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

# Conflicts:
#	src/i18n/lang/th_TH.json

src/i18n/lang/th_TH.json

@@ -2979,5 +2979,8 @@
 	"是否委外": "ไม่ว่าจะเป็นนอกสภา",
 	"订单项次": "รายการสั่งซื้อ",
 	"订单号": "หมายเลขการสั่งซื้อ",
-	"生产版本号必填且应为数字": "หมายเลขรุ่นการผลิต จำเป็นและควรเป็นตัวเลข"
+	"生产版本号必填且应为数字": "หมายเลขรุ่นการผลิต จำเป็นและควรเป็นตัวเลข",
+	"请输入整数": "กรุณาใส่จำนวนเต็ม",
+	"输入的不是整数": "ไม่ใช่จำนวนเต็มที่ป้อน",
+	"选择生产工单": "เลือกสั่งงานผลิต"
 }

src/i18n/lang/zh_CN.json

@@ -2979,5 +2979,8 @@
 	"是否委外": "是否委外",
 	"订单项次": "订单项次",
 	"订单号": "订单号",
-	"生产版本号必填且应为数字": "生产版本号必填且应为数字"
+	"生产版本号必填且应为数字": "生产版本号必填且应为数字",
+	"请输入整数": "请输入整数",
+	"输入的不是整数": "输入的不是整数",
+	"选择生产工单": "选择生产工单"
 }

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

@@ -202,7 +202,7 @@
           </el-col>
           <el-col :lg="12" :md="12" :sm="24" :xs="24">
             <el-form-item :label="$t('编码流水长度')" prop="serialLen">
-              <el-input v-model="form.serialLen" />
+              <el-input-number v-model="form.serialLen" :min="0" :step="1" style="width: 100%" />
             </el-form-item>
           </el-col>
           <el-col :lg="12" :md="12" :sm="24" :xs="24">
@@ -216,6 +216,8 @@
               </el-input>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :lg="12" :md="12" :sm="24" :xs="24">
             <el-form-item :label="$t('客户编码')" prop="clientCode">
               <el-input v-model="form.clientCode">
@@ -225,8 +227,6 @@
                   icon="el-icon-search"
                 ></el-button>
               </el-input>
-              <ClientSelect ref="clientSelect" @onSelected="onClientSelected">
-              </ClientSelect>
             </el-form-item>
           </el-col>
           <el-col :lg="12" :md="12" :sm="24" :xs="24">
@@ -273,6 +273,8 @@
         }}</el-button>
       </div>
     </el-dialog>
+    <ClientSelect ref="clientSelect" @onSelected="onClientSelected">
+    </ClientSelect>
     <ItemSelect ref="itemSelect" @onSelected="onItemSelected"> </ItemSelect>
   </div>
 </template>
