From 4cab5d1219c7ea01e60a0629bf0e9e062be029d1 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Wed, 21 Apr 2021 16:00:27 +0800 Subject: [PATCH] Merge branch 'score_shop' into api_score_meger --- zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-logistics-info.html | 41 +++++++++++++++++++++++------------------ 1 files changed, 23 insertions(+), 18 deletions(-) diff --git a/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-logistics-info.html b/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-logistics-info.html index b9767fc..87cd06e 100644 --- a/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-logistics-info.html +++ b/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-logistics-info.html @@ -105,22 +105,22 @@ <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px"> <el-row style="padding: 10px"> <el-col class="col-sm-10" > - <el-form-item label="收货人:" prop="shr"> - <el-input v-model="ruleForm.shr" :disabled="(formSelect.state == 3 ? true:false)"></el-input> + <el-form-item label="收货人:" prop="consignee"> + <el-input v-model="ruleForm.consignee" :disabled="(formSelect.state == 3 ? true:false)"></el-input> </el-form-item> </el-col> </el-row> <el-row style="padding: 10px"> <el-col class="col-sm-10" > - <el-form-item label="联系电话:" prop="lxdh"> - <el-input v-model="ruleForm.lxdh" :disabled="(formSelect.state == 3 ? true:false)"></el-input> + <el-form-item label="联系电话:" prop="consigneePhone"> + <el-input v-model="ruleForm.consigneePhone" :disabled="(formSelect.state == 3 ? true:false)"></el-input> </el-form-item> </el-col> </el-row> <el-row style="padding: 10px"> <el-col class="col-sm-10" > - <el-form-item label="收货地址:" prop="shdz"> - <el-input v-model="ruleForm.shdz" :disabled="(formSelect.state == 3 ? true:false)"></el-input> + <el-form-item label="收货地址:" prop="consigneeAddress"> + <el-input v-model="ruleForm.consigneeAddress" :disabled="(formSelect.state == 3 ? true:false)"></el-input> </el-form-item> </el-col> </el-row> @@ -217,16 +217,13 @@ djfs: '', state: '', djsj: '', - consignee: '', - consigneePhone: '', - consigneeAddress: '', }, //物流信息 logisticsList:[], ruleForm : { - shr:'', - lxdh:'', - shdz:'', + consignee:'', + consigneePhone:'', + consigneeAddress:'', kdgs:'', kddh:'', }, @@ -235,13 +232,13 @@ activities: [], rules : { - shr : [ + consignee : [ { required: true, message: '请输入收货人', trigger: 'blur' } ], - lxdh : [ + consigneePhone : [ { required: true, message: '请输入联系电话', trigger: 'blur' } ], - shdz : [ + consigneeAddress : [ { required: true, message: '请输入收货地址', trigger: 'blur' } ], kdgs : [ @@ -269,6 +266,11 @@ url: basePath + '/admin/activitySignWriteoff/findSignWriteoff', callback: function (data) { _this.formSelect = data.mapInfo.signWriteoffVo; + _this.ruleForm.consignee = data.mapInfo.signWriteoffVo.consignee; + _this.ruleForm.consigneePhone = data.mapInfo.signWriteoffVo.consigneePhone; + _this.ruleForm.consigneeAddress = data.mapInfo.signWriteoffVo.consigneeAddress; + _this.ruleForm.kdgs = data.mapInfo.signWriteoffVo.logisticsCompany; + _this.ruleForm.kddh = data.mapInfo.signWriteoffVo.logisticsNum; _this.activities = data.mapInfo.signWriteoffVo.activities; } }); @@ -303,9 +305,9 @@ } let resultData = { writeoffId : writeoffId, - shr : _this.ruleForm.shr, - lxdh : _this.ruleForm.lxdh, - shdz : _this.ruleForm.shdz, + shr : _this.ruleForm.consignee, + lxdh : _this.ruleForm.consigneePhone, + shdz : _this.ruleForm.consigneeAddress, kdgs : _this.ruleForm.kdgs, kddh : _this.ruleForm.kddh, } @@ -318,6 +320,8 @@ message: data.info, type: 'success', }); + parent.layer.close(parent.layer.getFrameIndex(window.name)); + parent.location.reload(); } }); }, @@ -327,6 +331,7 @@ }, closeFrame() { parent.layer.close(parent.layer.getFrameIndex(window.name)); + parent.location.reload(); }, } }) -- Gitblit v1.9.1