采购委外发货单

src/views/bpm/handleTask/components/productionWarehousing/submit.vue

@@ -25,7 +25,6 @@
         size="mini"
         :loading="isSaveLoading"
         @click="storeManagerApprove"
-        v-if="activeComp == 'storage'"
         >申请入库
       </el-button>
     </div>

src/views/bpm/handleTask/components/purchaseOrder/outSourceSend/detailDialog.vue

@@ -2,93 +2,79 @@
   <div class="ele-body">
     <el-form ref="form" :model="form" label-width="130px">
       <headerTitle title="基本信息"></headerTitle>
-      <el-row :gutter="20">
-        <el-col :span="12">
+      <el-row :gutter="24">
+        <el-col :span="8">
           <el-form-item
             label="委外发货单编码："
             prop="code"
-            style="margin-bottom: 22px"
           >
             {{ form.code }}
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="8">
           <el-form-item
             label="采购订单编码："
             prop="orderNo"
-            style="margin-bottom: 22px"
           >
             {{ form.orderNo }}
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
+        <el-col :span="8">
           <el-form-item
             label="外协单位："
             prop="contactName"
-            style="margin-bottom: 22px"
           >
             {{ form.supplierName }}
           </el-form-item>
         </el-col>
-
-        <el-col :span="12">
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="8">
           <el-form-item
             label="外协单位联系人："
             prop="linkName"
-            style="margin-bottom: 22px"
           >
             {{ form.linkName }}
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-       
-        <el-col :span="12">
+        <el-col :span="8">
           <el-form-item
             label="外协单位电话："
             prop="linkPhone"
-            style="margin-bottom: 22px"
           >
             {{ form.linkPhone }}
           </el-form-item>
         </el-col>
-     
-     
-        <el-col :span="12">
+        <el-col :span="8">
           <el-form-item
             label="发货日期："
             prop="sendDate"
-            style="margin-bottom: 22px"
           >
             {{ form.sendDate }}
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="8">
           <el-form-item
             label="发货单号："
             prop="sendNoteNo"
-            style="margin-bottom: 22px"
           >
             {{ form.sendNoteNo }}
           </el-form-item>
         </el-col>
-   
-        <el-col :span="12">
+        <el-col :span="8">
           <el-form-item
             label="订单类型："
             prop="sourceTypeName"
-            style="margin-bottom: 22px"
           >
             {{ form.sourceTypeName }}
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="8">
           <el-form-item
             label="车辆号："
             prop="carNo"
-            style="margin-bottom: 22px"
           >
             {{ form.carNo }}
           </el-form-item>
@@ -149,6 +135,7 @@
   import { getFile } from '@/api/system/file';
   import { getPurchaseOutSourceSendDetailAPI } from '@/api/bpm/components/purchasingManage/outSourceSend';
   import fileMain from '@/components/addDoc/index.vue';
+  import { mapActions } from 'vuex';
 
   export default {
     components: { fileMain },
@@ -395,6 +382,7 @@
       this.getDetailData(this.businessId);
     },
     methods: {
+      ...mapActions('dict', ['requestDict']),
       downloadFile(file) {
         getFile({ objectName: file.storePath }, file.name);
       },

src/views/bpm/stockManagement/storage.vue

@@ -1914,6 +1914,7 @@ export default {
           supplierId: '', // 供应商id
           supplierCode: '',
           supplierName: '', // 供应商名称
+          measureType: item.measureType, // 计量类型
           approvalNumber: item.approvalNumber, // 批准文号
           packingSpecification: item.packingSpecification, // 包装规格
           packingSpecificationOption: newSpecificationOption[index], // 包装规格选项
@@ -2504,13 +2505,16 @@ export default {
     },
     // 生成包装
     generateWrappers(row, productIndex, packingCodeList) {
-      console.log(packingCodeList, 'packingCodeList')
+      console.log(packingCodeList, 'packingCodeList', row.measureType)
       // 判断是否拆包，如果是不拆包，计量单位=包装单位，则不生成包装层数据
-      if (row.measureUnit == row.packingUnit) {
-        // 直接生成物品层数据
-        this.productList[productIndex].measureQuantity = row.measureQuantity;
-        this.productList[productIndex].weight = row.weight;
-        return;
+      if (row.measureType != 1) {
+        // 计量单位=包装单位，则不生成包装层数据
+        if (row.measureUnit == row.packingUnit) {
+          // 直接生成物品层数据
+          this.productList[productIndex].measureQuantity = row.measureQuantity;
+          this.productList[productIndex].weight = row.weight;
+          return;
+        }
       }
 
       console.log('包装数据--------', row);