冰排释冷要求、保温箱预冷要求

src/components/tables.vue

@@ -82,7 +82,7 @@
                 <div v-else-if="child.field == 'suitableForCold'">
                   {{scope.row.suitableForCold ? scope.row.suitableForCold + '℃' : ''}}
                 </div>
-                <div v-else>{{nestedField(scope.row,child.field)}}</div>
+                <div v-else>{{nestedField(scope.row,child.field) || ''}}</div>
               </template>
             </el-table-column>
           </template>
@@ -131,7 +131,7 @@
           </template>
         </el-table-column>
         <el-table-column :prop="item.field" :label="item.label" :width="item.colWidth" :align="item.align"
-          v-else-if="item.field == 'for_cold_cooler_time'">
+          v-else-if="['for_cold_cooler_time','forColdTime'].includes(item.field)">
           <template slot-scope="scope">
             <div>{{scope.row[item.field] || ''}}</div>
           </template>

src/views/IceCreamFreezer/iceRaft.js

@@ -47,7 +47,7 @@ export const employee = () => {
       label: '释冷时间',
       align: 'center',
     }, {
-      field: 'iceRaftRecord.forColdTime',
+      field: 'forColdTime',
       label: '释冷要求',
       align: 'center',
     }, {
@@ -55,7 +55,7 @@ export const employee = () => {
       label: '释冷温度',
       align: 'center',
     }, {
-      field: 'iceRaftRecord.ice_cold_address',
+      field: 'iceColdAddress',
       label: '释冷地点',
       align: 'center',
     }]
@@ -126,10 +126,14 @@ export const usageEmployee = () => {
       label: '释冷日期',
       align: 'center',
     }, {
-      field: 'start_ice_cold_time',
+      field: 'coolingTime',
       label: '释冷时间',
       align: 'center',
     }, {
+      field: 'forColdTime',
+      label: '释冷要求',
+      align: 'center',
+    }, {
       field: 'suitableForCold',
       label: '释冷温度',
       align: 'center',
@@ -143,7 +147,7 @@ export const usageEmployee = () => {
     label: '使用日期',
     align: 'center',
   }, {
-    field: 'ice_use_time',
+    field: 'iceTime',
     label: '使用时间',
     align: 'center',
   }, {
@@ -186,23 +190,31 @@ export const historyRecord = () => {
     field: 'multistage',
     label: '冰排释冷',
     children: [{
-      field: 'iceRaftRecord.start_ice_cold_time',
+      field: 'start_ice_cold_time',
       label: '释冷日期',
       align: 'center',
     }, {
-      field: 'iceRaftRecord.start_ice_cold_time',
+      field: 'coolingTime',
       label: '释冷时间',
       align: 'center',
     }, {
+      field: 'forColdTime',
+      label: '释冷要求',
+      align: 'center',
+    }, {
       field: 'suitableForCold',
       label: '释冷温度',
       align: 'center',
     }, {
-      field: 'iceRaftRecord.ice_cold_address',
+      field: 'ice_cold_address',
       label: '释冷地点',
       align: 'center',
     }]
   }, {
+    field: 'returnDate',
+    label: '归还时间',
+    align: 'center',
+  }, {
     field: 'action',
     label: '操作',
     colWidth: '160px',