问题清单

src/i18n/lang/zh_CN.json

@@ -2958,5 +2958,6 @@
 	"库位设置": "库位设置",
 	"分配角色": "分配角色",
 	"菜单字段": "menuName",
-	"工时单位必选": "工时单位必选"
+	"工时单位必选": "工时单位必选",
+	"委外加工商必选": "委外加工商必选"
 }

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

@@ -19,8 +19,8 @@
         <el-input v-model="queryParams.workorderCode" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item :label="$t('产品物料编码')" prop="sapItemCode">
-        <el-input v-model="queryParams.sapItemCode" clearable
+      <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">
@@ -67,7 +67,7 @@
       <el-table-column :label="$t('common.workunit')" width="120" align="center" prop="workunitName" />
       <el-table-column :label="$t('外协单号')" width="150" align="center" prop="assistProcessCode" />
       <el-table-column :label="$t('生产工单编号')" width="150" align="center" prop="workorderCode" />
-      <el-table-column :label="$t('产品物料编码')" width="120" align="center" prop="sapItemCode" />
+      <el-table-column :label="$t('产品物料编码')" width="120" align="center" prop="itemCode" />
       <el-table-column :label="$t('产品物料名称')" min-width="250" show-overflow-tooltip align="center" prop="itemName" />
       <el-table-column :label="$t('规格型号')" width="100" align="center" prop="specification" />
       <el-table-column :label="$t('报工数量')" align="center" prop="feedbackTime" width="180">
@@ -153,8 +153,8 @@
         </el-row>
         <el-row>
           <el-col :span="8">
-            <el-form-item :label="$t('产品编码')" prop="sapItemCode">
-              <el-input v-model="form.sapItemCode" disabled />
+            <el-form-item :label="$t('产品编码')" prop="itemCode">
+              <el-input v-model="form.itemCode" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -290,7 +290,7 @@ export default {
         taskCode: null,
         itemId: null,
         itemCode: null,
-        sapItemCode: null,
+        itemCode: null,
         itemName: null,
         unitOfMeasure: null,
         specification: null,
@@ -385,7 +385,7 @@ export default {
         taskCode: null,
         itemId: null,
         itemCode: null,
-        sapItemCode: null,
+        itemCode: null,
         itemName: null,
         specification: null,
         assistProcessCode: null,

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

@@ -444,6 +444,8 @@ export default {
       this.getList();
     },
     handleOutsource(){
+      const arr = this.selections.filter(v => !v.vendorId)
+      if (arr && arr.length > 0) return this.$modal.msgWarning(this.$t('委外加工商必选'))
       this.$modal
         .confirm(this.$t('是否确认委外？'))
         .then( ()=> {