Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator

src/views/ecw/customer/editIndirect.vue

@@ -450,6 +450,7 @@ export default {
       this.customerId = this.$route.query.id
       this.getCustomer(this.customerId).then(() => {
         getCustomerContactsListByCustomer({customerId: this.customerId}).then(r => {
+           if(r.data&&r.data.length>0){
           this.form.customerContacts = r.data
           let list = this.form.customerContacts.map(item => item.userid);
           if(list.length >0){
@@ -457,6 +458,7 @@ export default {
               this.selectMemberList = r.data
             })
           }
+          }
           if(this.form.promoter){
            getCustomerList({ids:this.form.promoter}).then(r => {
              this.recommended = r.data;
@@ -531,9 +533,9 @@ export default {
         type: [{ required: true, message: this.$t('客户类别不能为空'), trigger: "blur" }],
         createTime: [{ required: true, message: this.$t('创建时间不能为空'), trigger: "blur" }],
         source: [{ required: true, message: this.$t('客户来源不能为空'), trigger: "blur" }],
-        customerService: [{ required: true, message: this.$t('客户经理不能为空'), trigger: "blur" }],
+        // customerService: [{ required: true, message: this.$t('客户经理不能为空'), trigger: "blur" }],
         status: [{ required: true, message: this.$t('客户状态不能为空'), trigger: "blur" }],
-        founder: [{ required: true, message: this.$t('创建人不能为空'), trigger: "blur" }],
+        // founder: [{ required: true, message: this.$t('创建人不能为空'), trigger: "blur" }],
 
 
       },

src/views/ecw/customer/indirectInfo.vue

@@ -5,11 +5,11 @@
         <div style="display: flex;justify-content: space-between;align-items: flex-end;">
           <h2>{{$t('查看')}}</h2>
           <div>
-            <el-button type="primary" size="small" @click="$router.push('/customer/edit/' + id)">{{$t('编辑')}}</el-button>
+            <el-button type="primary" size="small" @click="$router.push('/customer/editIndirect?id=' + id)">{{$t('编辑')}}</el-button>
 <!--            <el-button @click="$router.push('/offer/create')" type="primary" size="small">{{$t('报价')}}</el-button>
             <el-button type="primary" size="small" @click="$refs['customerFollow'].customerFollow.dialogVisible = true">{{$t('跟进')}}</el-button>
             <el-button type="primary" size="small" @click="$refs['customerComplaint'].handleAdd()">{{$t('客诉')}}</el-button> -->
-            <el-button type="danger" size="small">{{$t('删除')}}</el-button>
+            <el-button type="danger" @click="delCustomer" size="small">{{$t('删除')}}</el-button>
           </div>
         </div>
         <el-card style="margin-top: 15px;">
@@ -441,15 +441,18 @@ export default {
       this.customer = { ...this.customer, ...response.data }
       console.log(this.id)
       getCustomerContactsListByCustomer({customerId: this.id}).then(r => {
-        this.customerContacts = r.data
-        let list =  this.customerContacts.map(r => r.userid)
-        memberUserList({ids:list.join(',')}).then(r => {
-          this.memberList = r.data
-        })
+        if(r.data&&r.data.length>0){
+          this.customerContacts = r.data
+          let list =  this.customerContacts.map(r => r.userid)
+          memberUserList({ids:list.join(',')}).then(r => {
+            this.memberList = r.data
+          })
+        }
+
       })
 
       getCountry(this.customer.country ? this.customer.country : 0 ).then(r => {
-        this.country = r.data.nameZh
+        this.country = r.data?r.data.nameZh:''
       })
     })
     getProductTypeList().then(r => {
@@ -614,6 +617,9 @@ export default {
       } else {
         return ''
       }
+    },
+    delCustomer(){
+
     },
     changeDate(val){
      if(val){