From 7de810097c2b4547c60dc7d9da749563d87a3360 Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Mon, 29 Dec 2025 13:55:41 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 34 ++++++++++++++--------------- .env.staging | 34 ++++++++++++++--------------- src/views/contract/contractEdit.vue | 23 ++++++++----------- vue.config.js | 4 ++-- 4 files changed, 45 insertions(+), 50 deletions(-) diff --git a/.env.production b/.env.production index e9c4129..5d7b145 100644 --- a/.env.production +++ b/.env.production @@ -2,22 +2,22 @@ ENV = 'production' # base api -#VUE_APP_DOMIAN=http://192.168.0.66:9001/ -#VUE_APP_UPLOAD_API = http://192.168.00.66:9001/api/admin/upload-file -#VUE_APP_BASE_API = '' -#VUE_APP_OUT_Book = http://192.168.0.66:9002/ -#VUE_APP_OUT_GDZC = http://192.168.0.66:17777/admin -#VUE_APP_OUT_OLD = http://192.168.0.66 -#VUE_APP_OUT_URL = http://192.168.60.18:2021 -#VUE_APP_OLD_OA = http://192.168.0.66:16667 -#VUE_APP_OUT_GOODS = http://hjjc-szemc_goods-test.ali251.langye.net -#VUE_APP_OUT_GPS=http://192.168.0.66:9003/admin/#/ +VUE_APP_DOMIAN=http://192.168.0.66:9001/ +VUE_APP_UPLOAD_API = http://192.168.00.66:9001/api/admin/upload-file +VUE_APP_BASE_API = '' +VUE_APP_OUT_Book = http://192.168.0.66:9002/ +VUE_APP_OUT_GDZC = http://192.168.0.66:17777/admin +VUE_APP_OUT_OLD = http://192.168.0.66 +VUE_APP_OUT_URL = http://192.168.60.18:2021 +VUE_APP_OLD_OA = http://192.168.0.66:16667 +VUE_APP_OUT_GOODS = http://hjjc-szemc_goods-test.ali251.langye.net +VUE_APP_OUT_GPS=http://192.168.0.66:9003/admin/#/ # -VUE_APP_DOMIAN = http://hjjc-hdcontract-test.ali251.langye.net -VUE_APP_UPLOAD_API = http://hjjc-hdcontract-test.ali251.langye.net/api/admin/upload-file -VUE_APP_BASE_API = -VUE_APP_OUT_Book = http://hjjc-book-service-test.ali251.langye.net -VUE_APP_OUT_GDZC = http://hjjc-szemcgdzc.ali251.langye.net -VUE_APP_OUT_OLD = http://hjjc-szemcold-test.ali251.langye.net -VUE_APP_OUT_GOODS = http://hjjc-szemc_goods-test.ali251.langye.net +#VUE_APP_DOMIAN = http://hjjc-hdcontract-test.ali251.langye.net +#VUE_APP_UPLOAD_API = http://hjjc-hdcontract-test.ali251.langye.net/api/admin/upload-file +#VUE_APP_BASE_API = +#VUE_APP_OUT_Book = http://hjjc-book-service-test.ali251.langye.net +#VUE_APP_OUT_GDZC = http://hjjc-szemcgdzc.ali251.langye.net +#VUE_APP_OUT_OLD = http://hjjc-szemcold-test.ali251.langye.net +#VUE_APP_OUT_GOODS = http://hjjc-szemc_goods-test.ali251.langye.net diff --git a/.env.staging b/.env.staging index 8e30887..9a49863 100644 --- a/.env.staging +++ b/.env.staging @@ -4,22 +4,22 @@ NODE_ENV = production ENV = 'staging' # base api -VUE_APP_DOMIAN=http://192.168.0.66:9001/ -VUE_APP_UPLOAD_API = http://192.168.00.66:9001/api/admin/upload-file -VUE_APP_BASE_API = '' -VUE_APP_OUT_Book = http://192.168.0.66:9002/ -VUE_APP_OUT_GDZC = http://192.168.0.66:17777/admin -VUE_APP_OUT_OLD = http://192.168.0.66 -VUE_APP_OUT_URL = http://192.168.60.18:2021 -VUE_APP_OLD_OA = http://192.168.0.66:16667 -VUE_APP_OUT_GOODS = http://hjjc-szemc_goods-test.ali251.langye.net -VUE_APP_OUT_GPS=http://192.168.0.66:9003/admin/#/ +#VUE_APP_DOMIAN=http://192.168.0.66:9001/ +#VUE_APP_UPLOAD_API = http://192.168.00.66:9001/api/admin/upload-file +#VUE_APP_BASE_API = '' +#VUE_APP_OUT_Book = http://192.168.0.66:9002/ +#VUE_APP_OUT_GDZC = http://192.168.0.66:17777/admin +#VUE_APP_OUT_OLD = http://192.168.0.66 +#VUE_APP_OUT_URL = http://192.168.60.18:2021 +#VUE_APP_OLD_OA = http://192.168.0.66:16667 +#VUE_APP_OUT_GOODS = http://hjjc-szemc_goods-test.ali251.langye.net +#VUE_APP_OUT_GPS=http://192.168.0.66:9003/admin/#/ # -#VUE_APP_DOMIAN = http://hjjc-hdcontract-test.ali251.langye.net -#VUE_APP_UPLOAD_API = http://hjjc-hdcontract-test.ali251.langye.net/api/admin/upload-file -#VUE_APP_BASE_API = -#VUE_APP_OUT_Book = http://hjjc-book-service-test.ali251.langye.net -#VUE_APP_OUT_GDZC = http://hjjc-szemcgdzc.ali251.langye.net -#VUE_APP_OUT_OLD = http://hjjc-szemcold-test.ali251.langye.net -#VUE_APP_OUT_GOODS = http://hjjc-szemc_goods-test.ali251.langye.net +VUE_APP_DOMIAN = http://hjjc-hdcontract-test.ali251.langye.net +VUE_APP_UPLOAD_API = http://hjjc-hdcontract-test.ali251.langye.net/api/admin/upload-file +VUE_APP_BASE_API = +VUE_APP_OUT_Book = http://hjjc-book-service-test.ali251.langye.net +VUE_APP_OUT_GDZC = http://hjjc-szemcgdzc.ali251.langye.net +VUE_APP_OUT_OLD = http://hjjc-szemcold-test.ali251.langye.net +VUE_APP_OUT_GOODS = http://hjjc-szemc_goods-test.ali251.langye.net diff --git a/src/views/contract/contractEdit.vue b/src/views/contract/contractEdit.vue index 153f333..7f535e8 100644 --- a/src/views/contract/contractEdit.vue +++ b/src/views/contract/contractEdit.vue @@ -237,19 +237,13 @@ - - + - + :key="item.id" + :label="item.id" + >{{ item.value }} + @@ -1194,7 +1188,7 @@ export default { }, { prop: "purchase_type.value", - label: "采购形势", + label: "采购形式", width: 120, }, { @@ -1560,8 +1554,9 @@ export default { isShowIsFramework() { let temp1 = this.form.purchase_type_id; let temp2 = this.form.use_framework_buy; + const selectedPurchaseType = this.purchaseType.find(item => item.id === this.form.purchase_type_id); if ( - this.$refs["purchaseTypeInput"]?.selected?.label === "直接采购" && + selectedPurchaseType?.value === "直接采购" && this.form.use_framework_buy ) { this.form.is_framework = true; diff --git a/vue.config.js b/vue.config.js index f15e26c..96d74b0 100644 --- a/vue.config.js +++ b/vue.config.js @@ -25,8 +25,8 @@ module.exports = { * In most cases please use '/' !!! * Detail: https://cli.vuejs.org/config/#publicpath */ - publicPath: process.env.ENV === 'staging' ? '/admin' : '/admin', - outputDir: '/Users/mac/Documents/朗业/2025/s-苏州环境监测中心/hjjc-hdcontract/public/admin', + publicPath: process.env.ENV === 'staging' ? '/admin_test' : '/admin', + outputDir: process.env.ENV === 'staging' ? '/Users/mac/Documents/朗业/2025/s-苏州环境监测中心/hjjc-hdcontract/public/admin_test':'/Users/mac/Documents/朗业/2025/s-苏州环境监测中心/hjjc-hdcontract/public/admin', // outputDir: '/Users/mac/Documents/朗业/2025/s-苏州环境监测中心/hetong/public/admin', // :'/Users/mac/Documents/朗业/2025/s-苏州环境监测中心/hetong/public/admin', // /Users/mac/Documents/朗业/2025/s-苏州环境监测中心/hetong/public/admin From 756d0d8b470f1a57670c35de40cdee15792acc17 Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Mon, 29 Dec 2025 15:13:13 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/contract/contractEdit.vue | 64 +++++++++++------------------ 1 file changed, 24 insertions(+), 40 deletions(-) diff --git a/src/views/contract/contractEdit.vue b/src/views/contract/contractEdit.vue index 7f535e8..03ef66a 100644 --- a/src/views/contract/contractEdit.vue +++ b/src/views/contract/contractEdit.vue @@ -176,23 +176,17 @@ - + @@ -399,6 +389,16 @@ export default { }; }, methods: { + openDetailOverview(command, row) { + if (command === 'yearMiddle') { + this.detailType = 1; + } else { + this.detailType = 2; + } + this.$refs['detailAchievements'].setPlanId(row.id); + this.$refs['detailAchievements'].show(); + }, + sendExamine (command, row) { this.$confirm("确认要送审？","提示",{ }).then(_ => {