问题清单

src/i18n/lang/th_TH.json

@@ -1386,7 +1386,6 @@
 	"辅助材料": "วัสดุเสริม",
 	"材料URL": "ลิงค์วัสดุ",
 	"工序不能为空": "กระบวนการไม่สามารถว่างเปล่าได้",
-	"是否包装工序": "นี่คือกระบวนการบรรจุหรือไม่",
 	"是否序列号报工": "นี่คือการรายงานการทำงานของหมายเลขซีเรียลหรือไม่",
 	"工序说明": "คำอธิบายกระบวนการ",
 	"操作步骤": "ขั้นตอนการดำเนินการ",
@@ -2958,5 +2957,6 @@
 	"出厂检验": "การตรวจสอบโรงงาน",
 	"库位设置": "การตั้งค่าไลบรารี",
 	"分配角色": "กำหนดบทบาท",
-	"菜单字段": "menuNameTh"
+	"菜单字段": "menuNameTh",
+	"工时单位必选": "หน่วยชั่วโมงการทํางานเป็นข้อบังคับ"
 }
\ No newline at end of file

src/i18n/lang/zh_CN.json

@@ -1386,7 +1386,6 @@
 	"辅助材料": "辅助材料",
 	"材料URL": "材料URL",
 	"工序不能为空": "工序不能为空",
-	"是否包装工序": "是否包装工序",
 	"是否序列号报工": "是否序列号报工",
 	"工序说明": "工序说明",
 	"操作步骤": "操作步骤",
@@ -2958,5 +2957,6 @@
 	"出厂检验": "出厂检验",
 	"库位设置": "库位设置",
 	"分配角色": "分配角色",
-	"菜单字段": "menuName"
+	"菜单字段": "menuName",
+	"工时单位必选": "工时单位必选"
 }

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

@@ -227,7 +227,6 @@
             <el-form-item :label="$t('工作中心编号')" prop="workstationCode">
               <el-input
                 v-model="form.workstationCode"
-                disabled
                 maxlength="64"
               />
             </el-form-item>
@@ -244,9 +243,13 @@
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('所在车间')" prop="workshopName">
-              <el-input v-model="form.workshopName" />
+              <el-select v-model="form.workshopName">
+                <el-option v-for="item in workshopOptions" :key="item.workshopId" :label="item.workshopName"
+                  :value="item.workshopName"></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
+          
         </el-row>
         <el-row>
           <el-col :span="24">
