damon227 9 月之前
父節點
當前提交
8912fc91f2

+ 15 - 0
src/views/modules/cus/contract-record-detail.vue

@@ -27,6 +27,14 @@
             width="50"
             align="center">
           </el-table-column>
+          <el-table-column
+            prop="mapNumber"
+            header-align="center"
+            align="center"
+            min-width="120"
+            :show-tooltip-when-overflow="true"
+            label="图号">
+          </el-table-column>
           <el-table-column
             prop="productName"
             header-align="center"
@@ -50,6 +58,13 @@
             min-width="160"
             label="数量">
           </el-table-column>
+          <el-table-column
+            prop="unitName"
+            header-align="center"
+            align="center"
+            min-width="160"
+            label="单位">
+          </el-table-column>
           <el-table-column
             prop="price"
             header-align="center"

+ 8 - 8
src/views/modules/order/order-add-or-update.vue

@@ -109,6 +109,14 @@
               :show-tooltip-when-overflow="true"
               label="物料名称">
             </el-table-column>
+            <el-table-column
+              prop="relatedProduct"
+              header-align="center"
+              align="center"
+              width="120"
+              :show-tooltip-when-overflow="true"
+              label="物料关联">
+            </el-table-column>
             <el-table-column
               prop="productSpecifications"
               header-align="center"
@@ -190,14 +198,6 @@
               :show-tooltip-when-overflow="true"
               label="备注">
             </el-table-column>
-            <el-table-column
-              prop="relatedProduct"
-              header-align="center"
-              align="center"
-              width="120"
-              :show-tooltip-when-overflow="true"
-              label="物料关联">
-            </el-table-column>
             <el-table-column
               header-align="center"
               align="center"

+ 4 - 4
src/views/modules/tech/product-management.vue

@@ -3,8 +3,8 @@
   <div class="product-management">
     <template v-if="!addOrUpdateVisible && !changeFormVisible && !attachVisible && !detailVisible && !craftsVisible && !drawVisible && !changeVisible && !noticeChangeVisible && !importVisible">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="search()">
-        <el-form-item label="名称">
-          <el-input v-model="dataForm.productName" placeholder="物料名称" clearable/>
+        <el-form-item label="名称/图号">
+          <el-input v-model="dataForm.productName" placeholder="物料名称/图号" clearable/>
         </el-form-item>
         <el-form-item label="物料类别">
           <el-select
@@ -19,9 +19,9 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="图号">
+        <!-- <el-form-item label="图号">
           <el-input v-model="dataForm.mapNumber" placeholder="图号" clearable/>
-        </el-form-item>
+        </el-form-item> -->
 <!--        <el-form-item label="是否组合">-->
 <!--          <el-select-->
 <!--            v-model="dataForm.isCompose"-->