Просмотр исходного кода

Merge branch 'dev' of http://www.baoxianzhanggui.com:8090/sxzgd/vue-insagent-pc into dev

lihongxiao 2 лет назад
Родитель
Сommit
2f0e17e5e7
28 измененных файлов с 511 добавлено и 501 удалено
  1. 1 1
      config/dev.env.js
  2. 7 0
      src/http/moudules/retail.js
  3. 21 22
      src/views/AgreementManage/CarInsurance/AgreementEntry.vue
  4. 15 6
      src/views/AgreementManage/CarInsurance/ProductCostExamine.vue
  5. 107 100
      src/views/DistributionManage/CarInsurance/DistributionManage.vue
  6. 10 2
      src/views/FinancialManagement/CarInsurance/Verifytasks/Verifyuntasks.vue
  7. 3 2
      src/views/PeopleManage/Agent/AgentManage.vue
  8. 5 5
      src/views/PeopleManage/Player/PlayerManage.vue
  9. 11 10
      src/views/PeopleManage/Player/PlayerManageteam.vue
  10. 178 231
      src/views/PeopleManage/Staff/StaffManage.vue
  11. 10 4
      src/views/PeopleManage/TeamLeader/TeamLeaderManage.vue
  12. 2 3
      src/views/Sys/Deptall.vue
  13. 31 28
      src/views/Task/AgentPoolChannel/AgentPoolChannel.vue
  14. 5 2
      src/views/Task/AgentPoolChannel/AgentPoolChannel1.vue
  15. 4 3
      src/views/Task/AgentPoolChannel/AgentPoolChannel2.vue
  16. 3 2
      src/views/Task/AgentPoolChannel/AgentPoolChannel3.vue
  17. 3 2
      src/views/Task/AgentPoolChannel/AgentPoolChannel4.vue
  18. 3 2
      src/views/Task/CompanyPoolChannel/CompanyPoolChannel.vue
  19. 3 2
      src/views/Task/CompanyPoolChannel/CompanyPoolChannel1.vue
  20. 3 2
      src/views/Task/CompanyPoolChannel/CompanyPoolChannel2.vue
  21. 5 2
      src/views/Task/CompanyPoolChannel/CompanyPoolChannel3.vue
  22. 3 2
      src/views/Task/CompanyPoolChannel/CompanyPoolChannel4.vue
  23. 3 2
      src/views/Task/TaskPoolChannel/TaskPoolChannel.vue
  24. 5 2
      src/views/Task/TaskPoolChannel/TaskPoolChannel1.vue
  25. 3 2
      src/views/Task/TaskPoolChannel/TaskPoolChannel2.vue
  26. 31 28
      src/views/Task/TaskPoolChannel/TaskPoolChannel3.vue
  27. 3 2
      src/views/Task/TaskPoolChannel/TaskPoolChannel4.vue
  28. 33 32
      src/views/Task/mixin.js

+ 1 - 1
config/dev.env.js

@@ -9,7 +9,7 @@ module.exports = merge(prodEnv, {
   BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
   // BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
   // BASE_URL: '"http://192.168.0.115:8080/"' //凯森
-  // BASE_URL: '"http:///192.168.0.106:8080/"',//屈晨
+  BASE_URL: '"http:///192.168.0.106:8080/"',//屈晨
   // BASE_URL: '"http:///192.168.0.253:8080/"',//田智
   // BASE_URL: '"http:///192.168.0.42:8080/"',//武鸿鹏
   // BASE_URL: '"http://192.168.1.101:8080/"',

+ 7 - 0
src/http/moudules/retail.js

@@ -25,3 +25,10 @@ export const findById = (id) => {
         method: 'get'
     })
 }
+//分销列表删除(单个)
+export const retailIdDelete = (id) => {
+  return axios({
+      url: '/esmRetail/deleteRetail?id=' + id,
+      method: 'get'
+  })
+}

+ 21 - 22
src/views/AgreementManage/CarInsurance/AgreementEntry.vue

@@ -34,9 +34,8 @@
           <el-col :span="6">
             <el-form-item label="是否有效">
               <el-select :size="overSize" v-model="queryForm.validStatus" placeholder="请选择" clearable>
-                <el-option label="有效" :value="1"></el-option>
                 <el-option label="无效" :value="0"></el-option>
-                <el-option label="待审核" :value="2"></el-option>
+                <el-option label="有效" :value="1"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -109,18 +108,18 @@
         <el-table-column prop="endDate" label="协议失效日期" align="center"></el-table-column>
         <el-table-column prop="matchType" label="匹配日期类型" align="center" :formatter="matchtypeFormatter"></el-table-column>
         <el-table-column prop="moneyTime" label="结算周期" align="center" :formatter="moneytimeFormatter"></el-table-column>
-        <el-table-column prop="auditStatus" label="状态" align="center">
+        <!-- <el-table-column prop="auditStatus" label="状态" align="center">
           <template slot-scope="scope">
             <span :style="'color:' + agreestatusStyle(scope.row.auditStatus)">
               {{ auditstatusFormatter(scope.row) }}
             </span>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column prop="updateTime" label="修改时间" align="center" :formatter="updatetimeFormatter"></el-table-column>
         <el-table-column prop="validStatus" label="是否有效" align="center">
           <template slot-scope="scope">
             <span :style="{ color: scope.row.validStatus == '1' ? '#67c23a' : '#909399' }">{{
-              scope.row.validStatus == 1 ? "有效" : scope.row.validStatus == 0 ? "无效" : '待审核' }}</span>
+              scope.row.validStatus == 1 ? "有效":"无效" }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="modifiedBy" label="修改人" align="center" width="130"></el-table-column>
@@ -204,13 +203,6 @@
               </el-col>
             </el-row>
             <el-row>
-              <el-col :span="12">
-                <el-form-item label="合作公司" prop="partnerCompaniesId">
-                  <el-cascader :disabled="operType == 'EDIT'" style="width: 100%" v-model="agreement.partnerCompaniesId"
-                    :show-all-levels="false" :options="ztreeNodes" :props="optionProps" @change="handleChange" clearable
-                    filterable></el-cascader>
-                </el-form-item>
-              </el-col>
               <el-col :span="12">
                 <el-form-item label="保险公司" :prop="supplierType == '1' ? '' : 'insuranceCompanyId'">
                   <el-cascader style="width: 100%" :disabled="supplierType == '1' || operType == 'EDIT'"
@@ -218,6 +210,13 @@
                     :props="optionProps" @change="prodhandleChange" clearable filterable></el-cascader>
                 </el-form-item>
               </el-col>
+              <el-col :span="12">
+                <el-form-item label="合作公司" prop="partnerCompaniesId">
+                  <el-cascader :disabled="operType == 'EDIT'" style="width: 100%" v-model="agreement.partnerCompaniesId"
+                    :show-all-levels="false" :options="ztreeNodes" :props="optionProps" @change="handleChange" clearable
+                    filterable></el-cascader>
+                </el-form-item>
+              </el-col>
             </el-row>
             <el-row>
               <el-col :span="12">
@@ -278,8 +277,8 @@
               <el-col :span="12">
                 <el-form-item label="有效状态" prop="validStatus">
                   <el-select v-model="agreement.validStatus" placeholder="请选择有效状态" style="width: 100%">
+                    <el-option label="无效" value="0"></el-option>
                     <el-option label="有效" value="1"></el-option>
-                    <el-option label="无效" value="2"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -295,8 +294,8 @@
               <el-col :span="12">
                 <el-form-item label="审核方式">
                   <el-select v-model="agreement.auditType" placeholder="请选择审核方式" style="width: 100%">
-                    <el-option label="人工审核" value="1"></el-option>
-                    <el-option label="自动审核" value="2"></el-option>
+                    <el-option label="人工审核" :value="1"></el-option>
+                    <el-option label="自动审核" :value="2"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -881,13 +880,6 @@
               </el-col>
             </el-row>
             <el-row>
-              <el-col :span="12">
-                <el-form-item label="合作公司" prop="partnerCompaniesId">
-                  <el-cascader :disabled="operType == 'EDIT'" style="width: 100%"
-                    v-model="agreementsHistoryInfo.agreement.partnerCompaniesId" :show-all-levels="false"
-                    :options="ztreeNodes" :props="optionProps" @change="handleChange" clearable filterable></el-cascader>
-                </el-form-item>
-              </el-col>
               <el-col :span="12">
                 <el-form-item label="保险公司" :prop="supplierType == '1' ? '' : 'insuranceCompanyId'">
                   <el-cascader :disabled="supplierType == '1' || operType == 'EDIT'" style="width: 100%"
@@ -896,6 +888,13 @@
                     filterable></el-cascader>
                 </el-form-item>
               </el-col>
+              <el-col :span="12">
+                <el-form-item label="合作公司" prop="partnerCompaniesId">
+                  <el-cascader :disabled="operType == 'EDIT'" style="width: 100%"
+                    v-model="agreementsHistoryInfo.agreement.partnerCompaniesId" :show-all-levels="false"
+                    :options="ztreeNodes" :props="optionProps" @change="handleChange" clearable filterable></el-cascader>
+                </el-form-item>
+              </el-col>
             </el-row>
             <el-row>
               <el-col :span="12">

+ 15 - 6
src/views/AgreementManage/CarInsurance/ProductCostExamine.vue

@@ -37,8 +37,8 @@
         <el-button type="primary" @click="costPage">查询</el-button>
       </el-form-item>
     </el-form>
-    <kt-common-table  :SerialShow="false" :operationWidth="150" :showOperation="true" button1Name="查看"
-       permsButton1="agreement:input:productCost" @handleButton1="viewDetails"
+    <kt-common-table  :SerialShow="false" :operationWidth="150" :showOperation="true" button2Name="查看"
+       permsButton2="agreement:input:productCost" @handleButton2="viewDetails"
        :showBatchDelete="true"   deleteName="批量审核" @handleDelete="handleDelete"  :data="costAudit" :columns="costColumns"
       @findPage="costPage">
     </kt-common-table>
