修改bug

src/locale/lang/zh-CN.js

@@ -1009,8 +1009,9 @@ export const messages = {
   W_126: '当前没有选择任何未盘点的模具',
   W_127: '当前模具状态为报废，不允许变更型号',
   W_128: '当前模具型号没有变化,不能保存',
-  W_130: '当前暂无可保存，请输入后重新操作',
   W_129: '只能在PDA设备上运行',
+  W_130: '当前暂无可保存，请输入后重新操作',
+  W_131: '当前暂无改判权限',
   E_001: '系统出现异常，请联系管理员。',
   Q_001: '当前页面的数据有过更改，请确认需要保存吗？',
   Q_002: '确定要进行{param}操作吗？',

src/view/mst/mould-check/form.vue

@@ -198,12 +198,13 @@
           modelCategoryIds: this.formData.modelCategoryIds,//模具类别
           mouldKindIds: this.formData.mouldKindIds,//模具状态
           remarks: this.formData.remarks,//备注
+          makeDate:[]
         }
         if(this.formData.makeTimeStart){
           makeItems.makeDate.push(this.formData.makeTimeStart.format())
         }
         if(this.formData.makeTimeEnd){
-          makeItems.makeTimeEnd.push(this.formData.makeTimeEnd.format())
+          makeItems.makeDate.push(this.formData.makeTimeEnd.format())
         }
         if (this.type === this.$config.formMode.add) {
           this.params = {

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

@@ -354,7 +354,7 @@
         })
       },
     },
