更新

components/chat/more.vue

@@ -14,6 +14,6 @@
 	}
 </script>
 
-<style lang="less">
+<style >
 
 </style>

pages/erpbusiness/sm/sm.vue

@@ -101,19 +101,27 @@
 			...mapState(['hasLogin', 'userInfo'])
 		},
 		onLoad(options) {
+			let _list = [];
+			if(options.data){
+				for (var p1 in options) {
+				          if (options.hasOwnProperty(p1)){
+							   _list.push(p1);
+						  }              
+				      }
+			}
 			//#ifdef APP-PLUS
 			this.user.title = options.data.split(',')[2]
 			this.user.companyId = options.data.split(',')[1]
-			this.compId = options.data.split(',')[1]
-			this.qualityNo = options.data.split(',')[2]
-			this.cangid = options.data.split(',')[3]
+			this.compId = options.data.split(",")[1]
+			this.qualityNo = _list[1]
+			this.cangid = _list[2]
 			//#endif
 		},
 		onShow() {
-			// this.qualityNo = "SGRK202112140060004"
-			// this.cangid = "374a8a02ecfe40dc9abdcd902dd564f5"
 			// this.compId = "2710b21efc1e4393930c5dc800010dc4"
-			console.log(this.qualityNo,this.cangid,this.compId)
+			// this.qualityNo = "SGRK202112040001"
+			// this.cangid = "1c9949fa0dc04c5e84f9bea9c809856c"
+			console.log("查看",this.qualityNo,this.compId,this.cangid)
 			if (this.cangid) { //判断是在哪扫码进入的
 				this.show = false
 				this.show1 = true

pages/task/audit/tradeServices_audit.vue

@@ -74,7 +74,7 @@
 				<view v-for="(item,index) in count">
 					<view class="row">
 						<view class="left ">
-							<u-input v-model="item.modifyExpense" placeholder="输入费用名称,1-8个字" />
+							<u-input v-model="item.modifyExpense" placeholder="输入费用名称,1-8个字" maxlength="8"/>
 						</view>
 						<view class="right">
 							<u-input v-model="item.expenses" @input="calculation" input-align="right" placeholder="输入金额" type="digit" />
@@ -87,8 +87,9 @@
 					<view class="add">
 						<u-button @click="add" type="success" class="btnAdd" :disabled="addshow">添加费用</u-button>
 					</view>
-					<view class="count_item"><span>合计应还：</span><span class="number">￥{{tradeList.amountDue}}</span>
-					</view>
+					<view class=" flex count_item">
+						<span>合计应还：</span><span class="number">￥{{tradeList.amountDue}}</span>
+				    </view>
 				</view>
 			</view>
 		</u-form>
@@ -307,6 +308,7 @@
 					});
 				} else {//通过
 				   if(this.tradeList.approveStatus == "待银行审批"){
+					   this.tradeList.amountToRepaid = this.tradeList.amountDue//设置待还金额 = 应还金额
 					   this.$api.doRequest('post', '/tradeWarehouseReceiptAppl/api/editTradeWarehouseReceiptAppl', this.tradeList)
 					   .then(res => {
 						   if(res.data.code == 200){
@@ -334,8 +336,7 @@
 							   	}
 							   });
 						   }
-					   })
-					   
+					   })  
 				   }else{
 					   this.$api.doRequest('post', '/workflow/api/handle', {
 						taskId: this.tradeList.taskId,
@@ -360,14 +361,12 @@
 							})
 						}
 					});
-				   }
-					
+				   }	
 				}
 			},
 			auditInfo() {
 				uni.navigateTo({
-					url: '/pages/task/audit_info?id=' + this.tradeList.id + "&workflowId=" + this.tradeList
-						.workflowId
+					url: '/pages/task/audit_info?id=' + this.tradeList.id + "&workflowId=" + this.tradeList.workflowId
 				})
 			},
 			filterFileType(index, lists) {
@@ -556,13 +555,11 @@
 				margin: 0 16rpx;
 			}
 		}
-
 	}
 
 	.count {
 		width: 100%;
 		margin: 20rpx 0;
-
 		.add {
 			width: 162rpx;
 			height: 64rpx;
@@ -573,11 +570,11 @@
 			text-align: center;
 			font-size: 28rpx;
 		}
-
 		.count_item {
+			width: 70%;
+			justify-content: flex-end;
 			font-size: 30rpx;
 			line-height: 70rpx;
-
 			.number {
 				font-size: 32rpx;
 				font-weight: 600;

pages/task/audit/tradeServices_audit_approval.vue

@@ -3,7 +3,6 @@
 		<u-form ref="uForm">
 			<view class="form_item">
 				<view class="title">申请信息</view>
-				<!-- <u-divider ></u-divider> -->
 				<u-form-item label-width='260' label="业务编号" :borderBottom="false">
 					<u-input v-model="tradeList.billNo" input-align="right" placeholder="暂无" disabled />
 				</u-form-item>
@@ -74,18 +73,16 @@
 				<view v-for="(item,index) in count">
 					<view class="row">
 						<view class="left ">
-							<u-input v-model="item.modifyExpense" placeholder="输入费用名称,1-8个字" />
+							<u-input v-model="item.modifyExpense" placeholder="输入费用名称,1-8个字" disabled/>
 						</view>
 						<view class="right">
 							<u-input v-model="item.expenses"  input-align="right" placeholder="暂无" type="digit" disabled/>
 							</u-input><span class="yuan">元</span>
-							
 						</view>
 					</view>
 				</view>
 				<view class="flex count">
-					
-					<view class="count_item"><span>合计应还：</span><span class="number">￥{{tradeList.amountDue}}</span>
+					<view class=" flex count_item"><span>合计应还：</span><span class="number">￥{{tradeList.amountDue}}</span>
 					</view>
 				</view>
 			</view>
@@ -102,25 +99,6 @@
 		<view style='padding:10px;' class='flex bottom-btn'>
 			<u-button @click='reject' type="error" class="btn1" hover-class='none'>返回</u-button>
 		</view>
-		<view v-if="show" class="shade">
-			<view class="wrap">
-				<view class="alert-top">
-					<view class="titleAudit">
-						{{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>
 	</view>
 </template>
 
@@ -139,20 +117,12 @@
 				imgUrl: [],
 				tradeList: {},
 				isShowAlert: false,
-				show: false,
-				content: "",
-				title: "",
-				auditMind: "", //审核意见
 				count: [],
-				addshow: false
 			}
 		},
 		onLoad(options) {
 			this.id = options.id
 			this.getList()
-		},
-		onshow() {
-
 		},
 		methods: {
 			getList() {
@@ -397,7 +367,8 @@
 
 			.yuan {
 				line-height: 70rpx;
-				margin: 0 16rpx;
+				// margin: 0 16rpx;
+				margin-left: 16rpx;
 			}
 		}
 
@@ -406,19 +377,9 @@
 	.count {
 		width: 100%;
 		margin: 20rpx 0;
-
-		.add {
-			width: 162rpx;
-			height: 64rpx;
-			background: #22C572;
-			border-radius: 10rpx;
-			color: #FFFFFF;
-			line-height: 64rpx;
-			text-align: center;
-			font-size: 28rpx;
-		}
-
+		justify-content: flex-end;
 		.count_item {
+			// width: 70%;
 			font-size: 30rpx;
 			line-height: 70rpx;
 

pages/task/audit_info.vue

@@ -12,6 +12,12 @@
 					{{item.auditMind}}
 				</view>
 			</view>
+			<view class="auditList_item" v-if="show">
+			<u-empty
+			        mode="data"
+			        icon="http://cdn.uviewui.com/uview/empty/car.png">
+			</u-empty>
+			</view>
 		</view>
 
 	</view>
@@ -24,6 +30,7 @@
 				workflowId: "",
 				id: "",
 				auditList: [],
+				show:false,
 			}
 		},
 		onLoad(options) {
@@ -40,6 +47,9 @@
 					workflowId: this.workflowId
 				}).then(res => {
 					this.auditList = res.data.data
+					if(this.auditList.length == 0 ){
+						this.show = true
+					}
 				}).catch(res => {
 					if (res.errmsg) {
 						uni.showToast({