前端

pages.json

@@ -414,6 +414,7 @@
 		{
 			"path": "pages/erpbusiness/index",
 			"style": {
+				// "navigationBarTitleText": "入库管理"
 				"navigationBarTitleText": "收购业务"
 			}
 		},

pages/erp/exWarehousing/exWarehousing.vue

@@ -67,6 +67,10 @@
 				<view class="left">纯重（吨）</view>
 				<input v-model='detailData.pureWeight' class="right-bottom" placeholder="不可编辑,自动计算"></input>
 			</view>
+			<view class="row row-bottom">
+				<view class="left">运费（元/吨）</view>
+				<input v-model='detailData.freight' class="right-bottom" placeholder="不可编辑,自动计算"></input>
+			</view>
 			<view class="row">
 				<view class="left">品级</view>
 				<view @click='show3=true'>{{detailData.grade}}</view>

pages/erp/improvedExWaehousing/improvedExWaehousingDetail.vue

@@ -61,6 +61,10 @@
 				<view class="left">纯重（吨）</view>
 				<input v-model='detailData.pureWeight' class="right-bottom" placeholder="不可编辑,自动计算" type="digit"></input>
 			</view>
+			<view class="row row-bottom">
+				<view class="left">运费（元/吨）</view>
+				<input v-model='detailData.freight' class="right-bottom" placeholder="输入运费"></input>
+			</view>
 			<view class="row">
 				<view class="left">品级</view>
 				<view @click='show3=true'>{{detailData.grade}}</view>

pages/erpbusiness/add_quality_testing.vue

@@ -89,15 +89,19 @@
 			<view v-if="gridList.type == '潮粮'" class="c-row">
 				<view class="title">净重单价（元/公斤）</view>
 				<view class="con-list">
-					<input v-model='gridList.tidalGrainPrice' disabled placeholder="自动获取，不可编辑" name="input"
+					<input v-model='gridList.tidalGrainPrice' :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="gridList.type == '干粮'" class="c-row">
 				<view class="title">干粮单价（元/公斤）</view>
 				<view class="con-list">
-					<input v-model='gridList.dryGrainPrice' placeholder="请输入干粮单价" name="input" type="digit"></input>
+					<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>
 		<view style='padding-bottom:300rpx;'>
@@ -219,6 +223,7 @@
 				show2: false,
 				goodsList: [],
 				currentPage: 1,
+				pricetext:'锁定',
 				value:false,
 				gridBorder: false,
 				headUrl: "../../static/img/myimg/YongHu@3x.png",
@@ -251,6 +256,8 @@
 				showTran: true,
 				companyId: 1,
 				current: 4,
+				pricedisabled:false,
+				
 				gradeList: [{
 						key: 1,
 						value: '一等品'
@@ -401,6 +408,21 @@
 				}
 				
 			},
+			changeprice(){
+				if(this.pricetext='解锁'){
+					this.pricedisabled=false
+					this.pricetext='锁定'
+				}else{
+					this.pricedisabled=true
+					this.pricetext='解锁'
+				}
+			},
+			inputprice(){
+				if(this.pricetext='锁定'){
+					this.pricedisabled=true
+					this.pricetext='解锁'
+				}
+			},
 			print(){
 				uni.navigateTo({
 					url: '/pages/erpbusiness/bleConnect'
@@ -443,58 +465,58 @@
 			},
 			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
-						}).then(res => {
-							that.gridList.dryGrainPrice = res.data.data
-						})
+				if(!this.pricedisabled){
+					if (this.gridList.goodsName && this.cangid) {
+							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
+					
+					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
+							}
 						}
 					}
