Merge remote-tracking branch 'origin/dev' into dev

src/i18n/lang/th_TH.json

@@ -387,7 +387,7 @@
 	"研发管理系统": "ระบบการจัดการการพัฒนา",
 	"生产执行管理系统": "ระบบการจัดการการผลิต",
 	"订单管理系统": "ระบบจัดการใบสั่งซื้อ",
-	"希迈MES系统": "ระบบ HIMAI MES",
+	"希迈MES系统": "Thai Xi Mai MES System",
 	"设备总数": "จำนวนอุปกรณ์ทั้งหมด",
 	"运行中": "กำลังทำงาน",
 	"待机": "รอการทำงาน",
@@ -2992,5 +2992,6 @@
 	"是否故障": "ไม่ว่าจะเป็นความล้มเหลว",
 	"排程日期": "วันที ่ กําหนดการ",
 	"该工序已添加，请勿重复添加": "มีการเพิ่มขั้นตอนห้ามเพิ่มซ้ำ",
-	"所属产线": "สายการผลิต"
+	"所属产线": "สายการผลิต",
+	"打印次数必须是整数": "จำนวนการพิมพ์ต้องเป็นจำนวนเต็ม"
 }

src/i18n/lang/zh_CN.json

@@ -2992,5 +2992,6 @@
 	"是否故障": "是否故障",
     "排程日期": "排程日期",
 	"该工序已添加，请勿重复添加": "该工序已添加，请勿重复添加",
-	"所属产线": "所属产线"
+	"所属产线": "所属产线",
+	"打印次数必须是整数": "打印次数必须是整数"
 }

src/views/mes/pro/productionSolution/components/ProogingProcess.vue

@@ -76,6 +76,19 @@
           />
         </template>
       </el-table-column>
+      <el-table-column :label="$t('工序流向')" prop="directionProcessId" align="center" width="160">
+        <template slot-scope="scope">
+          <el-select v-model="scope.row.directionProcessId" filterable :disabled="mode == 'info'"
+          @change="(v) => choosedirectionProcess(v, scope.row, scope.$index)">
+            <el-option
+              v-for="item in processOptions"
+              :key="item.processId"
+              :label="item.processName"
+              :value="item.processId"
+            ></el-option>
+          </el-select>
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('common.workstation_code')" prop="workstationCode" align="center" width="130">
         <template slot-scope="scope">
           <el-select v-model="scope.row.workstationId" :disabled="mode == 'info'" filterable @change="(v) => chooseworkstationName(v, scope.row, scope.$index)">
@@ -554,6 +567,9 @@ export default {
         processId: null,
         processCode: null,
         workstationName: null,
+        directionProcessId: null,
+        directionProcessCode: null,
+        directionProcessName: null,
         workstationId: null,
         workstationCode: null,
         stdWorkingTime: null,
@@ -844,6 +860,11 @@ export default {
         this.tableData.push(JSON.parse(JSON.stringify(this.breakData)))
       }
     },
+    choosedirectionProcess(e, row, index) {
+      const item = this.processOptions.find(v => v.processId === e)
+      row['directionProcessCode'] = item.processCode
+      row['directionProcessName'] = item.processName
+    },
     chooseworkstationName(e, row, index) {
       const item = this.workstationList.find(v => v.workstationId === e)
       row['workstationName'] = item.workstationName

src/views/mes/pro/qrcodeRecord/index.vue

@@ -92,6 +92,13 @@
                 @keyup.enter.native="handleQuery"
               />
             </el-form-item>
+            <el-form-item :label="$t('打印次数')" prop="printTime">
+              <el-input
+                v-model="queryParams.printTime"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
             <el-form-item>
               <el-button
                 type="primary"
@@ -485,6 +492,9 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
+      if (!this.queryWorkParams.printTime && this.queryParams.printTime.indexOf('.') > -1) {
+        return this.$message.error(this.$t('打印次数必须是整数'))
+      }
       if (!this.queryWorkParams.workorderCode && !this.queryParams.qrcode) {
         return this.$message.error(this.$t('请输入查询条件'))
       }