小程序 更新 sdy

pages/erpbusiness/edit_quality_testing.vue

@@ -70,7 +70,12 @@
 			<view class="c-row ">
 				<view class="title">货名</view>
 				<view class="con-list">
-					{{gridList.goodsName}}
+					<view v-if="flag == '1'">
+						{{gridList.goodsName}}
+					</view>
+					<view @click='goodsName = true' v-if="flag == '2'">{{gridList.goodsName}}</view>
+					<u-picker :range="goodsList" range-key="goodsName" @confirm='goodsPicker($event)' v-model="goodsName" mode="selector" v-if="flag == '2'">
+					</u-picker>
 				</view>
 			</view>
 			<view class="c-row ">
@@ -188,6 +193,7 @@
 				show: false,
 				selector: [],
 				show1: false,
+				goodsName:false,
 				inputContent: '',
 				coverTransform: 'translateY(0px)',
 				coverTransition: '0s',
@@ -235,7 +241,8 @@
 						value: '等外'
 					},
 				],
-				cangid: ''
+				cangid: '',
+				goodsList:[]
 			}
 		},
 		// #ifndef MP
@@ -290,6 +297,14 @@
 					})
 				}
 			})
+			//质检货名下拉
+			this.$api.doRequest('get', '/qualityInspectionManagement/api/goodsName', {
+				 warehouseId: this.cangid
+			}).then(res => {
+				if (res.data.data) {
+					this.goodsList = res.data.data
+				}
+			})
 			this.gridList.grade = this.gradeList[0].value
 			this.gridList.gradeKey = this.gradeList[0].key
 		},
@@ -305,9 +320,7 @@
 							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) {
@@ -344,6 +357,9 @@
 					})
 				}
 			},
+			goodsPicker(e){
+				this.gridList.goodsName = this.goodsList[e[0]].goodsName
+			},
 			submit() {
 				this.gridList.flag = this.flag
 				// if(this.flag==2){

pages/task/audit/acquisition_information_approval.vue

@@ -1,16 +1,39 @@
 <template>
 	<view class="wrap">
 		<view class='content1'>
-			<view class='row content-item'>
-				<view class="left" style="color: #878C9C ;">仓库</view>
-				<view class="right">鲅鱼圈库</view>
+			<view class='row'>
+				<view class="left">鲅鱼圈库</view>
+				<!-- <view class="right">鲅鱼圈库</view> -->
 			</view>
-			<view class='row content-item'>
+			<view class='row '>
 				<textarea placeholder="请输入仓库信息" class="textarea" maxlength="2000" v-model="textareaValue"></textarea>
 				<view class="textarea-bottom">{{textareaValue?textareaValue.length:'0'}}/2000字</view>
 			</view>
 			<view class='row content-item'>
-				<u-checkbox activeColor="#19be6b" v-model="value" @change="checkBoxChange">显示在易粮易运收购信息中</u-checkbox>
+				<!-- <u-checkbox activeColor="#19be6b" v-model="value" @change="checkBoxChange">显示在易粮易运收购信息中</u-checkbox> -->
+				显示在易粮易运收购信息中
+				<view class="right">
+					<u-switch v-model="checked" active-color="#22C572" inactive-color="#eee" size='40' @change="checkBoxChange" disabled="disabled"></u-switch>
+				</view>
+			</view>
+		</view>
+		<view v-if='show' class="shade">
+			<view class="wrap">
+				<view class="alert-top">
+					<view class="title">
+						{{title}}
+					</view>
+					<u-icon name="close" class="close" color="#8890B1" @click="close()"></u-icon>
+				</view>
+				<view class="u-textarea-style">
+					<view class="right-bottom">
+						{{auditMind.length}}/100个字
+					</view>
+					<u-input class="" v-model='auditMind' placeholder="请在此输入审核意见" type="textarea" height="414"
+						maxlength="100" />
+				</view>
+				<view @click='close()' class="cancel">取消</view>
+				<view @click='passSubmit()' class="confirm">确定</view>
 			</view>
 		</view>
 		<u-toast ref="uToast" />
@@ -39,33 +62,17 @@
 				isShowAlert: false,
 				content: '当前登入信息验证失败，是否重新登录？',
 				textareaValue: '',
-				value: ''
+				value: '',
+				show:false,
+				title:"",
+				auditMind:"", //审核意见
+			    checked: false,
 			}
 		},
 
 		onLoad() {
 
 		},
-		// #ifndef MP
-		onNavigationBarButtonTap(e) {
-			const index = e.index;
-			if (index === 0) {
-				this.navTo('/pages/set/set');
-			} else if (index === 1) {
-				// #ifdef APP-PLUS
-				const pages = getCurrentPages();
-				const page = pages[pages.length - 1];
-				const currentWebview = page.$getAppWebview();
-				currentWebview.hideTitleNViewButtonRedDot({
-					index
-				});
-				// #endif
-				uni.navigateTo({
-					url: '/pages/notice/notice'
-				})
-			}
-		},
-		// #endif
 		computed: {
 			...mapState(['hasLogin', 'userInfo']),
 		},
