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

src/components/productionSolution/index.vue

@@ -41,10 +41,14 @@
           <el-table-column :label="$t('工序编码')" width="120px" fixed align="center" prop="processCode" />
           <el-table-column :label="$t('工序名称')" width="150px" fixed align="center" prop="processName" />
           <el-table-column :label="$t('标准工时')" width="150px" align="center" prop="stdWorkingTime" />
-          <el-table-column :label="$t('common.workstation')" width="150px" align="center" prop="workstationName" />
-          <el-table-column :label="$t('工序总量')" width="100px" align="center" prop="keyFlag" />
+          <el-table-column :label="$t('common.workstation_name')" width="150px" align="center" prop="workstationName" />
+          <el-table-column :label="$t('common.workstation_code')" width="150px" align="center" prop="workstationCode" />
           <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_work_time" :value="scope.row.stdWorkingTimeUom" />
+            </template>
+          </el-table-column>
           <el-table-column :label="$t('工序总数量')" prop="quantity" align="center" />
         </el-table>
       </el-tab-pane>
@@ -71,6 +75,7 @@ export default {
   props: {
     itemCode: null,
   },
+  dicts: ["mes_work_time"],
   data() {
     return {
       showFlag: false,

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

@@ -365,7 +365,7 @@
                
               >
                 <el-option
-                  v-for="dict in dict.type.mes_time_type"
+                  v-for="dict in dict.type.mes_work_time"
                   :key="dict.value"
                   :label="dict.label"
                   :value="dict.value"
@@ -523,7 +523,7 @@ export default {
   dicts: [
     "process_control_code",
     "sys_yes_no",
-    "mes_time_type",
+    "mes_work_time",
     "mes_work_time",
     "product_shape",
   ],

src/views/mes/pro/proroute/product.vue

@@ -156,7 +156,7 @@
                 <el-form-item label="时间单位" prop="timeUnitType">
                     <el-select v-model="form.timeUnitType">
                         <el-option
-                        v-for="dict in dict.type.mes_time_type"
+                        v-for="dict in dict.type.mes_work_time"
                         :key="dict.value"
                         :label="dict.label"
                         :value="dict.value"
@@ -196,7 +196,7 @@ import Routeproductbom from "./routeproductbom.vue"
 import ItemSelect  from "@/components/itemSelect/single.vue";
 export default {
   name: "Routeproduct",
-  dicts: ['mes_time_type'],
+  dicts: ['mes_work_time'],
   components: {ItemSelect,Routeproductbom},
   data() {
     return {

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

@@ -22,7 +22,7 @@
       <el-table-column :label="$t('换型时间')" prop="lineBreakTime" 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" />
+          <dict-tag :options="dict.type.mes_work_time" :value="scope.row.stdWorkingTimeUom" />
         </template>
       </el-table-column>
       <el-table-column :label="$t('基本数量')" prop="quantity" align="center" />
@@ -205,7 +205,7 @@ export default {
     WorkuintSelect
   },
   inject: ["mode"],
-  dicts: ["process_control_code", "sys_yes_no", "mes_time_type"],
+  dicts: ["process_control_code", "sys_yes_no", "mes_work_time"],
   props: {
     bomList: {
       type: Array,

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

@@ -118,10 +118,10 @@
         <el-button type="success" plain size="mini" :disabled="single"
           @click="handleWorkProcess">{{$t('工艺路线更新')}}</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleMake"
           v-hasPermi="['mes:pro:workorder:make']">{{$t('生产补单')}}</el-button>
-      </el-col>
+      </el-col> -->
       <el-col :span="1.2">
         <el-button type="warning" plain size="mini" v-print="printContent" id="printbtn" style="display: none"
           >{{$t('打印工单')}}</el-button>

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

@@ -139,7 +139,7 @@
           </el-col>
           <el-col :lg="6" :md="8" :sm="12" :xs="12">
             <el-form-item :label="$t('产品编号')" prop="productCode">
-              <el-input :disabled="mode == 'make'" v-model="form.productCode">
+              <el-input :disabled="mode == 'make'" readonly v-model="form.productCode">
                 <el-button
                   slot="append"
                   v-if="!(mode === 'make' ||  mode === 'makeInfo')"
@@ -685,15 +685,16 @@ export default {
     //物料选择弹出框
 
     onRoutesProcessSelect(row) {
-      console.log('row44', row)
       if (row != undefined && row != null) {
         this.form.productionSolutionId = row.productionSolutionId;
         this.form.productionSolutionCode = row.productionSolutionCode;
-        this.form.productCode = row.itemCode;
         this.form.groupCounter = row.groupCounter;
         this.form.groupKey = row.groupKey;
-        this.form.productName = row.itemName;
-        this.form.productId = row.itemId;
+        if (!this.form.productId) {
+          this.form.productCode = row.itemCode;
+          this.form.productName = row.itemName;
+          this.form.productId = row.itemId;
+        }
         this.form.productionSolutionName = row.productionSolutionName;
         const params = {
           pageNum: 1,