Merge branch 'master' into release

src/views/business/supervise/components/Order-supervise-detail.vue

@@ -26,7 +26,7 @@
 						<el-form-item label="督办人"> {{ state.superviseDetail.crUser }} </el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-						<el-form-item label="督办部门"> {{ state.superviseDetail.creatorOrgName }} </el-form-item>
+						<el-form-item label="督办部门"> {{ state.superviseDetail.launchOrgName }} </el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
 						<el-form-item label="督办时间"> {{ formatDate(state.superviseDetail.creationTime, 'YYYY-mm-dd HH:MM:SS') }} </el-form-item>

src/views/business/supervise/components/Order-supervise-reply.vue

@@ -24,7 +24,7 @@
 						<el-form-item label="督办人" class="mb5"> {{ state.superviseDetail.crUser }} </el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-						<el-form-item label="督办部门" class="mb5"> {{ state.superviseDetail.creatorOrgName }} </el-form-item>
+						<el-form-item label="督办部门" class="mb5"> {{ state.superviseDetail.launchOrgName }} </el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
 						<el-form-item label="督办时间" class="mb5"> {{ formatDate(state.superviseDetail.creationTime, 'YYYY-mm-dd HH:MM:SS') }} </el-form-item>

src/views/business/supervise/index.vue

@@ -91,7 +91,7 @@ const columns = ref<any[]>([
 			return <span>{formatDate(scope.row.order?.expiredTime, 'YYYY-mm-dd HH:MM:SS')}</span>;
 		},
 	},
-	{ prop: 'creatorOrgName', label: '督办部门' },
+	{ prop: 'launchOrgName', label: '督办部门' },
 	{ prop: 'crUser', label: '督办人' },
 	{
 		prop: 'creationTime',

src/views/business/supervise/todo.vue

@@ -98,9 +98,9 @@ const columns = ref<any[]>([
 			return <span>{formatDate(scope.row.replyLimitTime, 'YYYY-mm-dd HH:MM:SS')}</span>;
 		},
 	},
-	{ prop: 'creatorOrgName', label: '督办部门', width: 150 },
+	{ prop: 'launchOrgName', label: '督办部门', width: 150 },
 	{ prop: 'crUser', label: '督办人', width: 120 },
-	{ prop: 'orgName', label: '被督办部门', width: 150 },
+	{ prop: 'launchOrgName', label: '被督办部门', width: 150 },
 	{ prop: 'applyContent', label: '督办意见', width: 200 },
 	{ prop: 'operation', label: '操作', fixed: 'right', width: 140, align: 'center' },
 ]);