@@ -94,6 +101,49 @@
 			console.log("hasLogin", this.hasLogin)
 		},
 		methods: {
+			pass(){
+				this.title = "审核意见（通过）"
+				this.show = true
+			},
+			reject(){
+				this.title = "驳回原因（驳回）"
+				this.show = true
+			},
+			close(){
+				this.show = false
+			},
+			passSubmit(item){
+				if(this.title == "审核意见（通过）"){
+					this.$api.doRequest('post', '/workflow/api/handle', {
+						taskId: item.taskId,
+						approved: true,
+						auditMind: this.auditMind ? this.auditMind : "34",
+						needReapply:true
+					}).then(res => {
+						if (res.data.code == 200) {
+					      this.$api.msg('通过成功')
+						}
+					})
+					
+				}else if(this.title == "驳回原因（驳回）"){
+					if(!this.auditMind){
+						this.$api.msg('驳回原因不能为空！')
+						return
+					}
+					this.$api.doRequest('post', '/workflow/api/handle', {
+						taskId: item.taskId,
+						approved: false,
+						auditMind: this.auditMind ? this.auditMind : "34",
+						needReapply:true
+					}).then(res => {
+						if (res.data.code == 200) {
+					      this.$api.msg('驳回成功')
+						}
+					})
+				}
+			},
+			
+			
 			/**
 			 * 统一跳转接口,拦截未登录路由
 			 * navigator标签现在默认没有转场动画，所以用view
@@ -129,34 +179,43 @@
 		background: #fff;
 		margin: 10px;
 		border-radius: 10px;
-		padding: 10px;
+		padding: 40rpx 30rpx;
 
 	}
+	.content-item{
+		margin-top: 50rpx;
+		font-size: 28rpx;
+	}
 
 	.row {
 		display: flex;
 		justify-content: space-between;
 		position: relative;
 		/* border-bottom: 1px solid #EEEEEE; */
-
 		.right,
 		input {
 			font-size: 28rpx;
 			// color: #333333;
 		}
+		.left{
+			font-size: 34rpx;
+			color: #333333;
+			font-weight: 600;
+		}
 	}
 
 	.textarea {
 		background: #F9F9FA;
-		font-size: 12px;
+		font-size: 26rpx;
 		text-align: left;
 		width: 100%;
 		height: 60px;
-		padding: 10px;
-		border-radius: 5px;
-		margin-top: 10px;
+		padding: 32rpx;
+		border-radius: 10rpx;
+		margin-top: 40rpx;
 		height: 50vh;
 		padding-bottom: 20rpx;
+		color: #AFB3BF ;
 	}
 
 	.textarea-bottom {
@@ -187,4 +246,87 @@
 			color: #00C265;
 		}
 	}
+	.shade {
+		position: fixed;
+		top: 0;
+		left: 0;
+		height: 100%;
+		width: 100%;
+		background: rgba(0, 0, 0, 0.4);
+		z-index: 3;
+	
+		.wrap {
+			position: absolute;
+			left: 0;
+			top: 0;
+			right: 0;
+			bottom: 0;
+			margin: auto;
+			background: #fff;
+			width: calc(100% - 198rpx);
+			height: 700rpx;
+			border-radius: 20rpx;
+			padding: 20rpx;
+	
+			.alert-top {
+				padding: 33rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				position: relative;
+			}
+	
+			.title {
+				font-size: 32rpx;
+				font-weight: 600;
+				color: #333333;
+			}
+	
+			.close {
+				position: absolute;
+				right: 33rpx;
+			}
+		}
+	}
+	.cancel,
+	.confirm {
+		position: absolute;
+		display: inline-block;
+		width: 50%;
+		text-align: center;
+		bottom: 0;
+		padding: 10px;
+		border-top: 1px solid #eee;
+		font-size: 34rpx;
+	}
+	
+	.cancel {
+		left: 0;
+		border-right: 1px solid #eee;
+		color: #AFB3BF;
+	}
+	
+	.confirm {
+		right: 0;
+		color: #22C572;
+	}
+	.u-textarea-style {
+		margin: 20rpx;
+		background: #F9F9FA;
+		border-radius: 10px;
+		border: 1px solid #EEEEEE;
+		padding: 10rpx 20rpx;
+		position: relative;
+	
+		.right-bottom {
+			position: absolute;
+			right: 20rpx;
+			bottom: 20rpx;
+			color: #AFB3BF;
+		}
+	}
+	
+	/deep/.u-input__textarea {
+		height: 300rpx !important;
+	}
 </style>

pages/task/my_task.vue

@@ -144,6 +144,12 @@
 						} else {
 							item.itemUrl = `/pages/task/audit/freight_setting_details?id=` + item.businessId
 						}
+					}else if (item.businessCode == 'ACQUISITION-SETTLEMENT-APPRPVE') {//库点收购
+						if (this.statusFlag == 1) {
+							item.itemUrl = `/pages/task/audit/acquisition_information_approval?id=` + item.businessId
+						} else {
+							item.itemUrl = `/pages/task/audit/acquisition_information_details?id=` + item.businessId
+						}
 					}
 					if (item.taskType == "入库任务") {
 
@@ -545,7 +551,6 @@
 						uni.navigateTo({
 							url: `/pageD/warehousings/warehousings?id=${item.id}&goodsName=${item.goodsName}&contractNo=${item.contractNo}&startWeight=${item.startWeight}&carNo=${item.carNo}&tranCarNo=${item.tranCarNo}&warehouseName=${item.warehouseName}&addressUrl=${item.addressUrl}&inOutDate=${item.inOutDate}&binNumber=${item.binNumber}&isShowbtn=true`
 						})
-
 					}
 				} else if (item.taskType == "出库任务") {
 					if (item.statusFlag == 3) {
@@ -555,7 +560,6 @@
 					} else {
 						uni.navigateTo({
 							url: `/pageD/warehousings/ex_warehouse?id=${item.id}&goodsName=${item.goodsName}&contractNo=${item.contractNo}&consignee=${item.consignee}&carNo=${item.carNo}&tranCarNo=${item.tranCarNo}&boxNo=${item.boxNo}&titleNo=${item.titleNo}&isShowbtn=true`
-
 						})
 					}
 				}