Merge remote-tracking branch 'origin/master'

src/views/device/item/index.vue

@@ -480,6 +480,7 @@
                   <el-input-number
                     v-model="form.itemLoop"
                     label=""
+                    @change="changeVal"
                   ></el-input-number>
                 </el-form-item>
               </el-col>
@@ -823,6 +824,11 @@ export default {
     this.getList();
   },
   methods: {
+    //
+    changeVal() {
+      this.$forceUpdate();//解决点击计数器失效问题
+    },
+
     // 获取设备List-置入穿梭框信息
     setTransfer() {
       getEquipmentList().then((response) => {

src/views/mes/prepare/index.vue

@@ -518,7 +518,7 @@ export default {
         this.refreshNewWorkerTable = true // 立即将refreshProTable设置为true，显示表格
         this.newWorkerLoading = false // 设置加载状态为false，表示加载完成
 
-		this.generateBarcode(this.printData.printDate); //条码 根据打印日期生成
+		this.generateBarcode(this.printData.productDate); //条码 根据打印日期生成
       })
     },