diff --git a/components/work/WorkOrderTotalItem.vue b/components/work/WorkOrderTotalItem.vue
index a658ff0..61b6fcf 100644
--- a/components/work/WorkOrderTotalItem.vue
+++ b/components/work/WorkOrderTotalItem.vue
@@ -55,7 +55,7 @@
 				
 				this.statusList.forEach((n, i) => {
 					if(n.id == this.obj.statusId){
-						index = i
+						index = i - 1
 					}
 				})
 				
diff --git a/pages/index/center.vue b/pages/index/center.vue
index 11d225f..b52cad4 100644
--- a/pages/index/center.vue
+++ b/pages/index/center.vue
@@ -25,13 +25,13 @@
 					<uv-icon name="arrow-right"></uv-icon>
 				</view>
 			</view>
-			<view class="index" @click="$utils.navigateTo('/pages_order/order/ChangePassword')">
+			<view class="index" @click="$utils.navigateTo('/pages_order/order/ModifyMembers?id=' + userInfo.id)">
 				<view class="indus">
 					<view class="horn">
 						<uv-icon name="lock-fill" size="30rpx"></uv-icon>
 					</view>
 					<view class="words">
-						修改密码
+						修改个人信息
 					</view>
 				</view>
 				<view class="arrow">
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 28d0a57..64f038b 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -16,9 +16,11 @@
 
 			<view class="search">
 				<uv-search 
-				placeholder="请输入搜索工单号" 
+				placeholder="请输入搜索任务号" 
 				bgColor="#fff"
-				v-model="queryParams.title"></uv-search>
+				@search="getData"
+				@custom="getData"
+				v-model="queryParams.taskNo"></uv-search>
 			</view>
 			
 		</view>
diff --git a/pages_order/order/FavoriteList.vue b/pages_order/order/FavoriteList.vue
index de5bbf3..74faf0c 100644
--- a/pages_order/order/FavoriteList.vue
+++ b/pages_order/order/FavoriteList.vue
@@ -8,10 +8,12 @@
 		
 		<view class="search">
 			<uv-search
-			placeholder="请输入搜索内容"
-			v-model="queryParams.title"
+			placeholder="请输入搜索任务号" 
 			bgColor="#fff"
-			height="80"></uv-search>
+			@search="getData"
+			@custom="getData"
+			@clear="getData"
+			v-model="queryParams.taskNo"></uv-search>
 		</view>
 		
 		<!-- 标签选项 -->
@@ -29,6 +31,7 @@
 				:options="options">
 					<WorkOrderitem
 					margin="0"
+					@click="$utils.navigateTo('/pages_order/order/WorkOrders?id=' + item.workorderTemplate.id)"
 					:obj="item.workorderTemplate"
 					/>
 				</uv-swipe-action-item>
diff --git a/pages_order/order/ModifyMembers.vue b/pages_order/order/ModifyMembers.vue
index c885ad7..2877cab 100644
--- a/pages_order/order/ModifyMembers.vue
+++ b/pages_order/order/ModifyMembers.vue
@@ -1,7 +1,7 @@
 <template>
 	<!-- 修改成员 -->
 	<view class="page">
-		<navbar title="修改成员" leftClick @leftClick="$utils.navigateBack" />
+		<navbar title="修改用户信息" leftClick @leftClick="$utils.navigateBack" />
 
 		<view class="box">
 			<view class="ChangeheadPortrait">
diff --git a/pages_order/order/ProcessCardFour.vue b/pages_order/order/ProcessCardFour.vue
index 925eabb..b8e6caa 100644
--- a/pages_order/order/ProcessCardFour.vue
+++ b/pages_order/order/ProcessCardFour.vue
@@ -71,16 +71,6 @@
 					v-for="(w, wi) in c.workorderParamStepfourList"
 					>
 					
-						<!-- <uv-upload
-						:fileList="w.fileList" 
-						:maxCount="10"
-						multiple 
-						width="150rpx" 
-						height="150rpx"
-						@delete="e => deleteImage(e, w)"
-						@afterRead="e => afterRead(e, w)"
-						:previewFullImage="true"></uv-upload> -->
-						
 						<view class="image-box">
 							<view class="image"
 							:key="xi"
