Merge remote-tracking branch 'origin/develop' into develop

internal/eslint-config/dist/index.cjs

-module.exports = require("D:/work/web-progeam/node_modules/.pnpm/jiti@1.21.0/node_modules/jiti/lib/index.js")(null, {
+module.exports = require("/Users/yanjiaxu/紫光云/web-progeam/node_modules/.pnpm/jiti@1.21.0/node_modules/jiti/lib/index.js")(null, {
   "esmResolve": true,
   "interopDefault": true,
   "alias": {
-    "@vben/eslint-config": "D:/work/web-progeam/internal/eslint-config"
+    "@vben/eslint-config": "/Users/yanjiaxu/紫光云/web-progeam/internal/eslint-config"
   }
-})("D:/work/web-progeam/internal/eslint-config/src/index.ts")
+})("/Users/yanjiaxu/紫光云/web-progeam/internal/eslint-config/src/index.ts")
\ No newline at end of file

internal/eslint-config/dist/index.d.ts

-export * from "D:/work/web-progeam/internal/eslint-config/src/index";
-export { default } from "D:/work/web-progeam/internal/eslint-config/src/index";
+export * from "/Users/yanjiaxu/紫光云/web-progeam/internal/eslint-config/src/index";
+export { default } from "/Users/yanjiaxu/紫光云/web-progeam/internal/eslint-config/src/index";
\ No newline at end of file

internal/eslint-config/dist/index.mjs

-import jiti from "file:///D:/work/web-progeam/node_modules/.pnpm/jiti@1.21.0/node_modules/jiti/lib/index.js";
+import jiti from "file:///Users/yanjiaxu/%E7%B4%AB%E5%85%89%E4%BA%91/web-progeam/node_modules/.pnpm/jiti@1.21.0/node_modules/jiti/lib/index.js";
 
-/** @type {import("D:/work/web-progeam/internal/eslint-config/src/index")} */
+/** @type {import("/Users/yanjiaxu/紫光云/web-progeam/internal/eslint-config/src/index")} */
 const _module = jiti(null, {
   "esmResolve": true,
   "interopDefault": true,
   "alias": {
-    "@vben/eslint-config": "D:/work/web-progeam/internal/eslint-config"
+    "@vben/eslint-config": "/Users/yanjiaxu/紫光云/web-progeam/internal/eslint-config"
   }
-})("D:/work/web-progeam/internal/eslint-config/src/index.ts");
+})("/Users/yanjiaxu/紫光云/web-progeam/internal/eslint-config/src/index.ts");
 
 export default _module;
\ No newline at end of file

internal/eslint-config/dist/strict.cjs

-module.exports = require("D:/work/web-progeam/node_modules/.pnpm/jiti@1.21.0/node_modules/jiti/lib/index.js")(null, {
+module.exports = require("/Users/yanjiaxu/紫光云/web-progeam/node_modules/.pnpm/jiti@1.21.0/node_modules/jiti/lib/index.js")(null, {
   "esmResolve": true,
   "interopDefault": true,
   "alias": {
-    "@vben/eslint-config": "D:/work/web-progeam/internal/eslint-config"
+    "@vben/eslint-config": "/Users/yanjiaxu/紫光云/web-progeam/internal/eslint-config"
   }
-})("D:/work/web-progeam/internal/eslint-config/src/strict.ts")
+})("/Users/yanjiaxu/紫光云/web-progeam/internal/eslint-config/src/strict.ts")
\ No newline at end of file

internal/eslint-config/dist/strict.d.ts

-export * from "D:/work/web-progeam/internal/eslint-config/src/strict";
-export { default } from "D:/work/web-progeam/internal/eslint-config/src/strict";
+export * from "/Users/yanjiaxu/紫光云/web-progeam/internal/eslint-config/src/strict";
+export { default } from "/Users/yanjiaxu/紫光云/web-progeam/internal/eslint-config/src/strict";
\ No newline at end of file

