地放铁路调整

components/ApproveInfo.vue

@@ -110,7 +110,11 @@
 							 <u-input v-if="item.isEdit" v-model="formData[item.key]"  :placeholder="'请输入'+item.text"
 							 	:placeholderStyle="placeholderStyle" class="oawork-line" type="textarea" />
 								
-							<u-input v-else  v-model="formData[item.key]"  placeholder="" :disabled="true"
+							<u-input v-else  v-model="formData[item.key]" 
+							 
+							 :customStyle="{fontSize: '16',color:'#000'}"
+							 
+							 placeholder="" :disabled="true"
 								:placeholderStyle="placeholderStyle" class="oawork-line" type="textarea" />
 							
 						</template>
@@ -347,7 +351,8 @@
 				}
 
 				.oawork-item1_b {
-					//color: #777777;
+					//color: #777777;
+					color: #000;
 					width: 100%;
 					text-align: right;
 				}
@@ -460,6 +465,7 @@
 				.head-approve-a{
 						display: flex;
 						align-items: center;
+						    flex-wrap: wrap;
 				}
 				.head-approve-a1{
 						display: flex;

config/.env.dev.js

@@ -4,7 +4,7 @@ const UNI_APP = {
 	//BASE_URL: 'http://192.168.33.220:8086/',
 	IMG_URL:"http://www.jsrailway.com.cn/",
 	
-	BASE_URL:'http://192.168.77.162:8086/railroad-server/',
+	//BASE_URL:'http://192.168.77.162:8086/railroad-server/',
 	//BASE_URL:'http://192.168.77.222:8086/railroad-server/',
 
 	

main.js

@@ -102,11 +102,12 @@ Vue.mixin({
 				case '1':
 					retu = '#52b56b'
 					break;
-				case '2':
-					retu = '#c94031'
+				case '2':
+					retu = '#3a3bc2'
+					
 					break;
 				case '3':
-					retu = '#3a3bc2'
+					retu = '#c94031'
 					break;
 				case '5':
 					retu = '#c94031'

pages/oawork/business/add.vue

@@ -30,13 +30,13 @@
 								<template v-if="item.type.indexOf('text')>-1">
 									<u-input v-model="formData[item.key]" :placeholder="'请输入'+item.text"
 										:placeholderStyle="placeholderStyle" class="oawork-line"
-										:customStyle="{textAlign: 'right'}" />
+										:customStyle="{textAlign: 'right1'}" />
 
 								</template>
 								<template v-if="item.type.indexOf('textnumber')>-1">
 									<u-input v-model="formData[item.key]" type="number" :placeholder="'请输入'+item.text"
 										:placeholderStyle="placeholderStyle" class="oawork-line"
-										:customStyle="{textAlign: 'right'}" />
+										:customStyle="{textAlign: 'right1'}" />
 
 								</template>
 
@@ -677,6 +677,9 @@
 		// 		width: 100%;
 		// 	}
 		// }
+		.oawork-texteditor{
+			margin-top: 10px;
+		}
 		.oawork-textlong,.oawork-itemline {
 			.oawork-item1_a {
 				width: 100%;

pages/oawork/data/editor-icon.css

@@ -7,18 +7,20 @@
 }
 
 .page-body {
-		height: calc(100vh - var(--window-top) - var(--status-bar-height));
+		height:300px;
+	}
+.editor-wrapper {
+		
+		height:240px;
+		background: #fff;
 	}
-
 	.wrapper {
 		height: 100%;
-		 border: 1px solid #c8c8c8;
+		 border: 1px solid #c8c8c8;
+		 overflow: hidden;
 	}
 
-	.editor-wrapper {
-		height: calc(100vh - var(--window-top) - var(--status-bar-height) - 140px);
-		background: #fff;
-	}
+	
 
 	.iconfont {
 		display: inline-block;

pages/oawork/data/oa3.js

@@ -65,7 +65,7 @@ var obj={
 				key:"divider",
 				type:["uview","divider","paddingTop"],
 				view:1,
-				text:"以下第一步审批人可编辑",
+				text:"审批人(第一步)可编辑",
 				role:["step1"]   ,
 				
 			},

uni_modules/uview-ui/components/u-upload-file-all/u-upload-file-all.vue

@@ -23,7 +23,7 @@
 			<view
 				v-if="!isedit"
 				class="u-download-icon"
-				@tap.stop="viewItem(index)"
+				@tap.stop="viewItem(item)"
 				
 			>
 				<u-icon class="u-icon" name="download" size="20" :color="delColor"></u-icon>
@@ -488,7 +488,7 @@ export default {
 			this.showToast('上传失败，请重试');
 		},
 		viewItem(item){
-			
+			console.log(item)
 			window.location.href=item.url;
 		},