reactor:对接随手拍公开信息审批;

src/api/snapshot/publish.ts

@@ -0,0 +1,91 @@
+/*
+ * @Author: zc
+ * @description 数据统计-知识统计
+ */
+import request from '@/utils/request';
+/**
+ * @description 获取随手拍公开集合基础数据
+ * @param {object} params
+ */
+export const centerDataListBasicData = (params?: object) => {
+	return request({
+		url: '/api/v1/SnapshotOrder/publish/basedata',
+		method: 'get',
+		params,
+	});
+};
+/**
+ * @description 获取随手拍公开集合
+ * @param {object} params
+ */
+export const centerPublishList = (params: object) => {
+	return request({
+		url: '/api/v1/SnapshotOrder/publish',
+		method: 'get',
+		params,
+	});
+};
+/**
+ * @description 获取随手拍公开详情
+ * @param {string} id
+ */
+export const centerPublishDetail = (id: string) => {
+	return request({
+		url: `/api/v1/SnapshotOrder/publish/${id}`,
+		method: 'get',
+	});
+};
+/**
+ * @description 批量设置随手拍公开申请不不公开
+ * @param {object} data
+ */
+export const centerPublishSetNotPublic = (data: object) => {
+	return request({
+		url: '/api/v1/SnapshotOrder/publishs/status/refuse',
+		method: 'put',
+		data,
+	});
+};
+/**
+ * @description 添加公开审核
+ * @param {object} data
+ */
+export const centerPublishAdd = (data: object) => {
+	return request({
+		url: '/api/v1/SnapshotOrder/publish',
+		method: 'post',
+		data,
+	});
+};
+/**
+ * @description 获取随手拍公开审批集合
+ * @param {object} params
+ */
+export const centerPublishUserList = (params: object) => {
+	return request({
+		url: '/api/v1/SnapshotOrder/publish/audit',
+		method: 'get',
+		params,
+	});
+};
+/**
+ * @description 获取随手拍公开审批详情
+ * @param {string} id
+ */
+export const centerPublishUserDetail = (id: string) => {
+	return request({
+		url: `/api/v1/SnapshotOrder/publish/audit/${id}`,
+		method: 'get',
+	});
+};
+/**
+ * @description 随手拍公开审批 通过不通过
+ * @param {object} data
+ */
+export const centerPublishUserAudit = (data: object) => {
+	return request({
+		url: '/api/v1/SnapshotOrder/publish/status',
+		method: 'put',
+		data,
+	});
+};

src/views/snapshot/publish/audit.vue

@@ -6,10 +6,10 @@
 					<el-form :model="state.queryParams" ref="ruleFormRef" inline @submit.native.prevent :disabled="gridOptions.loading">
 						<el-form-item label="审批状态" prop="Status">
 							<el-radio-group v-model="state.queryParams.Status" @change="handleQuery">
-								<el-radio :value="1">审批中</el-radio>
-								<el-radio :value="2">同意</el-radio>
-								<el-radio :value="3">不同意</el-radio>
-								<el-radio :value="0">全部</el-radio>
+								<el-radio :value="0">审批中</el-radio>
+								<el-radio :value="1">同意</el-radio>
+								<el-radio :value="2">不同意</el-radio>
+								<el-radio :value="-1">全部</el-radio>
 							</el-radio-group>
 						</el-form-item>
 						<el-form-item>
@@ -22,7 +22,7 @@
 					<el-button type="primary" @click="onView(row)" v-auth="'snapshot:publish:audit:audit'" link> 查看 </el-button>
 				</template>
 				<template #order_detail="{ row }">
-					<order-detail :order="{ id: row.orderId }" @updateList="queryList">{{ row.title }}</order-detail>
+					<order-detail :order="row" @updateList="queryList">{{ row.title }}</order-detail>
 				</template>
 				<template #pager>
 					<pagination
@@ -43,8 +43,8 @@
 <script lang="tsx" setup name="snapshotPublishAudit">
 import { defineAsyncComponent, onMounted, reactive, ref } from 'vue';
 import { FormInstance } from 'element-plus';
-import { getOrderMarkList } from '@/api/snapshot/handle';
 import Other from '@/utils/other';
