shish 2 anni fa
parent
commit
8a8fa6b42a
2 ha cambiato i file con 7 aggiunte e 32 eliminazioni
  1. 2 2
      ghs/src/mock/userInfo.js
  2. 5 30
      ghs/src/views/order/add.vue

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

@@ -154,8 +154,8 @@ let menu = {
         {id: '302',parentId: 3,name: '开单',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/order/add',viewPath: 'views/order/add.vue',keepAlive: 1},
         {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: '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: '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/add',viewPath: 'views/in/add.vue',keepAlive: 1},
-		{id: '1415',parentId: 1400,name: '改价入库',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/in/change',viewPath: 'views/in/change.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/add',viewPath: 'views/in/add.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: '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: '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},
 		{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 - 30
ghs/src/views/order/add.vue

@@ -144,8 +144,8 @@
         <div class="accounts-list">
         <div class="accounts-list">
           付款方式
           付款方式
           <div class="accounts-center">
           <div class="accounts-center">
-            <el-button :type="form.hasPay == 2?'primary':''" @keyup.enter.native="form.hasPay = 2" @click="form.hasPay = 2" size="small">赊账( Ctrl + [ )</el-button>
-            <el-button :type="form.hasPay == 1?'primary':''" @keyup.enter.native="form.hasPay = 1" @click="form.hasPay = 1" size="small">线下( Ctrl + ] )</el-button>
+            <el-button :type="form.hasPay == 2?'primary':''" @keyup.enter.native="form.hasPay = 2" @click="form.hasPay = 2" size="small">赊账</el-button>
+            <el-button :type="form.hasPay == 1?'primary':''" @keyup.enter.native="form.hasPay = 1" @click="form.hasPay = 1" size="small">线下</el-button>
           </div>
           </div>
         </div>
         </div>
         <div class="accounts-list" v-if="form.hasPay == 1">
         <div class="accounts-list" v-if="form.hasPay == 1">
@@ -160,8 +160,8 @@
         <div class="accounts-list">
         <div class="accounts-list">
           打印小票
           打印小票
           <div class="accounts-center">
           <div class="accounts-center">
-          <el-button :type="form.needPrint == 1?'primary':''" @keyup.enter.native="form.needPrint = 1" @click="form.needPrint = 1" size="small">需要( Ctrl + , )</el-button>
-            <el-button :type="form.needPrint == 2?'primary':''" @keyup.enter.native="form.needPrint = 2" @click="form.needPrint = 2" size="small">不要( Ctrl + . )</el-button>
+          <el-button :type="form.needPrint == 1?'primary':''" @keyup.enter.native="form.needPrint = 1" @click="form.needPrint = 1" size="small">需要</el-button>
+            <el-button :type="form.needPrint == 2?'primary':''" @keyup.enter.native="form.needPrint = 2" @click="form.needPrint = 2" size="small">不要</el-button>
           </div>
           </div>
         </div>
         </div>
         <div class="accounts-list">
         <div class="accounts-list">
@@ -195,7 +195,7 @@
         <div class="accounts-list">
         <div class="accounts-list">
           备注信息
           备注信息
           <div class="accounts-center">
           <div class="accounts-center">
-            <el-input type="textarea" :rows="2" placeholder="请输入内容,F8 插入光标" v-model="remark" ref="remarkRef"> </el-input>
+            <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="remark" ref="remarkRef"> </el-input>
           </div>
           </div>
         </div>
         </div>
         <div class="accounts-list">
         <div class="accounts-list">
@@ -369,16 +369,6 @@ export default {
       if(e && e.key =='ArrowDown'){
       if(e && e.key =='ArrowDown'){
         that.goDown();
         that.goDown();
       }
       }
-      if(e && e.key=='.' && e.ctrlKey){
-        if(that.showCommitPop == true){
-          that.form.needPrint = 2
-        }
-      }
-      if( e && e.key==',' && e.ctrlKey){
-        if(that.showCommitPop == true){
-          that.form.needPrint = 1
-        }
-      }
       if( e && e.key=='/' && e.ctrlKey){
       if( e && e.key=='/' && e.ctrlKey){
       
       
         if(that.$util.isEmpty(that.selectList)){
         if(that.$util.isEmpty(that.selectList)){
@@ -394,16 +384,6 @@ export default {
         that.showCommitPop = true
         that.showCommitPop = true
       
       
       }
       }
-      if( e && e.key=='[' && e.ctrlKey){
-        if(that.showCommitPop == true){
-          that.form.hasPay = 2
-        }
-      }
-      if( e && e.key==']' && e.ctrlKey){
-        if(that.showCommitPop == true){
-          that.form.hasPay = 1
-        }
-      }
       if(e && e.key=='Delete'){
       if(e && e.key=='Delete'){
         if(that.selectList[that.selectIndex]){
         if(that.selectList[that.selectIndex]){
           let current = that.selectList[that.selectIndex]
           let current = that.selectList[that.selectIndex]
@@ -423,11 +403,6 @@ export default {
           that.$refs['itemSearchRef'].focus()
           that.$refs['itemSearchRef'].focus()
         }
         }
       }
       }
-      if(e && e.key=='F8'){
-        that.$nextTick(() => {
-          that.$refs.remarkRef.focus()
-        })
-      }
     }
     }
     //门店信息
     //门店信息
     this.$service.common.shopInfo().then(res => {
     this.$service.common.shopInfo().then(res => {