前端改bug

pages/erpbusiness/add_quality_testing.vue

@@ -639,7 +639,7 @@
 				console.log(res)
 				this.taskNolist=res.data.data
 			})
-			this.multiSelector1=[]
+			this.multiSelector1=[{name:'他运',value:'他运'}]
 			this.$api.doRequest('get', '/inOutWarehouseTask/getContractNo', {
 				warehouseName:this.gridList.warehouseName
 			}).then(res => {
@@ -650,6 +650,8 @@
 						res.data.data.contractMangementInfoList[i].contractNo+' '+res.data.data.contractMangementInfoList[i].seller+'）'
 						this.multiSelector1.push(res.data.data.contractManagementInfoList[i])
 					}
+				}else{
+					this.multiSelector1=[{name:'他运',value:'他运'}]
 				}
 				// this.taskNolist=res.data.data
 			})
@@ -1068,9 +1070,12 @@
 						return
 					}
 				}
+				var text=''
 				if(this.utils.getCurrectRoles('acquisitionQuality.qview')&&!this.utils.getCurrectRoles('acquisitionQuality.initial')){
+					text="确定提交钎样信息？"
 					this.gridList.brazer=1
 				}else{
+					text="确定提交质检信息？"
 					this.gridList.brazer=0
 				}
 				
