lilei %!s(int64=2) %!d(string=hai) anos
pai
achega
5b36449911

+ 1 - 1
pages/approveStore/authPass.vue

@@ -50,7 +50,7 @@
 					<u-picker v-model="settleStyleModal" @confirm="settleStyleChange" :range="settleStyleList" range-key="dispName" mode="selector"></u-picker>
 				</u-form-item>
 				<u-form-item label="授信金额" v-if="form.settleType == 'CREDIT'" required prop="creditLimit">
-					<u-input :clearable="false" type="digit" :min="100" :maxlength="8" @input="numberToFixed('creditLimit',2,999999)" v-model.trim="form.creditLimit" placeholder="请输入大于100的数字,最多两位小数"/>
+					<u-input :clearable="false" type="digit" :min="100" :maxlength="8" @blur="numberToFixed('creditLimit',2,999999)" v-model.trim="form.creditLimit" placeholder="请输入大于100的数字,最多两位小数"/>
 				</u-form-item>
 			</u-form>
 		</view>

+ 7 - 5
pages/shelfSetting/searchShelfHw.vue

@@ -15,7 +15,7 @@
 					@search="getpartList" 
 					@clear="clearSearch" 
 					bg-color="#fff" 
-					:action-style="{border:'0.1rpx solid #00aaff',borderRadius:'50rpx',color:'#00aaff'}" 
+					:show-action="false"
 					placeholder="请输入产品编码或名称搜索"></u-search>
 				</view>
 				<view class="icon" @click="toScan">
@@ -263,6 +263,9 @@
 				width: 80%;
 				flex-grow: 1;
 				font-weight: bold;
+				overflow: hidden;
+				white-space: nowrap;
+				text-overflow: ellipsis;
 				text{
 					display: block;
 					height: 30rpx;
@@ -279,13 +282,12 @@
 			}
 		}
 		.search{
-			padding: 0.5rem 0.5rem 0.3rem 0.5rem;
+			padding: 0.2rem;
+			border-radius: 50rpx;
+			border:0.1rpx solid #eee;
 			.input{
 				flex-grow: 1;
-				border:0.1rpx solid #eee;
 				padding: 0.1rpx;
-				border-radius: 50rpx;
-				padding-right: 10rpx;
 			}
 			.icon{
 				width: 10%;

+ 1 - 1
pages/stockCheck/freezeDetailModal.vue

@@ -14,7 +14,7 @@
 				</view>
 				 <view class="p-row" v-for="item in list" :key="item.id">
 					  <text>{{item.orderDate}}</text>
-					  <text>{{item.dealerName}}</text>
+					  <text>{{item.orderPersonName}}</text>
 					  <text>{{item.totalQty}}</text>
 				 </view>
 			</view>

+ 1 - 1
pages/stockCheck/shelfList.vue

@@ -57,7 +57,7 @@
 				</view>
 			</view>
 		</view>
-		<freezeQtyModal :openModal="showModal" :infoData="tempData" @ok="toCheck"></freezeQtyModal>
+		<freezeQtyModal :openModal="showModal" :infoData="tempData" @close="showModal=false" @ok="toCheck"></freezeQtyModal>
 	</view>
 </template>