ss

src/api/purchase/purchase-order.js

@@ -574,3 +574,18 @@ export function deleteMerge (parameter) {
     method: 'delete'
   })
 }
+/**
+ * query list func
+ * parameter: { }
+ * @param parameter
+ * @returns {*}
+ */
+export function pushPurchaseMerge (parameter) {
+  return axios({
+    url: '/yongyou/push/merge/purchaseOrder/' + parameter.id,
+    method: 'get',
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
+}

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

@@ -91,15 +91,15 @@
 
 <script>
 import { STable, Ellipsis } from '@/components'
-import { getMergePage, syncMerge, pushPurchaseOrder, getMergeInfo, deleteMerge } from '@/api/purchase/purchase-order'
-import MargeModal from '@/views/purchase/purchase-order-page/modules/MargeModal.vue'
+import { getMergePage, syncMerge, pushPurchaseMerge, getMergeInfo, deleteMerge } from '@/api/purchase/purchase-order'
+import MergeModal from '@/views/purchase/purchase-order-page/modules/MergeModal.vue'
 
 export default {
   name: 'PurchaseOrderPage',
   components: {
     STable,
     Ellipsis,
-    MargeModal
+    MergeModal
   },
   data () {
     return {
@@ -267,7 +267,7 @@ export default {
       })
     },
     handlePush (record) {
-      pushPurchaseOrder(record).then(res => {
+      pushPurchaseMerge(record).then(res => {
         this.$message.info('推送成功')
         this.handleOk()
         this.$refs.table.clearSelected()

src/views/purchase/purchase-order-page/PurchaseOrderPage.vue

@@ -114,7 +114,7 @@ import { STable, Ellipsis } from '@/components'
 import { getPurchaseOrderPage2, deletePurchaseOrder2, getPurchaseOrderInfo, pushPurchaseOrder, wastePurchaseOrder, getPurchaseOrderList } from '@/api/purchase/purchase-order'
 import BaseForm from './modules/BaseForm.vue'
 import Detail from './modules/Detail.vue'
-import MargeModal from './modules/MargeModal.vue'
+import MergeModal from './modules/MergeModal.vue'
 import AddSpareForm from '@/views/store/sparestore/modules/AddSpareForm'
 export default {
   name: 'PurchaseOrderPage',
@@ -124,7 +124,7 @@ export default {
     BaseForm,
     AddSpareForm,
     Detail,
-    MargeModal
+    MergeModal
   },
   data () {
     return {