فهرست منبع

小程序 他运收货反馈 完成sdy

zhongtianhaoyuan 3 سال پیش
والد
کامیت
9b8236c986

+ 17 - 2
pages.json

@@ -977,14 +977,29 @@
 				"enablePullDownRefresh": false
 			}
 
-		}, {
+		}, 
+		{
+			"path": "pages/erp/deliveryfeedback/otherfeedback",
+			"style": {
+				"navigationBarTitleText": "发货反馈详情",
+				"enablePullDownRefresh": false
+			}
+		
+		},{
 			"path": "pages/erp/receivingfeedback/details",
 			"style": {
 				"navigationBarTitleText": "收货反馈详情",
 				"enablePullDownRefresh": false
 			}
 
-		}, {
+		},{
+			"path": "pages/erp/receivingfeedback/otherfeedback",
+			"style": {
+				"navigationBarTitleText": "收货反馈详情",
+				"enablePullDownRefresh": false
+			}
+
+		},{
 			"path": "pages/erp/openService/openService",
 			"style": {
 				"navigationBarTitleText": "开通服务",

+ 12 - 4
pages/erp/deliveryfeedback/list.vue

@@ -11,7 +11,8 @@
 		<view class="content2">
 			<view class="content2-item" v-for="(item,index) in dataList" @click="goDetail(item)">
 				<view style='padding:20px 5px 13px;border-bottom:1px solid #EEEEEE;' class="row">
-					<view style='font-size:14px;' class="left">{{item.processNo}}</view>
+					<view style='font-size:14px;' class="left" v-if="item.tranType != '他运'">{{item.processNo}}</view>
+					<view style='font-size:14px;' class="left" v-else>{{item.contractNo}}</view>
 					<view style='color:#22C572;'>{{item.tranType}}</view>
 				</view>
 				<view style='font-size:13px;' class="row">
@@ -26,7 +27,7 @@
 					<view style='flex:1;color:#9698A2;' class="left">收货</view>
 					<view style='flex:2;text-align:right;'>{{item.receive}}</view>
 				</view>
-				<view style='font-size:14px;' class="row">
+				<view style='font-size:14px;' class="row" v-if="item.tranType != '他运'">
 					<view style='flex:1;color:#9698A2;' class="left">运输周期</view>
 					<view style='flex:2;text-align:right;'>{{item.deliveryDateStart}} ~ {{item.deliveryDateEnd}}</view>
 				</view>
@@ -116,9 +117,16 @@
 				this.getList()
 			},
 			goDetail(val) {
-				uni.navigateTo({
+				if(val.tranType == "他运"){
+					uni.navigateTo({
+						url: '/pages/erp/deliveryfeedback/otherfeedback?id=' + val.id,
+					})
+				}else{
+					uni.navigateTo({
 					url: '/pages/erp/deliveryfeedback/details?id=' + val.id,
-				})
+				    })
+				}
+				
 			}
 		}
 	}

+ 1038 - 0
pages/erp/deliveryfeedback/otherfeedback.vue

