合同更新

config/index.js

@@ -3,11 +3,11 @@ const dev = {
 	// baseUrl: 'http://localhost:8080/',
 	// baseUrlNew: 'http://192.168.110.67:9100/',
 	// baseUrlNew: 'http://192.168.1.118:8090/',
-	baseUrlNew: 'http://192.168.110.55:9888/',
+	baseUrlNew: 'http://192.168.110.9:9888/',
 	// baseUrlNew: 'http://192.168.110.138:8090/',
 	// baseUrlNew: 'http://192.168.110.82:8099/',
 	// baseUrlNew: 'http://192.168.110.202:8090/',
-	baseUrlNew: 'http://192.168.110.138:8090/',
+	// baseUrlNew: 'http://192.168.110.138:8090/',
 	// 上传图片的
 	// baseUrlNew: 'https://api2.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',

pages/task/audit/acquisitioncontract.vue

@@ -30,10 +30,10 @@
 			<u-form-item label-width='260' label="收购方电话" :borderBottom="false">
 				<u-input v-model="list.buyerPhone" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="合营方" :borderBottom="false">
+			<u-form-item label-width='260' label="合营方" :borderBottom="false" v-if="list.seller">
 				<u-input v-model="list.seller" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="合营方电话" :borderBottom="false">
+			<u-form-item label-width='260' label="合营方电话" :borderBottom="false" v-if="list.sellerPhone">
 				<u-input v-model="list.sellerPhone" input-align="right" placeholder="--" disabled />
 			</u-form-item>
 			<u-form-item label-width='260' label="交货日期（起 - 止）" :borderBottom="false">
@@ -1039,8 +1039,9 @@
 	}
 
 	.form_top {
-		border-bottom: 1px solid #C7CAD6;
+		border-bottom: 1px solid #F5F6FA;
 		padding-bottom: 10px;
+		margin-bottom: 18rpx;
 		font-size: 30rpx;
 		font-weight: 600;
 	}
@@ -1050,6 +1051,7 @@
 		border-radius: 20rpx;
 		background: #F9F9FA;
 		padding: 30rpx 20rpx;
+		margin-top: 30rpx;
 	}
 
 	.label_css {
@@ -1110,6 +1112,7 @@
 		.headInfo_middle{
 			width: 70%;
 			padding-left: 10px;
+			margin-top: 10px;
 		}
 		.headInfo_right{
 			width: 20%;
@@ -1144,7 +1147,7 @@
 		.headInfo_No{
 			color: #878C9C;
 			font-size: 13px;
-			margin-top: 10px;
+			margin-top: 6px;
 		}
 	}
 </style>

pages/task/audit/purchasecontract.vue

@@ -37,7 +37,7 @@
 			<u-form-item label-width='260' label="卖方电话" :borderBottom="false">
 				<u-input v-model="list.sellerPhone" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="交易主体" :borderBottom="false">
+			<u-form-item label-width='260' label="交易主体" :borderBottom="false" v-if="list.transactionSubject">
 				<u-input v-model="list.transactionSubject" input-align="right" placeholder="--" disabled />
 			</u-form-item>
 			<u-form-item label-width='260' label="交货日期（起）" :borderBottom="false">
@@ -1017,8 +1017,9 @@
 		}
 	}
 	.form_top {
-		border-bottom: 1px solid #C7CAD6;
+		border-bottom: 1px solid #F5F6FA;
 		padding-bottom: 10px;
+		margin-bottom: 18rpx;
 		font-size: 30rpx;
 		font-weight: 600;
 	}
@@ -1027,6 +1028,7 @@
 		border-radius: 20rpx;
 		background: #F9F9FA;
 		padding: 30rpx 20rpx;
+		margin-top: 30rpx;
 	}
 	.label_css{
 		font-size: 26rpx;
@@ -1084,6 +1086,7 @@
 		.headInfo_middle{
 			width: 70%;
 			padding-left: 10px;
+			margin-top: 10px;
 		}
 		.headInfo_right{
 			width: 20%;
@@ -1118,7 +1121,7 @@
 		.headInfo_No{
 			color: #878C9C;
 			font-size: 13px;
-			margin-top: 10px;
+			margin-top: 6px;
 		}
 	}
 </style>

pages/task/audit/salecontract.vue

@@ -38,7 +38,7 @@
 			<u-form-item label-width='260' :borderBottom="false" label="卖方电话">
 				<u-input v-model="list.sellerPhone" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' :borderBottom="false" label="中转公司">
+			<u-form-item label-width='260' :borderBottom="false" label="中转公司" v-if="list.transitCompany">
 				<u-input v-model="list.transitCompany" input-align="right" placeholder="--" disabled />
 			</u-form-item>
 			<u-form-item label-width='260' :borderBottom="false" label="交货日期（起 - 止）">
@@ -58,20 +58,20 @@
 			<u-form-item label-width='260' :borderBottom="false" label="合同单价（元/吨）">
 				<u-input v-model="list.unitContractPrice" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' :borderBottom="false" label="货源所在地区">
+			<u-form-item label-width='260' :borderBottom="false" label="货源所在地区" v-if="list.sourceProvince">
 				<view class="textCss">
 					{{list.sourceProvince}}{{list.sourceCity}}{{list.sourceArea}}
 				</view>
 			</u-form-item>
-			<u-form-item label-width='260' :borderBottom="false" label="货源详细地址">
+			<u-form-item label-width='260' :borderBottom="false" label="货源详细地址" v-if="list.sourceGoods">
 				<u-input v-model="list.sourceGoods" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' :borderBottom="false" label="交货地所在地区">
+			<u-form-item label-width='260' :borderBottom="false" label="交货地所在地区" v-if="list.deliveryProvince">
 				<view class="textCss">
 					{{list.deliveryProvince}}{{list.deliveryCity}}{{list.deliveryArea}}
 				</view>
 			</u-form-item>
-			<u-form-item label-width='260' :borderBottom="false" label="交货地详细地址">
+			<u-form-item label-width='260' :borderBottom="false" label="交货地详细地址" v-if="list.placeDelivery">
 				<u-input v-model="list.placeDelivery" input-align="right" placeholder="--" disabled />
 			</u-form-item>
 			<u-form-item label-width='300' :borderBottom="false" label="最终实际交易量（吨）">
@@ -1085,8 +1085,9 @@
 	}
 
 	.form_top {
-		border-bottom: 1px solid #C7CAD6;
+		border-bottom: 1px solid #F5F6FA;
 		padding-bottom: 10px;
+		margin-bottom: 18rpx;
 		font-size: 30rpx;
 		font-weight: 600;
 	}
