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

pages/reimbursement/request_funds.vue

@@ -321,7 +321,10 @@
 					this.detailData.expensesPurpose = "5"
 					delete this.detailData.warehouseName
 					delete this.detailData.contractNo
-					this.show1 = true
+					if(this.reType == 2){
+						this.show1 = true
+					}
+					
 				}
 				console.log(this.detailData)
 			},

pages/task/audit/purchasecontract.vue

@@ -1090,12 +1090,12 @@
 			text-align: center;
 		}
 		.headInfo_middle{
-			width: 70%;
+			width: 60%;
 			padding-left: 10px;
 			margin-top: 10px;
 		}
 		.headInfo_right{
-			width: 20%;
+			width: 30%;
 			line-height: 60px;
 			.char_a{
 				color: #22C572;

pages/task/audit/salecontract.vue

@@ -1135,12 +1135,12 @@
 			text-align: center;
 		}
 		.headInfo_middle{
-			width: 70%;
+			width: 60%;
 			padding-left: 10px;
 			margin-top: 10px;
 		}
 		.headInfo_right{
-			width: 20%;
+			width: 30%;
 			line-height: 60px;
 			.char_a{
 				color: #22C572;