@@ -0,0 +1,1038 @@
+<template>
+	<view class="wrap">
+		<view>
+			<view style='margin-left:10px;'>任务详情</view>
+			<view class="content">
+				<view class="row">
+					<view class="left">合同编号</view>
+					<view>{{detailData.contractNo}}</view>
+				</view>
+				<view class="row">
+					<view class="left">货名</view>
+					<view>{{detailData.goodsName}}</view>
+				</view>
+				<view class="row">
+					<view class="left">重量</view>
+					<view>{{detailData.weight}}</view>
+				</view>
+				<view class="row">
+					<view class="left">发货地址</view>
+					<view>{{detailData.sendPrivate}}{{detailData.sendCity}}{{detailData.sendArea}}</view>
+				</view>
+				<view class="row">
+					<view class="left">收货地址</view>
+					<view>{{detailData.receivePrivate}}{{detailData.receiveCity}}{{detailData.receiveArea}}</view>
+				</view>
+			</view>
+			<!-- 汽运 -->
+			<view class="flex title_css">
+				<view class="head_css">汽运反馈({{sendCarList? sendCarList : 0}})<image :src="carurl" class="open_css" @click="openCar">
+					</image>
+				</view>
+				<view class="add_css">
+					<view @click='add(1)' class="add">添加</view>
+				</view>
+			</view>
+			<view class="content" v-for="(v_item,index1) in sendCar">
+				<!-- 派车编号 -->
+				<view class="c-row">
+					<view class="title">派车编号</view>
+					<view class="con-list">
+						<input v-model='v_item.tranCarNo' placeholder="请输入派车编号" disabled="" name="input"></input>
+					</view>
+				</view>
+				<!-- 车牌号 -->
+				<view class="c-row">
+					<view class="title">车牌号</view>
+					<view class="con-list">
+						<input v-model='v_item.carNo' placeholder="请输入车牌号" name="input"></input>
+					</view>
+				</view>
+				<!-- 箱号 -->
+				<view class="c-row">
+					<view class="title">箱号-1</view>
+					<view class="con-list">
+						<input v-model='v_item.caseNo' placeholder="请输入箱号" name="input" maxlength="20"></input>
+					</view>
+				</view>
+				<view class="c-row">
+					<view class="title">箱号-2</view>
+					<view class="con-list">
+						<input v-model='v_item.caseNoOther' placeholder="请输入箱号" name="input" maxlength="20"></input>
+					</view>
+				</view>
+				<!-- 封号 -->
+				<view class="c-row">
+					<view class="title">封号-1</view>
+					<view class="con-list">
+						<input v-model='v_item.titleNo' placeholder="请输入封号" name="input" maxlength="20"></input>
+					</view>
+				</view>
+				<view class="c-row">
+					<view class="title">封号-2</view>
+					<view class="con-list">
+						<input v-model='v_item.titleNoOther' placeholder="请输入封号" name="input" maxlength="20"></input>
+					</view>
+				</view>
+				<!-- 装车净重 -->
+				<view class="c-row">
+					<view class="title">装车净重(吨)</view>
+					<view class="con-list">
+						<input v-model='v_item.loadNetWeight' placeholder="请输入净重" name="input"></input>
+					</view>
+				</view>
+				<!-- 装车日期 -->
+				<view class="c-row">
+					<view class="title">装车日期</view>
+					<view @click='show=true' class="con-list">{{v_item.loadingDate?v_item.loadingDate:"请选择装车日期"}}</view>
+					<u-picker v-model="show" mode="time" @confirm='dateChange($event,index1)' :params="params">
+					</u-picker>
+				</view>
+				<view class="flex">
+					<view class="butKey">
+						<view class="del btn" @click='del(1,index1)'>删除</view>
+						<view class="pass btn" @click='pass(1,index1)'>保存</view>
+					</view>
+				</view>
+			</view>
+			<view class="content" v-if="carShow" v-for="(item,index) in detailData.tranCarInfoList1">
+				<!-- 派车编号 -->
+				<view class="c-row">
+					<view class="title">派车编号</view>
+					<view class="con-list">
+						<input v-model='item.tranCarNo' placeholder="暂无" disabled name="input"></input>
+					</view>
+				</view>
+				<!-- 车牌号 -->
+				<view class="c-row">
+					<view class="title">车牌号</view>
+					<view class="con-list">
+						<input v-model='item.carNo' placeholder="暂无" disabled name="input"></input>
+					</view>
+				</view>
+				<!-- 箱号 -->
+				<view class="c-row">
+					<view class="title">箱号-1</view>
+					<view class="con-list">
+						<input v-model='item.caseNo' placeholder="暂无" disabled name="input"></input>
+					</view>
+				</view>
+				<view class="c-row">
+					<view class="title">箱号-2</view>
+					<view class="con-list">
+						<input v-model='item.caseNoOther' placeholder="暂无" name="input"></input>
+					</view>
+				</view>
+				<!-- 封号 -->
+				<view class="c-row">
+					<view class="title">封号-1</view>
+					<view class="con-list">
+						<input v-model='item.titleNo' placeholder="暂无" disabled name="input"></input>
+					</view>
+				</view>
+				<view class="c-row">
+					<view class="title">封号-2</view>
+					<view class="con-list">
+						<input v-model='item.titleNoOther' placeholder="暂无" disabled name="input"></input>
+					</view>
+				</view>
+				<!-- 装车净重 -->
+				<view class="c-row">
+					<view class="title">装车净重(吨)</view>
+					<view class="con-list">
+						<input v-model='item.loadNetWeight' placeholder="暂无" disabled name="input"></input>
+					</view>
+				</view>
+				<!-- 装车日期 -->
+				<view class="c-row">
+					<view class="title">装车日期</view>
+					<view class="con-list">
+						<input v-model='item.loadingDate' placeholder="暂无" disabled name="input"></input>
+					</view>
+				</view>
+			</view>
+			<!-- 以上汽运 -->
+			<!-- 火运反馈 -->
+			<view class="flex title_css">
+				<view class="head_css">火运反馈({{trainCarList ? trainCarList : 0}})<image :src="trainCarurl" class="open_css"
+						@click="trainCar"></image>
+				</view>
+				<view class="add_css">
+					<view @click='add(2)' class="add">添加</view>
+				</view>
+			</view>
+			<view class="content" v-for="(item_add1,index) in huoYun">
+				<!-- 车号 -->
+				<view class="c-row">
+					<view class="title">车号</view>
+					<view class="con-list">
+						<input v-model='item_add1.carNo' placeholder="请输入车号" name="input"></input>
+					</view>
+				</view>
+				<!-- 车厢号 -->
+				<view class="c-row">
+					<view class="title">车厢号-1</view>
+					<view class="con-list">
+						<input v-model='item_add1.boxNo1' placeholder="请输入车厢号" name="input" maxlength="20"></input>
+					</view>
+				</view>
+				<view class="c-row">
+					<view class="title">车厢号-2</view>
+					<view class="con-list">
+						<input v-model='item_add1.boxNo2' placeholder="请输入车厢号" name="input" maxlength="20"></input>
+					</view>
+				</view>
+				<!-- 装车净重 -->
+				<view class="c-row">
+					<view class="title">装车净重(吨)</view>
+					<view class="con-list">
+						<input v-model='item_add1.loadNetWeight' placeholder="请输入净重" name="input" ></input>
+					</view>
+				</view>
+				<!-- 装车日期 -->
+				<view class="c-row">
+					<view class="title">装车日期</view>
+					<view @click='show1=true' class="con-list">{{item_add1.loadingDate?item_add1.loadingDate:"请选择装车日期"}}
+					</view>
+					<u-picker v-model="show1" mode="time" @confirm='dateChange1($event,index)' :params="params">
+					</u-picker>
+				</view>
+				<view class="flex">
+					<view class="butKey">
+						<view class="del btn" @click='del(2,index)'>删除</view>
+						<view class="pass btn" @click='pass(2,index)'>保存</view>
+					</view>
+				</view>
+			</view>
+			<view class="content" v-if="trainCarShow" v-for="(item1,index) in detailData.tranCarInfoList2">
+				<!-- 车号 -->
+				<view class="c-row">
+					<view class="title">车号</view>
+					<view class="con-list">
+						<input v-model='item1.carNo' placeholder="暂无" disabled name="input"></input>
+					</view>
+				</view>
+				<!-- 车厢号 -->
+				<view class="c-row">
+					<view class="title">车厢号-1</view>
+					<view class="con-list">
+						<input v-model='item1.boxNo1' placeholder="暂无" disabled name="input"></input>
+					</view>
+				</view>
+				<view class="c-row">
+					<view class="title">车厢号-2</view>
+					<view class="con-list">
+						<input v-model='item1.boxNo2' placeholder="暂无" disabled name="input"></input>
+					</view>
+				</view>
+				<!-- 装车净重 -->
+				<view class="c-row">
+					<view class="title">装车净重(吨)</view>
+					<view class="con-list">
+						<input v-model='item1.loadNetWeight' placeholder="暂无" disabled name="input"></input>
+					</view>
+				</view>
+				<!-- 装车日期 -->
+				<view class="c-row">
+					<view class="title">装车日期</view>
+					<view class="con-list">
+						<input v-model='item1.loadingDate' placeholder="暂无" disabled name="input"></input>
+					</view>
+				</view>
+			</view>
+			<!-- 以上火运反馈 -->
+			<!-- 散船反馈 -->
+			<view class="flex title_css">
+				<view class="head_css">散船反馈({{shipList ? shipList : 0 }})<image :src="shipurl" class="open_css" @click="shipping">
+					</image>
+				</view>
+				<view class="add_css">
+					<view @click='add(3)' class="add">添加</view>
+				</view>
+			</view>
+			<view class="content" v-for="(item_add3,index) in looseShip">
+				<!-- 船名 -->
+				<view class="c-row">
+					<view class="title">船名</view>
+					<view class="con-list">
+						<input v-model='item_add3.shipName' placeholder="请输入船名" name="input" maxlength="20"></input>
+					</view>
+				</view>
+				<view class="c-row">
+					<view class="title">航次</view>
+					<view class="con-list">
+						<input v-model='item_add3.shipNo' placeholder="请输入航次" name="input" maxlength="20"></input>
+					</view>
+				</view>
+				<!-- 装船日期 -->
+				<view class="c-row">
+					<view class="title">装船净重(吨)</view>
+					<view class="con-list">
+						<input v-model='item_add3.loadNetWeight' placeholder="请输入装船净重" name="input"></input>
+					</view>
+				</view>
+				<!-- 装船日期 -->
+				<view class="c-row">
+					<view class="title">装船日期</view>
+					<view @click='show2=true' class="con-list">{{item_add3.loadingDate?item_add3.loadingDate:"请选择装船日期"}}
+					</view>
+					<u-picker v-model="show2" mode="time" @confirm='dateChange2($event,index)' :params="params">
+					</u-picker>
+				</view>
+				<view class="flex">
+					<view class="butKey">
+						<view class="del btn" @click='del(3,index)'>删除</view>
+						<view class="pass btn" @click='pass(3,index)'>保存</view>
+					</view>
+				</view>
+			</view>
+			<view class="content" v-if="shipShow" v-for="(item2,index) in detailData.tranCarInfoList3">
+				<!-- 船名 -->
+				<view class="c-row">
+					<view class="title">船名</view>
+					<view class="con-list">
+						<input v-model='item2.shipName' placeholder="暂无" disabled name="input"></input>
+					</view>
+				</view>
+				<view class="c-row">
+					<view class="title">航次</view>
+					<view class="con-list">
+						<input v-model='item2.shipNo' placeholder="暂无" disabled name="input"></input>
+					</view>
+				</view>
+				<!-- 装船日期 -->
+				<view class="c-row">
+					<view class="title">装船净重(吨)</view>
+					<view class="con-list">
+						<input v-model='item2.loadNetWeight' placeholder="暂无" disabled name="input"></input>
+					</view>
+				</view>
+				<!-- 装船日期 -->
+				<view class="c-row">
+					<view class="title">装船日期</view>
+					<view class="con-list">
+						<input v-model='item2.loadingDate' placeholder="暂无" disabled name="input"></input>
+					</view>
+				</view>
+			</view>
+			<!-- 以上散船反馈 -->
+
+
+			<!-- 集装箱船反馈 -->
+			<view class="flex title_css">
+				<view class="head_css">集装箱船反馈({{containerList ? containerList : 0}})<image :src="containerUrl" class="open_css"
+						@click="containerchange"></image>
+				</view>
+				<view class="add_css">
+					<view @click='add(4)' class="add">添加</view>
+				</view>
+			</view>
+			<view class="content" v-for="(item_add4,index) in container">
+				<!-- 箱号 -->
+				<view class="c-row">
+					<view class="title">箱号</view>
+					<view class="con-list">
+						<input v-model='item_add4.caseNo' placeholder="请输入箱号" name="input" maxlength="20"></input>
+					</view>
+				</view>
+				<view class="c-row">
+					<view class="title">封号</view>
+					<view class="con-list">
+						<input v-model='item_add4.titleNo' placeholder="请输入封号" name="input" maxlength="20"></input>
+					</view>
+				</view>
+				<!-- 装船日期 -->
+				<view class="c-row">
+					<view class="title">装船净重(吨)</view>
+					<view class="con-list">
+						<input v-model='item_add4.loadNetWeight' placeholder="请输入装船净重" name="input"></input>
+					</view>
+				</view>
+				<!-- 装船日期 -->
+				<view class="c-row">
+					<view class="title">装船日期</view>
+					<view @click='show2=true' class="con-list">{{item_add4.loadingDate?item_add4.loadingDate:"请选择装船日期"}}
+					</view>
+					<u-picker v-model="show2" mode="time" @confirm='dateChange3($event,index)' :params="params">
+					</u-picker>
+				</view>
+				<view class="flex">
+					<view class="butKey">
+						<view class="del btn" @click='del(4,index)'>删除</view>
+						<view class="pass btn" @click='pass(4,index)'>保存</view>
+					</view>
+				</view>
+			</view>
+			<view class="content" v-if="containerShow" v-for="(item3,index) in detailData.tranCarInfoList4">
+				<!-- 箱号 -->
+				<view class="c-row">
+					<view class="title">箱号</view>
+					<view class="con-list">
+						<input v-model='item3.caseNo' placeholder="暂无" disabled name="input"></input>
+					</view>
+				</view>
+				<view class="c-row">
+					<view class="title">封号</view>
+					<view class="con-list">
+						<input v-model='item3.titleNo' placeholder="暂无" disabled name="input"></input>
+					</view>
+				</view>
+				<!-- 装船日期 -->
+				<view class="c-row">
+					<view class="title">装船净重(吨)</view>
+					<view class="con-list">
+						<input v-model='item3.loadNetWeight' placeholder="暂无" disabled name="input"></input>
+					</view>
+				</view>
+				<!-- 装船日期 -->
+				<view class="c-row">
+					<view class="title">装船日期</view>
+					<view class="con-list">
+						<input v-model='item3.loadingDate' placeholder="暂无" disabled name="input"></input>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view style='padding:10px;' class='flex bottom-btn'>
+			<!-- <u-button  @click='pass' type="error" class="btn1" hover-class='none'>提交</u-button> -->
+			<u-button @click='finishedgoods' type="success" class="btn2">完货</u-button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import upload from '@/components/upload.vue';
+	import helper from '@/common/helper.js';
+	export default {
+		components: {
+			upload
+		},
+		data() {
+			return {
+				id: '',
+				currentPage: 1,
+				pageSize: 10,
+				maxSize: 50 * 1024 * 1024,
+				status: '执行中',
+				params: {
+					year: true,
+					month: true,
+					day: true,
+				},
+				action: this.$uploadUrl, //磅单上传地址
+				detailData: {},
+				show: false,
+				show1: false,
+				show2: false,
+				val: "", //假
+				carShow: false,
+				carurl: "../../../static/img/authentication/up2.png",
+				trainCarShow: false,
+				trainCarurl: "../../../static/img/authentication/up2.png",
+				shipShow: false,
+				shipurl: "../../../static/img/authentication/up2.png",
+				containerUrl: "../../../static/img/authentication/up2.png",
+				containerShow: false,
+				infoId: "",
+				sendCar: [], //汽运
+				huoYun: [], //火运
+				looseShip: [], //散船
+				container: [], //集裝箱船
+				sendCarList: "",
+				trainCarList: "",
+				shipList: "",
+				containerList: "",
+				count: 0,
+
+			}
+		},
+		onLoad(options) {
+			this.id = options.id
+		},
+		onShow() {
+			this.getList()
+		},
+		computed: {
+			total: function() {
+				var maxStorage = 0
+				if (this.detailData.tranCarInfoList) {
+					// for (var i = 0; i < this.detailData.tranCarInfoList.length; i++) {
+					// 	maxStorage += Number(
+					// 	  this.detailData.tranCarInfoList[i].loadNetWeight
+					// 	)
+					//   } 
+				}
+				return maxStorage
+			},
+		},
+		methods: {
+			//汽运展开显示
+			openCar() {
+				this.carShow = !this.carShow
+				if (this.carShow) {
+					this.carurl = "../../../static/img/authentication/down2@2x.png"
+				} else {
+					this.carurl = "../../../static/img/authentication/up2.png"
+				}
+			},
+			// 火运展开显示
+			trainCar() {
+				this.trainCarShow = !this.trainCarShow
+				if (this.trainCarShow) {
+					this.trainCarurl = "../../../static/img/authentication/down2@2x.png"
+				} else {
+					this.trainCarurl = "../../../static/img/authentication/up2.png"
+				}
+			},
+			//船运展开显示
+			shipping() {
+				this.shipShow = !this.shipShow
+				if (this.shipShow) {
+					this.shipurl = "../../../static/img/authentication/down2@2x.png"
+				} else {
+					this.shipurl = "../../../static/img/authentication/up2.png"
+				}
+			},
+			//集装箱船展开显示
+			containerchange() {
+				this.containerShow = !this.containerShow
+				if (this.containerShow) {
+					this.containerUrl = "../../../static/img/authentication/down2@2x.png"
+				} else {
+					this.containerUrl = "../../../static/img/authentication/up2.png"
+				}
+			},
+
+			dateChange(e, num) {
+				this.sendCar[num].loadingDate = e.year + "-" + e.month + "-" + e.day
+			},
+			dateChange1(e, num) {
+				this.huoYun[num].loadingDate = e.year + "-" + e.month + "-" + e.day
+			},
+			dateChange2(e, num) {
+				this.looseShip[num].loadingDate = e.year + "-" + e.month + "-" + e.day
+			},
+			dateChange3(e, num) {
+				this.container[num].loadingDate = e.year + "-" + e.month + "-" + e.day
+			},
+			//完货
+			finishedgoods() {
+				var that = this
+				uni.showModal({
+					content: "完货操作后,装车信息不可修改,是否确定完货?",
+					success(res) {
+						if (res.confirm) {
+							let complete = {}
+							complete.id = that.id
+							that.$api.doRequest('post', '/tranProcessInfo/api/editFeedbackStatus', complete).then(
+								res => {
+									console.log(res)
+									if (res.data.code == 200) {
+										that.sendCar.splice(index, 1)
+										that.$api.msg("提交成功")
+										setTimeout(() => {
+											uni.navigateBack()
+										}, 1000)
+									} else {
+										that.$api.msg(res.data.message)
+									}
+								})
+						}
+					}
+				})
+			},
+			//添加
+			add(index) {
+				if (index == 1) {
+					var tranNos = ""
+					if (Number(this.count) < 10) {
+						tranNos = "C00" + Number(this.count + 1)
+					} else if (Number(this.count) < 100) {
+						tranNos = "C0" + Number(this.count + 1)
+					} else if (Number(this.count) < 1000) {
+						tranNos = "C" + Number(this.count + 1)
+					}
+					this.sendCar.push({
+						tranCarNo: tranNos,
+						carNo: "",
+						caseNo: "",
+						caseNoOther: "",
+						titleNo: "",
+						titleNoOther: "",
+						loadNetWeight: "",
+						loadingDate: "",
+					})
+					this.count++
+				} else if (index == 2) {
+					this.huoYun.push({
+						carNo: "",
+						boxNo1: "",
+						boxNo2: "",
+						loadNetWeight: "",
+						loadingDate: "",
+					})
+				} else if (index == 3) {
+					this.looseShip.push({
+						shipName: "",
+						shipNo: "",
+						loadNetWeight: "",
+						loadingDate: "",
+					})
+				} else if (index == 4) {
+					this.container.push({
+						caseNo: "",
+						titleNo: "",
+						loadNetWeight: "",
+						loadingDate: "",
+					})
+				}
+			},
+			// 删除
+			del(num, index) {
+				var that = this
+				uni.showModal({
+					content: "确定删除反馈信息?",
+					success(res) {
+						if (res.confirm) {
+							if (num == 1) {
+								that.sendCar.splice(index, 1)
+								if (this.shipList) {
+									that.count = Number(this.shipList) + 1
+								} else {
+									that.count = 1
+								}
+								for (var i = 0; i < that.sendCar.length; i++) {
+									if (that.count < 10) {
+										that.sendCar[i].tranCarNo = "C00" + that.count
+									} else if (that.count < 100) {
+										that.sendCar[i].tranCarNo = "C0" + that.count
+									} else if (that.count < 1000) {
+										that.sendCar[i].tranCarNo = "C" + that.count
+									}
+									that.count++
+								}
+							} else if (num == 2) {
+								that.huoYun.splice(index, 1)
+							} else if (num == 3) {
+								that.loadingDate.splice(index, 1)
+							} else if (num == 4) {
+								that.container.splice(index, 1)
+							}
+						}
+					}
+				})
+
+			},
+			//保存
+			pass(num, index) {
+				var that = this
+				let _pro = {}
+				_pro.id = that.id
+				_pro.infoId = that.detailData.infoId
+				_pro.contractNo = that.detailData.contractNo
+				if (num == 1) {
+					if(!that.sendCar[index].carNo){
+						that.$api.msg("车牌号不能为空!")
+						return
+					}
+					if(that.sendCar[index].carNo.length != 7){
+						that.$api.msg("车牌号输入有误!")
+						return
+					}
+					if(!that.sendCar[index].loadNetWeight){
+						that.$api.msg("装车净重不能为空!")
+						return
+					}
+					if(that.sendCar[index].loadNetWeight > 200 || that.sendCar[index].loadNetWeight < 0){
+						that.$api.msg("装车净重不能超过200吨!")
+						return
+					}
+					if(!that.sendCar[index].loadingDate){
+						that.$api.msg("装车日期不能为空!")
+						return
+					}
+					uni.showModal({
+						content: "确定保存反馈信息?",
+						success(res) {
+							if (res.confirm) {
+								_pro.tranCarInfoList1 = [that.sendCar[index]]
+								_pro.threeTranType = "汽运"
+								that.$api.doRequest('post', '/tranProcessInfo/api/addTranCar', _pro).then(res => {
+									if (res.data.code == 200) {
+										that.sendCar.splice(index, 1)
+										that.$api.msg("保存成功")
+										that.getList()
+									} else {
+										that.$api.msg(res.data.message)
+									}
+								})
+							}
+						}
+					})
+				} else if (num == 2) {
+					if(!that.huoYun[index].carNo){
+						that.$api.msg("车号不能为空!")
+						return
+					}
+					if(!that.huoYun[index].boxNo1){
+						that.$api.msg("车厢号不能为空!")
+						return
+					}
+					if(!that.huoYun[index].boxNo2){
+						that.$api.msg("车厢号不能为空!")
+						return
+					}
+					if(!that.huoYun[index].loadNetWeight){
+						that.$api.msg("装车净重不能为空!")
+						return
+					}
+					if(that.huoYun[index].loadNetWeight > 200){
+						that.$api.msg("装车净重不能超过200吨!")
+						return
+					}
+					if(!that.huoYun[index].loadingDate){
+						that.$api.msg("装车日期不能为空!")
+						return
+					}
+					uni.showModal({
+						content: "确定保存反馈信息?",
+						success(res) {
+							if (res.confirm) {
+								that.huoYun[index].boxNo = "" + that.huoYun.boxNo1 + "," + that.huoYun.boxNo2
+								_pro.tranCarInfoList2 = [that.huoYun[index]]
+								_pro.threeTranType = "火运"
+								that.$api.doRequest('post', '/tranProcessInfo/api/addTranCar', _pro).then(res => {
+									if (res.data.code == 200) {
+										that.huoYun.splice(index, 1)
+										that.$api.msg("保存成功")
+										that.getList()
+									} else {
+										that.$api.msg(res.data.message)
+									}
+								})
+							}
+						}
+					})
+				} else if (num == 3) {
+					if(!that.looseShip[index].shipName){
+						that.$api.msg("船名不能为空!")
+						return
+					}
+					if(!that.looseShip[index].shipNo){
+						that.$api.msg("船次不能为空!")
+						return
+					}
+					if(!that.looseShip[index].loadNetWeight || that.looseShip[index].loadNetWeight == 0 ){
+						that.$api.msg("装船净重不能为空!")
+						return
+					}
+					if(that.looseShip[index].loadNetWeight > 50000 ){
+						that.$api.msg("装船净重不能超过50000吨!")
+						return
+					}
+					if(!that.looseShip[index].loadingDate){
+						that.$api.msg("装船日期不能为空!")
+						return
+					}
+					uni.showModal({
+						content: "确定保存反馈信息?",
+						success(res) {
+							if (res.confirm) {
+								_pro.tranCarInfoList3 = [that.looseShip[index]]
+								_pro.threeTranType = "散船"
+								that.$api.doRequest('post', '/tranProcessInfo/api/addTranCar', _pro).then(res => {
+									if (res.data.code == 200) {
+										that.looseShip.splice(index, 1)
+										that.$api.msg("保存成功")
+										that.getList()
+									} else {
+										that.$api.msg(res.data.message)
+									}
+								})
+							}
+						}
+					})
+				} else if (num == 4) {
+					if(!that.container[index].caseNo){
+						that.$api.msg("箱号不能为空!")
+						return
+					}
+					if(!that.container[index].titleNo){
+						that.$api.msg("封号不能为空!")
+						return
+					}
+					if(!that.container[index].loadNetWeight || that.container[index].loadNetWeight == 0){
+						that.$api.msg("装船净重不能为空!")
+						return
+					}
+					if(that.container[index].loadNetWeight > 100 ){
+						that.$api.msg("装船净重不能超过100吨!")
+						return
+					}
+					if(!that.container[index].loadingDate){
+						that.$api.msg("装船日期不能为空!")
+						return
+					}
+					uni.showModal({
+						content: "确定保存反馈信息?",
+						success(res) {
+							if (res.confirm) {
+								_pro.tranCarInfoList4 = [that.container[index]]
+								_pro.threeTranType = "集装箱船"
+								that.$api.doRequest('post', '/tranProcessInfo/api/addTranCar', _pro).then(res => {
+									if (res.data.code == 200) {
+										that.container.splice(index, 1)
+										that.$api.msg("保存成功")
+										that.getList()
+									} else {
+										that.$api.msg(res.data.message)
+									}
+								})
+							}
+						}
+					})
+				}
+				// 		}
+				// 	}
+				// })
+			},
+			getList() {
+				this.$api.doRequest('get', '/tranProcessInfo/getThreeTranProcess', {
+					id: this.id
+				}).then(res => {
+					if (res.data.code == 200) {
+						this.detailData = res.data.data
+						this.sendCarList = this.detailData.tranCarInfoList1.length
+						this.count = this.detailData.tranCarInfoList1.length
+						this.trainCarList = this.detailData.tranCarInfoList2.length
+						this.shipList = this.detailData.tranCarInfoList3.length
+						this.containerList = this.detailData.tranCarInfoList4.length
+					}
+				})
+			},
+			filterFileType(index, lists) {
+				if (lists[index].fileType != 'jpg' && lists[index].fileType != 'png' && lists[index].fileType != 'gif') {
+					lists.splice(index, 1);
+					// 当前文件不支持
+					uni.showModal({
+						title: '暂不支持当前图片类型',
+						showCancel: false
+					});
+				} else {
+					this.isAdd = false;
+				}
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	uni-page-body {
+		overflow: hidden;
+	}
+
+	.content {
+		margin: 10px 0;
+	}
+
+	.wrap {
+		margin: 10rpx;
+		padding: 20rpx 20rpx 300rpx 20rpx;
+
+		.top {
+			display: flex;
+			margin-bottom: 20rpx;
+
+			.top-left {
+				margin-right: 20rpx;
+			}
+		}
+	}
+
+	.bottom-btn {
+		width: 100%;
+		position: fixed;
+		bottom: 0;
+		display: flex;
+		z-index: 2;
+		left: 0;
+		background-color: #f8f8f8;
+		flex-direction: column;
+
+		.btn1,
+		.btn2 {
+			width: 100%;
+			margin-bottom: 26rpx;
+			border-radius: 90rpx;
+		}
+
+		.btn1 {
+			background: white;
+			color: #00C265;
+		}
+	}
+
+	.content,
+	.content1,
+	.content2 {
+		border-radius: 20rpx;
+		background: white;
+		padding: 20rpx;
+
+		.title {
+			font-size: 28rpx;
+			// font-weight: 600;
+			color: #333333;
+		}
+
+		.row {
+			display: flex;
+			justify-content: space-between;
+			// border-bottom: 1px solid #EEEEEE;
+			padding: 20rpx 0;
+
+			.right,
+			input {
+				font-size: 28rpx;
+				color: #333333;
+			}
+		}
+
+		.row-bottom {
+
+			// border: 0;
+			.right-bottom {
+				width: 280rpx;
+				text-align: right;
+			}
+		}
+	}
+
+	.content1 {
+		margin-top: 20rpx;
+	}
+
+	.content2 {
+		margin-top: 10px;
+		// display: flex;
+		align-items: center;
+
+		.left {
+			margin-right: 20px;
+		}
+	}
+
+
+
+	.edit-btn {
+		background: #22C572;
+		width: 100rpx;
+		height: 50rpx;
+		margin: 0;
+		color: white;
+	}
+
+	.has-btn {
+		align-items: center;
+	}
+
+
+	.shade {
+		background: #000;
+		position: fixed;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		z-index: 10000;
+	}
+
+	.pound_list {
+		width: 452rpx;
+		display: flex;
+		justify-content: flex-end;
+		text-align: right;
+	}
+
+
+	.c-row {
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: flex;
+		-webkit-box-align: center;
+		-webkit-align-items: center;
+		align-items: center;
+		padding: 10rpx;
+		position: relative;
+	}
+
+	.con-list {
+		-webkit-box-flex: 1;
+		-webkit-flex: 1;
+		flex: 1;
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: flex;
+		-webkit-box-orient: vertical;
+		-webkit-box-direction: normal;
+		-webkit-flex-direction: column;
+		flex-direction: column;
+		color: #303133;
+		line-height: 40rpx;
+		text-align: right;
+		padding-right: 20rpx;
+	}
+
+	.add_css {
+		width: 50%;
+		display: flex;
+		justify-content: flex-end;
+
+		.add {
+			padding: 10rpx 40rpx;
+			background-color: #5ac725;
+			border-radius: 40rpx;
+			color: #FFFFFF;
+			line-height: 46rpx;
+		}
+	}
+
+	.butKey {
+		display: flex;
+		margin: 0 auto;
+
+		.del {
+			background-color: #ff0808;
+		}
+
+		.btn {
+			padding: 10rpx 60rpx;
+			border-radius: 40rpx;
+			color: #FFFFFF;
+			line-height: 46rpx;
+			margin: 0 20rpx;
+		}
+
+		.pass {
+			background-color: #5ac725;
+		}
+	}
+
+
+	.open_css {
+		width: 36rpx;
+		height: 20rpx;
+		// top: 4rpx;
+	}
+
+	.title_css {
+		margin-bottom: 20rpx;
+
+		.head_css {
+			margin-left: 20rpx;
+			width: 50%;
+			line-height: 40rpx;
+			margin-bottom: 30rpx;
+		}
+	}
+</style>

+ 9 - 2
pages/erp/receivingfeedback/list.vue

@@ -117,9 +117,16 @@
 				this.getList()
 			},
 			goDetail(val) {
-				uni.navigateTo({
+				if(val.tranType == "他运"){
+					uni.navigateTo({
+					url: '/pages/erp/receivingfeedback/otherfeedback?id=' + val.id,
+					})
+				}else{
+					uni.navigateTo({
 					url: '/pages/erp/receivingfeedback/details?id=' + val.id,
-				})
+				    })
+				}
+				
 			}
 		}
 	}

