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

# Conflicts:
#	config/index.js

components/master-keyboard/master-keyboard.scss

@@ -4,7 +4,7 @@
 	position: fixed;
 	bottom: 0;
 	left: 0;
-	z-index:11;
+	z-index:10000;
 	padding-top: 10rpx;
 	padding-bottom: 20rpx;
 	.down_wrap{

config/index.js

@@ -1,7 +1,12 @@
 const dev = {
 	baseUrl: 'https://www.zthymaoyi.com',
 	// baseUrlNew: 'http://192.168.1.119:9100/',
+<<<<<<< HEAD
 	baseUrlNew: 'http://api1.eliangeyun.com/',
+=======
+	baseUrlNew: 'http://192.168.1.117:8090/',
+	// baseUrlNew: 'http://api1.eliangeyun.com/',
+>>>>>>> 56c157c68012d2125a3c26a99453f22c95cf7765
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

pages/erp/exWarehousing/exWarehousing.vue

@@ -107,11 +107,13 @@
 				<view @click='slectCarNo' v-if="isPC">{{detailData.carNo}}</view> -->
 				<view class="left">车牌号</view>
 				<!-- 他运合同车牌号输入 -->
-				<input v-model='detailData.carNo' class="right-bottom" placeholder="请输入车牌号" v-if="!showCar"></input>
+				<input v-model='detailData.carNo' @click.stop="handleShowKeyboard":disabled="true"  class="right-bottom" placeholder="请输入车牌号" v-if="!showCar"></input>
+				<master-keyboard ref="keyboard" keyboardtype="car" :randomNumber="true" :newCar="false" :defaultValue="detailData.carNo" @keyboardClick="handleClick"></master-keyboard>
 				<!-- <view @click='slectCarNo' v-if="isPC">{{detailData.carNo}}</view> -->
 				<!-- 自运合同车牌号需下拉 -->
-				<view v-if="!carno" v-show="showCar" @click="carno = true">
-					{{detailData.carNo?detailData.carNo :"请选择车牌号"}}</view>
+				<view v-show="showCar" @click="carno = true">
+					{{detailData.carNo?detailData.carNo :"请选择车牌号"}}
+				</view>
 				<u-picker :range="carList" range-key="carNo" @confirm='carPicker($event)' v-model="carno"
 					mode="selector">
 				</u-picker>
@@ -210,12 +212,14 @@
 <script>
 	import upload from '@/components/upload.vue';
 	import helper from '@/common/helper.js';
+	import keyboard from "@/components/master-keyboard/master-keyboard.vue";
 	import {
 		mapState
 	} from 'vuex';
 	export default {
 		components: {
-			upload
+			upload,
+			keyboard
 		},
 		data() {
 			return {
@@ -312,6 +316,8 @@
 					gradeKey: "",
 					grossWeight: "",
 					tare: "",
+					tips: '',
+					carNo:''
 				},
 				params: {
 					year: true,
@@ -338,6 +344,10 @@
 			this.cangId = options.cangId
 		},
 		onShow() {
+			uni.showLoading({
+				title:"加载中...",
+				mask:true
+			})
 			let _data = uni.getStorageSync('erpContractNoCK') == '' ? {} : uni.getStorageSync('erpContractNoCK')
 			this.binNumber = helper.erpWarehouse.binNumber
 			this.warehouseName = helper.erpWarehouse.warehouseName
@@ -408,6 +418,19 @@
 				this.isShowPrint = false
 				uni.navigateBack({})
 			},
+			hidden(){
+				this.$refs.keyboard.open(false)
+			},
+			handleShowKeyboard(){
+				if(this.$refs.keyboard.open){
+					this.$refs.keyboard.open(true)//true 键盘显示 false 键盘隐藏
+				}else{
+					this.$refs.keyboard[0].open(true)
+				}
+			},
+			handleClick(e){
+				this.detailData.carNo = e.value //键盘输入值
+			},
 			inOutNo() {
 				this.$api.doRequest('get', '/inOutWarehouseTask/selectInOutWarehouseNo', {
 					flag: 1,
@@ -438,6 +461,7 @@
 					} else if (this.detailData.inOutType == '采购出库') {
 						this.detailData.inOutTypeKey = 6
 					}
+					console.log(this.detailData.inOutType)
 					//查询所有的合同  进行获取车牌号
 					this.$api.doRequest('get', '/warehouseBaseInfo/selectContractNoList', {
 						flag: 5,
@@ -446,17 +470,26 @@
 						if (res.data.code == 200) {
 							for (let i = 0; i < res.data.data.length; i++) {
 								// "MYCGYMHLJ2021102401"
-								if (res.data.data[i].contractNo == this.detailData.contractNo) { //如果查到该合同
+								if (res.data.data[i].contractNo == this.detailData.contractNo) {
+									if (this.detailData.inOutType == '销售出库') {
+										this.detailData.tips = '买方' + res.data.data[i].buyer
+									} else if (this.detailData.inOutType == '移库出库') {
+										this.detailData.tips = '入货库' + this.inOutNoList[0].warehouseName
+									}
+									//如果查到该合同
+									res.data.data[i].deliverType  = !res.data.data[i].deliverType?'1':res.data.data[i].deliverType  
 									if (res.data.data[i].deliverType == '1') { //判断自运1，他运2合同
 										this.showCar = true
 									} else {
 										this.showCar = false
 									}
+									
 									if (res.data.data[i].tranCarInfoList) {
 										this.carList = res.data.data[i].tranCarInfoList //车牌号下拉列表
 									}
 								}
-						 }
+							}
+							uni.hideLoading()
 						}
 					})
 				})
@@ -592,7 +625,7 @@
 			},
 			calculate() {
 				if (this.detailData.grossWeight && this.detailData.tare) {
-					this.netWeight = this.detailData.grossWeight - this.detailData.tare
+					this.netWeight =(this.detailData.grossWeight - this.detailData.tare).toFixed(3) 
 				}
 			},
 			getImgUrl(res) {
@@ -608,6 +641,7 @@
 			carPicker(e) {
 				// this.detailData.gradeKey = e[0] + 1
 				this.detailData.carNo = this.carList[e].carNo
+				this.detailData.tranCarNo = this.carList[e].tranCarNo
 				this.detailData.carId = this.carList[e].id
 			},
 			onProgress(e) {},
@@ -735,7 +769,7 @@
 					this.$api.msg('出库类型不能为空')
 					return
 				}
-				if(this.detailData.outType=="集装箱船"||this.detailData.outType=="汽运"){
+				if (this.detailData.outType == "集装箱船" || this.detailData.outType == "汽运") {
 					if (!this.detailData.carNo && num == 2) {
 						this.$api.msg('车牌号不能为空')
 						return
@@ -745,7 +779,7 @@
 						return
 					}
 				}
-				
+
 				if (!this.detailData.addressUrl && num == 2) {
 					this.$api.msg('请上传磅单')
 					return
@@ -898,8 +932,8 @@
 									var date = new Date()
 									that.weightbills.updateDate = date.getFullYear() + '-' + (date
 											.getMonth() + 1) + '-' + date.getDate() + ' ' + date
-									.getHours() + ':' + date.getMinutes() + ':' + date.getSeconds()
-									
+										.getHours() + ':' + date.getMinutes() + ':' + date.getSeconds()
+
 									that.$api.msg(title)
 									that.isShowPrint = true
 									uni.setStorageSync("exWarehousing_print", that.weightbills)

pages/erp/improvedExWaehousing/improvedExWaehousingDetail.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="warp">
+	<view @click='hidden' class="warp">
 		<view class="top">
 			<view class="top-left">{{warehouseName}}</view>
 			<view>{{binNumber}}仓位</view>
@@ -97,7 +97,8 @@
 			<view class="row row-bottom">
 				<view class="left">车牌号</view>
 				<!-- 他运合同车牌号输入 -->
-				<input v-model='detailData.carNo' class="right-bottom" placeholder="请输入车牌号" v-if="!showCar"></input>
+				<input v-model='detailData.carNo' @click.stop="handleShowKeyboard" disabled="true"  class="right-bottom" placeholder="请输入车牌号" v-if="!showCar"></input>
+				<master-keyboard ref="keyboard" keyboardtype="car" :randomNumber="true" :newCar="false" :defaultValue="detailData.carNo" @keyboardClick="handleClick"></master-keyboard>
 				<!-- <view @click='slectCarNo' v-if="isPC">{{detailData.carNo}}</view> -->
 				<!-- 自运合同车牌号需下拉 -->
 				<view v-if="!carno" v-show="showCar" @click="carno = true">{{detailData.carNo?detailData.carNo :"请选择车牌号"}}</view>
@@ -194,12 +195,14 @@
 <script>
 	import upload from '@/components/upload.vue';
 	import helper from '@/common/helper.js';
+	import keyboard from "@/components/master-keyboard/master-keyboard.vue";
 	import {
 		mapState
 	} from 'vuex';
 	export default {
 		components: {
-			upload
+			upload,
+			keyboard
 		},
 		data() {
 			return {
@@ -211,7 +214,7 @@
 				show5: false,
 				show6: false,
 				show7: false,
-				isPC: true,
+				// isPC: true,
 				typeList: [{
 						type: "干粮"
 					},
@@ -268,6 +271,7 @@
 					inOutType: "请选择出库类型",
 					warehouseInOutDetail: {},
 					gradeKey: "",
+					carNo:''
 				},
 				params: {
 					year: true,
@@ -300,14 +304,13 @@
 					url: this.detailData.addressUrl.split(",")[0]
 				})
 			}
-			this.cangId = options.cangId
 		},
 		onShow() {
 			this.binNumber = helper.erpWarehouse.binNumber
 			this.warehouseName = helper.erpWarehouse.warehouseName
 			// this.detailData.goodsName = uni.getStorageSync('erpContractNo').goodsName;
 			// this.detailData.contractNo = uni.getStorageSync('erpContractNo').contractNo;
-			this.detailData.goodsNameKey = uni.getStorageSync('erpContractNo').goodsNameKey;
+			// this.detailData.goodsNameKey = uni.getStorageSync('erpContractNo').goodsNameKey;
 			if (this.detailData.inOutType == '销售出库') {
 				this.detailData.inOutTypeKey = 1
 			} else if (this.detailData.inOutType == '移库出库') {
@@ -327,7 +330,7 @@
 			}
 			let _data = uni.getStorageSync('erpContractNoCK') == '' ? {} : uni.getStorageSync('erpContractNoCK')
 			if (!_data.tranCarInfoList) {
-				this.isPC = false
+				// this.isPC = false
 				_data.tranCarInfoList = []
 			} else {
 				this.isPC = true
@@ -338,9 +341,9 @@
 				}
 			}
 			if (this.detailData.carNo) {
-				for (let i = 0; i < uni.getStorageSync('erpContractNoCK').tranCarInfoList.length; i++) {
-					if (uni.getStorageSync('erpContractNoCK').tranCarInfoList[i].carNo == this.detailData.carNo)
-						this.detailData.tranCarNo = uni.getStorageSync('erpContractNoCK').tranCarInfoList[i].tranCarNo
+				for (let i = 0; i < _data.tranCarInfoList.length; i++) {
+					if (_data.tranCarInfoList[i].carNo == this.detailData.carNo)
+						this.detailData.tranCarNo = _data.tranCarInfoList[i].tranCarNo
 				}
 			}
 			//出库类型
@@ -351,6 +354,19 @@
 			this.handler()
 		},
 		methods: {
+			hidden(){
+				this.$refs.keyboard.open(false)
+			},
+			handleShowKeyboard(){
+				if(this.$refs.keyboard.open){
+					this.$refs.keyboard.open(true)//true 键盘显示 false 键盘隐藏
+				}else{
+					this.$refs.keyboard[0].open(true)
+				}
+			},
+			handleClick(e){
+				this.detailData.carNo = e.value //键盘输入值
+			},
 			inOutNo() {
 				this.$api.doRequest('get', '/inOutWarehouseTask/selectInOutWarehouseNo', {
 					flag: 1,

pages/erp/improvedWrehousing/improvedWrehousingDetail.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="warp">
+	<view @click='hidden' class="warp">
 		<view class="top">
 			<view class="top-left">{{warehouseName}}</view>
 			<view>{{binNumber}}仓位</view>
@@ -106,7 +106,9 @@
 			<view class="row row-bottom" v-if="detailData.outType!='火运' && detailData.outType!='散船'">
 				<view class="left">车牌号</view>
 				<!-- 他运合同车牌号输入 -->
-				<input v-model='detailData.carNo' class="right-bottom" placeholder="请输入车牌号" v-if="!showCar"></input>
+				<input v-model='detailData.carNo' @click.stop="handleShowKeyboard" disabled="true"  class="right-bottom" placeholder="请输入车牌号" v-if="!showCar"></input>
+				<master-keyboard ref="keyboard" keyboardtype="car" :randomNumber="true" :newCar="false" :defaultValue="detailData.carNo" @keyboardClick="handleClick"></master-keyboard>
+				<!-- <input v-model='detailData.carNo' class="right-bottom" placeholder="请输入车牌号" v-if="!showCar"></input> -->
 				<!-- <view @click='slectCarNo' v-if="isPC">{{detailData.carNo}}</view> -->
 				<!-- 自运合同车牌号需下拉 -->
 				<view v-if="!carno" v-show="showCar" @click="carno = true">{{detailData.carNo? detailData.carNo:"请选择车牌号"}}</view>
@@ -380,6 +382,19 @@
 			},
 		},
 		methods: {
+			hidden(){
+				this.$refs.keyboard.open(false)
+			},
+			handleShowKeyboard(){
+				if(this.$refs.keyboard.open){
+					this.$refs.keyboard.open(true)//true 键盘显示 false 键盘隐藏
+				}else{
+					this.$refs.keyboard[0].open(true)
+				}
+			},
+			handleClick(e){
+				this.detailData.carNo = e.value //键盘输入值
+			},
 			inOutNo(){
 				this.$api.doRequest('get', '/inOutWarehouseTask/selectInOutWarehouseNo', 
 				{flag:2,warehouseName:this.warehouseName,

pages/erp/index.vue

@@ -221,6 +221,7 @@
 			})
 			this.$api.doRequest('get', '/commonUser/api/checkSession').then(res => {
 				if (res.data.data == "INVALID") {
+					uni.hideLoading()
 					this.isShowAlert1 = true;
 					// uni.showModal({
 					// 	title: '提示',
@@ -245,6 +246,7 @@
 				if (res.data.code == 200) {
 					if (res.data.data.length == 0) {
 						this.isShowAlert = true
+						uni.hideLoading()
 					} else {
 						this.isShowAlert = false
 					}

pages/erp/warehousing/warehousing.vue

@@ -34,16 +34,18 @@
 			</view>
 			<view class="row row-bottom">
 				<view class="left">毛重（吨）</view>
-				<input type="digit" @input='calculate' name="grossWeight" v-model='detailData.grossWeight' class="right-bottom" 
-					placeholder="输入毛重"></input>
+				<input type="digit" @input='calculate' name="grossWeight" v-model='detailData.grossWeight'
+					class="right-bottom" placeholder="输入毛重"></input>
 			</view>
 			<view class="row row-bottom">
 				<view class="left">皮重（吨）</view>
-				<input type="digit" @input='calculate' name="tare" v-model='detailData.tare' class="right-bottom" placeholder="输入皮重"></input>
+				<input type="digit" @input='calculate' name="tare" v-model='detailData.tare' class="right-bottom"
+					placeholder="输入皮重"></input>
 			</view>
 			<view class="row row-bottom">
 				<view class="left">扣重（吨）</view>
-				<input type="digit" @input='calculate' v-model='detailData.deductionWeight' class="right-bottom" placeholder="输入扣重"></input>
+				<input type="digit" @input='calculate' v-model='detailData.deductionWeight' class="right-bottom"
+					placeholder="输入扣重"></input>
 			</view>
 			<view class="row row-bottom">
 				<view class="left">净重（吨）</view>
@@ -112,20 +114,22 @@
 			<view class="row row-bottom" v-if="detailData.outType!='火运'&&detailData.outType!='散船'">
 				<view class="left">车牌号</view>
 				<!-- 他运合同车牌号输入 -->
-				<input  v-model='detailData.carNo' class="right-bottom" placeholder="请输入车牌号" v-if="!showCar"></input>
+				<input v-model='detailData.carNo' @click.stop="handleShowKeyboard":disabled="true" class="right-bottom" placeholder="请输入车牌号" v-if="!showCar"></input>
+				<master-keyboard ref="keyboard" keyboardtype="car" :randomNumber="true" :newCar="false" :defaultValue="detailData.carNo" @keyboardClick="handleClick"></master-keyboard>
 				<!-- <view @click='slectCarNo' v-if="isPC">{{detailData.carNo}}</view> -->
-			    <!-- 自运合同车牌号需下拉 -->
-				<view v-if="!carno" v-show="showCar" @click="carno = true">{{detailData.carNo? detailData.carNo:"请选择车牌号"}}</view>
-				<u-picker :range="carList" range-key="carNo" @confirm='carPicker($event)' v-model="carno" mode="selector">
+				<!-- 自运合同车牌号需下拉 -->
+				<view v-show="showCar" @click="carno = true">{{detailData.carNo? detailData.carNo:"请选择车牌号"}}</view>
+				<u-picker :range="carList" range-key="carNo" @confirm='carPicker($event)' v-model="carno"
+					mode="selector">
 				</u-picker>
 			</view>
 			<view class="row row-bottom" v-if="detailData.outType=='火运'">
 				<view class="left">车号</view>
-				<input  v-model='detailData.carNo' class="right-bottom" placeholder="请输入车号" ></input>
+				<input v-model='detailData.carNo' class="right-bottom" placeholder="请输入车号"></input>
 			</view>
 			<view class="row row-bottom" v-if="detailData.outType=='散船'">
 				<view class="left">船名</view>
-				<input  v-model='detailData.carNo' class="right-bottom" placeholder="请输入船名" ></input>
+				<input v-model='detailData.carNo' class="right-bottom" placeholder="请输入船名"></input>
 			</view>
 			<view v-if='detailData.outType=="集装箱船"||!detailData.outType||detailData.outType=="汽运"'
 				class="row row-bottom">
@@ -133,17 +137,16 @@
 				<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 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="请输入封号" type="digit"></input>
-				<input v-model='detailData.titleNoOther' class="right-bottom"
-					placeholder="请输入封号" type="digit"></input>
+				<input v-model='detailData.titleNo' class="right-bottom" placeholder="请输入封号" type="digit"></input>
+				<input v-model='detailData.titleNoOther' class="right-bottom" 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="请输入车厢号" type="digit"></input>
+				<input v-model='detailData.wingNumber' @input="toUpperCase2" class="right-bottom" placeholder="请输入车厢号"
+					type="digit"></input>
 				<input v-model='detailData.wingNumberOther' @input="toUpperCase3" class="right-bottom"
 					placeholder="请输入车厢号" type="digit"></input>
 			</view>
@@ -183,8 +186,8 @@
 			</view>
 			<view class="row row-bottom">
 				<view class="left">水分（%）</view>
-				<input type="digit" v-model='detailData.warehouseInOutDetail.waterContent'
-					class="right-bottom" placeholder="输入水分占比"></input>
+				<input type="digit" v-model='detailData.warehouseInOutDetail.waterContent' class="right-bottom"
+					placeholder="输入水分占比"></input>
 			</view>
 			<view class="row row-bottom">
 				<view class="left">容重（克/升）</view>
@@ -203,8 +206,8 @@
 			</view>
 			<view class="row row-bottom">
 				<view class="left">霉变粒（%）</view>
-				<input type="digit" v-model='detailData.warehouseInOutDetail.mildewGrain'
-					class="right-bottom" placeholder="输入霉变粒占比"></input>
+				<input type="digit" v-model='detailData.warehouseInOutDetail.mildewGrain' class="right-bottom"
+					placeholder="输入霉变粒占比"></input>
 			</view>
 			<view class="row row-bottom">
 				<view class="left">不完善粒（%）</view>
@@ -226,9 +229,11 @@
 	} from 'vuex';
 	import upload from '@/components/upload.vue';
 	import helper from '@/common/helper.js';
+	import keyboard from "@/components/master-keyboard/master-keyboard.vue";
 	export default {
 		components: {
-			upload
+			upload,
+			keyboard
 		},
 		data() {
 			return {
@@ -240,7 +245,7 @@
 				show5: false,
 				show6: false,
 				isPC: true,
-				carno:false,
+				carno: false,
 				isSelectType: true,
 				inOutShow: false,
 				params: {
@@ -320,10 +325,12 @@
 					deductionAmount: '',
 					netWeight: 0,
 					cost: 0,
-					warehouseInOutDetail: {}
+					warehouseInOutDetail: {},
+					tips: '',
+					carNo:''
 				},
-				carList:[],//车牌号下拉
-				showCar:false,
+				carList: [], //车牌号下拉
+				showCar: false,
 			}
 		},
 		onLoad(options) {
@@ -338,6 +345,10 @@
 			...mapState(['hasLogin', 'userInfo']),
 		},
 		onShow() {
+			uni.showLoading({
+				title: "加载中...",
+				mask: true
+			})
 			let _data = uni.getStorageSync('erpContractNo') == '' ? {} : uni.getStorageSync('erpContractNo')
 			if (helper.erpWarehouse.personCharge)
 				this.detailData.agent = helper.erpWarehouse.personCharge
@@ -413,77 +424,92 @@
 			},
 		},
 		computed: {
-			...mapState(['hasLogin','userInfo']),
+			...mapState(['hasLogin', 'userInfo']),
 		},
 		methods: {
+			hidden(){
+				this.$refs.keyboard.open(false)
+			},
+			handleShowKeyboard(){
+				if(this.$refs.keyboard.open){
+					this.$refs.keyboard.open(true)//true 键盘显示 false 键盘隐藏
+				}else{
+					this.$refs.keyboard[0].open(true)
+				}
+			},
+			handleClick(e){
+				this.detailData.carNo = e.value //键盘输入值
+			},
 			inOutNo() {
-				let  that  = this
+				let that = this
 				this.$api.doRequest('get', '/inOutWarehouseTask/selectInOutWarehouseNo', {
 					flag: 2,
-					warehouseName:this.warehouseName,
-					agentKey : this.userInfo.id
+					warehouseName: this.warehouseName,
+					agentKey: this.userInfo.id
 				}).then(res => {
 					this.inOutNoList = res.data.data
-					if(this.inOutNoList.length > 0){
+					if (this.inOutNoList.length > 0) {
 						this.detailData.inOutTaskNo = this.inOutNoList[0].inOutTaskNo
-					this.detailData.agent = this.inOutNoList[0].agent
-					if (this.inOutNoList[0].contractNo) {
-						this.detailData.contractNo = this.inOutNoList[0].contractNo
-					} else {
-						this.detailData.contractNo = this.inOutNoList[0].moveTaskNo
-					}
-					this.detailData.goodsName = this.inOutNoList[0].goodsName
-					this.detailData.goodsNameKey = this.inOutNoList[0].goodsNameKey;
-					this.detailData.grade = this.inOutNoList[0].grade
-					this.detailData.inOutType = this.inOutNoList[0].inOutType
-					if (this.detailData.inOutType == '采购入库') {
-						this.detailData.inOutTypeKey = 1
-					} else if (this.detailData.inOutType == '移库入库') {
-						this.detailData.inOutTypeKey = 3
-					} else if (this.detailData.inOutType == '暂存入库') {
-						this.detailData.inOutTypeKey = 4
-					} else if (this.detailData.inOutType == '贸易服务入库') {
-						this.detailData.inOutTypeKey = 5
-					} else if (this.detailData.inOutType == '退库') {
-						this.detailData.inOutTypeKey = 6
-					}
-					//查询所有的合同  进行获取车牌号
-					this.$api.doRequest('get', '/warehouseBaseInfo/selectContractNoList', {
-						flag: 7,
-						compId: helper.erpWarehouse.compId,
-					}).then(res => {
-						if (res.data.code == 200) {
-							for(let i = 0 ; i < res.data.data.length ; i++){
+						this.detailData.agent = this.inOutNoList[0].agent
+						if (this.inOutNoList[0].contractNo) {
+							this.detailData.contractNo = this.inOutNoList[0].contractNo
+						} else {
+							this.detailData.contractNo = this.inOutNoList[0].moveTaskNo
+						}
+						this.detailData.goodsName = this.inOutNoList[0].goodsName
+						this.detailData.goodsNameKey = this.inOutNoList[0].goodsNameKey;
+						this.detailData.grade = this.inOutNoList[0].grade
+						this.detailData.inOutType = this.inOutNoList[0].inOutType
+						if (this.detailData.inOutType == '采购入库') {
+							this.detailData.inOutTypeKey = 1
+						} else if (this.detailData.inOutType == '移库入库') {
+							this.detailData.inOutTypeKey = 3
+						} else if (this.detailData.inOutType == '暂存入库') {
+							this.detailData.inOutTypeKey = 4
+						} else if (this.detailData.inOutType == '贸易服务入库') {
+							this.detailData.inOutTypeKey = 5
+						} else if (this.detailData.inOutType == '退库') {
+							this.detailData.inOutTypeKey = 6
+						}
+						//查询所有的合同  进行获取车牌号
+						this.$api.doRequest('get', '/warehouseBaseInfo/selectContractNoList', {
+							flag: 7,
+							compId: helper.erpWarehouse.compId,
+						}).then(res => {
+							if (res.data.code == 200) {
+								for (let i = 0; i < res.data.data.length; i++) {
 								 // "MYCGYMHLJ2021102401"
-								if(res.data.data[i].contractNo == this.detailData.contractNo){//如果查到该合同
-								if(res.data.data[i].deliverType == "1"){//判断自运1，他运2合同
-									this.showCar = true
-								}else{
-									this.showCar = false
-								}
-								if(res.data.data[i].tranCarInfoList){
-									this.carList = res.data.data[i].tranCarInfoList   //车牌号下拉列表
+									if (res.data.data[i].contractNo == this.detailData
+										.contractNo) { //如果查到该合同
+										if (res.data.data[i].deliverType == "1") { //判断自运1，他运2合同
+											this.showCar = true
+										} else {
+											this.showCar = false
+										}
+										if (res.data.data[i].tranCarInfoList) {
+											this.carList = res.data.data[i].tranCarInfoList //车牌号下拉列表
+										}
+									}
 								}
-							 }
+								uni.hideLoading()
 							}
-						}
-					})
-				  }
+						})
+					}
 				})
 				this.$api.doRequest('get', 'warehouseBaseInfo/selectContractNoList', ).then(res => {
 					this.contractNoList = res.data.data
 					for (var i = 0; i < this.contractNoList.length; i++) {
 						if (this.contractNoList[i].contractNo == this.detailData.contractNo) {
 							if (this.detailData.inOutType == '采购入库') {
-								if(this.contractNoList[i].unitContractPrice){
-									this.detailData.tips = '卖方' + this.contractNoList[i].seller+
-              '（ ' +
-              this.contractNoList[i].unitContractPrice +
-              '元/吨）'
-								}else{
+								if (this.contractNoList[i].unitContractPrice) {
+									this.detailData.tips = '卖方' + this.contractNoList[i].seller +
+										'（ ' +
+										this.contractNoList[i].unitContractPrice +
+										'元/吨）'
+								} else {
 									this.detailData.tips = '卖方' + this.contractNoList[i].seller
 								}
-								
+
 							} else if (this.detailData.inOutType == '移库入库') {
 								this.detailData.tips = '出货库' + this.inOutNoList[0].warehouseName
 							} else if (this.detailData.inOutType == '退库') {
@@ -508,14 +534,16 @@
 				for (var i = 0; i < this.contractNoList.length; i++) {
 					if (this.contractNoList[i].contractNo == this.detailData.contractNo) {
 						if (this.detailData.inOutType == '采购入库') {
-							this.detailData.tips = '卖方' + this.contractNoList[i].seller+'（'+this.contractNoList[i].unitContractPrice+'元/吨）'
+							this.detailData.tips = '卖方' + this.contractNoList[i].seller + '（' + this.contractNoList[i]
+								.unitContractPrice + '元/吨）'
 						} else if (this.detailData.inOutType == '移库入库') {
-							if(this.contractNoList[i].unitContractPrice){
-								this.detailData.tips = '出货库' + this.inOutNoList[e[0]].sendWarehouse+'（'+this.contractNoList[i].unitContractPrice+'元/吨）'
-							}else{
+							if (this.contractNoList[i].unitContractPrice) {
+								this.detailData.tips = '出货库' + this.inOutNoList[e[0]].sendWarehouse + '（' + this
+									.contractNoList[i].unitContractPrice + '元/吨）'
+							} else {
 								this.detailData.tips = '出货库' + this.inOutNoList[e[0]].sendWarehouse
 							}
-							
+
 						} else if (this.detailData.inOutType == '退库') {
 							if (this.contractNoList[i].contractNo) {
 								this.deptBudgetList.tips = '买方' + this.contractNoList[i].buyer
@@ -585,6 +613,8 @@
 			carPicker(e) {
 				// this.detailData.gradeKey = e[0] + 1
 				this.detailData.carNo = this.carList[e].carNo
+				this.detailData.tranCarNo = this.carList[e].tranCarNo
+				this.detailData.carId = this.carList[e].id
 			},
 			handlerPicker(e) {
 				console.log(e)

pages/erpbusiness/edit_quality_testing.vue

@@ -421,26 +421,28 @@
 			},
 			alertBtn() {
 				var that = this
-				that.gridList.flag = 2
-				this.$api.doRequest('post', '/qualityInspectionManagement/api/editQualityInspection', that.gridList).then(
-					res => {
-						if (res.data.code == "200") {
-							that.gridList.flag = 1
-							that.$api.doRequest('post', '/qualityInspectionManagement/api/editQualityInspection', that
-								.gridList).then(res => {
-								if (res.data.code == "200") {
-									that.$api.msg('提交成功！')
-									setTimeout(function() {
+				that.gridList.reWaterContent=that.gridList.waterContent
+				if(that.gridList.buckleMiscellaneous){
+					that.gridList.reBuckleMiscellaneous=that.gridList.buckleMiscellaneous
+				}
+				that.gridList.flag = 1
+				this.$api.doRequest('post', '/qualityInspectionManagement/api/editQualityInspection',that.gridList).then(res => {
+					if(res.data.code=="200"){
+						that.$api.doRequest('post', '/qualityInspectionManagement/api/editQualityInspection', {id:that.gridList.id,flag:2}).then(res => {
+							if(res.data.code=="200"){
+								that.$api.msg('提交成功！')
+								setTimeout(function(){
 										uni.navigateBack({})
-									}, 1000)
-								} else {
-									that.$api.msg('提交失败')
-								}
-							})
-						} else {
-							that.$api.msg('提交失败')
-						}
-					})
+								},1000)
+							}else{
+								that.$api.msg('提交失败')
+							}
+						})			
+						
+					}else{
+						that.$api.msg('提交失败')
+					}
+				})
 			},
 			waterContentChange() {
 				var that = this

pages/grain_pulse/my_grain_pulse.vue

@@ -181,11 +181,11 @@
 				})
 			},
 			edit(item){
-				if(item.status=='已驳回'||item.status=='待审核'){
+				// if(item.status=='已驳回'||item.status=='待审核'){
 					uni.navigateTo({
 						url:'/pages/grain_pulse/editcompany?id='+item.id
 					})
-				}
+				// }
 				
 			},
 			showHidden(item){