Browse Source

Merge branch 'linwenxin_dev' of https://gogs.zfire.top/zfire-front/zfire-newmall-admin into develop

linwenxin 1 year ago
parent
commit
330c548f69

+ 6 - 6
src/views/workOrder/workOrderPool/detailModule/workOrderInfo/mixins/workOrderLogic.js

@@ -274,14 +274,14 @@ export default {
           isRules: [...required]
         },
         workerId: {
-          isEdit: !finish && !this.orderInfo.isQd,
-          isShow: !this.orderInfo.isQd,
-          isRules: this.userInfo.type != 1 ? [...required] : []
+          isEdit: !finish,
+          isShow: true,
+          isRules: this.userInfo.type != 1 && !this.orderInfo.isQd ? [...required] : []
         },
         orderWorkers: {
-          isEdit: !finish && !this.orderInfo.isQd,
-          isShow: !this.orderInfo.isQd || this.orderInfo.orderWorkers.length,
-          isRules: this.userInfo.type != 1 ? [...required] : []
+          isEdit: !finish,
+          isShow: true,
+          isRules: this.userInfo.type != 1 && !this.orderInfo.isQd ? [...required] : []
         },
       }
     },