Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test

src/views/tool/Instead/components/keyboard.vue

@@ -7,7 +7,7 @@
         </slot>
       </div>
       <slot name="tips"></slot>
-      <div class="number_list_box">
+      <div class="number_list_box" v-if="!disabled">
         <div class="yd-keyboard">
           <div class="mini-number-box1">
             <div class="mini-number">
@@ -65,6 +65,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    disabled:{
+      type:Boolean,
+      default:false
+    },
     max: {
       type: [Number, String],
       default: Infinity,

src/views/tool/Instead/components/popup-choose-guazhang.vue

@@ -25,6 +25,7 @@
           v-model="number"
           isFloat
           @clear="clear"
+          :disabled="true"
           :max="payMoney"
           :maxTips="'超出未结账金额'"
         >
@@ -36,7 +37,7 @@
           >
             {{ tips }}
           </div>
-          <div slot="input" class="u-p-l-20 u-p-r-20 u-flex w-full">
+          <div slot="input" class="u-p-l-20 u-p-r-20 u-flex w-full u-relative">
             <div class="font-bold u-font-32">¥</div>
             <el-input
               placeholder="请输入挂账金额"
@@ -48,6 +49,7 @@
               :type="focus ? 'number' : 'text'"
             >
             </el-input>
+            <div class="zhezhao"></div>
           </div>
         </key-board>
         <div class="confirm_btns">
@@ -267,7 +269,14 @@ export default {
   font-size: 20px;
   position: relative;
 }
-
+.zhezhao{
+  position: absolute;
+  top: 0;
+  left: 0;
+  bottom: 0;
+  right: 0;
+  z-index: 1;
+}
 .select_desk .select_desk_dialog .inputs .close {
   color: #aaa;
   position: absolute;