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

预算绩效申报功能优化

Browse Source
dev^2
weizong song 2 days 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_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

39
.env.staging
Unescape View File

@ -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)

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

@ -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
}

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

@ -107,17 +107,7 @@
</el-dropdown>
</template>
<el-dropdown @command="command => {
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();
}
}">
<el-dropdown @command="command => openDetailOverview(command, scope.row)">
<Button style="margin-left: 4px;" size="small" type="primary">
查看总览<i class="el-icon-arrow-down el-icon--right"></i>
</Button>
@ -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(_ => {

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

@ -135,11 +135,10 @@ export default {
return (
<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-button style="float: right;margin-top: 4px;"
size="small"
disabled={!!(row.target && row.target.is_fixed)}
type="primary"
icon="el-icon-edit"
on={{

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

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

1
vue.config.js
Unescape View File

@ -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,

Write Preview
Loading…
Cancel
Save