-				}
-				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.$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) {
-								that.gridList.tidalGrainPrice = ''
-							}
-						} else {
-							if(that.gridList.type == '干粮'){
-								that.gridList.dryGrainPrice = res.data.data
-							}
-							else{
-								that.gridList.tidalGrainPrice = res.data.data
+					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.$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) {
+									that.gridList.tidalGrainPrice = ''
+								}
+							} else {
+								if(that.gridList.type == '干粮'){
+									that.gridList.dryGrainPrice = res.data.data
+								}
+								else{
+									that.gridList.tidalGrainPrice = res.data.data
+								}
 							}
-						}
-					})
+						})
+					}
 				}
+				
 			},
 			gocustomer() {
 				uni.navigateTo({
@@ -662,7 +684,9 @@
 				// 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.waterContentChange()
+				if(!this.pricedisabled){
+					this.waterContentChange()
+				}
 			},
 			setGoodName(e) {
 				// 
@@ -917,4 +941,4 @@
 		text-align: center;
 		border-radius: 20rpx;
 	}
-</style>
+</style>

pages/erpbusiness/index.vue

@@ -92,6 +92,7 @@
 					{
 						num: 1,
 						name: '收购质检',
+						// name: '入库质检',
 						// icon: 'cuIcon-calendar',
 						src: '../../static/img/erp/shougouzhijian@3x.png',
 						tips: 0,
@@ -101,6 +102,7 @@
 
 					{
 						num: 2,
+						// name: '入库检斤',
 						name: '收购检斤',
 						// icon: 'cuIcon-copy',
 						src: '../../static/img/erp/shougoujianjin@3x.png',

pages/erpbusiness/quality_testing.vue

@@ -26,6 +26,11 @@
 			</view>
 		</view>
 		<view class="content">
+			<view style='background:#fff;' class="flex">
+				<view class='status' :class="{'active':statusType==''}" @click='clickstatus("")'>全部</view>
+				<view class='status' :class="{'active':statusType=='1'}" @click='clickstatus("1")'>待复检</view>
+				<view class='status' :class="{'active':statusType=='2'}" @click='clickstatus("2")'>待确认</view>
+			</view>
 			<view class="item-style" v-for='item in gridList' @click='examine(item)'>
 				<view class="row1">
 					<view class="row1-left">
@@ -143,6 +148,7 @@
 				moving: false,
 				footprintList: [],
 				searchKeyWord: '',
+				statusType:'',
 				isVip: false,
 				userInfoTmp: [],
 				inputStatus: 'none',
@@ -162,6 +168,7 @@
 				companyId: 1,
 				current: 4,
 				warehouseCount: '',
+				warehouseTradeCount:'',
 				commonWarehouseNo: '',
 				cangid: '',
 				warehouse: {},
@@ -244,6 +251,7 @@
 							that.warehouse = list[i]
 							that.warehouseName = list[i].warehouseName
 							that.warehouseCount = list[i].count
+							that.warehouseTradeCount = list[i].count
 							that.commonWarehouseNo = list[i].commonWarehouseNo
 							// uni.setStorageSync('purchasePriceList',list[i].purchasePriceList)
 							break
@@ -254,6 +262,7 @@
 						that.warehouse = that.selector[0]
 						that.warehouseName = that.selector[0].warehouseName
 						that.warehouseCount = that.selector[0].count
+						that.warehouseTradeCount = that.selector[0].count
 						that.commonWarehouseNo = that.selector[0].commonWarehouseNo
 						that.cangid = that.selector[0].id
 						// uni.setStorageSync('purchasePriceList',that.selector[0].purchasePriceList)
@@ -263,6 +272,10 @@
 			})
 		},
 		methods: {
+			clickstatus(status){
+				this.statusType=status
+				this.getList(true)
+			},
 			//获取当前按钮权限
 			getRoles: function(role) {
 				let _roles = uni.getStorageSync('rolesList')
@@ -302,6 +315,7 @@
 				this.cangid = this.selector[e[0]].id
 				uni.setStorageSync("cangid", this.cangid)
 				this.warehouseCount = this.selector[e[0]].count
+				this.warehouseTradeCount = this.selector[e[0]].count
 				this.commonWarehouseNo = this.selector[e[0]].commonWarehouseNo
 				// uni.setStorageSync('purchasePriceList',this.selector[e[0]].purchasePriceList)
 				this.getList(true)
@@ -314,6 +328,7 @@
 						currentPage: this.currentPage,
 						searchKeyWord: this.searchKeyWord,
 						searchType: this.searchType,
+						statusType:this.statusType,
 						managementType: this.managementType,
 						warehouseName: this.warehouseName,
 						compId: '',
@@ -359,7 +374,7 @@
 						'&cangid=' + this.cangid + '&warehouseCount=' + this.warehouseCount +
 						'&commonWarehouseNo=' + this.commonWarehouseNo + '&warehouseName=' + this.warehouseName +
 						'&personCharge=' + this.warehouse.personCharge + '&personPhone=' + this.warehouse
-						.personPhone
+						.personPhone+'&warehouseTradeCount=' + this.warehouseTradeCount
 				})
 			},
 			del(item) {
@@ -724,7 +739,9 @@
 			height: 36upx;
 		}
 	}
