From e06ad4f7fe40490da1d9d85bac8cd0b7d8c0d4ed Mon Sep 17 00:00:00 2001 From: "0.0" <1092404103.qq.com> Date: Tue, 18 Jul 2023 16:58:01 +0800 Subject: [PATCH] =?UTF-8?q?1.=E7=AD=BE=E6=94=B6=E7=AE=A1=E7=90=86=E8=AF=A6?= =?UTF-8?q?=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/distribution/distributionSignfor.js | 2 +- src/option/basicdata/basicdataCarrier.js | 1 - .../driverArtery/basicdataDriverArtery.vue | 1 + .../deliverylist/distributionDeliveryList.vue | 10 + .../distributionDeliveryListedt.vue | 205 ++++++- .../signdetail/distributionSigndetail.vue | 2 +- .../signfor/distributionSignfor.vue | 27 +- .../signfor/distributionSignforedt.vue | 500 +++++++++++++----- .../signfor/distributionSignfortreat.vue | 191 ++++++- 9 files changed, 777 insertions(+), 162 deletions(-) diff --git a/src/api/distribution/distributionSignfor.js b/src/api/distribution/distributionSignfor.js index 6a1bc714..65729727 100644 --- a/src/api/distribution/distributionSignfor.js +++ b/src/api/distribution/distributionSignfor.js @@ -74,7 +74,7 @@ export const add = (row) => { export const update = (row) => { return request({ - url: '/api/logpm-distribution/signfor/submit', + url: '/api/logpm-distribution/signfor/update', method: 'post', data: row }) diff --git a/src/option/basicdata/basicdataCarrier.js b/src/option/basicdata/basicdataCarrier.js index 50f2db61..e658b91a 100644 --- a/src/option/basicdata/basicdataCarrier.js +++ b/src/option/basicdata/basicdataCarrier.js @@ -387,7 +387,6 @@ export default { res: 'data', url: 'link', }, - }, { label: "合同附件", diff --git a/src/views/basicdata/driverArtery/basicdataDriverArtery.vue b/src/views/basicdata/driverArtery/basicdataDriverArtery.vue index 7086e9e4..ba5bd9f2 100644 --- a/src/views/basicdata/driverArtery/basicdataDriverArtery.vue +++ b/src/views/basicdata/driverArtery/basicdataDriverArtery.vue @@ -613,6 +613,7 @@ }); }, rowUpdate(row, index, done, loading) { + console.log("swx>>>>>>>>>>>>>>"); update(row).then(() => { this.onLoad(this.page); this.$message({ diff --git a/src/views/distribution/deliverylist/distributionDeliveryList.vue b/src/views/distribution/deliverylist/distributionDeliveryList.vue index 124973ef..1dff85cb 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryList.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryList.vue @@ -315,6 +315,16 @@ export default { fixed: false, sortable: true, }, + { + prop: 'fee', + label: '增值服务', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + }, { prop: 'orderNumber', label: '订单总数', diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue index 5b1ffeaf..aaebeb78 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue @@ -79,7 +79,8 @@ @@ -183,12 +184,32 @@ + + + + +
+
+ 确定 + 取消 +
+
+ + + + diff --git a/src/views/distribution/signfor/distributionSignfortreat.vue b/src/views/distribution/signfor/distributionSignfortreat.vue index c1b5582a..930d0c80 100644 --- a/src/views/distribution/signfor/distributionSignfortreat.vue +++ b/src/views/distribution/signfor/distributionSignfortreat.vue @@ -73,7 +73,7 @@ > @@ -173,6 +173,24 @@ + + + +
+
+ 确定 + 取消 +
+
+ + import { getList, getDetail, add, update, remove ,getPage,getstatistics} from '@/api/distribution/distributionSignfor'; +import { update as updatesign } from "@/api/distribution/distributionSignfor"; import option from '@/option/distribution/distributionSignfor'; import { mapGetters } from 'vuex'; import { getDictionaryBiz } from '@/api/system/dict'; @@ -214,7 +233,7 @@ export default { // head: false, // }, { - prop: 'shoppingName', + prop: 'mallName', label: '商城名称', type: 2, values: '', @@ -422,8 +441,138 @@ export default { loading: true, // 是否为查看模式 view: false, + //签收是否显示 + signBox: false, + // 签收表单数据 + signform: {}, + // 签收列表 + signdata: [], // 查询信息 query: {}, + // 表单配置 + signoption: { + height:'auto', + width:'40px', + calcHeight: 30, + tip: false, + searchShow: true, + searchMenuSpan: 6, + border: true, + index: true, + viewBtn: true, + dialogClickModal: false, + emptyBtn: false, //隐藏清空按钮 + submitBtn: false, //隐藏提交按钮 + column: [ + { + label: "收货人姓名", + labelWidth:'150', + span:11, + prop: "consignee", + type: "input", + width:"150px", + align:'center', + disabled:true, + // rules: [{ + // required: true, + // message: "输入承运商编号", + // trigger: "blur" + // }], + }, + { + label: "收货人电话", + prop: "deliveryPhone", + labelWidth:'150', + span:11, + type: "input", + width:"150px", + align:'center', + disabled:true, + }, + { + label: "收货地址", + prop: "deliveryAddress", + labelWidth:'150', + span:11, + type: "input", + width:"150px", + align:'center', + disabled:true, + }, + { + label: "签收类型", + prop: "signingType", + labelWidth:'150', + span:11, + type: "radio", + width:"150px", + align:'center', + disabled:true, + dicData: [ + { + label: '签收', + value: '1', + }, + { + label: '代签收', + value: '2', + } + ], + }, + { + label: "司机签收图片", + prop: "deliverySignPictures", + labelWidth:'150', + type: 'upload', + listType: 'picture-card', + width:"150px", + span:15, + multiple:true, + align:'left', + action: '/blade-resource/oss/endpoint/put-file', + limit: 5, + propsHttp: { + res: 'data', + url: 'link', + }, + disabled:true, + }, + { + label: "复核图片", + prop: "clerkSignPictures", + type: 'upload', + listType: 'picture-card', + dataType: 'string', + labelWidth:'150', + span:15, + multiple:true, + width:"200px", + align:'left', + action: '/blade-resource/oss/endpoint/put-file', + limit: 15, + propsHttp: { + res: 'data', + url: 'link', + }, + rules: [{ + required: true, + message: "请上传图片", + trigger: "blur" + }], + }, + + { + label: "备注", + prop: "clerkSignRemarks", + labelWidth:'150', + span:15, + type: "input", + width:"150px", + align:'center', + }, + + ] + }, //数量 statistics:{}, //签收类型 @@ -558,6 +707,35 @@ export default { } }, + //取消 + cancellation(){ + this.signBox = false; + }, + //签收 + submitForm(){ + // this.isDis = true; + this.$refs.signform.validate(valid => { + if (valid) { + let row = {} + row.id = this.signform.id + row.clerkSignPictures = this.signform.clerkSignPictures + row.clerkSignRemarks = this.signform.clerkSignRemarks + row.signingStatus = '2' + // if (!!row.id){ + updatesign(row).then(() => { + this.$message({ + type: "success", + message: "操作成功!" + }); + this.signBox = false; + this.onLoad(this.page); + }, error => { + console.log(error); + this.signBox = false; + }); + } + }); + }, selectionsc(value) { console.log(value); }, @@ -565,6 +743,15 @@ export default { const { row } = scope; console.log(row); }, + handleSign(row) { + console.log("签收>>>>>>>>>>",row); + // this.title = '查看'; + // this.view = true; + this.signform = row + this.signBox = true; + // this.wid= row.id + // this.getWrapdetails(this.wpage) + }, editsolt(scope) { const { row } = scope; console.log("row>>>>>>>>>>>>>>>>>>>",row);