前端钎样员

config/index.js

@@ -6,7 +6,7 @@ const dev = {
 	// baseUrlNew: 'http://192.168.1.114:8090/',
 	// baseUrlNew: 'http://192.168.1.122:8090/',
 	// baseUrlNew: 'http://192.168.110.82:8090/',
-	baseUrlNew: 'http://192.168.110.138:8090/',
+	baseUrlNew: 'http://192.168.110.202:8090/',
 	// baseUrlNew: 'http://api1.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false

pages/erpbusiness/add_quality_testing.vue

@@ -6,12 +6,12 @@
 				<view class="title">类型</view>
 				<view class="con-list">
 					<u-radio-group @change="groupChange" v-model="typevalue">
-						<u-radio key="1" label="贸易入库"  name="1">贸易入库</u-radio>
-						<u-radio key="3" label="收购入库" name="3">收购入库</u-radio>
+						<u-radio v-if="utils.getCurrectRoles('acquisitionQuality.initial')" key="1" label="贸易入库"  name="1">贸易入库</u-radio>
+						<u-radio v-if="utils.getCurrectRoles('acquisitionQuality.qview')" key="3" label="收购入库" name="3">收购入库</u-radio>
 					</u-radio-group>
 				</view>
 			</view>
-			<view class="c-row ">
+			<view v-if='utils.getCurrectRoles("acquisitionQuality.initial")' class="c-row ">
 				<view class="title">仓库</view>
 				<view class="con-list">
 					{{gridList.warehouseName}}
@@ -38,12 +38,12 @@
 					{{gridList.contractNo?gridList.contractNo:'自动获取，不可编辑'}}
 				</view>
 			</view>
-			<view class="c-row ">
+			<!-- <view v-if='utils.getCurrectRoles("acquisitionQuality.initial")' class="c-row ">
 				<view class="title">业务编号</view>
 				<view class="con-list">
 					{{gridList.qualityNo}}
 				</view>
-			</view>
+			</view> -->
 			<view v-if='typevalue==1' style=' align-items: flex-start;' class="c-row ">
 				<view class="title">提示</view>
 				<view class="con-list">
@@ -91,7 +91,7 @@
 					</u-picker>
 				</view>
 			</view>
-			<view v-if='typevalue==1||typevalue==3&&gridList.outType=="自运"' class="c-row ">
+			<view v-if='typevalue==1||typevalue==3&&gridList.outType=="自运"&&utils.getCurrectRoles("acquisitionQuality.initial")' class="c-row ">
 				<view class="title">车队</view>
 				<view class="con-list">
 					<view @click='show6=true'>{{gridList.fleet?ridList.fleet:'非车队车辆'}}</view>
@@ -109,7 +109,7 @@
 					</u-picker>
 				</view>
 			</view>
-			<view v-if='typevalue==3' class="c-row ">
+			<view v-if='typevalue==3&&utils.getCurrectRoles("acquisitionQuality.qview")' class="c-row ">
 				<view class="title">运输方式</view>
 				<view class="con-list">
 					<view @click='show8=true'>{{outType?outType:'请选择运输方式'}}</view>
@@ -142,13 +142,13 @@
 					<input v-model='gridList.titleNoOther' placeholder="请输入封号" name="input" type="digit"></input>
 				</view>
 			</view>
-			<view v-if="gridList.paramType != '1'" class="c-row ">
+			<view v-if="gridList.paramType != '1'&&utils.getCurrectRoles('acquisitionQuality.initial')" class="c-row ">
 				<view class="title">扣重比</view>
 				<view class="con-list">
 					<input v-model='gridList.buckleWeightRatio' placeholder="请输入扣重比" name="input" type="digit"></input>
 				</view>
 			</view>
-			<view class="c-row ">
+			<view v-if='typevalue==3&&utils.getCurrectRoles("acquisitionQuality.qview")||typevalue==1' class="c-row ">
 				<view class="title">货名</view>
 				<view class="con-list">
 					<view v-if='goodsdisabled'>{{gridList.goodsName}}</view>
@@ -158,7 +158,7 @@
 					</u-picker>
 				</view>
 			</view>
-			<view  v-if='typevalue==3' class="c-row ">
+			<view  v-if='typevalue==3&&utils.getCurrectRoles("acquisitionQuality.qview")' class="c-row ">
 				<view class="title">客户</view>
 				<view class="con-list">
 					<view @click='gocustomer' v-if='gridList.customerName'>
@@ -169,19 +169,19 @@
 					</view>
 				</view>
 			</view>
-			<view class="c-row ">
+			<view v-if='typevalue==3&&utils.getCurrectRoles("acquisitionQuality.qview")||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.paramType != '1'" class="c-row ">
+			<!-- <view v-if="gridList.paramType != '1'&&utils.getCurrectRoles('acquisitionQuality.initial')" class="c-row ">
 				<view class="title">扣重比</view>
 				<view class="con-list">
 					<input v-model='gridList.buckleWeightRatio' placeholder="请输入扣重比" name="input" type="digit"></input>
 				</view>
-			</view>
+			</view> -->
 			<!-- <view v-else class="c-row ">
 				<view class="title">扣杂</view>
 				<view class="con-list">
@@ -191,13 +191,13 @@
 						name="input" type="digit"></input>
 				</view>
 			</view> -->
-			<view v-if='typevalue==3'  class="c-row ">
+			<view v-if='typevalue==3&&utils.getCurrectRoles("acquisitionQuality.initial")'  class="c-row ">
 				<view class="title">购粮性质</view>
 				<view class="con-list">
 					<input v-model='gridList.natureOfGrainPurchase' placeholder="请输入购粮性质" name="input"></input>
 				</view>
 			</view>
-			<view class="c-row ">
+			<view v-if='utils.getCurrectRoles("acquisitionQuality.initial")' class="c-row ">
 				<view class="title">仓位号</view>
 				<view class="con-list">
 					<view @click='show=true'>{{gridList.binNumber?gridList.binNumber:'请选择仓位号'}}</view>
@@ -206,13 +206,13 @@
 					</u-picker>
 				</view>
 			</view>
-			<view class="c-row ">
+			<view v-if='utils.getCurrectRoles("acquisitionQuality.initial")' class="c-row ">
 				<view class="title">囤位号</view>
 				<view class="con-list">
 					<input type="digit" v-model='gridList.storageTagNo' placeholder="请输入囤位号" name="input"></input>
 				</view>
 			</view>
-			<view class="c-row ">
+			<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>
@@ -221,7 +221,7 @@
 				</view>
 				<view v-else class="con-list">{{gridList.type}}</view>
 			</view>
-			<view v-if="gridList.type == '潮粮'" class="c-row">
+			<view v-if="gridList.type == '潮粮'&&utils.getCurrectRoles('acquisitionQuality.initial')" class="c-row">
 				<view class="title">净重单价（元/公斤）</view>
 				<view class="con-list">
 					<input v-model='gridList.tidalGrainPrice' :disabled='pricedisabled' @blur='inputprice' placeholder="自动获取，不可编辑" name="input"
@@ -229,39 +229,39 @@
 				</view>
 				<button class='cu-btn bg-green shadow' @click="changeprice">{{pricetext}}</button>
 			</view>
-			<view v-if="gridList.type == '干粮'" class="c-row">
+			<view v-if="gridList.type == '干粮'&&utils.getCurrectRoles('acquisitionQuality.initial')" 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="typevalue==3" class="c-row">
+			<view v-if="typevalue==3&&utils.getCurrectRoles('acquisitionQuality.qview')" class="c-row">
 				<view class="title">箱号-1</view>
 				<view class="con-list">
 					<input v-model='gridList.boxNo' placeholder="请输入箱号" name="input" type="digit"></input>
 				</view>
 			</view>
-			<view v-if="typevalue==3" class="c-row">
+			<view v-if="typevalue==3&&utils.getCurrectRoles('acquisitionQuality.qview')" class="c-row">
 				<view class="title">封号-1</view>
 				<view class="con-list">
 					<input v-model='gridList.titleNo' placeholder="请输入封号" name="input" type="digit"></input>
 				</view>
 			</view>
-			<view v-if="typevalue==3" class="c-row">
+			<view v-if="typevalue==3&&utils.getCurrectRoles('acquisitionQuality.qview')" class="c-row">
 				<view class="title">箱号-2</view>
 				<view class="con-list">
 					<input v-model='gridList.boxNoOther' placeholder="请输入箱号" name="input" type="digit"></input>
 				</view>
 			</view>
-			<view v-if="typevalue==3" class="c-row">
+			<view v-if="typevalue==3&&utils.getCurrectRoles('acquisitionQuality.qview')" class="c-row">
 				<view class="title">封号-2</view>
 				<view class="con-list">
 					<input v-model='gridList.titleNoOther' placeholder="请输入封号" name="input" type="digit"></input>
 				</view>
 			</view>
 		</view>
-		<view style='padding-bottom:300rpx;'>
+		<view v-if="utils.getCurrectRoles('acquisitionQuality.initial')" style='padding-bottom:300rpx;'>
 			<view class='wrap'>
 				<view style='margin-right:10px;' class='flex justify-between align-item-center'>
 					<view class='title_b'>化验信息</view>
@@ -559,7 +559,7 @@
 			let number = '000' + this.warehouseCount
 			number = number.substring(number.length - 4, number.length)
 			this.gridList.warehouseName = options.warehouseName
-			this.gridList.qualityNo = 'SGRK' + this.getdate() + this.commonWarehouseNo + number
+			// this.gridList.qualityNo = 'SGRK' + this.getdate() + this.commonWarehouseNo + number
 			this.cangid = options.cangid
 			this.gridList.compName = uni.getStorageSync('compName')
 			this.gridList.person= options.personCharge
@@ -626,6 +626,11 @@
 			})
 		},
 		onShow(){
+			if(this.utils.getCurrectRoles('acquisitionQuality.initial')&&!this.utils.getCurrectRoles('acquisitionQuality.qview')){
+				this.typevalue='1'
+			}else{
+				this.typevalue='3'
+			}
 			uni.showLoading({title: '加载中',mask:true})
 			this.$api.doRequest('get', '/inOutWarehouseTask/selectInOutWarehouseNo', {
 				flag: 2,
@@ -779,7 +784,7 @@
 						this.gridList.inOutType = this.contractNolist[i].inOutType
 						if(this.gridList.inOutType=='采购入库'){
 							this.warehouseTradeCount = '000' + this.warehouseTradeCount
-							this.gridList.qualityNo='CGRK'+this.getdate()+this.commonWarehouseNo+this.warehouseTradeCount.substring(this.warehouseTradeCount.length - 4)
+							// this.gridList.qualityNo='CGRK'+this.getdate()+this.commonWarehouseNo+this.warehouseTradeCount.substring(this.warehouseTradeCount.length - 4)
 							if (!this.contractNolist[i].unitContractPrice) {
 								this.gridList.tips = '卖方' + this.contractNolist[i].seller
 							} else {
@@ -789,7 +794,7 @@
 							this.gridList.inOutTypeKey = 1
 						}else if(this.gridList.inOutType=='移库入库'){
 							this.warehouseTradeCount = '000' + this.warehouseTradeCount
-							this.gridList.qualityNo='YKRK'+this.getdate()+this.commonWarehouseNo+this.warehouseTradeCount.substring(this.warehouseTradeCount.length - 4)
+							// this.gridList.qualityNo='YKRK'+this.getdate()+this.commonWarehouseNo+this.warehouseTradeCount.substring(this.warehouseTradeCount.length - 4)
 							if (this.contractNolist[i].unitContractPrice) {
 								this.gridList.tips ='出货库' +data.sendWarehouse +' （' +this.contractNolist[i].unitContractPrice +'元/吨）'
 							} else {
@@ -812,8 +817,8 @@
 // 						  this.gridList.inOutTypeKey = 6
 // =======
 							this.warehouseTradeCount = '000' + this.warehouseTradeCount
-							this.gridList.qualityNo = 'CGRK' + this.getdate() + this.commonWarehouseNo + this
-								.warehouseTradeCount.substring(this.warehouseTradeCount.length - 4)
+							// this.gridList.qualityNo = 'CGRK' + this.getdate() + this.commonWarehouseNo + this
+								// .warehouseTradeCount.substring(this.warehouseTradeCount.length - 4)
 							if (this.contractNolist[i].contractNo) {
 								this.gridList.tips = '买方' + this.contractNolist[i].buyer
 							} else {
@@ -978,24 +983,96 @@
 				this.gridList.carNo=this.gridList.carNumber
 				this.gridList.baseId=this.cangid
 				this.gridList.warehouseId=this.cangid
-				if (!this.gridList.qualityNo) {
-					this.$api.msg('编号不能为空')
-					return
+				if (this.typevalue == 1) {
+					if (this.gridList.inOutType == '移库入库') {
+					  this.gridList.numberLetter = 'YKRK'
+					} else {
+					  this.gridList.numberLetter = 'CGRK'
+					}
+				} else {
+					this.gridList.numberLetter = 'SGRK'
 				}
-				if (!this.gridList.binNumber) {
-					this.$api.msg('仓位不能为空')
-					return
+				this.gridList.warehouseNo=this.commonWarehouseNo
+				if(this.utils.getCurrectRoles('acquisitionQuality.initial')){
+					// if (!this.gridList.qualityNo) {
+					// 	this.$api.msg('编号不能为空')
+					// 	return
+					// }
+					if (!this.gridList.binNumber) {
+						this.$api.msg('仓位不能为空')
+						return
+					}
+					if(this.typevalue==3){
+						if (!this.gridList.natureOfGrainPurchase) {
+							this.$api.msg('购粮性质不能为空')
+							return
+						}
+					}
+					if (!this.gridList.type) {
+						this.$api.msg('类型不能为空')
+						return
+					}
+					
+					if(this.value==false){
+						if (!this.gridList.grade) {
+							this.$api.msg('等级不能为空')
+							return
+						}
+						if (!this.gridList.impurity) {
+							this.$api.msg('杂质不能为空')
+							return
+						}
+						if (!this.gridList.waterContent) {
+							this.$api.msg('初检水分不能为空')
+							return
+						}
+						// if (!this.gridList.reWaterContent) {
+						// 	this.$api.msg('复检水分不能为空')
+						// 	return
+						// }
+						if (!this.gridList.mildewGrain) {
+							this.$api.msg('霉变粒不能为空')
+							return
+						}
+						if (!this.gridList.bulkDensity) {
+							this.$api.msg('容重不能为空')
+							return
+						}
+						if (!this.gridList.jiaorenli) {
+							this.$api.msg('热损伤不能为空')
+							return
+						}
+						if (!this.gridList.imperfectGrain) {
+							this.$api.msg('不完整粒不能为空')
+							return
+						}
+					}
 				}
-				if(this.typevalue==3){
-					if (!this.gridList.customerName) {
-						this.$api.msg('客户不能为空')
+				if(this.utils.getCurrectRoles('acquisitionQuality.qview')){
+					if(this.typevalue==3){
+						if (!this.gridList.customerName) {
+							this.$api.msg('客户不能为空')
+							return
+						}
+					}
+					if (!this.gridList.carNumber) {
+						this.$api.msg('车牌号不能为空')
+						return
+					}
+					if (this.gridList.carNumber.length != 7) {
+						this.$api.msg('车牌号输入错误')
 						return
 					}
-					if (!this.gridList.natureOfGrainPurchase) {
-						this.$api.msg('购粮性质不能为空')
+					if (!this.gridList.goodsName) {
+						this.$api.msg('货名不能为空')
 						return
 					}
 				}
+				if(this.utils.getCurrectRoles('acquisitionQuality.qview')&&!this.utils.getCurrectRoles('acquisitionQuality.initial')){
+					this.gridList.brazer=1
+				}else{
+					this.gridList.brazer=0
+				}
 				
 				// if (!this.gridList.storageTagNo) {
 				// 	this.$api.msg('囤位号不能为空')
@@ -1005,18 +1082,7 @@
 				// 	this.$api.msg('囤位号不能为空')
 				// 	return
 				// }
-				if (!this.gridList.carNumber) {
-					this.$api.msg('车牌号不能为空')
-					return
-				}
-				if (this.gridList.carNumber.length != 7) {
-					this.$api.msg('车牌号输入错误')
-					return
-				}
-				if (!this.gridList.goodsName) {
-					this.$api.msg('货名不能为空')
-					return
-				}
+				
 				// if (this.gridList.buckleWeightRatio < 0 || this.gridList.buckleWeightRatio > 2) {
 				// 	this.$api.msg('扣重比输入错误')
 				// 	return
@@ -1028,45 +1094,7 @@
 				// 	this.$api.msg('扣重比输入错误')
 				// 	return
 				// }
-				if (!this.gridList.type) {
-					this.$api.msg('类型不能为空')
-					return
-				}
 				
-				if(this.value==false){
-					if (!this.gridList.grade) {
-						this.$api.msg('等级不能为空')
-						return
-					}
-					if (!this.gridList.impurity) {
-						this.$api.msg('杂质不能为空')
-						return
-					}
-					if (!this.gridList.waterContent) {
-						this.$api.msg('初检水分不能为空')
-						return
-					}
-					// if (!this.gridList.reWaterContent) {
-					// 	this.$api.msg('复检水分不能为空')
-					// 	return
-					// }
-					if (!this.gridList.mildewGrain) {
-						this.$api.msg('霉变粒不能为空')
-						return
-					}
-					if (!this.gridList.bulkDensity) {
-						this.$api.msg('容重不能为空')
-						return
-					}
-					if (!this.gridList.jiaorenli) {
-						this.$api.msg('热损伤不能为空')
-						return
-					}
-					if (!this.gridList.imperfectGrain) {
-						this.$api.msg('不完整粒不能为空')
-						return
-					}
-				}
 				uni.showModal({
 					content: "确定提交质检信息？",
 					showCancel: true,

pages/erpbusiness/edit_quality_testing.vue

@@ -817,7 +817,12 @@
 				}else{
 					this.gridList.customerName = ''
 				}
-				this.gridList.flag = this.flag
+				
+				if(this.flag==4){
+					this.gridList.flag = 0
+				}else{
+					this.gridList.flag = this.flag
+				}
 				// if(this.flag==2){
 				// 	this.gridList.reInspector=this.userInfo.userName
 				// }

pages/erpbusiness/quality_testing.vue

@@ -118,7 +118,7 @@
 		<view v-show="isContent">
 			<uni-load-more :status="loadStatus"></uni-load-more>
 		</view>
-		<view v-if='managementType==1&&getRoles("acquisitionQuality.qview")' class="footer">
+		<view v-if='managementType==1&&getRoles("acquisitionQuality.qview")||managementType==1&&getRoles("acquisitionQuality.initial")' class="footer">
 			<view @click='add' class="button">新增</view>
 		</view>
 	</view>