-
+	.status{
+		padding:3px 6px;
+	}
 	.tj-sction {
 		@extend %section;
 
@@ -807,7 +824,9 @@
 	.search-form {
 		background: #F5F6F9;
 	}
-
+.active{
+	color:red;
+}
 	.search-box {
 		width: 100%;
 		background-color: rgb(242, 242, 242);

pages/user/user.vue

@@ -41,7 +41,8 @@
 					<view class="cu-item" style='text-align:center;' v-for="(item,index) in gridList1" :key="index"
 						@click="gridClick(item, index)" v-show="item.show">
 						<view :class="['cuIcon-' + item.cuIcon,'text-' + item.color]">
-							<text v-if='item.num==4&&taskTip' class='badge_user'>{{taskTip}}</text>
+							<text v-if='item.num==4&&taskTip&&taskTip<100' class='badge_user'>{{taskTip}}</text>
+							<text v-if='item.num==4&&taskTip&&taskTip>100' class='badge_user'>...</text>
 							<image :src="item.src" class="sign1"></image>
 						</view>
 						<text style="color: #333333;">{{item.name}}</text>
@@ -176,6 +177,7 @@
 					},
 					{
 						num: 1,
+						// name: '入库管理',
 						name: '收购业务',
 						// icon: 'cuIcon-copy',
 						src: '../../static/img/myimg/sg.png',
@@ -779,22 +781,25 @@
 
 	.cu-list.grid>.cu-item .badge_user {
 		color: #fff;
-		border: 1px solid #fff;
-		background-color: #FF6600;
-		display: inline-block;
-		padding: .25em .25em;
-		position: absolute;
-		font-size: 9px;
-		font-weight: 700;
-		line-height: 1;
-		text-align: center;
-		white-space: nowrap;
-		vertical-align: top;
-		right: 26px;
-		top: -10px;
-		z-index: 2;
-		border-radius: 50%;
-		transition: color .15s ease-in-out, background-color .15s ease-in-out, border-color .15s ease-in-out, box-shadow .15s ease-in-out;
+		    border: 1px solid #fff;
+		    background-color: #FF6600;
+		    display: inline-block;
+		    padding: 0.45em .25em 0.25em;
+		    position: absolute;
+		    font-size: 9px;
+		    font-weight: 700;
+		    line-height: 1;
+		    text-align: center;
+		    white-space: nowrap;
+		    vertical-align: top;
+		    width: 22px;
+		    height: 22px;
+		    right: 19px;
+		    /* transform: scale(0.5); */
+		    top: -12px;
+		    z-index: 2;
+		    border-radius: 50%;
+		    transition: color .15s ease-in-out, background-color .15s ease-in-out, border-color .15s ease-in-out, box-shadow .15s ease-in-out;
 	}
 
 	@keyframes move_wave {