前端

manifest.json

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

pages/erpbusiness/acquisitionInspection/tareDetail.vue

@@ -49,6 +49,16 @@
 				<view class="left">净重（公斤）</view>
 				<input class="right-bottom" disabled placeholder="自动计算" v-model="detailData.netWeight"></input>
 			</view>
+			<view  class="row row-bottom">
+				<view class="left">应收卸车过磅费（元）</view>
+				<input disabled class="right-bottom" placeholder="未获取到卸车过磅费金额"
+					v-model="detailData.receivableWeighingFee"></input>
+			</view>
+			<view class="row row-bottom" style="border: 0;">
+				<view class="left">实收卸车过磅费（元）</view>
+				<input disabled class="right-bottom" placeholder="输入卸车过磅费"
+					v-model="detailData.actualWeighingFee"></input>
+			</view>
 		</view>
 		<u-button type="primary" class="submit" @click="submit">提交</u-button>
 		<u-toast ref="uToast" />
@@ -79,6 +89,7 @@
 		},
 		onLoad(options) {
 			this.detailData = JSON.parse(options.detailData)
+			console.log(this.detailData)
 			if (!this.detailData.buckleMiscellaneous) {
 				this.detailData.buckleMiscellaneous = 0
 			}

pages/erpbusiness/edit_quality_testing.vue

@@ -71,12 +71,12 @@
 			</view>
 			<view class="c-row ">
 				<view class="title">货名</view>
-				<view class="con-list">
-					<view v-if="flag == '1'||flag == '0'">
+				<view  class="con-list">
+					 <!-- <view v-if="flag != '0'">
 						{{gridList.goodsName}}
-					</view>
-					<view @click='goodsName = true' v-if="flag == '2'">{{gridList.goodsName}}</view>
-					<u-picker :range="goodsList" range-key="goodsName" @confirm='goodsPicker($event)' v-model="goodsName" mode="selector" v-if="flag == '2'">
+					</view> -->
+					<view @click='goodsName = true'>{{gridList.goodsName}}</view>
+					<u-picker :range="goodsList" range-key="goodsName" @confirm='goodsPicker($event)' v-model="goodsName" mode="selector" >
 					</u-picker>
 				</view>
 			</view>
@@ -103,7 +103,15 @@
 				<view style="margin: 0px 0px 30rpx 10rpx;">复检备注</view>
 					<textarea class='textarea-style' v-model='gridList.reMemo' placeholder="请输入复检备注" maxlength="300"></textarea>
 			</view>
-			
+			<view class="c-row" v-if="flag==1&&gridList.warehouseName=='鲅鱼圈金信库'">
+				<view class="title">车型</view>
+				<view class="con-list">
+					<view @click='carstatus = true'>{{gridList.carModel?gridList.carModel:'请选择车型'}}</view>
+				<u-picker :range="carModeList" range-key="constValue" @confirm='carPicker($event)' v-model="carstatus" mode="selector" >
+				</u-picker>
+				</view>
+				
+			</view>
 		</view>
 		<view style='padding-bottom:300rpx;'>
 			<view class='wrap'>
@@ -206,6 +214,7 @@
 				selector: [],
 				show1: false,
 				goodsName:false,
+				carstatus:false,
 				inputContent: '',
 				coverTransform: 'translateY(0px)',
 				coverTransition: '0s',
@@ -229,7 +238,8 @@
 					type: '潮粮',
 					tidalGrainPrice: '',
 					dryGrainPrice: '',
-					carNumber:''
+					carNumber:'',
+					carModel:'',
 				},
 				managementType: '',
 				warehouseName: '',
@@ -238,6 +248,7 @@
 				companyId: 1,
 				current: 4,
 				value:false,
+				carModeList:[],
 				gradeList: [{
 						key: 1,
 						value: '一等品'
@@ -319,6 +330,13 @@
 					})
 				}
 			})
+			this.$api.doRequest('get', 'commonSysParameter/getInfo', {
+				constId: 'QUA1'
+			}).then(res => {
+				if (res.data.data) {
+					that.carModeList=res.data.data
+				}
+			})
 			//质检货名下拉
 			this.$api.doRequest('get', '/qualityInspectionManagement/api/goodsName', {
 				 warehouseId: this.cangid
@@ -341,6 +359,9 @@
 			hidden(){
 				this.$refs.keyboard.open(false)
 			},
+			carPicker(e){
+				this.gridList.carModel=this.carModeList[e[0]].constValue
+			},
 			handleShowKeyboard(){
 				if(this.flag==0){
 					if(this.$refs.keyboard.open){