From 377ce2bdb2fcd4e211c139649d96fd4c5ad74b0b Mon Sep 17 00:00:00 2001
From: wws <18630710203@163.com>
Date: Tue, 24 Oct 2023 18:00:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E6=8C=81=E6=8E=A5=E5=8F=A3-=E5=B7=A1?=
 =?UTF-8?q?=E6=A3=80=E5=B7=A5=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device/deviceOrder/index.vue | 91 ++++++++++++++------------
 1 file changed, 49 insertions(+), 42 deletions(-)

diff --git a/src/views/device/deviceOrder/index.vue b/src/views/device/deviceOrder/index.vue
index ff14620..432d910 100644
--- a/src/views/device/deviceOrder/index.vue
+++ b/src/views/device/deviceOrder/index.vue
@@ -312,7 +312,7 @@
           <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column  width="180" label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
+      <el-table-column width="180" label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -348,72 +348,76 @@
         <el-tabs type="border-card">
           <el-tab-pane label="基础信息">
             <el-descriptions title="">
-              <el-descriptions-item label="计划编码">{{this.form.planCode}}</el-descriptions-item>
-              <el-descriptions-item label="计划名称">{{this.form.planName}}</el-descriptions-item>
-              <el-descriptions-item label="循环周期">{{this.form.planLoop}}{{this.form.planLoopType}}</el-descriptions-item>
-              <el-descriptions-item label="工单编码">{{this.form.orderCode}}</el-descriptions-item>
-              <el-descriptions-item label="车间编码">{{this.form.planWorkshop}}</el-descriptions-item>
-              <el-descriptions-item label="工作中心">{{this.form.workCenterName}}</el-descriptions-item>
+              <el-descriptions-item label="计划编码">{{ this.form.planCode }}</el-descriptions-item>
+              <el-descriptions-item label="计划名称">{{ this.form.planName }}</el-descriptions-item>
+              <el-descriptions-item label="循环周期">{{ this.form.planLoop }}{{ this.form.planLoopType }}
+              </el-descriptions-item>
+              <el-descriptions-item label="工单编码">{{ this.form.orderCode }}</el-descriptions-item>
+              <el-descriptions-item label="车间编码">{{ this.form.planWorkshop }}</el-descriptions-item>
+              <el-descriptions-item label="工作中心">{{ this.form.workCenterName }}</el-descriptions-item>
             </el-descriptions>
           </el-tab-pane>
           <el-tab-pane label="记录">
             <!-- 设备 -->
-            <div v-for="(equ , equIndex) in this.form.equList" :key="equIndex">
+            <el-row>
+              <el-col :offset="9" :span="6">
+                <el-form-item label="设备名称:">
+                  {{ this.form.equ.equipmentName }}
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <div v-for="(detail,detailIndex) in form.equ.detailList" :key="detailIndex">
+              <!-- 检查项 -->
               <el-row>
-                <el-col :offset="9" :span="6">
-                  <el-form-item label="设备名称">
-                    {{equ.equipmentName}}
+                <el-col :span="6">
+                  <el-form-item label="检查项:">
+                    {{ detail.itemName }}
                   </el-form-item>
                 </el-col>
               </el-row>
-              <!-- 检查项 -->
-              <div v-for="(detail,detailIndex) in equ.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">
-                  <el-row v-if="standard.standardType == 'qualitative' ">
+              <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}}
+                        {{ standard.standardName }}
                       </el-form-item>
                     </el-col>
-                    <el-row>
-                      <el-form-item label="是否达标">
+                    <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-row>
+                    </el-col>
                   </el-row>
-                  <el-row v-else>
-                    <el-col :span="6">
+                </div>
+                <div v-else>
+                  <!-- 标准 -->
+                  <el-row>
+                    <el-col :span="5">
                       <el-form-item label="标准:">
-                        {{standard.standardName}}
+                        {{ standard.standardName }}
                       </el-form-item>
                     </el-col>
                     <el-col :span="4">
-                      <el-form-item label-width="50px" label="上限:">
-                        {{standard.detailUpLimit}}
+                      <el-form-item label="上限:">
+                        {{ standard.detailUpLimit }}
                       </el-form-item>
                     </el-col>
                     <el-col :span="4">
-                      <el-form-item label-width="50px" label="下限:">
-                        {{standard.detailDownLimit}}
+                      <el-form-item label="下限:">
+                        {{ standard.detailDownLimit }}
                       </el-form-item>
                     </el-col>
                     <el-col :span="4">
-                      <el-form-item label-width="50px" label="单位:">
-                        {{standard.detailUnit}}
+                      <el-form-item label="单位:">
+                        {{ standard.detailUnit }}
                       </el-form-item>
                     </el-col>
-                    <el-col :span="4">
-                      <el-form-item label-width="50px" label="实际值:">
-                        <el-input v-model="standard.actualValue" placeholder="请输入值"></el-input>
+                    <el-col :span="6">
+                      <el-form-item label="实际值:">
+                        <el-input v-model="standard.actualValue" placeholder="请输入实际值"></el-input>
                       </el-form-item>
                     </el-col>
                   </el-row>
@@ -470,7 +474,7 @@ import {
 
 export default {
   name: "DeviceOrder",
-  dicts: ['device_order_status','device_loop_type'],
+  dicts: ['device_order_status', 'device_loop_type'],
   data() {
     return {
       // 遮罩层
@@ -524,7 +528,9 @@ export default {
         updateTime: null
       },
       // 表单参数
-      form: {},
+      form: {
+        equ: {equipmentName: null},
+      },
       // 表单校验
       rules: {}
     };
@@ -577,7 +583,8 @@ export default {
         createBy: null,
         createTime: null,
         updateBy: null,
-        updateTime: null
+        updateTime: null,
+        equ: {equipmentName: null},
       };
       this.resetForm("form");
     },