internal/eslint-config/dist/strict.mjs

-import jiti from "file:///D:/work/web-progeam/node_modules/.pnpm/jiti@1.21.0/node_modules/jiti/lib/index.js";
+import jiti from "file:///Users/yanjiaxu/%E7%B4%AB%E5%85%89%E4%BA%91/web-progeam/node_modules/.pnpm/jiti@1.21.0/node_modules/jiti/lib/index.js";
 
-/** @type {import("D:/work/web-progeam/internal/eslint-config/src/strict")} */
+/** @type {import("/Users/yanjiaxu/紫光云/web-progeam/internal/eslint-config/src/strict")} */
 const _module = jiti(null, {
   "esmResolve": true,
   "interopDefault": true,
   "alias": {
-    "@vben/eslint-config": "D:/work/web-progeam/internal/eslint-config"
+    "@vben/eslint-config": "/Users/yanjiaxu/紫光云/web-progeam/internal/eslint-config"
   }
-})("D:/work/web-progeam/internal/eslint-config/src/strict.ts");
+})("/Users/yanjiaxu/紫光云/web-progeam/internal/eslint-config/src/strict.ts");
 
 export default _module;
\ No newline at end of file

internal/stylelint-config/dist/index.cjs

-module.exports = require("D:/work/web-progeam/node_modules/.pnpm/jiti@1.21.0/node_modules/jiti/lib/index.js")(null, {
+module.exports = require("/Users/yanjiaxu/紫光云/web-progeam/node_modules/.pnpm/jiti@1.21.0/node_modules/jiti/lib/index.js")(null, {
   "esmResolve": true,
   "interopDefault": true,
   "alias": {
-    "@vben/stylelint-config": "D:/work/web-progeam/internal/stylelint-config"
+    "@vben/stylelint-config": "/Users/yanjiaxu/紫光云/web-progeam/internal/stylelint-config"
   }
-})("D:/work/web-progeam/internal/stylelint-config/src/index.ts")
+})("/Users/yanjiaxu/紫光云/web-progeam/internal/stylelint-config/src/index.ts")
\ No newline at end of file

internal/stylelint-config/dist/index.d.ts

-export * from "D:/work/web-progeam/internal/stylelint-config/src/index";
-export { default } from "D:/work/web-progeam/internal/stylelint-config/src/index";
+export * from "/Users/yanjiaxu/紫光云/web-progeam/internal/stylelint-config/src/index";
+export { default } from "/Users/yanjiaxu/紫光云/web-progeam/internal/stylelint-config/src/index";
\ No newline at end of file

internal/stylelint-config/dist/index.mjs

-import jiti from "file:///D:/work/web-progeam/node_modules/.pnpm/jiti@1.21.0/node_modules/jiti/lib/index.js";
+import jiti from "file:///Users/yanjiaxu/%E7%B4%AB%E5%85%89%E4%BA%91/web-progeam/node_modules/.pnpm/jiti@1.21.0/node_modules/jiti/lib/index.js";
 
-/** @type {import("D:/work/web-progeam/internal/stylelint-config/src/index")} */
+/** @type {import("/Users/yanjiaxu/紫光云/web-progeam/internal/stylelint-config/src/index")} */
 const _module = jiti(null, {
   "esmResolve": true,
   "interopDefault": true,
   "alias": {
-    "@vben/stylelint-config": "D:/work/web-progeam/internal/stylelint-config"
+    "@vben/stylelint-config": "/Users/yanjiaxu/紫光云/web-progeam/internal/stylelint-config"
   }
-})("D:/work/web-progeam/internal/stylelint-config/src/index.ts");
+})("/Users/yanjiaxu/紫光云/web-progeam/internal/stylelint-config/src/index.ts");
 
 export default _module;
\ No newline at end of file

internal/vite-config/dist/index.cjs

