Forráskód Böngészése

前端 小程序任务样式 sdy

zhongtianhaoyuan 3 éve
szülő
commit
fd1dd589bb

+ 1 - 1
config/index.js

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

+ 48 - 33
pages/task/audit/acquisition_settlement_approval.vue

@@ -1,26 +1,27 @@
 <template>
 	<view class="warp">
 		<view class='content1'>
-			<view class='row'>
-				<view class="left">仓库</view>
+			<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">{{item.paymentNo}}</view>
-					<view class="right">{{item.carNo}}</view>
+					<view class="left title">{{item.paymentNo}}</view>
+					<view class="right title">{{item.carNo}}</view>
 				</view>
 				<view class='row'>
-					<view class="left">{{item.goodsName}}({{item.netWeight}} - {{item.tidalGrainPrice}})</view>
-					<view class="right">{{item.amountIngPayable}}</view>
+					<view class="left goodsInfoCss">{{item.goodsName}}({{item.netWeight}}kg - {{item.tidalGrainPrice}})</view>
+					<view class="right priceCss">{{item.amountIngPayable}}</view>
 				</view>
 			</view>
-
+</view>
 		</view>
 		<u-toast ref="uToast" />
-		<view class="bottom-btn">
-			<u-button type="primary" class="submit" hover-class="none" @click="rejectSubmit()">驳回</u-button>
-			<u-button type="primary" class="submit" hover-class="none" @click="passSubmit()">通过</u-button>
+		<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>
 		</view>
 	</view>
 </template>
@@ -137,54 +138,68 @@
 <style scoped lang="scss">
 	.warp {
 		margin: 10rpx;
-		padding: 20rpx 20rpx 140rpx 20rpx;
+		padding: 20rpx 20rpx 200rpx 20rpx;
 	}
 
-	.content1,
-	.content2 {
-		border-radius: 20rpx;
-		background: white;
-		padding: 20rpx;
+	.content1{
+		.content-item{
+			border-radius: 20rpx;
+			background: white;
+			padding: 40rpx 20rpx;
+			margin-bottom: 30rpx;
+		}
 
 		.title {
-			font-size: 28rpx;
+			font-size: 32rpx;
 			font-weight: 600;
 			color: #333333;
-			text-align: center;
+			margin: 30rpx 0;
+		}
+		.goodsInfoCss{
+			font-size: 28rpx;
+			font-weight: 600;
+			color: #878C9C;
+				margin: 26rpx 10rpx;
+		}
+		.priceCss{
+			font-size: 40rpx;
+			margin: 26rpx 10rpx;
+			color: #22C572;
+			font-weight: 600;
 		}
 
 		.row {
 			display: flex;
 			justify-content: space-between;
 			border-bottom: 1px solid #EEEEEE;
-			padding: 21rpx 0;
 
 			.right,
 			input {
 				font-size: 28rpx;
-				color: #333333;
+				// color: #333333;
 			}
 		}
 	}
 
-	.content2 {
-		margin-top: 20rpx;
-	}
-
 	.bottom-btn {
-		width: 92%;
+		width: 100%;
 		position: fixed;
-		bottom: 40rpx;
+		bottom:0;
 		display: flex;
 		z-index: 2;
+		left: 0;
+		background-color: #f8f8f8;
+		flex-direction: column;
+		.btn1,.btn2{
+			width: 100%;
+			margin-bottom: 26rpx;
+			border-radius: 90rpx;
+		}
+		.btn1{
+			background: white;
+			color: #00C265;
+		}
 	}
-
-	.submit {
-		width: 40%;
-		background: #22C572;
-		border-radius: 10rpx;
-	}
-
 	.row1 {
 		border-bottom: 0 !important;
 	}

+ 42 - 2
pages/task/audit/freight_setting_approval.vue

@@ -1,7 +1,20 @@
 <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="transaction">
-			<u-form :model="list" ref="uForm" class="uForm">
+			<u-form :model="list" ref="list" class="uForm">
 				<u-form-item label="合同编号" prop="contractNo" label-width="140">
 					<u-input v-model="list.contractNo" input-align="right" placeholder="" disabled />
 				</u-form-item>
@@ -22,7 +35,7 @@
 				</u-form-item>
 			</u-form>
 		</view>
-		<u-button type="primary" class="submit" @click="passSubmit()">通过</u-button>
+		<u-button type="primary" class="submit" @click="passSubmit()" v-if="list.priceStatus == '审核中'">通过</u-button>
 	</view>
 </template>
 
@@ -83,6 +96,33 @@
 		z-index: 2;
 	}
 
+	.topInfo {
+		height: 210rpx;
+		background: linear-gradient(270deg, #22C572 0%, #34DE8A 100%);
+		padding: 30rpx;
+		.topInfo-item {
+			height: 158rpx;
+			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;
+			}
+		}
+	}
 	.submit {
 		width: 98%;
 		background: #22C572;

+ 45 - 5
pages/task/audit/freight_setting_details.vue

@@ -1,7 +1,20 @@
 <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="transaction">
-			<u-form :model="list" ref="uForm" class="uForm">
+			<u-form :model="list" ref="list" class="uForm">
 				<u-form-item label="合同编号" prop="contractNo" label-width="140">
 					<u-input v-model="list.contractNo" input-align="right" placeholder="" disabled />
 				</u-form-item>
@@ -12,17 +25,17 @@
 					<u-input v-model="list.goodsName" input-align="right" placeholder="" disabled />
 				</u-form-item>
 				<u-form-item label="发货地址" prop="sendDetailedAddress" label-width="140">
-					<u-input v-model="list.sendDetailedAddress" input-align="right" placeholder="" disabled />
+					<u-input v-model="list.sendDetailedAddress" input-align="right" placeholder="发货地址" disabled />
 				</u-form-item>
 				<u-form-item label="收货地址" prop="receiveDetailedAddress" label-width="140">
-					<u-input v-model="list.receiveDetailedAddress" input-align="right" placeholder="请输入收货地址" disabled />
+					<u-input v-model="list.receiveDetailedAddress" input-align="right" placeholder="收货地址" disabled />
 				</u-form-item>
 				<u-form-item label="运费(元/吨)" prop="tranPrice" label-width="250">
-					<u-input v-model="list.tranPriceIng" input-align="right" placeholder="请输入运费单价" />
+					<u-input v-model="list.tranPriceIng" input-align="right" placeholder="请输入运费单价" disabled/>
 				</u-form-item>
 			</u-form>
 		</view>
-		<u-button type="primary" class="submit" @click="passSubmit()">状态????</u-button>
+		
 	</view>
 </template>
 
@@ -83,6 +96,33 @@
 		z-index: 2;
 	}
 
+	.topInfo {
+		height: 210rpx;
+		background: linear-gradient(270deg, #22C572 0%, #34DE8A 100%);
+		padding: 30rpx;
+		.topInfo-item {
+			height: 158rpx;
+			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;
+			}
+		}
+	}
 	.submit {
 		width: 98%;
 		background: #22C572;

+ 108 - 58
pages/task/audit/purchase_settlement_approval.vue

@@ -1,34 +1,40 @@
 <template>
 	<view class="container">
 		<view class="content">
-			<view class="top">
-				<view>合同编号</view>
-				<view>{{contractNo}}</view>
+			<view class="top content-item">
+				<view>{{contractNo}}({{list[0].goodsName}})</view>
+				<view>元/吨</view>
 			</view>
-			<view class="car-container" v-for="(item,index) in list">
-				<view class="car-num title">{{item.carNo}}({{item.tranCarNo}})</view>
-				<view class="car-type-item">
-					<view class="left">净重</view>
-					<view class="left">{{item.netWeight}}吨</view>
-				</view>
-				<view class="car-type-item">
-					<view class="left">结重</view>
-					<view class="left">120.4{{item.settlementWeight}}吨</view>
-				</view>
-				<view class="car-type-item">
-					<view class="left">扣款</view>
-					<view class="left">{{item.deductionAmountchange}}元/吨</view>
-				</view>
-				<view class="car-type-item">
-					<view class="left">应付</view>
-					<view class="left">{{item.amountIngPayable}}元</view>
+			<view class="content-item">
+				<view class="car-container" v-for="(item,index) in list">
+					<view class="car-num title">{{item.carNo}}</view>
+					<view class="row">
+						<view class="left car-type-item">净重</view>
+						<view class="right weightInfoCss">{{item.netWeight}} 吨</view>
+					</view>
+					<view class="row">
+						<view class="left car-type-item">结重</view>
+						<view class="right weightInfoCss">{{item.settlementWeight}} 吨</view>
+					</view>
+					<view class="row">
+						<view class="left car-type-item">扣款</view>
+						<view class="right weightInfoCss">¥{{item.deductionAmountchange?item.deductionAmountchange:"0"}}/吨</view>
+					</view>
+					<view class="row ">
+						<view class="left money">应付</view>
+						<view class="right moneyInfo">¥{{item.amountIngPayable}}元</view>
+					</view>
 				</view>
 			</view>
 		</view>
 		<u-toast ref="uToast" />
-		<view class="bottom-btn">
+		<!-- <view class="bottom-btn">
 			<u-button type="primary" class="submit" hover-class="none" @click="rejectSubmit()">驳回</u-button>
 			<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='passSubmit' type="success" class="btn2">通过</u-button>
 		</view>
 	</view>
 </template>
@@ -38,10 +44,10 @@
 		data() {
 			return {
 				id: "",
-				currentPage:1,
-				pageSize:10,
-				list:[],
-				contractNo:"",
+				currentPage: 1,
+				pageSize: 10,
+				list: [],
+				contractNo: "",
 			}
 		},
 		onLoad(options) {
@@ -56,10 +62,10 @@
 					this.contractNo = res.data.data.contractNo
 					if (res.data.code == 200) {
 						this.$api.doRequest('get', '/stockPurchaseReceiptReport/selectPurchaseOrder', {
-						compId: "2710b21efc1e4393930c5dc800010dc4",
-						  currentPage: this.currentPage,
-						  pageSize: this.pageSize,
-						  contractNo: this.contractNo,
+							compId: "2710b21efc1e4393930c5dc800010dc4",
+							currentPage: this.currentPage,
+							pageSize: this.pageSize,
+							contractNo: this.contractNo,
 						}).then(res => {
 							if (res.data.code == 200) {
 								this.list = res.data.data.records
@@ -69,10 +75,10 @@
 				})
 			},
 			//驳回
-			rejectSubmit(){
+			rejectSubmit() {
 				var that = this
 				if (this.list.length == 0) {
-						that.$api.msg('没有要审核的条目!')
+					that.$api.msg('没有要审核的条目!')
 				} else {
 					// uni.showModal({
 					// 	content: "是否确定驳回?",
@@ -81,8 +87,8 @@
 					// 		this.audit(this.list[0], 0, false, true, '已驳回')
 					// 	}
 					// })
-					
-					
+
+
 					uni.showModal({
 						content: "是否确定驳回?",
 						showCancel: true,
@@ -90,14 +96,16 @@
 						success: function(res) {
 							if (res.confirm) {
 								that.audit(that.list[0], 0, false, true, '已驳回')
-							}}})
+							}
+						}
+					})
 				}
 			},
 			//通过
-			passSubmit(){
+			passSubmit() {
 				var that = this
 				if (this.list.length == 0) {
-						that.$api.msg('没有要审核的条目!')
+					that.$api.msg('没有要审核的条目!')
 				} else {
 					// uni.showModal({
 					// 	content: "是否确定通过?",
@@ -113,7 +121,9 @@
 						success: function(res) {
 							if (res.confirm) {
 								that.audit(that.list[0], 0, true, 2)
-							}}})
+							}
+						}
+					})
 				}
 			},
 			//审核方法
@@ -129,10 +139,10 @@
 					})
 				} else {
 					if (status == true) {
-							that.$api.msg('通过成功')
+						that.$api.msg('通过成功')
 						this.getList()
 					} else if (status == false) {
-							that.$api.msg('驳回成功')
+						that.$api.msg('驳回成功')
 						this.getList()
 					}
 				}
@@ -143,10 +153,7 @@
 
 <style scoped lang="scss">
 	.container {
-		margin: 10rpx;
-		padding: 20rpx 20rpx 140rpx 20rpx;
-		border-radius: 20rpx;
-		background: white;
+		padding: 20rpx 20rpx 250rpx 20rpx;
 	}
 
 	.content {
@@ -155,31 +162,74 @@
 			justify-content: space-between;
 		}
 
+		.content-item {
+			border-radius: 20rpx;
+			background: white;
+			padding: 40rpx 20rpx;
+			margin-bottom: 30rpx;
+		}
+
 		.title {
-			font-size: 28rpx;
+			font-size: 32rpx;
 			font-weight: 600;
 			color: #333333;
 			text-align: left;
+			margin: 20rpx 0;
+		}
+		.car-container{
+			border-bottom: 2rpx solid #EEEEEE;
 		}
 
 		.car-type-item {
-			display: inline-flex;
-			// justify-content: center;
-			width: 50%;
+			font-size: 28rpx;
+			margin: 20rpx 0;
+			color: #878C9C;
 		}
-	}
 
-	.bottom-btn {
-		width: 92%;
+		.weightInfoCss {
+			font-size: 28rpx;
+			color: #333333;
+			font-weight: 500;
+		}
+
+		.row {
+			display: flex;
+			justify-content: space-between;
+			// .right,
+			// input {
+			// 	font-size: 28rpx;
+			// 	// color: #333333;
+			// }
+		}
+
+		.money {
+			font-size: 32rpx;
+			font-weight: 500;
+			margin-bottom: 30rpx ;
+		}
+
+		.moneyInfo {
+			color: #22C572;
+			font-size: 32rpx;
+		}
+	}
+.bottom-btn {
+		width: 100%;
 		position: fixed;
-		bottom: 40rpx;
+		bottom:0;
 		display: flex;
 		z-index: 2;
-	}
-
-	.submit {
-		width: 40%;
-		background: #22C572;
-		border-radius: 10rpx;
-	}
+		left: 0;
+		background-color: #f8f8f8;
+		flex-direction: column;
+		.btn1,.btn2{
+			width: 100%;
+			margin-bottom: 26rpx;
+			border-radius: 90rpx;
+		}
+		.btn1{
+			background: white;
+			color: #00C265;
+		}
+		}
 </style>

+ 17 - 11
pages/task/audit/warehouse_approval.vue

@@ -117,16 +117,22 @@
 					confirmText: '确定',
 					success: function(res) {
 						if (res.confirm) {
-							that.$api.doRequest('post', '/purchasePrice/purchasePriceEdit', {
-								taskId: that.list.taskId,
-								approved: true,
-								auditMind: '34',
-								needReapply: true,
-							}).then(res1 => {
-								if (res1.data.code == 200) {
-									that.$api.msg('审核成功');
-									that.$nextTick(function() {
-										uni.navigateBack()
+							that.$api.doRequest('post', '/purchasePrice/purchasePriceEdit',that.list ).then(res => {
+								if (res.data.code == 200) {
+									that.$api.doRequest('post', '/workflow/api/handle', {
+										approved: true,
+										auditMind: "",
+										needReapply: true,
+										taskId:  that.list.taskId,
+									}).then(res1 => {
+										if (res1.data.code == 200) {
+											that.$api.msg('审核成功');
+											that.setTimeout(function() {
+													uni.navigateBack()
+											}, 1000);
+										} else {
+											that.$api.msg(res1.data.message);
+										}
 									})
 								} else {
 									that.$api.msg('系统异常,请联系管理员');
@@ -161,7 +167,7 @@
 								} else {
 									that.$api.msg(res1.data.message);
 								}
-							}).catch()
+							})
 						}
 					}
 				})

BIN
static/img/daishenhe.png


BIN
static/img/reject.png


BIN
static/img/tongguo.png