运营后台履约单列表

src/api/distribution/appoint.js

@@ -12,17 +12,6 @@ export const getList = (current, size, params) => {
   })
 }
 
-export const exportAppointGoods = (state) => {
-  return request({
-    url: '/api/distribution/appoint/exportAppointGoods',
-    method: 'get',
-    responseType: 'blob',
-    params: {
-      state
-    }
-  })
-}
-
 export const getDetail = (id) => {
   return request({
     url: '/api/distribution/appoint/detail',
@@ -51,7 +40,6 @@ export const add = (row) => {
   })
 }
 
-
 export const update = (row) => {
   return request({
     url: '/api/distribution/appoint/submit',
@@ -60,19 +48,29 @@ export const update = (row) => {
   })
 }
 
-export const shipments = (ids) => {
+export const shipments = (id) => {
   return request({
     url: '/api/distribution/appoint/shipments',
     method: 'post',
     params: {
-      ids,
+      id,
+    }
+  })
+}
+
+export const shipmentsAll = (grouponId) => {
+  return request({
+    url: '/api/distribution/appoint/shipmnetsALl',
+    method: 'post',
+    params: {
+      grouponId,
     }
   })
 }
 
 export const goodsList = (current, size, arrivalCode) => {
   return request({
-    url: '/api/finance/appointgoods/appointGoodsList',
+    url: '/api/finance/appointgoods/storeAppointGoodsList',
     method: 'get',
     params: {
       arrivalCode,
@@ -82,3 +80,14 @@ export const goodsList = (current, size, arrivalCode) => {
   })
 }
 
+export const appointStoreList = (current, size, grouponId) => {
+  return request({
+    url: '/api/distribution/appoint/appointAllList',
+    method: 'get',
+    params: {
+      grouponId,
+      current,
+      size,
+    }
+  })
+}

src/option/mall/appointGoodsOption.js

@@ -7,12 +7,16 @@ export const appointGoodsOption = {
     delBtn: false,
     addBtn: false,
     dialogClickModal: false,
-    menu: true,
+    menu: false,
     column: [
         {
             label: "自提点名称",
             prop: "takeName",
         },
+        {
+            label: "供应商名称",
+            prop: "storeName",
+        },
         {
             label: "联系电话",
             prop: "takeTel",

src/views/distribution/appoint.vue

@@ -27,10 +27,6 @@
         <!--        </el-button>-->
       </template>
       <template slot-scope="scope" slot="menu">
-        <el-button type="text"
-                   v-if="scope.row.appointState == 0"
-                   size="small"
-                   @click="shipmnetsALl(scope.row.grouponId)">确认发货</el-button>
         <el-button type="text"
                    size="small"
                    @click="goodsListView(scope.row.grouponId)">查看详情</el-button>
@@ -58,10 +54,7 @@
           </el-button>
         </template>
         <template slot-scope="scope" slot="menu">
-          <el-button type="text"
-                     v-if="scope.row.state == 0"
-                     size="small"
-                     @click="shipments(scope.row.id)">确认发货</el-button>
+
         </template>
       </avue-crud>
     </el-dialog>
@@ -70,7 +63,7 @@
 </template>
 
 <script>
-import {getList, getDetail, add, update, shipments, goodsList, shipmentsAll, appointStoreList} from "@/api/distribution/appoint";
+import {getList, getDetail, add, update, shipments, shipmentsAll, appointStoreList} from "@/api/distribution/appoint";
 import {mapGetters} from "vuex";
 import {appointGoodsOption} from "../../option/mall/appointGoodsOption"
 import {getToken} from '@/util/auth';
@@ -189,7 +182,7 @@ export default {
     },
 
     downLoadAppoint(){
-      window.open(`/api/distribution/appoint/exportStoreAppointGoods?${this.website.tokenHeader}=${getToken()}&grouponId=${this.grouponId}`);
+      window.open(`/api/distribution/appoint/exportAllAppointGoods?${this.website.tokenHeader}=${getToken()}&grouponId=${this.grouponId}`);
     },
     rowUpdate(row, index, done, loading) {
       update(row).then(() => {