Merge branch 'dev' of http://39.101.143.165:8090/sxzgd/vue-insagent-pc into dev

src/views/PeopleManage/Staff/StaffManage.vue

@@ -375,7 +375,7 @@
             @valids="valids"
             :isSpeciality="true"
           ></userDetail>
-          
+
           <div class="footerHandle" style="text-align: right">
             <!-- <el-button size="small" type="primary" @click="activeName = '1'"
               >上一步</el-button
@@ -486,7 +486,7 @@
         <el-button @click="closeDialogOut">取消</el-button>
       </div>
     </el-dialog>
-    
+
     <personnelHistory ref="personnelHistory" ></personnelHistory>
     <el-image-viewer v-if="showViewer" :on-close="closeViewer" :z-index="9999" :url-list="[ProViewImg]" />
   </div>
@@ -1101,7 +1101,7 @@ export default {
                   (val) => val.id == this.formData.leaderId
                 ).name;
               }
-              
+
               if (this.dialogTitle == "新增后线人员") {
                 this.$api.user
                   .saveUserInfo({
@@ -1171,7 +1171,7 @@ export default {
     handlePictureCardPreview(img) {
       if(!img){
         this.$message.error('暂无照片')
-        return 
+        return
       }
       this.ProViewImg = img;
       this.showViewer = true;
@@ -1576,4 +1576,4 @@ export default {
     padding-bottom: 10px;
   }
 }
-</style>
+</style>

src/views/Task/DaikeLetter.vue

@@ -97,7 +97,7 @@
         </el-tab-pane>
       </el-tabs>
     </div>
-    <el-dialog title="业务员信息" :visible.sync="dialogVisible" >
+    <el-dialog width="60%" title="业务员信息" :visible.sync="dialogVisible" >
       <el-form :inline="true" class="demo-form-inline" size="small"  label-width="80px" :model="salespersonForm" >
         <el-row :gutter="20">
           <el-col :span="12">
@@ -145,6 +145,18 @@
         <el-table-column prop="name" label="	业务员名称" align="center" ></el-table-column>
         <el-table-column prop="mobile" label="手机号" align="center"></el-table-column>
         <el-table-column prop="identity" label="身份证号" align="center"></el-table-column>
+        <el-table-column prop="leaderName" label="维护人" align="center"></el-table-column>
+        <el-table-column prop="areaNewCode" label="地区" align="center" width="240px">
+          <template slot-scope="scope">
+            <el-cascader  v-model="scope.row.areaNewCode"
+                          style="width: 100%"
+                          disabled
+                          :options="regionalTree"
+                          :props="{ checkStrictly: false, expandTrigger: 'hover', label: 'areaCname', value: 'areaCode', children: 'child'}"
+                          placeholder="">
+            </el-cascader>
+          </template>
+        </el-table-column>
         <el-table-column prop="weChatAuthenticationFlag" label="是否微信认证" align="center"></el-table-column>
         <el-table-column prop="alipayCertificationFlag" label="是否支付宝认证" align="center"></el-table-column>
         <el-table-column prop="bindBankNumberFlag" label="是否绑定银行卡信息" align="center"></el-table-column>
@@ -202,6 +214,7 @@ export default {
         },
       ],
       message:'',
+      regionalTree: []
     }
   },
   created(){
@@ -211,8 +224,29 @@ export default {
           type: 'warning',
           duration:10000
         });
+    this.selectTree()
   },
   methods:{
+    // 地区
+    selectTree(){
+      this.$api.dept.queryTree().then((response) =>{
+        this.regionalTree = this.recursion(response.data);
+      }).catch((error) =>{
+
+      })
+    },
+    recursion(data){
+      if(data.length){
+        data.forEach(item => {
+          if(item.child.length){
+            this.recursion(item.child);
+          }else{
+            delete item.child
+          }
+        });
+        return data;
+      }
+    },
      //业务列表双击选中事件
      reslistCurrentChange(row, column, event) {
       this.salespersonForm = row; //名称
@@ -223,6 +257,9 @@ export default {
       this.dialogVisible = false;
       this.isdisabled=false
     },
+    handelReset() {
+      this.salespersonForm = {}
+    },
     toChooseName(){
       const loading = this.$loading({
         lock: true,
@@ -233,6 +270,12 @@ export default {
       this.$api.task.getAllUsersByHospitality({... this.salespersonForm}).then(res => {
         if (res.code == "200") {
           this.salespersonData = res.data;
+          if(this.salespersonData.length>0) {
+            this.salespersonData.forEach(item => {
+              item.areaNewCode = item.liveAddress.split(',')
+            })
+            console.log(123123123, this.salespersonData)
+          }
           loading.close();
           this.dialogVisible = true;
         } else {
@@ -329,11 +372,11 @@ export default {
               height: 30px;
             }
             }
-            
+
             .hover{
               display: none;
             }
-            
+
           }
           .el-tabs__item:not(:first-child)::after{
             content: '|';
@@ -360,7 +403,7 @@ export default {
             }
           }
         }
-        
+
       }
     }
   }
@@ -410,7 +453,7 @@ export default {
         }
       }
     }
-    
+
   }
 }
 </style>