From 86eb2e00d1d4df1ba9b043efee691c0937e2bd55 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Mon, 11 Dec 2023 21:34:13 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vite.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vite.config.js b/vite.config.js index 7e940501..087584b8 100644 --- a/vite.config.js +++ b/vite.config.js @@ -14,7 +14,7 @@ export default ({ mode, command }) => { '/api': { // target: 'http://192.168.10.126:8889', - target: 'http://test.api.huitongys.com', + target: 'https://h5uapi.huitongys.com', changeOrigin: true, rewrite: path => path.replace(/^\/api/, ''), }, From 28c38ed76b5d582d969d2ebcc53ef4affee751dd Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Thu, 14 Dec 2023 10:55:00 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vite.config.js | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/vite.config.js b/vite.config.js index 8fb22299..78b59cbc 100644 --- a/vite.config.js +++ b/vite.config.js @@ -13,19 +13,7 @@ export default ({ mode, command }) => { proxy: { '/api': { // target: 'http://192.168.10.126:8889', -<<<<<<< HEAD - target: 'https://h5uapi.huitongys.com', -======= - // hy - target: 'http://192.168.10.48:13000', - // tjj - // target: 'http://192.168.10.25:13000', - // cg - // target: 'http://192.168.10.200:13000', - - // target: 'http://test.api.huitongys.com', ->>>>>>> pre-production changeOrigin: true, rewrite: path => path.replace(/^\/api/, ''), }, From bfd6e2a783526defc7cf1714d831b534370cb446 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Thu, 21 Dec 2023 22:22:22 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vite.config.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/vite.config.js b/vite.config.js index 497d3d30..cc2da7e7 100644 --- a/vite.config.js +++ b/vite.config.js @@ -14,7 +14,6 @@ export default ({ mode, command }) => { '/api': { // target: 'http://192.168.10.126:8889', // hy - target: 'http://192.168.10.48:13000', // lmy // target: 'http://192.168.10.123:8889', // target: 'http://192.168.10.101:8888', @@ -23,7 +22,6 @@ export default ({ mode, command }) => { // 新zyc // target: 'http://192.168.6.116:8777', // target: 'http://192.168.6.122:8777', - target: 'http://192.168.10.25:13000', // target: 'http://192.168.10.57:13000', // target: 'http://192.168.6.122:8777', // target: 'http://192.168.6.116:8777', @@ -32,7 +30,7 @@ export default ({ mode, command }) => { // target: 'http://192.168.10.94:8888', // target: 'http://192.168.10.29:13000', // target: 'http://h5uapi.huitongys.com', - // target: 'http://test.api.huitongys.com', + target: 'http://test.api.huitongys.com', changeOrigin: true, rewrite: path => path.replace(/^\/api/, ''), }, From b9ee2d0c5cc112477fbad6ae025e5715fc6d8a54 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Thu, 21 Dec 2023 23:20:07 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vite.config.js | 1 - 1 file changed, 1 deletion(-) diff --git a/vite.config.js b/vite.config.js index cc2da7e7..35158455 100644 --- a/vite.config.js +++ b/vite.config.js @@ -17,7 +17,6 @@ export default ({ mode, command }) => { // lmy // target: 'http://192.168.10.123:8889', // target: 'http://192.168.10.101:8888', - // 老zyc // target: 'http://192.168.10.75:8777', // 新zyc // target: 'http://192.168.6.116:8777', From c4784b72ee9dfab46286cb6844da7102a64c9834 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Wed, 27 Dec 2023 16:22:09 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AD=BE=E6=94=B6?= =?UTF-8?q?=E5=A4=8D=E5=90=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distributionDeliveryListedt.vue | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue index d7f78db9..74db694e 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue @@ -714,6 +714,7 @@ export default { SignForPhotos: [], reservationId: null, //当前行的ID windowHeight: null, + CheckStore:null, columnList: [ { prop: 'trainNumber', @@ -3284,8 +3285,10 @@ export default { this.dialogImageUrlE = uploadFile.url; this.dialogVisibleE = true; }, - + // 复核签收确认弹窗 submitForm() { + console.log(this.CheckStore,'要处理的值'); + // console.log('--------------->this.signtitle', this.signtitle); // console.log('--------------->this.signtitle', this.submitForm); let row = {}; @@ -3298,7 +3301,8 @@ export default { }; // 提交图片处理 //最后提交 - row.reservationId = this.reservationId; + + row.reservationId = this.CheckStore.reservationId; // row.clerkSignPictures = this.signform.clerkSignPictures; row.clerkSignRemarks = this.TcForm.clerkSignRemarks; //备注 row.deliveryId = this.deliveryId; @@ -3522,14 +3526,20 @@ export default { }, handleSign(row) { console.log('签收>>>>>>>>>>', row); - console.log(row.id, '复合签收'); - $_getDetail({ id: row.id }).then(res => { + console.log(row.signId, '复合签收'); + $_getDetail({ id: row.signId }).then(res => { console.log(res, '复合返回值'); + if(res.data.data){ + this.CheckStore=res.data.data + console.log(this.CheckStore,'data'); + console.log(res.data.data,'res'); + } + }); this.signtitle = '复核签收'; // this.view = true; this.signform = row; - this.signBox = true; + this.signBox = true;//开启复合弹窗 // this.wid= row.id // this.getWrapdetails(this.wpage) }, From b7ef1422140177597b0bff1836f6b7f8b98a85d3 Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Wed, 27 Dec 2023 16:43:12 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=A4=8D=E6=A0=B8=E7=AD=BE=E6=94=B6?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=A0=E8=BD=BD=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliverylist/distributionDeliveryListedt.vue | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue index 74db694e..c16ef9b7 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue @@ -128,7 +128,8 @@ - +
------------------------------
--> -
+
@@ -685,6 +687,7 @@ export default { data() { return { html: '', + checkloading:false,//复核签收加载 dialogImageUrl: '', //图片放大地址 dialogVisible: false, //图片状态 dialogImageUrlA: '', @@ -3288,7 +3291,8 @@ export default { // 复核签收确认弹窗 submitForm() { console.log(this.CheckStore,'要处理的值'); - + this.checkloading=true;//开启复核签收加载效果 + this.signBox = false; // console.log('--------------->this.signtitle', this.signtitle); // console.log('--------------->this.signtitle', this.submitForm); let row = {}; @@ -3340,6 +3344,7 @@ export default { this.signBox = false; getOneclickq(row) .then(res => { + this.checkloading=false;//关闭复核签收加载效果 if (res.data.code == 200) { this.TCloading = false; //取消限制 ElMessage({ From 44eb52ef0f12e51617789fd6e409d20a5a339adf Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Wed, 27 Dec 2023 18:50:08 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=AD=BE=E6=94=B6?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/deliverylist/distributionDeliveryListedt.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue index c16ef9b7..3771b63c 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue @@ -3306,7 +3306,7 @@ export default { // 提交图片处理 //最后提交 - row.reservationId = this.CheckStore.reservationId; + row.reservationId = this.reservationId; // row.clerkSignPictures = this.signform.clerkSignPictures; row.clerkSignRemarks = this.TcForm.clerkSignRemarks; //备注 row.deliveryId = this.deliveryId;