@@ -171,28 +161,19 @@
 					if(res.code == 200){
 						let p = res.result.workorderStepList[this.index]
 						
-						// for(let i = 0;i < p.workorderProcessList.length;i++){
-						// 	let step = p.workorderProcessList[i]
-						// 	for(let j = 0;j < step.workorderItemCheckList.length;j++){
-						// 		let check = step.workorderItemCheckList[j]
+						for(let i = 0;i < p.workorderProcessList.length;i++){
+							let step = p.workorderProcessList[i]
+							for(let j = 0;j < step.workorderItemCheckList.length;j++){
+								let check = step.workorderItemCheckList[j]
 								
-						// 		for(let k = 0;k < check.workorderParamStepfourList.length;k++){
-						// 			let params = check.workorderParamStepfourList[k]
-									
-						// 			params.fileList = []
-									
-						// 			for(let p = 0;p < 10;p++){
-						// 				let url = params['param' + (p + 1)]
-						// 				if(url){
-						// 					params.fileList.push({
-						// 						url
-						// 					})
-						// 				}
-						// 			}
-									
-						// 		}
-						// 	}
-						// }
+								if(check.workorderParamStepfourList.length == 0){
+									check.workorderParamStepfourList.push({
+										processId : check.id,
+										templateId : this.id,
+									})
+								}
+							}
+						}
 						
 						this.stepList = p.workorderProcessList
 					}
@@ -209,6 +190,12 @@
 					delete data.createBy
 					delete data.createTime
 					
