hh 1 viikko sitten
vanhempi
commit
79b4a2883a

+ 1 - 1
entry/src/main/ets/common/constants/CommonConstants.ets

@@ -54,7 +54,7 @@ export default class CommonConstants {
     ['jiluxiang', '2'],
     ['duomeiticaiji', '3'],
     ['ESOP', '4'],
-    // ['dianjian', '5'],
+    ['dianjian', '5'],
     ['shebeijilu', '6'],
     ['jingu', '7'],
     // ['tiaoshipipei', '8'],

+ 22 - 0
entry/src/main/ets/pages/ProcessIndex.ets

@@ -709,6 +709,17 @@ struct ProcessIndex {
                           }
                         }
                       }
+                      // 过滤掉点检工步
+                      this.opComponents = this.opComponents.filter(item => item.compentType !== '5');
+                      this.opComponents.unshift({
+                        compentName:'自检',
+                        compentType: '5',
+                        deleted:0,
+                        operationId: this.selectOperationId,
+                        processRouteId:'0',
+                        remark:'',
+                        sortNum:0
+                      })
                     })
                 }
                 .width('65%')
@@ -978,6 +989,17 @@ struct ProcessIndex {
                   }
                 }
               }
+              // 过滤掉点检工步
+              this.opComponents = this.opComponents.filter(item => item.compentType !== '5');
+              this.opComponents.unshift({
+                compentName:'自检',
+                compentType: '5',
+                deleted:0,
+                operationId: this.selectOperationId,
+                processRouteId: this.process?.id,
+                remark:'',
+                sortNum:0
+              })
             }
             this.scanState = 1
           })

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 66 - 87
entry/src/main/ets/view/process/SelfInspectView.ets


+ 2 - 1
entry/src/main/ets/viewmodel/PageInfo.ets

@@ -1,11 +1,12 @@
 import DeviceInfo from './DeviceInfo'
 import MaterialInfo from './MaterialInfo'
 import OperationItem from './OperationItem'
+import ProcessCheck from './process/ProcessCheck'
 import { UserInfo } from './UserInfo'
 
 export default interface PageInfo {
   pageNo?:string,
   pageSize?:string,
   //消息记录
-  records?: MaterialInfo[] | OperationItem[] | UserInfo[] | DeviceInfo[]
+  records?: MaterialInfo[] | ProcessCheck[] | OperationItem[] | UserInfo[] | DeviceInfo[]
 }