shish 2 лет назад
Родитель
Сommit
97b375b1ff

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/css/chunk-2abf5f16.8b1dcb31.css


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/css/chunk-9024092e.ac83bf89.css


+ 0 - 0
ghs/dist/shop/css/chunk-240872b3.c0fe823d.css → ghs/dist/shop/css/chunk-943e79d4.c0fe823d.css


+ 1 - 1
ghs/dist/shop/index.html

@@ -43,4 +43,4 @@
 			.once .sub-title {
 				color: #ababab;
 				font-size: 12px;
-			}</style><link href="/css/app.ae6e08b6.css" rel="preload" as="style"><link href="/css/chunk-libs.ce660555.css" rel="preload" as="style"><link href="/js/app.7123a90e.js" rel="preload" as="script"><link href="/js/chunk-libs.c536e65e.js" rel="preload" as="script"><link href="/css/chunk-libs.ce660555.css" rel="stylesheet"><link href="/css/app.ae6e08b6.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="http://img.hzghd.com/cdn/vue/2.6.10/vue.min.js"></script><script src="http://img.hzghd.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="http://img.hzghd.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="http://img.hzghd.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="http://img.hzghd.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="http://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="http://img.hzghd.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="http://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="http://img.hzghd.com/cdn/element-ui/2.13.0/index.js"></script><script src="http://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="http://img.hzghd.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="http://img.hzghd.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.c536e65e.js"></script><script src="/js/app.7123a90e.js"></script></body></html>
+			}</style><link href="/css/app.ae6e08b6.css" rel="preload" as="style"><link href="/css/chunk-libs.ce660555.css" rel="preload" as="style"><link href="/js/app.2ebe6192.js" rel="preload" as="script"><link href="/js/chunk-libs.c536e65e.js" rel="preload" as="script"><link href="/css/chunk-libs.ce660555.css" rel="stylesheet"><link href="/css/app.ae6e08b6.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="http://img.hzghd.com/cdn/vue/2.6.10/vue.min.js"></script><script src="http://img.hzghd.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="http://img.hzghd.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="http://img.hzghd.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="http://img.hzghd.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="http://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="http://img.hzghd.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="http://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="http://img.hzghd.com/cdn/element-ui/2.13.0/index.js"></script><script src="http://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="http://img.hzghd.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="http://img.hzghd.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.c536e65e.js"></script><script src="/js/app.2ebe6192.js"></script></body></html>

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/js/app.2ebe6192.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/js/chunk-2330d9a2.1d03764c.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/js/chunk-240872b3.da29ee8d.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/js/chunk-2abf5f16.daf46c3c.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/js/chunk-9024092e.b90cbce4.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/js/chunk-943e79d4.20a1b03d.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/js/chunk-a4867688.6b445ad0.js


+ 7 - 0
ghs/src/service/purchase-order/index.js