-module.exports = require("D:/work/web-progeam/node_modules/.pnpm/jiti@1.21.0/node_modules/jiti/lib/index.js")(null, {
+module.exports = require("/Users/yanjiaxu/紫光云/web-progeam/node_modules/.pnpm/jiti@1.21.0/node_modules/jiti/lib/index.js")(null, {
   "esmResolve": true,
   "interopDefault": true,
   "alias": {
-    "@vben/vite-config": "D:/work/web-progeam/internal/vite-config"
+    "@vben/vite-config": "/Users/yanjiaxu/紫光云/web-progeam/internal/vite-config"
   }
-})("D:/work/web-progeam/internal/vite-config/src/index.ts")
+})("/Users/yanjiaxu/紫光云/web-progeam/internal/vite-config/src/index.ts")
\ No newline at end of file

internal/vite-config/dist/index.d.ts

-export * from "D:/work/web-progeam/internal/vite-config/src/index";
+export * from "/Users/yanjiaxu/紫光云/web-progeam/internal/vite-config/src/index";

internal/vite-config/dist/index.mjs

-import jiti from "file:///D:/work/web-progeam/node_modules/.pnpm/jiti@1.21.0/node_modules/jiti/lib/index.js";
+import jiti from "file:///Users/yanjiaxu/%E7%B4%AB%E5%85%89%E4%BA%91/web-progeam/node_modules/.pnpm/jiti@1.21.0/node_modules/jiti/lib/index.js";
 
-/** @type {import("D:/work/web-progeam/internal/vite-config/src/index")} */
+/** @type {import("/Users/yanjiaxu/紫光云/web-progeam/internal/vite-config/src/index")} */
 const _module = jiti(null, {
   "esmResolve": true,
   "interopDefault": true,
   "alias": {
-    "@vben/vite-config": "D:/work/web-progeam/internal/vite-config"
+    "@vben/vite-config": "/Users/yanjiaxu/紫光云/web-progeam/internal/vite-config"
   }
-})("D:/work/web-progeam/internal/vite-config/src/index.ts");
+})("/Users/yanjiaxu/紫光云/web-progeam/internal/vite-config/src/index.ts");
 
 export const defineApplicationConfig = _module.defineApplicationConfig;
 export const definePackageConfig = _module.definePackageConfig;
\ No newline at end of file

src/api/contract/contract.ts

@@ -14,10 +14,23 @@ enum Api {
   GetGroupList = '/pro/settlement/contract-list',
   //新增合同
   Add = '/pro/settlement/add-contract',
+  DeleteProject = '/pro/contract/del',
+  UpdateProject = '/pro/contract/edit',
 }
 export const getContractListPage = (params?: ProjectParams) =>
   defHttp.post<ProjectModel>({ url: Api.GetList, data: params });
 
+export const deleteItem = (params?: any) =>
+    defHttp.delete<ProjectModel>({ url: Api.DeleteProject, params });
+
+export const updateItem = (params?: any) =>
+    defHttp.post<ProjectModel>({
+        url: Api.UpdateProject,
+        data: params,
+        headers: {
+            'Content-Type': 'application/json;charset=UTF-8',
+        },
+    });
 //查询下拉列表
 export const getProjectSelect = (params?: any) =>
   defHttp.get<ProjectListItem>({ url: Api.ProjectSelect, params });

src/components/projectlibraryModel/projectlibraryModel.vue

@@ -57,7 +57,7 @@
     emit('close', getSelectRows());
   }
 
