Browse Source

需求-我的申请列表修改

dufeng 5 months ago
parent
commit
e3af9aa512

+ 12 - 2
pages/workflowTask/approveCenter/approveList.js

@@ -50,7 +50,13 @@ export default {
 	  searchKeyWord: {
 	    handler: function (val) {
 		  this.list = []
-	      this.queryParam['name'] = val
+          console.log('搜索关键字', this.type)
+          if(this.type === 'myLaunch'){
+            this.queryParam['procInstId'] = val||undefined
+          }else{
+            this.queryParam['name'] = val
+          }
+	      
 		  this.handlePullDownRefresh()
 	    }
 	  }
@@ -61,6 +67,10 @@ export default {
 		},
 		searchKeyWord: {
 			type: String
-		}
+		},
+        type: {
+            type: String,
+            required: true
+        }
 	}
 }

+ 4 - 4
pages/workflowTask/approveCenter/index.vue

@@ -2,7 +2,7 @@
 	<view class="approve-container">
 		<view class="approve-search">
 			<u-search
-			placeholder="查询流程"
+			:placeholder="type==='myLaunch'?'单号模糊查询':'请输入关键字搜索'"
 			v-model="keyword"
 			bg-color="#fff"
 			margin="16rpx 24rpx"
@@ -21,9 +21,9 @@
 			/>
 		</view>
 		<view class="approve-list">
-			<todo-list :approve-list-height="approveListHeight" :search-key-word="searchKeyWord" v-if="type === 'todo'"/>
-			<done-list :approve-list-height="approveListHeight" :search-key-word="searchKeyWord" v-else-if="type === 'done'"/>
-			<launch-list :approve-list-height="approveListHeight" :search-key-word="searchKeyWord" v-else/>
+			<todo-list :approve-list-height="approveListHeight" :search-key-word="searchKeyWord" :type="type" v-if="type === 'todo'"/>
+			<done-list :approve-list-height="approveListHeight" :search-key-word="searchKeyWord" :type="type" v-else-if="type === 'done'"/>
+			<launch-list :approve-list-height="approveListHeight" :search-key-word="searchKeyWord" :type="type" v-else/>
 		</view>
 	</view>
 </template>

+ 10 - 3
pages/workflowTask/approveCenter/launchList.vue

@@ -10,12 +10,19 @@
 				:key="index" 
 				:index='item.id'    
 				@content-click="(id) => handle2ProcessTask('', item.id, item.category, item.procDefId, false)">
-				<di-descriptions :title="item.name" label-col="3" value-col="9" :border-bottom="true" >
+				<di-descriptions :title="item.processDefinitionName" label-col="3" value-col="9" :border-bottom="true" >
 					<u-tag slot="right" size="mini" :text="item.statusLabel" :type="statusColorMap[item.statusLabel]" mode="light" />
-					<di-descriptions-item label="流程名称" :value="item.processDefinitionName" :ellipsis="true"/>
+					<!-- <di-descriptions-item label="流程名称" :value="item.processDefinitionName" :ellipsis="true"/>
 					<di-descriptions-item label="开始时间" :value="item.startTime" :ellipsis="true"/>
 					<di-descriptions-item label="结束时间" :value="item.endTime" :ellipsis="true"/>
-					<di-descriptions-item label="流程耗时" :value="item.durationLabel" :ellipsis="true"/>
+					<di-descriptions-item label="流程耗时" :value="item.durationLabel" :ellipsis="true"/> -->
+                    <!-- 后端说单号是id 查询是procInstId -->
+					<di-descriptions-item label="流程单号" :value="item.id" :ellipsis="true"/>
+					<di-descriptions-item label="当前节点" :value="item.nodeKeyName" :ellipsis="true"/>
+					<di-descriptions-item label="申请人" :value="item.startUserName" :ellipsis="true"/>
+					<di-descriptions-item label="申请时间" :value="item.startTime" :ellipsis="true"/>
+
+
                     <u-row style="justify-content: flex-end;">
                         <u-col :span="2" v-if="item.endTime == null">
                           <u-button type="primary" plain size="mini"  @click="handle2Click(item.id, 'cancel')">撤销</u-button>