Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

pages/task/audit/Issueandreceipt_task_approval.vue

@@ -136,7 +136,6 @@
 							label-width="170">
 							<u-input v-model="OutList.binNumber" input-align="right" placeholder="未指定" />
 						</u-form-item>
-
 					</view>
 
 				</view>
@@ -333,20 +332,22 @@
 				}
 			},
 			rejectSubmit() {
+				// （1出库2入库3移库4退库并出库）
 				if (!this.rejectInfo) {
 					this.$api.msg('驳回原因不能为空！')
 				} else {
-					if (this.EnterList.taskTypeKey == 1) {
-						this.requestaudit(this.EnterList)
-					} else if (this.EnterList.taskTypeKey == 2) {
-						this.requestaudit(this.EnterList)
+					this.show1 = false
+					if (this.OutList.taskTypeKey == 1) {
+						this.requestaudit(this.OutList)
+					} else if (this.OutList.taskTypeKey == 2) {
+						this.requestaudit(this.OutList)
 					} else if (
-						this.EnterList.taskTypeKey == 3 ||
-						this.EnterList.taskTypeKey == 4
+						this.OutList.taskTypeKey == 3 ||
+						this.OutList.taskTypeKey == 4
 					) {
-						this.requestaudit(this.EnterList, 'repetition')
+						this.requestaudit(this.OutList, 'repetition')
 						if (!this.deletetask) {
-							this.requestaudit(this.EnterList, 'repetition')
+							this.requestaudit(this.OutList, 'repetition')
 						}
 					}
 				}
@@ -356,7 +357,7 @@
 				list.publisher = this.userInfo.userName
 				this.$api.doRequest('post', '/inOutWarehouseTask/api/checkOrUpdateInOutTask', list).then(res => {
 					if (res.data.code == 200) {
-						this.$api.doRequest('post', '/inOutWarehouseTask/api/checkOrUpdateInOutTask', {
+						this.$api.doRequest('post', '/workflow/api/handle', {
 							taskId: list.taskId,
 							approved: true,
 							auditMind: '34',
@@ -364,6 +365,9 @@
 						}).then(res => {
 							if (res.data.code == 200) {
 								this.$api.msg('审核成功！')
+								this.setTimeout(function() {
+										uni.navigateBack()
+								}, 1000);
 							}
 						})
 					}
@@ -374,7 +378,7 @@
 				list.publisher = this.userInfo.userName
 				this.$api.doRequest('post', '/inOutWarehouseTask/api/checkOrUpdateInOutTask', list).then(res => {
 					if (res.data.code == 200) {
-						this.$api.doRequest('post', '/inOutWarehouseTask/api/checkOrUpdateInOutTask', {
+						this.$api.doRequest('post', '/workflow/api/handle', {
 							taskId: list.taskId,
 							approved: false,
 							auditMind: this.rejectInfo,
@@ -382,6 +386,9 @@
 						}).then(res => {
 							if (res.data.code == 200) {
 								this.$api.msg('驳回成功！')
+								this.setTimeout(function() {
+										uni.navigateBack()
+								}, 1000);
 							}
 						})
 					}

pages/task/audit/freight_setting_approval.vue

@@ -40,6 +40,9 @@
 </template>
 
 <script>
+	import {
+		mapState
+	} from 'vuex';
 	export default {
 		data() {
 			return {
@@ -51,6 +54,8 @@
 			this.id = options.id
 			this.getList()
 		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo']),},
 		methods: {
 			getList() {
 				this.$api.doRequest('get', '/tranProcessInfo/getTranProcess', {
@@ -60,12 +65,20 @@
 				})
 			},
 			passSubmit() {
+				var that = this
 				var tranProcessInfo = {}
 				tranProcessInfo.id = this.list.id
 				tranProcessInfo.flag = "1"
 				tranProcessInfo.tranPriceIng = this.list.tranPriceIng
+				tranProcessInfo.reviewer = this.userInfo.userName
 				this.$api.doRequest('post', '/tranProcessInfo/api/setUpTranPrice', tranProcessInfo).then(res => {
-					that.$api.msg('审核通过成功')
+					if(res.data.code == 200){
+							this.$api.msg('审核通过成功!')
+							that.setTimeout(function() {
+									uni.navigateBack()
+							},1000);
+					}
+				
 				})
 			}
 		}

pages/task/audit/freight_settlement_approval.vue

@@ -1,9 +1,25 @@
 <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].approveStatus == '已驳回'"
+							style="height: 40rpx;"></image><!-- 驳回 -->
+						<image src="../../../static/img/tongguo.png" mode="" v-if="list[0].approveStatus == '已通过'"
+							style="height: 40rpx;"></image><!-- 通过 -->
+						<image src="../../../static/img/daishenhe.png" mode="" v-if="list[0].approveStatus == '待决策人审核'"
+							style="height: 40rpx;"></image><!-- 待审核 -->
+					</view>
+					<view class="infoText">{{list[0].approveStatus}}</view>
+				</view>
+				<view class="infoData">2020年1月15日 08:45</view>
+			</view>
+		</view>
 		<view class="content">
 			<view class="top">
 				<view>合同编号</view>
-				<view>123456796</view>
+				<view>{{list[0].contractNo}}</view>
 			</view>
 			<view class="car-container">
 				<view v-for="(item,index) in list" style="border-bottom: 2rpx solid #EEEEEE;margin-top: 30rpx;">
@@ -132,9 +148,7 @@
 <style scoped lang="scss">
 	.container {
 		margin: 10rpx;
-		padding: 20rpx 20rpx 140rpx 20rpx;
-		// border-radius: 20rpx;
-		// background: white;
+		padding: 20rpx 20rpx 230rpx 20rpx;
 	}
 
 	.content {
@@ -145,6 +159,7 @@
 			background: white;
 			padding: 30rpx 20rpx;
 			font-size: 36rpx;
+			margin-top: 30rpx;
 		}
 
 		.title {
@@ -219,4 +234,34 @@
 	.textInfo{
 		margin: 6rpx 0 0 10rpx;
 	}
+	.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;
+			}
+		}
+	}
 </style>

pages/task/audit/purchase_settlement_approval.vue

@@ -2,7 +2,7 @@
 	<view class="container">
 		<view class="content">
 			<view class="top content-item">
-				<view>{{contractNo}}({{list[0].goodsName}})</view>
+				<view>{{contractNo}}</view>
 				<view>元/吨</view>
 			</view>
 			<view class="content-item">