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

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

lihongxiao 2 лет назад
Родитель
Сommit
f416f8e88f

+ 9 - 0
src/http/moudules/user.js

@@ -653,3 +653,12 @@ export const queryGeographyRecord = (data) => {
     data
     data
   })
   })
 }
 }
+
+
+// 电销管理人
+export const findDxUserList = () => {
+  return axios({
+    url: '/user/findDxUserList',
+    method: 'get',
+  })
+}

+ 35 - 0
src/views/PeopleManage/Sales/SalesExamine.vue

@@ -327,6 +327,36 @@
                 </el-form-item>
                 </el-form-item>
               </el-col>
               </el-col>
             </el-row>
             </el-row>
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="电销管理人" prop="managerName">
+                  <el-select
+                    style="width: 100%"
+                    clearable
+                    filterable
+                    v-model="formData.managerId"
+                    placeholder="请选择"
+                    popper-class="select-prop"
+                  >
+                    <el-option
+                      v-for="val in managerOptions"
+                      :label="val.name"
+                      :value="val.id"
+                      :key="val.id"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="电销管理工号" prop="leaderName">
+                  <el-input v-model="formData.managerId" disabled
+                            style="width: 100%"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+              </el-col>
+            </el-row>
           </el-form>
           </el-form>
           <div class="footerHandle" style="text-align: right">
           <div class="footerHandle" style="text-align: right">
             <el-button
             <el-button
@@ -473,6 +503,7 @@ export default {
   mixins: [mixin],
   mixins: [mixin],
   data() {
   data() {
     return {
     return {
+      managerOptions:[], //电销管理集合
       showRemark: false, // 驳回弹窗
       showRemark: false, // 驳回弹窗
       activeName: "1",
       activeName: "1",
       pageData: {
       pageData: {
@@ -597,6 +628,10 @@ export default {
             }
             }
           });
           });
         });
         });
