@@ -54,42 +54,42 @@
查看
- 办理
- 盘库报告
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
@@ -126,14 +126,15 @@
* 监盘人
-
-
-
+
+
+
+
@@ -171,7 +172,7 @@
getCurrentDate
} from '@/utils/index.js'
import {
- selFianceByOrgSidPath
+ selAllByOrgSidPath
} from '@/api/Common/dictcommons'
export default {
@@ -232,14 +233,14 @@
"billNo": "",
"createStartTime": "",
"createEndTime": "",
- "stocktakType": "",
+ "checkState": "",
"createByName": "",
- "finance": ""
+ "superviseName": ""
}
},
sids: [],
selectionList: [],
- stocktakTypeList: [{
+ checkStateList: [{
sid: '1',
name: '未完成'
},
@@ -251,14 +252,18 @@
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),
createDate: getCurrentDate(),
- financeSid: [],
- finances: [],
+ superviseName: '',
+ superviseSid: '',
remarks: ""
},
financeList: [],
rules: {
- financeSid: [{
+ superviseName: [{
required: true,
message: '监盘人不能为空',
trigger: 'change'
@@ -272,13 +277,17 @@
created() {
this.loadList()
- selFianceByOrgSidPath({
- orgPath: window.sessionStorage.getItem('defaultOrgPath')
+ selAllByOrgSidPath({
+ orgSidPath: window.sessionStorage.getItem('defaultOrgPath')
}).then((res) => {
if (res.success) {
this.financeList = res.data
+
+ console.log("aaaaaa", this.financeList);
+
}
})
+
},
methods: {
selectFinance(val) {
@@ -287,20 +296,25 @@
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 = []
+ // for (var i = 0; i < choose.length; i++) {
- this.formobj.finances.push({
- name: choose[i].name,
- sid: choose[i].sid
- })
+ // this.formobj.finances.push({
+ // name: choose[i].name,
+ // sid: choose[i].sid
+ // })
- }
+ // }
},
handleClose() {
this.dialogVisible = false
+ this.formobj.superviseName = ''
+ this.formobj.superviseSid = ''
+ this.formobj.remarks = ''
},
saveExamine() {
@@ -319,9 +333,13 @@
this.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),
createDate: getCurrentDate(),
- financeSid: [],
- finances: [],
+ superviseName: '',
+ superviseSid: '',
remarks: ""
}
this.loadList()
@@ -360,6 +378,9 @@
},
loadList() {
this.tableLoading = true
+ this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
+ this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+ this.queryParams.params.menuUrl = this.$route.path
req.listPage(this.queryParams).then((resp) => {
this.tableLoading = false
if (resp.success) {
@@ -407,9 +428,9 @@
"billNo": "",
"createStartTime": "",
"createEndTime": "",
- "stocktakType": "",
+ "checkState": "",
"createByName": "",
- "finance": ""
+ "superviseName": ""
}
}
this.loadList()
@@ -418,10 +439,11 @@
// this.viewState = 2
// this.$refs['divadd'].showAdd()
+
+ this.dialogVisible = true
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
- this.dialogVisible = true
},
selectionLineChangeHandle(val) {
console.log('val', val)
@@ -437,7 +459,7 @@
console.log('toDetail', row)
this.viewState = 5
- this.$refs['divinfo'].loadList(row.sid)
+ this.$refs['divinfo'].showDetail(row.sid)
},
toShowBill() {
@@ -451,10 +473,10 @@
}
this.viewState = 2
- this.$refs['divstocktak'].loadList(this.selectionList[0].sid)
+ this.$refs['divstocktak'].showDetail(this.selectionList[0].sid)
},
toStocktak() {
- if (this.selectionList.length == 0) {
+ if (this.selectionList.length != 1) {
this.$message({
type: 'warning',
message: '请选择一条数据。',
@@ -463,19 +485,20 @@
return
}
- for (var i = this.selectionList.length - 1; i >= 0; i--) {
- if (this.selectionList[i].isReport == '1') {
- this.$message({
- type: 'warning',
- message: '所选记录已生成报告,不可重复生成。',
- showClose: true
- })
- return
- }
+ if (this.selectionList[0].state == '0') {
+ this.$message({
+ type: 'warning',
+ message: '所选记录已生成报告,不可重复生成。',
+ showClose: true
+ })
+ return
+ }
+ var params = {
+ sid: this.selectionList[0].sid
}
- req.billCreateReport(this.sids).then((resp) => {
+ req.billCreateReport(params).then((resp) => {
if (resp.success) {
this.$message({
type: 'success',
diff --git a/yxt-as-ui/src/views/storage/stocktaking/stocktakingInfo.vue b/yxt-as-ui/src/views/storage/stocktaking/stocktakingInfo.vue
index b74708dfa8..7c4429543e 100644
--- a/yxt-as-ui/src/views/storage/stocktaking/stocktakingInfo.vue
+++ b/yxt-as-ui/src/views/storage/stocktaking/stocktakingInfo.vue
@@ -10,22 +10,34 @@
@@ -44,21 +56,22 @@
-
-
+
+
-
+
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
+
@@ -102,6 +115,9 @@
import ButtonBar from '@/components/ButtonBar'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
+ import req2 from '@/api/warehouse/warehouse.js'
+ import req3 from '@/api/warehouse/warehouseArea.js'
+ import req4 from '@/api/warehouse/goodsShelves.js'
export default {
components: {
ButtonBar,
@@ -129,17 +145,22 @@
size: 10,
total: 0,
params: {
- "sid": "",
+ "billSid": "",
+ "warehouseSid": "",
"warehouseName": "",
- "warehouseAreaeName": "",
- "warehouseRackName": "",
- "goodsId": "",
- "goodsName": "",
- "goodsCode": ""
+ "warehouseAreaSid": "",
+ "warehouseAreaName": "",
+ "warehouseRackSid": "",
+ "goodsID": "",
+ "goodsSkuTitle": "",
+ "goodsSkuCode": ""
}
},
billSid: "",
- fileList: []
+ fileList: [],
+ warehouseList: [],
+ warehouseAreaList: [],
+ warehouseRackList: []
}
},
mounted() {
@@ -149,6 +170,74 @@
},
methods: {
+ initData() {
+
+ var parpams = {
+ orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+ }
+
+ req2.getAllWarehouse(parpams).then(resp => {
+ this.warehouseList = resp.data
+ })
+ },
+
+ getWarehouseArea(sid) {
+ this.queryParams.params.warehouseAreaSid = ''
+ this.queryParams.params.warehouseAreaName = ''
+
+ var params = {
+ ckSid: sid
+ }
+
+ req3.getAllWarehouseareaBysid(params).then(resp => {
+ console.log('>>>>>>>>>getAllWarehousearea', resp)
+ this.warehouseAreaList = resp.data
+ }).catch(() => {})
+ },
+
+ getAllTypeByAreaSid(sid) {
+ this.queryParams.params.warehouseRackSid = ''
+ this.queryParams.params.warehouseRackName = ''
+
+ var params = {
+ areaSid: sid
+ }
+
+ 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)
+
+ },
+
+ 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)
+ },
+
+ 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
+
+ },
+
+
showImage(paths) {
this.fileList = paths
this.dialogVisible = true
@@ -175,11 +264,16 @@
}
},
- loadList(sid) {
+ showDetail(sid) {
+ this.initData()
+ this.billSid = sid
+ this.queryParams.params.billSid = sid
+ this.loadList()
+ },
+
+ loadList() {
this.tableLoading = true
- this.billSid = sid
- this.queryParams.params.sid = sid
req.billDetail(this.queryParams).then((resp) => {
this.tableLoading = false
@@ -213,13 +307,15 @@
size: 10,
total: 0,
params: {
- "sid": this.billSid,
+ "billSid": this.billSid,
+ "warehouseSid": "",
"warehouseName": "",
- "warehouseAreaeName": "",
- "warehouseRackName": "",
- "goodsId": "",
- "goodsName": "",
- "goodsCode": ""
+ "warehouseAreaSid": "",
+ "warehouseAreaName": "",
+ "warehouseRackSid": "",
+ "goodsID": "",
+ "goodsSkuTitle": "",
+ "goodsSkuCode": ""
}
}
this.loadList()
diff --git a/yxt-as-ui/src/views/storage/stocktaking/stocktakingRackCodeDetail.vue b/yxt-as-ui/src/views/storage/stocktaking/stocktakingRackCodeDetail.vue
index 85b3650108..477beecf2d 100644
--- a/yxt-as-ui/src/views/storage/stocktaking/stocktakingRackCodeDetail.vue
+++ b/yxt-as-ui/src/views/storage/stocktaking/stocktakingRackCodeDetail.vue
@@ -10,13 +10,13 @@
@@ -35,21 +35,22 @@
-
-
+
+
-
+
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
+
@@ -120,13 +121,15 @@
size: 10,
total: 0,
params: {
- "sid": "",
- "goodsId": "",
- "goodsName": "",
- "goodsCode": ""
+ "billSid": "",
+ "warehouseRackSid": "",
+ "goodsID": "",
+ "goodsSkuTitle": "",
+ "goodsSkuCode": ""
}
},
billSid: "",
+ warehouseRackSid: "",
fileList: []
}
},
@@ -163,12 +166,16 @@
}
},
- loadList(sid) {
-
- this.tableLoading = true
+ showDetail(sid, warehouseRackSid) {
this.billSid = sid
- this.queryParams.params.sid = sid
+ this.warehouseRackSid = warehouseRackSid
+ this.queryParams.params.billSid = sid
+ this.queryParams.params.warehouseRackSid = warehouseRackSid
+ this.loadList()
+ },
+ loadList() {
+ this.tableLoading = true
req.billRackCodeDetail(this.queryParams).then((resp) => {
this.tableLoading = false
if (resp.success) {
@@ -201,10 +208,11 @@
size: 10,
total: 0,
params: {
- "sid": this.billSid,
- "goodsId": "",
- "goodsName": "",
- "goodsCode": ""
+ "billSid": this.billSid,
+ "warehouseRackSid": this.warehouseRackSid,
+ "goodsID": "",
+ "goodsSkuTitle": "",
+ "goodsSkuCode": ""
}
}
this.loadList()
diff --git a/yxt-as-ui/src/views/storage/stocktaking/stocktakingRackCodeList.vue b/yxt-as-ui/src/views/storage/stocktaking/stocktakingRackCodeList.vue
index 37ea05c85f..57ec6d889f 100644
--- a/yxt-as-ui/src/views/storage/stocktaking/stocktakingRackCodeList.vue
+++ b/yxt-as-ui/src/views/storage/stocktaking/stocktakingRackCodeList.vue
@@ -10,20 +10,22 @@
@@ -98,6 +100,9 @@
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'
export default {
components: {
ButtonBar,
@@ -126,10 +131,12 @@
size: 10,
total: 0,
params: {
- "sid": "",
+ "billSid": "",
+ "warehouseSid": "",
"warehouseName": "",
- "warehouseAreaeName": "",
- "warehouseRackName": "",
+ "warehouseAreaSid": "",
+ "warehouseAreaName": "",
+ "warehouseRackSid": "",
}
},
billSid: "",
@@ -145,6 +152,75 @@
},
methods: {
+
+ initData() {
+
+ var parpams = {
+ orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+ }
+
+ req2.getAllWarehouse(parpams).then(resp => {
+ this.warehouseList = resp.data
+ })
+ },
+
+ getWarehouseArea(sid) {
+ this.queryParams.params.warehouseAreaSid = ''
+ this.queryParams.params.warehouseAreaName = ''
+
+ var params = {
+ ckSid: sid
+ }
+
+ req3.getAllWarehouseareaBysid(params).then(resp => {
+ console.log('>>>>>>>>>getAllWarehousearea', resp)
+ this.warehouseAreaList = resp.data
+ }).catch(() => {})
+ },
+
+ getAllTypeByAreaSid(sid) {
+ this.queryParams.params.warehouseRackSid = ''
+ this.queryParams.params.warehouseRackName = ''
+
+ var params = {
+ areaSid: sid
+ }
+
+ 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)
+
+ },
+
+ 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)
+ },
+
+ 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
+
+ },
+
+
// 搜索条件效果
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
@@ -163,13 +239,15 @@
break
}
},
-
- loadList(sid) {
-
- this.tableLoading = true
+ showDetail(sid) {
+ this.initData()
this.billSid = sid
- this.queryParams.params.sid = sid
+ this.queryParams.params.billSid = sid
+ this.loadList()
+ },
+ loadList() {
+ this.tableLoading = true
req.billStocktak(this.queryParams).then((resp) => {
this.tableLoading = false
if (resp.success) {
@@ -202,10 +280,12 @@
size: 10,
total: 0,
params: {
- "sid": this.billSid,
+ "billSid": this.billSid,
+ "warehouseSid": "",
"warehouseName": "",
- "warehouseAreaeName": "",
- "warehouseRackName": "",
+ "warehouseAreaSid": "",
+ "warehouseAreaName": "",
+ "warehouseRackSid": "",
}
}
this.loadList()
@@ -214,7 +294,7 @@
toDetail(row) {
this.viewState = 2
- this.$refs['divSp'].loadList(row.sid)
+ this.$refs['divSp'].showDetail(row.billSid, row.warehouseRackSid)
},
close() {
this.$emit('doback')