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

src/i18n/lang/th_TH.json

@@ -2983,6 +2983,9 @@
 	"请输入整数": "กรุณาใส่จำนวนเต็ม",
 	"输入的不是整数": "ไม่ใช่จำนวนเต็มที่ป้อน",
 	"选择生产工单": "เลือกสั่งงานผลิต",
+	"编码时间格式说明":"คําอธิบายรูปแบบเวลาการเข้ารหัส",
+	"yy=2位年份 yyyy=4位年份 dd=当月哪天 DDD=当年哪天 HH=24小时制 hh=12小时制 mm=分钟 ss=秒": "yy = ปี 2 บิต yyyy = ปี 4 บิต dd = วันของเดือน ddd = วันของปี hh = 24 ชั่วโมง hh = 12 ชั่วโมง mm = นาที ss = วินาที",
+	"日期流水间隔符": "อักขระค ่ าระหว ่ างการไหลของวัน",
 	"该工单当前状态为": "สถานะปัจจุบันของใบสั่งงานคือ",
 	", 不允许修改": ", ไม่อนุญาตให้แก้ไข",
 	"是否故障": "ไม่ว่าจะเป็นความล้มเหลว"

src/i18n/lang/zh_CN.json

@@ -2983,6 +2983,9 @@
 	"请输入整数": "请输入整数",
 	"输入的不是整数": "输入的不是整数",
 	"选择生产工单": "选择生产工单",
+	"编码时间格式说明":"编码时间格式说明",
+	"yy=2位年份 yyyy=4位年份 dd=当月哪天 DDD=当年哪天 HH=24小时制 hh=12小时制 mm=分钟 ss=秒": "yy=2位年份 yyyy=4位年份 dd=当月哪天 DDD=当年哪天 HH=24小时制 hh=12小时制 mm=分钟 ss=秒",
+	"日期流水间隔符": "日期流水间隔符",
 	"该工单当前状态为": "该工单当前状态为",
 	", 不允许修改": ", 不允许修改",
 	"是否故障": "是否故障"

src/views/mes/md/product/index.vue

@@ -45,10 +45,6 @@
             <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
               @click="handleDelete">{{ $t('common.del') }}</el-button>
           </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="multiple"
-              @click="handBecomeFormalProduct">{{$t('转正式产品')}}</el-button>
-          </el-col>
           <el-col :span="1.5">
             <el-button type="success" plain size="mini"
               @click="handleSyncData">{{$t('ERP数据同步')}}</el-button>

src/views/mes/md/workstation/index.vue

@@ -206,23 +206,6 @@
         label-width="120px"
       >
         <el-row>
-          <el-col :span="12">
-            <el-form-item :label="$t('工厂')" prop="factoryCode">
-              <el-select
-                v-model="form.factoryCode"
-                class="form-item"
-                clearable
-               
-              >
-                <el-option
-                  v-for="item in factoryCodes"
-                  :key="item.value"
-                  :value="item.value"
-                  :label="item.label"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('工作中心编号')" prop="workstationCode">
               <el-input
@@ -242,10 +225,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('所在车间')" prop="workshopName">
-              <el-select v-model="form.workshopName">
+            <el-form-item :label="$t('所在车间')" prop="workshopId">
+              <el-select v-model="form.workshopId" @change="chooseWorkshop">
                 <el-option v-for="item in workshopOptions" :key="item.workshopId" :label="item.workshopName"
-                  :value="item.workshopName"></el-option>
+                  :value="item.workshopId"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -435,6 +418,16 @@ export default {
         this.workshopOptions = response.data;
       });
     },
+    chooseWorkshop() {
+      var op = this.workshopOptions.findLast((item) =>{
+        if(item.workshopId == this.form.workshopId){
+          return item;
+        }
+      });
+      console.log(op)
+      this.form.workshopName = op.workshopName;
+      this.form.workshopCode = op.workshopCode;
+    },
     //查询工序信息
     getProcess() {
       listAllProcess().then((response) => {

src/views/mes/md/workunit/index.vue

@@ -89,7 +89,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('common.workstation')" label-width="120px" prop="workstationName">
-              <el-input v-model="form.workstationName">
+              <el-input v-model="form.workstationName" readonly="readonly">
                 <el-button slot="append" icon="el-icon-search" @click="handleWorkstationSelect"></el-button>
               </el-input>
               <WorkstationSelect ref="workstationSelect" @onSelected="onWorkstationSelected"> </WorkstationSelect>

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

@@ -124,6 +124,7 @@
           align="center"
           prop="datePattern"
       />
+      <el-table-column :label="$t('日期流水间隔符')" align="center" prop="dateSerialSpace" />
       <el-table-column
         :label="$t('目前号段')"
         align="center"
@@ -171,7 +172,7 @@
     />
 
     <!-- 添加或修改产品二维码规则对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="750px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="110px">
         <el-row>
           <el-col :lg="12" :md="12" :sm="24" :xs="24">
@@ -200,6 +201,11 @@
               <el-input v-model="form.datePattern" />
             </el-form-item>
           </el-col>
+          <el-col :lg="12" :md="12" :sm="24" :xs="24">
+            <el-form-item :label="$t('日期流水间隔符')" prop="dateSerialSpace">
+              <el-input v-model="form.dateSerialSpace" />
+            </el-form-item>
+          </el-col>
           <el-col :lg="12" :md="12" :sm="24" :xs="24">
             <el-form-item :label="$t('编码流水长度')" prop="serialLen">
               <el-input-number v-model="form.serialLen" :min="0" :step="1" style="width: 100%" />
@@ -242,6 +248,15 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col>
+            <el-alert :closable="false"
+                :title="$t('编码时间格式说明')"
+                type="error"
+                :description="$t('yy=2位年份 yyyy=4位年份 dd=当月哪天 DDD=当年哪天 HH=24小时制 hh=12小时制 mm=分钟 ss=秒')">
+            </el-alert>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">{{
@@ -403,6 +418,7 @@ export default {
         itemCode: null,
         prefix: null,
         datePattern: null,
+        dateSerialSpace:null,
         serialLen: 0,
         itemDesc: null,
         clientCode: null,
@@ -495,4 +511,3 @@ export default {
   },
 }
 </script>
-  
\ No newline at end of file

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

@@ -402,7 +402,7 @@ export default {
         routeName: null,
         groupKey: null,
         groupCounter: null,
-        workorderType: "product",
+        workorderType: "501",
         orderSource: null,
         sourceCode: null,
         productId: null,