guarantee-lsq 2 жил өмнө
parent
commit
6938b4ce7a

+ 5 - 1
src/views/sb/change-record/SbChangeRecord.vue

@@ -150,8 +150,12 @@ export default {
               return '设备位置变更'
             } else if (text === 2) {
               return '设备位号变更'
-            } else {
+            } else if (text === 3) {
               return '父设备变更'
+            } else if (text === 4) {
+              return '状态变更'
+            } else if (text === 5) {
+              return '设备原号变更'
             }
           }
         },

+ 2 - 2
src/views/sb/info/modules/BaseFormMeasure.vue

@@ -28,10 +28,10 @@
               <th width="150px">设备位号</th>
               <th width="150px">检定周期</th>
               <th width="150px">检定日期</th>
+              <th width="150px">下次检定日期</th>
               <th width="150px">检定单号</th>
               <th width="150px">检定单位</th>
               <th width="150px">备注</th>
-              <th width="150px">有效期</th>
               <th width="150px">操作</th>
             </tr>
           </thead>
@@ -89,10 +89,10 @@
                   style="width: 150px"
                   :format="BaseTool.Date.PICKER_NORM_DATE_PATTERN"
                   v-model="item.lastDate" /></td>
+              <td>{{ validity(item.lastDate,item.checkPeriod) }}</td>
               <td><div v-if="item.sbStatus"> {{ item.no }}</div><a-input v-else style="width: 150px" v-model="item.no" /></td>
               <td><div v-if="item.sbStatus"> {{ item.requirement }}</div><a-input v-else style="width: 150px" v-model="item.requirement" /></td>
               <td><div v-if="item.sbStatus"> {{ item.remark }}</div><a-input v-else style="width: 150px" v-model="item.remark" /></td>
-              <td>{{ validity(item.lastDate,item.checkPeriod) }}</td>
               <td>
                 <a-button type="link" @click="uploadImg(item,i)">上传图片</a-button>
                 <a-button type="link" @click="uploadFile(item,i)">上传文件</a-button>