From 4a4b30a58068bd1d509ba3b853b774d627440b29 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Tue, 9 May 2023 15:03:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E7=A5=A8=EF=BC=8C=E6=A3=80=E9=AA=8C?= =?UTF-8?q?=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 @@