diff --git a/src/views/goverment/huizhou/assessmentManagement/unitList/components/addCompany.vue b/src/views/goverment/huizhou/assessmentManagement/unitList/components/addCompany.vue index b941895..3daad92 100644 --- a/src/views/goverment/huizhou/assessmentManagement/unitList/components/addCompany.vue +++ b/src/views/goverment/huizhou/assessmentManagement/unitList/components/addCompany.vue @@ -405,9 +405,9 @@ const rules = ref({ } ] }); -const confirmSubmit = async (ruleFormRef: FormInstance | undefined) => { +const confirmSubmit = (ruleFormRef: FormInstance | undefined) => { if (!ruleFormRef) return; - await ruleFormRef.validate((valid, fields) => { + ruleFormRef.validate(async (valid, fields) => { if (valid) { ruleForm.value.enterpriseMains = [ { @@ -417,9 +417,12 @@ const confirmSubmit = async (ruleFormRef: FormInstance | undefined) => { } ]; ruleForm.value.state = 1; - const res = addCompany(ruleForm.value); - ElMessage.success("操作成功"); - visible1.value = false; + const res = await addCompany(ruleForm.value); + console.log(res); + if (res.success) { + ElMessage.success("操作成功"); + visible1.value = false; + } } else { ElMessage({ showClose: true, diff --git a/src/views/goverment/huizhou/assessmentManagement/unitList/components/scoreTable.vue b/src/views/goverment/huizhou/assessmentManagement/unitList/components/scoreTable.vue index e568bd4..a73e484 100644 --- a/src/views/goverment/huizhou/assessmentManagement/unitList/components/scoreTable.vue +++ b/src/views/goverment/huizhou/assessmentManagement/unitList/components/scoreTable.vue @@ -132,12 +132,10 @@ const confirmAddType = async (form: any) => { for (let i in recordData.value) { recordData.value[i].map(item => { item.scoreId = props.relativeInfo.id; + delete item.id; arr.push(item); }); } - let requestData = { - enterpriseScoreDetails: arr - }; const res = await addScoreDetail(arr); ElMessage.success("操作成功"); visible1.value = false; diff --git a/src/views/goverment/huizhou/progressManagement/GanttchartChart/index.vue b/src/views/goverment/huizhou/progressManagement/GanttchartChart/index.vue index 45c5e9d..23696e2 100644 --- a/src/views/goverment/huizhou/progressManagement/GanttchartChart/index.vue +++ b/src/views/goverment/huizhou/progressManagement/GanttchartChart/index.vue @@ -135,14 +135,15 @@ import LeftMenu from "@/components/LeftMenu/LeftMenu.vue"; import { getDustprojectPage, getDustengineeringPage, getAIQuestionPage } from "@/api/modules/goverment"; const refChart = ref(); const headerList = reactive([ - { label: "未开始", color: "#35e5fd" }, - { label: "进行中", color: "#f1d520" }, - { label: "已完成", color: "#4fd389" }, - { label: "逾期未开始", color: "#F80840" }, - { label: "逾期进行中", color: "#fc6f8e" }, - { label: "逾期已完成", color: "#C13F5B" } + { label: "未开始", color: "#D0A530" }, + { label: "推进中", color: "#35e5fd" }, + { label: "按期完成", color: "#f1d520" }, + { label: "临期", color: "#4fd389" }, + { label: "超期", color: "#F80840" }, + { label: "逾期完成", color: "#fc6f8e" }, + { label: "暂停状态", color: "#C13F5B" } ]); -const colors = ref(["#35e5fd", "#f1d520", "#4fd389", "#F80840", "#fc6f8e", "#C13F5B"]); +const colors = ref(["#D0A530", "#35e5fd", "#f1d520", "#4fd389", "#F80840", "#fc6f8e", "#C13F5B"]); const active = ref(0); const records = ref([]); const projects = ref([]); @@ -643,15 +644,16 @@ watch( .header { display: flex; justify-content: space-between; + flex-wrap: wrap; + align-items: center; width: 100%; - height: 60px; .left-content { display: flex; - width: 80%; height: 100%; .item { + width: max-content; display: flex; align-items: center; // width: calc(100% / 4); diff --git a/src/views/goverment/huizhou/progressManagement/divisionsAndISubItems/index.vue b/src/views/goverment/huizhou/progressManagement/divisionsAndISubItems/index.vue index 2bfbea4..ca1ccc6 100644 --- a/src/views/goverment/huizhou/progressManagement/divisionsAndISubItems/index.vue +++ b/src/views/goverment/huizhou/progressManagement/divisionsAndISubItems/index.vue @@ -72,15 +72,17 @@ scope.row.state == 1 ? "未开始" : scope.row.state == 2 - ? "进行中" + ? "推进中" : scope.row.state == 3 - ? "已完成" + ? "按期完成" : scope.row.state == 4 - ? "逾期未开始" + ? "临期" : scope.row.state == 5 - ? "逾期进行中" + ? "超期" : scope.row.state == 6 - ? "逾期已完成" + ? "逾期完成" + : scope.row.state == 7 + ? "暂停" : "" }} @@ -242,11 +244,12 @@ import { getRealTimePage } from "@/api/modules/project"; import { bigItemGovermentList } from "@/api/modules/huizhou"; const statusList = ref([ { label: "未开始", value: 1 }, - { label: "进行中", value: 2 }, - { label: "已完成", value: 3 }, - { label: "逾期未开始", value: 4 }, - { label: "逾期进行中", value: 5 }, - { label: "逾期已完成", value: 6 } + { label: "推进中", value: 2 }, + { label: "按期完成", value: 3 }, + { label: "临期", value: 4 }, + { label: "超期", value: 5 }, + { label: "逾期完成", value: 6 }, + { label: "暂停", value: 7 } ]); const tableData = ref([]); const pages = ref({ diff --git a/src/views/goverment/huizhou/projectMonitoring/progressManagement/index.vue b/src/views/goverment/huizhou/projectMonitoring/progressManagement/index.vue index fad90bf..084363b 100644 --- a/src/views/goverment/huizhou/projectMonitoring/progressManagement/index.vue +++ b/src/views/goverment/huizhou/projectMonitoring/progressManagement/index.vue @@ -51,15 +51,17 @@ row.state == 1 ? "未开始" : row.state == 2 - ? "进行中" + ? "推进中" : row.state == 3 - ? "已完成" + ? "按期完成" : row.state == 4 - ? "逾期未开始" + ? "临期" : row.state == 5 - ? "逾期进行中" + ? "超期" : row.state == 6 - ? "逾期已完成" + ? "逾期完成" + : row.state == 7 + ? "暂停" : "" }} @@ -170,11 +172,12 @@ const columns: ColumnProps[] = [ search: { el: "select" }, enum: [ { label: "未开始", value: 1 }, - { label: "进行中", value: 2 }, - { label: "已完成", value: 3 }, - { label: "逾期未开始", value: 4 }, - { label: "逾期进行中", value: 5 }, - { label: "逾期已完成", value: 6 } + { label: "推进中", value: 2 }, + { label: "按期完成", value: 3 }, + { label: "临期", value: 4 }, + { label: "超期", value: 5 }, + { label: "逾期完成", value: 6 }, + { label: "暂停", value: 7 } ] }, { prop: "operation", label: "操作", fixed: "right", width: 120 } diff --git a/src/views/goverment/huizhou/projectMonitoring/projectApproval/components/ProjectSupervision/dutyForm.scss b/src/views/goverment/huizhou/projectMonitoring/projectApproval/components/ProjectSupervision/dutyForm.scss index 9e94f9a..140f339 100644 --- a/src/views/goverment/huizhou/projectMonitoring/projectApproval/components/ProjectSupervision/dutyForm.scss +++ b/src/views/goverment/huizhou/projectMonitoring/projectApproval/components/ProjectSupervision/dutyForm.scss @@ -33,6 +33,16 @@ width: stretch; } } + +.selectAdd { + display: flex; + align-items: center; + :deep() { + .el-icon { + margin-right: 2px; + } + } +} :deep(.el-input-number) { width: 100%; .el-input-number__increase { diff --git a/src/views/goverment/huizhou/projectMonitoring/projectApproval/components/ProjectSupervision/dutyForm.vue b/src/views/goverment/huizhou/projectMonitoring/projectApproval/components/ProjectSupervision/dutyForm.vue index d641f12..dda0afe 100644 --- a/src/views/goverment/huizhou/projectMonitoring/projectApproval/components/ProjectSupervision/dutyForm.vue +++ b/src/views/goverment/huizhou/projectMonitoring/projectApproval/components/ProjectSupervision/dutyForm.vue @@ -5,6 +5,12 @@ + @@ -91,13 +98,15 @@ import { getDicList } from "@/api/modules/jxjview"; import type { FormRules } from "element-plus"; import type { EngineeringMainPerson } from "@/api/types"; import type { EngineeringMainList } from "./duty"; +import addCompany from "../../../../assessmentManagement/unitList/components/addCompany.vue"; export interface formConfig { formData: EngineeringMainList[number]; rules: FormRules; datas: EngineeringMainList[number]; } - +const openAddCompany = ref(false); +const companyType = ref({ dictLabel: 1 }); const props = defineProps<{ formConfig: formConfig; }>(); @@ -110,12 +119,16 @@ const nameOptions = ref([{ enterpriseSn: "", enterpriseName: "", creditCode: "", watch( () => formData.value.type, - async (n, o) => { - const data = await queryMainType({ mainType: formData.value.type }); - nameOptions.value = data.result; + (n, o) => { + getMainData(); } ); - +const allConfirm = () => { + getMainData(); +}; +const openAddDialog = () => { + openAddCompany.value = true; +}; const onChange = option => { const value = nameOptions.value.find(item => item.enterpriseSn == option); if (!value) return; @@ -140,7 +153,10 @@ const removeEngineeringMainPerson = (row: EngineeringMainPerson) => { // index && index >= 0 && formData.value.engineeringMainPersonList?.splice(index, 1); !index >= 0 && formData.value.engineeringMainPersonList?.splice(index, 1); }; - +const getMainData = async () => { + const data = await queryMainType({ mainType: formData.value.type }); + nameOptions.value = data.result; +}; onMounted(async () => { const res = await getDicList({ dictType: "engineering_post" }); jobOptions.value = res.result; diff --git a/src/views/goverment/huizhou/projectMonitoring/projectApproval/components/ProjectSupervision/overview.ts b/src/views/goverment/huizhou/projectMonitoring/projectApproval/components/ProjectSupervision/overview.ts index ba94e45..737e702 100644 --- a/src/views/goverment/huizhou/projectMonitoring/projectApproval/components/ProjectSupervision/overview.ts +++ b/src/views/goverment/huizhou/projectMonitoring/projectApproval/components/ProjectSupervision/overview.ts @@ -97,37 +97,37 @@ export const rules = ref({ engineeringName: { type: "string", required: true, - message: "请输入工程名称" + message: "请输入项目名称" }, engineeringCode: { type: "string", required: true, - message: "请输入工程编码" + message: "请输入项目编码" }, engineeringType: { type: "number", required: true, - message: "请输入工程类别" + message: "请输入项目类别" }, engineeringUse: { type: "number", required: true, - message: "请选择工程用途" + message: "请选择项目用途" }, engineeringCost: { type: "string", required: true, - message: "请输入工程造价" + message: "请输入项目造价" }, engineeringArea: { type: "string", required: true, - message: "请输入工程总面积" + message: "请输入项目总面积" }, engineeringLength: { type: "string", required: true, - message: "请输入工程总长度(m)" + message: "请输入项目总长度(m)" }, isImportant: { type: "number", @@ -137,7 +137,7 @@ export const rules = ref({ position: { type: "string", required: true, - message: "请选择工程位置" + message: "请选择项目位置" }, // district: { // type: "string", @@ -199,12 +199,12 @@ export const rules = ref({ safetySupervisionState: { type: "string", required: true, - message: "请输入安全监督工程状态" + message: "请输入安全监督项目状态" }, qualitySupervisionState: { type: "string", required: true, - message: "请输入质量监督工程状态" + message: "请输入质量监督项目状态" }, safetySupervisionPlan: { type: "string", diff --git a/src/views/goverment/huizhou/projectMonitoring/projectApproval/components/ProjectSupervision/overview.vue b/src/views/goverment/huizhou/projectMonitoring/projectApproval/components/ProjectSupervision/overview.vue index 17acb3d..e63f95b 100644 --- a/src/views/goverment/huizhou/projectMonitoring/projectApproval/components/ProjectSupervision/overview.vue +++ b/src/views/goverment/huizhou/projectMonitoring/projectApproval/components/ProjectSupervision/overview.vue @@ -5,14 +5,14 @@ - +
- + - +
- + - +
- + - +
- + - + @@ -114,7 +114,7 @@
- + - +
@@ -178,7 +178,7 @@
-

单体工程

+

单体项目

- + @@ -199,7 +199,7 @@ - + @@ -343,7 +343,7 @@ onMounted(async () => { // form.value.projectName = res2.result.projectName; //获取项目名称 const data = await getDicList({ dictType: "engineering_type" }); engineeringTypeOptions.value = data.result; - const res = await getDicList({ dictType: "engineering_purpose" }); //工程用途 + const res = await getDicList({ dictType: "engineering_purpose" }); //项目用途 engineeringPurpose.value = res.result; const res1 = await getDicList({ dictType: "structural_style" }); structuralStyle.value = res1.result; diff --git a/src/views/goverment/huizhou/projectMonitoring/projectApproval/components/readonlyDialog/index.vue b/src/views/goverment/huizhou/projectMonitoring/projectApproval/components/readonlyDialog/index.vue index a8a1206..3af5984 100644 --- a/src/views/goverment/huizhou/projectMonitoring/projectApproval/components/readonlyDialog/index.vue +++ b/src/views/goverment/huizhou/projectMonitoring/projectApproval/components/readonlyDialog/index.vue @@ -1,49 +1,49 @@ @@ -110,11 +112,12 @@ const columns: ColumnProps[] = [ search: { el: "select" }, enum: [ { label: "未开始", value: 1 }, - { label: "进行中", value: 2 }, - { label: "已完成", value: 3 }, - { label: "逾期未开始", value: 4 }, - { label: "逾期进行中", value: 5 }, - { label: "逾期已完成", value: 6 } + { label: "推进中", value: 2 }, + { label: "按期完成", value: 3 }, + { label: "临期", value: 4 }, + { label: "超期", value: 5 }, + { label: "逾期完成", value: 6 }, + { label: "暂停", value: 7 } ] }, { prop: "operation", label: "操作", fixed: "right", width: 100 }