前端

pages/erp/deliveryfeedback/details.vue

@@ -172,7 +172,7 @@
 					<view>
 						<view v-if="item.status == '已装车' || item.status == '已送达'">{{item.loadingDate}}</view>
 						<view v-else @click='train(index)'>{{item.loadingDate?item.loadingDate:'请选择日期'}}</view>
-						<u-picker v-model="item.show2" mode="time" @confirm='dateChange1($event,item)' :params="params">
+						<u-picker v-model="item.show2" mode="time" @cancel='datecancel()' @confirm='dateChange1($event,item)' :params="params">
 						</u-picker>
 					</view>
 				</view>
@@ -212,7 +212,7 @@
 					<view>
 						<view v-if="item.status == '已装车' || item.status == '已送达'">{{item.loadingDate}}</view>
 						<view v-else @click='train(index)'>{{item.loadingDate?item.loadingDate:'请选择日期'}}</view>
-						<u-picker v-model="item.show2" mode="time" @confirm='dateChange1($event,index)' :params="params">
+						<u-picker v-model="item.show2" mode="time" @cancel='datecancel()' @confirm='dateChange1($event,index)' :params="params">
 						</u-picker>
 					</view>
 				</view>
@@ -294,7 +294,7 @@
 					<view>
 						<view v-if="item.status == '已装车' || item.status == '已送达'">{{item.loadingDate}}</view>
 						<view v-else @click='train(index)'>{{item.loadingDate?item.loadingDate:'请选择日期'}}</view>
-						<u-picker v-model="item.show2" mode="time" @confirm='dateChange1($event,index)' :params="params">
+						<u-picker v-model="item.show2" mode="time"  @cancel='datecancel()' @confirm='dateChange1($event,index)' :params="params">
 						</u-picker>
 					</view>
 				</view>
@@ -399,6 +399,10 @@
 				this.imgShow=true
 				this.url=url
 			},
