排版方式

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

@@ -87,7 +87,7 @@
               <dict-tag :options="dict.type.mes_item_product" :value="scope.row.itemOrProduct" />
             </template>
           </el-table-column>
-          <el-table-column label="是否DTA排版" align="center" key="itemOrProduct" prop="itemOrProduct"
+          <el-table-column label="排版方式" align="center" key="dta" prop="dta"
             :show-overflow-tooltip="true">
             <template slot-scope="scope">
               <div>{{ scope.row.dta ? dtaOptions.find(v => v.value === scope.row.dta).name : ''}}</div>
@@ -187,7 +187,7 @@
         </el-row>
         <el-row>
           <el-col :span="8">
-            <el-form-item label="是否DTA排版">
+            <el-form-item label="排版方式">
               <el-select v-model="form.dta" placeholder="请选择是否DTA排版" filterable :disabled="optType == 'view'">
                 <el-option v-for="item in dtaOptions" :key="item.value" :label="item.name"
                   :value="item.value"></el-option>
@@ -623,30 +623,33 @@ export default {
       this.$refs["form"].validate(async (valid) => {
         if (valid) {
           if (this.form.itemId != undefined) {
+            let baseInfoData
             //基本信息保存
-            const baseInfoData = await this.$refs["BaseInfo"].getBaseInfoData();
-            baseInfoData.itemId = this.form.itemId;
+            if (this.$refs["BaseInfo"]) {
+              baseInfoData = await this.$refs["BaseInfo"].getBaseInfoData();
+              baseInfoData.itemId = this.form.itemId;
+            }
             // //产品外观保存
             // const lookData = await this.$refs["Look"].getLookFormData();
             // lookData.itemId = this.form.itemId;
 
             //产品参数配置保存  publishedConf
-            const publishedConfData = await this.$refs[
-              "PublishedConf"
-            ].getPublishedConfData();
-            publishedConfData.itemId = this.form.itemId;
+            // const publishedConfData = await this.$refs[
+            //   "PublishedConf"
+            // ].getPublishedConfData();
+            // publishedConfData.itemId = this.form.itemId;
 
             //销售单位转换保存
             //const saleUnit = await this.$refs["SaleUnit"].getSaleUnitFormData();
             //saleUnit.itemId = this.form.itemId;
 
             const params = {
-              ...this.form,
-              baseInfo: baseInfoData,
-              look: lookData,
-              publishedConf: publishedConfData,
+              ...this.form
               //saleUnit: saleUnit
             };
+            if (baseInfoData) {
+              params['baseInfo'] = baseInfoData
+            }
             updateMdItem(params).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;

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

@@ -67,6 +67,12 @@
       <el-table-column label="销售单号" align="center" prop="saleCode" />
       <el-table-column label="物料名称" align="center" prop="itemName" />
       <el-table-column label="开始时间" align="center" prop="startTime" />
+      <el-table-column label="排版方式" align="center" prop="dtaType"
+        :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <div>{{ scope.row.dtaType ? dtaOptions.find(v => v.value === scope.row.dtaType).name : ''}}</div>
+        </template>
+      </el-table-column>
       <el-table-column label="完成时间" align="center" prop="endTime" />
       <el-table-column label="操作" width="200" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -212,7 +218,9 @@
 import { getDtaList, finishApi } from "@/api/mes/pro/dta";
 import BrandSelect from "@/components/itemType/single.vue";
 import ProcessSelect from "@/components/process/taskSelectSingle.vue";
-
+import {
+  getItmeDtaTypeEnum
+} from "@/api/mes/md/mdItem";
 
 export default {
   name: "ScheduleSetupRule",
@@ -223,6 +231,8 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      //dta列表
+      dtaOptions: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -260,9 +270,21 @@ export default {
     };
   },
   created() {
+    this.getDtas()
     this.getList();
   },
   methods: {
+    getDtas() {
+      this.dtaOptions = []
+      getItmeDtaTypeEnum().then((response) => {
+        Object.keys(response.data).forEach(v => {
+          this.dtaOptions.push({
+            name: response.data[v],
+            value: v
+          })
+        })
+      });
+    },
     /** 查询排产换型对照信息列表 */
     getList() {
       this.loading = true;