From d06d2f76b25a975b872e99361ca6db18f5980bc4 Mon Sep 17 00:00:00 2001
From: wws <18630710203@163.com>
Date: Fri, 17 Nov 2023 11:53:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A1=AB=E5=86=99=E8=AE=B0=E5=BD=95=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device/deviceOrder/index.vue        | 126 ++++++++---------
 .../device/spotInspectionOrder/index.vue      | 128 ++++++++----------
 src/views/device/upkeepOrder/index.vue        | 125 ++++++++---------
 3 files changed, 172 insertions(+), 207 deletions(-)

diff --git a/src/views/device/deviceOrder/index.vue b/src/views/device/deviceOrder/index.vue
index c487ca9..18e9be6 100644
--- a/src/views/device/deviceOrder/index.vue
+++ b/src/views/device/deviceOrder/index.vue
@@ -359,73 +359,54 @@
             </el-descriptions>
           </el-tab-pane>
           <el-tab-pane label="记录">
-            <!-- 设备 -->
-            <el-row>
-              <el-col :offset="9" :span="6">
-                <el-form-item label="设备名称:">
-                  {{ this.form.equipmentName }}
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <div v-for="(detail,detailIndex) in form.detailList" :key="detailIndex">
-              <!-- 检查项 -->
-              <el-row>
-                <el-col :span="6">
-                  <el-form-item label="检查项:">
-                    {{ detail.itemName }}
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <div v-for="(standard,standardIndex) in detail.standardList" :key="standardIndex">
-                <div v-if="standard.standardType == 'qualitative' ">
-                  <!-- 标准 -->
-                  <el-row>
-                    <el-col :span="6">
-                      <el-form-item label="标准:">
-                        {{ standard.standardName }}
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="9">
-                      <el-form-item label="是否达标:">
-                        <el-radio v-model="standard.detailReach" label="0">未达标</el-radio>
-                        <el-radio v-model="standard.detailReach" label="1">达标</el-radio>
-                      </el-form-item>
-                    </el-col>
-                  </el-row>
-                </div>
-                <div v-else>
-                  <!-- 标准 -->
-                  <el-row>
-                    <el-col :span="5">
-                      <el-form-item label="标准:">
-                        {{ standard.standardName }}
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="4">
-                      <el-form-item label="上限:">
-                        {{ standard.detailUpLimit }}
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="4">
-                      <el-form-item label="下限:">
-                        {{ standard.detailDownLimit }}
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="4">
-                      <el-form-item label="单位:">
-                        {{ standard.detailUnit }}
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="6">
-                      <el-form-item label="实际值:">
-                        <el-input v-model="standard.actualValue" placeholder="请输入实际值"></el-input>
-                      </el-form-item>
-                    </el-col>
-                  </el-row>
-                </div>
-              </div>
-              <el-divider></el-divider>
-            </div>
+            <el-table
+              :data="recordList"
+              border
+              style="width: 100%">
+              <el-table-column
+                prop="itemName"
+                label="检查项"
+                >
+              </el-table-column>
+              <el-table-column
+                prop="standardName"
+                label="标准名称"
+                >
+              </el-table-column>
+              <el-table-column
+                prop="detailReach"
+                label="是否达标">
+                <template slot-scope="scope">
+                  <el-select v-model="scope.row.detailReach" placeholder="请选择">
+                    <el-option
+                      v-for="item in dict.type.device_reach_standard"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value">
+                    </el-option>
+                  </el-select>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="detailUpLimit"
+                label="上限">
+              </el-table-column>
+              <el-table-column
+                prop="detailDownLimit"
+                label="下限">
+              </el-table-column>
+              <el-table-column
+                prop="actualValue"
+                label="实际值">
+                <template slot-scope="scope">
+                  <el-input v-if="scope.row.standardType == 'quantify' " size="small" v-model="scope.row.actualValue" @change="handleEdit(scope.$index,scope.row)"></el-input>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="detailUnit"
+                label="单位">
+              </el-table-column>
+            </el-table>
           </el-tab-pane>
           <el-tab-pane label="工单信息修改">
             <el-row>
