@z1595784580 3 лет назад
Родитель
Сommit
b0f5eb01c1

+ 23 - 6
src/assets/css/global.css

@@ -74,9 +74,26 @@ html, body, #app {
   font-weight: 500 !important;
   font-size: 13px !important;
 }
-/* .treeicon .el-tree-node__expand-icon {
-  cursor: pointer;
-  color: #8b8b8b !important;
-  font-size: 17px !important;
-  padding-right: 2px;
-} */
+/* 发票信息样式 */
+.ktTable .el-button+.el-button,
+.el-checkbox.is-bordered+.el-checkbox.is-bordered {
+  margin-left: 0px !important;
+  margin-top: 2px;
+}
+.ktTable .el-button--small {
+  padding: 9px 12px !important;
+}
+.ktTable .el-button--danger.is-disabled {
+  display: none !important;
+}
+.ktTable .el-button--danger{
+  display: none;
+}
+.ktTable .fa{
+  width: 10px;
+}
+/* 确认提示框样式 */
+.el-message-box__wrapper {
+  top: -120px !important;
+  left: 9px !important;
+}

+ 4 - 4
src/config/global.js

@@ -7,16 +7,16 @@
 // 后台管理系统服务器地址
 // export const baseUrl = 'http://192.168.1.7:8080'
 // export const h5BaseUrl = 'http://192.168.1.7:8091'
-// export const baseUrl = 'http://192.168.1.111:8080'
-// export const h5BaseUrl = 'http://192.168.1.111:8091'
+export const baseUrl = 'http://192.168.0.111:8080'
+export const h5BaseUrl = 'http://192.168.0.111:8091'
 //旧服务器
 // export const baseUrl = 'http://test.baoxianzhanggui.com:8080'  
-export const h5BaseUrl = 'http://test.baoxianzhanggui.com:8091'   // h5测试
+// export const h5BaseUrl = 'http://test.baoxianzhanggui.com:8091'   // h5测试
 // export const baseUrl = 'http://www.baoxianzhanggui.com:8080'   
 // export const h5BaseUrl = 'http://www.baoxianzhanggui.com:8091'  //h5正式
 // 新服务器
 // export const baseUrl = 'http://sxzgkj.baoxianzhanggui.com/web-api' //正式服务器
-export const baseUrl = 'http://39.98.239.48/web-api' //测试服务器
+// export const baseUrl = 'http://39.98.239.48/web-api' //测试服务器
 export const backupBaseUrl = 'http://localhost:8002'
 //保险公司名称
 export const insCompanyList = [

+ 68 - 0
src/http/moudules/dict.js

@@ -88,4 +88,72 @@ export const listAllDataByTypes = (data) => {
         method: 'get',
         data
     })
+}
+
+
+//发票信息管理
+//分页查询
+export const queryPage = (data) => {
+    return axios({
+        url: '/api/inv/invoiceInfo/queryPage',
+        method: 'post',
+        data
+    })
+}
+//保存
+export const invoiceInfoSave = (data) => {
+    return axios({
+        url: '/api/inv/invoiceInfo/save',
+        method: 'post',
+        data
+    })
+}
+//
+//批量审批退回
+export const approvalBack = (data) => {
+    return axios({
+        url: '/api/inv/invoiceInfo/approvalBack?ids='+data,
+        method: 'post',
+    })
+}
+//批量审批通过
+export const approvalPass = (data) => {
+    console.log(data);
+    return axios({
+        url: '/api/inv/invoiceInfo/approvalPass?ids='+data,
+        method: 'post',
+    })
+}
+//excel导入数据
+export const invoiceInfoImport = (data) => {
+    return axios({
+        url: '/api/inv/invoiceInfo/import',
+        method: 'post',
+        data
+    })
+}
+//发票公司控制层-----
+//保存
+export const companySave = (data) => {
+    return axios({
+        url: '/api/inv/company/save',
+        method: 'post',
+        data
+    })
+}
+//开票公司查询
+export const companyFindList = (data) => {
+    return axios({
+        url: '/api/inv/company/findList',
+        method: 'post',
+        data
+    })
+}
+//开票公司查询分页(展示额度)
+export const companyFindPage = (data) => {
+    return axios({
+        url: '/api/inv/company/findPage',
+        method: 'post',
+        data
+    })
 }

+ 32 - 15
src/views/Core/KtCommonTable.vue

@@ -148,31 +148,43 @@
             @click="handleDeleteFlag(scope.$index, scope.row)"
           />
           <kt-button
-            style="color: #ffffff !important"
-            v-if="button1Name"
-            :label="button1Name"
-            :perms="permsButton1"
+            style="
+              background: rgb(14, 194, 22);
+              border: 1px solid rgb(14, 194, 22);
+              color: #ffffff;
+            "
+            v-if="button3Name"
+            :label="button3Name"
+            :perms="permsButton3"
+            icon="fa fa-edit"
             :size="size"
-            :style="'background:' + button1Background"
-            @click="handleButton1(scope.$index, scope.row)"
+            @click="handleButton3(scope.$index, scope.row)"
           />
           <kt-button
-            style="color: #ffffff"
+            style="
+              background: rgb(222, 80, 76);
+              border: 1px solid rgb(222, 80, 76);
+              color: #ffffff;
+            "
+            icon="fa fa-edit"
             v-if="button2Name"
             :label="button2Name"
             :perms="permsButton2"
             :size="size"
-            :style="'background:' + button2Background"
             @click="handleButton2(scope.$index, scope.row)"
           />
           <kt-button
-            style="color: #ffffff"
-            v-if="button3Name"
-            :label="button3Name"
-            :perms="permsButton3"
+            style="
+              background: #f56c6c;
+              border: 1px solid #f56c6c;
+              color: #ffffff;
+            "
+            icon="fa fa-trash"
+            v-if="button1Name"
+            :label="button1Name"
+            :perms="permsButton1"
             :size="size"
-            :style="'background:' + button3Background"
-            @click="handleButton3(scope.$index, scope.row)"
+            @click="handleButton1(scope.$index, scope.row)"
           />
         </template>
       </el-table-column>
@@ -181,6 +193,7 @@
     <!-- 底部分页 -->
     <div class="bottomFixed" ref="bottomFixed">
       <kt-button
+        class="debutton"
         :label="$t('action.batchDelete')"
         :perms="permsDelete"
         :size="size"
@@ -220,6 +233,7 @@
         :page-sizes="[10, 20, 50, 100, 200, 300, 400, 500]"
         :total="data.totalSize"
         style="float: left; margin-left: 20px"
+        v-if="isshowpagination"
       >
       </el-pagination>
     </div>
@@ -346,7 +360,7 @@ export default {
       // 分页信息
       pageRequest: {
         pageNum: 1,
-        pageSize: 20,
+        pageSize: 10,
       },
       loading: false, // 加载标识
       selections: [], // 列表选中列
@@ -373,6 +387,9 @@ export default {
         callback: callback,
       });
     },
