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

src/views/ecw/customer/edit.vue

 <template xmlns="">
   <div>
-
     <el-row type="flex" style="margin-top: 15px;margin-bottom: 15px" justify="center">
       <el-col :xs="24" :sm="24" :md="24" :lg="22" :xl="20">
         <el-form ref="form" :model="form" :rules="rules" label-width="150px">
@@ -103,7 +102,7 @@
             </el-col>
             <el-col :span="12">
               <el-form-item :label="$t('客户经理')" prop="customerService">
-                <el-select v-model="form.customerService" :placeholder="$t('请选择客户经理')" :disabled="!!(customerId !== '0' && form.customerService)">
+                <el-select  v-model="form.customerService" :placeholder="$t('请选择客户经理')" :disabled="(!!(customerId !== '0' && form.customerService) || isCustomerServiceConfirmed)">
                   <el-option v-for="item in serviceUserList"
                              :key="item.id" :label="item.nickname" :value="item.id" />
                 </el-select>
@@ -169,7 +168,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item :label="$t('到仓确认')" prop="arrivalConfirm">
-                <el-switch v-model="form.arrivalConfirm" :active-value="0" :inactive-value="1" />
+                <el-switch v-model="form.arrivalConfirm" :active-value="1" :inactive-value="0" />
               </el-form-item>
             </el-col>
             <el-col :span="13">
@@ -282,7 +281,7 @@
               >
                <template v-slot = "{row}">
                  <el-form-item label="">
-                   <el-select v-model="row.userid"  remote :remote-method="getUserMemberUserFn" @change="selectBD" size="mini" filterable>
+                   <el-select v-model="row.userid"  clearable remote :remote-method="getUserMemberUserFn" @change="selectBD" size="mini" filterable>
                      <el-option v-for="(item,index) in userMemberUser" :value="item.id" :key="index"  :label="item.nickname + '(' + item.mobile + ')'" ></el-option>
                    </el-select>
                  </el-form-item>
@@ -430,7 +429,7 @@ import {customerDropDownList} from "@/api/ecw/customerCommissionInfo";
 export default {
   name: "edit",
   props: {
-    customerId: String
+    customerId: String,
   },
   components: {
     Template,
@@ -438,6 +437,7 @@ export default {
     CustomerLineTable
   },
   created() {
+    this.isCustomerServiceConfirmed =  this.$route.query.isCustomerServiceConfirmed ? true : false
     this.getCustomerSelect()
     this.reset()
     this.getUserMemberUserFn()
@@ -462,6 +462,10 @@ export default {
     } else {
       // 新建客户
       this.handleAddContact()
+      if(this.isCustomerServiceConfirmed){
+        console.log(this.userId);
+        this.form.customerService = this.userId
+      }
     }
 
     getNodeList().then(r => {
@@ -489,6 +493,7 @@ export default {
   },
   data(){
     return {
+      isCustomerServiceConfirmed:false,
       getDictDatas,
       DICT_TYPE,
 
@@ -595,6 +600,9 @@ export default {
       }
     },
     selectBD(val){
+     if(!val){
+       return
+     }
    let i = this.selectMemberList.find(item => item.id === val);
     if(i === undefined){
       this.selectMemberList.push(this.memberList.find(item => item.id === val))
@@ -642,6 +650,8 @@ export default {
             return;
           }
           // 添加的提交
+          //我的客户页面跳转直接
+           form.isCustomerServiceConfirmed = true;
           createCustomer(form).then(response => {
             this.$modal.msgSuccess(this.$t('新增成功'));
             this.open = false;
@@ -752,6 +762,9 @@ export default {
     }
   },
   computed: {
+    userId(){
+      return  this.$store.state.user.id
+    },
     userMemberUser(){
      let list = this.memberList.filter(item => {
         return this.selectMemberList.findIndex(i => i.id === item.id) < 0

src/views/ecw/customerConfirm/index.vue

@@ -67,6 +67,10 @@
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
                    v-hasPermi="['ecw:customer:export']">{{$t('导出')}}</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="$router.push({path:'/customer/add-edit/0',query:{isCustomerServiceConfirmed:true,}})"
+                   v-hasPermi="['ecw:customer:create']">{{$t('新增')}}</el-button>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 

src/views/ecw/myCustomerService/index.vue

@@ -303,7 +303,7 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.$router.push('/customer/add-edit/0')
+      this.$router.push({path:'/customer/add-edit/0',query:{isCustomerServiceConfirmed:true,}})
       // this.reset();
       // this.open = true;
       // this.title = "添加客户";