From c169921bafd14cfad8ed565fb7aa441ab95caa0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Wed, 9 Aug 2023 16:28:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E8=AE=BE=E5=A4=87=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E7=BA=A7=E5=88=AB=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inventory/DeviceInspectPlanAudit.vue      | 33 +++++++++---------
 .../DeviceInspectPlanAuditModify.vue          | 26 ++++++--------
 .../inventory/DeviceInspectPlanCompleted.vue  | 34 +++++++++----------
 .../inventory/DeviceInspectPlanModify.vue     | 13 +------
 src/views/inventory/DeviceInspectPlanNew.vue  | 33 +++++++-----------
 5 files changed, 57 insertions(+), 82 deletions(-)

diff --git a/src/views/inventory/DeviceInspectPlanAudit.vue b/src/views/inventory/DeviceInspectPlanAudit.vue
index 382ebb38..1c5b6b66 100644
--- a/src/views/inventory/DeviceInspectPlanAudit.vue
+++ b/src/views/inventory/DeviceInspectPlanAudit.vue
@@ -48,18 +48,15 @@
                         clearable></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="计划级别:" class="query-form-item" >
-              <el-select v-model="filterQuery.level" style="width: 90%" placeholder="请选择计划级别" clearable>
-                <el-option label="低级" :value=1></el-option>
-                <el-option label="中级" :value=2></el-option>
-                <el-option label="高级" :value=3></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-
+<!--          <el-col :span="8">-->
+<!--            <el-form-item label="计划级别:" class="query-form-item" >-->
+<!--              <el-select v-model="filterQuery.level" style="width: 90%" placeholder="请选择计划级别" clearable>-->
+<!--                <el-option label="低级" :value=1></el-option>-->
+<!--                <el-option label="中级" :value=2></el-option>-->
+<!--                <el-option label="高级" :value=3></el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
           <el-col :span="8">
             <el-form-item label="计划状态:" class="query-form-item">
               <el-select v-model="filterQuery.planStatus" style="width: 90%" placeholder="请选择计划级别" clearable>
@@ -70,6 +67,8 @@
               </el-select>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="8">
             <el-form-item class="query-form-item" label="开始时间:">
               <el-date-picker
@@ -137,11 +136,11 @@
 <!--            <el-tag :type="statusFilterType(scope.row.planStatus)">{{ planStatusMap[scope.row.planStatus] }}</el-tag>-->
 <!--          </template>-->
 <!--        </el-table-column>-->
-        <el-table-column label="计划级别" prop="level" show-overflow-tooltip width="120">
-          <template slot-scope="scope">
-            <el-tag :type="statusFilterType(scope.row.level)">{{ levelMap[scope.row.level] }}</el-tag>
-          </template>
-        </el-table-column>
+<!--        <el-table-column label="计划级别" prop="level" show-overflow-tooltip width="120">-->
+<!--          <template slot-scope="scope">-->
+<!--            <el-tag :type="statusFilterType(scope.row.level)">{{ levelMap[scope.row.level] }}</el-tag>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
         <el-table-column label="状态" prop="status" show-overflow-tooltip width="120">
           <template slot-scope="scope">
             <el-tag>{{ statusMap[scope.row.status] }}</el-tag>
diff --git a/src/views/inventory/DeviceInspectPlanAuditModify.vue b/src/views/inventory/DeviceInspectPlanAuditModify.vue
index 10a5daab..0d429c39 100644
--- a/src/views/inventory/DeviceInspectPlanAuditModify.vue
+++ b/src/views/inventory/DeviceInspectPlanAuditModify.vue
@@ -2,7 +2,7 @@
   <div>
     <el-card style="margin: 5px;margin-top: -20px">
       <el-form :model="inspectPlan" ref="formRef" :rules="formRules" label-width="120px" style="margin-bottom: -15px">
