Browse Source

完善盘点管理

master
yunuo970428 3 days ago
parent
commit
ca35af1012
  1. 350
      yxt-as-ui/src/views/storage/stocktaking/index.vue
  2. 2
      yxt-as-ui/src/views/storage/stocktaking/stocktakingEditReport.vue
  3. 94
      yxt-as-ui/src/views/storage/stocktaking/stocktakingRackCodeDetail.vue
  4. 234
      yxt-as-ui/src/views/storage/stocktaking/stocktakingRackCodeList.vue
  5. 2
      yxt-as-ui/src/views/storage/stocktaking/stocktakingReportDetail.vue

350
yxt-as-ui/src/views/storage/stocktaking/index.vue

@ -16,15 +16,13 @@
<el-input v-model="queryParams.params.billNo" placeholder="" clearable/>
</el-form-item>
<el-form-item label="生成日期">
<el-date-picker v-model="queryParams.params.createStartTime" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" />
<el-date-picker v-model="queryParams.params.createEndTime" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" />
<el-date-picker v-model="queryParams.params.createStartTime" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;"/>
<span style="padding: 0px 8px"></span>
<el-date-picker v-model="queryParams.params.createEndTime" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;"/>
</el-form-item>
<el-form-item label="盘点状态">
<el-select v-model="queryParams.params.checkState" placeholder="请选择" style="width: 200px;">
<el-option v-for="item in checkStateList" :key="item.sid" :label="item.name" :value="item.name" />
<el-option v-for="item in checkStateList" :key="item.sid" :label="item.name" :value="item.sid"/>
</el-select>
</el-form-item>
<el-form-item label="盘点人">
@ -47,17 +45,14 @@
<!-- End 项目列表头部 -->
<!-- Start 项目列表 -->
<div class="">
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%"
@selection-change="selectionLineChangeHandle">
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" @selection-change="selectionLineChangeHandle">
<el-table-column fixed width="50" type="selection" align="center"/>
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column fixed label="操作" align="center" width="220">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="toDetail(scope.row)">查看</el-button>
<el-button type="primary" size="mini" v-show="scope.row.state=='0'"
@click="toEdit(scope.row)">办理</el-button>
<el-button type="primary" size="mini" v-show="scope.row.state=='0'"
@click="toReport(scope.row)">盘库报告</el-button>
<el-button type="primary" size="mini" v-show="scope.row.state=='0'" @click="toEdit(scope.row)">办理</el-button>
<el-button type="primary" size="mini" v-show="scope.row.state=='0'" @click="toReport(scope.row)">盘库报告</el-button>
</template>
</el-table-column>
<el-table-column label="流程状态" width="120" align="center">
@ -103,8 +98,7 @@
<div class="pages">
<div class="tit"/>
<!-- 翻页 -->
<pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
:limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
<pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="loadList"/>
</div>
</div>
</div>
@ -134,39 +128,28 @@
<el-col :span="12">
<div class="span-sty"><span class="must">*</span> 盘点类型</div>
<el-form-item prop="checkTypeValue">
<el-select v-model="formobj.checkTypeValue" placeholder="请选择" class="addinputInfo addinputw"
@change="selectStocktakTyp">
<el-select v-model="formobj.checkTypeValue" placeholder="请选择" class="addinputInfo addinputw" @change="selectStocktakTyp">
<el-option v-for="item in stocktakTypeList" :key="item.sid" :label="item.name" :value="item.sid"/>
</el-select>
<!-- <el-select v-model="formobj.financeSid" placeholder="请选择" class="addinputInfo addinputw" filterable
multiple @change="selectFinance">
<el-option v-for="item in financeList" :key="item" :label="item.name" :value="item.sid"></el-option>
</el-select> -->
</el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty"><span class="must">*</span> 监盘人</div>
<el-form-item prop="superviseName">
<el-select v-model="formobj.superviseName" placeholder="请选择" class="addinputInfo addinputw"
@change="selectFinance">
<el-select v-model="formobj.superviseName" placeholder="请选择" class="addinputInfo addinputw" @change="selectFinance">
<el-option v-for="item in financeList" :key="item.sid" :label="item.name" :value="item.sid"/>
</el-select>
<!-- <el-select v-model="formobj.financeSid" placeholder="请选择" class="addinputInfo addinputw" filterable
multiple @change="selectFinance">
<el-option v-for="item in financeList" :key="item" :label="item.name" :value="item.sid"></el-option>
</el-select> -->
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><el-input v-model="formobj.remarks" placeholder="请填写" class="addinputInfo addinputw"
clearable />
<el-form-item>
<el-input v-model="formobj.remarks" placeholder="请填写" class="addinputInfo addinputw" clearable/>
</el-form-item>
</el-col>
</el-row>
<div class="title titleOne" v-show="showList=='1'">
<div>盘点库位</div>
<el-button type="primary" size="mini" class="btntopblueline" @click="seleRack()">选择库位</el-button>
@ -175,41 +158,35 @@
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column fixed label="操作" align="center" width="100">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="toDeleted(scope.row)">删除</el-button>
<el-button type="danger" size="mini" @click="toDeleted(scope.$index)">删除</el-button>
</template>
</el-table-column>
<el-table-column prop="warehouseName" label="仓库" align="center"/>
<el-table-column prop="zoneName" label="区域" align="center"/>
<el-table-column prop="locationName" label="库区" align="center"/>
<el-table-column prop="rackCode" label="库位" align="center"/>
</el-table>
</el-form>
<div style="display: flex;flex-direction: row;width: 100%;justify-content: center;align-items: center;">
<el-button type="primary" style="margin-top: 20px;" @click="saveExamine"> </el-button>
<el-button type="primary" style="margin-top: 20px;" @click="handleClose"> </el-button>
</div>
</el-dialog>
<el-dialog title="选择盘点库位" :visible.sync="dialogVisible2" :before-close="handleClose2">
<el-form ref="form_obj2" class="formaddcopy02" :rules="rules" style="margin-top: -40px;" :model="formobj">
<el-form :inline="true" class="tab-header">
<el-form-item label="仓库">
<el-select v-model="dialogParams.params.warehouseName" placeholder="请选择仓库" @change="selectWarehouseChange"
style="width: 200px;">
<el-select v-model="dialogParams.params.warehouseName" placeholder="请选择仓库" @change="selectWarehouseChange" style="width: 200px;">
<el-option v-for="item in warehouseList" :key="item.sid" :label="item.warehouseName" :value="item.sid"/>
</el-select>
</el-form-item>
<el-form-item label="库区">
<el-select v-model="dialogParams.params.warehouseAreaName" placeholder="请选择库区"
@change="selectWarehouseAreaChange" style="width: 200px;">
<el-select v-model="dialogParams.params.warehouseAreaName" placeholder="请选择库区" @change="selectWarehouseAreaChange" style="width: 200px;">
<el-option v-for="item in warehouseAreaList" :key="item.sid" :label="item.areaName" :value="item.sid"/>
</el-select>
</el-form-item>
<el-form-item label="库位">
<el-select v-model="dialogParams.params.warehouseRackCode" placeholder="请选择库位" style="width: 200px;"
@change="selectWarehouseRackChange">
<el-select v-model="dialogParams.params.warehouseRackCode" placeholder="请选择库位" style="width: 200px;" @change="selectWarehouseRackChange">
<el-option v-for="item in warehouseRackList" :key="item.sid" :label="item.rackCode" :value="item.sid">
</el-option>
</el-select>
@ -222,32 +199,24 @@
<div class="title titleOne" style="margin-top: 0px;">
<div>库位列表</div>
</div>
<el-table v-loading="tableLoading" :data="allWarehouseRackList" border style="width: 100%;"
@selection-change="selectionWarehouseRack">
<el-table v-loading="tableLoading" :data="allWarehouseRackList" border style="width: 100%;" @selection-change="selectionWarehouseRack">
<el-table-column fixed width="50" type="selection" align="center"/>
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column prop="warehouseName" label="仓库" align="center"/>
<el-table-column prop="locationName" label="库区" align="center"/>
<el-table-column prop="rackCode" label="库位" align="center"/>
</el-table>
<pagination v-show="allWarehouseRackList.length > 0" :total="dialogParams.total"
:page.sync="dialogParams.current" :limit.sync="dialogParams.size" class="pagination" @pagination="seleRack" />
<pagination v-show="allWarehouseRackList.length > 0" :total="dialogParams.total" :page.sync="dialogParams.current" :limit.sync="dialogParams.size" class="pagination" @pagination="seleRack"/>
</el-form>
<div style="display: flex;flex-direction: row;width: 100%;justify-content: center;align-items: center;">
<el-button type="primary" style="margin-top: 20px;" @click="addRck"> </el-button>
<el-button type="primary" style="margin-top: 20px;" @click="handleClose2"> </el-button>
</div>
</el-dialog>
<!-- 流程审批记录 -->
<el-dialog title="" :visible.sync="centerDialogVisible" width="78%" height="1%" :before-close="closeIt" center>
<iframe frameborder="0" id="iframe" style="width:100%;" scrolling="no"
:src="this.centerDialogVisible === true ? url :''"></iframe>
<iframe frameborder="0" id="iframe" style="width:100%;" scrolling="no" :src="this.centerDialogVisible === true ? url :''"></iframe>
</el-dialog>
</div>
</template>
@ -255,14 +224,12 @@
import req from '@/api/storage/stocktaking.js'
import ButtonBar from '@/components/ButtonBar'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import stocktakingAdd from './stocktakingAdd.vue'
import stocktakingInfo from './stocktakingInfo.vue'
import stocktakingRackCodeList from './stocktakingRackCodeList.vue'
import stocktakingEditReport from './stocktakingEditReport.vue'
import stocktakingReportDetail from './stocktakingReportDetail.vue'
import req2 from '@/api/warehouse/warehouse.js'
import req3 from '@/api/warehouse/warehouseArea.js'
import { getAllRackByKQSid, getAllWarehouse, getWarehouseareas } from '@/api/Common/dictcommons'
import req4 from '@/api/warehouse/goodsShelves.js'
import {
getCurrentDate
@ -278,7 +245,6 @@
components: {
ButtonBar,
Pagination,
pageye,
stocktakingAdd,
stocktakingInfo,
stocktakingRackCodeList,
@ -333,79 +299,73 @@
size: 10,
total: 0,
params: {
"deptNmae": "",
"billNo": "",
"createStartTime": "",
"createEndTime": "",
"checkState": "",
"createByName": "",
"superviseName": "",
"warehouseTypeKey": "01"
deptNmae: '',
billNo: '',
createStartTime: '',
createEndTime: '',
checkState: '',
createByName: '',
superviseName: '',
warehouseTypeKey: '01',
orgPath: '',
userSid: '',
menuUrl: ''
}
},
sids: [],
selectionList: [],
checkStateList: [{
checkStateList: [
{
sid: '1',
name: '未完成'
name: '盘点中'
},
{
sid: '2',
name: '完成'
name: '盘点完成'
}
],
stocktakTypeList: [{
stocktakTypeList: [
{
sid: '1',
name: '月度抽盘'
},
{
sid: '2',
name: '季度全盘'
},
}
],
formobj: {
createByName: window.sessionStorage.getItem('name'),
createBySid: window.sessionStorage.getItem('userSid'),
deptSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
.getItem('defaultOrgPath').lastIndexOf('/') + 1),
deptName: window.sessionStorage.getItem('defaultOrgPathName').substring(window
.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
deptSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1),
deptName: window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
createDate: getCurrentDate(),
checkTypeValue: '',
checkTypeKey: '',
superviseName: '',
superviseSid: '',
remarks: "",
remarks: '',
dataList: [],
"warehouseTypeKey": "01",
"warehouseTypeValue": "配件库"
warehouseTypeKey: '01',
warehouseTypeValue: '配件库'
},
financeList: [],
rules: {
checkTypeValue: [{
required: true,
message: '请选择盘点类型',
trigger: 'change'
}],
superviseName: [{
required: true,
message: '请选择监盘人',
trigger: 'change'
}],
checkTypeValue: [{ required: true, message: '请选择盘点类型', trigger: 'change' }],
superviseName: [{ required: true, message: '请选择监盘人', trigger: 'change' }]
},
dialogParams: {
current: 1,
size: 10,
total: 0,
params: {
"warehouseSid": "",
"warehouseName": "",
"warehouseAreaSid": "",
"warehouseAreaName": "",
"warehouseRackSid": "",
"warehouseRackCode": "",
"warehouseTypeKey": "01",
warehouseSid: '',
warehouseName: '',
warehouseAreaSid: '',
warehouseAreaName: '',
warehouseRackSid: '',
warehouseRackCode: '',
warehouseTypeKey: '01'
}
},
warehouseList: [],
@ -422,21 +382,14 @@
},
created() {
this.loadList()
selAllByOrgSidPath({
orgSidPath: window.sessionStorage.getItem('defaultOrgPath')
}).then((res) => {
selAllByOrgSidPath({ orgSidPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
if (res.success) {
this.financeList = res.data
}
})
req2.getAllWarehouse({
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
}).then(resp => {
getAllWarehouse({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), warehouseTypeValue: '配件库' }).then(resp => {
this.warehouseList = resp.data
})
},
methods: {
async handleMessage(event) {
@ -470,60 +423,34 @@
getWarehouseArea(sid) {
this.dialogParams.params.warehouseAreaSid = ''
this.dialogParams.params.warehouseAreaName = ''
var params = {
ckSid: sid
}
req3.getAllWarehouseareaBysid(params).then(resp => {
console.log('>>>>>>>>>getAllWarehousearea', resp)
getWarehouseareas({ ckSid: sid }).then(resp => {
this.warehouseAreaList = resp.data
}).catch(() => {})
})
},
getAllTypeByAreaSid(sid) {
this.dialogParams.params.warehouseRackSid = ''
this.dialogParams.params.warehouseRackCode = ''
var params = {
areaSid: sid
}
req4.getAllTypeByAreaSid(params).then(resp => {
console.log('>>>>>>>>>getAllTypeByAreaSid', resp)
getAllRackByKQSid({ kqSid: sid }).then(resp => {
this.warehouseRackList = resp.data
}).catch(() => {})
})
},
selectWarehouseChange(val) {
const choose = this.warehouseList.filter((item) => item.sid == val)
console.log('>>>>>>>>>selectWarehouseChange', choose)
const choose = this.warehouseList.filter((item) => item.sid === val)
this.dialogParams.params.warehouseSid = choose[0].sid
this.dialogParams.params.warehouseName = choose[0].warehouseName
this.getWarehouseArea(choose[0].sid)
},
selectWarehouseAreaChange(val) {
const choose = this.warehouseAreaList.filter((item) => item.sid == val)
console.log('>>>>>>>>>selectWarehouseAreaChange', choose)
const choose = this.warehouseAreaList.filter((item) => item.sid === val)
this.dialogParams.params.warehouseAreaSid = choose[0].sid
this.dialogParams.params.warehouseAreaName = choose[0].areaName
this.getAllTypeByAreaSid(choose[0].sid)
},
selectWarehouseRackChange(val) {
const choose = this.warehouseRackList.filter((item) => item.sid == val)
console.log('>>>>>>>>>selectWarehouseRackChange', choose)
const choose = this.warehouseRackList.filter((item) => item.sid === val)
this.dialogParams.params.warehouseRackSid = choose[0].sid
this.dialogParams.params.warehouseRackCode = choose[0].rackCode
},
dialogDosearch() {
this.dialogParams.current = 1
this.seleRack()
@ -534,26 +461,22 @@
size: 10,
total: 0,
params: {
"warehouseSid": "",
"warehouseName": "",
"warehouseAreaSid": "",
"warehouseAreaName": "",
"warehouseRackSid": "",
"warehouseRackCode": "",
"warehouseTypeKey": "01",
warehouseSid: '',
warehouseName: '',
warehouseAreaSid: '',
warehouseAreaName: '',
warehouseRackSid: '',
warehouseRackCode: '',
warehouseTypeKey: '01'
}
}
this.seleRack()
},
seleRack() {
this.dialogParams.params.userSid = window.sessionStorage.getItem('userSid')
this.dialogParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.dialogParams.params.menuUrl = this.$route.path
req4.warehouserackListAll(this.dialogParams).then(resp => {
console.log('>>>>>>>>>warehouserackListAll', resp)
if (resp.success) {
const data = resp.data
this.dialogParams.total = data.total
@ -564,36 +487,29 @@
this.allWarehouseRackList = []
this.dialogParams.total = 0
}
}).catch(() => {})
}).catch(() => {
})
},
selectionWarehouseRack(val) {
console.log('>>>>>>>>>selectionWarehouseRack', val)
this.selectionWarehouseRackList = val
},
addRck() {
this.formobj.dataList = []
for (var i = 0; i < this.selectionWarehouseRackList.length; i++) {
var item = this.selectionWarehouseRackList[i]
this.formobj.dataList.push(item)
}
console.log('>>>>>>>>>addRck', this.formobj.dataList)
this.dialogParams = {
current: 1,
size: 10,
total: 0,
params: {
"warehouseSid": "",
"warehouseName": "",
"warehouseAreaSid": "",
"warehouseAreaName": "",
"warehouseRackSid": "",
"warehouseRackCode": "",
"warehouseTypeKey": "01",
warehouseSid: '',
warehouseName: '',
warehouseAreaSid: '',
warehouseAreaName: '',
warehouseRackSid: '',
warehouseRackCode: '',
warehouseTypeKey: '01'
}
}
this.dialogVisible2 = false
@ -604,54 +520,34 @@
size: 10,
total: 0,
params: {
"warehouseSid": "",
"warehouseName": "",
"warehouseAreaSid": "",
"warehouseAreaName": "",
"warehouseRackSid": "",
"warehouseRackCode": "",
"warehouseTypeKey": "01",
warehouseSid: '',
warehouseName: '',
warehouseAreaSid: '',
warehouseAreaName: '',
warehouseRackSid: '',
warehouseRackCode: '',
warehouseTypeKey: '01'
}
}
this.dialogVisible2 = false
},
toDeleted(row) {
console.log('>>>>>>>>>toDeleted', row)
const index = this.formobj.dataList.findIndex((item) => item == row)
toDeleted(index) {
this.formobj.dataList.splice(index, 1)
},
selectStocktakTyp(val) {
this.showList = val
console.log('>>>>>>>>>selectStocktakTyp', val)
const choose = this.stocktakTypeList.filter((item) => val.includes(item.sid))
console.log('>>>>>>>>>selectStocktakTyp', choose)
this.formobj.checkTypeValue = choose[0].name
this.formobj.checkTypeKey = choose[0].sid
},
selectFinance(val) {
console.log('>>>>>>>>>selectFinance', val)
const choose = this.financeList.filter((item) => val.includes(item.sid))
console.log('>>>>>>>>>selectFinance', choose)
this.formobj.superviseName = choose[0].name
this.formobj.superviseSid = choose[0].sid
// this.formobj.finances = []
// for (var i = 0; i < choose.length; i++) {
// this.formobj.finances.push({
// name: choose[i].name,
// sid: choose[i].sid
// })
// }
},
handleClose() {
this.dialogVisible = false
this.showList = "2"
this.showList = '2'
this.formobj.checkTypeValue = ''
this.formobj.checkTypeKey = ''
this.formobj.superviseName = ''
@ -660,14 +556,11 @@
this.formobj.dataList = []
},
saveExamine() {
console.log('>>>>>>>>>saveExamine', this.formobj)
this.formobj.rackSids = []
for (var i = 0; i < this.formobj.dataList.length; i++) {
var item = this.formobj.dataList[i]
this.formobj.rackSids.push(item.sid)
}
this.$refs['form_obj'].validate((valid) => {
if (valid) {
req.createBill(this.formobj).then((resp) => {
@ -680,7 +573,8 @@
this.handleClose()
this.loadList()
}
}).catch(() => {})
}).catch(() => {
})
}
})
},
@ -731,19 +625,7 @@
}).catch(() => {
this.tableLoading = false
})
// this.$http({
// method: "post",
// url: "http://127.0.0.1:4523/mock/430173/user/list",
// params: this.queryParams,
// }).then((resp) => {
// const data = resp.data
// this.queryParams.total = data.total
// this.dataList = data.records
// });
},
//
indexMethod(index) {
var pagestart = (this.queryParams.current - 1) * this.queryParams.size
@ -760,23 +642,22 @@
size: 10,
total: 0,
params: {
"deptNmae": "",
"billNo": "",
"createStartTime": "",
"createEndTime": "",
"checkState": "",
"createByName": "",
"superviseName": "",
"warehouseTypeKey": "01",
deptNmae: '',
billNo: '',
createStartTime: '',
createEndTime: '',
checkState: '',
createByName: '',
superviseName: '',
warehouseTypeKey: '01',
orgPath: '',
userSid: '',
menuUrl: ''
}
}
this.loadList()
},
toAdd() {
// this.viewState = 2
// this.$refs['divadd'].showAdd()
this.dialogVisible = true
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
@ -799,8 +680,7 @@
this.$refs['divinfo'].showDetail(row.sid)
},
toShowBill() {
if (this.selectionList.length != 1) {
if (this.selectionList.length !== 1) {
this.$message({
type: 'warning',
message: '请选择一条数据。',
@ -808,12 +688,11 @@
})
return
}
this.viewState = 2
this.$refs['divstocktak'].showDetail(this.selectionList[0].sid)
},
toStocktak() {
if (this.selectionList.length != 1) {
if (this.selectionList.length !== 1) {
this.$message({
type: 'warning',
message: '请选择一条数据。',
@ -831,18 +710,16 @@
return
}
this.$confirm("请确认是否盘点完毕,生成盘点报告后将不能再盘点!", "提示", {
this.$confirm('请确认是否盘点完毕,生成盘点报告后将不能再盘点!', '提示', {
// iconClass: "el-icon-question", //
confirmButtonText: "确认", //
cancelButtonText: "取消", //
showClose: true, //
type: "warning", // success/info/warning/error
confirmButtonText: '确认',
cancelButtonText: '取消',
showClose: true,
type: 'warning'
}).then(() => {
//
var params = {
sid: this.selectionList[0].sid
}
req.billCreateReport(params).then((resp) => {
if (resp.success) {
this.$message({
@ -850,24 +727,18 @@
message: '操作成功',
showClose: true
})
this.loadList()
}
}).catch(() => {})
}).catch(() => {
//
});
})
}).catch(() => {
})
},
toEdit(row) {
this.viewState = 3
this.$refs['divedit'].showEdit(row)
},
toReport(row) {
this.viewState = 4
this.$refs['divreport'].showDetail(row)
},
@ -875,7 +746,6 @@
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
},
resetState() {
this.viewState = 1
}

2
yxt-as-ui/src/views/storage/stocktaking/stocktakingEditReport.vue

@ -127,7 +127,7 @@
</div>
<el-table :data="formobj.arehouseAreaeStocktakList" :index="index" border style="width: 100%;">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
<el-table-column prop="warehouseAreaeName" label="仓库-库区" width="200" align="center" />
<el-table-column prop="warehouseAreaeName" label="仓库-区域-库区" width="200" align="center" />
<el-table-column prop="ypNum" label="应盘" align="center" />
<el-table-column prop="ypMoney" label="应盘金额" align="center" />
<el-table-column prop="spNum" label="实盘" align="center" />

94
yxt-as-ui/src/views/storage/stocktaking/stocktakingRackCodeDetail.vue

@ -38,6 +38,7 @@
<el-table-column prop="goodsSkuTitle" label="商品名称" width="120" align="center"/>
<el-table-column prop="goodsSkuCode" label="图号" width="120" align="center"/>
<el-table-column prop="warehouseName" label="仓库" width="120" align="center"/>
<el-table-column prop="zoneName" label="区域" width="120" align="center"/>
<el-table-column prop="warehouseArea" label="库区" width="120" align="center"/>
<el-table-column prop="warehouseRackName" label="库位" width="120" align="center"/>
<el-table-column prop="unit" label="单位" width="120" align="center"/>
@ -45,18 +46,16 @@
<el-table-column prop="bookCount" label="库存数量" width="120" align="center"/>
<el-table-column prop="bookAmount" label="库存金额" width="120" align="center"/>
<el-table-column prop="realCount" label="实盘数量" width="120" align="center"/>
<el-table-column prop="realCount" label="实盘金额" width="120" align="center" />
<el-table-column prop="realAmount" label="实盘金额" width="120" align="center"/>
<el-table-column prop="state" label="状态" width="120" align="center"/>
<el-table-column prop="profitAndLoseCount" label="亏盈数" width="120" align="center"/>
<el-table-column prop="profitAndLoseAmount" label="亏金额" width="120" align="center" />
<el-table-column prop="profitAndLoseAmount" label="亏金额" width="120" align="center"/>
<el-table-column prop="lossCount" label="盘损数量" width="120" align="center"/>
<el-table-column prop="lossAmount" label="盘损金额" width="120" align="center"/>
<el-table-column prop="remarks" label="备注" align="center" width="200"/>
<el-table-column label="附件" align="center">
<template slot-scope="scope">
<div style="color: #1890FF; text-decoration: underline ;" @click="showImage(scope.row.fillPaths)">
查看
</div>
<span class="bluezi" @click="showImage(scope.row.fillPaths)">查看</span>
</template>
</el-table-column>
</el-table>
@ -65,27 +64,21 @@
<div class="pages">
<div class="tit"/>
<!-- 翻页 -->
<pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
:limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
<pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="loadList"/>
</div>
</div>
</div>
<el-dialog title="附件" :visible.sync="dialogVisible" :before-close="handleClose">
<el-form ref="dataForm1" class="formadd" style="margin-top: -30px;">
<el-row class="first_row">
<el-col :span="24" class="trightb">
<el-image style="width: 120px;height: 120px; margin: 10px; background: #f0f;"
v-for="(item,index) in fileList" :src="item.url" :preview-src-list="[item]">
<el-image style="width: 120px;height: 120px; margin: 10px; background: #f0f;" v-for="(item, index) in fileList" :key="index" :src="item.url" :preview-src-list="[item]">
</el-image>
</el-col>
</el-row>
</el-form>
</el-dialog>
</div>
</template>
@ -93,12 +86,11 @@
import req from '@/api/storage/stocktaking.js'
import ButtonBar from '@/components/ButtonBar'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
export default {
components: {
ButtonBar,
Pagination,
pageye,
Pagination
},
data() {
return {
@ -121,23 +113,20 @@
size: 10,
total: 0,
params: {
"billSid": "",
"warehouseRackSid": "",
"goodsID": "",
"goodsSkuTitle": "",
"goodsSkuCode": ""
billSid: '',
warehouseRackSid: '',
goodsID: '',
goodsSkuTitle: '',
goodsSkuCode: ''
}
},
billSid: "",
warehouseRackSid: "",
billSid: '',
warehouseRackSid: '',
fileList: []
}
},
mounted() {
this.$refs['btnbar'].setButtonList(this.btnList)
},
created() {
},
methods: {
showImage(paths) {
@ -208,64 +197,23 @@
size: 10,
total: 0,
params: {
"billSid": this.billSid,
"warehouseRackSid": this.warehouseRackSid,
"goodsID": "",
"goodsSkuTitle": "",
"goodsSkuCode": ""
billSid: this.billSid,
warehouseRackSid: this.warehouseRackSid,
goodsID: '',
goodsSkuTitle: '',
goodsSkuCode: ''
}
}
this.loadList()
},
close() {
this.$emit('doback')
},
}
}
}
</script>
<style scoped>
/deep/ .el-form-item__error {
margin-left: 120px !important;
}
.must {
color: #f00;
}
.span-sty {
width: 90px !important;
}
.addinputInfo {
margin-left: 80px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
margin-left: 80px !important;
width: calc(100% - 70px);
}
.first_row {
border-top: 1px solid #E0E3EB;
}
.titleOne {
padding: 7px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
/deep/ .el-form-item__error {
margin-left: 180px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group {
display: inline;
line-height: 1px;
vertical-align: middle;
}
</style>

234
yxt-as-ui/src/views/storage/stocktaking/stocktakingRackCodeList.vue

@ -10,24 +10,26 @@
<div v-show="isSearchShow" class="search">
<el-form :inline="true" class="tab-header">
<el-form-item label="仓库">
<el-select v-model="queryParams.params.warehouseName" placeholder="请选择仓库"
@change="selectWarehouseChange">
<el-option v-for="item in warehouseList" :key="item.sid" :label="item.warehouseName"
:value="item.sid" />
<el-select v-model="queryParams.params.warehouseName" filterable clearable placeholder="请选择" style="width:100%" @change="selectWarehouseName">
<el-option v-for="item in warehouseList" :key="item.sid" :label="item.warehouseName" :value="item.sid">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="区域">
<el-select v-model="queryParams.params.zoneName" filterable clearable placeholder="请选择" @change="selectWareZoneName">
<el-option v-for="item in warehouseZoneList" :key="item.sid" :label="item.zoneName" :value="item.sid">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="库区">
<el-select v-model="queryParams.params.warehouseAreaName" placeholder="请选择库区"
@change="selectWarehouseAreaChange">
<el-option v-for="item in warehouseAreaList" :key="item.sid" :label="item.areaName"
:value="item.sid" />
<el-select v-model="queryParams.params.warehouseAreaName" filterable clearable placeholder="请选择" @change="selectWareAreaName">
<el-option v-for="item in wareAreaList" :key="item.sid" :label="item.areaName" :value="item.sid">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="库位">
<el-select v-model="queryParams.params.warehouseRackName" placeholder="请选择库位"
@change="selectWarehouseRackChange">
<el-option v-for="item in warehouseRackList" :key="item.sid" :label="item.rackName"
:value="item.sid">
<el-select v-model="queryParams.params.warehouseRackCode" filterable clearable placeholder="请选择" style="width:100%">
<el-option v-for="item in warehouseRackList" :key="item.rackCode" :label="item.rackCode" :value="item.rackCode">
</el-option>
</el-select>
</el-form-item>
@ -53,6 +55,7 @@
</template>
</el-table-column>
<el-table-column prop="warehouseName" label="仓库" width="120" align="center"/>
<el-table-column prop="zoneName" label="区域" width="120" align="center"/>
<el-table-column prop="warehouseArea" label="库区" width="120" align="center"/>
<el-table-column prop="warehouseRackName" label="库位" width="120" align="center"/>
<el-table-column label="应盘" align="center">
@ -85,8 +88,7 @@
<div class="pages">
<div class="tit"/>
<!-- 翻页 -->
<pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
:limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
<pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="loadList"/>
</div>
</div>
</div>
@ -99,16 +101,13 @@
import req from '@/api/storage/stocktaking.js'
import ButtonBar from '@/components/ButtonBar'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import stocktakingRackCodeDetail from './stocktakingRackCodeDetail.vue'
import req2 from '@/api/warehouse/warehouse.js'
import req3 from '@/api/warehouse/warehouseArea.js'
import req4 from '@/api/warehouse/goodsShelves.js'
import { getAllRackByKQSid, getAllWarehouse, getAllWarehouseareaByZoneSid, getAllWarehousezoneBysid } from '@/api/Common/dictcommons'
export default {
components: {
ButtonBar,
Pagination,
pageye,
stocktakingRackCodeDetail
},
data() {
@ -120,28 +119,28 @@
searchxianshitit: '显示查询条件',
tableLoading: false,
dataList: [],
btnList: [{
btnList: [
{
type: 'info',
size: 'small',
icon: 'cross',
btnKey: 'doClose',
btnLabel: '关闭'
}],
}
],
queryParams: {
current: 1,
size: 10,
total: 0,
params: {
"billSid": "",
"warehouseSid": "",
"warehouseName": "",
"warehouseAreaSid": "",
"warehouseAreaName": "",
"warehouseRackSid": "",
"warehouseRackName": "",
billSid: '',
warehouseName: '',
zoneName: '',
wareAreaName: '',
warehouseRackCode: ''
}
},
billSid: "",
billSid: '',
warehouseList: [],
warehouseAreaList: [],
warehouseRackList: []
@ -149,80 +148,75 @@
},
mounted() {
this.$refs['btnbar'].setButtonList(this.btnList)
},
created() {
},
methods: {
initData() {
var parpams = {
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
getAllWarehouse({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), warehouseTypeValue: '配件库' }).then((res) => {
if (res.success) {
this.warehouseList = res.data
}
req2.getAllWarehouse(parpams).then(resp => {
this.warehouseList = resp.data
})
},
getWarehouseArea(sid) {
this.queryParams.params.warehouseAreaSid = ''
this.queryParams.params.warehouseAreaName = ''
var params = {
ckSid: sid
selectWarehouseName(val) {
this.warehouseZoneList = []
this.wareAreaList = []
this.warehouseRackList = []
const choose = this.warehouseList.filter((item) => item.sid === val)
if (choose !== null || choose.length > 0) {
this.queryParams.params.warehouseName = choose[0].warehouseName
this.getWarehouseZoneList(choose[0].sid)
} else {
this.queryParams.params.warehouseName = ''
}
req3.getAllWarehouseareaBysid(params).then(resp => {
console.log('>>>>>>>>>getAllWarehousearea', resp)
this.warehouseAreaList = resp.data
}).catch(() => {})
this.queryParams.params.wareZoneName = ''
this.queryParams.params.wareAreaName = ''
this.queryParams.params.warehouseRackCode = ''
},
getAllTypeByAreaSid(sid) {
this.queryParams.params.warehouseRackSid = ''
this.queryParams.params.warehouseRackName = ''
var params = {
areaSid: sid
getWarehouseZoneList(sid) {
getAllWarehousezoneBysid({ ckSid: sid }).then((res) => {
if (res.success) {
this.warehouseZoneList = res.data
}
req4.getAllTypeByAreaSid(params).then(resp => {
console.log('>>>>>>>>>getAllTypeByAreaSid', resp)
this.warehouseRackList = resp.data
}).catch(() => {})
})
},
selectWarehouseChange(val) {
const choose = this.warehouseList.filter((item) => item.sid == val)
console.log('>>>>>>>>>selectWarehouseChange', choose)
this.queryParams.params.warehouseSid = choose[0].sid
this.queryParams.params.warehouseName = choose[0].warehouseName
this.getWarehouseArea(choose[0].sid)
selectWareZoneName(val) {
this.wareAreaList = []
this.warehouseRackList = []
const choose = this.warehouseZoneList.filter((item) => item.sid === val)
if (choose !== null && choose.length > 0) {
this.queryParams.params.wareZoneName = choose[0].zoneName
this.getWareAreaList(choose[0].sid)
} else {
this.queryParams.params.wareZoneName = ''
}
this.queryParams.params.wareAreaName = ''
this.queryParams.params.warehouseRackCode = ''
},
selectWarehouseAreaChange(val) {
const choose = this.warehouseAreaList.filter((item) => item.sid == val)
console.log('>>>>>>>>>selectWarehouseAreaChange', choose)
this.queryParams.params.warehouseAreaSid = choose[0].sid
this.queryParams.params.warehouseAreaName = choose[0].areaName
this.getAllTypeByAreaSid(choose[0].sid)
getWareAreaList(sid) {
getAllWarehouseareaByZoneSid({ qySid: sid }).then((res) => {
if (res.success) {
this.wareAreaList = res.data
}
})
},
selectWarehouseRackChange(val) {
const choose = this.warehouseRackList.filter((item) => item.sid == val)
console.log('>>>>>>>>>selectWarehouseRackChange', choose)
this.queryParams.params.warehouseRackSid = choose[0].sid
this.queryParams.params.warehouseRackName = choose[0].rackName
selectWareAreaName(val) {
this.warehouseRackList = []
const choose = this.wareAreaList.filter((item) => item.sid === val)
if (choose !== null && choose.length > 0) {
this.queryParams.params.wareAreaName = choose[0].areaName
this.getWarehouseRackList(choose[0].sid)
} else {
this.queryParams.params.wareAreaName = ''
}
this.queryParams.params.warehouseRackCode = ''
},
getWarehouseRackList(sid) {
getAllRackByKQSid({ kqSid: sid }).then((res) => {
if (res.success) {
this.warehouseRackList = res.data
}
})
},
//
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
@ -247,7 +241,6 @@
this.queryParams.params.billSid = sid
this.loadList()
},
loadList() {
this.tableLoading = true
req.billStocktak(this.queryParams).then((resp) => {
@ -265,7 +258,6 @@
this.tableLoading = false
})
},
//
indexMethod(index) {
var pagestart = (this.queryParams.current - 1) * this.queryParams.size
@ -282,74 +274,28 @@
size: 10,
total: 0,
params: {
"billSid": this.billSid,
"warehouseSid": "",
"warehouseName": "",
"warehouseAreaSid": "",
"warehouseAreaName": "",
"warehouseRackSid": "",
"warehouseRackName": "",
billSid: this.billSid,
warehouseName: '',
zoneName: '',
wareAreaName: '',
warehouseRackCode: ''
}
}
this.loadList()
},
toDetail(row) {
this.viewState = 2
this.$refs['divSp'].showDetail(row.billSid, row.warehouseRackSid)
},
close() {
this.$emit('doback')
},
resetState() {
this.viewState = 1
}
}
}
</script>
<style scoped>
/deep/ .el-form-item__error {
margin-left: 120px !important;
}
.must {
color: #f00;
}
.span-sty {
width: 90px !important;
}
.addinputInfo {
margin-left: 80px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
margin-left: 80px !important;
width: calc(100% - 70px);
}
.first_row {
border-top: 1px solid #E0E3EB;
}
.titleOne {
padding: 7px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
/deep/ .el-form-item__error {
margin-left: 180px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group {
display: inline;
line-height: 1px;
vertical-align: middle;
}
<style scoped>
</style>

2
yxt-as-ui/src/views/storage/stocktaking/stocktakingReportDetail.vue

@ -124,7 +124,7 @@
</div>
<el-table :data="formobj.arehouseAreaeStocktakList" :index="index" border style="width: 100%;">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
<el-table-column prop="warehouseAreaeName" label="仓库-库区" align="center" />
<el-table-column prop="warehouseAreaeName" label="仓库-区域-库区" align="center" />
<el-table-column prop="ypNum" label="应盘" align="center" />
<el-table-column prop="ypMoney" label="应盘金额" width="150" align="center" />
<el-table-column prop="spNum" label="实盘" width="150" align="center" />

Loading…
Cancel
Save