Explorar o código

组织架构新增状态查询,调整删除逻辑

qymljy hai 1 ano
pai
achega
880133d1a0

+ 9 - 1
src/HManagement/department/index.vue

@@ -39,6 +39,12 @@
         :apiId="{query:20221102090303,del:20221102090403}"
         :autoQuery="false"
         :options="options">
+        <div slot="custom">
+          <el-select v-model="status" placeholder="请选择" size="small" class="inline-16" @change="selectChange">
+            <el-option label="在职" value="0"></el-option>
+            <el-option label="离职" value="1"></el-option>
+          </el-select>
+        </div>
         <div slot="custom-right">
           <el-checkbox v-model="selectResult" :false-label="1" :true-label="0" @change="selectChange">当前部门</el-checkbox>
           <el-checkbox v-model="issale" :false-label="0" :true-label="1" @change="selectChange">业务员</el-checkbox>
@@ -88,7 +94,8 @@ export default {
       options:[],
       areaInfo:{},
       selectResult:1,
-      issale:0
+      issale:0,
+      status:''
     }
   },
   methods:{
@@ -109,6 +116,7 @@ export default {
     selectChange () {
       this.$refs.basicLayout.param.content.containssub = this.selectResult
       this.$refs.basicLayout.param.content.where.issale = this.issale
+      this.$refs.basicLayout.param.content.where.status = this.status
       this.$refs.basicLayout.param.content.pageNumber = 1
       this.$refs['basicLayout'].listData()
     }

+ 36 - 1
src/HManagement/department/staff/detail/index.vue

@@ -7,7 +7,6 @@
         :editData="mainData"
         :mainAreaData="mainAreaData"
         turnPageId="20221102090303"
-        delApiId="20221102090403"
         idname="hrid"
         ownertable="sys_hr"
         tags=""
@@ -22,6 +21,7 @@
       <div slot="customOperation" >
         <linkAccount class="inline-16" v-if="tool.checkAuth($route.name,'update')"  :data="mainData"  @onSuccess="queryMainData"></linkAccount>
         <createUser class="inline-16" v-if="tool.checkAuth($route.name,'update') && !mainData.userid" :data="mainData"  @onSuccess="queryMainData"></createUser>
+        <el-button v-if="tool.checkAuth($route.name,'delete')" type="primary" class="inline-16" size="mini"  @click="deleteData">删 除</el-button>
         <!-- <restPas v-if="tool.checkAuth($route.name,'restpas')" :userid="mainData.userid" class="inline-16"></restPas> -->
       </div>
       <div class="container normal-panel" slot="slot0" >
@@ -41,6 +41,7 @@ import linkAccount from "./modules/linkAccount.vue"
 import createUser from "./modules/createUser.vue"
 import accountInfo from "./modules/accountInfo.vue"
 import commissionSet from '@/components/commissionSet/index.vue'
+import {Message} from "element-ui";
 export default {
   name: "detail",
   data() {
@@ -160,6 +161,40 @@ export default {
       this.visible = false
       this.queryMainData(this.$route.query.id)
       this.$emit('onSuccess')
+    },
+    deleteData(){
+      this.$confirm('确定删除当前数据吗?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(async() => {
+        let param = {
+          "id": 20221102090403,
+          "content":{
+            "hrids":[this.$route.query.id]
+          }
+        }
+        const res = await this.$api.requested(param)
+        console.log(res,'删除')
+        if (res.data === '成功'){
+          this.tool.showMessage(res,()=>{
+            this.$store.dispatch('changeDetailDrawer',false)
+          })
+        }else {
+          Message({
+            message: res.data,
+            type: 'error',
+            duration:3000,
+            showClose:true
+          });
+          this.onSuccess()
+        }
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        });
+      });
     }
   },
   mounted () {

+ 1 - 1
src/HManagement/department/staff/list/modules/edit.vue

@@ -377,7 +377,7 @@ export default {
 
           this.$notify({
             title: '成功',
-            message: '添加成功',
+            message: '编辑成功',
             type: 'success'
           });
 

+ 0 - 1
src/HManagement/siteManage/securityConfig/modules/ProReportField.vue

@@ -35,7 +35,6 @@ export default {
   },
   methods:{
     querySite_Parameter(){
-      console.log(this.data,'data')
       this.dialogSetVisible = true
       this.project_tradefield = this.data.project_tradefield
     },

+ 0 - 1
src/HManagement/siteManage/securityConfig/modules/statementData.vue

@@ -35,7 +35,6 @@ export default {
   },
   methods:{
     queryStatementData(){
-      console.log(this.data,'data')
       this.dialogSetVisible = true
       this.querysaledata = this.data.querysaledata
     },