修改BOM清单新增编辑的基本字段

src/views/modules/tech/product-add-or-update.vue

@@ -1,10 +1,5 @@
 <template>
   <div>
-    <!-- <el-dialog
-        :title="!id ? '新增': display ? '详情' : '修改'"
-        width="70%"
-        :close-on-click-modal="false"
-        :visible.sync="visible"> -->
     <div class="my-title">{{ !id ? '新增' : display ? '详情' : '修改' }}</div>
     <!-- 工作流 -->
     <div v-show="display && dataForm.workFlowBusinessExt">
@@ -27,6 +22,11 @@
     <!-- 表单 -->
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" label-width="auto">
       <el-row class="my-row">
+        <el-col :span="8">
+          <el-form-item label="主图号" prop="mapNumber">
+            <el-input v-model="dataForm.mapNumber" :disabled="display" placeholder="主图号"></el-input>
+          </el-form-item>
+        </el-col>
         <el-col :span="8">
           <el-form-item label="物料名称" prop="productName">
             <el-input v-model="dataForm.productName" :disabled="display" placeholder="物料名称"></el-input>
@@ -37,87 +37,67 @@
             <el-input v-model="dataForm.productSpec" :disabled="display" placeholder="物料规格"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
-          <el-form-item label="物料类别" prop="productType">
-            <el-select v-model="dataForm.productType" :disabled="display" remote placeholder="请选择">
-              <el-option v-for="item in optionsType" :key="item.code" :label="item.value" :value="item.code">
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
       </el-row>
       <el-row class="my-row">
-        <el-col :span="8">
-          <el-form-item label="材料" prop="materials">
-            <el-input v-model="dataForm.materials" :disabled="display" placeholder="材料"></el-input>
+         <el-col :span="8">
+          <el-form-item label="版本号" prop="versionNumber">
+            <el-input v-model="dataForm.versionNumber" :disabled="display" placeholder="版本号"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
-          <el-form-item label="物料尺寸" prop="size">
-            <el-input v-model="dataForm.size" :disabled="display" placeholder="物料尺寸"></el-input>
+         <el-col :span="8">
+          <el-form-item label="单套数量" prop="cnt">
+            <el-input v-model="dataForm.cnt" :disabled="display" placeholder="单套数量"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
-          <el-form-item label="展开尺寸" prop="developedSize">
-            <el-input v-model="dataForm.developedSize" :disabled="display" placeholder="展开尺寸"></el-input>
+         <el-col :span="8">
+          <el-form-item label="单位" prop="unit">
+            <el-input v-model="dataForm.unit" :disabled="display" placeholder="单位"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row class="my-row">
         <el-col :span="8">
-          <el-form-item label="单位" prop="unit">
-            <el-input v-model="dataForm.unit" :disabled="display" placeholder="单位"></el-input>
+          <el-form-item label="材料" prop="materials">
+            <el-input v-model="dataForm.materials" :disabled="display" placeholder="材料"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="单套数量" prop="cnt">
-            <el-input v-model="dataForm.cnt" :disabled="display" placeholder="单套数量"></el-input>
+          <el-form-item label="净尺寸" prop="size">
+            <el-input v-model="dataForm.size" :disabled="display" placeholder="物料尺寸"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
-          <el-form-item label="主图号" prop="mapNumber">
-            <el-input v-model="dataForm.mapNumber" :disabled="display" placeholder="主图号"></el-input>
+         <el-col :span="8">
+          <el-form-item label="表面处理" prop="surfaceTreatment">
+            <el-input v-model="dataForm.surfaceTreatment" :disabled="display" placeholder="表面处理"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row class="my-row">
         <el-col :span="8">
-          <el-form-item label="关重件" prop="importance">
-            <el-select v-model="dataForm.importance" :disabled="display" remote placeholder="请选择">
-              <el-option v-for="item in optionsImportance" :key="item.code" :label="item.value" :value="item.value">
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="16">
           <el-form-item label="热处理" prop="heatTreatment">
             <el-input v-model="dataForm.heatTreatment" :disabled="display" placeholder="热处理"></el-input>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row>
