Parcourir la source

修改成型记录和成型记录绑码 展示数据

koushanshan il y a 2 ans
Parent
commit
d1853846a2

+ 1 - 0
src/view/pdm/molding-record/bind-barcode-group.vue

@@ -390,6 +390,7 @@
           'moldingBatch': this.$route.query.moldingBatch,
           'moldingDate': this.$route.query.moldingDate,
           'productFlag': this.$route.query.productFlag,
+          'modelFlag': this.$route.query.modelFlag,
           'ftyId': this.$store.state.user.ftyId
         }
         return this.excute(this.$service.moldingRecordItemService, this.$service.moldingRecordItemService.selectByMoldineId, param).then(res => {

+ 3 - 2
src/view/pdm/molding-record/bind-barcode-grouping.vue

@@ -455,6 +455,7 @@
           'moldingBatch': this.$route.query.moldingBatch,
           'moldingDate': this.$route.query.moldingDate,
           'productFlag': this.$route.query.productFlag,
+          'modelFlag': this.$route.query.modelFlag,
           'ftyId': this.$store.state.user.ftyId
         }
         return this.excute(this.$service.moldingRecordItemService, this.$service.moldingRecordItemService.selectByMoldineId, param).then(res => {
@@ -497,13 +498,13 @@
             //明细的绑定条码不可以修改
             this.$set(item, 'readOnly', ['productUniqueCode'])
             //如果明细里绑定条码存在没值的情况;总单绑定条码可以输入 反之不可以;明细有值没值都要禁用
-            if (item.productUniqueCode) {
+            if (item.productUniqueCode ) {
               item.exchangeFlag = false
               productUniqueCodeLength++
               item.readOnlyUniqueCode = true
             }
             //明细不是成型
-            if (!item.flgMolding) {
+            if (!item.flgMolding && item.pdtModelId) {
               item.exchangeFlag = false
               flgMoldingLength++
             }

+ 1 - 0
src/view/pdm/molding-record/bind-barcode.vue

@@ -296,6 +296,7 @@
           'moldingBatch': this.$route.query.moldingBatch,
           'moldingDate': this.$route.query.moldingDate,
           'productFlag': this.$route.query.productFlag,
+          'modelFlag': this.$route.query.modelFlag,
           'ftyId': this.$store.state.user.ftyId
         }
         return this.excute(this.$service.moldingRecordItemService, this.$service.moldingRecordItemService.selectByMoldineId, param).then(res => {

+ 3 - 2
src/view/pdm/molding-record/form.vue

@@ -696,10 +696,11 @@ export default {
       this.moldingRecordList = moldingItemlist
       for(let i in  this.moldingRecordList){
         if(!this.moldingRecordList[i].modelCode){
-          if(this.moldingRecordList[i].unmoldedReasonId){
+          if(!this.moldingRecordList[i].unmoldedReasonId){
             this.moldingRecordList[i].unmoldedReasonId = this.unmoldedReasonList[0].dataId
+            this.moldingRecordList[i].flgMolding = false
+            this.$set(this.moldingRecordList[i], 'readOnly', ['flgMolding'])
           }
-          // todo   如何禁用行
           this.$set(this.moldingRecordList[i], 'readOnly','all')
         }
       }

+ 3 - 0
src/view/pdm/molding-record/index.vue

@@ -224,6 +224,7 @@ export default {
               'moldingBatch': rows[0].moldingBatch,
               'moldingDate': rows[0].moldingDate,
               'productFlag':true,
+              'modelFlag':true,
             }
           })
         }
@@ -236,6 +237,7 @@ export default {
               'moldingBatch': rows[0].moldingBatch,
               'moldingDate': rows[0].moldingDate,
               'productFlag':true,
+              'modelFlag':true,
             }
           })
         }
@@ -248,6 +250,7 @@ export default {
               'moldingBatch': rows[0].moldingBatch,
               'moldingDate': rows[0].moldingDate,
               'productFlag':true,
+              'modelFlag':true,
             }
           })
         } else {