+			datecancel(){
+				this.freightspace[this.index].show2=true
+				this.$forceUpdate();
+			},
 			submit(index,status){
 				var that = this
 				if(this.detailData.tranType=='火运'){

pages/erp/deliveryfeedback/list.vue

@@ -4,7 +4,7 @@
 			<view class="right" @click='show1=true'>
 				<view>{{status}}</view>
 				<u-icon name="arrow-right"></u-icon>
-				<u-picker @confirm="statuschange" range-key='warehouseName' mode="selector" v-model="show1"
+				<u-picker @confirm="statuschange" range-key='name' mode="selector" v-model="show1"
 					:range="statusList"></u-picker>
 			</view>
 		</view>

pages/erp/index.vue

@@ -34,6 +34,20 @@
 				</view>
 			</view>
 		</view>
+		<view>
+
+			<view class='title'>运输管理</view>
+			<view class="cu-list grid" :class="['col-' + gridCol,gridBorder?'':'no-border']" v-if="isShowBtn">
+				<view class="cu-item" v-for="(item,index) in gridList1" :key="index" @click="gridClick(item, index)"
+					v-if="index<gridCol*2">
+					<view :class="['cuIcon-' + item.cuIcon,'text-' + item.color]">
+						<image :src="item.src" class="sign"></image>
+					</view>
+		
+					<text>{{item.name}}</text>
+				</view>
+			</view>
+		</view>
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
 			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='立即开通'
 			title='您尚未开通ERP业务' showCancelButton='false' :content="content" @confirm="goOpenService" @cancel="cancelClick"></u-modal>
@@ -104,21 +118,41 @@
 						tips: 0,
 						url: `/pages/erp/improvedExWaehousing/improvedExWaehousing`,
 						show: true
-					},
+					}
+					// {
+					// 	num: 4,
+					// 	name: '开通业务',
+					// 	// icon: 'cuIcon-edit',
+					// 	src: '../../static/img/erp/shougouzhijian@3x.png',
+					// 	tips: 0,
+					// 	url: `/pages/erp/openService/openService`,
+					// 	show: true
+					// },
+					// {
+					// 	num: 5,
+					// 	name: '联系客服',
+					// 	// icon: 'cuIcon-edit',
+					// 	src: '../../static/img/erp/shougouzhijian@3x.png',
+					// 	tips: 0,
+					// 	url: `/pages/erp/contactCustomerService/contactCustomerService`,
+					// 	show: true
+					// }
+				],
+				gridList1: [
 					{
-						num: 4,
+						num: 0,
 						name: '发货反馈',
 						// icon: 'cuIcon-copy',
-						src: '../../static/img/erp/shougoujianjin@3x.png',
+						src: '../../static/img/erp/delivery@3x.png',
 						tips: 0,
 						url: '/pages/erp/deliveryfeedback/list',
 						show: true
 					},
 					{
-						num: 5,
+						num: 1,
 						name: '收货反馈',
 						// icon: 'cuIcon-edit',
-						src: '../../static/img/erp/shougouzhijian@3x.png',
+						src: '../../static/img/erp/receiving@3x.png',
 						tips: 0,
 						url: `/pages/erp/receivingfeedback/list`,
 						show: true

pages/erp/receivingfeedback/details.vue

@@ -176,7 +176,7 @@
 					<view>
 						<view v-if="item.status == '已装车' || item.status == '已送达'">{{item.unloadingDate}}</view>
 						<view v-else @click='train(index)'>{{item.unloadingDate?item.unloadingDate:'请选择日期'}}</view>
-						<u-picker v-model="item.show2" mode="time" @confirm='dateChange1($event,item)' :params="params">
+						<u-picker v-model="item.show2" mode="time"  @cancel='datecancel()' @confirm='dateChange1($event,item)' :params="params">
 						</u-picker>
 					</view>
 				</view>
@@ -220,7 +220,7 @@
 					<view>
 						<view v-if="item.status == '已装车' || item.status == '已送达'">{{item.receiveDateEnd}}</view>
 						<view v-else @click='train(index)'>{{item.receiveDateEnd?item.receiveDateEnd:'请选择日期'}}</view>
-						<u-picker v-model="item.show2" mode="time" @confirm='dateChange2($event,index)' :params="params">
+						<u-picker v-model="item.show2" mode="time"  @cancel='datecancel()' @confirm='dateChange2($event,index)' :params="params">
 						</u-picker>
 					</view>
 				</view>
@@ -307,7 +307,7 @@
 					<view>
 						<view v-if="item.status == '已装车' || item.status == '已送达'">{{item.unloadingDate}}</view>
 						<view v-else @click='train(index)'>{{item.unloadingDate?item.unloadingDate:'请选择日期'}}</view>
-						<u-picker v-model="item.show2" mode="time" @confirm='dateChange1($event,index)' :params="params">
+						<u-picker v-model="item.show2" mode="time"  @cancel='datecancel()' @confirm='dateChange1($event,index)' :params="params">
 						</u-picker>
 					</view>
 				</view>
@@ -412,6 +412,10 @@
 				this.imgShow=true
 				this.url=url
 			},
+			datecancel(){
+				this.freightspace[this.index].show2=true
+				this.$forceUpdate();
+			},
 			submit(index,status){
 				var that = this
 				if(this.detailData.tranType=='火运'){

pages/erp/receivingfeedback/list.vue

@@ -4,7 +4,7 @@
 			<view class="right" @click='show1=true'>
 				<view>{{status}}</view>
 				<u-icon name="arrow-right"></u-icon>
-				<u-picker @confirm="statuschange" range-key='warehouseName' mode="selector" v-model="show1"
+				<u-picker @confirm="statuschange" range-key='name' mode="selector" v-model="show1"
 					:range="statusList"></u-picker>
 			</view>
 		</view>

pages/erpbusiness/examine_quality_testing.vue

@@ -39,9 +39,12 @@
 				</view>
 			</view>
 			<view v-if='managementType==1' class="c-row ">
-				<view class="title">扣重比</view>
+				<view class="title">扣杂</view>
 				<view class="con-list">
-					{{gridList.buckleWeightRatio}}
+					{{gridList.buckleMiscellaneous}}
+				</view>
+				<view class="con-list">
+					{{gridList.reBuckleMiscellaneous}}
 				</view>
 			</view>
 			<view v-if='managementType==1' class="c-row ">
@@ -101,6 +104,10 @@
 				<view class="con-list">
 					{{gridList.waterContent}}
 				</view>
+				<view class="con-list">
+					{{gridList.rewaterContent}}
+				</view>
+				
 			</view>
 			<view class="c-row ">
 				<view class="title">容重（克/升）</view>