Merge branch 'release' into dev

.env.development

@@ -3,7 +3,7 @@ VITE_MODE_NAME=development
 # 防止部署多套系统到同一域名不同目录时，变量共用的问题 设置不同的前缀
 VITE_STORAGE_NAME=dev
 # 业务系统基础请求地址
-VITE_API_URL=http://110.188.24.28:50300
+VITE_API_URL=http://110.188.24.28:50100
 # 业务系统socket请求地址
 VITE_API_SOCKET_URL=http://110.188.24.28:50100/hubs/hotline
 # 业务系统文件上传上传请求地址

src/views/business/discern/ZGApply.vue

@@ -99,7 +99,7 @@
 							{{ formatDate(row.orderVisit?.visitTime, 'YYYY-mm-dd HH:MM:SS') }}
 						</template>
 					</vxe-column>
-					<vxe-column title="操作" fixed="right" width="280" align="center">
+					<vxe-column title="操作" fixed="right" width="340" align="center">
 						<template #default="{ row }">
 							<el-button link type="primary" @click="submitDiscern(row)" title="发起甄别申请" v-auth="'business:discern:apply:submit'">
 								发起甄别

src/views/judicial/order/components/orderDetail.vue

@@ -82,9 +82,9 @@
 							<el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6">
 								<el-form-item label="热点分类"> {{ state.ruleForm.hotspotSpliceName }} </el-form-item>
 							</el-col>
-              <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6" v-if="state.ruleForm.eventTypeSpliceName">
-                <el-form-item label="事项类型"> {{ state.ruleForm.eventTypeSpliceName }} </el-form-item>
-              </el-col>
+							<el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6" v-if="state.ruleForm.eventTypeSpliceName">
+								<el-form-item label="事项类型"> {{ state.ruleForm.eventTypeSpliceName }} </el-form-item>
+							</el-col>
 							<el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6">
 								<el-form-item label="受理人">
 									<span>{{ state.ruleForm?.acceptorName }}</span>
@@ -93,9 +93,9 @@
 							<el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6">
 								<el-form-item label="生成时间"> {{ formatDate(state.ruleForm?.creationTime, 'YYYY-mm-dd HH:MM:SS') }} </el-form-item>
 							</el-col>
-              <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6">
-                <el-form-item label="执法部门"> {{ state.ruleForm?.enforcementOrdersHandler?.map((item) => item.key).join(',') }} </el-form-item>
-              </el-col>
+							<el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6">
+								<el-form-item label="执法部门"> {{ state.ruleForm?.enforcementOrdersHandler?.map((item) => item.key).join(',') }} </el-form-item>
+							</el-col>
 							<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
 								<el-form-item label="工单标题">
 									{{ state.ruleForm.title }} <el-tag class="ml10" v-if="state.ruleForm?.workflowId">{{ state.ruleForm.statusText }}</el-tag>
@@ -115,6 +115,50 @@
 					</el-form>
 				</div>
 			</el-collapse-item>
+			<el-collapse-item name="3">
+				<template #title>
+					<p class="pl20">
+						<b class="font14">结果信息</b>
+					</p>
+				</template>
+				<div class="collapse-container">
+					<el-form label-width="100px" ref="ruleFormRef">
+						<el-row :gutter="10">
+							<el-col :xs="24" :sm="24" :md="8" :lg="6" :xl="6">
+								<el-form-item label="交办部门"> 热线中心 </el-form-item>
+							</el-col>
+							<el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6" v-if="state.ruleForm.centerToOrgTime">
+								<el-form-item label="交办时间"> {{ formatDate(state.ruleForm.centerToOrgTime, 'YYYY-mm-dd HH:MM:SS') }} </el-form-item>
+							</el-col>
+							<el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6" v-if="state.ruleForm.actualHandleOrgName">
+								<el-form-item label="接办部门"> {{ state.ruleForm.actualHandleOrgName }}</el-form-item>
+							</el-col>
+							<el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6" v-if="state.ruleForm.actualHandleTime">
+								<el-form-item label="接办时间"> {{ formatDate(state.ruleForm.actualHandleTime, 'YYYY-mm-dd HH:MM:SS') }} </el-form-item>
+							</el-col>
+							<el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6" v-if="state.ruleForm.timeLimit">
+								<el-form-item label="工单办理期限">
+									{{ state.ruleForm.timeLimit }}
+								</el-form-item>
+							</el-col>
+							<el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6" v-if="state.ruleForm.expiredTime">
+								<el-form-item label="工单期满时间">
+									{{ formatDate(state.ruleForm.expiredTime, 'YYYY-mm-dd HH:MM:SS') }}
+								</el-form-item>
+							</el-col>
+							<el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6">
+								<el-form-item label="部门处理结果" class="formatted-text"> {{ state.ruleForm.isResolvedText }} </el-form-item>
+							</el-col>
+							<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" v-if="state.ruleForm.centerOpinion">
+								<el-form-item label="中心意见" class="formatted-text"> {{ state.ruleForm.centerOpinion }} </el-form-item>
+							</el-col>
+							<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" v-if="state.ruleForm.fileOpinion">
+								<el-form-item label="承办意见" class="formatted-text"> {{ state.ruleForm.fileOpinion }} </el-form-item>
+							</el-col>
+						</el-row>
+					</el-form>
+				</div>
+			</el-collapse-item>
 		</el-collapse>
 	</el-dialog>
 	<!-- 播放录音 -->
@@ -162,7 +206,7 @@ const state = reactive<any>({
 	ruleForm: {
 		// 表单数据
 	},
-	collapseArr: ['1', '2'], //展开列表
+	collapseArr: ['1', '2', '3'], //展开列表
 	loading: false,
 	orderId: '', //工单id
 });