履约单查询

src/option/mall/appointGoodsOption.js

@@ -1,34 +1,43 @@
 export const appointGoodsOption = {
-    height:'auto',
-    calcHeight: 30,
     tip: false,
     border: true,
     index: true,
-    viewBtn: true,
+    viewBtn: false,
+    editBtn: false,
+    delBtn: false,
     addBtn: false,
     dialogClickModal: false,
-    menu: false,
+    menu: true,
     column: [
         {
-            label: "商品名称",
-            prop: "goodsName",
-            rules: [{
-                required: true,
-                message: "请输入商品名称",
-                trigger: "blur"
-            }]
+            label: "自提点名称",
+            prop: "takeName",
+        },
+        {
+            label: "联系电话",
+            prop: "takeTel",
         },
         {
-            label: "商品图片",
-            prop: "goodsImage",
-            type: 'img',
+            label: "商品总数量",
+            prop: "goodsAllNum",
         },
         {
-            label: "商品数量",
-            prop: "goodsNum",
+            label: "履约单状态",
+            labelWidth: 130,
+            prop: "state",
+            searchLabelWidth: 130,
+            type: "select",
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=appoint_state",
+            props: {
+                label: "dictValue",
+                value: "dictKey"
+            },
+            dataType: "number",
+            hide: false,
+            display: true,
             rules: [{
                 required: true,
-                message: "请输入商品数量",
+                message: "选择状态",
                 trigger: "blur"
             }]
         },

src/views/distribution/appoint.vue

@@ -1,3 +1,4 @@
+
 <template>
   <basic-container>
     <avue-crud :option="option"
@@ -19,25 +20,24 @@
                @refresh-change="refreshChange"
                @on-load="onLoad">
       <template slot="menuLeft">
-        <el-button type="primary"
-                   size="small"
-                   plain
-                   v-if="permission.appoint_delete"
-                   @click="handleDelete">确认发货
-        </el-button>
-        <el-button type="primary"
-                   size="small"
-                   @click="downLoadAppoint">下载
-        </el-button>
+        <!--        <el-button type="primary"-->
+        <!--                   size="small"-->
+        <!--                   plain-->
+        <!--                   @click="handleDelete">确认发货-->
+        <!--        </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.arrivalCode)">查看商品列表</el-button>
+                   @click="goodsListView(scope.row.grouponId)">查看详情</el-button>
       </template>
     </avue-crud>
     <!--  商品列表dialog  -->
-    <el-dialog title="商品列表"
+    <el-dialog title="详情列表"
                append-to-body
                :visible.sync="goodsBox"
                :before-close="handleClose"
@@ -48,7 +48,21 @@
                  :data="appointGoodsData"
                  :page.sync="goodsPage"
                  ref="grouponCrud"
+                 @size-change="sizeAppointChange"
                  @on-load="goodsOnLoad">
+        <template slot="menuLeft">
+          <el-button type="primary"
+                     size="small"
+                     plain
+                     @click="downLoadAppoint">下载详情
+          </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>
   </basic-container>
@@ -56,188 +70,147 @@
 </template>
 
 <script>
-  import {getList, getDetail, add, update, shipments, goodsList, exportAppointGoods} from "@/api/distribution/appoint";
-  import {mapGetters} from "vuex";
-  import {appointGoodsOption} from "../../option/mall/appointGoodsOption"
-  import {getToken} from '@/util/auth';
+import {getList, getDetail, add, update, shipments, goodsList, shipmentsAll, appointStoreList} from "@/api/distribution/appoint";
+import {mapGetters} from "vuex";
+import {appointGoodsOption} from "../../option/mall/appointGoodsOption"
+import {getToken} from '@/util/auth';
 
-  export default {
-    data() {
-      return {
-        form: {},
-        query: {},
-        state: '',
-        loading: true,
-        goodsBox: false,
-        goodsLoading: false,
-        page: {
-          pageSize: 10,
-          currentPage: 1,
-          total: 0
-        },
-        arrivalCode: '',
-        appointGoodsData: [],
-        goodsPage: {
-          pageSize: 10,
-          currentPage: 1,
-          total: 0
-        },
-        selectionList: [],
-        appointGoodsOption,
-        option: {
-          selectable:(row,index)=>{
-            return row.state === 0;
+export default {
+  data() {
+    return {
+      form: {},
+      query: {},
+      loading: true,
+      goodsBox: false,
+      goodsLoading: false,
+      page: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0
+      },
+      grouponId: 0,
+      appointGoodsData: [],
+      goodsPage: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0
+      },
+      selectionList: [],
+      appointGoodsOption,
+      option: {
+        height:'auto',
+        calcHeight: 30,
+        addBtn: false,
+        tip: false,
+        searchShow: true,
+        searchMenuSpan: 6,
+        border: true,
+        index: true,
+        editBtn: false,
+        viewBtn: false,
+        delBtn: false,
+        selection: false,
+        searchSpan: 5,
+        dialogClickModal: false,
+        column: [
+          {
+            label: "团购标题",
+            labelWidth: 130,
+            prop: "grouponName",
+            rules: [{
+              required: true,
+              message: "请输入团购标题",
+              trigger: "blur"
+            }]
           },
-          height:'auto',
-          calcHeight: 30,
-          tip: false,
-          searchShow: true,
-          searchMenuSpan: 6,
-          border: true,
-          index: true,
-          addBtn: false,
-          viewBtn: true,
-          delBtn: false,
-          selection: true,
-          searchSpan: 5,
-          dialogClickModal: false,
-          column: [
-            {
-              label: "供应商名称",
-              labelWidth: 130,
-              prop: "storeName",
-              rules: [{
-                required: true,
-                message: "请输入供应商名称",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "自提点名称",
-              labelWidth: 130,
-              prop: "takeName",
-              rules: [{
-                required: true,
-                message: "请输入自提点名称",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "自提点联系电话",
-              labelWidth: 130,
-              prop: "takeTel",
-              rules: [{
-                required: true,
-                message: "自提点联系电话",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "履约单状态",
-              labelWidth: 130,
-              prop: "state",
-              searchLabelWidth: 130,
-              change: ({value, column}) => {
-                this.state = value
-              },
-              type: "select",
-              dicUrl: "/api/blade-system/dict-biz/dictionary?code=appoint_state",
-              props: {
-                label: "dictValue",
-                value: "dictKey"
-              },
-              dataType: "number",
-              search: true,
-              hide: false,
-              display: true,
-              rules: [{
-                required: true,
-                message: "选择状态",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "团购标题",
-              labelWidth: 130,
-              prop: "grouponName",
-              rules: [{
-                required: true,
-                message: "请输入团购标题",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "团购结束时间",
-              labelWidth: 130,
-              prop: "grouponEndTime",
-              rules: [{
-                required: true,
-                message: "请输入团购结束时间",
-                trigger: "blur"
-              }]
+          {
+            label: "团购开始时间",
+            labelWidth: 130,
+            prop: "grouponStartTime",
+
+          },
+          {
+            label: "履约单状态",
+            labelWidth: 130,
+            prop: "appointState",
+            searchLabelWidth: 130,
+            type: "select",
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=appoint_state",
+            props: {
+              label: "dictValue",
+              value: "dictKey"
             },
-          ]
-        },
-        data: []
+            dataType: "number",
+            search: true,
+            hide: false,
+            display: true,
+            rules: [{
+              required: true,
+              message: "选择状态",
+              trigger: "blur"
+            }]
+          },
+        ]
+      },
+      data: []
+    };
+  },
+  computed: {
+    ...mapGetters(["permission"]),
+    permissionList() {
+      return {
+        // addBtn: this.vaildData(this.permission.appoint_add, false),
+        // viewBtn: this.vaildData(this.permission.appoint_view, false),
+        // delBtn: this.vaildData(this.permission.appoint_delete, false),
+        // editBtn: this.vaildData(this.permission.appoint_edit, false)
       };
     },
-    computed: {
-      ...mapGetters(["permission"]),
-      permissionList() {
-        return {
-          addBtn: this.vaildData(this.permission.appoint_add, false),
-          viewBtn: this.vaildData(this.permission.appoint_view, false),
-          delBtn: this.vaildData(this.permission.appoint_delete, false),
-          editBtn: this.vaildData(this.permission.appoint_edit, false)
-        };
-      },
-      ids() {
-        let ids = [];
-        this.selectionList.forEach(ele => {
-          ids.push(ele.id);
+    ids() {
+      let ids = [];
+      this.selectionList.forEach(ele => {
+        ids.push(ele.id);
+      });
+      return ids.join(",");
+    }
+  },
+  methods: {
+    rowSave(row, done, loading) {
+      add(row).then(() => {
+        this.onLoad(this.page);
+        this.$message({
+          type: "success",
+          message: "操作成功!"
         });
-        return ids.join(",");
-      }
+        done();
+      }, error => {
+        loading();
+        window.console.log(error);
+      });
     },
-    methods: {
-
-      downLoadAppoint(){
-        window.open(`/api/distribution/appoint/exportAppointGoods?${this.website.tokenHeader}=${getToken()}&state=${this.state}`);
-      },
-      rowSave(row, done, loading) {
-        add(row).then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-          done();
-        }, error => {
-          loading();
-          window.console.log(error);
-        });
-      },
 
-      rowUpdate(row, index, done, loading) {
-        update(row).then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-          done();
-        }, error => {
-          loading();
-          console.log(error);
+    downLoadAppoint(){
+      window.open(`/api/distribution/appoint/exportStoreAppointGoods?${this.website.tokenHeader}=${getToken()}&grouponId=${this.grouponId}`);
+    },
+    rowUpdate(row, index, done, loading) {
+      update(row).then(() => {
+        this.onLoad(this.page);
+        this.$message({
+          type: "success",
+          message: "操作成功!"
         });
-      },
+        done();
+      }, error => {
+        loading();
+        console.log(error);
+      });
+    },
 
-      rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
+    rowDel(row) {
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
           .then(() => {
             return remove(row.id);
           })
@@ -248,19 +221,15 @@
               message: "操作成功!"
             });
           });
-      },
-      handleDelete() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
-        }
-        this.$confirm("确定将选择的履约单进行发货么?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
+    },
+    shipments(id){
+      this.$confirm("确定将改履约单进行发货么?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
           .then(() => {
-            return shipments(this.ids);
+            return shipments(id);
           })
           .then(() => {
             this.onLoad(this.page);
@@ -268,76 +237,102 @@
               type: "success",
               message: "操作成功!"
             });
-            this.$refs.crud.toggleSelection();
+            this.goodsOnLoad(this.goodsPage)
+            this.$refs.grouponCrud.toggleSelection();
           });
-      },
-      beforeOpen(done, type) {
-        if (["edit", "view"].includes(type)) {
-          getDetail(this.form.id).then(res => {
-            this.form = res.data.data;
+
+    },
+    shipmnetsALl(grouponId){
+      this.$confirm("确定将这个团的所有履约单进行发货么?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+          .then(() => {
+            return shipmentsAll(grouponId);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+            this.$refs.crud.toggleSelection();
           });
-        }
-        done();
-      },
-      searchReset() {
-        this.query = {};
-        this.onLoad(this.page);
-      },
-      searchChange(params, done) {
-        this.query = params;
-        this.page.currentPage = 1;
-        this.onLoad(this.page, params);
-        done();
-      },
-      selectionChange(list) {
-        this.selectionList = list;
-      },
-      selectionClear() {
-        this.selectionList = [];
-        this.$refs.crud.toggleSelection();
-      },
-      currentChange(currentPage){
-        this.page.currentPage = currentPage;
-      },
-      sizeChange(pageSize){
-        this.page.pageSize = pageSize;
-      },
-      refreshChange() {
-        this.onLoad(this.page, this.query);
-      },
-      onLoad(page, params = {}) {
-        this.loading = true;
-        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-          console.log(params, '----------------');
-          const data = res.data.data;
-          this.page.total = data.total;
-          this.data = data.records;
-          this.loading = false;
-          this.selectionClear();
+    },
+    beforeOpen(done, type) {
+      if (["edit", "view"].includes(type)) {
+        getDetail(this.form.id).then(res => {
+          this.form = res.data.data;
         });
-      },
+      }
+      done();
+    },
+    searchReset() {
+      this.query = {};
+      this.onLoad(this.page);
+    },
+    searchChange(params, done) {
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    selectionChange(list) {
+      this.selectionList = list;
+    },
+    selectionClear() {
+      this.selectionList = [];
+      this.$refs.crud.toggleSelection();
+    },
+    currentChange(currentPage){
+      this.page.currentPage = currentPage;
+    },
+    sizeChange(pageSize){
+      this.page.pageSize = pageSize;
+    },
+    sizeAppointChange(pageSize){
+      this.goodsPage.pageSize = pageSize;
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.query);
+    },
+    onLoad(page, params = {}) {
+      this.loading = true;
+      getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+        const data = res.data.data;
+        this.page.total = data.total;
+        this.data = data.records;
+        this.loading = false;
+        this.selectionClear();
+      });
+    },
 
-      goodsListView(arrivalCode) {
-        this.arrivalCode = arrivalCode;
-        this.goodsOnLoad(this.goodsPage)
-        this.goodsBox = true;
-      },
-      handleClose() {
-        this.goodsBox = false;
-      },
-      goodsOnLoad(page){
-        console.log(this.arrivalCode, '------arrivalCode---------');
-        this.goodsLoading = true;
-        goodsList(page.currentPage, page.pageSize, this.arrivalCode).then(res => {
-          const data = res.data.data;
-          this.page.total = data.total;
-          this.appointGoodsData = data.records;
-          this.goodsLoading = false;
-          this.selectionClear();
-        });
+    goodsListView(grouponId) {
+      this.grouponId = grouponId;
+      this.goodsPage = {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0
       }
+      this.goodsOnLoad(this.goodsPage)
+      this.goodsBox = true;
+    },
+    handleClose() {
+      this.goodsBox = false;
+    },
+    goodsOnLoad(page){
+      this.goodsLoading = true;
+      appointStoreList(page.currentPage, page.pageSize, this.grouponId).then(res => {
+        const data = res.data.data;
+        this.goodsPage.total = data.total;
+        this.appointGoodsData = data.records;
+        this.goodsLoading = false;
+        this.selectionClear();
+      });
     }
-  };
+  }
+};
 </script>
 
 <style>