+					for (let k in data) {
+						if(!data[k] || data[k] == 'null'){
+							data[k] = ''
+						}
+					}
+					
 					this.$api('updateParamStepFour', data, res => {
 						if(res.code == 200){
 							success(res)
@@ -232,9 +219,8 @@
 				this.$api('updateGeneralStepFour', StepOne, res => {
 				})
 				
-				uni.showToast({
+				uni.showLoading({
 					title: '保存中...',
-					icon: 'none'
 				})
 				
 				// 任务列表
@@ -267,11 +253,13 @@
 				this.$Oss.ossUploadImage({
 					success : url => {
 						w[key] = url
+						this.$forceUpdate()
 					}
 				})
 			},
 			del(w, key){
 				w[key] = ''
+				this.$forceUpdate()
 			},
 			// deleteImage(e, w){
 			// 	w.fileList.splice(e.index, 1)
diff --git a/pages_order/order/ProcessCardOne.vue b/pages_order/order/ProcessCardOne.vue
index cc85410..25b5ea7 100644
--- a/pages_order/order/ProcessCardOne.vue
+++ b/pages_order/order/ProcessCardOne.vue
@@ -99,9 +99,9 @@
 								v-model="w['param' + (xi + 1)]"/>
 							</view>
 							<view class="text"
-							v-if=""
+							v-if="w.specs"
 							style="margin-left: 20rpx;">
-								{{ w.specs }}
+								{{ w.specs}}
 							</view>
 						</view>
 						
@@ -165,7 +165,22 @@
 				}, res =>{
 					if(res.code == 200){
 						let p = res.result.workorderStepList[this.index]
+						
 						this.stepList = p.workorderProcessList
+						
+						for(let i = 0;i < this.stepList.length;i++){
+							let step = this.stepList[i]
+							for(let j = 0;j < step.workorderItemCheckList.length;j++){
+								let check = step.workorderItemCheckList[j]
+								
+								if(check.workorderParamSteponeList.length == 0){
+									check.workorderParamSteponeList.push({
+										processId : check.id,
+										templateId : this.id,
+									})
+								}
+							}
+						}
 					}
 				})
 			},
@@ -180,6 +195,12 @@
 					delete data.createBy
 					delete data.createTime
 					
+					for (let k in data) {
+						if(!data[k] || data[k] == 'null'){
+							data[k] = ''
+						}
+					}
+					
 					this.$api('updateParamStepOne', data, res => {
 						if(res.code == 200){
 							success(res)
@@ -203,9 +224,8 @@
 				this.$api('updateGeneralStepOne', StepOne, res => {
 				})
 				
-				uni.showToast({
+				uni.showLoading({
 					title: '保存中...',
-					icon: 'none'
 				})
 				
 				// 任务列表
diff --git a/pages_order/order/ProcessCardThree.vue b/pages_order/order/ProcessCardThree.vue
index 97b02e7..335f4a1 100644
--- a/pages_order/order/ProcessCardThree.vue
+++ b/pages_order/order/ProcessCardThree.vue
@@ -66,40 +66,82 @@
 						{{ c.name }}
 					</view>
 					
-					<view class="item-input"
-					:key="wi"
-					v-for="(w, wi) in c.workorderParamStepthreeList"
-					>
-						<view class="Work-List"
-						:key="xi"
-						v-for="(x, xi) in 10"
+					<template 
+					v-if="c.paramType == 1">
+						<view class="item-input"
+						:key="wi"
+						v-for="(w, wi) in c.workorderParamStepthreeList"
 						>
-							<view class="label">
-								规格{{ xi + 1 }}：
-							</view>
-							<view class="text">
-								<input type="text" 
-								v-model="w['param' + (xi + 1)]"/>
-							</view>
-							<view class="text"
-							v-if=""
-							style="margin-left: 20rpx;">
-								{{ w.specs }}
+							<view class="image-box">
+								<view class="image"
+								:key="xi"
+								v-for="(x, xi) in 10">
+								
+									<image 
+									v-if="w['param' + (xi + 1)]"
+									:src="w['param' + (xi + 1)]"
+									@click="previewImage([w['param' + (xi + 1)]], 0)"
+									mode="aspectFill"></image>
+									
+									<view class="add-image"
+									v-else
+									@click="upload(w, 'param' + (xi + 1))">
+										<uv-icon
+										size="40rpx"
+										name="plus"
+										color="#00000022"
+										></uv-icon>
+									</view>
+									
+									<view class="delete"
+									@click="del(w, 'param' + (xi + 1))"
+									v-if="w['param' + (xi + 1)]">
+										x
+									</view>
+									
+								</view>
 							</view>
 						</view>
-						
-						<view class="Work-List"
+					</template>
+					
+					
+					<template v-else>
+						<view class="item-input"
+						:key="wi"
+						v-for="(w, wi) in c.workorderParamStepthreeList"
 						>
-							<view class="label">
-								作业员：
+							<view class="Work-List"
+							:key="xi"
+							v-for="(x, xi) in 10"
+							>
+								<view class="label">
+									规格{{ xi + 1 }}：
+								</view>
+								<view class="text">
+									<input type="text" 
+									v-model="w['param' + (xi + 1)]"/>
+								</view>
+								<view class="text"
+								v-if="w.specs"
+								style="margin-left: 20rpx;">
+									{{ w.specs }}
+								</view>
 							</view>
-							<view class="text">
-								<input type="text" 
-								style="width: 450rpx;"
-								v-model="w.operator"/>
+							
+							<view class="Work-List"
+							>
+								<view class="label">
+									作业员：
+								</view>
+								<view class="text">
+									<input type="text" 
+									style="width: 450rpx;"
+									v-model="w.operator"/>
+								</view>
 							</view>
 						</view>
-					</view>
+					</template>
+					
 				</view>
 			</view>
 			
@@ -147,6 +189,21 @@
 				}, res =>{
 					if(res.code == 200){
 						let p = res.result.workorderStepList[this.index]
+						
+						for(let i = 0;i < p.workorderProcessList.length;i++){
+							let step = p.workorderProcessList[i]
+							for(let j = 0;j < step.workorderItemCheckList.length;j++){
+								let check = step.workorderItemCheckList[j]
+								
+								if(check.workorderParamStepthreeList.length == 0){
+									check.workorderParamStepthreeList.push({
+										processId : check.id,
+										templateId : this.id,
+									})
+								}
+							}
+						}
+						
 						this.stepList = p.workorderProcessList
 					}
 				})
@@ -162,6 +219,12 @@
 					delete data.createBy
 					delete data.createTime
 					
+					for (let k in data) {
+						if(!data[k] || data[k] == 'null'){
+							data[k] = ''
+						}
+					}
+					
 					this.$api('updateParamStepThree', data, res => {
 						if(res.code == 200){
 							success(res)
@@ -185,9 +248,8 @@
 				this.$api('updateGeneralStepThree', StepOne, res => {
 				})
 				
-				uni.showToast({
+				uni.showLoading({
 					title: '保存中...',
-					icon: 'none'
 				})
 				
 				// 任务列表
@@ -216,6 +278,18 @@
 				
 				setTimeout(uni.navigateBack, 1000, -1)
 			},
+			upload(w, key){
+				this.$Oss.ossUploadImage({
+					success : url => {
+						w[key] = url
+						this.$forceUpdate()
+					}
+				})
+			},
+			del(w, key){
+				w[key] = ''
+				this.$forceUpdate()
+			},
 		}
 	}
 </script>
@@ -255,6 +329,46 @@
 					.label{
 						width: 130rpx;
 					}
+					
+					.image-box{
+						display: flex;
+						width: 100%;
+						flex-shrink: 0;
+						flex-wrap: wrap;
+						.image{
+							width: 100rpx;
+							height: 100rpx;
+							margin: 10rpx;
+							position: relative;
+							image{
+								width: 100%;
+								height: 100%;
+								border-radius: 20rpx;
+							}
+							.add-image{
+								width: 100%;
+								height: 100%;
+								display: flex;
+								justify-content: center;
+								align-items: center;
+								border: 1rpx solid #00000022;
+								border-radius: 20rpx;
+							}
+							.delete{
+								width: 30rpx;
+								height: 30rpx;
+								background-color: #00000066;
+								color: #fff;
+								position: absolute;
+								right: 0;
+								top: 0;
+								font-size: 22rpx;
+								display: flex;
+								justify-content: center;
+								align-items: center;
+							}
+						}
+					}
 				}
 			}
 			input{
diff --git a/pages_order/order/ProcessCardTo.vue b/pages_order/order/ProcessCardTo.vue
index b469f7d..34f3d4e 100644
--- a/pages_order/order/ProcessCardTo.vue
+++ b/pages_order/order/ProcessCardTo.vue
@@ -73,7 +73,7 @@
 								v-model="w['param' + (xi + 1)]"/>
 							</view>
 							<view class="text"
-							v-if=""
+							v-if="w.specs"
 							style="margin-left: 20rpx;">
 								{{ w.specs }}
 							</view>
@@ -139,6 +139,21 @@
 				}, res =>{
 					if(res.code == 200){
 						let p = res.result.workorderStepList[this.index]
+						
+						for(let i = 0;i < p.workorderProcessList.length;i++){
+							let step = p.workorderProcessList[i]
+							for(let j = 0;j < step.workorderItemCheckList.length;j++){
+								let check = step.workorderItemCheckList[j]
+								
+								if(check.workorderParamSteptwoList.length == 0){
+									check.workorderParamSteptwoList.push({
+										processId : check.id,
+										templateId : this.id,
+									})
+								}
+							}
+						}
+						
 						this.stepList = p.workorderProcessList
 					}
 				})
@@ -154,6 +169,12 @@
 					delete data.createBy
 					delete data.createTime
 					
+					for (let k in data) {
+						if(!data[k] || data[k] == 'null'){
+							data[k] = ''
+						}
+					}
+					
 					this.$api('updateParamStepTwo', data, res => {
 						if(res.code == 200){
 							success(res)
@@ -177,9 +198,8 @@
 				this.$api('updateGeneralStepTwo', StepOne, res => {
 				})
 				
-				uni.showToast({
+				uni.showLoading({
 					title: '保存中...',
-					icon: 'none'
 				})
 				
 				// 任务列表
diff --git a/pages_order/order/WorkOrderList.vue b/pages_order/order/WorkOrderList.vue
index 28c3fc4..c6c784a 100644
--- a/pages_order/order/WorkOrderList.vue
+++ b/pages_order/order/WorkOrderList.vue
@@ -4,10 +4,12 @@
 		
 		<view class="search">
 			<uv-search
-			placeholder="请输入搜索内容" 
-			v-model="queryParams.title" 
+			placeholder="请输入搜索任务号" 
 			bgColor="#fff"
-			height="80"></uv-search>
+			@search="getData"
+			@custom="getData"
+			@clear="getData"
+			v-model="queryParams.taskNo"></uv-search>
 		</view>
 		
 		<!-- 标签选项 -->
diff --git a/pages_order/order/WorkOrderTotalList.vue b/pages_order/order/WorkOrderTotalList.vue
index 26a45f1..ca44155 100644
--- a/pages_order/order/WorkOrderTotalList.vue
+++ b/pages_order/order/WorkOrderTotalList.vue
@@ -4,10 +4,12 @@
 		
 		<view class="search">
 			<uv-search
-			placeholder="请输入搜索内容" 
-			v-model="queryParams.title" 
+			placeholder="请输入搜索任务号" 
 			bgColor="#fff"
-			height="80"></uv-search>
+			@search="getData"
+			@custom="getData"
+			@clear="getData"
+			v-model="queryParams.taskNo"></uv-search>
 		</view>
 		
 		<!-- 标签选项 -->
diff --git a/pages_order/order/memberList.vue b/pages_order/order/memberList.vue
index 8eeb0f4..c6f40af 100644
--- a/pages_order/order/memberList.vue
+++ b/pages_order/order/memberList.vue
@@ -3,7 +3,14 @@
 	<view class="page">
 		<navbar title="成员列表" leftClick @leftClick="$utils.navigateBack" />
 		<view class="search">
-			<uv-search placeholder="输入员工姓名进行搜索" bgColor="#fff" height="80"></uv-search>
+			<uv-search
+			placeholder="输入员工姓名进行搜索" 
+			bgColor="#fff"
+			@search="getData"
+			@custom="getData"
+			@clear="getData"
+			height="80"
+			v-model="queryParams.name"></uv-search>
 		</view>
 
 		<view class="Memberinformation" >
@@ -23,9 +30,9 @@
 					<!-- <view class="Account">
 						账号：{{item.name}}
 					</view> -->
-					<view class="password">
+					<!-- <view class="password">
 						密码：{{item.password}}
-					</view>
+					</view> -->
 					<view class="password">
 						角色：{{item.roleId_dictText}}
 					</view>