-  const emit = defineEmits(['close']);
+  const emit = defineEmits(['close', 'register']);
 
   function handleVisibleChange(v) {
     clearSelectedRowKeys();

src/views/biddingManagement/biddingManagementEdit.vue

@@ -12,19 +12,20 @@
       <a-button type="default" @click="router.back()"> 返回 </a-button>
     </template>
 
-    <PageCard v-for="(item, index) in tabsFormSchema" :key="index" :title="item.name">
-      <template #right>
-        <a-button
-          type="text"
-          preIcon="ant-design:delete-outlined"
-          danger
-          v-if="!disabled"
-          @click="deleteItem(index)"
-        >
-        </a-button>
-      </template>
-      <BasicForm :loading="loading" @register="item.Form[0]" />
-    </PageCard>
+    <template v-for="(item, index) in tabsFormSchema">
+      <PageCard v-if="item.show" :key="index" :title="item.name">
+        <template #right>
+          <a-button
+            v-if="!disabled"
+            type="text"
+            preIcon="ant-design:delete-outlined"
+            danger
+            @click="deleteItem(index)"
+          />
+        </template>
+        <BasicForm :loading="loading" @register="item.Form[0]" />
+      </PageCard>
+    </template>
 
     <a-button v-if="!disabled" type="dashed" @click="add" preIcon="ei:plus">
       从项目库导入
@@ -100,6 +101,7 @@
         tabsFormSchema.push(item);
         formData.value.tenderPlanPro.push({
           id: source.id,
+          show: true,
           proId: source.proId,
           tenderId: source.tenderId,
         });
@@ -114,6 +116,7 @@
   });
   type TabsFormType = {
     name: string;
+    show?: boolean;
     forceRender?: boolean;
     Form: UseFormReturnType;
   };
@@ -143,6 +146,7 @@
     const item = {
       name: '序号' + (tabsFormSchema.length + 1),
       forceRender: true,
+      show: true,
       Form: useForm(Object.assign({ schemas: formSchema }, baseFormConfig) as FormProps),
     };
     const { setFieldsValue } = item.Form[1];
@@ -169,12 +173,8 @@
     //   formData.value.tenderPlanPro.splice(index, 1);
     //   tabsFormSchema.splice(index, 1);
     //   loadingRef.value = false;
-    // } else {
-    console.log(tabsFormSchema);
-    console.log(index);
-    formData.value.tenderPlanPro.splice(index, 1);
-    tabsFormSchema.splice(index, 1);
-    console.log(tabsFormSchema);
+
+    tabsFormSchema[index].show = false;
     // loadingRef.value = false;
     // }
   }
@@ -193,11 +193,13 @@
     try {
       for (let i = 0; i < tabsFormSchema.length; i++) {
         let item = tabsFormSchema[i];
-        const { validate, getFieldsValue } = item.Form[1];
-        await validate();
-        let res = getFieldsValue();
-        formData.value.tenderPlanPro[i] = deepMerge(formData.value.tenderPlanPro[i], res);
-        console.log(formData.value.tenderPlanPro);
+        if (item.show) {
+          const { validate, getFieldsValue } = item.Form[1];
+          await validate();
+          let res = getFieldsValue();
+          formData.value.tenderPlanPro[i] = deepMerge(formData.value.tenderPlanPro[i], res);
+          console.log(formData.value.tenderPlanPro);
+        }
       }
       formData.value.proNumber = formData.value.tenderPlanPro.Length;
 

src/views/biddingPlan/biddingPlanEdit.vue

@@ -11,20 +11,20 @@
       <a-button type="primary" v-if="!disabled" @click="handleSubmit"> 提交 </a-button>
       <a-button type="default" @click="router.back()"> 返回 </a-button>
     </template>
-
-    <PageCard v-for="(item, index) in tabsFormSchema" :key="index" :title="item.name">
-      <template #right>
-        <a-button
-          v-if="!disabled"
-          type="text"
-          preIcon="ant-design:delete-outlined"
-          danger
-          @click="deleteItem(index)"
-        />
-      </template>
-      <BasicForm :loading="loading" @register="item.Form[0]" />
-    </PageCard>
-
+    <template v-for="(item, index) in tabsFormSchema">
+      <PageCard v-if="item.show" :key="index" :title="item.name">
+        <template #right>
+          <a-button
+            v-if="!disabled"
+            type="text"
+            preIcon="ant-design:delete-outlined"
+            danger
+            @click="deleteItem(index)"
+          />
+        </template>
+        <BasicForm :loading="loading" @register="item.Form[0]" />
+      </PageCard>
+    </template>
     <a-button v-if="!disabled" type="dashed" @click="add" preIcon="ei:plus">
       从项目库导入
     </a-button>
@@ -52,7 +52,6 @@
   import { router } from '@/router';
   import { useRoute } from 'vue-router';
   import { isArray } from 'lodash-es';
-
   const loadingRef = ref(false);
   const [registerDrawer, { openDrawer }] = useDrawer();
   const [register, { openModal: openModal }] = useModal();
@@ -91,6 +90,7 @@
         const item = {
           name: '序号' + (i + 1),
           forceRender: true,
+          show: true,
           Form: useForm(
             Object.assign({ schemas: formSchema, disabled }, baseFormConfig) as FormProps,
           ),
@@ -115,6 +115,7 @@
   });
   type TabsFormType = {
     name: string;
+    show?: boolean;
     forceRender?: boolean;
     Form: UseFormReturnType;
   };
