xiaoy
/
hjjc-workbench-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

预算绩效申报功能优化

Browse Source
master
weizong song 2 weeks ago
parent 3696d9b06a 0254789b3a
commit 98eb533c66
7 changed files with 64 additions and 91 deletions
Show Stats Download Patch File Download Diff File

1
.env.production
Unescape View File

@ -21,7 +21,6 @@ ENV = 'production'
#VUE_APP_OUT_GDZC = http://hjjc-szemcgdzc.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_OLD = http://hjjc-szemcold-test.ali251.langye.net
#VUE_APP_OUT_GOODS = http://hjjc-szemc_goods-test.ali251.langye.net #VUE_APP_OUT_GOODS = http://hjjc-szemc_goods-test.ali251.langye.net
VUE_APP_PUBLIC_PATH=/admin VUE_APP_PUBLIC_PATH=/admin
VUE_APP_OUTPUT_DIR=/www/szemc-budget-execution/backend/public/admin VUE_APP_OUTPUT_DIR=/www/szemc-budget-execution/backend/public/admin

39
.env.staging
Unescape View File

@ -4,29 +4,26 @@ NODE_ENV = production
ENV = 'staging' ENV = 'staging'
# base api # base api
VUE_APP_DOMIAN=http://192.168.0.66:9001/ #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_UPLOAD_API = http://192.168.00.66:9001/api/admin/upload-file
VUE_APP_BASE_API = '' #VUE_APP_BASE_API = ''
VUE_APP_OUT_Book = http://192.168.0.66:9002/ #VUE_APP_OUT_Book = http://192.168.0.66:9002/
VUE_APP_OUT_GDZC = http://192.168.0.66:17777/admin #VUE_APP_OUT_GDZC = http://192.168.0.66:17777/admin
VUE_APP_OUT_OLD = http://192.168.0.66 #VUE_APP_OUT_OLD = http://192.168.0.66
VUE_APP_OUT_URL = http://192.168.60.18:2021 #VUE_APP_OUT_URL = http://192.168.60.18:2021
VUE_APP_OLD_OA = http://192.168.0.66:16667 #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_GOODS = http://hjjc-szemc_goods-test.ali251.langye.net #VUE_APP_OUT_GPS=http://192.168.0.66:9003/admin/#/
VUE_APP_OUT_GPS=http://192.168.0.66:9003/admin/#/
# #
#VUE_APP_DOMIAN = http://hjjc-hdcontract-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_UPLOAD_API = http://hjjc-hdcontract-test.ali251.langye.net/api/admin/upload-file
#VUE_APP_BASE_API = VUE_APP_BASE_API =
#VUE_APP_OUT_Book = http://hjjc-book-service-test.ali251.langye.net 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_GDZC = http://hjjc-szemcgdzc.ali251.langye.net
#VUE_APP_OUT_OLD = http://hjjc-szemcold-test.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_GOODS = http://hjjc-szemc_goods-test.ali251.langye.net
======= VUE_APP_OUT_GPS = http://hjjc-gps.ali251.langye.net/admin/#/
VUE_APP_OUT_GPS=http://hjjc-gps.ali251.langye.net/admin/#/
VUE_APP_PUBLIC_PATH=/admin_test VUE_APP_PUBLIC_PATH=/admin_test
VUE_APP_OUTPUT_DIR=/www/szemc-budget-execution/backend/public/admin_test VUE_APP_OUTPUT_DIR=/www/szemc-budget-execution/backend/public/admin_test
>>>>>>> 1fa454b (up)

2
src/views/achievements/components/detailAchievements.vue
Unescape View File

