shish преди 1 година
родител
ревизия
692b0cd03e

Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
ghs/dist/shop/css/chunk-498eb989.66fbf532.css


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
ghs/dist/shop/css/chunk-4b4ec7f7.3ad15539.css


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

@@ -1,4 +1,4 @@
-<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="referer" content="never"><meta name="renderer" content="webkit"><meta name="viewport" content><link rel="icon" href="/favicon.ico"><link rel="stylesheet" type="text/css" media="print" href="/print-lock.css"><title>销花宝</title><link href="https://img.wixhb.com/cdn/nprogress/0.2.0/nprogress.min.css" rel="stylesheet"><link href="https://img.wixhb.com/cdn/quill/2.0.0-dev.3/quill.core.min.css" rel="stylesheet"><link href="https://img.wixhb.com/cdn/viewerjs/1.3.7/viewer.min.css" rel="stylesheet"><link href="https://img.wixhb.com/cdn/element-ui/2.13.0/theme-chalk/index.css" rel="stylesheet"><style>html,
+<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="referer" content="never"><meta name="renderer" content="webkit"><meta name="viewport" content><link rel="icon" href="/favicon.ico"><link rel="stylesheet" type="text/css" media="print" href="/print-lock.css"><title>销花宝</title><link href="http://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.css" rel="stylesheet"><link href="http://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.core.min.css" rel="stylesheet"><link href="http://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.css" rel="stylesheet"><link href="http://img.hzghd.com/cdn/element-ui/2.13.0/theme-chalk/index.css" rel="stylesheet"><style>html,
 			body,
 			body,
 			#app {
 			#app {
 				height: 100%;
 				height: 100%;
@@ -43,4 +43,4 @@
 			.once .sub-title {
 			.once .sub-title {
 				color: #ababab;
 				color: #ababab;
 				font-size: 12px;
 				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.4b4a2649.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="https://img.wixhb.com/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.wixhb.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.wixhb.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.wixhb.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.wixhb.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.wixhb.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.wixhb.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.wixhb.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.wixhb.com/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.wixhb.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.wixhb.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.wixhb.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.c536e65e.js"></script><script src="/js/app.4b4a2649.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.f41c3e9a.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.f41c3e9a.js"></script></body></html>

Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
ghs/dist/shop/js/app.f41c3e9a.js


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
ghs/dist/shop/js/chunk-09d40fc7.136bb0dc.js


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
ghs/dist/shop/js/chunk-2646fcf7.b35f1f2b.js


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
ghs/dist/shop/js/chunk-498eb989.63dc0517.js


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
ghs/dist/shop/js/chunk-4b4ec7f7.0b8f1b61.js


+ 39 - 18
ghs/src/views/order/list.vue

@@ -331,7 +331,7 @@ export default {
       currentKdStaffName:'',
       currentKdStaffName:'',
       currentKdStaffId:0,
       currentKdStaffId:0,
       staffList:[],
       staffList:[],
-      selectedIds:[]
+      selectedData:[]
     };
     };
   },
   },
   created() {
   created() {
@@ -360,22 +360,6 @@ export default {
 
 
 	},
 	},
   methods: {
   methods: {
-		batchDown(){
-			let that = this
-			if (this.$util.isEmpty(this.selectedIds)) {
-				this.$message.error('请选要下载项')
-				return false
-			}
-		},
-		getKdStaff(e){
-			this.currentKdStaffId = e
-      this.refreshData()
-		},
-    bottomDoMore(cmd,data){
-      if(cmd == 'batchAllDown'){
-
-      }
-    },
     doMore(cmd,data){
     doMore(cmd,data){
       if(cmd == 'cancel'){
       if(cmd == 'cancel'){
         this.$message.error('开发中')
         this.$message.error('开发中')
@@ -547,6 +531,41 @@ export default {
       setTimeout(() => {
       setTimeout(() => {
         this.$refs.selOrder.init();
         this.$refs.selOrder.init();
       });
       });
+    },
+		batchDown(){
+			let that = this
+			if (this.$util.isEmpty(this.selectedData)) {
+				this.$message.error('请选要下载项')
+				return false
+			}
+      this.selectedData.forEach((item,idx,arr) => {
+        if(Number(item.status) != 1 && Number(item.status)!=5){
+          setTimeout(() => {
+            that.down({id:item.id})
+            console.log(idx)
+          }, 1000);
+        }
+      })
+		},
+		getKdStaff(e){
+			this.currentKdStaffId = e
+      this.refreshData()
+		},
+    bottomDoMore(cmd,data){
+      if(cmd == 'batchAllDown'){
+        let that = this
+        if (this.$util.isEmpty(this.selectedData)) {
+          this.$message.error('请选要下载项')
+          return false
+        }
+        this.selectedData.forEach((item,idx,arr) => {
+          if(Number(item.status) != 1 && Number(item.status)!=5){
+            if(Number(item.sameTimeIdsNum)>1){
+              that.allDown({id:item.id})
+            }
+          }
+        })
+      }
     },
     },
     down(info){
     down(info){
 			let imgFile = this.$service.order.down(info.id,0)
 			let imgFile = this.$service.order.down(info.id,0)
@@ -709,7 +728,9 @@ export default {
             ],
             ],
             on: {
             on: {
               'selection-change': selection => {
               'selection-change': selection => {
-                this.selectedIds = selection.map(e => e.id)
+                this.selectedData = selection.map(e => { 
+	                return {id:e.id,status:e.status,sameTimeIdsNum:e.sameTimeIdsNum}
+                })
               }
               }
             },
             },
             props: {
             props: {

Някои файлове не бяха показани, защото твърде много файлове са промени