Merge branch 'developer'

935090232@qq.com

2022-02-24 8c6026959d3006bbf9dce3f3c9311e70a02b80c1

 zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-logistics-info.html

@@ -49,7 +49,7 @@
                        <el-row style="display:flex;">
                            <el-col>
                                <el-form-item label="奖品图片：" :label-width="formLabelWidth">
                                    {{formSelect.jptp}}
                                    <img :src="formSelect.jptp" style="max-width: 200px;">
                                </el-form-item>
                            </el-col>
                            <el-col>
@@ -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>
@@ -136,7 +136,7 @@
                    </el-col>
                </el-row>
                <el-row style="padding: 10px">
                    <el-col class="col-sm-10" >
                    <el-col class="col-sm-10"  v-show='false'>
                        <el-form-item label="快递公司编码：">
                            <el-input v-model="ruleForm.kdgs" :disabled="(formSelect.state == 3 ? true:false)"></el-input>
                        </el-form-item>
@@ -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 : [
@@ -259,7 +256,7 @@
        mounted: function () {
        },
        methods: {
            //加载分类
            //加载
            loadInfo() {
                let _this = this;
                //加载配置
@@ -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,7 @@
                            message: data.info,
                            type: 'success',
                        });
                        _this.loadInfo();
                    }
                });
            },
@@ -327,6 +330,7 @@
            },
            closeFrame() {
                parent.layer.close(parent.layer.getFrameIndex(window.name));
                parent.location.reload();
            },
        }
    })