ss

src/views/purchase/purchase-marge-page/PurchaseMargePage.vue

@@ -32,7 +32,7 @@
       </div>
 
       <div class="table-operator" style="margin-bottom: 8px;">
-        <a-button v-if="$auth('longyanpurchaseorder-menu-add')" type="primary" icon="plus" @click="$refs.baseForm.base()">采购申请</a-button>
+        <!-- <a-button v-if="$auth('longyanpurchaseorder-menu-add')" type="primary" icon="plus" @click="$refs.baseForm.base()">采购申请</a-button> -->
         <!--        <a-button v-if="$auth('purchase-purchase-orders-add')" style="margin-left: 8px" type="primary" icon="plus" @click="$refs.addSpareForm.base()">新增物料</a-button>-->
         <a-dropdown v-if="selectedRowKeys.length > 0 ">
           <!-- <a-menu slot="overlay">

src/views/purchase/purchase-marge-page/modules/Detail.vue

@@ -15,7 +15,7 @@
     <title-divider title="合并采购单" width="120px"></title-divider>
     <a-table
       bordered
-      :data-source="model.detailVOS"
+      :data-source="model.longYanPurchaseOrderVOS"
       :columns="columns"
       tableLayout="auto"
       :scroll="{ x: 1500 }"
@@ -145,15 +145,6 @@ export default {
           checked: true,
           width: 100,
           dataIndex: 'errorMessage'
-        },
-        {
-          title: '操作',
-          key: 'action',
-          width: '200px',
-          fixed: 'right',
-          checked: true,
-          align: 'center',
-          scopedSlots: { customRender: 'action' }
         }
       ]
     }

src/views/purchase/purchase-order-page/modules/MergeModal.vue

@@ -183,7 +183,7 @@ export default {
         return
       }
       this.title = '编辑合并采购单'
-      // this.data = record.detailVOS
+      this.data = record.longYanPurchaseOrderVOS
       const { form: { setFieldsValue } } = this
       this.$nextTick(() => {
         setFieldsValue(Object.assign(pick(record, [