fix: 惠州政务系统需求

.env.development

@@ -2,12 +2,12 @@
 NODE_ENV = 'development'
 
 # 本地环境接口地址(/api/index.ts文件中使用)
-# VITE_API_URL = 'http://192.168.34.155:6688'
+VITE_API_URL = 'http://192.168.34.155:6688'
 # VITE_API_URL = 'http://183.63.230.59:6090'
 # VITE_API_URL = 'http://2xliv7gs.shenzhuo.vip:55296'
 VITE_WPAPI_URL = "http://jxjzw.zhgdyun.com:8081"
 # VITE_API_URL = "http://jxjzw.zhgdyun.com:9013"
-VITE_API_URL = 'https://xmglcs.hyjgxt.cn:6090'
+# VITE_API_URL = 'https://xmglcs.hyjgxt.cn:6090'
 
 # 上传
 # VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url='

src/stores/interface/index.ts

@@ -1,69 +1,70 @@
-/* GlobalState */
+/* GlobalState */
-export interface GlobalState {
+export interface GlobalState {
-	Message: Object | null;
+	Message: Object | null;
-	token: string | null;
+	isDraft: Boolean | false;
-	userInfo: any | null;
+	token: string | null;
-	accountType: number | undefined;
+	userInfo: any | null;
-	enterpriseType: number[];
+	accountType: number | undefined;
-	moduleId: string | null;
+	enterpriseType: number[];
-	menuName: string | null;
+	moduleId: string | null;
-	account: string | null;
+	menuName: string | null;
-	assemblySize: AssemblySizeType | "";
+	account: string | null;
-	language: string | null;
+	assemblySize: AssemblySizeType | "";
-	themeConfig: ThemeConfigProps;
+	language: string | null;
-	projectDateAuth: number | null; // 0必选校验 1去除校验
+	themeConfig: ThemeConfigProps;
-	moduleName: string | null; // 点击首页页面存的标题
+	projectDateAuth: number | null; // 0必选校验 1去除校验
-	editPassword: boolean | null;
+	moduleName: string | null; // 点击首页页面存的标题
-	openDropdown: boolean | null;
+	editPassword: boolean | null;
-	path: string | null;
+	openDropdown: boolean | null;
-	isManager: string | null;
+	path: string | null;
-	leftMenuIndex: number;
+	isManager: string | null;
-}
+	leftMenuIndex: number;
-
+}
-/* themeConfigProp */
+
-export interface ThemeConfigProps {
+/* themeConfigProp */
-	maximize: boolean;
+export interface ThemeConfigProps {
-	layout: LayoutType;
+	maximize: boolean;
-	primary: string;
+	layout: LayoutType;
-	isDark: boolean;
+	primary: string;
-	isGrey: boolean;
+	isDark: boolean;
-	isCollapse: boolean;
+	isGrey: boolean;
-	isWeak: boolean;
+	isCollapse: boolean;
-	breadcrumb: boolean;
+	isWeak: boolean;
-	breadcrumbIcon: boolean;
+	breadcrumb: boolean;
-	tabs: boolean;
+	breadcrumbIcon: boolean;
-	tabsIcon: boolean;
+	tabs: boolean;
-	footer: boolean;
+	tabsIcon: boolean;
-}
+	footer: boolean;
-
+}
-export type AssemblySizeType = "default" | "small" | "large";
+
-
+export type AssemblySizeType = "default" | "small" | "large";
-export type LayoutType = "vertical" | "classic" | "transverse" | "columns";
+
-
+export type LayoutType = "vertical" | "classic" | "transverse" | "columns";
-/* tabsMenuProps */
+
-export interface TabsMenuProps {
+/* tabsMenuProps */
-	icon: string;
+export interface TabsMenuProps {
-	title: string;
+	icon: string;
-	path: string;
+	title: string;
-	name: string;
+	path: string;
-	close: boolean;
+	name: string;
-}
+	close: boolean;
-
+}
-/* TabsState */
+
-export interface TabsState {
+/* TabsState */
-	tabsMenuList: TabsMenuProps[];
+export interface TabsState {
-}
+	tabsMenuList: TabsMenuProps[];
-
+}
-/* AuthState */
+
-export interface AuthState {
+/* AuthState */
-	routeName: string;
+export interface AuthState {
-	authButtonList: {
+	routeName: string;
-		[key: string]: string[];
+	authButtonList: {
-	};
+		[key: string]: string[];
-	authMenuList: Menu.MenuOptions[];
+	};
-}
+	authMenuList: Menu.MenuOptions[];
-
+}
-/* keepAliveState */
+
-export interface keepAliveState {
+/* keepAliveState */
-	keepAliveName: string[];
+export interface keepAliveState {
-}
+	keepAliveName: string[];
+}

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