@@ -328,6 +330,10 @@ export default {
       visible: false,
       // 表单校验
       rules: {
+        serialLen: [
+          { required: true, message: this.$t('请输入整数'), trigger: 'blur' },
+          { type: 'integer', message: this.$t('输入的不是整数'), trigger: 'blur' }
+        ],
         itemCode: [
           {
             required: true,
@@ -397,7 +403,7 @@ export default {
         itemCode: null,
         prefix: null,
         datePattern: null,
-        serialLen: null,
+        serialLen: 0,
         itemDesc: null,
         clientCode: null,
         clientName: null,

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

@@ -278,11 +278,35 @@
         <el-button @click="cancel">{{ $t('common.cancel') }}</el-button>
       </div>
     </el-dialog>
+    <!-- 标签模板对话框 -->
+    <el-dialog
+      :title="$t('标签模板')"
+      :visible.sync="printVisible"
+      width="960px"
+      append-to-body
+    >
+      <templatePrint
+        ref="templatePrintRef"
+        v-if="printVisible"
+        type="single"
+        reportType="qrcode"
+        :operation="false"
+      ></templatePrint>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="handleSubmitPrint">{{
+          $t('common.confirm')
+        }}</el-button>
+        <el-button @click="printVisible = false">{{
+          $t('common.cancel')
+        }}</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
   
   <script>
 import { workorderList } from '@/api/mes/pro/packageLablePrint'
+import templatePrint from '@/views/mes/report/index'
 
 import {
   listQrcodeRecord,
@@ -295,10 +319,14 @@ import {
 import { postBatchPrintPdf }  from '@/utils/ruoyi'
 export default {
   name: 'QrcodeRecord',
+  components: {
+    templatePrint
+  },
   data() {
     return {
       // 遮罩层
       loading: false,
+      printVisible: false,
       // 遮罩层
       workorderloading: false,
       workorderList: [],
@@ -375,12 +403,24 @@ export default {
       }
       this.getList()
     },
+    handleSubmitPrint() {
+      if (!this.$refs.templatePrintRef.selectedItemId) {
+        this.$message.warning(this.$t('请选择标签模板'))
+        return
+      }
+      this.selectRow[0]['templateName1'] = this.$refs.templatePrintRef.currentData.name
+      this.printVisible = false
+      this.printQrCode()
+    },
     handlePrint() {},
     printQrCode() {
       const promise = []
       let detail = []
-      if(!this.selectRow[0].templateName) {
+      const templateName = this.selectRow[0].templateName || this.selectRow[0].templateName1
+      if(!templateName) {
         this.$message.warning(this.$t('没有配置标签模版'))
+        this.printVisible = true
+        return
       }
       this.selectRow.forEach((s, i) => {
         promise.push(s.recordId)
@@ -392,7 +432,7 @@ export default {
           }]
         })
       })
-      postBatchPrintPdf(this.selectRow[0].templateName, detail)
+      postBatchPrintPdf(templateName, detail)
       if (promise.length > 0) {
         editList(promise).then((res) => {
           this.getList()

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

@@ -421,7 +421,7 @@
 
     <!-- 排程 -->
     <el-dialog
-      :title="$t('选择编排单')"
+      :title="$t('选择生产工单')"
       :visible.sync="scheduleVisible"
       width="1000px"
       append-to-body

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

@@ -20,7 +20,11 @@
       <el-table-column :label="$t('common.workunit_name')" v-if="mode === 'makeInfo'" prop="workunitName" align="center" />
       <el-table-column :label="$t('标准工时')" prop="stdWorkingTime" align="center" />
       <el-table-column :label="$t('换型时间')" prop="lineBreakTime" align="center" />
-      <el-table-column :label="$t('工时单位')" prop="stdWorkingTimeUom" align="center" />
+      <el-table-column :label="$t('工时单位')" prop="stdWorkingTimeUom" align="center" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.mes_time_type" :value="scope.row.stdWorkingTimeUom" />
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('基本数量')" prop="quantity" align="center" />
       <el-table-column :label="$t('委外数量')" prop="assistQuantity" align="center" />
       <el-table-column :label="$t('是否委外')" align="center" prop="outsourced" >
@@ -201,7 +205,7 @@ export default {
     WorkuintSelect
   },
   inject: ["mode"],
-  dicts: ["process_control_code", "sys_yes_no"],
+  dicts: ["process_control_code", "sys_yes_no", "mes_time_type"],
   props: {
     bomList: {
       type: Array,

src/views/mes/pro/workorder/indexApply.vue

@@ -730,11 +730,8 @@ export default {
       if (row != undefined && row != null) {
         form.productionSolutionId = row.productionSolutionId;
         form.productionSolutionCode = row.productionSolutionCode;
-        form.productCode = row.itemCode;
         form.groupCounter = row.groupCounter;
         form.groupKey = row.groupKey;
-        form.productName = row.itemName;
-        form.productId = row.itemId;
         form.productionSolutionName = row.productionSolutionName;
         const params = {
           pageNum: 1,

src/views/mes/pro/workorder/proofingInfo.vue

@@ -20,6 +20,7 @@
         :model="form"
         ref="form"
         :rules="rules"
+        :disabled="mode == 'info' || mode == 'makeInfo'"
         size="small"
         :inline="true"
         label-width="8em"

src/views/mes/qc/report/index.vue

@@ -137,7 +137,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleComplete(scope.row)"
-            :disabled="scope.row.abnormalStatus !== 'SUBMIT'"
+            :disabled="scope.row.abnormalStatus === 'CLOSE' || scope.row.abnormalStatus === 'NOT' || scope.row.abnormalStatus === 'FINISH'"
             v-hasPermi="['qc:report:edit']"
           >{{$t('完成')}}</el-button>
            <!-- <el-button
@@ -150,14 +150,14 @@
             size="mini"
             type="text"
             @click="handleStart(scope.row)"
-            :disabled="scope.row.abnormalStatus !== 'NOT'"
+            :disabled="scope.row.abnormalStatus === 'CLOSE' || scope.row.abnormalStatus === 'FINISH' || scope.row.abnormalStatus === 'SUBMIT'"
             v-hasPermi="['qc:report:edit']"
           >{{ $t('开始') }}</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
-            :disabled="scope.row.abnormalStatus === 'SUBMIT' || scope.row.abnormalStatus === 'NOT'"
+            :disabled="scope.row.abnormalStatus === 'CLOSE' || scope.row.abnormalStatus === 'FINISH'"
             @click="handleClose(scope.row)"
             v-hasPermi="['qc:report:remove']"
           >{{ $t('关闭') }}</el-button>