111

ordermall-ui/static/css/chunk-15e795f1.c049bde2.css

@@ -1 +0,0 @@
-[data-v-3fa49be9] .el-form-item__error{margin-left:120px!important}.must[data-v-3fa49be9]{color:red}.span-sty[data-v-3fa49be9]{width:130px!important}.addinputInfo[data-v-3fa49be9]{margin-left:120px!important}.formaddcopy02 .el-row .el-col[data-v-3fa49be9] .el-form-item .addinputw{margin-left:120px!important;width:calc(100% - 115px)}.first_row[data-v-3fa49be9]{border-top:1px solid #e0e3eb}.titleOne[data-v-3fa49be9]{padding:7px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.el-radio[data-v-3fa49be9] .el-radio__label{font-size:14px!important}

ordermall-ui/static/css/chunk-9aeec19e.e28d63f9.css → ordermall-ui/static/css/chunk-26f27df9.39e5d2ed.css

@@ -1 +1 @@
-.trightb[data-v-7bb0ba38]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;text-align:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.trightb_item[data-v-7bb0ba38]{padding-top:5px}.span[data-v-7bb0ba38]{margin-left:50px;font-size:15px;font-weight:400}[data-v-7bb0ba38] .el-collapse-item__header{height:40px;padding:10px;font-weight:700;font-size:20px;text-align:left;color:#fff;background-color:#0294d7}[data-v-7bb0ba38] .el-collapse-item__content{padding-bottom:0}[data-v-eccb9944] .el-table .cell{padding:0}
+.trightb[data-v-7bb0ba38]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;text-align:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.trightb_item[data-v-7bb0ba38]{padding-top:5px}.span[data-v-7bb0ba38]{margin-left:50px;font-size:15px;font-weight:400}[data-v-7bb0ba38] .el-collapse-item__header{height:40px;padding:10px;font-weight:700;font-size:20px;text-align:left;color:#fff;background-color:#0294d7}[data-v-7bb0ba38] .el-collapse-item__content{padding-bottom:0}

ordermall-ui/static/css/chunk-49a36f7c.e69ee5ae.css

@@ -0,0 +1 @@
+[data-v-50de4c3d] .el-collapse-item__header{height:40px;padding:10px;font-weight:700;font-size:20px;text-align:left;color:#fff;background-color:#0294d7}[data-v-50de4c3d] .el-collapse-item__content{padding-bottom:0}

ordermall-ui/static/css/chunk-2edbaac8.007c54fa.css → ordermall-ui/static/css/chunk-4a223bb4.39e5d2ed.css

@@ -1 +1 @@
-.trightb[data-v-7bb0ba38]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;text-align:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.trightb_item[data-v-7bb0ba38]{padding-top:5px}.span[data-v-7bb0ba38]{margin-left:50px;font-size:15px;font-weight:400}[data-v-7bb0ba38] .el-collapse-item__header{height:40px;padding:10px;font-weight:700;font-size:20px;text-align:left;color:#fff;background-color:#0294d7}[data-v-7bb0ba38] .el-collapse-item__content{padding-bottom:0}[data-v-13d3a938] .el-table .cell{padding:0}
+.trightb[data-v-7bb0ba38]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;text-align:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.trightb_item[data-v-7bb0ba38]{padding-top:5px}.span[data-v-7bb0ba38]{margin-left:50px;font-size:15px;font-weight:400}[data-v-7bb0ba38] .el-collapse-item__header{height:40px;padding:10px;font-weight:700;font-size:20px;text-align:left;color:#fff;background-color:#0294d7}[data-v-7bb0ba38] .el-collapse-item__content{padding-bottom:0}

ordermall-ui/static/css/chunk-545283f2.b056a940.css

@@ -1 +0,0 @@
-.trightb[data-v-418791e4]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;text-align:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.trightb_item[data-v-418791e4]{padding-top:5px}[data-v-418791e4] .el-collapse-item__header{height:40px;padding:10px;font-weight:700;font-size:20px;text-align:left;color:#fff;background-color:#0294d7}[data-v-418791e4] .el-collapse-item__content{padding-bottom:0}

ordermall-ui/static/css/chunk-8768581a.46f16ef0.css → ordermall-ui/static/css/chunk-6616e71e.39e5d2ed.css

@@ -1 +1 @@
-.trightb[data-v-7bb0ba38]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;text-align:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.trightb_item[data-v-7bb0ba38]{padding-top:5px}.span[data-v-7bb0ba38]{margin-left:50px;font-size:15px;font-weight:400}[data-v-7bb0ba38] .el-collapse-item__header{height:40px;padding:10px;font-weight:700;font-size:20px;text-align:left;color:#fff;background-color:#0294d7}[data-v-7bb0ba38] .el-collapse-item__content{padding-bottom:0}[data-v-4f44d49a] .el-table .cell{padding:0}
+.trightb[data-v-7bb0ba38]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;text-align:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.trightb_item[data-v-7bb0ba38]{padding-top:5px}.span[data-v-7bb0ba38]{margin-left:50px;font-size:15px;font-weight:400}[data-v-7bb0ba38] .el-collapse-item__header{height:40px;padding:10px;font-weight:700;font-size:20px;text-align:left;color:#fff;background-color:#0294d7}[data-v-7bb0ba38] .el-collapse-item__content{padding-bottom:0}

ordermall-ui/static/css/chunk-6751ece2.75e5eb50.css

@@ -0,0 +1 @@
+[data-v-062c68fc] .el-form-item__error{margin-left:120px!important}.must[data-v-062c68fc]{color:red}.span-sty[data-v-062c68fc]{width:130px!important}.addinputInfo[data-v-062c68fc]{margin-left:120px!important}.formaddcopy02 .el-row .el-col[data-v-062c68fc] .el-form-item .addinputw{margin-left:120px!important;width:calc(100% - 115px)}.first_row[data-v-062c68fc]{border-top:1px solid #e0e3eb}.titleOne[data-v-062c68fc]{padding:7px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.el-radio[data-v-062c68fc] .el-radio__label{font-size:14px!important}

ordermall-ui/static/css/chunk-7b9cf70b.7557e0f3.css

@@ -0,0 +1 @@
+.trightb[data-v-d2a7abe4]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;text-align:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.trightb_item[data-v-d2a7abe4]{padding-top:5px}[data-v-d2a7abe4] .el-collapse-item__header{height:40px;padding:10px;font-weight:700;font-size:20px;text-align:left;color:#fff;background-color:#0294d7}[data-v-d2a7abe4] .el-collapse-item__content{padding-bottom:0}

src/api/invoiceReview/invoiceReview.js

@@ -14,7 +14,7 @@ export default {
     //   获取订单详情
     getOrderDetails: function(params) {
         return request({
-            url: '/mall/empsreservoorder/OrderDetailsNew/' + params,
+            url: '/mall/order/OrderDetailsNew/' + params,
             method: 'get'
         })
     },

src/api/lpk/bank.js

@@ -2,24 +2,31 @@ import request from '@/utils/request'
 
 export default {
 
-  // 各支行列表
+    // 各支行列表
-  listBankAll: function() {
+    listBankAll: function() {
-    return request({
+        return request({
-      url: '/adminapi/bank/listBankAll'
+            url: '/adminapi/bank/listBankAll'
-    });
+        });
-  },
+    },
 
-  // 获取支行下的提货点
+    // 获取支行下的提货点
-  listStoreOfBank: function(bankSid) {
+    listStoreOfBank: function(bankSid) {
-    return request({
+        return request({
-      url: '/adminapi/bank/listStoreOfBank',
+            url: '/adminapi/bank/listStoreOfBank',
-      method: 'get',
+            method: 'get',
-      params: {
+            params: {
-        "bankSid": bankSid
+                "bankSid": bankSid
-      }
+            }
-    });
+        });
-  },
+    },
+    // 获取所有门店
+    getAllStore: function(data) {
+        return request({
+            url: '/mall/lpkstore/getAllStore',
+            method: 'DELETE',
+            data: data
+        });
+    },
 
 
-
+}
-}

src/api/lpk/reserveorder.js

@@ -89,6 +89,15 @@ export default {
             },
             responseType: 'blob'
         })
-    }
+    },
+
+    // 批量取消预约 
+    pcCancelReservation: function(data) {
+        return request({
+            url: '/mall/lpksreservoorders/pcCancelReservation',
+            method: 'post',
+            data: data
+        });
+    },
 
 }

src/api/preSaleOrder/preSaleOrder.js

@@ -5,7 +5,7 @@ export default {
     // 获取礼包列表
     pcOrderList: function(data) {
         return request({
-            url: '/mall/empsreservoorder/pcOrderList',
+            url: '/mall/order/pcOrderList',
             method: 'post',
             data: data
         });

src/layout/components/Sidebar/index.vue

@@ -382,7 +382,7 @@
                                 component: 'subBranch',
                                 meta: {
                                     icon: 'el-icon-help',
-                                    title: '支行配货统计'
+                                    title: '区域配货统计'
                                 },
                                 name: '/orderreserve/subBranch',
                                 path: '/orderreserve/subBranch'

src/router/index.js

@@ -410,7 +410,7 @@ export const constantRoutes = [{
                     import('@/views/order/subBranch.vue'),
                 name: 'subBranch',
                 meta: {
-                    title: '支行配货统计'
+                    title: '区域配货统计'
                 }
             },
             {
@@ -450,7 +450,7 @@ export const constantRoutes = [{
                     import('@/views/orderreserve/subBranch.vue'),
                 name: 'OrderreserveSubBranch',
                 meta: {
-                    title: '支行配货统计'
+                    title: '区域配货统计'
                 }
             },
             {

src/views/commodity/commodityAdd.vue

@@ -103,9 +103,9 @@
                     </el-col>
                     <el-col :span="8">
                         <div class="span-sty"><span class="must">*</span> 进货单价</div>
-                        <el-form-item prop="purchasePrice">
+                        <el-form-item prop="standardPurchasePrice">
-                            <el-input v-model="formobj.purchasePrice" placeholder="" class="addinputw addinputInfo"
+                            <el-input v-model="formobj.standardPurchasePrice" placeholder=""
-                                clearable
+                                class="addinputw addinputInfo" clearable
                                 oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
                         </el-form-item>
                     </el-col>
@@ -342,7 +342,7 @@
                     name: '',
                     code: '',
                     barcode: '',
-                    purchasePrice: '',
+                    standardPurchasePrice: '',
                     price: '',
                     stepWeight: '',
                     stepPrice: '',
@@ -399,7 +399,7 @@
                         message: '请选择商品单位',
                         trigger: 'change'
                     }],
-                    purchasePrice: [{
+                    standardPurchasePrice: [{
                         required: true,
                         message: '进货单价不能为空',
                         trigger: 'blur'
@@ -514,7 +514,7 @@
                     name: '',
                     code: '',
                     barcode: '',
-                    purchasePrice: '',
+                    standardPurchasePrice: '',
                     price: '',
                     stepWeight: '',
                     stepPrice: '',

src/views/invoiceReview/index.vue

@@ -43,7 +43,7 @@
                         <el-table-column prop="createTime" label="提交时间" width="180" align="center" />
                         <el-table-column label="订单编号" align="center">
                             <template slot-scope="scope">
-                                <div style="color: #1890FF; text-decoration: underline ;"
+                                <div style="color: #1890FF; text-decoration: underline ;cursor:pointer;"
                                     @click="showOrder(scope.row.orderSid)">{{ scope.row.outTradeNo }}</div>
                             </template>
                         </el-table-column>

src/views/orderreserve/allDistributionCount.vue

@@ -9,11 +9,10 @@
                     </el-button>
                     <div v-show="isSearchShow" class="search">
                         <el-form :inline="true" class="tab-header">
-                            <el-form-item label="预约开始日期">
+                            <el-form-item label="预约日期">
                                 <el-date-picker v-model="page.params.startDate" type="date" placeholder="选择日期"
                                     format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" clearable />
-                            </el-form-item>
+                                至
-                            <el-form-item label="预约结束日期">
                                 <el-date-picker v-model="page.params.endDate" type="date" placeholder="选择日期"
                                     format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" clearable />
                             </el-form-item>
@@ -38,7 +37,7 @@
                 <!-- End 项目列表头部 -->
                 <!-- Start 项目列表 -->
                 <div class="">
-                    <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" :cell-style="cell">
+                    <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%">
                         <!-- <el-table-column fixed width="50" type="selection" align="center" /> -->
                         <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
                         <!-- 	<el-table-column label="操作" align="center" width="120">
@@ -47,7 +46,7 @@
 							</template>
 						</el-table-column> -->
                         <el-table-column prop="reserveDate" label="预约日期" align="center" />
-                        <el-table-column prop="brandName" label="菜窖分类" align="center" />
+                        <el-table-column prop="brandName" label="品牌" align="center" />
                         <el-table-column prop="goodsName" label="商品名称" align="center" />
                         <el-table-column prop="goodsNumber" label="数量(份)" align="center" />
 
@@ -70,6 +69,7 @@
 
 <script>
     import req from '@/api/lpk/reserveorder.js'
+    import reqBank from '@/api/lpk/bank.js'
     import reqMall from '@/api/adminmallapi.js'
     import ButtonBar from '@/components/ButtonBar'
     import Pagination from '@/components/pagination'
@@ -115,7 +115,11 @@
                         cardType: ''
                     }
                 },
-                brandList: []
+                brandList: [],
+                bankList: [],
+                storeList: [],
+                selectionList: [],
+                sids: [],
             }
         },
         mounted() {
@@ -239,7 +243,5 @@
     }
 </script>
 <style scoped>
-    ::v-deep .el-table .cell {
+
-        padding: 0px;
-    }
 </style>

src/views/orderreserve/distributionCount.vue

@@ -9,29 +9,36 @@
                     </el-button>
                     <div v-show="isSearchShow" class="search">
                         <el-form :inline="true" class="tab-header">
-                            <el-form-item label="预约开始日期">
+                            <el-form-item label="预约日期">
                                 <el-date-picker v-model="page.params.startDate" type="date" placeholder="选择日期"
                                     format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" clearable />
-                            </el-form-item>
+                                至
-                            <el-form-item label="预约结束日期">
                                 <el-date-picker v-model="page.params.endDate" type="date" placeholder="选择日期"
                                     format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" clearable />
                             </el-form-item>
-                            <!-- <el-form-item label="所属支行">
+                            <el-form-item label="提货地点">
-                <el-select v-model="page.params.bankSid" filterable class="item_input" clearable placeholder="请选择" style="width:100%" @change="bankSelect">
+                                <el-select v-model="page.params.address" filterable class="item_input" clearable
-                  <el-option v-for="item in bankList" :key="item.sid" :label="item.name" :value="item.sid" />
+                                    placeholder="请选择" style="width:100%">
-                </el-select>
+                                    <el-option v-for="item in storeList" :key="item.value" :label="item.text"
-              </el-form-item>
+                                        :value="item.text" />
-              <el-form-item label="提货门店">
+                                </el-select>
-                <el-select v-model="page.params.store" filterable class="item_input" clearable placeholder="请选择" style="width:100%">
+                            </el-form-item>
-                  <el-option v-for="item in storeList" :key="item.sid" :label="item.name" :value="item.sid" />
+                            <el-form-item label="品牌">
-                </el-select>
+                                <el-select v-model="page.params.brand" filterable class="item_input" clearable
-              </el-form-item>
+                                    placeholder="请选择" style="width:100%">
-              <el-form-item label="菜窖分类">
+                                    <el-option v-for="item in brandList" :key="item.sid" :label="item.name"
-                <el-select v-model="page.params.cardType" filterable class="item_input" clearable placeholder="请选择" style="width:100%">
+                                        :value="item.sid" />
-                  <el-option v-for="item in brandList" :key="item.id" :label="item.name" :value="item.id" />
+                                </el-select>
-                </el-select>
+                            </el-form-item>
-              </el-form-item> -->
+                            <el-form-item label="客户名称">
+                                <el-input v-model="page.params.userName" placeholder="" clearable />
+                            </el-form-item>
+                            <el-form-item label="联系电话">
+                                <el-input v-model="page.params.userPhone" placeholder="" clearable />
+                            </el-form-item>
+                            <el-form-item label="商品名称">
+                                <el-input v-model="page.params.goodsName" placeholder="" clearable />
+                            </el-form-item>
                         </el-form>
                         <div class="btn" style="text-align: center;">
                             <el-button type="primary" size="small" icon="el-icon-search"
@@ -48,7 +55,7 @@
                 <!-- End 项目列表头部 -->
                 <!-- Start 项目列表 -->
                 <div class="">
-                    <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" :cell-style="cell">
+                    <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%">
                         <!-- <el-table-column fixed width="50" type="selection" align="center" /> -->
                         <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
                         <!-- 	<el-table-column label="操作" align="center" width="120">
@@ -57,9 +64,9 @@
 							</template>
 						</el-table-column> -->
                         <el-table-column prop="reserveDate" label="预约日期" align="center" />
-                        <el-table-column prop="bankName" label="所属支行" align="center" />
+                        <!-- <el-table-column prop="bankName" label="所属支行" align="center" /> -->
                         <el-table-column prop="storeName" label="提货地点" align="center" />
-                        <el-table-column prop="brandName" label="菜窖分类" align="center" />
+                        <el-table-column prop="brandName" label="品牌" align="center" />
                         <el-table-column prop="goodsName" label="商品名称" align="center" />
                         <el-table-column prop="goodsNumber" label="数量(份)" align="center" />
                         <el-table-column prop="storeAddress" label="提货点地址" align="center" />
@@ -138,14 +145,18 @@
                     params: {
                         startDate: '',
                         endDate: '',
-                        store: '',
+                        address: '',
-                        bankSid: '',
+                        brand: '',
-                        cardType: ''
+                        userName: '',
+                        userPhone: '',
+                        goodsName: '',
                     }
                 },
                 brandList: [],
                 bankList: [],
-                storeList: []
+                storeList: [],
+                selectionList: [],
+                sids: [],
             }
         },
         mounted() {
@@ -156,22 +167,26 @@
             // this.initStore()
             // this.initBrand()
             this.loadList()
+            this.getAllStore()
+            this.initBrand()
         },
         methods: {
-            initBank() {
+            getAllStore() {
-                reqBank.listBankAll()
+                var params = {
-                    .then(resp => {
+                    orgPath: window.sessionStorage.getItem('orgSidPath')
-                        this.bankList = resp.data
+                }
-                    })
+                reqBank.getAllStore(params)
-            },
-            initStore() {
-                reqBank.listStoreOfBank(this.page.params.bankSid)
                     .then(resp => {
                         this.storeList = resp.data
                     })
             },
             initBrand() {
-                reqMall.listAllBrand().then(resp => {
+
+                var params = {
+                    orgPath: window.sessionStorage.getItem('orgSidPath')
+                }
+
+                reqMall.listAllBrand(params).then(resp => {
                     this.brandList = resp.data
                 })
             },
@@ -204,6 +219,9 @@
             },
             loadList() {
                 this.tableLoading = true
+                this.page.params.userSid = window.sessionStorage.getItem('userSid')
+                this.page.params.orgPath = window.sessionStorage.getItem('orgSidPath')
+                this.page.params.menuUrl = this.$route.path
                 req.pageOfStore(this.page).then((resp) => {
                     this.tableLoading = false
                     if (resp.success) {
@@ -238,9 +256,11 @@
                     params: {
                         startDate: '',
                         endDate: '',
-                        store: '',
+                        address: '',
-                        bankSid: '',
+                        brand: '',
-                        cardType: ''
+                        userName: '',
+                        userPhone: '',
+                        goodsName: '',
                     }
                 }
                 this.loadList()
@@ -290,7 +310,5 @@
     }
 </script>
 <style scoped>
-    ::v-deep .el-table .cell {
+
-        padding: 0px;
-    }
 </style>

src/views/orderreserve/index.vue

@@ -9,6 +9,7 @@
                     </el-button>
                     <div v-show="isSearchShow" class="search">
                         <el-form :inline="true" class="tab-header">
+
                             <el-form-item label="预约日期">
                                 <el-date-picker v-model="page.params.startDate" type="date" placeholder="选择日期"
                                     format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" clearable />
@@ -24,27 +25,34 @@
                                 </el-select>
                             </el-form-item> -->
                             <el-form-item label="提货地点">
-                                <el-select v-model="page.params.store" filterable class="item_input" clearable
+                                <el-select v-model="page.params.address" filterable class="item_input" clearable
                                     placeholder="请选择" style="width:100%">
-                                    <el-option v-for="item in storeList" :key="item.sid" :label="item.name"
+                                    <el-option v-for="item in storeList" :key="item.value" :label="item.text"
-                                        :value="item.sid" />
+                                        :value="item.value" />
                                 </el-select>
                             </el-form-item>
-                            <el-form-item label="菜窖分类">
+                            <el-form-item label="品牌">
-                                <el-select v-model="page.params.cardType" filterable class="item_input" clearable
+                                <el-select v-model="page.params.brand" filterable class="item_input" clearable
                                     placeholder="请选择" style="width:100%">
-                                    <el-option v-for="item in brandList" :key="item.id" :label="item.name"
+                                    <el-option v-for="item in brandList" :key="item.sid" :label="item.name"
-                                        :value="item.id" />
+                                        :value="item.sid" />
                                 </el-select>
                             </el-form-item>
                             <el-form-item label="客户名称">
-                                <el-input v-model="page.params.name" placeholder="" clearable />
+                                <el-input v-model="page.params.userName" placeholder="" clearable />
                             </el-form-item>
                             <el-form-item label="联系电话">
-                                <el-input v-model="page.params.name" placeholder="" clearable />
+                                <el-input v-model="page.params.userPhone" placeholder="" clearable />
                             </el-form-item>
                             <el-form-item label="商品名称">
-                                <el-input v-model="page.params.name" placeholder="" clearable />
+                                <el-input v-model="page.params.goodsName" placeholder="" clearable />
+                            </el-form-item>
+                            <el-form-item label="预约单状态">
+                                <el-select v-model="page.params.stateValue" filterable class="item_input" clearable
+                                    placeholder="请选择" style="width:100%">
+                                    <el-option v-for="item in stateValueList" :key="item.sid" :label="item.name"
+                                        :value="item.sid" />
+                                </el-select>
                             </el-form-item>
                         </el-form>
                         <div class="btn" style="text-align: center;">
@@ -72,10 +80,10 @@
               </template>
             </el-table-column> -->
                         <el-table-column prop="reserveDate" label="预约日期" align="center" />
-                        <el-table-column prop="reserveState" label="预约单状态" align="center" />
+                        <el-table-column prop="stateValue" label="预约单状态" align="center" />
                         <!-- <el-table-column prop="bankName" label="所属支行" align="center" /> -->
                         <el-table-column prop="storeName" label="提货点" align="center" />
-                        <el-table-column prop="brandName" label="菜窖分类" align="center" />
+                        <el-table-column prop="brandName" label="品牌" align="center" />
                         <el-table-column prop="userName" label="客户名称" align="center" />
                         <el-table-column prop="userPhone" label="联系电话" align="center" />
                         <el-table-column prop="goodsName" label="商品名称" align="center" />
@@ -146,47 +154,129 @@
                     current: 1, // 默认开始页面
                     size: 10, // 每页的数据条数
                     params: {
-                        startDate: '',
+                        startDate: new Date(),
-                        endDate: '',
+                        endDate: new Date(),
-                        store: '',
+                        address: '',
-                        bankSid: '',
+                        brand: '',
-                        cardType: ''
+                        userName: '',
+                        userPhone: '',
+                        goodsName: '',
+                        stateValue: ''
                     }
                 },
                 brandList: [],
                 bankList: [],
-                storeList: []
+                storeList: [],
+                selectionList: [],
+                sids: [],
+                stateValueList: [
+                    // {
+                    //     sid: '0',
+                    //     name: '备货中'
+                    // },
+                    {
+                        sid: '0',
+                        name: '待提货'
+                    },
+                    {
+                        sid: '1',
+                        name: '已提货'
+                    },
+                    {
+                        sid: '2',
+                        name: '已取消'
+                    },
+
+                ]
             }
         },
         mounted() {
             this.$refs['btnbar'].setButtonList(this.btnList)
         },
         created() {
-            // this.initBank()
+            this.getAllStore()
-            this.initStore()
             this.initBrand()
-            // this.getAllStore()
             this.loadList()
             // this.getBankList()
         },
         methods: {
             handleChange(val) {
+                const aa = []
+                this.selectionList = val
+                val.forEach(element => {
+                    aa.push(element.sid)
+                })
+                this.sids = aa
 
             },
-            initBank() {
+            cancel() {
-                reqBank.listBankAll()
+
+                if (this.sids.length != 0) {
+                    this.selectionList.forEach(element => {
+
+                        console.log('>>>>>>>>>cancel', element.stateValue)
+
+                        if (element.stateValue != '待提货') {
+                            this.$message({
+                                type: 'warning',
+                                message: '请选择状态为待提货的预约单.',
+                                showClose: true
+                            })
+                            return
+                        }
+                    })
+                } else {
+                    this.$message({
+                        type: 'warning',
+                        message: '请选择预约单.',
+                        showClose: true
+                    })
+                    return
+                }
+
+                req.pcCancelReservation(this.sids)
                     .then(resp => {
-                        this.bankList = resp.data
+
+                        if (resp.success) {
+                            this.$message({
+                                type: 'success',
+                                message: '操作成功.',
+                                showClose: true
+                            })
+                            this.loadList()
+                        }
+
                     })
+
+
             },
-            initStore() {
+            getAllStore() {
-                reqBank.listStoreOfBank(this.page.params.bankSid)
+                var params = {
+                    orgPath: window.sessionStorage.getItem('orgSidPath')
+                }
+                reqBank.getAllStore(params)
                     .then(resp => {
                         this.storeList = resp.data
                     })
             },
+            // initStore() {
+
+            //     var params = {
+            //         orgPath: window.sessionStorage.getItem('orgSidPath')
+            //     }
+
+            //     reqBank.listStoreOfBank(this.page.params.bankSid)
+            //         .then(resp => {
+            //             this.storeList = resp.data
+            //         })
+            // },
             initBrand() {
-                reqMall.listAllBrand().then(resp => {
+
+                var params = {
+                    orgPath: window.sessionStorage.getItem('orgSidPath')
+                }
+
+                reqMall.listAllBrand(params).then(resp => {
                     this.brandList = resp.data
                 })
             },
@@ -208,6 +298,9 @@
                     case 'doClose':
                         this.doClose()
                         break
+                    case 'cancel':
+                        this.cancel()
+                        break
                     default:
                         break
                 }
@@ -220,6 +313,9 @@
             },
             loadList() {
                 this.tableLoading = true
+                this.page.params.userSid = window.sessionStorage.getItem('userSid')
+                this.page.params.orgPath = window.sessionStorage.getItem('orgSidPath')
+                this.page.params.menuUrl = this.$route.path
                 req.pageOfCustomer(this.page).then((resp) => {
                     this.tableLoading = false
                     if (resp.success) {
@@ -252,11 +348,14 @@
                     size: 10,
                     total: 0,
                     params: {
-                        startDate: '',
+                        startDate: new Date(),
-                        endDate: '',
+                        endDate: new Date(),
-                        store: '',
+                        address: '',
-                        bankSid: '',
+                        brand: '',
-                        cardType: ''
+                        userName: '',
+                        userPhone: '',
+                        goodsName: '',
+                        stateValue: '',
                     }
                 }
                 this.loadList()

src/views/orderreserve/subBranch.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="app-container">
         <div v-show="viewState == 1">
-            <button-bar ref="btnbar" view-title="支行配货统计" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+            <button-bar ref="btnbar" view-title="区域配货统计" :btndisabled="btndisabled" @btnhandle="btnHandle" />
             <div class="main-content">
                 <div class="searchcon">
                     <el-button size="small" class="searchbtn" @click="clicksearchShow">
@@ -9,24 +9,37 @@
                     </el-button>
                     <div v-show="isSearchShow" class="search">
                         <el-form :inline="true" class="tab-header">
-                            <el-form-item label="预约开始日期">
+                            <el-form-item label="预约日期">
                                 <el-date-picker v-model="page.params.startDate" type="date" placeholder="选择日期"
                                     format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" clearable />
-                            </el-form-item>
+                                至
-                            <el-form-item label="预约结束日期">
                                 <el-date-picker v-model="page.params.endDate" type="date" placeholder="选择日期"
                                     format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" clearable />
                             </el-form-item>
-                            <!-- <el-form-item label="所属支行">
+                            <el-form-item label="所属区域">
-                <el-select v-model="page.params.bankSid" filterable class="item_input" clearable placeholder="请选择" style="width:100%">
+                                <el-select v-model="page.params.address" filterable class="item_input" clearable
-                  <el-option v-for="item in bankList" :key="item.sid" :label="item.name" :value="item.sid" />
+                                    placeholder="请选择" style="width:100%">
-                </el-select>
+                                    <el-option v-for="item in storeList" :key="item.value" :label="item.text"
-              </el-form-item>
+                                        :value="item.text" />
-              <el-form-item label="菜窖分类">
+                                </el-select>
-                <el-select v-model="page.params.cardType" filterable class="item_input" clearable placeholder="请选择" style="width:100%">
+                            </el-form-item>
-                  <el-option v-for="item in brandList" :key="item.id" :label="item.name" :value="item.id" />
+                            <el-form-item label="提货地点">
-                </el-select>
+                                <el-select v-model="page.params.address" filterable class="item_input" clearable
-              </el-form-item> -->
+                                    placeholder="请选择" style="width:100%">
+                                    <el-option v-for="item in storeList" :key="item.value" :label="item.text"
+                                        :value="item.text" />
+                                </el-select>
+                            </el-form-item>
+                            <el-form-item label="品牌">
+                                <el-select v-model="page.params.brand" filterable class="item_input" clearable
+                                    placeholder="请选择" style="width:100%">
+                                    <el-option v-for="item in brandList" :key="item.sid" :label="item.name"
+                                        :value="item.sid" />
+                                </el-select>
+                            </el-form-item>
+                            <el-form-item label="商品名称">
+                                <el-input v-model="page.params.goodsName" placeholder="" clearable />
+                            </el-form-item>
                         </el-form>
                         <div class="btn" style="text-align: center;">
                             <el-button type="primary" size="small" icon="el-icon-search"
@@ -38,12 +51,12 @@
                 </div>
                 <!-- Start 项目列表头部 -->
                 <div class="listtop">
-                    <div class="tit">支行配货列表</div>
+                    <div class="tit">区域配货列表</div>
                 </div>
                 <!-- End 项目列表头部 -->
                 <!-- Start 项目列表 -->
                 <div class="">
-                    <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" :cell-style="cell">
+                    <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%">
                         <!-- <el-table-column fixed width="50" type="selection" align="center" /> -->
                         <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
                         <!-- 	<el-table-column label="操作" align="center" width="120">
@@ -52,13 +65,13 @@
 							</template>
 						</el-table-column> -->
                         <el-table-column prop="reserveDate" label="预约日期" align="center" />
-                        <el-table-column prop="bankName" label="支行名称" align="center" />
+                        <el-table-column prop="bankName" label="区域名称" align="center" />
-                        <el-table-column prop="brandName" label="菜窖分类" align="center" />
+                        <el-table-column prop="brandName" label="品牌" align="center" />
                         <el-table-column prop="goodsName" label="商品名称" align="center" />
                         <el-table-column prop="goodsNumber" label="数量(份)" align="center" />
-                        <el-table-column prop="bankAddress" label="支行地址" align="center" />
+                        <el-table-column prop="bankAddress" label="区域地址" align="center" />
-                        <el-table-column prop="bankLinker" label="支行联系人" align="center" />
+                        <el-table-column prop="bankLinker" label="区域联系人" align="center" />
-                        <el-table-column prop="bankPhone" label="支行电话" align="center" />
+                        <el-table-column prop="bankPhone" label="区域电话" align="center" />
 
                     </el-table>
                 </div>
@@ -126,7 +139,10 @@
                     }
                 },
                 brandList: [],
-                bankList: []
+                bankList: [],
+                storeList: [],
+                selectionList: [],
+                sids: [],
             }
         },
         mounted() {
@@ -257,7 +273,5 @@
     }
 </script>
 <style scoped>
-    ::v-deep .el-table .cell {
+
-        padding: 0px;
-    }
 </style>

src/views/preSaleOrder/index.vue

@@ -74,7 +74,7 @@
                         <el-table-column prop="createTime" label="创建日期" align="center" />
                         <el-table-column label="订单编号" align="center" width="350">
                             <template slot-scope="scope">
-                                <span style="color: #1890FF; text-decoration: underline ;"
+                                <span style="color: #1890FF; text-decoration: underline ; cursor:pointer;"
                                     @click="showOrder(scope.row.sid)">{{scope.row.outTradeNo}}</span>
                             </template>
                         </el-table-column>
@@ -526,4 +526,17 @@
     }
 </script>
 <style scoped>
+    /deep/.el-collapse-item__header {
+        height: 40px;
+        padding: 10px;
+        font-weight: bold;
+        font-size: 20px;
+        text-align: left;
+        color: #ffffff;
+        background-color: #0294d7;
+    }
+
+    /deep/.el-collapse-item__content {
+        padding-bottom: 0;
+    }
 </style>

vue.config.js

@@ -40,8 +40,8 @@ module.exports = {
         },
         proxy: {
             '/api': { // 匹配所有以 '/api'开头的请求路径
-                target: 'http://192.168.0.105:8116',
+                // target: 'http://192.168.0.105:8116',
-                // target: process.env.VUE_APP_URL, // 代理目标的基础路径
+                target: process.env.VUE_APP_URL, // 代理目标的基础路径
                 // target: 'https://supervise.yxtsoft.com/lpkapi', // 代理目标的基础路径
                 changeOrigin: true, // 支持跨域
                 pathRewrite: { // 重写路径: 去掉路径中开头的'/api'
@@ -49,8 +49,8 @@ module.exports = {
                 }
             },
             '/upload': { // 匹配所有以 '/api'开头的请求路径
-                target: 'http://192.168.0.105:8116',
+                // target: 'http://192.168.0.105:8116',
-                // target: process.env.VUE_APP_URL, // 代理目标的基础路径
+                target: process.env.VUE_APP_URL, // 代理目标的基础路径
                 // target: 'https://supervise.yxtsoft.com/lpkapi', // 代理目标的基础路径
                 changeOrigin: true, // 支持跨域
                 pathRewrite: { // 重写路径: 去掉路径中开头的'/api'