reactor:425 工单导出提示语调整;24 工单新增补充备注功能;特殊号码提示需要手动关闭

.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/App.vue

@@ -66,7 +66,7 @@ VxeUI.renderer.add('exportCurrent', {
 							};
 						})
 						.filter((item: any) => item.prop && item.name && !['seq', 'checkbox'].includes(item.type));
-					ElMessageBox.confirm(`您确定要导出当前页数据，是否继续?`, '提示', {
+					ElMessageBox.confirm(`工单已留痕，禁止泄露工单信息，否则将依法依规追究责任。您确定导出当前页数据?`, '提示', {
 						confirmButtonText: '确认',
 						cancelButtonText: '取消',
 						type: 'warning',
@@ -159,7 +159,7 @@ VxeUI.renderer.add('exportAll', {
 						};
 					}
 
-					ElMessageBox.confirm(`您确定要导出全部数据，是否继续?`, '提示', {
+					ElMessageBox.confirm(`工单已留痕，禁止泄露工单信息，否则将依法依规追究责任。您确定要导出全部数据?`, '提示', {
 						confirmButtonText: '确认',
 						cancelButtonText: '取消',
 						type: 'warning',

src/components/OrderDetail/index.vue

@@ -405,22 +405,21 @@
 					</p>
 				</template>
 				<div class="collapse-container">
-					<div v-for="i in state.orderComplements" :key="i" class="plug-container">
+					<div v-for="(i, index) in state.orderComplements" :key="i" class="plug-container">
 						<el-form label-width="100px" ref="ruleFormRef">
 							<el-row :gutter="10">
-								<!--								<el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6">
+								<el-divider v-if="index" style="margin: 10px 0"/>
+								<!--																<el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6">
 									<el-form-item label="补充部门">
 										{{ i.creator.organization }}
 									</el-form-item>
-								</el-col>
+								</el-col>-->
 								<el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6">
-									<el-form-item label="补充时间"> {{ formatDate(i.creationTime, 'YYYY-mm-dd HH:MM:SS') }} </el-form-item>
+									<el-form-item label="补充时间"> {{ formatDate(i.supplyTime, '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="补充人">
-										{{ i.creator.name }} <span v-if="i.creator.staffNo">[{{ i.creator.staffNo }} ]</span></el-form-item
-									>
-								</el-col>-->
+									<el-form-item label="补充人"> {{ i.supplyName }}</el-form-item>
+								</el-col>
 								<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
 									<el-form-item label="补充内容" class="formatted-text">
 										<el-text type="danger">{{ i.opinion }}</el-text>
@@ -841,7 +840,7 @@ const state = reactive<any>({
 			label: '副本工单',
 			value: '4',
 		},
-	/*	{
+		/*	{
 			label: '附件列表',
 			value: '5',
 		},*/
@@ -952,11 +951,11 @@ const openDialog = (val: any) => {
 					label: '副本工单',
 					value: '4',
 				},
-/*				{
+				/*				{
 					label: '附件列表',
 					value: '5',
 				},*/
-			/*	{
+				/*	{
 					label: '地图信息',
 					value: '6',
 				},*/
@@ -976,7 +975,7 @@ const openDialog = (val: any) => {
 					label: '回访详情',
 					value: '2',
 				},
-			/*	{
+				/*	{
 					label: '附件列表',
 					value: '5',
 				},*/
@@ -1000,7 +999,7 @@ const openDialog = (val: any) => {
 				label: '市民画像',
 				value: '3',
 			},
-		/*	{
+			/*	{
 				label: '附件列表',
 				value: '5',
 			},*/

src/views/business/order/components/Order-supply.vue

@@ -67,7 +67,7 @@
 
 <script setup lang="ts" name="orderSupply">
 import { reactive, ref, defineAsyncComponent } from 'vue';
-import { FormInstance } from 'element-plus';
+import { ElMessage, FormInstance } from 'element-plus';
 import { throttle } from '@/utils/tools';
 import { storeToRefs } from 'pinia';
 import { useUserInfo } from '@/stores/userInfo';
@@ -137,6 +137,7 @@ const onSubmit = throttle((formEl: FormInstance | undefined) => {
 			.then(() => {
 				state.loading = false;
 				state.dialogVisible = false;
+				ElMessage.success('补充成功');
 				emit('onSupplySuccess');
 			})
 			.catch(() => {

src/views/business/order/index.vue

@@ -123,6 +123,7 @@
 					>
 						退回</el-button
 					>
+					<el-button type="primary" link @click="onSupply(row)" v-auth="'business:order:supply'" v-show="['LuZhou'].includes(themeConfig.appScope)">补充备注</el-button>
 				</template>
 				<template #pager>
 					<pagination
@@ -376,6 +377,8 @@
 		<order-revoke ref="orderRevokeRef" @updateList="refreshList" />
 		<!-- 工单催办 -->
 		<order-urge ref="orderUrgeRef" @updateList="refreshList" />
+		<!-- 工单补充 -->
+		<order-supply ref="orderSupplyRef" @onSupplySuccess="refreshList" />
 	</div>
 </template>
 <script setup lang="tsx" name="order">
@@ -402,6 +405,7 @@ const OrderReturn = defineAsyncComponent(() => import('@/views/business/return/c
 const OrderRevoke = defineAsyncComponent(() => import('@/views/business/order/components/Order-revoke.vue')); // 工单撤销
 const OrderUrge = defineAsyncComponent(() => import('@/views/business/order/components/Order-Urge.vue')); // 工单催办
 const pagination = defineAsyncComponent(() => import('@/components/ProTable/components/Pagination.vue')); // 分页
+const OrderSupply = defineAsyncComponent(() => import('@/views/business/order/components/Order-supply.vue')); // 工单补充
 
 const storesUserInfo = useUserInfo();
 const { userInfos } = storeToRefs(storesUserInfo);
@@ -728,6 +732,11 @@ const onUrge = () => {
 	const ids = checkTable.value.map((item: any) => item.id);
 	orderUrgeRef.value.openDialog(ids);
 };
+// 工单补充
+const orderSupplyRef = ref<RefType>();
+const onSupply = (row:any)=>{
+	orderSupplyRef.value.openDialog(row);
+}
 const ruleFormContentRef = ref<RefType>();
 // 内容检索
 const onSearch = (formEl: FormInstance | undefined) => {

src/views/business/order/tableHeader.tsx

@@ -268,5 +268,5 @@ export const LZTableHeader = [
 	{ field: 'threeHotspotName', title: '三级热点', width: 150 },
 	{ field: 'fourHotspotName', title: '四级热点', width: 150 },
 	{ field: 'fiveHotspotName', title: '五级热点', width: 150 },
-	{ title: '操作', width: 80, fixed: 'right', align: 'center', slots: { default: 'action' } },
+	{ title: '操作', width: 140, fixed: 'right', align: 'center', slots: { default: 'action' } },
 ];

src/views/statistics/order/hotspotAccept.vue

@@ -318,7 +318,7 @@ const linkDetail = (data: any) => {
 const tableRef = ref();
 const exportAll = () => {
 	const columns = tableRef.value.getColumns();
-	ElMessageBox.confirm(`您确定要导出全部数据，是否继续?`, '提示', {
+	ElMessageBox.confirm(`工单已留痕，禁止泄露工单信息，否则将依法依规追究责任。您确定要导出全部数据?`, '提示', {
 		confirmButtonText: '确认',
 		cancelButtonText: '取消',
 		type: 'warning',

src/views/statistics/order/hotspotArea.vue

@@ -315,7 +315,7 @@ const linkDetail = (data:any) => {
 const tableRef = ref();
 const exportAll = () => {
 	const columns = tableRef.value.getColumns();
-	ElMessageBox.confirm(`您确定要导出全部数据，是否继续?`, '提示', {
+	ElMessageBox.confirm(`工单已留痕，禁止泄露工单信息，否则将依法依规追究责任。您确定要导出全部数据?`, '提示', {
 		confirmButtonText: '确认',
 		cancelButtonText: '取消',
 		type: 'warning',