-        <el-col>
-          <el-form-item label="表面处理" prop="surfaceTreatment">
-            <el-input v-model="dataForm.surfaceTreatment" :disabled="display" placeholder="" type="textarea"></el-input>
+        <el-col :span="8">
+          <el-form-item label="是否关重件" prop="importance">
+            <el-select v-model="dataForm.importance" :disabled="display" remote placeholder="请选择">
+              <el-option v-for="item in optionsImportance" :key="item.code" :label="item.value" :value="item.value">
+              </el-option>
+            </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <!--      <el-row>-->
-      <!--        <el-col>-->
-      <!--          <el-form-item label="热处理" prop="heatTreatment">-->
-      <!--            <el-input v-model="dataForm.heatTreatment" :disabled="display" placeholder="" type="textarea"></el-input>-->
-      <!--          </el-form-item>-->
-      <!--        </el-col>-->
-      <!--      </el-row>-->
-      <el-row>
         <el-col :span="8">
-          <el-form-item label="关联物料" prop="materialCode">
-            <el-input v-model.lazy="material.materialCode" disabled placeholder="请选择物料"></el-input>
+          <el-form-item label="是否首件鉴定" prop="appraisal">
+            <el-select v-model="dataForm.appraisal" placeholder="请选择">
+              <el-option
+                v-for="item in appraisalOptions"
+                :key="item.code"
+                :label="item.value"
+                :value="item.code">
+              </el-option>
+            </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="margin-left: 20px">
-          <el-button @click="selectMaterial" type="primary">选择</el-button>
-        </el-col>
       </el-row>
       <el-row>
         <el-col>
@@ -129,12 +109,7 @@
       <el-row class="my-row">
         <el-col :span="8">
           <el-form-item label="简图" prop="attachList2">
-            <upload-component :accept="'.jpg,.jpeg,.png'" v-model="dataForm.attachList2" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8" :offset="4">
-          <el-form-item label="技术资料附件" prop="attachList">
-            <upload-component :accept="'*'" v-model="dataForm.attachList" />
+            <upload-component :accept="'.jpg,.jpeg,.png'" v-model="dataForm.attachList2" :file-obj-list="dataForm.attachList2"/>
           </el-form-item>
         </el-col>
       </el-row>
@@ -264,6 +239,10 @@ export default {
         { code: '1', value: '是' },
         { code: '0', value: '否' }
       ],
+      appraisalOptions: [
+        { code: '2', value: '是' },
+        { code: '1', value: '否' }
+      ],
       fileList: [],
       listingList: [],
       dataList: [],
@@ -284,11 +263,14 @@ export default {
         productName: [{ required: true, message: '请输入物料名称', trigger: 'blur' }],
         productSpec: [{ required: true, message: '请输入物料规格', trigger: 'blur' }],
         productType: [{ required: true, message: '请选择物料类别', trigger: 'change' }],
+        versionNumber: [{ required: true, message: '请输入版本号', trigger: 'blur' }],
         materials: [{ required: true, message: '请输入材料', trigger: 'blur' }],
         size: [{ required: true, message: '请输入物料尺寸', trigger: 'blur' }],
         unit: [{ required: true, message: '请输入单位', trigger: 'blur' }],
         cnt: [{ required: true, message: '请输入单套数量', trigger: 'blur' }],
-        mapNumber: [{ required: true, message: '请输入主图号', trigger: 'blur' }]
+        mapNumber: [{ required: true, message: '请输入主图号', trigger: 'blur' }],
+        appraisal: [{ required: true, message: '请选择', trigger: 'change' }],
+        attachList2: [{ required: true, message: '请上传简图', trigger: 'blur' }],
       },
       activeNo: 0,
       stepList: [],
@@ -439,7 +421,7 @@ export default {
             }
           })
         } else {
-          this.$message.error('请检查输入参数')
+          // this.$message.error('请检查输入参数')
         }
       })
     },
@@ -482,4 +464,8 @@ export default {
 }
 </script>
 
-<style scoped></style>
+<style scoped>
+.my-row {
+  margin-bottom: 0px;
+}
+</style>

src/views/modules/tech/product-detail.vue

@@ -1,9 +1,4 @@
 <template>
-  <!-- <el-dialog
-    title="查看"
-    width="70%"
-    :close-on-click-modal="false"
-    :visible.sync="visible"> -->
   <div>
     <div class="my-title">查看</div>
     <div style="margin-left: 20px;margin-right: 20px">
@@ -29,64 +24,23 @@
         <approve-component ref="approve" @approveFinished="approveFinished" />
       </div>
       <e-desc title="基本信息" column="3">
+        <e-desc-item label="主图号">{{ dataForm.mapNumber }}</e-desc-item>
         <e-desc-item label="物料名称">{{ dataForm.productName }}</e-desc-item>
         <e-desc-item label="物料规格">{{ dataForm.productSpec }}</e-desc-item>
