flat: 暂存

src/api/tenant/talents.js

@@ -137,3 +137,11 @@ export const talentsApproval = (params) => {
   })
 }
 
+export const tenantSuspected = (params) => {
+  return request({
+    url: '/api/jobslink-api/tenant/talents/suspected',
+    method: 'post',
+    data: params
+  })
+}
+

src/components/promptDialog/index.vue

@@ -22,7 +22,7 @@
     <span slot="footer" class="dialog-footer">
       <slot name="footer"></slot>
       <el-button @click="handleClose">取 消</el-button>
-      <el-button v-if="backBtnHide" :type="btnTypes[flagState]" @click="handleCancel">驳 回</el-button>
+      <el-button v-if="backBtnHide" :type="btnTypes[flagState]" @click="handleCancel">{{ backText }}</el-button>
       <el-button type="primary" @click="handleConfirm">{{ submitText }}</el-button>
     </span>
   </el-dialog>
@@ -63,6 +63,15 @@ export default {
       type: String,
       required: false,
     },
+    backText: {
+      default: '驳 回',
+      type: String,
+      required: false,
+    },
+    isInputInfo: {
+      type: Boolean,
+      default: true,
+    },
     backBtnHide: {
       default: true,
       type: Boolean,
@@ -106,6 +115,10 @@ export default {
       this.$emit('onClose')
     },
     handleCancel() {
+      if (!this.isInputInfo) {
+        this.$emit('onCancel')
+        return
+      }
       if (this.status) {
         this.$emit('onCancel', this.input)
       } else {

src/views/tenant/main/label/index.vue

@@ -45,7 +45,8 @@
                 icon="el-icon-plus"
                 v-if="vaildData(permission.tenant_main_label_index_groupadd, false)"
                 @click="updateGroups('add')">
-                新建分组</el-button>
+                新建分组
+              </el-button>
             </div>
           </el-scrollbar>
         </div>
@@ -98,7 +99,8 @@
           <template slot="resume" slot-scope="{ row }">
             <div>
               <el-button type="text" size="mini" @click="$refs.resume.openDialog(row)"
-                v-if="row.userId && row.userId !== '0'">查看简历</el-button>
+                         v-if="row.userId && row.userId !== '0'">查看简历
+              </el-button>
               <div v-else>暂无简历</div>
             </div>
           </template>
@@ -110,12 +112,16 @@
           <!--自定义按钮-->
           <template slot="menuLeft">
             <el-button type="success" size="small" plain icon="el-icon-plus" @click="handleImport"
-              v-show="vaildData(permission.tenant_talents_groupadd, false)">导入</el-button>
+                       v-show="vaildData(permission.tenant_talents_groupadd, false)">导入
+            </el-button>
             <el-button type="warning" size="small" plain :disabled="!selectionList.length" icon="el-icon-sort"
-              @click="handleTransfer">转移分组</el-button>
+                       @click="handleTransfer">转移分组
+            </el-button>
             <el-button type="danger" size="small" icon="el-icon-delete" @click="handleDelete"
-              :disabled="!selectionList.length" plain v-show="vaildData(permission.tenant_talents_groupdelete, false)">
+                       :disabled="!selectionList.length" plain
-              删除</el-button>
+                       v-show="vaildData(permission.tenant_talents_groupdelete, false)">
+              删除
+            </el-button>
           </template>
           <template slot="name" slot-scope="{row}">
             <span>{{ row.name }}</span>

src/views/tenant/main/policy/index.vue

@@ -38,8 +38,10 @@
             </el-tree>
             <!-- v-show="vaildData(permission.tenant_wage_payroll_view, false)" -->
             <div class="footer" style="padding-left: 6px">
-              <el-button type="text" icon="el-icon-plus" v-if="vaildData(permission.tenant_main_policy_index_groupadd, false)"
+              <el-button type="text" icon="el-icon-plus"
-                  @click="updateGroups('add')">新建分组</el-button>
+                         v-if="vaildData(permission.tenant_main_policy_index_groupadd, false)"
+                         @click="updateGroups('add')">新建分组
+              </el-button>
             </div>
           </el-scrollbar>
         </div>
@@ -81,7 +83,9 @@
           <template slot="labelName" slot-scope="{ row }">
             <el-tooltip effect="dark" placement="top">
               <div slot="content">
-                <div v-for="(item, index) in clipStr(row.labelName)" :key="index"><div>{{item}}</div></div>
+                <div v-for="(item, index) in clipStr(row.labelName)" :key="index">
+                  <div>{{ item }}</div>
+                </div>
               </div>
               <span>{{ row.labelName.length > 20 ? row.labelName.substring(0, 20) : row.labelName }}</span>
             </el-tooltip>
@@ -89,7 +93,8 @@
           <template slot="resume" slot-scope="{ row }">
             <div>
               <el-button type="text" size="mini" @click="$refs.resume.openDialog(row)"
-                v-if="row.userId && row.userId !== '0'">查看简历</el-button>
+                         v-if="row.userId && row.userId !== '0'">查看简历
+              </el-button>
               <div v-else>暂无简历</div>
             </div>
           </template>
@@ -108,7 +113,9 @@
                   :show-file-list="false"
                   :http-request="allUpload"
                   :multiple="false"
-                ><el-button size="small" type="primary">点击上传</el-button></el-upload>
+                >
+                  <el-button size="small" type="primary">点击上传</el-button>
+                </el-upload>
               </div>
               <avue-input disabled v-model="policyFileUrl" placeholder="点击上传文件"></avue-input>
             </div>
@@ -123,7 +130,9 @@
                   :show-file-list="false"
                   :http-request="allUploadGuideline"
                   :multiple="false"
-                ><el-button size="small" type="primary">点击上传</el-button></el-upload>
+                >
+                  <el-button size="small" type="primary">点击上传</el-button>
+                </el-upload>
               </div>
               <avue-input disabled v-model="guidelineFileUrl" placeholder="点击上传文件"></avue-input>
             </div>
@@ -140,10 +149,14 @@
             <!--            <el-button type="success" size="small" plain icon="el-icon-plus" @click="handleImport"-->
             <!--              v-show="vaildData(permission.tenant_talents_groupadd, false)">导入</el-button>-->
             <el-button type="warning" size="small" plain :disabled="!selectionList.length" icon="el-icon-sort"
-              @click="handleTransfer" v-show="vaildData(permission.tenant_main_policy_transfergroup, false)">转移分组</el-button>
+                       @click="handleTransfer" v-show="vaildData(permission.tenant_main_policy_transfergroup, false)">
+              转移分组
+            </el-button>
             <el-button type="danger" size="small" icon="el-icon-delete" @click="handleDelete"
-              :disabled="!selectionList.length" plain v-show="vaildData(permission.tenant_main_policy_index_del, false)">
+                       :disabled="!selectionList.length" plain
-              删除</el-button>
+                       v-show="vaildData(permission.tenant_main_policy_index_del, false)">
+              删除
+            </el-button>
           </template>
           <template slot="name" slot-scope="{row}">
             <span>{{ row.name }}</span>
@@ -203,6 +216,7 @@ import { serviceType } from "@/common/dic";
 import {excelAccept} from "@/common/accept";
 import Tinymce from "@/components/Tinymce";
 import _ from "lodash";
+
 export default {
   filters: {
     ellipsis(value) {

src/views/tenant/main/serve/index.vue

@@ -539,6 +539,10 @@ export default {
               trigger: "blur",
             },
           ],
+        }, {
+          label: '服务名称',
+          prop: 'serveName',
+          display: false,
         }, {
           label: '服务发起人',
           prop: 'fromName',

src/views/tenant/main/talents/certain/index.vue

@@ -101,11 +101,19 @@
             <!--            >查看日志-->
             <!--            </el-button>-->
             <el-button type="text"
+                       v-if="row.suspected === 0"
                        icon="el-icon-circle-check"
                        size="small"
                        @click="checkUserInfo(row)"
             >剔除
             </el-button>
+            <el-button type="text"
+                       v-if="row.suspected === 1"
+                       icon="el-icon-circle-check"
+                       size="small"
+                       @click="checkSuspected(row)"
+            >验证审核
+            </el-button>
           </template>
 
           <!--/自定义按钮-->
@@ -192,7 +200,27 @@
             </div>
           </template>
         </PromptDialog>
-
+        <PromptDialog
+          :visible="checkDialog"
+          title="验证人员信息"
+          submit-text="已死亡"
+          back-text="未死亡"
+          :isInputInfo="false"
+          sub-title="请核对人员信息后再进行审核通过，核验人员是否死亡，审核记录在人员服务日志中可见"
+          :tips="[
+            '经查验确实死亡；',
+            '经查验未死亡；',
+          ]"
+          @onClose="checkDialog = false; backInput = ''"
+          @onCancel="checkDialogCancel"
+          @onConfirm="checkDialogConfirm"
+        >
+          <template v-slot:header>
+            <div class="input_box" style="margin-top: 20px">
+              <el-input type="textarea" v-model="checkInput" placeholder="请输入备注"></el-input>
+            </div>
+          </template>
+        </PromptDialog>
       </basic-container>
       <ied ref="ied"></ied>
     </el-col>
@@ -210,7 +238,8 @@ import {
   removeDept,
   upload,
   getDeptMyTree,
-  talentsEliminate
+  talentsEliminate,
+  tenantSuspected
 } from "@/api/tenant/talents";
 import {getWorkTypes, getLabelList} from "@/api/tenant/common";
 import {mapGetters} from "vuex";
@@ -243,6 +272,8 @@ export default {
   name: "tenant_talents",
   data() {
     return {
+      checkInput: '',
+      checkDialog: false,
       dialogFlag: false,
       dialogInfo: null,
       downloadButton: false,
@@ -342,6 +373,7 @@ export default {
         searchShow: true,
         viewBtn: true,
         searchMenuSpan: 6,
+        searchSpan: 8,
         menuWidth: 170,
         border: true,
         index: false,
@@ -410,6 +442,17 @@ export default {
             ],
             search: true,
           },
+          {
+            label: "人员类型",
+            prop: "suspected",
+            search: true,
+            type: 'select',
+            dicData: [
+              {label: '普通人员', value: 0},
+              {label: '疑似死亡人员', value: 1},
+              {label: '死亡人员', value: 2},
+            ]
+          },
           {
             label: "手机号",
             prop: "telphone",
@@ -708,6 +751,64 @@ export default {
     this.getDept()
   },
   methods: {
+    checkDialogConfirm() {
+      if (!this.checkInput) {
+        return this.$message.info('请输入备注');
+      }
+      const params = {
+        id: this.dialogInfo.id,
+        idNumber: this.dialogInfo.idNumber,
+        remarks: this.checkInput,
+        suspected: 2,
+        name: this.dialogInfo.name,
+      }
+      this.$confirm("确定该人员已死亡?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return tenantSuspected(params);
+        })
+        .then(() => {
+          this.initDept();
+          this.onLoad(this.page, this.query);
+          this.checkDialog = false
+          this.$message.success('操作成功');
+        });
+    },
+    checkDialogCancel() {
+      if (!this.checkInput) {
+        return this.$message.info('请输入备注');
+      }
+      const params = {
+        id: this.dialogInfo.id,
+        idNumber: this.dialogInfo.idNumber,
+        remarks: this.checkInput,
+        suspected: 0,
+        name: this.dialogInfo.name,
+      }
+      this.$confirm("确定该人员未死亡?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return tenantSuspected(params);
+        })
+        .then(() => {
+          this.initDept();
+          this.onLoad(this.page, this.query);
+          this.checkDialog = false
+          this.$message.success('操作成功');
+        });
+      console.log(params)
+    },
+    checkSuspected(row) {
+      console.log(row)
+      this.dialogInfo = row
+      this.checkDialog = true
+    },
     checkUserInfo(row) {
       this.dialogInfo = row
       this.dialogFlag = true

src/views/tenant/main/talents/personnelserve/index.vue

@@ -308,7 +308,7 @@ export default {
       return {
         editBtn: true,
         delBtn: true,
-        addBtn: true,
+        addBtn: false,
         viewBtn: true,
         border: true,
         index: true,
@@ -374,6 +374,11 @@ export default {
     this.initDept()
     this.onLoad(this.page, this.query)
   },
+  activated() {
+    this.$nextTick(() => {
+      this.$refs.crud.refreshTable()
+    })
+  },
   methods: {
     async getDept() {
       let params = {

vue.config.js

@@ -24,7 +24,7 @@ module.exports = {
     port: 1888,
     proxy: {
       "/api": {
-        target: 'http://10.165.0.173:8000',
+        target: 'http://192.168.1.105:8000',
         ws: true,
         changeOrigin: true,
         pathRewrite: {