😎1、调整行政区域编辑页面 2、清理代码及升级npm包依赖

Web/package.json

@@ -14,8 +14,9 @@
 		"@element-plus/icons-vue": "^2.3.1",
 		"@microsoft/signalr": "^8.0.0",
 		"@vue-office/docx": "^1.6.0",
-		"@vue-office/excel": "^1.7.1",
+		"@vue-office/excel": "^1.7.2",
 		"@vue-office/pdf": "^1.6.5",
+		"@vueuse/core": "^10.9.0",
 		"@wangeditor/editor": "^5.1.23",
 		"@wangeditor/editor-for-vue": "^5.1.12",
 		"animate.css": "^4.1.1",
@@ -74,7 +75,7 @@
 		"rollup-plugin-visualizer": "^5.12.0",
 		"sass": "^1.72.0",
 		"terser": "^5.29.2",
-		"typescript": "^5.4.2",
+		"typescript": "^5.4.3",
 		"vite": "^5.2.2",
 		"vite-plugin-cdn-import": "^0.3.5",
 		"vite-plugin-compression": "^0.5.1",

Web/src/components/table/search.vue

@@ -53,7 +53,15 @@
 								@change="val.change"
 								class="w100"
 							/>
-							<el-select v-model="searchModel[val.prop]" v-bind="val.comProps" :clearable="!val.required" :placeholder="val.placeholder" v-else-if="val.type === 'select'" @change="val.change" class="w100">
+							<el-select
+								v-model="searchModel[val.prop]"
+								v-bind="val.comProps"
+								:clearable="!val.required"
+								:placeholder="val.placeholder"
+								v-else-if="val.type === 'select'"
+								@change="val.change"
+								class="w100"
+							>
 								<el-option v-for="item in val.options" :key="item.value" :label="item.label" :value="item.value"> </el-option>
 							</el-select>
 							<el-cascader
@@ -85,8 +93,8 @@
 						<div>
 							<!-- 使用el-button-group会导致具有type属性的按钮的右边框无法显示 -->
 							<!-- <el-button-group> -->
-								<el-button plain type="primary" icon="ele-Search" @click="onSearch(tableSearchRef)"> 查询 </el-button>
-								<el-button icon="ele-Refresh" @click="onReset(tableSearchRef)" style="margin-left: 12px"> 重置 </el-button>
+							<el-button plain type="primary" icon="ele-Search" @click="onSearch(tableSearchRef)"> 查询 </el-button>
+							<el-button icon="ele-Refresh" @click="onReset(tableSearchRef)" style="margin-left: 12px"> 重置 </el-button>
 							<!-- </el-button-group> -->
 						</div>
 					</el-form-item>
@@ -101,7 +109,6 @@ import { reactive, ref } from 'vue';
 import type { FormInstance } from 'element-plus';
 import { saulVModel } from '/@/utils/saulVModel';
 
-
 // 定义父组件传过来的值
 const props = defineProps({
 	// 搜索表单,type-控件类型（input,select,cascader,date）,options-type为selct时需传值，cascaderData,cascaderProps-type为cascader时需传值，属性同elementUI,cascaderProps不传则使用state默认。
@@ -122,7 +129,7 @@ const props = defineProps({
 
 // 定义子组件向父组件传值/事件
 const emit = defineEmits(['search', 'reset', 'update:modelValue']);
-const searchModel=ref(props.modelValue);
+const searchModel = ref(props.modelValue);
 // 定义变量内容
 const tableSearchRef = ref<FormInstance>();
 const state = reactive({
@@ -137,7 +144,7 @@ const onSearch = (formEl: FormInstance | undefined) => {
 	if (!formEl) return;
 	formEl.validate((valid: boolean) => {
 		if (valid) {
-			emit('search',model);
+			emit('search', model);
 		} else {
 			return false;
 		}
@@ -148,9 +155,8 @@ const onSearch = (formEl: FormInstance | undefined) => {
 const onReset = (formEl: FormInstance | undefined) => {
 	if (!formEl) return;
 	formEl.resetFields();
-	emit('reset',model);
+	emit('reset', model);
 };
-
 </script>
 
 <style scoped lang="scss">
@@ -169,5 +175,4 @@ const onReset = (formEl: FormInstance | undefined) => {
 		}
 	}
 }
-
 </style>

Web/src/layout/footer/index.vue

@@ -8,14 +8,11 @@
 </template>
 
 <script setup lang="ts" name="layoutFooter">
-// 此处需有内容（注释也得），否则缓存将失败
 import { storeToRefs } from 'pinia';
 import { useThemeConfig } from '/@/stores/themeConfig';
 
-// 定义变量内容
 const storesThemeConfig = useThemeConfig();
 const { themeConfig } = storeToRefs(storesThemeConfig);
-
 </script>
 
 <style scoped lang="scss">

Web/src/views/system/region/component/editRegion.vue

@@ -26,6 +26,11 @@
 							</el-cascader>
 						</el-form-item>
 					</el-col> -->
+					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
+						<el-form-item label="上级行政Id" prop="pid" :rules="[{ required: true, message: '上级行政Id不能为空', trigger: 'blur' }]">
+							<el-input v-model="state.ruleForm.pid" placeholder="上级行政Id或上级行政代码或默认0" clearable />
+						</el-form-item>
+					</el-col>
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
 						<el-form-item label="行政名称" prop="name" :rules="[{ required: true, message: '行政名称不能为空', trigger: 'blur' }]">
 							<el-input v-model="state.ruleForm.name" placeholder="行政名称" clearable />