+ 722 - 0
pages/erp/receivingfeedback/otherfeedback.vue

@@ -0,0 +1,722 @@
+<template>
+	<view class="wrap">
+		<view>
+			<view style='margin-left:10px;'>任务详情</view>
+			<view class="content">
+				<view class="row">
+					<view class="left">合同编号</view>
+					<view>{{detailData.contractNo}}</view>
+				</view>
+				<view class="row">
+					<view class="left">货名</view>
+					<view>{{detailData.goodsName}}</view>
+				</view>
+				<view class="row">
+					<view class="left">重量</view>
+					<view>{{detailData.weight}}</view>
+				</view>
+				<view class="row">
+					<view class="left">发货地址</view>
+					<view>{{detailData.sendPrivate}}{{detailData.sendCity}}{{detailData.sendArea}}</view>
+				</view>
+				<view class="row">
+					<view class="left">收货地址</view>
+					<view>{{detailData.receivePrivate}}{{detailData.receiveCity}}{{detailData.receiveArea}}</view>
+				</view>
+			</view>
+			<!-- 汽运 -->
+			<view class="flex title_css">
+				<view class="head_css">汽运反馈({{sendCarList}})<image :src="carurl" class="open_css" @click="openCar"></image>
+				</view>
+			</view>
+			
+			<view class="content" v-if="carShow" v-for="(item,index) in detailData.tranCarInfoList1">
+				<!-- 派车编号 -->
+				<view class="c-row">
+					<view class="title">派车编号</view>
+					<view class="con-list">
+						<input v-model='item.tranCarNo' placeholder="暂无" disabled name="input"></input>
+					</view>
+				</view>
+				<!-- 车牌号 -->
+				<view class="c-row">
+					<view class="title">车牌号</view>
+					<view class="con-list">
+						<input v-model='item.carNo' placeholder="暂无" disabled name="input"></input>
+					</view>
+				</view>
+				<!-- 箱号 -->
+				<view class="c-row">
+					<view class="title">箱号-1</view>
+					<view class="con-list">
+						<input v-model='item.caseNo' placeholder="暂无" disabled name="input"></input>
+					</view>
+				</view>
+				<view class="c-row">
+					<view class="title">箱号-2</view>
+					<view class="con-list">
+						<input v-model='item.caseNoOther' placeholder="暂无" name="input"></input>
+					</view>
+				</view>
+				<!-- 封号 -->
+				<view class="c-row">
+					<view class="title">封号-1</view>
+					<view class="con-list">
+						<input v-model='item.titleNo' placeholder="暂无" disabled name="input"></input>
+					</view>
+				</view>
+				<view class="c-row">
+					<view class="title">封号-2</view>
+					<view class="con-list">
+						<input v-model='item.titleNoOther' placeholder="暂无" disabled name="input"></input>
+					</view>
+				</view>
+				<!-- 装车净重 -->
+				<view class="c-row">
+					<view class="title">装车净重(吨)</view>
+					<view class="con-list">
+						<input v-model='item.loadNetWeight' placeholder="暂无" disabled name="input"></input>
+					</view>
+				</view>
+				<!-- 卸车日期 -->
+				<view class="c-row">
+					<view class="title">卸车净重(吨)</view>
+					<view class="con-list">  
+						<input v-model='item.unloadNetWeight' placeholder="请输入卸车净重" :disabled="item.status == '已送达'" name="input"></input>
+					</view>
+				</view>
+				<view class="flex">
+					<u-button @click='pass(1,index)' type="success" v-if="item.status != '已送达'" hover-class='none'>保存</u-button>
+				</view>
+			</view>
+			<!-- 以上汽运 -->
+			<!-- 火运反馈 -->
+			<view class="flex title_css">
+				<view class="head_css">火运反馈({{trainCarList}})<image :src="trainCarurl" class="open_css"
+						@click="trainCar"></image>
+				</view>
+			</view>
+			<view class="content" v-if="trainCarShow" v-for="(item,index) in detailData.tranCarInfoList2">
+				<!-- 车号 -->
+				<view class="c-row">
+					<view class="title">车号</view>
+					<view class="con-list">
+						<input v-model='item.carNo' placeholder="暂无" disabled name="input"></input>
+					</view>
+				</view>
+				<!-- 车厢号 -->
+				<view class="c-row">
+					<view class="title">车厢号-1</view>
+					<view class="con-list">
+						<input v-model='item.boxNo' placeholder="暂无" disabled name="input"></input>
+					</view>
+				</view>
+				<view class="c-row">
+					<view class="title">车厢号-2</view>
+					<view class="con-list">
+						<input v-model='item.boxNo' placeholder="暂无" disabled name="input"></input>
+					</view>
+				</view>
+				<!-- 装车净重 -->
+				<view class="c-row">
+					<view class="title">装车净重(吨)</view>
+					<view class="con-list">
+						<input v-model='item.loadNetWeight' placeholder="暂无" disabled name="input"></input>
+					</view>
+				</view>
+				<!-- 卸车净重 -->
+				<view class="c-row">
+					<view class="title">卸车净重(吨)</view>
+					<view class="con-list">
+						<input v-model='item.unloadNetWeight' placeholder="请输入卸车净重" :disabled="item.status == '已送达'" name="input"></input>
+					</view>
+				</view>
+				<view class="flex">
+					<u-button @click='pass(2,index)' v-if="item.status != '已送达'" type="success" hover-class='none'>保存</u-button>
+				</view>
+			</view>
+			<!-- 以上火运反馈 -->
+			<!-- 散船反馈 -->
+			<view class="flex title_css">
+				<view class="head_css">散船反馈({{shipList}})<image :src="shipurl" class="open_css" @click="shipping">
+					</image>
+				</view>
+				
+			</view>
+			<view class="content" v-if="shipShow" v-for="(item,index) in detailData.tranCarInfoList3">
+				<!-- 船名 -->
+				<view class="c-row">
+					<view class="title">船名</view>
+					<view class="con-list">
+						<input v-model='item.shipName' placeholder="暂无" disabled name="input"></input>
+					</view>
+				</view>
+				<view class="c-row">
+					<view class="title">航次</view>
+					<view class="con-list">
+						<input v-model='item.shipNo' placeholder="暂无" disabled name="input"></input>
+					</view>
+				</view>
+				<!-- 装船净重 -->
+				<view class="c-row">
+					<view class="title">装船净重(吨)</view>
+					<view class="con-list">
+						<input v-model='item.loadNetWeight' placeholder="暂无" disabled name="input"></input>
+					</view>
+				</view>
+				<!-- 卸船净重 -->
+				<view class="c-row">
+					<view class="title">装船净重(吨)</view>
+					<view class="con-list">
+						<input v-model='item.unloadNetWeight' placeholder="请输入卸船净重" :disabled="item.status == '已送达'"  name="input"></input>
+					</view>
+				</view>
+				<view class="flex">
+					<u-button @click='pass(3,index)' type="success" v-if="item.status != '已送达'" hover-class='none'>保存</u-button>
+				</view>
+			</view>
+			<!-- 以上散船反馈 -->
+			<!-- 集装箱船反馈 -->
+			<view class="flex title_css">
+				<view class="head_css">集装箱船反馈({{containerList}})<image :src="containerUrl" class="open_css"
+						@click="containerchange"></image>
+				</view>
+			</view>
+			<view class="content" v-if="containerShow" v-for="(item,index) in detailData.tranCarInfoList4">
+				<!-- 箱号 -->
+				<view class="c-row">
+					<view class="title">箱号</view>
+					<view class="con-list">
+						<input v-model='item.caseNo' placeholder="暂无" disabled name="input"></input>
+					</view>
+				</view>
+				<view class="c-row">
+					<view class="title">封号</view>
+					<view class="con-list">
+						<input v-model='item.titleNo' placeholder="暂无" disabled name="input"></input>
+					</view>
+				</view>
+				<!-- 装船净重 -->
+				<view class="c-row">
+					<view class="title">装船净重(吨)</view>
+					<view class="con-list">
+						<input v-model='item.loadNetWeight' placeholder="暂无" disabled name="input"></input>
+					</view>
+				</view>
+				<!-- 卸船净重 -->
+				<view class="c-row">
+					<view class="title">卸船净重(吨)</view>
+					<view class="con-list">
+						<input v-model='item.unloadNetWeight' placeholder="请输入卸船净重" :disabled="item.status == '已送达'" name="input"></input>
+					</view>
+				</view>
+				<view class="flex">
+					<u-button @click='pass(4,index)' type="success" v-if="item.status != '已送达'" hover-class='none'>保存</u-button>
+				</view>
+			</view>
+		</view>
+		<view style='padding:10px;' class='flex bottom-btn'>
+			<u-button @click='finishedgoods' type="success" class="btn2">完货</u-button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import upload from '@/components/upload.vue';
+	import helper from '@/common/helper.js';
+	export default {
+		components: {
+			upload
+		},
+		data() {
+			return {
+				id: '',
+				currentPage: 1,
+				pageSize: 10,
+				maxSize: 50 * 1024 * 1024,
+				status: '执行中',
+				params: {
+					year: true,
+					month: true,
+					day: true,
+				},
+				action: this.$uploadUrl, //磅单上传地址
+				detailData: {},
+				show: false,
+				show1: false,
+				show2: false,
+				val: "", //假
+				carShow: false,
+				carurl: "../../../static/img/authentication/up2.png",
+				trainCarShow: false,
+				trainCarurl: "../../../static/img/authentication/up2.png",
+				shipShow: false,
+				shipurl: "../../../static/img/authentication/up2.png",
+				containerUrl: "../../../static/img/authentication/up2.png",
+				containerShow: false,
+				infoId: "",
+				sendCar: [], //汽运
+				huoYun: [], //火运
+				looseShip: [], //散船
+				container: [], //集裝箱船
+				sendCarList: "",
+				trainCarList: "",
+				shipList: "",
+				containerList: "",
+
+			}
+		},
+		onLoad(options) {
+			this.id = options.id
+		},
+		onShow() {
+			this.getList()
+		},
+		computed: {
+			total: function() {
+				var maxStorage = 0
+				if (this.detailData.tranCarInfoList) {
+					// for (var i = 0; i < this.detailData.tranCarInfoList.length; i++) {
+					// 	maxStorage += Number(
+					// 	  this.detailData.tranCarInfoList[i].loadNetWeight
+					// 	)
+					//   } 
+				}
+				return maxStorage
+			},
+		},
+		methods: {
+			//汽运展开显示
+			openCar() {
+				this.carShow = !this.carShow
+				if (this.carShow) {
+					this.carurl = "../../../static/img/authentication/down2@2x.png"
+				} else {
+					this.carurl = "../../../static/img/authentication/up2.png"
+				}
+			},
+			// 火运展开显示
+			trainCar() {
+				this.trainCarShow = !this.trainCarShow
+				if (this.trainCarShow) {
+					this.trainCarurl = "../../../static/img/authentication/down2@2x.png"
+				} else {
+					this.trainCarurl = "../../../static/img/authentication/up2.png"
+				}
+			},
+			//船运展开显示
+			shipping() {
+				this.shipShow = !this.shipShow
+				if (this.shipShow) {
+					this.shipurl = "../../../static/img/authentication/down2@2x.png"
+				} else {
+					this.shipurl = "../../../static/img/authentication/up2.png"
+				}
+			},
+			//集装箱船展开显示
+			containerchange() {
+				this.containerShow = !this.containerShow
+				if (this.containerShow) {
+					this.containerUrl = "../../../static/img/authentication/down2@2x.png"
+				} else {
+					this.containerUrl = "../../../static/img/authentication/up2.png"
+				}
+			},
+
+			dateChange(e, num) {
+				this.sendCar[num].loadingDate = e.year + "-" + e.month + "-" + e.day
+			},
+			dateChange1(e, num) {
+				this.huoYun[num].loadingDate = e.year + "-" + e.month + "-" + e.day
+			},
+			dateChange2(e, num) {
+				this.looseShip[num].loadingDate = e.year + "-" + e.month + "-" + e.day
+			},
+			dateChange3(e, num) {
+				this.container[num].loadingDate = e.year + "-" + e.month + "-" + e.day
+			},
+			//完货
+			finishedgoods() {
+				for(let i = 0 ; i < this.detailData.tranCarInfoList1.length;i++){
+					if(this.detailData.tranCarInfoList1[i].status != "已送达" ){
+						this.$api.msg("请完成所有的汽运收货反馈!")
+						return
+					}
+				}
+				for(let i = 0 ; i < this.detailData.tranCarInfoList2.length;i++){
+					if(this.detailData.tranCarInfoList2[i].status != "已送达"){
+						this.$api.msg("请完成所有的火运收货反馈!")
+						return
+					}
+				}
+				for(let i = 0 ; i < this.detailData.tranCarInfoList3.length;i++){
+					if(this.detailData.tranCarInfoList3[i].status != "已送达"){
+						this.$api.msg("请完成所有的散船收货反馈!")
+						return
+					}
+				}
+				for(let i = 0 ; i < this.detailData.tranCarInfoList4.length;i++){
+					if(this.detailData.tranCarInfoList4[i].status != "已送达"){
+						this.$api.msg("请完成所有的集装箱船收货反馈!")
+						return
+					}
+				}
+				var that = this
+				uni.showModal({
+					content: "完货操作后,卸车信息不可修改,是否确定完货?",
+					success(res) {
+						if (res.confirm) {
+							let complete = {}
+							complete.id = that.id
+							that.$api.doRequest('post', '/tranProcessInfo/api/editReceivingStatus', complete).then(res => {
+								if (res.data.code == 200) {
+									that.sendCar.splice(index, 1)
+									that.$api.msg("提交成功")
+									setTimeout(() => {
+										uni.navigateBack()
+									}, 1000)
+								} else {
+									that.$api.msg(res.data.message)
+								}
+							})
+						}
+					}
+				})
+			},
+			//添加
+			add(index) {
+				if (index == 1) {
+					let _a = []
+					this.sendCar.push({
+						tranCarNo: "",
+						carNo: "",
+						caseNo: "",
+						caseNoOther: "",
+						titleNo: "",
+						titleNoOther: "",
+						loadNetWeight: "",
+						loadingDate: "",
+					})
+				} else if (index == 2) {
+					this.huoYun.push({
+						carNo: "",
+						boxNo1: "",
+						boxNo2: "",
+						loadNetWeight: "",
+						loadingDate: "",
+					})
+				} else if (index == 3) {
+					this.looseShip.push({
+						shipName: "",
+						shipNo: "",
+						loadNetWeight: "",
+						loadingDate: "",
+					})
+				} else if (index == 4) {
+					this.container.push({
+						caseNo: "",
+						titleNo: "",
+						loadNetWeight: "",
+						loadingDate: "",
+					})
+				}
+			},
+			// 删除
+			del(num, index) {
+				var that = this
+				uni.showModal({
+					content: "确定删除反馈信息?",
+					success(res) {
+						if (res.confirm) {
+							if (num == 1) {
+								that.sendCar.splice(index, 1)
+								// array.splice(start,delCount);//从start的位置开始向后删除delCount个元素
+							} else if (num == 2) {
+								that.huoYun.splice(index, 1)
+							} else if (num == 3) {
+								that.loadingDate.splice(index, 1)
+							} else if (num == 4) {
+								that.container.splice(index, 1)
+							}
+						}
+					}
+				})
+
+			},
+			//保存
+			pass(num, index) {
+				var that = this
+				uni.showModal({
+					content: "确定保存反馈信息?",
+					success(res) {
+						if (res.confirm) {
+							let _pro = {}
+							_pro.id = that.id
+							_pro.infoId = that.detailData.infoId
+							_pro.contractNo = that.detailData.contractNo
+							if (num == 1) {
+								_pro.tranCarInfoList1 = [that.detailData.tranCarInfoList1[index]]
+								_pro.threeTranType = "汽运"
+								that.$api.doRequest('post', '/tranProcessInfo/api/addTranCar', _pro).then(res => {
+									if (res.data.code == 200) {
+										that.$api.msg("保存成功")
+										that.getList()
+									} else {
+										that.$api.msg(res.data.message)
+									}
+								})
+							} else if (num == 2) {
+								_pro.tranCarInfoList2 = [that.detailData.tranCarInfoList2[index]]
+								_pro.threeTranType = "火运"
+								that.$api.doRequest('post', '/tranProcessInfo/api/addTranCar', _pro).then(res => {
+									if (res.data.code == 200) {
+										that.$api.msg("保存成功")
+										that.getList()
+									} else {
+										that.$api.msg(res.data.message)
+									}
+								})
+							} else if (num == 3) {
+								_pro.tranCarInfoList3 = [that.detailData.tranCarInfoList3[index]]
+								_pro.threeTranType = "散船"
+								that.$api.doRequest('post', '/tranProcessInfo/api/addTranCar', _pro).then(res => {
+									if (res.data.code == 200) {
+										that.$api.msg("保存成功")
+										that.getList()
+									} else {
+										that.$api.msg(res.data.message)
+									}
+								})
+							} else if (num == 4) {
+								_pro.tranCarInfoList4 = [that.detailData.tranCarInfoList4[index]]
+								_pro.threeTranType = "集装箱船"
+								that.$api.doRequest('post', '/tranProcessInfo/api/addTranCar', _pro).then(res => {
+									if (res.data.code == 200) {
+										that.$api.msg("保存成功")
+										that.getList()
+									} else {
+										that.$api.msg(res.data.message)
+									}
+								})
+							}
+						}
+					}
+				})
+			},
+			getList() {
+				this.$api.doRequest('get', '/tranProcessInfo/getThreeTranProcess', {
+					id: this.id
+				}).then(res => {
+					if (res.data.code == 200) {
+						this.detailData = res.data.data
+						this.sendCarList = this.detailData.tranCarInfoList1.length
+						this.trainCarList = this.detailData.tranCarInfoList2.length
+						this.shipList = this.detailData.tranCarInfoList3.length
+						this.containerList = this.detailData.tranCarInfoList4.length
+					}
+				})
+			},
+			filterFileType(index, lists) {
+				if (lists[index].fileType != 'jpg' && lists[index].fileType != 'png' && lists[index].fileType != 'gif') {
+					lists.splice(index, 1);
+					// 当前文件不支持
+					uni.showModal({
+						title: '暂不支持当前图片类型',
+						showCancel: false
+					});
+				} else {
+					this.isAdd = false;
+				}
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	uni-page-body {
+		overflow: hidden;
+	}
+
+	.content {
+		margin: 10px 0;
+	}
+
+	.wrap {
+		margin: 10rpx;
+		padding: 20rpx 20rpx 300rpx 20rpx;
+
+		.top {
+			display: flex;
+			margin-bottom: 20rpx;
+
+			.top-left {
+				margin-right: 20rpx;
+			}
+		}
+	}
+
+	.bottom-btn {
+		width: 100%;
+		position: fixed;
+		bottom: 0;
+		display: flex;
+		z-index: 2;
+		left: 0;
+		background-color: #f8f8f8;
+		flex-direction: column;
+
+		.btn1,
+		.btn2 {
+			width: 100%;
+			margin-bottom: 26rpx;
+			border-radius: 90rpx;
+		}
+
+		.btn1 {
+			background: white;
+			color: #00C265;
+		}
+	}
+
+	.content,
+	.content1,
+	.content2 {
+		border-radius: 20rpx;
+		background: white;
+		padding: 20rpx;
+
+		.title {
+			font-size: 28rpx;
+			// font-weight: 600;
+			color: #333333;
+		}
+
+		.row {
+			display: flex;
+			justify-content: space-between;
+			// border-bottom: 1px solid #EEEEEE;
+			padding: 20rpx 0;
+
+			.right,
+			input {
+				font-size: 28rpx;
+				color: #333333;
+			}
+		}
+
+		.row-bottom {
+
+			// border: 0;
+			.right-bottom {
+				width: 280rpx;
+				text-align: right;
+			}
+		}
+	}
+
+	.content1 {
+		margin-top: 20rpx;
+	}
+
+	.content2 {
+		margin-top: 10px;
+		// display: flex;
+		align-items: center;
+
+		.left {
+			margin-right: 20px;
+		}
+	}
+
+
+
+	.edit-btn {
+		background: #22C572;
+		width: 100rpx;
+		height: 50rpx;
+		margin: 0;
+		color: white;
+	}
+
+	.has-btn {
+		align-items: center;
+	}
+
+
+	.shade {
+		background: #000;
+		position: fixed;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		z-index: 10000;
+	}
+
+	.pound_list {
+		width: 452rpx;
+		display: flex;
+		justify-content: flex-end;
+		text-align: right;
+	}
+
+
+	.c-row {
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: flex;
+		-webkit-box-align: center;
+		-webkit-align-items: center;
+		align-items: center;
+		padding: 10rpx;
+		position: relative;
+	}
+
+	.con-list {
+		-webkit-box-flex: 1;
+		-webkit-flex: 1;
+		flex: 1;
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: flex;
+		-webkit-box-orient: vertical;
+		-webkit-box-direction: normal;
+		-webkit-flex-direction: column;
+		flex-direction: column;
+		color: #303133;
+		line-height: 40rpx;
+		text-align: right;
+		padding-right: 20rpx;
+	}
+
+	.add_css {
+		width: 50%;
+		display: flex;
+		justify-content: flex-end;
+
+		.add {
+			padding: 10rpx 20rpx;
+			background-color: #5ac725;
+			border-radius: 6rpx;
+			color: #FFFFFF;
+			line-height: 40rpx;
+		}
+	}
+
+	.open_css {
+		width: 36rpx;
+		height: 20rpx;
+		// top: 4rpx;
+	}
+
+	.title_css {
+		margin-bottom: 20rpx;
+
+		.head_css {
+			margin-left: 20rpx;
+			width: 50%;
+			line-height: 40rpx;
+			margin-bottom: 30rpx;
+		}
+	}
+</style>

+ 0 - 0
static/img/authentication/up2 (2).png → static/img/authentication/up2.png