收现金额

ghsPad/src/pages/home/components/cashConsole.vue

@@ -5,7 +5,7 @@
  style="background-color:orange;color:white;border-color:orange;position:fixed;left:135upx;bottom:13upx;width:84upx;height:50upx;line-height:30upx;font-size:16upx;" 
  @click="goSettleCommit">结算</view>
     <view class="active" @click="clearItemFn">清空</view>
-	<view class="active" @click="cancelKdFn">取消</view>
+	<view class="active" @click="cancelKdFn">返回</view>
 
 	<view v-if="Number(customId)>0" style="position:fixed;left:32upx;bottom:66upx;width:189upx;height:20upx;line-height:5upx;font-size:13upx;background-color:white;color:#3385FF;font-weight:bold;border:none;">{{customName}}</view>
 
@@ -328,7 +328,6 @@ export default {
 		confirmClearItem(){
 			this.$util.hitVoice()
 			this.removeFromSaveDirect()
-			this.$emit('clearAll')
 		},
 		confirmLogout(){
 			this.$util.hitVoice()

ghsPad/src/pages/home/components/settlePop.vue

@@ -317,6 +317,13 @@ export default {
                 this.$msg('应付金额不能大于总金额')
                 return false
             }
+            if(this.form.hasPay == 1 && this.form.payWay == 4){
+                if(Number(this.form.modifyPrice) > Number(this.form.cash)){
+                    let intPrice = parseFloat(this.form.modifyPrice)
+                    this.$msg('收现金不能低于'+intPrice+'元')
+                    return false
+                }
+            }
             this.$emit('settleCommit',this.form)
         },
         cancel(){