小程序 更新 sdy

pages/erpbusiness/index.vue

@@ -84,7 +84,7 @@
 						src:'../../static/img/erp/shougoujianjin@3x.png',
 						tips: 0,
 						url: '/pages/erpbusiness/acquisitionInspection/acquisitionInspection',
-						show: true
+						show: false
 					}
 					// {
 					// 	num: 5,

pages/task/audit/Issueandreceipt_task_approval.vue

@@ -1,5 +1,21 @@
 <template>
 	<view class="warp">
+		<view class="topInfo">
+			<view class="topInfo-item">
+				<view class="flex info">
+					<view class="logo">
+						<image src="../../../static/img/reject.png" mode="" v-if="OutList.taskStatus == '已驳回'"
+							style="height: 40rpx;"></image><!-- 驳回 -->
+						<image src="../../../static/img/tongguo.png" mode="" v-if="OutList.taskStatus == '已通过'"
+							style="height: 40rpx;"></image><!-- 通过 -->
+						<image src="../../../static/img/daishenhe.png" mode="" v-if="OutList.taskStatus == '审核中'"
+							style="height: 40rpx;"></image><!-- 待审核 -->
+					</view>
+					<view class="infoText">{{OutList.taskStatus}}</view>
+				</view>
+				<view class="infoData">{{OutList.updateDate}}</view>
+			</view>
+		</view>
 		<view class="content1">
 			<u-form :model="OutList" ref="uForm">
 				<u-form-item label="任务类型" prop="inOutType" label-width="140" class="uForm_item">
@@ -226,7 +242,7 @@
 		</u-popup>
 		<u-toast ref="uToast" />
 		<view style='padding:10px;' class='flex bottom-btn'>
-			<u-button @click='show1 = true' type="error" class="btn1">驳回</u-button>
+			<u-button @click='show1 = true' type="error" class="btn1" hover-class='none'>驳回</u-button>
 			<u-button @click='passSubmit()' type="success" class="btn2">通过</u-button>
 		</view>
 	</view>
@@ -264,9 +280,9 @@
 				],
 			}
 		},