+    hideLoading() {
+      this.loading = false;
+    },
     // 选择切换
     selectionChange: function (selections) {
       this.selections = selections;

+ 1 - 1
src/views/Esm/Esmcompany.vue

@@ -526,7 +526,7 @@ export default {
 
     handleAddType() {
       // 添加保险总公司
-      this.operType = "ADD1";
+      this.operType = "ADD2";
       this.dialogTitle = "新增保险总公司";
       this.dataForm.parentId = "0";
       this.dialogVisible = true;

+ 718 - 11
src/views/FinancialManagement/InvoiceAmount.vue

@@ -1,27 +1,734 @@
 <template>
   <!--布局容器-->
   <div class="container" style="width: 99%; margin-top: 0px">
-    <el-button type="primary">新增</el-button>
-    <el-container style="height: 100%" direction="vertical"> </el-container>
+    <!-- 顶部查询 -->
+    <el-row class="top">
+      <el-form v-model="queryFrom" size="small" label-width="95px" class="form">
+        <el-form-item label="选择日期">
+          <el-date-picker
+            v-model="queryFrom.value1"
+            size="small"
+            type="daterange"
+            range-separator="至"
+            start-placeholder="起开票日期"
+            end-placeholder="止开票日期"
+            value-format="yyyy-MM-dd"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="营业性质" label-width="95px" prop="qualityId">
+          <el-select
+            v-model="queryFrom.qualityId"
+            placeholder="请选择营业性质"
+            clearable
+          >
+            <el-option
+              v-for="item in natureBusinessList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="企业名称" label-width="95px" prop="invCompanyName">
+          <el-select
+            v-model="queryFrom.enterpriseId"
+            placeholder="请选择企业"
+            clearable
+            @change="changeEnterprise"
+          >
+            <el-option
+              v-for="item in enterpriseNameList"
+              :key="item.id"
+              :label="item.enterpriseName"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" size="mini" @click="queryStaffInfo"
+            >查询</el-button
+          >
+        </el-form-item>
+      </el-form>
+    </el-row>
+    <!-- 新增 -->
+    <el-button
+      class="operation"
+      type="primary"
+      plain
+      size="mini"
+      @click="addAmount"
+      >新增</el-button
+    >
+
+    <!-- 表格 -->
+    <kt-common-table
+      :operationWidth="operationWidth"
+      class="ktTable"
+      permsEdit="sys:agent:view"
+      ref="dataTable"
+      :data="pageResult"
+      :columns="columns"
+      :showBatchDelete="true"
+      :showOperation="true"
+      editButtonName="修改"
+      :button1Name="button1Name"
+      @handleButton1="handleTableDelete"
+      @findPage="findPage"
+      @handleEdit="handleTableEdit"
+      :isshowpagination="true"
+    ></kt-common-table>
+
+    <!-- 新增弹出框 -->
+    <el-dialog
+      class="dialog"
+      title="新增"
+      :close-on-click-modal="false"
+      :before-close="handleClose"
+      :visible.sync="dialogFormVisible"
+      width=" 770px"
+    >
+      <el-form
+        :model="addform"
+        :rules="rules"
+        ref="addform"
+        label-width="120px"
+        size="small"
+        class="frame"
+      >
+        <el-row>
+          <el-col :span="12">
+            <el-form-item
+              label="营业性质"
+              :label-width="formLabelWidth"
+              prop="qualityId"
+            >
+              <el-select
+                v-model="addform.qualityId"
+                placeholder="请选择营业性质"
+                @change="changeDept"
+              >
+                <el-option
+                  v-for="item in natureBusinessList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item
+              label="所属地"
+              :label-width="formLabelWidth"
+              prop="areaName"
+            >
+              <el-input
+                v-model="addform.areaName"
+                autocomplete="off"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item
+              label="企业名称"
+              :label-width="formLabelWidth"
+              prop="enterpriseName"
+            >
+              <el-input
+                v-model="addform.enterpriseName"
+                autocomplete="off"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item
+              label="法人"
+              :label-width="formLabelWidth"
+              prop="legalPerson"
+            >
+              <el-input
+                v-model="addform.legalPerson"
+                autocomplete="off"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item
+              label="税率(%)"
+              :label-width="formLabelWidth"
+              prop="taxRate"
+            >
+              <el-input-number
+                v-model="addform.taxRate"
+                @change="handleChange"
+                :min="0"
+                :max="10"
+                label="描述文字"
+              ></el-input-number>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12"
+            ><el-form-item label="成立日期" prop="foundDate"
+              ><el-date-picker
+                v-model="addform.foundDate"
+                type="date"
+                placeholder="选择日期"
+                value-format="yyyy-MM-dd"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item
+              label="管理员"
+              :label-width="formLabelWidth"
+              prop="管理员"
+            >
+              <el-input v-model="addform.admin" autocomplete="off"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item
+              label="报税限额度(年)"
+              :label-width="formLabelWidth"
+              prop="taxLimit"
+            >
+              <el-input v-model="addform.taxLimit"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="resetForm('addform')">取 消</el-button>
+        <el-button type="primary" @click="submitForm('addform')"
+          >确 定</el-button
+        >
+      </div>
+    </el-dialog>
+    <!-- 修改弹出框 -->
+    <el-dialog
+      class="dialog"
+      title="编辑信息"
+      :close-on-click-modal="false"
+      :visible.sync="dialogForm"
+      width=" 770px"
+    >
+      <el-form
+        :model="editform"
+        :rules="rules"
+        ref="editform"
+        label-width="120px"
+        size="small"
+        class="frame"
+      >
+        <el-row>
+          <el-col :span="12">
+            <el-form-item
+              label="营业性质"
+              :label-width="formLabelWidth"
+              prop="qualityId"
+            >
+              <el-select
+                v-model="editform.qualityId"
+                placeholder="请选择营业性质"
+                @change="changeDept"
+              >
+                <el-option
+                  v-for="item in natureBusinessList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item
+              label="所属地"
+              :label-width="formLabelWidth"
+              prop="areaName"
+            >
+              <el-input
+                v-model="editform.areaName"
+                autocomplete="off"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item
+              label="企业名称"
+              :label-width="formLabelWidth"
+              prop="enterpriseName"
+            >
+              <el-input
+                v-model="editform.enterpriseName"
+                autocomplete="off"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item
+              label="法人"
+              :label-width="formLabelWidth"
+              prop="legalPerson"
+            >
+              <el-input
+                v-model="editform.legalPerson"
+                autocomplete="off"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item
+              label="税率(%)"
+              :label-width="formLabelWidth"
+              prop="taxRate"
+            >
+              <el-input-number
+                v-model="editform.taxRate"
+                @change="handleChange"
+                :min="0"
+                :max="10"
+                label="描述文字"
+              ></el-input-number>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12"
+            ><el-form-item label="成立日期" prop="foundDate"
+              ><el-date-picker
+                v-model="editform.foundDate"
+                type="date"
+                placeholder="选择日期"
+                value-format="yyyy-MM-dd"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item
+              label="管理员"
+              :label-width="formLabelWidth"
+              prop="管理员"
+            >
+              <el-input v-model="editform.admin" autocomplete="off"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item
+              label="报税限额度(年)"
+              :label-width="formLabelWidth"
+              prop="taxLimit"
+            >
+              <el-input v-model="editform.taxLimit"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="reset('editform')">取 消</el-button>
+        <el-button type="primary" @click="determine">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
-import Cookies from "js-cookie";
+import KtCommonTable from "@/views/Core/KtCommonTable.vue"; //表格组件
+import KtButton from "@/views/Core/KtButton"; // 按钮权限组件
+import CommonUtil from "@/utils/comutil.js";
+
 export default {
-  name: "InvoiceAmount",
-  components: {},
-  created() {},
+  name: "InvoiceInformation",
+  components: { KtCommonTable, KtButton },
+  created() {
+    this.business(); //营业性质
+    this.findEnterpriseNameList(); //获取企业下拉框数据
+  },
   mounted() {},
   data() {
-    return {};
+    return {
+      operationWidth: 300, //操作列宽度
+      queryFrom: {
+        value1: "",
+        qualityId: "",
+        enterpriseName: "",
+        enterpriseId: "",
+      },
+
+      button1Name: "删除",
+      pageResult: {},
+      pageRequest: {
+        //查询的默认条件
+        startInvoiceDate: "",
+        endInvoiceDate: "",
+        enterpriseId: "", //企业id
+        pageNum: 1,
+        pageSize: 10,
+        qualityId: "", //营业性质
+      },
+      columns: [
+        // 数据列
+        {
+          prop: "qualityName",
+          label: "营业性质",
+          minWidth: 80,
+          sortable: false,
+        },
+
+        { prop: "areaName", label: "所属地", minWidth: 150, sortable: false },
+        {
+          prop: "enterpriseName",
+          label: "企业名称",
+          minWidth: 160,
+          sortable: false,
+        },
+        {
+          prop: "legalPerson",
+          label: "法人",
+          minWidth: 80,
+          sortable: false,
+        },
+        {
+          prop: "taxRate",
+          label: "税率",
+          minWidth: 70,
+          sortable: false,
+        },
+        {
+          prop: "foundDate",
+          label: "成立日期",
+          minWidth: 140,
+          sortable: false,
+        },
+        {
+          prop: "taxLimit",
+          label: "总开票额",
+          minWidth: 80,
+          sortable: false,
+        },
+        {
+          prop: "invoicedMoney",
+          label: "已开票额",
+          minWidth: 80,
+          sortable: false,
+        },
+        {
+          prop: "notInvoicedMoney",
+          label: "未开票额",
+          minWidth: 80,
+          sortable: false,
+        },
+      ],
+      //查询信息
+      checked: false, //选项
+      dialogFormVisible: false, //新增弹出框
+      dialogForm: false, //编辑弹出框
+      formLabelWidth: "120px",
+      num: 1, //发票数
+      addform: {
+        qualityName: "", //营业性质
+        areaName: "", //所属地
+        enterpriseName: "", //企业名称
+        legalPerson: "", //法人
+        taxRate: 0, //税率
+        foundDate: "", //成立日期
+        taxLimit: "", //报税限额度(年)
+        admin: "", //管理员
+        qualityId: "", //营业性质ID
+        enterpriseId: "", //企业名称ID
+      },
+      editform: {
+        qualityName: "", //营业性质
+        areaName: "", //所属地
+        enterpriseName: "", //企业名称
+        legalPerson: "", //法人
+        taxRate: 0, //税率
+        foundDate: "", //成立日期
+        taxLimit: "", //报税限额度(年)
+        admin: "", //管理员
+        qualityId: "", //营业性质ID
+        enterpriseId: "", //企业名称ID
+      },
+      //下拉框数据字典
+      natureBusinessList: [], //营业性质
+      rules: {
+        legalPerson: [
+          { required: true, message: "请输入法人名称", trigger: "blur" },
+          { min: 2, max: 5, message: "长度在 2 到 6 个字符", trigger: "blur" },
+        ],
+        qualityId: [
+          { required: true, message: "请选择营业性质", trigger: "change" },
+        ],
+        areaName: [
+          { required: true, message: "请输入所属地", trigger: "blur" },
+        ],
+        enterpriseName: [
+          { required: true, message: "请输入企业名称", trigger: "blur" },
+        ],
+        foundDate: [
+          {
+            required: true,
+            message: "请选择成立日期",
+            trigger: "change",
+          },
+        ],
+      },
+      id: "",
+      enterpriseNameList: [], //下拉框企业名称集合
+    };
+  },
+  methods: {
+    //获取企业下拉框数据
+    findEnterpriseNameList() {
+      let params = {
+        pageNum: 1,
+        pageSize: 10,
+        startInvoiceDate: "",
+        endInvoiceDate: "",
+        enterpriseId: "", //企业id
+        qualityId: "", //营业性质
+      };
+      this.$api.dict.companyFindPage(params).then((res) => {
+        console.log(res);
+        // this.pageResult = res.data;
+        this.enterpriseNameList = res.data.content;
+      });
+    },
+    findPage(data) {
+      if (data && data.pageRequest) {
+        this.pageRequest.pageNum = data.pageRequest.pageNum;
+        this.pageRequest.pageSize = data.pageRequest.pageSize;
+      }
+      this.$api.dict
+        .companyFindPage(this.pageRequest)
+        .then((res) => {
+          this.pageResult = res.data;
+          // this.enterpriseNameList = res.data.content;
+        })
+        .then(data != null ? data.callback : "");
+    },
+    //营业性质下拉框
+    changeDept(value) {
+      this.natureBusinessList.forEach((item) => {
+        if (item.value == value) {
+          this.addform.qualityId = item.value;
+          this.addform.qualityName = item.label;
+          this.editform.qualityName = item.label;
+        }
+      });
+    },
+    changeEnterprise(value) {},
+    //formatter---营业性质
+    natureBusinessFormatter(row) {
+      let nature_business = row.nature_business;
+      return CommonUtil.getDataName({
+        dataList: this.natureBusinessList,
+        value: "value",
+        label: "label",
+        data: nature_business,
+      });
+    },
+
+    //营业性质数据字典
+    business() {
+      let typeName = "nature_business";
+      this.$api.dict.findByLableName(typeName).then((res) => {
+        this.natureBusinessList = res.data;
+      });
+    },
+    // 查询
+    queryStaffInfo() {
+      if (
+        this.queryFrom.value1 == undefined ||
+        this.queryFrom.value1 == null ||
+        this.queryFrom.value1 == ""
+      ) {
+        (this.pageRequest.startInvoiceDate = ""),
+          (this.pageRequest.endInvoiceDate = "");
+      } else {
+        this.pageRequest.startInvoiceDate = this.queryFrom.value1[0];
+        this.pageRequest.endInvoiceDate = this.queryFrom.value1[1];
+      }
+      this.pageRequest.enterpriseId = this.queryFrom.enterpriseId; //企业名称id
+      this.pageRequest.qualityId = this.queryFrom.qualityId; //营业性质id
+      this.pageRequest.pageNum = 1;
+      this.findPage();
+    },
+    addAmount() {
+      this.dialogFormVisible = true;
+    },
+    handleClose() {
+      this.dialogFormVisible = false;
+      this.$refs.addform.resetFields();
+    },
+    handleTableDelete(index) {
+      // console.log("删除", index);
+      this.$message({ message: "暂不支持删除操作", type: "warning" });
+    },
+    //发票数
+    handleChange() {},
+    //新增取消重置
+    resetForm(addform) {
+      this.$refs[addform].resetFields();
+      this.dialogFormVisible = false;
+    },
+    //修改取消重置
+    reset(editform) {
+      this.$refs[editform].resetFields();
+      this.dialogForm = false;
+    },
+
+    //修改
+    handleTableEdit(index) {
+      console.log(index);
+      this.id = index.row.id;
+      let data = index.row;
+      this.editform = { ...data };
+      this.dialogForm = true;
+    },
+    //修改提交
+    determine() {
+      this.$refs["editform"].validate((valid) => {
+        if (valid) {
+          let params = {
+            admin: this.editform.admin,
+            areaName: this.editform.areaName,
+            enterpriseName: this.editform.enterpriseName,
+            foundDate: this.editform.foundDate,
+            legalPerson: this.editform.legalPerson,
+            qualityId: this.editform.qualityId,
+            qualityName: this.editform.qualityName,
+            taxLimit: this.editform.taxLimit,
+            taxRate: String(this.editform.taxRate),
+            id: this.id,
+          };
+          console.log(params);
+          this.$api.dict.companySave(params).then((res) => {
+            if (res.code == "200") {
+              this.$message({ message: "修改成功!", type: "success" });
+              this.dialogFormVisible = false;
+            } else {
+              this.$message({
+                message: `修改失败, ${res.msg}`,
+                type: "error",
+              });
+            }
+            this.findPage();
+            this.dialogForm = false;
+          });
+        } else {
+          return false;
+        }
+      });
+    },
+    //提交
+    submitForm(addform) {
+      let params = {
+        admin: this.addform.admin,
+        areaName: this.addform.areaName,
+        enterpriseName: this.addform.enterpriseName,
+        foundDate: this.addform.foundDate,
+        legalPerson: this.addform.legalPerson,
+        qualityId: this.addform.qualityId,
+        qualityName: this.addform.qualityName,
+        taxLimit: this.addform.taxLimit,
+        taxRate: String(this.addform.taxRate),
+      };
+      console.log(params);
+      this.$refs[addform].validate((valid) => {
+        if (valid) {
+          this.$api.dict.companySave(params).then((res) => {
+            if (res.code == 200) {
+              this.$message({
+                message: "添加成功",
+                type: "success",
+              });
+            } else {
+              this.$message({
+                message: `添加失败, ${res.msg}`,
+                type: "error",
+              });
+            }
+            this.dialogFormVisible = false;
+            this.findPage();
+          });
+        } else {
+          return false;
+        }
+      });
+    },
   },
-  methods: {},
 };
 </script>
 
 <style scoped>
-.el-button--primary {
-  background-color: rgb(85, 134, 167);
-  border-color: rgb(85, 134, 167);
+.el-button {
+  padding: 10px 20px;
+}
+.operation {
+  margin-left: 14px !important;
+  margin-top: 15px;
+}
+.form {
+  display: flex;
+  margin-top: 14px;
+  align-items: center;
+  margin-left: -12px;
+  margin-bottom: 20px;
+}
+.el-pagination {
+  font-weight: normal;
+}
+.el-card__body {
+  padding: 12px !important;
+}
+.footer .footerdiv {
+  display: flex;
+  align-items: center;
+}
+.el-form-item {
+  margin-bottom: -14px;
+}
+.form .el-form-item__label {
+  font-size: 15px !important;
+  font-weight: 600 !important;
+}
+
+.ktTable {
+  margin-top: 15px;
+}
+.el-row {
+  margin-top: 18px;
+}
+.top {
+  margin-top: 0px;
+}
+.dialog-footer .el-button[data-v-536b86d8] {
+  padding: 8px 14px;
+}
+.el-date-editor--daterange.el-input__inner {
+  width: 300px;
+}
+.frame .el-form-item .el-input {
+  width: 220px;
+}
+.frame .el-form-item .el-select {
+  width: 220px;
 }
 </style>

Разница между файлами не показана из-за своего большого размера
+ 1056 - 144
src/views/FinancialManagement/InvoiceInformation.vue


+ 2 - 1
src/views/PeopleManage/Agent/AgentExamine.vue

@@ -1040,7 +1040,6 @@ export default {
 
     // 右侧列表的方法Start
     findPage(data) {
-      console.log(this.pageRequest);
       // 获取分页数据
       if (data && data.pageRequest) {
         this.pageRequest.pageNum = data.pageRequest.pageNum;
@@ -1055,6 +1054,7 @@ export default {
         .then(data != null ? data.callback : "");
     },
     handleTableEdit(params) {
+      console.log(params, 111);
       // 编辑后线人员
       this.pic1Control = false;
       this.pic3Control = false;
@@ -1196,6 +1196,7 @@ export default {
     },
     // 提交
     submitForm(statusType) {
+      console.log(111, statusType);
       if (this.remarks == "" && (statusType == 2 || statusType == 3)) {
         return this.$message({ type: "info", message: "请备注原因" });
       }

+ 4 - 4
src/views/PeopleManage/Agent/AgentManage.vue

@@ -1089,8 +1089,8 @@ export default {
     },
     statusChange(e) {
       //状态选择事件
-      // this.pageRequest.columnFilters.approvalStatus.value = e;
-      // this.findPage();
+      this.pageRequest.columnFilters.approvalStatus.value = e;
+      this.findPage();
     },
     // 查询End
 
@@ -1422,7 +1422,7 @@ export default {
         },
       ];
 
-      this.$confirm("确认关闭?")
+      this.$confirm("确认删除?")
         .then(() => {
           this.$api.user.deleteFlag(params).then((res) => {
             if (res.code == 200) {
@@ -1672,7 +1672,7 @@ export default {
               params.sysDept.parentName = this.deptInfo.parentName;
               params.sysDept.province = this.deptInfo.province;
 
-              params.sysUser.approvalStatus = 1;
+              // params.sysUser.approvalStatus = 1;
               params.sysUser.id = this.dataForm.id;
               params.sysUser.checkid = this.dataForm.checkid;
               params.sysUser.name = this.dataForm.name;

+ 904 - 669
src/views/PeopleManage/Staff/StaffExamine.vue

@@ -35,7 +35,7 @@
                   </el-col>
                   <el-col :span="5">
                     <el-form-item label="状态">
-                      <el-select size="small"  v-model="queryFrom.status" placeholder="请选择"  >
+                      <el-select size="small"  v-model="queryFrom.approvalStatus" placeholder="请选择"  >
                         <el-option label="待审核" value="0"></el-option>
                         <el-option label="审核通过" value="1"></el-option>
                         <el-option label="审核驳回" value="2"></el-option>
@@ -53,7 +53,7 @@
             </el-row>
             <!-- 筛选区域End -->
 
-            <kt-common-table operationWidth="140" permsButton1="sys:userverify:edit" :data="pageResult" :columns="columns" :button1Name="(pageRequest.columnFilters.status.value == '0')?'审核':'查看'" :showBatchDelete="false" @findPage="findPage"  :button1Background="(pageRequest.columnFilters.status.value == '0')?'#F00':'#F2904B'" @handleButton1="handleTableEdit"></kt-common-table>
+            <kt-common-table :operationWidth="140" permsButton1="sys:agentverify:edit" :data="pageResult" :columns="columns" :button1Name="(pageRequest.columnFilters.approvalStatus.value == '0')?'审核':'查看'" :showBatchDelete="false" @findPage="findPage"  :button1Background="(pageRequest.columnFilters.approvalStatus.value == '0')?'#F00':'#F2904B'" @handleButton1="handleTableEdit"></kt-common-table>
 
         </SplitArea>
         <!-- 右侧列表页面End -->
@@ -61,13 +61,11 @@
     </el-main>
 
     <!-- 新增修改界面 -->
-    <el-dialog title="后线人员审核" width="1000px" :visible.sync="dialogVisible" :close-on-click-modal="false" :before-close="handleDialogBefore" @close="closeDialog"
-      v-dialogDrag>
+    <el-dialog title="代理人审核" width="1000px" :visible.sync="dialogVisible" :close-on-click-modal="false" :before-close="handleDialogBefore" @close="closeDialog" v-dialogDrag>
       <template v-if="(dataForm.status1=='2') || (dataForm.status1=='3')">
         <div style="color:red" > {{(dataForm.status1=='2')?"驳回原因:":"退回修改原因:" }} {{dataForm.remark}}</div>
       </template>
-      <el-form :model="dataForm" :rules="dataFormRules" ref="dataForm" @keyup.enter.native="submitForm('提交审核')" label-width="120px"
-        size="small" style="text-align:left;">
+      <el-form :model="dataForm"  ref="dataForm"  label-width="120px" size="small" style="text-align:left;">
         <el-tabs v-model="activeTabs">
           <el-tab-pane label="行政信息" name="first">
             <el-row>
@@ -128,20 +126,20 @@
           <el-tab-pane label="基本信息" name="second">
             <el-row>
               <el-col :span="8">
-                <el-form-item label="员工工号" prop="id">
+                <el-form-item label="员工工号">
                   <el-input v-model="dataForm.id" disabled></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="部门" prop="deptId">
+                <el-form-item label="部门">
                   <el-select disabled 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="岗位" prop="jobCode">
-                  <el-select disabled style="width: 100%;" v-model="dataForm.jobCode" placeholder="请选择">
+                <el-form-item label="岗位">
+                  <el-select disabled style="width: 100%;" v-model="dataForm.jobName" placeholder="请选择">
                     <el-option v-for="item in jobcodeoptions" :key="item.value" :label="item.label" :value="item.value" ></el-option>
                   </el-select>
                 </el-form-item>
@@ -149,96 +147,101 @@
             </el-row>
             <el-row>
               <el-col :span="8">
-                <el-form-item label="薪资等级" prop="salarycode">
-                  <el-select disabled 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 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>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="档案号" prop="documentno">
-                  <el-input disabled v-model="dataForm.documentno"></el-input>
+                <el-form-item label="修改密码" >
+                  <el-input value="******" disabled></el-input>
                 </el-form-item>
               </el-col>
               <!-- <el-col :span="8">
-                <el-form-item label="初始密码" prop="password">
-                  <el-input disabled v-model="dataForm.password"></el-input>
+                <el-form-item label="用户属性">
+                  <el-select disabled style="width:100%" v-model="dataForm.isshowsalesroom" 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>
               <el-col :span="8">
-                <el-form-item label="婚姻状况" prop="marrycode">
-                  <el-select disabled 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 label="推荐人名字" >
+                  <el-input v-model="dataForm.recommendername" disabled></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="推荐人工号">
+                  <el-input v-model="dataForm.recommenderid" disabled></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8" >
+                <el-form-item label="认证方式" >
+                  <el-input v-model="dataForm.darta1" disabled></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="8">
-                <el-form-item label="姓名" prop="name">
+                <el-form-item label="姓名">
                   <el-input disabled v-model="dataForm.name"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="性别" prop="sex">
+                <el-form-item label="性别">
                   <el-select disabled 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="电话" prop="mobile">
-                  <el-input disabled v-model="dataForm.mobile"></el-input>
+              <el-col :span="8" >
+                <el-form-item label="状态" >
+                  <el-input v-model="dataForm.darta2" disabled></el-input>
                 </el-form-item>
               </el-col>
+              <!-- <el-col :span="8">
+                <el-form-item label="职级">
+                  <el-select disabled style="width: 100%;" v-model="dataForm.jobCode" placeholder="请选择">
+                    <el-option v-for="item in 108" :key="item" :label="item+'级'" :value="item" ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col> -->
             </el-row>
             <el-row>
               <el-col :span="8">
-                <el-form-item label="身份证号" prop="identity">
+                <el-form-item label="身份证号">
                   <el-input disabled v-model="dataForm.identity" ></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="出生日期" prop="birthday">
-                  <el-date-picker disabled style="width: 100%;" v-model="dataForm.birthday" type="date" placeholder="选择日期"></el-date-picker>
+                <el-form-item label="出生日期">
+                  <el-date-picker disabled 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="开户银行" prop="bankname">
-                  <el-input disabled v-model="dataForm.bankname"></el-input>
+                <el-form-item label="移动电话">
+                  <el-input disabled v-model="dataForm.mobile"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="8">
-                <el-form-item label="银行账号" prop="accountno">
-                  <el-input disabled v-model="dataForm.accountno" ></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="民族" prop="nations">
+                <el-form-item label="民族">
                   <el-select disabled 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="政治面貌" prop="politicalstatus">
+                <el-form-item label="政治面貌">
                   <el-select disabled style="width:100%" v-model="dataForm.politicalstatus" placeholder="请选择">
                     <el-option label="群众" value="群众"></el-option>
                     <el-option label="共青团员" value="共青团员"></el-option>
@@ -246,83 +249,58 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row>
               <el-col :span="8">
-                <el-form-item label="户口所在地" prop="addressresident">
+                <el-form-item label="户口所在地">
                   <el-input disabled v-model="dataForm.addressresident"></el-input>
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="健康状况" prop="health">
-                  <el-select disabled 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="邮政编码" prop="postalcode">
-                  <el-input disabled v-model="dataForm.postalcode"></el-input>
-                </el-form-item>
-              </el-col>
             </el-row>
             <el-row>
               <el-col :span="8">
-                <el-form-item label="居住地址" prop="addressnow">
-                  <el-input disabled v-model="dataForm.addressnow"></el-input>
+                <el-form-item label="银行账号">
+                  <el-input disabled v-model="dataForm.accountno" ></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="邮箱" prop="email">
-                  <el-input disabled v-model="dataForm.email"></el-input>
+                <el-form-item label="开户银行">
+                  <el-input disabled v-model="dataForm.bankname"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="住宅电话" prop="phonehouse">
+                <el-form-item label="住宅电话">
                   <el-input disabled v-model="dataForm.phonehouse"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="8">
-                <el-form-item label="籍贯" prop="nativeplace">
-                  <el-input disabled v-model="dataForm.nativeplace"></el-input>
+                <el-form-item label="健康状况">
+                  <el-select disabled 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="入司时间" prop="intime">
-                  <el-date-picker disabled style="width: 100%;" v-model="dataForm.intime" type="date" placeholder="选择日期">
-                  </el-date-picker>
+                <el-form-item label="邮政编码">
+                  <el-input disabled v-model="dataForm.postalcode"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="转正时间" prop="regulartm">
-                  <el-date-picker disabled style="width: 100%;" v-model="dataForm.regulartm" type="date" placeholder="选择日期"></el-date-picker>
+                <el-form-item label="邮箱">
+                  <el-input disabled v-model="dataForm.email"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="8">
-                <el-form-item label="毕业院校" prop="college">
-                  <el-input disabled v-model="dataForm.college"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="毕业时间" prop="collegetm">
-                  <el-date-picker disabled 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="专业" prop="speciality">
-                  <el-input disabled v-model="dataForm.speciality"></el-input>
+                <el-form-item label="籍贯">
+                  <el-input disabled v-model="dataForm.nativeplace"></el-input>
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row>
               <el-col :span="8">
-                <el-form-item label="学历" prop="education">
+                <el-form-item label="学历">
                   <el-select disabled style="width:100%" v-model="dataForm.education" placeholder="请选择">
                     <el-option label="小学" value="小学"></el-option>
                     <el-option label="初中" value="初中"></el-option>
@@ -335,7 +313,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="血型" prop="blood">
+                <el-form-item label="血型">
                   <el-select disabled style="width:100%" v-model="dataForm.blood" placeholder="请选择">
                     <el-option label="A型" value="A型"></el-option>
                     <el-option label="B型" value="B型"></el-option>
@@ -344,46 +322,96 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+            </el-row>
+            <el-row>
+               <el-col :span="8">
+                 <el-form-item label="居住地址">
+                   <el-input disabled v-model="dataForm.addressnow"></el-input>
+                 </el-form-item>
+               </el-col>
+                <el-col :span="8">
+                  <el-form-item label="毕业院校">
+                    <el-input disabled v-model="dataForm.college"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="入司时间">
+                    <el-date-picker disabled 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 disabled v-model="dataForm.saleno"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="毕业时间">
+                  <el-date-picker disabled 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="原工作单位" prop="orglast">
+                <el-form-item label="原工作单位">
                   <el-input disabled v-model="dataForm.orglast"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="8">
-                <el-form-item label="紧急联系人姓名" prop="namespecial">
-                  <el-input disabled v-model="dataForm.namespecial"></el-input>
+                <el-form-item label="婚姻状况">
+                  <el-select disabled 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="紧急联系人电话" prop="phonespecial">
-                  <el-input disabled v-model="dataForm.phonespecial"></el-input>
+                <el-form-item label="紧急联系人电话" >
+                  <el-input v-model="dataForm.phonespecial" disabled></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="录入人" prop="createBy">
-                  <el-input disabled v-model="dataForm.createBy"></el-input>
+                <el-form-item label="紧急联系人姓名">
+                  <el-input v-model="dataForm.namespecial" disabled></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="8">
-                <el-form-item label="录入时间" prop="createTime">
-                  <el-input disabled v-model="dataForm.createTime"></el-input>
+                <el-form-item label="是否显示门店" >
+                  <el-input v-model="dataForm.isshowsalesroom" disabled></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="初始密码" >
+                  <el-input v-model="dataForm.password" disabled></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="lastUpdateBy">
-                  <el-input disabled v-model="dataForm.lastUpdateBy"></el-input>
+                <el-form-item label="录入人" prop="createBy">
+                  <el-input v-model="dataForm.createBy" disabled></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item  label="修改时间" prop="lastUpdateTime">
-                  <el-input disabled v-model="dataForm.lastUpdateTime"></el-input>
+                <el-form-item label="录入时间" prop="createTime">
+                  <el-input v-model="dataForm.createTime" disabled></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="最后修改时间" prop="lastUpdateTime">
+                  <el-input v-model="dataForm.lastUpdateTime" disabled></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
+
           </el-tab-pane>
           <el-tab-pane label="影像资料" name="third">
 
@@ -395,28 +423,42 @@
               </el-row>
               <el-row class="imageLibraryItemBody" v-show="pic1Control">
                 <el-col :span="12">
-                  <el-form-item label="身份证正面:" style="width: 50%;">
-                    <el-upload disabled class="avatar-uploader" action="" name="photo1" :show-file-list="false" :http-request="httpRequest" :before-upload="beforeAvatarUpload">
-                      <img v-if="dataForm.photo1" :src="dataForm.photo1"  v-show="!!dataForm.photo1" class="avatar">
-                      <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-                    </el-upload>
-                    <viewer :images="photo1List" >
-                       <img style="width: 50px;height: 30px;opacity:0;position:absolute; top: 122px; left: 0;right: 0;bottom: 0;" :src="photo1Item" v-for="(photo1Item,photo1Index) in photo1List"  :key="photo1Index">
-                    </viewer>
-                    <button @click.prevent v-show="!!dataForm.photo1">预览</button>
-                  </el-form-item>
+                <el-form-item label="身份证正面:" style="width: 50%;">
+                  <el-upload
+                    disabled
+                    class="avatar-uploader"
+                    action=""
+                    name="photo1"
+                    :show-file-list="false"
+                    :http-request="httpRequest"
+                    :before-upload="beforeAvatarUpload">
+                    <img v-if="dataForm.photo1" :src="dataForm.photo1" v-show="!!dataForm.photo1" class="avatar">
+                    <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+                  </el-upload>
+                  <viewer :images="photo1List" >
+                     <img style="width: 50px;height: 30px;opacity:0;position:absolute; top: 122px; left: 0;right: 0;bottom: 0;" :src="photo1Item" v-for="(photo1Item,photo1Index) in photo1List"  :key="photo1Index"></img>
+                  </viewer>
+                  <button @click.prevent v-show="!!dataForm.photo1">预览</button>
+                </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item label="身份证反面:" style="width: 50%;">
-                    <el-upload disabled class="avatar-uploader" action="" name="photo2" :show-file-list="false" :http-request="httpRequest" :before-upload="beforeAvatarUpload">
-                      <img v-if="dataForm.photo2" :src="dataForm.photo2" v-show="!!dataForm.photo2" class="avatar">
-                      <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-                    </el-upload>
-                    <viewer :images="photo2List" >
-                       <img style="width: 50px;height: 30px;opacity:0;position:absolute; top: 122px; left: 0;right: 0;bottom: 0;" :src="photo2Item" v-for="(photo2Item,photo2Index) in photo2List"  :key="photo2Index">
-                    </viewer>
-                    <button @click.prevent v-show="!!dataForm.photo2">预览</button>
-                  </el-form-item>
+                <el-form-item label="身份证反面:" style="width: 50%;">
+                  <el-upload
+                    disabled
+                    class="avatar-uploader"
+                    action=""
+                    name="photo2"
+                    :show-file-list="false"
+                    :http-request="httpRequest"
+                    :before-upload="beforeAvatarUpload">
+                    <img v-if="dataForm.photo2" :src="dataForm.photo2" v-show="!!dataForm.photo2" class="avatar">
+                    <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+                  </el-upload>
+                  <viewer :images="photo2List" >
+                     <img style="width: 50px;height: 30px;opacity:0;position:absolute; top: 122px; left: 0;right: 0;bottom: 0;" :src="photo2Item" v-for="(photo2Item,photo2Index) in photo2List"  :key="photo2Index"></img>
+                  </viewer>
+                  <button @click.prevent v-show="!!dataForm.photo2">预览</button>
+                </el-form-item>
                 </el-col>
               </el-row>
             </div>
@@ -429,16 +471,23 @@
               </el-row>
               <el-row class="imageLibraryItemBody" v-show="pic3Control">
                 <el-col :span="12">
-                  <el-form-item label="资格证照片:" style="width: 50%;">
-                    <el-upload disabled class="avatar-uploader" action="" name="photo3" :show-file-list="false" :http-request="httpRequest" :before-upload="beforeAvatarUpload">
-                      <img v-if="dataForm.photo3" :src="dataForm.photo3" v-show="!!dataForm.photo3" class="avatar">
-                      <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-                     </el-upload>
-                     <viewer :images="photo3List" >
-                        <img style="width: 50px;height: 30px;opacity:0;position:absolute; top: 122px; left: 0;right: 0;bottom: 0;" :src="photo3Item" v-for="(photo3Item,photo3Index) in photo3List"  :key="photo3Index">
-                     </viewer>
-                     <button @click.prevent v-show="!!dataForm.photo3">预览</button>
-                  </el-form-item>
+                <el-form-item label="资格证照片:" style="width: 50%;">
+                  <el-upload
+                    disabled
+                    class="avatar-uploader"
+                    action=""
+                    name="photo3"
+                    :show-file-list="false"
+                    :http-request="httpRequest"
+                    :before-upload="beforeAvatarUpload">
+                    <img v-if="dataForm.photo3" :src="dataForm.photo3" v-show="!!dataForm.photo3" class="avatar">
+                    <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+                  </el-upload>
+                  <viewer :images="photo3List" >
+                     <img style="width: 50px;height: 30px;opacity:0;position:absolute; top: 122px; left: 0;right: 0;bottom: 0;" :src="photo3Item" v-for="(photo3Item,photo3Index) in photo3List"  :key="photo3Index"></img>
+                  </viewer>
+                  <button @click.prevent v-show="!!dataForm.photo3">预览</button>
+                </el-form-item>
                 </el-col>
               </el-row>
             </div>
@@ -451,16 +500,23 @@
               </el-row>
               <el-row class="imageLibraryItemBody" v-show="pic4Control">
                 <el-col :span="12">
-                  <el-form-item label="劳动合同照片:" style="width: 50%;">
-                    <el-upload disabled class="avatar-uploader" action="" name="photo4" :show-file-list="false" :http-request="httpRequest" :before-upload="beforeAvatarUpload">
-                      <img v-if="dataForm.photo4" :src="dataForm.photo4" v-show="!!dataForm.photo4" class="avatar">
-                      <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-                    </el-upload>
-                    <viewer :images="photo4List" >
-                       <img style="width: 50px;height: 30px;opacity:0;position:absolute; top: 122px; left: 0;right: 0;bottom: 0;" :src="photo4Item" v-for="(photo4Item,photo4Index) in photo4List"  :key="photo4Index">
-                    </viewer>
-                    <button @click.prevent v-show="!!dataForm.photo4">预览</button>
-                  </el-form-item>
+                <el-form-item label="劳动合同照片:" style="width: 50%;">
+                  <el-upload
+                    disabled
+                    class="avatar-uploader"
+                    action=""
+                    name="photo4"
+                    :show-file-list="false"
+                    :http-request="httpRequest"
+                    :before-upload="beforeAvatarUpload">
+                    <img v-if="dataForm.photo4" :src="dataForm.photo4" v-show="!!dataForm.photo4" class="avatar">
+                    <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+                  </el-upload>
+                  <viewer :images="photo4List" >
+                     <img style="width: 50px;height: 30px;opacity:0;position:absolute; top: 122px; left: 0;right: 0;bottom: 0;" :src="photo4Item" v-for="(photo4Item,photo4Index) in photo4List"  :key="photo4Index"></img>
+                  </viewer>
+                  <button @click.prevent v-show="!!dataForm.photo4">预览</button>
+                </el-form-item>
                 </el-col>
               </el-row>
             </div>
@@ -474,16 +530,23 @@
               <el-row class="imageLibraryItemBody" v-show="pic5Control">
                 <el-col :span="12">
                   <el-form-item label="应聘表照片:" style="width: 50%;">
-                    <el-upload disabled class="avatar-uploader" action="" name="photo5" :show-file-list="false" :http-request="httpRequest" :before-upload="beforeAvatarUpload">
+                    <el-upload
+                    disabled
+                      class="avatar-uploader"
+                      action=""
+                      name="photo5"
+                      :show-file-list="false"
+                      :http-request="httpRequest"
+                      :before-upload="beforeAvatarUpload">
                       <img v-if="dataForm.photo5" :src="dataForm.photo5" v-show="!!dataForm.photo5" class="avatar">
                       <i v-else class="el-icon-plus avatar-uploader-icon"></i>
                     </el-upload>
                     <viewer :images="photo5List" >
-                       <img style="width: 50px;height: 30px;opacity:0;position:absolute; top: 122px; left: 0;right: 0;bottom: 0;" :src="photo5Item" v-for="(photo5Item,photo5Index) in photo5List"  :key="photo5Index">
+                       <img style="width: 50px;height: 30px;opacity:0;position:absolute; top: 122px; left: 0;right: 0;bottom: 0;" :src="photo5Item" v-for="(photo5Item,photo5Index) in photo5List"  :key="photo5Index"></img>
                     </viewer>
                     <button @click.prevent v-show="!!dataForm.photo5">预览</button>
                   </el-form-item>
-                 </el-col>
+                </el-col>
               </el-row>
             </div>
 
@@ -495,22 +558,29 @@
               </el-row>
               <el-row class="imageLibraryItemBody" v-show="pic6Control">
                 <el-col :span="12">
-                  <el-form-item label="定薪表照片:" style="width: 50%;" >
-                    <el-upload disabled class="avatar-uploader" action="" name="photo6" :show-file-list="false" :http-request="httpRequest" :before-upload="beforeAvatarUpload">
-                      <img v-if="dataForm.photo6" :src="dataForm.photo6" v-show="!!dataForm.photo6" class="avatar">
-                      <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-                    </el-upload>
-                    <viewer :images="photo6List" >
-                       <img style="width: 50px;height: 30px;opacity:0;position:absolute; top: 122px; left: 0;right: 0;bottom: 0;" :src="photo6Item" v-for="(photo6Item,photo6Index) in photo6List"  :key="photo6Index">
-                    </viewer>
-                    <button @click.prevent v-show="!!dataForm.photo6">预览</button>
-                  </el-form-item>
-                </el-col>
+                <el-form-item label="定薪表照片:" style="width: 50%;" >
+                  <el-upload
+                    disabled
+                    class="avatar-uploader"
+                    action=""
+                    name="photo6"
+                    :show-file-list="false"
+                    :http-request="httpRequest"
+                    :before-upload="beforeAvatarUpload">
+                    <img v-if="dataForm.photo6" :src="dataForm.photo6" v-show="!!dataForm.photo6" class="avatar">
+                    <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+                  </el-upload>
+                  <viewer :images="photo6List" >
+                     <img style="width: 50px;height: 30px;opacity:0;position:absolute; top: 122px; left: 0;right: 0;bottom: 0;" :src="photo6Item" v-for="(photo6Item,photo6Index) in photo6List"  :key="photo6Index"></img>
+                  </viewer>
+                  <button @click.prevent v-show="!!dataForm.photo6">预览</button>
+                </el-form-item>
+              </el-col>
               </el-row>
             </div>
 
           </el-tab-pane>
-          <el-tab-pane label="审核" name="fourth" v-if="dataForm.status1 == '0'">
+          <el-tab-pane label="审核" name="fourth" v-if="dataForm.status1=='0'">
             <el-row style="margin: 20px 0px;">
               <el-col :span="2" style="text-align: right"><label style="margin-right: 10px;">备注:</label></el-col>
               <el-col :span="22">
@@ -525,567 +595,732 @@
           </el-tab-pane>
         </el-tabs>
       </el-form>
-      
       <span slot="footer" class="dialog-footer">
         <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>
-  import Cookies from "js-cookie"
-  import KtButton from "@/views/Core/KtButton"; // 按钮权限组件
-  import tree from "@/components/ztree.vue";  // 机构树组件
-  import KtCommonTable from "@/views/Core/KtCommonTable.vue";//表格组件
-  import bankBin from "@/assets/js/bankcardinfo.js"
-  import CommonUtil from "@/utils/comutil.js"
+import Cookies from "js-cookie";
+import KtButton from "@/views/Core/KtButton"; // 按钮权限组件
+import tree from "@/components/ztree.vue"; // 机构树组件
+import KtCommonTable from "@/views/Core/KtCommonTable.vue"; //表格组件
+import bankBin from "@/assets/js/bankcardinfo.js";
+import CommonUtil from "@/utils/comutil.js";
 
-  export default {
-    components: {
-      KtButton,
-      tree,
-      KtCommonTable
-    },
-    data() {
-      return {
-        peopleid:"",
-        peopledeptid:"",
+export default {
+  components: {
+    KtButton,
+    tree,
+    KtCommonTable,
+  },
+  data() {
+    return {
+      peopleid: "",
+      peopledeptid: "",
 
-        /**Split 开始 */
-        leftSplitWidth: 20,
-        rightSplitWidth: 80,
-        /**Split 结束 */
+      /**Split 开始 */
+      leftSplitWidth: 20,
+      rightSplitWidth: 80,
+      /**Split 结束 */
 
-        //----ztreeLeft begin---------
-        ztreeObj: null,
-        ztreeSetting: {
-          check: {
-            enable: false
-          },
-          data: {
-            simpleData: {
-              enable: true,
-              pIdKey: "parentId"
-            }
+      //----ztreeLeft begin---------
+      ztreeObj: null,
+      ztreeSetting: {
+        check: {
+          enable: false,
+        },
+        data: {
+          simpleData: {
+            enable: true,
+            pIdKey: "parentId",
           },
-          view: {
-            showIcon: false
-          }
         },
-        ztreeNodes: [],
-        currentTreeNode: null,
-        //----ztreeLeft end---------
+        view: {
+          showIcon: false,
+        },
+      },
+      ztreeNodes: [],
+      currentTreeNode: null,
+      //----ztreeLeft end---------
 
-        // 控制影像
-        pic1Control:false,
-        pic3Control:false,
-        pic4Control:false,
-        pic5Control:false,
-        pic6Control:false,
+      // 控制影像
+      pic1Control: false,
+      pic3Control: false,
+      pic4Control: false,
+      pic5Control: false,
+      pic6Control: false,
 
-        // 右侧列表查询数据Start
-        queryFrom:{
-          "status":"0"
+      // 右侧列表查询数据Start
+      teamleadername: "", //推荐人姓名
+      teamleaderid: "", //推荐人编码
+      queryFrom: {
+        status: "0",
+      },
+      pageResult: {},
+      containsSubDeptChecked: true, //是否包含下级机构
+      pageRequest: {
+        //查询的默认条件
+        pageNum: 1,
+        pageSize: 20,
+        columnFilters: {
+          deptId: {
+            name: "deptId",
+            value: "",
+          },
+          containsSubDept: {
+            name: "containsSubDept",
+            value: 1,
+          },
+          usertype: {
+            name: "usertype",
+            value: "1",
+          },
+          approvalStatus: {
+            name: "approvalStatus",
+            value: "0",
+          },
+          isteamleader: {
+            name: "isteamleader",
+            value: "0",
+          },
+          userId: {
+            name: "userId",
+            value: "",
+          },
+          realName: {
+            name: "realName",
+            value: "",
+          },
+          mobile: {
+            name: "mobile",
+            value: "",
+          },
+          delFlag: {
+            name: "delFlag ",
+            value: "",
+          },
         },
-        pageResult: {},
-        containsSubDeptChecked: true, //是否包含下级机构
-        pageRequest: {  //查询的默认条件
-          pageNum: 1,
-          pageSize: 20,
-          columnFilters: {
-            "deptId": {
-              "name": "deptId",
-              "value": ''
-            },
-            "containsSubDept": {
-              "name": "containsSubDept",
-              "value": 1
-            },
-            "usertype": {
-              "name": "usertype",
-              "value": "A"
-            },
-            "status":{
-              "name":"status",
-              "value":"0"
-            },
-            "id":{
-              "name":"id",
-              "value":""
-            },
-            "name":{
-              "name":"name",
-              "value":""
-            },
-            "mobile":{
-              "name":"mobile",
-              "value":""
-            }
-          }
+      },
+      columns: [
+        { prop: "deptId", label: "部门编码", minWidth: 80, sortable: false },
+        {
+          prop: "pdeptName",
+          label: "机构名称",
+          minWidth: 120,
+          sortable: false,
+          formatter: this.companyNameFormatter,
+        },
+        { prop: "deptName", label: "部门名称", minWidth: 80, sortable: false },
+        {
+          prop: "jobName",
+          label: "岗位",
+          minWidth: 80,
+          sortable: false,
+        },
+        { prop: "userId", label: "工号", minWidth: 80, sortable: false },
+        { prop: "name", label: "姓名", minWidth: 120, sortable: false },
+        { prop: "sex", label: "性别", minWidth: 120, sortable: false },
+        { prop: "mobile", label: "联系电话", minWidth: 100, sortable: false },
+        {
+          prop: "lastUpdateTime",
+          label: "提交时间",
+          minWidth: 100,
+          sortable: false,
+        },
+        {
+          prop: "approvalStatus",
+          label: "状态",
+          minWidth: 70,
+          sortable: false,
         },
-        columns: [  // 数据列
-          { prop: "deptId",label: "部门编码",minWidth: 80,sortable: false},
-		  { prop: "companyName",label: "机构名称",minWidth: 120,sortable: false,formatter: this.companyNameFormatter},
-          { prop: "deptName",label: "部门名称",minWidth: 80,sortable: false},
-          { prop: "jobCode",label: "岗位",minWidth: 80,sortable: false,formatter: this.jobcodeFormatter},
-          { prop: "id",label: "工号",minWidth: 80,sortable: false},
-          { prop: "name",label: "姓名",minWidth: 80,sortable: false},
-          { prop: "sex",label: "性别",minWidth: 80,sortable: false,formatter: this.sexFormatter},
-          { prop: "mobile",label: "联系电话",minWidth: 100,sortable: false},
-          { prop: "status", label: "状态", minWidth: 70, sortable: false,formatter: this.statusFormatter}
-        ],
-        // 右侧列表查询数据End
+      ],
+      // 右侧列表查询数据End
 
-        // 新增或修改的弹出框Start
-        remarks:'',//审核的备注
-        activeTabs: "first",
-        dialogVisible: false, // 新增编辑界面是否显示
-        operation: false, // true:新增, false:编辑
-        departmentList:[], // 选中公司的所有部门的集合
-        deptInfo:{},  //选中机构的基本信息
-        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: '' ,//薪资等级
+      // 新增或修改的弹出框Start
+      remarks: "", //审核的备注
+      activeTabs: "first",
+      dialogVisible: false, // 新增编辑界面是否显示
+      operation: false, // true:新增, false:编辑
+      departmentList: [], // 选中公司的所有部门的集合
+      deptInfo: {}, //选中机构的基本信息
+      dataForm: {
+        // 人员个人信息
+        id: "",
+        name: "", //用户名
+        password: "", //密码
+        email: "", //邮箱
+        mobile: "", //手机号
+        birthday: "", //出生日期
+        approvalStatus: "", //状态  1:正常   0:离司
+        marrycode: "", //婚姻状况
+        deptId: "", //机构号或者部门号
+        createBy: "", //创建人
+        createTime: "", //创建时间
+        lastUpdateBy: "", //更新人
+        lastUpdateTime: "", //更新时间
+        delFlag: "", //是否删除  -1:已删除  0:正常
+        usertype: "", //用户类型:0:系统用户 A:后线人员 B:代理人员
+        tenantId: "", //所属租户
+        sex: "", //性别
+        jobName: "", //岗位
+        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: "", //薪资等级
+        isshowsalesroom: "", //是否显示门店
+        isshowteam: "", //是否显示团队
 
-            photo1:"",
-            photo2:"",
-            photo3:"",
-            photo4:"",
-            photo5:"",
-            photo6:""
-        },
-        // 新增或修改的弹出框End
+        photo1: "",
+        photo2: "",
+        photo3: "",
+        photo4: "",
+        photo5: "",
+        photo6: "",
+      },
+      // 新增或修改的弹出框End
 
-        //------------下拉框数据字典   begin-----------------
-        comleveloptions: [],
-        comattributeoptions: [],
-        comtypeoptions: [],
-        jobcodeoptions: [],
-        statusoptions:[
-            {label:"待审核",value:"0"},
-            {label:"审核通过",value:"1"},
-            {label:"审核驳回",value:"2"},
-            {label:"退回修改",value:"3"},
-            {label:"全部",value:"0,1,2,3"}
-          ],
-        //------------下拉框数据字典   end----------------
+      //------------下拉框数据字典   begin-----------------
+      comleveloptions: [],
+      comattributeoptions: [],
+      comtypeoptions: [],
+      jobcodeoptions: [],
+      statusoptions: [
+        { label: "待审核", value: "0" },
+        { label: "审核通过", value: "1" },
+        { label: "审核驳回", value: "2" },
+        { label: "退回修改", value: "3" },
+        { label: "全部", value: "0,1,2,3" },
+      ],
+      //------------下拉框数据字典   end----------------
 
-        //56个民族
-        nationalList:['汉族','壮族','满族','回族','苗族','维吾尔族','土家族','彝族','蒙古族','藏族','布依族','侗族','瑶族','朝鲜族','白族','哈尼族','哈萨克族','黎族','傣族','畲族','傈僳族','仡佬族','东乡族','高山族','拉祜族','水族','佤族','纳西族','羌族','土族','仫佬族','锡伯族','柯尔克孜族','达斡尔族','景颇族','毛南族','撒拉族','布朗族','塔吉克族','阿昌族','普米族','鄂温克族','怒族','京族','基诺族','德昂族','保安族','俄罗斯族','裕固族','乌兹别克族','门巴族','鄂伦春族','独龙族','塔塔尔族','赫哲族','珞巴族'],
+      //56个民族
+      nationalList: [
+        "汉族",
+        "壮族",
+        "满族",
+        "回族",
+        "苗族",
+        "维吾尔族",
+        "土家族",
+        "彝族",
+        "蒙古族",
+        "藏族",
+        "布依族",
+        "侗族",
+        "瑶族",
+        "朝鲜族",
+        "白族",
+        "哈尼族",
+        "哈萨克族",
+        "黎族",
+        "傣族",
+        "畲族",
+        "傈僳族",
+        "仡佬族",
+        "东乡族",
+        "高山族",
+        "拉祜族",
+        "水族",
+        "佤族",
+        "纳西族",
+        "羌族",
+        "土族",
+        "仫佬族",
+        "锡伯族",
+        "柯尔克孜族",
+        "达斡尔族",
+        "景颇族",
+        "毛南族",
+        "撒拉族",
+        "布朗族",
+        "塔吉克族",
+        "阿昌族",
+        "普米族",
+        "鄂温克族",
+        "怒族",
+        "京族",
+        "基诺族",
+        "德昂族",
+        "保安族",
+        "俄罗斯族",
+        "裕固族",
+        "乌兹别克族",
+        "门巴族",
+        "鄂伦春族",
+        "独龙族",
+        "塔塔尔族",
+        "赫哲族",
+        "珞巴族",
+      ],
 
-        dataFormRules: {},
-        // 新增编辑界面数据
+      // 新增编辑界面数据
+    };
+  },
+  created() {
+    this.peopleid = Cookies.get("user");
+    if (this.peopleid != "admin") {
+      this.peopledeptid = Cookies.get("user").split("D")[0];
+      this.pageRequest.columnFilters.deptId.value = this.peopledeptid;
+    } else {
+      this.peopledeptid = "9";
+      this.pageRequest.columnFilters.deptId.value = this.peopledeptid;
+    }
+    //获取所有下拉框数据(字典)
+    this.getDictItems("comlevel");
+    this.getDictItems("comattribute");
+    this.getDictItems("comtype");
+    this.getDictItems("jobcode");
+
+    this.findLeftTreeData(); // 获取机构树的数据
+  },
+  computed: {
+    photo1List() {
+      if (!!this.dataForm.photo1) {
+        return this.dataForm.photo1.split("___");
+      } else {
+        return [];
       }
     },
-    computed: {
-      photo1List(){
-        if(!!this.dataForm.photo1){
-          return this.dataForm.photo1.split('___');
-        }else{
-          return [];
-        }
-      },
-      photo2List(){
-        if(!!this.dataForm.photo2){
-          return this.dataForm.photo2.split('___');
-        }else{
-          return [];
-        }
-      },
-      photo3List(){
-        if(!!this.dataForm.photo3){
-          return this.dataForm.photo3.split('___');
-        }else{
-          return [];
-        }
-      },
-      photo4List(){
-        if(!!this.dataForm.photo4){
-          return this.dataForm.photo4.split('___');
-        }else{
-          return [];
-        }
-      },
-      photo5List(){
-        if(!!this.dataForm.photo5){
-          return this.dataForm.photo5.split('___');
-        }else{
-          return [];
-        }
-      },
-      photo6List(){
-        if(!!this.dataForm.photo6){
-          return this.dataForm.photo6.split('___');
-        }else{
-          return [];
-        }
+    photo2List() {
+      if (!!this.dataForm.photo2) {
+        return this.dataForm.photo2.split("___");
+      } else {
+        return [];
       }
-
     },
-    created() {
-      this.peopleid = Cookies.get('user');
-      if(this.peopleid!='admin'){
-        this.peopledeptid = Cookies.get('user').split('D')[0];
-        this.pageRequest.columnFilters.deptId.value = this.peopledeptid;
-      }else{
-        this.peopledeptid = '9';
-        this.pageRequest.columnFilters.deptId.value = this.peopledeptid;
+    photo3List() {
+      if (!!this.dataForm.photo3) {
+        return this.dataForm.photo3.split("___");
+      } else {
+        return [];
       }
-      //获取所有下拉框数据(字典)
-      this.getDictItems("comlevel");
-      this.getDictItems("comattribute");
-      this.getDictItems("comtype");
-      this.getDictItems("jobcode");
-			
-      this.findLeftTreeData();// 获取机构树的数据
     },
-    mounted() {
-      //用像素初始化左边的split的宽度
-      this.changeTreeWidth(240);// 初始化树的宽度
+    photo4List() {
+      if (!!this.dataForm.photo4) {
+        return this.dataForm.photo4.split("___");
+      } else {
+        return [];
+      }
     },
-    watch:{
-      containsSubDeptChecked(){ // 监听是否包含下级
-        this.pageRequest.columnFilters.containsSubDept.value = this.containsSubDeptChecked ? "1" : "0";
-        this.findPage();
+    photo5List() {
+      if (!!this.dataForm.photo5) {
+        return this.dataForm.photo5.split("___");
+      } else {
+        return [];
       }
     },
-    methods: {
-
-      /**Split 开始 */
-      changeTreeWidth(widthVal){
-        // 初始化树的宽度
-        this.leftSplitWidth = Math.ceil(widthVal/this.$refs.elMain.$el.clientWidth*100);
-        this.rightSplitWidth = 100-(this.leftSplitWidth)
-      },
-      /**Split 结束 */
+    photo6List() {
+      if (!!this.dataForm.photo6) {
+        return this.dataForm.photo6.split("___");
+      } else {
+        return [];
+      }
+    },
+  },
+  mounted() {
+    //用像素初始化左边的split的宽度
+    this.changeTreeWidth(240); // 初始化树的宽度
+  },
+  watch: {
+    containsSubDeptChecked() {
+      // 监听是否包含下级
+      this.pageRequest.columnFilters.containsSubDept.value = this
+        .containsSubDeptChecked
+        ? "1"
+        : "0";
+      this.findPage();
+    },
+  },
+  methods: {
+    //-- formatter begin--
+    statusFormatter(row, column) {
+      let status = row.status;
+      return CommonUtil.getDataName({
+        dataList: this.statusoptions,
+        value: "value",
+        label: "label",
+        data: status,
+      });
+    },
+    // jobcodeFormatter(row, column) {
+    //   let jobcode = row.jobCode;
+    //   return CommonUtil.getDataName({
+    //     dataList: this.jobcodeoptions,
+    //     value: "value",
+    //     label: "label",
+    //     data: jobcode,
+    //   });
+    // },
+    companyNameFormatter(row, column) {
+      let companyId = row.deptId.split("D")[0];
+      return CommonUtil.getDataName({
+        dataList: this.ztreeNodes,
+        value: "id",
+        label: "name",
+        data: companyId,
+      });
+    },
+    //-- formatter end--
 
-      //--left tree begin-------
-      findLeftTreeData: function() {
-        // 获取数据
-        this.$api.dept.findLeftDeptTree(this.peopledeptid).then(res => {
-          this.ztreeNodes = res.data;
-        });
-      },
-      onZTreeCreated: function(ztreeObj) {
-        this.ztreeObj = ztreeObj;
-        // onCreated 中操作ztreeObj对象展开第一个节点
-        ztreeObj.expandNode(ztreeObj.getNodes()[0], true);
-        this.currentTreeNode=ztreeObj.getNodes()[0];
-      },
-      onZTreeClick: function(evt, treeId, treeNode) {
-        // 点击事件
-        console.log(evt.type, treeNode);
-        this.currentTreeNode = treeNode;
-        this.pageRequest.columnFilters.deptId.value = this.currentTreeNode.id;
-        this.findPage(null);
-      },
-      //--left tree start-------
+    /**Split 开始 */
+    changeTreeWidth(widthVal) {
+      // 初始化树的宽度
+      this.leftSplitWidth = Math.ceil(
+        (widthVal / this.$refs.elMain.$el.clientWidth) * 100
+      );
+      this.rightSplitWidth = 100 - this.leftSplitWidth;
+    },
+    /**Split 结束 */
 
-      // 查询Start
-      queryStaffInfo(val){
-        this.pageRequest.columnFilters.id.value = this.queryFrom.id;
-        this.pageRequest.columnFilters.name.value = this.queryFrom.name;
-        this.pageRequest.columnFilters.mobile.value = this.queryFrom.tel;
-        this.pageRequest.columnFilters.status.value = this.queryFrom.status;
-        this.pageRequest.pageNum = 1;
-        console.log(this.pageRequest)
-        this.findPage();
-      },
-      // 查询End
+    //--left tree begin-------
+    findLeftTreeData: function () {
+      // 获取数据
+      this.$api.dept.findLeftDeptTree(this.peopledeptid).then((res) => {
+        this.ztreeNodes = res.data;
+      });
+    },
+    onZTreeCreated: function (ztreeObj) {
+      this.ztreeObj = ztreeObj;
+      // onCreated 中操作ztreeObj对象展开第一个节点
+      ztreeObj.expandNode(ztreeObj.getNodes()[0], true);
+      this.currentTreeNode = ztreeObj.getNodes()[0];
+    },
+    onZTreeClick: function (evt, treeId, treeNode) {
+      // 点击事件
+      console.log(evt.type, treeNode);
+      this.currentTreeNode = treeNode;
+      this.pageRequest.columnFilters.deptId.value = this.currentTreeNode.id;
+      this.findPage(null);
+    },
+    //--left tree start-------
 
-      //-- formatter begin--
-      statusFormatter(row, column) {
-          let status = row.status;
-          return CommonUtil.getDataName({dataList: this.statusoptions, value: 'value', label: 'label', data: status})
-      },
-      jobcodeFormatter(row, column) {
-          let jobcode = row.jobCode;
-          return CommonUtil.getDataName({dataList: this.jobcodeoptions, value: 'value', label: 'label', data: jobcode})
-      },
-		companyNameFormatter(row, column){
-			let companyId = row.deptId.split('D')[0];
-			return CommonUtil.getDataName({dataList: this.ztreeNodes, value: 'id', label: 'name', data: companyId})
-		},
-      //-- formatter end--
+    // 查询Start
+    queryStaffInfo(val) {
+      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.approvalStatus.value =
+        this.queryFrom.approvalStatus;
+      this.pageRequest.pageNum = 1;
+      this.findPage(null);
+    },
+    // 查询End
 
-      // 右侧列表的方法Start
-      findPage(data) {
+    // 右侧列表的方法Start
+    findPage(data) {
+      console.log(this.pageRequest);
       // 获取分页数据
-        if(data && data.pageRequest){
-          this.pageRequest.pageNum = data.pageRequest.pageNum;
-          this.pageRequest.pageSize = data.pageRequest.pageSize;
-        }
-        this.$api.user.findCheckPage(this.pageRequest).then((res) => {
+      if (data && data.pageRequest) {
+        this.pageRequest.pageNum = data.pageRequest.pageNum;
+        this.pageRequest.pageSize = data.pageRequest.pageSize;
+      }
+      this.$api.user
+        .findPage(this.pageRequest)
+        .then((res) => {
+          console.log(res);
           this.pageResult = res.data;
-        }).then(data != null ? data.callback : '')
-      },
-      handleTableEdit(params) {
-        // 编辑后线人员
-        this.activeTabs = "first";
-        this.operation = false;
-        this.$api.dept.getDeptById(params.row.deptId.split('D')[0]).then(deptRes => {
+        })
+        .then(data != null ? data.callback : "");
+    },
+    handleTableEdit(params) {
+      console.log(params, 111);
+      // 编辑后线人员
+      this.pic1Control = false;
+      this.pic3Control = false;
+      this.pic4Control = false;
+      this.pic5Control = false;
+      this.pic6Control = false;
+
+      this.activeTabs = "first";
+      this.operation = false;
+      this.dialogTitle = "后线人员信息";
+      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){
-                this.departmentList.push({
-                  label:this.ztreeNodes[i].name,
-                  value:this.ztreeNodes[i].id
-                })
-              }
+          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,
+              });
             }
-
-            console.log(params.row.checkid)
-          this.$api.user.findCheckById(params.row.checkid).then((personRes) => {
-            console.log(personRes)
+          }
+          this.$api.user.findById(params.row.userId).then((personRes) => {
             Object.assign(this.dataForm, personRes.data.sysUser);
             Object.assign(this.dataForm, personRes.data.esmUserInternal);
-            this.dataForm.status = personRes.data.sysUser.status;
-            this.dataForm.status1 = personRes.data.esmUserInternal.status;
-
-            this.$api.user.findPersonImage({
-              taskid:this.dataForm.id,
-              imgtype:"T1"
-            }).then((resImage)=>{
-              this.dataForm['photo1']=resImage.data.imgList[0]
-            })
-            this.$api.user.findPersonImage({
-              taskid:this.dataForm.id,
-              imgtype:"T2"
-            }).then((resImage)=>{
-              this.dataForm['photo2']=resImage.data.imgList[0]
-            })
-            this.$api.user.findPersonImage({
-              taskid:this.dataForm.id,
-              imgtype:"T3"
-            }).then((resImage)=>{
-              this.dataForm['photo3']=resImage.data.imgList[0]
-            })
-            this.$api.user.findPersonImage({
-              taskid:this.dataForm.id,
-              imgtype:"T4"
-            }).then((resImage)=>{
-              this.dataForm['photo4']=resImage.data.imgList[0]
-            })
-            this.$api.user.findPersonImage({
-              taskid:this.dataForm.id,
-              imgtype:"T5"
-            }).then((resImage)=>{
-              this.dataForm['photo5']=resImage.data.imgList[0]
-            })
-            this.$api.user.findPersonImage({
-              taskid:this.dataForm.id,
-              imgtype:"T6"
-            }).then((resImage)=>{
-              this.dataForm['photo6']=resImage.data.imgList[0]
-            })
+            Object.assign(this.dataForm, personRes.data.esmUserAgent);
+            // this.dataForm.status = personRes.data.sysUser.status;
+            this.dataForm.status1 = personRes.data.sysUser.approvalStatus;
 
-            this.dialogVisible = true
-
-          })
-        })
+            // this.$api.user
+            //   .findBasePersonById(personRes.data.esmUserAgent.recommenderid)
+            //   .then((res1) => {
+            //     if (res1.code == 200) {
+            //       this.dataForm.recommenderid = res1.data.id;
+            //       this.dataForm.recommendername = res1.data.name;
+            //       this.dialogVisible = true;
+            //     } else {
+            //       this.dialogVisible = true;
+            //     }
+            //   });
+            // this.$api.user.selectByDeptId(this.dataForm.deptId).then((res2) => {
+            //   console.log(res2.data);
+            //   if (res2.code == 200) {
+            //     this.teamleaderid = res2.data.id;
+            //     this.teamleadername = res2.data.name;
+            //   }
+            // });
 
-      },
-      // 右侧列表的方法End
+            this.$api.user
+              .findPersonImage({
+                taskid: params.row.id,
+                imgtype: "T1",
+              })
+              .then((resImage) => {
+                this.dataForm["photo1"] = resImage.data.imgList[0];
+              });
+            this.$api.user
+              .findPersonImage({
+                taskid: params.row.id,
+                imgtype: "T2",
+              })
+              .then((resImage) => {
+                this.dataForm["photo2"] = resImage.data.imgList[0];
+              });
+            this.$api.user
+              .findPersonImage({
+                taskid: params.row.id,
+                imgtype: "T3",
+              })
+              .then((resImage) => {
+                this.dataForm["photo3"] = resImage.data.imgList[0];
+              });
+            this.$api.user
+              .findPersonImage({
+                taskid: params.row.id,
+                imgtype: "T4",
+              })
+              .then((resImage) => {
+                this.dataForm["photo4"] = resImage.data.imgList[0];
+              });
+            this.$api.user
+              .findPersonImage({
+                taskid: params.row.id,
+                imgtype: "T5",
+              })
+              .then((resImage) => {
+                this.dataForm["photo5"] = resImage.data.imgList[0];
+              });
+            this.$api.user
+              .findPersonImage({
+                taskid: params.row.id,
+                imgtype: "T6",
+              })
+              .then((resImage) => {
+                this.dataForm["photo6"] = resImage.data.imgList[0];
+              });
+            this.dialogVisible = true;
+          });
+        });
+    },
+    // 右侧列表的方法End
 
-      // 新增或修改的弹出框Start
-      getDictItems(typeName) {
+    // 新增或修改的弹出框Start
+    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)=>{
+        })
+        .catch((error) => {
           this[typeName + "options"] = [];
+        });
+    },
+    handleDialogBefore(done) {
+      // 退出对话框之前确认提示
+      var that = this;
+      this.$confirm("确认关闭?")
+        .then((_) => {
+          done();
         })
-      },
-      handleDialogBefore(done) {
-        // 退出对话框之前确认提示
-        var that = this;
-        this.$confirm('确认关闭?')
-          .then(_ => {
-            done();
-          })
-          .catch(_ => {});
-      },
-      closeDialog(){
-        // 清空数据
-        this.deptInfo={};
-        this.remarks="";
-        this.$refs['dataForm'].resetFields()
-        for (let key in this.dataForm) {
-          this.dataForm[key] = "";
-        }
-        this.dialogVisible=false
-        console.log(this.dataForm)
-      },
-      // 提交
-      submitForm(statusType) {
-        if((this.remarks=="") && ((statusType == 2) || (statusType == 3) )){
-          return this.$message({type: 'info',message: '请备注原因'});
-        }
+        .catch((_) => {});
+    },
+    closeDialog() {
+      // 清空数据
+      this.deptInfo = {};
+      this.remarks = "";
+      this.$refs["dataForm"].resetFields();
+      for (let key in this.dataForm) {
+        this.dataForm[key] = "";
+      }
+      this.dialogVisible = false;
+      console.log(this.dataForm);
+    },
+    // 提交
+    submitForm(statusType) {
+      console.log(111, statusType);
+      if (this.remarks == "" && (statusType == 2 || statusType == 3)) {
+        return this.$message({ type: "info", message: "请备注原因" });
+      }
 
-        this.$confirm('是否确认提交?', '提示', {}).then(() => {
-            var data={
-              checkid:this.dataForm.checkid,
-              remark:this.remarks,
-              status:statusType
-            }
-            this.$api.user.checkUser(data).then(res => {
-              this.dialogVisible = false
-              this.findPage(null);
-              this.$message({
-                type: 'success',
-                message: '已提交'
-              });
+      this.$confirm("是否确认提交?", "提示", {})
+        .then(() => {
+          var data = {
+            userId: this.dataForm.id,
+            status: statusType,
+          };
+          this.$api.user.checkUser(data).then((res) => {
+            this.dialogVisible = false;
+            this.findPage();
+            this.$message({
+              type: "success",
+              message: "已提交",
             });
-        }).catch(() => {
+          });
+        })
+        .catch(() => {
           this.$message({
-            type: 'info',
-            message: '已取消审核'
+            type: "info",
+            message: "已取消审核",
           });
         });
+    },
+    // 新增或修改的弹出框End
 
-      },
-      // 新增或修改的弹出框End
-
-      // 上传图片的方法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)
-          }
+    // 上传图片的方法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>
-  .el-divider--horizontal {
-    margin: 4px 0;
-  }
-
-  /* 顶部查询条件样式Start */
-  .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 */
+.el-divider--horizontal {
+  margin: 4px 0;
+}
+/* 顶部查询条件样式Start */
+.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 */
 
-  .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>

Разница между файлами не показана из-за своего большого размера
+ 500 - 333
src/views/PeopleManage/Staff/StaffManage.vue


+ 228 - 157
src/views/PeopleManage/TeamLeader/TeamLeaderExamine.vue

@@ -17,7 +17,7 @@
             <!-- 筛选区域Start -->
             <el-row class="queryFrom" >
               <el-form ref="queryFormRef" :model="queryFrom" label-width="80px">
-                <el-row>
+                  <el-row>
                   <el-col :span="5">
                     <el-form-item label="工号">
                       <el-input clearable size="small" placeholder="工号" v-model="queryFrom.id" ></el-input>
@@ -35,7 +35,7 @@
                   </el-col>
                   <el-col :span="5">
                     <el-form-item label="状态">
-                      <el-select size="small"  v-model="queryFrom.status" placeholder="请选择"  >
+                      <el-select size="small"  v-model="queryFrom.approvalStatus" placeholder="请选择"  >
                         <el-option label="待审核" value="0"></el-option>
                         <el-option label="审核通过" value="1"></el-option>
                         <el-option label="审核驳回" value="2"></el-option>
@@ -48,12 +48,12 @@
                       <el-button type="primary" size="small" @click="queryStaffInfo">查询</el-button>
                     </el-form-item>
                   </el-col>
-                </el-row>
+                  </el-row>
               </el-form>
             </el-row>
             <!-- 筛选区域End -->
 
-            <kt-common-table :operationWidth="140" permsButton1="sys:teamverify:edit" :data="pageResult" :columns="columns" :button1Name="(pageRequest.columnFilters.status.value == '0')?'审核':'查看'" :showBatchDelete="false" @findPage="findPage"  :button1Background="(pageRequest.columnFilters.status.value == '0')?'#F00':'#F2904B'" @handleButton1="handleTableEdit"></kt-common-table>
+            <kt-common-table :operationWidth="140" permsButton1="sys:agentverify:edit" :data="pageResult" :columns="columns" :button1Name="(pageRequest.columnFilters.approvalStatus.value == '0')?'审核':'查看'" :showBatchDelete="false" @findPage="findPage"  :button1Background="(pageRequest.columnFilters.approvalStatus.value == '0')?'#F00':'#F2904B'" @handleButton1="handleTableEdit"></kt-common-table>
 
         </SplitArea>
         <!-- 右侧列表页面End -->
@@ -61,13 +61,11 @@
     </el-main>
 
     <!-- 新增修改界面 -->
-    <el-dialog title="团队长审核" width="1000px" :visible.sync="dialogVisible" :close-on-click-modal="false" :before-close="handleDialogBefore" @close="closeDialog"
-      v-dialogDrag>
-      <el-form :model="dataForm" :rules="dataFormRules" ref="dataForm" @keyup.enter.native="submitForm('提交审核')" label-width="120px"
-        size="small" style="text-align:left;">
-        <template v-if="(dataForm.status1=='2') || (dataForm.status1=='3')">
-          <div style="color:red" > {{(dataForm.status1=='2')?"驳回原因:":"退回修改原因:" }} {{dataForm.remark}}</div>
-        </template>
+    <el-dialog title="代理人审核" width="1000px" :visible.sync="dialogVisible" :close-on-click-modal="false" :before-close="handleDialogBefore" @close="closeDialog" v-dialogDrag>
+      <template v-if="(dataForm.status1=='2') || (dataForm.status1=='3')">
+        <div style="color:red" > {{(dataForm.status1=='2')?"驳回原因:":"退回修改原因:" }} {{dataForm.remark}}</div>
+      </template>
+      <el-form :model="dataForm"  ref="dataForm"  label-width="120px" size="small" style="text-align:left;">
         <el-tabs v-model="activeTabs">
           <el-tab-pane label="行政信息" name="first">
             <el-row>
@@ -128,73 +126,122 @@
           <el-tab-pane label="基本信息" name="second">
             <el-row>
               <el-col :span="8">
-                <el-form-item label="员工工号" prop="id">
+                <el-form-item label="员工工号">
                   <el-input v-model="dataForm.id" disabled></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="部门" prop="deptId">
+                <el-form-item label="部门">
                   <el-select disabled 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="初始密码" prop="password">
-                  <el-input disabled v-model="dataForm.password"></el-input>
+                <el-form-item label="岗位">
+                  <el-select disabled style="width: 100%;" v-model="dataForm.jobName" placeholder="请选择">
+                    <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>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="修改密码" >
+                  <el-input value="******" disabled></el-input>
+                </el-form-item>
+              </el-col>
+              <!-- <el-col :span="8">
+                <el-form-item label="用户属性">
+                  <el-select disabled style="width:100%" v-model="dataForm.isshowsalesroom" 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>
+              <el-col :span="8">
+                <el-form-item label="推荐人名字" >
+                  <el-input v-model="dataForm.recommendername" disabled></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="推荐人工号">
+                  <el-input v-model="dataForm.recommenderid" disabled></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8" >
+                <el-form-item label="认证方式" >
+                  <el-input v-model="dataForm.darta1" disabled></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="8">
-                <el-form-item label="姓名" prop="name">
+                <el-form-item label="姓名">
                   <el-input disabled v-model="dataForm.name"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="性别" prop="sex">
+                <el-form-item label="性别">
                   <el-select disabled 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="岗位" prop="jobCode">
+              <el-col :span="8" >
+                <el-form-item label="状态" >
+                  <el-input v-model="dataForm.darta2" disabled></el-input>
+                </el-form-item>
+              </el-col>
+              <!-- <el-col :span="8">
+                <el-form-item label="职级">
                   <el-select disabled style="width: 100%;" v-model="dataForm.jobCode" placeholder="请选择">
-                    <el-option v-for="item in jobcodeoptions" :key="item.value" :label="item.label" :value="item.value" ></el-option>
+                    <el-option v-for="item in 108" :key="item" :label="item+'级'" :value="item" ></el-option>
                   </el-select>
                 </el-form-item>
-              </el-col>
+              </el-col> -->
             </el-row>
             <el-row>
               <el-col :span="8">
-                <el-form-item label="身份证号" prop="identity">
+                <el-form-item label="身份证号">
                   <el-input disabled v-model="dataForm.identity" ></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="出生日期" prop="birthday">
+                <el-form-item label="出生日期">
                   <el-date-picker disabled 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="移动电话" prop="mobile">
+                <el-form-item label="移动电话">
                   <el-input disabled v-model="dataForm.mobile"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="8">
-                <el-form-item label="民族" prop="nations">
+                <el-form-item label="民族">
                   <el-select disabled 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="政治面貌" prop="politicalstatus">
+                <el-form-item label="政治面貌">
                   <el-select disabled style="width:100%" v-model="dataForm.politicalstatus" placeholder="请选择">
                     <el-option label="群众" value="群众"></el-option>
                     <el-option label="共青团员" value="共青团员"></el-option>
@@ -203,31 +250,31 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="户口所在地" prop="addressresident">
+                <el-form-item label="户口所在地">
                   <el-input disabled 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-form-item label="银行账号">
                   <el-input disabled v-model="dataForm.accountno" ></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="开户银行" prop="bankname">
+                <el-form-item label="开户银行">
                   <el-input disabled v-model="dataForm.bankname"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="住宅电话" prop="phonehouse">
+                <el-form-item label="住宅电话">
                   <el-input disabled v-model="dataForm.phonehouse"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="8">
-                <el-form-item label="健康状况" prop="health">
+                <el-form-item label="健康状况">
                   <el-select disabled style="width:100%" v-model="dataForm.health" placeholder="请选择">
                     <el-option label="健康" value="健康"></el-option>
                     <el-option label="亚健康" value="亚健康"></el-option>
@@ -236,24 +283,24 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="邮政编码" prop="postalcode">
+                <el-form-item label="邮政编码">
                   <el-input disabled v-model="dataForm.postalcode"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="邮箱" prop="email">
+                <el-form-item label="邮箱">
                   <el-input disabled 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-form-item label="籍贯">
                   <el-input disabled v-model="dataForm.nativeplace"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="学历" prop="education">
+                <el-form-item label="学历">
                   <el-select disabled style="width:100%" v-model="dataForm.education" placeholder="请选择">
                     <el-option label="小学" value="小学"></el-option>
                     <el-option label="初中" value="初中"></el-option>
@@ -266,7 +313,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="血型" prop="blood">
+                <el-form-item label="血型">
                   <el-select disabled style="width:100%" v-model="dataForm.blood" placeholder="请选择">
                     <el-option label="A型" value="A型"></el-option>
                     <el-option label="B型" value="B型"></el-option>
@@ -277,44 +324,44 @@
               </el-col>
             </el-row>
             <el-row>
-              <el-col :span="8">
-                <el-form-item label="居住地址" prop="addressnow">
-                  <el-input disabled v-model="dataForm.addressnow"></el-input>
-                </el-form-item>
-              </el-col>
-             <el-col :span="8">
-               <el-form-item label="毕业院校" prop="college">
-                 <el-input disabled v-model="dataForm.college"></el-input>
-               </el-form-item>
-             </el-col>
-              <el-col :span="8">
-                <el-form-item label="入司时间" prop="intime">
-                  <el-date-picker disabled 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="居住地址">
+                   <el-input disabled v-model="dataForm.addressnow"></el-input>
+                 </el-form-item>
+               </el-col>
+                <el-col :span="8">
+                  <el-form-item label="毕业院校">
+                    <el-input disabled v-model="dataForm.college"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="入司时间">
+                    <el-date-picker disabled 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="代理人资格证号" prop="saleno">
+                <el-form-item label="代理人资格证号">
                   <el-input disabled v-model="dataForm.saleno"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="毕业时间" prop="collegetm">
+                <el-form-item label="毕业时间">
                   <el-date-picker disabled 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="原工作单位" prop="orglast">
+                <el-form-item label="原工作单位">
                   <el-input disabled v-model="dataForm.orglast"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="8">
-                <el-form-item label="婚姻状况" prop="marrycode">
+                <el-form-item label="婚姻状况">
                   <el-select disabled style="width:100%" v-model="dataForm.marrycode" placeholder="请选择">
                     <el-option label="未婚" value="未婚"></el-option>
                     <el-option label="已婚" value="已婚"></el-option>
@@ -324,45 +371,47 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="紧急联系人姓名" prop="namespecial">
-                  <el-input disabled v-model="dataForm.namespecial"></el-input>
+                <el-form-item label="紧急联系人电话" >
+                  <el-input v-model="dataForm.phonespecial" disabled></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="紧急联系人电话" prop="phonespecial">
-                  <el-input disabled v-model="dataForm.phonespecial"></el-input>
+                <el-form-item label="紧急联系人姓名">
+                  <el-input v-model="dataForm.namespecial" disabled></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
-            <!-- <el-row>
+            <el-row>
               <el-col :span="8">
-                <el-form-item label="是否显示门店" prop="isshowsalesroom">
-                  <el-input disabled v-model="dataForm.isshowsalesroom"></el-input>
+                <el-form-item label="是否显示门店" >
+                  <el-input v-model="dataForm.isshowsalesroom" disabled></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="是否显示团队" prop="isshowteam">
-                  <el-input disabled v-model="dataForm.isshowteam"></el-input>
+                <el-form-item label="初始密码" >
+                  <el-input v-model="dataForm.password" disabled></el-input>
                 </el-form-item>
               </el-col>
-            </el-row> -->
-            <el-row>
+
+            </el-row>
+            <el-row v-if="(dataForm.status1=='0')||(dataForm.status1=='2')">
               <el-col :span="8">
                 <el-form-item label="录入人" prop="createBy">
-                  <el-input disabled v-model="dataForm.createBy"></el-input>
+                  <el-input v-model="dataForm.createBy" disabled></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="录入时间" prop="createTime">
-                  <el-input disabled v-model="dataForm.createTime"></el-input>
+                  <el-input v-model="dataForm.createTime" disabled></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="最后修改时间" prop="lastUpdateTime">
-                  <el-input disabled v-model="dataForm.lastUpdateTime"></el-input>
+                  <el-input v-model="dataForm.lastUpdateTime" disabled></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
+
           </el-tab-pane>
           <el-tab-pane label="影像资料" name="third">
 
@@ -480,23 +529,23 @@
               </el-row>
               <el-row class="imageLibraryItemBody" v-show="pic5Control">
                 <el-col :span="12">
-                <el-form-item label="应聘表照片:" style="width: 50%;">
-                  <el-upload
-                  disabled
-                    class="avatar-uploader"
-                    action=""
-                    name="photo5"
-                    :show-file-list="false"
-                    :http-request="httpRequest"
-                    :before-upload="beforeAvatarUpload">
-                    <img v-if="dataForm.photo5" :src="dataForm.photo5" v-show="!!dataForm.photo5" class="avatar">
-                    <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-                  </el-upload>
-                  <viewer :images="photo5List" >
-                     <img style="width: 50px;height: 30px;opacity:0;position:absolute; top: 122px; left: 0;right: 0;bottom: 0;" :src="photo5Item" v-for="(photo5Item,photo5Index) in photo5List"  :key="photo5Index"></img>
-                  </viewer>
-                  <button @click.prevent v-show="!!dataForm.photo5">预览</button>
-                </el-form-item>
+                  <el-form-item label="应聘表照片:" style="width: 50%;">
+                    <el-upload
+                    disabled
+                      class="avatar-uploader"
+                      action=""
+                      name="photo5"
+                      :show-file-list="false"
+                      :http-request="httpRequest"
+                      :before-upload="beforeAvatarUpload">
+                      <img v-if="dataForm.photo5" :src="dataForm.photo5" v-show="!!dataForm.photo5" class="avatar">
+                      <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+                    </el-upload>
+                    <viewer :images="photo5List" >
+                       <img style="width: 50px;height: 30px;opacity:0;position:absolute; top: 122px; left: 0;right: 0;bottom: 0;" :src="photo5Item" v-for="(photo5Item,photo5Index) in photo5List"  :key="photo5Index"></img>
+                    </viewer>
+                    <button @click.prevent v-show="!!dataForm.photo5">预览</button>
+                  </el-form-item>
                 </el-col>
               </el-row>
             </div>
@@ -531,7 +580,7 @@
             </div>
 
           </el-tab-pane>
-           <el-tab-pane label="审核" name="fourth" v-if="dataForm.status1 == '0'">
+          <el-tab-pane label="审核" name="fourth" v-if="dataForm.status1=='0'">
             <el-row style="margin: 20px 0px;">
               <el-col :span="2" style="text-align: right"><label style="margin-right: 10px;">备注:</label></el-col>
               <el-col :span="22">
@@ -572,6 +621,7 @@ export default {
     return {
       peopleid: "",
       peopledeptid: "",
+
       /**Split 开始 */
       leftSplitWidth: 20,
       rightSplitWidth: 80,
@@ -605,6 +655,8 @@ export default {
       pic6Control: false,
 
       // 右侧列表查询数据Start
+      teamleadername: "", //推荐人姓名
+      teamleaderid: "", //推荐人编码
       queryFrom: {
         status: "0",
       },
@@ -625,34 +677,38 @@ export default {
           },
           usertype: {
             name: "usertype",
-            value: "B",
+            value: "2",
           },
-          status: {
-            name: "status",
+          approvalStatus: {
+            name: "approvalStatus",
             value: "0",
           },
           isteamleader: {
             name: "isteamleader",
             value: "1",
           },
-          id: {
-            name: "id",
+          userId: {
+            name: "userId",
             value: "",
           },
-          name: {
-            name: "name",
+          realName: {
+            name: "realName",
             value: "",
           },
           mobile: {
             name: "mobile",
             value: "",
           },
+          delFlag: {
+            name: "delFlag ",
+            value: "",
+          },
         },
       },
       columns: [
         { prop: "deptId", label: "部门编码", minWidth: 80, sortable: false },
         {
-          prop: "companyName",
+          prop: "pdeptName",
           label: "机构名称",
           minWidth: 120,
           sortable: false,
@@ -660,13 +716,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: 80, sortable: false },
+        { prop: "userId", label: "工号", minWidth: 80, sortable: false },
         { prop: "name", label: "姓名", minWidth: 120, sortable: false },
         { prop: "sex", label: "性别", minWidth: 120, sortable: false },
         { prop: "mobile", label: "联系电话", minWidth: 100, sortable: false },
@@ -677,11 +732,10 @@ export default {
           sortable: false,
         },
         {
-          prop: "status",
+          prop: "approvalStatus",
           label: "状态",
           minWidth: 70,
           sortable: false,
-          formatter: this.statusFormatter,
         },
       ],
       // 右侧列表查询数据End
@@ -701,7 +755,7 @@ export default {
         email: "", //邮箱
         mobile: "", //手机号
         birthday: "", //出生日期
-        status: "", //状态  1:正常   0:离司
+        approvalStatus: "", //状态  1:正常   0:离司
         marrycode: "", //婚姻状况
         deptId: "", //机构号或者部门号
         createBy: "", //创建人
@@ -712,7 +766,7 @@ export default {
         usertype: "", //用户类型:0:系统用户 A:后线人员 B:代理人员
         tenantId: "", //所属租户
         sex: "", //性别
-        jobCode: "", //岗位
+        jobName: "", //岗位
         esmUserInternalid: "",
         addressnow: "", //居住地址
         nations: "", //民族
@@ -831,10 +885,26 @@ export default {
         "珞巴族",
       ],
 
-      dataFormRules: {},
       // 新增编辑界面数据
     };
   },
+  created() {
+    this.peopleid = Cookies.get("user");
+    if (this.peopleid != "admin") {
+      this.peopledeptid = Cookies.get("user").split("D")[0];
+      this.pageRequest.columnFilters.deptId.value = this.peopledeptid;
+    } else {
+      this.peopledeptid = "9";
+      this.pageRequest.columnFilters.deptId.value = this.peopledeptid;
+    }
+    //获取所有下拉框数据(字典)
+    this.getDictItems("comlevel");
+    this.getDictItems("comattribute");
+    this.getDictItems("comtype");
+    this.getDictItems("jobcode");
+
+    this.findLeftTreeData(); // 获取机构树的数据
+  },
   computed: {
     photo1List() {
       if (!!this.dataForm.photo1) {
@@ -879,23 +949,6 @@ export default {
       }
     },
   },
-  created() {
-    this.peopleid = Cookies.get("user");
-    if (this.peopleid != "admin") {
-      this.peopledeptid = Cookies.get("user").split("D")[0];
-      this.pageRequest.columnFilters.deptId.value = this.peopledeptid;
-    } else {
-      this.peopledeptid = "9";
-      this.pageRequest.columnFilters.deptId.value = this.peopledeptid;
-    }
-    //获取所有下拉框数据(字典)
-    this.getDictItems("comlevel");
-    this.getDictItems("comattribute");
-    this.getDictItems("comtype");
-    this.getDictItems("jobcode");
-
-    this.findLeftTreeData(); // 获取机构树的数据
-  },
   mounted() {
     //用像素初始化左边的split的宽度
     this.changeTreeWidth(240); // 初始化树的宽度
@@ -921,15 +974,15 @@ export default {
         data: status,
       });
     },
-    jobcodeFormatter(row, column) {
-      let jobcode = row.jobCode;
-      return CommonUtil.getDataName({
-        dataList: this.jobcodeoptions,
-        value: "value",
-        label: "label",
-        data: jobcode,
-      });
-    },
+    // jobcodeFormatter(row, column) {
+    //   let jobcode = row.jobCode;
+    //   return CommonUtil.getDataName({
+    //     dataList: this.jobcodeoptions,
+    //     value: "value",
+    //     label: "label",
+    //     data: jobcode,
+    //   });
+    // },
     companyNameFormatter(row, column) {
       let companyId = row.deptId.split("D")[0];
       return CommonUtil.getDataName({
@@ -975,25 +1028,26 @@ 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.approvalStatus;
       this.pageRequest.pageNum = 1;
-      console.log(this.pageRequest);
-      this.findPage();
+      this.findPage(null);
     },
     // 查询End
 
     // 右侧列表的方法Start
     findPage(data) {
+      console.log(this.pageRequest);
       // 获取分页数据
       if (data && data.pageRequest) {
         this.pageRequest.pageNum = data.pageRequest.pageNum;
         this.pageRequest.pageSize = data.pageRequest.pageSize;
       }
       this.$api.user
-        .findCheckPage(this.pageRequest)
+        .findPage(this.pageRequest)
         .then((res) => {
           console.log(res);
           this.pageResult = res.data;
@@ -1002,8 +1056,15 @@ export default {
     },
     handleTableEdit(params) {
       // 编辑后线人员
+      this.pic1Control = false;
+      this.pic3Control = false;
+      this.pic4Control = false;
+      this.pic5Control = false;
+      this.pic6Control = false;
+
       this.activeTabs = "first";
       this.operation = false;
+      this.dialogTitle = "团队长人员信息";
       this.$api.dept
         .getDeptById(params.row.deptId.split("D")[0])
         .then((deptRes) => {
@@ -1021,19 +1082,35 @@ export default {
               });
             }
           }
-
-          this.$api.user.findCheckById(params.row.checkid).then((personRes) => {
-            console.log(personRes.data);
+          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);
-            console.log(this.dataForm);
-            this.dataForm.status = personRes.data.sysUser.status;
-            this.dataForm.status1 = personRes.data.esmUserInternal.status;
+            // this.dataForm.status = personRes.data.sysUser.status;
+            this.dataForm.status1 = personRes.data.sysUser.approvalStatus;
+
+            // this.$api.user
+            //   .findBasePersonById(personRes.data.esmUserAgent.recommenderid)
+            //   .then((res1) => {
+            //     if (res1.code == 200) {
+            //       this.dataForm.recommenderid = res1.data.id;
+            //       this.dataForm.recommendername = res1.data.name;
+            //       this.dialogVisible = true;
+            //     } else {
+            //       this.dialogVisible = true;
+            //     }
+            //   });
+            // this.$api.user.selectByDeptId(this.dataForm.deptId).then((res2) => {
+            //   console.log(res2.data);
+            //   if (res2.code == 200) {
+            //     this.teamleaderid = res2.data.id;
+            //     this.teamleadername = res2.data.name;
+            //   }
+            // });
 
             this.$api.user
               .findPersonImage({
-                taskid: this.dataForm.id,
+                taskid: params.row.id,
                 imgtype: "T1",
               })
               .then((resImage) => {
@@ -1041,7 +1118,7 @@ export default {
               });
             this.$api.user
               .findPersonImage({
-                taskid: this.dataForm.id,
+                taskid: params.row.id,
                 imgtype: "T2",
               })
               .then((resImage) => {
@@ -1049,7 +1126,7 @@ export default {
               });
             this.$api.user
               .findPersonImage({
-                taskid: this.dataForm.id,
+                taskid: params.row.id,
                 imgtype: "T3",
               })
               .then((resImage) => {
@@ -1057,7 +1134,7 @@ export default {
               });
             this.$api.user
               .findPersonImage({
-                taskid: this.dataForm.id,
+                taskid: params.row.id,
                 imgtype: "T4",
               })
               .then((resImage) => {
@@ -1065,7 +1142,7 @@ export default {
               });
             this.$api.user
               .findPersonImage({
-                taskid: this.dataForm.id,
+                taskid: params.row.id,
                 imgtype: "T5",
               })
               .then((resImage) => {
@@ -1073,13 +1150,12 @@ export default {
               });
             this.$api.user
               .findPersonImage({
-                taskid: this.dataForm.id,
+                taskid: params.row.id,
                 imgtype: "T6",
               })
               .then((resImage) => {
                 this.dataForm["photo6"] = resImage.data.imgList[0];
               });
-
             this.dialogVisible = true;
           });
         });
@@ -1120,6 +1196,7 @@ export default {
     },
     // 提交
     submitForm(statusType) {
+      console.log(111, statusType);
       if (this.remarks == "" && (statusType == 2 || statusType == 3)) {
         return this.$message({ type: "info", message: "请备注原因" });
       }
@@ -1127,13 +1204,12 @@ export default {
       this.$confirm("是否确认提交?", "提示", {})
         .then(() => {
           var data = {
-            checkid: this.dataForm.checkid,
-            remark: this.remarks,
+            userId: this.dataForm.id,
             status: statusType,
           };
           this.$api.user.checkUser(data).then((res) => {
             this.dialogVisible = false;
-            this.findPage(null);
+            this.findPage();
             this.$message({
               type: "success",
               message: "已提交",
@@ -1184,22 +1260,17 @@ export default {
 .el-divider--horizontal {
   margin: 4px 0;
 }
-
 /* 顶部查询条件样式Start */
 .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;

Разница между файлами не показана из-за своего большого размера
+ 442 - 268
src/views/PeopleManage/TeamLeader/TeamLeaderManage.vue


+ 112 - 63
src/views/Sys/PosterManage.vue

@@ -1,19 +1,30 @@
 <template>
   <div>
-    <el-main ref="elMain" style="padding: 0px;">
-      <el-row style="margin: 0px 20px;">
+    <el-main ref="elMain" style="padding: 0px">
+      <el-row style="margin: 0px 20px">
         <!-- <kt-button size="small" style="color: #409EFF;" icon="el-icon-circle-plus" label="新增海报" type="text" perms="sys:user:add" @click="handleAdd" /> -->
         <el-button
-          style="background-color: #52C578;border:#52C578;margin-left: 15px;margin-bottom: 20px;"
+          style="
+            background-color: #52c578;
+            border: #52c578;
+            margin-left: 15px;
+            margin-bottom: 20px;
+          "
           icon="fa fa-plus"
           size="mini"
           type="primary"
           @click="handleAdd"
-        >新增海报</el-button>
+          >新增海报</el-button
+        >
       </el-row>
       <!-- 工具区域Start -->
-      <el-form class="queryForm" ref="queryFormRef" :model="queryForm" label-width="80px">
-        <el-row style="margin-bottom: 15px;">
+      <el-form
+        class="queryForm"
+        ref="queryFormRef"
+        :model="queryForm"
+        label-width="80px"
+      >
+        <el-row style="margin-bottom: 15px">
           <el-col :span="6" class="u-f-ajc">
             <el-form-item label="海报类型">
               <el-select
@@ -34,26 +45,61 @@
           </el-col>
         </el-row>
       </el-form>
-        <el-table
-      :data="pageResult"
-      height="650"
-      border
-      style="width: 100%"
-      highlight-current-row
-      :default-sort="{prop: 'createtime', order: 'descending'}"
-      stripe
-      :header-cell-style="{background:'#F2F7FC',fontWeight: '700',color:'#606266'}"
-    >
-      <el-table-column prop="originalfilename" label="海报名称"  align="center"></el-table-column>
-      <el-table-column prop="dirid" label="海报类型"  align="center" :formatter="typeFormatter"></el-table-column>
-      <el-table-column prop="url" label="图片" align="center" :formatter="imgFormatter"></el-table-column>
-      <el-table-column prop="createdate" label="创建时间" align="center"  sortable :formatter="createtimeFormatter"></el-table-column>
-      <el-table-column prop="address" label="操作" align="center" width="300" fixed="right">
-        <template slot-scope="scope">
-          <el-button size="small" type="danger" @click="Appdelete(scope.$index, scope.row)">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
+      <el-table
+        :data="pageResult"
+        height="650"
+        border
+        style="width: 100%"
+        highlight-current-row
+        :default-sort="{ prop: 'createtime', order: 'descending' }"
+        stripe
+        :header-cell-style="{
+          background: '#F2F7FC',
+          fontWeight: '700',
+          color: '#606266',
+        }"
+      >
+        <el-table-column
+          prop="originalfilename"
+          label="海报名称"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="dirid"
+          label="海报类型"
+          align="center"
+          :formatter="typeFormatter"
+        ></el-table-column>
+        <el-table-column
+          prop="url"
+          label="图片"
+          align="center"
+          :formatter="imgFormatter"
+        ></el-table-column>
+        <el-table-column
+          prop="createdate"
+          label="创建时间"
+          align="center"
+          sortable
+          :formatter="createtimeFormatter"
+        ></el-table-column>
+        <el-table-column
+          prop="address"
+          label="操作"
+          align="center"
+          width="300"
+          fixed="right"
+        >
+          <template slot-scope="scope">
+            <el-button
+              size="small"
+              type="danger"
+              @click="Appdelete(scope.$index, scope.row)"
+              >删除</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
     </el-main>
 
     <!-- 新增协议的对话框 -->
@@ -73,7 +119,6 @@
         size="small"
       >
         <el-row>
-        
           <el-col :span="8">
             <el-form-item label="海报类型" prop="dirId">
               <el-select v-model="dataForm.dirId" placeholder="请选择海报类型">
@@ -89,7 +134,7 @@
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item label="海报图片" prop="image" style="width: 100%;">
+            <el-form-item label="海报图片" prop="image" style="width: 100%">
               <el-upload
                 action="#"
                 list-type="picture-card"
@@ -97,8 +142,12 @@
                 :on-change="drivingupload1"
               >
                 <i slot="default" class="el-icon-plus"></i>
-                <div slot="file" slot-scope="{file}">
-                  <img class="el-upload-list__item-thumbnail" :src="file.url" alt />
+                <div slot="file" slot-scope="{ file }">
+                  <img
+                    class="el-upload-list__item-thumbnail"
+                    :src="file.url"
+                    alt
+                  />
                   <span class="el-upload-list__item-actions">
                     <span
                       class="el-upload-list__item-preview"
@@ -131,7 +180,6 @@ export default {
         taskid: "",
         imgList: [],
       },
-     
 
       operType: "VIEW", //'ADD','VIEW'
       dialogTitle: "查看产品信息",
@@ -142,9 +190,9 @@ export default {
         postertype: "推荐",
       },
       pageResult: [],
-     
-      dirId:"P0001",
-            // 右侧列表查询数据End
+
+      dirId: "P0001",
+      // 右侧列表查询数据End
     };
   },
   mounted() {
@@ -154,16 +202,16 @@ export default {
   },
   methods: {
     Appdelete(index, row) {
-      console.log(row)
+      console.log(row);
       this.$confirm("确定删除该应用吗?,请谨慎操作", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
       })
         .then(() => {
-          let fileId=row.fileid;
+          let fileId = row.fileid;
           this.$api.task.deleteFile(fileId).then((res) => {
-            console.log()
+            console.log();
             if (res.code == "200") {
               this.$message({
                 type: "success",
@@ -181,20 +229,20 @@ export default {
         });
     },
     drivingupload1(file) {
-        var formData = new FormData();
-      formData.append("files",file.raw);
-      this.$api.task.uploadMore(this.dataForm.dirId,formData).then((res) => {
+      var formData = new FormData();
+      formData.append("files", file.raw);
+      this.$api.task.uploadMore(this.dataForm.dirId, formData).then((res) => {
         console.log(res);
         this.$message({
           message: "上传成功",
           type: "success",
         });
         this.dialogVisible = false;
-        this.dirId=this.dataForm.dirId;
+        this.dirId = this.dataForm.dirId;
         this.findPage();
       });
     },
-  
+
     imgFormatter(row, column) {
       let image = row.url;
       return <img src={"" + image + ""} class="imageclass"></img>;
@@ -206,7 +254,7 @@ export default {
     },
     // 下拉选择海报类型
     choosePosterType(val) {
-      this.dirId  = val;
+      this.dirId = val;
       this.findPage();
     },
 
@@ -239,35 +287,36 @@ export default {
     },
     //-- formatter begin--
     createtimeFormatter(row, column) {
+      console.log(row);
       let createtime = row.createdate;
       return format(createtime);
     },
     //海报类型
     typeFormatter(row, column) {
-     if(row.dirid=="P0001"){
-       return "推荐"
-     }
-     if(row.dirid=="P0002"){
-       return "保险"
-     }
-     if(row.dirid=="P0003"){
-       return "产品"
-     }
-     if(row.dirid=="P0004"){
-       return "节气"
-     }
-     if(row.dirid=="P0005"){
-       return "节日"
-     }
-     if(row.dirid=="P0006"){
-       return "增员"
-     }
+      if (row.dirid == "P0001") {
+        return "推荐";
+      }
+      if (row.dirid == "P0002") {
+        return "保险";
+      }
+      if (row.dirid == "P0003") {
+        return "产品";
+      }
+      if (row.dirid == "P0004") {
+        return "节气";
+      }
+      if (row.dirid == "P0005") {
+        return "节日";
+      }
+      if (row.dirid == "P0006") {
+        return "增员";
+      }
     },
     // 右侧列表的方法Start
     findPage(data) {
       // 获取分页数据
-       this.$api.task
-            .queryUploadList(this.dirId)
+      this.$api.task
+        .queryUploadList(this.dirId)
         .then((res) => {
           this.pageResult = res.data;
         })

Некоторые файлы не были показаны из-за большого количества измененных файлов