diff --git a/.env.development b/.env.development
index a8a9f1c..ce4ccb5 100644
--- a/.env.development
+++ b/.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='
diff --git a/src/stores/interface/index.ts b/src/stores/interface/index.ts
index 9a74561..6cb17af 100644
--- a/src/stores/interface/index.ts
+++ b/src/stores/interface/index.ts
@@ -1,69 +1,70 @@
-/* GlobalState */
-export interface GlobalState {
- Message: Object | null;
- token: string | null;
- userInfo: any | null;
- accountType: number | undefined;
- enterpriseType: number[];
- moduleId: string | null;
- menuName: string | null;
- account: string | null;
- assemblySize: AssemblySizeType | "";
- language: string | null;
- themeConfig: ThemeConfigProps;
- projectDateAuth: number | null; // 0必选校验 1去除校验
- moduleName: string | null; // 点击首页页面存的标题
- editPassword: boolean | null;
- openDropdown: boolean | null;
- path: string | null;
- isManager: string | null;
- leftMenuIndex: number;
-}
-
-/* themeConfigProp */
-export interface ThemeConfigProps {
- maximize: boolean;
- layout: LayoutType;
- primary: string;
- isDark: boolean;
- isGrey: boolean;
- isCollapse: boolean;
- isWeak: boolean;
- breadcrumb: boolean;
- breadcrumbIcon: boolean;
- tabs: boolean;
- tabsIcon: boolean;
- footer: boolean;
-}
-
-export type AssemblySizeType = "default" | "small" | "large";
-
-export type LayoutType = "vertical" | "classic" | "transverse" | "columns";
-
-/* tabsMenuProps */
-export interface TabsMenuProps {
- icon: string;
- title: string;
- path: string;
- name: string;
- close: boolean;
-}
-
-/* TabsState */
-export interface TabsState {
- tabsMenuList: TabsMenuProps[];
-}
-
-/* AuthState */
-export interface AuthState {
- routeName: string;
- authButtonList: {
- [key: string]: string[];
- };
- authMenuList: Menu.MenuOptions[];
-}
-
-/* keepAliveState */
-export interface keepAliveState {
- keepAliveName: string[];
-}
+/* GlobalState */
+export interface GlobalState {
+ Message: Object | null;
+ isDraft: Boolean | false;
+ token: string | null;
+ userInfo: any | null;
+ accountType: number | undefined;
+ enterpriseType: number[];
+ moduleId: string | null;
+ menuName: string | null;
+ account: string | null;
+ assemblySize: AssemblySizeType | "";
+ language: string | null;
+ themeConfig: ThemeConfigProps;
+ projectDateAuth: number | null; // 0必选校验 1去除校验
+ moduleName: string | null; // 点击首页页面存的标题
+ editPassword: boolean | null;
+ openDropdown: boolean | null;
+ path: string | null;
+ isManager: string | null;
+ leftMenuIndex: number;
+}
+
+/* themeConfigProp */
+export interface ThemeConfigProps {
+ maximize: boolean;
+ layout: LayoutType;
+ primary: string;
+ isDark: boolean;
+ isGrey: boolean;
+ isCollapse: boolean;
+ isWeak: boolean;
+ breadcrumb: boolean;
+ breadcrumbIcon: boolean;
+ tabs: boolean;
+ tabsIcon: boolean;
+ footer: boolean;
+}
+
+export type AssemblySizeType = "default" | "small" | "large";
+
+export type LayoutType = "vertical" | "classic" | "transverse" | "columns";
+
+/* tabsMenuProps */
+export interface TabsMenuProps {
+ icon: string;
+ title: string;
+ path: string;
+ name: string;
+ close: boolean;
+}
+
+/* TabsState */
+export interface TabsState {
+ tabsMenuList: TabsMenuProps[];
+}
+
+/* AuthState */
+export interface AuthState {
+ routeName: string;
+ authButtonList: {
+ [key: string]: string[];
+ };
+ authMenuList: Menu.MenuOptions[];
+}
+
+/* keepAliveState */
+export interface keepAliveState {
+ keepAliveName: string[];
+}
diff --git a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/index.vue b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/index.vue
index 3a3e4ae..85b3e05 100644
--- a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/index.vue
+++ b/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;
diff --git a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview.vue b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview.vue
index 1ad0481..933eb49 100644
--- a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview.vue
+++ b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview.vue
@@ -144,7 +144,7 @@
diff --git a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview2.vue b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview2.vue
index 28b5039..02cab1f 100644
--- a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview2.vue
+++ b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview2.vue
@@ -116,7 +116,7 @@
diff --git a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview3.vue b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview3.vue
index afcd17d..100e05f 100644
--- a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview3.vue
+++ b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview3.vue
@@ -154,7 +154,7 @@
diff --git a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview4.vue b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview4.vue
index 467d8cb..b233d4e 100644
--- a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview4.vue
+++ b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview4.vue
@@ -78,7 +78,7 @@
diff --git a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview5.vue b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview5.vue
index 3d1de03..bfe3e0e 100644
--- a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview5.vue
+++ b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview5.vue
@@ -105,7 +105,7 @@
diff --git a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview6.vue b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview6.vue
index c0f8696..8466741 100644
--- a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview6.vue
+++ b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview6.vue
@@ -102,7 +102,7 @@
diff --git a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview7.vue b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview7.vue
index 5a91223..f46891a 100644
--- a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview7.vue
+++ b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview7.vue
@@ -86,7 +86,7 @@
diff --git a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview8.vue b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview8.vue
index 5c104f6..7938867 100644
--- a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview8.vue
+++ b/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;
diff --git a/src/views/goverment/huizhou/preProjectManagement/index.vue b/src/views/goverment/huizhou/preProjectManagement/index.vue
index 3e4641e..3fac6dc 100644
--- a/src/views/goverment/huizhou/preProjectManagement/index.vue
+++ b/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;