chrislee 1 year ago
parent
commit
ad3480044b

+ 2 - 2
src/views/modules/product/template-add-or-update.vue

@@ -56,12 +56,12 @@
             <el-input type="textarea" v-model="dataForm.notes" placeholder="备注"></el-input>
           </el-form-item>
         </el-row>
-        <el-row class="my-row" v-if="bizType === 2 || bizType === 3">
+        <el-row class="my-row" v-if="bizType === 3">
           <el-form-item prop="productId" label="物料关联">
             <product-component v-model="dataForm.productId" :product-id="dataForm.productId" @productSelected="prodSelected"/>
           </el-form-item>
         </el-row>
-        <el-row class="my-row">
+        <el-row class="my-row" v-if="bizType !== 2">
           <el-form-item label="首件鉴定">
             <el-radio-group v-model="dataForm.appraisal">
               <el-radio :label="'1'">否</el-radio>

+ 1 - 7
src/views/modules/tech/product-detail.vue

@@ -146,12 +146,6 @@
             width="50"
             align="center">
           </el-table-column>
-          <el-table-column
-            prop="productName"
-            header-align="center"
-            align="center"
-            label="物料名称">
-          </el-table-column>
           <el-table-column
             prop="materialName"
             header-align="center"
@@ -159,7 +153,7 @@
             label="物品名称">
           </el-table-column>
           <el-table-column
-            prop="specifications"
+            prop="productSpec"
             header-align="center"
             align="center"
             label="规格">