前端

config/index.js

@@ -14,5 +14,4 @@ const dev = {
 
 export function def() {
 	return dev
-}
-
+}

pages.json

@@ -196,6 +196,13 @@
 				"navigationBarTitleText": "采购合同审核"
 			}
 		},
+		{
+			"path": "pages/task/audit/acquisitioncontract",
+			"style": {
+				"enablePullDownRefresh": true,
+				"navigationBarTitleText": "收购合同审核"
+			}
+		},
 		{
 			"path": "pages/task/sale_details",
 			"style": {

pages/erpbusiness/acquisitionInspection/grossWeightDetail.vue

@@ -68,6 +68,9 @@
 </template>
 
 <script>
+	import {
+	    mapState 
+	} from 'vuex';
 	export default {
 		data() {
 			return {
@@ -108,6 +111,9 @@
 			})
 			console.log(this.detailData)
 		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo']),
+		},
 		methods: {
 			submit() {
 			if(!this.detailData.grossWeight){
@@ -122,6 +128,7 @@
 		
 							if(that.detailData.serviceManagementType==1){
 								var data=that.detailData
+								data.secretaryWeigher=that.userInfo.userName;
 								data.weighingManagement=JSON.parse(JSON.stringify(that.detailData))
 								data.inOutFlag = 2
 								data.statusFlag=1

pages/erpbusiness/acquisitionInspection/tareDetail.vue

@@ -102,6 +102,9 @@
 </template>
 
 <script>
+	import {
+	    mapState 
+	} from 'vuex';
 	export default {
 		data() {
 			return {
@@ -246,6 +249,9 @@
 				this.detailData.buckleMiscellaneous = 0
 			}
 		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo']),
+		},
 		methods: {
 			changeInput() {
 				this.detailData.netWeight = (parseFloat(this.detailData.grossWeight) - parseFloat(this.detailData.tare) -
@@ -270,6 +276,7 @@
 									var data=res.data.data
 									data.statusFlag=3
 									data.inOutFlag=2
+									data.secretaryWeigher=that.userInfo.userName;
 									data.warehouseType=that.detailData.warehouseType
 									// data.baseId=that.detailData.warehouseInOutId
 									data.grossWeight=that.detailData.grossWeight/1000

pages/erpbusiness/add_quality_testing.vue

@@ -17,7 +17,7 @@
 					{{gridList.warehouseName}}
 				</view>
 			</view>
-			<view v-if='typevalue==1' class="c-row ">
+			<view class="c-row ">
 				<view class="title">任务编号</view>
 				<view class="con-list">
 					<view @click='show4=true'>{{gridList.inOutTaskNo?gridList.inOutTaskNo:'请选择任务编号'}}</view>
@@ -26,7 +26,7 @@
 					</u-picker>
 				</view>
 			</view>
-			<view v-if='typevalue==1&&gridList.inOutType!="移库入库"' class="c-row ">
+			<view v-if='typevalue==1&&gridList.inOutType!="移库入库"||typevalue==3' class="c-row ">
 				<view class="title">合同编号</view>
 				<view class="con-list">
 					{{gridList.contractNo?gridList.contractNo:'自动获取，不可编辑'}}
@@ -118,6 +118,13 @@
 					</u-picker>
 				</view>
 			</view>
+			<view v-if='typevalue==1' class="c-row ">
+				<view class="title">车牌号</view>
+				<view class="con-list">
+					<input v-model='gridList.carNumber' @click.stop="handleShowKeyboard":disabled="true" placeholder="请输入车牌号" name="input"></input>
+					<master-keyboard ref="keyboard" keyboardtype="car" :randomNumber="true" :newCar="false" :defaultValue="gridList.carNumber" @keyboardClick="handleClick"></master-keyboard>
+				</view>
+			</view>
 			<view v-if="gridList.outType=='汽运'&&typevalue==1 ||gridList.outType == '集装箱船'&&typevalue==1" class="c-row ">
 				<view class="title">箱号-1</view>
 				<view class="con-list">
@@ -169,7 +176,7 @@
 					</view>
 				</view>
 			</view>
-			<view v-if='typevalue==3&&utils.getCurrectRoles("acquisitionQuality.qview")||typevalue==1' class="c-row ">
+			<view v-if='typevalue==3&&utils.getCurrectRoles("acquisitionQuality.qview")' class="c-row ">
 				<view class="title">车牌号</view>
 				<view class="con-list">
 					<input v-model='gridList.carNumber' @click.stop="handleShowKeyboard":disabled="true" placeholder="请输入车牌号" name="input"></input>
@@ -215,13 +222,13 @@
 			<view v-if='utils.getCurrectRoles("acquisitionQuality.initial")' class="c-row ">
 				<view class="title">类型</view>
 				<view v-if="!edit" class="con-list">
-					<view @click='show3=true'>{{gridList.type}}</view>
+					<view @click='show3=true'>{{gridList.type?gridList.type:'请选择类型'}}</view>
 					<u-picker :range="typeList" @confirm='typepicker($event)' v-model="show3" mode="selector">
 					</u-picker>
 				</view>
-				<view v-else class="con-list">{{gridList.type}}</view>
+				<view v-else class="con-list">{{gridList.type?gridList.type:'请选择类型'}}</view>
 			</view>
-			<view v-if="gridList.type == '潮粮'&&utils.getCurrectRoles('acquisitionQuality.initial')" class="c-row">
+			<view v-if="gridList.type == '潮粮'&&utils.getCurrectRoles('acquisitionQuality.initial')&&typevalue==3" class="c-row">
 				<view class="title">净重单价（元/公斤）</view>
 				<view class="con-list">
 					<input v-model='gridList.tidalGrainPrice' :disabled='pricedisabled' @blur='inputprice' placeholder="自动获取，不可编辑" name="input"
@@ -229,13 +236,26 @@
 				</view>
 				<button class='cu-btn bg-green shadow' @click="changeprice">{{pricetext}}</button>
 			</view>
-			<view v-if="gridList.type == '干粮'&&utils.getCurrectRoles('acquisitionQuality.initial')" class="c-row">
+			<view v-if="gridList.type == '干粮'&&utils.getCurrectRoles('acquisitionQuality.initial')&&typevalue==3" class="c-row">
 				<view class="title">干粮单价（元/公斤）</view>
 				<view class="con-list">
 					<input v-model='gridList.dryGrainPrice' :disabled='pricedisabled'  @blur='inputprice' placeholder="请输入干粮单价" name="input" type="digit"></input>
 				</view>
 				<button class='cu-btn bg-green shadow' @click="changeprice">{{pricetext}}</button>
 			</view>
+			<view v-if="gridList.type == '潮粮'&&utils.getCurrectRoles('acquisitionQuality.initial')&&typevalue==1" class="c-row">
+				<view class="title">净重单价（元/公斤）</view>
+				<view class="con-list">
+					<input v-model='gridList.tidalGrainPrice' :disabled='disabled1' @blur='inputprice' placeholder="自动获取，不可编辑" name="input"
+									type="digit"></input>
+				</view>
+			</view>
+			<view v-if="gridList.type == '干粮'&&utils.getCurrectRoles('acquisitionQuality.initial')&&typevalue==1" class="c-row">
+				<view class="title">干粮单价（元/公斤）</view>
+				<view class="con-list">
+					<input v-model='gridList.dryGrainPrice' :disabled='disabled1'  @blur='inputprice' placeholder="请输入干粮单价" name="input" type="digit"></input>
+				</view>
+			</view>
 			<view v-if="typevalue==3&&utils.getCurrectRoles('acquisitionQuality.qview')" class="c-row">
 				<view class="title">箱号-1</view>
 				<view class="con-list">
@@ -282,8 +302,6 @@
 					<view class="con-list">
 						<input v-model='gridList.waterContent' placeholder="初检水分" @input="waterContentChange"
 							name="input" type="digit"></input>
-						<input v-model='gridList.rewaterContent' placeholder="复检水分" @input="waterContentChange"
-							name="input" type="digit"></input>
 					</view>
 				</view>
 				<view class="c-row ">
@@ -353,6 +371,7 @@
 			return {
 				isShowPrint:false,
 				isShowAlert: false,
+				disabled1:false,
 				content: '确认初检信息后，初检员不需要再次确认质检信息，是否确定提交?',
 				inputShow: false,
 				params:{year: true,
@@ -402,6 +421,7 @@
 				headUrl: "../../static/img/myimg/YongHu@3x.png",
 				userphone: "",
 				username: "请更改昵称",
+				contractFlag:10,
 				gridList: {
 					natureOfGrainPurchase: '贸易粮',
 					type: '',
@@ -469,10 +489,11 @@
 					boxNoOther:'',
 					titleNo:'',
 					titleNoOther:'',
-					statusFlag:1
+					statusFlag:0
 				},
 				typeList: ['潮粮', '干粮'],
 				managementType: '',
+				flag:2,
 				warehouseName: '',
 				warehouseList: [],
 				warehouseCount: '',
@@ -606,7 +627,6 @@
 					that.goodsList = res.data.data
 					if (that.goodsList.length > 0) {
 						that.gridList.goodsName = that.goodsList[0].goodsName
-						this.setGoodName([0],1)
 						uni.setStorageSync('purchasePriceList', that.goodsList)
 						that.purchasePriceList = uni.getStorageSync('purchasePriceList')
 					}
@@ -627,12 +647,20 @@
 		onShow(){
 			if(this.utils.getCurrectRoles('acquisitionQuality.initial')&&!this.utils.getCurrectRoles('acquisitionQuality.qview')){
 				this.typevalue='1'
+				this.contractFlag=7
 			}else{
 				this.typevalue='3'
+				this.contractFlag=10
 			}
 			uni.showLoading({title: '加载中',mask:true})
+			if(this.typevalue=='3'){
+				this.flag=3
+			}else{
+				this.flag=2
+				
+			}
 			this.$api.doRequest('get', '/inOutWarehouseTask/selectInOutWarehouseNo', {
-				flag: 2,
+				flag: this.flag,
 				warehouseName:this.gridList.warehouseName
 			}).then(res => {
 				console.log(res)
@@ -655,7 +683,7 @@
 				// this.taskNolist=res.data.data
 			})
 			this.$api.doRequest('get', '/warehouseBaseInfo/selectContractNoList', {
-				flag: 7,
+				flag: this.contractFlag,
 				
 			}).then(res => {
 				if(res.data.data){
@@ -705,11 +733,31 @@
 				this.gridList.serviceManagementType=e
 				if(e==1){
 					this.gridList.qualityNo=''
+					this.flag=2
+					this.contractFlag=7
 				}else{
+					this.flag=3
+					this.contractFlag=10
 					let number = '000' + this.warehouseCount
 					number = number.substring(number.length - 4, number.length)
 					this.gridList.qualityNo = 'SGRK' + this.getdate() + this.commonWarehouseNo + number
 				}
+				this.$api.doRequest('get', '/warehouseBaseInfo/selectContractNoList', {
+					flag: this.contractFlag,
+					
+				}).then(res => {
+					if(res.data.data){
+						console.log(res.data.data)
+						this.contractNolist=res.data.data
+					}
+				})
+				this.$api.doRequest('get', '/inOutWarehouseTask/selectInOutWarehouseNo', {
+					flag: this.flag,
+					warehouseName:this.gridList.warehouseName
+				}).then(res => {
+					console.log(res)
+					this.taskNolist=res.data.data
+				})
 			},
 			outtypepicker(e,status){
 				if(status==0){
@@ -778,8 +826,54 @@
 				for (let i = 0; i < this.contractNolist.length; i++) {
 					
 					if(this.gridList.contractNo==this.contractNolist[i].contractNo){
-						console.log(this.contractNolist[i])
-						this.gridList.goodsName = this.contractNolist[i].goodsName
+						if(this.typevalue==3){
+							if(this.goodsList.indexOf(this.contractNolist[i].goodsName)!=-1){
+								// 收购入库
+								for (let q = 0; q < this.goodsList.length; q++) {
+									if(this.goodsList[q].goodsName==this.contractNolist[i].goodsName){
+										this.gridList.goodsName = this.contractNolist[i].goodsName
+										this.setGoodName([q])
+									}
+								}
+							}else{
+								uni.showModal({
+									title: '提示',
+									content: '仓库设置中无该合同货名',
+									showCancel:false,
+									confirmText:'返回',
+									success: function (res) {
+										if (res.confirm) {
+											uni.navigateBack({
+												delta:1
+											})
+										}
+									}
+								});
+							}
+						}else{
+							this.gridList.goodsName = this.contractNolist[i].goodsName
+							if (this.gridList.goodsName == '玉米') {
+								this.gridList.type = '干粮'
+								if (this.contractNolist[i].priceType != '随行就市') {
+									this.gridList.dryGrainPrice=this.contractNolist[i].contractPrice
+								}
+								this.edit = true
+							} else if (this.gridList.goodsName == '玉米（潮粮）') {
+								this.gridList.type = '潮粮'
+								this.edit = true
+								if (this.contractNolist[i].priceType != '随行就市') {
+									this.gridList.tidalGrainPrice=this.contractNolist[i].contractPrice
+								}
+								
+							} else {
+								this.gridList.type = '干粮'
+								this.edit = false
+								if (this.contractNolist[i].priceType != '随行就市') {
+									this.gridList.dryGrainPrice=this.contractNolist[i].contractPrice
+								}
+							}
+						}
+						
 						this.gridList.goodsNameKey = this.contractNolist[i].goodsNameKey
 						this.gridList.grade = this.contractNolist[i].grade
 						this.gridList.inOutType = this.contractNolist[i].inOutType
@@ -841,7 +935,9 @@
 							this.isSelectType = true
 						}
 						if (this.contractNolist[i].priceType == '随行就市') {
-							this.disabled1 = !this.disabled1
+							this.disabled1 = true
+						}else{
+							this.disabled1 = false
 						}
 						if (this.contractNolist[i].deliverType == '1') {
 							this.carstatus = true
@@ -981,6 +1077,7 @@
 					}
 				}
 				var that = this
+				this.gridList.agent=this.userInfo.userName;
 				this.gridList.carNo=this.gridList.carNumber
 				this.gridList.baseId=this.cangid
 				this.gridList.warehouseId=this.cangid
@@ -994,7 +1091,12 @@
 					this.gridList.numberLetter = 'SGRK'
 				}
 				this.gridList.warehouseNo=this.commonWarehouseNo
+				if(!this.gridList.inOutTaskNo){
+					this.$api.msg('任务编号不能为空')
+					return
+				}
 				if(this.utils.getCurrectRoles('acquisitionQuality.initial')){
+					this.gridList.statusFlag=0
 					// if (!this.gridList.qualityNo) {
 					// 	this.$api.msg('编号不能为空')
 					// 	return
@@ -1050,6 +1152,9 @@
 					}
 				}
 				if(this.utils.getCurrectRoles('acquisitionQuality.qview')){
+					if(!this.utils.getCurrectRoles('acquisitionQuality.initial')){
+						this.gridList.statusFlag=7
+					}
 					if(this.typevalue==3){
 						if (!this.gridList.customerName) {
 							this.$api.msg('客户不能为空')
@@ -1206,6 +1311,7 @@
 				this.waterContentChange()
 			},
 			setGoodName(e,status) {
+				console.log(this.goodsList[e[0]].goodsName,111111111)
 				// 
 				// [e[0]] = 0
 				// this.$set(this.gradeList,'grade',this.gradeList[e[0]].value)

pages/erpbusiness/edit_quality_testing.vue

@@ -15,13 +15,13 @@
 					{{gridList.warehouseName}}
 				</view>
 			</view>
-			<view v-if='gridList.serviceManagementType==1&&flag!=3' class="c-row ">
+			<view class="c-row ">
 				<view class="title">任务编号</view>
 				<view class="con-list">
 					<view >{{gridList.inOutTaskNo}}</view>
 				</view>
 			</view>
-			<view v-if='gridList.serviceManagementType==1&&gridList.inOutType!="移库入库"&&flag!=3' class="c-row ">
+			<view v-if='gridList.serviceManagementType==1&&gridList.inOutType!="移库入库"&&flag!=3||gridList.serviceManagementType==3' class="c-row ">
 				<view class="title">合同编号</view>
 				<view class="con-list">
 					{{gridList.contractNo}}
@@ -47,7 +47,7 @@
 						<input v-model='gridList.cost' placeholder="请输入成本" name="input" type="digit"></input>
 					</view>
 				</view>
-				<button class='cu-btn bg-green shadow' @click="changecost">{{costtext}}</button>
+				<button v-if='flag==4||flag==0' class='cu-btn bg-green shadow' @click="changecost">{{costtext}}</button>
 			</view>
 			<view v-if='gridList.serviceManagementType==1&&flag!=3' class="c-row ">
 				<view class="title">运费</view>
@@ -57,12 +57,12 @@
 						<input v-model='gridList.freight' placeholder="请输入运费" name="input" type="digit"></input>
 					</view>
 				</view>
-				<button class='cu-btn bg-green shadow' @click="changefreight">{{freighttext}}</button>
+				<button v-if='flag==4||flag==0' class='cu-btn bg-green shadow' @click="changefreight">{{freighttext}}</button>
 			</view>
 			<view v-if='gridList.serviceManagementType==1&&flag!=3' class="c-row ">
 				<view class="title">扣款</view>
 				<view class="con-list">
-					<input v-model='gridList.deductionAmount' placeholder="请输入扣款" name="input" type="digit"></input>
+					<input v-if='flag==4||flag==0' v-model='gridList.deductionAmount' placeholder="请输入扣款" name="input" type="digit"></input>
 				</view>
 			</view>
 			<view v-if='gridList.serviceManagementType==1&&flag!=3' class="c-row ">
@@ -74,7 +74,8 @@
 			<view v-if='gridList.serviceManagementType==1&&flag!=3' class="c-row ">
 				<view class="title">入库日期</view>
 				<view class="con-list">
-					<view @click='show5=true'>{{gridList.inOutDate?gridList.inOutDate:'请选择入库日期'}}</view>
+					<view v-if='flag==4||flag==0' @click='show5=true'>{{gridList.inOutDate?gridList.inOutDate:'请选择入库日期'}}</view>
+					<view v-else @click='show5=true'>{{gridList.inOutDate?gridList.inOutDate:'请选择入库日期'}}</view>
 					<u-picker  @confirm='inOutDatepicker($event)' :params="params" v-model="show5"
 						mode="time">
 					</u-picker>
@@ -84,7 +85,10 @@
 			<view v-if='gridList.serviceManagementType==3&&flag!=0' class="c-row ">
 				<view class="title">客户</view>
 				<view class="con-list">
-					<view @click='gocustomer'>
+					<view v-if='flag==4||flag==3' @click='gocustomer'>
+						{{gridList.customerName}}({{gridList.customerPhone}})
+					</view>
+					<view v-else>
 						{{gridList.customerName}}({{gridList.customerPhone}})
 					</view>
 				</view>
@@ -92,7 +96,7 @@
 			<view v-if='flag!=0' class="c-row ">
 				<view class="title">车牌号</view>
 				<view class="con-list">
-					<input v-model='gridList.carNumber' @click.stop="handleShowKeyboard" placeholder="请输入车牌号"
+					<input :disabled="flag!=4&&flag!=3" v-model='gridList.carNumber' @click.stop="handleShowKeyboard" placeholder="请输入车牌号"
 						name="input"></input>
 					<master-keyboard ref="keyboard" keyboardtype="car" :randomNumber="true" :newCar="false"
 						:defaultValue="gridList.carNumber" @keyboardClick="handleClick"></master-keyboard>
@@ -133,7 +137,7 @@
 			<view v-if='flag!=3' class="c-row ">
 				<view class="title">囤位号</view>
 				<view class="con-list">
-					<input v-model='gridList.storageTagNo' placeholder="请输入囤位号" name="input"></input>
+					<input :disabled="flag!=4&&flag!=0" v-model='gridList.storageTagNo' placeholder="请输入囤位号" name="input"></input>
 				</view>
 			</view>
 			<view v-if='flag!=3' class="c-row ">
@@ -142,7 +146,8 @@
 					<!-- <view v-if="flag != '0'">
 						{{gridList.goodsName}}
 					</view> -->
-					<view @click='goodsName = true'>{{gridList.goodsName}}</view>
+					<view v-if='flag==4||flag==0' @click='goodsName = true'>{{gridList.goodsName}}</view>
+					<view v-else>{{gridList.goodsName}}</view>
 					<u-picker :range="goodsList" range-key="goodsName" @confirm='goodsPicker($event)'
 						v-model="goodsName" mode="selector">
 					</u-picker>
@@ -157,7 +162,8 @@
 			<view v-if='gridList.serviceManagementType==1' class="c-row ">
 				<view class="title">运输方式</view>
 				<view class="con-list">
-					<view @click='show7=true'>{{gridList.outType?gridList.outType:'请选择运输方式'}}</view>
+					<view v-if='flag==4||flag==0' @click='show7=true'>{{gridList.outType?gridList.outType:'请选择运输方式'}}</view>
+					<view v-else>{{gridList.outType?gridList.outType:'请选择运输方式'}}</view>
 					<u-picker :range="multiSelector" range-key="name" @confirm='outtypepicker($event,0)' v-model="show7"
 						mode="selector">
 					</u-picker>
@@ -166,7 +172,8 @@
 			<view v-if='gridList.serviceManagementType==3&&flag!=0' class="c-row ">
 				<view class="title">运输方式</view>
 				<view class="con-list">
-					<view @click='show8=true'>{{outType?outType:'请选择运输方式'}}</view>
+					<view v-if='flag==4||flag==3' @click='show8=true'>{{outType?outType:'请选择运输方式'}}</view>
+					<view v-else>{{outType?outType:'请选择运输方式'}}</view>
 					<u-picker :range="multiSelector1" range-key="name" @confirm='outtypepicker($event,1)' v-model="show8"
 						mode="selector">
 					</u-picker>
@@ -175,7 +182,8 @@
 			<view v-if='gridList.serviceManagementType==1&&flag!=3||gridList.serviceManagementType==3&&gridList.outType=="自运"&&flag!=3' class="c-row ">
 				<view class="title">车队</view>
 				<view class="con-list">
-					<view @click='show6=true'>{{gridList.fleet?ridList.fleet:'非车队车辆'}}</view>
+					<view v-if='flag==4||flag==0' @click='show6=true'>{{gridList.fleet?ridList.fleet:'非车队车辆'}}</view>
+					<view v-else>{{gridList.fleet?ridList.fleet:'非车队车辆'}}</view>
 					<u-picker  @confirm='fleetpicker($event)' :range="fleetNameList" range-key="fleetName" v-model="show5"
 						mode="selector">
 					</u-picker>
@@ -184,49 +192,49 @@
 			<view v-if="gridList.outType=='汽运'&&gridList.serviceManagementType==1 ||gridList.outType == '集装箱船'&&gridList.serviceManagementType==1" class="c-row ">
 				<view class="title">箱号-1</view>
 				<view class="con-list">
-					<input v-model='gridList.boxNo' placeholder="请输入箱号" name="input" type="digit"></input>
+					<input :disabled='flag!=4&&flag!=0' v-model='gridList.boxNo' placeholder="请输入箱号" name="input" type="digit"></input>
 				</view>
 			</view>
 			<view v-if="gridList.outType== '汽运'&&gridList.serviceManagementType==1 ||gridList.outType == '集装箱船'&&gridList.serviceManagementType==1" class="c-row ">
 				<view class="title">封号-1</view>
 				<view class="con-list">
-					<input v-model='gridList.titleNo' placeholder="请输入封号" name="input" type="digit"></input>
+					<input :disabled='flag!=4&&flag!=0' v-model='gridList.titleNo' placeholder="请输入封号" name="input" type="digit"></input>
 				</view>
 			</view>
 			<view v-if="gridList.outType=='汽运'&&gridList.serviceManagementType==1 ||gridList.outType == '集装箱船'&&gridList.serviceManagementType==1" class="c-row ">
 				<view class="title">箱号-2</view>
 				<view class="con-list">
-					<input v-model='gridList.boxNoOther' placeholder="请输入箱号" name="input" type="digit"></input>
+					<input :disabled='flag!=4&&flag!=0' v-model='gridList.boxNoOther' placeholder="请输入箱号" name="input" type="digit"></input>
 				</view>
 			</view>
 			<view v-if="gridList.outType== '汽运'&&gridList.serviceManagementType==1 ||gridList.outType == '集装箱船'&&gridList.serviceManagementType==1" class="c-row ">
 				<view class="title">封号-2</view>
 				<view class="con-list">
-					<input v-model='gridList.titleNoOther' placeholder="请输入封号" name="input" type="digit"></input>
+					<input :disabled='flag!=4&&flag!=0' v-model='gridList.titleNoOther' placeholder="请输入封号" name="input" type="digit"></input>
 				</view>
 			</view>
 			<view v-if="gridList.serviceManagementType==3&&flag!=0" class="c-row">
 				<view class="title">箱号-1</view>
 				<view class="con-list">
-					<input v-model='gridList.boxNo' placeholder="请输入箱号" name="input" type="digit"></input>
+					<input :disabled='flag!=4&&flag!=0' v-model='gridList.boxNo' placeholder="请输入箱号" name="input" type="digit"></input>
 				</view>
 			</view>
 			<view v-if="gridList.serviceManagementType==3&&flag!=0" class="c-row">
 				<view class="title">封号-1</view>
 				<view class="con-list">
-					<input v-model='gridList.titleNo' placeholder="请输入封号" name="input" type="digit"></input>
+					<input :disabled='flag!=4&&flag!=0' v-model='gridList.titleNo' placeholder="请输入封号" name="input" type="digit"></input>
 				</view>
 			</view>
 			<view v-if="gridList.serviceManagementType==3&&flag!=0" class="c-row">
 				<view class="title">箱号-2</view>
 				<view class="con-list">
-					<input v-model='gridList.boxNoOther' placeholder="请输入箱号" name="input" type="digit"></input>
+					<input :disabled='flag!=4&&flag!=0' v-model='gridList.boxNoOther' placeholder="请输入箱号" name="input" type="digit"></input>
 				</view>
 			</view>
 			<view v-if="gridList.serviceManagementType==3&&flag!=0" class="c-row">
 				<view class="title">封号-2</view>
 				<view class="con-list">
-					<input v-model='gridList.titleNoOther' placeholder="请输入封号" name="input" type="digit"></input>
+					<input :disabled='flag!=4&&flag!=0' v-model='gridList.titleNoOther' placeholder="请输入封号" name="input" type="digit"></input>
 				</view>
 			</view>
 			<view v-if="gridList.type == '潮粮'&&gridList.serviceManagementType==3&&flag!=3" class="c-row">
@@ -261,7 +269,7 @@
 			</view>
 			<view v-if="gridList.type == '干粮'&&gridList.serviceManagementType==1&&flag!=3" class="c-row">
 				<view class="title">干粮单价（元/公斤）</view>
-				<view class="con-list" @click="setPrice">
+				<view class="con-list">
 					{{gridList.dryGrainPrice}}
 				</view>
 			</view>
@@ -427,6 +435,7 @@
 				coverTransition: '0s',
 				moving: false,
 				footprintList: [],
+				zjid:'',
 				searchKeyWord: '',
 				isVip: false,
 				flag: 0,
@@ -733,12 +742,23 @@
 				this.isShowAlert = true
 			},
 			alertBtn() {
+				this.gridList.agent=this.userInfo.userName;
 				var that = this
 				that.gridList.reWaterContent = that.gridList.waterContent
 				if (that.gridList.buckleMiscellaneous) {
 					that.gridList.reBuckleMiscellaneous = that.gridList.buckleMiscellaneous
 				}
 				that.gridList.flag = 1
+				if(this.flag==3){
+					this.gridList.statusFlag=7
+				}else if(this.flag==4||this.flag==0){
+					this.gridList.statusFlag=0
+				}
+				else if(this.flag==1){
+					this.gridList.statusFlag=1
+				}else if(this.flag==2){
+					this.gridList.statusFlag=2
+				}
 				this.$api.doRequest('post', '/qualityInspectionManagement/api/editQualityInspection', that.gridList).then(
 					res => {
 						if (res.data.code == "200") {
@@ -749,7 +769,7 @@
 								if (res.data.code == "200") {
 									that.$api.msg('提交成功！')
 									setTimeout(function() {
-										uni.navigateBack({})
+										uni.navigateBack({delta:Int16Array})
 									}, 1000)
 								} else {
 									that.$api.msg('提交失败')
@@ -813,7 +833,18 @@
 				this.gridList.goodsName = this.goodsList[e[0]].goodsName
 			},
 			submit() {
-				this.gridList.statusFlag=1
+				this.gridList.agent=this.userInfo.userName;
+				if(this.flag==3){
+					this.gridList.statusFlag=7
+				}else if(this.flag==4||this.flag==0){
+					this.gridList.statusFlag=0
+				}
+				else if(this.flag==1){
+					this.gridList.statusFlag=1
+				}else if(this.flag==2){
+					this.gridList.statusFlag=2
+				}
+				
 				if(this.gridList.serviceManagementType==3){
 					if(this.outType){
 						this.gridList.outType=this.outType
@@ -844,15 +875,19 @@
 				// if(this.flag==2){
 				// 	this.gridList.reInspector=this.userInfo.userName
 				// }
-				var that = this
 				if (!this.gridList.qualityNo) {
 					this.$api.msg('编号不能为空')
 					return
 				}
-				if (!this.gridList.binNumber) {
-					this.$api.msg('仓位不能为空')
-					return
+				var that = this
+				if(this.flag==4||this.flag==0){
+					if (!this.gridList.binNumber) {
+						this.$api.msg('仓位不能为空')
+						return
+					}
 				}
+				
+				
 				if(this.gridList.serviceManagementType==3){
 					if (!this.gridList.customerName) {
 						this.$api.msg('客户不能为空')
@@ -906,7 +941,7 @@
 					this.$api.msg('类型不能为空')
 					return
 				}
-				if (this.value == false || this.flag == 2) {
+				if (this.value == false&&this.flag!=3 || this.flag == 2) {
 					if (!this.gridList.grade) {
 						this.$api.msg('等级不能为空')
 						return
@@ -941,6 +976,8 @@
 					}
 				}
 				this.gridList.storageNumber = this.gridList.storageTagNo
+				var kid=JSON.parse(JSON.stringify(this.gridList.warehouseInOutId))
+				this.zjid=JSON.parse(JSON.stringify(this.gridList.id))
 				that.gridList.warehouseInOutDetail={
 					id:that.gridList.warehouseInOutId,
 					grade:that.gridList.grade,
@@ -958,7 +995,7 @@
 					mildewGrain:that.gridList.mildewGrain,
 					reMildewGrain:that.gridList.reMildewGrain,
 				}
-				
+				console.log(this.gridList)
 				uni.showModal({
 					content: text,
 					showCancel: true,
@@ -968,6 +1005,8 @@
 								that.$api.doRequest('post',
 									'/qualityInspectionManagement/api/editQualityInspection', that.gridList)
 								.then(res => {
+									that.gridList.id=kid
+									that.gridList.statusFlag=1
 									that.$api.doRequest('post',
 											'/warehouseInOutInfo/InOutWarehouse',
 											that.gridList)
@@ -979,6 +1018,8 @@
 										console.log('that.gridList', that.gridList)
 										if(that.utils.getCurrectRoles('acquisitionQuality.initial')){
 											that.isShowPrint = true
+										}else{
+											uni.navigateBack({delta:1})
 										}
 										// uni.getStorageSync("depotAcquisition_warehouseName")
 										// uni.navigateBack({})

pages/task/audit/Issueandreceipt_task_approval.vue

@@ -348,7 +348,8 @@
 										this.OutList = res.data.data[i]
 										this.OutList.judge = 1
 									} else if (res.data.data[i].inOutType == "移库入库" || res.data.data[i]
-										.inOutType == "暂存入库" || res
+										.inOutType == "暂存入库" || res.data.data[i]
+										.inOutType == "收购入库"|| res
 										.data.data[i].inOutType == "采购入库" || res.data.data[i].inOutType ==
 										"贸易服务入库") {
 										this.EnterList = res.data.data[i]

pages/task/audit/purchasecontract.vue

@@ -4,6 +4,9 @@
 			<u-form-item label-width='260' label="合同编号">
 				<u-input v-model="list.contractNo" input-align="right" placeholder="" disabled />
 			</u-form-item>
+			<u-form-item label-width='260' label="交易主体">
+				<u-input v-model="list.transactionSubject" input-align="right" placeholder="" disabled />
+			</u-form-item>
 			<u-form-item label-width='260' label="买方">
 				<u-input v-model="list.buyer" input-align="right" placeholder="" disabled />
 			</u-form-item>
@@ -74,6 +77,9 @@
 			<u-form-item v-if='list.deliverType == 1' label-width='260' label="临时仓库负责人">
 				<u-input v-model="list.personCharge" input-align="right" placeholder="" disabled />
 			</u-form-item>
+			<u-form-item label-width='300' label="结算单价（元/吨）">
+				<u-input v-model="list.settlementPrice" input-align="right" placeholder="" disabled />
+			</u-form-item>
 			<u-form-item label-width='260' label="货名">
 				<u-input v-model="list.contractGoodsInfo.goodsName" input-align="right" placeholder="" disabled />
 			</u-form-item>

pages/task/audit/salecontract.vue

@@ -4,6 +4,9 @@
 			<u-form-item label-width='260' label="合同编号">
 				<u-input v-model="list.contractNo" input-align="right" placeholder="" disabled />
 			</u-form-item>
+			<u-form-item label-width='260' label="交易主体">
+				<u-input v-model="list.transactionSubject" input-align="right" placeholder="" disabled />
+			</u-form-item>
 			<u-form-item label-width='260' label="运输方式">
 				<u-input v-model="list.shippingType" input-align="right" placeholder="" disabled />
 			</u-form-item>
@@ -19,6 +22,9 @@
 			<u-form-item label-width='260' label="卖方电话">
 				<u-input v-model="list.sellerPhone" input-align="right" placeholder="" disabled />
 			</u-form-item>
+			<u-form-item label-width='260' label="中转公司">
+				<u-input v-model="list.transitCompany" input-align="right" placeholder="" disabled />
+			</u-form-item>
 			<u-form-item label-width='260' label="结算方式">
 				<u-input v-model="list.settlementMethod" input-align="right" placeholder="" disabled />
 			</u-form-item>
@@ -71,6 +77,9 @@
 			<u-form-item label-width='300' label="最终实际交易量（吨）">
 				<u-input v-model="list.finalTradingVolume" input-align="right" placeholder="" disabled />
 			</u-form-item>
+			<u-form-item label-width='300' label="结算单价（元/吨）">
+				<u-input v-model="list.settlementPrice" input-align="right" placeholder="" disabled />
+			</u-form-item>
 			<u-form-item label-width='260' label="货名">
 				<u-input v-model="list.contractGoodsInfo.goodsName" input-align="right" placeholder="" disabled />
 			</u-form-item>

pages/task/my_task.vue

@@ -503,6 +503,10 @@
 					uni.navigateTo({
 						url: '/pages/task/audit/purchasecontract?id=' + item.businessId + "&isShowbtn=true"
 					})
+				}else if (item.businessCode == 'SHOU-CONTRACT-APPROVE') {
+					uni.navigateTo({
+						url: '/pages/task/audit/acquisitioncontract?id=' + item.businessId + "&isShowbtn=true"
+					})
 				} else if (item.businessCode == 'PROCUREMENT-RECEIPT-REPORT') {
 					uni.navigateTo({
 						url: '/pages/task/procurement_report_details?id=' + item.businessId + "&isShowbtn=true"

util/util.js

@@ -15,7 +15,7 @@ const utils = {
 	},
 	getCurrectRoles: function(role) {
 		let _roles = uni.getStorageSync('rolesList')
-		console.log(_roles)
+		// console.log(_roles)
 		for (let i = 0; i < _roles.length; i++) {
 			if (_roles[i] == role) {
 				return true