前端

config/index.js

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

manifest.json

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

pages/erp/exWarehousing/exWarehousing.vue

@@ -111,7 +111,8 @@
 				<!-- <view @click='slectCarNo' v-if="isPC">{{detailData.carNo}}</view> -->
 				<!-- 自运合同车牌号需下拉 -->
 				<view v-if="!carno" v-show="showCar" @click="carno = true">
-					{{detailData.carNo?detailData.carNo :"请选择车牌号"}}</view>
+					{{detailData.carNo?detailData.carNo :"请选择车牌号"}}
+				</view>
 				<u-picker :range="carList" range-key="carNo" @confirm='carPicker($event)' v-model="carno"
 					mode="selector">
 				</u-picker>
@@ -312,6 +313,7 @@
 					gradeKey: "",
 					grossWeight: "",
 					tare: "",
+					tips: ''
 				},
 				params: {
 					year: true,
@@ -338,6 +340,10 @@
 			this.cangId = options.cangId
 		},
 		onShow() {
+			uni.showLoading({
+				title:"加载中...",
+				mask:true
+			})
 			let _data = uni.getStorageSync('erpContractNoCK') == '' ? {} : uni.getStorageSync('erpContractNoCK')
 			this.binNumber = helper.erpWarehouse.binNumber
 			this.warehouseName = helper.erpWarehouse.warehouseName
@@ -424,8 +430,20 @@
 						this.detailData.contractNo = this.inOutNoList[0].moveTaskNo
 					}
 					this.detailData.goodsName = this.inOutNoList[0].goodsName
+					this.detailData.goodsNameKey = this.inOutNoList[0].goodsNameKey
 					this.detailData.grade = this.inOutNoList[0].grade
 					this.detailData.inOutType = this.inOutNoList[0].inOutType
+					if (this.detailData.inOutType == '销售出库') {
+						this.detailData.inOutTypeKey = 1
+					} else if (this.detailData.inOutType == '移库出库') {
+						this.detailData.inOutTypeKey = 3
+					} else if (this.detailData.inOutType == '暂存出库') {
+						this.detailData.inOutTypeKey = 4
+					} else if (this.detailData.inOutType == '贸易服务出库') {
+						this.detailData.inOutTypeKey = 5
+					} else if (this.detailData.inOutType == '采购出库') {
+						this.detailData.inOutTypeKey = 6
+					}
 					//查询所有的合同  进行获取车牌号
 					this.$api.doRequest('get', '/warehouseBaseInfo/selectContractNoList', {
 						flag: 5,
@@ -434,7 +452,13 @@
 						if (res.data.code == 200) {
 							for (let i = 0; i < res.data.data.length; i++) {
 								// "MYCGYMHLJ2021102401"
-								if (res.data.data[i].contractNo == this.detailData.contractNo) { //如果查到该合同
+								if (res.data.data[i].contractNo == this.detailData.contractNo) {
+									if (this.detailData.inOutType == '销售出库') {
+										this.detailData.tips = '买方' + res.data.data[i].buyer
+									} else if (this.detailData.inOutType == '移库出库') {
+										this.detailData.tips = '入货库' + this.inOutNoList[0].warehouseName
+									}
+									//如果查到该合同
 									if (res.data.data[i].deliverType == '1') { //判断自运1，他运2合同
 										this.showCar = true
 									} else {
@@ -444,7 +468,8 @@
 										this.carList = res.data.data[i].tranCarInfoList //车牌号下拉列表
 									}
 								}
-						 }
+							}
+							uni.hideLoading()
 						}
 					})
 				})
@@ -470,6 +495,7 @@
 					this.detailData.contractNo = this.inOutNoList[e[0]].moveTaskNo
 				}
 				this.detailData.goodsName = this.inOutNoList[e[0]].goodsName
+				this.detailData.goodsNameKey = this.inOutNoList[e[0]].goodsNameKey
 				this.detailData.grade = this.inOutNoList[e[0]].grade
 				this.detailData.inOutType = this.inOutNoList[e[0]].inOutType
 				this.weightbills.goodsName = this.inOutNoList[e[0]].goodsName
@@ -579,7 +605,7 @@
 			},
 			calculate() {
 				if (this.detailData.grossWeight && this.detailData.tare) {
-					this.netWeight = this.detailData.grossWeight - this.detailData.tare
+					this.netWeight =(this.detailData.grossWeight - this.detailData.tare).toFixed(3) 
 				}
 			},
 			getImgUrl(res) {
@@ -722,7 +748,7 @@
 					this.$api.msg('出库类型不能为空')
 					return
 				}