@@ -2,6 +2,13 @@ import { BaseService, Service } from '@/cool';
 @Service('purchase-order')
 export class PurchaseOrderService extends BaseService {
 
+	getOrderList(data){
+		return this.request({
+			url: '/list',
+			params: data
+		});		
+	}
+
 	dueList(data){
 		return this.request({
 			url: '/due-list',

+ 68 - 5
ghs/src/views/in/list.vue

@@ -105,6 +105,17 @@
 				<el-button type="primary" size="mini" style="margin-left:50px;" @click="newCg()">新增采购</el-button>
 			</template>
 
+			<template #slot-export-order>
+				<el-button type="primary" size="mini" style="margin-left:60px;" @click="exportData()">导出数据</el-button>
+			</template>
+
+      <template #slot-search-option="{scope}">
+        入库时间:
+        <el-date-picker v-model="currentDateList" type="daterange" align="right" unlink-panels range-separator="至" start-placeholder="开始日期" @change="getSearchDate" value-format="yyyy-MM-dd"
+                end-placeholder="结束日期" :picker-options="pickerOptions" size="mini" style="margin-right:20px;">
+        </el-date-picker>
+      </template>
+
     </x-crud>
 
     <order-detail ref="orderDetail" :orderOperate="optionData" />
@@ -173,7 +184,39 @@ export default {
       orderData:'',
       addPop:false,
       name:'',
-      location:0
+      location:0,
+      searchContent:'',
+      startTime:'',
+      endTime:'',
+      searchTime:'',
+      currentDateList:[],
+      pickerOptions: {
+            shortcuts: [{
+                text: '最近一周',
+                onClick(picker) {
+                const end = new Date();
+                const start = new Date();
+                start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+                picker.$emit('pick', [start, end]);
+                }
+            }, {
+                text: '最近一个月',
+                onClick(picker) {
+                const end = new Date();
+                const start = new Date();
+                start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+                picker.$emit('pick', [start, end]);
+                }
+            }, {
+                text: '最近三个月',
+                onClick(picker) {
+                const end = new Date();
+                const start = new Date();
+                start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+                picker.$emit('pick', [start, end]);
+                }
+            }]
+      }
     };
   },
   created() {
@@ -193,6 +236,13 @@ export default {
 		}
 	},
   methods: {
+		exportData(){
+			this.$service.purchaseOrder.getOrderList({status: this.tabIndex,searchTime:this.searchTime,startTime:this.startTime,endTime:this.endTime,name:this.searchContent,export:1}).then(res => {
+				if(res.file){
+					window.location.href = res.file
+				}
+			})
+		},
 		changeSeatSn(info){
 			this.$prompt('请输入货位号','提示',{confirmButtonText:'确定',cancelButtonText:'取消'}).then(({value}) => {
 				this.$service.purchaseOrder.modifySeatSn({ seatSn: value,id:info.id}).then(data => {
@@ -290,7 +340,7 @@ export default {
 			this.$confirm('确认取消?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }).then(() => {
         this.$service.purchaseOrder.cancelOrder({id:item.id}).then(data => {
           this.$notify({ title: '已取消', message: '操作成功', type: 'success'})
-          this.app.refresh({ status: this.tabIndex})
+          this.app.refresh({ status: this.tabIndex,searchTime:this.searchTime,startTime:this.startTime,endTime:this.endTime,name:this.searchContent})
         })
 			})
     },
@@ -301,7 +351,19 @@ export default {
       });
     },
     changeTab(tab, e) {
-      this.app.refresh({ status: this.tabIndex});
+      this.app.refresh({ status: this.tabIndex,searchTime:this.searchTime,startTime:this.startTime,endTime:this.endTime,name:this.searchContent});
+    },
+    getSearchDate(){
+      if (this.$util.isEmpty(this.currentDateList)) {
+        this.searchTime = ''
+        this.startTime = ''
+        this.endTime = ''
+      }else{
+        this.searchTime = 'custom'
+        this.startTime = this.currentDateList[0]
+        this.endTime = this.currentDateList[1]
+      }
+      this.app.refresh({ status: this.tabIndex,searchTime:this.searchTime,startTime:this.startTime,endTime:this.endTime,name:this.searchContent})
     },
     onLoad({ ctx, app }) {
       this.app = app;
@@ -425,12 +487,13 @@ export default {
           })
           .set('layout', [
             ['slot-tabs'],
-            ['search-key','slot-new-cg'],
+            ['slot-search-option','search-key','slot-new-cg','flex1','slot-export-order'],
             ['data-table'],
             ['flex1', 'pagination']
           ])
           .on('refresh', async (params, { next }) => {
             let  asset  = await next(params);
+            this.searchContent = params.name?params.name:''
             // this.tabsData[0].val = asset.shop && asset.shop.totalOrder ? asset.shop.totalOrder : 0;
             // this.tabsData[1].val = asset.shop && asset.shop.unPayOrder?asset.shop.unPayOrder:0;
             // this.tabsData[2].val = asset.shop && asset.shop.unSendOrder?asset.shop.unSendOrder:0;
@@ -438,7 +501,7 @@ export default {
             // this.tabsData[4].val = asset.shop && asset.shop.finishOrder?asset.shop.finishOrder:0;
           })
           .done();
-          app.refresh({ status: this.tabIndex})
+          app.refresh({ status: this.tabIndex,searchTime:this.searchTime,startTime:this.startTime,endTime:this.endTime})
     }
   }
 };

+ 13 - 2
ghs/src/views/order/list.vue

@@ -48,7 +48,12 @@
           {{ scope.row.addTime?scope.row.addTime.substr(5,11):'' }}
         </div>
       </template>
-      
+     
+      <template #table-column-payTime="{scope}">
+        <div>
+          {{ scope.row.payTime?scope.row.payTime.substr(5,11):'' }}
+        </div>
+      </template>
       
       <template #table-column-printNum="{scope}">
         <span v-if="scope.row.printNum>0">
@@ -123,7 +128,7 @@
           <el-radio label="0">待结款</el-radio>
           <el-radio label="1">已结款</el-radio>
         </el-radio-group>
-
+        付款时间:
         <el-date-picker v-model="currentDateList" type="daterange" align="right" unlink-panels range-separator="至" start-placeholder="开始日期" @change="getSearchDate" value-format="yyyy-MM-dd"
                 end-placeholder="结束日期" :picker-options="pickerOptions" size="mini" style="margin-right:20px;">
         </el-date-picker>
@@ -543,6 +548,12 @@ export default {
                 label: '开单时间',
                 align: 'center',
                 width: 90
+              },
+              {
+                prop: 'payTime',
+                label: '支付时间',
+                align: 'center',
+                width: 90
               }
             ],
             on: {

Некоторые файлы не были показаны из-за большого количества измененных файлов