@@ -124,7 +125,7 @@
     layout: 'vertical',
   };
 
-  const tabsFormSchema = reactive<TabsFormType[]>([]);
+  let tabsFormSchema = reactive<TabsFormType[]>([]);
 
   async function add() {
     openModal();
@@ -143,6 +144,7 @@
   async function handleNew(info: any) {
     const item = {
       name: '序号' + (tabsFormSchema.length + 1),
+      show: true,
       forceRender: true,
       Form: useForm(Object.assign({ schemas: formSchema }, baseFormConfig) as FormProps),
     };
@@ -166,17 +168,14 @@
     //   await Itemdelete({
     //     id,
     //   });
-    //   formData.value.tenderPlanPro.splice(index, 1);
+
     //   tabsFormSchema.splice(index, 1);
     //   loadingRef.value = false;
     // } else {
-    console.log(index);
-
-    formData.value.tenderPlanPro.splice(index, 1);
+    tabsFormSchema[index].show = false;
 
-    tabsFormSchema.splice(index, 1);
-    console.log(tabsFormSchema);
-    console.log(formData.value.tenderPlanPro);
+    // console.log(tabsFormSchema);
+    // console.log(formData.value.tenderPlanPro);
     // loadingRef.value = false;
     // }
   }
@@ -195,17 +194,19 @@
     try {
       for (let i = 0; i < tabsFormSchema.length; i++) {
         let item = tabsFormSchema[i];
-        const { validate, getFieldsValue } = item.Form[1];
-        await validate();
-        let res = getFieldsValue();
-        res.biddingPeriod = isArray(res.biddingPeriod)
-          ? res.biddingPeriod.join(',')
-          : res.biddingPeriod;
-        res.plannedPeriod = isArray(res.plannedPeriod)
-          ? res.plannedPeriod.join(',')
-          : res.plannedPeriod;
-        // res.plannedPeriod = res.plannedPeriod.join(',');
-        formData.value.tenderPlanPro[i] = deepMerge(formData.value.tenderPlanPro[i], res);
+        if (item.show) {
+          const { validate, getFieldsValue } = item.Form[1];
+          await validate();
+          let res = getFieldsValue();
+          res.biddingPeriod = isArray(res.biddingPeriod)
+            ? res.biddingPeriod.join(',')
+            : res.biddingPeriod;
+          res.plannedPeriod = isArray(res.plannedPeriod)
+            ? res.plannedPeriod.join(',')
+            : res.plannedPeriod;
+          // res.plannedPeriod = res.plannedPeriod.join(',');
+          formData.value.tenderPlanPro[i] = deepMerge(formData.value.tenderPlanPro[i], res);
+        }
         console.log(formData.value.tenderPlanPro);
       }
       formData.value.proNumber = formData.value.tenderPlanPro.Length;

src/views/engineeringProject/engineeringProjectModel/engineeringprojectModel.vue

@@ -60,7 +60,7 @@
     emit('close', getSelectRows());
   }
 
-  const emit = defineEmits(['close']);
+  const emit = defineEmits(['close', 'register']);
 
   function handleVisibleChange(v) {
     clearSelectedRowKeys();

src/views/project/tabs/contract.vue

@@ -14,6 +14,19 @@
               {
                 label: '查看详情',
                 onClick: handleDetail.bind(null, record, true),
+              },
+                        {
+                label: '编辑',
+                onClick: handleEdit.bind(null, record, false),
+              },
+                       {
+                label: '删除',
+                color: 'error',
+                popConfirm: {
+                  title: '是否确认删除',
+                  placement: 'left',
+                  confirm: handleDelete.bind(null, record),
+                },
               },
             ]"
           />
@@ -26,7 +39,7 @@
 <script lang="ts" setup>
   import { contractColumns, searchFormSchema } from './data';
   import { BasicTable, useTable, TableAction } from '@/components/Table';
-  import { getContractListPage } from '@/api/contract/contract';
+  import { getContractListPage, deleteItem } from '@/api/contract/contract';
   import { inject } from 'vue';
   import { router } from '@/router';
   import { Tag } from 'ant-design-vue';
@@ -68,6 +81,12 @@
       fixed: undefined,
     },
   });