-				if(this.detailData.outType=="集装箱船"||this.detailData.outType=="汽运"){
+				if (this.detailData.outType == "集装箱船" || this.detailData.outType == "汽运") {
 					if (!this.detailData.carNo && num == 2) {
 						this.$api.msg('车牌号不能为空')
 						return
@@ -732,7 +758,7 @@
 						return
 					}
 				}
-				
+
 				if (!this.detailData.addressUrl && num == 2) {
 					this.$api.msg('请上传磅单')
 					return
@@ -885,8 +911,8 @@
 									var date = new Date()
 									that.weightbills.updateDate = date.getFullYear() + '-' + (date
 											.getMonth() + 1) + '-' + date.getDate() + ' ' + date
-									.getHours() + ':' + date.getMinutes() + ':' + date.getSeconds()
-									
+										.getHours() + ':' + date.getMinutes() + ':' + date.getSeconds()
+
 									that.$api.msg(title)
 									that.isShowPrint = true
 									uni.setStorageSync("exWarehousing_print", that.weightbills)

pages/erp/index.vue

@@ -245,6 +245,7 @@
 				if (res.data.code == 200) {
 					if (res.data.data.length == 0) {
 						this.isShowAlert = true
+						uni.hideLoading()
 					} else {
 						this.isShowAlert = false
 					}

pages/erp/warehousing/warehousing.vue

@@ -34,16 +34,18 @@
 			</view>
 			<view class="row row-bottom">
 				<view class="left">毛重（吨）</view>
-				<input type="digit" @input='calculate' name="grossWeight" v-model='detailData.grossWeight' class="right-bottom" 
-					placeholder="输入毛重"></input>
+				<input type="digit" @input='calculate' name="grossWeight" v-model='detailData.grossWeight'
+					class="right-bottom" placeholder="输入毛重"></input>
 			</view>
 			<view class="row row-bottom">
 				<view class="left">皮重（吨）</view>
-				<input type="digit" @input='calculate' name="tare" v-model='detailData.tare' class="right-bottom" placeholder="输入皮重"></input>
+				<input type="digit" @input='calculate' name="tare" v-model='detailData.tare' class="right-bottom"
+					placeholder="输入皮重"></input>
 			</view>
 			<view class="row row-bottom">
 				<view class="left">扣重（吨）</view>
-				<input type="digit" @input='calculate' v-model='detailData.deductionWeight' class="right-bottom" placeholder="输入扣重"></input>
+				<input type="digit" @input='calculate' v-model='detailData.deductionWeight' class="right-bottom"
+					placeholder="输入扣重"></input>
 			</view>
 			<view class="row row-bottom">
 				<view class="left">净重（吨）</view>
@@ -112,20 +114,21 @@
 			<view class="row row-bottom" v-if="detailData.outType!='火运'&&detailData.outType!='散船'">
 				<view class="left">车牌号</view>
 				<!-- 他运合同车牌号输入 -->
-				<input  v-model='detailData.carNo' class="right-bottom" placeholder="请输入车牌号" v-if="!showCar"></input>
+				<input v-model='detailData.carNo' class="right-bottom" placeholder="请输入车牌号" v-if="!showCar"></input>
 				<!-- <view @click='slectCarNo' v-if="isPC">{{detailData.carNo}}</view> -->
-			    <!-- 自运合同车牌号需下拉 -->
-				<view v-if="!carno" v-show="showCar" @click="carno = true">{{detailData.carNo? detailData.carNo:"请选择车牌号"}}</view>
-				<u-picker :range="carList" range-key="carNo" @confirm='carPicker($event)' v-model="carno" mode="selector">
+				<!-- 自运合同车牌号需下拉 -->
+				<view v-show="showCar" @click="carno = true">{{detailData.carNo? detailData.carNo:"请选择车牌号"}}</view>
+				<u-picker :range="carList" range-key="carNo" @confirm='carPicker($event)' v-model="carno"
+					mode="selector">
 				</u-picker>
 			</view>
 			<view class="row row-bottom" v-if="detailData.outType=='火运'">
 				<view class="left">车号</view>
-				<input  v-model='detailData.carNo' class="right-bottom" placeholder="请输入车号" ></input>
+				<input v-model='detailData.carNo' class="right-bottom" placeholder="请输入车号"></input>
 			</view>
 			<view class="row row-bottom" v-if="detailData.outType=='散船'">
 				<view class="left">船名</view>
-				<input  v-model='detailData.carNo' class="right-bottom" placeholder="请输入船名" ></input>
+				<input v-model='detailData.carNo' class="right-bottom" placeholder="请输入船名"></input>
 			</view>
 			<view v-if='detailData.outType=="集装箱船"||!detailData.outType||detailData.outType=="汽运"'
 				class="row row-bottom">
@@ -133,17 +136,16 @@
 				<input v-model='detailData.boxNo' class="right-bottom" placeholder="请输入箱号" type="digit"></input>
 				<input v-model='detailData.boxNoOther' class="right-bottom" placeholder="请输入箱号" type="digit"></input>
 			</view>
-			<view v-if='!detailData.outType||detailData.outType=="汽运" || detailData.outType=="集装箱船"' class="row row-bottom">
+			<view v-if='!detailData.outType||detailData.outType=="汽运" || detailData.outType=="集装箱船"'
+				class="row row-bottom">
 				<view class="left">封号</view>
-				<input v-model='detailData.titleNo'  class="right-bottom"
-					placeholder="请输入封号" type="digit"></input>
-				<input v-model='detailData.titleNoOther' class="right-bottom"
-					placeholder="请输入封号" type="digit"></input>
+				<input v-model='detailData.titleNo' class="right-bottom" placeholder="请输入封号" type="digit"></input>
+				<input v-model='detailData.titleNoOther' class="right-bottom" placeholder="请输入封号" type="digit"></input>
 			</view>
 			<view v-if='detailData.outType=="火运"' class="row row-bottom">
 				<view class="left">车厢号</view>
-				<input v-model='detailData.wingNumber' @input="toUpperCase2" class="right-bottom"
-					placeholder="请输入车厢号" type="digit"></input>
+				<input v-model='detailData.wingNumber' @input="toUpperCase2" class="right-bottom" placeholder="请输入车厢号"
+					type="digit"></input>
 				<input v-model='detailData.wingNumberOther' @input="toUpperCase3" class="right-bottom"
 					placeholder="请输入车厢号" type="digit"></input>
 			</view>
@@ -183,8 +185,8 @@
 			</view>
 			<view class="row row-bottom">
 				<view class="left">水分（%）</view>
-				<input type="digit" v-model='detailData.warehouseInOutDetail.waterContent'
-					class="right-bottom" placeholder="输入水分占比"></input>
+				<input type="digit" v-model='detailData.warehouseInOutDetail.waterContent' class="right-bottom"
+					placeholder="输入水分占比"></input>
 			</view>
 			<view class="row row-bottom">
 				<view class="left">容重（克/升）</view>
@@ -203,8 +205,8 @@
 			</view>
 			<view class="row row-bottom">
 				<view class="left">霉变粒（%）</view>
-				<input type="digit" v-model='detailData.warehouseInOutDetail.mildewGrain'
-					class="right-bottom" placeholder="输入霉变粒占比"></input>
+				<input type="digit" v-model='detailData.warehouseInOutDetail.mildewGrain' class="right-bottom"
+					placeholder="输入霉变粒占比"></input>
 			</view>
 			<view class="row row-bottom">
 				<view class="left">不完善粒（%）</view>
@@ -240,7 +242,7 @@
 				show5: false,
 				show6: false,
 				isPC: true,
-				carno:false,
+				carno: false,
 				isSelectType: true,
 				inOutShow: false,
 				params: {
@@ -320,10 +322,11 @@
 					deductionAmount: '',
 					netWeight: 0,
 					cost: 0,
-					warehouseInOutDetail: {}
+					warehouseInOutDetail: {},
+					tips: ''
 				},
-				carList:[],//车牌号下拉
-				showCar:false,
+				carList: [], //车牌号下拉
+				showCar: false,
 			}
 		},
 		onLoad(options) {
@@ -338,6 +341,10 @@
 			...mapState(['hasLogin', 'userInfo']),
 		},
 		onShow() {
+			uni.showLoading({
+				title: "加载中...",
+				mask: true
+			})
 			let _data = uni.getStorageSync('erpContractNo') == '' ? {} : uni.getStorageSync('erpContractNo')
 			if (helper.erpWarehouse.personCharge)
 				this.detailData.agent = helper.erpWarehouse.personCharge
@@ -345,17 +352,6 @@
 			this.detailData.contractNo = _data.contractNo;
 			this.detailData.goodsNameKey = _data.goodsNameKey;
 			this.detailData.inOutType = _data.inOutType;
-			if (this.detailData.inOutType == '采购入库') {
-				this.detailData.inOutTypeKey = 1
-			} else if (this.detailData.inOutType == '移库入库') {
-				this.detailData.inOutTypeKey = 3
-			} else if (this.detailData.inOutType == '暂存入库') {
-				this.detailData.inOutTypeKey = 4
-			} else if (this.detailData.inOutType == '贸易服务入库') {
-				this.detailData.inOutTypeKey = 5
-			} else if (this.detailData.inOutType == '退库') {
-				this.detailData.inOutTypeKey = 6
-			}
 			if (_data.unitContractPrice) {
 				this.detailData.cost = _data.unitContractPrice
 			}
@@ -424,64 +420,79 @@
 			},
 		},
 		computed: {
-			...mapState(['hasLogin','userInfo']),
+			...mapState(['hasLogin', 'userInfo']),
 		},
 		methods: {
 			inOutNo() {
+				let that = this
 				this.$api.doRequest('get', '/inOutWarehouseTask/selectInOutWarehouseNo', {
 					flag: 2,
-					warehouseName:this.warehouseName,
-					agentKey : this.userInfo.id
+					warehouseName: this.warehouseName,
+					agentKey: this.userInfo.id
 				}).then(res => {
 					this.inOutNoList = res.data.data
-					if(this.inOutNoList.length > 0){
+					if (this.inOutNoList.length > 0) {
 						this.detailData.inOutTaskNo = this.inOutNoList[0].inOutTaskNo
-					this.detailData.agent = this.inOutNoList[0].agent
-					if (this.inOutNoList[0].contractNo) {
-						this.detailData.contractNo = this.inOutNoList[0].contractNo
-					} else {
-						this.detailData.contractNo = this.inOutNoList[0].moveTaskNo
-					}
-					this.detailData.goodsName = this.inOutNoList[0].goodsName
-					this.detailData.grade = this.inOutNoList[0].grade
-					this.detailData.inOutType = this.inOutNoList[0].inOutType
-					//查询所有的合同  进行获取车牌号
-					this.$api.doRequest('get', '/warehouseBaseInfo/selectContractNoList', {
-						flag: 7,
-						compId: helper.erpWarehouse.compId,
-					}).then(res => {
-						if (res.data.code == 200) {
-							for(let i = 0 ; i < res.data.data.length ; i++){
+						this.detailData.agent = this.inOutNoList[0].agent
+						if (this.inOutNoList[0].contractNo) {
+							this.detailData.contractNo = this.inOutNoList[0].contractNo
+						} else {
+							this.detailData.contractNo = this.inOutNoList[0].moveTaskNo
+						}
+						this.detailData.goodsName = this.inOutNoList[0].goodsName
+						this.detailData.goodsNameKey = this.inOutNoList[0].goodsNameKey;
+						this.detailData.grade = this.inOutNoList[0].grade
+						this.detailData.inOutType = this.inOutNoList[0].inOutType
+						if (this.detailData.inOutType == '采购入库') {
+							this.detailData.inOutTypeKey = 1
+						} else if (this.detailData.inOutType == '移库入库') {
+							this.detailData.inOutTypeKey = 3
+						} else if (this.detailData.inOutType == '暂存入库') {
+							this.detailData.inOutTypeKey = 4
+						} else if (this.detailData.inOutType == '贸易服务入库') {
+							this.detailData.inOutTypeKey = 5
+						} else if (this.detailData.inOutType == '退库') {
+							this.detailData.inOutTypeKey = 6
+						}
+						//查询所有的合同  进行获取车牌号
+						this.$api.doRequest('get', '/warehouseBaseInfo/selectContractNoList', {
+							flag: 7,
+							compId: helper.erpWarehouse.compId,
+						}).then(res => {
+							if (res.data.code == 200) {
+								for (let i = 0; i < res.data.data.length; i++) {
 								 // "MYCGYMHLJ2021102401"
-								if(res.data.data[i].contractNo == this.detailData.contractNo){//如果查到该合同
-								if(res.data.data[i].deliverType == "1"){//判断自运1，他运2合同
-									this.showCar = true
-								}else{
-									this.showCar = false
+									if (res.data.data[i].contractNo == this.detailData
+										.contractNo) { //如果查到该合同
+										if (res.data.data[i].deliverType == "1") { //判断自运1，他运2合同
+											this.showCar = true
+										} else {
+											this.showCar = false
+										}
+										if (res.data.data[i].tranCarInfoList) {
+											this.carList = res.data.data[i].tranCarInfoList //车牌号下拉列表
+										}
+									}
 								}
-								if(res.data.data[i].tranCarInfoList){
-									this.carList = res.data.data[i].tranCarInfoList   //车牌号下拉列表
-								}
-							 }
+								uni.hideLoading()
 							}
-						}
-					})
-				  }
+						})
+					}
 				})
 				this.$api.doRequest('get', 'warehouseBaseInfo/selectContractNoList', ).then(res => {
 					this.contractNoList = res.data.data
 					for (var i = 0; i < this.contractNoList.length; i++) {
 						if (this.contractNoList[i].contractNo == this.detailData.contractNo) {
 							if (this.detailData.inOutType == '采购入库') {
-								if(this.contractNoList[i].unitContractPrice){
-									this.detailData.tips = '卖方' + this.contractNoList[i].seller+
-              '（ ' +
-              this.contractNoList[i].unitContractPrice +
-              '元/吨）'
-								}else{
+								if (this.contractNoList[i].unitContractPrice) {
+									this.detailData.tips = '卖方' + this.contractNoList[i].seller +
+										'（ ' +
+										this.contractNoList[i].unitContractPrice +
+										'元/吨）'
+								} else {
 									this.detailData.tips = '卖方' + this.contractNoList[i].seller
 								}
-								
+
 							} else if (this.detailData.inOutType == '移库入库') {
 								this.detailData.tips = '出货库' + this.inOutNoList[0].warehouseName
 							} else if (this.detailData.inOutType == '退库') {
@@ -500,19 +511,22 @@
 					this.detailData.contractNo = this.inOutNoList[e[0]].moveTaskNo
 				}
 				this.detailData.goodsName = this.inOutNoList[e[0]].goodsName
+				this.detailData.goodsNameKey = this.inOutNoList[e[0]].goodsNameKey;
 				this.detailData.grade = this.inOutNoList[e[0]].grade
 				this.detailData.inOutType = this.inOutNoList[e[0]].inOutType
 				for (var i = 0; i < this.contractNoList.length; i++) {
 					if (this.contractNoList[i].contractNo == this.detailData.contractNo) {
 						if (this.detailData.inOutType == '采购入库') {
-							this.detailData.tips = '卖方' + this.contractNoList[i].seller+'（'+this.contractNoList[i].unitContractPrice+'元/吨）'
+							this.detailData.tips = '卖方' + this.contractNoList[i].seller + '（' + this.contractNoList[i]
+								.unitContractPrice + '元/吨）'
 						} else if (this.detailData.inOutType == '移库入库') {
-							if(this.contractNoList[i].unitContractPrice){
-								this.detailData.tips = '出货库' + this.inOutNoList[e[0]].sendWarehouse+'（'+this.contractNoList[i].unitContractPrice+'元/吨）'
-							}else{
+							if (this.contractNoList[i].unitContractPrice) {
+								this.detailData.tips = '出货库' + this.inOutNoList[e[0]].sendWarehouse + '（' + this
+									.contractNoList[i].unitContractPrice + '元/吨）'
+							} else {
 								this.detailData.tips = '出货库' + this.inOutNoList[e[0]].sendWarehouse
 							}
-							
+
 						} else if (this.detailData.inOutType == '退库') {
 							if (this.contractNoList[i].contractNo) {
 								this.deptBudgetList.tips = '买方' + this.contractNoList[i].buyer

pages/erpbusiness/acquisitionInspection/grossWeightDetail.vue

@@ -84,13 +84,15 @@
 		},
 		methods: {
 			submit() {
+			
 				let that = this
 				uni.showModal({
 					content: "确定提交检斤信息?",
 					success: function(res) {
 						if (res.confirm) {
 							that.$api.doRequest('get', '/paymentManagement/cumulant', {
-								compId: JSON.parse(localStorage.getItem('pcUserInfo')).data.compId,
+								// compId: JSON.parse(localStorage.getItem('pcUserInfo')).data.compId,
+								compId: uni.getStorageSync('pcUserInfo').compId,
 								customerNumberCard: that.detailData.customerNumberCard,
 								goodsName: that.detailData.goodsName,
 							}).then(res => {
@@ -100,6 +102,7 @@
 											that.detailData.goodsName == that.purchasePriceList[i]
 											.goodsName
 										) {
+											
 											let count = (that.purchasePriceList[i].saleLimit -
 												res.data.data / 1000).toFixed(2)
 											if (Number(count) - that.detailData.grossWeight / 1000 <= 0) {

pages/erpbusiness/acquisitionInspection/tareDetail.vue

@@ -89,7 +89,6 @@
 		},
 		onLoad(options) {
 			this.detailData = JSON.parse(options.detailData)
-			console.log(this.detailData)
 			if (!this.detailData.buckleMiscellaneous) {
 				this.detailData.buckleMiscellaneous = 0
 			}
@@ -105,7 +104,8 @@
 					content: "确定提交检斤信息?",
 					success() {
 						that.$api.doRequest('get', '/paymentManagement/cumulant', {
-							compId: JSON.parse(localStorage.getItem('pcUserInfo')).data.compId,
+							// compId: JSON.parse(localStorage.getItem('pcUserInfo')).data.compId,
+							compId: uni.getStorageSync('pcUserInfo').compId,
 							customerNumberCard: that.detailData.customerNumberCard,
 							goodsName: that.detailData.goodsName,
 						}).then(res => {

pages/erpbusiness/add_quality_testing.vue

@@ -312,12 +312,10 @@
 			// 	}
 			// })
 			this.managementType = options.managementType
-		},
-		onShow() {
 			let that = this
 			this.purchasePriceList = uni.getStorageSync('purchasePriceList')
 			if (uni.getStorageSync('checkcustomer')) {
-
+			
 				let _customerInfo = uni.getStorageSync('checkcustomer')
 				if (_customerInfo.shipperName) {
 					this.gridList.identityId = _customerInfo.id
@@ -330,7 +328,7 @@
 					this.gridList.customerName = _customerInfo.customerName
 					this.gridList.customerPhone = _customerInfo.customerPhone
 				}
-
+			
 				this.gridList.customerNumberCard = _customerInfo.customerNumberCard
 			}
 			this.gridList.grade = this.gradeList[0].value
@@ -351,7 +349,7 @@
 						uni.setStorageSync('purchasePriceList', that.goodsList)
 						that.purchasePriceList = uni.getStorageSync('purchasePriceList')
 					}
-
+			
 					// for (let i = 0; i < res.data.data.length; i++) {
 					// 	this.goodsList.push(res.data.data[i].goodsName)
 					// }
@@ -632,7 +630,7 @@
 				this.waterContentChange()
 			},
 			setGoodName(e) {
-				uni.showLoading({title: '加载中',mask:true})
+				// 
 				// [e[0]] = 0
 				// this.$set(this.gradeList,'grade',this.gradeList[e[0]].value)
 				if (this.goodsList[e[0]].goodsName == '玉米') {
@@ -647,24 +645,25 @@
 				}
 				var that = this
 				this.gridList.goodsName = this.goodsList[e[0]].goodsName
-				this.$api.doRequest('get', '/identityAuthenticationInfo/identityAuthenticationInfoCustomer', {
-					warehouseId: this.cangid,
-					goodsName: this.gridList.goodsName
-				}).then(res => {
-					if (res.data.data) {
-						uni.hideLoading()
-						// let data = res.data.data
-						// that.gridList =data
-					}
-				})
+				// this.$api.doRequest('get', '/identityAuthenticationInfo/identityAuthenticationInfoCustomer', {
+				// 	warehouseId: this.cangid,
+				// 	goodsName: this.gridList.goodsName
+				// }).then(res => {
+				// 	if (res.data.data) {
+				// 		uni.hideLoading()
+				// 		// let data = res.data.data
+				// 		// that.gridList =data
+				// 	}
+				// })
 				uni.setStorageSync('goodsName', this.gridList.goodsName)
 				if (this.gridList.type == "干粮" && this.gridList.goodsName) {
+					uni.showLoading({title: '加载中',mask:true})
 					this.$api.doRequest('get', '/purchasePrice/dryGrainPrice', {
 						warehouseId: this.cangid,
 						goodsName: this.gridList.goodsName
 					}).then(res => {
 						this.gridList.dryGrainPrice = res.data.data
-						
+						uni.hideLoading()
 					})
 				}
 				this.waterContentChange()

pages/erpbusiness/bleConnect.vue

@@ -33,17 +33,11 @@
 		},
 		computed: mapState(['sysinfo', 'Bluetooth']),
 		onLoad() {
-			
-			
-			
-		},
-		onShow() {
-			// if(this.Bluetooth){
-			// 	uni.navigateTo({
-			// 		url: '/pages/erpbusiness/sendCommand'
-			// 	})
-			// }
-		console.log(this.Bluetooth)
+			console.log("····················")
+			console.log("this.Bluetooth",this.Bluetooth)
+			if(this.Bluetooth.BLEInformation.deviceId){
+				this.openControl()
+			}
 		},
 		onUnload() {
 			//停止搜索蓝牙设备
@@ -162,9 +156,9 @@
 			//校验权限
 			checkPemission() {
 				let that = this
-				let 
+				let {
 					BLEInformation
-				 = that.Bluetooth;
+				} = that.Bluetooth;
 				let platform = BLEInformation.platform;
 				that.getBluetoothDevices();
 			},
@@ -224,9 +218,9 @@
 				let {
 					title
 				} = e.currentTarget.dataset;
-				let 
+				let {
 					BLEInformation
-				 = that.Bluetooth;
+				} = that.Bluetooth;
 				this.stopSearch();
 				
 				that.serviceId = 0;
@@ -244,7 +238,6 @@
 						console.log('createBLEConnection success:', res)
 						BLEInformation.deviceId = title;
 						that.$store.commit('BLEInformationSet', BLEInformation);
-						// console.log(this.Bluetooth,)
 						uni.hideLoading()
 						that.getSeviceId()
 					},
@@ -257,9 +250,9 @@
 			//获取蓝牙设备所有服务(service)。
 			getSeviceId() {
 				let that = this;
-				let 
+				let {
 					BLEInformation
-				 = that.Bluetooth;
+				} = that.Bluetooth;
 				console.log('BLEInformation.deviceId:',BLEInformation.deviceId)
 				// uni.getBLEDeviceServices
 				let t=setTimeout(()=>{
@@ -287,9 +280,9 @@
 					readCharacter: read,
 					notifyCharacter: notify
 				} = that;
-				let 
+				let {
 					BLEInformation
-				 = that.Bluetooth;
+				} = that.Bluetooth;
 				// uni.getBLEDeviceCharacteristics
 				plus.bluetooth.getBLEDeviceCharacteristics({
 					deviceId: BLEInformation.deviceId,
@@ -339,7 +332,6 @@
 								that.getCharacteristics()
 							}
 						} else {
-							that.$store.commit('BLEInformationSet', BLEInformation);
 							that.openControl()
 						}
 					},

pages/erpbusiness/edit_quality_testing.vue

@@ -23,8 +23,10 @@
 			<view 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>
+					<input v-model='gridList.carNumber' @click.stop="handleShowKeyboard" placeholder="请输入车牌号"
+						name="input"></input>
+					<master-keyboard ref="keyboard" keyboardtype="car" :randomNumber="true" :newCar="false"
+						:defaultValue="gridList.carNumber" @keyboardClick="handleClick"></master-keyboard>
 					<!-- <input :disabled='flag==1' v-model='gridList.carNumber' placeholder="请输入车牌号" name="input"></input> -->
 				</view>
 			</view>
@@ -65,18 +67,18 @@
 			<view class="c-row ">
 				<view class="title">囤位号</view>
 				<view class="con-list">
-					<input v-model='gridList.storageTagNo' placeholder="请输入囤位号"
-						name="input"></input>
+					<input v-model='gridList.storageTagNo' placeholder="请输入囤位号" name="input"></input>
 				</view>
 			</view>
 			<view class="c-row ">
 				<view class="title">货名</view>
-				<view  class="con-list">
-					 <!-- <view v-if="flag != '0'">
+				<view class="con-list">
+					<!-- <view v-if="flag != '0'">
 						{{gridList.goodsName}}
 					</view> -->
 					<view @click='goodsName = true'>{{gridList.goodsName}}</view>
-					<u-picker :range="goodsList" range-key="goodsName" @confirm='goodsPicker($event)' v-model="goodsName" mode="selector" >
+					<u-picker :range="goodsList" range-key="goodsName" @confirm='goodsPicker($event)'
+						v-model="goodsName" mode="selector">
 					</u-picker>
 				</view>
 			</view>
@@ -101,23 +103,27 @@
 			</view>
 			<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>
+				<textarea class='textarea-style' v-model='gridList.reMemo' placeholder="请输入复检备注"
+					maxlength="300"></textarea>
 			</view>
 			<view class="c-row" v-if="flag==1&&gridList.warehouseName=='鲅鱼圈金信库'">
 				<view class="title">车型</view>
 				<view class="con-list">
 					<view @click='carstatus = true'>{{gridList.carModel?gridList.carModel:'请选择车型'}}</view>
-				<u-picker :range="carModeList" range-key="constValue" @confirm='carPicker($event)' v-model="carstatus" mode="selector" >
-				</u-picker>
+					<u-picker :range="carModeList" range-key="constValue" @confirm='carPicker($event)'
+						v-model="carstatus" mode="selector">
+					</u-picker>
 				</view>
-				
+
 			</view>
 		</view>
 		<view style='padding-bottom:300rpx;'>
 			<view class='wrap'>
 				<view style='margin-right:10px;' class='flex justify-between align-item-center'>
 					<view class='title_b'>化验信息</view>
-					<view class='flex justify-between align-item-center'>补录：<u-switch activeColor="#22C572" v-if='flag==0' v-model="value" @change="change"></u-switch></view>
+					<view class='flex justify-between align-item-center'>补录：<u-switch activeColor="#22C572"
+							v-if='flag==0' v-model="value" @change="change"></u-switch>
+					</view>
 				</view>
 				<view class="c-row ">
 					<view class="title">等级</view>
@@ -172,7 +178,7 @@
 					<view class="con-list">
 						<input :disabled='flag==1' v-model='gridList.jiaorenli' placeholder="请输入热损伤占比"
 							name="input"></input>
-							<!-- <input v-model='gridList.jiaorenli' @click.stop="handleShowKeyboard1":disabled="true" placeholder="请输入热损伤占比" name="input"></input> -->
+						<!-- <input v-model='gridList.jiaorenli' @click.stop="handleShowKeyboard1":disabled="true" placeholder="请输入热损伤占比" name="input"></input> -->
 					</view>
 				</view>
 			</view>
@@ -185,12 +191,12 @@
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
 			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
 			showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
-			<u-popup v-model="isShowPrint" class="popup" @close="close" mode="bottom" border-radius="30" :closeable="true">
-				<view class="buns_item">
-					<view class="but_css" @click="print">打印小票</view>
-					<view class="but_css" @click="close">返回</view>
-				</view>
-			</u-popup>
+		<u-popup v-model="isShowPrint" class="popup" @close="close" mode="bottom" border-radius="30" :closeable="true">
+			<view class="buns_item">
+				<view class="but_css" @click="print">打印小票</view>
+				<view class="but_css" @click="close">返回</view>
+			</view>
+		</u-popup>
 	</view>
 </template>
 
@@ -210,7 +216,7 @@
 		},
 		data() {
 			return {
-				isShowPrint:false,
+				isShowPrint: false,
 				inputShow: false,
 				modalName: '',
 				mycarStyle: '',
@@ -219,8 +225,8 @@
 				show: false,
 				selector: [],
 				show1: false,
-				goodsName:false,
-				carstatus:false,
+				goodsName: false,
+				carstatus: false,
 				inputContent: '',
 				coverTransform: 'translateY(0px)',
 				coverTransition: '0s',
@@ -244,8 +250,8 @@
 					type: '潮粮',
 					tidalGrainPrice: '',
 					dryGrainPrice: '',
-					carNumber:'',
-					carModel:'',
+					carNumber: '',
+					carModel: '',
 				},
 				managementType: '',
 				warehouseName: '',
@@ -253,8 +259,8 @@
 				showTran: true,
 				companyId: 1,
 				current: 4,
-				value:false,
-				carModeList:[],
+				value: false,
+				carModeList: [],
 				gradeList: [{
 						key: 1,
 						value: '一等品'
@@ -273,8 +279,8 @@
 					},
 				],
 				cangid: '',
-				goodsList:[],
-				isShowAlert:false,
+				goodsList: [],
+				isShowAlert: false,
 				content: '确认初检信息后，初检员不需要再次确认质检信息，是否确定提交?',
 			}
 		},
@@ -313,8 +319,6 @@
 			this.flag = options.flag
 			this.cangid = options.cangid
 			this.managementType = options.managementType
-		},
-		onShow() {
 			console.log(this.flag)
 			var that = this
 			this.$api.doRequest('get', '/qualityInspectionManagement/api/getQualityInspection', {
@@ -322,10 +326,10 @@
 			}).then(res => {
 				if (res.data.data) {
 					let data = res.data.data
-					if(data.supplementaryRecording==1){
-						that.value=true
-					}else{
-						that.value=false
+					if (data.supplementaryRecording == 1) {
+						that.value = true
+					} else {
+						that.value = false
 					}
 					that.gridList = data
 					that.$api.doRequest('get', '/warehouseBaseInfo/getWarehouse', {
@@ -340,12 +344,12 @@
 				constId: 'QUA1'
 			}).then(res => {
 				if (res.data.data) {
-					that.carModeList=res.data.data
+					that.carModeList = res.data.data
 				}
 			})
 			//质检货名下拉
 			this.$api.doRequest('get', '/qualityInspectionManagement/api/goodsName', {
-				 warehouseId: this.cangid
+				warehouseId: this.cangid
 			}).then(res => {
 				if (res.data.data) {
 					this.goodsList = res.data.data
@@ -353,14 +357,17 @@
 			})
 			this.gridList.grade = this.gradeList[0].value
 			this.gridList.gradeKey = this.gradeList[0].key
+		},
+		onShow() {
+
 		},
 		methods: {
-			print(){
+			print() {
 				uni.navigateTo({
 					url: '/pages/erpbusiness/bleConnect'
 				})
 			},
-			close(){
+			close() {
 				this.isShowPrint = false
 				uni.navigateBack({})
 			},
@@ -368,49 +375,49 @@
 			// 	console.log('childclick',type)
 			// 	// 0是上一项
 			// 	if(type==0){
-					
+
 			// 	}else{}
 			// },
-			hidden(){
+			hidden() {
 				this.$refs.keyboard.open(false)
 			},
-			carPicker(e){
-				this.gridList.carModel=this.carModeList[e[0]].constValue
+			carPicker(e) {
+				this.gridList.carModel = this.carModeList[e[0]].constValue
 			},
-			handleShowKeyboard(){
-				if(this.flag==0){
-					if(this.$refs.keyboard.open){
-						this.$refs.keyboard.open(true)//true 键盘显示 false 键盘隐藏
-					}else{
+			handleShowKeyboard() {
+				if (this.flag == 0) {
+					if (this.$refs.keyboard.open) {
+						this.$refs.keyboard.open(true) //true 键盘显示 false 键盘隐藏
+					} else {
 						this.$refs.keyboard[0].open(true)
 					}
 				}
 			},
-			handleShowKeyboard1(){
-				if(this.flag==0){
-					if(this.$refs.keyboard1.open){
-						this.$refs.keyboard1.open(true)//true 键盘显示 false 键盘隐藏
-					}else{
+			handleShowKeyboard1() {
+				if (this.flag == 0) {
+					if (this.$refs.keyboard1.open) {
+						this.$refs.keyboard1.open(true) //true 键盘显示 false 键盘隐藏
+					} else {
 						this.$refs.keyboard1[0].open(true)
 					}
 				}
 			},
-			handleClick(e){
+			handleClick(e) {
 				this.gridList.carNumber = e.value //键盘输入值
 			},
-			handleClick1(e){
+			handleClick1(e) {
 				this.gridList.jiaorenli = e.value //键盘输入值
 			},
-			change(e){
-				if(e){
-					this.gridList.supplementaryRecording=1
-				}else{
-					this.gridList.supplementaryRecording=0
+			change(e) {
+				if (e) {
+					this.gridList.supplementaryRecording = 1
+				} else {
+					this.gridList.supplementaryRecording = 0
 				}
-				
+
 			},
 			confirmInfo() {
-				this.isShowAlert = true	
+				this.isShowAlert = true
 			},
 			alertBtn() {
 				var that = this
@@ -485,7 +492,7 @@
 					})
 				}
 			},
-			goodsPicker(e){
+			goodsPicker(e) {
 				this.gridList.goodsName = this.goodsList[e[0]].goodsName
 			},
 			submit() {
@@ -556,7 +563,7 @@
 					this.$api.msg('购粮性质不能为空')
 					return
 				}
-				if(this.value==false||this.flag==2){
+				if (this.value == false || this.flag == 2) {
 					if (!this.gridList.grade) {
 						this.$api.msg('等级不能为空')
 						return
@@ -600,11 +607,11 @@
 									'/qualityInspectionManagement/api/editQualityInspection', that.gridList)
 								.then(res => {
 									if (res.data.code == 200) {
-									that.$api.msg('编辑质检成功')
+										that.$api.msg('编辑质检成功')
 										that.isShowPrint = true
 										that.gridList.warehouseId = that.cangid
-										uni.setStorageSync("quality_print",that.gridList)
-										console.log('that.gridList',that.gridList)
+										uni.setStorageSync("quality_print", that.gridList)
+										console.log('that.gridList', that.gridList)
 										// uni.getStorageSync("depotAcquisition_warehouseName")
 										// uni.navigateBack({})
 									}
@@ -811,21 +818,25 @@
 	input:disabled {
 		color: #ccc;
 	}
-	.textarea-style{
+
+	.textarea-style {
 		border: 1px solid #EEEEEE;
 		width: 100%;
-		padding:20rpx;
+		padding: 20rpx;
 		border-radius: 20rpx;
 	}
-	.c-row-fj{
-		padding:20rpx
+
+	.c-row-fj {
+		padding: 20rpx
 	}
-	.buns_item{
+
+	.buns_item {
 		display: flex;
 		padding: 80rpx 0 50rpx 0;
 		justify-content: space-around;
 	}
-	.but_css{
+
+	.but_css {
 		background: #22C572;
 		width: 40%;
 		padding: 20rpx;

pages/erpbusiness/exbleConnect.vue

@@ -34,7 +34,11 @@
 		computed: mapState(['sysinfo', 'Bluetooth']),
 		onLoad() {
 			// console.log(this.Bluetooth)
-			
+			console.log("~~~~~~~~~~~~~~~~~~~~~~~~~~~")
+			console.log("this.Bluetooth",this.Bluetooth)
+			if(this.Bluetooth.BLEInformation.deviceId){
+				this.openControl()
+			}
 		},
 		onUnload() {
 			//停止搜索蓝牙设备

pages/erpbusiness/jjbleConnect.vue

@@ -34,7 +34,11 @@
 		computed: mapState(['sysinfo', 'Bluetooth']),
 		onLoad() {
 			// console.log(this.Bluetooth)
-			
+			console.log("····················")
+			console.log("this.Bluetooth",this.Bluetooth)
+			if(this.Bluetooth.BLEInformation.deviceId){
+				this.openControl()
+			}
 		},
 		onUnload() {
 			//停止搜索蓝牙设备

pages/erpbusiness/jjsendCommand.vue

@@ -103,7 +103,6 @@
 		},
 		onShow() {
 			this.gridList = uni.getStorageSync("acquisitionInspection_print")
-			console.log(this.gridList)
 			let that = this;
 			let width;
 			let height;

pages/erpbusiness/sendCommand.vue

@@ -103,6 +103,7 @@
 		},
 		onShow() {
 			this.gridList = uni.getStorageSync("quality_print")
+			this.gridList.compId = uni.getStorageSync('pcUserInfo').compId
 			console.log(this.gridList)
 			let that = this;
 			let width;

pages/erpbusiness/sm/sm.vue

@@ -44,12 +44,12 @@
 					去初检
 				</view>
 				<view class="but_css" @click="skip(2)"
-					v-if="getRoles('acquisitionQuality.again') && (status == '已初检'|| status == '已复检')">去复检</view>
+					v-if="getRoles('acquisitionQuality.again') && !payStatus && confirm != '1' && (status == '已初检'|| status == '已复检')">去复检</view>
 				<view class="but_css" @click="skip(3)"
 					v-if="getRoles('acquisitionWeight.mao') && weightStatus != '已称皮重' && (weightStatus == '已质检'|| weightStatus == '已称毛重')">
 					去称毛重</view>
 				<view class="but_css" @click="skip(4)"
-					v-if="getRoles('acquisitionWeight.weight') && (weightStatus == '已称毛重' || weightStatus == '已称皮重')">
+					v-if="getRoles('acquisitionWeight.weight') && !payStatus && (weightStatus == '已称毛重' || weightStatus == '已称皮重')">
 					去称皮重
 				</view>
 				<view class="but_css" @click="skip(5)"
@@ -91,6 +91,7 @@
 				weightStatus: "", //检斤状态
 				qualityNo: "",
 				confirm: "", //确认初检确认状态
+				payStatus:"",//结算状态
 				detailData: {},
 				userName: "", //仓库负责人
 				companyId: "",
@@ -112,17 +113,20 @@
 			//#ifdef APP-PLUS
 			this.user.title = options.data.split(',')[2]
 			this.user.companyId = options.data.split(',')[1]
-			this.compId = options.data.split(",")[1]
+			this.compId = options.data
 			this.qualityNo = _list[1]
 			this.cangid = _list[2]
 			//#endif
 		},
 		onShow() {
 			// this.compId = "2710b21efc1e4393930c5dc800010dc4"
-			// this.qualityNo = "SGRK202112040001"
-			// this.cangid = "1c9949fa0dc04c5e84f9bea9c809856c"
+			// this.qualityNo = "SGRK202112200080001"
+			// this.cangid = "715d87adeea548cc9a70d03f72952816"
 			console.log("查看",this.qualityNo,this.compId,this.cangid)
 			if (this.cangid) { //判断是在哪扫码进入的
+				if(this.compId.indexOf(",") != -1){
+					this.compId = this.compId.split(",")[1]
+				}
 				this.show = false
 				this.show1 = true
 				this.companyId = uni.getStorageSync('pcUserInfo').compId
@@ -149,6 +153,8 @@
 							})
 						}
 					}).catch(res => {});
+				}else{
+				    this.$api.msg('当前身份不可操作！')
 				}
 			} else {//邀请客户
 				this.show = true
@@ -156,10 +162,13 @@
 				this.getList()
 			}
 			// this.getShow()
+			// debugger
+			// this.getRoles("acquisitionWeight.mao")
 		},
 		methods: {
 			//查看权限
 			getRoles: function(role) {
+				// debugger
 				let _roles = uni.getStorageSync('rolesList')
 				for (let i = 0; i < _roles.length; i++) {
 					if (_roles[i] == role) {
@@ -179,6 +188,7 @@
 						this.status = this.detailData.qualityInspectionManagement.status
 						this.confirm = this.detailData.qualityInspectionManagement.confirm
 						this.weightStatus = this.detailData.status
+						this.payStatus = this.detailData.paymentManagement.approveStatus
 					})
 					.catch(res => {
 						if (res.message) {

pages/grain_pulse/my_grain_pulse.vue

@@ -181,11 +181,11 @@
 				})
 			},
 			edit(item){
-				if(item.status=='已驳回'||item.status=='待审核'){
+				// if(item.status=='已驳回'||item.status=='待审核'){
 					uni.navigateTo({
 						url:'/pages/grain_pulse/editcompany?id='+item.id
 					})
-				}
+				// }
 				
 			},
 			showHidden(item){

pages/task/audit/freight_setting_approval.vue

@@ -46,19 +46,10 @@
 				</u-form-item>
 			</u-form>
 		</view>
-		<!-- 审核意见弹窗 -->
-		<!-- <u-popup v-model="show1" mode="center">
-			<view style="width: 300px;padding: 30rpx 10rpx;border-radius: 20rpx;">
-				<view class="rejectText">审核意见</view>
-				<u-input v-model="rejectInfo" type="textarea" :border="border" :height="height" :auto-height="autoHeight"  class="rejectInfoCss"
-					placeholder="请输入审核意见" />
-				<view class="flex">
-					<u-button @click="show1 = false" type="error" hover-class='none'>取消</u-button>
-					<u-button @click="passSubmit()" type="success">确定</u-button>
-				</view>
-			</view>
-		</u-popup> -->
-		<u-button type="primary" class="submit" @click="passSubmit()" v-if="list.priceStatus == '审核中'||isSHowBtn">通过
+		<u-modal v-model="show" :title-style="{fontSize: '18px',fontWeight:'500'}"
+			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
+			showCancelButton='false' :content="content" @confirm="passSubmit" @cancel="show = false"></u-modal>
+		<u-button type="primary" class="submit" @click="show = true" v-if="list.priceStatus == '审核中'||isSHowBtn">通过
 		</u-button>
 	</view>
 </template>
@@ -79,18 +70,16 @@
 				id: "",
 				show: false,
 				rejectInfo: "", //审核意见
-				//弹窗属性
-				// height:200,
-				// autoHeight: true,
-				// border: false,
+				title: "提示",
+				content: '是否通过该设置?'
 			}
 		},
 		onBackPress(e) {
-			if(this.everyCheck){
-			uni.navigateTo({
-				url: "/pages/task/my_task"
-			})
-			return true;
+			if (this.everyCheck) {
+				uni.navigateTo({
+					url: "/pages/task/my_task"
+				})
+				return true;
 			}
 		},
 		onLoad(options) {
@@ -116,45 +105,30 @@
 					this.$api.msg('运费单价不能为空')
 					return
 				}
-				// if (!this.rejectInfo1) {
-				// 	this.$api.msg('审核意见不能为空！')
-				// }else{
-
-				// }
-				uni.showModal({
-					content: "是否通过该设置?",
-					showCancel: true,
-					confirmText: '确定',
-					success: function(res) {
-						uni.showLoading({
-							title: "审核中"
-						})
-						if (res.confirm) {
-							var tranProcessInfo = {}
-							tranProcessInfo.id = that.list.id
-							tranProcessInfo.flag = "2"
-							tranProcessInfo.tranPriceIng = that.list.tranPriceIng
-							tranProcessInfo.reviewer = that.userInfo.userName
-							tranProcessInfo.tranTypeKey = that.list.tranTypeKey
-							that.$api.doRequest('post', '/tranProcessInfo/api/setUpTranPrice', tranProcessInfo)
-								.then(res => {
-									if (res.data.code == 200) {
-										that.$api.msg('审核通过成功!')
-										setTimeout(function() {
-											if (that.everyCheck) {
-												helper.setAudit(that.list)
-											} else {
-												uni.navigateBack()
-											}
-											uni.hideLoading()
-										}, 1000);
-									}
-								})
-						} else {
-							uni.hideLoading()
-						}
-					}
+				uni.showLoading({
+					title: "审核中"
 				})
+				var tranProcessInfo = {}
+				tranProcessInfo.id = that.list.id
+				tranProcessInfo.flag = "2"
+				tranProcessInfo.tranPriceIng = that.list.tranPriceIng
+				tranProcessInfo.reviewer = that.userInfo.userName
+				tranProcessInfo.tranTypeKey = that.list.tranTypeKey
+				that.$api.doRequest('post', '/tranProcessInfo/api/setUpTranPrice', tranProcessInfo)
+					.then(res => {
+						if (res.data.code == 200) {
+							that.$api.msg('审核通过成功!')
+							setTimeout(function() {
+								if (that.everyCheck) {
+									helper.setAudit(that.list)
+								} else {
+									uni.navigateBack()
+								}
+								uni.hideLoading()
+							}, 1000);
+						}
+					})
+
 			}
 		}
 	}
@@ -244,4 +218,4 @@
 		width: 100%;
 		justify-content: flex-end;
 	}
-</style>
+</style>

store/bluetooth/index.js

@@ -2,10 +2,21 @@ let sysinfo = uni.getSystemInfoSync();
 const Bluetooth = {
 	state: {
 		//蓝牙信息
-		
+		BLEInformation: {
+			platform: sysinfo.platform || "",
+			deviceId: "",
+			writeCharaterId: "",
+			writeServiceId: "",
+			notifyCharaterId: "",
+			notifyServiceId: "",
+			readCharaterId: "",
+			readServiceId: "",
+		}
 	},
 	mutations:{
-		
+		BLEInformationSet(state, info){
+			state.BLEInformation = info;
+		}
 	}
 }
 

store/index.js

@@ -1,6 +1,8 @@
 import Vue from 'vue'
 import Vuex from 'vuex'
 Vue.use(Vuex)
+//蓝牙设置
+import Bluetooth from '@/store/bluetooth/index.js'
 let lifeData = {};
 
 try {
@@ -39,15 +41,16 @@ const saveLifeData = function(key, value) {
 		uni.setStorageSync('lifeData', tmp);
 	}
 }
-let sysinfo = uni.getSystemInfoSync();
 
 
 const store = new Vuex.Store({
+	modules: {
+		Bluetooth
+	},
 	state: {
 		sysinfo: uni.getSystemInfoSync(),//系统信息
 		enter:{},
 		hasLogin: false,
-		BLEInformation: {},
 		// 如果上面从本地获取的lifeData对象下有对应的属性，就赋值给state中对应的变量
 		pushRes:lifeData.pushRes?lifeData.pushRes: {},
 		//期货数据获取
@@ -90,18 +93,7 @@ const store = new Vuex.Store({
 		clientId: lifeData.clientId?lifeData.clientId: "",
 		// 确定收货
 		isConfigfreightTransport:true,
-		choice:"",
-		//蓝牙信息
-		BLEInformation: {
-			platform: sysinfo.platform || "",
-			deviceId: "",
-			writeCharaterId: "",
-			writeServiceId: "",
-			notifyCharaterId: "",
-			notifyServiceId: "",
-			readCharaterId: "",
-			readServiceId: "",
-		}
+		choice:""
 	},
 	mutations: {
 		$uStore(state, payload) {
@@ -129,10 +121,7 @@ const store = new Vuex.Store({
 			state.userInfo = provider;
 			uni.setStorageSync('userInfo', provider)
 		},
-		BLEInformationSet(state, info){
-			console.log(info)
-			state.BLEInformation = info;
-		},
+		
 		logout(state) {
 			state.hasLogin = false;
 			state.userInfo = {};
@@ -151,9 +140,8 @@ const store = new Vuex.Store({
 		state.enter = provider
 		console.log(state)
 		},
-		BLEInformationSet(state, info){
-			state.BLEInformation = info;
-		}
+		
+		
 	},
 	actions: {