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

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

src/i18n/lang/zh_CN.json

@@ -2978,5 +2978,6 @@
 	"是否紧急": "是否紧急",
 	"是否委外": "是否委外",
 	"订单项次": "订单项次",
-	"订单号": "订单号"
+	"订单号": "订单号",
+	"生产版本号必填且应为数字": "生产版本号必填且应为数字"
 }

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

@@ -32,7 +32,7 @@
       >
         <el-row>
           <el-col :lg="6" :md="8" :sm="12" :xs="12">
-            <el-form-item :label="$t('生产版本编码')" prop="productionSolutionCode">
+            <el-form-item :label="$t('生产版本号')" prop="productionSolutionCode">
               <el-input
                 v-model="form.productionSolutionCode"
                 placeholder
@@ -144,7 +144,7 @@
 <script>
 
 
-import { genCode } from "@/api/system/autocode/rule";
+// import { genCode } from "@/api/system/autocode/rule";
 import ProogingBom from "./components/ProogingBom.vue";
 import ProogingProcess from "./components/ProogingProcess.vue";
 import ItemSelect from "@/components/itemSelect/single.vue";
@@ -253,9 +253,9 @@ export default {
   methods: {
     //自动生成编码
     handleAutoGenChange() {
-      genCode("PRO_SOLUTION_CODE").then((response) => {
-        this.form.productionSolutionCode = response;
-      });
+      // genCode("PRO_SOLUTION_CODE").then((response) => {
+      //   this.form.productionSolutionCode = response;
+      // });
     },
     updateItemUpload(items) {
       this.form.drawingList = items;
@@ -310,6 +310,7 @@ export default {
     },
     /**提交 */
     saveForm() {
+      if(!this.form.productionSolutionCode || isNaN(Number(this.form.productionSolutionCode))) return this.$modal.msgError(this.$t('生产版本号必填且应为数字'));
       const bomHead = this.$refs.ProogingBomRef.getComData();
       const processList = this.$refs.ProogingProcessRef.getComData();
       if (typeof processList === 'boolean') return