Merge branch 'master' of http://git.dongkesoft.com:9001/DK-MES-3.0/mes-web

src/view/pdm/data-collection/finishCheck-add.vue

@@ -153,7 +153,7 @@
     data() {
       let self = this
       return {
-        gradeFlag:null,//改判权限标识
+        gradeFlag: null,//改判权限标识
         tableData: [],
         loading: false,
         tableHeight: 620,
@@ -299,7 +299,7 @@
         modelPdtLabelJson: {},//验证标签集合
         labelModal: false,//验证标签modal
         labelFormData: {},
-        getBarCodeMessage:null,//产品条码信息
+        getBarCodeMessage: null,//产品条码信息
         onProdUserCodeFlag: false,//校验打卡标识
       }
     },
@@ -347,7 +347,7 @@
               this.$Message.error(res.message)
             }
           })
-        }else{
+        } else {
           this.onProdUserCodeFlag = false
         }
       },
@@ -366,8 +366,8 @@
           }
           this.excute(this.$service.collectService, this.$service.collectService.checkBarCode, params).then(res => {
             if (res.code === this.$config.SUCCESS_CODE) {
-              if(0 == parseInt(res.data.flowNodeNum)){
-                this.labelFlag =true
+              if (0 == parseInt(res.data.flowNodeNum)) {
+                this.gradeFlag = true
               }
               this.getBarCodeMessage = res
               //验证标签开启并且工序类型为产品码
@@ -514,13 +514,11 @@
           i.blameStaffId = i.staffId
           i.blameWsJobId = i.jobId
         }
-        if (!this.jobId || this.staffList.filter(it => it.jobId == this.jobId).length == 0) {
-          let _this = this
-          setTimeout(() => {
-            _this.$refs['staff-table-select'].$refs.table.setCheckboxRow(
-              _this.staffList.filter(it => it.defaultFlag), true)
-          }, 200)
-        }
+        let _this = this
+        setTimeout(() => {
+          _this.$refs['staff-table-select'].$refs.table.setCheckboxRow(
+            _this.staffList.filter(it => it.defaultFlag), true)
+        }, 200)
       },
       /**
        *   @desc   : 查询员工
@@ -542,13 +540,11 @@
               i.blameStaffId = i.staffId
               i.blameWsJobId = i.jobId
             }
-            if (!this.jobId || this.staffList.filter(it => it.jobId == this.jobId).length == 0) {
-              let _this = this
-              setTimeout(() => {
-                _this.$refs['staff-table-select'].$refs.table.setCheckboxRow(
-                  _this.staffList.filter(it => it.defaultFlag), true)
-              }, 200)
-            }
+            let _this = this
+            setTimeout(() => {
+              _this.$refs['staff-table-select'].$refs.table.setCheckboxRow(
+                _this.staffList.filter(it => it.defaultFlag), true)
+            }, 200)
           } else {
             this.$Message.error(res.message)
           }
@@ -784,15 +780,6 @@
         }
         //endregion
 
-        //region 缺陷扣罚
-        if (item.dftFineId == null) {
-          this.$Message.error(this.$t('W_069', { 'param': this.$t('dftFineId') }))
-          this.setErrToRow(item, this.$t('W_093', {
-            'param': this.$t('dftFineId')
-          }))// 给行增加错误提示信息
-          return false
-        }
-        //endregion
 
         //region 缺陷位置
         if (item && this.formData.opnGradeKind != this.$config.gradeKindType.excellent && item.pdtPlaceId == null) {
@@ -978,7 +965,7 @@
        */
       validData() {
         //判断是否有改判权限
-        if(!this.gradeFlag){
+        if (!this.gradeFlag) {
           this.$Message.error(this.$t('W_131'))
           return false
         }

src/view/pdm/data-collection/halfCheck-add.vue

@@ -153,7 +153,7 @@
     data() {
       let self = this
       return {
-        gradeFlag:null,//改判权限标识
+        gradeFlag: null,//改判权限标识
         tableData: [],
         loading: false,
         tableHeight: 620,
@@ -347,7 +347,7 @@
               this.$Message.error(res.message)
             }
           })
-        }else{
+        } else {
           this.onProdUserCodeFlag = false
         }
       },
@@ -366,8 +366,8 @@
           }
           this.excute(this.$service.collectService, this.$service.collectService.checkBarCode, params).then(res => {
             if (res.code === this.$config.SUCCESS_CODE) {
-              if(0 == parseInt(res.data.flowNodeNum)){
-                this.labelFlag =true
+              if (0 == parseInt(res.data.flowNodeNum)) {
+                this.gradeFlag = true
               }
               this.getBarCodeMessage = res
               //验证标签开启并且工序类型为产品码
@@ -514,13 +514,11 @@
           i.blameStaffId = i.staffId
           i.blameWsJobId = i.jobId
         }
-        if (!this.jobId || this.staffList.filter(it => it.jobId == this.jobId).length == 0) {
-          let _this = this
-          setTimeout(() => {
-            _this.$refs['staff-table-select'].$refs.table.setCheckboxRow(
-              _this.staffList.filter(it => it.defaultFlag), true)
-          }, 200)
-        }
+        let _this = this
+        setTimeout(() => {
+          _this.$refs['staff-table-select'].$refs.table.setCheckboxRow(
+            _this.staffList.filter(it => it.defaultFlag), true)
+        }, 200)
       },
       /**
        *   @desc   : 查询员工
@@ -542,13 +540,11 @@
               i.blameStaffId = i.staffId
               i.blameWsJobId = i.jobId
             }
-            if (!this.jobId || this.staffList.filter(it => it.jobId == this.jobId).length == 0) {
-              let _this = this
-              setTimeout(() => {
-                _this.$refs['staff-table-select'].$refs.table.setCheckboxRow(
-                  _this.staffList.filter(it => it.defaultFlag), true)
-              }, 200)
-            }
+            let _this = this
+            setTimeout(() => {
+              _this.$refs['staff-table-select'].$refs.table.setCheckboxRow(
+                _this.staffList.filter(it => it.defaultFlag), true)
+            }, 200)
           } else {
             this.$Message.error(res.message)
           }
@@ -784,15 +780,6 @@
         }
         //endregion
 
-        //region 缺陷扣罚
-        if (item.dftFineId == null) {
-          this.$Message.error(this.$t('W_069', { 'param': this.$t('dftFineId') }))
-          this.setErrToRow(item, this.$t('W_093', {
-            'param': this.$t('dftFineId')
-          }))// 给行增加错误提示信息
-          return false
-        }
-        //endregion
 
         //region 缺陷位置
         if (item && this.formData.opnGradeKind != this.$config.gradeKindType.excellent && item.pdtPlaceId == null) {
@@ -978,7 +965,7 @@
        */
       validData() {
         //判断是否有改判权限
-        if(!this.gradeFlag){
+        if (!this.gradeFlag) {
           this.$Message.error(this.$t('W_131'))
           return false
         }

src/view/pdm/data-collection/register-add.vue

@@ -240,9 +240,6 @@
           }
           this.excute(this.$service.collectService, this.$service.collectService.checkBarCode, params).then(res => {
             if (res.code === this.$config.SUCCESS_CODE) {
-              if(0 == parseInt(res.data.flowNodeNum)){
-                this.labelFlag =true
-              }
               this.getBarCodeMessage = res
               //验证标签开启并且工序类型为产品码
               if (this.$config.processType.productCode == this.opnKind && this.labelFlag) {

src/view/pdm/prod-defect/add.vue

@@ -473,10 +473,11 @@
        *   @date   : 2023/3/3 10:09
        *   @author : 寇珊珊
        */
+      //todo  2023年4月13日14:14:52 zdl 损柸原因-损坯
       getReasonForBlankLoss() {
         let params = {
           ftyId: this.$store.state.user.ftyId,
-          defectKind: this.$config.defectKind.moldDamageReason
+          defectKind: this.$config.defectKind.Damage
         }
         this.excute(this.$service.commonService, this.$service.commonService.getProductDefect, params).then(res => {
           if (res.code === this.$config.SUCCESS_CODE) {

src/view/report/code-change-report/index.vue

@@ -64,7 +64,7 @@ export default {
         },
         {
           itemCode: 'changeDate',//变更日期
-          valueFormat: {code: 'hisTime', default: [new Date().toDateStr(), new Date().addDays(1).toDateStr()]},
+          valueFormat: {code: 'hisTime'},
           valueKind: 'DATE_RANGE'
         },
       ],

src/view/report/delivery-blank/index.vue

@@ -95,7 +95,7 @@ export default {
           },
           {
             itemCode: 'renderMTime',
-            valueFormat: {code: 'renderMTime', default: [new Date().toDateStr(), new Date().addDays(1).toDateStr()]},
+            valueFormat: {code: 'renderMTime'},
             valueKind: 'DATE_RANGE',
           },
         ],

src/view/report/in-product-report/index.vue

@@ -107,7 +107,7 @@ export default {
           },
           {
             itemCode: 'renderMTime',
-            valueFormat: {code: 'renderMTime', default: [new Date().toDateStr(), new Date().addDays(1).toDateStr()]},
+            valueFormat: {code: 'renderMTime'},
             valueKind: 'DATE_RANGE',
           },
           // {

src/view/report/missed-scan-report/index.vue

@@ -90,7 +90,7 @@ export default {
           },
           {
             itemCode: 'operationTime',
-            valueFormat: {code: 'opnTime', default: [new Date().toDateStr(), new Date().addDays(1).toDateStr()]},
+            valueFormat: {code: 'opnTime'},
             valueKind: 'DATE_RANGE',
           },
         ],

src/view/report/molding-record-report/index.vue

@@ -112,7 +112,7 @@ export default {
           },
           {
             itemCode: 'moldingDate',
-            valueFormat: {code: 'moldingDate', default: [new Date().toDateStr(), new Date().toDateStr()]},
+            valueFormat: {code: 'moldingDate'},
             valueKind: 'DATE_RANGE',
           },
           {

src/view/report/process-output/index.vue

@@ -101,7 +101,7 @@ export default {
           },
           {
             itemCode: 'operationTime',
-            valueFormat: {code: 'opnTime', default: [new Date().toDateStr(), new Date().addDays(1).toDateStr()]},
+            valueFormat: {code: 'opnTime'},
             valueKind: 'DATE_RANGE',
           },
         ],

src/view/report/product-report/index.vue

@@ -89,7 +89,7 @@ export default {
           },
           {
             itemCode: 'finishTime',
-            valueFormat: {code: 'finishTime', default: [new Date().toDateStr(), new Date().addDays(1).toDateStr()]},
+            valueFormat: {code: 'finishTime'},
             valueKind: 'DATE_RANGE',
           },
           {

src/view/report/production-report/index.vue

@@ -80,7 +80,7 @@ export default {
           },
           {
             itemCode: 'makeDate',
-            valueFormat: {code: 'makeDate', default: [new Date().toDateStr(), new Date().addDays(1).toDateStr()]},
+            valueFormat: {code: 'makeDate'},
             valueKind: 'DATE_RANGE',
           },
         ],