Skip to content

W
web-project
Commit 8b548b73 authored by jiaxu.yan's avatar jiaxu.yan
Browse files
Options

feat: 修改删除

parent d15474c3
Hide whitespace changes
Inline Side-by-side
Showing with 98 additions and 95 deletions
internal/eslint-config/dist/index.cjs
View file @ 8b548b73
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")
\ No newline at end of file
})("/Users/yanjiaxu/紫光云/web-progeam/internal/eslint-config/src/index.ts")
\ No newline at end of file
internal/eslint-config/dist/index.d.ts
View file @ 8b548b73
export * from "D:/work/web-progeam/internal/eslint-config/src/index";
export { default } from "D:/work/web-progeam/internal/eslint-config/src/index";
\ No newline at end of file
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
View file @ 8b548b73
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
View file @ 8b548b73
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")
\ No newline at end of file
})("/Users/yanjiaxu/紫光云/web-progeam/internal/eslint-config/src/strict.ts")
\ No newline at end of file
internal/eslint-config/dist/strict.d.ts
View file @ 8b548b73
export * from "D:/work/web-progeam/internal/eslint-config/src/strict";
export { default } from "D:/work/web-progeam/internal/eslint-config/src/strict";
\ No newline at end of file
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
View file @ 8b548b73
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
View file @ 8b548b73
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")
\ No newline at end of file
})("/Users/yanjiaxu/紫光云/web-progeam/internal/stylelint-config/src/index.ts")
\ No newline at end of file
internal/stylelint-config/dist/index.d.ts
View file @ 8b548b73
export * from "D:/work/web-progeam/internal/stylelint-config/src/index";
export { default } from "D:/work/web-progeam/internal/stylelint-config/src/index";
\ No newline at end of file
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
View file @ 8b548b73
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
View file @ 8b548b73
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")
\ No newline at end of file
})("/Users/yanjiaxu/紫光云/web-progeam/internal/vite-config/src/index.ts")
\ No newline at end of file
internal/vite-config/dist/index.d.ts
View file @ 8b548b73
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
View file @ 8b548b73
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/components/projectlibraryModel/projectlibraryModel.vue
View file @ 8b548b73
......@@ -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
View file @ 8b548b73
......@@ -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
View file @ 8b548b73
......@@ -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
View file @ 8b548b73
......@@ -60,7 +60,7 @@
emit('close', getSelectRows());
}
const emit = defineEmits(['close']);
const emit = defineEmits(['close', 'register']);
function handleVisibleChange(v) {
clearSelectedRowKeys();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment