前端小程序样式 sdy

pages/task/audit/Issueandreceipt_task_approval.vue

@@ -11,7 +11,7 @@
 					<view class="title part2">{{retreatList.inOutType}}</view>
 					<view class='row'>
 						<view class="left">编号</view>
-						<view class="right">{{retreatList.inOutType}} {{retreatList.inOutTaskNo}}</view>
+						<view class="right">退库（{{retreatList.inOutTaskNo}}}</view>
 					</view>
 					<view class='row'>
 						<view class="left">仓库</view>
@@ -65,16 +65,12 @@
 					</u-form-item>
 					
 				</view>
-				
-				
-				
-				
 				<view v-if="OutList.judge == 1">
 					<!-- 出库 -->
 					<view class="title part2">{{OutList.inOutType}}</view>
 					<view class='row'>
 						<view class="left">编号</view>
-						<view class="right">{{OutList.inOutType}} {{OutList.inOutTaskNo}}</view>
+						<view class="right">出库（{{OutList.inOutTaskNo}})</view>
 					</view>
 					<view class='row'>
 						<view class="left">仓库</view>
@@ -109,26 +105,26 @@
 						<view class="right">{{OutList.publisher}}</view>
 					</view>
 					<view class="title part2">可编辑项</view>
-					<u-form-item label="品级" prop="grade" label-width="150">
+					<u-form-item label="品级" prop="grade" label-width="150" v-if="retreatList.inOutType != '退库'">
 						<u-input v-model="OutList.grade" input-align="right" placeholder="" @click='show=true'
 							disabled />
 						<u-picker :range="pjList" range-key="type" @confirm='pjPicker($event)' v-model="show"
 							mode="selector">
 						</u-picker>
 					</u-form-item>
-					<u-form-item label="容重(克/升)>=" prop="bulkDensity" label-width="190">
+					<u-form-item label="容重(克/升)>=" prop="bulkDensity" label-width="190" v-if="retreatList.inOutType != '退库'">
 						<u-input v-model="OutList.bulkDensity" input-align="right" placeholder="" />
 					</u-form-item>
-					<u-form-item label="水分(%)<=" prop="waterContent" label-width="160">
+					<u-form-item label="水分(%)<=" prop="waterContent" label-width="160" v-if="retreatList.inOutType != '退库'">
 						<u-input v-model="OutList.waterContent" input-align="right" placeholder="" />
 					</u-form-item>
-					<u-form-item label="单价(元/吨)" prop="unitPrice" label-width="160">
+					<u-form-item label="单价(元/吨)" prop="unitPrice" label-width="160" v-if="retreatList.inOutType != '退库'">
 						<u-input v-model="OutList.unitPrice" input-align="right" placeholder="" />
 					</u-form-item>
 					<u-form-item  label="业务描述" prop="businessDescribe" label-width="160"label-position="top" v-if="OutList.inOutType != '移库出库'">
 						<u-input v-model="OutList.businessDescribe" input-align="left" placeholder="" type="textarea" class="textarea" />
 					</u-form-item>
-					<u-form-item v-if="OutList.inOutType!='退库'" label="仓位号(选填)" prop="binNumber" label-width="170">
+					<u-form-item v-if="retreatList.inOutType!='退库'" label="仓位号(选填)" prop="binNumber" label-width="170">
 						<u-input v-model="OutList.binNumber" input-align="right" placeholder="未指定" />
 					</u-form-item>
 				</view>
@@ -137,7 +133,7 @@
 					<view class="title part2">{{EnterList.inOutType}}</view>
 					<view class='row'>
 						<view class="left">编号</view>
-						<view class="right">{{EnterList.inOutType}} {{EnterList.inOutTaskNo}}</view>
+						<view class="right">入库（{{EnterList.inOutTaskNo}})</view>
 					</view>
 					<view class='row'>
 						<view class="left">仓库</view>
@@ -172,7 +168,7 @@
 						<view class="right">{{EnterList.publisher}}</view>
 					</view>
 					<view class="title part2">可编辑项</view>
-					<u-form-item label="品级" prop="grade" label-width="150" v-if="EnterList.inOutType != '移库入库'">
+					<u-form-item label="品级" prop="grade" label-width="150" v-if="EnterList.inOutType != '移库入库' ">
 						<u-input v-model="EnterList.grade" input-align="right" placeholder="请选择品级" @click='show=true'disabled />
 						<u-picker :range="pjList" range-key="type" @confirm='pjPicker1($event)' v-model="show" mode="selector">
 						</u-picker>
@@ -301,7 +297,6 @@
 						<u-button @click="show1 = false" class="submit">取消</u-button>
 					<u-button @click="rejectSubmit()" class="submit">确定</u-button>
 					</view>
-					
 			</view>		
 		</u-popup>
 		<u-toast ref="uToast" />

pages/task/audit/freight_setting_approval.vue

@@ -11,23 +11,19 @@
 				<u-form-item label="货名" prop="goodsName" label-width="140">
 					<u-input v-model="list.goodsName" input-align="right" placeholder="" disabled />
 				</u-form-item>
-				<u-form-item label="发货地址" prop="sendDetailedAddress" label-width="140" label-position='top'>
-					<u-input v-model="list.sendDetailedAddress" input-align="left" placeholder="" disabled />
+				<u-form-item label="发货地址" prop="sendDetailedAddress" label-width="140">
+					<u-input v-model="list.sendDetailedAddress" input-align="right" placeholder="" disabled />
 				</u-form-item>
-				<u-form-item label="收货地址" prop="receiveDetailedAddress" label-width="140" label-position='top'>
-					<u-input v-model="list.receiveDetailedAddress" input-align="left" placeholder="请输入收货地址" disabled />
+				<u-form-item label="收货地址" prop="receiveDetailedAddress" label-width="140">
+					<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-form-item>
 			</u-form>
 		</view>
-		<u-toast ref="uToast" />
-		<view class="bottom-btn">
-			<u-button type="primary" class="submit" hover-class="none" @click="passSubmit()">通过</u-button>
-		</view>
+		<u-button type="primary" class="submit" @click="passSubmit()">通过</u-button>
 	</view>
-
 </template>
 
 <script>
@@ -56,7 +52,7 @@
 				tranProcessInfo.flag = "1"
 				tranProcessInfo.tranPriceIng = this.list.tranPriceIng
 				this.$api.doRequest('post', '/tranProcessInfo/api/setUpTranPrice', tranProcessInfo).then(res => {
-						that.$api.msg('审核通过成功')
+					that.$api.msg('审核通过成功')
 				})
 			}
 		}
@@ -88,8 +84,9 @@
 	}
 
 	.submit {
-		width: 40%;
+		width: 98%;
 		background: #22C572;
-		border-radius: 10rpx;
+		border-radius: 40rpx;
+		margin-top: 40rpx;
 	}
 </style>

pages/task/audit/freight_setting_details.vue

@@ -1,30 +1,30 @@
 <template>
 	<view class="warp">
 		<view class="transaction">
-			<u-form :model="purchaseOrder" ref="uForm" class="uForm">
-				<u-form-item label="合同编号" prop="receivingAddress" label-width="140">
-					<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+			<u-form :model="list" ref="uForm" 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>
-				<u-form-item label="任务编号" prop="receivingAddress" label-width="140">
-					<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+				<u-form-item label="任务编号" prop="processNo" label-width="140">
+					<u-input v-model="list.processNo" input-align="right" placeholder="" disabled />
 				</u-form-item>
-				<u-form-item label="货名" prop="receivingAddress" label-width="140">
-					<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+				<u-form-item label="货名" prop="goodsName" label-width="140">
+					<u-input v-model="list.goodsName" input-align="right" placeholder="" disabled />
 				</u-form-item>
-				<u-form-item label="发货地址" prop="receivingAddress" label-width="140" label-position='top'>
-					<u-input v-model="purchaseOrder.receivingAddress" input-align="left" placeholder="" disabled/>
+				<u-form-item label="发货地址" prop="sendDetailedAddress" label-width="140" label-position='top'>
+					<u-input v-model="list.sendDetailedAddress" input-align="left" placeholder="" disabled />
 				</u-form-item>
-				<u-form-item label="收货地址" prop="receivingAddress" label-width="140" label-position='top'>
-					<u-input v-model="purchaseOrder.receivingAddress" input-align="left" placeholder="请输入收货地址" disabled/>
+				<u-form-item label="收货地址" prop="receiveDetailedAddress" label-width="140" label-position='top'>
+					<u-input v-model="list.receiveDetailedAddress" input-align="left" placeholder="请输入收货地址" disabled />
 				</u-form-item>
-				<u-form-item label="运费（元/吨）" prop="freightUnitPrice" label-width="250">
-					<u-input v-model="purchaseOrder.freightUnitPrice" input-align="right" placeholder="请输入运费单价" />
+				<u-form-item label="运费（元/吨）" prop="tranPrice" label-width="250">
+					<u-input v-model="list.tranPriceIng" input-align="right" placeholder="请输入运费单价" />
 				</u-form-item>
 			</u-form>
 		</view>
 		<u-toast ref="uToast" />
 		<view class="bottom-btn">
-			<u-button type="primary" class="submit" hover-class="none">已通过</u-button>
+			<u-button type="primary" class="submit" hover-class="none" @click="passSubmit()">通过</u-button>
 		</view>
 	</view>
 
@@ -34,70 +34,30 @@
 	export default {
 		data() {
 			return {
-				purchaseOrder: {
-					freightUnitPrice: "123",
-					receivingAddress:'444'
-				},
-				rules: {
-					freightUnitPrice: [{
-							validator: (rule, value, callback) => {
-								return !this.$u.test.isEmpty(value)
-							},
-							message: '运费不能为空',
-							trigger: ['change', 'blur']
-						},
-						{
-							validator: (rule, value, callback) => {
-								return this.$u.test.amount(value)
-							},
-							message: '数值类型，最多保留两位小数',
-							trigger: ['change', 'blur'],
-						}
-					]
-				}
+				list: {},
+				id: "",
 			}
 		},
-		onReady() {
-			this.$refs.uForm.setRules(this.rules);
+		onLoad(options) {
+			this.id = options.id
+			this.getList()
 		},
 		methods: {
-			passSubmit(){
-				this.$refs.uForm.validate(valid => {
-					if (valid) {
-						uni.showLoading({
-							title: '正在加载',
-							mask: true
-						})
-						console.log('验证通过');
-						this.$api.doRequest('post',
-							'/freightReceivingDispatching/api/insertFreightReceivingDispatching',
-							this
-							.purchaseOrder).then(res => {
-							if (res.data.code == 200) {
-								uni.showToast({
-									title: '提交成功',
-									icon: 'none',
-									duration: 2000,
-									success: function() {
-										uni.navigateTo({
-											url: `/pageA/freightTransport/index`
-										})
-									}
-								})
-				
-							}
-				
-						}).catch(res => {
-							// uni.showToast({
-							// 	title: res.data.message,
-							// 	icon: 'none',
-							// 	duration: 2000
-							// })
-						})
-					} else {
-						console.log('验证失败');
-					}
-				});
+			getList() {
+				this.$api.doRequest('get', '/tranProcessInfo/getTranProcess', {
+					id: this.id
+				}).then(res => {
+					this.list = res.data.data
+				})
+			},
+			passSubmit() {
+				var tranProcessInfo = {}
+				tranProcessInfo.id = this.list.id
+				tranProcessInfo.flag = "1"
+				tranProcessInfo.tranPriceIng = this.list.tranPriceIng
+				this.$api.doRequest('post', '/tranProcessInfo/api/setUpTranPrice', tranProcessInfo).then(res => {
+						that.$api.msg('审核通过成功')
+				})
 			}
 		}
 	}
@@ -110,12 +70,15 @@
 		padding-bottom: 10rpx;
 		border-radius: 20rpx;
 	}
+
 	.uForm {
 		padding: 0 40rpx;
 	}
-	.u-form-item{
+
+	.u-form-item {
 		padding: 0;
 	}
+
 	.bottom-btn {
 		width: 100%;
 		position: fixed;
@@ -123,6 +86,7 @@
 		display: flex;
 		z-index: 2;
 	}
+
 	.submit {
 		width: 40%;
 		background: #22C572;

pages/task/audit/freight_settlement_details.vue

@@ -1,6 +1,43 @@
 <template>
-	<view>
-		运费结算详情
+	<view class="container">
+		<view class="content">
+			<view class="top">
+				<view>合同编号</view>
+				<view>123456796</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.loadingWeight}}吨</view>
+				</view>
+				<view class="car-type-item">
+					<view class="left">卸</view>
+					<view class="left">{{item.unloadingWeight}}吨</view>
+				</view>
+				<view class="car-type-item">
+					<view class="left">结</view>
+					<view class="left">{{item.settlementWeightchange}}吨</view>
+				</view>
+				<view class="car-type-item">
+					<view class="left">运</view>
+					<view class="left">{{item.transportPrice}}元/吨</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.amountEdPayable}}元</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>
 	</view>
 </template>
 
@@ -8,15 +45,127 @@
 	export default {
 		data() {
 			return {
-				
+				currentPage: 1,
+				pageSize: 10,
+				list: [],
 			}
 		},
+		onLoad() {
+			this.getList()
+		},
 		methods: {
-			
+			getList() {
+				this.$api.doRequest('get', '/tranSettlementReport/selectTranSettlementReport', {
+					compId: "2710b21efc1e4393930c5dc800010dc4",
+					currentPage: this.currentPage,
+					pageSize: this.pageSize,
+					contractNo: "全部合同"
+				}).then(res => {
+					if (res.data.code == 200) {
+						this.list = res.data.data.records
+					}
+				})
+			},
+			// 驳回
+			rejectSubmit() {
+				var that = this
+				if (this.list.length == 0) {
+						this.$api.msg('没有要审核的条目！')
+				} else {
+					uni.showModal({
+						content: "是否确定驳回?",
+						showCancel: true,
+						confirmText: '确定',
+						success: function(res) {
+							if (res.confirm) {
+								that.audit(that.list[0], 0, false, true, '已驳回')
+							}
+						}
+					})
+				}
+			},
+			//通过
+			passSubmit() {
+				var that = this
+				if (this.list.length == 0) {
+					this.$api.msg('没有要审核的条目！')
+				} else {
+					uni.showModal({
+						content: "是否确定通过?",
+						showCancel: true,
+						confirmText: '确定',
+						success: function(res) {
+							if (res.confirm) {
+								that.audit(that.list[0], 0, true, 2)
+							}
+						}
+					})
+				}
+			},
+			//审核方法
+			audit(item, index, status, status2, reason) {
+				if (index < this.list.length) {
+					this.$api.doRequest('post', '/workflow/api/handle', {
+						taskId: item.taskId,
+						approved: status,
+						auditMind: reason != undefined ? '已驳回' : '34',
+						needReapply: status2 != undefined ? true : false,
+					}).then(res => {
+						this.audit(this.list[index + 1], index + 1, status)
+					})
+				} else {
+					if (status == true) {
+							that.$api.msg('通过成功')
+						this.getList()
+					} else if (status == false) {
+							that.$api.msg('驳回成功')
+						this.getList()
+					}
+				}
+			},
 		}
 	}
 </script>
 
-<style>
+<style scoped lang="scss">
+	.container {
+		margin: 10rpx;
+		padding: 20rpx 20rpx 140rpx 20rpx;
+		border-radius: 20rpx;
+		background: white;
+	}
+
+	.content {
+		.top {
+			display: flex;
+			justify-content: space-between;
+		}
+
+		.title {
+			font-size: 28rpx;
+			font-weight: 600;
+			color: #333333;
+			text-align: left;
+		}
+
+		.car-type-item {
+			display: inline-flex;
+			// justify-content: center;
+			width: 33.33%;
+		}
+	}
+
+	.bottom-btn {
+		width: 92%;
+		position: fixed;
+		bottom: 40rpx;
+		display: flex;
+		z-index: 2;
+	}
 
+	.submit {
+		width: 40%;
+		background: #22C572;
+		border-radius: 10rpx;
+	}
 </style>

pages/task/my_task.vue

@@ -47,7 +47,7 @@
 				PageCur: "task",
 				taskInfo: [],
 				pages: 1, //页数
-				limit: 10, //每次取条目数
+				limit: 50, //每次取条目数
 				loadStatus: 'loading', //加载样式：more-加载前样式，loading-加载中样式，nomore-没有数据样式
 				isLoadMore: false, //是否加载中
 				isSole: false,