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

src/views/PeopleManage/Agent/AgentExamine.vue

@@ -705,6 +705,7 @@ export default {
     queryStaffInfo() {
       this.pageData.realName = this.queryFrom.name;
       this.pageData.mobile = this.queryFrom.mobile;
+      this.pageData.userId = this.queryFrom.userId;
       this.findPage();
     },
     changeTreeWidth(widthVal) {
@@ -866,6 +867,10 @@ export default {
           }
         });
       } else {
+        if(!this.formDataDetail.remark){
+          this.$message.error('请在详细信息填写驳回原因')
+          return
+        }
         this.$refs.formDataDetail.validate((valid) => {
           if (valid) {
             this.$api.user

src/views/PeopleManage/Player/PlayerExamine.vue

@@ -0,0 +1,594 @@
+<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>
+            </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
+                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="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:edit"
+              :data="pageResult"
+              :columns="columns"
+              :button1Name="'审核'"
+              :showBatchDelete="false"
+              @findPage="findPage"
+              @handleButton1="handleTableEdit"
+            ></kt-common-table>
+          </SplitArea>
+          <!-- 右侧列表页面End -->
+        </Split>
+      </el-main>
+  
+      <el-dialog
+        :title="dialogTitle"
+        width="60%"
+        :visible.sync="dialogVisible"
+        :close-on-click-modal="false"
+        :before-close="handleDialogBefore"
+        @close="closeDialog"
+        v-dialogDrag
+      >
+        <el-tabs v-model="activeName">
+          <el-tab-pane label="基本信息" name="1">
+            <el-form
+              :model="formData"
+              ref="formData"
+              :rules="formDataRules"
+              :inline="true"
+              label-width="130px"
+              size="small"
+            >
+              <el-row>
+                <el-col :span="8">
+                  <el-form-item label="机构名称" prop="deptId">
+                    <el-cascader
+                      style="width: 200px"
+                      :options="ztreeNodes"
+                      v-model="formData.deptId"
+                      clearable
+                      disabled
+                      :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="id">
+                    <el-input disabled v-model="formData.id" disabled></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="手机号" prop="mobile">
+                    <el-input disabled v-model="formData.mobile"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="名称" prop="name">
+                    <el-input disabled v-model="formData.name"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="密码" prop="password">
+                    <el-input
+                      style="width: 200px"
+                      v-model="formData.password"
+                      autocomplete="new-password"
+                      show-password
+                      disabled
+                    ></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="状态" prop="status">
+                    <el-select
+                      style="width: 200px"
+                      v-model="formData.status"
+                      placeholder="请选择"
+                      disabled
+                    >
+                      <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: 200px"
+                      v-model="formData.roleId"
+                      placeholder="请选择"
+                      disabled
+                    >
+                      <el-option
+                        v-for="val in roles"
+                        :label="val.name"
+                        :value="val.id + ''"
+                        :key="val.id"
+                      ></el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="22">
+                    <el-form-item label="备注" prop="remark">
+                    <el-input :disabled="false" style="width: 30vw;" v-model="formData.remark" type="textarea"
+                        :autosize="{ minRows: 4, maxRows: 6 }" placeholder="请输入内容" prop="remark" maxlength="200"
+                        show-word-limit></el-input>
+                    </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+            <div style="text-align: right">
+              <el-button
+                size="mini"
+                type="primary"
+                style="background-color: #0ec216; border: 1px solid #0ec216"
+                @click="submitForm(1)"
+                >审核通过</el-button
+              >
+              <el-button
+                size="mini"
+                type="danger"
+                style="background-color: #de504c; border: 1px solid #de504c"
+                @click="submitForm(2)"
+                >审核驳回</el-button
+              >
+              <el-button size="small" type="primary" @click="closeDialog"
+                >取消</el-button
+              >
+            </div>
+          </el-tab-pane>
+        </el-tabs>
+      </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"; //影像组件
+  
+  export default {
+    components: {
+      tree,
+      KtCommonTable,
+      peopleImage,
+    },
+    data() {
+      return {
+        activeName: "1",
+        //56个民族
+        nationalList: [
+          "汉族",
+          "壮族",
+          "满族",
+          "回族",
+          "苗族",
+          "维吾尔族",
+          "土家族",
+          "彝族",
+          "蒙古族",
+          "藏族",
+          "布依族",
+          "侗族",
+          "瑶族",
+          "朝鲜族",
+          "白族",
+          "哈尼族",
+          "哈萨克族",
+          "黎族",
+          "傣族",
+          "畲族",
+          "傈僳族",
+          "仡佬族",
+          "东乡族",
+          "高山族",
+          "拉祜族",
+          "水族",
+          "佤族",
+          "纳西族",
+          "羌族",
+          "土族",
+          "仫佬族",
+          "锡伯族",
+          "柯尔克孜族",
+          "达斡尔族",
+          "景颇族",
+          "毛南族",
+          "撒拉族",
+          "布朗族",
+          "塔吉克族",
+          "阿昌族",
+          "普米族",
+          "鄂温克族",
+          "怒族",
+          "京族",
+          "基诺族",
+          "德昂族",
+          "保安族",
+          "俄罗斯族",
+          "裕固族",
+          "乌兹别克族",
+          "门巴族",
+          "鄂伦春族",
+          "独龙族",
+          "塔塔尔族",
+          "赫哲族",
+          "珞巴族",
+        ],
+        pageData: {
+          pageNum: 1,
+          pageSize: 20,
+          deptId: JSON.parse(localStorage.getItem("user_data")).deptId,
+          userId: "",
+          realName: "",
+          mobile: "",
+        },
+        formData: {},
+        formDataDetail:{
+            remark:''
+        },
+        roles: [],
+        peopleid: "",
+        peopledeptid: "",
+        /**Split 开始 */
+        leftSplitWidth: 20,
+        rightSplitWidth: 80,
+        ztreeObj: null,
+        ztreeSetting: {
+          check: {
+            enable: false,
+          },
+          data: {
+            simpleData: {
+              enable: true,
+              pIdKey: "parentId",
+            },
+          },
+          view: {
+            showIcon: false,
+          },
+        },
+        formDataRules: {
+          remark: [
+            { required: true, message: "请填写驳回原因", trigger: "blur" },
+          ],
+        },
+        ztreeNodes: [],
+        currentTreeNode: null,
+        //----ztreeLeft end---------
+        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: "mobile", label: "联系电话", minWidth: 100, sortable: false },
+          {
+            prop: "roleId",
+            label: "角色",
+            minWidth: 80,
+            sortable: false,
+          },
+          {
+            prop: "status",
+            label: "状态",
+            minWidth: 50,
+            sortable: false,
+          },
+        ],
+        dialogTitle: "",
+        dialogVisible: false, // 新增编辑界面是否显示
+        departmentList: [], // 选中公司的所有部门的集合
+        deptInfo: {}, //选中机构的基本信息
+        sexoptions: JSON.parse(localStorage.getItem("sexOptions")),
+        user_statusoptions: JSON.parse(
+          localStorage.getItem("user_statusoptions")
+        ),
+        option: [], //机构列表
+        //影像资料
+        dataForm: {
+          SFZ_01: "",
+          SFZ_02: "",
+          Z6Z_00: "",
+          LD_00: "",
+          YP_00: "",
+          DX_00: "",
+        },
+        //影像上传列表
+        imagesIdList:[],
+      };
+    },
+    created() {
+      this.$api.role.findAll().then((res) => {
+        this.roles = res.data;
+      });
+      this.findLeftTreeData(); // 获取机构树的数据
+    },
+    mounted() {
+      //用像素初始化左边的split的宽度
+      this.changeTreeWidth(240); // 初始化树的宽度
+    },
+    methods: {
+      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.findPage();
+      },
+      changeTreeWidth(widthVal) {
+        // 初始化树的宽度
+        this.leftSplitWidth = Math.ceil(
+          (widthVal / this.$refs.elMain.$el.clientWidth) * 100
+        );
+        this.rightSplitWidth = 100 - this.leftSplitWidth;
+      },
+      findLeftTreeData: function () {
+        this.$api.dept.findDeptTree().then((res) => {
+          this.ztreeNodes = res.data;
+        });
+      },
+      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);
+      },
+      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;
+        }
+        let dto = {
+          deptId: this.pageData.deptId,
+          mobile: this.pageData.mobile,
+          name: this.pageData.realName,
+          userId: this.pageData.userId,
+          status: "2",
+          roleId: "19",
+        };
+        this.$api.user
+          .findPage({
+            dto,
+            pageNum: this.pageData.pageNum,
+            pageSize: this.pageData.pageSize,
+          })
+          .then((res) => {
+            res.data.content.forEach((val) => {
+              if (val.sex && val.sex !== "" && val.sex !== null) {
+                val.sex = this.sexoptions.find(
+                  (ele) => ele.value == val.sex
+                ).label;
+              }
+              if (val.status && val.status !== "" && val.status !== null) {
+                val.status = this.user_statusoptions.find(
+                  (ele) => ele.value == val.status
+                ).label;
+              }
+              if (val.roleId && val.roleId !== "" && val.roleId !== null) {
+                val.roleId = this.roles.find((ele) => ele.id == val.roleId).name;
+              }
+            });
+            this.pageResult = res.data;
+          });
+      },
+      closeDialog() {
+        this.$refs["formData"].resetFields();
+        for (let key in this.formData) {
+          this.formData[key] = "";
+        }
+        this.dialogVisible = false;
+      },
+      // 新增或修改的弹出框Start
+      getDictItems(typeName) {
+        //--数据字典--
+        this.$api.dict
+          .findByLableName(typeName)
+          .then((response) => {
+            this[typeName + "options"] = response.data; // 把获取到的数据赋给this.data
+          })
+          .catch((error) => {
+            this[typeName + "options"] = [];
+          });
+      },
+      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;
+            this.formData.password = "";
+          }
+        });
+        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.$refs.formData.validate((valid) => {
+                if (valid) {
+                    this.$api.user
+                    .getApprovalNotPass({
+                        userId: this.formData.id,
+                        reason: this.formData.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>
+  

src/views/PeopleManage/Staff/StaffExamine.vue

@@ -501,6 +501,7 @@ export default {
     queryStaffInfo() {
       this.pageData.realName = this.queryFrom.name
       this.pageData.mobile = this.queryFrom.mobile
+      this.pageData.userId = this.queryFrom.userId;
       this.findPage();
     },
     changeTreeWidth(widthVal) {
@@ -641,6 +642,10 @@ export default {
           }
         });
       } else {
+        if(!this.formDataDetail.remark){
+          this.$message.error('请在详细信息填写驳回原因')
+          return
+        }
         this.$refs.formDataDetail.validate(valid => {
           if (valid) {
             this.$api.user

src/views/PeopleManage/TeamLeader/TeamLeaderExamine.vue

@@ -531,6 +531,7 @@ export default {
     queryStaffInfo() {
         this.pageData.realName=this.queryFrom.name
         this.pageData.mobile=this.queryFrom.mobile
+        this.pageData.userId = this.queryFrom.userId;
       this.findPage();
     },
     changeTreeWidth(widthVal) {