@@ -1096,7 +1101,7 @@
 				// }
 				
 				uni.showModal({
-					content: "确定提交质检信息？",
+					content: text,
 					showCancel: true,
 					confirmText: '提交',
 					success: function(res) {
@@ -1139,10 +1144,15 @@
 														.then(res => {
 															if (res.data.code == 200) {
 																that.$api.msg('提交成功')
-																that.isShowPrint = true
 																that.gridList.warehouseId = that.cangid
 																that.gridList.compId = uni.getStorageSync('pcUserInfo').compId
 																uni.setStorageSync("quality_print",that.gridList)
+																if(that.utils.getCurrectRoles('acquisitionQuality.initial')){
+																	that.isShowPrint = true
+																}else{
+																	uni.navigateBack({})
+																}
+																
 																console.log('that.gridList',that.gridList)
 																// uni.navigateBack({})
 															} else {
@@ -1167,10 +1177,15 @@
 											.then(res => {
 												if (res.data.code == 200) {
 													that.$api.msg('提交成功')
-													that.isShowPrint = true
 													that.gridList.warehouseId = that.cangid
 													that.gridList.compId = uni.getStorageSync('pcUserInfo').compId
 													uni.setStorageSync("quality_print",that.gridList)
+													if(that.utils.getCurrectRoles('acquisitionQuality.initial')){
+														that.isShowPrint = true
+													}else{
+														uni.navigateBack({})
+													}
+													
 													console.log('that.gridList',that.gridList)
 													// uni.navigateBack({})
 												} else {

pages/erpbusiness/customer.vue

@@ -5,9 +5,9 @@
 				<view style='flex:6;' class="search-form round Medium">
 					<text style='color: #ccc;text-indent:6px;' class="cuIcon-search"></text>
 					<input @input='searchinput' type="text" maxlength="20" :focus="true" v-model="searchKeyWord"
-						@confirm="doSearch()" placeholder=" 输入客户姓名、客户手机号或供应商姓名" confirm-type="search"></input>
+						@confirm="doSearch(1)" placeholder=" 输入客户姓名、客户手机号或供应商姓名" confirm-type="search"></input>
 				</view>
-				<view @click='doSearch()' class="Regular" style="width:4%;flex:1;">搜索</view>
+				<view @click='doSearch(1)' class="Regular" style="width:4%;flex:1;">搜索</view>
 				<u-icon @click='emptysearch' class="cuIcon" v-if='searchKeyWord.length>0' size="34"
 					name="close-circle-fill" color="#D6D9E0"></u-icon>
 				<!-- <text @click='emptysearch' v-if='searchKeyWord.length>0' class='tip_text cuIcon-roundclosefill'></text> -->
@@ -194,6 +194,7 @@
 			searchinput(e) {
 				if (this.searchKeyWord.length == 0) {
 					this.show = false
+					this.isContent=false
 					this.getList()
 				}
 
@@ -368,7 +369,11 @@
 				this.currentPage = 1
 				this.getList()
 			},
-			doSearch() {
+			doSearch(status) {
+				if(this.searchKeyWord.length == 0){
+					this.$api.msg('请输入内容后再进行搜索')
+					return
+				}
 				this.show = true
 				this.gridList = []
 				this.currentPage = 1
@@ -376,9 +381,10 @@
 					title: '正在加载',
 					mask: true
 				})
-				this.getList()
+				this.getList(status)
 			},
 			getList() {
+				
 				var that = this
 				var url = ''
 				var data = {}
@@ -390,13 +396,15 @@
 						searchKeyWord: this.searchKeyWord
 					}
 				} else {
-					url = '/searchRecordsInfo/selectSearchRecordsInfo'
-					data = {
-						pageSize: this.pageSize,
-						currentPage: this.currentPage,
-						functionType: "3",
-						commonId: this.userInfo.id
-					}
+					
+						url = '/searchRecordsInfo/selectSearchRecordsInfo'
+						data = {
+							pageSize: this.pageSize,
+							currentPage: this.currentPage,
+							functionType: "3",
+							commonId: this.userInfo.id
+						}
+					
 				}
 				this.$api.doRequest('get', url, data).then(res => {
 					if (res.data.data) {

pages/erpbusiness/edit_quality_testing.vue

@@ -126,7 +126,7 @@
 			<view v-if='flag!=3' class="c-row ">
 				<view class="title">仓位号</view>
 				<view class="con-list">
-					<view v-if='flag!=1' @click='show=true'>{{gridList.binNumber}}</view>
+					<view v-if='flag!=1' @click='show=true'>{{gridList.binNumber?gridList.binNumber:'请选择仓位号'}}</view>
 					<view v-else>{{gridList.binNumber}}</view>
 				</view>
 			</view>
@@ -259,7 +259,7 @@
 				</view>
 
 			</view>
-			<view v-if="gridList.type == '干粮'&&flag!=3" class="c-row">
+			<view v-if="gridList.type == '干粮'&&gridList.serviceManagementType==1&&flag!=3" class="c-row">
 				<view class="title">干粮单价（元/公斤）</view>
 				<view class="con-list" @click="setPrice">
 					{{gridList.dryGrainPrice}}
@@ -286,7 +286,7 @@
 							mode="selector">
 						</u-picker>
 						<view v-if='flag==1' @click='show2=true'>{{gridList.reGrade?gridList.reGrade:'请选择等级'}}</view>
-						<view v-else>{{gridList.reGrade}}</view>
+						<view v-if='flag==2'>{{gridList.reGrade}}</view>
 					</view>
 				</view>
 				<view class="c-row ">
@@ -294,8 +294,7 @@
 					<view class="con-list">
 						<input :disabled='flag==1' v-model='gridList.waterContent' placeholder="初检水分"
 							@input="waterContentChange" type="digit" name="input"></input>
-						<input v-if='flag==0' value='未复检' disabled placeholder="复检水分" name="input"></input>
-						<input :disabled='flag!=1' type="digit" v-else v-model='gridList.reWaterContent' placeholder="复检水分"
+						<input v-if='flag==1||flag==2' type="digit" v-model='gridList.reWaterContent' placeholder="复检水分"
 							name="input"></input>
 					</view>
 				</view>
@@ -304,7 +303,7 @@
 					<view class="con-list">
 						<input :disabled='flag==1' type="digit" v-model='gridList.bulkDensity' placeholder="请输入容重"
 							name="input"></input>
-							<input :disabled='flag!=1' type="digit" v-model='gridList.reBulkDensity' placeholder="请输入容重"
+							<input  v-if='flag==1||flag==2' type="digit" v-model='gridList.reBulkDensity' placeholder="请输入容重"
 								name="input"></input>
 					</view>
 				</view>
@@ -313,7 +312,7 @@
 					<view class="con-list">
 						<input :disabled='flag==1' type="digit" v-model='gridList.imperfectGrain' placeholder="请输入不完整粒占比"
 							name="input"></input>
-							<input :disabled='flag!=1' type="digit" v-model='gridList.reImperfectGrain' placeholder="请输入不完整粒占比"
+							<input  v-if='flag==1||flag==2' type="digit" v-model='gridList.reImperfectGrain' placeholder="请输入不完整粒占比"
 								name="input"></input>
 					</view>
 				</view>
@@ -322,7 +321,7 @@
 					<view class="con-list">
 						<input :disabled='flag==1' type="digit" v-model='gridList.impurity' placeholder="请输入杂质占比"
 							name="input"></input>
-						<input :disabled='flag!=1' type="digit" v-model='gridList.reImpurity' placeholder="请输入杂质占比"
+						<input  v-if='flag==1||flag==2' type="digit" v-model='gridList.reImpurity' placeholder="请输入杂质占比"
 							name="input"></input>
 					</view>
 				</view>
@@ -331,7 +330,7 @@
 					<view class="con-list">
 						<input :disabled='flag==1' type="digit" v-model='gridList.mildewGrain' placeholder="请输入霉变粒占比"
 							name="input"></input>
-						<input :disabled='flag!=1' type="digit" v-model='gridList.reMildewGrain' placeholder="请输入霉变粒占比"
+						<input  v-if='flag==1||flag==2' type="digit" v-model='gridList.reMildewGrain' placeholder="请输入霉变粒占比"
 							name="input"></input>
 					</view>
 				</view>
@@ -340,7 +339,7 @@
 					<view class="con-list">
 						<input :disabled='flag==1' type="digit" v-model='gridList.jiaorenli' placeholder="请输入热损伤占比"
 							name="input"></input>
-						<input :disabled='flag!=1' type="digit" v-model='gridList.reJiaorenli' placeholder="请输入热损伤占比"
+						<input  v-if='flag==1||flag==2' type="digit" v-model='gridList.reJiaorenli' placeholder="请输入热损伤占比"
 							name="input"></input>
 						<!-- <input v-model='gridList.jiaorenli' @click.stop="handleShowKeyboard1":disabled="true" placeholder="请输入热损伤占比" name="input"></input> -->
 					</view>
@@ -556,6 +555,9 @@
 					if(!that.gridList.reJiaorenli){
 						that.gridList.reJiaorenli=that.gridList.jiaorenli
 					}
+					if(this.gridList.outType&&this.gridList.serviceManagementType==3){
+						this.outType=this.gridList.outType
+					}
 					that.$api.doRequest('get', '/warehouseBaseInfo/getWarehouse', {
 						id: this.cangid
 					}).then(res => {
@@ -583,7 +585,7 @@
 			this.gridList.gradeKey = this.gradeList[0].key
 		},
 		onShow() {
-			this.multiSelector1=[]
+			this.multiSelector1=[{name:'他运',value:'他运'}]
 			this.$api.doRequest('get', '/inOutWarehouseTask/getContractNo', {
 				warehouseName:this.warehouseName
 			}).then(res => {
@@ -594,6 +596,8 @@
 						res.data.data.contractMangementInfoList[i].contractNo+' '+res.data.data.contractMangementInfoList[i].seller+'）'
 						this.multiSelector1.push(res.data.data.contractManagementInfoList[i])
 					}
+				}else{
+					this.multiSelector1=[{name:'他运',value:'他运'}]
 				}
 				// this.taskNolist=res.data.data
 			})
@@ -818,11 +822,25 @@
 					this.gridList.customerName = ''
 				}
 				
+				var text=''
+				if(this.utils.getCurrectRoles('acquisitionQuality.qview')&&!this.utils.getCurrectRoles('acquisitionQuality.initial')){
+					text="确定提交钎样信息？"
+					if(this.flag==3||this.flag==4||this.flag==0){
+						this.gridList.brazer=1
+					}
+					
+				}else{
+					text="确定提交质检信息？"
+					if(this.flag==3||this.flag==4||this.flag==0){
+						this.gridList.brazer=0
+					}
+				}
 				if(this.flag==4){
 					this.gridList.flag = 0
 				}else{
 					this.gridList.flag = this.flag
 				}
+				
 				// if(this.flag==2){
 				// 	this.gridList.reInspector=this.userInfo.userName
 				// }
@@ -940,8 +958,9 @@
 					mildewGrain:that.gridList.mildewGrain,
 					reMildewGrain:that.gridList.reMildewGrain,
 				}
+				
 				uni.showModal({
-					content: "确定提交质检信息？",
+					content: text,
 					showCancel: true,
 					confirmText: '提交',
 					success: function(res) {
@@ -958,7 +977,9 @@
 										that.gridList.warehouseId = that.cangid
 										uni.setStorageSync("quality_print", that.gridList)
 										console.log('that.gridList', that.gridList)
-										that.isShowPrint = true
+										if(that.utils.getCurrectRoles('acquisitionQuality.initial')){
+											that.isShowPrint = true
+										}
 										// uni.getStorageSync("depotAcquisition_warehouseName")
 										// uni.navigateBack({})
 									}

pages/erpbusiness/examine_quality_testing.vue

@@ -3,7 +3,7 @@
 		<view class='wrap'>
 			<view class='title_b'>基本信息</view>
 			<view v-if='gridList.managementType==1' class="c-row ">
-				<view class="title">入库类型</view>
+				<view class="title">类型</view>
 				<view v-if='gridList.serviceManagementType==1' class="con-list">
 					贸易入库
 				</view>
@@ -187,9 +187,9 @@
 				<view class="c-row ">
 					<view class="title">水分（%）</view>
 					<view class="con-list">
-						<input v-model='gridList.waterContent' placeholder="初检水分" @input=""
+						<input disabled v-model='gridList.waterContent' placeholder="初检水分" @input=""
 							name="input"></input>
-						<input v-model='gridList.reWaterContent' placeholder="复检水分" @input=""
+						<input disabled v-model='gridList.reWaterContent' placeholder="复检水分" @input=""
 							name="input"></input>
 					</view>
 					<!-- <view class="con-list">

pages/erpbusiness/quality_testing.vue

@@ -28,7 +28,7 @@
 		<view class="content">
 			<view style='background:#fff;' class="flex">
 				<view class='line' :class='statusType==""?"active":""' @click='clickstatus("")'>全部</view>
-				<view class='line' :class='statusType=="7"?"active":""' @click='clickstatus("7")'>待初检</view>
+				<view class='line' :class='statusType=="0"?"active":""' @click='clickstatus("0")'>待初检</view>
 				<view class='line' :class='statusType=="1"?"active":""' @click='clickstatus("1")'>待复检</view>
 				<view class='line' :class='statusType=="2"?"active":""' @click='clickstatus("2")'>待确认</view>
 			</view>
@@ -297,10 +297,13 @@
 				})
 			},
 			examine(item) {
-				uni.navigateTo({
-					url: '/pages/erpbusiness/examine_quality_testing?id=' + item.id + '&managementType=' + this
-						.managementType + '&cangid=' + this.cangid + '&statusShow=' + item.status
-				})
+				if(item.status!='待初检'){
+					uni.navigateTo({
+						url: '/pages/erpbusiness/examine_quality_testing?id=' + item.id + '&managementType=' + this
+							.managementType + '&cangid=' + this.cangid + '&statusShow=' + item.status
+					})
+				}
+				
 			},
 			emptysearch() {
 				this.searchKeyWord = ''
@@ -367,8 +370,10 @@
 					})
 			},
 			edit(item, status) {
-				if(this.utils.getCurrectRoles('acquisitionQuality.qview')&&this.utils.getCurrectRoles('acquisitionQuality.initial')){
-					status=4
+				if(status==0||status==3){
+					if(this.utils.getCurrectRoles('acquisitionQuality.qview')&&this.utils.getCurrectRoles('acquisitionQuality.initial')){
+						status=4
+					}	
 				}
 				uni.navigateTo({
 					url: '/pages/erpbusiness/edit_quality_testing?id=' + item.id + '&managementType=' + this

pages/user/user.vue

@@ -307,7 +307,7 @@
 						num: 7,
 						name: '打卡',
 						// icon: 'cuIcon-edit',
-						src: '../../static/img/sign/kdsg.png',
+						src: '../../static/img/sign/daka@3x.png',
 						tips: 0,
 						url: `/pages/clock/the_clock`,
 						show: true
@@ -316,7 +316,7 @@
 						num: 8,
 						name: '请假',
 						// icon: 'cuIcon-edit',
-						src: '../../static/img/sign/kdsg.png',
+						src: '../../static/img/sign/qingjia@3x.png',
 						tips: 0,
 						url: `/pages/leave/the_leave`,
 						show: true
@@ -325,7 +325,7 @@
 						num: 9,
 						name: '加油',
 						// icon: 'cuIcon-edit',
-						src: '../../static/img/sign/kdsg.png',
+						src: '../../static/img/sign/jiayou.png',
 						tips: 0,
 						url: `/pages/fuelfilling/the_fuel_filling`,
 						show: true
@@ -334,11 +334,20 @@
 						num: 10,
 						name: '短途记录',
 						// icon: 'cuIcon-edit',
-						src: '../../static/img/sign/kdsg.png',
+						src: '../../static/img/sign/duantujilu.png',
 						tips: 0,
 						url: `/pages/shortDistance/short_distance_record`,
 						show: true
-					}
+					},
+					{
+						num: 11,
+						name: '库点收购',
+						// icon: 'cuIcon-edit',
+						src: '../../static/img/sign/kdsg.png',
+						tips: 0,
+						url: `/pages/user/depotAcquisition/depotAcquisition`,
+						show: true
+					},
 				],
 				showTran: true,
 				companyId: 1,