@ -289,7 +289,7 @@ export default {
targetValue () { targetValue () {
return function(item) { return function(item) {
if (item.target?.unit_detail?.value !== '无') { 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 { } else {
return this.type === 1 ? item.target?.half_target : item.target?.year_target return this.type === 1 ? item.target?.half_target : item.target?.year_target
} }

22
src/views/achievements/evaluate.vue
Unescape View File

@ -107,17 +107,7 @@
</el-dropdown> </el-dropdown>
</template> </template>
<el-dropdown @command="command => { <el-dropdown @command="command => openDetailOverview(command, scope.row)">
if (command === 'yearMiddle') {
detailType = 1;
$refs['detailAchievements'].setPlanId(scope.row.id);
$refs['detailAchievements'].show();
} else {
detailType = 2;
$refs['detailAchievements'].setPlanId(scope.row.id);
$refs['detailAchievements'].show();
}
}">
<Button style="margin-left: 4px;" size="small" type="primary"> <Button style="margin-left: 4px;" size="small" type="primary">
查看总览<i class="el-icon-arrow-down el-icon--right"></i> 查看总览<i class="el-icon-arrow-down el-icon--right"></i>
</Button> </Button>
@ -399,6 +389,16 @@ export default {
}; };
}, },
methods: { 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) { sendExamine (command, row) {
this.$confirm("确认要送审？","提示",{ this.$confirm("确认要送审？","提示",{
}).then(_ => { }).then(_ => {

3
src/views/budget/components/addPoint.vue
Unescape View File

@ -135,11 +135,10 @@ export default {
return ( return (
<div> <div>
<el-input type="textarea" readonly={!!(row.target && row.target.is_fixed)} autosize={{ minRows: 1, maxRows: 3 }} vModel={row.evaluation_way}> <el-input type="textarea" autosize={{ minRows: 1, maxRows: 3 }} vModel={row.evaluation_way}>
</el-input> </el-input>
<el-button style="float: right;margin-top: 4px;" <el-button style="float: right;margin-top: 4px;"
size="small" size="small"
disabled={!!(row.target && row.target.is_fixed)}
type="primary" type="primary"
icon="el-icon-edit" icon="el-icon-edit"
on={{ on={{

87
src/views/contract/contractEdit.vue
Unescape View File

@ -176,23 +176,17 @@
<template v-if="!isLedger"> <template v-if="!isLedger">
<el-form-item prop="is_contract" label="是否需要签订合同"> <el-form-item prop="is_contract" label="是否需要签订合同">
<el-switch <el-radio-group v-model="form.is_contract">
v-model="form.is_contract" <el-radio :label="1">是</el-radio>
active-text="是" <el-radio :label="0">否</el-radio>
inactive-text="否" </el-radio-group>
:active-value="1"
:inactive-value="0"
/>
</el-form-item> </el-form-item>
<el-form-item prop="is_simple" label="是否为直接支付"> <el-form-item prop="is_simple" label="是否为直接支付">
<el-switch <el-radio-group v-model="form.is_simple">
v-model="form.is_simple" <el-radio :label="1">是</el-radio>
active-text="是" <el-radio :label="0">否</el-radio>
inactive-text="否" </el-radio-group>
:active-value="1"
:inactive-value="0"
/>
<span style="flex: 1; text-align: right">（无需采购流程，如水电邮寄费等）</span> <span style="flex: 1; text-align: right">（无需采购流程，如水电邮寄费等）</span>
</el-form-item> </el-form-item>
@ -237,19 +231,13 @@
</el-form-item> </el-form-item>
<el-form-item prop="purchase_type_id" label="采购形式"> <el-form-item prop="purchase_type_id" label="采购形式">
<el-select <el-radio-group v-model="form.purchase_type_id">
ref="purchaseTypeInput" <el-radio
clearable
placeholder="请选择采购形式"
v-model="form.purchase_type_id"
style="width: 100%"
>
<el-option
v-for="item in purchaseType" v-for="item in purchaseType"
:label="item.value" :key="item.id"
:value="item.id" :label="item.id"
></el-option> >{{ item.value }}</el-radio>
</el-select> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item prop="purchase_way_id" label="采购方式"> <el-form-item prop="purchase_way_id" label="采购方式">
@ -313,26 +301,20 @@
prop="use_framework_buy" prop="use_framework_buy"
label="是否使用框架协议采购内容" label="是否使用框架协议采购内容"
> >
<el-switch <el-radio-group v-model="form.use_framework_buy">
v-model="form.use_framework_buy" <el-radio :label="1">是</el-radio>
active-text="是" <el-radio :label="0">否</el-radio>
inactive-text="否" </el-radio-group>
:active-value="1"
:inactive-value="0"
/>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
prop="is_framework" prop="is_framework"
label="是否新生成框架协议" label="是否新生成框架协议"
v-show="isShowIsFramework" v-show="isShowIsFramework"
> >
<el-switch <el-radio-group v-model="form.is_framework">
v-model="form.is_framework" <el-radio :label="1">是</el-radio>
active-text="是" <el-radio :label="0">否</el-radio>
inactive-text="否" </el-radio-group>
:active-value="1"
:inactive-value="0"
/>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
prop="contract_to_contracts" prop="contract_to_contracts"
@ -357,12 +339,10 @@
</template> </template>
<template v-else> <template v-else>
<el-form-item prop="is_contract" label="是否需要签订合同"> <el-form-item prop="is_contract" label="是否需要签订合同">
<el-switch <el-radio-group :value="1">
disabled <el-radio :label="1" disabled>是</el-radio>
:value="true" <el-radio :label="0" disabled>否</el-radio>
active-text="是" </el-radio-group>
inactive-text="否"
/>
</el-form-item> </el-form-item>
<el-form-item prop="contract_type" label="是否需要签订合同"> <el-form-item prop="contract_type" label="是否需要签订合同">
@ -395,12 +375,10 @@
label="是否新生成框架协议" label="是否新生成框架协议"
v-show="isShowIsFramework" v-show="isShowIsFramework"
> >
<el-switch <el-radio-group v-model="form.is_framework">
active-text="是" <el-radio :label="1">是</el-radio>
inactive-text="否" <el-radio :label="0">否</el-radio>
:active-value="1" </el-radio-group>
:inactive-value="0"
/>
</el-form-item> </el-form-item>
</template> </template>
</el-form> </el-form>
@ -1194,7 +1172,7 @@ export default {
}, },
{ {
prop: "purchase_type.value", prop: "purchase_type.value",
label: "采购形势", label: "采购形式",
width: 120, width: 120,
}, },
{ {
@ -1560,8 +1538,9 @@ export default {
isShowIsFramework() { isShowIsFramework() {
let temp1 = this.form.purchase_type_id; let temp1 = this.form.purchase_type_id;
let temp2 = this.form.use_framework_buy; let temp2 = this.form.use_framework_buy;
const selectedPurchaseType = this.purchaseType.find(item => item.id === this.form.purchase_type_id);
if ( if (
this.$refs["purchaseTypeInput"]?.selected?.label === "直接采购" && selectedPurchaseType?.value === "直接采购" &&
this.form.use_framework_buy this.form.use_framework_buy
) { ) {
this.form.is_framework = true; this.form.is_framework = true;

1
vue.config.js
Unescape View File

@ -39,7 +39,6 @@ module.exports = {
// outputDir：构建生成的生产环境静态文件的输出目录。即 npm run build 后，所有打包好的文件会输出到该目录。通常设置为服务器上前端资源实际存放的物理路径。 // outputDir：构建生成的生产环境静态文件的输出目录。即 npm run build 后，所有打包好的文件会输出到该目录。通常设置为服务器上前端资源实际存放的物理路径。
outputDir: process.env.VUE_APP_OUTPUT_DIR || '/www/szemc-budget-execution/backend/public/admin', outputDir: process.env.VUE_APP_OUTPUT_DIR || '/www/szemc-budget-execution/backend/public/admin',
assetsDir: 'static', assetsDir: 'static',
lintOnSave: false, lintOnSave: false,
productionSourceMap: false, productionSourceMap: false,

Write Preview
Loading…
Cancel
Save