+        //添加电销负责人
+        this.$api.user.findDxUserList().then((res) => {
+          this.managerOptions = res.data;
+        }); 
     },
     },
     // 新增或修改的弹出框Start
     // 新增或修改的弹出框Start
     getDictItems(typeName) {
     getDictItems(typeName) {

+ 1107 - 0
src/views/PeopleManage/Sales/SalesExamineGroup.vue

@@ -0,0 +1,1107 @@
+<template>
+  <div>
+    <el-main ref="elMain" style="padding: 0px">
+      <Split :gutterSize="2" style="height: calc(100vh - 120px)">
+        <!-- 左侧树Start -->
+        <SplitArea :size="leftSplitWidth" :minSize="240">
+          <div>
+            <!-- 左侧树形结构 -->
+            <!-- <el-tree
+              :data="ztreeNodes"
+              :props="{ children: 'children', label: 'name' }"
+              node-key="id"
+              :default-expanded-keys="['9']"
+              @node-click="onZTreeClick"
+            ></el-tree> -->
+            <el-tree
+              :data="ztreeNodes"
+              :props="{ children: 'children', label: 'name' }"
+              node-key="id"
+              :default-expanded-keys="['9']"
+              @node-click="onZTreeClick"
+            ></el-tree>
+          </div>
+        </SplitArea>
+        <!-- 左侧树End -->
+
+        <!-- 右侧列表页面Start -->
+        <SplitArea :size="rightSplitWidth">
+          <!-- 筛选区域Start -->
+          <el-row class="queryFrom">
+            <el-form ref="queryFormRef" :model="queryFrom" label-width="80px">
+              <el-row>
+                <el-col :span="5">
+                  <el-form-item label="工号">
+                    <el-input
+                      clearable
+                      size="small"
+                      placeholder="工号"
+                      v-model="queryFrom.userId"
+                    ></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="5">
+                  <el-form-item label="姓名">
+                    <el-input
+                      clearable
+                      size="small"
+                      placeholder="姓名"
+                      v-model="queryFrom.name"
+                    ></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="5">
+                  <el-form-item label="手机号">
+                    <el-input
+                      clearable
+                      size="small"
+                      placeholder="手机号"
+                      v-model="queryFrom.mobile"
+                    ></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="5">
+                  <el-form-item label="状态">
+                    <el-select
+                      size="small"
+                      style="width: 200px"
+                      clearable
+                      v-model="queryFrom.status"
+                      placeholder="请选择"
+                    >
+                      <el-option
+                        v-for="val in user_statusoptions"
+                        :label="val.label"
+                        :value="val.value"
+                        :key="val.id"
+                      ></el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="5">
+                  <el-form-item label="领导人">
+                    <el-select
+                      size="small"
+                      style="width: 215px"
+                      clearable
+                      filterable
+                      v-model="queryFrom.leaderId"
+                      placeholder="请选择"
+                    >
+                      <el-option
+                        v-for="item in searchLeaderOptions"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.name"
+                      >
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="4">
+                  <el-form-item label>
+                    <el-button
+                      size="small"
+                      type="primary"
+                      @click="queryStaffInfo"
+                      >查询</el-button
+                    >
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </el-row>
+
+          <kt-common-table
+            permsButton1="sys:agent:examine"
+            :data="pageResult"
+            :columns="columns"
+            :showBatchDelete="false"
+            @findPage="findPage"
+            :button7Name="'审核'"
+            :button7Status="'离司待审核'"
+            @handleButton7="handleTableEdit"
+            :button8Name="'审核'"
+            :button8Status="'入司待审核'"
+            @handleButton8="handleTableEdit"
+            @handleButton3="handleTableEdit1"
+            :button3Name="'详情'"
+            :button10Name="'审核'"
+            :button10Status="'修改待审核'"
+            @handleButton10="handleTableEdit"
+          ></kt-common-table>
+          <!--
+            @handleButton1="handleTableEdit"
+            :button1Name="'审核'"
+           -->
+        </SplitArea>
+        <!-- 右侧列表页面End -->
+      </Split>
+    </el-main>
+
+    <el-dialog
+      :title="dialogTitle"
+      width="60%"
+      top="5vh"
+      :visible.sync="dialogVisible"
+      :close-on-click-modal="false"
+      :before-close="handleDialogBefore"
+      :show-close="false"
+      @close="closeDialog"
+      v-dialogDrag
+      class="people-style"
+    >
+      <el-tabs v-model="activeName" class="tab-style">
+        <el-tab-pane label="基本信息" name="1">
+          <el-form
+            :model="formData"
+            disabled
+            ref="formData"
+            :inline="true"
+            @keyup.enter.native="nextStep()"
+            label-width="110px"
+            size="small"
+            label-position="top"
+            class="personnelInformation"
+          >
+          <el-row>
+              <el-col :span="8">
+                <el-form-item label="机构名称">
+                  <el-cascader
+                    style="width: 100%"
+                    :options="ztreeNodes"
+                    v-model="formData.pdeptId"
+                    clearable
+                    disabled
+                    :show-all-levels="false"
+                    :props="{
+                      value: 'id',
+                      label: 'name',
+                      checkStrictly: true,
+                    }"
+                    @change="handleChange"
+                  >
+                  </el-cascader>
+                </el-form-item
+              ></el-col>
+              <el-col :span="8">
+                <el-form-item label="机构部门" prop="deptId">
+                  <el-cascader
+                    style="width: 100%"
+                    :options="ztreeNodes"
+                    v-model="formData.deptId"
+                    clearable
+                    disabled
+                    :show-all-levels="false"
+                    :props="{
+                      value: 'id',
+                      label: 'name',
+                      checkStrictly: true,
+                    }"
+                    @change="handleChange"
+                  >
+                  </el-cascader> </el-form-item
+              ></el-col>
+              <el-col :span="8">
+                <el-form-item label="岗位" prop="positionId">
+                  <el-select
+                    style="width: 100%"
+                    v-model="formData.positionId"
+                    placeholder="请选择"
+                    popper-class="select-prop"
+                  >
+                    <el-option
+                      v-for="val in postOption"
+                      :label="val.postName"
+                      :value="val.postId"
+                      :key="val.postId"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+          </el-row>
+          <el-row>
+              <el-col :span="8">
+                <el-form-item label="工号" prop="id">
+                  <el-input v-model="formData.id" disabled
+                  style="width: 100%"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="姓名" prop="name">
+                  <el-input v-model="formData.name"
+                  style="width: 100%"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="手机号" prop="mobile">
+                  <el-input v-model="formData.mobile"
+                  style="width: 100%"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+          </el-row>
+          <el-row>
+              <el-col :span="8">
+                <el-form-item label="入司时间">
+                  <el-date-picker
+                    style="width: 100%"
+                    v-model="formDataDetail.entryTime"
+                    type="date"
+                    placeholder="选择日期"
+                    popper-class="select-prop"
+                  >
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="状态" prop="status">
+                  <el-select
+                    disabled
+                    style="width: 100%"
+                    v-model="formData.status"
+                    placeholder="请选择"
+                  >
+                    <el-option
+                      v-for="val in user_statusoptions"
+                      :label="val.label"
+                      :value="val.value"
+                      :key="val.id"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="角色" prop="roleId">
+                  <el-select
+                    style="width: 100%"
+                    v-model="formData.roleId"
+                    placeholder="请选择"
+                    disabled
+                  >
+                    <el-option
+                      v-for="val in roles"
+                      :label="val.name"
+                      :value="val.id + ''"
+                      :key="val.id"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+          </el-row>
+          <el-row>
+              <el-col :span="8">
+                <el-form-item label="管理人" prop="leaderId">
+                  <el-select
+                    style="width: 100%"
+                    clearable
+                    filterable
+                    v-model="formData.leaderId"
+                    placeholder="请选择"
+                    popper-class="select-prop"
+                  >
+                    <el-option
+                      v-for="val in leaderOptions"
+                      :label="val.name"
+                      :value="val.id"
+                      :key="val.id"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="管理人工号" prop="leaderName">
+                  <el-input v-model="formData.leaderId" disabled
+                  style="width: 100%"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="代理人资格证号" prop="agentQualificationCode">
+                  <el-input
+                    style="width: 100%"
+                    v-model="formDataDetail.agentQualificationCode"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="电销管理人" prop="managerName">
+                  <el-select
+                    style="width: 100%"
+                    clearable
+                    filterable
+                    v-model="formData.managerId"
+                    placeholder="请选择"
+                    popper-class="select-prop"
+                  >
+                    <el-option
+                      v-for="val in managerOptions"
+                      :label="val.name"
+                      :value="val.id"
+                      :key="val.id"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="电销管理工号" prop="leaderName">
+                  <el-input v-model="formData.managerId" disabled
+                            style="width: 100%"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+              </el-col>
+            </el-row>
+          </el-form>
+          <div class="footerHandle" style="text-align: right">
+            <el-button
+              size="small"
+              type="primary"
+              style="
+                border: 1px solid #D42426;
+                color: #D42426;
+              "
+              class="closeBtn"
+              @click="closeDialog"
+              >取消</el-button
+            >
+            <el-button size="small" type="primary" @click="nextStep('2')"
+              >下一步</el-button
+            >
+          </div>
+        </el-tab-pane>
+        <el-tab-pane label="详细信息" name="2">
+          <userDetail
+            :formData="formData"
+            :formDataDetail="formDataDetail"
+            ref="formDataDetails"
+            isDisabled
+            :showThirdParty="true"
+          ></userDetail>
+          <div class="footerHandle" style="text-align: right">
+            <el-button
+              size="small"
+              type="primary"
+              style="
+                border: 1px solid #D42426;
+                color: #D42426;
+              "
+              class="closeBtn"
+              @click="closeDialog"
+              >取消</el-button
+            >
+            <!-- <el-button size="small" type="primary" @click="nextStep('1')"
+              >上一步</el-button
+            > -->
+            <el-button size="small" type="primary" @click="nextStep('3')"
+              >下一步</el-button
+            >
+          </div>
+        </el-tab-pane>
+        <el-tab-pane label="影像资料" name="3">
+          <el-form
+            :model="formDataDetail"
+            ref="formDataDetail"
+            :inline="true"
+            label-width="130px"
+            size="small"
+            class="peopleImage"
+          >
+            <peopleImage
+              :dataForm="dataForm"
+              :carfrontImg="true"
+              :dialogVisible="dialogVisible"
+              isDisabled
+            ></peopleImage>
+          </el-form>
+          <div class="footerHandle" style="text-align: right">
+            <el-button
+              size="small"
+              type="primary"
+              style="
+                border: 1px solid #D42426;
+                color: #D42426;
+              "
+              class="closeBtn"
+              @click="closeDialog"
+              >取消</el-button
+            >
+            <!-- <el-button size="small" type="primary" @click="nextStep('2')"
+              >上一步</el-button
+            > -->
+            <el-button
+              v-show="dialogTitle == '审核电销负责人'"
+              size="mini"
+              type="primary"
+              style="background-color: #0ec216; border: 1px solid #0ec216"
+              @click="submitForm(1)"
+              >审核通过</el-button
+            >
+            <el-button
+              v-show="dialogTitle == '审核电销负责人'"
+              size="mini"
+              type="danger"
+              style="background-color: #de504c; border: 1px solid #de504c"
+              @click="submitForm(2)"
+              >审核驳回</el-button
+            >
+          </div>
+        </el-tab-pane>
+      </el-tabs>
+    </el-dialog>
+
+    <!-- 驳回理由 -->
+    <el-dialog
+      title="驳回"
+      width="40%"
+      :visible.sync="showRemark"
+      @close="closeDialogOut"
+    >
+      <el-form>
+        <el-form-item label="备注" prop="remark">
+          <el-input
+            style="width: 30vw"
+            v-model="formDataDetail.remark"
+            type="textarea"
+            :autosize="{ minRows: 4, maxRows: 6 }"
+            placeholder="请输入内容"
+            prop="remark"
+            maxlength="200"
+            show-word-limit
+          ></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer">
+        <el-button type="primary" @click="handleSubOut">确定</el-button>
+        <el-button @click="closeDialogOut">取消</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import tree from "@/components/ztree.vue"; // 机构树组件
+import KtCommonTable from "@/views/Core/KtCommonTable.vue"; //表格组件
+import peopleImage from "@/components/PeopleImage/index.vue"; //影像组件
+import userDetail from "@/components/UserDetail/index.vue"; // 详情信息
+import mixa from "../mixin";
+const mixin = new mixa({
+  treeTypeNum: 3, //树分类过滤参数
+});
+export default {
+  components: {
+    tree,
+    KtCommonTable,
+    peopleImage,
+    userDetail,
+  },
+  mixins: [mixin],
+  data() {
+    return {
+      managerOptions:[], //电销管理集合
+      showRemark: false, // 驳回弹窗
+      activeName: "1",
+      pageData: {
+        pageNum: 1,
+        pageSize: 20,
+        deptId: JSON.parse(localStorage.getItem("user_data")).deptId,
+        userId: "",
+        realName: "",
+        mobile: "",
+      },
+      formData: {},
+      formDataRules: {
+        remark: [
+          { required: true, message: "请填写驳回原因", trigger: "blur" },
+        ],
+      },
+      formDataDetail: {},
+      filterObject: {},
+      peopleid: "",
+      peopledeptid: "",
+      recommenderList: [],
+      teamleadername: "",
+      teamleaderid: "",
+      // 右侧列表查询数据Start
+      queryFrom: {},
+      pageResult: {},
+      columns: [
+        // 数据列
+        { prop: "deptId", label: "部门编码", minWidth: 80, sortable: false },
+        {
+          prop: "pdeptName",
+          label: "机构名称",
+          minWidth: 120,
+          sortable: false,
+        },
+
+        { prop: "deptName", label: "部门名称", minWidth: 80, sortable: false },
+
+        { prop: "userId", label: "工号", minWidth: 80, sortable: false },
+        { prop: "name", label: "姓名", minWidth: 120, sortable: false },
+        {
+          prop: "sex",
+          label: "性别",
+          minWidth: 80,
+          sortable: false,
+          isSex: true
+        },
+        { prop: "mobile", label: "联系电话", minWidth: 100, sortable: false },
+        {
+          prop: "roleId",
+          label: "角色",
+          minWidth: 80,
+          sortable: false,
+        },
+        {
+          prop: "submitTime",
+          label: "提交时间",
+          type: "text",
+          minWidth: 100,
+        },
+        {
+          prop: "approveTime",
+          label: "审核时间",
+          type: "text",
+          minWidth: 100,
+        },
+        {
+          prop: "approveBy",
+          label: "审核人",
+          type: "text",
+          minWidth: 100,
+        },
+        {
+          prop: "status",
+          label: "状态",
+          minWidth: 120,
+          sortable: false,
+          isStatus: true
+        },
+      ],
+      dialogTitle: "",
+      dialogVisible: false, // 新增编辑界面是否显示
+      departmentList: [], // 选中公司的所有部门的集合
+      deptInfo: {}, //选中机构的基本信息
+      option: [], //机构列表
+      //影像资料
+      dataForm: {
+        SFZ_01: "",
+        SFZ_02: "",
+        Z6Z_00: "",
+        LD_00: "",
+        YP_00: "",
+        DX_00: "",
+      },
+      //影像上传列表
+      imagesIdList: [],
+      searchLeaderOptions: [],
+      leaderOptions: [],
+    };
+  },
+  created() {
+    console.log(this.roles)
+    this.findPage();
+    this.getDictItems("user_status");
+    this.searchLeaderFun();
+  },
+  methods: {
+    searchLeaderFun() {
+      this.$api.user.findHxUserList().then((res) => {
+        this.leaderOptions = res.data;
+      });
+      this.$api.user
+        .findBackListByDeptId({ deptId: this.deptId })
+        .then((res) => {
+          res.data.forEach((e) => {
+            e.value = e.id;
+            e.label = e.name;
+          });
+          this.searchLeaderOptions = [...res.data];
+        });
+        //添加电销负责人
+        this.$api.user.findDxUserList().then((res) => {
+          this.managerOptions = res.data;
+        }); 
+    },
+    // 新增或修改的弹出框Start
+    getDictItems(typeName) {
+      //--数据字典--
+      this.$api.dict
+        .findByLableName(typeName)
+        .then((response) => {
+          this[typeName + "options"] = response.data; // 把获取到的数据赋给this.data
+        })
+        .catch((error) => {
+          this[typeName + "options"] = [];
+        });
+    },
+    handleSubOut() {
+      if (!this.formDataDetail.remark) {
+        this.$message.error("请在详细信息填写驳回原因");
+        return;
+      }
+      this.$refs.formDataDetail.validate((valid) => {
+        if (valid) {
+          this.$api.user
+            .getApprovalNotPass({
+              userId: this.formData.id,
+              reason: this.formDataDetail.remark,
+            })
+            .then((result) => {
+              if (result.code == 200 && result.data) {
+                this.$message({
+                  message: "审核已驳回",
+                  type: "success",
+                });
+                this.findPage();
+                this.closeDialogOut();
+                this.dialogVisible = false;
+              }
+            });
+        }
+      });
+    },
+    closeDialogOut() {
+      this.showRemark = false;
+    },
+    handleDialogBefore(done) {
+      // 退出对话框之前确认提示
+      var that = this;
+      this.$confirm("确认关闭?")
+        .then((_) => {
+          done();
+        })
+        .catch((_) => {});
+    },
+    // 查询Start
+    queryStaffInfo() {
+      this.pageData.realName = this.queryFrom.name;
+      this.pageData.mobile = this.queryFrom.mobile;
+      this.pageData.userId = this.queryFrom.userId;
+      this.pageData.status = this.queryFrom.status;
+      this.isQueryStaff = true
+      this.findPage();
+    },
+    onZTreeClick: function (evt, treeId, treeNode) {
+      // 点击事件
+      this.currentTreeNode = evt;
+      this.pageData.deptId = this.currentTreeNode.id;
+      this.pageData.pageNum = 1;
+      this.findPage();
+      this.formData.deptId = [];
+      this.platform(treeId);
+      this.searchLeaderFun();
+    },
+    platform(array) {
+      if (!array.parent) {
+        return;
+      }
+      this.formData.deptId.unshift(array.data.id);
+      this.platform(array.parent);
+    },
+
+    // 右侧列表的方法Start
+    findPage(data) {
+      // 获取分页数据
+      if (data && data.pageRequest) {
+        this.pageData.pageNum = data.pageRequest.pageNum;
+        this.pageData.pageSize = data.pageRequest.pageSize;
+      }
+      if (this.isQueryStaff) {
+        this.pageData.pageNum = 1
+      }
+      this.isQueryStaff = false
+      let dto = {
+        deptId: this.pageData.deptId,
+        mobile: this.pageData.mobile,
+        name: this.pageData.realName,
+        userId: this.pageData.userId,
+        status: this.pageData.status,
+        leaderName: this.queryFrom.leaderId,
+        agentFlag: "3",
+        roleId: "72",
+      };
+      this.$api.user
+        .findUserList({
+          dto,
+          pageNum: this.pageData.pageNum,
+          pageSize: this.pageData.pageSize,
+        })
+        .then((res) => {
+          res.data.records.forEach((val) => {
+            if (val.sex && val.sex !== "" && val.sex !== null) {
+              val.sex = this.sexoptions.find(
+                (ele) => ele.value == val.sex
+              ).label;
+            }
+            if (val.status && val.status !== "" && val.status !== null) {
+              val.status = this.user_statusoptions.find(
+                (ele) => ele.value == val.status
+              ).label;
+            }
+            val.roleId = val.roleName;
+          });
+          let datas = {
+            content: res.data.records,
+            pageNum: res.data.current,
+            pageSize: res.data.size,
+            totalPages: res.data.pages,
+            totalSize: res.data.total,
+          };
+          this.pageResult = datas;
+        });
+    },
+    closeDialog() {
+      this.$refs["formData"].resetFields();
+      for (let key in this.formData) {
+        this.formData[key] = "";
+      }
+      this.dialogVisible = false;
+      this.activeName = '1'
+    },
+    // 下一步
+    nextStep(num) {
+      this.$refs.formData.validate((valid) => {
+        if (valid) {
+          this.activeName = num;
+        }
+      });
+    },
+    handleTableEdit1(params) {
+      this.dataForm = {
+        SFZ_01: "",
+        SFZ_02: "",
+        Z6Z_00: "",
+        LD_00: "",
+        YP_00: "",
+        DX_00: "",
+        LZ_01: "",
+      };
+      this.$api.user.getUserDatail(params.row.userId).then((res) => {
+        if (res.code == 200) {
+          this.formData = res.data.sysUser;
+          res.data.sysUser.status += "";
+          if (res.data.esmUserImageVo.length > 0) {
+            res.data.esmUserImageVo.forEach((item) => {
+              item.path = process.env.BASE_URL + item.path;
+              this.dataForm[item.type] = item.path;
+            });
+          }
+          this.formDataDetail = res.data.sysUserInfo
+            ? res.data.sysUserInfo
+            : {};
+        }
+      });
+      this.dialogTitle = "详情";
+      this.dialogVisible = true;
+    },
+    handleTableEdit(params) {
+      this.dataForm = {
+        SFZ_01: "",
+        SFZ_02: "",
+        Z6Z_00: "",
+        LD_00: "",
+        YP_00: "",
+        DX_00: "",
+      };
+      this.$api.user.getUserDatail(params.row.userId).then((res) => {
+        if (res.code == 200) {
+          res.data.sysUser.status += "";
+          this.formData = res.data.sysUser;
+          if (res.data.esmUserImageVo.length > 0) {
+            res.data.esmUserImageVo.forEach((item) => {
+              item.path = process.env.BASE_URL + item.path;
+              this.dataForm[item.type] = item.path;
+            });
+          }
+          this.formDataDetail = res.data.sysUserInfo
+            ? res.data.sysUserInfo
+            : {};
+        }
+        this.dialogTitle = "审核电销负责人";
+        this.dialogVisible = true;
+      });
+    },
+    //联级选择器触发事件
+    handleChange(val) {
+      if (val.length !== 0) {
+        this.formData.deptId = val.at(-1);
+      }
+    },
+    submitForm(type) {
+      if (type == 1) {
+        this.$api.user.getApprovalPass(this.formData.id).then((result) => {
+          if (result.code == 200 && result.data) {
+            this.$message({
+              message: "审核已通过",
+              type: "success",
+            });
+            this.findPage();
+            this.dialogVisible = false;
+          }
+        });
+      } else {
+        this.showRemark = true;
+        return;
+        if (!this.formDataDetail.remark) {
+          this.$message.error("请在详细信息填写驳回原因");
+          return;
+        }
+        this.$refs.formDataDetail.validate((valid) => {
+          if (valid) {
+            this.$api.user
+              .getApprovalNotPass({
+                userId: this.formData.id,
+                reason: this.formDataDetail.remark,
+              })
+              .then((result) => {
+                if (result.code == 200 && result.data) {
+                  this.$message({
+                    message: "审核已驳回",
+                    type: "success",
+                  });
+                  this.findPage();
+                  this.dialogVisible = false;
+                }
+              });
+          }
+        });
+      }
+    },
+  },
+};
+</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;
+}
+</style>
+
+<style lang="scss" scoped>
+
+>>> .el-tabs__item:hover {
+  // color: #2d4d89;
+}
+>>> .el-tabs__item.is-active {
+  color: #fff;
+  // background: #2d4d89;
+  transition: all ease 0.5s;
+}
+>>> .el-tabs__active-bar {
+  // background-color: #2d4d89;
+}
+>>> .el-tabs__item.is-top:nth-child(2) {
+  padding-left: 20px !important;
+}
+>>> .el-tabs--top .el-tabs__item.is-top:last-child {
+  padding-right: 20px !important;
+}
+
+.el-tabs {
+  >>> .el-input__inner:focus,
+  >>> .el-select .el-input.is-focus .el-input__inner {
+    border-color: #D42426;
+  }
+  .el-button--primary,
+  .el-button--primary:focus {
+    background-color: #D42426;
+    border-color: #D42426;
+  }
+}
+.select-prop {
+  .el-select-dropdown__item.selected,
+  .el-date-table td.available:hover {
+    color: #D42426;
+  }
+  .el-date-table td.current:not(.disabled) span {
+    background-color: #D42426;
+  }
+}
+</style>
+<style lang="scss" scoped>
+.people-style {
+  // max-height: 500px;
+  .footerHandle{
+    // border-radius: 6px;
+    border-top: 1px solid #f2f2f2;
+    margin-top: 0 !important;
+    .el-button{
+      width: 90px;
+      height: 36px;
+      font-size: 16px;
+      margin-left: 24px;
+      font-weight: 310;
+    }
+    .el-button--danger:focus, .el-button--danger:hover{
+      color: #fff;
+    }
+  }
+  .peopleImage{
+    padding: 0 !important;
+    margin: 0 0 0 6px !important;
+  }
+  .closeBtn{
+    background: #fff !important;
+  }
+  .el-col{
+    width: calc(33.3333% - 20px);
+    margin-right: 20px;
+  }
+  .personnelInformation{
+    padding: 0 !important;
+    margin: 0 0 0 20px !important;
+    max-height: 470px;
+    .el-form-item{
+      width: 100%;
+      margin-bottom: 20px;
+      margin-right: 0px;
+      >>>.el-form-item__label{
+        font-size: 14px;
+        line-height: 16px;
+        color: #262626;
+        padding-bottom: 10px;
+      }
+      >>>.el-input__inner{
+      padding-left: 10px !important;
+      font-size: 14px;
+      font-weight: 500;
+      color: #333;
+      font-family: PingFang SC, PingFang SC;
+      border: 1px solid #eee;
+      &::placeholder{
+        color: #999999;
+        font-weight: 300;
+      }
+    }
+    >>>.el-textarea__inner{
+      padding: 10px;
+      border: 1px solid #eeeeee;
+      font-weight: 500;
+      font-size: 14px;
+      color: #333;
+      font-family: PingFang SC, PingFang SC;
+      &::placeholder{
+        color: #999999;
+        font-weight: 300;
+      }
+    }
+    >>>.el-input.is-disabled{
+      .el-input__inner{
+        background: #fff;
+      }
+    }
+    >>>.el-form-item__error{
+      padding-top: 0;
+      margin-top: 8px;
+      font-size: 12px;
+      color: #D42426;
+      position: relative;
+    }
+    }
+  }
+  /deep/ .el-date-editor{
+    position: relative;
+      .el-input__prefix{
+        // color: #D42426;
+        // position: absolute;
+        // right: 5px;
+        // left: auto;
+        // display: none;
+        background-image: url('~@/assets/image/people/rili.svg'); /* 替换为你的新图标路径 */
+        background-size: cover; /* 覆盖整个元素 */
+        background-repeat: no-repeat; /* 不重复背景图片 */
+        height: 15px; /* 根据实际情况调整高度 */
+        width: 17px; /* 根据实际情况调整宽度 */
+        position: absolute;
+        right: 10px;
+        top: 9px;
+        left: auto;
+        .el-icon-date::before{
+          content: '';
+        }
+      }
+      .el-input__suffix{
+        position: absolute;
+        right: 25px;
+      }
+  }
+  /deep/ .el-dialog {
+    border-radius: 6px;
+    .el-dialog__header{
+      height: 50px;
+      line-height: 50px;
+      padding: 0;
+      text-align: center;
+      border-top-left-radius: 6px;
+      border-top-right-radius: 6px;
+      .el-dialog__title{
+        color: #333;
+        font-weight: 500;
+      }
+    }
+    .el-dialog__body{
+      background: #fff;
+      border-radius: 6px;
+    }
+  }
+  /deep/ .el-tabs{
+    .el-tabs__header{
+      padding: 20px 0;
+      margin-bottom: 0;
+      .el-tabs__nav{
+        background: #f7f7f7;
+        padding: 0 4px;
+        height: 44px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+      }
+      .el-tabs__item{
+        width: 120px;
+        height: 36px;
+        line-height: 36px;
+        text-align: center;
+        font-size: 16px;
+        background: #f7f7f7;
+        color: #333;
+        font-weight: 310;
+      }
+      .el-tabs__item.is-active{
+        background: #D42426;
+        color: #fff;
+        border-radius: 2px;
+      }
+      .el-tabs__active-bar{
+        display: none;
+      }
+      .el-tabs__nav{
+        left: 50%;
+        transform: translateX(-50%) !important;
+      }
+    }
+    .el-tabs__content{
+      border-radius: 6px;
+    }
+  }
+}
+</style>

