fix: 修改评分部门类别和填报人为字典数据

src/views/goverment/huizhou/assessmentManagement/scoreStandard/index.vue

@@ -149,10 +149,7 @@ const formConfig = reactive({
 			label: "评分部门类别",
 			prop: "deductPointsStandard",
 			type: "select",
-			data: [
+			data: []
-				{ label: "工程管理", value: "工程管理" },
-				{ label: "安全生产管理", value: "安全生产管理" }
-			]
 		},
 		{
 			label: "标准分",
@@ -301,6 +298,19 @@ const getDicMainList = async () => {
 	}
 	console.log(dicMainData.value);
 };
+const getTypeDicMainList = async () => {
+	// 获取部门类别字典
+	const { result } = await getDicList({ dictType: "score_department_type" });
+	console.log(result);
+	if (result.length > 0) {
+		formConfig.formItemConfig[3].data = result.map(item => {
+			return {
+				label: item.dictValue,
+				value: item.dictValue
+			};
+		});
+	}
+};
 // 获取标准分合计
 const getSumScore = async () => {
 	const res = await scoreSum({ enterpriseType: companyType.value });
@@ -381,6 +391,7 @@ const onSearch = async (params: any) => {
 };
 onMounted(async () => {
 	await getDicMainList();
+	await getTypeDicMainList();
 	companyType.value = dicMainData.value[0].dictLabel;
 	proTable.value.getTableList();
 	await getSumScore();

src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/index.vue

@@ -3,7 +3,7 @@
 		<Steps class="steps" :datas="datas" :active="active" />
 
 		<keep-alive>
-			<component :is="Components[active]" @next="next" @prev="active--"></component>
+			<component :is="Components[active]" :reportPersonList="reportPersonList" @next="next" @prev="active--"></component>
 		</keep-alive>
 	</div>
 </template>
@@ -29,6 +29,8 @@ import { EngineeringMainList } from "./duty";
 // import router from "@/routers";
 import { GlobalStore } from "@/stores";
 import { ElMessage } from "element-plus";
+import { getDicList } from "@/api/modules/jxjview";
+const reportPersonList = ref([]);
 const visible1 = ref(false);
 const datas = ref([
 	{
@@ -134,6 +136,19 @@ const temporarySave = async () => {
 		ElMessage.success(res.message);
 	}
 };
+const getPersonDicMainList = async () => {
+	// 获取部门类别字典
+	const { result } = await getDicList({ dictType: "report_person_dic" });
+	console.log(result);
+	if (result.length > 0) {
+		reportPersonList.value = result.map(item => {
+			return {
+				name: item.dictValue,
+				value: item.dictValue
+			};
+		});
+	}
+};
 // 监听父组件的visible，用来简介控制el-dialog的弹框开关，一般是用于开
 watch(
 	() => props.detailsDialog,
@@ -152,8 +167,9 @@ watch(visible1, (n, o) => {
 	console.log(n, 456789);
 	emits("update:detailsDialog", n);
 });
-onMounted(() => {
+onMounted(async () => {
 	console.log(666);
+	await getPersonDicMainList();
 	// console.log(router.params);
 });
 onUnmounted(() => {

src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview.vue

@@ -139,7 +139,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, onMounted, onUnmounted } from "vue";
+import { ref, onMounted, onUnmounted, watch } from "vue";
 import { form, reset, rules } from "./overview";
 import { getDicList } from "@/api/modules/jxjview";
 import { ElDatePicker } from "element-plus";
@@ -169,6 +169,7 @@ const addressList = ref({
 	area: "",
 	district: ""
 });
+const props = defineProps(["reportPersonList"]);
 const emit = defineEmits<{
 	(e: "next", data: OverviewForm, isTemporary: any): void;
 }>();
@@ -197,36 +198,7 @@ const engineeringState = ref<any>([
 		value: "已完结"
 	}
 ]);
-const reportPerson = ref<any>([
+const reportPerson = ref<any>([]);
-	{
-		name: "曹晓童",
-		value: "曹晓童"
-	},
-	{
-		name: "黄浩正",
-		value: "黄浩正"
-	},
-	{
-		name: "黄培峰",
-		value: "黄培峰"
-	},
-	{
-		name: "李燕",
-		value: "李燕"
-	},
-	{
-		name: "周韵",
-		value: "周韵"
-	},
-	{
-		name: "牟红洁",
-		value: "牟红洁"
-	},
-	{
-		name: "杨润韬",
-		value: "杨润韬"
-	}
-]);
 const addAnnexFile = (row: AnnexFilesOptions) => {
 	// console.log(row);
 
@@ -288,6 +260,12 @@ const next = async (formEl: FormInstance | undefined, isTemporary?: any) => {
 		}
 	});
 };
+watch(
+	() => props.reportPersonList,
+	(n, o) => {
+		reportPerson.value = n;
+	}
+);
 onMounted(async () => {
 	ruleFormRef.value?.clearValidate();
 	const data = await getDicList({ dictType: "engineering_type" });

src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview2.vue

@@ -125,7 +125,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, onMounted, onUnmounted, onActivated, onDeactivated } from "vue";
+import { ref, onMounted, onUnmounted, watch } from "vue";
 import { form, reset, rules } from "./overview2";
 import { getDicList } from "@/api/modules/jxjview";
 import { getEngineeringName } from "@/api/modules/project";
@@ -152,6 +152,7 @@ const current = ref<AnnexFilesOptions>({} as AnnexFilesOptions);
 const dictLabel = ref<undefined | number>(undefined);
 const store = GlobalStore();
 const isOpen = ref(false);
+const props = defineProps(["reportPersonList"]);
 const emit = defineEmits<{
 	(e: "next", data: OverviewForm, isTemporary: any): void;
 	(e: "prev", data: void): void;
@@ -164,36 +165,7 @@ const twoTimeRef = ref<ElDatePickerType>(),
 	twoStartTimeRef = ref<ElDatePickerType>(),
 	twoEndTimeRef = ref<ElDatePickerType>();
 
-const reportPerson = ref<any>([
+const reportPerson = ref<any>([]);
-	{
-		name: "曹晓童",
-		value: "曹晓童"
-	},
-	{
-		name: "黄浩正",
-		value: "黄浩正"
-	},
-	{
-		name: "黄培峰",
-		value: "黄培峰"
-	},
-	{
-		name: "李燕",
-		value: "李燕"
-	},
-	{
-		name: "周韵",
-		value: "周韵"
-	},
-	{
-		name: "牟红洁",
-		value: "牟红洁"
-	},
-	{
-		name: "杨润韬",
-		value: "杨润韬"
-	}
-]);
 const engineeringState = ref<any>([
 	{
 		name: "未开始",
@@ -284,7 +256,15 @@ const next = async (formEl: FormInstance | undefined, isTemporary?: any) => {
 const prev = async () => {
 	emit("prev");
 };
+watch(
+	() => props.reportPersonList,
+	(n, o) => {
+		console.log(n, 888999);
+		reportPerson.value = n;
+	}
+);
 onMounted(async () => {
+	reportPerson.value = props.reportPersonList;
 	ruleFormRef.value?.clearValidate();
 	if (store.Message) {
 		for (let i in form.value) {

src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview3.vue

@@ -163,7 +163,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, onMounted, onUnmounted, onActivated, onDeactivated } from "vue";
+import { ref, onMounted, onUnmounted, watch } from "vue";
 import { form, reset, rules } from "./overview3";
 import { getDicList } from "@/api/modules/jxjview";
 import { getEngineeringName } from "@/api/modules/project";
@@ -190,6 +190,7 @@ const current = ref<AnnexFilesOptions>({} as AnnexFilesOptions);
 const dictLabel = ref<undefined | number>(undefined);
 const store = GlobalStore();
 const isOpen = ref(false);
+const props = defineProps(["reportPersonList"]);
 const emit = defineEmits<{
 	(e: "next", data: OverviewForm, isTemporary: any): void;
 	(e: "prev", data: void): void;
@@ -204,36 +205,7 @@ const threeStartTimeRef = ref<ElDatePickerType>(),
 	threePlanTimeRef = ref<ElDatePickerType>(),
 	threeLevyTimeRef = ref<ElDatePickerType>();
 
-const reportPerson = ref<any>([
+const reportPerson = ref<any>([]);
-	{
-		name: "曹晓童",
-		value: "曹晓童"
-	},
-	{
-		name: "黄浩正",
-		value: "黄浩正"
-	},
-	{
-		name: "黄培峰",
-		value: "黄培峰"
-	},
-	{
-		name: "李燕",
-		value: "李燕"
-	},
-	{
-		name: "周韵",
-		value: "周韵"
-	},
-	{
-		name: "牟红洁",
-		value: "牟红洁"
-	},
-	{
-		name: "杨润韬",
-		value: "杨润韬"
-	}
-]);
 const engineeringState = ref<any>([
 	{
 		name: "未开始",
@@ -324,7 +296,14 @@ const next = async (formEl: FormInstance | undefined, isTemporary?: any) => {
 const prev = async () => {
 	emit("prev");
 };
+watch(
+	() => props.reportPersonList,
+	(n, o) => {
+		reportPerson.value = n;
+	}
+);
 onMounted(async () => {
+	reportPerson.value = props.reportPersonList;
 	ruleFormRef.value?.clearValidate();
 	if (store.Message) {
 		for (let i in form.value) {

src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview4.vue

@@ -87,7 +87,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, onMounted, onUnmounted, onActivated, onDeactivated } from "vue";
+import { ref, onMounted, onUnmounted, watch } from "vue";
 import { form, reset, rules } from "./overview4";
 import { getDicList } from "@/api/modules/jxjview";
 import { getEngineeringName } from "@/api/modules/project";
@@ -114,6 +114,7 @@ const current = ref<AnnexFilesOptions>({} as AnnexFilesOptions);
 const dictLabel = ref<undefined | number>(undefined);
 const store = GlobalStore();
 const isOpen = ref(false);
+const props = defineProps(["reportPersonList"]);
 const emit = defineEmits<{
 	(e: "next", data: OverviewForm, isTemporary: any): void;
 	(e: "prev", data: void): void;
@@ -125,36 +126,7 @@ type ElDatePickerType = typeof ElDatePicker;
 const fourStartTimeRef = ref<ElDatePickerType>(),
 	fourEndTime = ref<ElDatePickerType>();
 
-const reportPerson = ref<any>([
+const reportPerson = ref<any>([]);
-	{
-		name: "曹晓童",
-		value: "曹晓童"
-	},
-	{
-		name: "黄浩正",
-		value: "黄浩正"
-	},
-	{
-		name: "黄培峰",
-		value: "黄培峰"
-	},
-	{
-		name: "李燕",
-		value: "李燕"
-	},
-	{
-		name: "周韵",
-		value: "周韵"
-	},
-	{
-		name: "牟红洁",
-		value: "牟红洁"
-	},
-	{
-		name: "杨润韬",
-		value: "杨润韬"
-	}
-]);
 const engineeringState = ref<any>([
 	{
 		name: "未开始",
@@ -245,7 +217,14 @@ const next = async (formEl: FormInstance | undefined, isTemporary?: any) => {
 const prev = async () => {
 	emit("prev");
 };
+watch(
+	() => props.reportPersonList,
+	(n, o) => {
+		reportPerson.value = n;
+	}
+);
 onMounted(async () => {
+	reportPerson.value = props.reportPersonList;
 	ruleFormRef.value?.clearValidate();
 	if (store.Message) {
 		for (let i in form.value) {

src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview5.vue

@@ -114,7 +114,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, onMounted, onUnmounted, onActivated, onDeactivated } from "vue";
+import { ref, onMounted, onUnmounted, watch } from "vue";
 import { form, reset, rules } from "./overview5";
 import { getDicList } from "@/api/modules/jxjview";
 import { getEngineeringName } from "@/api/modules/project";
@@ -141,6 +141,7 @@ const current = ref<AnnexFilesOptions>({} as AnnexFilesOptions);
 const dictLabel = ref<undefined | number>(undefined);
 const store = GlobalStore();
 const isOpen = ref(false);
+const props = defineProps(["reportPersonList"]);
 const emit = defineEmits<{
 	(e: "next", data: OverviewForm, isTemporary: any): void;
 	(e: "prev", data: void): void;
@@ -153,36 +154,7 @@ const fiveReplyTimeRef = ref<ElDatePickerType>(),
 	fiveStartTimeRef = ref<ElDatePickerType>(),
 	fiveEndTimeRef = ref<ElDatePickerType>();
 
-const reportPerson = ref<any>([
+const reportPerson = ref<any>([]);
-	{
-		name: "曹晓童",
-		value: "曹晓童"
-	},
-	{
-		name: "黄浩正",
-		value: "黄浩正"
-	},
-	{
-		name: "黄培峰",
-		value: "黄培峰"
-	},
-	{
-		name: "李燕",
-		value: "李燕"
-	},
-	{
-		name: "周韵",
-		value: "周韵"
-	},
-	{
-		name: "牟红洁",
-		value: "牟红洁"
-	},
-	{
-		name: "杨润韬",
-		value: "杨润韬"
-	}
-]);
 const engineeringState = ref<any>([
 	{
 		name: "未开始",
@@ -273,7 +245,14 @@ const next = async (formEl: FormInstance | undefined, isTemporary?: any) => {
 const prev = async () => {
 	emit("prev");
 };
+watch(
+	() => props.reportPersonList,
+	(n, o) => {
+		reportPerson.value = n;
+	}
+);
 onMounted(async () => {
+	reportPerson.value = props.reportPersonList;
 	ruleFormRef.value?.clearValidate();
 	if (store.Message) {
 		for (let i in form.value) {

src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview6.vue

@@ -111,7 +111,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, onMounted, onUnmounted, onActivated, onDeactivated } from "vue";
+import { ref, onMounted, onUnmounted, watch } from "vue";
 import { form, reset, rules } from "./overview6";
 import { getDicList } from "@/api/modules/jxjview";
 import { getEngineeringName } from "@/api/modules/project";
@@ -138,6 +138,7 @@ const current = ref<AnnexFilesOptions>({} as AnnexFilesOptions);
 const dictLabel = ref<undefined | number>(undefined);
 const store = GlobalStore();
 const isOpen = ref(false);
+const props = defineProps(["reportPersonList"]);
 const emit = defineEmits<{
 	(e: "next", data: OverviewForm, isTemporary: any): void;
 	(e: "prev", data: void): void;
@@ -150,36 +151,7 @@ const sixReplyTimeRef = ref<ElDatePickerType>(),
 	sixStartTimeRef = ref<ElDatePickerType>(),
 	sixEndTimeRef = ref<ElDatePickerType>();
 
-const reportPerson = ref<any>([
+const reportPerson = ref<any>([]);
-	{
-		name: "曹晓童",
-		value: "曹晓童"
-	},
-	{
-		name: "黄浩正",
-		value: "黄浩正"
-	},
-	{
-		name: "黄培峰",
-		value: "黄培峰"
-	},
-	{
-		name: "李燕",
-		value: "李燕"
-	},
-	{
-		name: "周韵",
-		value: "周韵"
-	},
-	{
-		name: "牟红洁",
-		value: "牟红洁"
-	},
-	{
-		name: "杨润韬",
-		value: "杨润韬"
-	}
-]);
 const engineeringState = ref<any>([
 	{
 		name: "未开始",
@@ -270,7 +242,14 @@ const next = async (formEl: FormInstance | undefined, isTemporary?: any) => {
 const prev = async () => {
 	emit("prev");
 };
+watch(
+	() => props.reportPersonList,
+	(n, o) => {
+		reportPerson.value = n;
+	}
+);
 onMounted(async () => {
+	reportPerson.value = props.reportPersonList;
 	ruleFormRef.value?.clearValidate();
 	if (store.Message) {
 		for (let i in form.value) {

src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview7.vue

@@ -95,7 +95,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, onMounted, onUnmounted, onActivated, onDeactivated } from "vue";
+import { ref, onMounted, onUnmounted, watch } from "vue";
 import { form, reset, rules } from "./overview7";
 import { getDicList } from "@/api/modules/jxjview";
 import { getEngineeringName } from "@/api/modules/project";
@@ -122,6 +122,7 @@ const current = ref<AnnexFilesOptions>({} as AnnexFilesOptions);
 const dictLabel = ref<undefined | number>(undefined);
 const store = GlobalStore();
 const isOpen = ref(false);
+const props = defineProps(["reportPersonList"]);
 const emit = defineEmits<{
 	(e: "next", data: OverviewForm, isTemporary: any): void;
 	(e: "prev", data: void): void;
@@ -134,36 +135,7 @@ const licenseCreateTimeRef = ref<ElDatePickerType>(),
 	startTimeRef = ref<ElDatePickerType>(),
 	endTimeRef = ref<ElDatePickerType>();
 
-const reportPerson = ref<any>([
+const reportPerson = ref<any>([]);
-	{
-		name: "曹晓童",
-		value: "曹晓童"
-	},
-	{
-		name: "黄浩正",
-		value: "黄浩正"
-	},
-	{
-		name: "黄培峰",
-		value: "黄培峰"
-	},
-	{
-		name: "李燕",
-		value: "李燕"
-	},
-	{
-		name: "周韵",
-		value: "周韵"
-	},
-	{
-		name: "牟红洁",
-		value: "牟红洁"
-	},
-	{
-		name: "杨润韬",
-		value: "杨润韬"
-	}
-]);
 const engineeringState = ref<any>([
 	{
 		name: "未开始",
@@ -254,7 +226,14 @@ const next = async (formEl: FormInstance | undefined, isTemporary?: any) => {
 const prev = async () => {
 	emit("prev");
 };
+watch(
+	() => props.reportPersonList,
+	(n, o) => {
+		reportPerson.value = n;
+	}
+);
 onMounted(async () => {
+	reportPerson.value = props.reportPersonList;
 	ruleFormRef.value?.clearValidate();
 	if (store.Message) {
 		for (let i in form.value) {

src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview8.vue

@@ -251,7 +251,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, onMounted, onUnmounted, onActivated, onDeactivated } from "vue";
+import { ref, onMounted, onUnmounted, watch } from "vue";
 import { form, reset, rules } from "./overview8";
 import { getDicList } from "@/api/modules/jxjview";
 import { getEngineeringName } from "@/api/modules/project";
@@ -278,6 +278,7 @@ const current = ref<AnnexFilesOptions>({} as AnnexFilesOptions);
 const dictLabel = ref<undefined | number>(undefined);
 const store = GlobalStore();
 const isOpen = ref(false);
+const props = defineProps(["reportPersonList"]);
 const emit = defineEmits<{
 	(e: "next", data: OverviewForm, isTemporary: any): void;
 	(e: "prev", data: void): void;
@@ -295,36 +296,7 @@ const eightTimeRef = ref<ElDatePickerType>(),
 	tenStartTimeRef = ref<ElDatePickerType>(),
 	tenEndTimeRef = ref<ElDatePickerType>();
 
-const reportPerson = ref<any>([
+const reportPerson = ref<any>([]);
-	{
-		name: "曹晓童",
-		value: "曹晓童"
-	},
-	{
-		name: "黄浩正",
-		value: "黄浩正"
-	},
-	{
-		name: "黄培峰",
-		value: "黄培峰"
-	},
-	{
-		name: "李燕",
-		value: "李燕"
-	},
-	{
-		name: "周韵",
-		value: "周韵"
-	},
-	{
-		name: "牟红洁",
-		value: "牟红洁"
-	},
-	{
-		name: "杨润韬",
-		value: "杨润韬"
-	}
-]);
 const engineeringState = ref<any>([
 	{
 		name: "未开始",
@@ -537,7 +509,14 @@ const handleSubmit = async (formEl: FormInstance | undefined, isTemporary?: any)
 const prev = async () => {
 	emit("prev");
 };
+watch(
+	() => props.reportPersonList,
+	(n, o) => {
+		reportPerson.value = n;
+	}
+);
 onMounted(async () => {
+	reportPerson.value = props.reportPersonList;
 	ruleFormRef.value?.clearValidate();
 	if (store.Message) {
 		for (let i in form.value) {