@@ -391,6 +394,9 @@ export default {
         workstationCode: [
           { required: true, message: this.$t('工作中心编号不能为空'), trigger: "blur" },
         ],
+        workshopName: [
+          { required: true, message: this.$t('请选择所属车间'), trigger: "blur" },
+        ],
         workstationName: [
           { required: true, message: this.$t('工作中心名称不能为空'), trigger: "blur" },
         ],

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

@@ -147,9 +147,13 @@
                     </el-form-item>
                 </el-col>
                 <el-col :lg="12" :md="12" :sm="24" :xs="24">
-                    <el-form-item :label="$t('客户编码')" prop="clientCode">
-                        <el-input v-model="form.clientCode" />
-                    </el-form-item>
+                  <el-form-item :label="$t('客户编码')" prop="clientCode">
+                    <el-input v-model="form.clientCode">
+                      <el-button slot="append" @click="handleSelectClient" 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">
                     <el-form-item :label="$t('客户名称')" prop="clientName">
@@ -180,9 +184,12 @@
   
   import { listProQrcodeRule, getProQrcodeRule, delProQrcodeRule, addProQrcodeRule, updateProQrcodeRule } from "@/api/mes/pro/proQrcodeRule";
   import ItemSelect from "@/components/itemSelect/single.vue";
+  import ClientSelect from "@/components/clientSelect/single.vue";
+
   export default {
     components: {
-        ItemSelect
+        ItemSelect,
+        ClientSelect
     },
     name: "ProQrcodeRule",
     data() {
@@ -232,6 +239,16 @@
         this.form.itemId = obj.itemId;
         this.form.itemDesc = obj.itemDesc;
       }
+    },
+    handleSelectClient() {
+      this.$refs.clientSelect.showFlag = true;
+    },
+    onClientSelected(obj) {
+      if (obj != undefined && obj != null) {
+        this.form.clientId = obj.clientId;
+        this.form.clientCode = obj.clientCode;
+        this.form.clientName = obj.clientName;
+      }
     },
       /** 查询产品二维码规则列表 */
       getList() {

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

@@ -103,11 +103,6 @@
           <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.enableFlag"/>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('是否包装工序')" align="center" prop="isPackage">
-        <template slot-scope="scope">
-          {{ scope.row.isPackage === '1'? $t('是'): $t('否') }}
-        </template>
-      </el-table-column>
       <el-table-column :label="$t('是否序列号报工')" align="center" prop="isSerialReport">
         <template slot-scope="scope">
           {{ (scope.row.isSerialReport && Number(scope.row.isSerialReport) === 1)? $t('是'): $t('否') }}
@@ -164,7 +159,7 @@
               <el-input v-model="form.processName" />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="12">
             <el-form-item :label="$t('是否启用')" prop="enableFlag">
                <el-radio-group v-model="form.enableFlag" disabled v-if="optType=='view'">
                 <el-radio
@@ -182,29 +177,7 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item :label="$t('是否包装工序')" prop="isPackage">
-               <!-- <el-radio-group v-model="form.isPackage">
-                <el-radio label="1">是</el-radio>
-                <el-radio label="0">否</el-radio>
-              </el-radio-group> -->
-              <el-radio-group v-model="form.isPackage" disabled v-if="optType=='view'">
-                <el-radio
-                  v-for="dict in dict.type.sys_yes_non"
-                  :key="dict.value"
-                  :label="dict.value"
-                >{{dict.label}}</el-radio>
-              </el-radio-group>
-              <el-radio-group v-model="form.isPackage" v-else>
-                <el-radio
-                  v-for="dict in dict.type.sys_yes_non"
-                  :key="dict.value"
-                  :label="dict.value"
-                >{{dict.label}}</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
+          <el-col :span="12">
             <el-form-item :label="$t('是否序列号报工')" prop="isSerialReport" label-width="110px">
                <!-- <el-radio-group v-model="form.isSerialReport">
                 <el-radio label="1">是</el-radio>

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

 <template>
   <div>
-    <el-table :data="tableData">
+    <el-table :data="tableData" border>
       <el-table-column align="center" label="" width="165">
         <template slot-scope="scope">
           <el-button
@@ -200,7 +200,7 @@
           />
         </template>
       </el-table-column>
-      <el-table-column :label="$t('工序备注')" prop="processRemark" align="center" >
+      <el-table-column :label="$t('工序备注')" prop="processRemark" align="center" width="140">
         <template slot-scope="scope">
           <el-input
             v-model="scope.row.processRemark"
@@ -736,9 +736,12 @@ export default {
           this.$message.warning(this.$t('标准工时必填'))
           isNULL = true
           break
+        } else if (item.processName && !item.stdWorkingTimeUom) {
+          this.$message.warning(this.$t('工时单位必选'))
+          isNULL = true
+          break
         }
       }
-      console.log('isNULL', isNULL)
       if (isNULL) {
         return isNULL
       }

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

 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item :label="$t('成品物料号')" prop="sapItemCode">
-        <el-input v-model="queryParams.sapItemCode" clearable @keyup.enter.native="handleQuery" />
+      <el-form-item :label="$t('成品物料号')" prop="itemCode">
+        <el-input v-model="queryParams.itemCode" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item :label="$t('成品物名称')" prop="itemName">
         <el-input v-model="queryParams.itemName" clearable @keyup.enter.native="handleQuery" />
@@ -31,7 +31,7 @@
         </template>
       </el-table-column>
       <el-table-column :label="$t('产品版本名称')" align="center" prop="productionSolutionName" :show-overflow-tooltip="true" />
-      <el-table-column :label="$t('成品物料编码')" align="center" prop="sapItemCode" />
+      <el-table-column :label="$t('成品物料编码')" align="center" prop="itemCode" />
       <el-table-column :label="$t('成品物料名称')" align="center" prop="itemName" />
       <el-table-column :label="$t('生产用途')" align="center" prop="usageName" />
       <el-table-column :label="$t('打样订单')" align="center" prop="sapPrototypeMakeCode" />