Merge branch 'master' of http://git.huaml.com/zhh/front-end

ghs/src/views/order/add.vue

@@ -56,8 +56,9 @@
     bottom: 70px;
     right: 20%;
     width: 70%;
-    max-height: 200px;
-    overflow-y: scroll;
+    height: 310px;
+    overflow: hidden;
+    //overflow-y: scroll;
   }
   .bottom_input {
     position: absolute;
@@ -165,7 +166,7 @@
 
     <el-dialog title="改价" v-if="isAmendPrice" :visible.sync="isAmendPrice" width="30%" center>
       <div class="el-dialog-center">
-        <el-input ref="priceInput" style="width: 130px;margin-left: 15px" type="number" @keyup.enter.native="amendPrice" v-model="priceAmend"></el-input></el-form-item>
+        <el-input ref="priceInput" style="width: 130px;margin-left: 15px" type="number" placeholder="0" @keyup.enter.native="amendPrice" @keyup.key-backspace.native="priceAmend = ''" v-model="priceAmend"></el-input></el-form-item>
       </div>
     </el-dialog>
 
@@ -589,6 +590,10 @@ export default {
     },
     /**改价-确定**/
     amendPrice(){
+      if(this.priceAmend==''){
+        this.$message({message: '请输入大于0的值',type: 'warning'});
+        return;
+      }
       let selectList = this.tableData[this.tableDataIndex];
       this.tableData[this.tableDataIndex].price = this.priceAmend;
       let money = Number(selectList.price) * (Number(selectList.big) + Number(selectList.small) / Number(selectList.ratio));
@@ -638,6 +643,7 @@ export default {
     tableDataDown(){
       if(this.isSeek){
         let tableDataLength = this.seekList.length-1;
+        if(this.seekListIndex==5) return
         if(tableDataLength==this.seekListIndex){
           this.seekListIndex = tableDataLength
         }else{

ghsApp/src/components/module/app-commodity.vue

@@ -7,7 +7,8 @@
 			<view class="tit" @click="addEvents">{{ info.itemName || "" }}</view>
 			<view class="kc" @click="addEvents">库存 {{ info.stock }}</view>
 			<view class="num-open_bx">
-				<view class="price">￥{{ showPrice }}</view>
+				<view class="price" v-if="!offPrice">￥{{ showPrice }}</view>
+				<view class="price" v-else></view>
 				<view class="open-bx" v-if="type == COMMODITY_TYPE.COMMON">
 					<i class="iconfont iconjian" :class="delAnimationData?'animation':''" @click="delEvent" v-if="bigCount > 0 || smallCount > 0"></i>
 					<text class="num" @click="customNum">
@@ -66,6 +67,10 @@ export default {
 			default: 0
 		},
 		autoPrice: {},
+		offPrice: {
+			type: Boolean,
+			default: false
+		},
 	},
 	data() {
 		return {

ghsApp/src/pagesStorehouse/inventory/select.vue

@@ -73,6 +73,7 @@
 						</view>
 						<template v-for="(productItem, productIndex) in classItem.child">
 							<Commondity
+								:offPrice="true"
 								:key="productIndex"
 								:info="productItem"
 								:bigCount="