+  async function handleEdit(record: Recordable, disabled: boolean) {
+    openDrawer(true, {
+      record,
+      isUpdate: true,
+    });
+  }
   async function handleDetail(record: Recordable, disabled: boolean) {
     openDrawer(true, {
       record,
@@ -75,4 +94,11 @@
       disabled,
     });
   }
+  function handleDelete(record: Recordable) {
+    deleteItem({ id: record.id });
+    reload();
+  }
+  function handleSuccess() {
+    reload();
+  }
 </script>

src/views/project/tabs/drawer/contractDrawer.vue

@@ -15,10 +15,12 @@
   import { BasicForm, useForm, FormActionType } from '@/components/Form';
   import { contractDrawer } from '../drawer/drawerData';
   import { BasicDrawer, useDrawerInner } from '@/components/Drawer';
-
+  import { updateItem } from '@/api/contract/contract';
+  const emit = defineEmits(['success', 'register']);
+  const detailId = ref(0);
   const isUpdate = ref(true);
   const formElRef = ref<Nullable<FormActionType>>(null);
-  const [registerForm, { resetFields, setFieldsValue }] = useForm({
+  const [registerForm, { resetFields, setFieldsValue,validate }] = useForm({
     labelWidth: 90,
     baseColProps: { span: 24 },
     schemas: contractDrawer,
@@ -29,6 +31,17 @@
     resetFields();
     setDrawerProps({ confirmLoading: false });
 
+
+    isUpdate.value = !!data?.isUpdate;
+    if (isUpdate.value) {
+      detailId.value = data.record.id;
+      getTitle.value = '编辑合同管理';
+      const formEl = unref(formElRef);
+      if (!formEl) return;
+      await formEl.setProps({
+        disabled: false,
+      });
+    }
     if (data.disabled == true) {
       getTitle.value = '查看合同管理';
       const formEl = unref(formElRef);
@@ -38,6 +51,7 @@
       });
     }
 
+
     if (unref(isUpdate)) {
       setFieldsValue({
         ...data.record,
@@ -48,5 +62,23 @@
   const getTitle = ref('');
   async function handleSubmit() {
     closeDrawer();
+    try {
+      const values = await validate();
+      setDrawerProps({ confirmLoading: true });
+      if (isUpdate.value) {
+        values.id = detailId.value;
+      }
+      // TODO custom api
+      console.log('id',values);
+      let res = await updateItem(values)
+      console.log(res);
+
+      closeDrawer();
+      emit('success', res);
+    } finally {
+      setDrawerProps({ confirmLoading: false });
+    }
+
+
   }
 </script>