ccj пре 2 година
родитељ
комит
0575fd486f
3 измењених фајлова са 19 додато и 14 уклоњено
  1. 2 2
      manifest.json
  2. 10 9
      pages/erpbusiness/add_quality_testing.vue
  3. 7 3
      pages/erpbusiness/quality_testing.vue

+ 2 - 2
manifest.json

@@ -2,8 +2,8 @@
     "name" : "易粮易运",
     "appid" : "__UNI__7297DA2",
     "description" : "易粮易运——为天下粮食人服务的App",
-    "versionName" : "2.1.151",
-    "versionCode" : 21151,
+    "versionName" : "2.1.152",
+    "versionCode" : 21152,
     "transformPx" : false,
     /* SDK配置 */
     "quickapp" : {},

+ 10 - 9
pages/erpbusiness/add_quality_testing.vue

@@ -369,15 +369,7 @@
 						<input v-else v-model='gridList.jiaorenli' @click="SetInputKey('jiaorenli')" placeholder="请输入热损伤占比" name="input" type="digit"></input>
 					</view>
 				</view>
-				<view v-show="gridList.type == '潮粮'&&utils.getCurrectRoles('acquisitionQuality.initial')&&typevalue==3"
-					class="c-row">
-					<view class="title">净重单价(元/公斤)</view>
-					<view class="con-list">
-						<input v-model='gridList.tidalGrainPrice' :disabled='pricedisabled' @blur='inputprice'
-							placeholder="自动获取,不可编辑" name="input" type="digit"></input>
-					</view>
-					<button class='cu-btn bg-green shadow' @click="changeprice">{{pricetext}}</button>
-				</view>
+				
 				
 				<view v-show="utils.getCurrectRoles('acquisitionQuality.initial')&&typevalue==3"
 					class="c-row">
@@ -421,6 +413,15 @@
 					</view>
 					<button class='cu-btn bg-green shadow' @click="changeprice">{{pricetext}}</button>
 				</view>
+				<view v-show="gridList.type == '潮粮'&&utils.getCurrectRoles('acquisitionQuality.initial')&&typevalue==3"
+					class="c-row">
+					<view class="title">净重单价(元/公斤)</view>
+					<view class="con-list">
+						<input v-model='gridList.tidalGrainPrice' :disabled='pricedisabled' @blur='inputprice'
+							placeholder="自动获取,不可编辑" name="input" type="digit"></input>
+					</view>
+					<button class='cu-btn bg-green shadow' @click="changeprice">{{pricetext}}</button>
+				</view>
 				<view v-show="gridList.type == '潮粮'&&utils.getCurrectRoles('acquisitionQuality.initial')&&typevalue==1"
 					class="c-row">
 					<view class="title">净重单价(元/公斤)</view>

+ 7 - 3
pages/erpbusiness/quality_testing.vue

@@ -262,8 +262,6 @@
 			uni.showLoading({
 				title: "正在加载"
 			})
-			this.pageSize = 10
-			this.currentPage = 1
 			var that = this
 			if (this.cangid) {
 				uni.setStorageSync("cangid", this.cangid)
@@ -299,7 +297,10 @@
 						uni.setStorageSync("cangid", that.cangid)
 						// uni.setStorageSync('purchasePriceList',that.selector[0].purchasePriceList)
 					}
-					this.getList(true)
+					
+					that.pageSize = 10
+					that.currentPage = 1
+					that.getList(true)
 				}
 			})
 			
@@ -392,6 +393,9 @@
 								if (this.currentPage == 1) {
 									that.gridList = []
 								}
+								else{
+									this.currentPage -- 
+								}
 								this.isContent = true
 							}
 						}else{