yusheng пре 7 месеци
родитељ
комит
421631b0a2

+ 16 - 1
src/BIZComponents/inventoryTableDetails.vue

@@ -148,6 +148,11 @@
             unitIdKey: 'saleUnitId'
           };
         }
+      },
+      //是否显示生产要求
+      isProductionRequirements: {
+        type: Boolean,
+        default: false
       }
     },
     data() {
@@ -511,9 +516,19 @@
           {
             minWidth: 160,
             prop: 'productionCodes',
-            label: '生产编',
+            label: '生产编',
             align: 'center'
           },
+          this.isProductionRequirements
+            ? {
+                minWidth: 280,
+                prop: 'productionRequirements',
+                label: '生产要求',
+                align: 'center'
+              }
+            : {
+                width: 1
+              },
           {
             minWidth: 240,
             prop: 'taskName',

+ 1 - 0
src/views/bpm/handleTask/components/contractBook/detailDialog.vue

@@ -169,6 +169,7 @@
       :pricingWay="form.pricingWay"
       :isChangeCount="false"
       :isArrivalWay="true"
+      :isProductionRequirements="form.type == '1'"
       :countObj="{
         countKey: 'contractCount',
         unitKey: 'contractUnit',

+ 1 - 0
src/views/bpm/handleTask/components/saleOrder/detailDialog.vue

@@ -206,6 +206,7 @@
         :isCustomerMark="true"
         :isDiscountTotalPrice="true"
         :isArrivalWay="true"
+        :isProductionRequirements="true"
       ></inventoryTabledetail>
       <headerTitle title="类型清单" v-if="form.needProduce == 4"></headerTitle>
 

+ 7 - 2
src/views/bpm/handleTask/components/saleOrder/invoice/detailDialog.vue

@@ -259,7 +259,6 @@
       };
     },
     computed: {
-
       columns() {
         let columnsVersion = this.columnsVersion;
         return [
@@ -339,6 +338,12 @@
             label: '生产编号',
             align: 'center'
           },
+          {
+            minWidth: 280,
+            prop: 'productionRequirements',
+            label: '生产要求',
+            align: 'center'
+          },
           {
             width: 120,
             prop: 'imgCode',
@@ -427,7 +432,7 @@
             align: 'center'
           },
 
-           this.$store.state.user.info.clientEnvironmentId== '4'
+          this.$store.state.user.info.clientEnvironmentId == '4'
             ? {
                 width: 120,
                 prop: 'blockCount',

+ 7 - 0
src/views/bpm/stockManagement/details.vue

@@ -245,6 +245,13 @@
               :show-overflow-tooltip="true"
             >
             </el-table-column>
+             <el-table-column
+                label="生产要求"
+                align="center"
+                width="200"
+                prop="productionRequirements"
+                :show-overflow-tooltip="true"
+              ></el-table-column>
             <el-table-column label="机型" prop="modelKey" width="200">
             </el-table-column>
             <el-table-column label="颜色" prop="colorKey" width="200">

+ 10 - 2
src/views/bpm/stockManagement/storage.vue

@@ -120,7 +120,7 @@
               ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <!-- <el-col :span="6">
             <el-form-item label="生产要求" prop="productionRequirements">
               <el-input
                 v-model="formData.productionRequirements"
@@ -131,7 +131,7 @@
                 disabled
               ></el-input>
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
       </el-form>
       <div class="inbound_details">
@@ -461,6 +461,13 @@
                   <template slot="append"> </template>
                 </template>
               </el-table-column>
+             <el-table-column
+                label="生产要求"
+                align="center"
+                width="200"
+                prop="productionRequirements"
+                :show-overflow-tooltip="true"
+              ></el-table-column>
               <el-table-column label="机型" prop="modelKey" width="300">
                 <template slot-scope="{ row, $index }">
                   <DictSelection
@@ -1681,6 +1688,7 @@
                 batchNo: batchNo, // 批次号
                 supplierListOptions: supplierList[item.id], // 供应商列表
                 supplierId: this.form.supplierId, // 供应商id
+                productionRequirements:filtersItem.productionRequirements,//生产要求
                 supplierCode:
                   this.bizType == 2 || this.bizType == 7
                     ? filtersItem.supplierMark