花商

ghs/src/mock/userInfo.js

@@ -167,9 +167,9 @@ let menu = {
 		{id: '1415',parentId: 1400,name: '新增采购',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/in/add',viewPath: 'views/in/add.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: '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: '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: '1522',parentId: 15,name: '历史应付',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/in/pastDue',viewPath: 'views/in/pastDue',keepAlive: 1},
 		{id: '1530',parentId: 15,name: '历付明细',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/in/ghs-debt-record',viewPath: 'views/in/ghs-debt-record.vue',keepAlive: 1},

ghs/src/views/home.vue

@@ -105,7 +105,7 @@ export default {
 					url: '/order/addBook'
 				},
 				{
-					name: '采购',
+					name: '新增采购',
 					icon: 'icondingdanguanli',
 					url: '/in/add'
 				},

ghs/src/views/order/list.vue

@@ -135,12 +135,8 @@
 
       </template>
 
-      <template #slot-billing>
-				<el-button type="primary" size="mini" style="margin-left:20px;" @click="billing()">开单</el-button>
-			</template>
-
 			<template #slot-export-order>
-				<el-button type="primary" size="mini" style="margin-left:60px;" @click="exportData()">导出数据</el-button>
+				<el-button type="primary" size="mini" style="margin-left:30px;" @click="exportData()">导出数据</el-button>
 			</template>
 
     </x-crud>
@@ -557,7 +553,7 @@ export default {
               },
               {
                 prop: 'payTime',
-                label: '支付确认',
+                label: '付款时间',
                 align: 'center',
                 width: 90
               },
@@ -594,7 +590,7 @@ export default {
           })
           .set('dict', {
             search: {
-              keyWord: 'name'
+              keyWord: 'name',
             }
           })
           .set('search', {