Browse Source

更新sdy

zhongtianhaoyuan 3 years ago
parent
commit
a2ea195f0f

+ 2 - 2
config/index.js

@@ -1,7 +1,7 @@
 const dev = {
 	baseUrl: 'https://www.zthymaoyi.com',
-	// baseUrlNew: 'http://api1.eliangeyun.com/',
-	baseUrlNew: 'http://192.168.1.107:8090/',
+	baseUrlNew: 'http://api1.eliangeyun.com/',
+	// baseUrlNew: 'http://192.168.1.107:8090/',
 	// baseUrlNew: 'http://192.168.1.122:9100/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false

+ 2 - 2
manifest.json

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

+ 7 - 3
pages/erp/deliveryfeedback/details.vue

@@ -172,7 +172,7 @@
 					<view>
 						<view v-if="item.status == '已装车' || item.status == '已送达'">{{item.loadingDate}}</view>
 						<view v-else @click='train(index)'>{{item.loadingDate?item.loadingDate:'请选择日期'}}</view>
-						<u-picker v-model="item.show2" mode="time" @confirm='dateChange1($event,item)' :params="params">
+						<u-picker v-model="item.show2" mode="time" @cancel='datecancel()' @confirm='dateChange1($event,item)' :params="params">
 						</u-picker>
 					</view>
 				</view>
@@ -212,7 +212,7 @@
 					<view>
 						<view v-if="item.status == '已装车' || item.status == '已送达'">{{item.loadingDate}}</view>
 						<view v-else @click='train(index)'>{{item.loadingDate?item.loadingDate:'请选择日期'}}</view>
-						<u-picker v-model="item.show2" mode="time" @confirm='dateChange1($event,index)' :params="params">
+						<u-picker v-model="item.show2" mode="time" @cancel='datecancel()' @confirm='dateChange1($event,index)' :params="params">
 						</u-picker>
 					</view>
 				</view>
@@ -294,7 +294,7 @@
 					<view>
 						<view v-if="item.status == '已装车' || item.status == '已送达'">{{item.loadingDate}}</view>
 						<view v-else @click='train(index)'>{{item.loadingDate?item.loadingDate:'请选择日期'}}</view>
-						<u-picker v-model="item.show2" mode="time" @confirm='dateChange1($event,index)' :params="params">
+						<u-picker v-model="item.show2" mode="time"  @cancel='datecancel()' @confirm='dateChange1($event,index)' :params="params">
 						</u-picker>
 					</view>
 				</view>
@@ -399,6 +399,10 @@
 				this.imgShow=true
 				this.url=url
 			},