-    created() {
+    activated() {
       //默认给新建为了保存不关页面
       this.typeData = this.$config.formMode.add
       //获取工位

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

@@ -1,4 +1,4 @@
-<!-- @desc:成检  @auth:寇珊珊  @time:2023年3月7日09:22:05 -->
+<!-- @desc:半检  @auth:寇珊珊  @time:2023年3月7日09:22:05 -->
 <template>
   <div class="main-div">
     <DkPaxeButton :total="editKeys?editKeys.length:0"
@@ -51,6 +51,7 @@
           <DkFormItem prop="opnGradeId" :required="true" :label="$t('gradeClassification')" data-type="number">
             <SelectPop v-model="formData.opnGradeId" ref="gradeName" :multiple="false"
                        :options="gradeList"
+                       :disabled="!gradeFlag"
                        @on-select="chooseGrade"
                        labelKey="gradeName"
                        valueKey="gradeId">
@@ -147,11 +148,12 @@
   import { formMixin } from '@/mixins/form'
 
   export default {
-    name: 'finishCheck-add',
+    name: 'halfCheck-add',
     mixins: [formMixin],
     data() {
       let self = this
       return {
+        gradeFlag:null,//改判权限标识
         tableData: [],
         loading: false,
         tableHeight: 620,
@@ -293,10 +295,11 @@
         pdtDefectId: null,//当前选择的缺陷
         labelFlag: false,//默认验证标签
         pdtLabelKinds: [],//开的验证标签
-        checkModelPdtLabelJson:{},//校验验证标签
-        modelPdtLabelJson:{},//验证标签集合
+        checkModelPdtLabelJson: {},//校验验证标签
+        modelPdtLabelJson: {},//验证标签集合
         labelModal: false,//验证标签modal
-        labelFormData: {}
+        labelFormData: {},
+        getBarCodeMessage:null//产品条码信息
       }
     },
     methods: {
@@ -347,14 +350,27 @@
        */
       onBarCode() {
         if (this.formData.barCode) {
-          //验证标签开启
-          if (this.labelFlag) {
-            this.modalTitle = this.$t('label')  // 给modal标题赋值
-            this.labelModal = true
-          } else {
-            //查询产品条码
-            this.getBarCode()
+          let params = {
+            ftyId: this.formData.ftyId,
+            barCode: this.formData.barCode,
+            prodUserCode: this.formData.prodUserCode,
+            flowNodeId: this.flowNodeId,
           }
+          this.excute(this.$service.collectService, this.$service.collectService.checkBarCode, params).then(res => {
+            if (res.code === this.$config.SUCCESS_CODE) {
+              this.getBarCodeMessage = res
+              //验证标签开启并且工序类型为产品码
+              if (this.$config.processType.productCode == this.opnKind && this.labelFlag) {
+                this.modalTitle = this.$t('label')  // 给modal标题赋值
+                this.labelModal = true
+              } else {
+                //验证产品条码后赋值
+                this.setBarCode(this.getBarCodeMessage)
+              }
+            } else {
+              this.$Message.error(res.message)
+            }
+          })
         }
       },
       /**
@@ -365,7 +381,7 @@
       saveLabel() {
         this.$refs['labelFormInline'].validate().then(valid => {
           if (valid) {
-            this.checkModelPdtLabelJson[this.formData.barCode]=this.pdtLabelKinds
+            this.checkModelPdtLabelJson[this.formData.barCode] = this.pdtLabelKinds
             let params = {
               flowNodeId: this.flowNodeId,
               ftyId: this.formData.ftyId,
@@ -375,12 +391,12 @@
             this.excute(this.$service.collectService, this.$service.collectService.checkLabel, params).then(res => {
               if (res.code === this.$config.SUCCESS_CODE) {
                 this.labelModal = false
-                this.modelPdtLabelJson[this.formData.barCode]=this.pdtLabelKinds.copy()
+                this.modelPdtLabelJson[this.formData.barCode] = this.pdtLabelKinds.copy()
                 for (let i of this.pdtLabelKinds) {
                   i['labelCode'] = ''
                 }
-                //查询产品条码
-                this.getBarCode()
+                //验证产品条码后赋值
+                this.setBarCode(this.getBarCodeMessage)
               } else {
                 this.$Message.error(res.message)
               }
@@ -389,44 +405,32 @@
         })
       },
       /**
-       *   @desc   : 查询产品条码
-       *   @date   : 2023/3/30 11:19
+       *   @desc   : 验证产品条码后赋值
+       *   @date   : 2023/4/4 14:38
        *   @author : 寇珊珊
        */
-      getBarCode() {
-        let params = {
-          ftyId: this.formData.ftyId,
-          barCode: this.formData.barCode,
-          prodUserCode: this.formData.prodUserCode,
-          flowNodeId: this.flowNodeId,
-        }
-        this.excute(this.$service.collectService, this.$service.collectService.checkBarCode, params).then(res => {
-          if (res.code === this.$config.SUCCESS_CODE) {
-            this.modelId = res.data.modelId
-            this.formData.productId = res.data.uniqueId
-            this.formData.productCode = res.data.modelCode
-            this.formData.productName = res.data.modelName
-            this.formData.logoName = res.data.logoName
-            this.formData.colourName = res.data.colourName
-            this.formData.opnGradeId = res.data.opnGradeId
-            this.formData.opnGradeKind = res.data.opnGradeKind
-            if (res.data.productionDefectList && res.data.productionDefectList.length > 0) {
-              let list = res.data.productionDefectList
-              for (let i = 0; i < list.length; i++) {
-                this.editDetailList = list
-              }
-            }
-            //产品等级不为优
-            if (this.formData.opnGradeKind != this.$config.gradeKindType.excellent) {
-              //调用查询缺陷位置
-              this.getDefectPlace()
-            } else {
-              this.defectPlaceList = []
-            }
-          } else {
-            this.$Message.error(res.message)
+      setBarCode(res) {
+        this.modelId = res.data.modelId
+        this.formData.productId = res.data.uniqueId
+        this.formData.productCode = res.data.modelCode
+        this.formData.productName = res.data.modelName
+        this.formData.logoName = res.data.logoName
+        this.formData.colourName = res.data.colourName
+        this.formData.opnGradeId = res.data.opnGradeId
+        this.formData.opnGradeKind = res.data.opnGradeKind
+        if (res.data.productionDefectList && res.data.productionDefectList.length > 0) {
+          let list = res.data.productionDefectList
+          for (let i = 0; i < list.length; i++) {
+            this.editDetailList = list
           }
-        })
+        }
+        //产品等级不为优
+        if (this.formData.opnGradeKind != this.$config.gradeKindType.excellent) {
+          //调用查询缺陷位置
+          this.getDefectPlace()
+        } else {
+          this.defectPlaceList = []
+        }
       },
       /**
        *   @desc   : 产品条码清空
@@ -962,6 +966,11 @@
        *   @author : 寇珊珊
        */
       validData() {
+        //判断是否有改判权限
+        if(!this.gradeFlag){
+          this.$Message.error(this.$t('W_131'))
+          return false
+        }
         //判断是否存在明细 并且 产品等级为瑕、劣
         if (this.editDetailList.length == 0 &&
           (this.formData.opnGradeKind == this.$config.gradeKindType.flaw
@@ -1096,7 +1105,9 @@
       //endregion
 
     },
-    created() {
+    activated() {
+      //改判权限标识
+      this.gradeFlag = this.$libaray.checkButtonHasRight('check-recharge')
       //默认给新建为了保存不关页面
       this.typeData = this.$config.formMode.add
       //查询产品等级

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

@@ -51,6 +51,7 @@
           <DkFormItem prop="opnGradeId" :required="true" :label="$t('gradeClassification')" data-type="number">
             <SelectPop v-model="formData.opnGradeId" ref="gradeName" :multiple="false"
                        :options="gradeList"
+                       :disabled="!gradeFlag"
                        @on-select="chooseGrade"
                        labelKey="gradeName"
                        valueKey="gradeId">
@@ -152,6 +153,7 @@
     data() {
       let self = this
       return {
+        gradeFlag:null,//改判权限标识
         tableData: [],
         loading: false,
         tableHeight: 620,
@@ -293,10 +295,11 @@
         pdtDefectId: null,//当前选择的缺陷
         labelFlag: false,//默认验证标签
         pdtLabelKinds: [],//开的验证标签
-        checkModelPdtLabelJson:{},//校验验证标签
-        modelPdtLabelJson:{},//验证标签集合
+        checkModelPdtLabelJson: {},//校验验证标签
+        modelPdtLabelJson: {},//验证标签集合
         labelModal: false,//验证标签modal
-        labelFormData: {}
+        labelFormData: {},
+        getBarCodeMessage: null//产品条码信息
       }
     },
     methods: {
@@ -347,14 +350,27 @@
        */
       onBarCode() {
         if (this.formData.barCode) {
-          //验证标签开启
-          if (this.labelFlag) {
-            this.modalTitle = this.$t('label')  // 给modal标题赋值
-            this.labelModal = true
-          } else {
-            //查询产品条码
-            this.getBarCode()
+          let params = {
+            ftyId: this.formData.ftyId,
+            barCode: this.formData.barCode,
+            prodUserCode: this.formData.prodUserCode,
+            flowNodeId: this.flowNodeId,
           }
+          this.excute(this.$service.collectService, this.$service.collectService.checkBarCode, params).then(res => {
+            if (res.code === this.$config.SUCCESS_CODE) {
+              this.getBarCodeMessage = res
+              //验证标签开启并且工序类型为产品码
+              if (this.$config.processType.productCode == this.opnKind && this.labelFlag) {
+                this.modalTitle = this.$t('label')  // 给modal标题赋值
+                this.labelModal = true
+              } else {
+                //验证产品条码后赋值
+                this.setBarCode(this.getBarCodeMessage)
+              }
+            } else {
+              this.$Message.error(res.message)
+            }
+          })
         }
       },
       /**
@@ -365,7 +381,7 @@
       saveLabel() {
         this.$refs['labelFormInline'].validate().then(valid => {
           if (valid) {
-            this.checkModelPdtLabelJson[this.formData.barCode]=this.pdtLabelKinds
+            this.checkModelPdtLabelJson[this.formData.barCode] = this.pdtLabelKinds
             let params = {
               flowNodeId: this.flowNodeId,
               ftyId: this.formData.ftyId,
@@ -375,12 +391,12 @@
             this.excute(this.$service.collectService, this.$service.collectService.checkLabel, params).then(res => {
               if (res.code === this.$config.SUCCESS_CODE) {
                 this.labelModal = false
-                this.modelPdtLabelJson[this.formData.barCode]=this.pdtLabelKinds.copy()
+                this.modelPdtLabelJson[this.formData.barCode] = this.pdtLabelKinds.copy()
                 for (let i of this.pdtLabelKinds) {
                   i['labelCode'] = ''
                 }
-                //查询产品条码
-                this.getBarCode()
+                //验证产品条码后赋值
+                this.setBarCode(this.getBarCodeMessage)
               } else {
                 this.$Message.error(res.message)
               }
@@ -389,44 +405,32 @@
         })
       },
       /**
-       *   @desc   : 查询产品条码
-       *   @date   : 2023/3/30 11:19
+       *   @desc   : 验证产品条码后赋值
+       *   @date   : 2023/4/4 14:38
        *   @author : 寇珊珊
        */
-      getBarCode() {
-        let params = {
-          ftyId: this.formData.ftyId,
-          barCode: this.formData.barCode,
-          prodUserCode: this.formData.prodUserCode,
-          flowNodeId: this.flowNodeId,
-        }
-        this.excute(this.$service.collectService, this.$service.collectService.checkBarCode, params).then(res => {
-          if (res.code === this.$config.SUCCESS_CODE) {
-            this.modelId = res.data.modelId
-            this.formData.productId = res.data.uniqueId
-            this.formData.productCode = res.data.modelCode
-            this.formData.productName = res.data.modelName
-            this.formData.logoName = res.data.logoName
-            this.formData.colourName = res.data.colourName
-            this.formData.opnGradeId = res.data.opnGradeId
-            this.formData.opnGradeKind = res.data.opnGradeKind
-            if (res.data.productionDefectList && res.data.productionDefectList.length > 0) {
-              let list = res.data.productionDefectList
-              for (let i = 0; i < list.length; i++) {
-                this.editDetailList = list
-              }
-            }
-            //产品等级不为优
-            if (this.formData.opnGradeKind != this.$config.gradeKindType.excellent) {
-              //调用查询缺陷位置
-              this.getDefectPlace()
-            } else {
-              this.defectPlaceList = []
-            }
-          } else {
-            this.$Message.error(res.message)
+      setBarCode(res) {
+        this.modelId = res.data.modelId
+        this.formData.productId = res.data.uniqueId
+        this.formData.productCode = res.data.modelCode
+        this.formData.productName = res.data.modelName
+        this.formData.logoName = res.data.logoName
+        this.formData.colourName = res.data.colourName
+        this.formData.opnGradeId = res.data.opnGradeId
+        this.formData.opnGradeKind = res.data.opnGradeKind
+        if (res.data.productionDefectList && res.data.productionDefectList.length > 0) {
+          let list = res.data.productionDefectList
+          for (let i = 0; i < list.length; i++) {
+            this.editDetailList = list
           }
-        })
+        }
+        //产品等级不为优
+        if (this.formData.opnGradeKind != this.$config.gradeKindType.excellent) {
+          //调用查询缺陷位置
+          this.getDefectPlace()
+        } else {
+          this.defectPlaceList = []
+        }
       },
       /**
        *   @desc   : 产品条码清空
@@ -962,6 +966,11 @@
        *   @author : 寇珊珊
        */
       validData() {
+        //判断是否有改判权限
+        if(!this.gradeFlag){
+          this.$Message.error(this.$t('W_131'))
+          return false
+        }
         //判断是否存在明细 并且 产品等级为瑕、劣
         if (this.editDetailList.length == 0 &&
           (this.formData.opnGradeKind == this.$config.gradeKindType.flaw
@@ -1096,7 +1105,9 @@
       //endregion
 
     },
-    created() {
+    activated() {
+      //改判权限标识
+      this.gradeFlag = this.$libaray.checkButtonHasRight('half-check-recharge')
       //默认给新建为了保存不关页面
       this.typeData = this.$config.formMode.add
       //查询产品等级

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

@@ -347,7 +347,7 @@
         })
       },
     },
-    created() {
+    activated() {
       //默认给新建为了保存不关页面
       this.typeData = this.$config.formMode.add
       //获取工位

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

@@ -345,7 +345,7 @@
         })
       },
     },
-    created() {
+    activated() {
       //默认给新建为了保存不关页面
       this.typeData = this.$config.formMode.add
       //获取工位

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

@@ -269,7 +269,7 @@
         })
       },
     },
-    created() {
+    activated() {
       //默认给新建为了保存不关页面
       this.typeData = this.$config.formMode.add
       //获取工位

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

@@ -104,7 +104,7 @@
       :maskClosable="false"
     >
       <DkForm ref="labelFormInline" v-model="labelFormData" :col-count="1">
-        <DkFormItem  required :data-type="$config.dataType.str"
+        <DkFormItem required :data-type="$config.dataType.str"
                     v-for="(item,index) in pdtLabelKinds" :key="index" :label="item.labelName">
           <InputPop v-model="item.labelCode" ref="item.labelCode"/>
         </DkFormItem>
@@ -137,7 +137,7 @@
           kilnId: null,
           perCarCode: null,//原载具
         },
-        dressKilnCarFlag:false,//装载具校验标识
+        dressKilnCarFlag: false,//装载具校验标识
         flowNodeId: self.$route.meta.menuUuid,
         tableData: [],
         workStationList: [],//工位数据
@@ -148,11 +148,12 @@
         stationFlag: false,//默认工位标识
         labelFlag: false,//默认验证标签
         pdtLabelKinds: [],//开的验证标签
-        checkModelPdtLabelJson:{},//校验验证标签
-        modelPdtLabelJson:{},//验证标签集合
+        checkModelPdtLabelJson: {},//校验验证标签
+        modelPdtLabelJson: {},//验证标签集合
         labelModal: false,//验证标签modal
-        modalTitle:null,
-        labelFormData: {}
+        modalTitle: null,
+        labelFormData: {},
+        getBarCodeMessage: null//产品条码信息
       }
     },
     methods: {
@@ -214,52 +215,53 @@
        */
       onBarCode() {
         if (this.formData.barCode) {
-          //验证标签开启并且工序类型为产品码
-          if (this.$config.processType.productCode == this.opnKind && this.labelFlag) {
-            this.modalTitle =this.$t('label')  // 给modal标题赋值
-            this.labelModal = true
-          } else {
-            //查询产品条码
-            this.getBarCode()
+          let params = {
+            ftyId: this.formData.ftyId,
+            barCode: this.formData.barCode,
+            prodUserCode: this.formData.prodUserCode,
+            flowNodeId: this.flowNodeId,
           }
+          this.excute(this.$service.collectService, this.$service.collectService.checkBarCode, params).then(res => {
+            if (res.code === this.$config.SUCCESS_CODE) {
+              this.getBarCodeMessage = res
+              //验证标签开启并且工序类型为产品码
+              if (this.$config.processType.productCode == this.opnKind && this.labelFlag) {
+                this.modalTitle = this.$t('label')  // 给modal标题赋值
+                this.labelModal = true
+              } else {
+                //验证产品条码后赋值
+                this.setBarCode(this.getBarCodeMessage)
+              }
+            } else {
+              this.$Message.error(res.message)
+            }
+          })
         }
       },
       /**
-       *   @desc   : 查询产品条码
-       *   @date   : 2023/3/30 8:51
+       *   @desc   : 验证产品条码后赋值
+       *   @date   : 2023/4/4 14:38
        *   @author : 寇珊珊
        */
-      getBarCode() {
-        let params = {
-          ftyId: this.formData.ftyId,
-          barCode: this.formData.barCode,
-          prodUserCode: this.formData.prodUserCode,
-          flowNodeId: this.flowNodeId,
-        }
-        this.excute(this.$service.collectService, this.$service.collectService.checkBarCode, params).then(res => {
-          if (res.code === this.$config.SUCCESS_CODE) {
-            if (this.tableData.filter(it => it.uniqueId == [res.data.uniqueId]).length == 0) {
-              //页面table赋值载具条码
-              if (this.formData.carCode) {
-                res.data.vehicleBarcode = this.formData.carCode
-              }
-              this.tableData = this.tableData.concat(res.data)
-              this.barCodeList.push(this.formData.barCode)
-              this.$refs['table-select'].reloadData(this.tableData)
-              if (this.$config.registerType.singleProduct == this.pieceKind) {
-                this.barCodeList = []
-                this.barCodeList.push(this.formData.barCode)
-                this.save()
-              }
-              //装载具下 产品条码每次查出来都要清空
-              if (this.$config.processType.dressKilnCar == this.opnKind) {
-                this.formData.barCode = null
-              }
-            }
-          } else {
-            this.$Message.error(res.message)
+      setBarCode(res) {
+        if (this.tableData.filter(it => it.uniqueId == [res.data.uniqueId]).length == 0) {
+          //页面table赋值载具条码
+          if (this.formData.carCode) {
+            res.data.vehicleBarcode = this.formData.carCode
           }
-        })
+          this.tableData = this.tableData.concat(res.data)
+          this.barCodeList.push(this.formData.barCode)
+          this.$refs['table-select'].reloadData(this.tableData)
+          if (this.$config.registerType.singleProduct == this.pieceKind) {
+            this.barCodeList = []
+            this.barCodeList.push(this.formData.barCode)
+            this.save()
+          }
+          //装载具下 产品条码每次查出来都要清空
+          if (this.$config.processType.dressKilnCar == this.opnKind) {
+            this.formData.barCode = null
+          }
+        }
       },
       /**
        *   @desc   : 保存验证标签
@@ -269,7 +271,7 @@
       saveLabel() {
         this.$refs['labelFormInline'].validate().then(valid => {
           if (valid) {
-            this.checkModelPdtLabelJson[this.formData.barCode]=this.pdtLabelKinds
+            this.checkModelPdtLabelJson[this.formData.barCode] = this.pdtLabelKinds
             let params = {
               flowNodeId: this.flowNodeId,
               ftyId: this.formData.ftyId,
@@ -278,14 +280,14 @@
             }
             this.excute(this.$service.collectService, this.$service.collectService.checkLabel, params).then(res => {
               if (res.code === this.$config.SUCCESS_CODE) {
-                this.checkModelPdtLabelJson={}
+                this.checkModelPdtLabelJson = {}
                 this.labelModal = false
-                this.modelPdtLabelJson[this.formData.barCode]=this.pdtLabelKinds.copy()
+                this.modelPdtLabelJson[this.formData.barCode] = this.pdtLabelKinds.copy()
                 for (let i of this.pdtLabelKinds) {
                   i['labelCode'] = ''
                 }
-                //查询产品条码
-                this.getBarCode()
+                //验证产品条码后赋值
+                this.setBarCode(this.getBarCodeMessage)
               } else {
                 this.$Message.error(res.message)
               }
@@ -321,7 +323,7 @@
           this.excute(this.$service.collectService, this.$service.collectService.checkCarrierCode, params).then(res => {
             if (res.code === this.$config.SUCCESS_CODE) {
               //如果是装载具
-              if(this.opnKind == this.$config.processType.dressKilnCar){
+              if (this.opnKind == this.$config.processType.dressKilnCar) {
                 this.dressKilnCarFlag = true
               }
               if (this.opnKind == this.$config.processType.unloadKilnCar ||
@@ -449,7 +451,7 @@
         })
       },
     },
-    created() {
+    activated() {
       //默认给新建为了保存不关页面
       this.typeData = this.$config.formMode.add
       //获取工位

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

@@ -292,7 +292,7 @@
         })
       },
     },
-    created() {
+    activated() {
       //默认给新建为了保存不关页面
       this.typeData = this.$config.formMode.add
       //获取工位

src/view/pdm/prod-check/form.vue

@@ -21,12 +21,12 @@
                              @ok="chooseProcessNode"></SelectMagnifier>
           </DkFormItem>
           <!--完成时间-开始-->
-          <DkFormItem prop="finishTimeStart" required :data-type="$config.dataType.date">
+          <DkFormItem prop="finishTimeStart"  :data-type="$config.dataType.date">
             <DatePickerPop ref="finishTimeStart" :readonly="typeData==$config.formMode.edit"
                            v-model="formData.finishTimeStart" type="datetime"/>
           </DkFormItem>
           <!--完成时间-结束-->
-          <DkFormItem prop="finishTimeEnd" required :data-type="$config.dataType.date">
+          <DkFormItem prop="finishTimeEnd"  :data-type="$config.dataType.date">
             <DatePickerPop ref="finishTimeEnd" :readonly="typeData==$config.formMode.edit"
                            v-model="formData.finishTimeEnd" type="datetime"/>
           </DkFormItem>
@@ -39,8 +39,8 @@
                              @ok="chooseModelCategory"></SelectMagnifier>
           </DkFormItem>
           <!--产品条码-->
-          <DkFormItem prop="productCodeList" :label="$t('barCode')">
-            <SelectMagnifier v-model="formData.productCodeList"
+          <DkFormItem prop="productIdList" :label="$t('barCode')">
+            <SelectMagnifier v-model="formData.productIdList"
                              :display-text="formData.productCodeList?formData.productCodeList.toString():null"
                              :type="this.$config.MagnifierType.product"
                              :disabled="typeData==$config.formMode.edit"
@@ -102,6 +102,7 @@
           finishTimeStart: null,//完成时间开始
           finishTimeEnd: null,//完成时间结束
           productCodeList: null,//产品编码(保存需要）
+          productIdList: null,//产品编码
           modelCategory: null,//产品类别(保存需要）
           modelCategoryName: null,//产品类别
           prodUserNameList: null,//生产工号
@@ -264,6 +265,7 @@
         this.formData.flowNodeNameList = null//盘点工序
         this.formData.finishTimeStart = null//完成时间开始
         this.formData.finishTimeEnd = null//完成时间结束
+        this.formData.productIdList = null//产品编码
         this.formData.productCodeList = null//产品编码(保存需要）
         this.formData.modelCategory = null//产品类别(保存需要）
         this.formData.modelCategoryName = null//产品类别