前端小程序erp模块 sdy

config/index.js

@@ -3,6 +3,8 @@ const dev = {
 	baseUrlNew: 'http://192.168.1.120:8090/',
 	// baseUrlNew: 'http://192.168.1.103:9100/',
 	// baseUrlNew: 'https://apitest.eliangeyun.com/',
+	// baseUrlNew: 'https://apitest.eliangeyun.com/',
+	// baseUrlNew: 'http://api1.eliangeyun.com/',
 	// baseUrlNew: 'http://api1.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false

pageD/identity/companyIdentity.vue

@@ -1,14 +1,14 @@
 <template>
 	<view class="center">
 		<view v-if='!status' class="top">
-			<text @click='consent' v-bind:class="switchs1">公司</text>
-			<text @click='consent' v-bind:class="switchs2">个人</text>
+			<text @click='consent' v-bind:class="switchs1" v-if="consentStatus">公司</text>
+			<text @click='consent' v-bind:class="switchs2" v-if="consentStatus1">个人</text>
 		</view>
 		<view class="content">
 			<view v-if="consentStatus == true">
 				<!-- 公司营业执照上传 -->
 				<view v-if="license1 != ''">
-					<upload v-if="consentStatus == true" class="upload" ref="upload" :action="action"
+					<upload :file-list='businesslicense' v-if="consentStatus == true" class="upload" ref="upload" :action="action"
 						:max-size="maxSize" :max-count="1" :size-type="['compressed']" @on-success="getImgUrl"
 						@on-remove="onRemove" @on-uploaded="isAdd = true" :before-upload="filterFileType"
 						:options="uploadOptions" :custom="uploadCustom"></upload>
@@ -80,6 +80,7 @@
 		name: "buy",
 		data() {
 			return {
+				isShowPerson:false,
 				action: this.$uploadUrl,
 				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
 				btnLoading: false, //防止重复点击
@@ -87,6 +88,7 @@
 				uploadCustom: true,
 				uploadCustom1: true,
 				uploadCustom2: true,
+				businesslicense:[],
 				uploadOptions: {
 					"text": "上传营业执照",
 					"bgc": ""
@@ -117,17 +119,19 @@
 				id1: "../../static/img/authentication/identityup(3).png",
 				id2: "../../static/img/authentication/identitylow(3).png",
 				identityImgs1: {},
-status:false,
+				status:false,
 				identityAuthenticationInfo: {},
 				tempFilePaths: [],
 				businessLicenseAddressUrl: "",
 				certificates: true,
+				isEdit:false
 			};
 		},
 		computed: {
 			...mapState(['hasLogin', 'userInfo'])
 		},
 		onLoad(options) {
+			// this.isEdit = options.isEdit;
 			if(options.status){
 				this.status=true
 				this.consentStatus = false
@@ -135,6 +139,56 @@ status:false,
 				this.switchs1 = "switchs2"
 				this.switchs2 = "switchs1"
 			}
+			if(options.id){
+				this.$api.doRequest('get', '/identityAuthenticationInfo/api/getIdentityAuthenticationInfo', {id:options.id},
+						'application/json;charset=UTF-8').then(res => {
+						console.log("成功连接")
+				
+						this.identityAuthenticationInfo = res.data.data
+						if (this.identityAuthenticationInfo.businessLicenseAddressUrl != "") {
+							this.businesslicense=[{url:this.identityAuthenticationInfo.businessLicenseAddressUrl}]
+						}
+						console.log(this.businesslicense)
+						// if (this.deptList.cardAddressUrl != "") {
+						// 	this.id = this.deptList.cardAddressUrl.split(",")
+						// 	this.idup = this.id[0]
+						// 	this.idlow = this.id[1]
+						// }
+						// if (this.deptList.payeeAddressUrl != "") {
+						// 	this.payeeAddress = this.deptList.payeeAddressUrl.split(","),
+						// 		this.bank1 = this.payeeAddress[0]
+						// 	this.bank2 = this.payeeAddress[1]
+						// }
+						// console.log(this.deptList.customerTypeFlag, "判断")
+						if (this.identityAuthenticationInfo.customerTypeFlag == 2) {
+							this.consentStatus = true
+							this.consentStatus1 = false
+							this.switchs1 = "switchs1"
+							this.switchs2 = "switchs2"
+						} else {
+							this.consentStatus = false
+							this.consentStatus1 = true
+							this.switchs1 = "switchs2"
+							this.switchs2 = "switchs1"
+						}
+				
+					})
+					.catch(res => {
+						if (res.errmsg) {
+							uni.showToast({
+								title: res.errmsg,
+								icon: 'none',
+								duration: 2000
+							})
+						} else {
+							uni.showToast({
+								title: "系统异常，请联系管理员",
+								icon: 'none',
+								duration: 2000
+							})
+						}
+					});
+			}
 		},
 		onShow(){
 			

pageD/identity/companyIdentityThree.vue

@@ -2,20 +2,21 @@
 	<view class="center">
 		<view>
 			<!-- 上传银行卡正面 -->
-			<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1"
-				:size-type="['compressed']" @on-success="getImgUrl"  @on-remove="onRemove"
+			<upload class="upload" :file-list='payeeAddressUrlList[0]' ref="upload" :action="action" :max-size="maxSize"
+				:max-count="1" :size-type="['compressed']" @on-success="getImgUrl" @on-remove="onRemove"
 				@on-uploaded="isAdd = true" :before-upload="filterFileType" :options="uploadOptions"
 				:custom="uploadCustom"></upload>
 			<!-- 上传银行卡反面 -->
-			<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1"
-				:size-type="['compressed']" @on-success="getImgUrl1"  @on-remove="onRemove"
+			<upload class="upload" :file-list='payeeAddressUrlList[1]' ref="upload" :action="action" :max-size="maxSize"
+				:max-count="1" :size-type="['compressed']" @on-success="getImgUrl1" @on-remove="onRemove"
 				@on-uploaded="isAdd = true" :before-upload="filterFileType" :options="uploadOptions1"
-				:custom="uploadCustom" ></upload>
+				:custom="uploadCustom"></upload>123456
 		</view>
 		<view class="c-row b-b">
 			<text class="tit">银行卡号</text>
 			<view class="con-list">
-				<input type='number' placeholder="请填写银行卡号" name="input" v-model="identityAuthenticationInfo.bankCard"></input>
+				<input type='number' placeholder="请填写银行卡号" name="input"
+					v-model="identityAuthenticationInfo.bankCard"></input>
 			</view>
 		</view>
 		<view class="c-row b-b">
@@ -129,6 +130,7 @@
 				zhihangStatus: true,
 				verification: true,
 				identityAuthenticationInfos: {},
+				payeeAddressUrlList: []
 			}
 		},
 		computed: {
@@ -140,6 +142,16 @@
 				this.identityAuthenticationInfo.payeeName = this.identityAuthenticationInfo.customerName
 				this.identityAuthenticationInfo.payeeNumberCard = this.identityAuthenticationInfo.customerNumberCard
 			}
+			if (this.identityAuthenticationInfo.payeeAddressUrl) {
+				let _lsit = []
+				_lsit = this.identityAuthenticationInfo.payeeAddressUrl.split(',')
+				this.payeeAddressUrlList[0] = [{
+					url: _lsit[0]
+				}]
+				this.payeeAddressUrlList[1] = [{
+					url: _lsit[0]
+				}]
+			}
 		},
 		methods: {
 			filterFileType(index, lists) {
@@ -321,15 +333,15 @@
 					// 	return
 					// }
 				} else if (this.identityAuthenticationInfo.customerTypeFlag == 2) {
-					// if (!this.identityAuthenticationInfo.compAddress) {
-					// 	this.$api.msg('公司地址不能为空')
-					// 	return
-					// }
-					// if (this.identityAuthenticationInfo.compAddress.length < 2 || this.identityAuthenticationInfo
-					// 	.compAddress.length > 20) {
-					// 	this.$api.msg('公司地址输入错误')
-					// 	return
-					// }
+					if (!this.identityAuthenticationInfo.compAddress) {
+						this.$api.msg('公司地址不能为空')
+						return
+					}
+					if (this.identityAuthenticationInfo.compAddress.length < 2 || this.identityAuthenticationInfo
+						.compAddress.length > 20) {
+						this.$api.msg('公司地址输入错误')
+						return
+					}
 				}
 				this.amendprice()
 
@@ -348,23 +360,26 @@
 					showCancel: true,
 					confirmText: '确定',
 					success: function(res) {
+
+						console.log('confirmInfo', that.identityAuthenticationInfo)
 						if (res.confirm) {
 							uni.showLoading({
-								title:"正在提交",
-								mask:true
+								title: "正在提交",
+								mask: true
 							})
 							that.$api.doRequest('get', '/commonUser/loginVerifyCode', {
 									phone: that.identityAuthenticationInfo.customerPhone,
 									verifyCode: that.verifyCode
 								}).then(res => {
-									console.log("loginVerifyCode:",res)
+									console.log("loginVerifyCode:", res)
 									if (res.data.code == 200) {
 										if (that.userInfo) {
 											that.identityAuthenticationInfo.commonId = that.userInfo.id
 										} else {
 											that.identityAuthenticationInfo.commonId = res.data.data.id
 										}
-										that.identityAuthenticationInfo.payeeAddressUrl = that.bankid.toString()
+										that.identityAuthenticationInfo.payeeAddressUrl = that.bankid
+											.toString()
 										// that.identityAuthenticationInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
 										that.identityAuthenticationInfos.customerPhone = that
 											.identityAuthenticationInfo.customerPhone
@@ -372,63 +387,164 @@
 												'/identityAuthenticationInfo/selectPhone', that
 												.identityAuthenticationInfos)
 											.then(res => {
-												console.log("selectPhone:",res)
+												console.log("selectPhone:", res)
 												if (res.data.code == '11018') {
 													uni.showModal({
 														title: '提示',
 														content: '该手机号已认证过个人粮商，再次认证将覆盖之前的认证信息，是否确定认证？',
 														success: function(res) {
 															if (res.confirm) {
-																that.$api.doRequest('post',
-																		'/identityAuthenticationInfo/api/addIdentityAuthenticationInfo',
-																		that
-																		.identityAuthenticationInfo
+																if (that
+																	.identityAuthenticationInfo
+																	.id) {
+																	that.$api.doRequest(
+																			'post',
+																			'/identityAuthenticationInfo/api/editIdentityAuthenticationInfo',
+																			that
+																			.identityAuthenticationInfo,
+																			'application/json;charset=UTF-8'
+																		).then(res => {
+																			console
+																				.log(
+																					"成功连接"
+																				)
+																			if (!that
+																				.identityAuthenticationInfo
+																				.goodsName
+																			) {
+																				that.$api
+																					.msg(
+																						'修改成功！'
+																					)
+																				uni.navigateTo({
+																					url: `/pages/attestation/index`
+																				})
+																				return
+																			}
+
+
+																		})
+																		.catch(res => {
+																			if (res
+																				.errmsg
+																			) {
+																				uni.showToast({
+																					title: res
+																						.errmsg,
+																					icon: 'none',
+																					duration: 2000
+																				})
+																			} else {
+																				uni.showToast({
+																					title: "系统异常，请联系管理员",
+																					icon: 'none',
+																					duration: 2000
+																				})
+																			}
+																		});
+
+
+																} else {
+																	that.$api.doRequest(
+																			'post',
+																			'/identityAuthenticationInfo/api/addIdentityAuthenticationInfo',
+																			that
+																			.identityAuthenticationInfo
 																		)
-																	.then(res => {
-																		if (res.data.code ==200) {
-																			uni.showToast({
-																				title: '提交成功',
-																				icon: 'none',
-																				duration: 2000
-																			})
-																			setTimeout(()=>{uni.navigateBack({
-																				delta: 3
-																			})},2000);
-																		}
-																	})
+																		.then(res => {
+																			if (res
+																				.data
+																				.code ==
+																				200) {
+																				uni.showToast({
+																					title: '提交成功',
+																					icon: 'none',
+																					duration: 2000
+																				})
+																				setTimeout
+																					(() => {
+																							uni.navigateBack({
+																								delta: 3
+																							})
+																						},
+																						2000
+																					);
+																			}
+																		})
+																}
 															}
 														}
 													});
 												} else if (res.data.code == 200) {
-													that.$api.doRequest('post',
-															'/identityAuthenticationInfo/api/addIdentityAuthenticationInfo',
-															that.identityAuthenticationInfo)
-														.then(res => {
-															console.log("addIdentityAuthenticationInfo:",res)
-															if (res.data.code == 200) {
-																uni.showToast({
-																	title: '提交成功',
-																	icon: 'none',
-																	duration: 2000
-																})
-																setTimeout(()=>{uni.navigateBack({
-																	delta: 3
-																})},2000);
-																
-															}
-															else{
-																console.log("异常1:",res)
-																uni.showToast({
-																	title: "系统异常，请联系管理员",
-																	icon: 'none',
-																	duration: 2000
+													if (that.identityAuthenticationInfo.id) {
+														that.$api.doRequest('post',
+																'/identityAuthenticationInfo/api/editIdentityAuthenticationInfo',
+																that.identityAuthenticationInfo,
+																'application/json;charset=UTF-8').then(
+																res => {
+																	console.log("成功连接")
+																	if (!that
+																		.identityAuthenticationInfo
+																		.goodsName) {
+																		that.$api.msg('修改成功！')
+																		uni.navigateTo({
+																			url: `/pages/attestation/index`
+																		})
+																		return
+																	}
+
 																})
-															}
-														})
+															.catch(res => {
+																if (res.errmsg) {
+																	uni.showToast({
+																		title: res.errmsg,
+																		icon: 'none',
+																		duration: 2000
+																	})
+																} else {
+																	uni.showToast({
+																		title: "系统异常，请联系管理员",
+																		icon: 'none',
+																		duration: 2000
+																	})
+																}
+															});
+
+													} else {
+														that.$api.doRequest('post',
+																'/identityAuthenticationInfo/api/addIdentityAuthenticationInfo',
+																that.identityAuthenticationInfo)
+															.then(res => {
+																console.log(
+																	"addIdentityAuthenticationInfo:",
+																	res)
+																if (res.data.code == 200) {
+																	uni.showToast({
+																		title: '提交成功',
+																		icon: 'none',
+																		duration: 2000
+																	})
+																	setTimeout(() => {
+																		uni.navigateBack({
+																			delta: 3
+																		})
+																	}, 2000);
+
+																} else {
+																	console.log("异常1:", res)
+																	uni.showToast({
+																		title: "系统异常，请联系管理员",
+																		icon: 'none',
+																		duration: 2000
+																	})
+																}
+															})
+													}
+
 												}
 												uni.hideLoading()
 											}).catch(res => {
-												console.log("异常:",res)
+												console.log("异常:", res)
 												uni.showToast({
 													title: "系统异常，请联系管理员",
 													icon: 'none',
@@ -457,13 +573,13 @@
 									uni.hideLoading()
 									return false
 								});
-							
+
 						} else if (res.cancel) {
 							// console.log('用户点击取消');
 						}
 					}
 				})
-				
+
 			},
 			getcode() {
 				var that = this
@@ -591,10 +707,12 @@
 		top: -150px;
 		text-align: center;
 	}
+
 	.upload {
 		margin: 20rpx 0;
 	}
-	.tit_red{
+
+	.tit_red {
 		color: #E54D42;
 	}
 </style>

pageD/identity/companyIdentityTwo.vue

@@ -2,12 +2,12 @@
 	<view class="center">
 		<view>
 			<!-- 个人身份证正面 -->
-			<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1"
+			<upload class="upload" :file-list='cardAddressUrlList[0]' ref="upload" :action="action" :max-size="maxSize" :max-count="1"
 				:size-type="['compressed']" @on-success="getImgUrl1"  @on-remove="onRemove"
 				@on-uploaded="isAdd = true" :before-upload="filterFileType" :options="uploadOptions1"
 				:custom="uploadCustom1" ></upload>
 			<!-- 个人身份证反面 -->
-			<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1"
+			<upload class="upload" :file-list='cardAddressUrlList[1]' ref="upload" :action="action" :max-size="maxSize" :max-count="1"
 				:size-type="['compressed']" @on-success="getImgUrl2"  @on-remove="onRemove"
 				@on-uploaded="isAdd = true" :before-upload="filterFileType" :options="uploadOptions2"
 				:custom="uploadCustom1" ></upload>
@@ -45,6 +45,7 @@
 				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
 				btnLoading: false, //防止重复点击
 				isAdd: true,
+				cardAddressUrlList:[],
 				imgUrls: [],
 				uploadCustom1: true,
 				uploadCustom2: true,
@@ -68,6 +69,12 @@
 		onLoad(options) {
 			this.identityAuthenticationInfo = JSON.parse(options.identityAuthenticationInfo)
 			console.log(this.identityAuthenticationInfo)
+			if (this.identityAuthenticationInfo.cardAddressUrl) {
+				let _lsit = []
+				_lsit = this.identityAuthenticationInfo.cardAddressUrl.split(',')
+				this.cardAddressUrlList[0] = [{url:_lsit[0]}]
+				this.cardAddressUrlList[1] = [{url:_lsit[0]}]
+			}
 		},
 		methods: {
 			filterFileType(index, lists) {
@@ -152,6 +159,7 @@
 				this.imgUrls.splice(index, 1);
 			},
 			jumpUrl() {
+				
 				this.identityAuthenticationInfo.cardAddressUrl = this.id.toString()
 				// if (this.id[0] == '' || this.id[0] == null) {
 				// 	this.$api.msg('请上传身份证正面')

pages/attestation/indexTwo.vue

@@ -49,9 +49,9 @@
 					<text style="font-size: 12px;" @click.stop="select(item)">设为默认</text>
 				</view>
 				<view class="options flex">
-					<view class='but' v-if="item.authenticationStatus == '已覆盖'||item.authenticationStatus == '已认证'"
+					<view class='but' v-if="item.cover == '1'||item.authenticationStatus == '已认证'"
 						@click="open(item)">更换手机号</view>
-					<view class='but' v-if="item.authenticationStatus == '未通过'" @click="companyEdit(item)">修改</view>
+					<view class='but' v-if="item.cover != '1'&&item.authenticationStatus == '未通过'" @click="companyEdit(item)">修改</view>
 					<view class='but' @click="deleteLS(item)">删除</view>
 				</view>
 			</view>
@@ -450,8 +450,9 @@
 				})
 			},
 			companyEdit(item) {
+				
 				uni.navigateTo({
-					url: `/pageD/identity/companyIdentityEdit?id=${item.id}`
+					url: `/pageD/identity/companyIdentity?isEdit=${true}&id=${item.id}`
 				})
 			},
 		}

pages/bill/index.vue

@@ -39,7 +39,7 @@
 				<view>{{item.netWeight}}</view>
 			</view>
 			<view class='flex justify-between align-item-center'>
-				<view style="color:#878C9C;padding:5px;">单价</view><view>{{item.tidalGrainPrice}}</view>
+				<view style="color:#878C9C;padding:5px;">单价</view><view>{{(item.tidalGrainPrice-item.unitDeduction).toFixed(2)}}</view>
 			</view>
 			<view class='flex justify-between align-item-center'>
 				<view style="color:#878C9C;padding:5px;">应付</view>

pages/erpbusiness/acquisitionInspection/acquisitionInspection.vue

@@ -29,12 +29,12 @@
 							<view class="bottom">{{item.updateDate}}</view>
 						</view>
 					</view>
-					<view class="right">{{item.customer}}</view>
+					<view class="right">{{item.secretaryWeigher}}</view>
 				</view>
-				<view class="row2" v-if="item.paymentManagement">
-					<view>{{item.paymentManagement.customerName}}</view>
-					<view>{{item.paymentManagement.carNo}}</view>
-					<view>{{item.paymentManagement.goodsName}}（{{item.qualityInspectionManagement.waterContent}}水）</view>
+				<view class="row2" v-if="item.qualityInspectionManagement">
+					<view>{{item.qualityInspectionManagement.customerName}}</view>
+					<view>{{item.qualityInspectionManagement.carNo}}</view>
+					<view>{{item.qualityInspectionManagement.goodsName}}（{{item.qualityInspectionManagement.waterContent}}水）</view>
 				</view>
 				<view class="row3">
 					<view class="row3-item">
@@ -81,9 +81,16 @@
 				dataList: [],
 				pageSize:10,
 				currentPage:1,
+				cangid:''
 			}
 		},
 		onShow() {
+			if(this.cangid){
+				uni.setStorageSync("cangid",this.cangid)
+			}
+			else{
+				this.cangid = uni.getStorageSync("cangid")
+			}
 			this.$api.doRequest('get', '/commonUser/api/checkSession').then(res => {
 					if (res.data.data == "INVALID") {
 						uni.showModal({
@@ -133,22 +140,31 @@
 		},
 		methods: {
 			loadData() {
+				var that = this
 				this.$api.doRequest('get', '/warehouseBaseInfo/selectWarehouseSelf', {
 					compId: '',
 					personCharge:this.userInfo.phone
 				}).then(res => {
 					console.log("warehouseBaseInfo", res)
 					let _resData = res.data.data
-					this.warehouseList = []
+					that.warehouseList = []
 					for (let i = 0; i < _resData.length; i++) {
 						let _obj = {
 							"label": _resData[i].warehouseName,
 							"value": _resData[i].id,
 						}
-						this.warehouseList.push(_obj)
+						that.warehouseList.push(_obj)
+						if (that.cangid&&that.cangid == _resData[i].id) {
+						  that.warehouseName = _resData[i].warehouseName
+						  that.warehouseId =  _resData[i].id
+						} 
+					}
+					if(that.warehouseList.length > 0 && !that.cangid){
+						that.warehouseName = that.warehouseList[0].label
+						that.warehouseId =  that.warehouseList[0].value
+						that.cangid =  that.warehouseList[0].value
 					}
-					this.warehouseName = this.warehouseList[0].label
-					this.warehouseId = this.warehouseList[0].value
+					
 					this.getList(true)
 				})
 			},
@@ -183,6 +199,8 @@
 				console.log(e)
 				this.warehouseName = e[0].label
 				this.dataList.warehouseName = e[0].label;
+				this.cangid=e[0].value
+				uni.setStorageSync("cangid",this.cangid)
 				this.getList(true)
 			},
 			//毛重

pages/erpbusiness/acquisitionInspection/grossWeightDetail.vue

@@ -37,7 +37,7 @@
 				<input class="right-bottom" placeholder="输入毛重" v-model="detailData.grossWeight"></input>
 			</view>
 		</view>
-		<u-button type="primary" class="submit" @click="submit">提交</u-button>
+		<u-button v-if='tabbar' type="primary" class="submit" @click="submit">提交</u-button>
 		<u-toast ref="uToast" />
 	</view>
 </template>
@@ -46,6 +46,8 @@
 	export default {
 		data() {
 			return {
+				tabbar:true,
+				windowHeight: '',
 				detailData: {
 					grossWeight:''
 				}
@@ -53,7 +55,22 @@
 		},
 		onShow() {},
 		onLoad(options) {
+			uni.onWindowResize((res) => {
+			    if(res.size.windowHeight < this.windowHeight){
+			        this.tabbar = false
+			    }else{
+			        this.tabbar = true
+			   }
+			   })
 			this.detailData = JSON.parse(options.detailData)
+			uni.getSystemInfo({
+				success:(res) => {
+					this.windowHeight = res.windowHeight;
+					// console.log(res)
+					this.system = res.system  // ios
+					this.platform = res.platform  // 14.3
+				}
+			})
 			console.log(this.detailData)
 		},
 		methods: {

pages/erpbusiness/acquisitionInspection/tareDetail.vue

@@ -67,9 +67,6 @@
 		onShow() {},
 		onLoad(options) {
 			this.detailData = JSON.parse(options.detailData)
-			if(!this.detailData.tare){
-				this.detailData.tare = 0
-			}
 			if(!this.detailData.buckleMiscellaneous){
 				this.detailData.buckleMiscellaneous = 0
 			}

pages/erpbusiness/add_quality_testing.vue

@@ -57,7 +57,7 @@
 			<view class="c-row ">
 				<view class="title">囤位号</view>
 				<view class="con-list">
-					<input v-model='gridList.storageTagNo' placeholder="请输入囤位号"
+					<input type='number' v-model='gridList.storageTagNo' placeholder="请输入囤位号"
 						 name="input"></input>
 				</view>
 			</view>

pages/erpbusiness/quality_testing.vue

@@ -41,8 +41,7 @@
 						</view>
 					</view>
 					<view class="right">{{item.customer}}</view>
-					<view v-if='item.status=="已质检"' class='right'>{{item.qualityInspector}}</view>
-					<view v-else></view>
+					<view class='right'>{{item.qualityInspector}}</view>
 				</view>
 				<view class="row2" >
 					<view v-if='managementType==1'>{{item.customerName}}</view>

pages/grain_pulse/enter.vue

@@ -5,7 +5,7 @@
 		<view class="back-btn cuIcon-back" @click="navBack"></view>
 		<!-- <view class='title1'>入驻</view> -->
 		<view class="titleUp">
-			请完善入驻信息
+			请填写入驻信息
 		</view>
 		<u-form class="forList">
 			<view style='padding-bottom:20px;' class="modular">