@@ -332,9 +332,11 @@ export default {
       },
 
       costColumns: [
-        { prop: "productName", label: " 产品名称", minWidth: 160 },
+        { prop: "productName", label: " 产品名称", minWidth: 120 },
+        { prop: "agreementId", label: " 协议名称", minWidth: 160,  formatter: this.agreementIdFormatter},
         { prop: "costsStartDate", label: "费用起期", minWidth: 160 },
         { prop: "costsEndDate", label: "费用止期", minWidth: 160 },
+        { prop: "costsDescription", label: "费用描述", minWidth: 220 },
         { prop: "desc", label: "费用因子描述", minWidth: 520 },
         {
           prop: "jqCarCostsProportion",
@@ -466,16 +468,20 @@ export default {
           label: "非车出口比例五级",
           minWidth: 160,
         },
-        { prop: "costsDescription", label: "费用描述", minWidth: 220 },
+
 
         { prop: "priorityLevel", label: "方案优先级", minWidth: 120 },
       ],
       batchSizeList:[],
-      isBatch:false
+      isBatch:false,
+      allAgreementList:[],
     }
   },
   // 生命周期函数
   created() {
+      this.$api.task.findPtlAgreementList().then((res) => {
+        this.allAgreementList=res.data;
+      });
     this.getFactorTemplate();
     //获取操作符
     this.$api.dict.findPage(this.operator).then(res => {
@@ -509,7 +515,7 @@ export default {
         costsIds: this.isBatch ?this.batchSizeList :[this.productCostForm.id],
         isAudit:'1',
       }
-     
+
       this.$api.insCompany.auditBatch(data).then((res) => {
         if (res.code == '200') {
           this.productCostAddVehicleFactorVisible = false;
@@ -640,6 +646,9 @@ export default {
           }
         });
     },
+    agreementIdFormatter(row, column){
+      return  this.allAgreementList.find(val=>val.id==row.agreementId).agreementName;
+    }
   },
   // 计算属性
   computed: {

+ 107 - 100
src/views/DistributionManage/CarInsurance/DistributionManage.vue

@@ -8,8 +8,8 @@
             <div>
               <el-checkbox v-model="containsSubDept">包含下级机构</el-checkbox>
 
-              <kt-button style="margin-left: 15px;margin-bottom: 10px;"
-                icon="el-icon-plus" label="添加分销" type="primary" perms="sys:distributionManage:add" @click="handleAddButton" />
+              <kt-button style="margin-left: 15px;margin-bottom: 10px;" icon="el-icon-plus" label="添加分销" type="primary"
+                perms="sys:distributionManage:add" @click="handleAddButton" />
             </div>
             <el-divider></el-divider>
 
@@ -42,9 +42,9 @@
           </el-row>
 
 
-          <kt-common-table permsEdit="sys:distributionManage:edit" permsDelete="sys:distributionManage:delete" :data="pageResult" :columns="columns"
-            editButtonName="编辑" deleteButtonName="删除" :showBatchDelete="true" @findPage="findPage"
-            @handleEdit="handleTableEdit" @handleDeleteFlag="handleTableDeleteFlag"
+          <kt-common-table permsEdit="sys:distributionManage:edit" permsDelete="sys:distributionManage:delete"
+            :data="pageResult" :columns="columns" editButtonName="编辑" deleteButtonName="删除" :showBatchDelete="false"
+            @findPage="findPage" @handleEdit="handleTableEdit" deleteName="批量删除" @handleDeleteFlag="handleTableDeleteFlag"
             @handleDelete="handleTableBatchDelete">
           </kt-common-table>
         </SplitArea>
@@ -131,7 +131,7 @@
               <el-radio-group v-model="distributionForm.retailtype" @change="retailtypeChange">
                 <el-row style="margin: 15px 0px;"><el-radio label="1">一级分销</el-radio></el-row>
                 <el-row style="margin: 15px 0px;"><el-radio label="2">二级分销</el-radio></el-row>
-                <!--<el-row style="margin: 15px 0px;"><el-radio label="3">三级分销</el-radio></el-row>-->
+                <el-row style="margin: 15px 0px;"><el-radio label="3">三级分销</el-radio></el-row>
                 <el-row style="margin: 15px 0px;"><el-radio label="0">无分销分式</el-radio></el-row>
               </el-radio-group>
             </el-form-item>
@@ -326,50 +326,50 @@ export default {
     /**Split 结束 */
     getDictItems(typeName) {
       //--数据字典--
-        this.$api.dict.findByLableName(typeName).then((response)=>{
-          this[typeName + "options"] = response.data; // 把获取到的数据赋给this.data
-        }).catch((error)=>{
-          this[typeName + "options"] = [];
-        })
-      },
-      //--left tree begin-------
-      findLeftTreeData: function() {
-        // 获取数据
-        this.$api.dept.findTree().then((res) => {
-          this.treeDataRecursion(res.data, 2);
-          this.ztreeNodes = res.data;
-        });
-        this.$api.dept.findTree().then(res => {
-          this.ztreeNodes = res.data;
-        });
-      },
-      //树过滤五级机构递归
-      treeDataRecursion(data, num, one) {
-        data = data || this.ztreeNodes;
-        one = one || 0;
-        one++;
-        for (let i = 0; i < data.length; i++) {
-          if (data[i].comlevel == 5 && (data[i].managementSource != num)) {
-            data.splice(i, 1);
-            i = i - 1;
-          } else {
-            this.treeDataRecursion(data[i].children, num, one);
-          }
+      this.$api.dict.findByLableName(typeName).then((response) => {
+        this[typeName + "options"] = response.data; // 把获取到的数据赋给this.data
+      }).catch((error) => {
+        this[typeName + "options"] = [];
+      })
+    },
+    //--left tree begin-------
+    findLeftTreeData: function () {
+      // 获取数据
+      this.$api.dept.findTree().then((res) => {
+        this.treeDataRecursion(res.data, 2);
+        this.ztreeNodes = res.data;
+      });
+      this.$api.dept.findTree().then(res => {
+        this.ztreeNodes = res.data;
+      });
+    },
+    //树过滤五级机构递归
+    treeDataRecursion(data, num, one) {
+      data = data || this.ztreeNodes;
+      one = one || 0;
+      one++;
+      for (let i = 0; i < data.length; i++) {
+        if (data[i].comlevel == 5 && (data[i].managementSource != num)) {
+          data.splice(i, 1);
+          i = i - 1;
+        } else {
+          this.treeDataRecursion(data[i].children, num, one);
         }
-      },
-      onZTreeCreated: function(ztreeObj) {
-        this.ztreeObj = ztreeObj;
-        // onCreated 中操作ztreeObj对象展开第一个节点
-        ztreeObj.expandNode(ztreeObj.getNodes()[0], true);
-        this.currentTreeNode=ztreeObj.getNodes()[0];
-      },
-      onZTreeClick: function(evt, treeId, treeNode) {
-        // 点击事件
-        this.currentTreeNode = treeNode;
-        this.pageRequest.columnFilters.deptid.value = this.currentTreeNode.id;
-        this.findPage();
-      },
-      //--left tree start-------
+      }
+    },
+    onZTreeCreated: function (ztreeObj) {
+      this.ztreeObj = ztreeObj;
+      // onCreated 中操作ztreeObj对象展开第一个节点
+      ztreeObj.expandNode(ztreeObj.getNodes()[0], true);
+      this.currentTreeNode = ztreeObj.getNodes()[0];
+    },
+    onZTreeClick: function (evt, treeId, treeNode) {
+      // 点击事件
+      this.currentTreeNode = treeNode;
+      this.pageRequest.columnFilters.deptid.value = this.currentTreeNode.id;
+      this.findPage();
+    },
+    //--left tree start-------
 
     // 查询Start
     queryInfo(val) {
@@ -380,35 +380,35 @@ export default {
     // 查询End
 
 
-      // 右侧工具方法Start
-      handleAddButton(){
-          if(this.currentTreeNode == null ){
-            return this.$message.info("请选择门店下团队");
-          }
-          this.activeTabs = 'first'
-          // 查询机构信息
-          this.$api.dept.getDeptById(this.currentTreeNode.id).then(res => {
-            if((res.data.deptType =='D') && (res.data.id.indexOf('M')>=0)){
-              this.$api.dept.getDeptById(res.data.parentId).then(result => {
-                this.deptInfo = result.data;
-                this.deptInfo.teamid = res.data.id;
-                this.deptInfo.teamname = res.data.name;
-                this.dialogVisible = true;
-              })
-            }else{
-              return this.$message.info("请选择门店下团队");
-            }
-          })
-      },
-      handleDialogBefore(done) {
-        // 退出对话框之前确认提示
-        var that = this;
-        this.$confirm('确认关闭?')
-          .then(_ => {
-            done();
+    // 右侧工具方法Start
+    handleAddButton() {
+      if (this.currentTreeNode == null) {
+        return this.$message.info("请选择门店下团队");
+      }
+      this.activeTabs = 'first'
+      // 查询机构信息
+      this.$api.dept.getDeptById(this.currentTreeNode.id).then(res => {
+        if ((res.data.deptType == 'D') && (res.data.id.indexOf('M') >= 0)) {
+          this.$api.dept.getDeptById(res.data.parentId).then(result => {
+            this.deptInfo = result.data;
+            this.deptInfo.teamid = res.data.id;
+            this.deptInfo.teamname = res.data.name;
+            this.dialogVisible = true;
           })
-          .catch(_ => {});
-      },
+        } else {
+          return this.$message.info("请选择门店下团队");
+        }
+      })
+    },
+    handleDialogBefore(done) {
+      // 退出对话框之前确认提示
+      var that = this;
+      this.$confirm('确认关闭?')
+        .then(_ => {
+          done();
+        })
+        .catch(_ => { });
+    },
 
     // 右侧列表的方法Start
     findPage(data) {
@@ -450,19 +450,26 @@ export default {
     },
     // 批量删除人员
     handleTableBatchDelete(data) {
-
     },
     // 删除单个人员
     handleTableDeleteFlag(data) {
-
+      this.$api.retail.retailIdDelete(data.row.id).then((res) => {
+        if (res.code == '200') {
+          this.findPage();
+          this.$message({
+            type: 'success',
+            message: res.msg,
+          });
+        } else {
+          this.$message({
+            type: 'error',
+            message: res.msg,
+          });
+        }
+      });
     },
     // 右侧列表的方法End
-
-
-
     // 新增或修改的弹出框Start
-
-
     closeDialog() {
       // 清空数据
       this.deptInfo = {};
@@ -538,22 +545,22 @@ export default {
       param.disrate2 = '';
       param.disrate3 = '';
 
-         for(let i=0;i<this.retailSettingForm.length;i++){
-           param['disrate'+this.retailSettingForm[i].retailLevel] = this.retailSettingForm[i].retailRate;
-         }
-
-         this.$api.retail.saveRetail(param).then(res => {
-           if(res.code == 200){
-             this.$message.success("操作成功");
-             this.findPage()
-             this.dialogVisible = false;
-           }else{
-             this.$message.info("操作失败 "+res.msg);
-           }
-
-         }).catch(err=>{
-           this.$message.error("操作失败")
-         })
+      for (let i = 0; i < this.retailSettingForm.length; i++) {
+        param['disrate' + this.retailSettingForm[i].retailLevel] = this.retailSettingForm[i].retailRate;
+      }
+
+      this.$api.retail.saveRetail(param).then(res => {
+        if (res.code == 200) {
+          this.$message.success("操作成功");
+          this.findPage()
+          this.dialogVisible = false;
+        } else {
+          this.$message.info("操作失败 " + res.msg);
+        }
+
+      }).catch(err => {
+        this.$message.error("操作失败")
+      })
       // 新增分销End
       this.$api.retail.saveRetail(param).then(res => {
         if (res.code == 200) {

+ 10 - 2
src/views/FinancialManagement/CarInsurance/Verifytasks/Verifyuntasks.vue

@@ -17,6 +17,11 @@
           <span>{{ scope.row.insCompany ? scope.row.insCompany : '--' }}</span>
         </template>
       </el-table-column>
+      <el-table-column prop="insCompany" label="合作公司" width="180" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.partnerCompaniesName ? scope.row.partnerCompaniesName : '--' }}</span>
+        </template>
+      </el-table-column>
       <el-table-column prop="licenseno" label="车牌号" width="180" align="center"></el-table-column>
       <el-table-column prop="insuredname" label="投保人姓名" align="center" width="150"></el-table-column>
       <el-table-column prop="product" label="投保险种" align="center" width="200"></el-table-column>
@@ -44,7 +49,7 @@
     </div>
     <!-- 车辆报价新页面 -->
     <detailsDialog ref="detailsDialog" :orderInfo="orderInfo" :feeOrderNewVoList="feeOrderNewVoList"
-      @updatedCost="updatedCost">
+      @updatedCost="updatedCost" @adusitFUn="adusitFUn">
     </detailsDialog>
   </div>
 </template>
@@ -387,7 +392,10 @@ export default {
       }
       this.$api.task.auditFee(subParam).then((res) => {
         if (res.code == 200) {
-          this.$message.success('审核通过')
+          this.$message({
+            type: 'success',
+            message:"审核通过",
+          });
           this.findPage();
           // this.quotedetailsdialogVisible = false;
           this.$refs.detailsDialog.setBackupVisible(false);

+ 3 - 2
src/views/PeopleManage/Agent/AgentManage.vue

@@ -178,6 +178,7 @@
                 <el-form-item label="推荐人" prop="referrerId">
                   <el-select
                     style="width: 200px"
+                    clearable
                     v-model="formData.referrerId"
                     placeholder="请选择"
                   >
@@ -456,7 +457,7 @@ import tree from "@/components/ztree.vue"; // 机构树组件
 import templateTable from "../../../components/TemplateTable/index.vue";
 import peopleImage from "@/components/PeopleImage/index.vue";
 import { validateSfz } from "../../../utils/validate.js";
-import mixa from '../mixin' 
+import mixa from '../mixin'
 const mixin = new mixa({
   treeTypeNum:2 //树分类过滤参数
 })
@@ -467,7 +468,7 @@ export default {
     templateTable,
     peopleImage,
   },
-  mixins: [mixin], 
+  mixins: [mixin],
   data() {
     return {
       activeName: "1",

+ 5 - 5
src/views/PeopleManage/Player/PlayerManage.vue

@@ -193,6 +193,7 @@
                 <el-form-item label="业务员" prop="referrerId">
                   <el-select
                     style="width: 200px"
+                    clearable
                     v-model="formData.referrerId"
                     placeholder="请选择"
                   >
@@ -229,13 +230,13 @@
     </el-dialog>
   </div>
 </template>
-  
+
   <script>
 import KtButton from "@/views/Core/KtButton"; // 按钮权限组件
 import tree from "@/components/ztree.vue"; // 机构树组件
 import templateTable from "../../../components/TemplateTable/index.vue";
 import peopleImage from "@/components/PeopleImage/index.vue";
-import mixa from '../mixin' 
+import mixa from '../mixin'
 const mixin = new mixa({
   treeTypeNum:1
 })
@@ -246,7 +247,7 @@ export default {
     templateTable,
     peopleImage,
   },
-  mixins: [mixin], 
+  mixins: [mixin],
   data() {
     return {
       activeName: "1", //弹框tab索引
@@ -596,7 +597,7 @@ export default {
   },
 };
 </script>
-  
+
   <style scoped>
 .el-divider--horizontal {
   margin: 4px 0;
@@ -630,4 +631,3 @@ export default {
   text-align: center;
 }
 </style>
-  

+ 11 - 10
src/views/PeopleManage/Player/PlayerManageteam.vue

@@ -40,7 +40,7 @@
             :pagination="pageData"
           >
           <template slot="领导人" >
-          <el-select size="small" v-model="queryFrom.leaderName" placeholder="请选择" clearable>
+          <el-select size="small" v-model="queryFrom.leaderName" placeholder="请选择" clearable  filterable>
               <el-option
                 v-for="item in searchLeaderOptions"
                 :key="item.id"
@@ -91,7 +91,7 @@
                       checkStrictly: true,
                     }"
                     @change="handleChange"
-                    
+
                   >
                   </el-cascader> </el-form-item
               ></el-col>
@@ -182,6 +182,8 @@
                 <el-form-item label="领导人" prop="leaderId">
                   <el-select
                     style="width: 200px"
+                    clearable
+                    filterable
                     v-model="formData.leaderId"
                     placeholder="请选择"
                   >
@@ -426,13 +428,13 @@
     </el-dialog>
   </div>
 </template>
-  
+
   <script>
 import KtButton from "@/views/Core/KtButton"; // 按钮权限组件
 import tree from "@/components/ztree.vue"; // 机构树组件
 import templateTable from "../../../components/TemplateTable/index.vue";
 import peopleImage from "@/components/PeopleImage/index.vue";
-import mixa from '../mixin' 
+import mixa from '../mixin'
 const mixin = new mixa({
   treeTypeNum:1 //树分类过滤参数
 })
@@ -443,7 +445,7 @@ export default {
     templateTable,
     peopleImage,
   },
-  mixins: [mixin], 
+  mixins: [mixin],
   data() {
     return {
       searchLeaderOptions:[],
@@ -561,7 +563,7 @@ export default {
       containsSubDeptChecked: true, //是否包含下级机构
       dialogTitle: "", //弹框title
       dialogVisible: false, // 新增编辑界面是否显示
-     
+
       option: [], //机构列表
       dialogPassword: true, //密码是否显示明文
       // postOption:[],
@@ -573,7 +575,7 @@ export default {
     this.findPage();
     this.searchLeaderFun()
   },
- 
+
   watch: {
     containsSubDeptChecked() {
       this.findPage();
@@ -652,7 +654,7 @@ export default {
         this.searchLeaderFun();
         this.formData.deptId = [];
         this.platform(treeId);
-        
+
       },
     platform(array) {
       if (!array.parent) {
@@ -840,7 +842,7 @@ export default {
   },
 };
 </script>
-  
+
   <style scoped>
 .el-divider--horizontal {
   margin: 4px 0;
@@ -874,4 +876,3 @@ export default {
   text-align: center;
 }
 </style>
-  

+ 178 - 231
src/views/PeopleManage/Staff/StaffManage.vue

@@ -5,32 +5,20 @@
         <!-- 左侧树Start -->
         <SplitArea :size="leftSplitWidth" :minSize="240">
           <div>
-            <div >
+            <div>
               <!-- <el-checkbox v-model="containsSubDeptChecked"
                 >包含下级机构</el-checkbox
               > -->
 
-              <kt-button
-                style="
+              <kt-button style="
                   background-color: #ffc000;
                   border: #ffc000;
-                "
-                icon="fa fa-plus"
-                label="添加人员"
-                type="primary"
-                perms="sys:backline:add"
-                @click="handleAddButton"
-              />
+                " icon="fa fa-plus" label="添加人员" type="primary" perms="sys:backline:add" @click="handleAddButton" />
             </div>
             <el-divider></el-divider>
             <!-- 左侧树形结构 -->
-            <el-tree
-              :data="ztreeNodes"
-              :props="{ children: 'children', label: 'name' }"
-              node-key="id"
-              :default-expanded-keys="['9']"
-              @node-click="onZTreeClick"
-            ></el-tree>
+            <el-tree :data="ztreeNodes" :props="{ children: 'children', label: 'name' }" node-key="id"
+              :default-expanded-keys="['9']" @node-click="onZTreeClick"></el-tree>
           </div>
         </SplitArea>
         <!-- 左侧树End -->
@@ -39,93 +27,52 @@
         <SplitArea :size="rightSplitWidth">
           <!-- 筛选区域Start -->
           <el-row class="queryFrom">
-            <el-form ref="queryFormRef" :model="pageData" label-width="80px">
+            <el-form ref="queryFormRef" :model="pageData" label-width="80px" size="small">
               <el-row>
                 <el-col :span="5">
                   <el-form-item label="工号">
-                    <el-input
-                      clearable
-                      size="small"
-                      placeholder="工号"
-                      v-model="pageData.userId"
-                    ></el-input>
+                    <el-input clearable placeholder="工号" v-model="pageData.userId"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="5">
                   <el-form-item label="姓名">
-                    <el-input
-                      clearable
-                      size="small"
-                      placeholder="姓名"
-                      v-model="pageData.name"
-                    ></el-input>
+                    <el-input clearable  placeholder="姓名" v-model="pageData.name"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="5">
                   <el-form-item label="手机号">
-                    <el-input
-                      clearable
-                      size="small"
-                      placeholder="手机号"
-                      v-model="pageData.mobile"
-                    ></el-input>
+                    <el-input clearable  placeholder="手机号" v-model="pageData.mobile"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="5">
                   <el-form-item label="状态">
-                    <el-select
-                      style="width:200px"
-                      clearable 
-                        v-model="pageData.status"
-                        placeholder="请选择"
-                      >
-                      <el-option v-for="val in user_statusoptions" :label="val.label" :value="val.value" :key="val.id"></el-option>
+                    <el-select style="width:200px" clearable v-model="pageData.status" placeholder="请选择">
+                      <el-option v-for="val in user_statusoptions" :label="val.label" :value="val.value"
+                        :key="val.id"></el-option>
                     </el-select>
                   </el-form-item>
                 </el-col>
                 <el-col :span="5">
                   <el-form-item label="领导人">
-                    <el-select
-                    size="small" 
-                      style="width:215px"
-                      clearable 
-                        v-model="pageData.leaderId"
-                        placeholder="请选择"
-                      >
-                      <el-option
-                      v-for="item in searchLeaderOptions"
-                      :key="item.id"
-                      :label="item.name"
-                      :value="item.name">
-                    </el-option>
+                    <el-select  style="width:215px" clearable filterable  v-model="pageData.leaderId" placeholder="请选择">
+                      <el-option v-for="item in searchLeaderOptions" :key="item.id" :label="item.name" :value="item.name">
+                      </el-option>
                     </el-select>
                   </el-form-item>
                 </el-col>
                 <el-col :span="4">
                   <el-form-item label="">
-                    <el-button
-                      size="small"
-                      type="primary"
-                      @click="queryStaffInfo"
-                      >查询</el-button
-                    >
+                    <el-button  type="primary" @click="queryStaffInfo">查询</el-button>
                   </el-form-item>
                 </el-col>
               </el-row>
             </el-form>
           </el-row>
 
-            <kt-common-table
-              permsEdit="sys:backline:edit"
-              :data="pageResult"
-              :columns="columns"
-              editButtonName="编辑"
-              :showBatchDelete="false"
-              @findPage="findPage"
-              @handleEdit="handleTableEdit"
-            >
-            </kt-common-table>
-         
+          <kt-common-table permsEdit="sys:backline:edit" :data="pageResult" :columns="columns" editButtonName="编辑"
+            :showBatchDelete="false" @findPage="findPage" @handleEdit="handleTableEdit">
+          </kt-common-table>
+
         </SplitArea>
         <!-- 右侧列表页面End -->
       </Split>
@@ -133,18 +80,17 @@
 
 
 
-<!-- 新增修改界面 -->
-<el-dialog :title="dialogTitle" width="60%" :visible.sync="dialogVisible" :close-on-click-modal="false"
+    <!-- 新增修改界面 -->
+    <el-dialog :title="dialogTitle" width="60%" :visible.sync="dialogVisible" :close-on-click-modal="false"
       :before-close="handleDialogBefore" @close="closeDialog" v-dialogDrag>
-      <el-tabs v-model="activeName"  :before-leave="beforeTabLeave" >
+      <el-tabs v-model="activeName" :before-leave="beforeTabLeave">
         <el-tab-pane label="基本信息" name="1">
           <el-form :model="formData" :rules="formDataRules" ref="formData" :inline="true" @keyup.enter.native="nextStep()"
             label-width="110px" size="small">
             <el-row>
               <el-col :span="8">
                 <el-form-item label="机构名称" prop="deptId">
-                  <el-cascader style="width:200px" :options="ztreeNodes" v-model="formData.deptId" clearable
-                    disabled
+                  <el-cascader style="width:200px" :options="ztreeNodes" v-model="formData.deptId" clearable disabled
                     :show-all-levels="false" :props="{
                       value: 'id',
                       label: 'name',
@@ -163,7 +109,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-              <el-row>
+            <el-row>
               <el-col :span="8">
                 <el-form-item label="身份证号" prop="identity">
                   <el-input v-model="formData.identity" :maxlength="18" @change="identityChange"></el-input>
@@ -176,14 +122,14 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="密码" prop="password">
-                  <el-input  v-model="formData.password" :class="isShow==true?'disc':'none'" ></el-input>
-                  <i class="el-icon-view icon" @click="isShowFun()"  v-if="dialogPassword"></i>
+                  <el-input v-model="formData.password" :class="isShow == true ? 'disc' : 'none'"></el-input>
+                  <i class="el-icon-view icon" @click="isShowFun()" v-if="dialogPassword"></i>
                   <!-- <el-input style="width:200px" v-model="formData.password" autocomplete="new-password"
                     show-password></el-input> -->
                 </el-form-item>
               </el-col>
             </el-row>
-              <el-row>
+            <el-row>
               <el-col :span="8">
                 <el-form-item label="状态" prop="status">
                   <el-select @change="statusChange" style="width:200px" v-model="formData.status" placeholder="请选择">
@@ -194,7 +140,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="角色" prop="roleId">
-                  <el-select style="width:200px" v-model="formData.roleId" placeholder="请选择">
+                  <el-select style="width:200px" v-model="formData.roleId" placeholder="请选择" disabled>
                     <el-option v-for="val in roles" :label="val.name" :value="val.id + ''" :key="val.id"></el-option>
                   </el-select>
                 </el-form-item>
@@ -202,23 +148,15 @@
               <el-col :span="8">
                 <el-form-item label="岗位" prop="positionId">
                   <el-select style="width:200px" v-model="formData.positionId" placeholder="请选择">
-                    <el-option v-for="val in postOption" :label="val.postName" :value="val.postId" :key="val.postId"></el-option>
+                    <el-option v-for="val in postOption" :label="val.postName" :value="val.postId"
+                      :key="val.postId"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="领导人" prop="leaderId">
-                  <el-select
-                    style="width: 200px"
-                    v-model="formData.leaderId"
-                    placeholder="请选择"
-                  >
-                    <el-option
-                      v-for="val in leaderOptions"
-                      :label="val.name"
-                      :value="val.id"
-                      :key="val.id"
-                    ></el-option>
+                  <el-select style="width: 200px" clearable filterable  v-model="formData.leaderId" placeholder="请选择">
+                    <el-option v-for="val in leaderOptions" :label="val.name" :value="val.id" :key="val.id"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -229,7 +167,8 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="离职时间" prop="logoutTime">
-                  <el-date-picker value-format="yyyy-MM-dd" style="width:200px" v-model="formData.logoutTime" type="date" placeholder="选择日期">
+                  <el-date-picker value-format="yyyy-MM-dd" style="width:200px" v-model="formData.logoutTime" type="date"
+                    placeholder="选择日期">
                   </el-date-picker>
                 </el-form-item>
               </el-col>
@@ -241,7 +180,7 @@
         </el-tab-pane>
         <el-tab-pane label="详细信息" name="2">
           <el-form :model="formDataDetail" :rules="formDataRulesDetail" ref="formDataDetail" :inline="true"
-           label-width="110px" size="small">
+            label-width="110px" size="small">
             <el-row>
               <el-col :span="8">
                 <el-form-item label="开户账号" prop="accountno">
@@ -260,8 +199,8 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              </el-row>
-              <el-row>
+            </el-row>
+            <el-row>
               <el-col :span="8">
                 <el-form-item label="出生日期" prop="birthday">
                   <el-date-picker style="width:200px" v-model="formDataDetail.birthday" type="date" placeholder="选择日期">
@@ -284,7 +223,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-              <el-row>
+            <el-row>
               <el-col :span="8">
                 <el-form-item label="民族" prop="nations">
                   <el-select style="width:200px" v-model="formDataDetail.nations" placeholder="请选择民族">
@@ -312,18 +251,18 @@
                 </el-form-item>
               </el-col>
             </el-row>
-              <el-row>
+            <el-row>
               <el-col :span="8">
                 <el-form-item label="邮政编码" prop="postalCode">
                   <el-input style="width:200px" v-model="formDataDetail.postalCode"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                 <el-form-item label="居住地址" prop="address">
-                   <el-input style="width:200px" v-model="formDataDetail.address"></el-input>
-                 </el-form-item>
-               </el-col>
-             
+                <el-form-item label="居住地址" prop="address">
+                  <el-input style="width:200px" v-model="formDataDetail.address"></el-input>
+                </el-form-item>
+              </el-col>
+
               <el-col :span="8">
                 <el-form-item label="血型" prop="bloodType">
                   <el-select style="width:200px" v-model="formDataDetail.bloodType" placeholder="请选择">
@@ -335,7 +274,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-              <el-row>
+            <el-row>
               <el-col :span="8">
                 <el-form-item label="学历" prop="education">
                   <el-select style="width:200px" v-model="formDataDetail.education" placeholder="请选择">
@@ -350,36 +289,37 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                  <el-form-item label="毕业院校" prop="school">
-                    <el-input style="width:200px" v-model="formDataDetail.school"></el-input>
-                  </el-form-item>
-                </el-col>
+                <el-form-item label="毕业院校" prop="school">
+                  <el-input style="width:200px" v-model="formDataDetail.school"></el-input>
+                </el-form-item>
+              </el-col>
               <el-col :span="8">
                 <el-form-item label="毕业时间" prop="graduationTime">
-                  <el-date-picker  style="width:200px" v-model="formDataDetail.graduationTime" type="date" placeholder="选择日期">
+                  <el-date-picker style="width:200px" v-model="formDataDetail.graduationTime" type="date"
+                    placeholder="选择日期">
                   </el-date-picker>
                 </el-form-item>
               </el-col>
             </el-row>
-              <el-row>
+            <el-row>
               <el-col :span="8">
                 <el-form-item label="原工作单位" prop="formerEmployer">
                   <el-input style="width:200px" v-model="formDataDetail.formerEmployer"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                  <el-form-item label="入司时间" prop="entryTime">
-                    <el-date-picker style="width:200px" v-model="formDataDetail.entryTime" type="date" placeholder="选择日期">
-                    </el-date-picker>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
+                <el-form-item label="入司时间" prop="entryTime">
+                  <el-date-picker style="width:200px" v-model="formDataDetail.entryTime" type="date" placeholder="选择日期">
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
                 <el-form-item label="代理人资格证号" prop="agentQualificationCode">
                   <el-input style="width:200px" v-model="formDataDetail.agentQualificationCode"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
-              <el-row>
+            <el-row>
               <el-col :span="8">
                 <el-form-item label="紧急联系人电话" prop="emergencyContactTel">
                   <el-input style="width:200px" v-model="formDataDetail.emergencyContactTel"></el-input>
@@ -387,7 +327,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="紧急联系人姓名" prop="emergencyContactName">
-                  <el-input  style="width:200px" v-model="formDataDetail.emergencyContactName"></el-input>
+                  <el-input style="width:200px" v-model="formDataDetail.emergencyContactName"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -398,9 +338,8 @@
           </div>
         </el-tab-pane>
         <el-tab-pane label="影像资料" name="3">
-          <el-form :model="formDataDetail" ref="formDataDetail" :inline="true"
-           label-width="130px" size="small">
-           <peopleImage :dataForm="dataForm" :imagesIdList="imagesIdList" :dialogVisible="dialogVisible"></peopleImage>
+          <el-form :model="formDataDetail" ref="formDataDetail" :inline="true" label-width="130px" size="small">
+            <peopleImage :dataForm="dataForm" :imagesIdList="imagesIdList" :dialogVisible="dialogVisible"></peopleImage>
           </el-form>
           <div style="text-align: right;">
             <el-button size="small" type="primary" style="background-color: #ffc000; border: 1px solid #ffc000"
@@ -422,9 +361,9 @@ import tree from "@/components/ztree.vue"; // 机构树组件
 import KtCommonTable from "@/views/Core/KtCommonTable.vue"; //表格组件
 import { validateSfz } from "../../../utils/validate.js";
 import peopleImage from '@/components/PeopleImage/index.vue' //影像组件
-import mixa from '../mixin' 
+import mixa from '../mixin'
 const mixin = new mixa({
-  treeTypeNum:null
+  treeTypeNum: null
 })
 export default {
   components: {
@@ -433,23 +372,23 @@ export default {
     KtCommonTable,
     peopleImage
   },
-  mixins: [mixin], 
+  mixins: [mixin],
   data() {
     return {
       activeName: '1',
-      isShow:true,
+      isShow: true,
       //56个民族
-      pageData:{
+      pageData: {
         pageNum: 1,
         pageSize: 20,
-        deptId:JSON.parse(localStorage.getItem('user_data')).deptId  ,
-        userId:'',
-        realName:'',
-        mobile:'',
+        deptId: JSON.parse(localStorage.getItem('user_data')).deptId,
+        userId: '',
+        realName: '',
+        mobile: '',
       },
-      formData:{},
-      formDataRules:{
-        deptId:[{ required: true, message: "请选择机构", trigger: "change" }],
+      formData: {},
+      formDataRules: {
+        deptId: [{ required: true, message: "请选择机构", trigger: "change" }],
         mobile: [
           { required: true, message: "请输入手机号", trigger: "blur" },
           { min: 11, max: 11, message: "请输入11位手机号码", trigger: "blur" },
@@ -465,10 +404,10 @@ export default {
         roleId: [{ required: true, message: "请填写角色", trigger: "blur" }],
         password: [{ required: true, message: "请填写密码", trigger: "blur" }],
         identity:
-        [{ required: true, message: "请填写身份证号" },
-        { validator: validateSfz }], 
-        },
-        formDataDetail: {},
+          [{ required: true, message: "请填写身份证号" },
+          { validator: validateSfz }],
+      },
+      formDataDetail: {},
       formDataRulesDetail: { //详情信息内容校验规则
         // accountno: [{ required: true, message: "请填写开户账号", trigger: "blur" }],
         // address: [{ required: true, message: "请填写居住地址", trigger: "blur" }],
@@ -476,7 +415,7 @@ export default {
         // birthday: [{ required: true, message: "请填写出生日期", trigger: "blur" }],
         // identity:
         // [{ required: true, message: "请填写身份证号" },
-        // { validator: validateSfz }], 
+        // { validator: validateSfz }],
 
         // koseki: [{ required: true, message: "请填写户籍", trigger: "blur" }],
         // maritalStatus: [{ required: true, message: "请选择婚姻状况", trigger: "change" }],
@@ -503,7 +442,7 @@ export default {
         },
 
         { prop: "deptName", label: "部门名称", minWidth: 80, sortable: false },
-      
+
         { prop: "userId", label: "工号", minWidth: 80, sortable: false },
         { prop: "name", label: "姓名", minWidth: 120, sortable: false },
         {
@@ -513,12 +452,17 @@ export default {
           sortable: false,
         },
         { prop: "mobile", label: "联系电话", minWidth: 100, sortable: false },
-          {
+        {
           prop: "roleId",
           label: "角色",
           minWidth: 80,
           sortable: false,
         },
+        {
+          prop: "positionName",
+          label: "岗位",
+          minWidth: 120,
+        },
         {
           prop: "status",
           label: "状态",
@@ -541,10 +485,10 @@ export default {
         DX_00: "",
       },
       //影像上传列表
-      imagesIdList:[],
-      dialogPassword:false, //密码是否显示明文
-      leaderOptions:[],
-      searchLeaderOptions:{}
+      imagesIdList: [],
+      dialogPassword: false, //密码是否显示明文
+      leaderOptions: [],
+      searchLeaderOptions: {}
     };
   },
   created() {
@@ -568,68 +512,68 @@ export default {
     },
   },
   methods: {
-    searchLeaderFun(){
+    searchLeaderFun() {
       this.$api.user
-          .findBackListByDeptId({ deptId: this.deptId })
-          .then((res) => {
-            this.searchLeaderOptions = res.data;
-          });
+        .findBackListByDeptId({ deptId: this.deptId })
+        .then((res) => {
+          this.searchLeaderOptions = res.data;
+        });
     },
     //获取角色数据
-    getFindRoleByUserId(){
-      this.$api.role.findRoleByUserId().then(res=>{
+    getFindRoleByUserId() {
+      this.$api.role.findRoleByUserId().then(res => {
         this.roles = res.data
       })
     },
     //状态改变时
-    statusChange(e){
-      if(e==0){
-        this.$set( this.formDataRules,'logoutTime',[
-        {required: true, message: '请选择日期', trigger: 'change' }
-          ])
-      }else{
+    statusChange(e) {
+      if (e == 0) {
+        this.$set(this.formDataRules, 'logoutTime', [
+          { required: true, message: '请选择日期', trigger: 'change' }
+        ])
+      } else {
         this.formDataRules.logoutTime = undefined
       }
     },
-    isShowFun(){
-      this.isShow=!this.isShow
+    isShowFun() {
+      this.isShow = !this.isShow
     },
-    identityChange(iden){
+    identityChange(iden) {
       let sex = null;
       let birth = null;
       let myDate = new Date();
       let month = myDate.getMonth() + 1;
       let day = myDate.getDate();
-        sex = iden.substring(16,17);
-        birth = iden.substring(6,10)+"-"+iden.substring(10,12)+"-"+iden.substring(12,14);
-        let age = 0;
-        if (iden.substring(10, 12) < month || iden.substring(10, 12) == month && iden.substring(12, 14) <= day) age++;
-      if(sex%2 === 0)
+      sex = iden.substring(16, 17);
+      birth = iden.substring(6, 10) + "-" + iden.substring(10, 12) + "-" + iden.substring(12, 14);
+      let age = 0;
+      if (iden.substring(10, 12) < month || iden.substring(10, 12) == month && iden.substring(12, 14) <= day) age++;
+      if (sex % 2 === 0)
         sex = '女';
       else
         sex = '男';
-        this.formDataDetail.birthday=birth
-        this.formDataDetail.sex=this.sexoptions.find(val=>sex==val.label).value
+      this.formDataDetail.birthday = birth
+      this.formDataDetail.sex = this.sexoptions.find(val => sex == val.label).value
     },
     // 查询Start
     queryStaffInfo() {
       this.findPage();
     },
-    sexFormatter(row){
+    sexFormatter(row) {
       // return this.sexoptions[row.sex]
       // return row.sex+'1'
-// console.log(val,1)
+      // console.log(val,1)
     },
     onZTreeClick: function (evt, treeId, treeNode) {
       // 点击事件
       this.currentTreeNode = evt;
-       this.deptId  = this.currentTreeNode.id;
-      this.pageData.pageNum =1;
+      this.deptId = this.currentTreeNode.id;
+      this.pageData.pageNum = 1;
       this.findPage();
       this.searchLeaderFun()
       // this.formData.deptId = [];
       // this.platform(treeId);
-      
+
     },
     //联级选择器触发事件
     handleChange(val) {
@@ -643,13 +587,13 @@ export default {
           });
       }
     },
-  
-       // 下一步
-       nextStep() {
+
+    // 下一步
+    nextStep() {
       this.$refs.formData.validate((valid) => {
         if (valid) {
           this.activeName = '2'
-          // this.formData.deptIdCom= this.formData.deptId 
+          // this.formData.deptIdCom= this.formData.deptId
           // this.formData.deptId =  this.formData.deptId.at(-1);
           // if (this.formData.referrerId) {
           //   this.formData.referrerName = this.recommenderOptions.find(val => this.formData.referrerId == val.id).name
@@ -667,7 +611,7 @@ export default {
           // });
         }
       });
-  },
+    },
     // 右侧列表的方法Start
     findPage(data) {
       // 获取分页数据
@@ -675,31 +619,31 @@ export default {
         this.pageData.pageNum = data.pageRequest.pageNum;
         this.pageData.pageSize = data.pageRequest.pageSize;
       }
-       let dto={
-        deptId:this.deptId,
-        mobile:this.pageData.mobile,
-        name:this.pageData.name,
-        userId:this.pageData.userId,
-        status:this.pageData.status,
-        agentFlag:0,
-        leaderName:this.pageData.leaderId,
-        roleId:'22',
+      let dto = {
+        deptId: this.deptId,
+        mobile: this.pageData.mobile,
+        name: this.pageData.name,
+        userId: this.pageData.userId,
+        status: this.pageData.status,
+        agentFlag: 0,
+        leaderName: this.pageData.leaderId,
+        roleId: '22',
       }
       // .findUserList({
       //     ...this.pageData,
       //     dto: { ...data, roleId: "20", deptId: this.deptId,agentFlag: "2", },
       //   })
       this.$api.user
-        .findBackUserList({dto,pageNum:this.pageData.pageNum,pageSize:this.pageData.pageSize})
+        .findBackUserList({ dto, pageNum: this.pageData.pageNum, pageSize: this.pageData.pageSize })
         .then((res) => {
-          res.data.records.forEach(val=>{
-            if(val.sex&& val.sex!==''&& val.sex!==null){
-              val.sex=this.sexoptions.find(ele=>ele.value==val.sex).label
+          res.data.records.forEach(val => {
+            if (val.sex && val.sex !== '' && val.sex !== null) {
+              val.sex = this.sexoptions.find(ele => ele.value == val.sex).label
             }
-            if(val.status&& val.status!==''&& val.status!==null){
-              val.status=this.user_statusoptions.find(ele=>ele.value==val.status).label
+            if (val.status && val.status !== '' && val.status !== null) {
+              val.status = this.user_statusoptions.find(ele => ele.value == val.status).label
             }
-            val.roleId=val.roleName
+            val.roleId = val.roleName
           })
           this.pageResult = {
             content: res.data.records,
@@ -709,16 +653,16 @@ export default {
             totalSize: res.data.total,
           };
         })
-       
+
     },
-    beforeTabLeave(){
+    beforeTabLeave() {
       // let p = new Promise((resolve, reject) => {
       //   this.$refs.formData.validate(async (valid) => {
       //     valid ? resolve() : reject();
       //     if (valid !== resolve()) {
       //       // this.$message.error("请完善基本信息!");
       //     }
-        
+
       //   });
       // });
       // return p;
@@ -738,30 +682,30 @@ export default {
       let res = await this.$api.user.getUserDatail(params.row.userId)
       if (res.code == 200) {
         this.$api.user
-          .findListByDeptId({ deptId: res.data.sysUser.deptId,id:params.row.userId })
+          .findListByDeptId({ deptId: res.data.sysUser.deptId, id: params.row.userId })
           .then((res) => {
             this.leaderOptions = res.data;
           });
         res.data.sysUser.status += ''
         this.formData = res.data.sysUser
-        if(this.formData.status==0){
-          this.$set( this.formDataRules,'logoutTime',[
-            {  required: true, message: '请选择日期', trigger: 'change' }
+        if (this.formData.status == 0) {
+          this.$set(this.formDataRules, 'logoutTime', [
+            { required: true, message: '请选择日期', trigger: 'change' }
           ])
-        }else{
+        } else {
           this.formDataRules.logoutTime = undefined
         }
-        if(res.data.esmUserImageVo.length > 0) {
-          this.imagesIdList = res.data.esmUserImageVo.map(item=>{
+        if (res.data.esmUserImageVo.length > 0) {
+          this.imagesIdList = res.data.esmUserImageVo.map(item => {
             item.path = process.env.BASE_URL + item.path
-            this.dataForm[item.type]=item.path
+            this.dataForm[item.type] = item.path
             return {
-              imageId:item.imageId,
-              type:item.type
+              imageId: item.imageId,
+              type: item.type
             }
           })
         }
-        this.formDataDetail = res.data.sysUserInfo?res.data.sysUserInfo:{}
+        this.formDataDetail = res.data.sysUserInfo ? res.data.sysUserInfo : {}
         // this.formData.password = ''
         this.dialogTitle = "编辑后线人员";
         this.dialogVisible = true;
@@ -785,9 +729,9 @@ export default {
             }
           });
         })
-        .catch(() => {});
+        .catch(() => { });
     },
-    
+
     //添加人员
     handleAddButton() {
       // console.log(this.currentTreeNode.managementSource)
@@ -796,15 +740,15 @@ export default {
       //   return;
       // }
       this.$api.user
-      .findListByDeptId({ deptId: this.formData.deptId })
-      .then((res) => {
-        this.leaderOptions = res.data;
-      });
+        .findListByDeptId({ deptId: this.formData.deptId })
+        .then((res) => {
+          this.leaderOptions = res.data;
+        });
       if (this.currentTreeNode == null) {
         this.$message.info("请选择所属公司或部门");
         return;
       }
-      if(this.currentTreeNode.comlevel!=null||this.currentTreeNode.managementSource!=null){ //团队代理人managementSource为2  渠道为1  后线为空
+      if (this.currentTreeNode.comlevel != null || this.currentTreeNode.managementSource != null) { //团队代理人managementSource为2  渠道为1  后线为空
         this.$message.info("请选择第六级机构");
         return;
       }
@@ -838,7 +782,7 @@ export default {
         .then((_) => {
           done();
         })
-        .catch((_) => {});
+        .catch((_) => { });
     },
     closeDialog() {
       // 清空数据
@@ -872,14 +816,14 @@ export default {
               //   });
               //   return false
               // }
-              if(this.formData.positionId){
-                this.formData.positionName=this.postOption.find(val=>val.postId==this.formData.positionId).postName
+              if (this.formData.positionId) {
+                this.formData.positionName = this.postOption.find(val => val.postId == this.formData.positionId).postName
               }
-              if(this.formData.leaderId){
-                this.formData.leaderName=this.leaderOptions.find(val=>val.id==this.formData.leaderId).name
+              if (this.formData.leaderId) {
+                this.formData.leaderName = this.leaderOptions.find(val => val.id == this.formData.leaderId).name
               }
               if (this.dialogTitle == '新增后线人员') {
-                this.$api.user.saveUserInfo({esmUserImageVo:this.imagesIdList, sysUser: this.formData, sysUserInfo: this.formDataDetail }).then((res) => {
+                this.$api.user.saveUserInfo({ esmUserImageVo: this.imagesIdList, sysUser: this.formData, sysUserInfo: this.formDataDetail }).then((res) => {
                   if (res.code == 200) {
                     this.$message({
                       message: "保存成功",
@@ -897,8 +841,8 @@ export default {
                   }
                 });
               }
-              else{
-                this.$api.user.updateUserInfo(this.formData.id,{ esmUserImageVo:this.imagesIdList,sysUser: this.formData, sysUserInfo: this.formDataDetail }).then((res) => {
+              else {
+                this.$api.user.updateUserInfo(this.formData.id, { esmUserImageVo: this.imagesIdList, sysUser: this.formData, sysUserInfo: this.formDataDetail }).then((res) => {
                   if (res.code == 200) {
                     this.$message({
                       message: "编辑成功",
@@ -942,19 +886,22 @@ export default {
 .queryFrom .queryButton .el-form-item__content {
   margin-left: 0px !important;
 }
-.disc{
-  -webkit-text-security:disc;
+
+.disc {
+  -webkit-text-security: disc;
   position: relative;
 }
-.none{
-  -webkit-text-security:none;
+
+.none {
+  -webkit-text-security: none;
   position: relative;
 }
-.icon{
+
+.icon {
   color: #ccc;
   position: absolute;
   right: 0;
-  top:10px;
+  top: 10px;
   text-align: center
 }
 </style>

+ 10 - 4
src/views/PeopleManage/TeamLeader/TeamLeaderManage.vue

@@ -72,6 +72,7 @@
                   <el-form-item label="状态">
                     <el-select
                       style="width: 200px"
+                      size="small"
                       clearable
                       v-model="pageData.status"
                       placeholder="请选择"
@@ -471,7 +472,7 @@ import KtButton from "@/views/Core/KtButton"; // 按钮权限组件
 import tree from "@/components/ztree.vue"; // 机构树组件
 import KtCommonTable from "@/views/Core/KtCommonTable.vue"; //表格组件
 import { validateSfz } from "../../../utils/validate.js";
-import mixa from '../mixin' 
+import mixa from '../mixin'
 const mixin = new mixa({
   treeTypeNum:2 //树分类过滤参数
 })
@@ -481,7 +482,7 @@ export default {
     tree,
     KtCommonTable,
   },
-  mixins: [mixin], 
+  mixins: [mixin],
   data() {
     return {
       activeName: "1",
@@ -560,7 +561,8 @@ export default {
         {
           prop: "managementSource",
           label: "来源",
-          sortable: false,
+          minWidth: 80,
+          formatter: this.managementSourceFormatter
         },
         {
           prop: "status",
@@ -580,6 +582,10 @@ export default {
   created() {
   },
   methods: {
+    managementSourceFormatter(row){
+      const managementSource=row.managementSource=='2'?"个代":"渠道"
+      return managementSource;
+    },
     //状态改变时
     statusChange(e) {
       if (e == 0) {
@@ -775,7 +781,7 @@ export default {
         this.$message.info("请选择第六级机构");
         return;
       }
-      
+
       // let deptId=''
       // if(this.formData.deptId){
       //    deptId = this.formData.deptId.at(-1);

+ 2 - 3
src/views/Sys/Deptall.vue

@@ -81,6 +81,8 @@
         >
           <el-table-column prop="name" label="部门管理" width="300">
           </el-table-column>
+          <el-table-column prop="deptCount" label="部门数量" width="80" align="center">
+          </el-table-column>
           <el-table-column prop="id" label="ID" width="150" align="center">
           </el-table-column>
           <el-table-column
@@ -924,7 +926,6 @@ export default {
       if (this.dataForm.comlevel === "5") {
         //第5级是门店,去服务器获取最大编号
         this.$api.dept.findMaxHouseId(this.currentTreeNode.id).then((res) => {
-          console.log(res);
           let newId = parseInt(res.data) + 1;
           if (newId < 10) {
             newId = "0" + newId;
@@ -944,7 +945,6 @@ export default {
           type: "info",
         });
       }
-      console.log(this.currentTreeNode.id);
       if (this.currentTreeNode.id.indexOf("D") >= 0) {
         return this.$message({
           message: "部门下无法增设部门",
@@ -956,7 +956,6 @@ export default {
       this.deptDataForm.deptType = "D"; //类型是机构(C是机构,D是部门)
       this.deptDataForm.parentId = this.currentTreeNode.id;
       this.$api.dept.findMaxDeptId(this.currentTreeNode.id).then((res) => {
-        console.log(res);
         let newId = parseInt(res.data) + 1;
         if (newId < 10) {
           newId = "0" + newId;

+ 31 - 28
src/views/Task/AgentPoolChannel/AgentPoolChannel.vue

@@ -3,9 +3,9 @@
     <retrievalForm :fields="retrievalFields" @submit="handleFormSubmit" @toggleCollapse="toggleCollapse"
       @areaSelectChange="areaSelectChange"></retrievalForm>
     <kt-common-table :data="pageResult" :columns="columns" element-loading-text="加载中..." v-loading="loading"
-      :showBatchDelete="false" @findPage="findPage" button3Name="转发" button3Type="text"
-      @handleButton3="transmit" button2Name="报价轨迹" button2Type="text"
-      @handleButton2="trajectory" button5Name="详情" button5Type="text" @handleButton5="detailFun"></kt-common-table>
+      :showBatchDelete="false" @findPage="findPage" button3Name="转发" button3Type="text" @handleButton3="transmit"
+      button2Name="报价轨迹" button2Type="text" @handleButton2="trajectory" button5Name="详情" button5Type="text"
+      @handleButton5="detailFun"></kt-common-table>
     <el-dialog title="转发" :visible.sync="dialogVisible" width="30%">
       转发人:
       <el-select v-model="transmitValue" placeholder="请选择">
@@ -22,11 +22,8 @@
         <span>订单轨迹</span>
       </div>
       <div style="height: 300px; overflow-y: auto">
-        <el-steps direction="vertical" :active="trajectoryTable.length - 1" >
-          <el-step v-for="item in trajectoryTable"
-            :key="item.id"
-            :title="getStatusText(item.orderStatus)"
-          >
+        <el-steps direction="vertical" :active="trajectoryTable.length - 1">
+          <el-step v-for="item in trajectoryTable" :key="item.id" :title="getStatusText(item.orderStatus)">
             <template slot="description">
               <span>保险公司:{{ item.insCompany }}</span>
               <span>提交人:{{ item.operator }}</span>
@@ -62,9 +59,9 @@ export default {
         userId: "",
       },
 
-      ddgjdialogVisible:false,
-      trajectoryTable:[],
-      optionsStatus:[],
+      ddgjdialogVisible: false,
+      trajectoryTable: [],
+      optionsStatus: [],
     }
   },
   mixins: [mixin],
@@ -77,7 +74,7 @@ export default {
 
   methods: {
     getStatusText(code) {
-      return this.optionsStatus.find(val=>val.dictValue==code).dictTag;;
+      return this.optionsStatus.find(val => val.dictValue == code).dictTag;;
     },
 
     handleFormSubmit(data) {
@@ -113,7 +110,7 @@ export default {
           }
         });
     },
-    trajectory(row){
+    trajectory(row) {
       this.$api.letter.queryBySuborder(row.row.subOrderId).then((res) => {
         if (res.code == 200 && res.data.length > 0) {
           this.ddgjdialogVisible = true;
@@ -190,14 +187,15 @@ export default {
       }
     },
     detailFun(row) {
-      this.orderInfo=row.row;
       let params = {
         companyId: row.row.subOrderId
       };
-      this.cpolicy();
       this.$api.letter.getByCompanyId(params).then(res => {
         if (res.code == "200") {
           var data = res.data;
+          this.orderInfo = res.data;
+          this.cpolicy();
+          this.ImageList();
           data.kindinfo.map((ele, index) => {
             switch (ele.kindCode) {
               case "A":
@@ -230,26 +228,31 @@ export default {
 </script>
 
 <style scoped lang="scss">
-/deep/{
-  .el-step__title,.el-step__icon-inner{
-    color:var(--themeColor)
+/deep/ {
+  .el-step__title,
+  .el-step__icon-inner {
+    color: var(--themeColor)
+  }
+
+  .el-step__line-inner {
+    height: 0;
+    display: none
   }
-  .el-step__line-inner{
-      height:0;
-      display:none
-    }
-  .is-flex{
 
-    .el-step__icon{
+  .is-flex {
+
+    .el-step__icon {
       background: var(--themeColor)
     }
-    .el-step__icon-inner{
+
+    .el-step__icon-inner {
       color: #fff;
     }
   }
-  .el-step__icon.is-text{
-    border:none;
-    box-shadow: 0px 2px 2px 0px rgba(0,0,0,0.1);
+
+  .el-step__icon.is-text {
+    border: none;
+    box-shadow: 0px 2px 2px 0px rgba(0, 0, 0, 0.1);
   }
 }
 </style>

+ 5 - 2
src/views/Task/AgentPoolChannel/AgentPoolChannel1.vue

@@ -188,14 +188,17 @@ export default {
       }
     },
     detailFun(row) {
-      this.orderInfo=row.row;
+
       let params = {
         companyId: row.row.subOrderId
       };
-      this.cpolicy();
+
       this.$api.letter.getByCompanyId(params).then(res => {
         if (res.code == "200") {
           var data = res.data;
+          this.orderInfo = res.data;
+          this.cpolicy();
+          this.ImageList();
           data.kindinfo.map((ele, index) => {
             switch (ele.kindCode) {
               case "A":

+ 4 - 3
src/views/Task/AgentPoolChannel/AgentPoolChannel2.vue

@@ -188,15 +188,16 @@ export default {
         this.queryFrom.endDate = e[1];
       }
     },
-    detailFun(row) {
-      this.orderInfo=row.row;
+    detailFun(row) {;
       let params = {
         companyId: row.row.subOrderId
       };
-      this.cpolicy();
       this.$api.letter.getByCompanyId(params).then(res => {
         if (res.code == "200") {
           var data = res.data;
+          this.orderInfo = res.data;
+          this.cpolicy();
+          this.ImageList();
           data.kindinfo.map((ele, index) => {
             switch (ele.kindCode) {
               case "A":

+ 3 - 2
src/views/Task/AgentPoolChannel/AgentPoolChannel3.vue

@@ -189,14 +189,15 @@ export default {
       }
     },
     detailFun(row) {
-      this.orderInfo=row.row;
       let params = {
         companyId: row.row.subOrderId
       };
-      this.cpolicy();
       this.$api.letter.getByCompanyId(params).then(res => {
         if (res.code == "200") {
           var data = res.data;
+          this.orderInfo = res.data;
+          this.cpolicy();
+          this.ImageList();
           data.kindinfo.map((ele, index) => {
             switch (ele.kindCode) {
               case "A":

+ 3 - 2
src/views/Task/AgentPoolChannel/AgentPoolChannel4.vue

@@ -187,14 +187,15 @@ export default {
       }
     },
     detailFun(row) {
-      this.orderInfo=row.row;
       let params = {
         companyId: row.row.subOrderId
       };
-      this.cpolicy();
       this.$api.letter.getByCompanyId(params).then(res => {
         if (res.code == "200") {
           var data = res.data;
+          this.orderInfo = res.data;
+          this.cpolicy();
+          this.ImageList();
           data.kindinfo.map((ele, index) => {
             switch (ele.kindCode) {
               case "A":

+ 3 - 2
src/views/Task/CompanyPoolChannel/CompanyPoolChannel.vue

@@ -189,14 +189,15 @@ export default {
       }
     },
     detailFun(row) {
-      this.orderInfo=row.row;
       let params = {
         companyId: row.row.subOrderId
       };
-      this.cpolicy();
       this.$api.letter.getByCompanyId(params).then(res => {
         if (res.code == "200") {
           var data = res.data;
+          this.orderInfo = res.data;
+          this.cpolicy();
+          this.ImageList();
           data.kindinfo.map((ele, index) => {
             switch (ele.kindCode) {
               case "A":

+ 3 - 2
src/views/Task/CompanyPoolChannel/CompanyPoolChannel1.vue

@@ -193,14 +193,15 @@ export default {
       }
     },
     detailFun(row) {
-      this.orderInfo=row.row;
       let params = {
         companyId: row.row.subOrderId
       };
-      this.cpolicy();
       this.$api.letter.getByCompanyId(params).then(res => {
         if (res.code == "200") {
           var data = res.data;
+          this.orderInfo = res.data;
+          this.cpolicy();
+          this.ImageList();
           data.kindinfo.map((ele, index) => {
             switch (ele.kindCode) {
               case "A":

+ 3 - 2
src/views/Task/CompanyPoolChannel/CompanyPoolChannel2.vue

@@ -188,14 +188,15 @@ export default {
       }
     },
     detailFun(row) {
-      this.orderInfo=row.row;
       let params = {
         companyId: row.row.subOrderId
       };
-      this.cpolicy();
       this.$api.letter.getByCompanyId(params).then(res => {
         if (res.code == "200") {
           var data = res.data;
+          this.orderInfo = res.data;
+          this.cpolicy();
+          this.ImageList();
           data.kindinfo.map((ele, index) => {
             switch (ele.kindCode) {
               case "A":

+ 5 - 2
src/views/Task/CompanyPoolChannel/CompanyPoolChannel3.vue

@@ -189,14 +189,17 @@ export default {
       }
     },
     detailFun(row) {
-      this.orderInfo=row.row;
+
       let params = {
         companyId: row.row.subOrderId
       };
-      this.cpolicy();
+
       this.$api.letter.getByCompanyId(params).then(res => {
         if (res.code == "200") {
           var data = res.data;
+          this.orderInfo = res.data;
+          this.cpolicy();
+          this.ImageList();
           data.kindinfo.map((ele, index) => {
             switch (ele.kindCode) {
               case "A":

+ 3 - 2
src/views/Task/CompanyPoolChannel/CompanyPoolChannel4.vue

@@ -188,14 +188,15 @@ export default {
       }
     },
     detailFun(row) {
-      this.orderInfo=row.row;
       let params = {
         companyId: row.row.subOrderId
       };
-      this.cpolicy();
       this.$api.letter.getByCompanyId(params).then(res => {
         if (res.code == "200") {
           var data = res.data;
+          this.orderInfo = res.data;
+          this.cpolicy();
+          this.ImageList();
           data.kindinfo.map((ele, index) => {
             switch (ele.kindCode) {
               case "A":

+ 3 - 2
src/views/Task/TaskPoolChannel/TaskPoolChannel.vue

@@ -189,14 +189,15 @@ export default {
       }
     },
     detailFun(row) {
-      this.orderInfo=row.row;
       let params = {
         companyId: row.row.subOrderId
       };
-      this.cpolicy();
       this.$api.letter.getByCompanyId(params).then(res => {
         if (res.code == "200") {
           var data = res.data;
+          this.orderInfo = res.data;
+          this.cpolicy();
+          this.ImageList();
           data.kindinfo.map((ele, index) => {
             switch (ele.kindCode) {
               case "A":

+ 5 - 2
src/views/Task/TaskPoolChannel/TaskPoolChannel1.vue

@@ -190,14 +190,17 @@ export default {
       }
     },
     detailFun(row) {
-      this.orderInfo=row.row;
+
       let params = {
         companyId: row.row.subOrderId
       };
-      this.cpolicy();
+
       this.$api.letter.getByCompanyId(params).then(res => {
         if (res.code == "200") {
           var data = res.data;
+          this.orderInfo = res.data;
+          this.cpolicy();
+          this.ImageList();
           data.kindinfo.map((ele, index) => {
             switch (ele.kindCode) {
               case "A":

+ 3 - 2
src/views/Task/TaskPoolChannel/TaskPoolChannel2.vue

@@ -189,14 +189,15 @@ export default {
       }
     },
     detailFun(row) {
-      this.orderInfo=row.row;
       let params = {
         companyId: row.row.subOrderId
       };
-      this.cpolicy();
       this.$api.letter.getByCompanyId(params).then(res => {
         if (res.code == "200") {
           var data = res.data;
+          this.orderInfo = res.data;
+          this.cpolicy();
+          this.ImageList();
           data.kindinfo.map((ele, index) => {
             switch (ele.kindCode) {
               case "A":

+ 31 - 28
src/views/Task/TaskPoolChannel/TaskPoolChannel3.vue

@@ -3,9 +3,9 @@
     <retrievalForm :fields="retrievalFields" @submit="handleFormSubmit" @toggleCollapse="toggleCollapse"
       @areaSelectChange="areaSelectChange"></retrievalForm>
     <kt-common-table :data="pageResult" :columns="columns" element-loading-text="加载中..." v-loading="loading"
-      :showBatchDelete="false" @findPage="findPage" button3Name="转发" button3Type="text"
-      @handleButton3="transmit" button2Name="报价轨迹" button2Type="text"
-      @handleButton2="trajectory" button5Name="详情" button5Type="text" @handleButton5="detailFun"></kt-common-table>
+      :showBatchDelete="false" @findPage="findPage" button3Name="转发" button3Type="text" @handleButton3="transmit"
+      button2Name="报价轨迹" button2Type="text" @handleButton2="trajectory" button5Name="详情" button5Type="text"
+      @handleButton5="detailFun"></kt-common-table>
     <el-dialog title="转发" :visible.sync="dialogVisible" width="30%">
       转发人:
       <el-select v-model="transmitValue" placeholder="请选择">
@@ -22,11 +22,8 @@
         <span>订单轨迹</span>
       </div>
       <div style="height: 300px; overflow-y: auto">
-        <el-steps direction="vertical" :active="trajectoryTable.length - 1" >
-          <el-step v-for="item in trajectoryTable"
-            :key="item.id"
-            :title="getStatusText(item.orderStatus)"
-          >
+        <el-steps direction="vertical" :active="trajectoryTable.length - 1">
+          <el-step v-for="item in trajectoryTable" :key="item.id" :title="getStatusText(item.orderStatus)">
             <template slot="description">
               <span>保险公司:{{ item.insCompany }}</span>
               <span>提交人:{{ item.operator }}</span>
@@ -61,9 +58,9 @@ export default {
         userId: "",
       },
 
-      ddgjdialogVisible:false,
-      trajectoryTable:[],
-      optionsStatus:[],
+      ddgjdialogVisible: false,
+      trajectoryTable: [],
+      optionsStatus: [],
     }
   },
   mixins: [mixin],
@@ -76,7 +73,7 @@ export default {
 
   methods: {
     getStatusText(code) {
-      return this.optionsStatus.find(val=>val.dictValue==code).dictTag;;
+      return this.optionsStatus.find(val => val.dictValue == code).dictTag;;
     },
     handleFormSubmit(data) {
       let obj = Object.assign(this.pageRequest, data)
@@ -111,7 +108,7 @@ export default {
           }
         });
     },
-    trajectory(row){
+    trajectory(row) {
       this.$api.letter.queryBySuborder(row.row.subOrderId).then((res) => {
         if (res.code == 200 && res.data.length > 0) {
           this.ddgjdialogVisible = true;
@@ -188,14 +185,15 @@ export default {
       }
     },
     detailFun(row) {
-      this.orderInfo=row.row;
       let params = {
         companyId: row.row.subOrderId
       };
-      this.cpolicy();
       this.$api.letter.getByCompanyId(params).then(res => {
         if (res.code == "200") {
           var data = res.data;
+          this.orderInfo = res.data;
+          this.cpolicy();
+          this.ImageList();
           data.kindinfo.map((ele, index) => {
             switch (ele.kindCode) {
               case "A":
@@ -228,26 +226,31 @@ export default {
 </script>
 
 <style scoped lang="scss">
-/deep/{
-  .el-step__title,.el-step__icon-inner{
-    color:var(--themeColor)
+/deep/ {
+  .el-step__title,
+  .el-step__icon-inner {
+    color: var(--themeColor)
+  }
+
+  .el-step__line-inner {
+    height: 0;
+    display: none
   }
-  .el-step__line-inner{
-      height:0;
-      display:none
-    }
-  .is-flex{
 
-    .el-step__icon{
+  .is-flex {
+
+    .el-step__icon {
       background: var(--themeColor)
     }
-    .el-step__icon-inner{
+
+    .el-step__icon-inner {
       color: #fff;
     }
   }
-  .el-step__icon.is-text{
-    border:none;
-    box-shadow: 0px 2px 2px 0px rgba(0,0,0,0.1);
+
+  .el-step__icon.is-text {
+    border: none;
+    box-shadow: 0px 2px 2px 0px rgba(0, 0, 0, 0.1);
   }
 }
 </style>

+ 3 - 2
src/views/Task/TaskPoolChannel/TaskPoolChannel4.vue

@@ -187,14 +187,15 @@ export default {
       }
     },
     detailFun(row) {
-      this.orderInfo=row.row;
       let params = {
         companyId: row.row.subOrderId
       };
-      this.cpolicy();
       this.$api.letter.getByCompanyId(params).then(res => {
         if (res.code == "200") {
           var data = res.data;
+          this.orderInfo = res.data;
+          this.cpolicy();
+          this.ImageList();
           data.kindinfo.map((ele, index) => {
             switch (ele.kindCode) {
               case "A":

+ 33 - 32
src/views/Task/mixin.js

@@ -35,7 +35,7 @@ export const mixin = { // 导出混入对象
 
         },
         {
-          name: 'subOrderId',
+          name: 'id',
           label: '订单号',
           type: 'input',
 
@@ -130,6 +130,7 @@ export const mixin = { // 导出混入对象
         { prop: "subOrderId", label: "订单号", minWidth: 180 },
         { prop: "userid", label: "业务员", minWidth: 160, formatter: this.useridFormatter },
         { prop: "insCompany", label: "保险公司", minWidth: 120 },
+        { prop: "partnerCompaniesName", label: "合作公司", minWidth: 120 },
         { prop: "agreementName", label: "协议", minWidth: 160 },
         { prop: "licenseno", label: "车牌号", minWidth: 160 },
         { prop: "insuredname", label: "投保人姓名", minWidth: 120 },
@@ -143,7 +144,7 @@ export const mixin = { // 导出混入对象
       options: [],//转发人列表
       transmitValue: "", //选中的转发人
       orderNo: '', //主订单号
-      subOrderId: '', //子订单号
+      id: '', //子订单号
       queryOrders: {},
       carImageList: [], //车辆影像
       ownerImageList: [], //车主影像
@@ -162,7 +163,6 @@ export const mixin = { // 导出混入对象
     this.$api.dept.findAllTree().then(res => {
       this.institutionOptions = res.data;
     });
-    this.ImageList();
     this.areaqueryList(1, 99, "provinceId");
     this.CompanyList();
     this.agrmentlist();
@@ -215,16 +215,17 @@ export const mixin = { // 导出混入对象
       });
     },
     cpolicy(){
-      this.oldfileList = [];
-      let businessList = []
-      let accidentList = []
+
       if (this.orderInfo.orderstatus == "3") {
+        this.oldfileList = [];
+        let businessList = []
+        let accidentList = []
         switch (this.orderInfo.inscompany) {
           case "永安财险":
             if (this.orderInfo.jqpolicyno) {
               this.$api.letter
                 .getPolicyPrint({
-                  companyId: this.orderInfo.subOrderId,
+                  companyId: this.orderInfo.id,
                   policytype: "jq",
                 })
                 .then((res) => {
@@ -245,7 +246,7 @@ export const mixin = { // 导出混入对象
                 });
               this.$api.letter
                 .getPolicyPrint2({
-                  companyId: this.orderInfo.subOrderId,
+                  companyId: this.orderInfo.id,
                   policytype: "jq",
                 })
                 .then((res) => {
@@ -268,7 +269,7 @@ export const mixin = { // 导出混入对象
             if (this.orderInfo.sypolicyno) {
               this.$api.letter
                 .getPolicyPrint({
-                  companyId: this.orderInfo.subOrderId,
+                  companyId: this.orderInfo.id,
                   policytype: "sy",
                 })
                 .then((res) => {
@@ -293,7 +294,7 @@ export const mixin = { // 导出混入对象
             if (this.orderInfo.jqpolicyno) {
               this.$api.letter
                 .HuataigetPolicyPrint({
-                  companyId: this.orderInfo.subOrderId,
+                  companyId: this.orderInfo.id,
                   riskCode: "0507",
                   type: "2", //2:保单
                 })
@@ -321,7 +322,7 @@ export const mixin = { // 导出混入对象
             if (this.orderInfo.sypolicyno) {
               this.$api.letter
                 .HuataigetPolicyPrint({
-                  companyId: this.orderInfo.subOrderId,
+                  companyId: this.orderInfo.id,
                   riskCode: "0510",
                   type: "2", //2:保单
                 })
@@ -342,7 +343,7 @@ export const mixin = { // 导出混入对象
             if (this.orderInfo.jqpolicyno) {
               this.$api.letter
                 .ZhongmeigetPolicyPrint({
-                  companyId: this.orderInfo.subOrderId,
+                  companyId: this.orderInfo.id,
                   riskCode: "0507",
                   type: "2", //2:保单
                 })
@@ -359,7 +360,7 @@ export const mixin = { // 导出混入对象
                 });
               this.$api.letter
                 .ZhongmeigetPolicyPrint({
-                  companyId: this.orderInfo.subOrderId,
+                  companyId: this.orderInfo.id,
                   riskCode: "0507",
                   type: "1", // 1:标志
                 })
@@ -378,7 +379,7 @@ export const mixin = { // 导出混入对象
             if (this.orderInfo.sypolicyno) {
               this.$api.letter
                 .ZhongmeigetPolicyPrint({
-                  companyId: this.orderInfo.subOrderId,
+                  companyId: this.orderInfo.id,
                   riskCode: "0510",
                   type: "2", //2:保单
                 })
@@ -399,7 +400,7 @@ export const mixin = { // 导出混入对象
                 this.$api.letter
                   .ZhongmeigetPolicyPrint({
                     ridePolicyNo: ele.ridePolicyNo,
-                    companyId: this.orderInfo.subOrderId,
+                    companyId: this.orderInfo.id,
                     riskCode: "0513",
                     type: "2", //2:保单
                   })
@@ -421,7 +422,7 @@ export const mixin = { // 导出混入对象
             if (this.orderInfo.jqpolicyno) {
               this.$api.letter
                 .yongchenggetPolicyPrint({
-                  companyId: this.orderInfo.subOrderId,
+                  companyId: this.orderInfo.id,
                   riskCode: "0507",
                   type: "2", //2:保单
                 })
@@ -449,7 +450,7 @@ export const mixin = { // 导出混入对象
             if (this.orderInfo.sypolicyno) {
               this.$api.letter
                 .yongchenggetPolicyPrint({
-                  companyId: this.orderInfo.subOrderId,
+                  companyId: this.orderInfo.id,
                   riskCode: "0510",
                   type: "2", //2:保单
                 })
@@ -469,7 +470,7 @@ export const mixin = { // 导出混入对象
               this.orderInfo.crossInsurance.map((ele) => {
                 this.$api.letter
                   .yongchenggetPolicyPrint({
-                    companyId: this.orderInfo.subOrderId,
+                    companyId: this.orderInfo.id,
                     policyNumber: ele.policyNumber,
                     riskCode: "0513",
                     type: "2", //2:保单
@@ -492,7 +493,7 @@ export const mixin = { // 导出混入对象
             if (this.orderInfo.jqpolicyno) {
               this.$api.letter
                 .guoRengetPolicyPrint({
-                  companyId: this.orderInfo.subOrderId,
+                  companyId: this.orderInfo.id,
                   riskCode: "0507",
                   type: "2", //2:保单
                 })
@@ -509,7 +510,7 @@ export const mixin = { // 导出混入对象
                 });
               this.$api.letter
                 .guoRengetPolicyPrint({
-                  companyId: this.orderInfo.subOrderId,
+                  companyId: this.orderInfo.id,
                   riskCode: "0507",
                   type: "1", //1:标志
                 })
@@ -528,7 +529,7 @@ export const mixin = { // 导出混入对象
             if (this.orderInfo.sypolicyno) {
               this.$api.letter
                 .guoRengetPolicyPrint({
-                  companyId: this.orderInfo.subOrderId,
+                  companyId: this.orderInfo.id,
                   riskCode: "0510",
                   type: "2", //2:保单
                 })
@@ -548,7 +549,7 @@ export const mixin = { // 导出混入对象
               this.orderInfo.crossInsurance.map((ele) => {
                 this.$api.letter
                   .guoRengetPolicyPrint({
-                    companyId: this.orderInfo.subOrderId,
+                    companyId: this.orderInfo.id,
                     policyNumber: ele.policyNumber,
 
                     riskCode: "0513",
@@ -573,7 +574,7 @@ export const mixin = { // 导出混入对象
             if (this.orderInfo.jqpolicyno) {
               this.$api.letter
                 .zijingetPolicyPrint({
-                  companyId: this.orderInfo.subOrderId,
+                  companyId: this.orderInfo.id,
                   riskCode: "0507",
                   type: "2", //2:保单
                 })
@@ -590,7 +591,7 @@ export const mixin = { // 导出混入对象
                 });
               this.$api.letter
                 .zijingetPolicyPrint({
-                  companyId: this.orderInfo.subOrderId,
+                  companyId: this.orderInfo.id,
                   riskCode: "0507",
                   type: "1", //1:标志
                 })
@@ -609,7 +610,7 @@ export const mixin = { // 导出混入对象
             if (this.orderInfo.sypolicyno) {
               this.$api.letter
                 .zijingetPolicyPrint({
-                  companyId: this.orderInfo.subOrderId,
+                  companyId: this.orderInfo.id,
                   riskCode: "0510",
                   type: "2", //2:保单
                 })
@@ -629,7 +630,7 @@ export const mixin = { // 导出混入对象
               this.orderInfo.crossInsurance.map((ele) => {
                 this.$api.letter
                   .zijingetPolicyPrint({
-                    companyId: this.orderInfo.subOrderId,
+                    companyId: this.orderInfo.id,
                     policyNumber: ele.policyNumber,
                     riskCode: "0513",
                     type: "2", //2:保单
@@ -652,7 +653,7 @@ export const mixin = { // 导出混入对象
             if (this.orderInfo.jqpolicyno) {
               this.$api.letter
                 .getPolicyPrintboHai({
-                  companyId: this.orderInfo.subOrderId,
+                  companyId: this.orderInfo.id,
                 })
                 .then((res) => {
                   if (res.code == 200 && res.data) {
@@ -704,7 +705,7 @@ export const mixin = { // 导出混入对象
             if (this.orderInfo.jqpolicyno || this.orderInfo.sypolicyno) {
               this.$api.letter
                 .pythongetPolicyPrint({
-                  subOrderNo: this.orderInfo.subOrderId,
+                  subOrderNo: this.orderInfo.id,
                 })
                 .then((res) => {
                   if (res.code == 200 && res.data) {
@@ -751,7 +752,7 @@ export const mixin = { // 导出混入对象
             if (this.orderInfo.jqpolicyno) {
               this.$api.letter
                 .obtainWarranty({
-                  companyId: this.orderInfo.subOrderId,
+                  companyId: this.orderInfo.id,
                   riskCode: "0507",
                   type: "2", //2:保单
                 })
@@ -768,7 +769,7 @@ export const mixin = { // 导出混入对象
                 });
               this.$api.letter
                 .obtainWarranty({
-                  companyId: this.orderInfo.subOrderId,
+                  companyId: this.orderInfo.id,
                   riskCode: "0507",
                   type: "1", //1:标志
                 })
@@ -787,7 +788,7 @@ export const mixin = { // 导出混入对象
             if (this.orderInfo.sypolicyno) {
               this.$api.letter
                 .obtainWarranty({
-                  companyId: this.orderInfo.subOrderId,
+                  companyId: this.orderInfo.id,
                   riskCode: "0510",
                   type: "2", //2:保单
                 })
@@ -805,7 +806,7 @@ export const mixin = { // 导出混入对象
               this.orderInfo.crossInsurance.map((ele) => {
                 this.$api.letter
                   .zijingetPolicyPrint({
-                    companyId: this.orderInfo.subOrderId,
+                    companyId: this.orderInfo.id,
                     policyNumber: ele.policyNumber,
                     riskCode: "0513",
                     type: "2", //2:保单