diff --git a/.eslintignore b/.eslintignore index fc04190..50f1b24 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,3 +1,7 @@ /*.json /*.js -dist \ No newline at end of file +dist +*.config.js +*.config.ts +.eslintrc.js +node_modules/ diff --git a/.eslintrc.js b/.eslintrc.js index e74ce34..7d423ab 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,77 +1,129 @@ -// eslint-disable-next-line @typescript-eslint/no-var-requires const path = require('path'); module.exports = { root: true, - parser: 'vue-eslint-parser', - parserOptions: { - // Parser that checks the content of the + + diff --git a/src/components/index.ts b/src/components/index.ts index 797268f..bae0bd8 100644 --- a/src/components/index.ts +++ b/src/components/index.ts @@ -13,6 +13,7 @@ import Chart from './chart/index.vue'; import Breadcrumb from './breadcrumb/index.vue'; import DataTable from './common/DataTable.vue'; import ImageUpload from './common/ImageUpload.vue'; +import OnlyOfficeEditor from './common/OnlyOfficeEditor.vue'; // Manually introduce ECharts modules to reduce packing size @@ -35,5 +36,6 @@ export default { Vue.component('Breadcrumb', Breadcrumb); Vue.component('DataTable', DataTable); Vue.component('ImageUpload', ImageUpload); + Vue.component('OnlyOfficeEditor', OnlyOfficeEditor); }, }; diff --git a/src/components/menu/index.vue b/src/components/menu/index.vue index e0cd7b3..a9cb535 100644 --- a/src/components/menu/index.vue +++ b/src/components/menu/index.vue @@ -1,158 +1,23 @@ - + diff --git a/src/views/setting/system/contract-settings/contract-file.vue b/src/views/setting/system/contract-settings/contract-file.vue index 28116c2..a51ef09 100644 --- a/src/views/setting/system/contract-settings/contract-file.vue +++ b/src/views/setting/system/contract-settings/contract-file.vue @@ -61,7 +61,6 @@ import { Message } from '@arco-design/web-vue'; import useDataTable from '@/composables/useDataTable'; import { - getWordSettingFromId, delWordSetting, getWordSettingList, disableWordSetting, @@ -72,7 +71,7 @@ import { camelToSnake } from '@/utils/caseConvert'; // import contractNumberFormDrawer from './drawer/contract-number-form-drawer.vue'; import contractFileForm from './modal/contract-file-form.vue'; - + import { useRouter } from 'vue-router'; const { data: renderData, columns: projectColumn, @@ -91,7 +90,7 @@ initialPageSize: 10, pageSizeOptions: [10, 20, 50, 100], }); - + const router = useRouter(); const contractWordList = ref([]); const departmentListData = ref([]); const showModal = ref(false); @@ -200,26 +199,16 @@ // 处理错误 } }; - const getWordSettingFromIdData = async (id: number) => { - const { code, data } = await getWordSettingFromId(id); - if (code === 200 && data) { - const { contractCodeSetting } = data; - currentNumberInfo.value = contractCodeSetting || null; - currentNumberInfo.value.arrange = camelToSnake( - currentNumberInfo.value.arrange - ); - } - }; const handleAddContractNumber = () => { // currentNumberInfo.value = null; isEdit.value = false; showModal.value = true; }; const handleEditContractNumber = async (id: number) => { - await getWordSettingFromIdData(id); - isEdit.value = true; - // currentNumberInfo.value = info - showModal.value = true; + router.push({ + name: 'system-setting-contract-file-edit', + query: { id }, + }); }; // 初始化数据 onMounted(() => { diff --git a/src/views/setting/system/contract-settings/contract-template-edit.vue b/src/views/setting/system/contract-settings/contract-template-edit.vue new file mode 100644 index 0000000..28f5d2e --- /dev/null +++ b/src/views/setting/system/contract-settings/contract-template-edit.vue @@ -0,0 +1,709 @@ + + + + diff --git a/src/views/setting/system/contract-settings/contract-template.vue b/src/views/setting/system/contract-settings/contract-template.vue index 306a9d4..fd1cfc9 100644 --- a/src/views/setting/system/contract-settings/contract-template.vue +++ b/src/views/setting/system/contract-settings/contract-template.vue @@ -48,20 +48,19 @@ + + diff --git a/src/views/setting/system/contract-settings/modal/contract-template-form.vue b/src/views/setting/system/contract-settings/modal/contract-template-form.vue index 4687939..5309888 100644 --- a/src/views/setting/system/contract-settings/modal/contract-template-form.vue +++ b/src/views/setting/system/contract-settings/modal/contract-template-form.vue @@ -1,7 +1,7 @@