From 4a4b30a58068bd1d509ba3b853b774d627440b29 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Tue, 9 May 2023 15:03:37 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E5=8F=91=E7=A5=A8=EF=BC=8C=E6=A3=80?= =?UTF-8?q?=E9=AA=8C=E6=8A=A5=E5=91=8A=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 + .env.production | 12 ++-- .env.test | 6 +- src/views/inout/DialogCheck.vue | 92 ++++++++++++------------ src/views/inout/InvoiceCkeck.vue | 25 ++++--- src/views/inout/InvoiceRegistration.vue | 96 ++++++++++++------------- 6 files changed, 122 insertions(+), 111 deletions(-) diff --git a/.env.development b/.env.development index 27ca6342..1562a5da 100644 --- a/.env.development +++ b/.env.development @@ -7,6 +7,8 @@ ENV = 'development' # 若依管理系统/开发环境 VUE_APP_BASE_API = '/dev-api' +VUE_APP_SYNC_API ="http://127.0.0.1:10001" + # 应用访问路径 例如使用前缀 /admin/ VUE_APP_CONTEXT_PATH = '/' diff --git a/.env.production b/.env.production index 1bb0a0fe..a64eb8dd 100644 --- a/.env.production +++ b/.env.production @@ -2,9 +2,6 @@ VUE_APP_TITLE = UDI管理系统 - - - # 生产环境配置 ENV = 'production' # VUE_APP_BASE_API = 'http://116.204.71.86:9150/UDI_WMS_MC/' @@ -13,13 +10,18 @@ ENV = 'production' #林纪裕cd # VUE_APP_BASE_API = 'http://101.43.77.55:9150/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/' -VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:5004/UDI_WMS_MC/' +# VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:5004/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://127.0.0.1:9150/UDI_WMS_MC/' # 测试服务器 # VUE_APP_BASE_API = 'http://192.168.0.66:9150/UDI_WMS_MC/' -# 文明东 +# 文明东1 # VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_WMS_MC/' +# 文明东2 +VUE_APP_BASE_API = 'http://192.168.0.61:9150/UDI_WMS_MC/' +VUE_APP_SYNC_API ="http://192.168.0.62:9150/SP_SYNC_SERVER" +# VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/' +# VUE_APP_SYNC_API ="http://55.55.0.24:9150/SP_SYNC_SERVER" # 吴总测试服务器 # VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/' diff --git a/.env.test b/.env.test index fdfe673d..e7f166e5 100644 --- a/.env.test +++ b/.env.test @@ -9,19 +9,19 @@ ENV = 'test' #林纪裕cd # VUE_APP_BASE_API = 'http://101.43.77.55:9150/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/' -#VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:5004/UDI_WMS_MC/' +# VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:5004/UDI_WMS_MC/' # 测试服务器 # VUE_APP_BASE_API = 'http://192.168.0.66:9150/UDI_WMS_MC/' # 文明东 -# VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_WMS_MC/' +VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_WMS_MC/' # 吴总测试服务器 # VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/' -VUE_APP_BASE_API = 'http://192.168.0.66:8883/UDI_WMS_MC/' +# VUE_APP_BASE_API = 'http://192.168.0.66:8883/UDI_WMS_MC/' # 应用访问路径 例如使用前缀 /admin/ VUE_APP_CONTEXT_PATH = '/UDI_WMS_NEW/' diff --git a/src/views/inout/DialogCheck.vue b/src/views/inout/DialogCheck.vue index 66263aac..0cdfdbf7 100644 --- a/src/views/inout/DialogCheck.vue +++ b/src/views/inout/DialogCheck.vue @@ -39,7 +39,7 @@ - + @@ -50,7 +50,7 @@ - + @@ -62,7 +62,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -83,7 +83,7 @@ - + @@ -93,7 +93,7 @@ - + @@ -123,7 +123,6 @@ -
@@ -164,10 +163,11 @@ - 检验报告预览 + style="text-align:right" @click="showImgViewer"> + 检验报告预览 - + @@ -183,11 +183,10 @@ import draggable from "vuedraggable"; import store from "@/store"; import {updateById} from '@/api/inout/orderDetailBiz' import {updateOrderDetailBiz} from '@/api/inout/order' -import { previewImage } from '@/api/purchase/supCompany' +import {previewImage} from '@/api/purchase/supCompany' import ElImageViewer from "element-ui/packages/image/src/image-viewer"; - export default { name: "DialogCheck", props: { @@ -208,19 +207,20 @@ export default { }, data() { return { - imgList:[], - imgViewerVisible:false, + imgList: [], + imgViewerVisible: false, BASE_URL: process.env.VUE_APP_BASE_API, + IMAGE_URL: process.env.VUE_APP_SYNC_API, code: "", formData: { - ggxh:"", - cpmctymc:"", - machineNo:"", - invoiceCode:"", - invoiceEncode:"", - price:"", - remark:"", - licenseUrl:"" + ggxh: "", + cpmctymc: "", + machineNo: "", + invoiceCode: "", + invoiceEncode: "", + price: "", + remark: "", + licenseUrl: "" }, // formRules: { // name: [ @@ -239,20 +239,20 @@ export default { }; }, components: { - draggable,ElImageViewer + draggable, ElImageViewer }, methods: { submitUpload() { - updateById(this.inputQuery).then((res) =>{ - if(res.code==20000){ - this.$message({ - type: "success", - message: "修改成功！", - }); - this.closeDialog(); - } + updateById(this.inputQuery).then((res) => { + if (res.code == 20000) { + this.$message({ + type: "success", + message: "修改成功！", + }); + this.closeDialog(); + } - } ) + }) }, @@ -299,8 +299,8 @@ export default { // // }, uploadHandleRemove(file, fileList) { - this.inputQuery.filePath=null; - this.inputQuery.checkFileName=null; + this.inputQuery.filePath = null; + this.inputQuery.checkFileName = null; console.log(file, fileList); }, uploadHandlePreview(file) { @@ -311,7 +311,7 @@ export default { this.$message.warning(`当前限制选择 1 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`); }, uploadOnchange(file, fileList) { - this.inputQuery.checkFileName=file.name; + this.inputQuery.checkFileName = file.name; let fileName = file.name; let uid = file.uid let pos = fileName.lastIndexOf("."); @@ -340,7 +340,7 @@ export default { uploadHandleSuccess(response, file, fileList) { if (response.code === 20000) { this.inputQuery.filePath = response.data.name; - // this.onSubmit(); + // this.onSubmit(); } else { this.$message.error("文件上传失败：" + response.message); } @@ -349,24 +349,28 @@ export default { }, - showImgViewer(row){ - this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name="; - this.imgList=[]; - previewImage({imageUrl:this.inputQuery.filePath,certFileUrl:this.certFileUrl}).then(response => { + showImgViewer(row) { + this.certFileUrl = this.IMAGE_URL + "/mapi" + "/udiwms/image/register/file/getImage?type=image2&name="; + this.imgList = []; + previewImage({imageUrl: this.inputQuery.filePath, certFileUrl: this.certFileUrl}).then(response => { if (response.code === 20000) { - this.imgList=response.data; + this.imgList = response.data; } console.log(this.imgList) this.imgViewerVisible = true; }); - const m = (e) => { e.preventDefault() }; + const m = (e) => { + e.preventDefault() + }; document.body.style.overflow = 'hidden'; document.addEventListener("touchmove", m, false); // 禁止页面滑动 }, - closeImgViewer(){ + closeImgViewer() { this.imgViewerVisible = false; - const m = (e) => { e.preventDefault() }; + const m = (e) => { + e.preventDefault() + }; document.body.style.overflow = 'auto'; document.removeEventListener("touchmove", m, true); }, diff --git a/src/views/inout/InvoiceCkeck.vue b/src/views/inout/InvoiceCkeck.vue index 27271b70..36f11ff4 100644 --- a/src/views/inout/InvoiceCkeck.vue +++ b/src/views/inout/InvoiceCkeck.vue @@ -166,7 +166,7 @@ row-key="id" highlight-current-row > - + { this.closeDialog(); }) - .catch((error) => {}); + .catch((error) => { + }); }, showImgViewer(row) { this.certFileUrl = - this.BASE_URL + + this.IMAGE_URL + "/mapi" + "/udiwms/image/register/file/getImage?type=image2&name="; this.imgList = []; previewImage({ diff --git a/src/views/inout/InvoiceRegistration.vue b/src/views/inout/InvoiceRegistration.vue index 1e36cefe..2d952958 100644 --- a/src/views/inout/InvoiceRegistration.vue +++ b/src/views/inout/InvoiceRegistration.vue @@ -196,7 +196,9 @@ @@ -224,7 +210,6 @@ export default { loading: false, productPlaceDialogVisible: false, orderPlaceDialogVisible: false, - placeChangeDialogVisible: false, typeNames: { 1: "按物资上架", 2: "按单上架" @@ -308,8 +293,6 @@ export default { this.productPlaceDialogVisible = true; } else if (type === 2) { this.orderPlaceDialogVisible = true; - } else if (type === 3) { - this.placeChangeDialogVisible = true; } }, closePlaceDialog(type) { @@ -317,8 +300,6 @@ export default { this.productPlaceDialogVisible = false; } else if (type === 2) { this.orderPlaceDialogVisible = false; - } else if (type === 3) { - this.placeChangeDialogVisible = false; } this.getList(); }, diff --git a/src/views/inventory/InvProductPlaceOutModify.vue b/src/views/inventory/InvProductPlaceOutModify.vue new file mode 100644 index 00000000..5d69982c --- /dev/null +++ b/src/views/inventory/InvProductPlaceOutModify.vue @@ -0,0 +1,313 @@ + + + + + From dfc065db38c3ce733cdb6c2c3ded8dff38e0fb17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Tue, 9 May 2023 16:26:00 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E7=89=A9=E8=B5=84=E6=91=86=E6=94=BE?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inventory/InvCheckPlace.vue | 2 +- src/views/inventory/InvPlace.vue | 1 - src/views/inventory/InvPlaceChangeModify.vue | 2 +- src/views/inventory/InvProductPlaceOutModify.vue | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/views/inventory/InvCheckPlace.vue b/src/views/inventory/InvCheckPlace.vue index ccd41f48..2f0d0e8b 100644 --- a/src/views/inventory/InvCheckPlace.vue +++ b/src/views/inventory/InvCheckPlace.vue @@ -180,7 +180,7 @@ export default { invCode: this.$store.getters.locInvCode, invSpaceCode: null, code: null, - type: 1, + type: 3, orderId: null, productName: null, nameCode: null, diff --git a/src/views/inventory/InvPlace.vue b/src/views/inventory/InvPlace.vue index d8dabfec..db62e1cb 100644 --- a/src/views/inventory/InvPlace.vue +++ b/src/views/inventory/InvPlace.vue @@ -114,7 +114,6 @@ - diff --git a/src/views/inventory/InvPlaceChangeModify.vue b/src/views/inventory/InvPlaceChangeModify.vue index c7aaeeb8..79bfdd31 100644 --- a/src/views/inventory/InvPlaceChangeModify.vue +++ b/src/views/inventory/InvPlaceChangeModify.vue @@ -227,7 +227,7 @@ export default { bindInvSpace(params) .then((res) => { if (res.code === 20000) { - this.$message.success("上架成功"); + this.$message.success("变更成功"); this.clearFormData(); this.$nextTick(() => { this.$refs.spaceInputRef.focus(); diff --git a/src/views/inventory/InvProductPlaceOutModify.vue b/src/views/inventory/InvProductPlaceOutModify.vue index 5d69982c..aaaa52fa 100644 --- a/src/views/inventory/InvProductPlaceOutModify.vue +++ b/src/views/inventory/InvProductPlaceOutModify.vue @@ -148,7 +148,7 @@ export default { unbindInvOrderSpace(params) .then((res) => { if (res.code === 20000) { - this.$message.success("上架成功"); + this.$message.success("下架成功"); this.clearFormData(); this.$nextTick(() => { this.$refs.spaceInputRef.focus(); From e0ad939a0369e636edf688c9bea35eade5bbe2b1 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Tue, 9 May 2023 17:19:03 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inout/InvoiceCkeck.vue | 2 +- src/views/inout/InvoiceRegistration.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/inout/InvoiceCkeck.vue b/src/views/inout/InvoiceCkeck.vue index 36f11ff4..76982252 100644 --- a/src/views/inout/InvoiceCkeck.vue +++ b/src/views/inout/InvoiceCkeck.vue @@ -236,7 +236,7 @@ :total="codeTotal" :page.sync="codeQuery.page" :limit.sync="codeQuery.limit" - @pagination="getOrderDetail" + @pagination="getCodeDetailLists" /> diff --git a/src/views/inout/InvoiceRegistration.vue b/src/views/inout/InvoiceRegistration.vue index 2d952958..812b3870 100644 --- a/src/views/inout/InvoiceRegistration.vue +++ b/src/views/inout/InvoiceRegistration.vue @@ -327,7 +327,7 @@ :total="codeTotal" :page.sync="codeQuery.page" :limit.sync="codeQuery.limit" - @pagination="getOrderDetails" + @pagination="getCodeDetailList" /> From a3533b072921ca11467d2a044279f4008e465380 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Tue, 9 May 2023 17:37:16 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B4=A7=E4=BD=8D=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inventory/InvPreProducts.vue | 1 + src/views/inventory/InvProducts.vue | 4 +++- src/views/inventory/InvSupPreInProducts.vue | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/views/inventory/InvPreProducts.vue b/src/views/inventory/InvPreProducts.vue index c08b4c8c..2524990e 100644 --- a/src/views/inventory/InvPreProducts.vue +++ b/src/views/inventory/InvPreProducts.vue @@ -153,6 +153,7 @@ + diff --git a/src/views/inventory/InvProducts.vue b/src/views/inventory/InvProducts.vue index ec1de167..6e6a1906 100644 --- a/src/views/inventory/InvProducts.vue +++ b/src/views/inventory/InvProducts.vue @@ -153,6 +153,7 @@ + @@ -252,7 +253,7 @@ export default { supId: null, zczbhhzbapzbh: null, ylqxzcrbarmc: null, - invCode: null, + invCode: this.$store.getters.locInvCode, invSpaceCode: null, page: 1, limit: 10, @@ -471,6 +472,7 @@ export default { }; }, created() { + this.filterQuery.invCode=this.$store.getters.locInvCode let supId = this.$store.getters.customerId; if (supId == "110") { this.showSup = true; diff --git a/src/views/inventory/InvSupPreInProducts.vue b/src/views/inventory/InvSupPreInProducts.vue index c8daa2f0..3b7e0b83 100644 --- a/src/views/inventory/InvSupPreInProducts.vue +++ b/src/views/inventory/InvSupPreInProducts.vue @@ -151,8 +151,8 @@ - + + From 61fdc85212fdaa4d35bea9f66751b5a50622ba70 Mon Sep 17 00:00:00 2001 From: wj <1285151836@qq.com> Date: Wed, 10 May 2023 10:33:34 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E9=83=A8=E9=97=A8=E4=B8=8E=E4=BB=93?= =?UTF-8?q?=E5=BA=93=E8=81=94=E5=8A=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/purchase/purApply/purApply.vue | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/views/purchase/purApply/purApply.vue b/src/views/purchase/purApply/purApply.vue index 36b10996..c5b787d7 100644 --- a/src/views/purchase/purApply/purApply.vue +++ b/src/views/purchase/purApply/purApply.vue @@ -174,6 +174,7 @@ export default { editStatus: 1, emergency:'', targetDeptCode:'', + targetInvCode:null }, isChang:false, formName: null, @@ -247,6 +248,7 @@ export default { this.$router.push({ path: "", }); + let deptCode = this.filterQuery.targetDeptCode this.filterQuery = { billNo: "", thirdSysFk: "", @@ -260,7 +262,11 @@ export default { type: 1, editStatus: 1, targetDeptCode: this.invCodebe, + targetInvCode:null }; + if(deptCode!=this.invCodebe){ + this.getInvList() + } this.actDateRange = []; this.getList(); }, @@ -405,6 +411,8 @@ export default { var query={ parentId:this.filterQuery.targetDeptCode } + this.filterQuery.targetInvCode = null + this.$forceUpdate() filterSubAll(query).then((res) => { this.invList = res.data || []; }) From bbe011f9595b662fc388700572e807f0b42f3557 Mon Sep 17 00:00:00 2001 From: wj <1285151836@qq.com> Date: Wed, 10 May 2023 10:36:55 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/purchase/purApply/purApplyEditDiaolog.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/purchase/purApply/purApplyEditDiaolog.vue b/src/views/purchase/purApply/purApplyEditDiaolog.vue index c1aac5fb..26de2e75 100644 --- a/src/views/purchase/purApply/purApplyEditDiaolog.vue +++ b/src/views/purchase/purApply/purApplyEditDiaolog.vue @@ -286,7 +286,7 @@ export default { return this.$message.error("单据日期不能为空！"); } if (this.formData.targetInvCode == "" || this.formData.targetInvCode == null) { - return this.$message.error("采购科室不能为空！"); + return this.$message.error("申购仓库不能为空！"); } if (this.formData.emergency == "" || this.formData.emergency == null) { return this.$message.error("紧急程度不能为空！"); From 5bdd1b12949f3e5988eae17dfe69380084a8b187 Mon Sep 17 00:00:00 2001 From: wj <1285151836@qq.com> Date: Wed, 10 May 2023 11:00:46 +0800 Subject: [PATCH 08/11] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inout/receive/DialogNewReceive.vue | 23 ++++++++++---------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/views/inout/receive/DialogNewReceive.vue b/src/views/inout/receive/DialogNewReceive.vue index b96a73f2..ca10d3df 100644 --- a/src/views/inout/receive/DialogNewReceive.vue +++ b/src/views/inout/receive/DialogNewReceive.vue @@ -440,33 +440,34 @@ export default { } }, deleteCodeArray(index, row) { + let _this = this this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", { confirmButtonText: "确定", cancelButtonText: "取消", type: "warning", }).then(() => { - if (this.orderEditor) { - this.detailLoading = true; - if (this.$isNotBlank(row.id)) { + if (_this.formData.billNo) { + _this.detailLoading = true; + if (_this.$isNotBlank(row.id)) { delReceiveDetail({id: row.id}) .then(response => { - this.detailLoading = false; + _this.detailLoading = false; if (response.code === 20000) { - this.getOrderDetailList(); + _this.getOrderDetailList(); } else { - this.$message.error(response.message); + _this.$message.error(response.message); } }) .catch(() => { - this.detailLoading = false; + _this.detailLoading = false; }) } else { - this.$message.success('删除成功'); - this.codeArray.splice(index, 1); + _this.$message.success('删除成功'); + _this.codeArray.splice(index, 1); } } else { - this.$message.success('删除成功'); - this.codeArray.splice(index, 1); + _this.$message.success('删除成功'); + _this.codeArray.splice(index, 1); } }).catch(() => { From 051cb9cc0eea53db421c7b901591ae7f3d58ce3b Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 10 May 2023 11:03:21 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E5=B9=B3=E6=BD=AD=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.env.production b/.env.production index a64eb8dd..03c7814b 100644 --- a/.env.production +++ b/.env.production @@ -11,6 +11,7 @@ ENV = 'production' # VUE_APP_BASE_API = 'http://101.43.77.55:9150/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:5004/UDI_WMS_MC/' +# VUE_APP_SYNC_API ="http://r.jiyuudims.cloud:5008/SP_SYNC_SERVER" # VUE_APP_BASE_API = 'http://127.0.0.1:9150/UDI_WMS_MC/' # 测试服务器 # VUE_APP_BASE_API = 'http://192.168.0.66:9150/UDI_WMS_MC/' @@ -18,10 +19,10 @@ ENV = 'production' # 文明东1 # VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_WMS_MC/' # 文明东2 -VUE_APP_BASE_API = 'http://192.168.0.61:9150/UDI_WMS_MC/' -VUE_APP_SYNC_API ="http://192.168.0.62:9150/SP_SYNC_SERVER" -# VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/' -# VUE_APP_SYNC_API ="http://55.55.0.24:9150/SP_SYNC_SERVER" +# VUE_APP_BASE_API = 'http://192.168.0.61:9150/UDI_WMS_MC/' +# VUE_APP_SYNC_API ="http://192.168.0.62:9150/SP_SYNC_SERVER" +VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/' +VUE_APP_SYNC_API ="http://55.55.0.24:9150/SP_SYNC_SERVER" # 吴总测试服务器 # VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/' From fe4ba6a28b0b464fd6fdb189d98477d79b11a6c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Wed, 10 May 2023 11:28:44 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B4=A7=E4=BD=8D=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/inventory/invPlaceOrder.js | 8 ++ src/views/inventory/InvPlaceSelect.vue | 135 +++++++++++++++++++++++++ 2 files changed, 143 insertions(+) create mode 100644 src/views/inventory/InvPlaceSelect.vue diff --git a/src/api/inventory/invPlaceOrder.js b/src/api/inventory/invPlaceOrder.js index 1461787b..1cf4479b 100644 --- a/src/api/inventory/invPlaceOrder.js +++ b/src/api/inventory/invPlaceOrder.js @@ -15,3 +15,11 @@ export function getInvPlaceOrderDetailList(params) { params: params }); } + +export function selectPlaceList(params) { + return axios({ + url: "/spms/inv/product/selectPlaceList", + method: "get", + params: params + }); +} diff --git a/src/views/inventory/InvPlaceSelect.vue b/src/views/inventory/InvPlaceSelect.vue new file mode 100644 index 00000000..a44d67b7 --- /dev/null +++ b/src/views/inventory/InvPlaceSelect.vue @@ -0,0 +1,135 @@ + + + + + + From 8422f6c36205841c1379d717205de7f30b4affbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Wed, 10 May 2023 14:28:26 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9di=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=98=BE=E7=A4=BAnameCode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/basic/product/bindHospProduct.vue | 3 ++- src/views/inventory/InvCheckPlace.vue | 2 +- src/views/inventory/InvOrderPlaceModify.vue | 2 +- src/views/inventory/InvOutPlace.vue | 2 +- src/views/inventory/InvPlace.vue | 2 +- src/views/inventory/InvPlaceChangeModify.vue | 2 +- src/views/inventory/InvPlaceSelect.vue | 2 +- src/views/inventory/InvProductPlaceOutModify.vue | 2 +- 8 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/views/basic/product/bindHospProduct.vue b/src/views/basic/product/bindHospProduct.vue index d010fca4..667afa4f 100644 --- a/src/views/basic/product/bindHospProduct.vue +++ b/src/views/basic/product/bindHospProduct.vue @@ -159,7 +159,8 @@ export default { page: 1, limit: 20, addType: 1, - diType: 1 + diType: 1, + bindType: 1 }; this.getList(); }, diff --git a/src/views/inventory/InvCheckPlace.vue b/src/views/inventory/InvCheckPlace.vue index 2f0d0e8b..e7ed1905 100644 --- a/src/views/inventory/InvCheckPlace.vue +++ b/src/views/inventory/InvCheckPlace.vue @@ -122,7 +122,7 @@ - + diff --git a/src/views/inventory/InvOrderPlaceModify.vue b/src/views/inventory/InvOrderPlaceModify.vue index 0998d859..ef421115 100644 --- a/src/views/inventory/InvOrderPlaceModify.vue +++ b/src/views/inventory/InvOrderPlaceModify.vue @@ -92,7 +92,7 @@ - + diff --git a/src/views/inventory/InvPlace.vue b/src/views/inventory/InvPlace.vue index db62e1cb..16f320c0 100644 --- a/src/views/inventory/InvPlace.vue +++ b/src/views/inventory/InvPlace.vue @@ -123,7 +123,7 @@ - + diff --git a/src/views/inventory/InvPlaceChangeModify.vue b/src/views/inventory/InvPlaceChangeModify.vue index 79bfdd31..5e6910db 100644 --- a/src/views/inventory/InvPlaceChangeModify.vue +++ b/src/views/inventory/InvPlaceChangeModify.vue @@ -103,7 +103,7 @@ - + diff --git a/src/views/inventory/InvProductPlaceOutModify.vue b/src/views/inventory/InvProductPlaceOutModify.vue index aaaa52fa..a21d8974 100644 --- a/src/views/inventory/InvProductPlaceOutModify.vue +++ b/src/views/inventory/InvProductPlaceOutModify.vue @@ -72,7 +72,7 @@ - +