From d926e43f93d5c01bc73669d609d3d61c37f6dbbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
 <7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Tue, 13 Aug 2024 22:38:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/work/emergencyDrill/index.vue | 15 ++++++---------
 ruoyi-ui/src/views/work/workTrain/index.vue      | 16 ++++++----------
 2 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/ruoyi-ui/src/views/work/emergencyDrill/index.vue b/ruoyi-ui/src/views/work/emergencyDrill/index.vue
index 4b8f4261..f9f7927b 100644
--- a/ruoyi-ui/src/views/work/emergencyDrill/index.vue
+++ b/ruoyi-ui/src/views/work/emergencyDrill/index.vue
@@ -7,11 +7,8 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="总包单位名称" prop="trainDeptIds">        
-        <el-select v-model="queryParams.trainDeptIds" filterable placeholder="请输入总包单位名称" clearable>
-          <el-option v-for="(item, index) in depts" :key="index" :label="item.deptName" :value="item.deptId">
-          </el-option>
-        </el-select>
+      <el-form-item label="总包单位" prop="trainNatureName">
+        <el-input v-model="queryParams.trainNatureName" placeholder="请输入总包单位" clearable @keyup.enter.native="handleQuery" />        
       </el-form-item>
       <el-form-item label="演练类型" prop="dataType">
         <el-select v-model="queryParams.dataType" @keyup.enter.native="handleQuery" placeholder="请选择演练类型" clearable>
@@ -22,7 +19,7 @@
       <el-form-item label="演练标题" prop="trainTitle">
         <el-input v-model="queryParams.trainTitle" placeholder="请输入演练标题" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="责任主体" prop="projectDeptId" v-hasPermi="['project:project:zgs']">
+      <el-form-item label="责任主体" prop="projectDeptId" v-if="false">
         <el-select v-model="queryParams.projectDeptId" placeholder="请选择责任主体" clearable>
           <el-option v-for="dict in depts" :key="dict.deptId" :label="dict.deptName" :value="dict.deptId"></el-option>
         </el-select>
@@ -284,9 +281,9 @@ export default {
   },
   created() {
     this.getList();
-    this.$api.publics.getZgsDeptList().then((d) => {
-      this.depts = d?.data || [];
-    });
+    // this.$api.publics.getZgsDeptList().then((d) => {
+    //   this.depts = d?.data || [];
+    // });
     this.$api.publics.getMyProjectList({}).then((response) => {
         this.projectOptions = response.rows;
     }); 
diff --git a/ruoyi-ui/src/views/work/workTrain/index.vue b/ruoyi-ui/src/views/work/workTrain/index.vue
index 317fa699..a79e1183 100644
--- a/ruoyi-ui/src/views/work/workTrain/index.vue
+++ b/ruoyi-ui/src/views/work/workTrain/index.vue
@@ -7,13 +7,9 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="总包单位名称" prop="trainDeptIds">        
-        <el-select v-model="queryParams.trainDeptIds" filterable placeholder="请输入总包单位名称" clearable>
-          <el-option v-for="(item, index) in depts" :key="index" :label="item.deptName" :value="item.deptId">
-          </el-option>
-        </el-select>
+      <el-form-item label="总包单位" prop="trainNatureName">
+        <el-input v-model="queryParams.trainNatureName" placeholder="请输入总包单位" clearable @keyup.enter.native="handleQuery" />        
       </el-form-item>
-
       <el-form-item label="培训类型" prop="dataType">
         <el-select v-model="queryParams.dataType" @keyup.enter.native="handleQuery" placeholder="请选择培训类型" clearable>
           <el-option v-for="dict in dict.type.work_train_data_type" v-show="dict.raw.remark == '0'" :key="dict.value"
@@ -23,7 +19,7 @@
       <el-form-item label="培训标题" prop="trainTitle">
         <el-input v-model="queryParams.trainTitle" placeholder="请输入培训标题" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="责任主体" prop="projectDeptId" v-hasPermi="['project:project:zgs']">
+      <el-form-item label="责任主体" prop="projectDeptId" v-if="false">
         <el-select v-model="queryParams.projectDeptId" placeholder="请选择责任主体" clearable>
           <el-option v-for="dict in depts" :key="dict.deptId" :label="dict.deptName" :value="dict.deptId"></el-option>
         </el-select>
@@ -282,9 +278,9 @@ export default {
   },
   created() {
     this.getList();
-    this.$api.publics.getZgsDeptList().then((d) => {
-      this.depts = d?.data || [];
-    });
+    // this.$api.publics.getZgsDeptList().then((d) => {
+    //   this.depts = d?.data || [];
+    // });
     this.$api.publics.getMyProjectList({}).then((response) => {
         this.projectOptions = response.rows;
     });