Browse Source

reactor:484 特殊号码管理中导入新一批人大代表信息等需求;482 调整部门办件统计表对应明细表的导出结果

zhangchong 2 weeks ago
parent
commit
426b379190

+ 16 - 48
src/views/business/order/index.vue

@@ -123,7 +123,14 @@
 					>
 						退回</el-button
 					>
-					<el-button type="primary" link @click="onSupply(row)" v-auth="'business:order:supply'" v-show="['LuZhou','ZiGong'].includes(themeConfig.appScope)">补充备注</el-button>
+					<el-button
+						type="primary"
+						link
+						@click="onSupply(row)"
+						v-auth="'business:order:supply'"
+						v-show="['LuZhou', 'ZiGong'].includes(themeConfig.appScope)"
+						>补充备注</el-button
+					>
 				</template>
 				<template #pager>
 					<pagination
@@ -338,41 +345,17 @@
 						<el-option label="否" :value="false" />
 					</el-select>
 				</el-form-item>
+				<el-form-item label="政治身份" prop="PoliticalIdentityValue" v-if="['ZiGong'].includes(themeConfig.appScope)">
+					<el-select v-model="state.queryParams.PoliticalIdentityValue" placeholder="请选择政治身份" clearable @change="handleQuery">
+						<el-option v-for="item in state.politicalIdentity" :value="item.dicDataValue" :key="item.dicDataValue" :label="item.dicDataName" />
+					</el-select>
+				</el-form-item>
 			</el-form>
 			<template #footer>
 				<el-button type="primary" @click="handleQuery" :loading="state.loading"> <SvgIcon name="ele-Search" class="mr5" />查询 </el-button>
 				<el-button @click="resetQuery(drawerRuleFormRef)" class="default-button"> <SvgIcon name="ele-Refresh" class="mr5" />重置 </el-button>
 			</template>
 		</el-drawer>
-		<!--	内容检索	-->
-		<el-dialog
-			v-model="state.dialogVisible"
-			draggable
-			destroy-on-close
-			:close-on-click-modal="false"
-			modal-class="modal_class"
-			class="dialog_class"
-			append-to-body
-			:modal="false"
-			title="内容检索"
-			width="500px"
-		>
-			<el-form :model="state.ruleForm" ref="ruleFormContentRef" label-width="90px" class="show-info-form" @submit.native.prevent>
-				<el-form-item label="信件内容">
-					<el-input v-model="state.ruleForm.content" placeholder="请填写信件内容" :autosize="{ minRows: 4, maxRows: 10 }" type="textarea"></el-input>
-				</el-form-item>
-				<!--				<el-form-item label="检索范围">
-					<el-checkbox v-model="state.ruleForm.isContent">受理内容</el-checkbox>
-					<el-checkbox v-model="state.ruleForm.isFileOpinion">承办意见</el-checkbox>
-				</el-form-item>-->
-			</el-form>
-			<template #footer>
-				<span class="dialog-footer">
-					<el-button @click="state.dialogVisible = false" class="default-button">取 消</el-button>
-					<el-button type="primary" @click="onSearch(ruleFormContentRef)">查 询</el-button>
-				</span>
-			</template>
-		</el-dialog>
 		<!-- 工单撤销 -->
 		<order-revoke ref="orderRevokeRef" @updateList="refreshList" />
 		<!-- 工单催办 -->
@@ -478,12 +461,7 @@ const state = reactive<any>({
 	orgData: [], // 机构数据
 	areaOptions: [], // 省市区数据
 	focusOnEvents: [], // 重点事项
-	dialogVisible: false,
-	ruleForm: {
-		content: null,
-		isContent: true, // 内容检索默认勾选 受理内容
-		isFileOpinion: false, // 内容检索承办意见
-	},
+	politicalIdentity: [], // 政治身份
 });
 const requestParams = ref<EmptyObjectType>({});
 const gridOptions = reactive<any>({
@@ -574,6 +552,7 @@ const getBaseData = async () => {
 			currentStepOptions: 'currentStepOptions',
 			orderTagOptions: 'orderTags',
 			focusOnEvents: 'focusOnEvents',
+			politicalIdentity: 'politicalIdentity',
 		};
 		for (const key in mappings) {
 			state[key] = result?.[mappings[key]] ?? [];
@@ -657,7 +636,6 @@ const resetQuery = (formEl: FormInstance | undefined) => {
 	fastSearch.value = 'all';
 	checkList.value = [];
 	ruleFormRef.value?.resetFields();
-	state.ruleForm.content = null;
 	queryList();
 	getTotal();
 };
@@ -734,18 +712,8 @@ const onUrge = () => {
 };
 // 工单补充
 const orderSupplyRef = ref<RefType>();
-const onSupply = (row:any)=>{
+const onSupply = (row: any) => {
 	orderSupplyRef.value.openDialog(row);
-}
-const ruleFormContentRef = ref<RefType>();
-// 内容检索
-const onSearch = (formEl: FormInstance | undefined) => {
-	if (!formEl) return;
-	formEl.validate((valid: boolean) => {
-		if (!valid) return;
-		handleQuery();
-		state.dialogVisible = false;
-	});
 };
 const checkTable = ref<EmptyArrayType>([]);
 const gridRef = ref<RefType>();

+ 5 - 0
src/views/statistics/department/detailHandle.vue

@@ -87,6 +87,11 @@
 					<vxe-column field="sourceChannel" title="来源渠道" width="100"></vxe-column>
 					<vxe-column field="hotspotSpliceName" title="热点全称" width="150"></vxe-column>
 					<vxe-column field="hotspotName" title="热点分类" width="150"></vxe-column>
+					<vxe-column field="oneHotspotName" title="一级热点" width="150"></vxe-column>
+					<vxe-column field="twoHotspotName" title="二级热点" width="150"></vxe-column>
+					<vxe-column field="threeHotspotName" title="三级热点" width="150"></vxe-column>
+					<vxe-column field="fourHotspotName" title="四级热点" width="150"></vxe-column>
+					<vxe-column field="fiveHotspotName" title="五级热点" width="150"></vxe-column>
 					<vxe-column field="acceptorName" title="受理人" width="100"></vxe-column>
 				</vxe-table>
 			</div>

+ 5 - 0
src/views/statistics/department/detailHandleList.vue

@@ -98,6 +98,11 @@
 					<vxe-column field="sourceChannel" title="来源渠道" width="100"></vxe-column>
 					<vxe-column field="hotspotSpliceName" title="热点全称" width="150"></vxe-column>
 					<vxe-column field="hotspotName" title="热点分类" width="150"></vxe-column>
+					<vxe-column field="oneHotspotName" title="一级热点" width="150"></vxe-column>
+					<vxe-column field="twoHotspotName" title="二级热点" width="150"></vxe-column>
+					<vxe-column field="threeHotspotName" title="三级热点" width="150"></vxe-column>
+					<vxe-column field="fourHotspotName" title="四级热点" width="150"></vxe-column>
+					<vxe-column field="fiveHotspotName" title="五级热点" width="150"></vxe-column>
 					<vxe-column field="acceptorName" title="受理人" width="100"></vxe-column>
 				</vxe-table>
 			</div>