@@ -475,9 +456,11 @@ import {
 
 export default {
   name: "DeviceOrder",
-  dicts: ['device_order_status', 'device_loop_type'],
+  dicts: ['device_order_status', 'device_loop_type','device_reach_standard'],
   data() {
     return {
+      // 记录
+      recordList: [],
       // 遮罩层
       loading: true,
       // 选中数组
@@ -614,11 +597,18 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
+      this.recordList = [];
       const orderCode = row.orderCode || this.ids
       getDeviceOrder(orderCode).then(response => {
         this.form = response.data;
         console.log("这里是回显信息")
         console.log(response.data)
+        for (let i = 0; i < this.form.detailList.length; i++) {
+          for (let j = 0; j < this.form.detailList[i].standardList.length; j++) {
+            this.form.detailList[i].standardList[j].itemName = this.form.detailList[i].itemName;
+            this.recordList.push(this.form.detailList[i].standardList[j]);
+          }
+        }
         this.open = true;
         this.title = "填写记录";
       });
diff --git a/src/views/device/spotInspectionOrder/index.vue b/src/views/device/spotInspectionOrder/index.vue
index 0018fbb..b18de08 100644
--- a/src/views/device/spotInspectionOrder/index.vue
+++ b/src/views/device/spotInspectionOrder/index.vue
@@ -363,76 +363,54 @@
             </el-descriptions>
           </el-tab-pane>
           <el-tab-pane label="记录">
-            <!-- 设备 -->
-            <el-row>
-              <el-col :offset="9" :span="6">
-                <el-form-item label="设备名称:">
-                  {{ this.form.equipmentName }}
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <div v-for="(detail,detailIndex) in form.detailList" :key="detailIndex">
-              <!-- 检查项 -->
-              <el-row>
-                <el-col :span="6">
-                  <el-form-item label="检查项:">
-                    {{ detail.itemName }}
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <div v-for="(standard,standardIndex) in detail.standardList" :key="standardIndex">
-                <div v-if="standard.standardType == 'qualitative' ">
-                  <!-- 标准 -->
-                  <el-row>
-                    <el-col :span="6">
-                      <el-form-item label="标准:">
-                        {{ standard.standardName }}
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="9">
-                      <el-form-item label="是否达标:">
-                        <el-radio v-model="standard.detailReach" label="0">未达标</el-radio>
-                        <el-radio v-model="standard.detailReach" label="1">达标</el-radio>
-                      </el-form-item>
-                    </el-col>
-                    <el-col v-if="false" :span="2">
-                      <el-button type="primary" icon="el-icon-picture" circle @click="imgDialog = true"></el-button>
-                    </el-col>
-                  </el-row>
-                </div>
-                <div v-else>
-                  <!-- 标准 -->
-                  <el-row>
-                    <el-col :span="5">
-                      <el-form-item label="标准:">
-                        {{ standard.standardName }}
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="4">
-                      <el-form-item label="上限:">
-                        {{ standard.detailUpLimit }}
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="4">
-                      <el-form-item label="下限:">
-                        {{ standard.detailDownLimit }}
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="4">
-                      <el-form-item label="单位:">
-                        {{ standard.detailUnit }}
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="6">
-                      <el-form-item label="实际值:">
-                        <el-input v-model="standard.actualValue" placeholder="请输入实际值"></el-input>
-                      </el-form-item>
-                    </el-col>
-                  </el-row>
-                </div>
-              </div>
-              <el-divider></el-divider>
-            </div>
+            <el-table
+              :data="recordList"
+              border
+              style="width: 100%">
+              <el-table-column
+                prop="itemName"
+                label="检查项"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="standardName"
+                label="标准名称"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="detailReach"
+                label="是否达标">
+                <template slot-scope="scope">
+                  <el-select v-model="scope.row.detailReach" placeholder="请选择">
+                    <el-option
+                      v-for="item in dict.type.device_reach_standard"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value">
+                    </el-option>
+                  </el-select>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="detailUpLimit"
+                label="上限">
+              </el-table-column>
+              <el-table-column
+                prop="detailDownLimit"
+                label="下限">
+              </el-table-column>
+              <el-table-column
+                prop="actualValue"
+                label="实际值">
+                <template slot-scope="scope">
+                  <el-input v-if="scope.row.standardType == 'quantify' " size="small" v-model="scope.row.actualValue" @change="handleEdit(scope.$index,scope.row)"></el-input>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="detailUnit"
+                label="单位">
+              </el-table-column>
+            </el-table>
           </el-tab-pane>
           <el-tab-pane label="工单信息修改">
             <el-row>
@@ -478,11 +456,13 @@ import {getWorkCenter} from "@/api/device/plan";
 
 export default {
 	name: "SpotInspectionOrder",
-  dicts: ['device_order_status', 'device_loop_type'],
+  dicts: ['device_order_status', 'device_loop_type','device_reach_standard'],
 	data() {
 		return {
       dialogImageUrl: '',
       dialogVisible: false,
+      // 记录
+      recordList: [],
       disabled: false,
       // 上传图片弹出层
       imgDialog: false,
@@ -654,6 +634,12 @@ export default {
         if (response.data.timeArray[0] == null) {
           response.data.timeArray = [];
         }
+        for (let i = 0; i < this.form.detailList.length; i++) {
+          for (let j = 0; j < this.form.detailList[i].standardList.length; j++) {
+            this.form.detailList[i].standardList[j].itemName = this.form.detailList[i].itemName;
+            this.recordList.push(this.form.detailList[i].standardList[j]);
+          }
+        }
         this.open = true;
         this.title = "填写记录";
       });
diff --git a/src/views/device/upkeepOrder/index.vue b/src/views/device/upkeepOrder/index.vue
index 4131878..fd925a5 100644
--- a/src/views/device/upkeepOrder/index.vue
+++ b/src/views/device/upkeepOrder/index.vue
@@ -745,73 +745,54 @@
             </el-descriptions>
           </el-tab-pane>
           <el-tab-pane label="记录">
-            <!-- 设备 -->
-            <el-row>
-              <el-col :offset="9" :span="6">
-                <el-form-item label="设备名称:">
-                  {{ this.form.equipmentName }}
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <div v-for="(detail,detailIndex) in form.detailList" :key="detailIndex">
-              <!-- 检查项 -->
-              <el-row>
-                <el-col :span="6">
-                  <el-form-item label="检查项:">
-                    {{ detail.itemName }}
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <div v-for="(standard,standardIndex) in detail.standardList" :key="standardIndex">
-                <div v-if="standard.standardType == 'qualitative' ">
-                  <!-- 标准 -->
-                  <el-row>
-                    <el-col :span="6">
-                      <el-form-item label="标准:">
-                        {{ standard.standardName }}
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="9">
-                      <el-form-item label="是否达标:">
-                        <el-radio v-model="standard.detailReach" label="0">未达标</el-radio>
-                        <el-radio v-model="standard.detailReach" label="1">达标</el-radio>
-                      </el-form-item>
-                    </el-col>
-                  </el-row>
-                </div>
-                <div v-else>
-                  <!-- 标准 -->
-                  <el-row>
-                    <el-col :span="5">
-                      <el-form-item label="标准:">
-                        {{ standard.standardName }}
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="4">
-                      <el-form-item label="上限:">
-                        {{ standard.detailUpLimit }}
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="4">
-                      <el-form-item label="下限:">
-                        {{ standard.detailDownLimit }}
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="4">
-                      <el-form-item label="单位:">
-                        {{ standard.detailUnit }}
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="6">
-                      <el-form-item label="实际值:">
-                        <el-input v-model="standard.actualValue" placeholder="请输入实际值"></el-input>
-                      </el-form-item>
-                    </el-col>
-                  </el-row>
-                </div>
-              </div>
-              <el-divider></el-divider>
-            </div>
+            <el-table
+              :data="recordList"
+              border
+              style="width: 100%">
+              <el-table-column
+                prop="itemName"
+                label="检查项"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="standardName"
+                label="标准名称"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="detailReach"
+                label="是否达标">
+                <template slot-scope="scope">
+                  <el-select v-model="scope.row.detailReach" placeholder="请选择">
+                    <el-option
+                      v-for="item in dict.type.device_reach_standard"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value">
+                    </el-option>
+                  </el-select>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="detailUpLimit"
+                label="上限">
+              </el-table-column>
+              <el-table-column
+                prop="detailDownLimit"
+                label="下限">
+              </el-table-column>
+              <el-table-column
+                prop="actualValue"
+                label="实际值">
+                <template slot-scope="scope">
+                  <el-input v-if="scope.row.standardType == 'quantify' " size="small" v-model="scope.row.actualValue" @change="handleEdit(scope.$index,scope.row)"></el-input>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="detailUnit"
+                label="单位">
+              </el-table-column>
+            </el-table>
           </el-tab-pane>
           <el-tab-pane label="备件">
             <el-table
@@ -898,9 +879,11 @@ import {updateInspectionWork} from "@/api/device/inspectionWork";
 
 export default {
   name: "UpkeepOrder",
-  dicts: ['device_order_status', 'device_loop_type'],
+  dicts: ['device_order_status', 'device_loop_type','device_reach_standard'],
   data() {
     return {
+      // 记录
+      recordList: [],
       // 检验结果
       inspect: '0',
       // 结果检验弹窗
@@ -1371,6 +1354,12 @@ export default {
         if (response.data.timeArray[0] == null) {
           response.data.timeArray = []
         }
+        for (let i = 0; i < this.form.detailList.length; i++) {
+          for (let j = 0; j < this.form.detailList[i].standardList.length; j++) {
+            this.form.detailList[i].standardList[j].itemName = this.form.detailList[i].itemName;
+            this.recordList.push(this.form.detailList[i].standardList[j]);
+          }
+        }
         this.open = true;
         this.title = "填写记录";
       });