-		onReady() {
-			this.$refs.uForm.setRules(this.rules);
-		},
+		// onReady() {
+		// 	this.$refs.uForm.setRules(this.rules);
+		// },
 		onLoad(options) {
 			this.id = options.id
 			this.getList()
@@ -497,4 +513,34 @@
 	.rejectText {
 		text-align: center;
 	}
+	.topInfo {
+		height: 210rpx;
+		background: linear-gradient(270deg, #22C572 0%, #34DE8A 100%);
+		padding: 30rpx;
+	
+		.topInfo-item {
+			height: 150rpx;
+			background-color: #FFFFFF;
+			border-radius: 20rpx;
+			padding: 40rpx;
+	
+			.logo {
+				width: 40rpx;
+				height: 40rpx;
+				margin-top: 8rpx;
+			}
+	
+			.infoText {
+				font-size: 36rpx;
+				font-weight: 600;
+				margin-left: 20rpx;
+			}
+	
+			.infoData {
+				color: #878C9C;
+				font-size: 26rpx;
+				margin-top: 10rpx;
+			}
+		}
+	}
 </style>

pages/task/audit/acquisition_settlement_approval.vue

@@ -1,27 +1,44 @@
 <template>
 	<view class="warp">
+		<view class="topInfo">
+			<view class="topInfo-item">
+				<view class="flex info">
+					<view class="logo">
+						<image src="../../../static/img/reject.png" mode="" v-if="list.priceStatus == '已驳回'"
+							style="height: 40rpx;"></image><!-- 驳回 -->
+						<image src="../../../static/img/tongguo.png" mode="" v-if="list.priceStatus == '已通过'"
+							style="height: 40rpx;"></image><!-- 通过 -->
+						<image src="../../../static/img/daishenhe.png" mode="" v-if="list.priceStatus == '审核中'"
+							style="height: 40rpx;"></image><!-- 待审核 -->
+					</view>
+					<view class="infoText">{{list.priceStatus}}</view>
+				</view>
+				<view class="infoData">2020年1月15日 08:45</view>
+			</view>
+		</view>
 		<view class='content1'>
-			<view class='row content-item' >
+			<view class='row content-item'>
 				<view class="left" style="color: #878C9C ;">仓库</view>
 				<view class="right">鲅鱼圈一号库</view>
 			</view>
 			<view class="content-item">
-			<view v-for="(item,index) in List">
-				<view class='row row1'>
-					<view class="left title">{{item.paymentNo}}</view>
-					<view class="right title">{{item.carNo}}</view>
-				</view>
-				<view class='row'>
-					<view class="left goodsInfoCss">{{item.goodsName}}({{item.netWeight}}kg - ￥{{item.tidalGrainPrice}})</view>
-					<view class="right priceCss">￥{{item.amountIngPayable}}</view>
+				<view v-for="(item,index) in List">
+					<view class='row row1'>
+						<view class="left title">{{item.paymentNo}}</view>
+						<view class="right title">{{item.carNo}}</view>
+					</view>
+					<view class='row'>
+						<view class="left goodsInfoCss">{{item.goodsName}}({{item.netWeight}}kg -
+							￥{{item.tidalGrainPrice}})</view>
+						<view class="right priceCss">￥{{item.amountIngPayable}}</view>
+					</view>
 				</view>
 			</view>
-</view>
 		</view>
 		<u-toast ref="uToast" />
 		<view style='padding:10px;' class='flex bottom-btn'>
-			<u-button  @click='rejectSubmit()' type="error" class="btn1">驳回</u-button>
-			<u-button  @click='passSubmit()' type="success" class="btn2">通过</u-button>
+			<u-button @click='rejectSubmit()' type="error" class="btn1" hover-class='none'>驳回</u-button>
+			<u-button @click='passSubmit()' type="success" class="btn2">通过</u-button>
 		</view>
 	</view>
 </template>
@@ -113,8 +130,8 @@
 						this.$api.doRequest('get', '/workflow/api/handle', {
 							taskId: item.taskId,
 							approved: status,
-							auditMind: reason  ? '已驳回' : '34',
-							needReapply: status2  ? true : false
+							auditMind: reason ? '已驳回' : '34',
+							needReapply: status2 ? true : false
 						}).then(res => {
 							if (res.data.code == 200) {
 								this.audit(this.List[index + 1], index + 1, status, status2, reason)
@@ -141,8 +158,8 @@
 		padding: 20rpx 20rpx 200rpx 20rpx;
 	}
 
-	.content1{
-		.content-item{
+	.content1 {
+		.content-item {
 			border-radius: 20rpx;
 			background: white;
 			padding: 40rpx 20rpx;
@@ -155,13 +172,15 @@
 			color: #333333;
 			margin: 30rpx 0;
 		}
-		.goodsInfoCss{
+
+		.goodsInfoCss {
 			font-size: 28rpx;
 			font-weight: 600;
 			color: #878C9C;
-				margin: 26rpx 10rpx;
+			margin: 26rpx 10rpx;
 		}
-		.priceCss{
+
+		.priceCss {
 			font-size: 40rpx;
 			margin: 26rpx 10rpx;
 			color: #22C572;
@@ -184,23 +203,57 @@
 	.bottom-btn {
 		width: 100%;
 		position: fixed;
-		bottom:0;
+		bottom: 0;
 		display: flex;
 		z-index: 2;
 		left: 0;
 		background-color: #f8f8f8;
 		flex-direction: column;
-		.btn1,.btn2{
+
+		.btn1,
+		.btn2 {
 			width: 100%;
 			margin-bottom: 26rpx;
 			border-radius: 90rpx;
 		}
-		.btn1{
+
+		.btn1 {
 			background: white;
 			color: #00C265;
 		}
 	}
+
 	.row1 {
 		border-bottom: 0 !important;
 	}
+	.topInfo {
+		height: 210rpx;
+		background: linear-gradient(270deg, #22C572 0%, #34DE8A 100%);
+		padding: 30rpx;
+	
+		.topInfo-item {
+			height: 150rpx;
+			background-color: #FFFFFF;
+			border-radius: 20rpx;
+			padding: 40rpx;
+	
+			.logo {
+				width: 40rpx;
+				height: 40rpx;
+				margin-top: 8rpx;
+			}
+	
+			.infoText {
+				font-size: 36rpx;
+				font-weight: 600;
+				margin-left: 20rpx;
+			}
+	
+			.infoData {
+				color: #878C9C;
+				font-size: 26rpx;
+				margin-top: 10rpx;
+			}
+		}
+	}
 </style>

pages/task/audit/freight_setting_approval.vue

@@ -119,7 +119,7 @@
 		padding: 30rpx;
 
 		.topInfo-item {
-			height: 158rpx;
+			height: 150rpx;
 			background-color: #FFFFFF;
 			border-radius: 20rpx;
 			padding: 40rpx;

pages/task/audit/freight_settlement_approval.vue

@@ -53,7 +53,7 @@
 		</view>
 		<u-toast ref="uToast" />
 		<view style='padding:10px;' class='flex bottom-btn'>
-			<u-button @click="rejectSubmit()" type="error" class="btn1">驳回</u-button>
+			<u-button @click="rejectSubmit()" type="error" class="btn1" hover-class='none'>驳回</u-button>
 			<u-button  @click="passSubmit()" type="success" class="btn2">通过</u-button>
 		</view>
 	</view>
@@ -65,7 +65,11 @@
 			return {
 				currentPage: 1,
 				pageSize: 10,
-				list: [],
+				list: [
+					{
+						approveStatus:"",
+					}
+				],
 			}
 		},
 		onLoad() {

pages/task/audit/purchase_settlement_approval.vue

@@ -1,5 +1,21 @@
 <template>
 	<view class="container">
+		<view class="topInfo">
+			<view class="topInfo-item">
+				<view class="flex info">
+					<view class="logo">
+						<image src="../../../static/img/reject.png" mode="" v-if="list[0].status == '已驳回'"
+							style="height: 40rpx;"></image><!-- 驳回 -->
+						<image src="../../../static/img/tongguo.png" mode="" v-if="list[0].status == '已通过'"
+							style="height: 40rpx;"></image><!-- 通过 -->
+						<image src="../../../static/img/daishenhe.png" mode="" v-if="list[0].status == '审核中'||list[0].status == '未审核'"
+							style="height: 40rpx;"></image><!-- 待审核 -->
+					</view>
+					<view class="infoText">{{list[0].status}}</view>
+				</view>
+				<view class="infoData">{{list[0].warehousingDate}}</view>
+			</view>
+		</view>
 		<view class="content">
 			<view class="top content-item">
 				<view>{{contractNo}}</view>
@@ -33,7 +49,7 @@
 			<u-button type="primary" class="submit" hover-class="none" @click="passSubmit()">通过</u-button>
 		</view> -->
 		<view style='padding:10px;' class='flex bottom-btn'>
-			<u-button  @click='rejectSubmit' type="error" class="btn1">驳回</u-button>
+			<u-button  @click='rejectSubmit' type="error" class="btn1" hover-class='none'>驳回</u-button>
 			<u-button  @click='passSubmit' type="success" class="btn2">通过</u-button>
 		</view>
 	</view>
@@ -157,6 +173,7 @@
 	}
 
 	.content {
+		margin-top: 30rpx;
 		.top {
 			display: flex;
 			justify-content: space-between;
@@ -232,4 +249,34 @@
 			color: #00C265;
 		}
 		}
+		.topInfo {
+			height: 210rpx;
+			background: linear-gradient(270deg, #22C572 0%, #34DE8A 100%);
+			padding: 30rpx;
+		
+			.topInfo-item {
+				height: 150rpx;
+				background-color: #FFFFFF;
+				border-radius: 20rpx;
+				padding: 40rpx;
+		
+				.logo {
+					width: 40rpx;
+					height: 40rpx;
+					margin-top: 8rpx;
+				}
+		
+				.infoText {
+					font-size: 36rpx;
+					font-weight: 600;
+					margin-left: 20rpx;
+				}
+		
+				.infoData {
+					color: #878C9C;
+					font-size: 26rpx;
+					margin-top: 10rpx;
+				}
+			}
+		}
 </style>

pages/task/audit/warehouse_approval.vue

@@ -1,5 +1,21 @@
 <template>
 	<view class="warp">
+		<view class="topInfo">
+			<view class="topInfo-item">
+				<view class="flex info">
+					<view class="logo">
+						<image src="../../../static/img/reject.png" mode="" v-if="list.status == '已驳回'"
+							style="height: 40rpx;"></image><!-- 驳回 -->
+						<image src="../../../static/img/tongguo.png" mode="" v-if="list.status == '已通过'"
+							style="height: 40rpx;"></image><!-- 通过 -->
+						<image src="../../../static/img/daishenhe.png" mode="" v-if="list.status == '审核中'"
+							style="height: 40rpx;"></image><!-- 待审核 -->
+					</view>
+					<view class="infoText">{{list.status}}</view>
+				</view>
+				<view class="infoData">{{list.updateDate}}</view>
+			</view>
+		</view>
 		<view class='content1'>
 			<view class="title">基本信息</view>
 			<view class='row'>
@@ -55,7 +71,7 @@
 		</view>
 		<u-toast ref="uToast" />
 		<view style='padding:10px;' class='flex bottom-btn'>
-			<u-button  @click='reject' type="error" class="btn1">驳回</u-button>
+			<u-button  @click='reject' type="error" class="btn1" hover-class='none'>驳回</u-button>
 			<u-button  @click='audit' type="success" class="btn2">通过</u-button>
 		</view>
 	</view>
@@ -242,4 +258,34 @@
 		border:0;
 		border-bottom: 0!important;
 	}
+	.topInfo {
+		height: 210rpx;
+		background: linear-gradient(270deg, #22C572 0%, #34DE8A 100%);
+		padding: 30rpx;
+	
+		.topInfo-item {
+			height: 150rpx;
+			background-color: #FFFFFF;
+			border-radius: 20rpx;
+			padding: 40rpx;
+	
+			.logo {
+				width: 40rpx;
+				height: 40rpx;
+				margin-top: 8rpx;
+			}
+	
+			.infoText {
+				font-size: 36rpx;
+				font-weight: 600;
+				margin-left: 20rpx;
+			}
+	
+			.infoData {
+				color: #878C9C;
+				font-size: 26rpx;
+				margin-top: 10rpx;
+			}
+		}
+	}
 </style>

pages/task/my_task.vue

@@ -350,6 +350,7 @@
 						})
 					}
 				}else if (item.businessCode == 'INOUTTASK-TASK-APPROVE') {
+					debugger
 					if (this.statusFlag == 1) {
 						uni.navigateTo({
 							url: `/pages/task/audit/Issueandreceipt_task_approval?id=` + item.businessId
@@ -358,8 +359,7 @@
 					} else {
 						uni.navigateTo({
 							// url:'/pageD/warehousings/warehousings?id='+item.businessId+'&compId='+item.compId
-							url: `/pages/task/audit/Issueandreceipt_task_details?id=` + item.businessId + '&compId=' + this
-								.pcUserInfo.compId
+							url: `/pages/task/audit/Issueandreceipt_task_details?id=` + item.businessId
 						})
 					}