前端

manifest.json

@@ -2,8 +2,8 @@
     "name" : "易粮易运",
     "appid" : "__UNI__7297DA2",
     "description" : "易粮易运——为天下粮食人服务的App",
-    "versionName" : "1.1.36",
-    "versionCode" : 1136,
+    "versionName" : "1.1.37",
+    "versionCode" : 1137,
     "transformPx" : false,
     /* SDK配置 */
     "quickapp" : {},

pageD/identity/companyIdentity.vue

@@ -35,12 +35,14 @@
 				<view>
 					<!-- <image src="../../static/img/authentication/business.png" mode=""></image> -->
 					<!-- 个人身份证正面 -->
-					<upload class="upload" ref="upload1" delIcon="trash" :action="action" :max-size="maxSize" :max-count="1"
+					<upload class="upload" ref="upload1" :action="action" :max-size="maxSize" :max-count="1"
 						:size-type="['compressed']" @on-success="getImgUrl1" @on-remove="onRemove"
+						delIconSize='30' delBgColor='rgba(0,0,0,0.4)' delIcon="trash"
 						@on-uploaded="isAdd = true" :before-upload="filterFileType" :options="uploadOptions1"
 						:custom="uploadCustom1"></upload>
 					<!-- 个人身份证反面 -->
-					<upload class="upload" ref="upload2" delIcon="trash" :action="action" :max-size="maxSize" :max-count="1"
+					<upload class="upload" ref="upload2" :action="action" :max-size="maxSize" :max-count="1"
+					    delIconSize='30' delBgColor='rgba(0,0,0,0.4)' delIcon="trash"
 						:size-type="['compressed']" @on-success="getImgUrl2" @on-remove="onRemove"
 						@on-uploaded="isAdd = true" :before-upload="filterFileType" :options="uploadOptions2"
 						:custom="uploadCustom2"></upload>
@@ -58,7 +60,7 @@
 					<text class="tit_red">*</text>
 					<text class="tit">身份证号</text>
 					<view class="con-list">
-						<input placeholder="请填写身份证号" name="input"
+						<input placeholder="请填写身份证号" name="input" maxlength="18"
 							v-model="identityAuthenticationInfo.customerNumberCard"></input>
 					</view>
 				</view>

pageD/identity/companyIdentityEdit.vue

@@ -44,7 +44,7 @@
 				<view class="c-row ">
 					<text class="tit">身份证号</text>
 					<view class="con-list">
-						<input placeholder="请填写身份证号" name="input" v-model="deptList.customerNumberCard"></input>
+						<input placeholder="请填写身份证号" maxlength="18" name="input" v-model="deptList.customerNumberCard"></input>
 					</view>
 				</view>
 			</view>
@@ -114,7 +114,7 @@
 				<view class="c-row b-b">
 					<text class="tit">身份证号</text>
 					<view class="con-list">
-						<input placeholder="请填写身份证号" name="input" v-model="deptList.customerNumberCard"></input>
+						<input placeholder="请填写身份证号" name="input" maxlength="18" v-model="deptList.customerNumberCard"></input>
 					</view>
 				</view>
 			</view>

pageD/identity/companyIdentityThree.vue

@@ -4,11 +4,13 @@
 			<!-- 上传银行卡正面 -->
 			<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"
+				 delIconSize='30' delBgColor='rgba(0,0,0,0.4)' delIcon="trash" 
 				@on-uploaded="isAdd = true" :before-upload="filterFileType" :options="uploadOptions"
 				:custom="uploadCustom"></upload>
 			<!-- 上传银行卡反面 -->
 			<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"
+				 delIconSize='30' delBgColor='rgba(0,0,0,0.4)' delIcon="trash" 
 				@on-uploaded="isAdd = true" :before-upload="filterFileType" :options="uploadOptions1"
 				:custom="uploadCustom"></upload>
 		</view>
@@ -55,7 +57,7 @@
 				<input style='text-align:right;' v-model='verifyCode' placeholder="请输入验证码" type="number" maxlength="6">
 			</view>
 		</view>
-		<view class="c-row b-b" v-if="identityAuthenticationInfo.customerTypeFlag == 2">
+		<!-- <view class="c-row b-b" v-if="identityAuthenticationInfo.customerTypeFlag == 2">
 			<text class="tit">公司地址</text>
 			<view class="con-list">
 				<input placeholder="请填写公司地址" name="input" v-model="identityAuthenticationInfo.compAddress"></input>
@@ -66,7 +68,7 @@
 			<view class="con-list">
 				<input placeholder="请填写联系地址" name="input" v-model="identityAuthenticationInfo.compAddress"></input>
 			</view>
-		</view>
+		</view> -->
 		<view class="c-row b-b" >
 			<text class="tit">供应商姓名</text>
 			<view class="con-list">
