修改bug

src/locale/lang/zh-CN.js

@@ -1063,6 +1063,7 @@ export const columns = {
   externalNo: '外部编号',
   qualityNoName: '重烧标识',
   staffCodeName:'员工',
+  moldlineTagNames:'实验标识',
 }
 
 /**

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

@@ -704,6 +704,9 @@
           }
           this.excute(this.$service.collectService, this.$service.collectService.checkNodeDefectCode, params).then(res => {
             if (res.code === this.$config.SUCCESS_CODE) {
+              if (!this.detailList[rowIndex]) {
+                this.detailList.splice(rowIndex, 0, {})
+              }
               this.$set(this.detailList[rowIndex], 'defectCode', row[field])
               //扣罚id
               this.$set(this.detailList[rowIndex], 'pdtDefectId', res.data.defectId)

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

@@ -33,7 +33,7 @@
                       @on-blur="onBarCode"/>
           </DkFormItem>
           <!--窑炉编码-->
-          <DkFormItem v-if="opnKind && opnKind==$config.processType.kilnCode" :required="true" prop="kilnId"
+          <DkFormItem  :required="true" prop="kilnId"
                       :label="$t('kilnCode')">
             <SelectPop v-model="formData.kilnId" ref="kilnId"
                        :multiple="false"

src/view/pdm/data-collection/mixin/half-check.js

@@ -558,6 +558,9 @@ export const halfCheckMixin = {
         }
         this.excute(this.$service.collectService, this.$service.collectService.checkNodeDefectCode, params).then(res => {
           if (res.code === this.$config.SUCCESS_CODE) {
+            if (!this.detailList[rowIndex]) {
+              this.detailList.splice(rowIndex, 0, {})
+            }
             this.$set(this.detailList[rowIndex], 'defectCode', row[field])
             //扣罚id
             this.$set(this.detailList[rowIndex], 'pdtDefectId', res.data.defectId)

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

@@ -35,7 +35,7 @@
                       @on-blur="onBarCode"/>
           </DkFormItem>
           <!--窑炉编码-->
-          <DkFormItem v-if="opnKind && opnKind==$config.processType.kilnCode" :required="true" prop="kilnId"
+          <DkFormItem  :required="true" prop="kilnId"
                       :label="$t('kilnCode')">
             <SelectPop v-model="formData.kilnId" ref="kilnId"
                        :multiple="false"

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

@@ -384,12 +384,12 @@
        *   @author : 寇珊珊
        */
       detail(id) {
-
         let param = {
           'moldlineId': parseInt(id),
           'pdtGlueKind': this.$route.query.pdtGlueKind,
           'moldingBatch': this.$route.query.moldingBatch,
           'moldingDate': this.$route.query.moldingDate,
+          'productFlag': this.$route.query.productFlag,
           'ftyId': this.$store.state.user.ftyId
         }
         return this.excute(this.$service.moldingRecordItemService, this.$service.moldingRecordItemService.selectByMoldineId, param).then(res => {

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

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

src/view/pdm/molding-record/bind-barcode.vue

@@ -255,8 +255,8 @@
        *   @author : 寇珊珊
        */
       revokeBindBarcode() {
-        let pdtUniqueIdList = this.$refs['moldingRecord'].tableData.filter(it=>it.checkBoxFlag).map(map => map.pdtUniqueId)
-        if (pdtUniqueIdList.length == 0) {
+        let pdtUniqueIdList = this.$refs['moldingRecord'].tableData.filter(it=>it.checkBoxFlag && it.pdtUniqueId).map(map => map.pdtUniqueId)
+        if (pdtUniqueIdList.length == 0 || pdtUniqueIdList == null) {
           this.$Message.warning(this.$t('W_150'))
           return
         }
@@ -295,6 +295,7 @@
           'pdtGlueKind': this.$route.query.pdtGlueKind,
           'moldingBatch': this.$route.query.moldingBatch,
           'moldingDate': this.$route.query.moldingDate,
+          'productFlag': this.$route.query.productFlag,
           'ftyId': this.$store.state.user.ftyId
         }
         return this.excute(this.$service.moldingRecordItemService, this.$service.moldingRecordItemService.selectByMoldineId, param).then(res => {

src/view/pdm/molding-record/damage.vue

@@ -99,6 +99,7 @@
         :clearCheckFlag="false"
         :auto-width-flag="false"
         :autoWidthFlag="false"
+        :choose-flag="false"
         primaryKey="moldingId" >
         <!--成型线-->
         <DkTableColumn field="moldlineCodeName" :title="$t('moldlineCodeName')" width="200"></DkTableColumn>
@@ -264,17 +265,7 @@ export default {
         if(this.searchCond._value.moldingDate){
           param = Object.assign(param, this.searchCond._value)
         }
-        // else{
-        //   this.searchCond._value.moldingDate= new Date().toDateStr()
-        //   param = Object.assign(param, this.searchCond._value)
-        // }
       }
-      // if (!param.moldingDate) {
-      //   this.$Message.warning(this.$t('W_093', {
-      //     'param': this.$t('moldingDate')
-      //   }))
-      //   return
-      // }
       this.loading = true;
       this.excute(this.$service.moldingRecordService, this.$service.moldingRecordService.selectMoldingGiveDamage, param).then(res => {
         if (res.code === this.$config.SUCCESS_CODE) {

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

@@ -223,6 +223,7 @@ export default {
               'pdtGlueKind': rows[0].pdtGlueKind,
               'moldingBatch': rows[0].moldingBatch,
               'moldingDate': rows[0].moldingDate,
+              'productFlag':true,
             }
           })
         }
@@ -234,6 +235,7 @@ export default {
               'pdtGlueKind': rows[0].pdtGlueKind,
               'moldingBatch': rows[0].moldingBatch,
               'moldingDate': rows[0].moldingDate,
+              'productFlag':true,
             }
           })
         }
@@ -245,6 +247,7 @@ export default {
               'pdtGlueKind': rows[0].pdtGlueKind,
               'moldingBatch': rows[0].moldingBatch,
               'moldingDate': rows[0].moldingDate,
+              'productFlag':true,
             }
           })
         } else {

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

@@ -29,7 +29,8 @@
                :current-page="pageInfo.currentPage"
                :height="tableHeight "
                @pageChange="pageSizeChange">
-        <DkTableColumn field="flowName"></DkTableColumn>
+        <DkTableColumn field="flowName" :title="$t('processFlow')"></DkTableColumn>
+        <DkTableColumn field="moldlineTagNames" ></DkTableColumn>
         <DkTableColumn field="nodeName" :title="$t('productionProcess')"></DkTableColumn>
         <DkTableColumn field="pdtNodeName" :title="$t('currentNode')"></DkTableColumn>
         <DkTableColumn field="pdtUniqueCode" :title="$t('pdtBarcode')" ></DkTableColumn>
@@ -110,6 +111,15 @@ export default {
             valueKind: self.$config.docUserInput.sSearch,
             magnifierType: self.$config.MagnifierType.product,
           },
+          //实验标识
+          {
+            itemCode: 'moldlineTags',
+            itemName: 'flgExperimentList',
+            valueFormat: {code: 'moldlineTags'},
+            valueKind: self.$config.docUserInput.mSearch,
+            magnifierType: self.$config.MagnifierType.dictionaryData,
+            otherCondition:{dictCode:self.$config.dictType.moldlineTag}
+          },
           //操作时间
           {
             itemCode: 'operationTime',