+			datecancel(){
+				this.freightspace[this.index].show2=true
+				this.$forceUpdate();
+			},
 			submit(index,status){
 				var that = this
 				if(this.detailData.tranType=='火运'){

+ 1 - 1
pages/erp/deliveryfeedback/list.vue

@@ -4,7 +4,7 @@
 			<view class="right" @click='show1=true'>
 				<view>{{status}}</view>
 				<u-icon name="arrow-right"></u-icon>
-				<u-picker @confirm="statuschange" range-key='warehouseName' mode="selector" v-model="show1"
+				<u-picker @confirm="statuschange" range-key='name' mode="selector" v-model="show1"
 					:range="statusList"></u-picker>
 			</view>
 		</view>

+ 39 - 5
pages/erp/index.vue

@@ -34,6 +34,20 @@
 				</view>
 			</view>
 		</view>
+		<view>
+
+			<view class='title'>运输管理</view>
+			<view class="cu-list grid" :class="['col-' + gridCol,gridBorder?'':'no-border']" v-if="isShowBtn">
+				<view class="cu-item" v-for="(item,index) in gridList1" :key="index" @click="gridClick(item, index)"
+					v-if="index<gridCol*2">
+					<view :class="['cuIcon-' + item.cuIcon,'text-' + item.color]">
+						<image :src="item.src" class="sign"></image>
+					</view>
+		
+					<text>{{item.name}}</text>
+				</view>
+			</view>
+		</view>
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
 			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='立即开通'
 			title='您尚未开通ERP业务' showCancelButton='false' :content="content" @confirm="goOpenService" @cancel="cancelClick"></u-modal>
@@ -104,21 +118,41 @@
 						tips: 0,
 						url: `/pages/erp/improvedExWaehousing/improvedExWaehousing`,
 						show: true
-					},
+					}
+					// {
+					// 	num: 4,
+					// 	name: '开通业务',
+					// 	// icon: 'cuIcon-edit',
+					// 	src: '../../static/img/erp/shougouzhijian@3x.png',
+					// 	tips: 0,
+					// 	url: `/pages/erp/openService/openService`,
+					// 	show: true
+					// },
+					// {
+					// 	num: 5,
+					// 	name: '联系客服',
+					// 	// icon: 'cuIcon-edit',
+					// 	src: '../../static/img/erp/shougouzhijian@3x.png',
+					// 	tips: 0,
+					// 	url: `/pages/erp/contactCustomerService/contactCustomerService`,
+					// 	show: true
+					// }
+				],
+				gridList1: [
 					{
-						num: 4,
+						num: 0,
 						name: '发货反馈',
 						// icon: 'cuIcon-copy',
-						src: '../../static/img/erp/shougoujianjin@3x.png',
+						src: '../../static/img/erp/delivery@3x.png',
 						tips: 0,
 						url: '/pages/erp/deliveryfeedback/list',
 						show: true
 					},
 					{
-						num: 5,
+						num: 1,
 						name: '收货反馈',
 						// icon: 'cuIcon-edit',
-						src: '../../static/img/erp/shougouzhijian@3x.png',
+						src: '../../static/img/erp/receiving@3x.png',
 						tips: 0,
 						url: `/pages/erp/receivingfeedback/list`,
 						show: true

+ 7 - 3
pages/erp/receivingfeedback/details.vue

@@ -176,7 +176,7 @@
 					<view>
 						<view v-if="item.status == '已装车' || item.status == '已送达'">{{item.unloadingDate}}</view>
 						<view v-else @click='train(index)'>{{item.unloadingDate?item.unloadingDate:'请选择日期'}}</view>
-						<u-picker v-model="item.show2" mode="time" @confirm='dateChange1($event,item)' :params="params">
+						<u-picker v-model="item.show2" mode="time"  @cancel='datecancel()' @confirm='dateChange1($event,item)' :params="params">
 						</u-picker>
 					</view>
 				</view>
@@ -220,7 +220,7 @@
 					<view>
 						<view v-if="item.status == '已装车' || item.status == '已送达'">{{item.receiveDateEnd}}</view>
 						<view v-else @click='train(index)'>{{item.receiveDateEnd?item.receiveDateEnd:'请选择日期'}}</view>
-						<u-picker v-model="item.show2" mode="time" @confirm='dateChange2($event,index)' :params="params">
+						<u-picker v-model="item.show2" mode="time"  @cancel='datecancel()' @confirm='dateChange2($event,index)' :params="params">
 						</u-picker>
 					</view>
 				</view>
@@ -307,7 +307,7 @@
 					<view>
 						<view v-if="item.status == '已装车' || item.status == '已送达'">{{item.unloadingDate}}</view>
 						<view v-else @click='train(index)'>{{item.unloadingDate?item.unloadingDate:'请选择日期'}}</view>
-						<u-picker v-model="item.show2" mode="time" @confirm='dateChange1($event,index)' :params="params">
+						<u-picker v-model="item.show2" mode="time"  @cancel='datecancel()' @confirm='dateChange1($event,index)' :params="params">
 						</u-picker>
 					</view>
 				</view>
@@ -412,6 +412,10 @@
 				this.imgShow=true
 				this.url=url
 			},
+			datecancel(){
+				this.freightspace[this.index].show2=true
+				this.$forceUpdate();
+			},
 			submit(index,status){
 				var that = this
 				if(this.detailData.tranType=='火运'){

+ 1 - 1
pages/erp/receivingfeedback/list.vue

@@ -4,7 +4,7 @@
 			<view class="right" @click='show1=true'>
 				<view>{{status}}</view>
 				<u-icon name="arrow-right"></u-icon>
-				<u-picker @confirm="statuschange" range-key='warehouseName' mode="selector" v-model="show1"
+				<u-picker @confirm="statuschange" range-key='name' mode="selector" v-model="show1"
 					:range="statusList"></u-picker>
 			</view>
 		</view>

+ 174 - 154
pages/erpbusiness/edit_quality_testing.vue

@@ -23,24 +23,22 @@
 			<view class="c-row ">
 				<view class="title">车牌号</view>
 				<view class="con-list">
-					<input :disabled='flag==1' v-model='gridList.carNumber' placeholder="请输入车牌号"
-						 name="input"></input>
+					<input :disabled='flag==1' v-model='gridList.carNumber' placeholder="请输入车牌号" name="input"></input>
 				</view>
 			</view>
 			<view v-if="gridList.paramType != '1'" class="c-row ">
 				<view class="title">扣重比</view>
 				<view class="con-list">
 					<input :disabled='flag==1' v-model='gridList.buckleWeightRatio' placeholder="请输入扣重比"
-						 name="input"></input>
+						name="input"></input>
 				</view>
 			</view>
 			<view v-else class="c-row ">
 				<view class="title">扣杂</view>
 				<view class="con-list">
-					<input :disabled='flag==1' v-model='gridList.buckleMiscellaneous' placeholder="初检扣杂" @input="waterContentChange"
-						 	 name="input"></input>
-					<input v-if='flag==0' value='未复检' disabled placeholder="复检扣杂" 
-						name="input"></input>
+					<input :disabled='flag==1' v-model='gridList.buckleMiscellaneous' placeholder="初检扣杂"
+						@input="waterContentChange" name="input"></input>
+					<input v-if='flag==0' value='未复检' disabled placeholder="复检扣杂" name="input"></input>
 					<input v-else :disabled='flag!=1' v-model='gridList.reBuckleMiscellaneous' placeholder="复检扣杂"
 						name="input"></input>
 				</view>
@@ -49,13 +47,14 @@
 				<view class="title">购粮性质</view>
 				<view class="con-list">
 					<input :disabled='flag==1' v-model='gridList.natureOfGrainPurchase' placeholder="请输入购粮性质"
-						 name="input"></input>
+						name="input"></input>
 				</view>
 			</view>
 			<view class="c-row ">
 				<view class="title">仓位号</view>
 				<view class="con-list">
-					<u-picker  :range="warehouseList" range-key="binNumber" @confirm='binNumberpicker($event)' v-model="show" mode="selector" >
+					<u-picker :range="warehouseList" range-key="binNumber" @confirm='binNumberpicker($event)'
+						v-model="show" mode="selector">
 					</u-picker>
 					<view v-if='flag!=1' @click='show=true'>{{gridList.binNumber}}</view>
 					<view v-else>{{gridList.binNumber}}</view>
@@ -65,7 +64,7 @@
 				<view class="title">囤位号</view>
 				<view class="con-list">
 					<input :disabled='flag==1' v-model='gridList.storageTagNo' placeholder="请输入囤位号"
-						 name="input"></input>
+						name="input"></input>
 				</view>
 			</view>
 			<view class="c-row ">
@@ -84,14 +83,13 @@
 				<view class="title">净重单价(元/公斤)</view>
 				<view class="con-list">
 					<input :disabled='flag==1' v-model='gridList.tidalGrainPrice' disabled placeholder="自动获取,不可编辑"
-						 name="input"></input>
+						name="input"></input>
 				</view>
 			</view>
 			<view v-if="gridList.type == '干粮'" class="c-row">
 				<view class="title">干粮单价(元/公斤)</view>
 				<view class="con-list">
-					<input v-model='gridList.dryGrainPrice' placeholder="请输入干粮单价"
-						 name="input"></input>
+					<input v-model='gridList.dryGrainPrice' placeholder="请输入干粮单价" name="input"></input>
 				</view>
 			</view>
 		</view>
@@ -101,7 +99,8 @@
 			<view class="c-row ">
 				<view class="title">等级</view>
 				<view class="con-list">
-					<u-picker :range="gradeList" range-key="value" @confirm='gradepicker($event)' v-model="show1" mode="selector" >
+					<u-picker :range="gradeList" range-key="value" @confirm='gradepicker($event)' v-model="show1"
+						mode="selector">
 					</u-picker>
 					<view v-if='flag!=1' @click='show1=true'>{{gridList.grade?gridList.grade:'请选择等级'}}</view>
 					<view v-else>{{gridList.grade}}</view>
@@ -110,47 +109,43 @@
 			<view class="c-row ">
 				<view class="title">水分(%)</view>
 				<view class="con-list">
-					<input :disabled='flag==1' v-model='gridList.waterContent' placeholder="初检水分" @input="waterContentChange"
-					 name="input"></input>
-					  <input v-if='flag==0' value='未复检' disabled placeholder="复检水分"
-					  	name="input"></input>
-						<input :disabled='flag!=1' v-else v-model='gridList.reWaterContent' placeholder="复检水分"
-						 name="input"></input>
+					<input :disabled='flag==1' v-model='gridList.waterContent' placeholder="初检水分"
+						@input="waterContentChange" name="input"></input>
+					<input v-if='flag==0' value='未复检' disabled placeholder="复检水分" name="input"></input>
+					<input :disabled='flag!=1' v-else v-model='gridList.reWaterContent' placeholder="复检水分"
+						name="input"></input>
 				</view>
 			</view>
 			<view class="c-row ">
 				<view class="title">容重(克/升)</view>
 				<view class="con-list">
-					<input :disabled='flag==1' v-model='gridList.bulkDensity' placeholder="请输入容重"
-					 name="input"></input>
+					<input :disabled='flag==1' v-model='gridList.bulkDensity' placeholder="请输入容重" name="input"></input>
 				</view>
 			</view>
 			<view class="c-row ">
 				<view class="title">不完善粒(%)</view>
 				<view class="con-list">
 					<input :disabled='flag==1' v-model='gridList.imperfectGrain' placeholder="请输入不完整粒占比"
-						 name="input"></input>
+						name="input"></input>
 				</view>
 			</view>
 			<view class="c-row ">
 				<view class="title">杂质(%)</view>
 				<view class="con-list">
-					<input :disabled='flag==1' v-model='gridList.impurity' placeholder="请输入杂质占比"
-					 name="input"></input>
+					<input :disabled='flag==1' v-model='gridList.impurity' placeholder="请输入杂质占比" name="input"></input>
 				</view>
 			</view>
 			<view class="c-row ">
 				<view class="title">霉变粒(%)</view>
 				<view class="con-list">
 					<input :disabled='flag==1' v-model='gridList.mildewGrain' placeholder="请输入霉变粒占比"
-					 name="input"></input>
+						name="input"></input>
 				</view>
 			</view>
 			<view class="c-row ">
 				<view class="title">热损伤(%)</view>
 				<view class="con-list">
-					<input :disabled='flag==1' v-model='gridList.jiaorenli' placeholder="请输入热损伤占比"
-					 name="input"></input>
+					<input :disabled='flag==1' v-model='gridList.jiaorenli' placeholder="请输入热损伤占比" name="input"></input>
 				</view>
 			</view>
 		</view>
@@ -178,47 +173,58 @@
 				modalName: '',
 				mycarStyle: '',
 				feild: undefined,
-				id:0,
-				show:false,
-				selector:[],
-				show1:false,
+				id: 0,
+				show: false,
+				selector: [],
+				show1: false,
 				inputContent: '',
 				coverTransform: 'translateY(0px)',
 				coverTransition: '0s',
 				moving: false,
 				footprintList: [],
-				searchKeyWord:'',
+				searchKeyWord: '',
 				isVip: false,
-				flag:0,
+				flag: 0,
 				userInfoTmp: [],
 				inputStatus: 'none',
 				carInfo: [],
 				gridCol: 4,
-				pageSize:10,
-				currentPage:1,
+				pageSize: 10,
+				currentPage: 1,
 				gridBorder: false,
-				headUrl:"../../static/img/myimg/YongHu@3x.png",
-				userphone:"",
-				username:"请更改昵称",
+				headUrl: "../../static/img/myimg/YongHu@3x.png",
+				userphone: "",
+				username: "请更改昵称",
 				gridList: {
-					natureOfGrainPurchase:'贸易粮',
-					type:'潮粮',
-					tidalGrainPrice:'',
-					dryGrainPrice:''
+					natureOfGrainPurchase: '贸易粮',
+					type: '潮粮',
+					tidalGrainPrice: '',
+					dryGrainPrice: ''
 				},
-				managementType:'',
+				managementType: '',
 				warehouseName: '',
-				warehouseList:[],
+				warehouseList: [],
 				showTran: true,
 				companyId: 1,
 				current: 4,
-				gradeList:[
-					{key:1,value:'一等品'},
-					{key:2,value:'二等品'},
-					{key:3,value:'三等品'},
-					{key:4,value:'等外'},
+				gradeList: [{
+						key: 1,
+						value: '一等品'
+					},
+					{
+						key: 2,
+						value: '二等品'
+					},
+					{
+						key: 3,
+						value: '三等品'
+					},
+					{
+						key: 4,
+						value: '等外'
+					},
 				],
-				cangid:''
+				cangid: ''
 			}
 		},
 		// #ifndef MP
@@ -244,89 +250,91 @@
 		computed: {
 			...mapState(['hasLogin', 'userInfo']),
 			// 手机号中间4位加*
-			starUserphone(){
+			starUserphone() {
 				let reg = /^(\d{3})\d{4}(\d{4})$/;
-				if(this.userphone){
+				if (this.userphone) {
 					return this.userphone.replace(reg, "$1****$2");
 				}
 			}
 		},
-		onLoad(options){
-			this.id=options.id
-			this.flag=options.flag
-			this.cangid=options.cangid
-			this.managementType=options.managementType
+		onLoad(options) {
+			this.id = options.id
+			this.flag = options.flag
+			this.cangid = options.cangid
+			this.managementType = options.managementType
 		},
 		onShow() {
 			var that = this
-				this.$api.doRequest('get', '/qualityInspectionManagement/api/getQualityInspection',{
-					id:this.id
-				}).then(res => {
-					if(res.data.data){
-						let data = res.data.data
-						that.gridList =data
-						that.$api.doRequest('get', '/warehouseBaseInfo/getWarehouse',{
-							id:this.cangid
-						}).then(res => {
-							that.warehouseList=res.data.data.warehousePositionInfoList
-							
-						})
-					}
-				})
-				this.gridList.grade=this.gradeList[0].value
-				this.gridList.gradeKey=this.gradeList[0].key
+			this.$api.doRequest('get', '/qualityInspectionManagement/api/getQualityInspection', {
+				id: this.id
+			}).then(res => {
+				if (res.data.data) {
+					let data = res.data.data
+					that.gridList = data
+					that.$api.doRequest('get', '/warehouseBaseInfo/getWarehouse', {
+						id: this.cangid
+					}).then(res => {
+						that.warehouseList = res.data.data.warehousePositionInfoList
+
+					})
+				}
+			})
+			this.gridList.grade = this.gradeList[0].value
+			this.gridList.gradeKey = this.gradeList[0].key
 		},
 		methods: {
 			waterContentChange() {
 				var that = this
-				if(this.gridList.goodsName && this.cangid){
-					if(!this.gridList.dryGrainPrice||this.gridList.dryGrainPrice == 0){
-						this.$api.doRequest('get', '/purchasePrice/dryGrainPrice',{
-							warehouseId:this.cangid,
-							goodsName:this.gridList.goodsName
+				if (this.gridList.goodsName && this.cangid) {
+					if (!this.gridList.dryGrainPrice || this.gridList.dryGrainPrice == 0) {
+						this.$api.doRequest('get', '/purchasePrice/dryGrainPrice', {
+							warehouseId: this.cangid,
+							goodsName: this.gridList.goodsName
 						}).then(res => {
 							that.gridList.dryGrainPrice = res.data.data
 						})
 					}
-					
+
 				}
-				
+
 				if (this.gridList.goodsName) {
-				  for (var i = 0; i < this.purchasePriceList.length; i++) {
-					if (this.purchasePriceList[i].goodsName == this.gridList.goodsName) {
-					  this.gridList.buckleWeightRatio = this.purchasePriceList[i].deductWeight
-					  this.gridList.paramType = this.purchasePriceList[i].paramType
+					for (var i = 0; i < this.purchasePriceList.length; i++) {
+						if (this.purchasePriceList[i].goodsName == this.gridList.goodsName) {
+							this.gridList.buckleWeightRatio = this.purchasePriceList[i].deductWeight
+							this.gridList.paramType = this.purchasePriceList[i].paramType
+						}
 					}
-				  }
 				}
 				var numReg = /^[0-9]*$/
 				var numRe = new RegExp(numReg)
 				//潮粮单价改变事件
 				if (
-				  this.gridList.goodsName &&
-				  this.gridList.waterContent &&
-				  this.gridList.grade&&
-				  numRe.test(this.gridList.waterContent)
+					this.gridList.goodsName &&
+					this.gridList.waterContent &&
+					this.gridList.grade &&
+					numRe.test(this.gridList.waterContent)
 				) {
-					this.$api.doRequest('get', '/purchasePrice/tidalGrainPrice',{
-						warehouseId:this.cangid,
-						goodsName:this.gridList.goodsName,
+					this.$api.doRequest('get', '/purchasePrice/tidalGrainPrice', {
+						warehouseId: this.cangid,
+						goodsName: this.gridList.goodsName,
 						waterContent: this.gridList.waterContent,
 						grade: this.gridList.grade,
 					}).then(res => {
-						if(that.gridList.paramType == '1'){
-							that.gridList.tidalGrainPrice = parseFloat(parseFloat(res.data.data) - parseFloat(that.gridList.buckleMiscellaneous)/100*parseFloat(that.gridList.dryGrainPrice)).toFixed(4)
-							if(!that.gridList.tidalGrainPrice){
+						if (that.gridList.paramType == '1') {
+							that.gridList.tidalGrainPrice = parseFloat(parseFloat(res.data.data) - parseFloat(that
+								.gridList.buckleMiscellaneous) / 100 * parseFloat(that.gridList
+								.dryGrainPrice)).toFixed(4)
+							if (!that.gridList.tidalGrainPrice) {
 								that.gridList.tidalGrainPrice = ''
 							}
-						}else{
+						} else {
 							that.gridList.tidalGrainPrice = res.data.data
 						}
 					})
 				}
 			},
-			submit(){
-				this.gridList.flag=this.flag
+			submit() {
+				this.gridList.flag = this.flag
 				// if(this.flag==2){
 				// 	this.gridList.reInspector=this.userInfo.userName
 				// }
@@ -363,23 +371,25 @@
 					this.$api.msg('货名不能为空')
 					return
 				}
-				if (this.gridList.paramType!=1&&this.gridList.buckleWeightRatio < 0 ||this.gridList.paramType!=1&&this.gridList.buckleWeightRatio > 2) {
+				if (this.gridList.paramType != 1 && this.gridList.buckleWeightRatio < 0 || this.gridList.paramType != 1 &&
+					this.gridList.buckleWeightRatio > 2) {
 					this.$api.msg('扣重比输入错误')
 					return
 				}
 				if (
-					this.gridList.paramType!=1&&String(this.gridList.buckleWeightRatio).indexOf('.') != -1 &&
+					this.gridList.paramType != 1 && String(this.gridList.buckleWeightRatio).indexOf('.') != -1 &&
 					String(this.gridList.buckleWeightRatio).length -
-					(String(this.gridList.buckleWeightRatio).indexOf('.') + 1) > 2) 
-					{
-						this.$api.msg('扣重比输入错误')
-						return
+					(String(this.gridList.buckleWeightRatio).indexOf('.') + 1) > 2) {
+					this.$api.msg('扣重比输入错误')
+					return
 				}
-				if (this.flag==0&&this.gridList.paramType==1&&this.gridList.buckleMiscellaneous < 0 ||this.flag==0&&this.gridList.paramType==1&&this.gridList.buckleMiscellaneous > 50) {
+				if (this.flag == 0 && this.gridList.paramType == 1 && this.gridList.buckleMiscellaneous < 0 || this.flag ==
+					0 && this.gridList.paramType == 1 && this.gridList.buckleMiscellaneous > 50) {
 					this.$api.msg('初检扣杂输入错误')
 					return
 				}
-				if (this.flag==1&&this.gridList.paramType==1&&this.gridList.reBuckleMiscellaneous < 0 ||this.flag==0&&this.gridList.paramType==1&&this.gridList.reBuckleMiscellaneous > 50) {
+				if (this.flag == 1 && this.gridList.paramType == 1 && this.gridList.reBuckleMiscellaneous < 0 || this
+					.flag == 0 && this.gridList.paramType == 1 && this.gridList.reBuckleMiscellaneous > 50) {
 					this.$api.msg('复检扣杂输入错误')
 					return
 				}
@@ -429,34 +439,35 @@
 					confirmText: '提交',
 					success: function(res) {
 						if (res.confirm) {
-							that.$api.doRequest('post', '/qualityInspectionManagement/api/editQualityInspection',that.gridList).then(res => {
-								if(res.data.code==200){
-									that.$api.msg('编辑质检成功')
-									uni.navigateBack({
-									})
-								}
-							})
+							that.$api.doRequest('post',
+									'/qualityInspectionManagement/api/editQualityInspection', that.gridList)
+								.then(res => {
+									if (res.data.code == 200) {
+										that.$api.msg('编辑质检成功')
+										uni.navigateBack({})
+									}
+								})
 						}
 					}
 				})
 			},
-			gradepicker(e){
+			gradepicker(e) {
 				console.log(e)
 				// this.$set(this.gradeList,'grade',this.gradeList[e[0]].value)
-				this.gridList.grade=this.gradeList[e[0]].value
-				this.gridList.gradeKey=this.gradeList[e[0]].key
+				this.gridList.grade = this.gradeList[e[0]].value
+				this.gridList.gradeKey = this.gradeList[e[0]].key
 				this.waterContentChange()
 			},
-			binNumberpicker(e){
-				this.gridList.binNumber=this.warehouseList[e[0]].binNumber
+			binNumberpicker(e) {
+				this.gridList.binNumber = this.warehouseList[e[0]].binNumber
 			},
-			del(item){
-				this.$api.doRequest('get', '/qualityInspectionManagement/api/deleteQualityInspection',{
-					id:item.id
+			del(item) {
+				this.$api.doRequest('get', '/qualityInspectionManagement/api/deleteQualityInspection', {
+					id: item.id
 				}).then(res => {
-					if(res.data.code==200){
+					if (res.data.code == 200) {
 						this.$api.msg('删除成功')
-					}else{
+					} else {
 						this.$api.msg('系统异常,请联系管理员')
 					}
 				})
@@ -563,40 +574,50 @@
 		font-size: 18px;
 		font-weight: 550;
 	}
-	page{
-		background:#F5F6FA;
+
+	page {
+		background: #F5F6FA;
 	}
-	.wrap{
-		padding-bottom:10px;
-		font-size:14px;
-		background:#fff;margin:10px;border-radius:10px;
-		input{
-			font-size:14px;
+
+	.wrap {
+		padding-bottom: 10px;
+		font-size: 14px;
+		background: #fff;
+		margin: 10px;
+		border-radius: 10px;
+
+		input {
+			font-size: 14px;
 		}
-		>.title{
-			padding:10px 16px;
+
+		>.title {
+			padding: 10px 16px;
 		}
-		.b-b:after{
-			border-bottom:1px solid #eee;
+
+		.b-b:after {
+			border-bottom: 1px solid #eee;
 		}
 	}
-	.footer{
-		background:#fff;
-		position:fixed;
-		bottom:0;
-		width:100%;
-		padding:20px 10px;
-		z-index:10;
-		.button{
-			background:#22C572;
-			width:90%;
-			margin:0 auto;
-			padding:10px;
-			color:#fff;
-			text-align:center;
+
+	.footer {
+		background: #fff;
+		position: fixed;
+		bottom: 0;
+		width: 100%;
+		padding: 20px 10px;
+		z-index: 10;
+
+		.button {
+			background: #22C572;
+			width: 90%;
+			margin: 0 auto;
+			padding: 10px;
+			color: #fff;
+			text-align: center;
 			border-radius: 30px;
 		}
 	}
+
 	.c-row {
 		display: -webkit-box;
 		display: -webkit-flex;
@@ -607,7 +628,7 @@
 		padding: 20rpx 30rpx;
 		position: relative;
 	}
-	
+
 	.con-list {
 		-webkit-box-flex: 1;
 		-webkit-flex: 1;
@@ -624,9 +645,8 @@
 		text-align: right;
 		padding-right: 20rpx;
 	}
+
 	input:disabled {
-		color:#ccc;
+		color: #ccc;
 	}
 </style>
-
-

+ 11 - 1
pages/erpbusiness/examine_quality_testing.vue

@@ -40,8 +40,14 @@
 			</view>
 			<view v-if="gridList.paramType != '1'"  class="c-row ">
 				<view class="title">扣重比</view>
+			</view>
+			<view v-if='managementType==1' class="c-row ">
+				<view class="title">扣杂</view>
 				<view class="con-list">
-					{{gridList.buckleWeightRatio}}
+					{{gridList.buckleMiscellaneous}}
+				</view>
+				<view class="con-list">
+					{{gridList.reBuckleMiscellaneous}}
 				</view>
 			</view>
 			<view v-else class="c-row ">
@@ -113,6 +119,10 @@
 					 <input v-model='gridList.rewaterContent' placeholder="复检水分" @input="waterContentChange"
 					  name="input"></input>
 				</view>
+				<view class="con-list">
+					{{gridList.rewaterContent}}
+				</view>
+				
 			</view>
 			<view class="c-row ">
 				<view class="title">容重(克/升)</view>

+ 2 - 2
pages/task/audit/salecontract.vue

@@ -129,7 +129,7 @@
 				<view style='border-bottom:1px solid #eee;padding:10px;display:flex;justify-content:space-between;'>{{title}}
 				<u-icon name="close"></u-icon></view>
 				<view style='padding:10px;'>
-					<input v-model='auditMind' placeholder="请输入原因" type="text" value="" />
+					<input v-model='auditMind' placeholder="请输入审核意见,不超过100字" type="text" value="" />
 				</view>
 				<view  @click='passSubmit()' class="cancel">取消</view>
 				<view  @click='passSubmit()' class="confirm">确定</view>
@@ -201,7 +201,7 @@
 			pass(){
 				console.log(1111)
 				this.show=true
-				this.title='通过原因'
+				this.title='审核意见'
 			},
 			reject() {
 				this.show=true

BIN
static/img/erp/delivery@3x.png


BIN
static/img/erp/receiving@3x.png