@@ -93,6 +93,21 @@ const next = async (data: { [key: string]: OverviewForm }, isTemporary: any, isS
 	addRepostData.value.annexFiles = annexFileList.value.filter(v => !map.has(v.fileUrl) && map.set(v.fileUrl, v));
 	console.log(annexFileList.value, 111222);
 	console.log(addRepostData.value, 111222);
+	delete addRepostData.value.engineeringSingles;
+	console.info(isTemporary, "isTemporary");
+
+	addRepostData.value.engineeringStageEightList?.map(item => {
+		let eightAnnexFileList: AnnexFile[] = [];
+		item.engineeringSingles.forEach((data: any) => {
+			if (data.files.length) {
+				eightAnnexFileList.push(...data.files);
+			}
+		});
+		const map = new Map();
+		item.annexFiles = eightAnnexFileList.filter(v => !map.has(v.fileUrl) && map.set(v.fileUrl, v));
+		delete item.engineeringSingles;
+	});
+
 	if (isTemporary) {
 		await temporarySave();
 		return;

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

@@ -144,7 +144,7 @@
 			<FileUpload v-model="showFilesUpload" @update:files="handlechange" :files="current.files" :reset="true" />
 		</div>
 		<footer class="footer">
-			<el-button type="primary" @click="next(ruleFormRef, !store.Message ? true : false, true)">保存</el-button>
+			<el-button type="primary" @click="next(ruleFormRef, store.isDraft ? true : false, true)">保存</el-button>
 			<el-button type="primary" @click="next(ruleFormRef)">下一步</el-button>
 		</footer>
 	</div>

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

@@ -116,7 +116,7 @@
 			<FileUpload v-model="showFilesUpload" @update:files="handlechange" :files="current.files" :reset="true" />
 		</div>
 		<footer class="footer">
-			<el-button type="primary" @click="next(ruleFormRef, !store.Message ? true : false, true)">保存</el-button>
+			<el-button type="primary" @click="next(ruleFormRef, store.isDraft ? true : false, true)">保存</el-button>
 			<el-button type="primary" @click="prev">上一步</el-button>
 			<el-button type="primary" @click="next(ruleFormRef)">下一步</el-button>
 		</footer>

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

@@ -154,7 +154,7 @@
 			<FileUpload v-model="showFilesUpload" @update:files="handlechange" :files="current.files" :reset="true" />
 		</div>
 		<footer class="footer">
-			<el-button type="primary" @click="next(ruleFormRef, !store.Message ? true : false, true)">保存</el-button>
+			<el-button type="primary" @click="next(ruleFormRef, store.isDraft ? true : false, true)">保存</el-button>
 			<el-button type="primary" @click="prev">上一步</el-button>
 			<el-button type="primary" @click="next(ruleFormRef)">下一步</el-button>
 		</footer>

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

@@ -78,7 +78,7 @@
 			<FileUpload v-model="showFilesUpload" @update:files="handlechange" :files="current.files" :reset="true" />
 		</div>
 		<footer class="footer">
-			<el-button type="primary" @click="next(ruleFormRef, !store.Message ? true : false, true)">保存</el-button>
+			<el-button type="primary" @click="next(ruleFormRef, store.isDraft ? true : false, true)">保存</el-button>
 			<el-button type="primary" @click="prev">上一步</el-button>
 			<el-button type="primary" @click="next(ruleFormRef)">下一步</el-button>
 		</footer>

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

@@ -105,7 +105,7 @@
 			<FileUpload v-model="showFilesUpload" @update:files="handlechange" :files="current.files" :reset="true" />
 		</div>
 		<footer class="footer">
-			<el-button type="primary" @click="next(ruleFormRef, !store.Message ? true : false, true)">保存</el-button>
+			<el-button type="primary" @click="next(ruleFormRef, store.isDraft ? true : false, true)">保存</el-button>
 			<el-button type="primary" @click="prev">上一步</el-button>
 			<el-button type="primary" @click="next(ruleFormRef)">下一步</el-button>
 		</footer>

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

@@ -102,7 +102,7 @@
 			<FileUpload v-model="showFilesUpload" @update:files="handlechange" :files="current.files" :reset="true" />
 		</div>
 		<footer class="footer">
-			<el-button type="primary" @click="next(ruleFormRef, !store.Message ? true : false, true)">保存</el-button>
+			<el-button type="primary" @click="next(ruleFormRef, store.isDraft ? true : false, true)">保存</el-button>
 			<el-button type="primary" @click="prev">上一步</el-button>
 			<el-button type="primary" @click="next(ruleFormRef)">下一步</el-button>
 		</footer>

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

@@ -86,7 +86,7 @@
 			<FileUpload v-model="showFilesUpload" @update:files="handlechange" :files="current.files" :reset="true" />
 		</div>
 		<footer class="footer">
-			<el-button type="primary" @click="next(ruleFormRef, !store.Message ? true : false, true)">保存</el-button>
+			<el-button type="primary" @click="next(ruleFormRef, store.isDraft ? true : false, true)">保存</el-button>
 			<el-button type="primary" @click="prev">上一步</el-button>
 			<el-button type="primary" @click="next(ruleFormRef)">下一步</el-button>
 		</footer>

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

@@ -632,7 +632,7 @@ onMounted(async () => {
 								name: curr.fileName,
 								size: +curr.fileSize,
 								type: "image/png",
-								response: { ...curr }
+								response: { ...curr, contentType: "image/png" }
 							});
 						});
 						j.files = files;

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

@@ -243,6 +243,7 @@ const confirmReform = () => {
 // 新增项目
 const handleAddItem = async () => {
 	store.Message = null;
+	store.isDraft = true;
 	const res: any = await getQueryUnSubmitApi({});
 	console.info(res, "----res---");
 	if (res.result) {
@@ -255,6 +256,7 @@ const handleAddItem = async () => {
 const onEdit = async (row: any) => {
 	const res: any = await getPreIdEngApproveList({ id: row.id });
 	store.Message = res.result;
+	store.isDraft = false;
 	approvalTitle.value = "编辑";
 	detailsDialog.value = true;
 	// relativeId.value = row.id;