From a6a0fcdc5a3e43449ecb99eb00fbd35fdec12054 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Fri, 31 Mar 2023 14:22:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=BA=E5=91=98=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E4=BB=A5=E5=8F=8A=E8=A2=AB=E9=80=80=E5=9B=9E=E7=9A=84?=
 =?UTF-8?q?=E7=9B=B8=E5=BA=94=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/opm/usecl.vue   | 28 +++++++++-----------
 src/views/sys/user.vue    | 55 +++++++++++++++++++++++++--------------
 src/views/wf/dutywork.vue |  4 +--
 3 files changed, 50 insertions(+), 37 deletions(-)

diff --git a/src/views/opm/usecl.vue b/src/views/opm/usecl.vue
index e009446a..3b1e0d99 100644
--- a/src/views/opm/usecl.vue
+++ b/src/views/opm/usecl.vue
@@ -311,19 +311,13 @@
           <el-row>
             <el-col :md="24" :sm="12" :xs="24">
               <el-form-item label="作业人员">
-                <el-select
-                  v-model="formworker.worker"
-                  @change="selectWorker"
-                  placeholder="选择作业人员"
-                >
-                  <el-option
-                    v-for="item in useroptions"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item>
+								<el-input
+								v-model="formworker.worker_name"
+								style="width:200px"
+								disabled
+								></el-input>
+							<ehsUserSelect :multiple="false" @submit="getWorker"/>
+							</el-form-item>
             </el-col>
             <el-col :md="24" :sm="12" :xs="24">
               <el-form-item label="工作职责">
@@ -559,7 +553,7 @@ export default {
       });
     },
     //作业
-
+   
     //根据作业许可证ID获取，风险、措施
     getOplcates() {
       this.$API.opm.oplcate.read.req(this.oplcateId).then((res) => {
@@ -616,7 +610,11 @@ export default {
       } 
       // this.stepSuc.push(++this.active)
     },
-
+    getWorker(data) {
+				this.formworker.worker=data.id,
+				this.formworker.worker_name=data.name
+				this.selectWorker()
+			},
     //选择人员后，调出该人员的所有证书
     selectWorker() {
       this.$API.hrm.certificate.list
diff --git a/src/views/sys/user.vue b/src/views/sys/user.vue
index 4e45ebd7..b3fdfd4a 100644
--- a/src/views/sys/user.vue
+++ b/src/views/sys/user.vue
@@ -35,19 +35,30 @@
             @click="add"
           ></el-button>
           <el-select
-        v-model="query.type"
-        placeholder="账号类型"
-        @change="handleQuery"
-        clearable
-        style="margin-left: 2px"
-      >
-        <el-option
-          v-for="item in userTypeOptions2"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"
-        ></el-option>
-      </el-select>
+            v-model="query.type"
+            placeholder="账号类型"
+            @change="handleQuery"
+            clearable
+            style="margin-left: 2px"
+          >
+            <el-option
+              v-for="item in userTypeOptions2"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+          <el-select
+            v-model="query.is_deleted"
+            placeholder="筛选"
+            @change="handleQuery"
+            clearable
+            style="margin-left: 2px"
+          >
+            <el-option label="全部" value=""></el-option>
+            <el-option label="在用" :value="deletedIs"></el-option>
+            <el-option label="已删" :value="isDeleted"></el-option>
+          </el-select>
         </div>
         <div class="right-panel">
           <div class="right-panel-search">
@@ -83,8 +94,8 @@
           <el-table-column label="登录账号" prop="username" width="140"></el-table-column>
           <el-table-column label="是否启用" prop="is_active">
             <template #default="scope">
-              <el-tag type="success" v-if="scope.row.is_active">启用</el-tag>
-              <el-tag v-else type="danger">禁用</el-tag>
+              <el-tag type="danger" v-if="scope.row.is_deleted">已删</el-tag>
+              <el-tag v-else type="success">在用</el-tag>
             </template>
           </el-table-column>
           <!-- <el-table-column label="微信通知" width="80">
@@ -129,6 +140,7 @@
                 type="primary"
                 link
                 size="small"
+                v-if="!query.is_deleted"
                 @click="formSetting(scope.row)"
                 v-auth="'user.update'"
               >
@@ -148,6 +160,7 @@
                 link
                 size="small"
                 type="danger"
+                v-if="!query.is_deleted"
                 @click="formReset(scope.row)"
                 v-auth="'user.update'"
               >
@@ -213,8 +226,8 @@
           clearable
         ></el-input>
       </el-form-item>
-      <el-form-item label="是否在用">
-        <el-switch v-model="addForm.is_active" />
+      <el-form-item label="是否删除">
+        <el-switch active-color="#f56c6c" v-model="addForm.is_deleted" />
       </el-form-item>
     </el-form>
     <template #footer>
@@ -254,7 +267,9 @@ export default {
         save: false,
         //	certSave:false,
       },
-      query: {},
+      isDeleted: true,
+      deletedIs: false,
+      query: {is_deleted:''},
       baseUrl: baseUrl.API_URL,
       type: "add",
       titleMap: {
@@ -266,7 +281,6 @@ export default {
       addForm: {
         username: "",
         name: "",
-        // email: "",
         phone: null,
         // belong_dept: [],
         is_active: true,
@@ -301,7 +315,7 @@ export default {
       apiObj: this.$API.system.user.list,
       temp: [],
       postList: [],
-	  userTypeOptions :{
+	    userTypeOptions :{
         'employee': '正式员工',
         'remployee': '相关方',
         'visitor': '访客',
@@ -428,6 +442,7 @@ export default {
         if (valid) {
           this.isSaveing = true;
           let res;
+
           if (this.type === "add") {
             res = await this.$API.system.user.create.req(this.addForm);
           } else if (this.type === "edit") {
diff --git a/src/views/wf/dutywork.vue b/src/views/wf/dutywork.vue
index 9c17e863..d48afb4e 100644
--- a/src/views/wf/dutywork.vue
+++ b/src/views/wf/dutywork.vue
@@ -70,8 +70,8 @@
               link
               size="small"
               v-if="
-                (scope.row.act_state === 1 || scope.row.act_state === 3) &&
-                scope.row.state_.type === 0
+                (scope.row.act_state === 1&&scope.row.state_.type === 0) || (scope.row.act_state === 3&&
+                scope.row.state_.type === 0) ||scope.row.act_state === 2
               "
               type="primary"
               @click="handleDetail(scope.row)"