diff --git a/public/打包备份.txt b/public/打包备份.txt index 0a4d78e..d8be088 100644 --- a/public/打包备份.txt +++ b/public/打包备份.txt @@ -24,7 +24,7 @@ { "UDI_SYNC_SERVER_IP": "http://192.168.0.109:9995/", "BASE_URL":"http://139.9.178.73:8080/UDI_WMS_MC", - "SERVER_IP": "http://140.9.178.73:8080/UDI_WMS_MC/", + "SERVER_IP": "http://139.9.178.73:8080/UDI_WMS_MC/", "WEBSOCKET_URL": "ws://192.168.0.109:9991/UDI_WMS_MC/api/websocket/", "hosp_name": "平和县医院" } diff --git a/src/role.js b/src/role.js index 6b9e809..4e8b212 100644 --- a/src/role.js +++ b/src/role.js @@ -104,7 +104,7 @@ router.beforeEach((to, from, next) => { }) .catch(() => { store.dispatch("fedLogout").then(() => { - Message.error("验证失败,请重新登录"); + Message.error("登录失效,请重新登录"); let redirect = to.fullPath; store.dispatch("loginOut").then(() => { next({ diff --git a/src/utils/axios.js b/src/utils/axios.js index 9c4ee9d..d999d46 100644 --- a/src/utils/axios.js +++ b/src/utils/axios.js @@ -42,7 +42,7 @@ service.interceptors.response.use( if (data.code) { if (data.code === 2) { store.dispatch("fedLogout").then(() => { - Message.error("验证失败,请重新登录"); + Message.error("登录失效,请重新登录"); router.push({ path: "/login", query: { redirect: router.currentRoute.fullPath } // 从哪个页面跳转过来 diff --git a/src/utils/axios2.js b/src/utils/axios2.js index 65cde7c..d2f020e 100644 --- a/src/utils/axios2.js +++ b/src/utils/axios2.js @@ -21,7 +21,7 @@ service.interceptors.response.use( if (data.code) { if (data.code === 2) { store.dispatch("fedLogout").then(() => { - Message.error("验证失败,请重新登录"); + Message.error("登录失效,请重新登录"); router.push({ path: "/login", query: {redirect: router.currentRoute.fullPath} // 从哪个页面跳转过来 diff --git a/src/views/basic/BasicEntrutsRece.vue b/src/views/basic/BasicEntrutsRece.vue index 479b1af..b4a2161 100644 --- a/src/views/basic/BasicEntrutsRece.vue +++ b/src/views/basic/BasicEntrutsRece.vue @@ -1,334 +1,357 @@ diff --git a/src/views/basic/UdiRlDetailDialog.vue b/src/views/basic/UdiRlDetailDialog.vue index d8ec7b8..3ce65d3 100644 --- a/src/views/basic/UdiRlDetailDialog.vue +++ b/src/views/basic/UdiRlDetailDialog.vue @@ -393,7 +393,7 @@ export default { methods: { getThirdSysDetail() { let query = { - id: this.editQuery.id, + id: this.editQuery.rlId, }; thirdSysDetail(query) diff --git a/src/views/business/stockOrder.vue b/src/views/business/stockOrder.vue index 7d20805..19ac0e9 100644 --- a/src/views/business/stockOrder.vue +++ b/src/views/business/stockOrder.vue @@ -324,7 +324,7 @@ { this.storageList = response.data || []; if (this.storageList.length > 0) { - this.invChange(); + this.getSubInvList(); this.getList(); } }) @@ -813,6 +813,19 @@ export default { .catch(() => { }); }, + + getSubInvList() { + let query = { + pcode: this.query.locStorageCode + }; + filterSubByInv(query) + .then((response) => { + this.subInvList = response.data || []; + }) + .catch(() => { + }); + }, + subInvChange() { this.getBusType(); }, diff --git a/src/views/business/stockOrderDelSearch.vue b/src/views/business/stockOrderDelSearch.vue index a09baa7..44863c1 100644 --- a/src/views/business/stockOrderDelSearch.vue +++ b/src/views/business/stockOrderDelSearch.vue @@ -856,7 +856,7 @@ export default { .then((response) => { this.storageList = response.data || []; if (this.storageList.length > 0) { - this.invChange(); + this.getSubInvList(); this.getList(); } }) @@ -877,6 +877,19 @@ export default { .catch(() => { }); }, + + getSubInvList() { + let query = { + pcode: this.query.locStorageCode + }; + filterSubByInv(query) + .then((response) => { + this.subInvList = response.data || []; + }) + .catch(() => { + }); + }, + subInvChange() { this.getBusType(); }, diff --git a/src/views/business/stockOrderEditDistribution.vue b/src/views/business/stockOrderEditDistribution.vue index 2da8d2e..b08ecd2 100644 --- a/src/views/business/stockOrderEditDistribution.vue +++ b/src/views/business/stockOrderEditDistribution.vue @@ -135,6 +135,22 @@ + + + +
+ +
+ + + + 允许无库存出库 + + + + + @@ -380,7 +396,21 @@ export default { page: 1, limit: 10, }, - formData: {}, + formData: { + + noInvOut: false, + locStorageCode: null, + invWarehouseCode: null, + fromSubInvCode: null, + billNo: null, + billdate: "", + customerId: store.getters.customerId, + billType: "", + type: null, + corpName: "", + corpId: "", + + }, formRules: { corpName: [ {required: true, message: "请输入供应商", trigger: "blur"} @@ -477,9 +507,9 @@ export default { // return this.$message.error('批次号不能为空'); // } // } - if (this.$isBlank(this.codeArray[i].productDate) && this.$isBlank(this.codeArray[i].expireDate)) { - return this.$message.error('生产日期与失效日期不能全部为空'); - } + // if (this.$isBlank(this.codeArray[i].productDate) && this.$isBlank(this.codeArray[i].expireDate)) { + // return this.$message.error('生产日期与失效日期不能全部为空'); + // } if (this.$isBlank(this.codeArray[i].reCount) || this.codeArray[i].reCount < 1) { return this.$message.error('配货数量不能小于0'); } @@ -1061,13 +1091,16 @@ export default { this.invChange(); } else { this.formData = { + billNo: null, billdate: "", - corpName: store.getters.companyName, customerId: store.getters.customerId, - // billType: "deliveryNote", billType: "", - type: "1", - // type: "", + type: "2", + corpName: "", + corpId: "", + noInvOut: "", + locStorageCode: store.getters.locInvCode, + invWarehouseCode: store.getters.locSubInvCode, }; this.iCount = 0; this.orderEditor = false; diff --git a/src/views/business/stockOrderEditor.vue b/src/views/business/stockOrderEditor.vue index 9ebbd95..c6f35d7 100644 --- a/src/views/business/stockOrderEditor.vue +++ b/src/views/business/stockOrderEditor.vue @@ -100,12 +100,12 @@ {{ scope.row.status | statusFilterName }} - - - - - - + + + + + + @@ -895,9 +895,9 @@ export default { // return this.$message.error('批次号不能为空'); // } // } - if (this.$isBlank(tQuery.productDate) && this.$isBlank(tQuery.expireDate)) { - return this.$message.error('生产日期与失效日期不能全部为空'); - } + // if (this.$isBlank(tQuery.productDate) && this.$isBlank(tQuery.expireDate)) { + // return this.$message.error('生产日期与失效日期不能全部为空'); + // } uploadStockOrderDetail(tQuery).then((response) => { this.detailLoading = false; if (response.code === 20000) { @@ -952,7 +952,7 @@ export default { .then((response) => { this.storageList = response.data || []; if (this.storageList.length > 0) { - this.invChange(); + this.getSubInvList(); this.getList(); } }) @@ -972,6 +972,19 @@ export default { .catch(() => { }); }, + + getSubInvList() { + let query = { + pcode: this.query.locStorageCode + }; + filterSubByInv(query) + .then((response) => { + this.subInvList = response.data || []; + }) + .catch(() => { + }); + }, + subInvChange() { this.getBusType(); }, diff --git a/src/views/business/stockOrderNew.vue b/src/views/business/stockOrderNew.vue index 32508ae..107b3eb 100644 --- a/src/views/business/stockOrderNew.vue +++ b/src/views/business/stockOrderNew.vue @@ -924,7 +924,7 @@ export default { .then((response) => { this.storageList = response.data || []; if (this.storageList.length > 0) { - this.invChange(); + this.getSubInvList(); this.getList(); } }) @@ -944,6 +944,19 @@ export default { .catch(() => { }); }, + + getSubInvList() { + let query = { + pcode: this.query.locStorageCode + }; + filterSubByInv(query) + .then((response) => { + this.subInvList = response.data || []; + }) + .catch(() => { + }); + }, + subInvChange() { this.getBusType(); }, diff --git a/src/views/business/stockOrderNewDistribution.vue b/src/views/business/stockOrderNewDistribution.vue index 14a4203..967d957 100644 --- a/src/views/business/stockOrderNewDistribution.vue +++ b/src/views/business/stockOrderNewDistribution.vue @@ -602,9 +602,9 @@ export default { // return this.$message.error('批次号不能为空'); // } // } - if (this.$isBlank(this.codeArray[i].productDate) && this.$isBlank(this.codeArray[i].expireDate)) { - return this.$message.error('生产日期与失效日期不能全部为空'); - } + // if (this.$isBlank(this.codeArray[i].productDate) && this.$isBlank(this.codeArray[i].expireDate)) { + // return this.$message.error('生产日期与失效日期不能全部为空'); + // } // if (this.$isBlank(this.codeArray[i].expireDate)) { // return this.$message.error('失效日期不能为空'); // } @@ -796,7 +796,6 @@ export default { selectProductFunction(event) { if (event == null) { - // this.$refs.inputRef.focus(); } else { event.target.select(); } @@ -827,12 +826,14 @@ export default { if (item.mainAction == 'WareHouseOut' && this.formData.noInvOut != true) { this.invQueryData = { locStorageCode: this.formData.locStorageCode, + invWarehouseCode: this.formData.invWarehouseCode, }; this.selectInvProductVisible = true; } else if (item.mainAction == "WareHouseIn" && this.curAction.corpType == 1 && this.formData.noInvOut != true) { this.invQueryData = { locStorageCode: this.formData.corpId, + invWarehouseCode: this.formData.fromSubInvCode, }; this.selectInvProductVisible = true; } else { diff --git a/src/views/business/stockOrderQRCodeDetail.vue b/src/views/business/stockOrderQRCodeDetail.vue index ac72842..6340a34 100644 --- a/src/views/business/stockOrderQRCodeDetail.vue +++ b/src/views/business/stockOrderQRCodeDetail.vue @@ -63,23 +63,10 @@ - - - - - + - - - - - - - - - - - + - - - - - - - - - - -
@@ -123,8 +99,13 @@ diff --git a/src/views/inout/IOCheckWaitOrder.vue b/src/views/inout/IOCheckWaitOrder.vue index 988bfb9..624086e 100644 --- a/src/views/inout/IOCheckWaitOrder.vue +++ b/src/views/inout/IOCheckWaitOrder.vue @@ -842,7 +842,7 @@ export default { .then((response) => { this.storageList = response.data || []; if (this.storageList.length > 0) { - this.invChange(); + this.getSubInvList(); this.getList(); } }) @@ -862,6 +862,20 @@ export default { .catch(() => { }); }, + + + getSubInvList() { + let query = { + pcode: this.filterQuery.locStorageCode + }; + filterSubByInv(query) + .then((response) => { + this.subInvList = response.data || []; + }) + .catch(() => { + }); + }, + subInvChange() { this.getBusType(); }, diff --git a/src/views/inout/IOFinishOrder.vue b/src/views/inout/IOFinishOrder.vue index 7b16557..250c784 100644 --- a/src/views/inout/IOFinishOrder.vue +++ b/src/views/inout/IOFinishOrder.vue @@ -80,7 +80,7 @@ 查询 - 导出单据 + @@ -601,8 +601,8 @@ export default { .then((response) => { this.storageList = response.data || []; if (this.storageList.length > 0) { - this.filterQuery.locStorageCode = this.storageList[0].code; - this.invChange(); + // this.filterQuery.locStorageCode = this.storageList[0].code; + this.getSubInvList(); this.getList(); } }) @@ -911,6 +911,19 @@ export default { .catch(() => { }); }, + + getSubInvList() { + let query = { + pcode: this.filterQuery.locStorageCode + }; + filterSubByInv(query) + .then((response) => { + this.subInvList = response.data || []; + }) + .catch(() => { + }); + }, + subInvChange() { this.getBusType(); }, diff --git a/src/views/inout/IONewOrder.vue b/src/views/inout/IONewOrder.vue index cf65b48..9c61421 100644 --- a/src/views/inout/IONewOrder.vue +++ b/src/views/inout/IONewOrder.vue @@ -73,7 +73,7 @@ 合并单据 - 新增订单 + 新增单据 异常单据 @@ -82,7 +82,7 @@ - @@ -220,7 +220,7 @@ { this.storageList = response.data || []; if (this.storageList.length > 0) { - this.invChange(); + this.getSubInvList(); this.getList(); } }) @@ -540,17 +540,17 @@ export default { let unit = repeatData[0].fromCorp; let action = repeatData[0].action; let orderList = []; - repeatData.forEach((obj, index) => { - if (unit !== obj.fromCorp) { - this.$message.warning("往来单位不一致！"); + for (let index in repeatData) { + if (action !== repeatData[index].action) { + this.$message.warning("业务类型不一致！"); return; } - if (action !== obj.action) { - this.$message.warning("业务类型不一致！"); + if (unit !== repeatData[index].fromCorp) { + this.$message.warning("往来单位不一致！"); return; } - orderList.push(obj.id); - }); + orderList.push(repeatData[index].id); + } let tquery = { orderList: orderList, type: 2, @@ -668,6 +668,20 @@ export default { .catch(() => { }); }, + + getSubInvList() { + let query = { + pcode: this.filterQuery.locStorageCode + }; + filterSubByInv(query) + .then((response) => { + this.subInvList = response.data || []; + }) + .catch(() => { + }); + }, + + subInvChange() { this.getBusType(); }, diff --git a/src/views/inout/errorCode.vue b/src/views/inout/errorCode.vue index 67f6042..5ec2a52 100644 --- a/src/views/inout/errorCode.vue +++ b/src/views/inout/errorCode.vue @@ -118,7 +118,8 @@ @@ -132,7 +133,8 @@ title="绑定产品ID" :visible.sync="selectRlVisible" width="80%" - v-if="selectRlVisible" + v-if="selectRlVisible" :close-on-click-modal="false" + :close-on-press-escape="false" append-to-body > @@ -203,7 +206,7 @@ export default { }; }, components: { - draggable, DialogSelectUnit, selectRlDialog,editCodeDialog + draggable, DialogSelectUnit, selectRlDialog, editCodeDialog }, methods: { handleSelectionChange(val) { @@ -355,6 +358,7 @@ export default { }, closeCodeDialog() { this.editCodeVisible = false; + this.getCodeList(); }, editCode(row) { this.codeDetail = row; diff --git a/src/views/inventory/InvPreInProductsDetail.vue b/src/views/inventory/InvPreInProductsDetail.vue index 1c6942f..fba3ae4 100644 --- a/src/views/inventory/InvPreInProductsDetail.vue +++ b/src/views/inventory/InvPreInProductsDetail.vue @@ -43,12 +43,12 @@ - + - 查询 @@ -106,6 +106,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next,total" :total="total" + :current-page="query.page" >
diff --git a/src/views/thrsys/thrOrderNew.vue b/src/views/thrsys/thrOrderNew.vue index 570a5dc..33b2bac 100644 --- a/src/views/thrsys/thrOrderNew.vue +++ b/src/views/thrsys/thrOrderNew.vue @@ -479,9 +479,9 @@ export default { if (this.$isBlank(this.codeArray[i].batchNo)) { return this.$message.error('批次号不能为空'); } - if (this.$isBlank(this.codeArray[i].productDate) && this.$isBlank(this.codeArray[i].expireDate)) { - return this.$message.error('生产日期与失效日期不能全部为空'); - } + // if (this.$isBlank(this.codeArray[i].productDate) && this.$isBlank(this.codeArray[i].expireDate)) { + // return this.$message.error('生产日期与失效日期不能全部为空'); + // } // if (this.$isBlank(this.codeArray[i].expireDate)) { // return this.$message.error('失效日期不能为空'); // }