Merge branch 'dev' into test

src/views/ecw/offer/edit.vue

@@ -752,20 +752,6 @@ export default {
       }
       if (this.form.relation == 1) {
         rules.consignorId = [{ required: true, message: this.$t("发货人不能为空") }]
-        // if(this.$route.query.type ==1){
-        //    if(this.$route.query.customer.defaultContactName==null){
-        //     rules.consignorId = [{ required: true, message: this.$t("发货人不能为空")}]
-        //    }else{
-        //     // rules.consignorId = [{ required: true, message: ''}]
-        //    }
-
-        // }else {
-        //     rules.consignorId = [{ required: true, message: this.$t("发货人不能为空")}]
-        // }
-        // else if(this.$route.query.type !=='1'){
-
-        //     rules.consignorId = [{ required: true, message: this.$t("发货人不能为空")}]
-        // }
       }
       if (this.form.relation == 2) {
         rules.consigneeId = [{ required: true, message: this.$t("收货人不能为空") }]
@@ -966,7 +952,6 @@ export default {
       // this.form.standard = this.computedStandard
       if (this.$route.query.type == 1) {
         let customer = this.customer
-        console.log(customer, "zs")
         switch (this.form.relation) {
           case 1:
             if (customer.name != null) {
@@ -988,6 +973,7 @@ export default {
               this.form.consignorEmail = customer.email
               this.form.consigneeEmail = ""
             }
+            console.log(customer, this.form, "zs")
             return
 
           case 2:
@@ -1354,11 +1340,8 @@ export default {
           console.log(JSON.stringify(this.contactsList))
           data = Object.assign({}, this.form, {
             prodCreateReqVOList: this.getProductListWithDefaultValue(),
-            consignorId: this.customer.defaultContactId,
             status
           })
-
-          // data.consignorId = contacts.customerContactsId
         } else {
           data = Object.assign({}, this.form, {
             prodCreateReqVOList: this.getProductListWithDefaultValue(),
@@ -1366,6 +1349,8 @@ export default {
           })
         }
 
+        console.log(data)
+
         // 添加的提交
         createOffer(data).then((response) => {
           // 重置表单内容

src/views/ecw/offer/logListCommon.vue

@@ -53,7 +53,7 @@
               "
               >{{ $t("重置") }}
             </el-button>
-            <el-button type="success" @click="customerFollowFn('follow')" v-hasPermi="['ecw:customer:follow-create']">{{ $t("新增") }} </el-button>
+            <el-button type="success" @click="$refs['customerFollow'].handleAdd()" v-hasPermi="['ecw:customer:follow-create']">{{ $t("新增") }} </el-button>
             <el-button type="warning" @click="handleExport" v-hasPermi="['ecw:customer:follow-export']">
               {{ $t("导出") }}
             </el-button>