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

src/http/moudules/dept.js

@@ -210,4 +210,57 @@ export const withdraw = (data) => {
         method: 'post',
         data
     })
+}
+
+//获取树结构
+export const sysDeptInternalAgentFindTree = (params) => {
+    return axios({
+        url: '/sysDeptInternalAgent/findTree',
+        method: 'get',
+        params
+    })
+}
+// 内部机构添加修改
+export const sysDeptInternalAgentAddOrUpdate = (data) => {
+    return axios({
+        url: '/sysDeptInternalAgent/addOrUpdate',
+        method: 'post',
+        data
+    })
+}
+
+//内部机构编辑回显
+export const findSysDeptInternalAgentById = (params) => {
+    return axios({
+        url: '/sysDeptInternalAgent/findSysDeptInternalAgentById',
+        method: 'get',
+        params
+    })
+}
+// 内部机构分页
+export const sysDeptInternalAgentQueryPage = (data) => {
+    return axios({
+        url: '/sysDeptInternalAgent/queryPage',
+        method: 'post',
+        data
+    })
+}
+
+
+// 机构类型
+export const sysDeptInternalAgentType = (data) => {
+    return axios({
+        url: '/sysDict/dictDetails/sysDeptInternalAgentType',
+        method: 'get',
+        data
+    })
+}
+
+// 内部机构删除
+export const sysDeptInternalAgentDelete = (data) => {
+    return axios({
+        url: '/sysDeptInternalAgent/delete',
+        method: 'post',
+        data
+    })
 }

src/http/moudules/letter.js

@@ -899,9 +899,9 @@ export const findForwardingListBySubOrderId = (subOrderId) => {
   })
 }
 // 判断显示报价单和二维码的样式
-export const getThemeByUserId = () => {
+export const getThemeByUserId = (userId ) => {
   return axios({
-    url: "/sys/quotation/getThemeByUserId",
+    url: "/sys/quotation/getThemeByUserId?userId="+userId ,
     method: "get",
   })
 }

src/http/moudules/task.js

@@ -1564,3 +1564,18 @@ export const updateNoHand = (data) => {
     data
   })
 }
+
+export const batchPinBalanceNew = (data) => {
+  return axios({
+    url: "/fnc/plyFee/batchPinBalanceNew",
+    method: "put",
+    data
+  })
+}
+export const querySumAmount = (data) => {
+  return axios({
+    url: "/sysAmountAuditing/querySumAmount",
+    method: "post",
+    data
+  })
+}

src/http/moudules/user.js

@@ -452,3 +452,49 @@ export const addOrDelete = (data) => {
     data
   })
 }
+
+
+// 获取前线机构树
+export const sysUserLinkFrontLineDeptQueryQxOrgTree= (params) => {
+  return axios({
+      url: '/sysUserLinkFrontLineDept/queryQxOrgTree',
+      method: 'get',
+      params
+  })
+}
+
+// 查询所有的后线人员配置前线机构列表
+export const sysUserLinkFrontLineDeptQueryPage = (data) => {
+  return axios({
+    url: '/sysUserLinkFrontLineDept/queryPage',
+    method: 'post',
+    data
+  })
+}
+
+
+// 后线人员配置前线机构删除
+export const sysUserLinkFrontLineDeptDelete = (data) => {
+  return axios({
+    url: '/sysUserLinkFrontLineDept/delete',
+    method: 'post',
+    data
+  })
+}
+
+// 后线人员配置前线机构添加修改
+export const sysUserLinkFrontLineDeptAddOrUpdate= (data) => {
+  return axios({
+    url: '/sysUserLinkFrontLineDept/addOrUpdate',
+    method: 'post',
+    data
+  })
+}
+// 查询所有的后线人员列表+分页+标红显示
+export const sysUserLinkFrontLineDeptFindAllUserList= (data) => {
+  return axios({
+    url: '/sysUserLinkFrontLineDept/findAllUserList',
+    method: 'post',
+    data
+  })
+}

src/views/FinancialManagement/CarInsurance/CompanySettlement/CarInsurance/DocumentaryFeesDetail.vue

@@ -145,7 +145,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="协议选择" prop="agreeId">
-              <el-select size="small" v-model="formDataAdd.agreeId" placeholder="请选择协议类型" style="width: 100%">
+              <el-select size="small" v-model="formDataAdd.agreeId" placeholder="请选择协议类型" style="width: 100%" filterable>
                 <el-option v-for="item in agreementTypeoptions" :key="item.dictValue" :label="item.agreementName"
                   :value="item.id"></el-option>
               </el-select>

src/views/FinancialManagement/CarInsurance/CompanySettlement/CarInsurance/HandlingFees.vue

@@ -188,7 +188,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="协议选择" prop="agreeId">
-              <el-select size="small" v-model="formDataAdd.agreeId" placeholder="请选择协议类型" style="width: 100%">
+              <el-select size="small" v-model="formDataAdd.agreeId" placeholder="请选择协议类型" style="width: 100%" filterable>
                 <el-option v-for="item in agreementTypeoptions" :key="item.dictValue" :label="item.agreementName"
                   :value="item.id"></el-option>
               </el-select>

src/views/FinancialManagement/CarInsurance/CompanySettlement/NoCarInsurance/DocumentaryFeesDetail.vue

@@ -105,7 +105,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="协议选择" prop="agreeId">
-              <el-select size="small" v-model="formDataAdd.agreeId" placeholder="请选择协议类型" style="width: 100%">
+              <el-select size="small" v-model="formDataAdd.agreeId" placeholder="请选择协议类型" style="width: 100%" filterable>
                 <el-option v-for="item in agreementTypeoptions" :key="item.dictValue" :label="item.agreementName"
                   :value="item.id"></el-option>
               </el-select>

src/views/FinancialManagement/CarInsurance/CompanySettlement/NoCarInsurance/HandlingFees.vue

@@ -158,7 +158,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="协议选择" prop="agreeId">
-              <el-select size="small" v-model="formDataAdd.agreeId" placeholder="请选择协议类型" style="width: 100%">
+              <el-select size="small" v-model="formDataAdd.agreeId" placeholder="请选择协议类型" style="width: 100%" filterable>
                 <el-option v-for="item in agreementTypeoptions" :key="item.dictValue" :label="item.agreementName"
                   :value="item.id"></el-option>
               </el-select>

src/views/FinancialManagement/CarInsurance/PlatformSettlement/NonVehicleBalance.vue

