From 12807f711640ed365cf396804987182dee95e2b9 Mon Sep 17 00:00:00 2001 From: xy <271556543@qq.com> Date: Fri, 6 Sep 2024 16:06:11 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E8=A7=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 5 +++ src/permission.js | 2 +- src/router/index.js | 5 +++ src/views/contract/contractEdit.vue | 3 ++ src/views/contract/contractList.vue | 2 +- src/views/preview/index.vue | 70 +++++++++++++++++++++++++++++ 6 files changed, 85 insertions(+), 2 deletions(-) create mode 100644 src/views/preview/index.vue diff --git a/package.json b/package.json index a37fcba..6564312 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,10 @@ "test:ci": "npm run lint && npm run test:unit" }, "dependencies": { + "@vue-office/docx": "^1.6.2", + "@vue-office/excel": "^1.7.11", + "@vue-office/pdf": "^2.0.2", + "@vue/composition-api": "^1.7.2", "axios": "0.18.1", "core-js": "3.6.5", "echarts": "^5.0.0", @@ -29,6 +33,7 @@ "print-js": "^1.6.0", "view-design": "^4.7.0", "vue": "2.6.10", + "vue-demi": "^0.14.6", "vue-grid-layout": "^2.4.0", "vue-router": "3.0.6", "vuex": "3.1.0", diff --git a/src/permission.js b/src/permission.js index 8f7efa3..316fdc5 100644 --- a/src/permission.js +++ b/src/permission.js @@ -16,7 +16,7 @@ NProgress.configure({ showSpinner: false }) // NProgress Configuration -const whiteList = ['/login'] // no redirect whitelist +const whiteList = ['/login','/preview'] // no redirect whitelist router.beforeEach(async (to, from, next) => { // start progress bar diff --git a/src/router/index.js b/src/router/index.js index 61597ec..c419cd1 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -75,6 +75,11 @@ export const constantRoutes = [{ path: "/install", component: () => import("@/views/install"), hidden: true + }, + { + path: '/preview', + component: () => import("@/views/preview"), + hidden: true } ] diff --git a/src/views/contract/contractEdit.vue b/src/views/contract/contractEdit.vue index 6f495f4..4764bae 100644 --- a/src/views/contract/contractEdit.vue +++ b/src/views/contract/contractEdit.vue @@ -1504,6 +1504,9 @@ export default { } this.form.is_purchase = this.flowIds?.find(i => i.id == this.form.flow_mod_id)?.type == 2 ? 1 : 0; // this.form.is_contract = this.flowIds?.find(i => i.id == this.form.flow_mod_id)?.type == 2 ? 0 : 1; + if (!this.form.money) { + this.form.money = this.form.plan_price + } if (this.type === 'add') { addContrant(this.form,true).then(res => { this.btnLoading = false diff --git a/src/views/contract/contractList.vue b/src/views/contract/contractList.vue index 9a249ea..73001bf 100644 --- a/src/views/contract/contractList.vue +++ b/src/views/contract/contractList.vue @@ -272,7 +272,7 @@ @click="new RegExp(/contractLedger/g).test($route.path) ? ($refs['addContractLedger'].setType('add'),$refs['addContractLedger'].show()) : $router.push('/contract/contractEdit')" >新增 -