更新 sdy

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 => {

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

@@ -632,7 +632,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 +647,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/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,7 +44,7 @@
 					去初检
 				</view>
 				<view class="but_css" @click="skip(2)"
-					v-if="getRoles('acquisitionQuality.again') && !payStatus && (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>
@@ -162,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) {

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>