-        <e-desc-item label="物料类别">{{ dataForm.productTypeValue }}</e-desc-item>
-
-        <e-desc-item label="材料">{{ dataForm.materials }}</e-desc-item>
-        <e-desc-item label="物料尺寸">{{ dataForm.size }}</e-desc-item>
-        <e-desc-item label="展开尺寸">{{ dataForm.developedSize }}</e-desc-item>
 
-        <e-desc-item label="单位">{{ dataForm.unit }}</e-desc-item>
+        <e-desc-item label="版本号">{{ dataForm.versionNumber }}</e-desc-item>
         <e-desc-item label="单套数量">{{ dataForm.cnt }}</e-desc-item>
-        <e-desc-item label="主图号">{{ dataForm.mapNumber }}</e-desc-item>
-
-        <e-desc-item label="热处理" span="3">{{ dataForm.heatTreatment }}</e-desc-item>
+        <e-desc-item label="单位">{{ dataForm.unit }}</e-desc-item>
 
-        <e-desc-item label="表面处理" span="3">{{ dataForm.surfaceTreatment }}</e-desc-item>
+        <e-desc-item label="材料">{{ dataForm.materials }}</e-desc-item>
+        <e-desc-item label="净尺寸">{{ dataForm.size }}</e-desc-item>
+        <e-desc-item label="表面处理">{{ dataForm.surfaceTreatment }}</e-desc-item>
 
-        <e-desc-item label="关联物料" span="3">{{ dataForm.materialCode }}</e-desc-item>
+        <e-desc-item label="热处理">{{ dataForm.heatTreatment }}</e-desc-item>
+        <e-desc-item label="是否关重件">{{ dataForm.importance }}</e-desc-item>
+        <e-desc-item label="是否首件鉴定">{{ dataForm.appraisal == 2 ? '是' : '否' }}</e-desc-item>
 
         <e-desc-item label="备注" span="3">{{ dataForm.notes }}</e-desc-item>
-
-        <e-desc-item label="关重件" span="3">{{ dataForm.importance }}</e-desc-item>
-
-        <!-- <e-desc-item v-if="dataForm.noticeChangeRecord" label="物料变更描述">{{dataForm.noticeChangeRecord?dataForm.noticeChangeRecord.description:''}}</e-desc-item>
-
-        <e-desc-item v-if="dataForm.noticeChangeRecord && dataForm.noticeChangeRecord.attachList" label="变更通知单" span="3">
-          <div v-for="(item, index) in dataForm.noticeChangeRecord.attachList" style="display: inline">
-            <span v-if="index > 0">,</span>
-            <a :key="item.fileName + index" type="primary" href="#" @click="previewFile(item.fileName, item.url)">{{ item.fileName }}</a>
-          </div>
-        </e-desc-item>
-
-        <e-desc-item v-if="fileList" label="物料图纸" span="3">
-          <div v-for="(item, index) in fileList" style="display: inline">
-            <span v-if="index > 0">,</span>
-            <a :key="item.fileName + index" type="primary" href="#" @click="previewFile(item.fileName, item.url)">{{ item.fileName }}</a>
-          </div>
-        </e-desc-item>
-
-        <e-desc-item v-if="dataForm.noticeChangeRecord && dataForm.noticeChangeRecord.attachList" label="所需文件资料" span="3">
-          <div v-for="(item, index) in dataForm.noticeChangeRecord.attachList" style="display: inline">
-            <span v-if="index > 0">,</span>
-            <a :key="item.fileName + index" type="primary" href="#" @click="previewFile(item.fileName, item.url)">{{ item.fileName }}</a>
-          </div>
-        </e-desc-item>
-
-        <e-desc-item v-if="dataForm.attachList" label="物料技术文件" span="3">
-          <div v-for="(item, index) in dataForm.attachList" style="display: inline">
-            <span v-if="index > 0">,</span>
-            <a :key="item.fileName + index" type="primary" href="#" @click="previewFile(item.fileName, item.url)">{{ item.fileName }}</a>
-          </div>
-        </e-desc-item>
-
-        <e-desc-item v-if="dataForm.listingList" label="物料配料清单" span="3">
-          <div v-for="(item, index) in dataForm.listingList" style="display: inline">
-            <span v-if="index > 0">,</span>
-            <a :key="item.fileName + index" type="primary" href="#" @click="previewFile(item.fileName, item.url)">{{ item.fileName }}</a>
-          </div>
-        </e-desc-item> -->
       </e-desc>
       <e-desc title="简图">
         <upload-component :display="true" :display-title="false" :accept="'*'" :value="dataForm.attachList2" />