完善大屏

src/views/sb/info/modules/BaseFormMeasure.vue

@@ -21,6 +21,7 @@
               <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="350px">选择父设备</th>
@@ -43,6 +44,7 @@
               </a-switch></td>
               <td>{{ item.sbName }}</td>
               <td>{{ item.sbModel }}</td>
+              <td><div v-if="item.sbStatus"> {{ item.zzh }}</div><a-input style="width: 150px" v-else v-model="item.zzh" /></td>
               <td>{{ item.isChild === 1?'是':'否' }}</td>
               <td>
                 <div v-if="item.sbStatus">{{ item.sbPositionName }}</div>
@@ -229,6 +231,7 @@ export default {
           name: this.username,
           sbId: item.id,
           type: 1,
+          zzh: item.zzh,
           checkImgList: [],
           checkFileList: []
         }
@@ -325,10 +328,10 @@ export default {
 
       this.ListForm.forEach(item => {
         switch (true) {
-          case item.sbStatus || (item.no === '' && (item.lastDate === '' || item.lastDate === null)) :
+          case item.sbStatus || (item.requirement === '' && (item.lastDate === '' || item.lastDate === null)) :
             break
-          case item.no === '':
-            this.$message.warning(item.sbName + '的检定单号不能为空！')
+          case item.requirement === '':
+            this.$message.warning(item.sbName + '的检定单位不能为空！')
             status = true
             break
           case item.lastDate === '' || item.lastDate === null:
@@ -340,7 +343,7 @@ export default {
       })
       if (status) return
       const params = {
-        sbMeasureLogDTOList: this.ListForm.filter(item => !(!item.sbStatus && item.no === '' && item.lastDate === ''))
+        sbMeasureLogDTOList: this.ListForm.filter(item => !(!item.sbStatus && item.requirement === '' && item.lastDate === ''))
       }
       // console.log(params)
       importMeasure(params).then(res => {