@z1595784580 3 年之前
父節點
當前提交
84817c7e8c

+ 0 - 1
src/http/moudules/merciqiao-vue-master/static/css/theme-green/index.css

@@ -4289,7 +4289,6 @@
 
 .el-form-item--mini.el-form-item,
 .el-form-item--small.el-form-item {
-    margin-bottom: 18px
 }
 
 .el-form-item .el-input__validateIcon {

+ 12 - 16
src/views/FinancialManagement/InvoiceAmount.vue

@@ -47,7 +47,7 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" size="mini" @click="queryStaffInfo"
+          <el-button type="primary" size="small" @click="queryStaffInfo"
             >查询</el-button
           >
         </el-form-item>
@@ -58,7 +58,7 @@
       class="operation"
       type="primary"
       plain
-      size="mini"
+      size="medium"
       @click="addAmount"
       >新增</el-button
     >
@@ -209,8 +209,8 @@
       </el-form>
 
       <div slot="footer" class="dialog-footer">
-        <el-button @click="resetForm('addform')">取 消</el-button>
-        <el-button type="primary" @click="submitForm('addform')"
+        <el-button @click="resetForm('addform')" size="small">取 消</el-button>
+        <el-button type="primary" @click="submitForm('addform')" size="small"
           >确 定</el-button
         >
       </div>
@@ -342,8 +342,10 @@
       </el-form>
 
       <div slot="footer" class="dialog-footer">
-        <el-button @click="reset('editform')">取 消</el-button>
-        <el-button type="primary" @click="determine">确 定</el-button>
+        <el-button @click="reset('editform')" size="small">取 消</el-button>
+        <el-button type="primary" @click="determine" size="small"
+          >确 定</el-button
+        >
       </div>
     </el-dialog>
   </div>
@@ -678,12 +680,9 @@ export default {
 </script>
 
 <style scoped>
-.el-button {
-  padding: 10px 20px;
-}
 .operation {
   margin-left: 14px !important;
-  margin-top: 15px;
+  margin-top: 15px !important ;
 }
 .form {
   display: flex;
@@ -702,8 +701,8 @@ export default {
   display: flex;
   align-items: center;
 }
-.el-form-item {
-  margin-bottom: -14px;
+.container .el-form-item {
+  margin-bottom: -14px !important;
 }
 .form .el-form-item__label {
   font-size: 15px !important;
@@ -711,7 +710,7 @@ export default {
 }
 
 .ktTable {
-  margin-top: 15px;
+  margin-top: 20px;
 }
 .el-row {
   margin-top: 18px;
@@ -719,9 +718,6 @@ export default {
 .top {
   margin-top: 0px;
 }
-.dialog-footer .el-button[data-v-536b86d8] {
-  padding: 8px 14px;
-}
 .el-date-editor--daterange.el-input__inner {
   width: 300px;
 }

+ 22 - 38
src/views/FinancialManagement/InvoiceInformation.vue

@@ -47,7 +47,7 @@
             <el-option label="退回修改" value="3"></el-option>
           </el-select> </el-form-item
         ><el-form-item>
-          <el-button type="primary" size="mini" @click="queryStaffInfo"
+          <el-button type="primary" size="small" @click="queryStaffInfo"
             >查询</el-button
           >
         </el-form-item>
@@ -55,7 +55,9 @@
     </el-row>
     <!-- 操作按钮 -->
     <div class="operation" style="margin-bottom: 20px">
-      <el-button type="primary" plain size="mini" @click="add">新增</el-button>
+      <el-button type="primary" plain size="medium" @click="add"
+        >新增</el-button
+      >
       <el-button
         type="success"
         :disabled="
@@ -64,7 +66,7 @@
             : false
         "
         plain
-        size="mini"
+        size="medium"
         @click="batchApproval"
         >批量审核通过</el-button
       >
@@ -76,7 +78,7 @@
             : false
         "
         plain
-        size="mini"
+        size="medium"
         @click="batchReturn"
         >批量审核退回</el-button
       >
@@ -361,8 +363,8 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="resetForm('dataform')">取 消</el-button>
-        <el-button type="primary" @click="submitForm('dataform')"
+        <el-button @click="resetForm('dataform')" size="small">取 消</el-button>
+        <el-button type="primary" @click="submitForm('dataform')" size="small"
           >确 定</el-button
         >
       </div>
@@ -583,8 +585,9 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="reset('form')">取 消</el-button>
+        <el-button @click="reset('form')" size="small">取 消</el-button>
         <el-button
+          size="small"
           v-if="pageRequest.approvalStatus != '1'"
           type="primary"
           @click="determine('form')"
@@ -1220,45 +1223,26 @@ export default {
 </script>
 
 <style scoped>
-.el-button {
-  padding: 10px 20px;
-}
-
 .el-input--suffix .el-input__inner {
-  padding-right: 60px;
+  padding-right: 60px !important;
 }
 .operation {
   margin-left: 14px !important;
-  margin-top: 15px;
-}
-.falseButtom {
-  color: #fff;
-  background-color: rgb(252, 202, 0);
-  padding: 10px 28px !important;
-  margin-right: 240px !important;
-  margin-bottom: 20px !important;
-}
-.trueButtom {
-  color: #fff;
-  background-color: rgb(30, 178, 255);
-  padding: 10px 28px !important;
+  margin-top: 15px !important ;
 }
 
 .dialog-footer {
-  margin-top: -20px;
-}
-.dialog-footer .el-button[data-v-4d3df2dc] {
-  padding: 8px 14px;
+  margin-top: -20px !important;
 }
 .dialog .el-dialog__body {
   padding: 30px 20px 5px !important;
 }
 .form {
   display: flex;
-  margin-left: -12px;
+  margin-left: -12px !important;
 }
 .el-pagination {
-  font-weight: normal;
+  font-weight: normal !important;
 }
 .footer {
   z-index: 500;
@@ -1275,27 +1259,27 @@ export default {
   padding: 12px !important;
 }
 .footer .footerdiv {
-  display: flex;
-  align-items: center;
+  display: flex !important;
+  align-items: center !important;
 }
-.el-form-item {
-  margin-bottom: 7px;
+.frame .el-form-item {
+  margin-bottom: 7px !important;
 }
 .form .el-form-item__label {
   font-size: 15px !important;
   font-weight: 600 !important;
 }
 .el-row {
-  margin-top: 10px;
+  margin-top: 10px !important;
 }
 .el-textarea {
   margin-top: 10px !important;
 }
 
 .frame .el-form-item .el-input {
-  width: 220px;
+  width: 220px !important;
 }
 .frame .el-form-item .el-select {
-  width: 220px;
+  width: 220px !important;
 }
 </style>

+ 75 - 18
src/views/FinancialManagement/ReconciliationSystem/UploadReconciliationList.vue

@@ -5,7 +5,12 @@
         <el-row>
           <el-col :span="4">
             <el-form-item label="供应商筛选">
-              <el-select size="small" clearable v-model="queryFrom.fieldName2" placeholder="请选择">
+              <el-select
+                size="small"
+                clearable
+                v-model="queryFrom.fieldName2"
+                placeholder="请选择"
+              >
                 <el-option label="人保" value="人保"></el-option>
                 <el-option label="太平洋" value="太平洋"></el-option>
                 <el-option label="平安" value="平安"></el-option>
@@ -27,12 +32,22 @@
           </el-col>
           <el-col :span="4">
             <el-form-item label="对接人筛选">
-              <el-input clearable size="small" placeholder="对接人筛选" v-model="queryFrom.fieldName3"></el-input>
+              <el-input
+                clearable
+                size="small"
+                placeholder="对接人筛选"
+                v-model="queryFrom.fieldName3"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="车型筛选">
-              <el-select size="small" clearable v-model="queryFrom.fieldName8" placeholder="请选择">
+              <el-select
+                size="small"
+                clearable
+                v-model="queryFrom.fieldName8"
+                placeholder="请选择"
+              >
                 <el-option label="小型客车" value="小型客车"></el-option>
                 <el-option label="货车" value="货车"></el-option>
                 <el-option label="特种车" value="特种车"></el-option>
@@ -41,12 +56,22 @@
           </el-col>
           <el-col :span="4">
             <el-form-item label="保单号查询">
-              <el-input clearable size="small" placeholder="保单号查询" v-model="queryFrom.fieldName5"></el-input>
+              <el-input
+                clearable
+                size="small"
+                placeholder="保单号查询"
+                v-model="queryFrom.fieldName5"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="车牌号查询">
-              <el-input clearable size="small" placeholder="车牌号查询" v-model="queryFrom.fieldName7"></el-input>
+              <el-input
+                clearable
+                size="small"
+                placeholder="车牌号查询"
+                v-model="queryFrom.fieldName7"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -54,7 +79,7 @@
               <el-date-picker
                 clearable
                 size="small"
-                style="width: 100%;"
+                style="width: 100%"
                 v-model="queryFrom.fieldName1"
                 type="daterange"
                 range-separator="至"
@@ -66,7 +91,12 @@
           </el-col>
           <el-col :span="4">
             <el-form-item label="险种类别筛选">
-              <el-select size="small" clearable v-model="queryFrom.fieldName4" placeholder="请选择">
+              <el-select
+                size="small"
+                clearable
+                v-model="queryFrom.fieldName4"
+                placeholder="请选择"
+              >
                 <el-option label="单交强" value="单交强"></el-option>
                 <el-option label="单三者" value="单三者"></el-option>
                 <el-option label="单商业" value="单商业"></el-option>
@@ -77,17 +107,29 @@
           </el-col>
           <el-col :span="4">
             <el-form-item label="业务员查询">
-              <el-input clearable size="small" placeholder="业务员查询" v-model="queryFrom.fieldName6"></el-input>
+              <el-input
+                clearable
+                size="small"
+                placeholder="业务员查询"
+                v-model="queryFrom.fieldName6"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="被保险人">
-              <el-input clearable size="small" placeholder="被保险人" v-model="queryFrom.fieldName9"></el-input>
+              <el-input
+                clearable
+                size="small"
+                placeholder="被保险人"
+                v-model="queryFrom.fieldName9"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label>
-              <el-button size="small" type="primary" @click="queryInfo">查询</el-button>
+              <el-button size="small" type="primary" @click="queryInfo"
+                >查询</el-button
+              >
             </el-form-item>
           </el-col>
         </el-row>
@@ -97,7 +139,13 @@
     <!-- 按钮 -->
     <div class="u-f">
       <div>
-        <el-button size="small" type="danger" @click="viewfile" style="margin:0px 20px">下载样表</el-button>
+        <el-button
+          size="small"
+          type="danger"
+          @click="viewfile"
+          style="margin: 0px 20px"
+          >下载样表</el-button
+        >
       </div>
       <el-upload
         class="upload"
@@ -115,13 +163,21 @@
     <br />
     <!-- 列表 -->
     <div class="u-f">
-      <div style="margin-left:30px;margin-bottom:20px;color:#666;">交强险合计:{{!jsum?'0':jsum}}元</div>
-      <div style="margin-left:30px;margin-bottom:20px;color:#666;">商业险合计:{{!ssum?'0':ssum}}元</div>
-      <div style="margin-left:30px;margin-bottom:20px;color:#666;">应收合计:{{!yssum?'0':yssum}}元</div>
-      <div style="margin-left:30px;margin-bottom:20px;color:#666;">应付合计:{{!yfsum?'0':yfsum}}元</div>
-      <div
-        style="margin-left:30px;margin-bottom:20px;color:#666;"
-      >数量合计:{{!totalSize?'0':totalSize}}条</div>
+      <div style="margin-left: 30px; margin-bottom: 20px; color: #666">
+        交强险合计:{{ !jsum ? "0" : jsum }}元
+      </div>
+      <div style="margin-left: 30px; margin-bottom: 20px; color: #666">
+        商业险合计:{{ !ssum ? "0" : ssum }}元
+      </div>
+      <div style="margin-left: 30px; margin-bottom: 20px; color: #666">
+        应收合计:{{ !yssum ? "0" : yssum }}元
+      </div>
+      <div style="margin-left: 30px; margin-bottom: 20px; color: #666">
+        应付合计:{{ !yfsum ? "0" : yfsum }}元
+      </div>
+      <div style="margin-left: 30px; margin-bottom: 20px; color: #666">
+        数量合计:{{ !totalSize ? "0" : totalSize }}条
+      </div>
     </div>
     <kt-common-table
       keyName="fieldName5"
@@ -380,6 +436,7 @@ export default {
 
     //预览文件
     viewfile() {
+      console.log(111);
       var win = window.open();
       win.document.write(
         '<body style="margin:0px;"><object data="' +

文件差異過大導致無法顯示
+ 572 - 230
src/views/PeopleManage/Agent/AgentExamine.vue


文件差異過大導致無法顯示
+ 571 - 232
src/views/PeopleManage/Agent/AgentManage.vue


+ 51 - 53
src/views/PeopleManage/Seo/StaffSeo.vue

@@ -9,12 +9,19 @@
               >包含下级机构</el-checkbox
             >
             <el-divider></el-divider>
-            <tree
+            <!-- <tree
               :setting="ztreeSetting"
               :nodes="ztreeNodes"
               @onClick="onZTreeClick"
               @onCreated="onZTreeCreated"
-            />
+            /> -->
+            <el-tree
+              :data="ztreeNodes"
+              :props="{ children: 'children', label: 'name' }"
+              node-key="id"
+              :default-expanded-keys="['9']"
+              @node-click="onZTreeClick"
+            ></el-tree>
           </div>
         </SplitArea>
         <!-- 左侧树End -->
@@ -85,7 +92,7 @@
           <!-- 筛选区域End -->
 
           <kt-common-table
-            operationWidth="140"
+            :operationWidth="operationWidth"
             permsButton1="sys:userverify:view"
             :data="pageResult"
             :columns="columns"
@@ -201,7 +208,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="部门">
+                <el-form-item label="部门" prop="deptTd">
                   <el-select
                     style="width: 100%"
                     v-model="dataForm.deptId"
@@ -240,20 +247,18 @@
                   <el-input v-model="teamleaderid"></el-input>
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row>
               <el-col :span="8">
                 <el-form-item label="推荐人名字">
                   <el-input v-model="dataForm.recommendername"></el-input>
                 </el-form-item>
               </el-col>
+            </el-row>
+            <el-row>
               <el-col :span="8">
                 <el-form-item label="推荐人工号">
                   <el-input v-model="dataForm.recommenderid"></el-input>
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row>
               <el-col :span="8">
                 <el-form-item label="姓名">
                   <el-input v-model="dataForm.name"></el-input>
@@ -494,13 +499,13 @@
                   <el-input v-model="dataForm.isshowteam"></el-input>
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row>
               <el-col :span="8">
                 <el-form-item label="录入人">
                   <el-input v-model="dataForm.createBy"></el-input>
                 </el-form-item>
               </el-col>
+            </el-row>
+            <el-row>
               <el-col :span="8">
                 <el-form-item label="录入时间">
                   <el-input v-model="dataForm.createTime"></el-input>
@@ -688,6 +693,7 @@ export default {
   },
   data() {
     return {
+      operationWidth: 140,
       peopleid: "",
       peopledeptid: "",
 
@@ -724,7 +730,7 @@ export default {
       //----ztreeLeft end---------
 
       // 右侧列表查询数据Start
-      queryFrom: {},
+      queryFrom: { status: "1" },
       pageResult: {},
       containsSubDeptChecked: true, //是否包含下级机构
       pageRequest: {
@@ -744,16 +750,16 @@ export default {
             name: "usertype",
             value: null,
           },
-          status: {
-            name: "status",
+          approvalStatus: {
+            name: "approvalStatus",
             value: "1",
           },
-          id: {
-            name: "id",
+          userId: {
+            name: "userId",
             value: "",
           },
-          name: {
-            name: "name",
+          realName: {
+            name: "realName",
             value: "",
           },
           mobile: {
@@ -774,13 +780,12 @@ export default {
         },
         { prop: "deptName", label: "部门名称", minWidth: 80, sortable: false },
         {
-          prop: "jobCode",
+          prop: "jobName",
           label: "岗位",
           minWidth: 80,
           sortable: false,
-          formatter: this.jobcodeFormatter,
         },
-        { prop: "id", label: "工号", minWidth: 120, sortable: false },
+        { prop: "userId", label: "工号", minWidth: 120, sortable: false },
         { prop: "name", label: "姓名", minWidth: 90, sortable: false },
         {
           prop: "sex",
@@ -791,11 +796,10 @@ export default {
         },
         { prop: "mobile", label: "联系电话", minWidth: 100, sortable: false },
         {
-          prop: "status",
+          prop: "approvalStatus",
           label: "状态",
           minWidth: 70,
           sortable: false,
-          formatter: this.statusFormatter,
         },
       ],
       // 右侧列表查询数据End
@@ -1032,7 +1036,7 @@ export default {
     //--left tree begin-------
     findLeftTreeData: function () {
       // 获取数据
-      this.$api.dept.findLeftDeptTree(this.peopledeptid).then((res) => {
+      this.$api.dept.findDeptTree(this.peopledeptid).then((res) => {
         this.ztreeNodes = res.data;
       });
     },
@@ -1044,7 +1048,7 @@ export default {
     },
     onZTreeClick: function (evt, treeId, treeNode) {
       // 点击事件
-      this.currentTreeNode = treeNode;
+      this.currentTreeNode = evt;
       this.pageRequest.columnFilters.deptId.value = this.currentTreeNode.id;
       this.findPage();
     },
@@ -1052,10 +1056,11 @@ export default {
 
     // 查询Start
     queryStaffInfo(val) {
-      this.pageRequest.columnFilters.id.value = this.queryFrom.id;
-      this.pageRequest.columnFilters.name.value = this.queryFrom.name;
+      this.pageRequest.columnFilters.userId.value = this.queryFrom.id;
+      this.pageRequest.columnFilters.realName.value = this.queryFrom.name;
       this.pageRequest.columnFilters.mobile.value = this.queryFrom.tel;
-      this.pageRequest.columnFilters.status.value = this.queryFrom.status;
+      this.pageRequest.columnFilters.approvalStatus.value =
+        this.queryFrom.status;
       this.pageRequest.pageNum = 1;
       this.findPage();
     },
@@ -1068,27 +1073,19 @@ export default {
         this.pageRequest.pageNum = data.pageRequest.pageNum;
         this.pageRequest.pageSize = data.pageRequest.pageSize;
       }
-      if (this.pageRequest.columnFilters.status.value == "1") {
-        this.$api.user
-          .findPage(this.pageRequest)
-          .then((res) => {
-            this.pageResult = res.data;
-          })
-          .then(data != null ? data.callback : "");
-      } else {
-        this.$api.user
-          .findCheckPage(this.pageRequest)
-          .then((res) => {
-            this.pageResult = res.data;
-          })
-          .then(data != null ? data.callback : "");
-      }
+      this.$api.user
+        .findPage(this.pageRequest)
+        .then((res) => {
+          this.pageResult = res.data;
+        })
+        .then(data != null ? data.callback : "");
     },
     handleTableEdit(params) {
+      console.log(params);
       // 编辑代理人员
       this.activeTabs = "first";
       this.operation = false;
-      this.dialogTitle = "修改代理人员信息";
+      this.dialogTitle = "查看代理人员信息";
       this.$api.dept
         .getDeptById(params.row.deptId.split("D")[0])
         .then((deptRes) => {
@@ -1106,21 +1103,22 @@ export default {
               });
             }
           }
+          // this.$api.user.selectByDeptId(params.row.deptId).then((res2) => {
+          //   console.log(res2);
+          //   if (res2.code == 200) {
+          //     this.teamleaderid = res2.data.id;
+          //     this.teamleadername = res2.data.name;
+          //   }
+          // });
 
-          this.$api.user.selectByDeptId(params.row.deptId).then((res2) => {
-            if (res2.code == 200) {
-              this.teamleaderid = res2.data.id;
-              this.teamleadername = res2.data.name;
-            }
-          });
-
-          if (this.pageRequest.columnFilters.status.value == "1") {
-            this.$api.user.findById(params.row.id).then((personRes) => {
+          if (this.pageRequest.columnFilters.approvalStatus.value == "1") {
+            this.$api.user.findById(params.row.userId).then((personRes) => {
               Object.assign(this.dataForm, personRes.data.sysUser);
               Object.assign(this.dataForm, personRes.data.esmUserInternal);
               Object.assign(this.dataForm, personRes.data.esmUserAgent);
               this.dataForm.status = personRes.data.sysUser.status;
-              this.dataForm.status1 = personRes.data.esmUserInternal.status;
+              this.dataForm.status1 =
+                personRes.data.esmUserInternal.approvalStatus;
               this.$api.user
                 .findBasePersonById(personRes.data.esmUserAgent.recommenderid)
                 .then((res1) => {

+ 1075 - 780
src/views/PeopleManage/Seo/TeamSeo.vue

@@ -1,830 +1,1125 @@
 <template>
   <div>
-   <div class="queryFrom" title="检索区">
-        <el-form ref="queryFormRef" :model="queryFrom" label-width="80px">
-          <el-row>
-            <el-col :span="5">
-              <el-form-item label="工号">
-                <el-input clearable size="small" placeholder="工号" v-model="queryFrom.id"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="5">
-              <el-form-item label="姓名">
-                <el-input clearable size="small" placeholder="姓名" v-model="queryFrom.name"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="5">
-              <el-form-item label="手机号">
-                <el-input clearable size="small" placeholder="手机号" v-model="queryFrom.mobile"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="5">&nbsp;</el-col>
-            <el-col :span="4" >
-              <el-form-item label="">
-                <el-button size="small" type="primary" @click="queryTeam">查询</el-button>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
+    <div class="queryFrom" title="检索区">
+      <el-form ref="queryFormRef" :model="queryFrom" label-width="80px">
+        <el-row>
+          <el-col :span="5">
+            <el-form-item label="工号">
+              <el-input
+                clearable
+                size="small"
+                placeholder="工号"
+                v-model="queryFrom.id"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="姓名">
+              <el-input
+                clearable
+                size="small"
+                placeholder="姓名"
+                v-model="queryFrom.name"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="手机号">
+              <el-input
+                clearable
+                size="small"
+                placeholder="手机号"
+                v-model="queryFrom.mobile"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">&nbsp;</el-col>
+          <el-col :span="4">
+            <el-form-item label="">
+              <el-button size="small" type="primary" @click="queryTeam"
+                >查询</el-button
+              >
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
     </div>
-     <el-table :border="true" :data="tableData" style="width: 100%" :header-cell-style="{background:'#F2F7FC',fontWeight: '700',color:'#606266'}">
-          <el-table-column header-align="center" align="center" type="index"> </el-table-column>
-          <el-table-column header-align="center" align="center" prop="companyname" label="机构名称">
-            <template  slot-scope="scope">
-              <span v-for="(companyItem,companyIndex) in ztreeNodes" :key="companyIndex" v-if="scope.row.deptid.split('D')[0] == companyItem.id">
-                {{companyItem.name}}
-              </span>
-            </template>
-          </el-table-column>
-			<el-table-column header-align="center" align="center" prop="deptid" label="部门编码" width="180"> </el-table-column>
-          <!-- <el-table-column header-align="center" align="center" prop="depName" label="部门名称"> </el-table-column> -->
-          <el-table-column header-align="center" align="center" prop="jobcode" label="岗位">
-            <template  slot-scope="scope">
-              <span v-for="(jobItem,jobIndex) in jobcodeoptions" :key="jobIndex" v-if="scope.row.jobcode == jobItem.value">
-                {{jobItem.label}}
-              </span>
-            </template>
-          </el-table-column>
-					
-          <el-table-column header-align="center" align="center" prop="id" label="工号"> </el-table-column>
-          <el-table-column header-align="center" align="center" prop="name" label="姓名"> </el-table-column>
-          <el-table-column header-align="center" align="center" prop="sex" label="性别"> </el-table-column>
-          <el-table-column header-align="center" align="center" prop="mobile" label="电话"> </el-table-column>
-          <el-table-column header-align="center" align="center" prop="teamnum" label="我的团队"> </el-table-column>
-          <el-table-column header-align="center" align="center" prop="level1num" label="一级团队(人数)"> </el-table-column>
-          <el-table-column header-align="center" align="center" prop="level2num" label="二级团队(人数)"> </el-table-column>
-          <el-table-column header-align="center" align="center" prop="level3num" label="三级团队(人数)"> </el-table-column>
-          <el-table-column header-align="center" align="center" prop="tempnum" label="临时用户(人数)"> </el-table-column>
-          <el-table-column header-align="center" align="center" label="操作">
-            <template slot-scope="scope">
-              <el-button type="text" size="small" @click="handleTableEdit(scope)">查看</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-
-
-        <el-dialog title="人员信息" width="1000px" :visible.sync="dialogVisible" :close-on-click-modal="false" :before-close="handleDialogBefore" @close="closeDialog" v-dialogDrag>
-          <el-form disabled :model="dataForm" ref="dataForm" label-width="130px"
-            size="small" style="text-align:left;">
-            <el-tabs v-model="activeTabs">
-              <el-tab-pane label="行政信息" name="first">
-                <el-row>
-                  <el-col :span="8">
-                    <el-form-item label="机构编码">
-                      <el-input :value="deptInfo.id"></el-input>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="8">
-                    <el-form-item label="机构名称">
-                      <el-input :value="deptInfo.name"></el-input>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="8">
-                    <el-form-item label="上级机构编码" >
-                      <el-input :value="deptInfo.parentId"></el-input>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-                <el-row>
-                  <el-col :span="8">
-                    <el-form-item label="机构类型" >
-                      <el-select :value="deptInfo.comtype" placeholder="请选择">
-                        <el-option v-for="item in comtypeoptions" :key="item.label" :label="item.label" :value="item.value" ></el-option>
-                      </el-select>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="8">
-                    <el-form-item label="机构级别" >
-                      <el-select :value="deptInfo.comlevel" placeholder="请选择">
-                        <el-option v-for="item in comleveloptions" :key="item.label" :label="item.label" :value="item.value" ></el-option>
-                       </el-select>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="8">
-                    <el-form-item label="机构性质">
-                      <el-select :value="deptInfo.comattribute" placeholder="请选择">
-                        <el-option v-for="item in comattributeoptions" :key="item.label" :label="item.label" :value="item.value" ></el-option>
-                      </el-select>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-                <el-row>
-                  <el-col :span="24">
-                    <el-form-item label="机构地址" style="width: 100%;">
-                      <el-input
-                        type="textarea"
-                        :rows="3"
-                        :autosize="{ minRows: 3, maxRows: 4}"
-                        placeholder="请输入内容"
-                        :value="deptInfo.address"
-                        >
-                      </el-input>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-              </el-tab-pane>
-              <el-tab-pane label="基本信息" name="second">
-                <el-row>
-                  <el-col :span="8">
-                    <el-form-item label="员工工号">
-                      <el-input v-model="dataForm.id" ></el-input>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="8">
-                    <el-form-item label="部门">
-                      <el-select style="width: 100%;" v-model="dataForm.deptId" placeholder="请选择">
-                        <el-option v-for="item in departmentList" :key="item.value" :label="item.label" :value="item.value" ></el-option>
-                      </el-select>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="8">
-                    <el-form-item label="是否团队长">
-                      <el-select style="width: 100%;" v-model="dataForm.isteamleader " placeholder="请选择">
-                        <el-option label="是" value="1"></el-option>
-                        <el-option label="否" value="0"></el-option>
-                      </el-select>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-                <el-row v-if="dataForm.isteamleader != 1">
-                  <el-col :span="8">
-                    <el-form-item label="所属团队长">
-                      <el-input v-model="teamleadername"></el-input>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="8">
-                    <el-form-item label="所属团队工号">
-                      <el-input v-model="teamleaderid"></el-input>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-                <el-row>
-                  <el-col :span="8">
-                    <el-form-item label="推荐人名字">
-                      <el-input v-model="dataForm.recommendername"></el-input>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="8">
-                    <el-form-item label="推荐人工号">
-                      <el-input v-model="dataForm.recommenderid"></el-input>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-                <el-row>
-                  <el-col :span="8">
-                    <el-form-item label="姓名">
-                      <el-input v-model="dataForm.name"></el-input>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="8">
-                    <el-form-item label="性别">
-                      <el-select style="width:100%" v-model="dataForm.sex" placeholder="请选择">
-                        <el-option label="男" value="男"></el-option>
-                        <el-option label="女" value="女"></el-option>
-                      </el-select>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-                <el-row>
-                  <el-col :span="8">
-                    <el-form-item label="身份证号">
-                      <el-input v-model="dataForm.identity" ></el-input>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="8">
-                    <el-form-item label="出生日期">
-                      <el-date-picker style="width: 100%;" v-model="dataForm.birthday" type="date" placeholder="选择日期">
-                      </el-date-picker>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="8">
-                    <el-form-item label="移动电话">
-                      <el-input v-model="dataForm.mobile"></el-input>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-                <el-row>
-                  <el-col :span="8">
-                    <el-form-item label="民族">
-                      <el-select style="width:100%" v-model="dataForm.nations" placeholder="请选择">
-                        <el-option :label="national" :value="national" v-for="national in nationalList" :key="national"></el-option>
-                      </el-select>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="8">
-                    <el-form-item label="政治面貌">
-                      <el-select style="width:100%" v-model="dataForm.politicalstatus" placeholder="请选择">
-                        <el-option label="群众" value="群众"></el-option>
-                        <el-option label="共青团员" value="共青团员"></el-option>
-                        <el-option label="中共党员" value="中共党员"></el-option>
-                      </el-select>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="8">
-                    <el-form-item label="户口所在地">
-                      <el-input v-model="dataForm.addressresident"></el-input>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-                <el-row>
-                  <el-col :span="8">
-                    <el-form-item label="银行账号">
-                      <el-input v-model="dataForm.accountno" ></el-input>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="8">
-                    <el-form-item label="开户银行">
-                      <el-input v-model="dataForm.bankname" disabled></el-input>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="8">
-                    <el-form-item label="住宅电话">
-                      <el-input v-model="dataForm.phonehouse"></el-input>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-                <el-row>
-                  <el-col :span="8">
-                    <el-form-item label="健康状况">
-                      <el-select style="width:100%" v-model="dataForm.health" placeholder="请选择">
-                        <el-option label="健康" value="健康"></el-option>
-                        <el-option label="亚健康" value="亚健康"></el-option>
-                        <el-option label="疾病" value="疾病"></el-option>
-                      </el-select>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="8">
-                    <el-form-item label="邮政编码">
-                      <el-input v-model="dataForm.postalcode"></el-input>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="8">
-                    <el-form-item label="邮箱">
-                      <el-input v-model="dataForm.email"></el-input>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-                <el-row>
-                  <el-col :span="8">
-                    <el-form-item label="籍贯">
-                      <el-input v-model="dataForm.nativeplace"></el-input>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="8">
-                    <el-form-item label="学历">
-                      <el-select style="width:100%" v-model="dataForm.education" placeholder="请选择">
-                        <el-option label="小学" value="小学"></el-option>
-                        <el-option label="初中" value="初中"></el-option>
-                        <el-option label="高中" value="高中"></el-option>
-                        <el-option label="专科" value="专科"></el-option>
-                        <el-option label="本科" value="本科"></el-option>
-                        <el-option label="硕士" value="硕士"></el-option>
-                        <el-option label="博士" value="博士"></el-option>
-                      </el-select>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="8">
-                    <el-form-item label="血型">
-                      <el-select style="width:100%" v-model="dataForm.blood" placeholder="请选择">
-                        <el-option label="A型" value="A型"></el-option>
-                        <el-option label="B型" value="B型"></el-option>
-                        <el-option label="O型" value="O型"></el-option>
-                        <el-option label="AB型" value="AB型"></el-option>
-                      </el-select>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-                <el-row>
-                   <el-col :span="8">
-                     <el-form-item label="居住地址">
-                       <el-input v-model="dataForm.addressnow"></el-input>
-                     </el-form-item>
-                   </el-col>
-                    <el-col :span="8">
-                      <el-form-item label="毕业院校">
-                        <el-input v-model="dataForm.college"></el-input>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                      <el-form-item label="入司时间">
-                        <el-date-picker style="width: 100%;" v-model="dataForm.intime" type="date" placeholder="选择日期">
-                        </el-date-picker>
-                      </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row>
-                  <el-col :span="8">
-                    <el-form-item label="代理人资格证号">
-                      <el-input v-model="dataForm.saleno"></el-input>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="8">
-                    <el-form-item label="毕业时间">
-                      <el-date-picker style="width: 100%;" v-model="dataForm.collegetm" type="date" placeholder="选择日期">
-                      </el-date-picker>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="8">
-                    <el-form-item label="原工作单位">
-                      <el-input v-model="dataForm.orglast"></el-input>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-                <el-row>
-                  <el-col :span="8">
-                    <el-form-item label="婚姻状况">
-                      <el-select style="width:100%" v-model="dataForm.marrycode" placeholder="请选择">
-                        <el-option label="未婚" value="未婚"></el-option>
-                        <el-option label="已婚" value="已婚"></el-option>
-                        <el-option label="离异" value="离异"></el-option>
-                        <el-option label="再婚" value="再婚"></el-option>
-                      </el-select>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="8">
-                    <el-form-item label="紧急联系人电话">
-                      <el-input v-model="dataForm.phonespecial"></el-input>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="8">
-                    <el-form-item label="紧急联系人姓名">
-                      <el-input v-model="dataForm.namespecial"></el-input>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-                <el-row>
-                  <el-col :span="8">
-                    <el-form-item label="是否显示门店">
-                      <el-input v-model="dataForm.isshowsalesroom"></el-input>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="8">
-                    <el-form-item label="是否显示团队">
-                      <el-input v-model="dataForm.isshowteam"></el-input>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-                <el-row>
-                  <el-col :span="8">
-                    <el-form-item label="录入人">
-                      <el-input v-model="dataForm.createBy"></el-input>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="8">
-                    <el-form-item label="录入时间">
-                      <el-input v-model="dataForm.createTime"></el-input>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="8">
-                    <el-form-item label="最后修改时间">
-                      <el-input v-model="dataForm.lastUpdateTime"></el-input>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
+    <el-table
+      :border="true"
+      :data="tableData"
+      style="width: 100%"
+      :header-cell-style="{
+        background: '#F2F7FC',
+        fontWeight: '700',
+        color: '#606266',
+      }"
+    >
+      <el-table-column header-align="center" align="center" type="index">
+      </el-table-column>
+      <el-table-column
+        header-align="center"
+        align="center"
+        prop="companyname"
+        label="机构名称"
+      >
+        <template slot-scope="scope">
+          <span
+            v-for="(companyItem, companyIndex) in ztreeNodes"
+            :key="companyIndex"
+            v-if="scope.row.deptid.split('D')[0] == companyItem.id"
+          >
+            {{ companyItem.name }}
+          </span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        header-align="center"
+        align="center"
+        prop="deptid"
+        label="部门编码"
+        width="180"
+      >
+      </el-table-column>
+      <!-- <el-table-column header-align="center" align="center" prop="depName" label="部门名称"> </el-table-column> -->
+      <el-table-column
+        header-align="center"
+        align="center"
+        prop="jobcode"
+        label="岗位"
+      >
+        <template slot-scope="scope">
+          <span
+            v-for="(jobItem, jobIndex) in jobcodeoptions"
+            :key="jobIndex"
+            v-if="scope.row.jobcode == jobItem.value"
+          >
+            {{ jobItem.label }}
+          </span>
+        </template>
+      </el-table-column>
 
-              </el-tab-pane>
-              <el-tab-pane label="影像资料" name="third">
+      <el-table-column
+        header-align="center"
+        align="center"
+        prop="id"
+        label="工号"
+      >
+      </el-table-column>
+      <el-table-column
+        header-align="center"
+        align="center"
+        prop="name"
+        label="姓名"
+      >
+      </el-table-column>
+      <el-table-column
+        header-align="center"
+        align="center"
+        prop="sex"
+        label="性别"
+      >
+      </el-table-column>
+      <el-table-column
+        header-align="center"
+        align="center"
+        prop="mobile"
+        label="电话"
+      >
+      </el-table-column>
+      <el-table-column
+        header-align="center"
+        align="center"
+        prop="teamnum"
+        label="我的团队"
+      >
+      </el-table-column>
+      <el-table-column
+        header-align="center"
+        align="center"
+        prop="level1num"
+        label="一级团队(人数)"
+      >
+      </el-table-column>
+      <el-table-column
+        header-align="center"
+        align="center"
+        prop="level2num"
+        label="二级团队(人数)"
+      >
+      </el-table-column>
+      <el-table-column
+        header-align="center"
+        align="center"
+        prop="level3num"
+        label="三级团队(人数)"
+      >
+      </el-table-column>
+      <el-table-column
+        header-align="center"
+        align="center"
+        prop="tempnum"
+        label="临时用户(人数)"
+      >
+      </el-table-column>
+      <el-table-column header-align="center" align="center" label="操作">
+        <template slot-scope="scope">
+          <el-button type="text" size="small" @click="handleTableEdit(scope)"
+            >查看</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
 
-                <div class="imageLibraryItem">
-                  <el-row class="imageLibraryItemTitle">
-                    <label @click="pic1Control = !pic1Control">
-                      身份证照片
-                    </label>
-                  </el-row>
-                  <el-row class="imageLibraryItemBody" v-show="pic1Control">
-                    <el-form-item label="身份证正面:" style="width: 50%;">
-                      <el-upload
-                        class="avatar-uploader"
-                        action=""
-                        name="photo1"
-                        :show-file-list="false"
-                        :http-request="httpRequest"
-                        :before-upload="beforeAvatarUpload">
-                        <img v-if="dataForm.photo1" :src="dataForm.photo1" class="avatar">
-                        <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-                      </el-upload>
-                    </el-form-item>
+    <el-dialog
+      title="人员信息"
+      width="1000px"
+      :visible.sync="dialogVisible"
+      :close-on-click-modal="false"
+      :before-close="handleDialogBefore"
+      @close="closeDialog"
+      v-dialogDrag
+    >
+      <el-form
+        disabled
+        :model="dataForm"
+        ref="dataForm"
+        label-width="130px"
+        size="small"
+        style="text-align: left"
+      >
+        <el-tabs v-model="activeTabs">
+          <el-tab-pane label="行政信息" name="first">
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="机构编码">
+                  <el-input :value="deptInfo.id"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="机构名称">
+                  <el-input :value="deptInfo.name"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="上级机构编码">
+                  <el-input :value="deptInfo.parentId"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="机构类型">
+                  <el-select :value="deptInfo.comtype" placeholder="请选择">
+                    <el-option
+                      v-for="item in comtypeoptions"
+                      :key="item.label"
+                      :label="item.label"
+                      :value="item.value"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="机构级别">
+                  <el-select :value="deptInfo.comlevel" placeholder="请选择">
+                    <el-option
+                      v-for="item in comleveloptions"
+                      :key="item.label"
+                      :label="item.label"
+                      :value="item.value"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="机构性质">
+                  <el-select
+                    :value="deptInfo.comattribute"
+                    placeholder="请选择"
+                  >
+                    <el-option
+                      v-for="item in comattributeoptions"
+                      :key="item.label"
+                      :label="item.label"
+                      :value="item.value"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <el-form-item label="机构地址" style="width: 100%">
+                  <el-input
+                    type="textarea"
+                    :rows="3"
+                    :autosize="{ minRows: 3, maxRows: 4 }"
+                    placeholder="请输入内容"
+                    :value="deptInfo.address"
+                  >
+                  </el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-tab-pane>
+          <el-tab-pane label="基本信息" name="second">
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="员工工号">
+                  <el-input v-model="dataForm.id"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="部门">
+                  <el-select
+                    style="width: 100%"
+                    v-model="dataForm.deptId"
+                    placeholder="请选择"
+                  >
+                    <el-option
+                      v-for="item in departmentList"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="是否团队长">
+                  <el-select
+                    style="width: 100%"
+                    v-model="dataForm.isteamleader"
+                    placeholder="请选择"
+                  >
+                    <el-option label="是" value="1"></el-option>
+                    <el-option label="否" value="0"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row v-if="dataForm.isteamleader != 1">
+              <el-col :span="8">
+                <el-form-item label="所属团队长">
+                  <el-input v-model="teamleadername"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="所属团队工号">
+                  <el-input v-model="teamleaderid"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="推荐人名字">
+                  <el-input v-model="dataForm.recommendername"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="推荐人工号">
+                  <el-input v-model="dataForm.recommenderid"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="姓名">
+                  <el-input v-model="dataForm.name"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="性别">
+                  <el-select
+                    style="width: 100%"
+                    v-model="dataForm.sex"
+                    placeholder="请选择"
+                  >
+                    <el-option label="男" value="男"></el-option>
+                    <el-option label="女" value="女"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="身份证号">
+                  <el-input v-model="dataForm.identity"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="出生日期">
+                  <el-date-picker
+                    style="width: 100%"
+                    v-model="dataForm.birthday"
+                    type="date"
+                    placeholder="选择日期"
+                  >
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="移动电话">
+                  <el-input v-model="dataForm.mobile"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="民族">
+                  <el-select
+                    style="width: 100%"
+                    v-model="dataForm.nations"
+                    placeholder="请选择"
+                  >
+                    <el-option
+                      :label="national"
+                      :value="national"
+                      v-for="national in nationalList"
+                      :key="national"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="政治面貌">
+                  <el-select
+                    style="width: 100%"
+                    v-model="dataForm.politicalstatus"
+                    placeholder="请选择"
+                  >
+                    <el-option label="群众" value="群众"></el-option>
+                    <el-option label="共青团员" value="共青团员"></el-option>
+                    <el-option label="中共党员" value="中共党员"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="户口所在地">
+                  <el-input v-model="dataForm.addressresident"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="银行账号">
+                  <el-input v-model="dataForm.accountno"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="开户银行">
+                  <el-input v-model="dataForm.bankname" disabled></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="住宅电话">
+                  <el-input v-model="dataForm.phonehouse"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="健康状况">
+                  <el-select
+                    style="width: 100%"
+                    v-model="dataForm.health"
+                    placeholder="请选择"
+                  >
+                    <el-option label="健康" value="健康"></el-option>
+                    <el-option label="亚健康" value="亚健康"></el-option>
+                    <el-option label="疾病" value="疾病"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="邮政编码">
+                  <el-input v-model="dataForm.postalcode"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="邮箱">
+                  <el-input v-model="dataForm.email"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="籍贯">
+                  <el-input v-model="dataForm.nativeplace"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="学历">
+                  <el-select
+                    style="width: 100%"
+                    v-model="dataForm.education"
+                    placeholder="请选择"
+                  >
+                    <el-option label="小学" value="小学"></el-option>
+                    <el-option label="初中" value="初中"></el-option>
+                    <el-option label="高中" value="高中"></el-option>
+                    <el-option label="专科" value="专科"></el-option>
+                    <el-option label="本科" value="本科"></el-option>
+                    <el-option label="硕士" value="硕士"></el-option>
+                    <el-option label="博士" value="博士"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="血型">
+                  <el-select
+                    style="width: 100%"
+                    v-model="dataForm.blood"
+                    placeholder="请选择"
+                  >
+                    <el-option label="A型" value="A型"></el-option>
+                    <el-option label="B型" value="B型"></el-option>
+                    <el-option label="O型" value="O型"></el-option>
+                    <el-option label="AB型" value="AB型"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="居住地址">
+                  <el-input v-model="dataForm.addressnow"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="毕业院校">
+                  <el-input v-model="dataForm.college"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="入司时间">
+                  <el-date-picker
+                    style="width: 100%"
+                    v-model="dataForm.intime"
+                    type="date"
+                    placeholder="选择日期"
+                  >
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="代理人资格证号">
+                  <el-input v-model="dataForm.saleno"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="毕业时间">
+                  <el-date-picker
+                    style="width: 100%"
+                    v-model="dataForm.collegetm"
+                    type="date"
+                    placeholder="选择日期"
+                  >
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="原工作单位">
+                  <el-input v-model="dataForm.orglast"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="婚姻状况">
+                  <el-select
+                    style="width: 100%"
+                    v-model="dataForm.marrycode"
+                    placeholder="请选择"
+                  >
+                    <el-option label="未婚" value="未婚"></el-option>
+                    <el-option label="已婚" value="已婚"></el-option>
+                    <el-option label="离异" value="离异"></el-option>
+                    <el-option label="再婚" value="再婚"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="紧急联系人电话">
+                  <el-input v-model="dataForm.phonespecial"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="紧急联系人姓名">
+                  <el-input v-model="dataForm.namespecial"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="是否显示门店">
+                  <el-input v-model="dataForm.isshowsalesroom"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="是否显示团队">
+                  <el-input v-model="dataForm.isshowteam"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="录入人">
+                  <el-input v-model="dataForm.createBy"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="录入时间">
+                  <el-input v-model="dataForm.createTime"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="最后修改时间">
+                  <el-input v-model="dataForm.lastUpdateTime"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-tab-pane>
+          <el-tab-pane label="影像资料" name="third">
+            <div class="imageLibraryItem">
+              <el-row class="imageLibraryItemTitle">
+                <label @click="pic1Control = !pic1Control"> 身份证照片 </label>
+              </el-row>
+              <el-row class="imageLibraryItemBody" v-show="pic1Control">
+                <el-form-item label="身份证正面:" style="width: 50%">
+                  <el-upload
+                    class="avatar-uploader"
+                    action=""
+                    name="photo1"
+                    :show-file-list="false"
+                    :http-request="httpRequest"
+                    :before-upload="beforeAvatarUpload"
+                  >
+                    <img
+                      v-if="dataForm.photo1"
+                      :src="dataForm.photo1"
+                      class="avatar"
+                    />
+                    <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+                  </el-upload>
+                </el-form-item>
 
-                    <el-form-item label="身份证反面:" style="width: 50%;">
-                      <el-upload
-                        class="avatar-uploader"
-                        action=""
-                        name="photo2"
-                        :show-file-list="false"
-                        :http-request="httpRequest"
-                        :before-upload="beforeAvatarUpload">
-                        <img v-if="dataForm.photo2" :src="dataForm.photo2" class="avatar">
-                        <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-                      </el-upload>
-                    </el-form-item>
-                  </el-row>
-                </div>
+                <el-form-item label="身份证反面:" style="width: 50%">
+                  <el-upload
+                    class="avatar-uploader"
+                    action=""
+                    name="photo2"
+                    :show-file-list="false"
+                    :http-request="httpRequest"
+                    :before-upload="beforeAvatarUpload"
+                  >
+                    <img
+                      v-if="dataForm.photo2"
+                      :src="dataForm.photo2"
+                      class="avatar"
+                    />
+                    <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+                  </el-upload>
+                </el-form-item>
+              </el-row>
+            </div>
 
-                <div class="imageLibraryItem">
-                  <el-row class="imageLibraryItemTitle">
-                    <label @click="pic3Control = !pic3Control">
-                      展业资格证
-                    </label>
-                  </el-row>
-                  <el-row class="imageLibraryItemBody" v-show="pic3Control">
-                    <el-form-item label="资格证照片:" style="width: 50%;">
-                      <el-upload
-                        class="avatar-uploader"
-                        action=""
-                        name="photo3"
-                        :show-file-list="false"
-                        :http-request="httpRequest"
-                        :before-upload="beforeAvatarUpload">
-                        <img v-if="dataForm.photo3" :src="dataForm.photo3" class="avatar">
-                        <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-                      </el-upload>
-                    </el-form-item>
-                  </el-row>
-                </div>
+            <div class="imageLibraryItem">
+              <el-row class="imageLibraryItemTitle">
+                <label @click="pic3Control = !pic3Control"> 展业资格证 </label>
+              </el-row>
+              <el-row class="imageLibraryItemBody" v-show="pic3Control">
+                <el-form-item label="资格证照片:" style="width: 50%">
+                  <el-upload
+                    class="avatar-uploader"
+                    action=""
+                    name="photo3"
+                    :show-file-list="false"
+                    :http-request="httpRequest"
+                    :before-upload="beforeAvatarUpload"
+                  >
+                    <img
+                      v-if="dataForm.photo3"
+                      :src="dataForm.photo3"
+                      class="avatar"
+                    />
+                    <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+                  </el-upload>
+                </el-form-item>
+              </el-row>
+            </div>
 
-                <div class="imageLibraryItem">
-                  <el-row class="imageLibraryItemTitle">
-                    <label @click="pic4Control = !pic4Control">
-                      劳动合同
-                    </label>
-                  </el-row>
-                  <el-row class="imageLibraryItemBody" v-show="pic4Control">
-                    <el-form-item label="劳动合同照片:" style="width: 50%;">
-                      <el-upload
-                        class="avatar-uploader"
-                        action=""
-                        name="photo4"
-                        :show-file-list="false"
-                        :http-request="httpRequest"
-                        :before-upload="beforeAvatarUpload">
-                        <img v-if="dataForm.photo4" :src="dataForm.photo4" class="avatar">
-                        <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-                      </el-upload>
-                    </el-form-item>
-                  </el-row>
-                </div>
+            <div class="imageLibraryItem">
+              <el-row class="imageLibraryItemTitle">
+                <label @click="pic4Control = !pic4Control"> 劳动合同 </label>
+              </el-row>
+              <el-row class="imageLibraryItemBody" v-show="pic4Control">
+                <el-form-item label="劳动合同照片:" style="width: 50%">
+                  <el-upload
+                    class="avatar-uploader"
+                    action=""
+                    name="photo4"
+                    :show-file-list="false"
+                    :http-request="httpRequest"
+                    :before-upload="beforeAvatarUpload"
+                  >
+                    <img
+                      v-if="dataForm.photo4"
+                      :src="dataForm.photo4"
+                      class="avatar"
+                    />
+                    <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+                  </el-upload>
+                </el-form-item>
+              </el-row>
+            </div>
 
-                <div class="imageLibraryItem">
-                  <el-row class="imageLibraryItemTitle">
-                    <label @click="pic5Control = !pic5Control">
-                      应聘表
-                    </label>
-                  </el-row>
-                  <el-row class="imageLibraryItemBody" v-show="pic5Control">
-                    <el-form-item label="应聘表照片:" style="width: 50%;">
-                      <el-upload
-                        class="avatar-uploader"
-                        action=""
-                        name="photo5"
-                        :show-file-list="false"
-                        :http-request="httpRequest"
-                        :before-upload="beforeAvatarUpload">
-                        <img v-if="dataForm.photo5" :src="dataForm.photo5" class="avatar">
-                        <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-                      </el-upload>
-                    </el-form-item>
-                  </el-row>
-                </div>
+            <div class="imageLibraryItem">
+              <el-row class="imageLibraryItemTitle">
+                <label @click="pic5Control = !pic5Control"> 应聘表 </label>
+              </el-row>
+              <el-row class="imageLibraryItemBody" v-show="pic5Control">
+                <el-form-item label="应聘表照片:" style="width: 50%">
+                  <el-upload
+                    class="avatar-uploader"
+                    action=""
+                    name="photo5"
+                    :show-file-list="false"
+                    :http-request="httpRequest"
+                    :before-upload="beforeAvatarUpload"
+                  >
+                    <img
+                      v-if="dataForm.photo5"
+                      :src="dataForm.photo5"
+                      class="avatar"
+                    />
+                    <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+                  </el-upload>
+                </el-form-item>
+              </el-row>
+            </div>
 
-                <div class="imageLibraryItem">
-                  <el-row class="imageLibraryItemTitle">
-                    <label @click="pic6Control = !pic6Control">
-                      定薪表
-                    </label>
-                  </el-row>
-                  <el-row class="imageLibraryItemBody" v-show="pic6Control">
-                    <el-form-item label="定薪表照片:" style="width: 50%;">
-                      <el-upload
-                        class="avatar-uploader"
-                        action=""
-                        name="photo6"
-                        :show-file-list="false"
-                        :http-request="httpRequest"
-                        :before-upload="beforeAvatarUpload">
-                        <img v-if="dataForm.photo6" :src="dataForm.photo6" class="avatar">
-                        <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-                      </el-upload>
-                    </el-form-item>
-                  </el-row>
-                </div>
-              </el-tab-pane>
-            </el-tabs>
-          </el-form>
-          <span slot="footer" class="dialog-footer" v-show="activeTabs == 'third'">
-            <el-button size="small" type="primary" style="background-color: #FFC000;border: 1px solid #FFC000;" @click="closeDialog">{{$t('action.cancel')}}</el-button>
-          </span>
-        </el-dialog>
+            <div class="imageLibraryItem">
+              <el-row class="imageLibraryItemTitle">
+                <label @click="pic6Control = !pic6Control"> 定薪表 </label>
+              </el-row>
+              <el-row class="imageLibraryItemBody" v-show="pic6Control">
+                <el-form-item label="定薪表照片:" style="width: 50%">
+                  <el-upload
+                    class="avatar-uploader"
+                    action=""
+                    name="photo6"
+                    :show-file-list="false"
+                    :http-request="httpRequest"
+                    :before-upload="beforeAvatarUpload"
+                  >
+                    <img
+                      v-if="dataForm.photo6"
+                      :src="dataForm.photo6"
+                      class="avatar"
+                    />
+                    <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+                  </el-upload>
+                </el-form-item>
+              </el-row>
+            </div>
+          </el-tab-pane>
+        </el-tabs>
+      </el-form>
+      <span slot="footer" class="dialog-footer" v-show="activeTabs == 'third'">
+        <el-button
+          size="small"
+          type="primary"
+          style="background-color: #ffc000; border: 1px solid #ffc000"
+          @click="closeDialog"
+          >{{ $t("action.cancel") }}</el-button
+        >
+      </span>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-  export default {
-    data() {
-      return {
-        activeTabs: "first",
-        dialogVisible: false, // 新增编辑界面是否显示
-        deptInfo:{},  //选中机构的基本信息
-        // 控制影像
-        pic1Control:false,
-        pic3Control:false,
-        pic4Control:false,
-        pic5Control:false,
-        pic6Control:false,
+export default {
+  data() {
+    return {
+      activeTabs: "first",
+      dialogVisible: false, // 新增编辑界面是否显示
+      deptInfo: {}, //选中机构的基本信息
+      // 控制影像
+      pic1Control: false,
+      pic3Control: false,
+      pic4Control: false,
+      pic5Control: false,
+      pic6Control: false,
 
-        dataForm:{  // 人员个人信息
-            id: '',
-            name: '', //用户名
-            password: '', //密码
-            email: '', //邮箱
-            mobile: '', //手机号
-            birthday: '', //出生日期
-            status: '', //状态  1:正常   0:离司
-            marrycode: '', //婚姻状况
-            deptId: '', //机构号或者部门号
-            createBy: '', //创建人
-            createTime: '', //创建时间
-            lastUpdateBy: '', //更新人
-            lastUpdateTime: '', //更新时间
-            delFlag: '', //是否删除  -1:已删除  0:正常
-            usertype: '', //用户类型:0:系统用户 A:后线人员 B:代理人员
-            tenantId: '', //所属租户
-            sex: '', //性别
-            jobCode: '', //岗位
-            esmUserInternalid: '',
-            addressnow: '', //居住地址
-            nations: '', //民族
-            politicalstatus: '', //政治面貌
-            college: '', //毕业院校
-            identity: '', //身份证号
-            education: '', //学历
-            bankname: '', //开户行
-            accountno: '', //开户账号
-            addressresident: '', //户口地址
-            health: '', //健康状态
-            postalcode: '', //邮政编码
-            phonehouse: '', //住宅电话
-            collegetm: '', //毕业时间
-            speciality: '', //专业
-            nativeplace: '', //籍贯
-            worktype: '', //工作性质
-            blood: '', //血型
-            saleno: '', //业务员职业证书号
-            orglast: '', //原工作单位
-            joblast: '', //工作职务
-            hobby: '', //爱好特长
-            namespecial: '', //紧急联系人姓名
-            phonespecial: '', //紧急联系人电话
-            intimes: '', //是否二次入司
-            intime: '', //入司时间
-            contracttime: '', //签约时间(财)
-            isteamleader: '', //是否团队长(财)
-            documentno: '', //后线人员档案号
-            hrcode: '', //后线人员HR编码
-            regulartm: '', //转正时间
-            salarycode: '', //薪资等级
-            esmUserAgentid: '', //主键
-            recommenderid: '', //推荐人代码
-            recommendername: '', //推荐人姓名
-            leaderupid: '', //上级主管代码
-            leaderupname: '', //上级主管姓名
-            grouppersonid: '', //组育成人代码
-            grouppersonname: '', //组育成人姓名
-            deppersonid: '', //部育成人代码
-            deppersonname: '', //部育成人姓名
-            isshowteam: '', //是否显示团队
-            isshowsalesroom: '', //是否显示门店
+      dataForm: {
+        // 人员个人信息
+        id: "",
+        name: "", //用户名
+        password: "", //密码
+        email: "", //邮箱
+        mobile: "", //手机号
+        birthday: "", //出生日期
+        status: "", //状态  1:正常   0:离司
+        marrycode: "", //婚姻状况
+        deptId: "", //机构号或者部门号
+        createBy: "", //创建人
+        createTime: "", //创建时间
+        lastUpdateBy: "", //更新人
+        lastUpdateTime: "", //更新时间
+        delFlag: "", //是否删除  -1:已删除  0:正常
+        usertype: "", //用户类型:0:系统用户 A:后线人员 B:代理人员
+        tenantId: "", //所属租户
+        sex: "", //性别
+        jobCode: "", //岗位
+        esmUserInternalid: "",
+        addressnow: "", //居住地址
+        nations: "", //民族
+        politicalstatus: "", //政治面貌
+        college: "", //毕业院校
+        identity: "", //身份证号
+        education: "", //学历
+        bankname: "", //开户行
+        accountno: "", //开户账号
+        addressresident: "", //户口地址
+        health: "", //健康状态
+        postalcode: "", //邮政编码
+        phonehouse: "", //住宅电话
+        collegetm: "", //毕业时间
+        speciality: "", //专业
+        nativeplace: "", //籍贯
+        worktype: "", //工作性质
+        blood: "", //血型
+        saleno: "", //业务员职业证书号
+        orglast: "", //原工作单位
+        joblast: "", //工作职务
+        hobby: "", //爱好特长
+        namespecial: "", //紧急联系人姓名
+        phonespecial: "", //紧急联系人电话
+        intimes: "", //是否二次入司
+        intime: "", //入司时间
+        contracttime: "", //签约时间(财)
+        isteamleader: "", //是否团队长(财)
+        documentno: "", //后线人员档案号
+        hrcode: "", //后线人员HR编码
+        regulartm: "", //转正时间
+        salarycode: "", //薪资等级
+        esmUserAgentid: "", //主键
+        recommenderid: "", //推荐人代码
+        recommendername: "", //推荐人姓名
+        leaderupid: "", //上级主管代码
+        leaderupname: "", //上级主管姓名
+        grouppersonid: "", //组育成人代码
+        grouppersonname: "", //组育成人姓名
+        deppersonid: "", //部育成人代码
+        deppersonname: "", //部育成人姓名
+        isshowteam: "", //是否显示团队
+        isshowsalesroom: "", //是否显示门店
 
-            photo1:"",
-            photo2:"",
-            photo3:"",
-            photo4:"",
-            photo5:"",
-            photo6:""
-        },
-        // 新增或修改的弹出框End
+        photo1: "",
+        photo2: "",
+        photo3: "",
+        photo4: "",
+        photo5: "",
+        photo6: "",
+      },
+      // 新增或修改的弹出框End
 
-        queryFrom:{
-          "id":"",
-          "name":"",
-          "mobile":"",
-        },
-        tableData:[],
-        teamleadername:"",//团队长姓名
-        teamleaderid:"",//团队长工号
-        ztreeNodes:"",
+      queryFrom: {
+        id: "",
+        name: "",
+        mobile: "",
+      },
+      tableData: [],
+      teamleadername: "", //团队长姓名
+      teamleaderid: "", //团队长工号
+      ztreeNodes: "",
 
-        //------------下拉框数据字典   begin-----------------
-        comleveloptions: [],
-        comattributeoptions: [],
-        comtypeoptions: [],
-        jobcodeoptions:[],
-        departmentList:[], // 选中公司的所有部门的集合
-        //56个民族
-        nationalList:['汉族','壮族','满族','回族','苗族','维吾尔族','土家族','彝族','蒙古族','藏族','布依族','侗族','瑶族','朝鲜族','白族','哈尼族','哈萨克族','黎族','傣族','畲族','傈僳族','仡佬族','东乡族','高山族','拉祜族','水族','佤族','纳西族','羌族','土族','仫佬族','锡伯族','柯尔克孜族','达斡尔族','景颇族','毛南族','撒拉族','布朗族','塔吉克族','阿昌族','普米族','鄂温克族','怒族','京族','基诺族','德昂族','保安族','俄罗斯族','裕固族','乌兹别克族','门巴族','鄂伦春族','独龙族','塔塔尔族','赫哲族','珞巴族'],
-      }
-    },
-    created() {
-      //获取所有下拉框数据(字典)
-      this.getDictItems("comlevel");
-      this.getDictItems("comattribute");
-      this.getDictItems("comtype");
+      //------------下拉框数据字典   begin-----------------
+      comleveloptions: [],
+      comattributeoptions: [],
+      comtypeoptions: [],
+      jobcodeoptions: [],
+      departmentList: [], // 选中公司的所有部门的集合
+      //56个民族
+      nationalList: [
+        "汉族",
+        "壮族",
+        "满族",
+        "回族",
+        "苗族",
+        "维吾尔族",
+        "土家族",
+        "彝族",
+        "蒙古族",
+        "藏族",
+        "布依族",
+        "侗族",
+        "瑶族",
+        "朝鲜族",
+        "白族",
+        "哈尼族",
+        "哈萨克族",
+        "黎族",
+        "傣族",
+        "畲族",
+        "傈僳族",
+        "仡佬族",
+        "东乡族",
+        "高山族",
+        "拉祜族",
+        "水族",
+        "佤族",
+        "纳西族",
+        "羌族",
+        "土族",
+        "仫佬族",
+        "锡伯族",
+        "柯尔克孜族",
+        "达斡尔族",
+        "景颇族",
+        "毛南族",
+        "撒拉族",
+        "布朗族",
+        "塔吉克族",
+        "阿昌族",
+        "普米族",
+        "鄂温克族",
+        "怒族",
+        "京族",
+        "基诺族",
+        "德昂族",
+        "保安族",
+        "俄罗斯族",
+        "裕固族",
+        "乌兹别克族",
+        "门巴族",
+        "鄂伦春族",
+        "独龙族",
+        "塔塔尔族",
+        "赫哲族",
+        "珞巴族",
+      ],
+    };
+  },
+  created() {
+    //获取所有下拉框数据(字典)
+    this.getDictItems("comlevel");
+    this.getDictItems("comattribute");
+    this.getDictItems("comtype");
 
-      this.getDictItems("jobcode");
-      this.findLeftTreeData();
+    this.getDictItems("jobcode");
+    this.findLeftTreeData();
+    this.queryTeam();
+  },
+  methods: {
+    queryTeam() {
+      this.$api.user.queryTeamNum(this.queryFrom).then((res) => {
+        this.tableData = res.data;
+      });
     },
-    methods:{
-      queryTeam(){
-        console.log(this.queryFrom)
-        this.$api.user.queryTeamNum(this.queryFrom).then(res => {
-          console.log(res.data)
-          this.tableData = res.data;
-        });
-        console.log("通过组合条件查询团队关系!")
-      },
-      getDictItems(typeName) {
+    getDictItems(typeName) {
       //--数据字典--
-        this.$api.dict.findByLableName(typeName).then((response)=>{
+      this.$api.dict
+        .findByLableName(typeName)
+        .then((response) => {
           this[typeName + "options"] = response.data; // 把获取到的数据赋给this.data
-        }).catch((error)=>{
-          this[typeName + "options"] = [];
         })
-      },
-
-      findLeftTreeData: function() {
-        // 获取数据
-        this.$api.dept.findLeftDeptTree('99').then(res => {
-          this.ztreeNodes = res.data;
+        .catch((error) => {
+          this[typeName + "options"] = [];
         });
-      },
+    },
 
-      handleTableEdit(params) {
-        // 编辑代理人员
-        this.activeTabs = "first";
-        this.$api.dept.getDeptById(params.row.deptid.split('D')[0]).then(deptRes => {
+    findLeftTreeData: function () {
+      // 获取数据
+      this.$api.dept.findLeftDeptTree("99").then((res) => {
+        this.ztreeNodes = res.data;
+      });
+    },
+
+    handleTableEdit(params) {
+      // 编辑代理人员
+      this.activeTabs = "first";
+      this.$api.dept
+        .getDeptById(params.row.deptid.split("D")[0])
+        .then((deptRes) => {
           this.deptInfo = deptRes.data;
           this.departmentList = [];
-          for(var i=0;i<this.ztreeNodes.length;i++){
-            if(this.ztreeNodes[i].id.indexOf(params.row.deptid.split('D')[0]+'D')>=0){
+          for (var i = 0; i < this.ztreeNodes.length; i++) {
+            if (
+              this.ztreeNodes[i].id.indexOf(
+                params.row.deptid.split("D")[0] + "D"
+              ) >= 0
+            ) {
               this.departmentList.push({
-                label:this.ztreeNodes[i].name,
-                value:this.ztreeNodes[i].id
-              })
+                label: this.ztreeNodes[i].name,
+                value: this.ztreeNodes[i].id,
+              });
             }
           }
 
-          this.$api.user.selectByDeptId(params.row.deptid).then(res2=>{
-            if(res2.code == 200){
-              this.teamleaderid=res2.data.id;
+          this.$api.user.selectByDeptId(params.row.deptid).then((res2) => {
+            if (res2.code == 200) {
+              this.teamleaderid = res2.data.id;
               this.teamleadername = res2.data.name;
             }
-          })
+          });
 
           this.$api.user.findById(params.row.id).then((personRes) => {
-            console.log(personRes.data)
+            console.log(personRes.data);
             Object.assign(this.dataForm, personRes.data.sysUser);
             Object.assign(this.dataForm, personRes.data.esmUserInternal);
             Object.assign(this.dataForm, personRes.data.esmUserAgent);
             this.dataForm.status = personRes.data.sysUser.status;
             this.dataForm.status1 = personRes.data.esmUserInternal.status;
-            this.$api.user.findBasePersonById(personRes.data.esmUserAgent.recommenderid).then(res1=>{
-              console.log(res1.data)
-              if(res1.code == 200){
-                this.dataForm.recommenderid=res1.data.id;
-                this.dataForm.recommendername=res1.data.name;
-              }
-            })
-
-            this.dialogVisible = true
-
-          })
+            this.$api.user
+              .findBasePersonById(personRes.data.esmUserAgent.recommenderid)
+              .then((res1) => {
+                console.log(res1.data);
+                if (res1.code == 200) {
+                  this.dataForm.recommenderid = res1.data.id;
+                  this.dataForm.recommendername = res1.data.name;
+                }
+              });
 
+            this.dialogVisible = true;
+          });
+        });
+    },
+    handleDialogBefore(done) {
+      // 退出对话框之前确认提示
+      var that = this;
+      this.$confirm("确认关闭?")
+        .then((_) => {
+          done();
         })
-
-      },
-      handleDialogBefore(done) {
-        // 退出对话框之前确认提示
-        var that = this;
-        this.$confirm('确认关闭?')
-          .then(_ => {
-            done();
-          })
-          .catch(_ => {});
-      },
-      closeDialog(){
-        // 清空数据
-        this.deptInfo={};
-        this.$refs['dataForm'].resetFields()
-        for (let key in this.dataForm) {
-          this.dataForm[key] = "";
-        }
-        this.dialogVisible=false
-        console.log(this.dataForm)
-      },
-      // 上传图片的方法Start
-      beforeAvatarUpload(file) {
-        console.log(file);
-        const isJPG = (file.type === 'image/jpeg' ||  file.type === 'image/png') ;
-        const isLt2M = file.size / 1024 / 1024 < 2;
-        if (!isJPG) {
-          this.$message.error('上传图片只能是 JPG 或者 PNG 格式!');
-        }
-        if (!isLt2M) {
-          this.$message.error('上传图片大小不能超过 2MB!');
-        }
-        return isJPG && isLt2M;
-      },
-      httpRequest(options) {
-        console.log(options);
-          let file = options.file;
-          let filename = options.filename;
-          let reader  = new FileReader();
-          if (file) {
-              reader.readAsDataURL(file)
-          }
-          reader.onload = () => {
-              let base64Str = reader.result;
-              this.dataForm[options.filename] = base64Str;
-              console.log(options.filename)
-          }
+        .catch((_) => {});
+    },
+    closeDialog() {
+      // 清空数据
+      this.deptInfo = {};
+      this.$refs["dataForm"].resetFields();
+      for (let key in this.dataForm) {
+        this.dataForm[key] = "";
       }
-
-    }
-  }
+      this.dialogVisible = false;
+      console.log(this.dataForm);
+    },
+    // 上传图片的方法Start
+    beforeAvatarUpload(file) {
+      console.log(file);
+      const isJPG = file.type === "image/jpeg" || file.type === "image/png";
+      const isLt2M = file.size / 1024 / 1024 < 2;
+      if (!isJPG) {
+        this.$message.error("上传图片只能是 JPG 或者 PNG 格式!");
+      }
+      if (!isLt2M) {
+        this.$message.error("上传图片大小不能超过 2MB!");
+      }
+      return isJPG && isLt2M;
+    },
+    httpRequest(options) {
+      console.log(options);
+      let file = options.file;
+      let filename = options.filename;
+      let reader = new FileReader();
+      if (file) {
+        reader.readAsDataURL(file);
+      }
+      reader.onload = () => {
+        let base64Str = reader.result;
+        this.dataForm[options.filename] = base64Str;
+        console.log(options.filename);
+      };
+    },
+  },
+};
 </script>
 
 <style scoped>
-  /* 顶部查询条件样式Start */
-  .queryFrom{
-      background: #F2F7FC;
-      position:relative;
-      border:1px solid #ddd;
-      border-radius: 10px;
-      margin-top: 15px;
-      margin-bottom: 15px;
-      padding: 20px;
-  }
-  .queryFrom:before{
-      content:attr(title);
-      position:absolute;
-      left:10%;
-      transform:translate(-50%,-130%);
-      /* -webkit-transform:translate(-50%,-50%); */
-      padding:0 10px;
-      background-color:#fff;
-  }
-
-  .queryFrom .el-row {
-    margin: 10px 0px;
-  }
-  .queryFrom .el-form-item {
-    margin-bottom: 0px;
-  }
-  .queryFrom .queryButton .el-form-item__content {
-    margin-left: 0px !important;
-  }
-  /* 顶部查询条件样式End */
+/* 顶部查询条件样式Start */
+.queryFrom {
+  background: #f2f7fc;
+  position: relative;
+  border: 1px solid #ddd;
+  border-radius: 10px;
+  margin-top: 15px;
+  margin-bottom: 15px;
+  padding: 20px;
+}
+.queryFrom:before {
+  content: attr(title);
+  position: absolute;
+  left: 10%;
+  transform: translate(-50%, -130%);
+  /* -webkit-transform:translate(-50%,-50%); */
+  padding: 0 10px;
+  background-color: #fff;
+}
 
+.queryFrom .el-row {
+  margin: 10px 0px;
+}
+.queryFrom .el-form-item {
+  margin-bottom: 0px;
+}
+.queryFrom .queryButton .el-form-item__content {
+  margin-left: 0px !important;
+}
+/* 顶部查询条件样式End */
 
-  /* 上传图片样式Start */
-  .avatar-uploader .el-upload {
-     border: 1px dashed #d9d9d9;
-     border-radius: 6px;
-     cursor: pointer;
-     position: relative;
-     overflow: hidden;
-   }
-   .avatar-uploader .el-upload:hover {
-     border-color: #409EFF;
-   }
-   .avatar-uploader-icon {
-     font-size: 28px;
-     color: #8c939d;
-     width: 100px;
-     height: 100px;
-     line-height: 100px;
-     text-align: center;
-     border: 1px dashed #d9d9d9;
-   }
-   .avatar {
-     border: 1px dashed #d9d9d9;
-     padding: 5px;
-     border-radius: 6px;
-     width: 100px;
-     height: 100px;
-     display: block;
-   }
-  /* 上传图片样式End */
+/* 上传图片样式Start */
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+.avatar-uploader .el-upload:hover {
+  border-color: #409eff;
+}
+.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 100px;
+  height: 100px;
+  line-height: 100px;
+  text-align: center;
+  border: 1px dashed #d9d9d9;
+}
+.avatar {
+  border: 1px dashed #d9d9d9;
+  padding: 5px;
+  border-radius: 6px;
+  width: 100px;
+  height: 100px;
+  display: block;
+}
+/* 上传图片样式End */
 
-  .imageLibraryItem{
-      margin-bottom: 10px;
-  }
-  .imageLibraryItem .imageLibraryItemTitle{
-    display: block; height: 40px;line-height: 40px; width: 100%; background: #F3F3F3;border:1px solid #DDDDDD
-  }
-  .imageLibraryItem .imageLibraryItemTitle label{
-    margin: 0px 15px;font-weight: bold;
-  }
-  .imageLibraryItem .imageLibraryItemBody{
-    width:100%;border: 1px solid #DDD;padding: 15px;border-top: none;
-  }
+.imageLibraryItem {
+  margin-bottom: 10px;
+}
+.imageLibraryItem .imageLibraryItemTitle {
+  display: block;
+  height: 40px;
+  line-height: 40px;
+  width: 100%;
+  background: #f3f3f3;
+  border: 1px solid #dddddd;
+}
+.imageLibraryItem .imageLibraryItemTitle label {
+  margin: 0px 15px;
+  font-weight: bold;
+}
+.imageLibraryItem .imageLibraryItemBody {
+  width: 100%;
+  border: 1px solid #ddd;
+  padding: 15px;
+  border-top: none;
+}
 </style>

文件差異過大導致無法顯示
+ 572 - 230
src/views/PeopleManage/Staff/StaffExamine.vue


+ 128 - 159
src/views/PeopleManage/Staff/StaffManage.vue

@@ -291,7 +291,6 @@
               <el-col :span="8">
                 <el-form-item label="部门" prop="deptId">
                   <el-select
-                    @change="changeDept"
                     style="width: 100%"
                     v-model="dataForm.deptId"
                     placeholder="请选择"
@@ -306,30 +305,47 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="岗位" prop="jobName">
-                  <el-input
-                    disabled
+                <el-form-item label="岗位" prop="jobCode">
+                  <el-select
                     style="width: 100%"
-                    v-model="dataForm.jobName"
+                    v-model="dataForm.jobCode"
                     placeholder="请选择"
                   >
-                  </el-input>
+                    <el-option
+                      v-for="item in jobcodeoptions"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    ></el-option>
+                  </el-select>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="8">
-                <el-form-item label="所属团队长">
-                  <el-input v-model="teamleadername" disabled></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="所属团队工号">
-                  <el-input v-model="teamleaderid" disabled></el-input>
+                <el-form-item label="薪资等级" prop="salarycode">
+                  <el-select
+                    style="width: 100%"
+                    v-model="dataForm.salarycode"
+                    placeholder="请选择"
+                  >
+                    <el-option label="一级" value="一级"></el-option>
+                    <el-option label="二级" value="二级"></el-option>
+                    <el-option label="三级" value="三级"></el-option>
+                    <el-option label="四级" value="四级"></el-option>
+                    <el-option label="五级" value="五级"></el-option>
+                    <el-option label="六级" value="六级"></el-option>
+                    <el-option label="七级" value="七级"></el-option>
+                    <el-option label="八级" value="八级"></el-option>
+                    <el-option label="九级" value="九级"></el-option>
+                    <el-option label="十级" value="十级"></el-option>
+                    <el-option label="十一级" value="十一级"></el-option>
+                    <el-option label="十二级" value="十二级"></el-option>
+                  </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8" v-if="operation">
-                <el-form-item label="密码" prop="password">
+                <el-form-item label="修改密码" prop="password">
                   <el-input v-model="dataForm.password"></el-input>
                 </el-form-item>
               </el-col>
@@ -338,46 +354,9 @@
                   <el-input value="******" disabled></el-input>
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="8">
-                <el-form-item label="推荐人名字">
-                  <el-input
-                    :disabled="!operation"
-                    v-model="dataForm.recommendername"
-                  ></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="推荐人工号" prop="recommenderid">
-                  <el-select
-                    :disabled="!operation"
-                    style="width: 100%"
-                    filterable
-                    v-model="dataForm.recommenderid"
-                    placeholder="请选择"
-                    @change="changeRecommender"
-                  >
-                    <el-option
-                      v-for="item in recommenderList"
-                      :key="item.id"
-                      :label="item.id"
-                      :value="item.id"
-                    >
-                      <span style="float: left; margin-right: 20px">{{
-                        item.name
-                      }}</span>
-                      <span
-                        style="float: right; color: #8492a6; font-size: 13px"
-                        >{{ item.id }}</span
-                      >
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
               <el-col :span="8">
-                <el-form-item label="认证方式">
-                  <el-input v-model="dataForm.darta1"></el-input>
+                <el-form-item label="档案号" prop="documentno">
+                  <el-input v-model="dataForm.documentno"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -400,8 +379,8 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="状态">
-                  <el-input v-model="dataForm.darta2"></el-input>
+                <el-form-item label="电话" prop="mobile">
+                  <el-input v-model="dataForm.mobile"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -423,12 +402,17 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="移动电话" prop="mobile">
-                  <el-input v-model="dataForm.mobile"></el-input>
+                <el-form-item label="开户银行" prop="bankname">
+                  <el-input v-model="dataForm.bankname" disabled></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
+              <el-col :span="8">
+                <el-form-item label="银行账号" prop="accountno">
+                  <el-input v-model="dataForm.accountno"></el-input>
+                </el-form-item>
+              </el-col>
               <el-col :span="8">
                 <el-form-item label="民族" prop="nations">
                   <el-select
@@ -458,30 +442,13 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="户口所在地" prop="addressresident">
-                  <el-input v-model="dataForm.addressresident"></el-input>
-                </el-form-item>
-              </el-col>
             </el-row>
             <el-row>
               <el-col :span="8">
-                <el-form-item label="银行账号" prop="accountno">
-                  <el-input v-model="dataForm.accountno"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="开户银行" prop="bankname">
-                  <el-input v-model="dataForm.bankname" disabled></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="住宅电话" prop="phonehouse">
-                  <el-input v-model="dataForm.phonehouse"></el-input>
+                <el-form-item label="户口所在地" prop="addressresident">
+                  <el-input v-model="dataForm.addressresident"></el-input>
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row>
               <el-col :span="8">
                 <el-form-item label="健康状况" prop="health">
                   <el-select
@@ -500,66 +467,46 @@
                   <el-input v-model="dataForm.postalcode"></el-input>
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="邮箱" prop="email">
-                  <el-input v-model="dataForm.email"></el-input>
-                </el-form-item>
-              </el-col>
             </el-row>
             <el-row>
               <el-col :span="8">
-                <el-form-item label="籍贯" prop="nativeplace">
-                  <el-input v-model="dataForm.nativeplace"></el-input>
+                <el-form-item label="居住地址" prop="addressnow">
+                  <el-input v-model="dataForm.addressnow"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="学历" prop="education">
-                  <el-select
-                    style="width: 100%"
-                    v-model="dataForm.education"
-                    placeholder="请选择"
-                  >
-                    <el-option label="小学" value="小学"></el-option>
-                    <el-option label="初中" value="初中"></el-option>
-                    <el-option label="高中" value="高中"></el-option>
-                    <el-option label="专科" value="专科"></el-option>
-                    <el-option label="本科" value="本科"></el-option>
-                    <el-option label="硕士" value="硕士"></el-option>
-                    <el-option label="博士" value="博士"></el-option>
-                  </el-select>
+                <el-form-item label="邮箱" prop="email">
+                  <el-input v-model="dataForm.email"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="血型" prop="blood">
-                  <el-select
-                    style="width: 100%"
-                    v-model="dataForm.blood"
-                    placeholder="请选择"
-                  >
-                    <el-option label="A型" value="A型"></el-option>
-                    <el-option label="B型" value="B型"></el-option>
-                    <el-option label="O型" value="O型"></el-option>
-                    <el-option label="AB型" value="AB型"></el-option>
-                  </el-select>
+                <el-form-item label="住宅电话" prop="phonehouse">
+                  <el-input v-model="dataForm.phonehouse"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="8">
-                <el-form-item label="居住地址" prop="addressnow">
-                  <el-input v-model="dataForm.addressnow"></el-input>
+                <el-form-item label="籍贯" prop="nativeplace">
+                  <el-input v-model="dataForm.nativeplace"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="毕业院校" prop="college">
-                  <el-input v-model="dataForm.college"></el-input>
+                <el-form-item label="入司时间" prop="intime">
+                  <el-date-picker
+                    style="width: 100%"
+                    v-model="dataForm.intime"
+                    type="date"
+                    placeholder="选择日期"
+                  >
+                  </el-date-picker>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="入司时间" prop="intime">
+                <el-form-item label="转正时间" prop="regulartm">
                   <el-date-picker
                     style="width: 100%"
-                    v-model="dataForm.intime"
+                    v-model="dataForm.regulartm"
                     type="date"
                     placeholder="选择日期"
                   >
@@ -569,8 +516,8 @@
             </el-row>
             <el-row>
               <el-col :span="8">
-                <el-form-item label="代理人资格证号" prop="saleno">
-                  <el-input v-model="dataForm.saleno"></el-input>
+                <el-form-item label="毕业院校" prop="college">
+                  <el-input v-model="dataForm.college"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -585,8 +532,8 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="原工作单位" prop="orglast">
-                  <el-input v-model="dataForm.orglast"></el-input>
+                <el-form-item label="专业" prop="speciality">
+                  <el-input v-model="dataForm.speciality"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -606,23 +553,55 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="紧急联系人电话" prop="phonespecial">
-                  <el-input v-model="dataForm.phonespecial"></el-input>
+                <el-form-item label="学历" prop="education">
+                  <el-select
+                    style="width: 100%"
+                    v-model="dataForm.education"
+                    placeholder="请选择"
+                  >
+                    <el-option label="小学" value="小学"></el-option>
+                    <el-option label="初中" value="初中"></el-option>
+                    <el-option label="高中" value="高中"></el-option>
+                    <el-option label="专科" value="专科"></el-option>
+                    <el-option label="本科" value="本科"></el-option>
+                    <el-option label="硕士" value="硕士"></el-option>
+                    <el-option label="博士" value="博士"></el-option>
+                  </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="紧急联系人姓名" prop="namespecial">
-                  <el-input v-model="dataForm.namespecial"></el-input>
+                <el-form-item label="血型" prop="blood">
+                  <el-select
+                    style="width: 100%"
+                    v-model="dataForm.blood"
+                    placeholder="请选择"
+                  >
+                    <el-option label="A型" value="A型"></el-option>
+                    <el-option label="B型" value="B型"></el-option>
+                    <el-option label="O型" value="O型"></el-option>
+                    <el-option label="AB型" value="AB型"></el-option>
+                  </el-select>
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row> </el-row>
-            <el-row v-if="dataForm.status1 == '0' || dataForm.status1 == '2'">
+            <el-row>
               <el-col :span="8">
-                <el-form-item label="录入人" prop="createBy">
+                <el-form-item label="紧急联系姓名" prop="namespecial">
+                  <el-input v-model="dataForm.namespecial"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="紧急联系电话" prop="phonespecial">
+                  <el-input v-model="dataForm.phonespecial"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="操作员" prop="createBy">
                   <el-input v-model="dataForm.createBy"></el-input>
                 </el-form-item>
               </el-col>
+            </el-row>
+            <el-row v-if="dataForm.status1 == '0' || dataForm.status1 == '2'">
               <el-col :span="8">
                 <el-form-item label="录入时间" prop="createTime">
                   <el-input v-model="dataForm.createTime"></el-input>
@@ -633,6 +612,18 @@
                   <el-input v-model="dataForm.lastUpdateTime"></el-input>
                 </el-form-item>
               </el-col>
+              <el-col :span="8">
+                <el-form-item label="操作员" prop="lastUpdateBy">
+                  <el-input v-model="dataForm.lastUpdateBy"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="原工作单位" prop="orglast">
+                  <el-input v-model="dataForm.orglast"></el-input>
+                </el-form-item>
+              </el-col>
             </el-row>
           </el-tab-pane>
           <el-tab-pane label="影像资料" name="third">
@@ -1007,6 +998,7 @@ export default {
     };
 
     return {
+      jobNameList: [], //岗位下拉框数组
       filterObject: {},
       zrr: [],
       peopleid: "",
@@ -1304,37 +1296,6 @@ export default {
         // identity: [{ required: true,message: '请输入身份证',trigger: 'blur'},{ validator: validateIdCard, trigger: 'blur'}],
       },
       option: [], //机构列表
-
-      // dataFormRules: {
-      //   name: [{ required: true,message: '请输入用户名',trigger: 'blur'}],
-      //   deptId: [{ required: true,message: '请选择部门',trigger: 'blur'}],
-      //   // jobName: [{ required: true,message: '请选择岗位',trigger: 'blur'}],
-      //   // salarycode: [{ required: true,message: '请选择薪资等级',trigger: 'blur'}],
-      //   password: [{ required: true,message: '请设置初始密码',trigger: 'blur'},{ min: 6, max: 10, message: '长度在 6 到 10 个字符', trigger: 'blur' }],
-      //   recommenderid:[{ required: true,message: '请选择推荐人',trigger: 'blur'}],
-      //   name: [{ required: true,message: '请输入姓名',trigger: 'blur'}],
-      //   sex: [{ required: true,message: '请选择性别',trigger: 'blur'}],
-      //   mobile: [{ required: true,message: '请输入电话',trigger: 'blur'},{ min: 11, max: 11, message: "请输入11位手机号码", trigger: "blur" },{ pattern: /^(13[0-9]|14[579]|15[0-3,5-9]|16[6]|17[0135678]|18[0-9]|19[89])\d{8}$/, message: '请输入正确的手机号', trigger: 'blur'}],
-      //   identity: [{ required: true,message: '请输入身份证',trigger: 'blur'},{ validator: validateIdCard, trigger: 'blur'}],
-      //   birthday: { required: true, message: '请选择日期', trigger: 'blur' },
-      //   accountno: [{ validator: validateBankCard, trigger: 'blur' }],
-      //   marrycode: [{ required: true,message: '请选择婚姻状况',trigger: 'blur'}],
-      //   email: [{ required: true,message: '请输入邮箱地址',trigger: 'blur'},{ type: 'email', message: '请输入正确的邮箱地址', trigger: 'blur' }],
-      //   addressnow: [{ required: true,message: '请输入居住地址',trigger: 'blur'}],
-      //   nations: [{ required: true,message: '请选择民族',trigger: 'blur'}],
-      //   // politicalstatus: [{ required: true,message: '请选择政治面貌',trigger: 'blur'}],
-      //   // college: [{ required: true,message: '请输入毕业院校',trigger: 'blur'}],
-      //   education: [{ required: true,message: '请选择学历',trigger: 'blur'}],
-      //   // addressresident: [{ required: true,message: '请输入户口地址',trigger: 'blur'}],
-      //   // health: [{ required: true,message: '请选择健康状态',trigger: 'blur'}],
-      //   // postalcode: [{ required: true,message: '请输入邮政编码',trigger: 'blur'}],
-      //   // phonehouse: [{ required: true,message: '请输入住宅电话',trigger: 'blur'}],
-      //   // collegetm: [{ required: true,message: '请选择毕业时间',trigger: 'blur'}],
-      //   namespecial: [{ required: true,message: '请输入紧急联系人姓名',trigger: 'blur'}],
-      //   phonespecial: [{ required: true,message: '请输入紧急联系人电话',trigger: 'blur'}],
-      //   intime: [{ required: true,message: '请选择入司时间',trigger: 'blur'}],
-      // },
-      // 新增编辑界面数据
     };
   },
   created() {
@@ -1351,7 +1312,7 @@ export default {
     this.getDictItems("comlevel");
     this.getDictItems("comattribute");
     this.getDictItems("comtype");
-    this.getDictItems("jobName");
+    this.jobCodeList();
 
     this.findLeftTreeData(); // 获取机构树的数据
   },
@@ -1415,6 +1376,13 @@ export default {
     },
   },
   methods: {
+    jobCodeList() {
+      let typeName = "jobcode";
+      this.$api.dict.findByLableName(typeName).then((res) => {
+        console.log(res);
+        this.jobcodeoptions = res.data;
+      });
+    },
     // 查询Start
     queryStaffInfo() {
       this.pageRequest.columnFilters.userId.value = this.queryFrom.id;
@@ -1818,7 +1786,7 @@ export default {
       this.activeTabs = "first";
       this.operation = true; // 表示弹出框为新智能功能
       this.dialogTitle = "新增后线人员";
-      this.dataForm.jobName = "核保";
+      // this.dataForm.jobName = "核保";
       // 查询机构信息
       this.$api.dept.getDeptById(this.currentTreeNode.id).then((res) => {
         this.departmentList = [];
@@ -2027,7 +1995,7 @@ export default {
               params.sysUser.usertype = "1";
               params.sysUser.tenantId = this.dataForm.tenantId;
               params.sysUser.sex = this.dataForm.sex;
-              params.sysUser.jobCode = "17";
+              params.sysUser.jobCode = this.dataForm.jobCode;
               params.sysUser.openid = this.dataForm.openid;
               params.sysUser.salt = this.dataForm.salt;
               params.sysUserInternal.id = this.dataForm.id;
@@ -2086,6 +2054,7 @@ export default {
               params.esmUserAgent.isshowteam = this.dataForm.isshowteam;
               params.esmUserAgent.isshowsalesroom =
                 this.dataForm.isshowsalesroom;
+              console.log(params);
               this.$api.user.saveUser(params).then((res) => {
                 if (res.code == 200) {
                   let taskid = res.data;

+ 11 - 10
src/views/PeopleManage/TeamLeader/TeamLeaderExamine.vue

@@ -9,12 +9,13 @@
               >包含下级机构</el-checkbox
             >
             <el-divider></el-divider>
-            <tree
-              :setting="ztreeSetting"
-              :nodes="ztreeNodes"
-              @onClick="onZTreeClick"
-              @onCreated="onZTreeCreated"
-            />
+            <el-tree
+              :data="ztreeNodes"
+              :props="{ children: 'children', label: 'name' }"
+              node-key="id"
+              :default-expanded-keys="['9']"
+              @node-click="onZTreeClick"
+            ></el-tree>
           </div>
         </SplitArea>
         <!-- 左侧树End -->
@@ -59,7 +60,7 @@
                   <el-form-item label="状态">
                     <el-select
                       size="small"
-                      v-model="queryFrom.approvalStatus"
+                      v-model="queryFrom.status"
                       placeholder="请选择"
                     >
                       <el-option label="待审核" value="0"></el-option>
@@ -1348,7 +1349,7 @@ export default {
     //--left tree begin-------
     findLeftTreeData: function () {
       // 获取数据
-      this.$api.dept.findLeftDeptTree(this.peopledeptid).then((res) => {
+      this.$api.dept.findDeptTree(this.peopledeptid).then((res) => {
         this.ztreeNodes = res.data;
       });
     },
@@ -1361,7 +1362,7 @@ export default {
     onZTreeClick: function (evt, treeId, treeNode) {
       // 点击事件
       console.log(evt.type, treeNode);
-      this.currentTreeNode = treeNode;
+      this.currentTreeNode = evt;
       this.pageRequest.columnFilters.deptId.value = this.currentTreeNode.id;
       this.findPage(null);
     },
@@ -1373,7 +1374,7 @@ export default {
       this.pageRequest.columnFilters.realName.value = this.queryFrom.name;
       this.pageRequest.columnFilters.mobile.value = this.queryFrom.tel;
       this.pageRequest.columnFilters.approvalStatus.value =
-        this.queryFrom.approvalStatus;
+        this.queryFrom.status;
       this.pageRequest.pageNum = 1;
       this.findPage(null);
     },

+ 7 - 46
src/views/PeopleManage/TeamLeader/TeamLeaderManage.vue

@@ -180,13 +180,16 @@
             </el-row>
             <el-row>
               <el-col :span="8">
-                <el-form-item label="所属团队长">
-                  <el-input v-model="teamleadername" disabled></el-input>
+                <el-form-item label="姓名" prop="name">
+                  <el-input v-model="dataForm.name"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="所属团队工号">
-                  <el-input v-model="teamleaderid" disabled></el-input>
+                <el-form-item label="性别" prop="sex">
+                  <el-select style="width:100%" v-model="dataForm.sex" placeholder="请选择">
+                    <el-option label="男" value="男"></el-option>
+                    <el-option label="女" value="女"></el-option>
+                  </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8" v-if="operation">
@@ -200,48 +203,6 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row>
-              <el-col :span="8">
-                <el-form-item label="推荐人名字">
-                  <el-input :disabled="!operation" v-model="dataForm.recommendername"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="推荐人工号" prop="recommenderid">
-                  <el-select :disabled="!operation" style="width: 100%;" filterable  v-model="dataForm.recommenderid" placeholder="请选择" @change="changeRecommender">
-                    <el-option v-for="item in recommenderList" :key="item.id" :label="item.id" :value="item.id" >
-                      <span style="float: left;margin-right: 20px;">{{ item.name }}</span>
-                      <span style="float: right; color: #8492a6; font-size: 13px">{{ item.id }}</span>
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8" >
-                <el-form-item label="认证方式" >
-                  <el-input v-model="dataForm.darta1"></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="8">
-                <el-form-item label="姓名" prop="name">
-                  <el-input v-model="dataForm.name"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="性别" prop="sex">
-                  <el-select style="width:100%" v-model="dataForm.sex" placeholder="请选择">
-                    <el-option label="男" value="男"></el-option>
-                    <el-option label="女" value="女"></el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8" >
-                <el-form-item label="状态" >
-                  <el-input v-model="dataForm.darta2"></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
             <el-row>
               <el-col :span="8">
                 <el-form-item label="身份证号" prop="identity">

部分文件因文件數量過多而無法顯示