diff --git a/yxt-as-ui/src/api/operation/salesInvoice.js b/yxt-as-ui/src/api/operation/salesInvoice.js index dcd49afef8..e742a696f1 100644 --- a/yxt-as-ui/src/api/operation/salesInvoice.js +++ b/yxt-as-ui/src/api/operation/salesInvoice.js @@ -4,7 +4,7 @@ export default { // 查询分页列表 listPage: function(params) { return request({ - // baseURL: "http://127.0.0.1:4523/m1/613533-0-default", + baseURL: "http://127.0.0.1:4523/m1/613533-0-default", url: '/as/v1/salesInvoice/listPage', method: 'post', data: params, @@ -15,7 +15,7 @@ export default { }, saveOrUpdate: function(data) { return request({ - // baseURL: "http://127.0.0.1:4523/m1/613533-0-default", + baseURL: "http://127.0.0.1:4523/m1/613533-0-default", url: '/as/v1/salesInvoice/saveOrUpdate', method: 'post', data: data, @@ -26,14 +26,14 @@ export default { }, fetchBySid: function(data) { return request({ - // baseURL: "http://127.0.0.1:4523/m1/613533-0-default", + baseURL: "http://127.0.0.1:4523/m1/613533-0-default", url: '/as/v1/salesInvoice/fetchDetailsBySid/' + data, method: 'get' }) }, deleteBySids: function(data) { return request({ - // baseURL: "http://127.0.0.1:4523/m1/613533-0-default", + baseURL: "http://127.0.0.1:4523/m1/613533-0-default", url: '/as/v1/salesInvoice/delBySids', method: 'DELETE', data: data, @@ -44,7 +44,7 @@ export default { }, submit: function(data) { return request({ - // baseURL: "http://127.0.0.1:4523/m1/613533-0-default", + baseURL: "http://127.0.0.1:4523/m1/613533-0-default", url: '/as/v1/salesInvoice/submit', method: 'post', data: data, @@ -56,7 +56,7 @@ export default { salesOrderListPage: function(params) { return request({ - // baseURL: "http://127.0.0.1:4523/m1/613533-0-default", + baseURL: "http://127.0.0.1:4523/m1/613533-0-default", url: '/as/v1/salesInvoice/salesOrderListPage', method: 'post', data: params, diff --git a/yxt-as-ui/src/api/warehouse/warehouse.js b/yxt-as-ui/src/api/warehouse/warehouse.js index 3cea8fde01..3c8d1f2255 100644 --- a/yxt-as-ui/src/api/warehouse/warehouse.js +++ b/yxt-as-ui/src/api/warehouse/warehouse.js @@ -75,4 +75,13 @@ export default { params: params, }) }, + + // 根据仓库类型value 查询所有仓库 + selectWarehouseByType: function(params) { + return request({ + url: '/wms/apiadmin/base/wmswarehouseinfo/selectWarehouseByType', + method: 'get', + params: params, + }) + }, } diff --git a/yxt-as-ui/src/views/goods/goods/goodsAdd2.vue b/yxt-as-ui/src/views/goods/goods/goodsAdd2.vue index 503f7f12bf..88e85759ca 100644 --- a/yxt-as-ui/src/views/goods/goods/goodsAdd2.vue +++ b/yxt-as-ui/src/views/goods/goods/goodsAdd2.vue @@ -20,25 +20,27 @@
* 商品名称
- + -
* 商品编码
+
* 图号
- +
条形码
- +
拼音缩写
- + @@ -46,29 +48,32 @@
* 计量单位
- - + +
* 商品类别
- - + +
规格
- +
保质期(天)
- + @@ -77,22 +82,25 @@
* 品牌
- +
* 厂家
- - + +
原厂标志
- + 是 否 @@ -103,13 +111,15 @@
* 库存上限
- +
* 库存下限
- + @@ -117,44 +127,48 @@
* 排序
- +
备注
- + -
锁定销售定价
+
锁定销售价
- + 是 否 -
销售底价
+
销售价
- +
三包价格
- +
首保价格
+ oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" /> @@ -162,7 +176,8 @@
商品图片
- + @@ -172,289 +187,292 @@ diff --git a/yxt-as-ui/src/views/goods/goods/goodsInfo2.vue b/yxt-as-ui/src/views/goods/goods/goodsInfo2.vue index 83201ddf89..842ec08d03 100644 --- a/yxt-as-ui/src/views/goods/goods/goodsInfo2.vue +++ b/yxt-as-ui/src/views/goods/goods/goodsInfo2.vue @@ -1,209 +1,211 @@ diff --git a/yxt-as-ui/src/views/storage/oldPartsCope/index.vue b/yxt-as-ui/src/views/storage/oldPartsCope/index.vue index 83806d040b..2a86d4ffd2 100644 --- a/yxt-as-ui/src/views/storage/oldPartsCope/index.vue +++ b/yxt-as-ui/src/views/storage/oldPartsCope/index.vue @@ -75,7 +75,12 @@ 查看 - + + + @@ -101,6 +106,13 @@ + + + + + + @@ -111,6 +123,9 @@ import pageye from '@/components/pagination/pageye' import divAdd from './oldPartsCopeAdd.vue' import divInfo from './oldPartsCopeInfo.vue' + import { + getStorage + } from '@/utils/auth' export default { components: { ButtonBar, @@ -121,6 +136,9 @@ }, data() { return { + url: '', + dialogHeight: '80%', + centerDialogVisible: false, btndisabled: false, viewState: 1, // 1、列表 2、添加 3、修改 4、查看 isSearchShow: false, @@ -194,12 +212,42 @@ } }, mounted() { + // 在外部vue的window上添加postMessage的监听，而且绑定处理函数handleMessage + window.addEventListener('message', this.handleMessage) this.$refs['btnbar'].setButtonList(this.btnList) }, created() { this.loadList() }, methods: { + async handleMessage(event) { + var code = '' + if (event.data.params !== null && event.data.params !== undefined) { + code = event.data.params.code + } + if (code === 1) { + this.centerDialogVisible = false + } else if (code === 2) { + this.dialogHeight = event.data.params.data + this.setIframeHeight(document.getElementById('iframe')) + } + }, + closeIt() { + this.url = '' + this.centerDialogVisible = false + }, + setIframeHeight(iframe) { + iframe.height = this.dialogHeight + }, + flowRecord(row) { + this.centerDialogVisible = true + var params = { + deployId: row.procDefId, + procInsId: row.procInstId, + token: getStorage() + } + this.url = '/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params))) + }, selectionLineChangeHandle(val) { console.log("val", val); diff --git a/yxt-as-ui/src/views/storage/oldPartsFactory/index.vue b/yxt-as-ui/src/views/storage/oldPartsFactory/index.vue index 813ea2a849..b4fe07e478 100644 --- a/yxt-as-ui/src/views/storage/oldPartsFactory/index.vue +++ b/yxt-as-ui/src/views/storage/oldPartsFactory/index.vue @@ -69,7 +69,12 @@ 查看 - + + + @@ -176,6 +181,11 @@ + + + + @@ -188,6 +198,9 @@ import divAdd from './oldPartsFactoryAdd.vue' import divInfo from './oldPartsFactoryInfo.vue' import manufacturerconfirmInfo from './manufacturerconfirmInfo.vue' + import { + getStorage + } from '@/utils/auth' export default { components: { ButtonBar, @@ -199,6 +212,9 @@ }, data() { return { + url: '', + dialogHeight: '80%', + centerDialogVisible: false, dialogVisible: false, dialogVisible2: false, fileList: [], @@ -266,12 +282,42 @@ } }, mounted() { + // 在外部vue的window上添加postMessage的监听，而且绑定处理函数handleMessage + window.addEventListener('message', this.handleMessage) this.$refs['btnbar'].setButtonList(this.btnList) }, created() { this.loadList() }, methods: { + async handleMessage(event) { + var code = '' + if (event.data.params !== null && event.data.params !== undefined) { + code = event.data.params.code + } + if (code === 1) { + this.centerDialogVisible = false + } else if (code === 2) { + this.dialogHeight = event.data.params.data + this.setIframeHeight(document.getElementById('iframe')) + } + }, + closeIt() { + this.url = '' + this.centerDialogVisible = false + }, + setIframeHeight(iframe) { + iframe.height = this.dialogHeight + }, + flowRecord(row) { + this.centerDialogVisible = true + var params = { + deployId: row.procDefId, + procInsId: row.procInstId, + token: getStorage() + } + this.url = '/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params))) + }, handleClose() { this.dialogVisible = false }, diff --git a/yxt-as-ui/src/views/storage/oldpPartStocktaking/index.vue b/yxt-as-ui/src/views/storage/oldpPartStocktaking/index.vue index dddfd774ef..bb639b2b1f 100644 --- a/yxt-as-ui/src/views/storage/oldpPartStocktaking/index.vue +++ b/yxt-as-ui/src/views/storage/oldpPartStocktaking/index.vue @@ -60,7 +60,12 @@ @click="toReport(scope.row)">盘库报告 - + + + @@ -237,6 +242,11 @@ + + + + @@ -260,6 +270,9 @@ import { selAllByOrgSidPath } from '@/api/Common/dictcommons' + import { + getStorage + } from '@/utils/auth' export default { components: { @@ -274,6 +287,9 @@ }, data() { return { + url: '', + dialogHeight: '80%', + centerDialogVisible: false, showList: '2', dialogVisible: false, dialogVisible2: false, @@ -400,6 +416,8 @@ } }, mounted() { + // 在外部vue的window上添加postMessage的监听，而且绑定处理函数handleMessage + window.addEventListener('message', this.handleMessage) this.$refs['btnbar'].setButtonList(this.btnList) }, created() { @@ -427,6 +445,34 @@ }, methods: { + async handleMessage(event) { + var code = '' + if (event.data.params !== null && event.data.params !== undefined) { + code = event.data.params.code + } + if (code === 1) { + this.centerDialogVisible = false + } else if (code === 2) { + this.dialogHeight = event.data.params.data + this.setIframeHeight(document.getElementById('iframe')) + } + }, + closeIt() { + this.url = '' + this.centerDialogVisible = false + }, + setIframeHeight(iframe) { + iframe.height = this.dialogHeight + }, + flowRecord(row) { + this.centerDialogVisible = true + var params = { + deployId: row.procDefId, + procInsId: row.procInstId, + token: getStorage() + } + this.url = '/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params))) + }, getWarehouseArea(sid) { this.dialogParams.params.warehouseAreaSid = '' this.dialogParams.params.warehouseAreaName = '' diff --git a/yxt-as-ui/src/views/storage/oldpPartStocktakingLoss/index.vue b/yxt-as-ui/src/views/storage/oldpPartStocktakingLoss/index.vue index f7be9960e3..6e18437c4f 100644 --- a/yxt-as-ui/src/views/storage/oldpPartStocktakingLoss/index.vue +++ b/yxt-as-ui/src/views/storage/oldpPartStocktakingLoss/index.vue @@ -61,7 +61,12 @@ 查看 - + + + @@ -86,6 +91,12 @@ + + + + + @@ -96,6 +107,9 @@ import pageye from '@/components/pagination/pageye' import divAdd from './oldpPartStocktakingLossAdd.vue' import divInfo from './oldpPartStocktakingLossInfo.vue' + import { + getStorage + } from '@/utils/auth' export default { components: { ButtonBar, @@ -106,6 +120,9 @@ }, data() { return { + url: '', + dialogHeight: '80%', + centerDialogVisible: false, btndisabled: false, viewState: 1, // 1、列表 2、添加 3、修改 4、查看 isSearchShow: false, @@ -158,12 +175,42 @@ } }, mounted() { + // 在外部vue的window上添加postMessage的监听，而且绑定处理函数handleMessage + window.addEventListener('message', this.handleMessage) this.$refs['btnbar'].setButtonList(this.btnList) }, created() { this.loadList() }, methods: { + async handleMessage(event) { + var code = '' + if (event.data.params !== null && event.data.params !== undefined) { + code = event.data.params.code + } + if (code === 1) { + this.centerDialogVisible = false + } else if (code === 2) { + this.dialogHeight = event.data.params.data + this.setIframeHeight(document.getElementById('iframe')) + } + }, + closeIt() { + this.url = '' + this.centerDialogVisible = false + }, + setIframeHeight(iframe) { + iframe.height = this.dialogHeight + }, + flowRecord(row) { + this.centerDialogVisible = true + var params = { + deployId: row.procDefId, + procInsId: row.procInstId, + token: getStorage() + } + this.url = '/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params))) + }, toPrintLabel() { if (this.selectionList.length != 1) { this.$message({ diff --git a/yxt-as-ui/src/views/storage/oldpPartStocktakingSurplus/index.vue b/yxt-as-ui/src/views/storage/oldpPartStocktakingSurplus/index.vue index 36d6eb727f..838e088fbb 100644 --- a/yxt-as-ui/src/views/storage/oldpPartStocktakingSurplus/index.vue +++ b/yxt-as-ui/src/views/storage/oldpPartStocktakingSurplus/index.vue @@ -61,7 +61,12 @@ 查看 - + + + @@ -86,6 +91,12 @@ + + + + + @@ -96,6 +107,9 @@ import pageye from '@/components/pagination/pageye' import divAdd from './oldpPartStocktakingSurplusAdd.vue' import divInfo from './oldpPartStocktakingSurplusInfo.vue' + import { + getStorage + } from '@/utils/auth' export default { components: { ButtonBar, @@ -106,6 +120,9 @@ }, data() { return { + url: '', + dialogHeight: '80%', + centerDialogVisible: false, btndisabled: false, viewState: 1, // 1、列表 2、添加 3、修改 4、查看 isSearchShow: false, @@ -158,12 +175,42 @@ } }, mounted() { + // 在外部vue的window上添加postMessage的监听，而且绑定处理函数handleMessage + window.addEventListener('message', this.handleMessage) this.$refs['btnbar'].setButtonList(this.btnList) }, created() { this.loadList() }, methods: { + async handleMessage(event) { + var code = '' + if (event.data.params !== null && event.data.params !== undefined) { + code = event.data.params.code + } + if (code === 1) { + this.centerDialogVisible = false + } else if (code === 2) { + this.dialogHeight = event.data.params.data + this.setIframeHeight(document.getElementById('iframe')) + } + }, + closeIt() { + this.url = '' + this.centerDialogVisible = false + }, + setIframeHeight(iframe) { + iframe.height = this.dialogHeight + }, + flowRecord(row) { + this.centerDialogVisible = true + var params = { + deployId: row.procDefId, + procInsId: row.procInstId, + token: getStorage() + } + this.url = '/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params))) + }, toPrintLabel() { if (this.selectionList.length != 1) { this.$message({ diff --git a/yxt-as-ui/src/views/storage/stocktaking/index.vue b/yxt-as-ui/src/views/storage/stocktaking/index.vue index a677f0dfc9..6f698b9c2a 100644 --- a/yxt-as-ui/src/views/storage/stocktaking/index.vue +++ b/yxt-as-ui/src/views/storage/stocktaking/index.vue @@ -60,7 +60,12 @@ @click="toReport(scope.row)">盘库报告 - + + + @@ -237,6 +242,11 @@ + + + + @@ -260,6 +270,9 @@ import { selAllByOrgSidPath } from '@/api/Common/dictcommons' + import { + getStorage + } from '@/utils/auth' export default { components: { @@ -274,6 +287,9 @@ }, data() { return { + url: '', + dialogHeight: '80%', + centerDialogVisible: false, showList: '2', dialogVisible: false, dialogVisible2: false, @@ -400,6 +416,8 @@ } }, mounted() { + // 在外部vue的window上添加postMessage的监听，而且绑定处理函数handleMessage + window.addEventListener('message', this.handleMessage) this.$refs['btnbar'].setButtonList(this.btnList) }, created() { @@ -421,6 +439,34 @@ }, methods: { + async handleMessage(event) { + var code = '' + if (event.data.params !== null && event.data.params !== undefined) { + code = event.data.params.code + } + if (code === 1) { + this.centerDialogVisible = false + } else if (code === 2) { + this.dialogHeight = event.data.params.data + this.setIframeHeight(document.getElementById('iframe')) + } + }, + closeIt() { + this.url = '' + this.centerDialogVisible = false + }, + setIframeHeight(iframe) { + iframe.height = this.dialogHeight + }, + flowRecord(row) { + this.centerDialogVisible = true + var params = { + deployId: row.procDefId, + procInsId: row.procInstId, + token: getStorage() + } + this.url = '/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params))) + }, getWarehouseArea(sid) { this.dialogParams.params.warehouseAreaSid = '' this.dialogParams.params.warehouseAreaName = '' diff --git a/yxt-as-ui/src/views/storage/stocktakingLoss/index.vue b/yxt-as-ui/src/views/storage/stocktakingLoss/index.vue index 63abf7cf8b..35a5ff1261 100644 --- a/yxt-as-ui/src/views/storage/stocktakingLoss/index.vue +++ b/yxt-as-ui/src/views/storage/stocktakingLoss/index.vue @@ -61,7 +61,12 @@ 查看 - + + + @@ -85,7 +90,11 @@ - + + + + @@ -96,6 +105,9 @@ import pageye from '@/components/pagination/pageye' import divAdd from './stocktakingLossAdd.vue' import divInfo from './stocktakingLossInfo.vue' + import { + getStorage + } from '@/utils/auth' export default { components: { ButtonBar, @@ -106,6 +118,9 @@ }, data() { return { + url: '', + dialogHeight: '80%', + centerDialogVisible: false, btndisabled: false, viewState: 1, // 1、列表 2、添加 3、修改 4、查看 isSearchShow: false, @@ -158,12 +173,42 @@ } }, mounted() { + // 在外部vue的window上添加postMessage的监听，而且绑定处理函数handleMessage + window.addEventListener('message', this.handleMessage) this.$refs['btnbar'].setButtonList(this.btnList) }, created() { this.loadList() }, methods: { + async handleMessage(event) { + var code = '' + if (event.data.params !== null && event.data.params !== undefined) { + code = event.data.params.code + } + if (code === 1) { + this.centerDialogVisible = false + } else if (code === 2) { + this.dialogHeight = event.data.params.data + this.setIframeHeight(document.getElementById('iframe')) + } + }, + closeIt() { + this.url = '' + this.centerDialogVisible = false + }, + setIframeHeight(iframe) { + iframe.height = this.dialogHeight + }, + flowRecord(row) { + this.centerDialogVisible = true + var params = { + deployId: row.procDefId, + procInsId: row.procInstId, + token: getStorage() + } + this.url = '/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params))) + }, toPrintLabel() { if (this.selectionList.length != 1) { this.$message({ diff --git a/yxt-as-ui/src/views/storage/stocktakingSurplus/index.vue b/yxt-as-ui/src/views/storage/stocktakingSurplus/index.vue index 4d8725d559..ea374ffbce 100644 --- a/yxt-as-ui/src/views/storage/stocktakingSurplus/index.vue +++ b/yxt-as-ui/src/views/storage/stocktakingSurplus/index.vue @@ -61,7 +61,12 @@ 查看 - + + + @@ -85,7 +90,11 @@ - + + + + @@ -96,6 +105,9 @@ import pageye from '@/components/pagination/pageye' import divAdd from './stocktakingSurplusAdd.vue' import divInfo from './stocktakingSurplusInfo.vue' + import { + getStorage + } from '@/utils/auth' export default { components: { ButtonBar, @@ -106,6 +118,9 @@ }, data() { return { + url: '', + dialogHeight: '80%', + centerDialogVisible: false, btndisabled: false, viewState: 1, // 1、列表 2、添加 3、修改 4、查看 isSearchShow: false, @@ -158,12 +173,42 @@ } }, mounted() { + // 在外部vue的window上添加postMessage的监听，而且绑定处理函数handleMessage + window.addEventListener('message', this.handleMessage) this.$refs['btnbar'].setButtonList(this.btnList) }, created() { this.loadList() }, methods: { + async handleMessage(event) { + var code = '' + if (event.data.params !== null && event.data.params !== undefined) { + code = event.data.params.code + } + if (code === 1) { + this.centerDialogVisible = false + } else if (code === 2) { + this.dialogHeight = event.data.params.data + this.setIframeHeight(document.getElementById('iframe')) + } + }, + closeIt() { + this.url = '' + this.centerDialogVisible = false + }, + setIframeHeight(iframe) { + iframe.height = this.dialogHeight + }, + flowRecord(row) { + this.centerDialogVisible = true + var params = { + deployId: row.procDefId, + procInsId: row.procInstId, + token: getStorage() + } + this.url = '/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params))) + }, toPrintLabel() { if (this.selectionList.length != 1) { this.$message({ diff --git a/yxt-as-ui/src/views/warehouse/goodsShelves/goodsShelvesAdd.vue b/yxt-as-ui/src/views/warehouse/goodsShelves/goodsShelvesAdd.vue index 86e6de0396..a2ca43ec29 100644 --- a/yxt-as-ui/src/views/warehouse/goodsShelves/goodsShelvesAdd.vue +++ b/yxt-as-ui/src/views/warehouse/goodsShelves/goodsShelvesAdd.vue @@ -19,6 +19,19 @@ + +
* 仓库类型
+ + + + + + + + +
* 选择所属仓库
@@ -41,6 +54,11 @@ + + + + +
* 选择所属库区
@@ -51,9 +69,6 @@ - - -
* 库位编码
@@ -61,7 +76,7 @@ oninput="this.value=this.value.replace(/[^\w_-]/g,'');" /> - +
备注
@@ -113,6 +128,9 @@ import req2 from '@/api/warehouse/warehouse.js' import req3 from '@/api/warehouse/warehouseArea.js' import req4 from '@/api/warehouse/warehouseZone.js' + import { + typeValues, + } from '@/api/Common/dictcommons.js' export default { components: {}, data() { @@ -129,6 +147,8 @@ locationName: '', locationSid: '', remarks: '', + warehouseTypeKey: '', + warehouseTypeValue: '', useOrgSid: window.sessionStorage.getItem('departmentSid'), orgPath: window.sessionStorage.getItem('defaultOrgPath'), createOrgSid: window.sessionStorage.getItem('orgSid'), @@ -137,6 +157,7 @@ warehouseList: [], warehouseZoneList: [], warehouseAreaList: [], + warehouseTypeList: [], rules: { warehouseName: [{ required: true, @@ -162,7 +183,7 @@ } }, created() { - this.initData() + }, methods: { @@ -175,20 +196,53 @@ req2.getAllWarehouse(parpams).then(resp => { this.warehouseList = resp.data }) - }, - - getWarehouseArea(sid) { var params = { - qySid: sid + type: "warehouse", + psid: '0' } - req3.getAllWarehouseareaByZoneSid(params).then(resp => { - console.log('>>>>>>>>>getAllWarehousearea', resp) - this.warehouseAreaList = resp.data + typeValues(params).then(resp => { + console.log('>>>>>>>>>typeValues', resp) + this.warehouseTypeList = resp.data }).catch(() => {}) + + }, + selectWarehouseTypeChange(val) { + const choose = this.warehouseTypeList.filter((item) => item.dictKey == val) + console.log('>>>>>>>>>selectWarehouseChange', choose) + this.formobj.warehouseTypeKey = choose[0].dictKey + this.formobj.warehouseTypeValue = choose[0].dictValue + + this.formobj.warehouseSid = '' + this.formobj.warehouseName = '' + + this.formobj.zoneSid = '' + this.formobj.zoneName = '' + + this.formobj.locationSid = '' + this.formobj.locationName = '' + + this.getWarehouseList(this.formobj.warehouseTypeValue) + + }, + + getWarehouseList(val) { + + var parpams = { + useOrgSid: window.sessionStorage.getItem('departmentSid'), + warehouseTypeValue: val + } + req2.selectWarehouseByType(parpams).then(resp => { + this.warehouseList = resp.data + }) + + + }, + + selectWarehouseChange(val) { const choose = this.warehouseList.filter((item) => item.sid == val) console.log('>>>>>>>>>selectWarehouseChange', choose) @@ -220,7 +274,17 @@ this.formobj.locationName = '' this.getWarehouseArea(choose[0].sid) }, + getWarehouseArea(sid) { + + var params = { + qySid: sid + } + req3.getAllWarehouseareaByZoneSid(params).then(resp => { + console.log('>>>>>>>>>getAllWarehousearea', resp) + this.warehouseAreaList = resp.data + }).catch(() => {}) + }, selectWarehouseAreaChange(val) { const choose = this.warehouseAreaList.filter((item) => item.sid == val) @@ -265,7 +329,66 @@ type: 'success', message: resp.msg }) - this.handleReturn('true') + this.$confirm('是否继续添加仓库区域信息?', '温馨提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + // 点击确定进行的操作 + + var warehouseTypeKey = this.formobj.warehouseTypeKey + var warehouseTypeValue = this.formobj.warehouseTypeValue + var warehouseName = this.formobj.warehouseName + var warehouseSid = this.formobj.warehouseSid + var zoneName = this.formobj.zoneName + var zoneSid = this.formobj.zoneSid + var locationName = this.formobj.locationName + var locationSid = this.formobj.locationSid + + this.formobj = { + sid: '', + rackName: '', + rackCode: '', + warehouseName: warehouseName, + warehouseSid: warehouseSid, + zoneName: zoneName, + zoneSid: zoneSid, + locationName: locationName, + locationSid: locationSid, + warehouseTypeKey: warehouseTypeKey, + warehouseTypeValue: warehouseTypeValue, + remarks: '', + useOrgSid: window.sessionStorage.getItem('departmentSid'), + orgPath: window.sessionStorage.getItem('defaultOrgPath'), + createOrgSid: window.sessionStorage.getItem('orgSid'), + userSid: window.sessionStorage.getItem('userSid'), + } + this.$nextTick(() => { + this.$refs['form_obj'].clearValidate() + }) + }).catch(() => { + // 点击取消进行的操作 + + this.formobj = { + sid: '', + rackName: '', + rackCode: '', + warehouseName: '', + warehouseSid: '', + zoneName: '', + zoneSid: '', + locationName: '', + locationSid: '', + remarks: '', + warehouseTypeKey: '', + warehouseTypeValue: '', + useOrgSid: window.sessionStorage.getItem('departmentSid'), + orgPath: window.sessionStorage.getItem('defaultOrgPath'), + createOrgSid: window.sessionStorage.getItem('orgSid'), + userSid: window.sessionStorage.getItem('userSid'), + } + this.$emit('doback') + }); } else { // 根据resp.code进行异常情况处理 } @@ -288,6 +411,8 @@ locationName: '', locationSid: '', remarks: '', + warehouseTypeKey: '', + warehouseTypeValue: '', useOrgSid: window.sessionStorage.getItem('departmentSid'), orgPath: window.sessionStorage.getItem('defaultOrgPath'), createOrgSid: window.sessionStorage.getItem('orgSid'), @@ -296,12 +421,14 @@ this.$emit('doback') }, showAdd() { + this.initData() this.$nextTick(() => { this.$refs['form_obj'].clearValidate() }) }, showEdit(row) { + this.initData() this.$nextTick(() => { this.$refs['form_obj'].clearValidate() }) diff --git a/yxt-as-ui/src/views/warehouse/goodsShelves/index.vue b/yxt-as-ui/src/views/warehouse/goodsShelves/index.vue index 80359b3601..446e83e7fb 100644 --- a/yxt-as-ui/src/views/warehouse/goodsShelves/index.vue +++ b/yxt-as-ui/src/views/warehouse/goodsShelves/index.vue @@ -15,10 +15,10 @@ - - - + + @@ -28,14 +28,22 @@ :value="item.sid" /> - - - + + + + + + + + +
查询 @@ -65,12 +73,15 @@ inactive-value="2" @change="enableChange(scope.row.sid,scope.row.isEnable)" /> - - - - + + + + + + +
@@ -97,6 +108,9 @@ import Pagination from '@/components/pagination' import pageye from '@/components/pagination/pageye' import divAdd from './goodsShelvesAdd.vue' + import { + typeValues, + } from '@/api/Common/dictcommons.js' export default { components: { ButtonBar, @@ -160,7 +174,8 @@ warehouseZoneList: [], warehouseAreaList: [], sids: [], - selectionList: [] + selectionList: [], + warehouseTypeList: [], } }, mounted() { @@ -183,6 +198,18 @@ this.sids = aa }, getwarehouse() { + + var params = { + type: "warehouse", + psid: '0' + } + + typeValues(params).then(resp => { + console.log('>>>>>>>>>typeValues', resp) + this.warehouseTypeList = resp.data + }).catch(() => {}) + + var parpams = { orgPath: window.sessionStorage.getItem('defaultOrgPath'), } @@ -392,6 +419,7 @@ }, resetState() { this.viewState = 1 + this.loadList() }, enableChange(sid, state) { console.log('sid', sid) diff --git a/yxt-as-ui/src/views/warehouse/warehouse/index.vue b/yxt-as-ui/src/views/warehouse/warehouse/index.vue index 9cbd5650af..499430c12f 100644 --- a/yxt-as-ui/src/views/warehouse/warehouse/index.vue +++ b/yxt-as-ui/src/views/warehouse/warehouse/index.vue @@ -9,6 +9,12 @@
+ + + + + @@ -50,6 +56,7 @@ inactive-value="0" @change="enableChange(scope.row.sid,scope.row.usageStatus)" /> + @@ -57,6 +64,8 @@ + +
@@ -82,6 +91,9 @@ import pageye from '@/components/pagination/pageye' import divAdd from './warehouseAdd.vue' import divInfo from './warehouseInfo.vue' + import { + typeValues, + } from '@/api/Common/dictcommons.js' export default { components: { ButtonBar, @@ -132,13 +144,15 @@ size: 10, total: 0, params: { + warehouseTypeValue: "", name: '', code: "", address: "" } }, sids: [], - selectionList: [] + selectionList: [], + warehouseTypeList: [], } }, mounted() { @@ -146,6 +160,18 @@ }, created() { this.loadList() + + var params = { + type: "warehouse", + psid: '0' + } + + typeValues(params).then(resp => { + console.log('>>>>>>>>>typeValues', resp) + this.warehouseTypeList = resp.data + }).catch(() => {}) + + }, methods: { selectionLineChangeHandle(val) { @@ -225,6 +251,7 @@ size: 10, total: 0, params: { + warehouseTypeValue: "", name: '', code: "", address: "" @@ -301,6 +328,7 @@ resetState() { this.viewState = 1 + this.loadList() }, enableChange(sid, state) { console.log('sid', sid) diff --git a/yxt-as-ui/src/views/warehouse/warehouse/warehouseAdd.vue b/yxt-as-ui/src/views/warehouse/warehouse/warehouseAdd.vue index d5c868490b..b899e28c66 100644 --- a/yxt-as-ui/src/views/warehouse/warehouse/warehouseAdd.vue +++ b/yxt-as-ui/src/views/warehouse/warehouse/warehouseAdd.vue @@ -29,10 +29,16 @@ -
* 仓库名称
- - +
* 仓库类型
+ + + + + + @@ -40,14 +46,10 @@ -
仓库类型
- - - - - +
* 仓库名称
+ + @@ -232,6 +234,11 @@ message: '请选择仓库管理员', trigger: 'change' }], + warehouseTypeValue: [{ + required: true, + message: '请选择仓库类型', + trigger: 'change' + }], } } }, @@ -303,7 +310,70 @@ type: 'success', message: resp.msg }) - this.handleReturn('true') + this.$confirm('是否继续添加仓库信息?', '温馨提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + // 点击确定进行的操作 + + var warehouseTypeKey = this.formobj.warehouseTypeKey + var warehouseTypeValue = this.formobj.warehouseTypeValue + + this.formobj = { + sid: '', + warehouseName: '', + warehouseCode: '由系统自动生成', + warehouseTypeKey: warehouseTypeKey, + warehouseTypeValue: warehouseTypeValue, + contacts: "", + mob: "", + telephone: "", + manager: '', + longitude: '', + latitude: '', + usageStatus: "1", + address: '', + squareMeter: '', + sortNo: '', + remarks: '', + warehouseType: "0", + useOrgSid: window.sessionStorage.getItem('departmentSid'), + orgPath: window.sessionStorage.getItem('defaultOrgPath'), + createOrgSid: window.sessionStorage.getItem('orgSid'), + userSid: window.sessionStorage.getItem('userSid'), + } + this.$nextTick(() => { + this.$refs['form_obj'].clearValidate() + }) + }).catch(() => { + // 点击取消进行的操作 + + this.formobj = { + sid: '', + warehouseName: '', + warehouseCode: '由系统自动生成', + warehouseTypeKey: '', + warehouseTypeValue: '', + contacts: "", + mob: "", + telephone: "", + manager: '', + longitude: '', + latitude: '', + usageStatus: "1", + address: '', + squareMeter: '', + sortNo: '', + remarks: '', + warehouseType: "0", + useOrgSid: window.sessionStorage.getItem('departmentSid'), + orgPath: window.sessionStorage.getItem('defaultOrgPath'), + createOrgSid: window.sessionStorage.getItem('orgSid'), + userSid: window.sessionStorage.getItem('userSid'), + } + this.$emit('doback') + }); } else { // 根据resp.code进行异常情况处理 } diff --git a/yxt-as-ui/src/views/warehouse/warehouse/warehouseInfo.vue b/yxt-as-ui/src/views/warehouse/warehouse/warehouseInfo.vue index 9be8671d1e..e86a3e1602 100644 --- a/yxt-as-ui/src/views/warehouse/warehouse/warehouseInfo.vue +++ b/yxt-as-ui/src/views/warehouse/warehouse/warehouseInfo.vue @@ -26,10 +26,11 @@ -
仓库名称
+
仓库类型
- {{formobj.warehouseName}} + {{formobj.warehouseTypeValue}} + @@ -37,9 +38,9 @@ -
仓库类型
+
仓库名称
- {{formobj.warehouseTypeValue}} + {{formobj.warehouseName}} diff --git a/yxt-as-ui/src/views/warehouse/warehouseArea/index.vue b/yxt-as-ui/src/views/warehouse/warehouseArea/index.vue index f356a12352..466be67b95 100644 --- a/yxt-as-ui/src/views/warehouse/warehouseArea/index.vue +++ b/yxt-as-ui/src/views/warehouse/warehouseArea/index.vue @@ -9,19 +9,27 @@
+ - - - + + + + + + + + - - - + + + -
查询 @@ -68,12 +75,16 @@ + - - + + + + +
@@ -100,6 +111,9 @@ import Pagination from '@/components/pagination' import pageye from '@/components/pagination/pageye' import divAdd from './warehouseAreaAdd.vue' + import { + typeValues, + } from '@/api/Common/dictcommons.js' export default { components: { ButtonBar, @@ -157,13 +171,15 @@ warehouseName: '', zoneSid: '', zoneName: '', + warehouseTypeValue: "", } }, warehouseList: [], warehouseZoneList: [], warehouseAreaTypeLsit: [], sids: [], - selectionList: [] + selectionList: [], + warehouseTypeList: [], } }, mounted() { @@ -196,6 +212,18 @@ console.log('>>>>>>>>>getAllWarehouse', resp) this.warehouseList = resp.data }).catch(() => {}) + + var params = { + type: "warehouse", + psid: '0' + } + + typeValues(params).then(resp => { + console.log('>>>>>>>>>typeValues', resp) + this.warehouseTypeList = resp.data + }).catch(() => {}) + + }, getWarehouseAreaType() { var parpams = { @@ -315,6 +343,7 @@ warehouseName: '', zoneSid: '', zoneName: '', + warehouseTypeValue: "", } } this.loadList() @@ -388,6 +417,7 @@ resetState() { this.viewState = 1 + this.loadList() }, enableChange(sid, state) { console.log('sid', sid) diff --git a/yxt-as-ui/src/views/warehouse/warehouseArea/warehouseAreaAdd.vue b/yxt-as-ui/src/views/warehouse/warehouseArea/warehouseAreaAdd.vue index 886fecc8f0..35c2f253db 100644 --- a/yxt-as-ui/src/views/warehouse/warehouseArea/warehouseAreaAdd.vue +++ b/yxt-as-ui/src/views/warehouse/warehouseArea/warehouseAreaAdd.vue @@ -19,6 +19,20 @@ + + +
* 仓库类型
+ + + + + + + + +
* 选择所属仓库
@@ -42,16 +56,27 @@ + + + + + +
* 库区类型
+ + + + + +
* 库区名称
- + - - -
库区编码
@@ -61,6 +86,10 @@ + + + +
库区容量
@@ -77,21 +106,8 @@ - - -
* 库区类型
- - - - - - - -
备注
@@ -112,6 +128,9 @@ import req2 from '@/api/warehouse/warehouse.js' import req3 from '@/api/warehouse/warehouseAreaType.js' import req4 from '@/api/warehouse/warehouseZone.js' + import { + typeValues, + } from '@/api/Common/dictcommons.js' export default { components: {}, data() { @@ -130,6 +149,8 @@ zoneSid: '', areaTypeSid: "", areaTypeName: "", + warehouseTypeKey: '', + warehouseTypeValue: '', useOrgSid: window.sessionStorage.getItem('departmentSid'), orgPath: window.sessionStorage.getItem('defaultOrgPath'), createOrgSid: window.sessionStorage.getItem('orgSid'), @@ -138,8 +159,14 @@ }, warehouseList: [], warehouseZoneList: [], + areaTypeList: [], warehouseTypeList: [], rules: { + warehouseTypeValue: [{ + required: true, + message: '请选择仓库类型', + trigger: 'change' + }], warehouseName: [{ required: true, message: '请选择所属仓库', @@ -164,20 +191,27 @@ } } }, - created() { - this.initData() - }, + created() {}, methods: { initData() { + + var params = { + type: "warehouse", + psid: '0' + } + + typeValues(params).then(resp => { + console.log('>>>>>>>>>typeValues', resp) + this.warehouseTypeList = resp.data + }).catch(() => {}) + + var parpams = { orgPath: window.sessionStorage.getItem('defaultOrgPath'), } - req2.getAllWarehouse(parpams).then(resp => { - this.warehouseList = resp.data - }) req3.getAllWarehouseareatype(parpams).then(resp => { - this.warehouseTypeList = resp.data + this.areaTypeList = resp.data }) }, @@ -185,43 +219,6 @@ saveOrUpdate() { console.log('>>>>>>>>>saveOrUpdate', this.formobj) - // if (this.formobj.warehouseSid == '' || this.formobj.warehouseName == '') { - // this.$message({ - // showClose: true, - // type: 'warning', - // message: "请选择所属仓库" - // }) - // return - // } - - // if (this.formobj.areaName == '') { - // this.$message({ - // showClose: true, - // type: 'warning', - // message: "库区名称不能为空" - // }) - // return - // } - - - // if (this.formobj.areaCode == '') { - // this.$message({ - // showClose: true, - // type: 'warning', - // message: "库区编码不能为空" - // }) - // return - // } - - - // if (this.formobj.areaTypeSid == '' || this.formobj.areaTypeName == '') { - // this.$message({ - // showClose: true, - // type: 'warning', - // message: "请选择库区类型" - // }) - // return - // } this.$refs['form_obj'].validate((valid) => { if (valid) { @@ -234,7 +231,65 @@ type: 'success', message: resp.msg }) - this.handleReturn('true') + this.$confirm('是否继续添加仓库区域信息?', '温馨提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + // 点击确定进行的操作 + + var warehouseTypeKey = this.formobj.warehouseTypeKey + var warehouseTypeValue = this.formobj.warehouseTypeValue + var warehouseName = this.formobj.warehouseName + var warehouseSid = this.formobj.warehouseSid + var zoneName = this.formobj.zoneName + var zoneSid = this.formobj.zoneSid + + this.formobj = { + sid: '', + areaName: '', + areaCode: '由系统自动生成', + volume: '', + unit: '', + remarks: '', + warehouseName: warehouseName, + warehouseSid: warehouseSid, + zoneName: zoneName, + zoneSid: zoneSid, + areaTypeSid: "", + areaTypeName: "", + warehouseTypeKey: warehouseTypeKey, + warehouseTypeValue: warehouseTypeValue, + useOrgSid: window.sessionStorage.getItem('departmentSid'), + orgPath: window.sessionStorage.getItem('defaultOrgPath'), + createOrgSid: window.sessionStorage.getItem('orgSid'), + userSid: window.sessionStorage.getItem('userSid'), + + } + this.$nextTick(() => { + this.$refs['form_obj'].clearValidate() + }) + }).catch(() => { + // 点击取消进行的操作 + + this.formobj = { + sid: '', + zoneName: '', + zoneCode: '由系统自动生成', + volume: '', + unit: '', + remarks: '', + warehouseName: '', + warehouseSid: '', + warehouseTypeKey: '', + warehouseTypeValue: '', + useOrgSid: window.sessionStorage.getItem('departmentSid'), + orgPath: window.sessionStorage.getItem('defaultOrgPath'), + createOrgSid: window.sessionStorage.getItem('orgSid'), + userSid: window.sessionStorage.getItem('userSid'), + } + this.$emit('doback') + }); } else { // 根据resp.code进行异常情况处理 } @@ -259,6 +314,8 @@ zoneSid: '', areaTypeSid: "", areaTypeName: "", + warehouseTypeKey: '', + warehouseTypeValue: '', useOrgSid: window.sessionStorage.getItem('departmentSid'), orgPath: window.sessionStorage.getItem('defaultOrgPath'), createOrgSid: window.sessionStorage.getItem('orgSid'), @@ -268,12 +325,14 @@ this.$emit('doback') }, showAdd() { + this.initData() this.$nextTick(() => { this.$refs['form_obj'].clearValidate() }) }, showEdit(row) { + this.initData() this.$nextTick(() => { this.$refs['form_obj'].clearValidate() }) @@ -288,6 +347,36 @@ this.formobj = row }) }, + + selectWarehouseTypeChange(val) { + const choose = this.warehouseTypeList.filter((item) => item.dictKey == val) + console.log('>>>>>>>>>selectWarehouseChange', choose) + this.formobj.warehouseTypeKey = choose[0].dictKey + this.formobj.warehouseTypeValue = choose[0].dictValue + + this.formobj.warehouseSid = '' + this.formobj.warehouseName = '' + + this.formobj.zoneSid = '' + this.formobj.zoneName = '' + + this.getWarehouseList(this.formobj.warehouseTypeValue) + + }, + + getWarehouseList(val) { + + var parpams = { + useOrgSid: window.sessionStorage.getItem('departmentSid'), + warehouseTypeValue: val + } + req2.selectWarehouseByType(parpams).then(resp => { + this.warehouseList = resp.data + }) + + + }, + selectWarehouseChange(val) { const choose = this.warehouseList.filter((item) => item.sid == val) console.log('>>>>>>>>>selectWarehouseChange', choose) @@ -316,7 +405,7 @@ }, selectWarehouseTypeValueChange(val) { - const choose = this.warehouseTypeList.filter((item) => item.sid == val) + const choose = this.areaTypeList.filter((item) => item.sid == val) console.log('>>>>>>>>>selectWarehouseTypeValueChange', choose) this.formobj.areaTypeSid = choose[0].sid this.formobj.areaTypeName = choose[0].warehouseAreaTypeName diff --git a/yxt-as-ui/src/views/warehouse/warehouseZone/warehouseZone.vue b/yxt-as-ui/src/views/warehouse/warehouseZone/warehouseZone.vue index 3f273cf21d..f5dc29b409 100644 --- a/yxt-as-ui/src/views/warehouse/warehouseZone/warehouseZone.vue +++ b/yxt-as-ui/src/views/warehouse/warehouseZone/warehouseZone.vue @@ -22,6 +22,13 @@ + + + + + +
@@ -58,6 +65,9 @@ + + +
@@ -84,6 +94,9 @@ import pageye from '@/components/pagination/pageye' import divAdd from './warehouseZoneAdd.vue' // import divInfo from './warehouseInfo.vue' + import { + typeValues, + } from '@/api/Common/dictcommons.js' export default { components: { ButtonBar, @@ -134,6 +147,7 @@ size: 10, total: 0, params: { + warehouseTypeValue: "", name: '', code: "", address: "" @@ -142,6 +156,7 @@ sids: [], selectionList: [], warehouseList: [], + warehouseTypeList: [], } }, mounted() { @@ -173,6 +188,19 @@ console.log('>>>>>>>>>getAllWarehouse', resp) this.warehouseList = resp.data }).catch(() => {}) + + + var params = { + type: "warehouse", + psid: '0' + } + + typeValues(params).then(resp => { + console.log('>>>>>>>>>typeValues', resp) + this.warehouseTypeList = resp.data + }).catch(() => {}) + + }, // 搜索条件效果 clicksearchShow() { @@ -240,7 +268,8 @@ params: { name: '', code: "", - address: "" + address: "", + warehouseTypeValue: "", } } this.loadList() @@ -313,6 +342,7 @@ resetState() { this.viewState = 1 + this.loadList() }, enableChange(sid, state) { console.log('sid', sid) diff --git a/yxt-as-ui/src/views/warehouse/warehouseZone/warehouseZoneAdd.vue b/yxt-as-ui/src/views/warehouse/warehouseZone/warehouseZoneAdd.vue index 970f76e877..fc91c6eb9a 100644 --- a/yxt-as-ui/src/views/warehouse/warehouseZone/warehouseZoneAdd.vue +++ b/yxt-as-ui/src/views/warehouse/warehouseZone/warehouseZoneAdd.vue @@ -19,6 +19,20 @@ + + +
* 仓库类型
+ + + + + + + + +
* 选择所属仓库
@@ -38,6 +52,10 @@ + + + +
区域编码
@@ -47,9 +65,6 @@ - - -
区域面积
@@ -66,13 +81,16 @@ - + + + + +
备注
 -
@@ -83,6 +101,9 @@