Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Support
    • Submit feedback
    • Contribute to GitLab
  • Sign in
B
bims
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 0
    • Issues 0
    • List
    • Boards
    • Labels
    • Milestones
  • Merge Requests 0
    • Merge Requests 0
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • 孙海亮
  • bims
  • Merge Requests
  • !8

Merged
Opened 3 years ago by 吴婷慧@wutinghui
  • Report abuse
Report abuse

ECCS-1534完成

Request to merge ECCS-1534 into master
  • Email patches
  • Plain diff

Merged by 孙海亮 3 years ago

The changes were merged into master with 2cce847b

The source branch has been deleted

  • Discussion 0
  • Commits 1
  • Changes 4
  • 孙海亮 @sunhailiang merged 3 years ago

    merged

  • 孙海亮 @sunhailiang mentioned in commit 2cce847b 3 years ago

    mentioned in commit 2cce847b

  • You're only seeing other activity in the feed. To add a comment, switch to one of the following options.
Please register or sign in to reply
Viewing commit 3a4265c9
4 Files
39
14
Show latest version
File browser
Compare changes
src/views/welfare
edit
components
benefits
index.vue +3 -5
condition
index.vue +19 -7
index.vue +1 -1
info/components/condition
index.vue +16 -1
  • WindyWTH
    ECCS-1534完成 · 3a4265c9
    WindyWTH authored 3 years ago
    3a4265c9
src/views/welfare/edit/components/benefits/index.vue
3
5
Show all lines
</a-col>
<a-col :md="12">
<a-form-model-item label="福利项目" prop="benefitCode">
<a-select v-model="editForm.benefitCode" show-search allow-clear :filterOption="filterCode" :mode="editForm.id ? '' : multiple">
<a-select v-model="editForm.benefitCode" show-search allow-clear :filterOption="filterCode" :mode="editForm.id ? '' : 'multiple'">
<a-select-option v-for="item in benefitCode" :key="item.benefitCode + item.description" :value="item.benefitCode">
{{ item.description }}
</a-select-option>
Show all lines
corpCode: this.formData.corpCode,
planCode: this.formData.planCode,
coverageCode: this.formData.coverageCode,
benefitCode: '',
benefitCode: undefined,
isDirect: "N",
status: "1",
};
this._getBenefitCode();
this.editForm = this.$lodash.cloneDeep(data);
this.editForm.benefitCode = this.editForm.benefitCode ? this.editForm.benefitCode.split(',') : this.editForm.benefitCode
// this.editForm.benefitCode = this.editForm.benefitCode ? this.editForm.benefitCode.split(',') : this.editForm.benefitCode
this.isBenefitEditShow = true;
console.log(this.editForm)
},
cancel() {
this.$refs.editForm.resetFields();
Show all lines
const data = {
...this.editForm,
benefitCode: id || id === 0 ? benefitCode : benefitCode.join(',')
}
this._editBenefitData(data);
});
Show all lines
src/views/welfare/edit/components/condition/index.vue
19
7
Show all lines
</a-row> -->
<a-form-model-item label="币种">
<a-select v-model="editForm.currency" show-search allow-clear :filterOption="filterCode">
<a-select-option v-for="item in currencyCode" :key="item.code + item.name" :value="item.code">
{{ item.name }}
<a-select-option v-for="item in currencyCode" :key="item.refcd" :value="item.refcd">
{{ item.descCh }}
</a-select-option>
</a-select>
</a-form-model-item>
Show all lines
if (row.limitCode.indexOf('07') === 0) {
return val + '%'
}
return val
for(let i = 0; i < this.currencyCode.length; i ++) {
if (this.currencyCode[i].refcd === row.currency) {
return val + this.currencyCode[i].descCh
}
}
return val + row.currency
} },
{ title: "备注", dataIndex: "remark" },
{
Show all lines
editForm: {},
frequencyCode: [],
limitCode: [],
currencyCode: [
{ code: "RMB", name: "人民币" },
{ code: "US", name: "美金" },
],
currencyCode: [],
statusCode: [
{ code: "1", name: "有效" },
{ code: "2", name: "无效" },
Show all lines
},
mounted() {
this._getConditionList();
this._getRefcdByRefgrp()
},
methods: {
// 选择框筛选
Show all lines
}
});
},
// 获取币种列表
_getRefcdByRefgrp() {
this.$apis.GETREFCDBYREFGRP({
modid: "CI",
refgrp: "CURRENCY_TYPE"
}).then((res) => {
this.currencyCode = res.content || [];
});
},
},
};
</script>
Show all lines
src/views/welfare/edit/index.vue
1
1
Show all lines
:columns="columns"
:locale="{ emptyText: 'No Data' }"
:data-source="planData"
row-key="coverageCode"
row-key="id"
:pagination="false"
>
<template slot="operation" slot-scope="record">
Show all lines
src/views/welfare/info/components/condition/index.vue
16
1
Show all lines
if (row.limitCode.indexOf('07') === 0) {
return val + '%'
}
return val
for(let i = 0; i < this.currencyCode.length; i ++) {
if (this.currencyCode[i].refcd === row.currency) {
return val + this.currencyCode[i].descCh
}
}
return val + row.currency
}},
{ title: "剩余金额", dataIndex: "leftValue" },
{ title: "备注", dataIndex: "remark" }
Show all lines
};
},
mounted() {
this._getRefcdByRefgrp()
this._getConditionList();
},
methods: {
Show all lines
this.conditionList = res.content || [];
});
},
// 获取币种列表
_getRefcdByRefgrp() {
this.$apis.GETREFCDBYREFGRP({
modid: "CI",
refgrp: "CURRENCY_TYPE"
}).then((res) => {
this.currencyCode = res.content || [];
});
},
},
};
</script>
Show all lines
0 Assignees
None
Assign to
None
Milestone
None
Assign milestone
None
Time tracking
No estimate or time spent
0
Labels
None
Assign labels
  • View project labels
Lock merge request
Unlocked
2
2 participants
user avatar
孙海亮
user avatar
吴婷慧
Reference: sunhailiang/bims!8

Revert this merge request

This will create a new commit in order to revert the existing changes.

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.