shish 2 years ago
parent
commit
7ac10efb1f
4 changed files with 10 additions and 9 deletions
  1. 3 3
      ghs/src/mock/userInfo.js
  2. 5 4
      ghs/src/views/in/list.vue
  3. 1 1
      ghsApp/src/admin/home/me.vue
  4. 1 1
      ghsApp/src/pages.json

+ 3 - 3
ghs/src/mock/userInfo.js

@@ -154,9 +154,9 @@ let menu = {
         {id: '302',parentId: 3,name: '开单',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/order/add',viewPath: 'views/order/add.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: '1410',parentId: 1400,name: '改价入库',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/in/change',viewPath: 'views/in/change.vue',keepAlive: 1},
-		{id: '1415',parentId: 1400,name: '供货商',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/in/ghs',viewPath: 'views/in/ghs.vue',keepAlive: 1},
-		{id: '1420',parentId: 1400,name: '新增采购',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/in/add',viewPath: 'views/in/add.vue',keepAlive: 1},
+		{id: '1410',parentId: 1400,name: '供货商',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/in/ghs',viewPath: 'views/in/ghs.vue',keepAlive: 1},
+		{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: '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: '401',parentId: '4',name: '花材分类',type: 1,icon: 'icon-user',orderNum: 4,router: '/item-class/list',viewPath: 'views/item-class/list.vue',keepAlive: 1},

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

@@ -70,7 +70,7 @@
       </template>
 
       <template #slot-new-cg>
-        <el-button type="primary" size="mini" style="margin-left:50px;" @click="add()">添加供货商</el-button>
+        <el-button type="primary" size="mini" style="margin-left:50px;" @click="addGhs()">添加供货商</el-button>
         <el-button type="primary" size="mini" style="margin-left:50px;" @click="billing()">开单</el-button>
 				<el-button type="primary" size="mini" style="margin-left:50px;" @click="newCg()">新增采购</el-button>
 			</template>
@@ -170,9 +170,10 @@ export default {
       this.location = 0
       this.name = ''
     },
-    add(){
-      //this.addPop = true
-    },
+		addGhs(){
+			let query = {}
+			this.$router.push({path:'/in/add',query})			
+		},
     billing(){
 			let query = {}
 			this.$router.push({path:'/order/add',query})

+ 1 - 1
ghsApp/src/admin/home/me.vue

@@ -108,7 +108,7 @@
             </tui-list-cell>
 
             <tui-list-cell @click="pageTo({ url: '/admin/shop/wcPrint' })" class="line-cell" :hover="false" :arrow="true">
-              <view class="tui-title">采小票机</view>
+              <view class="tui-title">采小票机</view>
             </tui-list-cell>
 
             <tui-list-cell @click="pageTo({ url: '/admin/shop/trumpet' })" class="line-cell" :hover="false" :arrow="true">

+ 1 - 1
ghsApp/src/pages.json

@@ -198,7 +198,7 @@
 				{"path": "list","style": {"navigationBarTitleText": "门店"}},
 				{"path": "add","style": {"navigationBarTitleText": ""}},
 				{"path": "print","style": {"navigationBarTitleText": "小票机"}},
-				{"path": "wcPrint","style": {"navigationBarTitleText": "采小票机"}},
+				{"path": "wcPrint","style": {"navigationBarTitleText": "采小票机"}},
 				{"path": "trumpet","style": {"navigationBarTitleText": "云音箱"}},
 				{"path": "changeShop","style": {"navigationBarTitleText": "切换门店"}},
 				{"path": "sk","style": {"navigationBarTitleText": "设置快捷开单"}},