@@ -326,15 +328,15 @@
 						this.$api.msg('收款人身份证号输入错误')
 						return
 					}
-					if (!this.identityAuthenticationInfo.compAddress) {
-						this.$api.msg('联系地址不能为空')
-						return
-					}
-					if (this.identityAuthenticationInfo.compAddress.length < 2 || this.identityAuthenticationInfo
-						.compAddress.length > 40) {
-						this.$api.msg('联系地址输入错误')
-						return
-					}
+					// if (!this.identityAuthenticationInfo.compAddress) {
+					// 	this.$api.msg('联系地址不能为空')
+					// 	return
+					// }
+					// if (this.identityAuthenticationInfo.compAddress.length < 2 || this.identityAuthenticationInfo
+					// 	.compAddress.length > 40) {
+					// 	this.$api.msg('联系地址输入错误')
+					// 	return
+					// }
 				} else if (this.identityAuthenticationInfo.customerTypeFlag == 2) {
 					if (!this.identityAuthenticationInfo.compAddress) {
 						this.$api.msg('公司地址不能为空')

pageD/identity/companyIdentityTwo.vue

@@ -4,11 +4,13 @@
 			<!-- 个人身份证正面 -->
 			<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"
+				delIconSize='30' delBgColor='rgba(0,0,0,0.4)' delIcon="trash" 
 				@on-uploaded="isAdd = true" :before-upload="filterFileType" :options="uploadOptions1"
 				:custom="uploadCustom1" ></upload>
 			<!-- 个人身份证反面 -->
 			<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"
+				delIconSize='30' delBgColor='rgba(0,0,0,0.4)' delIcon="trash" 
 				@on-uploaded="isAdd = true" :before-upload="filterFileType" :options="uploadOptions2"
 				:custom="uploadCustom1" ></upload>
 		</view>
@@ -24,7 +26,7 @@
 			<text class="tit_red">*</text>
 			<text class="tit">身份证号</text>
 			<view class="con-list">
-				<input  placeholder="请填写身份证号" name="input"
+				<input  placeholder="请填写身份证号" name="input" maxlength="18"
 					v-model="identityAuthenticationInfo.customerNumberCard"></input>
 			</view>
 		</view>

pageD/identity/driverIdentity.vue

@@ -22,7 +22,7 @@
 			<view class="c-row b-b">
 				<text class="tit">身份证号</text>
 				<view class="con-list">
-					<input placeholder="请填写身份证号" name="input" v-model="DriverViewInfo.numberCard"></input>
+					<input placeholder="请填写身份证号" maxlength="18" name="input" v-model="DriverViewInfo.numberCard"></input>
 				</view>
 			</view>
 			<view class="c-row b-b">

pageD/identity/driverIdentityEdit.vue

@@ -30,7 +30,7 @@
 				<view class="c-row ">
 					<text class="tit">身份证号</text>
 					<view class="con-list">
-						<input placeholder="请填写身份证号" name="input" v-model="DriverViewInfo.numberCard"></input>
+						<input placeholder="请填写身份证号" maxlength="18" name="input" v-model="DriverViewInfo.numberCard"></input>
 					</view>
 				</view>
 				<view class="c-row ">

pages/erpbusiness/edit_quality_testing.vue

@@ -99,7 +99,7 @@
 					<input v-model='gridList.dryGrainPrice' placeholder="请输入干粮单价" name="input"></input>
 				</view>
 			</view>
-			<view class="c-row-fj" v-if="flag==2">
+			<view class="c-row-fj" v-if="flag==2||flag==1">
 				<view style="margin: 0px 0px 30rpx 10rpx;">复检备注</view>
 					<textarea class='textarea-style' v-model='gridList.reMemo' placeholder="请输入复检备注" maxlength="300"></textarea>
 			</view>
@@ -378,10 +378,8 @@
 			},
 			alertBtn() {
 				var that = this
-				this.$api.doRequest('post', '/qualityInspectionManagement/api/editQualityInspection', {
-					id: this.id,
-					flag:2
-				}).then(res => {
+				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 => {

pages/erpbusiness/quality_testing.vue

@@ -63,7 +63,7 @@
 						@click.stop='edit(item,0)' class='button'>初检</view>
 					<view
 						v-if='getRoles("acquisitionQuality.con")&&item.confirm!="1"&&item.status=="已复检"&&managementType==1'
-						@click.stop='edit(item,1)' class='button'>确认</view>
+						@click.stop='edit(item,2)' class='button'>确认</view>
 					<view v-if='getRoles("acquisitionQuality.again")&&item.confirm!="1"&&managementType==1'
 						@click.stop='edit(item,1)' class='button'>复检</view>
 					<view v-if='getRoles("acquisitionQualityOut.edit")&&item.status=="已称毛重"&&managementType==3'