+import { centerPublishUserList } from '@/api/snapshot/publish';
 
 // 引入组件
 const pagination = defineAsyncComponent(() => import('@/components/ProTable/components/Pagination.vue')); // 分页
@@ -58,7 +58,7 @@ const state = reactive<any>({
 		// 查询参数
 		PageIndex: 1,
 		PageSize: 20,
-		Status: 1, // 默认待标注
+		Status: 0, // 默认 审批中
 		No: null, // 工单编码
 		Title: null, // 工单标题
 	},
@@ -93,7 +93,7 @@ const gridOptions = reactive<any>({
 	height: 'auto',
 	columns: [
 		{
-			field: 'no',
+			field: 'statusTxt',
 			title: '审批状态',
 			width: 120,
 		},
@@ -109,7 +109,7 @@ const gridOptions = reactive<any>({
 			minWidth: 300,
 		},
 		{
-			field: 'no',
+			field: 'creatorName',
 			title: '申请人',
 			width: 120,
 		},
@@ -120,22 +120,22 @@ const gridOptions = reactive<any>({
 			width: 160,
 		},
 		{
-			field: 'content',
+			field: 'arrangeTitle',
 			title: '公开标题',
-			minWidth: 200,
+			minWidth: 300,
 		},
 		{
-			field: 'content',
+			field: 'address',
 			title: '公开地址',
 			width: 150,
 		},
 		{
-			field: 'content',
+			field: 'arrangeContent',
 			title: '公开内容',
 			minWidth: 300,
 		},
 		{
-			field: 'content',
+			field: 'arrangeOpinion',
 			title: '公开办理信息',
 			minWidth: 300,
 		},
@@ -154,7 +154,7 @@ const queryList = () => {
 	state.loading = true;
 	gridOptions.loading = true;
 	requestParams.value = Other.deepClone(state.queryParams);
-	getOrderMarkList(requestParams.value)
+	centerPublishUserList(requestParams.value)
 		.then((res) => {
 			state.loading = false;
 			gridOptions.data = res.result.items ?? [];

src/views/snapshot/publish/components/Order-publish.vue

@@ -4,7 +4,7 @@
 			<el-form label-width="100px" ref="ruleFormRef" :model="state.ruleForm" v-loading="state.loading">
 				<el-row :gutter="10" class="w100">
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
-						<el-form-item label="工单标题"> {{ state.publishDetail.orderTitle }} </el-form-item>
+						<el-form-item label="工单标题"> {{ state.publishDetail.title }} </el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
 						<el-form-item label="整改后标题" prop="arrangeTitle" :rules="[{ required: false, message: '请填写整改后标题', trigger: 'blur' }]">
@@ -13,17 +13,17 @@
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
 						<el-form-item label="受理时间">
-							{{ state.ruleForm.arrangeTitle }}
+							{{ formatDate(state.publishDetail.creationTime, 'YYYY-mm-dd HH:MM:SS') }}
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
 						<el-form-item label="事发地址">
-							{{ state.ruleForm.arrangeTitle }}
+							{{ state.publishDetail.fullAddress }}
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
-						<el-form-item label="地点整改" prop="arrangeTitle" :rules="[{ required: false, message: '请填写地点整改', trigger: 'blur' }]">
-							<el-input placeholder="请填写地点整改" v-model="state.ruleForm.arrangeTitle" clearable></el-input>
+						<el-form-item label="地点整改" prop="arrangeAddress" :rules="[{ required: false, message: '请填写地点整改', trigger: 'blur' }]">
+							<el-input placeholder="请填写地点整改" v-model="state.ruleForm.arrangeAddress" clearable></el-input>
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
@@ -42,7 +42,7 @@
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
-						<el-form-item label="办理结果" class="formatted-text"> {{ state.publishDetail.actualOpinion }}</el-form-item>
+						<el-form-item label="办理结果" class="formatted-text"> {{ state.publishDetail.fileOpinion }}</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
 						<el-form-item label="整改后结果" prop="arrangeOpinion" :rules="[{ required: false, message: '请填写整改后内容', trigger: 'blur' }]">
@@ -62,7 +62,7 @@
 		<template #footer>
 			<span class="dialog-footer">
 				<el-button @click="closeDialog" class="default-button" :loading="state.loading">取 消</el-button>
-				<el-button type="primary" @click="onPublish(ruleFormRef)" :loading="state.loading">保存</el-button>
+				<el-button type="primary" @click="onPublish(ruleFormRef)" :loading="state.loading">保 存</el-button>
 			</span>
 		</template>
 	</el-dialog>
@@ -70,11 +70,10 @@
 <script setup lang="ts">
 import { reactive, ref } from 'vue';
 import { ElMessage, FormInstance } from 'element-plus';
-import { baseData } from '@/api/business/publish';
-import { publishOrder } from '@/api/todo/publish';
-import { useThemeConfig } from '@/stores/themeConfig';
 import { storeToRefs } from 'pinia';
 import { useAppConfig } from '@/stores/appConfig';
+import { centerPublishAdd, centerPublishDetail } from '@/api/snapshot/publish';
+import { formatDate } from '@/utils/formatTime';
 
 // 定义子组件向父组件传值/事件
 const emit = defineEmits(['updateList']);
@@ -83,26 +82,16 @@ const state = reactive<any>({
 	dialogVisible: false, // 是否显示弹窗
 	loading: false, // 是否显示加载
 	ruleForm: {
-		proPublishState: false, // 是否公开
-		isContact: true, // 是否联系
-		isVisited: true, // 是否评价
-		feedBackPhone: '', // 反馈人电话
-		noPubReason: '', // 不公开原因
-		answerContent: '', // 答复口径
+		arrangeTitle: '', // 整改后标题
 		arrangeContent: '', // 整改后内容
 		arrangeOpinion: '', // 整改后结果
-		idNames: [], // 需回访部门
-		publishState: false, // 门户是否公开
-		resolve: null, // 处理结果
+		handleTime: '', // 受理时间
+		arrangeAddress: '', // 整改后地址
 	},
 	orderDetail: {}, // 工单详情
 	publishDetail: {}, // 发布详情
 });
 const ruleFormRef = ref<RefType>(); // 表单ref
-const idNamesArray = ref<EmptyArrayType>([]); // 部门列表
-const netizenEvaluateType = ref<EmptyArrayType>([]);
-const storesThemeConfig = useThemeConfig();
-const { themeConfig } = storeToRefs(storesThemeConfig);
 
 const appConfigStore = useAppConfig();
 const { AppConfigInfo } = storeToRefs(appConfigStore); // 系统配置信息
@@ -116,13 +105,12 @@ const openDialog = async (row: any) => {
 	state.dialogVisible = true;
 	try {
 		state.orderDetail = row ?? {};
-		const res = await baseData(state.orderDetail.id);
+		const res = await centerPublishDetail(state.orderDetail.id);
 		state.publishDetail = res.result ?? {};
-		state.ruleForm.arrangeTitle = state.publishDetail.orderTitle;
+		state.ruleForm.arrangeTitle = state.publishDetail.title;
+		state.ruleForm.arrangeAddress = state.publishDetail.fullAddress;
 		state.ruleForm.arrangeContent = state.publishDetail.content;
-		state.ruleForm.arrangeOpinion = state.publishDetail.actualOpinion;
-		idNamesArray.value = res.result?.idNames ?? [];
-		netizenEvaluateType.value = res.result?.netizenEvaluateType ?? [];
+		state.ruleForm.arrangeOpinion = state.publishDetail.fileOpinion;
 		state.loading = false;
 		state.dialogVisible = true;
 	} catch (e) {
@@ -144,20 +132,12 @@ const onPublish = (formEl: FormInstance | undefined) => {
 	formEl.validate((valid: boolean) => {
 		if (!valid) return;
 		state.loading = true;
-		let idNames: EmptyArrayType;
-		state.ruleForm.netizenEvaluate = netizenEvaluateType.value.find((item) => item.key === state.ruleForm.netizen);
-		if (state.ruleForm.idNames.length > 0) {
-			// 如果选择了部门
-			idNames = [...state.ruleForm.idNames];
-		} else {
-			idNames = [{ key: state.publishDetail.actualHandleOrgName?.key, value: state.publishDetail.actualHandleOrgName?.value }];
-		}
 		const request = {
 			...state.ruleForm,
-			idNames,
-			id: state.orderDetail.id,
+			orderId: state.publishDetail.id,
+			handleTime: state.publishDetail.creationTime,
 		};
-		publishOrder(request)
+		centerPublishAdd(request)
 			.then(() => {
 				ElMessage.success('发布成功');
 				state.loading = false;

src/views/snapshot/publish/components/Publish-audit.vue

@@ -4,34 +4,34 @@
 			<el-form label-width="100px" :model="state.ruleForm" v-loading="state.loading" class="show-info-form">
 				<el-row :gutter="10" class="w100">
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
-						<el-form-item label="工单标题"> {{ state.publishDetail.orderTitle }} </el-form-item>
+						<el-form-item label="工单标题"> {{ state.publishDetail.title }} </el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
-						<el-form-item label="标题整改"> {{ state.publishDetail.orderTitle }} </el-form-item>
+						<el-form-item label="标题整改"> {{ state.publishDetail.arrangeTitle }} </el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
 						<el-form-item label="受理时间">
-							{{ state.ruleForm.arrangeTitle }}
+							{{ formatDate(state.publishDetail.handleTime, 'YYYY-mm-dd HH:MM:SS') }}
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
 						<el-form-item label="事发地址">
-							{{ state.ruleForm.arrangeTitle }}
+							{{ state.publishDetail.fullAddress }}
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
 						<el-form-item label="地点整改">
-							{{ state.ruleForm.arrangeTitle }}
+							{{ state.publishDetail.arrangeAddress }}
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
 						<el-form-item label="工单内容" class="formatted-text"> {{ state.publishDetail.content }} </el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
-						<el-form-item label="整改后内容" class="formatted-text"> {{ state.publishDetail.content }} </el-form-item>
+						<el-form-item label="整改后内容" class="formatted-text"> {{ state.publishDetail.arrangeContent }} </el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
-						<el-form-item label="办理结果" class="formatted-text"> {{ state.publishDetail.actualOpinion }}</el-form-item>
+						<el-form-item label="办理结果" class="formatted-text"> {{ state.publishDetail.fileOpinion }}</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
 						<el-form-item label="整改后结果" class="formatted-text"> {{ state.publishDetail.arrangeOpinion }}</el-form-item>
@@ -42,26 +42,27 @@
 		<template #footer>
 			<span class="dialog-footer">
 				<el-button @click="closeDialog" class="default-button" :loading="state.loading">取 消</el-button>
-				<el-popconfirm title="确定同意公开？" v-if="!state.ruleForm.isForwarded" @confirm="agree">
-					<template #reference>
-						<el-button type="primary" @click="agree" :loading="state.loading">同意</el-button>
-					</template>
-				</el-popconfirm>
-				<el-popconfirm title="确定不同意公开？" v-if="!state.ruleForm.isForwarded" @confirm="disagree" width="170">
-					<template #reference>
-						<el-button type="primary" :loading="state.loading">不同意</el-button>
-					</template>
-				</el-popconfirm>
+				<template v-if="state.publishDetail.status === 0">
+					<el-popconfirm title="确定同意公开？" @confirm="agree">
+						<template #reference>
+							<el-button type="primary" :loading="state.loading">同意</el-button>
+						</template>
+					</el-popconfirm>
+					<el-popconfirm title="确定不同意公开？" @confirm="disagree" width="170">
+						<template #reference>
+							<el-button type="primary" :loading="state.loading">不同意</el-button>
+						</template>
+					</el-popconfirm>
+				</template>
 			</span>
 		</template>
 	</el-dialog>
 </template>
 <script setup lang="ts">
 import { reactive, ref } from 'vue';
-import { baseData } from '@/api/business/publish';
-import { useThemeConfig } from '@/stores/themeConfig';
-import { storeToRefs } from 'pinia';
-import { useAppConfig } from '@/stores/appConfig';
+import { centerPublishUserAudit, centerPublishUserDetail } from '@/api/snapshot/publish';
+import { formatDate } from '@/utils/formatTime';
+import { ElMessage } from 'element-plus';
 
 // 定义子组件向父组件传值/事件
 const emit = defineEmits(['updateList']);
@@ -69,30 +70,9 @@ const emit = defineEmits(['updateList']);
 const state = reactive<any>({
 	dialogVisible: false, // 是否显示弹窗
 	loading: false, // 是否显示加载
-	ruleForm: {
-		proPublishState: false, // 是否公开
-		isContact: true, // 是否联系
-		isVisited: true, // 是否评价
-		feedBackPhone: '', // 反馈人电话
-		noPubReason: '', // 不公开原因
-		answerContent: '', // 答复口径
-		arrangeContent: '', // 整改后内容
-		arrangeOpinion: '', // 整改后结果
-		idNames: [], // 需回访部门
-		publishState: false, // 门户是否公开
-		resolve: null, // 处理结果
-	},
 	orderDetail: {}, // 工单详情
 	publishDetail: {}, // 发布详情
 });
-const ruleFormRef = ref<RefType>(); // 表单ref
-const idNamesArray = ref<EmptyArrayType>([]); // 部门列表
-const netizenEvaluateType = ref<EmptyArrayType>([]);
-const storesThemeConfig = useThemeConfig();
-const { themeConfig } = storeToRefs(storesThemeConfig);
-
-const appConfigStore = useAppConfig();
-const { AppConfigInfo } = storeToRefs(appConfigStore); // 系统配置信息
 /*
  * @param row 工单详情
  *
@@ -103,13 +83,8 @@ const openDialog = async (row: any) => {
 	state.dialogVisible = true;
 	try {
 		state.orderDetail = row ?? {};
-		const res = await baseData(state.orderDetail.id);
+		const res = await centerPublishUserDetail(state.orderDetail.id);
 		state.publishDetail = res.result ?? {};
-		state.ruleForm.arrangeTitle = state.publishDetail.orderTitle;
-		state.ruleForm.arrangeContent = state.publishDetail.content;
-		state.ruleForm.arrangeOpinion = state.publishDetail.actualOpinion;
-		idNamesArray.value = res.result?.idNames ?? [];
-		netizenEvaluateType.value = res.result?.netizenEvaluateType ?? [];
 		state.loading = false;
 		state.dialogVisible = true;
 	} catch (e) {
@@ -122,9 +97,31 @@ const closeDialog = () => {
 	state.dialogVisible = false;
 };
 // 同意
-const agree = () => {};
+const agree = () => {
+	state.loading = true;
+	centerPublishUserAudit({ id: state.orderDetail.id, status: 1 })
+		.then(() => {
+			state.loading = false;
+			ElMessage.success('审批完成');
+			updateList();
+		})
+		.catch(() => {
+			state.loading = false;
+		});
+};
 // 不同意
-const disagree = () => {};
+const disagree = () => {
+	state.loading = true;
+	centerPublishUserAudit({ id: state.orderDetail.id, status: 2 })
+		.then(() => {
+			state.loading = false;
+			ElMessage.success('审批完成');
+			updateList();
+		})
+		.catch(() => {
+			state.loading = false;
+		});
+};
 // 重办和退回成功
 const updateList = () => {
 	closeDialog();

src/views/snapshot/publish/index.vue

@@ -4,9 +4,9 @@
 			<vxe-grid v-bind="gridOptions" ref="gridRef" @checkbox-all="selectAllChangeEvent" @checkbox-change="selectChangeEvent">
 				<template #form>
 					<el-form :model="state.queryParams" ref="ruleFormRef" inline @submit.native.prevent :disabled="gridOptions.loading">
-						<el-form-item label="行业" prop="Status">
-							<el-select v-model="state.queryParams.Status" class="w100" placeholder="请选择行业" @change="handleQuery">
-								<el-option v-for="item in state.statusOptions" :key="item.key" :label="item.value" :value="item.key" />
+						<el-form-item label="行业" prop="IndustryId">
+							<el-select v-model="state.queryParams.IndustryId" class="w100" placeholder="请选择行业" @change="handleQuery">
+								<el-option v-for="item in industry" :key="item.id" :label="item.name" :value="item.id" />
 							</el-select>
 						</el-form-item>
 						<el-form-item label="工单编码" prop="No">
@@ -23,19 +23,19 @@
 				</template>
 				<template #toolbar_buttons>
 					<el-button type="primary" @click="onUnPublic" v-auth="'snapshot:publish:index:notPublic'" :disabled="isChecked" :loading="state.loading"
-					><SvgIcon name="ele-Edit" class="mr5" />不公开<span v-if="checkTable.length">({{ checkTable.length }})</span>
+						><SvgIcon name="ele-Edit" class="mr5" />不公开<span v-if="checkTable.length">({{ checkTable.length }})</span>
 					</el-button>
 				</template>
 				<template #action="{ row }">
 					<el-button type="primary" @click="onApply(row)" v-auth="'snapshot:publish:index:apply'" link> 申请 </el-button>
 				</template>
-				<template #statusText="{ row }">
-					<el-text type="danger" tag="b" v-if="[1, 2, 3, 9, 101, 102, 103, 104, 105, 200].includes(row.status)">{{ row.statusText }}</el-text>
-					<span v-else>{{ row.statusText }}</span>
+				<template #statusTxt="{ row }">
+					<el-text type="danger" tag="b" v-if="[1, 2, 3, 9, 101, 102, 103, 104, 105, 200].includes(row.status)">{{ row.statusTxt }}</el-text>
+					<span v-else>{{ row.statusTxt }}</span>
 				</template>
-<!--				snapshot:publish:index:apply-->
+				<!--				snapshot:publish:index:apply-->
 				<template #order_detail="{ row }">
-					<order-detail :order="{id: row.orderId}" @updateList="queryList">{{ row.title }}</order-detail>
+					<order-detail :order="row" @updateList="queryList">{{ row.title }}</order-detail>
 				</template>
 				<template #pager>
 					<pagination
@@ -51,20 +51,22 @@
 		<!--	更多查询	-->
 		<el-drawer v-model="drawer" title="更多查询" size="500px">
 			<el-form :model="state.queryParams" ref="drawerRuleFormRef" @submit.native.prevent label-width="100px">
-				<el-form-item label="是否公开" prop="SnapshotBulletinTypeName">
-					<el-select v-model="state.queryParams.SnapshotBulletinTypeName" placeholder="请选择是否公开" clearable>
-						<el-option label="是" :value="true" />
-						<el-option label="否" :value="false" />
+				<el-form-item label="是否公开" prop="IsPublished">
+					<el-select v-model="state.queryParams.IsPublished" placeholder="请选择是否公开" clearable @change="handleQuery">
+						<el-option label="公开" :value="true" />
+						<el-option label="不公开" :value="false" />
 					</el-select>
 				</el-form-item>
-				<el-form-item label="受理类型" prop="No">
-					<el-input v-model="state.queryParams.No" placeholder="请填写受理类型" clearable @keyup.enter="handleQuery" />
+				<el-form-item label="受理类型" prop="AcceptTypeCode">
+					<el-select v-model="state.queryParams.AcceptTypeCode" clearable class="w100" placeholder="请选择工单状态" @change="handleQuery">
+						<el-option v-for="item in acceptCode" :key="item.key" :label="item.value" :value="item.key" />
+					</el-select>
 				</el-form-item>
-				<el-form-item label="来电号码" prop="DepartmentName">
-					<el-input v-model="state.queryParams.DepartmentName" placeholder="请填写来电号码" clearable @keyup.enter="handleQuery" />
+				<el-form-item label="来电号码" prop="FromPhone">
+					<el-input v-model="state.queryParams.FromPhone" placeholder="请填写来电号码" clearable @keyup.enter="handleQuery" />
 				</el-form-item>
-				<el-form-item label="联系电话" prop="CreatorName">
-					<el-input v-model="state.queryParams.CreatorName" placeholder="请填写联系电话" clearable @keyup.enter="handleQuery" />
+				<el-form-item label="联系电话" prop="Contact">
+					<el-input v-model="state.queryParams.Contact" placeholder="请填写联系电话" clearable @keyup.enter="handleQuery" />
 				</el-form-item>
 				<el-form-item label="受理时间" prop="slTime">
 					<el-date-picker
@@ -80,14 +82,14 @@
 						:default-time="defaultTimeStartEnd"
 					/>
 				</el-form-item>
-				<el-form-item label="工单状态" prop="Status">
-					<el-select v-model="state.queryParams.Status" class="w100" placeholder="请选择工单状态" @change="handleQuery">
-						<el-option v-for="item in state.statusOptions" :key="item.key" :label="item.value" :value="item.key" />
+				<el-form-item label="工单状态" prop="OrderStatus">
+					<el-select v-model="state.queryParams.OrderStatus" class="w100" clearable placeholder="请选择工单状态" @change="handleQuery">
+						<el-option v-for="item in orderStatus" :key="item.key" :label="item.value" :value="item.key" />
 					</el-select>
 				</el-form-item>
-				<el-form-item label="区域信息" prop="Status">
-					<el-select v-model="state.queryParams.Status" class="w100" placeholder="请选择区域信息" @change="handleQuery">
-						<el-option v-for="item in state.statusOptions" :key="item.key" :label="item.value" :value="item.key" />
+				<el-form-item label="区域信息" prop="AreaCode">
+					<el-select v-model="state.queryParams.AreaCode" class="w100" clearable placeholder="请选择区域信息" @change="handleQuery">
+						<el-option v-for="item in area" :key="item.key" :label="item.value" :value="item.key" />
 					</el-select>
 				</el-form-item>
 			</el-form>
@@ -103,15 +105,16 @@
 
 <script lang="tsx" setup name="snapshotPublishIndex">
 import { computed, defineAsyncComponent, onMounted, reactive, ref } from 'vue';
-import { ElMessageBox, FormInstance } from 'element-plus';
+import { ElMessage, ElMessageBox, FormInstance } from 'element-plus';
 import { getOrderMarkList } from '@/api/snapshot/handle';
 import Other from '@/utils/other';
 import { defaultTimeStartEnd, shortcuts } from '@/utils/constants';
+import { centerDataListBasicData, centerPublishList, centerPublishSetNotPublic } from '@/api/snapshot/publish';
 
 // 引入组件
 const pagination = defineAsyncComponent(() => import('@/components/ProTable/components/Pagination.vue')); // 分页
 const OrderDetail = defineAsyncComponent(() => import('@/components/OrderDetail/index.vue')); // 工单详情
-const OrderPublish = defineAsyncComponent(() => import('@/views/snapshot/publish/components/Order-publish.vue'));  // 公开
+const OrderPublish = defineAsyncComponent(() => import('@/views/snapshot/publish/components/Order-publish.vue')); // 公开
 
 // 定义变量内容
 const state = reactive<any>({
@@ -120,10 +123,18 @@ const state = reactive<any>({
 		// 查询参数
 		PageIndex: 1,
 		PageSize: 20,
-		Status: 1, // 默认待标注
-		No: null, // 工单编码
-		Title: null, // 工单标题
-		slTime:[],
+		IndustryId: null, // 行业
+		No: null, // 工单编号
+		Title: null, // 标题
+		IsPublished: null, // 是否公开
+		AcceptTypeCode: null, // 受理类型
+		FromPhone: null, // 来电号码
+		Contact: null, // 联系电话
+		slTime: [], // 受理时间
+		BeginCreationTime: null,
+		EndCreationTime: null,
+		OrderStatus: null, // 工单状态
+		AreaCode: null, // 区域信息
 	},
 	total: 0, // 总条数
 });
@@ -160,16 +171,16 @@ const gridOptions = reactive<any>({
 	columns: [
 		{ type: 'checkbox', width: 50, align: 'center' },
 		{
-			field: 'no',
+			field: 'publishStatusTxt',
 			title: '状态',
 			width: 100,
 		},
 		{
-			field: 'statusText',
+			field: 'statusTxt',
 			title: '工单状态',
 			width: 110,
 			slots: {
-				default: 'statusText',
+				default: 'statusTxt',
 			},
 		},
 		{
@@ -195,7 +206,7 @@ const gridOptions = reactive<any>({
 			width: 150,
 		},
 		{
-			field: 'county',
+			field: 'fromPhone',
 			title: '电话',
 			width: 140,
 		},
@@ -205,9 +216,14 @@ const gridOptions = reactive<any>({
 			width: 400,
 		},
 		{
-			field: 'county',
+			field: 'isTruth',
 			title: '网格员是否属实',
 			width: 140,
+			slots: {
+				default: ({ row }) => {
+					return row.isTruth === null ? '' : row.isTruth ? '是' : '否';
+				},
+			},
 		},
 		{ title: '操作', width: 90, fixed: 'right', showOverflow: false, align: 'center', slots: { default: 'action' } },
 	],
@@ -224,7 +240,7 @@ const queryList = () => {
 	state.loading = true;
 	gridOptions.loading = true;
 	requestParams.value = Other.deepClone(state.queryParams);
-	getOrderMarkList(requestParams.value)
+	centerPublishList(requestParams.value)
 		.then((res) => {
 			state.loading = false;
 			gridOptions.data = res.result.items ?? [];
@@ -274,11 +290,11 @@ const isChecked = computed(() => {
 
 // 申请
 const orderPublishRef = ref<RefType>();
-const onApply = (row:any)=>{
+const onApply = (row: any) => {
 	orderPublishRef.value.openDialog(row);
-}
+};
 // 不公开
-const onUnPublic = ()=>{
+const onUnPublic = () => {
 	const ids = checkTable.value.map((item: any) => item.id);
 	ElMessageBox.confirm(`您确认要不公开选中的记录？`, '提示', {
 		confirmButtonText: '确认',
@@ -289,16 +305,35 @@ const onUnPublic = ()=>{
 		autofocus: false,
 	})
 		.then(() => {
-		/*	deleteCommon({ ids }).then(() => {
+			centerPublishSetNotPublic(ids).then(() => {
 				ElMessage.success('操作成功');
 				queryList();
-			});*/
+			});
 		})
 		.catch(() => {});
-}
+};
+// 获取基础数据
+const acceptCode = ref<EmptyArrayType>([]);
+const area = ref<EmptyArrayType>([]);
+const orderStatus = ref<EmptyArrayType>([]);
+const publishStatus = ref<EmptyArrayType>([]);
+const industry = ref<EmptyArrayType>([]);
+const getBaseData = async () => {
+	try {
+		const { result } = await centerDataListBasicData();
+		acceptCode.value = result.acceptCode;
+		area.value = result.area;
+		orderStatus.value = result.orderStatus;
+		publishStatus.value = result.publishStatus;
+		industry.value = result.industry;
+	} catch (e) {
+		console.log(e);
+	}
+};
 // 页面加载时
 onMounted(() => {
 	queryList();
+	getBaseData();
 });
 </script>
 

src/views/snapshot/reAudit/citizen/index.vue

@@ -367,7 +367,7 @@ const gridOptions = reactive<any>({
 			width: 120,
 			slots: {
 				default: ({ row }) => {
-					return row.isTruthDepartment === null ? '' : row.isRepetition ? '是' : '否';
+					return row.isTruthDepartment === null ? '' : row.isTruthDepartment ? '是' : '否';
 				},
 			},
 		},

src/views/snapshot/reAudit/grid/index.vue

@@ -172,7 +172,7 @@ const gridOptions = reactive<any>({
 			width: 140,
 			slots: {
 				default: ({ row }) => {
-					return row.isTruthDepartment === null ? '' : row.isRepetition ? '是' : '否';
+					return row.isTruthDepartment === null ? '' : row.isTruthDepartment ? '是' : '否';
 				},
 			},
 		},
@@ -182,7 +182,7 @@ const gridOptions = reactive<any>({
 			width: 140,
 			slots: {
 				default: ({ row }) => {
-					return row.isTruthDepartment === null ? '' : row.isRepetition ? '是' : '否';
+					return row.isTruth === null ? '' : row.isTruth ? '是' : '否';
 				},
 			},
 		},
@@ -192,7 +192,7 @@ const gridOptions = reactive<any>({
 			width: 100,
 			slots: {
 				default: ({ row }) => {
-					return row.isTruthDepartment === null ? '' : row.isRepetition ? '是' : '否';
+					return row.isRepetition === null ? '' : row.isRepetition ? '是' : '否';
 				},
 			},
 		},
@@ -233,7 +233,7 @@ const gridOptions = reactive<any>({
 			width: 140,
 		},
 		{
-			field: 'levelOneStatusTxt',
+			field: 'levelOneAuditTime',
 			title: '区县审批时间',
 			formatter: 'formatDate',
 			width: 160,