From 4fd881c7eb727c71fba7ce77dd27955325659f78 Mon Sep 17 00:00:00 2001 From: "DESKTOP-00SUCB6\\Administrator" Date: Thu, 1 Jul 2021 16:18:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=2020210701?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/config.js | 2 +- src/views/get/addCancel.vue | 5 ----- src/views/get/deliverGoods.vue | 18 ++++++++++++++++-- src/views/get/getDetail.vue | 5 +++-- src/views/get/returnReceipt.vue | 2 +- src/views/send/send.vue | 2 +- src/views/status/goodsCount.vue | 2 +- src/views/status/sendStatus.vue | 8 ++++---- 8 files changed, 27 insertions(+), 17 deletions(-) diff --git a/public/config.js b/public/config.js index 087be89..f8f7194 100644 --- a/public/config.js +++ b/public/config.js @@ -7,6 +7,6 @@ config = { // API_URL: 'http://172.119.50.248:8081', // API_URL: 'http://61.135.192.50:8081', - API_URL: 'http://fw.niulanshan.com.cn:8081', + API_URL: 'http://172.119.51.195:8081', } \ No newline at end of file diff --git a/src/views/get/addCancel.vue b/src/views/get/addCancel.vue index cd00757..fae8f5c 100644 --- a/src/views/get/addCancel.vue +++ b/src/views/get/addCancel.vue @@ -112,11 +112,6 @@ export default { data() { return { - AllData:{ - sendTotal:'90000万', - getTotal:'40000万', - otherTotal:'50000万', - }, form:{ num:this.$route.query.ids || 'FMD_'+getDay2()+'_'+Math.floor(Math.random()*10000), theGetTime:this.$route.query.times || getDayTime(), diff --git a/src/views/get/deliverGoods.vue b/src/views/get/deliverGoods.vue index 9667c67..b8e9f77 100644 --- a/src/views/get/deliverGoods.vue +++ b/src/views/get/deliverGoods.vue @@ -19,7 +19,7 @@ :data="paramsForm.params" style="width: 100%"> + + + @@ -138,6 +149,9 @@ export default { sent_count:[ {required: true,type:'number', message: '请输入送货数量', trigger: 'blur'} ], + receive_company:[ + {required: true,type:'number', message: '请输入收货公司名称', trigger: 'blur'} + ], receipt:[ {required: true, validator: checkPhotoOpe, trigger: "blur"} ] @@ -160,7 +174,7 @@ export default { }) }, addRowData(){ - this.paramsForm.params.push({sent_time:null,sent_count:null,whitelist_id:null,receipt:null,origin_filename:null}) + this.paramsForm.params.push({sent_time:null,sent_count:null,receive_company:null,whitelist_id:null,receipt:null,origin_filename:null}) }, deleteData(index){ this.paramsForm.params.splice(index,1) diff --git a/src/views/get/getDetail.vue b/src/views/get/getDetail.vue index 986ca95..2494390 100644 --- a/src/views/get/getDetail.vue +++ b/src/views/get/getDetail.vue @@ -18,12 +18,13 @@ - +

- + + diff --git a/src/views/get/returnReceipt.vue b/src/views/get/returnReceipt.vue index 741e2ef..5b64baf 100644 --- a/src/views/get/returnReceipt.vue +++ b/src/views/get/returnReceipt.vue @@ -27,7 +27,7 @@ diff --git a/src/views/send/send.vue b/src/views/send/send.vue index 1fd85dc..ae82ce5 100644 --- a/src/views/send/send.vue +++ b/src/views/send/send.vue @@ -79,7 +79,7 @@
- +