Sfoglia il codice sorgente

Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

ccjgmwz 3 anni fa
parent
commit
581c054bed

+ 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": "开通服务",

+ 0 - 1
pages/erp/deliveryfeedback/details.vue

@@ -378,7 +378,6 @@
 					{
 						imgUrl:[],
 					}
-					
 				],
 				feedbackFlag:1,
 				detailData:{},

+ 11 - 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,15 @@
 				this.getList()
 			},
 			goDetail(val) {
-				uni.navigateTo({
+				if(val.tranType == "他运"){
+					uni.navigateTo({
+						url: `/pages/erp/deliveryfeedback/otherfeedback?id=${val.id}&status=${val.feedbackStatus}`,
+					})
+				}else{
+					uni.navigateTo({
 					url: '/pages/erp/deliveryfeedback/details?id=' + val.id,
-				})
+				    })
+				}	
 			}
 		}
 	}

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

@@ -0,0 +1,1033 @@
+<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" v-if="status == '执行中'">添加</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" type="digit"></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" type="digit"></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" type="digit"></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" type="digit"></input>
+					</view>
+				</view>
+				<!-- 装车净重 -->
+				<view class="c-row">
+					<view class="title">装车净重(吨)</view>
+					<view class="con-list">
+						<input v-model='v_item.loadNetWeight' placeholder="请输入净重" name="input" type="digit"></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" class="con-list" @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" v-if="status == '执行中'">添加</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" type="digit"></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" type="digit"></input>
+					</view>
+				</view>
+				<!-- 装车净重 -->
+				<view class="c-row">
+					<view class="title">装车净重(吨)</view>
+					<view class="con-list">
+						<input v-model='item_add1.loadNetWeight' placeholder="请输入净重" name="input" type="digit"></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" v-if="status == '执行中'">添加</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" type="digit"></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" v-if="status == '执行中'">添加</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" type="digit"></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" type="digit"></input>
+					</view>
+				</view>
+				<!-- 装船日期 -->
+				<view class="c-row">
+					<view class="title">装船净重(吨)</view>
+					<view class="con-list">
+						<input v-model='item_add4.loadNetWeight' placeholder="请输入装船净重" name="input" type="digit"></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" :disabled="status != '执行中'">完货</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: '',
+				status:"",
+				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
+			this.status = options.status
+		},
+		onShow() {
+			this.getList()
+		},
+		computed: {},
+		methods: {
+			qiehuan(){
+				this.show = !this.show
+			},
+			//汽运展开显示
+			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 (that.sendCarList) {
+									that.count = Number(that.sendCarList) 
+								} else {
+									that.count = 0
+								}
+								for (var i = 0; i < that.sendCar.length; i++) {
+									if (that.count < 10) {
+										that.sendCar[i].tranCarNo = "C00" + (that.count+1)
+									} 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[index].boxNo1 + "," + that.huoYun[index].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
+						if(this.detailData.tranCarInfoList1){
+							this.sendCarList = this.detailData.tranCarInfoList1.length
+						    this.count = this.detailData.tranCarInfoList1.length
+						}
+						if(this.detailData.tranCarInfoList2){
+							this.trainCarList = this.detailData.tranCarInfoList2.length
+							for(var i = 0 ; i < this.detailData.tranCarInfoList2.length; i++){
+								this.detailData.tranCarInfoList2[i].boxNo1=this.detailData.tranCarInfoList2[i].boxNo.split(",")[0]
+								this.detailData.tranCarInfoList2[i].boxNo2=this.detailData.tranCarInfoList2[i].boxNo.split(",")[1]
+							}	
+							}
+						if(this.detailData.tranCarInfoList3){this.shipList = this.detailData.tranCarInfoList3.length}
+						if(this.detailData.tranCarInfoList4){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>

+ 6 - 6
pages/erp/exWarehousing/exWarehousing.vue

@@ -120,23 +120,23 @@
 			<view v-if='detailData.outType=="集装箱船"||!detailData.outType||detailData.outType=="汽运"'
 				class="row row-bottom">
 				<view class="left">箱号</view>
-				<input v-model='detailData.boxNo' class="right-bottom" placeholder="请输入箱号"></input>
-				<input v-model='detailData.boxNoOther' class="right-bottom"
+				<input v-model='detailData.boxNo' class="right-bottom" placeholder="请输入箱号" type="digit"></input>
+				<input v-model='detailData.boxNoOther' class="right-bottom" type="digit"
 					placeholder="请输入箱号"></input>
 			</view>
 			<view v-if='!detailData.outType||detailData.outType=="汽运" || detailData.outType=="集装箱船"' class="row row-bottom">
 				<view class="left">封号</view>
 				<input v-model='detailData.titleNo' class="right-bottom"
-					placeholder="请输入封号"></input>
+					placeholder="请输入封号" type="digit"></input>
 				<input v-model='detailData.titleNoOther' class="right-bottom"
-					placeholder="请输入封号"></input>
+					placeholder="请输入封号" type="digit"></input>
 			</view>
 			<view v-if='detailData.outType=="火运"' class="row row-bottom">
 				<view class="left">车厢号</view>
 				<input v-model='detailData.wingNumber' @input="toUpperCase2" class="right-bottom"
-					placeholder="请输入车厢号"></input>
+					placeholder="请输入车厢号" type="digit"></input>
 				<input v-model='detailData.wingNumberOther' @input="toUpperCase3" class="right-bottom"
-					placeholder="请输入车厢号"></input>
+					placeholder="请输入车厢号" type="digit"></input>
 			</view>
 			<view v-if='detailData.outType=="散船"' class="row row-bottom">
 				<view class="left">航次</view>

+ 7 - 7
pages/erp/improvedExWaehousing/improvedExWaehousingDetail.vue

@@ -59,7 +59,7 @@
 			</view>
 			<view class="row row-bottom" v-if="detailData.type == '潮粮'">
 				<view class="left">纯重(吨)</view>
-				<input v-model='detailData.pureWeight' class="right-bottom" placeholder="不可编辑,自动计算"></input>
+				<input v-model='detailData.pureWeight' class="right-bottom" placeholder="不可编辑,自动计算" type="digit"></input>
 			</view>
 			<view class="row">
 				<view class="left">品级</view>
@@ -107,22 +107,22 @@
 			<view v-if='detailData.outType=="集装箱船"||!detailData.outType||detailData.outType=="汽运"'
 				class="row row-bottom">
 				<view class="left">箱号</view>
-				<input v-model='detailData.boxNo'  class="right-bottom" placeholder="请输入箱号"></input>
-				<input v-model='detailData.boxNoOther' class="right-bottom"
+				<input v-model='detailData.boxNo'  class="right-bottom" placeholder="请输入箱号" type="digit"></input>
+				<input v-model='detailData.boxNoOther' class="right-bottom" type="digit"
 					placeholder="请输入箱号"></input>
 			</view>
 			<view v-if='!detailData.outType||detailData.outType=="汽运"' class="row row-bottom">
 				<view class="left">封号</view>
-				<input v-model='detailData.titleNo' class="right-bottom"
+				<input v-model='detailData.titleNo' class="right-bottom" type="digit"
 					placeholder="请输入封号"></input>
-				<input v-model='detailData.titleNoOther' class="right-bottom"
+				<input v-model='detailData.titleNoOther' class="right-bottom" type="digit"
 					placeholder="请输入封号"></input>
 			</view>
 			<view v-if='detailData.outType=="火运"' class="row row-bottom">
 				<view class="left">车厢号</view>
-				<input v-model='detailData.wingNumber' @input="toUpperCase2" class="right-bottom"
+				<input v-model='detailData.wingNumber' @input="toUpperCase2" class="right-bottom" type="digit"
 					placeholder="请输入车厢号"></input>
-				<input v-model='detailData.wingNumberOther' @input="toUpperCase3" class="right-bottom"
+				<input v-model='detailData.wingNumberOther' @input="toUpperCase3" class="right-bottom" type="digit"
 					placeholder="请输入车厢号"></input>
 			</view>
 			<view v-if='detailData.outType=="散船"' class="row row-bottom">

+ 7 - 8
pages/erp/improvedWrehousing/improvedWrehousingDetail.vue

@@ -67,7 +67,7 @@
 			</view>
 			<view class="row row-bottom" v-if="detailData.type=='潮粮'">
 				<view class="left">纯重(吨)</view>
-				<input type="number" @input='calculate' v-model='detailData.pureWeight' class="right-bottom" placeholder="不可编辑,自动计算"
+				<input type="digit" @input='calculate' v-model='detailData.pureWeight' class="right-bottom" placeholder="不可编辑,自动计算"
 					:disabled="true"></input>
 			</view>
 			<view class="row">
@@ -124,21 +124,20 @@
 			<view v-if='detailData.outType=="集装箱船"||!detailData.outType||detailData.outType=="汽运"'
 				class="row row-bottom">
 				<view class="left">箱号</view>
-				<input v-model='detailData.boxNo' class="right-bottom" placeholder="请输入箱号"></input>
-				<input v-model='detailData.boxNoOther' class="right-bottom"
-					placeholder="请输入箱号"></input>
+				<input v-model='detailData.boxNo' class="right-bottom" placeholder="请输入箱号" type="digit"></input>
+				<input v-model='detailData.boxNoOther' class="right-bottom" placeholder="请输入箱号" type="digit"></input>
 			</view>
 			<view v-if='!detailData.outType||detailData.outType=="汽运" || detailData.outType=="集装箱船"' class="row row-bottom">
 				<view class="left">封号</view>
 				<input v-model='detailData.titleNo' class="right-bottom"
-					placeholder="请输入封号"></input>
+					placeholder="请输入封号" type="digit"></input>
 				<input v-model='detailData.titleNoOther' class="right-bottom"
-					placeholder="请输入封号"></input>
+					placeholder="请输入封号" type="digit"></input>
 			</view>
 			<view v-if='detailData.outType=="火运"' class="row row-bottom">
 				<view class="left">车厢号</view>
-				<input v-model='detailData.boxNo' @input="toUpperCase" class="right-bottom" placeholder="请输入车厢号"></input>
-				<input v-model='detailData.boxNoOther' @input="toUpperCase1" class="right-bottom" placeholder="请输入车厢号"></input>
+				<input v-model='detailData.boxNo' @input="toUpperCase" class="right-bottom" placeholder="请输入车厢号" type="digit"></input>
+				<input v-model='detailData.boxNoOther' @input="toUpperCase1" class="right-bottom" placeholder="请输入车厢号" type="digit"></input>
 			</view>
 			<view v-if='detailData.outType=="散船"' class="row row-bottom">
 				<view class="left">仓位号</view>

+ 14 - 7
pages/erp/receivingfeedback/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,12 +27,13 @@
 					<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='flex:1;color:#9698A2;' class="left">运输周期</view>
+				<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>
 				<view style='font-size:14px;' class="row">
-					<view style='flex:1;color:#9698A2;' class="left">{{item.feedbackStatus}}</view>
+					<view style='flex:1;color:#9698A2;' class="left" v-if="item.tranType != '他运'">{{item.feedbackStatus}}</view>
+					<view style='flex:1;color:#9698A2;' class="left" v-else>{{item.receivingStatus}}</view>
 					<view style='flex:2;text-align:right;'>{{item.createDate}}</view>
 				</view>
 			</view>
@@ -95,7 +97,6 @@
 					pageSize: this.pageSize
 				}).then(res => {
 					if (res.data.code == 200) {
-						console.log(this.flag)
 						if(this.flag=='1'){
 							var data=res.data.data.records
 							this.dataList = this.dataList.concat(data)
@@ -117,9 +118,15 @@
 				this.getList()
 			},
 			goDetail(val) {
-				uni.navigateTo({
+				if(val.tranType == "他运"){
+					uni.navigateTo({
+					url: `/pages/erp/receivingfeedback/otherfeedback?id=${val.id}&status=${val.receivingStatus}` ,
+					})
+				}else{
+					uni.navigateTo({
 					url: '/pages/erp/receivingfeedback/details?id=' + val.id,
-				})
+				    })
+				}
 			}
 		}
 	}

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

@@ -0,0 +1,664 @@
+<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>
+			
+			<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.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" type="digit"></input>
+					</view>
+				</view>
+				<view class="flex">
+					<!-- <u-button @click='pass(1,index)' type="success" v-if="item.status != '已送达'" hover-class='none'>保存</u-button> -->
+					 <view class="btn" @click='pass(1,index)' v-if="item.status != '已送达'">保存</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>
+			<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" type="digit"></input>
+					</view>
+				</view>
+				<view class="flex">
+					<!-- <u-button @click='pass(2,index)' v-if="item.status != '已送达'" type="success" hover-class='none'>保存</u-button> -->
+				    <view class="btn" @click='pass(2,index)'v-if="item.status != '已送达'">保存</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>
+			<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" type="digit"></input>
+					</view>
+				</view>
+				<view class="flex">
+					<!-- <u-button @click='pass(3,index)' type="success" v-if="item.status != '已送达'" hover-class='none'>保存</u-button> -->
+				    <view class="btn" @click='pass(3,index)'v-if="item.status != '已送达'">保存</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>
+			<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" type="digit"></input>
+					</view>
+				</view>
+				<view class="flex">
+					<!-- <u-button @click='pass(4,index)' type="success" v-if="item.status != '已送达'" hover-class='none'>保存</u-button> -->
+					<view class="btn" @click='pass(4,index)'v-if="item.status != '已送达'">保存</view>
+				</view>
+			</view>
+		</view>
+		<view style='padding:10px;' class='flex bottom-btn'>
+			<u-button @click='finishedgoods' type="success" class="btn2" :disabled="statusAll != '执行中'">完货</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: '',
+				statusAll:"",
+				currentPage: 1,
+				pageSize: 10,
+				maxSize: 50 * 1024 * 1024,
+				status: '执行中',
+				params: {
+					year: true,
+					month: true,
+					day: true,
+				},
+				action: this.$uploadUrl, //磅单上传地址
+				detailData: {},
+				show: false,
+				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
+		    this.statusAll = options.status
+		},
+		onShow() {
+			this.getList()
+		},
+		computed: {},
+		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"
+				}
+			},
+			//完货
+			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)
+								}
+							})
+						}
+					}
+				})
+			},
+			//保存
+			pass(num, index) {
+				if(num == 1){
+					if(!this.detailData.tranCarInfoList1[index].unloadNetWeight || this.detailData.tranCarInfoList1[index].unloadNetWeight == 0){
+						this.$api.msg("请输入卸车净重")
+						return
+					}	
+				}
+				if(num == 2){
+					if(!this.detailData.tranCarInfoList2[index].unloadNetWeight || this.detailData.tranCarInfoList2[index].unloadNetWeight == 0){
+						this.$api.msg("请输入卸车净重")
+						return
+					}	
+				}
+				if(num == 3){
+					if(!this.detailData.tranCarInfoList3[index].unloadNetWeight || this.detailData.tranCarInfoList3[index].unloadNetWeight == 0){
+						this.$api.msg("请输入卸船净重")
+						return
+					}	
+				}
+				if(num == 4){
+					if(!this.detailData.tranCarInfoList4[index].unloadNetWeight || this.detailData.tranCarInfoList4[index].unloadNetWeight == 0){
+						this.$api.msg("请输入卸船净重")
+						return
+					}	
+				}
+				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
+						if(this.detailData.tranCarInfoList1){this.sendCarList = this.detailData.tranCarInfoList1.length}
+						if(this.detailData.tranCarInfoList2){this.trainCarList = this.detailData.tranCarInfoList2.length}
+						if(this.detailData.tranCarInfoList3){this.shipList = this.detailData.tranCarInfoList3.length}
+						if(this.detailData.tranCarInfoList4){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;
+	}
+	.btn{
+		padding: 10rpx 60rpx;
+		border-radius: 40rpx;
+		color: #FFFFFF;
+		line-height: 46rpx;
+		margin: 0 auto;
+		background-color: #5ac725;
+	}
+
+	.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>

+ 7 - 7
pages/erp/warehousing/warehousing.vue

@@ -72,7 +72,7 @@
 			</view>
 			<view class="row row-bottom" v-if="detailData.type=='潮粮'">
 				<view class="left">纯重(吨)</view>
-				<input type="number" @input='calculate' v-model='detailData.pureWeight' class="right-bottom"
+				<input type="digit" @input='calculate' v-model='detailData.pureWeight' class="right-bottom"
 					placeholder="不可编辑,自动计算" :disabled="true"></input>
 			</view>
 			<view class="row">
@@ -130,22 +130,22 @@
 			<view v-if='detailData.outType=="集装箱船"||!detailData.outType||detailData.outType=="汽运"'
 				class="row row-bottom">
 				<view class="left">箱号</view>
-				<input v-model='detailData.boxNo' class="right-bottom" placeholder="请输入箱号"></input>
-				<input v-model='detailData.boxNoOther' class="right-bottom" placeholder="请输入箱号"></input>
+				<input v-model='detailData.boxNo' class="right-bottom" placeholder="请输入箱号" type="digit"></input>
+				<input v-model='detailData.boxNoOther' class="right-bottom" placeholder="请输入箱号" type="digit"></input>
 			</view>
 			<view v-if='!detailData.outType||detailData.outType=="汽运" || detailData.outType=="集装箱船"' class="row row-bottom">
 				<view class="left">封号</view>
 				<input v-model='detailData.titleNo'  class="right-bottom"
-					placeholder="请输入封号"></input>
+					placeholder="请输入封号" type="digit"></input>
 				<input v-model='detailData.titleNoOther' class="right-bottom"
-					placeholder="请输入封号"></input>
+					placeholder="请输入封号" type="digit"></input>
 			</view>
 			<view v-if='detailData.outType=="火运"' class="row row-bottom">
 				<view class="left">车厢号</view>
 				<input v-model='detailData.wingNumber' @input="toUpperCase2" class="right-bottom"
-					placeholder="请输入车厢号"></input>
+					placeholder="请输入车厢号" type="digit"></input>
 				<input v-model='detailData.wingNumberOther' @input="toUpperCase3" class="right-bottom"
-					placeholder="请输入车厢号"></input>
+					placeholder="请输入车厢号" type="digit"></input>
 			</view>
 			<view v-if='detailData.outType=="散船"' class="row row-bottom">
 				<view class="left">仓位号</view>

+ 3 - 1
pages/erpbusiness/add_quality_testing.vue

@@ -65,7 +65,7 @@
 			<view class="c-row ">
 				<view class="title">囤位号</view>
 				<view class="con-list">
-					<input type='number' v-model='gridList.storageTagNo' placeholder="请输入囤位号" name="input"></input>
+					<input type="digit" v-model='gridList.storageTagNo' placeholder="请输入囤位号" name="input"></input>
 				</view>
 			</view>
 			<view class="c-row ">
@@ -308,6 +308,7 @@
 					//点击登记客户
 					this.gridList.customerName = _customerInfo.shipperName
 					this.gridList.customerPhone = _customerInfo.shipperPhone
+					this.gridList.carNumber=uni.getStorageSync('carNo')
 				} else {
 					//点击搜索客户
 					this.gridList.customerName = _customerInfo.customerName
@@ -610,6 +611,7 @@
 					this.gridList.type = '潮粮'
 					this.edit = true
 				} else {
+					this.gridList.type = '干粮'
 					this.edit = false
 				}
 				this.gridList.goodsName = this.goodsList[e[0]].goodsName

