Ver Fonte

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

gjy há 3 anos atrás
pai
commit
159c88c72a
1 ficheiros alterados com 54 adições e 24 exclusões
  1. 54 24
      pages/task/audit/warehouse_approval.vue

+ 54 - 24
pages/task/audit/warehouse_approval.vue

@@ -86,8 +86,10 @@
 					<u-input class="" v-model='rejectInfo' placeholder="请在此输入审核意见" type="textarea" height="414"
 						maxlength="100" />
 				</view>
-				<u-button @click="show1 = false" type="error" hover-class='none'>取消</u-button>
-				<u-button @click="reject()" type="success">确定</u-button>
+			<!-- 	<u-button @click="show1 = false"  class="cancel">取消</u-button>
+				<u-button @click="reject()" class="confirm">确定</u-button> -->
+				<view @click='show1 = false' class="cancel">取消</view>
+				<view @click='reject()' class="confirm">确定</view>
 			</view>
 		</view>
 		<view v-if='show2' class="shade">
@@ -105,8 +107,10 @@
 					<u-input class="" v-model='rejectInfo1' placeholder="请在此输入审核意见" type="textarea" height="414"
 						maxlength="100" />
 				</view>
-				<u-button @click="show2 = false" type="error" hover-class='none'>取消</u-button>
-				<u-button @click="audit()" type="success">确定</u-button>
+				<!-- <u-button @click="show2 = false" class="cancel">取消</u-button>
+				<u-button @click="audit()"  class="confirm">确定</u-button> -->
+				<view @click='show2 = false' class="cancel">取消</view>
+				<view @click='audit()' class="confirm">确定</view>
 			</view>
 		</view>
 		<u-toast ref="uToast" />
@@ -164,6 +168,10 @@
 			})
 		},
 		methods: {
+			close(){
+				this.show1 = false
+				this.show2 = false
+			},
 			getData() {
 				var data = []
 				this.$api.doRequest('get', '/purchasePrice/purchasePriceLook', {
@@ -409,28 +417,28 @@
 		}
 	}
 
-	.cancel,
-	.confirm {
-		position: absolute;
-		display: inline-block;
-		width: 50%;
-		text-align: center;
-		bottom: 0;
-		padding: 10px;
-		border-top: 1px solid #eee;
-		font-size: 34rpx;
-	}
+	// .cancel,
+	// .confirm {
+	// 	position: absolute;
+	// 	display: inline-block;
+	// 	width: 50%;
+	// 	text-align: center;
+	// 	bottom: 0;
+	// 	padding: 10px;
+	// 	border-top: 1px solid #eee;
+	// 	font-size: 34rpx;
+	// }
 
-	.cancel {
-		left: 0;
-		border-right: 1px solid #eee;
-		color: #AFB3BF;
-	}
+	// .cancel {
+	// 	left: 0;
+	// 	border-right: 1px solid #eee;
+	// 	color: #AFB3BF;
+	// }
 
-	.confirm {
-		right: 0;
-		color: #22C572;
-	}
+	// .confirm {
+	// 	right: 0;
+	// 	color: #22C572;
+	// }
 	.u-textarea-style {
 		margin: 20rpx;
 		background: #F9F9FA;
@@ -449,4 +457,26 @@
 	/deep/.u-input__textarea {
 		height: 300rpx !important;
 	}
+	.cancel,
+	.confirm {
+		position: absolute;
+		display: inline-block;
+		width: 50%;
+		text-align: center;
+		bottom: 0;
+		padding: 10px;
+		border-top: 1px solid #eee;
+		font-size: 34rpx;
+	}
+	
+	.cancel {
+		left: 0;
+		border-right: 1px solid #eee;
+		color: #AFB3BF;
+	}
+	
+	.confirm {
+		right: 0;
+		color: #22C572;
+	}
 </style>