-        <el-button-group style="display: flex;margin: 0px 0 10px 90%; height: 35px">
+        <el-button-group style="display: flex;margin: 0px 0 10px 85%; height: 35px">
           <el-button type="primary" @click.native="submit(2)">审核通过</el-button>
           <el-button type="primary" @click.native="submit(3)">审核拒绝</el-button>
         </el-button-group>
@@ -108,19 +108,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="10">
-            <el-form-item label="计划级别:" prop="level">
-              <el-select v-model="inspectPlan.level" style="width: 90%" disabled placeholder="请选择计划级别" clearable>
-                <el-option label="低级" :value=1></el-option>
-                <el-option label="中级" :value=2></el-option>
-                <el-option label="高级" :value=3></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-
-        <el-row>
           <el-col :span="10">
             <el-form-item label="计划状态:" prop="planStatus">
               <el-select v-model="inspectPlan.planStatus" style="width: 90%" placeholder="请选择计划级别" clearable>
@@ -129,8 +116,17 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
+<!--          <el-col :span="10">-->
+<!--            <el-form-item label="计划级别:" prop="level">-->
+<!--              <el-select v-model="inspectPlan.level" style="width: 90%" disabled placeholder="请选择计划级别" clearable>-->
+<!--                <el-option label="低级" :value=1></el-option>-->
+<!--                <el-option label="中级" :value=2></el-option>-->
+<!--                <el-option label="高级" :value=3></el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
 
+        </el-row>
       </el-form>
     </el-card>
 
diff --git a/src/views/inventory/DeviceInspectPlanCompleted.vue b/src/views/inventory/DeviceInspectPlanCompleted.vue
index 087e7901..dd6ee671 100644
--- a/src/views/inventory/DeviceInspectPlanCompleted.vue
+++ b/src/views/inventory/DeviceInspectPlanCompleted.vue
@@ -51,15 +51,15 @@
                         clearable></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="计划级别:" class="query-form-item">
-              <el-select v-model="filterQuery.level" style="width: 90%" placeholder="请选择计划级别" clearable>
-                <el-option label="低级" :value=1></el-option>
-                <el-option label="中级" :value=2></el-option>
-                <el-option label="高级" :value=3></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="8">-->
+<!--            <el-form-item label="计划级别:" class="query-form-item">-->
+<!--              <el-select v-model="filterQuery.level" style="width: 90%" placeholder="请选择计划级别" clearable>-->
+<!--                <el-option label="低级" :value=1></el-option>-->
+<!--                <el-option label="中级" :value=2></el-option>-->
+<!--                <el-option label="高级" :value=3></el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
           <el-col :span="8">
             <el-form-item label="计划状态:" class="query-form-item">
               <el-select v-model="filterQuery.planStatus" style="width: 90%" placeholder="请选择计划级别" clearable>
@@ -70,9 +70,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-
-        <el-row>
           <el-col :span="8">
             <el-form-item label="审核时间:" class="query-form-item">
               <el-date-picker
@@ -89,6 +86,9 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
+        </el-row>
+
+        <el-row>
           <el-col :span="8">
             <el-form-item class="query-form-item" label="开始时间:">
               <el-date-picker
@@ -153,11 +153,11 @@
         </el-table-column>
         <el-table-column label="创建人" prop="createUserName"></el-table-column>
         <el-table-column label="审核人" prop="auditUserName"></el-table-column>
-        <el-table-column label="计划级别" prop="level" show-overflow-tooltip width="120">
-          <template slot-scope="scope">
-            <el-tag :type="statusFilterType(scope.row.level)">{{ levelMap[scope.row.level] }}</el-tag>
-          </template>
-        </el-table-column>
+<!--        <el-table-column label="计划级别" prop="level" show-overflow-tooltip width="120">-->
+<!--          <template slot-scope="scope">-->
+<!--            <el-tag :type="statusFilterType(scope.row.level)">{{ levelMap[scope.row.level] }}</el-tag>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
         <el-table-column label="计划状态" prop="planStatus">
           <template slot-scope="scope">
             <el-tag :type="statusFilterType(scope.row.planStatus)">{{ planStatusMap[scope.row.planStatus] }}</el-tag>