@@ -1095,6 +1096,7 @@
 		border-radius: 20rpx;
 		background: #F9F9FA;
 		padding: 30rpx 20rpx;
+		margin-top: 30rpx;
 	}
 	.label_css{
 		font-size: 26rpx;
@@ -1128,6 +1130,7 @@
 		.headInfo_middle{
 			width: 70%;
 			padding-left: 10px;
+			margin-top: 10px;
 		}
 		.headInfo_right{
 			width: 20%;
@@ -1162,7 +1165,7 @@
 		.headInfo_No{
 			color: #878C9C;
 			font-size: 13px;
-			margin-top: 10px;
+			margin-top: 6px;
 		}
 	}
 	

pages/task/audit/warehouse_approval.vue

@@ -26,23 +26,36 @@
 				<view class="left">货名</view>
 				<view class="right">{{list.goodsName}}</view>
 			</view>
-			<view class='row'>
-				<view class="left">基准水分（%）</view>
+			<view class='row' v-if="list.bulkDensityStandard !=1">
+				<view class="left" >基准水分（%）</view>
 				<view class="right">{{list.waterBase}}</view>
 			</view>
-			<view class='row'>
+			<view class='row' v-if="list.bulkDensityStandard !=1">
 				<view class="left">干粮水分（%）</view>
 				<view class="right">{{list.waterMin}}</view>
 			</view>
-			<view class='row'>
+			<view class='row' v-if="list.bulkDensityStandard !=1">
 				<view class="left">水分上限（%）</view>
 				<view class="right">{{list.waterMax}}</view>
 			</view>
-			<view v-if="list.paramType == '2'" class='row'>
+			<view v-if="list.paramType == '2' && list.bulkDensityStandard !=1" class='row'>
 				<view class="left">扣重比</view>
 				<view class="right">{{list.deductWeight}}</view>
 			</view>
-			<view class='row'>
+			<view class="form_view" style="background: #F9F9FA;">
+				<table border="1" width="100%" style="border-collapse: collapse;" cellspacing="0" cellpadding="0" class="table_css">
+				<tr>
+					<td>容重(g/L)</td>
+					<td>价格(元/公斤)</td>
+				</tr>
+				<tr v-for="(item,index) in list.detailPrints">
+					<td>{{item.bulkDensityMax }} ~ {{ item.bulkDensityMin}}</td>
+					<td>{{item.bulkDensityPrice}}</td>
+				</tr>
+				</table>
+				
+			</view>
+			<view class='row' v-if="list.bulkDensityStandard !=1">
 				<view class="left">干粮收购价格（元/公斤）</view>
 				<view class="right">{{list.dryGrainPrice}}</view>
 			</view>
@@ -51,7 +64,7 @@
 				<view class="right">{{list.saleLimit}}</view>
 			</view>
 		</view>
-		<view class="content2">
+		<view class="content2" v-if="list.bulkDensityStandard !=1">
 			<view class="title">粮价设置</view>
 			<view v-for="(item,index) in list.details" :key="index">
 				<view class="row">
@@ -203,7 +216,7 @@
 				auditList:[],
 				pcUserInfo: uni.getStorageSync('pcUserInfo'),
 				switchVal: false,
-				contractNoList: []
+				contractNoList: [],
 			};
 		},
 		computed: {
@@ -245,7 +258,7 @@
 				this.$api.doRequest('get', '/purchasePrice/purchasePriceLook', {
 					id: this.id
 				}).then(res => {
-					if (res.data.code == 200) {
+					if (res.data.code == 200) { 
 						this.list = res.data.data
 						this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
 							businessCode: 'PROCUREMENT-PRICE-APPROVE',
@@ -749,4 +762,18 @@
 			margin-top: 20rpx;
 		}
 	}
+	.form_view{
+		margin: 20rpx 0;
+		border-radius: 20rpx;
+		background: #F9F9FA;
+		padding: 30rpx 20rpx;
+		.table_css td{
+			text-align: center;
+			border: 1rpx solid #DBD9CE;
+			padding: 14rpx 0;
+		}
+		.table_css{
+			border: 1rpx solid #DBD9CE;
+		}
+	}
 </style>