+ 41 - 0
src/views/PeopleManage/Sales/SalesManage.vue

@@ -335,6 +335,36 @@
                 </el-form-item>
                 </el-form-item>
               </el-col>
               </el-col>
             </el-row>
             </el-row>
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="电销管理人" prop="managerName">
+                  <el-select
+                    style="width: 100%"
+                    clearable
+                    filterable
+                    v-model="formData.managerId"
+                    placeholder="请选择"
+                    popper-class="select-prop"
+                  >
+                    <el-option
+                      v-for="val in managerOptions"
+                      :label="val.name"
+                      :value="val.id"
+                      :key="val.id"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="电销管理工号" prop="managerId">
+                  <el-input v-model="formData.managerId" disabled
+                            style="width: 100%"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+              </el-col>
+            </el-row>
           </el-form>
           </el-form>
           <div class="footerHandle" style="text-align: right">
           <div class="footerHandle" style="text-align: right">
             <el-button
             <el-button
@@ -506,6 +536,7 @@ export default {
   mixins: [mixin],
   mixins: [mixin],
   data() {
   data() {
     return {
     return {
+      managerOptions:[], //电销管理集合
       logoutTime: "", // 离司 离职时间
       logoutTime: "", // 离司 离职时间
       logoutImg: "", // 离司 图片
       logoutImg: "", // 离司 图片
       logoutImgId: "",
       logoutImgId: "",
@@ -540,6 +571,7 @@ export default {
         name: [{required: true, message: "请填写名称", trigger: "blur"}],
         name: [{required: true, message: "请填写名称", trigger: "blur"}],
         // password: [{ required: true, message: "请填写密码", trigger: "blur" }],
         // password: [{ required: true, message: "请填写密码", trigger: "blur" }],
         status: [{required: true, message: "请选择状态", trigger: "change"}],
         status: [{required: true, message: "请选择状态", trigger: "change"}],
+        managerId: [{required: true, message: "请选择电销管理人", trigger: "change"}],
         // roleId: [{ required: true, message: "请填写角色", trigger: "blur" }],
         // roleId: [{ required: true, message: "请填写角色", trigger: "blur" }],
         // identity: [
         // identity: [
         //   { required: true, message: "请填写身份证号" },
         //   { required: true, message: "请填写身份证号" },
@@ -752,6 +784,10 @@ export default {
         .then((res) => {
         .then((res) => {
           this.searchLeaderOptions = res.data;
           this.searchLeaderOptions = res.data;
         });
         });
+        //添加电销负责人
+        this.$api.user.findDxUserList().then((res) => {
+        this.managerOptions = res.data;
+      }); 
     },
     },
     managementSourceFormatter(row) {
     managementSourceFormatter(row) {
       switch (row.managementSource) {
       switch (row.managementSource) {
@@ -1094,6 +1130,11 @@ export default {
                   (val) => val.id == this.formData.leaderId
                   (val) => val.id == this.formData.leaderId
                 ).name;
                 ).name;
               }
               }
+              if (this.formData.managerId) {
+                this.formData.managerName = this.managerOptions.find(
+                  (val) => val.id == this.formData.managerId
+                ).name;
+              }
               if (this.dialogTitle == "新增电销负责人") {
               if (this.dialogTitle == "新增电销负责人") {
                 this.$api.user
                 this.$api.user
                   .saveUserInfo({
                   .saveUserInfo({

+ 1482 - 0
src/views/PeopleManage/Sales/SalesManageGroup.vue

@@ -0,0 +1,1482 @@
+<template>
+  <div>
+    <el-main ref="elMain" style="padding: 0px">
+      <Split :gutterSize="2" style="height: calc(100vh - 120px)">
+        <!-- 左侧树Start -->
+        <SplitArea :size="leftSplitWidth" :minSize="240">
+          <div>
+            <div>
+              <kt-button
+                style="background-color: #ffc000; border: #ffc000"
+                icon="fa fa-plus"
+                label="添加人员"
+                type="primary"
+                perms="sys:team:add"
+                @click="handleAddButton"
+              />
+            </div>
+            <el-divider></el-divider>
+            <!-- 左侧树形结构 -->
+            <el-tree
+              :data="ztreeNodes"
+              :props="{ children: 'children', label: 'name' }"
+              node-key="id"
+              :default-expanded-keys="['9']"
+              @node-click="onZTreeClick"
+            ></el-tree>
+          </div>
+        </SplitArea>
+        <!-- 左侧树End -->
+
+        <!-- 右侧列表页面Start -->
+        <SplitArea :size="rightSplitWidth">
+          <!-- 筛选区域Start -->
+          <el-row class="queryFrom">
+            <el-form ref="queryFormRef" :model="pageData" label-width="80px">
+              <el-row>
+                <el-col :span="5">
+                  <el-form-item label="工号">
+                    <el-input
+                      clearable
+                      size="small"
+                      placeholder="工号"
+                      v-model="pageData.userId"
+                    ></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="5">
+                  <el-form-item label="姓名">
+                    <el-input
+                      clearable
+                      size="small"
+                      placeholder="姓名"
+                      v-model="pageData.name"
+                    ></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="5">
+                  <el-form-item label="手机号">
+                    <el-input
+                      clearable
+                      size="small"
+                      placeholder="手机号"
+                      v-model="pageData.mobile"
+                    ></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="5">
+                  <el-form-item label="状态">
+                    <el-select
+                      style="width: 200px"
+                      size="small"
+                      clearable
+                      v-model="pageData.status"
+                      placeholder="请选择"
+                    >
+                      <el-option
+                        v-for="val in user_statusoptions"
+                        :label="val.label"
+                        :value="val.value"
+                        :key="val.id"
+                      ></el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="5">
+                  <el-form-item label="领导人">
+                    <el-select
+                      size="small"
+                      style="width: 215px"
+                      clearable
+                      filterable
+                      v-model="pageData.leaderId"
+                      placeholder="请选择"
+                    >
+                      <el-option
+                        v-for="item in searchLeaderOptions"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.name"
+                      >
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="4">
+                  <el-form-item label="">
+                    <el-button
+                      size="small"
+                      type="primary"
+                      @click="queryStaffInfo"
+                    >查询
+                    </el-button
+                    >
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </el-row>
+
+          <kt-common-table
+            permsEdit="sys:team:edit"
+            :data="pageResult"
+            :operationWidth="250"
+            :columns="columns"
+            editButtonName="编辑"
+            :showBatchDelete="false"
+            @findPage="findPage"
+            @handleEdit="handleTableEdit"
+            :button7Name="'离司'"
+            :button7Status="'在职'"
+            @handleButton7="handleButton7"
+            :button9Name="'离司恢复'"
+            :button9Status="'离司'"
+            @handleButton9="handleRest"
+            :buttonDropdown="dropdownOption"
+          >
+          </kt-common-table>
+        </SplitArea>
+        <!-- 右侧列表页面End -->
+      </Split>
+    </el-main>
+
+    <!-- 新增修改界面 -->
+
+    <el-dialog
+      :title="dialogTitle"
+      width="60%"
+      top="5vh"
+      :visible.sync="dialogVisible"
+      :close-on-click-modal="false"
+      :before-close="handleDialogBefore"
+      :show-close="false"
+      @close="closeDialog"
+      v-dialogDrag
+      class="people-style"
+    >
+      <el-tabs v-model="activeName" :before-leave="beforeTabLeave" class="tab-style">
+        <el-tab-pane label="基本信息" name="1">
+          <el-form
+            :model="formData"
+            :rules="formDataRules"
+            ref="formData"
+            :inline="true"
+            @keyup.enter.native="nextStep()"
+            label-width="110px"
+            size="small"
+            label-position="top"
+            class="personnelInformation"
+          >
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="机构名称">
+                  <el-cascader
+                    style="width: 100%"
+                    :options="ztreeNodes"
+                    v-model="formData.pdeptId"
+                    clearable
+                    disabled
+                    :show-all-levels="false"
+                    :props="{
+                      value: 'id',
+                      label: 'name',
+                      checkStrictly: true,
+                    }"
+                    @change="handleChange"
+                  >
+                  </el-cascader>
+                </el-form-item
+                >
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="机构部门" prop="deptId">
+                  <el-cascader
+                    style="width: 100%"
+                    :options="ztreeNodes"
+                    v-model="formData.deptId"
+                    clearable
+                    disabled
+                    :show-all-levels="false"
+                    :props="{
+                      value: 'id',
+                      label: 'name',
+                      checkStrictly: true,
+                    }"
+                    @change="handleChange"
+                  >
+                  </el-cascader>
+                </el-form-item
+                >
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="岗位" prop="positionId">
+                  <el-select
+                    style="width: 100%"
+                    v-model="formData.positionId"
+                    placeholder="请选择"
+                    popper-class="select-prop"
+                  >
+                    <el-option
+                      v-for="val in postOption"
+                      :label="val.postName"
+                      :value="val.postId"
+                      :key="val.postId"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="工号" prop="id">
+                  <el-input v-model="formData.id" disabled
+                            style="width: 100%"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="姓名" prop="name">
+                  <el-input v-model="formData.name"
+                            style="width: 100%"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="手机号" prop="mobile">
+                  <el-input v-model="formData.mobile"
+                            style="width: 100%"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="入司时间">
+                  <el-date-picker
+                    style="width: 100%"
+                    v-model="formDataDetail.entryTime"
+                    type="date"
+                    value-format="yyyy-MM-dd"
+                    placeholder="选择日期"
+                    popper-class="select-prop"
+                  >
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="状态" prop="status">
+                  <el-select
+                    disabled
+                    style="width: 100%"
+                    @change="statusChange"
+                    v-model="formData.status"
+                    placeholder="请选择"
+                  >
+                    <el-option
+                      v-for="val in user_statusoptions"
+                      :label="val.label"
+                      :value="val.value"
+                      :key="val.id"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="角色" prop="roleId">
+                  <el-select
+                    style="width: 100%"
+                    v-model="formData.roleId"
+                    placeholder="请选择"
+                    disabled
+                  >
+                    <el-option
+                      v-for="val in roles"
+                      :label="val.name"
+                      :value="val.id + ''"
+                      :key="val.id"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="管理人" prop="leaderId">
+                  <el-select
+                    style="width: 100%"
+                    clearable
+                    filterable
+                    v-model="formData.leaderId"
+                    placeholder="请选择"
+                    popper-class="select-prop"
+                  >
+                    <el-option
+                      v-for="val in leaderOptions"
+                      :label="val.name"
+                      :value="val.id"
+                      :key="val.id"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="管理人工号" prop="leaderName">
+                  <el-input v-model="formData.leaderId" disabled
+                            style="width: 100%"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="代理人资格证号" prop="agentQualificationCode">
+                  <el-input
+                    style="width: 100%"
+                    v-model="formDataDetail.agentQualificationCode"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="电销管理人" prop="managerName">
+                  <el-select
+                    style="width: 100%"
+                    clearable
+                    filterable
+                    v-model="formData.managerId"
+                    placeholder="请选择"
+                    popper-class="select-prop"
+                  >
+                    <el-option
+                      v-for="val in managerOptions"
+                      :label="val.name"
+                      :value="val.id"
+                      :key="val.id"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="电销管理工号" prop="managerId">
+                  <el-input v-model="formData.managerId" disabled
+                            style="width: 100%"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+              </el-col>
+            </el-row>
+          </el-form>
+          <div class="footerHandle" style="text-align: right">
+            <el-button
+              size="small"
+              type="primary"
+              style="
+                border: 1px solid #D42426;
+                color: #D42426;
+              "
+              class="closeBtn"
+              @click="closeDialog"
+              >取消</el-button
+            >
+            <el-button size="small" type="primary" @click="nextStep"
+            >下一步
+            </el-button
+            >
+          </div>
+        </el-tab-pane>
+        <el-tab-pane label="详细信息" name="2">
+          <userDetail
+            :formData="formData"
+            :formDataDetail="formDataDetail"
+            ref="formDataDetails"
+            @statusChange="statusChange"
+            @valids="valids"
+            :showThirdParty="true"
+          ></userDetail>
+          <div class="footerHandle" style="text-align: right">
+            <el-button
+              size="small"
+              type="primary"
+              style="
+                border: 1px solid #D42426;
+                color: #D42426;
+              "
+              class="closeBtn"
+              @click="closeDialog"
+              >取消</el-button
+            >
+            <!-- <el-button size="small" type="primary" @click="activeName = '1'"
+            >上一步
+            </el-button
+            > -->
+            <el-button size="small" type="primary" @click="activeName = '3'"
+            >下一步
+            </el-button
+            >
+          </div>
+          <!-- <div style="text-align: right">
+            <el-button
+              size="small"
+              type="primary"
+              style="background-color: #EAEDF1; border: 1px solid #EAEDF1; color: #2D4D89;"
+              @click="closeDialog"
+              >取消</el-button
+            >
+            <el-button size="small" type="primary" @click="activeName = '1'"
+              >上一步</el-button
+            >
+            <el-button size="small" type="primary" @click="submitForm"
+              >提交</el-button
+            >
+          </div> -->
+        </el-tab-pane>
+        <el-tab-pane label="影像资料" name="3">
+          <el-form
+            :model="formDataDetail"
+            ref="formDataDetail"
+            :inline="true"
+            label-width="130px"
+            size="small"
+            class="peopleImage"
+          >
+            <peopleImage
+              :dataForm="dataForm"
+              :imagesIdList="imagesIdList"
+              :dialogVisible="dialogVisible"
+            ></peopleImage>
+          </el-form>
+          <div class="footerHandle" style="text-align: right">
+            <el-button
+              size="small"
+              type="primary"
+              style="
+                border: 1px solid #D42426;
+                color: #D42426;
+              "
+              class="closeBtn"
+              @click="closeDialog"
+              >取消</el-button
+            >
+            <!-- <el-button size="small" type="primary" @click="activeName = '2'"
+            >上一步
+            </el-button
+            > -->
+            <el-button size="small" type="primary" @click="submitForm"
+            >提交
+            </el-button
+            >
+          </div>
+        </el-tab-pane>
+      </el-tabs>
+    </el-dialog>
+
+    <el-dialog
+      title="离司"
+      width="40%"
+      :visible.sync="showOut"
+      @close="closeDialogOut"
+    >
+      <div>
+        <el-form>
+          <el-form-item label="离职时间" prop="logoutTime">
+            <el-date-picker
+              value-format="yyyy-MM-dd"
+              style="width: 200px"
+              v-model="logoutTime"
+              type="date"
+              placeholder="选择日期"
+            ></el-date-picker>
+          </el-form-item>
+          <el-form-item label="离职表:" style="width: 50%">
+            <el-upload
+              class="avatar-uploader"
+              action=""
+              name="LZ_01"
+              :show-file-list="false"
+              :http-request="httpRequest"
+              :before-upload="beforeAvatarUpload"
+            >
+              <img v-if="logoutImg" :src="logoutImg" class="avatar"/>
+              <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+            </el-upload>
+          </el-form-item>
+        </el-form>
+      </div>
+      <span slot="footer">
+        <el-button type="primary" @click="handleSubOut">确定</el-button>
+        <el-button @click="closeDialogOut">取消</el-button>
+      </span>
+    </el-dialog>
+    <personnelHistory ref="personnelHistory" ></personnelHistory>
+  </div>
+</template>
+
+<script>
+import KtButton from "@/views/Core/KtButton"; // 按钮权限组件
+import tree from "@/components/ztree.vue"; // 机构树组件
+import KtCommonTable from "@/views/Core/KtCommonTable.vue"; //表格组件
+import peopleImage from "@/components/PeopleImage/index.vue"; //影像组件
+import {validateSfz} from "../../../utils/validate.js";
+import userDetail from "@/components/UserDetail/index.vue"; // 详情信息
+import personnelHistory from "@/components/PersonnelHistory/index.vue"; //人员修改历史
+import mixa from "../mixin";
+
+const mixin = new mixa({
+  treeTypeNum: 3, //树分类过滤参数
+});
+export default {
+  components: {
+    KtButton,
+    tree,
+    KtCommonTable,
+    userDetail,
+    peopleImage,
+    personnelHistory
+  },
+  mixins: [mixin],
+  data() {
+    return {
+      managerOptions:[], //电销管理集合
+      logoutTime: "", // 离司 离职时间
+      logoutImg: "", // 离司 图片
+      logoutImgId: "",
+      lineId: "",
+      leaderOptions: [],
+      searchLeaderOptions: {},
+      activeName: "1",
+      isShow: true,
+      pageData: {
+        pageNum: 1,
+        pageSize: 20,
+        deptId: JSON.parse(localStorage.getItem("user_data")).deptId,
+        userId: "",
+        realName: "",
+        mobile: "",
+      },
+      formData: {
+        roleId: "72",
+      },
+      formDataRules: {
+        deptId: [{required: true, message: "请选择机构", trigger: "change"}],
+        mobile: [
+          {required: true, message: "请输入手机号", trigger: "blur"},
+          {min: 11, max: 11, message: "请输入11位手机号码", trigger: "blur"},
+          {
+            pattern:
+              /^(13[0-9]|14[579]|15[0-3,5-9]|16[6]|17[0135678]|18[0-9]|19[89])\d{8}$/,
+            message: "请输入正确的手机号",
+            trigger: "blur",
+          },
+        ],
+        name: [{required: true, message: "请填写名称", trigger: "blur"}],
+        // password: [{ required: true, message: "请填写密码", trigger: "blur" }],
+        status: [{required: true, message: "请选择状态", trigger: "change"}],
+        managerId: [{required: true, message: "请选择电销管理人", trigger: "change"}],
+        // roleId: [{ required: true, message: "请填写角色", trigger: "blur" }],
+        // identity: [
+        //   { required: true, message: "请填写身份证号" },
+        //   { validator: validateSfz },
+        // ],
+      },
+      formDataDetail: {},
+      formDataRulesDetail: {},
+      filterObject: {},
+      peopleid: "",
+      peopledeptid: "",
+      recommenderList: [],
+      teamleadername: "",
+      teamleaderid: "",
+      // 右侧列表查询数据Start
+      queryFrom: {},
+      pageResult: {},
+      columns: [
+        // 数据列
+        {prop: "deptId", label: "部门编码", minWidth: 80, sortable: false},
+        {
+          prop: "pdeptName",
+          label: "机构名称",
+          minWidth: 120,
+          sortable: false,
+        },
+
+        {prop: "deptName", label: "部门名称", minWidth: 80, sortable: false},
+
+        {prop: "userId", label: "工号", minWidth: 80, sortable: false},
+        {prop: "name", label: "姓名", minWidth: 120, sortable: false},
+        {
+          prop: "sex",
+          label: "性别",
+          minWidth: 80,
+          sortable: false,
+          isSex: true
+        },
+        {prop: "mobile", label: "联系电话", minWidth: 100, sortable: false},
+        {
+          prop: "roleId",
+          label: "角色",
+          minWidth: 80,
+          sortable: false,
+        },
+        {
+          prop: "managementSource",
+          label: "来源",
+          minWidth: 80,
+          formatter: this.managementSourceFormatter,
+        },
+        {
+          prop: "submitTime",
+          label: "提交时间",
+          type: "text",
+          minWidth: 100,
+        },
+        {
+          prop: "approveTime",
+          label: "审核时间",
+          type: "text",
+          minWidth: 100,
+        },
+        {
+          prop: "approveBy",
+          label: "审核人",
+          type: "text",
+          minWidth: 100,
+        },
+        {
+          prop: "status",
+          label: "状态",
+          minWidth: 120,
+          sortable: false,
+          isStatus: true
+        },
+      ],
+      dialogTitle: "",
+      dialogVisible: false, // 新增编辑界面是否显示
+      departmentList: [], // 选中公司的所有部门的集合
+      deptInfo: {}, //选中机构的基本信息
+      option: [], //机构列表
+      dialogPassword: false, //密码是否明文
+      showOut: false,
+      //影像资料
+      dataForm: {
+        SFZ_01: "",
+        SFZ_02: "",
+        Z6Z_00: "",
+        LD_00: "",
+        YP_00: "",
+        DX_00: "",
+        LZ_01: "",
+      },
+      //影像上传列表
+      imagesIdList: [],
+      pdeptId: null,
+      dropdownOption:[
+        {
+          label:'人员轨迹',
+          click:(row)=>this.checkHistory(row)
+        }
+      ],
+    };
+  },
+  created() {
+    this.searchLeaderFun();
+    this.getDictItems("user_status");
+
+  },
+  methods: {
+    // 离司恢复
+    handleRest(data) {
+      this.$confirm('是否恢复', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.$api.user.separationReinstatement(data.row.userId).then((res) => {
+          if (res.code == 200) {
+            this.$message({
+              type: 'success',
+              message: res.msg
+            });
+            this.findPage();
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消'
+        });
+      });
+    },
+    //上传影像
+    httpRequest(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.logoutImg = base64Str;
+      };
+      const params = new FormData(); // 声明formData数据类型
+      params.append("multipartFile", file);
+      params.append("type", "personnel");
+      this.$api.letter.uploadFile(params).then((res) => {
+        if (res.code == "200") {
+          this.logoutImgId = res.data.id;
+        }
+      });
+    },
+    // 上传图片的方法Start
+    beforeAvatarUpload(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;
+    },
+    handleSubOut() {
+      if (this.logoutTime == "") {
+        this.$message.error("请选择时间");
+        return;
+      }
+      if (this.logoutImgId == "") {
+        this.$message.error("请上传离职表");
+        return;
+      }
+      let subData = {
+        esmUserImageVo: [
+          {
+            imageId: this.logoutImgId,
+            type: "LZ_01",
+          },
+        ],
+        sysUser: {id: this.lineId, logoutTime: this.logoutTime},
+        sysUserInfo: {},
+      };
+      this.$api.user.departApply(subData).then((res) => {
+        if (res.code == 200) {
+          this.$message.success(res.msg);
+          this.findPage();
+          this.closeDialogOut();
+        } else {
+          this.$message.error(res.msg);
+        }
+      });
+    },
+    closeDialogOut() {
+      this.showOut = false;
+    },
+    handleButton7(data) {
+      this.lineId = data.row.userId;
+      this.showOut = true;
+    },
+    searchLeaderFun() {
+      this.$api.user.findHxUserList().then((res) => {
+        this.leaderOptions = res.data;
+      });
+      this.$api.user
+        .findBackListByDeptId({deptId: this.deptId})
+        .then((res) => {
+          this.searchLeaderOptions = res.data;
+        });
+        //添加电销负责人
+        this.$api.user.findDxUserList().then((res) => {
+        this.managerOptions = res.data;
+      }); 
+    },
+    managementSourceFormatter(row) {
+      switch (row.managementSource) {
+        case "1":
+          return "渠道";
+        case "2":
+          return "个代"
+        case "3":
+          return "电销"
+      }
+    },
+    //状态改变时
+    statusChange(e) {
+      if (e == 0) {
+        this.$set(this.formDataRules, "logoutTime", [
+          {required: true, message: "请选择日期", trigger: "change"},
+        ]);
+      } else {
+        this.formDataRules.logoutTime = undefined;
+      }
+    },
+    // 查询Start
+    queryStaffInfo() {
+      this.pageData.pageNum = 1
+      this.findPage();
+    },
+    sexFormatter(row) {
+      // return this.sexoptions[row.sex]
+      // return row.sex+'1'
+      // console.log(val,1)
+    },
+    onZTreeClick: function (evt, treeId, treeNode) {
+      // 点击事件
+      this.currentTreeNode = evt;
+      this.deptId = this.currentTreeNode.id;
+      this.pdeptId = this.currentTreeNode.parentId;
+      this.pageData.pageNum = 1;
+      this.findPage();
+      this.searchLeaderFun();
+      // this.formData.deptId = [];
+      // this.platform(treeId);
+    },
+    //联级选择器触发事件
+    handleChange(val) {
+      if (val && val.length !== 0) {
+        this.formData.leaderId = "";
+        this.formData.deptId = val.at(-1);
+        // console.log( this.formData.deptId,val,222222222);
+        this.$api.user
+          .findListByDeptId({deptId: this.formData.deptId})
+          .then((res) => {
+            this.leaderOptions = res.data;
+          });
+      }
+    },
+    isShowFun() {
+      this.isShow = !this.isShow;
+    },
+    identityChange(iden) {
+      let sex = null;
+      let birth = null;
+      let myDate = new Date();
+      let month = myDate.getMonth() + 1;
+      let day = myDate.getDate();
+      sex = iden.substring(16, 17);
+      birth =
+        iden.substring(6, 10) +
+        "-" +
+        iden.substring(10, 12) +
+        "-" +
+        iden.substring(12, 14);
+      let age = 0;
+      if (
+        iden.substring(10, 12) < month ||
+        (iden.substring(10, 12) == month && iden.substring(12, 14) <= day)
+      )
+        age++;
+      if (sex % 2 === 0) sex = "女";
+      else sex = "男";
+      this.formDataDetail.birthday = birth;
+      this.formDataDetail.sex = this.sexoptions.find(
+        (val) => sex == val.label
+      ).value;
+    },
+    // 右侧列表的方法Start
+    findPage(data) {
+      // 获取分页数据
+      if (data && data.pageRequest) {
+        this.pageData.pageNum = data.pageRequest.pageNum;
+        this.pageData.pageSize = data.pageRequest.pageSize;
+      }
+      let dto = {
+        deptId: this.deptId,
+        mobile: this.pageData.mobile,
+        name: this.pageData.name,
+        userId: this.pageData.userId,
+        status: this.pageData.status,
+        leaderName: this.pageData.leaderId,
+        roleId: "72",
+        agentFlag: "3",
+      };
+      this.$api.user
+        .findUserList({
+          dto,
+          pageNum: this.pageData.pageNum,
+          pageSize: this.pageData.pageSize,
+        })
+        .then((res) => {
+          res.data.records.forEach((val) => {
+            if (val.sex && val.sex !== "" && val.sex !== null) {
+              val.sex = this.sexoptions.find(
+                (ele) => ele.value == val.sex
+              ).label;
+            }
+            if (val.status && val.status !== "" && val.status !== null) {
+              val.status = this.user_statusoptions.find(
+                (ele) => ele.value == val.status
+              ).label;
+            }
+            val.roleId = val.roleName;
+          });
+          this.pageResult = {
+            content: res.data.records,
+            pageNum: res.data.current,
+            pageSize: res.data.size,
+            totalPages: res.data.pages,
+            totalSize: res.data.total,
+          };
+          this.pageData.pageNum = res.data.current;
+          this.pageData.pageSize = res.data.size;
+          this.pageData.totalSize = res.data.total;
+        });
+    },
+    beforeTabLeave() {
+      // let p = new Promise((resolve, reject) => {
+      //   this.$refs.formData.validate(async (valid) => {
+      //     valid ? resolve() : reject();
+      //     if (valid !== resolve()) {
+      //       // this.$message.error("请完善基本信息!");
+      //     }
+      //   });
+      // });
+      // return p;
+    },
+    // 下一步
+    nextStep() {
+      this.$refs.formData.validate((valid) => {
+        if (valid) {
+          this.activeName = "2";
+          // this.formData.deptIdCom= this.formData.deptId
+          // this.formData.deptId =  this.formData.deptId.at(-1);
+          // if (this.formData.referrerId) {
+          //   this.formData.referrerName = this.recommenderOptions.find(val => this.formData.referrerId == val.id).name
+          // }
+          // this.$api.user.saveOrUpdate(this.formData).then((res) => {
+          //   if (res.code == 200) {
+          //   this.activeName='2'
+          //   this.basicInformation=res.data
+          //   } else {
+          //     this.$message({
+          //       message: `操作失败,请重新添加,(${res.msg})`,
+          //       type: "error",
+          //     });
+          //   }
+          // });
+        }
+      });
+    },
+    async handleTableEdit(params) {
+      this.dataForm = {
+        SFZ_01: "",
+        SFZ_02: "",
+        Z6Z_00: "",
+        LD_00: "",
+        YP_00: "",
+        DX_00: "",
+        LZ_01: "",
+      };
+      this.imagesIdList = [];
+
+      this.activeName = "1";
+      let res = await this.$api.user.getUserDatail(params.row.userId);
+      if (res.code == 200) {
+        // this.$api.user
+        //   // .findListByDeptId({ deptId: res.data.sysUser.deptId, id: params.row.userId })
+        //   .findBackUserList1({ agentFlag: 0 })
+        //   .then((res) => {
+        //     this.leaderOptions = res.data;
+        //   });
+        res.data.sysUser.status += "";
+        this.formData = res.data.sysUser;
+        if (this.formData.status == 0) {
+          this.$set(this.formDataRules, "logoutTime", [
+            {required: true, message: "请选择日期", trigger: "change"},
+          ]);
+        } else {
+          this.formDataRules.logoutTime = undefined;
+        }
+        if (res.data.esmUserImageVo.length > 0) {
+          this.imagesIdList = res.data.esmUserImageVo.map((item) => {
+            item.path = process.env.BASE_URL + item.path;
+            this.dataForm[item.type] = item.path;
+            return {
+              imageId: item.imageId,
+              type: item.type,
+            };
+          });
+        }
+        this.formDataDetail = res.data.sysUserInfo ? res.data.sysUserInfo : {};
+        this.dialogTitle = "编辑电销负责人";
+        this.dialogVisible = true;
+        this.dialogPassword = false;
+        this.formData.referrerId = "";
+        this.formData.referrerName = "";
+      } else {
+        this.$message.error(res.msg);
+      }
+    },
+    // 删除单个人员
+    handleTableDeleteFlag(data) {
+      this.$confirm("确认删除?")
+        .then(() => {
+          this.$api.user.getDeleteBatch([data.row.userId]).then((res) => {
+            if (res.code == 200) {
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.findPage();
+            }
+          });
+        })
+        .catch(() => {
+        });
+    },
+    //添加人员
+    handleAddButton() {
+      if (this.currentTreeNode == null) {
+        this.$message.info("请选择所属公司或部门");
+        return;
+      }
+      if (
+        this.currentTreeNode.comlevel != null ||
+        this.currentTreeNode.managementSource != 3
+      ) {
+        //团队代理人managementSource为2  渠道为1  后线为空
+        this.$message.info("请选择第六级机构");
+        return;
+      }
+
+      // let deptId=''
+      // if(this.formData.deptId){
+      //    deptId = this.formData.deptId.at(-1);
+      // }
+      this.formData = {
+        roleId: "72",
+        status: "2",
+        deptId: this.deptId,
+        pdeptId: this.pdeptId
+      };
+      this.formDataDetail = {};
+      this.activeName = "1";
+      this.dialogTitle = "新增电销负责人";
+      this.dialogVisible = true;
+      this.dialogPassword = true;
+      // this.$api.user.findListByDeptId({ deptId: this.deptId }).then((res) => {
+      //   this.leaderOptions = res.data.map((val) => {
+      //     return {
+      //       userId: val.id,
+      //       name: val.name,
+      //     };
+      //   });
+      // });
+    },
+    // 新增或修改的弹出框Start
+    getDictItems(typeName) {
+      //--数据字典--
+      this.$api.dict
+        .findByLableName(typeName)
+        .then((response) => {
+          this[typeName + "options"] = response.data; // 把获取到的数据赋给this.data
+        })
+        .catch((error) => {
+          this[typeName + "options"] = [];
+        });
+    },
+    handleDialogBefore(done) {
+      // 退出对话框之前确认提示
+      var that = this;
+      this.$confirm("确认关闭?")
+        .then((_) => {
+          done();
+        })
+        .catch((_) => {
+        });
+    },
+    closeDialog() {
+      // 清空数据
+      this.deptInfo = {};
+      // this.$refs["formData"].resetFields();
+      // for (let key in this.formData) {
+      //   this.formData[key] = "";
+      // }
+      // this.formData={
+      //   roleId:'21',
+      //   id:'',
+      //   mobile:'',
+      //   email:'',
+      //   name:'',
+      //   password:'',
+      //   sex:'',
+      //   status:''
+      // }
+      this.dialogVisible = false;
+    },
+    valids(data) {
+      this.detailValid = data
+    },
+    // 提交
+    submitForm() {
+      this.$refs.formDataDetails.submit()
+      setTimeout(() => {
+        this.$refs.formData.validate((valid) => {
+          if (valid && this.detailValid) {
+            this.$confirm("确认提交吗?", "提示", {}).then(() => {
+              // if(!this.basicInformation.id && this.dialogTitle =="新增代理人"){
+              //   this.$message({
+              //     message: '请先填写基本信息!!!',
+              //     type: 'warning'
+              //   });
+              //   return false
+              // }
+              if (this.formData.positionId) {
+                this.formData.positionName = this.postOption.find(
+                  (val) => val.postId == this.formData.positionId
+                ).postName;
+              }
+              if (this.formData.leaderId) {
+                this.formData.leaderName = this.leaderOptions.find(
+                  (val) => val.id == this.formData.leaderId
+                ).name;
+              }
+              if (this.formData.managerId) {
+                this.formData.managerName = this.managerOptions.find(
+                  (val) => val.id == this.formData.managerId
+                ).name;
+              }
+              if (this.dialogTitle == "新增电销负责人") {
+                this.$api.user
+                  .saveUserInfo({
+                    esmUserImageVo: this.imagesIdList,
+                    sysUser: this.formData,
+                    sysUserInfo: this.formDataDetail,
+                  })
+                  .then((res) => {
+                    if (res.code == 200) {
+                      this.$message({
+                        message: "保存成功",
+                        type: "success",
+                      });
+                      this.dialogVisible = false;
+                      this.$refs["formData"].resetFields();
+                      this.$refs["formDataDetail"].resetFields();
+                      this.findPage();
+                    } else {
+                      this.$message({
+                        message: `保存失败,请重新添加,(${res.msg})`,
+                        type: "error",
+                      });
+                    }
+                  });
+              } else {
+                this.$api.user
+                  .updateUserInfo(this.formData.id, {
+                    esmUserImageVo: this.imagesIdList,
+                    sysUser: this.formData,
+                    sysUserInfo: this.formDataDetail,
+                  })
+                  .then((res) => {
+                    if (res.code == 200) {
+                      this.$message({
+                        message: "编辑成功",
+                        type: "success",
+                      });
+                      this.dialogVisible = false;
+                      this.$refs["formData"].resetFields();
+                      this.$refs["formDataDetail"].resetFields();
+                      this.findPage();
+                    } else {
+                      this.$message({
+                        message: `编辑失败,请重新添加,(${res.msg})`,
+                        type: "error",
+                      });
+                    }
+                  });
+              }
+            });
+          } else {
+            this.$message.error('请填写全部信息')
+          }
+        });
+      }, 200);
+    },
+    //查看人员修改记录
+    async checkHistory(row){
+      let userId = row.userId;
+      this.$refs.personnelHistory.getHistory(userId);
+    }
+  },
+};
+</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;
+}
+
+.disc {
+  -webkit-text-security: disc;
+  position: relative;
+}
+
+.none {
+  -webkit-text-security: none;
+  position: relative;
+}
+
+.icon {
+  color: #ccc;
+  position: absolute;
+  right: 0;
+  top: 10px;
+  text-align: center;
+}
+
+.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;
+}
+</style>
+
+<style lang="scss" scoped>
+>>> .el-tabs__item:hover {
+  // color: #2d4d89;
+}
+
+>>> .el-tabs__item.is-active {
+  color: #fff;
+  // background: #2d4d89;
+  transition: all ease 0.5s;
+}
+
+>>> .el-tabs__active-bar {
+  // background-color: #2d4d89;
+}
+
+>>> .el-tabs__item.is-top:nth-child(2) {
+  padding-left: 20px !important;
+}
+
+>>> .el-tabs--top .el-tabs__item.is-top:last-child {
+  padding-right: 20px !important;
+}
+
+.el-tabs {
+  >>> .el-input__inner:focus,
+  >>> .el-select .el-input.is-focus .el-input__inner {
+    border-color: #D42426;
+  }
+
+  .el-button--primary,
+  .el-button--primary:focus {
+    background-color: #D42426;
+    border-color: #D42426;
+  }
+}
+
+.select-prop {
+  .el-select-dropdown__item.selected,
+  .el-date-table td.available:hover {
+    color: #D42426;
+  }
+
+  .el-date-table td.current:not(.disabled) span {
+    background-color: #D42426;
+  }
+}
+</style>
+
+<style lang="scss" scoped>
+.people-style {
+  // max-height: 500px;
+  .footerHandle{
+    // border-radius: 6px;
+    border-top: 1px solid #f2f2f2;
+    margin-top: 0 !important;
+    .el-button{
+      width: 90px;
+      height: 36px;
+      font-size: 16px;
+      margin-left: 24px;
+      font-weight: 310;
+    }
+  }
+  .peopleImage{
+    padding: 0 !important;
+    margin: 0 0 0 6px !important;
+  }
+  .closeBtn{
+    background: #fff !important;
+  }
+  .el-col{
+    width: calc(33.3333% - 20px);
+    margin-right: 20px;
+  }
+  .personnelInformation{
+    padding: 0 !important;
+    margin: 0 0 0 20px !important;
+    max-height: 470px;
+    .el-form-item{
+      width: 100%;
+      margin-bottom: 20px;
+      margin-right: 0px;
+      >>>.el-form-item__label{
+        font-size: 14px;
+        line-height: 16px;
+        color: #262626;
+        padding-bottom: 10px;
+      }
+      >>>.el-input__inner{
+      padding-left: 10px !important;
+      font-size: 14px;
+      font-weight: 500;
+      color: #333;
+      font-family: PingFang SC, PingFang SC;
+      border: 1px solid #eee;
+      &::placeholder{
+        color: #999999;
+        font-weight: 300;
+      }
+    }
+    >>>.el-textarea__inner{
+      padding: 10px;
+      border: 1px solid #eeeeee;
+      font-weight: 500;
+      font-size: 14px;
+      color: #333;
+      font-family: PingFang SC, PingFang SC;
+      &::placeholder{
+        color: #999999;
+        font-weight: 300;
+      }
+    }
+    >>>.el-input.is-disabled{
+      .el-input__inner{
+        background: #fff;
+      }
+    }
+    >>>.el-form-item__error{
+      padding-top: 0;
+      margin-top: 8px;
+      font-size: 12px;
+      color: #D42426;
+      position: relative;
+    }
+    }
+  }
+  /deep/ .el-date-editor{
+    position: relative;
+      .el-input__prefix{
+        // color: #D42426;
+        // position: absolute;
+        // right: 5px;
+        // left: auto;
+        // display: none;
+        background-image: url('~@/assets/image/people/rili.svg'); /* 替换为你的新图标路径 */
+        background-size: cover; /* 覆盖整个元素 */
+        background-repeat: no-repeat; /* 不重复背景图片 */
+        height: 15px; /* 根据实际情况调整高度 */
+        width: 17px; /* 根据实际情况调整宽度 */
+        position: absolute;
+        right: 10px;
+        top: 9px;
+        left: auto;
+        .el-icon-date::before{
+          content: '';
+        }
+      }
+      .el-input__suffix{
+        position: absolute;
+        right: 25px;
+      }
+  }
+  /deep/ .el-dialog {
+    border-radius: 6px;
+    .el-dialog__header{
+      height: 50px;
+      line-height: 50px;
+      padding: 0;
+      text-align: center;
+      border-top-left-radius: 6px;
+      border-top-right-radius: 6px;
+      .el-dialog__title{
+        color: #333;
+        font-weight: 500;
+      }
+    }
+    .el-dialog__body{
+      background: #fff;
+      border-radius: 6px;
+    }
+  }
+  /deep/ .el-tabs{
+    .el-tabs__header{
+      padding: 20px 0;
+      margin-bottom: 0;
+      .el-tabs__nav{
+        background: #f7f7f7;
+        padding: 0 4px;
+        height: 44px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+      }
+      .el-tabs__item{
+        width: 120px;
+        height: 36px;
+        line-height: 36px;
+        text-align: center;
+        font-size: 16px;
+        background: #f7f7f7;
+        color: #333;
+        font-weight: 310;
+      }
+      .el-tabs__item.is-active{
+        background: #D42426;
+        color: #fff;
+        border-radius: 2px;
+      }
+      .el-tabs__active-bar{
+        display: none;
+      }
+      .el-tabs__nav{
+        left: 50%;
+        transform: translateX(-50%) !important;
+      }
+    }
+    .el-tabs__content{
+      border-radius: 6px;
+    }
+  }
+}
+</style>

+ 1 - 1
src/views/Task/DaikeLetter.vue

@@ -278,7 +278,7 @@ export default {
     left: 50%;
     left: 50%;
     transform: translateX(-50%);
     transform: translateX(-50%);
     bottom: 20px;
     bottom: 20px;
-    height: 60px;
+    height: 60px !important;
     margin: 0;
     margin: 0;
     padding: 0 20px;
     padding: 0 20px;
     display: flex;
     display: flex;