huang_an 2 лет назад
Родитель
Сommit
503c2282b9

+ 10 - 52
src/views/warehouseManagement/stockManagement/add.vue

@@ -850,11 +850,7 @@
               label="计量单位"
               prop="measuringUnit"
             ></el-table-column>
-            <el-table-column
-              v-if="formData.bizType == 2 || formData.bizType == 1"
-              label="物料代号"
-              prop="materielCode"
-            >
+            <el-table-column label="物料代号" prop="materielCode">
               <template slot-scope="{ row }">
                 <el-input
                   v-if="!row.isPack"
@@ -863,11 +859,7 @@
                 <span v-else>{{ row.materielCode }}</span>
               </template>
             </el-table-column>
-            <el-table-column
-              v-if="formData.bizType == 2 || formData.bizType == 1"
-              label="客户代号"
-              prop="clientCode"
-            >
+            <el-table-column label="客户代号" prop="clientCode">
               <template slot-scope="{ row }">
                 <el-input
                   v-if="!row.isPack"
@@ -876,22 +868,13 @@
                 <span v-else> {{ row.clientCode }}</span>
               </template>
             </el-table-column>
-            <el-table-column
-              v-if="formData.bizType == 1"
-              label="刻码"
-              prop="engrave"
-            >
+            <el-table-column label="刻码" prop="engrave">
               <template slot-scope="{ row }">
                 <el-input v-if="!row.isPack" v-model="row.engrave"></el-input>
                 <span v-else>{{ row.engrave }}</span>
               </template>
             </el-table-column>
-            <el-table-column
-              v-if="formData.bizType == 2 || formData.bizType == 1"
-              label="重量"
-              prop="weight"
-              width="100"
-            >
+            <el-table-column label="重量" prop="weight" width="100">
               <template slot-scope="{ row }">
                 <el-input
                   v-if="!row.isPack"
@@ -901,11 +884,7 @@
                 <span v-else>{{ row.weight }}</span>
               </template>
             </el-table-column>
-            <el-table-column
-              v-if="formData.bizType == 2 || formData.bizType == 1"
-              label="重量单位"
-              prop="weightUtil"
-            >
+            <el-table-column label="重量单位" prop="weightUtil">
               <template slot-scope="{ row }">
                 {{ row.weightUtil }}
               </template>
@@ -1028,48 +1007,27 @@
               label="计量单位"
               prop="measuringUnit"
             ></el-table-column>
-            <el-table-column
-              v-if="formData.bizType == 2"
-              label="物料代号"
-              prop="materielCode"
-            >
+            <el-table-column label="物料代号" prop="materielCode">
               <template slot-scope="{ row }">
                 <el-input v-model="row.materielCode"></el-input>
               </template>
             </el-table-column>
-            <el-table-column
-              v-if="formData.bizType == 2 || formData.bizType == 1"
-              label="客户代号"
-              prop="clientCode"
-            >
+            <el-table-column label="客户代号" prop="clientCode">
               <template slot-scope="{ row }">
                 <el-input v-model="row.clientCode"></el-input>
               </template>
             </el-table-column>
-            <el-table-column
-              v-if="formData.bizType == 1"
-              label="刻码"
-              prop="engrave"
-            >
+            <el-table-column label="刻码" prop="engrave">
               <template slot-scope="{ row }">
                 <el-input v-model="row.engrave"></el-input>
               </template>
             </el-table-column>
-            <el-table-column
-              width="100"
-              v-if="formData.bizType == 2 || formData.bizType == 1"
-              label="重量"
-              prop="weight"
-            >
+            <el-table-column width="100" label="重量" prop="weight">
               <template slot-scope="{ row }">
                 <el-input v-model="row.weight"></el-input>
               </template>
             </el-table-column>
-            <el-table-column
-              v-if="formData.bizType == 2 || formData.bizType == 1"
-              label="重量单位"
-              prop="weightUnit"
-            >
+            <el-table-column label="重量单位" prop="weightUnit">
               <template slot-scope="{ row }">
                 {{ row.weightUnit }}
               </template>

+ 5 - 1
src/views/warehouseManagement/stockManagement/components/pickerDetails.vue

@@ -178,7 +178,11 @@
             align="center"
           >
             <template slot-scope="{ row }">
-              {{ row.technicalDrawings[0].name }}
+              {{
+                row.technicalDrawings.length != 0
+                  ? row.technicalDrawings[0].name
+                  : ''
+              }}
             </template>
           </el-table-column>
           <el-table-column