头像图片调整,我的待办表格调整,流程发起人

src/components/userSelect/UserSelectDialog.vue

@@ -209,7 +209,6 @@ export default {
 				},
 				name: "",
 			},
-
 			dialogVisible: false,
 			showGrouploading: false,
 			showUserloading: false,
@@ -340,6 +339,7 @@ export default {
 				return;
 			}
 			this.$emit("doSubmit", this.value);
+			console.log(this.value)
 			this.dialogVisible = false;
 		},
 	},

src/layout/components/userbar.vue

@@ -15,7 +15,7 @@
 			style="margin-right: 30px"
 		>
 			<div class="user-avatar">
-				<el-avatar :size="30" :src="photo"></el-avatar>
+				<el-avatar :size="30" :src="photo === ''?'/static/img/avatar.png':photo"></el-avatar>
 				<label>{{ userName }}</label>
 			</div>
 			<template #dropdown>

src/views/cw/reportManagement/ReportManagementSignatureForm.vue

@@ -619,7 +619,7 @@
           businessObjects: ''
         },
         keyWatch: '',
-        activeName: 'archiveFile',
+        activeName: 'signatureFile',
         tableKey: '',
         tableKeyClient: '1',
         interVal: ''
@@ -741,7 +741,7 @@
         }
       },
       init (method, id) {
-        this.activeName = 'archiveFile'
+	  	this.activeName='signatureFile'
         this.method = method
         this.inputForm = {
           servedUnitId: '',  // 被服务单位id

src/views/dashboard/widgets/components/TodoList.vue

@@ -12,19 +12,29 @@
 				</div>
 			</div>
 		</template>
-		<el-table :data="dataList" style="width: 100%" height="480">
+		<el-table :data="dataList" style="width: 100%" height="480" border="inner" :menu-config="{}" @sort-change="sortChangeHandle"
+				  :sort-config="{remote:true}"  resizable>
 			<el-table-column
+				width="200px"
 				label="实例标题"
 				prop="vars.title"
+				show-overflow-tooltip
 			></el-table-column>
 			<el-table-column
-				width="100px"
+				width="90px"
 				label="流程名称"
 				show-overflow-tooltip
 				prop="processDefinitionName"
 			>
 			</el-table-column>
 			<el-table-column
+				width="90px"
+				label="发起人"
+				show-overflow-tooltip
+				prop="vars.userName"
+			></el-table-column>
+			<el-table-column
+				fixed="right"
 				width="100px"
 				label="当前环节"
 				show-overflow-tooltip
@@ -35,13 +45,8 @@
 				</template>
 			</el-table-column>
 			<el-table-column
-				width="100px"
-				label="流程发起人"
-				show-overflow-tooltip
-				prop="vars.userName"
-			></el-table-column>
-			<el-table-column
-				width="120px"
+				fixed="right"
+				width="90px"
 				prop="task.createTime"
 				show-overflow-tooltip
 				label="发起时间"

src/views/flowable/task/TaskForm.vue

@@ -548,10 +548,10 @@ export default {
 		},
 		// 同意
 		agree(vars) {
-			vars = {...vars, agree: true}
-			if (this.formType === '2') {
-				this.commit(vars)
-			}
+				vars = {...vars, agree: true}
+				if (this.formType === '2') {
+					this.commit(vars)
+				}
 		},
 		// 重新申请
 		reapply (vars) {
@@ -657,6 +657,7 @@ export default {
 		// Process_1669700915383 合同登记纸质归档
 		// Process_1669271524486 报销审批
 		// Process_1669275081328 发票申请
+		// Process_1693819615497 发票申请(旧)
 		// Process_1669275380218 发票作废
 		// Process_1672738002595 发起通知
 		// Process_1662628133027 评估-合同登记新建
@@ -679,6 +680,7 @@ export default {
 		// Process_1667894339167 会计-合同登记
 		// Process_1678692643340 会计-项目报告归档-苏州分部
 		// Process_1683767097901 物资管理-领用退回申请
+
 		// 驳回
 		reject(vars) {
 			if (this.procDefId.includes('Process_1667978088459') ||
@@ -694,6 +696,7 @@ export default {
 				this.procDefId.includes('Process_1669700915383') ||
 				this.procDefId.includes('Process_1669271524486') ||
 				this.procDefId.includes('Process_1669275081328') ||
+				this.procDefId.includes('Process_1693819615497') ||
 				this.procDefId.includes('Process_1669275380218') ||
 				this.procDefId.includes('Process_1672738002595') ||
 				this.procDefId.includes('Process_1662628133027') ||
@@ -1281,7 +1284,8 @@ export default {
 			wareHouseId: '',
 			returnId: '',
 			dataListHi: [],
-			dataListHiCollect: []
+			dataListHiCollect: [],
+			recordType:''
 		};
 	},
 };

src/views/home/components/TodoList2.vue

@@ -14,8 +14,6 @@
 		<div style="height: 250px;margin-top: 5px">
 			<vxe-table
 				border="inner"
-				auto-resize
-				resizable
 				:loading="loading"
 				size="small"
 				ref="todoTable"
@@ -29,7 +27,7 @@
 				:data="dataList"
 				header-align="center"
 				:checkbox-config="{}">
-				<vxe-column title="实例标题" field="vars.title">
+				<vxe-column title="实例标题"  field="vars.title">
 				</vxe-column>
 				<vxe-column title="流程名称" field="processDefinitionName"></vxe-column>
 				<vxe-column title="当前环节" field="task.name">