diff --git a/.env.production b/.env.production index 8a2aac8..f8cc9aa 100644 --- a/.env.production +++ b/.env.production @@ -21,7 +21,6 @@ ENV = 'production' #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_PUBLIC_PATH=/admin VUE_APP_OUTPUT_DIR=/www/szemc-budget-execution/backend/public/admin diff --git a/.env.staging b/.env.staging index 204773d..a286027 100644 --- a/.env.staging +++ b/.env.staging @@ -4,29 +4,26 @@ 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 -<<<<<<< HEAD -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_OUT_GPS=http://hjjc-gps.ali251.langye.net/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_OUT_GPS = http://hjjc-gps.ali251.langye.net/admin/#/ VUE_APP_PUBLIC_PATH=/admin_test VUE_APP_OUTPUT_DIR=/www/szemc-budget-execution/backend/public/admin_test ->>>>>>> 1fa454b (up) diff --git a/src/views/achievements/components/detailAchievements.vue b/src/views/achievements/components/detailAchievements.vue index cb3b507..72d1b92 100644 --- a/src/views/achievements/components/detailAchievements.vue +++ b/src/views/achievements/components/detailAchievements.vue @@ -289,7 +289,7 @@ export default { targetValue () { return function(item) { if (item.target?.unit_detail?.value !== '无') { - return `${item.target?.symbol_detail?.value}${this.type ? item.target?.half_target : item.target?.year_target}${item.target?.unit_detail?.value}` + return `${item.target?.symbol_detail?.value}${this.type === 1 ? item.target?.half_target : item.target?.year_target}${item.target?.unit_detail?.value}` } else { return this.type === 1 ? item.target?.half_target : item.target?.year_target } diff --git a/src/views/achievements/evaluate.vue b/src/views/achievements/evaluate.vue index 55ee71c..90ccadb 100644 --- a/src/views/achievements/evaluate.vue +++ b/src/views/achievements/evaluate.vue @@ -107,17 +107,7 @@ - + @@ -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(_ => { diff --git a/src/views/budget/components/addPoint.vue b/src/views/budget/components/addPoint.vue index 94e8684..017ef2d 100644 --- a/src/views/budget/components/addPoint.vue +++ b/src/views/budget/components/addPoint.vue @@ -135,11 +135,10 @@ export default { return (
- + - + + 是 + 否 + - + + 是 + 否 + （无需采购流程，如水电邮寄费等） @@ -237,19 +231,13 @@ - - + - + :key="item.id" + :label="item.id" + >{{ item.value }} + @@ -313,26 +301,20 @@ prop="use_framework_buy" label="是否使用框架协议采购内容" > - + + 是 + 否 + - + + 是 + 否 + @@ -1194,7 +1172,7 @@ export default { }, { prop: "purchase_type.value", - label: "采购形势", + label: "采购形式", width: 120, }, { @@ -1560,8 +1538,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 fa01ea4..e902a87 100644 --- a/vue.config.js +++ b/vue.config.js @@ -39,7 +39,6 @@ module.exports = { // outputDir：构建生成的生产环境静态文件的输出目录。即 npm run build 后，所有打包好的文件会输出到该目录。通常设置为服务器上前端资源实际存放的物理路径。 outputDir: process.env.VUE_APP_OUTPUT_DIR || '/www/szemc-budget-execution/backend/public/admin', - assetsDir: 'static', lintOnSave: false, productionSourceMap: false,