修改

pages/erp/deliveryfeedback/details.vue

@@ -247,14 +247,14 @@
 				<view v-if="item.shipType == '集装箱'" class="row">
 					<view class="left">集装箱-{{index+1}}</view>
 					<view v-if="item.status == '未装车'">未装船</view>
-					<view v-if="item.status == '已装车'">已装船</view>
-					<view v-if="item.status == '已送达'">{{item.status}}</view>
+					<view v-if="item.status == '已装车'">未卸船</view>
+					<view v-if="item.status == '已送达'">已卸船</view>
 				</view>
 				<view v-if="item.shipType == '散船'" class="row">
 					<view class="left">仓位号-{{index+1}}</view>
 					<view v-if="item.status == '未装车'">未装船</view>
-					<view v-if="item.status == '已装车'">已装船</view>
-					<view v-if="item.status == '已送达'">{{item.status}}</view>
+					<view v-if="item.status == '已装车'">未卸船</view>
+					<view v-if="item.status == '已送达'">已卸船</view>
 				</view>
 				<view v-if="item.shipType == '集装箱'" class="row">
 					<view class="left">箱号</view>
@@ -299,9 +299,9 @@
 						</u-picker>
 					</view>
 				</view>
-				<view style='text-align:right;' v-if="item.status == '已装车'">未装船</view>
-				<view style='text-align:right;' v-else-if="item.status == '已送达'">已装船</view>
-				<u-button v-else @click='submit(index,3)' type="success">保存</u-button>
+			<!-- 	<view style='text-align:right;' v-if="item.status == '已装车'">未装船</view>
+				<view style='text-align:right;' v-else-if="item.status == '已送达'">已装船</view> -->
+				<u-button v-if="item.status == '未装车'" @click='submit(index,3)' type="success">保存</u-button>
 			</view>
 			<view class="row">
 				<view style='margin-left:10px;' class="left">运单</view>

pages/erp/receivingfeedback/details.vue

@@ -220,8 +220,8 @@
 				<view class="row">
 					<view class="left">卸车日期</view>
 					<view>
-						<view v-if="item.status == '已装车' || item.status == '已送达'">{{item.receiveDateEnd}}</view>
-						<view v-else @click='train(index)'>{{item.receiveDateEnd?item.receiveDateEnd:'请选择日期'}}</view>
+						<view v-if="item.status == '未装车' || item.status == '已送达'">{{item.receiveDateEnd}}</view>
+						<view @click='train(index)'>{{item.receiveDateEnd?item.receiveDateEnd:'请选择日期'}}</view>
 						<u-picker v-model="item.show2" mode="time"  @cancel='datecancel()' @confirm='dateChange2($event,index)' :params="params">
 						</u-picker>
 					</view>
@@ -313,8 +313,8 @@
 						</u-picker>
 					</view>
 				</view>
-				<view style='text-align:right;' v-if="item.status == '未装车' || item.status == '已送达'">{{item.status}}</view>
-				<u-button v-else @click='submit(index,3)' type="success">保存</u-button>
+				<!-- <view style='text-align:right;' v-if="item.status == '未装车' || item.status == '已送达'">{{item.status}}</view> -->
+				<u-button v-if="item.status == '已装车'" @click='submit(index,3)' type="success">保存</u-button>
 			</view>
 			<view class="row">
 				<view style='margin-left:10px;' class="left">运单</view>

pages/task/audit/salecontract.vue

@@ -246,6 +246,9 @@
 				}).then(res => {
 					that.$api.msg('通过成功')
 					that.show=false
+					setTimeout(function() {
+						uni.navigateBack()
+					}, 1000);
 				})
 			},
 			//审核方法