@@ -30,7 +30,7 @@
     </template>
     <div v-if="!Object.keys(totalList).length == 0">
         <el-row class="customStyle">
-          <el-col :span="4">总手续费：{{ totalList.commissionFeevalue }}</el-col>
+          <el-col :span="4">总应收金额：{{ totalList.commissionFeevalue }}</el-col>
           <el-col :span="4">已结算金额：{{ totalList.readyCommissionFeevalue }}</el-col>
           <el-col :span="4">未结算金额：{{ totalList.noInvoicCommissionFeevalue }}</el-col>
         </el-row>
@@ -166,10 +166,21 @@
   <el-col :span="8">总跟单费 ：{{ importData.totalHandingAmount }}</el-col>
   <el-col :span="8">总金额 ：{{ importData.totalOtherAmount }}</el-col>
 </el-row>
-  <el-upload style="margin-top:20px" action="#" class="upload-demo"  :limit="1" :auto-upload="false"
+  <el-row>
+    <el-col :span="4">
+      <el-upload style="margin-top:20px" action="#" class="upload-demo"  :limit="1" :auto-upload="false"
         :on-change="handImport"  ref="upload3"  :file-list="fileList">
         <el-button size="small" type="primary">点击上传</el-button>
-  </el-upload>
+      </el-upload>
+    </el-col>
+    <el-col :span="8">
+      <el-upload style="margin-top:20px" action="#" class="upload-demo"  :limit="1" :auto-upload="false"
+        :on-change="handleUpload"  ref="upload3"  accept=".png, .jpg, .jpeg" :file-list="fileList1">
+        <el-button size="small" type="primary">上传凭证</el-button>
+      </el-upload>
+    </el-col>
+  </el-row>
+  
     <el-table
     v-if="importData.resultList"
         border
@@ -345,6 +356,8 @@ export default {
   },
   data() {
     return {
+      fileList1: [],
+      batchData: {},
       totalList:{},
       importData:{},
       fileList:[],
@@ -840,6 +853,23 @@ export default {
   },
   
   methods: {
+    // 上传凭证
+    handleUpload(file, fileList) {
+      this.fileList1=[]
+      const params = new FormData(); // 声明formData数据类型
+      params.append("multipartFile", file.raw);
+      params.append("type", "image");
+      this.$api.letter.uploadFile(params).then(res => {
+        if (res.code == "200") {
+          this.batchData =res.data
+          this.fileList1 = fileList
+        }
+        else{
+          this.fileList1=[]
+          this.$message.error(res.msg)
+        }
+      });
+    },
     deleteBtn(row) {
       this.$confirm('是否确认删除?', '提示', {
         confirmButtonText: '确定',
@@ -1097,10 +1127,12 @@ export default {
       });
     },
     submitImport(){
-      this.$api.task
-          .batchPinBalance({selectIds:this.importData.ids.split(',')})
-          .then(res => {
-            if (res.code==200) {
+      let data = {
+        settlementImageId: this.batchData.id,
+        settIdList: this.importData.settIdList
+      }
+      this.$api.task.batchPinBalanceNew(data).then(res => {
+        if (res.code==200) {
               this.$message({
                     message: '导入成功',
                     type: 'success'
@@ -1111,7 +1143,22 @@ export default {
             else{
               this.$message.error(res.msg)
             }
-          });
+      })
+      // this.$api.task
+      //     .batchPinBalance({selectIds:this.importData.ids.split(',')})
+      //     .then(res => {
+      //       if (res.code==200) {
+      //         this.$message({
+      //               message: '导入成功',
+      //               type: 'success'
+      //           })
+      //           this.findPage()
+      //           this.dialogVisibleImport=false
+      //       }
+      //       else{
+      //         this.$message.error(res.msg)
+      //       }
+      //     });
     },
     // 结算
     balanceFun(row){

src/views/FinancialManagement/CarInsurance/PlatformSettlement/NonVehicleBalanceyes.vue

@@ -1,6 +1,6 @@
 <template>
   <!--布局容器-->
-  <div class="container" style="width: 99%; margin-top: 0px">
+  <div class="InvoicedAndSettled" style="width: 99%; margin-top: 0px">
     <templateTable :formList="formList" :tableConfig="tableConfig" :data="tableData" @findPage="findPage"
       @handleSearchList="handleSearchList" :pagination="pageData">
       <template slot="data">
@@ -15,9 +15,12 @@
         </el-select>
       </template>
     </templateTable>
-    <el-dialog title="记录" :visible.sync="dialogVisiblerecord" width="30%" :before-close="handleCloserecord">
+    <el-dialog title="记录" :visible.sync="dialogVisiblerecord" width="40%" :before-close="handleCloserecord">
       <templateTable ref="templateTable1" :pagination="pageDatarecord" @getList="getListrecord"
         :tableConfig="tableConfigDetailrecord" :data="formTableDatarecord" @findPage="findPageDetailrecord">
+        <template slot="imageUrl" slot-scope="scope">
+          <img v-if="scope.row.imageUrl" :src="`${process + scope.row.imageUrl}`" class="imageclass" />
+        </template>
       </templateTable>
       <span slot="footer" class="dialog-footer">
         <el-button size="small" @click="dialogVisiblerecord = false">取消</el-button>
@@ -59,6 +62,7 @@ export default {
   },
   data() {
     return {
+      process:process.env.BASE_URL,
       tableConfigDetailDetail: {
         columns: [
           {
@@ -145,6 +149,11 @@ export default {
             label: "进帐金额",
             type: "text"
           },
+          {
+            name: "imageUrl",
+            label: "凭证",
+            type: 'slot'
+          }
         ],
         loading: true,
         isPaginationShow: true,
@@ -221,6 +230,7 @@ export default {
         isPaginationShow: true,
         showSummary: true,
         isShowIndex: true,
+        tableHeight: 'auto',
         optBtns: [
           {
             type: 'primary',
@@ -438,6 +448,10 @@ export default {
 </script>
 
 <style scoped>
+.InvoicedAndSettled>>>.el-table__body-wrapper {
+    overflow-y: auto !important;
+    height: auto !important;
+}
 >>>.dataTable .el-table__header-wrapper .el-table__header .el-checkbox {
   display: none;
 }

src/views/FinancialManagement/InsuranceData/InsuranceDataExport.vue

@@ -1,6 +1,8 @@
 <template>
     <div>
-      <el-main ref="elMain" style="padding: 0px;">
+      <el-card>
+        <el-main ref="elMain" style="padding: 0px;">
+          <p>车险数据导出</p>
             <!-- 工具区域Start -->
             <el-form class="queryForm" ref="queryFormRef" :model="queryForm" label-width="80px">
             <el-row style="margin-bottom: 15px;">
@@ -20,32 +22,42 @@
               </el-col>
               </el-row>
             </el-form>
-            <kt-button label="导出Excel" :perms="permsDelete" size="small" type="danger" @click="handlePrint()"
+            <kt-button label="导出" :perms="permsDelete" size="small" type="primary" @click="handlePrint()"
            style="float: left;margin-left: 50px;" />
       </el-main>
-      <div style="padding: 20px;">
+      </el-card>
+      <el-card style="margin: 20px 0;">
+        <p>财务审核明细导出</p>
+        <el-form label-width="80px" class="queryForm">
+          <el-row style="margin-bottom: 15px;">
+            <el-col :span="8">
+              <el-form-item label="筛选时间">
+                <el-date-picker
+                 style="margin-left: 20px;"
+                v-model="date"
+                type="daterange"
+                size="mini"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期">
+              </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item label="审核状态">
+                <el-select v-model="audit" size="mini">
+                  <el-option label="未审核" value="0"></el-option>
+                  <el-option label="审核通过" value="1"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
         <el-row>
-        <el-col :span="4">
-          <el-date-picker
-            v-model="date"
-            style="width: 220px;"
-            type="daterange"
-            size="mini"
-            value-format="yyyy-MM-dd"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期">
-          </el-date-picker>
-        </el-col>
-        <el-col :span="4">
-          <el-select v-model="audit" size="mini">
-            <el-option label="未审核" value="0"></el-option>
-            <el-option label="审核通过" value="1"></el-option>
-          </el-select>
-        </el-col>
-        <el-button size="mini" type="primary" @click="onExport">财务审核明细导出</el-button>
-      </el-row>
-      </div>
+          <el-button size="small" type="primary" @click="onExport" style="margin-left: 50px;">导出</el-button>
+        </el-row>
+      </el-card>
     </div>
   </template>
   <script>

src/views/FinancialManagement/WithdrawalManagement/WithdrawalProceduresEnd.vue

@@ -15,6 +15,12 @@
           <el-form-item label="业务员姓名">
             <el-input v-model="queryForm.userName" placeholder="业务员姓名" clearable></el-input>
           </el-form-item>
+          <el-form-item label="维护人工号">
+            <el-input v-model="queryForm.leaderId" placeholder="业务员姓名" clearable></el-input>
+          </el-form-item>
+          <el-form-item label="维护人">
+            <el-input v-model="queryForm.leaderName" placeholder="业务员姓名" clearable></el-input>
+          </el-form-item>
           <el-form-item label="电话">
             <el-input v-model="queryForm.mobile" placeholder="电话" clearable></el-input>
           </el-form-item>
@@ -36,9 +42,12 @@
           </el-form-item>
         </el-form>
       </el-row>
+      <div class="amount-money">
+        <span >提现总金额：￥{{ totalAmount ||  0 }}</span>
+      </div>
       <kt-common-table
         :showBatchDelete="false"
-        :showBatchPrint="true"
+        :showBatchPrint="false"
         :showOperation="false"
         :data="pageResult"
         :columns="columns"
@@ -68,11 +77,14 @@ export default {
         pageSize: 10,
         auditingStatus: "3"
       },
+      totalAmount:0,
       columns: [
         //数据列
         { prop: "id", label: "提现单号" },
         { prop: "userId", label: "业务员工号" },
         { prop: "userName", label: "业务员姓名" },
+        { prop: "leaderId", label: "维护人工号" },
+        { prop: "leaderName", label: "维护人" },
         { prop: "mobile", label: "电话" },
         { prop: "deptId", label: "机构代码" },
         { prop: "deptName", label: "机构名称" },
@@ -132,6 +144,18 @@ export default {
           }
         })
         .then(data != null ? data.callback : "");
+      
+        that.$api.task
+        .querySumAmount({
+          ...this.queryForm,
+          ...this.pageRequest,
+        })
+        .then(res => {
+          if (res.code == 200) {
+            that.totalAmount = res.data;
+          }
+        })
+        .then(data != null ? data.callback : "");
     },
 
     // 格式化日期，如月、日、时、分、秒保证为2位数
@@ -162,6 +186,15 @@ export default {
 </script>
     
     
-    <style scoped>
+    <style scoped lang='scss'>
+  .amount-money {
+  font-size: 14px;
+  text-align: right;
+  margin:0 30px 20px 0;
+  >span{
+    padding: 8px 15px;
+    background: #F2F5FD;
+  }
+}
 </style>
     

src/views/FinancialManagement/WithdrawalManagement/WithdrawalProceduresPending.vue

@@ -9,6 +9,12 @@
           <el-form-item label="业务员姓名">
             <el-input v-model="queryForm.userName" placeholder="业务员姓名" clearable></el-input>
           </el-form-item>
+          <el-form-item label="维护人工号">
+            <el-input v-model="queryForm.leaderId" placeholder="业务员姓名" clearable></el-input>
+          </el-form-item>
+          <el-form-item label="维护人">
+            <el-input v-model="queryForm.leaderName" placeholder="业务员姓名" clearable></el-input>
+          </el-form-item>
           <el-form-item label="电话">
             <el-input v-model="queryForm.mobile" placeholder="电话" clearable></el-input>
           </el-form-item>
@@ -25,8 +31,11 @@
           </el-form-item>
         </el-form>
       </el-row>
+      <div class="amount-money">
+        <span >提现总金额：￥{{ totalAmount ||  0 }}</span>
+      </div>
       <kt-common-table button2Type="text" button3Type="text" button4Type="text" :showBatchDelete="false"
-        :showBatchPrint="true" permsButton3="sys:withdrawalProceduresPending:examine"
+        :showBatchPrint="false" permsButton3="sys:withdrawalProceduresPending:examine"
         permsButton2="sys:withdrawalProceduresPending:examinepay" :data="pageResult" :columns="columns"
         @findPage="findPage" button3Name="审核并支付" @handleButton3="handleButton3" button4Name="审核驳回"
         @handleButton4="handleButton4" button2Name="审核提现" @handleButton2="handleButton2"></kt-common-table>
@@ -87,11 +96,14 @@ export default {
         pageSize: 10,
         auditingStatus: "2"
       },
+      totalAmount:0,
       columns: [
         //数据列
         { prop: "id", label: "提现单号" },
         { prop: "userId", label: "业务员工号" },
         { prop: "userName", label: "业务员姓名" },
+        { prop: "leaderId", label: "维护人工号" },
+        { prop: "leaderName", label: "维护人" },
         { prop: "mobile", label: "电话" },
         { prop: "deptId", label: "机构代码" },
         { prop: "deptName", label: "机构名称" },
@@ -150,6 +162,17 @@ export default {
           }
         })
         .then(data != null ? data.callback : "");
+        that.$api.task
+        .querySumAmount({
+          ...this.queryForm,
+          ...this.pageRequest,
+        })
+        .then(res => {
+          if (res.code == 200) {
+            that.totalAmount = res.data;
+          }
+        })
+        .then(data != null ? data.callback : "");
     },
     drivingupload(file) {
       let fileRaw = file.raw;
@@ -277,7 +300,7 @@ export default {
 </script>
 
 
-<style scoped>
+<style scoped lang='scss'>
 .avatar-uploader .el-upload {
   border: 1px dashed #d9d9d9;
   border-radius: 6px;
@@ -304,4 +327,13 @@ export default {
   height: 150px;
   display: block;
 }
+.amount-money {
+  font-size: 14px;
+  text-align: right;
+  margin:0 30px 20px 0;
+  >span{
+    padding: 8px 15px;
+    background: #F2F5FD;
+  }
+}
 </style>

src/views/Letter/Export.vue

@@ -1,35 +1,45 @@
 <template>
   <div>
-    <el-row>
-      <el-col :span="4">
-        <el-date-picker
-          v-model="date"
-          style="width: 220px;"
-          type="daterange"
-          size="mini"
-          value-format="yyyy-MM-dd"
-          range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期">
-        </el-date-picker>
-      </el-col>
-      <el-button size="mini" type="primary" @click="onExport">导出车险业务明细表</el-button>
-    </el-row>
-    <el-row style="padding-top: 20px;">
-      <el-col :span="4">
-        <el-date-picker
-          v-model="date1"
-          style="width: 220px;"
-          type="daterange"
-          size="mini"
-          value-format="yyyy-MM-dd"
-          range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期">
-        </el-date-picker>
-      </el-col>
-      <el-button size="mini" type="primary" @click="onExport1">导出收支明细表</el-button>
-    </el-row>
+    <el-form label-width="80px" class="queryForm">
+      <el-card>
+        <p>车险业务明细表</p>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="筛选时间">
+              <el-date-picker
+                v-model="date"
+                type="daterange"
+                size="mini"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-button size="mini" type="primary" @click="onExport">导出</el-button>
+      </el-card>
+      <el-card style="margin-top: 20px;">
+        <p>收支明细表</p>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="筛选时间">
+              <el-date-picker
+                v-model="date1"
+                type="daterange"
+                size="mini"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-button size="mini" type="primary" @click="onExport1">导出</el-button>
+      </el-card>
+    </el-form>
   </div>
 </template>
 

src/views/PeopleManage/Staff/AreaOrganization.vue

@@ -0,0 +1,457 @@
+<template>
+  <div class="container" style="width: 99%; margin-top: 0px">
+    <!--布局容器-->
+    <el-container style="height: 100%" direction="vertical">
+      <el-main ref="elMain" style="padding: 0px">
+        <!-- 搜索 新增-展开折叠 -->
+        <div style="margin-bottom: 20px; margin-top: 15px" class="flex a-start">
+          <el-button
+            size="small"
+            type="primary"
+            plain
+            icon="el-icon-plus"
+            :label="$t('action.addCompany')"
+            @click="handleAddCompany"
+            >新增子机构</el-button
+          >
+          <el-button
+            size="small"
+            type="info"
+            plain
+            icon="el-icon-sort"
+            @click="fold()"
+            >展开折叠</el-button
+          >
+          <!-- <el-form
+            :inline="true"
+            class="demo-form-inline"
+            size="small"
+            style="margin-left: 30px"
+          >
+            <el-form-item>
+              <el-button
+                type="primary"
+                size="small"
+                @click="managementSourceQuery"
+                >查询</el-button
+              >
+            </el-form-item>
+          </el-form> -->
+        </div>
+        <!-- 表格渲染 -->
+        <el-table
+          permsEdit="sys:dept:edit"
+          height="600"
+          permsDelete="sys:dept:delete"
+          row-key="id"
+          :expand-row-keys="['9']"
+          v-loading="loading"
+          border
+          :data="ztreeNodes"
+          :tree-props="{ children: 'children', hasChildren: 'hasChilkdren' }"
+          :header-cell-style="{
+            background: '#F2F7FC',
+            fontWeight: '900',
+            color: '#606266',
+          }"
+          size="small"
+          ref="expandTable"
+          highlight-current-row
+          @row-click="rowClick"
+        >
+          <el-table-column prop="name" label="机构名称" width="300" />
+          <el-table-column prop="deptCount" label="机构数量" width="80" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.children ? scope.row.children.length : 0 }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="id" label="ID" align="center" />
+          <el-table-column
+            prop="comtype"
+            label="机构类型"
+            :formatter="comtypeFormatter"
+            align="center"
+          >
+          </el-table-column>
+          <!-- <el-table-column prop="address" label="机构地址" align="center">
+          </el-table-column> -->
+          <el-table-column
+            label="操作"
+            fixed="right"
+            align="center"
+            width="150"
+          >
+            <template slot-scope="scope">
+              <KtButton :perms="'sys:institution:edit'" :size="'medium'" :type="'text'" :label="'编辑'"
+              @click.native.stop="handleEdit(scope.row)"
+                @findPage="findSubDeptPage"
+               ></KtButton>
+               <KtButton :perms="'sys:institution:delete'" :size="'medium'" :type="'text'" :label="'删除'"
+              @click.native.stop="deleteMechanism(scope.row)"
+               ></KtButton>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-main>
+    </el-container>
+    <!-- 新增修改机构界面 -->
+    <el-dialog
+      :title="dialogTitle"
+      width="1000px"
+      :visible.sync="dialogVisible"
+      :close-on-click-modal="false"
+      v-dialogDrag
+      @close="closeDialog"
+    >
+      <el-form
+        :model="dataForm"
+        :rules="dataRule"
+        ref="dataForm"
+        @keyup.enter.native="submitForm()"
+        label-width="100px"
+        size="small"
+        style="text-align: left"
+      >
+        <el-row>
+          <el-col :span="8" v-show="operType == 'EDIT'">
+            <el-form-item label="机构编码" prop="id">
+              <el-input
+                style="width: 100%"
+                v-model="dataForm.id"
+                placeholder="机构编码"
+                disabled
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="上级机构" prop="parentName">
+              <span style="width: 100%" class="span-disabled">{{ parentName }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="机构名称" prop="name">
+              <el-input
+                style="width: 100%"
+                v-model="dataForm.name"
+                placeholder="机构名称"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="机构类型" prop="comtype">
+              <el-select
+                style="width: 100%"
+                v-model="dataForm.comtype"
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in comtypeoptions"
+                  :key="item.dictValue"
+                  :label="item.dictTag"
+                  :value="item.dictValue"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="排序" prop="orderNum">
+              <el-input-number
+                v-model="dataForm.orderNum"
+                placeholder="排序"
+                controls-position="right"
+                :min="0"
+              ></el-input-number>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button
+          size="small"
+          type="primary"
+          style="background-color: #ffc000; border: 1px solid #ffc000"
+          @click="dialogVisible = false"
+          >取消</el-button
+        >
+        <el-button size="small" type="primary" @click="submitForm()">{{
+          $t("action.comfirm")
+        }}</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import Cookies from "js-cookie";
+import KtButton from "@/views/Core/KtButton"; //按钮权限组件
+import tree from "@/components/ztree.vue"; //机构树组件
+import KtCommonTable from "@/views/Core/KtCommonTable.vue"; //表格组件
+import CommonUtil from "@/utils/comutil.js";
+export default {
+  name: "Deptall",
+  components: {
+    KtButton,
+    tree,
+    KtCommonTable,
+  },
+  created() {
+    this.findTreeData(); // 获取左边机构树数据
+    this.$api.dept.sysDeptInternalAgentType().then(res => {
+      this.comtypeoptions = res.data.ddList
+    })
+  },
+  data() {
+    return {
+      loading: false,
+      peopledeptid: "",
+      managementSource: "", //来源类型
+      filters: {
+        id: "",
+      },
+      pageRequest: {
+        pageNum: 1,
+        pageSize: 10,
+      },
+      pageResult: {},
+      //----ztreeData start---------
+      ztreeLeftWidth: 0, //左边区域的宽度
+      ztreeRightWidth: 0, //右边区域的宽度
+      ztreeObj: null,
+      ztreeSetting: {
+        // 机构树上的数据格式
+        check: {
+          enable: false,
+        },
+        data: {
+          simpleData: {
+            enable: true,
+            pIdKey: "parentId",
+          },
+        },
+        view: {
+          showIcon: false,
+        },
+      },
+      ztreeNodes: [], // 机构树上的数据
+      currentTreeNode: {},
+      comtypeoptions: [],
+      operType: "ADD", //'ADD','EDIT'
+      dialogTitle: "窗口",
+      dialogVisible: false,
+      dataForm: {
+        parentId: 0,
+        name: "",
+        comtype: "", //机构类型
+        orderNum: 0,
+      },
+      //表单验证
+      dataRule: {
+        name: [
+          {
+            required: true,
+            message: "机构名称不能为空",
+            trigger: "blur",
+          },
+        ],
+        comtype: [
+          {
+            required: true,
+            message: "请选择机构类型",
+            trigger: "blur",
+          },
+        ]
+      },
+      isshow: false,
+      expanded: false, // 在这里定义了展开与否的标志
+      parentName: '',
+    };
+  },
+  mounted() {
+    this.changeTreeWidth(); // 初始化树的宽度
+    this.filters.id = "9";
+    this.findSubDeptPage(); //初始化数据
+  },
+  methods: {
+    //点击每一行的事件
+    rowClick(row, treeNode) {
+      //点每行展开折叠
+      row.expanded = !row.expanded;
+      this.$refs.expandTable.toggleRowExpansion(row, row.expanded);
+      //新增子公司、部门
+      this.currentTreeNode = row;
+      this.parentName = row.name
+      // this.currentTreeNode = treeNode;
+      this.filters.id = this.currentTreeNode.id;
+      this.findSubDeptPage();
+    },
+    //遍历表格数据
+    forTableData(arr, isExpand) {
+      arr.forEach((i) => {
+        this.$refs.expandTable.toggleRowExpansion(i, isExpand);
+        if (i.children) {
+          this.forTableData(i.children, isExpand);
+        }
+      });
+    },
+    //展开收起树列表
+    fold() {
+      this.isshow = !this.isshow;
+      this.forTableData(this.ztreeNodes, this.isshow);
+    },
+    // 添加子公司
+    handleAddCompany() {
+      if (!this.currentTreeNode.name) {
+        return this.$message({
+          message: "请选择所属机构",
+          type: "info",
+        });
+      }
+      this.operType = "ADD";
+      this.dialogVisible = true;
+    },
+
+    changeTreeWidth() {
+      // 初始化树的宽度
+      this.ztreeLeftWidth = Math.ceil(
+        (240 / this.$refs.elMain.$el.clientWidth) * 100
+      );
+      this.ztreeRightWidth = 100 - (this.ztreeLeftWidth - 0);
+    },
+    findTreeData() {
+      // 获取机构树的数据
+      this.loading = true;
+      this.$api.dept.sysDeptInternalAgentFindTree().then((res) => {
+        this.ztreeNodes = res.data;
+        this.loading = false;
+      });
+    },
+    // managementSourceQuery() {
+    //   this.loading = true;
+    //   this.$api.dept
+    //     .sysDeptInternalAgentFindTree()
+    //     .then((res) => {
+    //       this.ztreeNodes = res.data;
+    //       this.loading = false;
+    //     });
+    // },
+    // 右边表格Start
+    findSubDeptPage: function (data) {
+      // 获取分页数据
+      if (!!data) {
+        this.pageRequest = data.pageRequest;
+      }
+      this.pageRequest.columnFilters = {
+        id: {
+          name: "id",
+          value: this.filters.id,
+        },
+      };
+    },
+
+    // 编辑机构或部门
+    handleEdit(data) {
+      this.operType = "EDIT";
+      this.dialogTitle = "修改机构信息";
+      this.$api.dept.findSysDeptInternalAgentById({
+        id: data.id
+      }).then(res => {
+        this.parentName = res.data.parentName
+        this.dataForm = {
+          id: res.data.id,
+          parentId: res.data.parentId,
+          name: res.data.name,
+          orderNum: res.data.orderNum,
+          comtype: res.data.comtype
+        }
+      })
+      this.dialogVisible = true;
+    },
+    //删除机构或部门
+    deleteMechanism(data) {
+      this.$confirm('确定删除?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.$api.dept.sysDeptInternalAgentDelete({ ids: [data.id] }).then((res) => {
+            if (res.code == 200) {
+              this.findSubDeptPage();
+              this.findTreeData();
+              this.currentTreeNode = null;
+              this.$message({
+                type: "success",
+                message: "删除成功!",
+              });
+            }
+            else {
+              this.$message({
+                type: "error",
+                message: res.msg,
+              });
+            }
+          })
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消删除'
+          });          
+        });
+
+      
+    },
+    comtypeFormatter(row, column) {
+      let comtype = row.comtype;
+      return CommonUtil.getDataName({
+        dataList: this.comtypeoptions,
+        value: "dictValue",
+        label: "dictTag",
+        data: comtype,
+      });
+    },
+
+    // 提交表单
+    submitForm() {
+      this.$refs["dataForm"].validate((valid) => {
+        if (valid) {
+          if (this.operType == 'ADD') {
+            this.dataForm.parentId = this.currentTreeNode.id
+          }
+          this.$api.dept.sysDeptInternalAgentAddOrUpdate(this.dataForm).then(res => {
+            if (res.code == 200) {
+              this.$message({
+                message: "操作成功",
+                type: "success",
+              });
+              this.closeDialog()
+            } else {
+              this.$message({
+                message: "操作失败, " + res.msg,
+                type: "error",
+              });
+            }
+            this.findSubDeptPage();
+            this.findTreeData();
+          })
+        }
+      });
+    },
+    //关闭机构弹框
+    closeDialog() {
+      this.dialogVisible = false;
+      this.$refs.dataForm.resetFields();
+
+    },
+  },
+};
+</script>
+
+<style scoped>
+body {
+  scrollbar-gutter: stable both-edges;
+}
+
+.bh-medium-font-size {
+  font-size: 30px !important;
+}
+</style>

src/views/PeopleManage/Staff/PeopleOption.vue

@@ -0,0 +1,419 @@
+<template>
+  <div>
+      <el-main ref="elMain" style="padding: 0px;">
+          <Split :gutterSize="2" style="height: calc(100vh - 120px)">
+              <!-- 左侧树Start -->
+              <SplitArea :minSize="240">
+                  <div>
+                      <el-form ref="queryFormRef" :model="personnePageRequest" label-width="60px">
+                          <el-row>
+                              <el-col :span="7">
+                                  <el-form-item label="工号">
+                                      <el-input clearable :size="overSize" placeholder="工号"
+                                          v-model="personnePageRequest.userId"></el-input>
+                                  </el-form-item>
+                              </el-col>
+                              <el-col :span="7">
+                                  <el-form-item label="名称">
+                                      <el-input clearable :size="overSize" placeholder="名称"
+                                          v-model="personnePageRequest.name"></el-input>
+                                  </el-form-item>
+                              </el-col>
+                              <el-col :span="7">
+                                  <el-form-item label="机构">
+                                      <el-cascader v-model="personnePageRequest.deptId" :size="overSize"
+                                          :show-all-levels="false" :options="deptList" :props="optionProps" clearable
+                                          filterable></el-cascader>
+                                  </el-form-item>
+                              </el-col>
+                              <el-col :span="2">
+                                  <el-form-item label label-width="10px">
+                                      <el-button :size="overSize" type="primary"
+                                          @click="personnelFindQuery()">查询</el-button>
+                                  </el-form-item>
+                              </el-col>
+                          </el-row>
+                      </el-form>
+                      <el-table :data="personnePageReData" border ref="personneTable" width="100%" size="small"
+                          align="center" :header-cell-style="{
+                              background: '#F2F7FC',
+                              fontWeight: '900',
+                              color: '#606266',
+                          }" @selection-change="personneSelectionChange" :row-class-name="tableRowClassName">
+                          <el-table-column type="selection" width="55">
+                          </el-table-column>
+                          <el-table-column prop="userId" label="工号">
+                          </el-table-column>
+                          <el-table-column prop="name" label="名称">
+                          </el-table-column>
+                          <el-table-column prop="deptName" label="机构名称">
+                          </el-table-column>
+                          <el-table-column width="100" label="操作">
+                              <template slot-scope="scope">
+                                  <el-button type="text" @click="handleTableEdit(scope.row)" size="small">编辑</el-button>
+                              </template>
+                          </el-table-column>
+                          <!-- 表格列 -->
+                      </el-table>
+
+                      <el-pagination @size-change="handleSizeChange" @current-change="refreshPageRequest"
+                          :current-page="personnePageRequest.pageNum" :page-sizes="[10, 20, 50, 100, 200, 300, 400, 500]"
+                          :page-size="personnePageRequest.pageSize" layout="total, sizes, prev, pager, next, jumper"
+                          :total="personnePageRequest.total">
+                      </el-pagination>
+                  </div>
+              </SplitArea>
+              <!-- 工具区域Start -->
+              <SplitArea>
+                  <el-form ref="queryFormRef" :model="pageRequest" label-width="60px">
+                      <el-row>
+                          <el-col :span="7">
+                              <el-form-item label="工号">
+                                  <el-input clearable :size="overSize" placeholder="工号"
+                                      v-model="pageRequest.userId"></el-input>
+                              </el-form-item>
+                          </el-col>
+                          <el-col :span="7">
+                              <el-form-item label="姓名">
+                                  <el-input clearable :size="overSize" placeholder="姓名"
+                                      v-model="pageRequest.userName"></el-input>
+                              </el-form-item>
+                          </el-col>
+                          <el-col :span="7">
+                              <el-form-item label="前线机构" label-width="80px">
+                                  <el-cascader :size="overSize" v-model="pageRequest.areaCode"   :options="areaOptions"
+                                      :props="{ label: 'name', value: 'id', children: 'children', checkStrictly: true }" clearable
+                                      ref="area"></el-cascader>
+                              </el-form-item>
+                          </el-col>
+                          <el-col :span="12">
+                              <el-button size="small" type="primary" @click="findQuery()">查询</el-button>
+                              <kt-button label="添加" type="primary" @click="handleAddProduct" />
+                          </el-col>
+                      </el-row>
+                  </el-form>
+                  <kt-common-table style="margin-top:10px" :data="pageResult" :columns="columns" :showBatchDelete="true"
+                      deleteButtonName="删除" deleteName="批量删除" @handleDelete="handleDelete" @findPage="findPage"
+                      @handleDeleteFlag="handleTableDeleteFlag"></kt-common-table>
+              </SplitArea>
+              <!-- 右侧列表页面End -->
+          </Split>
+      </el-main>
+
+      <!-- 新增对话框 -->
+      <el-dialog :title="dialogTitle" v-dialogDrag :visible.sync="productDialogVisible" width="800px">
+          <el-tree
+              :data="tableData"
+              show-checkbox
+              node-key="id"
+              ref="areaTree"
+              check-strictly
+              highlight-current
+              :props="{
+                  children: 'children',
+                  label: 'name',
+                  value: 'id'
+                  }">
+              </el-tree>
+          <span slot="footer" class="dialog-footer">
+              <el-button size="small" @click="productDialogVisible = false">取 消</el-button>
+              <el-button size="small" type="primary" @click="submitForm">确 定</el-button>
+          </span>
+      </el-dialog>
+  </div>
+</template>
+<script>
+import KtButton from "@/views/Core/KtButton"; //按钮权限组件
+import KtCommonTable from "@/views/Core/KtCommonTable.vue"; //表格组件
+// import CommonUtil from "@/utils/comutil.js";
+export default {
+  components: {
+      KtButton,
+      KtCommonTable
+  },
+  data() {
+      return {
+          areaOptions: [],
+          optionProps: {
+              checkStrictly: true,
+              value: "id",
+              label: "name",
+              children: "children",
+          },
+          deptList: [],
+          overSize: "small",
+          leftSplitWidth: 20,
+          rightSplitWidth: 80,
+          // 右侧列表查询数据Start
+          pageResult: {},
+          personnePageReData: [],
+          pageRequest: {
+              //查询的默认条件
+              pageNum: 1,
+              pageSize: 20
+          },
+          personnePageRequest: {
+              //查询的默认条件
+              pageNum: 1,
+              pageSize: 10,
+              total: 0
+          },
+          columns: [
+              // 数据列
+              {
+                  prop: "userId",
+                  label: "人员ID",
+                  sortable: false
+              },
+              {
+                  prop: "userName",
+                  label: "姓名",
+                  sortable: false
+              },
+              {
+                  prop: "deptId",
+                  label: "前线机构ID",
+                  sortable: false
+              },
+              {
+                  prop: "deptName",
+                  label: "前线机构名称",
+                  sortable: false
+              },
+          ],
+          productDialogVisible: false, //控制产品对话框
+          dialogTitle: "新增",
+          userId: "",
+          tableData: [],
+          personnelValue: '', //工号搜索
+      };
+  },
+  created() {
+      this.$api.user.sysUserLinkFrontLineDeptQueryQxOrgTree().then((res) => {
+          this.areaOptions = res.data;
+      });
+      this.getAllCompany()
+      this.personnelFindPage()
+  },
+  watch: {},
+  methods: {
+      handleDelete(val) {
+          this.handleTableDelete(val)
+      },
+      personnelFindQuery() {
+          this.personnePageRequest.pageNum = '1',
+              this.personnePageRequest.pageSize = 20
+          this.personnelFindPage()
+      },
+      findQuery() {
+          this.pageRequest.pageNum = '1',
+              this.pageRequest.pageSize = 20
+          this.findPage()
+      },
+      tableRowClassName(row) {
+          if (row.row.flag) {
+              return 'flagRow';
+          } else {
+              return '';
+          }
+      },
+      handleSizeChange(pageSize) {
+          this.personnePageRequest.pageSize = pageSize;
+          this.personnelFindPage()
+      },
+      refreshPageRequest: function (pageNum) {
+          this.personnePageRequest.pageNum = pageNum;
+          this.personnelFindPage()
+      },
+      personnelFindPage() {
+          let deptId = ''
+          if (this.personnePageRequest.deptId && this.personnePageRequest.deptId.length > 0) {
+              deptId = this.personnePageRequest.deptId[this.personnePageRequest.deptId.length - 1]
+          }
+          this.$api.user.sysUserLinkFrontLineDeptFindAllUserList({ ...this.personnePageRequest, deptId }).then(res => {
+              if (res.code == 200) {
+                  this.personnePageReData = res.data.content;
+                  this.personnePageRequest.pageNum = res.data.pageNum;
+                  this.personnePageRequest.pageSize = res.data.pageSize;
+                  this.personnePageRequest.total = res.data.totalSize;
+              } else {
+                  this.$message.error(res.msg);
+              }
+          });
+      },
+          filterTreeData  (data, condition){
+              const result = [];
+              const recurse = (nodes) => {
+                  nodes.forEach((node) => {
+                  if (node.flag) {
+                      result.push(node);
+                  }
+                  if (node.children && node.children.length > 0) {
+                      recurse(node.children);
+                  }
+                  });
+              };
+              recurse(data);
+          return result;
+          },
+      //--tree begin-------
+      handleTableEdit(row) {
+          this.userId = row.userId
+          this.$api.user.sysUserLinkFrontLineDeptQueryQxOrgTree({
+            userId: row.userId
+          }).then(res=>{
+            if (res.code == 200) {
+                this.tableData = res.data;
+                this.$nextTick(() => {
+                    this.$refs.areaTree.setCheckedNodes(this.filterTreeData(this.tableData) )
+                })
+                this.dialogTitle = "修改";
+                this.productDialogVisible = true;
+            } else {
+                this.$message.error(res.msg);
+            }
+        });
+        //   this.$api.user.findAreaListByUserId(row.userId).then(res => {
+        //       if (res.code == 200) {
+        //           this.tableData = res.data;
+        //           this.$nextTick(() => {
+        //               this.$refs.areaTree.setCheckedNodes(this.filterTreeData(this.tableData) )
+        //           })
+        //           this.dialogTitle = "修改";
+        //           this.productDialogVisible = true;
+        //       } else {
+        //           this.$message.error(res.msg);
+        //       }
+        //   });
+      },
+     
+      // 获取所有机构列表
+      getAllCompany() {
+          this.$api.task.findAllTree().then(res => {
+              this.deptList = res.data
+          });
+      },
+      handleTableDeleteFlag(data) {
+          this.handleTableDelete([data.row.id])
+      },
+      handleTableDelete(id) {
+          this.$api.user.sysUserLinkFrontLineDeptDelete({ ids: id }).then(res => {
+              if (res.code == "200") {
+                  this.$message({
+                      message: "删除成功",
+                      type: "success"
+                  });
+                  this.findPage();
+                  this.personnelFindPage()
+              } else {
+                  this.$message({
+                      message: "操作失败",
+                      type: "error"
+                  });
+              }
+          });
+      },
+      handleAddProduct() {
+          if (this.$refs.personneTable.selection && this.$refs.personneTable.selection.length > 0) {
+              this.userId = this.$refs.personneTable.selection[0].userId
+              this.$api.user.sysUserLinkFrontLineDeptQueryQxOrgTree().then(res=>{
+                  if (res.code == 200) {
+                      this.tableData = res.data;
+                      this.dialogTitle = "新增";
+                      this.productDialogVisible = true;
+                  } else {
+                      this.$message.error(res.msg);
+                  }
+              });
+          } else {
+              this.$message.error("请选择人员！");
+          }
+      },
+      findPage(data) {
+          // 获取分页数据
+          if (data && data.pageRequest) {
+              this.pageRequest.pageNum = data.pageRequest.pageNum;
+              this.pageRequest.pageSize = data.pageRequest.pageSize;
+          }
+          let orgId=''
+          if(this.pageRequest.areaCode){
+            orgId=this.pageRequest.areaCode[this.pageRequest.areaCode.length-1]
+          }
+          this.$api.user
+              .sysUserLinkFrontLineDeptQueryPage({ ...this.pageRequest,orgId })
+              .then(res => {
+                  if (res.code == 200) {
+                      this.pageResult = res.data;
+                  } else {
+                      this.$message.error(res.msg);
+                  }
+              })
+              .then(data != null ? data.callback : "");
+      },
+      submitForm() {
+          let areaCodes= this.$refs.areaTree.getCheckedNodes().map(item => item.id)
+          this.$api.user
+              .sysUserLinkFrontLineDeptAddOrUpdate({
+                  deptIds: areaCodes,
+                  userId: this.userId
+              })
+              .then(res => {
+                  if (res.code == 200) {
+                      this.$message({
+                          message: "操作成功",
+                          type: "success"
+                      });
+                      this.personnelFindPage();
+                      this.findPage()
+                      this.productDialogVisible = false;
+                  } else {
+                      this.$message({
+                          message: "操作失败",
+                          type: "error"
+                      });
+                  }
+              });
+      },
+      //--数据字典 begin --
+      getDicType(type) {
+          this.$api.insCompany.dicType(type).then(res => {
+              if (res.code == 200) {
+                  this[type + "options"] = res.data.ddList;
+              }
+          });
+      },
+      personneSelectionChange(selection) {
+          if (selection.length > 1) {
+              this.$refs.personneTable.clearSelection(); // 清空所有选择
+              this.$refs.personneTable.toggleRowSelection(selection.pop()); // 设置选择项
+          }
+      },
+  }
+};
+</script>
+  
+<style scoped lang="scss">
+/* 顶部查询条件样式Start */
+.queryFrom .el-row {
+  margin: 10px 0px;
+}
+
+>>> .el-table .flagRow {
+  background: rgba(212, 36, 38, 0.2) !important;
+}
+
+>>> .el-table__header-wrapper .el-table__header .el-checkbox {
+  display: none;
+}
+
+.queryFrom .el-form-item {
+  margin-bottom: 0px;
+}
+
+.queryFrom .queryButton .el-form-item__content {
+  margin-left: 40px !important;
+}
+
+/* 顶部查询条件样式End */
+</style>
+  

src/views/Task/daikeComponents/KtLetter.vue

@@ -4270,6 +4270,7 @@ export default {
       // this.userId = userId;
       this.$api.user.getLoginUser().then(res => {
         if (res.code == 200) {
+          this.userId = res.data.id;
           this.userform = res.data;
           this.$api.dept.getDeptById(res.data.deptId).then(res => {
             this.deptName = res.data.name;
@@ -4277,7 +4278,6 @@ export default {
         }
       });
     }
-
     //--订单编辑回显--
     // this.paramsEdit = this.$route.query.data; //接收参数
     this.obtainProtocol(this.$route.query.data);
@@ -5651,6 +5651,7 @@ export default {
     },
     
     clearAccidentFormTk() {
+      this.taikangaccidentalDrivingVo = {};
       this.taikangInsuranceDataTable = []
       this.accidentFormTk = {};
       this.accidentFormTk.fen = 1;
@@ -9195,8 +9196,7 @@ export default {
           }
           data.logoImg = this.iconfftter(res.data.inscompany);
           this.queryOrders = data;
-
-          this.$api.letter.getThemeByUserId().then(res => {
+          this.$api.letter.getThemeByUserId(this.userId).then(res => {
             if (res.code == 200) {
               if (res.data[0] == 'GD') {
                 this.$refs.quotationDialogPro.setBackupVisible(true);
@@ -9234,7 +9234,7 @@ export default {
           this.systartdate = res.data.syStartDate; //商业起保日期
           // this.mobile = res.data.applyinfo.mobile;//投保人手机号
           let qrCodeUrl = res.data.qrCodeUrl;
-          this.$api.letter.getThemeByUserId().then(res => {
+          this.$api.letter.getThemeByUserId(this.userId).then(res => {
             if (res.code == 200) {
               if (res.data[0] == 'GD') {
                 this.codedialogVisiblePro = true;

src/views/Task/daikeComponents/KtOrder.vue

@@ -519,7 +519,7 @@ export default {
       vehicleTypeoptions: [],
       trafficManagementVehicleTypeoptions: [],
       outOfBusinessVehicleUseoptions: [],
-      userIdPor: '',
+      userIdPor:  Cookies.get("user"),
       statusPor: '',
       deptIdPor: ''
     };
@@ -699,7 +699,7 @@ export default {
           }
           data.logoImg = this.iconfftter(res.data.inscompany);
           this.queryOrders = data;
-          this.$api.letter.getThemeByUserId().then(res => {
+          this.$api.letter.getThemeByUserId(this.userIdPor).then(res => {
             if (res.code == 200) {
               if (res.data[0] == 'GD') {
                 this.$refs.quotationDialogPro.setBackupVisible(true);
@@ -1012,7 +1012,7 @@ export default {
           this.systartdate = res.data.syStartDate; //商业起保日期
           // this.mobile = res.data.applyinfo.mobile;//投保人手机号
           let qrCodeUrl = res.data.qrCodeUrl;
-          this.$api.letter.getThemeByUserId().then(res => {
+          this.$api.letter.getThemeByUserId( this.userIdPor).then(res => {
             if (res.code == 200) {
               if (res.data[0] == 'GD') {
                 this.codedialogVisiblePro = true;