diff --git a/src/views/inventory/DeviceInspectPlanModify.vue b/src/views/inventory/DeviceInspectPlanModify.vue
index d0d39dcc..3c9d8f21 100644
--- a/src/views/inventory/DeviceInspectPlanModify.vue
+++ b/src/views/inventory/DeviceInspectPlanModify.vue
@@ -116,18 +116,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="10">
-            <el-form-item label="计划级别:" prop="level">
-              <el-select v-model="inspectPlan.level"  :disabled="type == 'detail'" style="width: 90%" placeholder="请选择计划级别" clearable>
-                <el-option label="低级" :value=1></el-option>
-                <el-option label="中级" :value=2></el-option>
-                <el-option label="高级" :value=3></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row v-if="type == 'detail'">
-          <el-col :span="10">
+          <el-col :span="10" v-if="type == 'detail'">
             <el-form-item label="计划状态:" prop="planStatus">
               <el-select v-model="inspectPlan.planStatus" style="width: 90%" placeholder="请选择计划级别" clearable>
                 <el-option label="不启用" :value=1></el-option>
diff --git a/src/views/inventory/DeviceInspectPlanNew.vue b/src/views/inventory/DeviceInspectPlanNew.vue
index 250a0b4f..68d555f6 100644
--- a/src/views/inventory/DeviceInspectPlanNew.vue
+++ b/src/views/inventory/DeviceInspectPlanNew.vue
@@ -49,27 +49,18 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="计划级别:" class="query-form-item" >
-              <el-select v-model="filterQuery.level" style="width: 90%" placeholder="请选择计划级别" clearable>
-                <el-option label="低级" :value=1></el-option>
-                <el-option label="中级" :value=2></el-option>
-                <el-option label="高级" :value=3></el-option>
+            <el-form-item label="计划状态:" class="query-form-item">
+              <el-select v-model="filterQuery.planStatus" style="width: 90%" placeholder="请选择计划级别" clearable>
+                <el-option label="未启用" :value=1></el-option>
+                <el-option label="运行中" :value=2></el-option>
+                <el-option label="已结束" :value=3></el-option>
+                <el-option label="已过期" :value=4></el-option>
               </el-select>
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
 
-        <el-col :span="8">
-          <el-form-item label="计划状态:" class="query-form-item">
-            <el-select v-model="filterQuery.planStatus" style="width: 90%" placeholder="请选择计划级别" clearable>
-              <el-option label="未启用" :value=1></el-option>
-              <el-option label="运行中" :value=2></el-option>
-              <el-option label="已结束" :value=3></el-option>
-              <el-option label="已过期" :value=4></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
+        <el-row>
           <el-col :span="8">
             <el-form-item class="query-form-item" label="开始时间:">
               <el-date-picker
@@ -138,11 +129,11 @@
             <el-tag :type="statusFilterType(scope.row.planStatus)">{{ planStatusMap[scope.row.planStatus] }}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="计划级别" prop="level" show-overflow-tooltip width="120">
-          <template slot-scope="scope">
-            <el-tag :type="statusFilterType(scope.row.level)">{{ levelMap[scope.row.level] }}</el-tag>
-          </template>
-        </el-table-column>
+<!--        <el-table-column label="计划级别" prop="level" show-overflow-tooltip width="120">-->
+<!--          <template slot-scope="scope">-->
+<!--            <el-tag :type="statusFilterType(scope.row.level)">{{ levelMap[scope.row.level] }}</el-tag>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
         <el-table-column label="状态" prop="status" show-overflow-tooltip width="120">
           <template slot-scope="scope">
             <el-tag :type="statusFilterType(scope.row.status)">{{ statusMap[scope.row.status] }}</el-tag>