+ 3 - 3
pages/erpbusiness/customer.vue

@@ -32,7 +32,7 @@
 			<view style='padding-left:20px;color:#AFB3BF;font-size:14px;' v-if='show==false'>登记客户</view>
 
 			<view v-for='item in registeredCustomer'>
-				<view class="dj-customer" @click="registeredCustomerClick(item)" v-for="(item1,index) in item.carList">
+				<view class="dj-customer" v-for="(item1,index) in item.carList" @click="registeredCustomerClick(item,item1)">
 					<view class="left">{{item1}}</view>
 					<view class="right">
 						<view class="span1">{{item.shipperName}}(货)</view>
@@ -191,8 +191,8 @@
 				}
 
 			},
-			registeredCustomerClick(item){
-			
+			registeredCustomerClick(item,item1){
+			uni.setStorageSync('carNo', item1)
 			uni.setStorageSync('checkcustomer', item)
 				if (this.recentCustomers.length == 0) {
 					this.recentCustomers.push(item)

+ 55 - 34
pages/erpbusiness/edit_quality_testing.vue

@@ -97,7 +97,7 @@
 					<input v-model='gridList.dryGrainPrice' placeholder="请输入干粮单价" name="input"></input>
 				</view>
 			</view>
-			<view class="c-row-fj" v-if="flag==1">
+			<view class="c-row-fj" v-if="flag==2">
 				<view style="margin: 0px 0px 30rpx 10rpx;">复检备注</view>
 					<textarea class='textarea-style' v-model='gridList.reMemo' placeholder="请输入复检备注" maxlength="300"></textarea>
 			</view>
@@ -105,7 +105,11 @@
 		</view>
 		<view style='padding-bottom:300rpx;'>
 			<view class='wrap'>
-				<view class='title_b'>化验信息</view>
+				<view style='margin-right:10px;' class='flex justify-between align-item-center'>
+					<view class='title_b'>化验信息</view>
+					<u-switch v-if='flag!=1' v-model="value" @change="change"></u-switch>
+				</view>
+				
 
 				<view class="c-row ">
 					<view class="title">等级</view>
@@ -166,7 +170,7 @@
 		</view>
 
 		<view class="footer">
-			<view @click='confirmInfo' class="button">确认初检信息</view>
+			<view v-if='!value&&flag==1' @click='confirmInfo' class="button">确认初检信息</view>
 			<view @click='submit' class="button">提交</view>
 		</view>
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
@@ -228,6 +232,7 @@
 				showTran: true,
 				companyId: 1,
 				current: 4,
+				value:false,
 				gradeList: [{
 						key: 1,
 						value: '一等品'
@@ -288,12 +293,18 @@
 			this.managementType = options.managementType
 		},
 		onShow() {
+			console.log(this.flag)
 			var that = this
 			this.$api.doRequest('get', '/qualityInspectionManagement/api/getQualityInspection', {
 				id: this.id
 			}).then(res => {
 				if (res.data.data) {
 					let data = res.data.data
+					if(data.supplementaryRecording==1){
+						that.value=true
+					}else{
+						that.value=false
+					}
 					that.gridList = data
 					that.$api.doRequest('get', '/warehouseBaseInfo/getWarehouse', {
 						id: this.cangid
@@ -315,6 +326,14 @@
 			this.gridList.gradeKey = this.gradeList[0].key
 		},
 		methods: {
+			change(e){
+				if(e){
+					this.gridList.supplementaryRecording=1
+				}else{
+					this.gridList.supplementaryRecording=0
+				}
+				
+			},
 			confirmInfo() {
 				this.isShowAlert = true	
 			},
@@ -452,37 +471,39 @@
 					this.$api.msg('购粮性质不能为空')
 					return
 				}
-				if (!this.gridList.grade) {
-					this.$api.msg('等级不能为空')
-					return
-				}
-				if (!this.gridList.impurity) {
-					this.$api.msg('杂质不能为空')
-					return
-				}
-				if (!this.gridList.waterContent) {
-					this.$api.msg('初检水分不能为空')
-					return
-				}
-				// if (!this.gridList.reWaterContent) {
-				// 	this.$api.msg('复检水分不能为空')
-				// 	return
-				// }
-				if (!this.gridList.mildewGrain) {
-					this.$api.msg('霉变粒不能为空')
-					return
-				}
-				if (!this.gridList.bulkDensity) {
-					this.$api.msg('容重不能为空')
-					return
-				}
-				if (!this.gridList.jiaorenli) {
-					this.$api.msg('热损伤不能为空')
-					return
-				}
-				if (!this.gridList.imperfectGrain) {
-					this.$api.msg('不完整粒不能为空')
-					return
+				if(this.value==false){
+					if (!this.gridList.grade) {
+						this.$api.msg('等级不能为空')
+						return
+					}
+					if (!this.gridList.impurity) {
+						this.$api.msg('杂质不能为空')
+						return
+					}
+					if (!this.gridList.waterContent) {
+						this.$api.msg('初检水分不能为空')
+						return
+					}
+					// if (!this.gridList.reWaterContent) {
+					// 	this.$api.msg('复检水分不能为空')
+					// 	return
+					// }
+					if (!this.gridList.mildewGrain) {
+						this.$api.msg('霉变粒不能为空')
+						return
+					}
+					if (!this.gridList.bulkDensity) {
+						this.$api.msg('容重不能为空')
+						return
+					}
+					if (!this.gridList.jiaorenli) {
+						this.$api.msg('热损伤不能为空')
+						return
+					}
+					if (!this.gridList.imperfectGrain) {
+						this.$api.msg('不完整粒不能为空')
+						return
+					}
 				}
 				uni.showModal({
 					content: "确定提交质检信息?",

+ 9 - 5
pages/erpbusiness/quality_testing.vue

@@ -29,12 +29,16 @@
 			<view class="item-style" v-for='item in gridList' @click='examine(item)'>
 				<view class="row1">
 					<view class="row1-left">
-						<view class="left status1" v-if="item.status=='已质检'">检</view>
-						<view class="left status2" v-if="item.status=='已称皮重'">皮</view>
-						<view class="left status3" v-if="item.status=='已称毛重'">毛</view>
-						<view class="left status1" v-if="item.status=='已初检'">初</view>
-						<view class="left status2" v-if="item.status=='已复检'&&item.confirm!='1'">复</view>
 						<view class="left status3" v-if="item.confirm=='1'">确</view>
+						<view v-else>
+							<view class="left status1" v-if="item.status=='已质检'">检</view>
+							<view class="left status2" v-if="item.status=='已称皮重'">皮</view>
+							<view class="left status3" v-if="item.status=='已称毛重'">毛</view>
+							<view class="left status1" v-if="item.status=='已初检'">初</view>
+							<view class="left status2" v-if="item.status=='已复检'">复</view>
+							<view class="left status3" v-if="item.confirm=='1'">确</view>
+						</view>
+						
 						<view>
 							<view class="top-title">
 								<view v-if='managementType==1'>{{item.qualityNo}}</view>

+ 33 - 2
pages/sale/plant.vue

@@ -10,11 +10,26 @@
 			</view>
 			<view class="guess-list">
 				<view class="guess-list-item" v-for="(item, index) in newsInfo" :key="index">
-					<view class="guess-item-item">
+					<view class="flex-item">
 						<view class='factory Medium'>{{item.factory}}</view>
 						<view class='wrap Regular'>{{item.city}} {{item.factoryType}}</view>
 					</view>
 					<view class="flex-item">
+						<!-- <view class='price NumberBold'>{{item.price}}</view>
+						<view class='wrap Regular'>
+							<text style='margin-right:5px;'>
+								<image style='width:11px;height:11px;'
+									src='../../static/img/homepage/water@3x.png'>
+								</image>
+								<={{item.waterContent}}</text>
+									<text>
+										<image style='width:11px;height:11px;'
+											src='../../static/img/homepage/unitweight@3x.png'></image>
+										>={{item.bulkDensity}}
+									</text>
+						</view>
+					</view> -->
+					<!-- <view class='price NumberBold guess-item-item'>{{item.price}}</view> -->
 					<view class='price NumberBold guess-item-item'>{{item.price}}</view>
 					<view class='wrap Regular'>
 						<text style='margin-right:5px;'>
@@ -512,7 +527,23 @@
 			justify-content: flex-end;
 		}
 	}
-
+	
+	.flex-item:nth-of-type(1) {
+		width: 40%;
+		display: flex;
+		flex-direction: column;
+		align-items: flex-start;
+	}
+	
+	.flex-item:nth-of-type(2) {
+		width: 40%;
+	}
+	
+	.flex-item:nth-of-type(3) {
+		width: 20%;
+		display: flex;
+		justify-content: flex-end;
+	}
 	.guess-list {
 		width: 100%;
 

+ 10 - 9
pages/user/depotAcquisition/depotAcquisition.vue

@@ -16,7 +16,7 @@
 		<view class="content1" v-for="(item,index) in dataList" :key="index">
 			<view class="row row1">
 				<view class="title">{{item.warehouseName}}</view>
-				<view class='follow' @click="followClick(item)">{{item.followFlag=='0'?'+关注':'已关注'}}</view>
+				<view class='follow' @click="followClick(item)">{{item.follow=='未关注'?'+关注':'已关注'}}</view>
 			</view>
 			<view class="row2">
 				<view class='position'>
@@ -35,7 +35,7 @@
 				</view>
 			</view>
 			<view class="row4">
-				<view class="time">{{item.createDate}}</view>
+				<view class="time">{{item.updateDate}}</view>
 				<view class="btn"
 					@click='naviageToPage("/pages/user/depotAcquisition/grainDeliveryRegistration?itemValue="+JSON.stringify(item))'>
 					我要送粮
@@ -131,22 +131,21 @@
 					searchKeyWord: this.searchKeyWord,
 					city: this.currentCityName,
 					compId: uni.getStorageSync('pcUserInfo').compId,
-					pageSize: this.pageSize,
-					currentPage: this.currentPage,
 					loginPhone:uni.getStorageSync("userInfo").phone,
 					
 				}).then(res => {
 					if (res.data.code == "200") {
 						if (this.currentCityName == '') this.currentCityName = '全国'
-						this.dataList = res.data.data.records
+						this.dataList = res.data.data
 						this.isLoadMore = true
 						this.loadStatus = 'nomore'
 					}
 				})
 			},
 			followClick(val) {
+				console.log(val)
 				let _url = ''
-				if(val.followFlag==1){
+				if(val.follow=='已关注'){
 					_url = '/acquisitionInfo/api/followNot'
 				}else{
 					_url = '/acquisitionInfo/api/follow'
@@ -154,13 +153,15 @@
 				this.$api.doRequest('post', _url, {
 					id: val.id,
 					commonId: uni.getStorageSync("userInfo").id,
+					loginPhone:uni.getStorageSync("userInfo").phone,
+					warehouseName:val.warehouseName
 				}).then(res => {
 					if (res.data.code == "200") {
-						if (res.data.data == '1') {
-							val.followFlag = '1'
+						if (val.follow == '未关注') {
+							val.follow = '已关注'
 							this.$api.msg('关注成功')
 						} else {
-							val.followFlag = '0'
+							val.follow = '未关注'
 							this.$api.msg('取消关注成功')
 						}
 						this.$forceUpdate()

+ 24 - 18
pages/user/depotAcquisition/grainDeliveryRecord.vue

@@ -6,21 +6,24 @@
 					<view class="left">{{item.warehouseName}}</view>
 					<view class="right">{{item.validityDate}}</view>
 				</view>
-				<view class="hz-content">
-					<view class="row1">
-						<view class="hz-name">
-							{{item.shipperName}}
+				<view v-for="(item1,index) in item.shippingInformationList">
+					<view class="hz-content">
+						<view class="row1">
+							<view class="hz-name">
+								{{item1.shipperName}}
+							</view>
+							<view class="car">
+								({{item1.carList.length}}车)
+							</view>
 						</view>
-						<view class="car">
-							({{item.carList.length}}车)
-						</view>
-					</view>
-					<view class="car-list">
-						<view v-for="(item1,index) in item.carList" class="number">
-							{{item1}}
+						<view class="car-list">
+							<view v-for="(item2,index) in item1.carList" class="number">
+								{{item1.carNo}}
+							</view>
 						</view>
 					</view>
 				</view>
+				
 				<view class="del-row">
 					<view class="del" @click='del(item)'>删除</view>
 				</view>
@@ -101,16 +104,14 @@
 		methods: {
 			getData(size, page, type) {
 				let _obj = {
-					commonId: uni.getStorageSync("userInfo").id,
-					pageSize: size,
-					currentPage: page
+					commonId: uni.getStorageSync("userInfo").id
 				}
 				this.$api.doRequest('get', '/grainDeliveryRegistration/selectGrainDeliveryRegistration', _obj)
 					.then(res => {
 						if (res.data.code == 200) {
 							let curPageData = []
-							for (let i = 0; i < res.data.data.records.length; i++) {
-								let _data = res.data.data.records[i];
+							for (let i = 0; i < res.data.data.length; i++) {
+								let _data = res.data.data[i];
 								//判断是记录是否失效
 								let _isUserd = function() {
 									let _startTime = new Date((_data.validityDate + ' 00:00:00')).getTime();
@@ -121,12 +122,17 @@
 										_data.validityDate = _data.validityDate + ' 0时前有效'
 									}
 								}()
-								let _carNumberList = _data.carNo.split(',')
+								let _carNumberList=[]
+								for (var q = 0; q < _data.shippingInformationList.length; q++) {
+									console.log(_data.shippingInformationList[q])
+									_data.shippingInformationList[q].carList = _data.shippingInformationList[q].carNo.split(',')
+								}
+								
 								let __obj = {
 									warehouseName: _data.warehouseName,
 									id: _data.id,
 									shipperName: _data.shipperName,
-									carList: _carNumberList,
+									shippingInformationList: _data.shippingInformationList,
 									validityDate: _data.validityDate
 
 								}

+ 2 - 2
pages/user/depotAcquisition/grainDeliveryRegistration.vue

@@ -65,10 +65,10 @@
 		</view>
 		<u-button class='submit' @click='submit'>提交</u-button>
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
-			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='登录提示'
+			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
 			showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
 		<u-modal v-model="isShowAlert1" :title-style="{fontSize: '18px',fontWeight:'500'}"
-			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='登录提示'
+			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
 			showCancelButton='false' :content="content1" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
 
 	</view>

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