下载优化

ghs/src/mock/userInfo.js

@@ -165,11 +165,6 @@ let menu = {
 		{id: '312',parentId: 3,name: '走播单',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/order/live-list',viewPath: 'views/order/live-list.vue',keepAlive: 1},
 		{id: '309',parentId: 3,name: '开走播单',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/order/add-live',viewPath: 'views/order/add-live.vue',keepAlive: 1},
 
-		{id: '15',parentId: null,name: '供货',type: 0,icon: 'icondingdanguanli',orderNum: 3,router: '/in/ghs',viewPath: 'views/in/ghs.vue',keepAlive: 1},
-		{id: '1505',parentId: 15,name: '商家列表',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/in/ghs',viewPath: 'views/in/ghs.vue',keepAlive: 1},
-		{id: '1509',parentId: 15,name: '供货业绩',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/in/yj',viewPath: 'views/in/yj.vue',keepAlive: 1},
-		{id: '1515',parentId: 15,name: '应付统计',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/in/due',viewPath: 'views/in/due.vue',keepAlive: 1},
-
 		{id: '1400',parentId: null,name: '采购',type: 0,icon: 'icondingdanguanli',orderNum: 3,router: '/in/list',viewPath: 'views/in/list.vue',keepAlive: 1},
 		{id: '1405',parentId: 1400,name: '采购记录',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/in/list',viewPath: 'views/in/list.vue',keepAlive: 1},
 		{id: '1415',parentId: 1400,name: '采购',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/in/add',viewPath: 'views/in/add.vue',keepAlive: 1},
@@ -177,6 +172,11 @@ let menu = {
 		{id: '1430',parentId: 1400,name: '售后记录',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/in/refund-list',viewPath: 'views/in/refund-list.vue',keepAlive: 1},
 		{id: '1420',parentId: 1400,name: '入库改价',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/in/change',viewPath: 'views/in/change.vue',keepAlive: 1},
 
+		{id: '15',parentId: null,name: '供货',type: 0,icon: 'icondingdanguanli',orderNum: 3,router: '/in/ghs',viewPath: 'views/in/ghs.vue',keepAlive: 1},
+		{id: '1505',parentId: 15,name: '商家列表',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/in/ghs',viewPath: 'views/in/ghs.vue',keepAlive: 1},
+		{id: '1509',parentId: 15,name: '供货业绩',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/in/yj',viewPath: 'views/in/yj.vue',keepAlive: 1},
+		{id: '1515',parentId: 15,name: '应付统计',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/in/due',viewPath: 'views/in/due.vue',keepAlive: 1},
+
 		{id: '4',parentId: null,name: '花材',type: 0,icon: 'iconshangpinguanli',orderNum: 4,router: '/item/list',viewPath: 'views/item/list.vue',keepAlive: 1},
 		{id: '405',	parentId: '4',name: '花材列表',type: 1,icon: 'icon-user',orderNum: 4,router: '/item/list',viewPath: 'views/item/list.vue',keepAlive: 1},
 		{id: '403',	parentId: '4',name: '改价改数',type: 1,icon: 'icon-user',orderNum: 4,router: '/item/batch-modify',viewPath: 'views/item/batch-modify.vue',keepAlive: 1},

ghs/src/views/in/add.vue

@@ -87,6 +87,9 @@ export default {
 	},
 	methods: {
 		...mapActions(['getLevel']),
+		fileUpSuccess(){
+			this.$notify({ title: '已提交，请稍等', message: 'success', type: 'success'})
+		},
 		modifyLocation(info){
 			let that = this
 			that.$confirm('确认修改类型？', '提示', { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' }).then(() => {

ghs/src/views/in/list.vue

@@ -105,8 +105,9 @@
           <el-button size="small" v-if="scope.row.status == 5 || scope.row.status == 1">更多<i class="el-icon-arrow-down el-icon--right"></i></el-button>
           <el-button type="primary" size="small" v-else>更多<i class="el-icon-arrow-down el-icon--right"></i></el-button>
           <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item command="refundRecord">售后记录</el-dropdown-item>
-            <el-dropdown-item command="cancel">取消</el-dropdown-item>
+            <el-dropdown-item command="refundShowRecord">售后记录</el-dropdown-item>
+            <el-dropdown-item command="downExcel">下载excel</el-dropdown-item>
+            <el-dropdown-item command="cancelCurrentOrder">取消</el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
 
@@ -250,15 +251,22 @@ export default {
 	},
   methods: {
     doMore(cmd,data){
-      if(cmd == 'cancel'){
+      if(cmd == 'cancelCurrentOrder'){
         this.cancelOrder(data)
       }
-      if(cmd == 'refundRecord'){
+      if(cmd == 'refundShowRecord'){
         this.refundRecordData = data
         setTimeout(() => {
           this.$refs.refundRecordRef.init()
         })
       }
+      if(cmd == 'downExcel'){
+        this.$service.orderItem.getDownExcel({id:info.id}).then(res => {
+          if(res.file){
+            window.location.href = res.file
+          }
+			  })
+      }
     },
     goRefund(data){
       this.currentRefundData = data