From 36fc7906d2f459f86dadd9613710d9cabf5c3a7e Mon Sep 17 00:00:00 2001
From: wws <18630710203@163.com>
Date: Tue, 28 Nov 2023 17:41:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E9=A1=B9(=E9=83=A8=E4=BD=8D)?=
 =?UTF-8?q?+=E5=B7=A5=E5=85=B7=E6=96=B9=E6=B3=95=E6=8B=86=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device/item/index.vue | 65 +++++++++++++++++++--------------
 1 file changed, 38 insertions(+), 27 deletions(-)

diff --git a/src/views/device/item/index.vue b/src/views/device/item/index.vue
index 9a3ceb7..1c8ceb4 100644
--- a/src/views/device/item/index.vue
+++ b/src/views/device/item/index.vue
@@ -9,15 +9,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label-width="60px" label="检查项" prop="itemName">
+      <el-form-item label-width="60px" label="部位" prop="itemName">
         <el-input
           v-model="queryParams.itemName"
-          placeholder="请输入检查项名称"
+          placeholder="请输入部位"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label-width="120px" label="检查项方法/工具" prop="itemMethod">
+      <el-form-item label-width="120px" label="检查项方法" prop="itemMethod">
         <el-input
           v-model="queryParams.itemMethod"
           placeholder="请输入检查项方法/工具"
@@ -25,6 +25,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label-width="120px" label="检查项方法" prop="itemMethod">
+        <el-input
+          v-model="queryParams.itemTools"
+          placeholder="请输入检查项工具"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="维护类型" prop="itemType">
         <el-select v-model="queryParams.itemType" placeholder="请选择维护类型" clearable>
           <el-option
@@ -197,8 +205,9 @@
       <el-table-column v-if="false" label="主键" align="center" prop="itemId"/>
       <el-table-column width="60" align="center" label="序号" type="index"></el-table-column>
       <el-table-column width="120" label="检查项编码" align="center" prop="itemCode"/>
-      <el-table-column width="200" label="检查项" align="center" prop="itemName"/>
-      <el-table-column width="150" label="方法/工具" align="center" prop="itemMethod"/>
+      <el-table-column width="200" label="部位" align="center" prop="itemName"/>
+      <el-table-column width="150" label="方法" align="center" prop="itemMethod"/>
+      <el-table-column width="150" label="工具" align="center" prop="itemTools"/>
       <el-table-column width="120" label="维护类型编码" align="center" prop="itemType"/>
       <el-table-column width="120" label="维护类型" align="center" prop="itemTypeName"/>
       <el-table-column width="200" label="备注" align="center" prop="itemRemark"/>
@@ -252,18 +261,18 @@
     <!-- 添加或修改检查项维护对话框 -->
     <el-dialog v-loading="itemLoading" :title="title" :visible.sync="open" width="1000px" append-to-body>
       <el-tabs v-model="activePage" type="border-card">
-        <el-tab-pane name="check" label="检查项配置">
+        <el-tab-pane name="check" label="标准配置">
           <el-form ref="form" :model="form" :rules="rules" label-width="90px">
             <!-- 第一行 -->
             <el-row>
               <!-- 第一列 -->
-              <el-col :span="6">
+              <el-col :span="10">
                 <el-form-item label="检查项">
                   <el-input v-model="form.itemName" placeholder="请输入检查项"></el-input>
                 </el-form-item>
               </el-col>
               <!-- 第二列 -->
-              <el-col :span="6" :offset="1">
+              <el-col :span="8" :offset="1">
                 <el-form-item label="维护类型">
                   <el-select v-model="form.itemType" placeholder="请选择维护类型" clearable>
                     <el-option
@@ -275,15 +284,22 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <!-- 第三列 -->
-              <el-col :span="7" :offset="1">
-                <el-form-item label-width="100px" label="检查方法/工具">
-                  <el-input v-model="form.itemMethod" placeholder="请输入检查方法/工具"></el-input>
+            </el-row>
+            <el-row>
+              <el-col :span="10">
+                <el-form-item label="方法">
+                  <el-input v-model="form.itemMethod" placeholder="请输入检查方法"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8" :offset="1">
+                <el-form-item label="工具">
+                  <el-input v-model="form.itemTools" placeholder="请输入检查工具"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
             <!-- 动态表单 -->
             <div v-for="(item, index) in formStandard" :key="index">
+              <el-divider></el-divider>
               <!-- 标准类型 -->
               <el-row>
                 <el-col :span="7">
@@ -295,9 +311,9 @@
               </el-row>
               <!-- 单选-动态表单 -->
               <el-row v-if="item.standardType === 'qualitative'">
-                <el-col :span="6">
+                <el-col :span="12">
                   <el-form-item label="标准名称">
-                    <el-input v-model="item.standardName" placeholder="请输入标准名称"></el-input>
+                    <el-input type="textarea" autosize v-model="item.standardName" placeholder="请输入标准名称"></el-input>
                   </el-form-item>
                 </el-col>
                 <!-- 操作 -->
@@ -310,28 +326,28 @@
                 </el-col>
               </el-row>
               <el-row v-else>
-                <el-col :span="6">
+                <el-col :span="12">
                   <el-form-item label="标准名称">
-                    <el-input v-model="item.standardName" placeholder="请输入标准名称"></el-input>
+                    <el-input type="textarea" autosize v-model="item.standardName" placeholder="请输入标准名称"></el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :span="4">
+                <el-col :span="6">
                   <el-form-item label-width="50px" label="上限">
                     <el-input v-model="item.detailUpLimit" step="0.01" type="number" maxlength="9" oninput="value=value.replace(/[^\d.]/g, '')" placeholder="请输入上限"></el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :span="4">
+                <el-col :span="6">
                   <el-form-item label-width="50px" label="下限">
                     <el-input v-model="item.detailDownLimit" step="0.01" type="number" maxlength="9" oninput="value=value.replace(/[^\d.]/g, '')" placeholder="请输入下限"></el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :span="4">
+                <el-col :offset="1" :span="6">
                   <el-form-item label-width="50px" label="单位">
                     <el-input v-model="item.detailUnit" placeholder="请输入单位"></el-input>
                   </el-form-item>
                 </el-col>
                 <!-- 操作 -->
-                <el-col :span="4" class="my-dynamic-btn">
+                <el-col :span="6" class="my-dynamic-btn">
                   <el-button size="small" v-if="formStandard.length > 1" @click="removeStandard(index)" type="danger">删除
                   </el-button>
                   <el-button size="small" v-if="index === formStandard.length - 1" @click="addStandard" type="primary">
@@ -470,6 +486,7 @@ export default {
       },
       // 表单参数
       form: {
+        itemTools:null,
         itemName: null,
         itemType: null,
         itemMethod: null,
@@ -547,6 +564,7 @@ export default {
         updateTime: null,
         updateBy: null,
         formStandard: [],
+        itemTools:null,
       };
       this.formStandard = [{
         standardType: 'qualitative',
@@ -625,13 +643,6 @@ export default {
         })
         return
       }
-      if (this.form.itemMethod == null) {
-        this.$message({
-          message: "请输入检查方法/工具！",
-          type: "warning"
-        })
-        return
-      }
       if (this.selectEquipmentList.length == 0) {
         this.$message({
           message: "请关联设备！",