ccjgmwz 3 年之前
父节点
当前提交
cd3507270e
共有 3 个文件被更改,包括 29 次插入11 次删除
  1. 2 2
      manifest.json
  2. 17 7
      pages/erpbusiness/edit_quality_testing.vue
  3. 10 2
      pages/erpbusiness/examine_quality_testing.vue

+ 2 - 2
manifest.json

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

+ 17 - 7
pages/erpbusiness/edit_quality_testing.vue

@@ -80,13 +80,20 @@
 					{{gridList.type}}
 				</view>
 			</view>
-			<view class="c-row">
+			<view v-if="gridList.type == '潮粮'" class="c-row">
 				<view class="title">净重单价(元/公斤)</view>
 				<view class="con-list">
 					<input :disabled='flag==1' v-model='gridList.tidalGrainPrice' disabled placeholder="自动获取,不可编辑"
 						 name="input"></input>
 				</view>
 			</view>
+			<view v-if="gridList.type == '干粮'" class="c-row">
+				<view class="title">干粮单价(元/公斤)</view>
+				<view class="con-list">
+					<input v-model='gridList.dryGrainPrice' placeholder="请输入干粮单价"
+						 name="input"></input>
+				</view>
+			</view>
 		</view>
 		<view style='margin-bottom:100px;' class='wrap'>
 			<view class='title_b'>化验信息</view>
@@ -273,12 +280,15 @@
 			waterContentChange() {
 				var that = this
 				if(this.gridList.goodsName && this.cangid){
-					this.$api.doRequest('get', '/purchasePrice/dryGrainPrice',{
-						warehouseId:this.cangid,
-						goodsName:this.gridList.goodsName
-					}).then(res => {
-						that.gridList.dryGrainPrice = res.data.data
-					})
+					if(!this.gridList.dryGrainPrice||this.gridList.dryGrainPrice == 0){
+						this.$api.doRequest('get', '/purchasePrice/dryGrainPrice',{
+							warehouseId:this.cangid,
+							goodsName:this.gridList.goodsName
+						}).then(res => {
+							that.gridList.dryGrainPrice = res.data.data
+						})
+					}
+					
 				}
 				
 				if (this.gridList.goodsName) {

+ 10 - 2
pages/erpbusiness/examine_quality_testing.vue

@@ -74,12 +74,18 @@
 					{{gridList.type}}
 				</view>
 			</view>
-			<view v-if='managementType==1' class="c-row">
+			<view v-if="gridList.type == '潮粮'" class="c-row">
 				<view class="title">净重单价(元/公斤)</view>
 				<view class="con-list">
 					{{gridList.tidalGrainPrice}}
 				</view>
 			</view>
+			<view v-if="gridList.type == '干粮'" class="c-row">
+				<view class="title">干粮单价(元/公斤)</view>
+				<view class="con-list">
+					{{gridList.dryGrainPrice}}
+				</view>
+			</view>
 		</view>
 		<view style='margin-bottom:100px;' class='wrap'>
 			<view class='title_b'>化验信息</view>
@@ -169,7 +175,9 @@
 				headUrl:"../../static/img/myimg/YongHu@3x.png",
 				userphone:"",
 				username:"请更改昵称",
-				gridList: {},
+				gridList: {
+					type:'潮粮'
+				},
 				managementType:'',
 				warehouseName: '',
 				warehouseList:[],