shish 2 лет назад
Родитель
Сommit
475bf4d17c
2 измененных файлов с 20 добавлено и 31 удалено
  1. 4 8
      ghs/src/views/in/add.vue
  2. 16 23
      ghs/src/views/order/add.vue

+ 4 - 8
ghs/src/views/in/add.vue

@@ -9,9 +9,8 @@
   <div class="app-list-content" v-else>
     <div class="left_box">
       <p class="tor">
-        <span style="color:black;">{{form.ghsName}}</span>
+        <span style="color:black;">供货商:{{form.ghsName}}</span>
         <span>全屏:F11</span>
-        <span>提交:F9</span>
         <span>修改:回车</span>
         <span>删除:Delete</span>
         <span>删除所有:Page Down</span>
@@ -92,8 +91,8 @@
         <div style="display: inline-block;" class="allPrice">{{allCount.kind}}种</div>
         <div style="display: inline-block;" class="allPrice">{{ allCount.bigLength }}扎</div>
         <div style="display: inline-block;" class="allPrice">¥{{ allPrice }}</div>
-        <el-button type="primary" size="medium" style="margin-left:50px;" @click="commitOrder()">提交</el-button>
-        <el-button size="medium" style="margin-left:50px;" @click="comeBack()">返回( Ctrl + B )</el-button>
+        <el-button type="primary" size="medium" style="margin-left:50px;" @click="commitOrder()">提交(Ctrl + / )</el-button>
+        <el-button size="medium" style="margin-left:50px;" @click="comeBack()">返回</el-button>
     </div>
 
     <el-dialog :title="currentItem.name" v-if="showConfirmNum" :visible.sync="showConfirmNum" width="30%" center>
@@ -369,9 +368,6 @@ export default {
       if(e && e.key && e.key.toLowerCase() =='c' && e.ctrlKey){
         that.$refs['ghsRef'].focus();
       }
-      if(e && e.key && e.key.toLowerCase() =='b' && e.ctrlKey){
-        that.comeBack()
-      }
       if(e && e.key && e.key.toLowerCase() =='q' && e.ctrlKey){
         that.$refs['itemSearchRef'].focus();
       }
@@ -400,7 +396,7 @@ export default {
           that.$refs['itemSearchRef'].focus()
         }
       }
-      if( e && e.key=='F9' ){
+      if(e && e.key && e.key.toLowerCase() =='/' && e.ctrlKey){
         if(that.$util.isEmpty(that.selectList)){
           that.$message({message: '请选择花材',type: 'warning'});
           return;

+ 16 - 23
ghs/src/views/order/add.vue

@@ -11,7 +11,6 @@
       <p class="tor">
         <span style="font-weight:bold;color:black;">客户:{{form.customName}}</span>
         <span>全屏:F11</span>
-        <span>提交:F9</span>
         <span>修改:回车</span>
         <span>删除:Delete</span>
         <span>删除所有:Page Down</span>
@@ -92,8 +91,8 @@
         <div style="display: inline-block;" class="allPrice">{{allCount.kind}}种</div>
         <div style="display: inline-block;" class="allPrice">{{ allCount.bigLength }}扎</div>
         <div style="display: inline-block;" class="allPrice">¥{{ allPrice }}</div>
-        <el-button type="primary" size="medium" style="margin-left:50px;" @click="commitOrder()">提交</el-button>
-        <el-button size="medium" style="margin-left:50px;" @click="comeBack()">返回( Ctrl + B )</el-button>
+        <el-button type="primary" size="medium" style="margin-left:50px;" @click="commitOrder()">提交( Ctrl + / )</el-button>
+        <el-button size="medium" style="margin-left:50px;" @click="comeBack()">返回</el-button>
     </div>
 
     <el-dialog :title="currentItem.name" v-if="showConfirmNum" :visible.sync="showConfirmNum" width="30%" center>
@@ -188,13 +187,13 @@
           <el-date-picker v-model="form.sendTimeWant" style="width: 80%" type="date" placeholder="请选择,默认当天或隔天"> </el-date-picker>
         </div>
         <div class="accounts-list">
-          开单 Ctrl + /
+          开单人员
           <el-select ref="kdStaffRef" style="width:80%" v-model="form.getStaffName" placeholder="请选择" @change="changeKdStaff">
             <el-option v-for="item in staffList" :key="item.id" :label="item.name" :value="item"> </el-option>
           </el-select>
         </div>
         <div class="accounts-list">
-          备注
+          备注信息
           <div class="accounts-center">
             <el-input type="textarea" :rows="2" placeholder="请输入内容,F8 插入光标" v-model="remark" ref="remarkRef"> </el-input>
           </div>
@@ -361,9 +360,6 @@ export default {
       if(e && e.key && e.key.toLowerCase() =='c' && e.ctrlKey){
         that.$refs['customref'].focus();
       }
-      if(e && e.key && e.key.toLowerCase() =='b' && e.ctrlKey){
-        that.comeBack()
-      }
       if(e && e.key && e.key.toLowerCase() =='q' && e.ctrlKey){
         that.$refs['itemSearchRef'].focus();
       }
@@ -384,9 +380,19 @@ export default {
         }
       }
       if( e && e.key=='/' && e.ctrlKey){
-        if(that.showCommitPop == true){
-          that.$refs.kdStaffRef.focus()
+      
+        if(that.$util.isEmpty(that.selectList)){
+          that.$message({message: '请选择花材',type: 'warning'});
+          return;
         }
+        that.$refs['itemSearchRef'].blur()
+        that.setSendType(0)
+        that.setTransType(4)
+        that.form.hasPay = 2
+        that.form.getStaffId = that.defaultGetStaffId
+        that.form.getStaffName = that.defaultGetStaffName
+        that.showCommitPop = true
+      
       }
       if( e && e.key=='[' && e.ctrlKey){
         if(that.showCommitPop == true){
@@ -417,19 +423,6 @@ export default {
           that.$refs['itemSearchRef'].focus()
         }
       }
-      if( e && e.key=='F9' ){
-        if(that.$util.isEmpty(that.selectList)){
-          that.$message({message: '请选择花材',type: 'warning'});
-          return;
-        }
-        that.$refs['itemSearchRef'].blur()
-        that.setSendType(0)
-        that.setTransType(4)
-        that.form.hasPay = 2
-        that.form.getStaffId = that.defaultGetStaffId
-        that.form.getStaffName = that.defaultGetStaffName
-        that.showCommitPop = true
-      }
       if(e && e.key=='F8'){
         that.$nextTick(() => {
           that.$refs.remarkRef.focus()