Merge branch 'dev' of http://git.local.topsunit.com/ximai/mes-ui into dev

src/i18n/lang/th_TH.json

@@ -2983,4 +2983,4 @@
 	"请输入整数": "กรุณาใส่จำนวนเต็ม",
 	"输入的不是整数": "ไม่ใช่จำนวนเต็มที่ป้อน",
 	"选择生产工单": "เลือกสั่งงานผลิต"
-}
\ No newline at end of file
+}

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

@@ -31,7 +31,7 @@
               <el-input
                 disabled
                 v-model="form.parentCode"
-               
+
               ></el-input>
             </el-form-item>
           </el-col>
@@ -40,7 +40,7 @@
               <el-input
                 disabled
                 v-model="form.workorderCode"
-               
+
               ></el-input>
             </el-form-item>
           </el-col>
@@ -48,7 +48,7 @@
             <el-form-item :label="$t('工单名称')" prop="workorderName">
               <el-input
                 v-model="form.workorderName"
-               
+
               />
             </el-form-item>
           </el-col>
@@ -126,7 +126,7 @@
                 v-model="form.productionSolutionCode"
                 readonly
                 :disabled="mode == 'make'"
-               
+
               >
                 <el-button
                   slot="append"
@@ -153,7 +153,7 @@
             <el-form-item :label="$t('产品名称')" prop="productName">
               <el-input
                 v-model="form.productName"
-               
+
                 disabled
               />
             </el-form-item>
@@ -162,7 +162,7 @@
             <el-form-item :label="$t('规格型号')" prop="productSpc">
               <el-input
                 v-model="form.productSpc"
-               
+
                 disabled
               />
             </el-form-item>
@@ -171,7 +171,7 @@
             <el-form-item :label="$t('生产数量')" prop="quantity">
               <el-input
                 v-model="form.quantity"
-               
+
                 type="number"
                 min="1"
                 @blur="handleChangeQuantity"
@@ -182,7 +182,7 @@
             <el-form-item :label="$t('计量单位')" prop="unitOfMeasure">
               <el-input
                 v-model="form.unitOfMeasure"
-               
+
                 :disabled="mode == 'make'"
               />
             </el-form-item>
@@ -216,7 +216,7 @@
               <el-input
                 :disabled="mode == 'make'"
                 v-model="form.productionAdministrator"
-               
+
               />
             </el-form-item>
           </el-col>
@@ -225,7 +225,7 @@
               <el-input
                 :disabled="mode == 'make'"
                 v-model="form.stockLocation"
-               
+
               />
             </el-form-item>
           </el-col>
@@ -257,7 +257,7 @@
                 v-model="form.remark"
                 type="textarea"
                 :disabled="mode == 'make'"
-               
+
               />
             </el-form-item>
           </el-col>
@@ -282,7 +282,7 @@
             <el-form-item label="包装单位" prop="packUnitOfMeasure">
               <el-input
                 v-model="form.packUnitOfMeasure"
-               
+
                 :disabled="mode == 'make'"
               />
             </el-form-item>
@@ -294,7 +294,7 @@
             >
               <el-select
                 v-model="form.lossIndividuallyWrap"
-               
+
                 :disabled="mode == 'make'"
               >
                 <el-option
@@ -504,7 +504,7 @@ export default {
         this.gCode();
       }
     }
-    
+
   },
   created() {
     if (this.$route.query && this.$route.query.workorderId && this.workorderId !== this.$route.query.workorderId) {
@@ -629,7 +629,7 @@ export default {
         this.loading = true;
         getWorkorder(id)
           .then(({ data }) => {
-            
+
             Object.assign(this.form, data);
             this.currentData = {}
             if (this.mode == 'make') {
@@ -778,7 +778,7 @@ export default {
         workorderCode: null,
         workorderName: null,
         routeName: null,
-        workorderType: "product",
+        workorderType: "501",
         orderSource: null,
         sourceCode: null,
         productId: null,