n20-common-lib 2.4.5 → 2.4.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/nstc-g6/components/Calendar/index.js +5 -5
- package/nstc-g6/components/Calendar/src/basic/month-table.vue +12 -20
- package/nstc-g6/components/Calendar/src/basic/year-table.vue +18 -22
- package/nstc-g6/components/Calendar/src/main.vue +1 -5
- package/nstc-g6/components/DialogForm/index.js +5 -5
- package/nstc-g6/components/DialogForm/src/demo/index.vue +18 -27
- package/nstc-g6/components/DialogForm/src/main.vue +15 -21
- package/nstc-g6/components/Form/A_DEMO/component/originalForm.vue +35 -50
- package/nstc-g6/components/Form/A_DEMO/config/config_3.js +1115 -1110
- package/nstc-g6/components/Form/A_DEMO/index.vue +7 -29
- package/nstc-g6/components/Form/AutocompleteCustom/index.vue +3 -5
- package/nstc-g6/components/Form/BusinessSpecific/InputMultiple.vue +60 -62
- package/nstc-g6/components/Form/BusinessSpecific/InputWithUnit.vue +12 -35
- package/nstc-g6/components/Form/BusinessSpecific/SelectTreeDialog.vue +77 -77
- package/nstc-g6/components/Form/CascaderCustom/index.vue +4 -4
- package/nstc-g6/components/Form/CheckboxCustom/index.vue +5 -11
- package/nstc-g6/components/Form/Component.vue +56 -78
- package/nstc-g6/components/Form/ComponentSecond.vue +55 -77
- package/nstc-g6/components/Form/InputAndDialog/index.js +5 -5
- package/nstc-g6/components/Form/InputAndDialog/src/main.vue +130 -153
- package/nstc-g6/components/Form/InputCustom/demo/index.vue +4 -12
- package/nstc-g6/components/Form/InputCustom/index.vue +51 -54
- package/nstc-g6/components/Form/IntervalinputCustom/demo/index.vue +1 -3
- package/nstc-g6/components/Form/IntervalinputCustom/index.vue +19 -41
- package/nstc-g6/components/Form/Item.vue +15 -30
- package/nstc-g6/components/Form/ItemSecond.vue +7 -22
- package/nstc-g6/components/Form/List.vue +12 -28
- package/nstc-g6/components/Form/ListSecond.vue +11 -27
- package/nstc-g6/components/Form/RadioCustom/index.vue +5 -23
- package/nstc-g6/components/Form/SelectAccount/index.js +5 -5
- package/nstc-g6/components/Form/SelectAccount/src/demo/index.vue +34 -28
- package/nstc-g6/components/Form/SelectAccount/src/main.vue +112 -83
- package/nstc-g6/components/Form/SelectAndDialog/index.js +5 -5
- package/nstc-g6/components/Form/SelectAndDialog/src/main.vue +126 -149
- package/nstc-g6/components/Form/SelectCashFlow/index.js +5 -5
- package/nstc-g6/components/Form/SelectCashFlow/src/demo/index.vue +18 -19
- package/nstc-g6/components/Form/SelectCashFlow/src/main.vue +52 -41
- package/nstc-g6/components/Form/SelectCustom/demo/index.vue +14 -16
- package/nstc-g6/components/Form/SelectCustom/index.vue +129 -139
- package/nstc-g6/components/Form/SelectSubject/index.js +5 -5
- package/nstc-g6/components/Form/SelectSubject/src/demo/index.vue +42 -48
- package/nstc-g6/components/Form/SelectSubject/src/main.vue +83 -86
- package/nstc-g6/components/Form/SelectindialogCustom/demo/index.vue +34 -35
- package/nstc-g6/components/Form/SelectindialogCustom/index.vue +133 -148
- package/nstc-g6/components/Form/SelectindialogCustom/install.js +3 -3
- package/nstc-g6/components/Form/TableRadioCustom/demo/index.vue +1 -7
- package/nstc-g6/components/Form/TableRadioCustom/index.vue +17 -26
- package/nstc-g6/components/Form/TextCustom/index.vue +2 -2
- package/nstc-g6/components/Form/UploadCustom/demo/index.vue +1 -3
- package/nstc-g6/components/Form/UploadCustom/index.vue +143 -173
- package/nstc-g6/components/Form/configs.js +3 -14
- package/nstc-g6/components/Form/configsSecond.js +3 -16
- package/nstc-g6/components/Form/index.js +1 -1
- package/nstc-g6/components/Form/payeePersonSelect/index.js +5 -5
- package/nstc-g6/components/Form/payeePersonSelect/src/demo/index.vue +50 -44
- package/nstc-g6/components/Form/payeePersonSelect/src/main.vue +73 -82
- package/nstc-g6/components/FormGroup/index.js +5 -5
- package/nstc-g6/components/FormGroup/src/demo/config.js +18 -19
- package/nstc-g6/components/FormGroup/src/demo/index.vue +14 -22
- package/nstc-g6/components/FormGroup/src/main.vue +122 -141
- package/nstc-g6/components/FormGroup/src/validate.js +11 -13
- package/nstc-g6/components/InputTag/InputTag.vue +78 -111
- package/nstc-g6/components/NstcBackToTop/NstcBackToTop.vue +24 -24
- package/nstc-g6/components/NstcBranchLazyLoad/NstcBranchLazyLoad.vue +4 -13
- package/nstc-g6/components/NstcCharts/NstcCharts.vue +9 -18
- package/nstc-g6/components/NstcCharts/define.js +1 -6
- package/nstc-g6/components/NstcConfirm/NstcConfirm.vue +6 -21
- package/nstc-g6/components/NstcConfirm/index.js +21 -19
- package/nstc-g6/components/NstcDialog/NstcDialog.vue +34 -38
- package/nstc-g6/components/NstcDialogForm/NstcDialogForm.vue +17 -21
- package/nstc-g6/components/NstcDialogTable/NstcDialogTable.vue +4 -17
- package/nstc-g6/components/NstcDropdown/NstcDropdown.vue +2 -12
- package/nstc-g6/components/NstcDropdownTree/NstcDropdownTree.vue +3 -13
- package/nstc-g6/components/NstcElectronicFile/NstcElectronicFile.vue +18 -78
- package/nstc-g6/components/NstcExcelCustomImport/NstcExcelCustomImport.vue +121 -147
- package/nstc-g6/components/NstcExcelImport/NstcExcelImport.vue +9 -31
- package/nstc-g6/components/NstcExcelImportN/NstcExcelImportN.vue +10 -33
- package/nstc-g6/components/NstcExpandCollapse/NstcExpandCollapse.vue +12 -16
- package/nstc-g6/components/NstcFileUpload/NstcFileUpload.vue +19 -75
- package/nstc-g6/components/NstcForm/A_DEMO/component/originalForm.vue +35 -50
- package/nstc-g6/components/NstcForm/A_DEMO/config/config_3.js +1115 -1110
- package/nstc-g6/components/NstcForm/A_DEMO/index.vue +340 -354
- package/nstc-g6/components/NstcForm/AutocompleteCustom/index.vue +2 -2
- package/nstc-g6/components/NstcForm/BusinessSpecific/InputWithUnit.vue +11 -34
- package/nstc-g6/components/NstcForm/BusinessSpecific/SelectTreeDialog.vue +77 -77
- package/nstc-g6/components/NstcForm/CheckboxCustom/index.vue +5 -11
- package/nstc-g6/components/NstcForm/Component.vue +17 -62
- package/nstc-g6/components/NstcForm/ComponentSecond.vue +55 -77
- package/nstc-g6/components/NstcForm/InputAndDialog/NstcInputAndDialog.vue +6 -24
- package/nstc-g6/components/NstcForm/InputCustom/index.vue +2 -8
- package/nstc-g6/components/NstcForm/IntervalInputCustom/index.vue +4 -21
- package/nstc-g6/components/NstcForm/Item.vue +3 -15
- package/nstc-g6/components/NstcForm/ItemSecond.vue +7 -22
- package/nstc-g6/components/NstcForm/List.vue +12 -28
- package/nstc-g6/components/NstcForm/ListSecond.vue +11 -27
- package/nstc-g6/components/NstcForm/RadioCustom/index.vue +5 -23
- package/nstc-g6/components/NstcForm/SelectAccount/NstcSelectAccount.vue +4 -24
- package/nstc-g6/components/NstcForm/SelectAndDialog/NstcSelectAndDialog.vue +7 -30
- package/nstc-g6/components/NstcForm/SelectCashFlow/NstcSelectCashFlow.vue +50 -38
- package/nstc-g6/components/NstcForm/SelectCustom/index.vue +6 -16
- package/nstc-g6/components/NstcForm/SelectSubject/NstcSelectSubject.vue +72 -82
- package/nstc-g6/components/NstcForm/SelectindialogCustom/index.vue +6 -20
- package/nstc-g6/components/NstcForm/TableRadioCustom/index.vue +17 -26
- package/nstc-g6/components/NstcForm/TextCustom/index.vue +2 -2
- package/nstc-g6/components/NstcForm/UploadCustom/index.vue +13 -60
- package/nstc-g6/components/NstcForm/configs.js +3 -14
- package/nstc-g6/components/NstcForm/configsSecond.js +3 -16
- package/nstc-g6/components/NstcForm/index.js +1 -1
- package/nstc-g6/components/NstcForm/payeePersonSelect/NstcPayeePerson.vue +57 -73
- package/nstc-g6/components/NstcPagination/NstcPagination.vue +2 -12
- package/nstc-g6/components/NstcScreenFull/NstcScreenFull.vue +2 -3
- package/nstc-g6/components/NstcSelectTree/NstcSelectTree.vue +4 -15
- package/nstc-g6/components/NstcSelectTreeList/NstcSelectTreeList.vue +5 -20
- package/nstc-g6/components/NstcSticky/NstcSticky.vue +10 -4
- package/nstc-g6/components/NstcSvgIcon/NstcSvgIcon.vue +1 -7
- package/nstc-g6/components/NstcTab/NstcTab.vue +8 -20
- package/nstc-g6/components/NstcTabWithBadge/NstcTabWithBadge.vue +7 -7
- package/nstc-g6/components/NstcTable/ElTableColumnCustom/index.vue +88 -126
- package/nstc-g6/components/NstcTable/NstcTable.vue +4 -17
- package/nstc-g6/components/NstcTableSet/NstcTableSet.vue +27 -72
- package/nstc-g6/components/NstcThemePicker/NstcThemePicker.vue +13 -14
- package/nstc-g6/components/NstcUploadCustomExcel/NstcUploadCustomExcel.vue +3 -13
- package/nstc-g6/components/NstcUploadExcel/NstcUploadExcel.vue +21 -22
- package/nstc-g6/components/NstcWorkBench/NstcWorkBench.vue +4 -17
- package/nstc-g6/components/Search/NstcSearch.vue +12 -47
- package/nstc-g6/components/Search/src/demo/index copy.vue +28 -28
- package/nstc-g6/components/Search/src/demo/index.vue +36 -36
- package/nstc-g6/components/Search/src/main copy.vue +169 -204
- package/nstc-g6/components/approvelTwo/main.vue +2 -6
- package/nstc-g6/components/approvelTwo/progress.vue +7 -29
- package/nstc-g6/directives/VCopy/index.js +52 -54
- package/nstc-g6/directives/VNstcNumber/index.js +1 -1
- package/nstc-g6/directives/VNstcNumber/temp.js +357 -362
- package/nstc-g6/utils/mapper_aims.js +774 -775
- package/nstc-g6/utils/parseTime.js +38 -36
- package/nstc-g6/utils/validate/index.js +2 -2
- package/nstc-g6/utils/vendor/Export2Excel.js +110 -111
- package/nstc-g6/utils/vendor/Export2Zip.js +12 -7
- package/nstc-g6/utils/vue-bus.js +1 -1
- package/package.json +1 -1
- package/src/assets/iconFont/demo_index.html +1 -1
- package/src/assets/iconFont/iconfont.js +66 -1
- package/src/assets/iconFont2/demo_index.html +277 -286
- package/src/assets/iconFont2/iconfont.js +66 -1
- package/src/components/Button/button-group.vue +1 -1
- package/src/components/Layout/HeaderWrap/indexN.vue +1 -1
- package/src/components/Layout/indexN.vue +1 -2
- package/src/components/LoginTemporary/indexN.vue +12 -2
- package/src/components/TableOperateColumn/index.vue +1 -1
- package/src/plugins/Print/print-js/README.md +5 -5
- package/src/plugins/Print/print-js/package.json +2 -2
- package/src/plugins/Print/print-js/src/index.d.ts +36 -36
- package/src/plugins/Print/print-js/src/js/browser.js +3 -1
- package/src/plugins/Print/print-js/src/js/functions.js +16 -10
- package/src/plugins/Print/print-js/src/js/html.js +2 -2
- package/src/plugins/Print/print-js/src/js/image.js +1 -1
- package/src/plugins/Print/print-js/src/js/init.js +15 -7
- package/src/plugins/Print/print-js/src/js/json.js +14 -4
- package/src/plugins/Print/print-js/src/js/modal.js +16 -15
- package/src/plugins/Print/print-js/src/js/pdf.js +1 -1
- package/src/plugins/Print/print-js/src/js/print.js +6 -6
- package/src/plugins/Sign/NetSM3/InfosecNetSignCNGAgent.min.js +1825 -1592
- package/src/plugins/Sign/cfca/index.js +525 -520
- package/src/plugins/Sign/sign.js +128 -128
- package/style/index.css +1 -1
- package/style/index.css.map +1 -1
- package/theme/blue.css +1 -1
- package/theme/cctcRed.css +1 -1
- package/theme/green.css +1 -1
- package/theme/lightBlue.css +1 -1
- package/theme/orange.css +1 -1
- package/theme/purple.css +1 -1
- package/theme/red.css +1 -1
- package/theme/yellow.css +1 -1
|
@@ -2,36 +2,28 @@
|
|
|
2
2
|
<div class="form-base-wrapper">
|
|
3
3
|
<template v-for="(item, idx) in config">
|
|
4
4
|
<template v-if="Array.isArray(item)">
|
|
5
|
-
<div
|
|
6
|
-
:key="'inlineItem' + idx"
|
|
7
|
-
class="form-group"
|
|
8
|
-
>
|
|
5
|
+
<div :key="'inlineItem' + idx" class="form-group">
|
|
9
6
|
<template v-for="(iItem, index) in item">
|
|
10
7
|
<BaseItem
|
|
11
8
|
v-if="iItem.renderable !== false"
|
|
12
|
-
|
|
13
|
-
:key="iItem.mold + '-' + (iItem.prop ? iItem.prop : (idx + '-' + index))"
|
|
14
|
-
|
|
9
|
+
:key="iItem.mold + '-' + (iItem.prop ? iItem.prop : idx + '-' + index)"
|
|
15
10
|
v-model="value"
|
|
16
|
-
|
|
17
11
|
:class="[
|
|
18
12
|
'form-item',
|
|
19
13
|
`form-item-${iItem.mold}`,
|
|
20
14
|
{
|
|
21
|
-
'form-item-link':
|
|
15
|
+
'form-item-link':
|
|
16
|
+
iItem.link &&
|
|
17
|
+
((Array.isArray(iItem.link) && iItem.link.some((link) => link.mold)) || iItem.link.mold)
|
|
22
18
|
},
|
|
23
19
|
`form-item-${iItem.mold}-${iItem.prop ? iItem.prop : idx + '-' + index}`
|
|
24
20
|
]"
|
|
25
|
-
|
|
26
21
|
:popper-class="popperClass"
|
|
27
|
-
|
|
28
22
|
:item="iItem"
|
|
29
23
|
:resets.sync="resets"
|
|
30
24
|
:disableds="disableds"
|
|
31
|
-
|
|
32
25
|
:loading="loading"
|
|
33
|
-
|
|
34
|
-
@after-leave="val => $emit('after-leave', val)"
|
|
26
|
+
@after-leave="(val) => $emit('after-leave', val)"
|
|
35
27
|
@query-click="$emit('query-click')"
|
|
36
28
|
@add-click="$emit('add-click')"
|
|
37
29
|
@other-click="$emit('other-click')"
|
|
@@ -44,31 +36,24 @@
|
|
|
44
36
|
<template v-else>
|
|
45
37
|
<BaseItem
|
|
46
38
|
v-if="item.renderable !== false"
|
|
47
|
-
|
|
48
39
|
:key="item.mold + '-' + (item.prop ? item.prop : idx)"
|
|
49
|
-
|
|
50
40
|
v-model="value"
|
|
51
|
-
|
|
52
41
|
:class="[
|
|
53
42
|
'form-item',
|
|
54
43
|
`form-item-${item.mold}`,
|
|
55
44
|
{
|
|
56
|
-
'form-item-link':
|
|
45
|
+
'form-item-link':
|
|
46
|
+
item.link && ((Array.isArray(item.link) && item.link.some((link) => link.mold)) || item.link.mold)
|
|
57
47
|
},
|
|
58
48
|
`form-item-${item.mold}-${item.prop ? item.prop : idx}`
|
|
59
49
|
]"
|
|
60
|
-
|
|
61
50
|
:popper-class="popperClass"
|
|
62
|
-
|
|
63
51
|
:item="item"
|
|
64
52
|
:resets.sync="resets"
|
|
65
53
|
:disableds="disableds"
|
|
66
|
-
|
|
67
54
|
:loading="loading"
|
|
68
|
-
|
|
69
55
|
:from="from"
|
|
70
|
-
|
|
71
|
-
@after-leave="val => $emit('after-leave', val)"
|
|
56
|
+
@after-leave="(val) => $emit('after-leave', val)"
|
|
72
57
|
@query-click="$emit('query-click')"
|
|
73
58
|
@add-click="$emit('add-click')"
|
|
74
59
|
@other-click="$emit('other-click')"
|
|
@@ -80,7 +65,6 @@
|
|
|
80
65
|
</template>
|
|
81
66
|
|
|
82
67
|
<script>
|
|
83
|
-
|
|
84
68
|
import BaseItem from './ItemSecond'
|
|
85
69
|
|
|
86
70
|
export default {
|
|
@@ -95,11 +79,11 @@ export default {
|
|
|
95
79
|
props: {
|
|
96
80
|
from: {
|
|
97
81
|
type: String,
|
|
98
|
-
default: null
|
|
82
|
+
default: null
|
|
99
83
|
},
|
|
100
84
|
config: {
|
|
101
85
|
type: Array,
|
|
102
|
-
default: () =>
|
|
86
|
+
default: () => []
|
|
103
87
|
},
|
|
104
88
|
|
|
105
89
|
loading: {
|
|
@@ -1,26 +1,10 @@
|
|
|
1
1
|
<template>
|
|
2
|
-
<el-radio-group
|
|
3
|
-
v-model="_value"
|
|
4
|
-
v-bind="$attrs"
|
|
5
|
-
:style="{width:parseFloat(width) + 'px'}"
|
|
6
|
-
v-on="$listeners"
|
|
7
|
-
>
|
|
2
|
+
<el-radio-group v-model="_value" v-bind="$attrs" :style="{ width: parseFloat(width) + 'px' }" v-on="$listeners">
|
|
8
3
|
<template v-for="item in options">
|
|
9
|
-
<el-radio-button
|
|
10
|
-
v-if="type === 'button'"
|
|
11
|
-
:key="item.value"
|
|
12
|
-
:label="item.value"
|
|
13
|
-
:disabled="item.disabled"
|
|
14
|
-
>
|
|
4
|
+
<el-radio-button v-if="type === 'button'" :key="item.value" :label="item.value" :disabled="item.disabled">
|
|
15
5
|
{{ item.label }}
|
|
16
6
|
</el-radio-button>
|
|
17
|
-
<el-radio
|
|
18
|
-
v-else
|
|
19
|
-
:key="item.value"
|
|
20
|
-
:label="item.value"
|
|
21
|
-
:disabled="item.disabled"
|
|
22
|
-
:border="type === 'border'"
|
|
23
|
-
>
|
|
7
|
+
<el-radio v-else :key="item.value" :label="item.value" :disabled="item.disabled" :border="type === 'border'">
|
|
24
8
|
{{ item.label }}
|
|
25
9
|
</el-radio>
|
|
26
10
|
</template>
|
|
@@ -39,7 +23,7 @@ export default {
|
|
|
39
23
|
|
|
40
24
|
type: {
|
|
41
25
|
default: 'normal',
|
|
42
|
-
validator: function(val) {
|
|
26
|
+
validator: function (val) {
|
|
43
27
|
return ['normal', 'border', 'button'].includes(val)
|
|
44
28
|
}
|
|
45
29
|
},
|
|
@@ -68,6 +52,4 @@ export default {
|
|
|
68
52
|
}
|
|
69
53
|
</script>
|
|
70
54
|
|
|
71
|
-
<style scoped>
|
|
72
|
-
|
|
73
|
-
</style>
|
|
55
|
+
<style scoped></style>
|
|
@@ -6,10 +6,10 @@
|
|
|
6
6
|
* @Description: 选择账号输入弹窗
|
|
7
7
|
* @FilePath: \nstc_g6_common\packages\Form\SelectAccount\index.js
|
|
8
8
|
*/
|
|
9
|
-
import NstcSelectAccount from
|
|
9
|
+
import NstcSelectAccount from './src/main.vue'
|
|
10
10
|
|
|
11
|
-
NstcSelectAccount.install = function(Vue) {
|
|
12
|
-
Vue.component(NstcSelectAccount.name, NstcSelectAccount)
|
|
13
|
-
}
|
|
11
|
+
NstcSelectAccount.install = function (Vue) {
|
|
12
|
+
Vue.component(NstcSelectAccount.name, NstcSelectAccount)
|
|
13
|
+
}
|
|
14
14
|
|
|
15
|
-
export default NstcSelectAccount
|
|
15
|
+
export default NstcSelectAccount
|
|
@@ -7,52 +7,58 @@
|
|
|
7
7
|
* @FilePath: \settle\src\cmmon-components\demo.vue
|
|
8
8
|
-->
|
|
9
9
|
<template>
|
|
10
|
-
<div>
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
10
|
+
<div>
|
|
11
|
+
{{ selectOpt }}
|
|
12
|
+
<NstcSelectAccount
|
|
13
|
+
v-model="account"
|
|
14
|
+
:ch-mapper="labelconf"
|
|
15
|
+
:query-conf="accountConf"
|
|
16
|
+
:agencyOptionsConf="agencyOptionsConf"
|
|
17
|
+
:selectOpt="selectOpt"
|
|
18
|
+
@confirm="confirm"
|
|
19
|
+
/>
|
|
20
|
+
</div>
|
|
14
21
|
</template>
|
|
15
22
|
|
|
16
23
|
<script>
|
|
17
|
-
import NstcSelectAccount from
|
|
24
|
+
import NstcSelectAccount from '../main.vue'
|
|
18
25
|
export default {
|
|
19
26
|
components: { NstcSelectAccount },
|
|
20
27
|
data() {
|
|
21
28
|
return {
|
|
22
|
-
account:
|
|
29
|
+
account: '',
|
|
23
30
|
accountConf: {
|
|
24
|
-
url:
|
|
31
|
+
url: 'http://192.168.20.109:8080/api/nstc-tss/1.0/settle/account/list',
|
|
25
32
|
defaultParam: {
|
|
26
|
-
diabledValue:'001'
|
|
27
|
-
}
|
|
33
|
+
diabledValue: '001' // 开户机构由外部带入diaabled
|
|
34
|
+
}
|
|
28
35
|
},
|
|
29
36
|
selectOpt: {},
|
|
30
37
|
labelconf: {
|
|
31
|
-
title:
|
|
32
|
-
plcInput:
|
|
33
|
-
plcSelect:
|
|
34
|
-
noselectmsg:
|
|
35
|
-
accountAgencyLabel:
|
|
36
|
-
accountLabel:
|
|
37
|
-
accountNameLabel:
|
|
38
|
-
accountNameTableLabel:
|
|
38
|
+
title: '选择账号',
|
|
39
|
+
plcInput: '请输入',
|
|
40
|
+
plcSelect: '请选择',
|
|
41
|
+
noselectmsg: '请选择账号',
|
|
42
|
+
accountAgencyLabel: '开户机构',
|
|
43
|
+
accountLabel: '账号',
|
|
44
|
+
accountNameLabel: '账户名',
|
|
45
|
+
accountNameTableLabel: '户名'
|
|
39
46
|
},
|
|
40
|
-
agencyOptionsConf:{
|
|
41
|
-
url:
|
|
42
|
-
method:
|
|
47
|
+
agencyOptionsConf: {
|
|
48
|
+
url: '/api/nstc-tss/1.0/common/drop/organ',
|
|
49
|
+
method: 'GET',
|
|
43
50
|
defaultParam: {
|
|
44
51
|
// orgName:''
|
|
45
52
|
}
|
|
46
|
-
}
|
|
47
|
-
}
|
|
53
|
+
}
|
|
54
|
+
}
|
|
48
55
|
},
|
|
49
|
-
methods:{
|
|
56
|
+
methods: {
|
|
50
57
|
confirm(opt) {
|
|
51
|
-
console.log(opt,'----------opt')
|
|
52
|
-
}
|
|
58
|
+
console.log(opt, '----------opt')
|
|
59
|
+
}
|
|
53
60
|
}
|
|
54
|
-
}
|
|
61
|
+
}
|
|
55
62
|
</script>
|
|
56
63
|
|
|
57
|
-
<style>
|
|
58
|
-
</style>
|
|
64
|
+
<style></style>
|
|
@@ -7,13 +7,29 @@
|
|
|
7
7
|
* @FilePath: NstcSelectCashFlow.vue
|
|
8
8
|
-->
|
|
9
9
|
<template>
|
|
10
|
-
<SelectAndDialog
|
|
10
|
+
<SelectAndDialog
|
|
11
|
+
v-model="_value"
|
|
12
|
+
ref="select"
|
|
13
|
+
v-bind="bindProps"
|
|
14
|
+
:lazyLoad="true"
|
|
15
|
+
:table-form="formSearch"
|
|
16
|
+
:format-data="formatData"
|
|
17
|
+
:format-params="formatParams"
|
|
18
|
+
@show-dialog="onShowDialog"
|
|
19
|
+
@comfirm="selectOption"
|
|
20
|
+
>
|
|
11
21
|
<div class="form-wrap">
|
|
12
22
|
<el-form inline :model="formSearch" :label-width="labelWidth">
|
|
13
23
|
<el-row>
|
|
14
24
|
<el-col :span="8">
|
|
15
25
|
<el-form-item :label="chMapper.accountAgencyLabel">
|
|
16
|
-
<el-select
|
|
26
|
+
<el-select
|
|
27
|
+
:placeholder="chMapper.plcSelect"
|
|
28
|
+
v-model="formSearch.brNo"
|
|
29
|
+
filterable
|
|
30
|
+
clearable
|
|
31
|
+
:disabled="queryConf.defaultParam.diabledValue ? true : false"
|
|
32
|
+
>
|
|
17
33
|
<el-option v-for="item in agencyOptionsArr" :key="item.orgNo" :label="item.orgName" :value="item.orgNo">
|
|
18
34
|
</el-option>
|
|
19
35
|
</el-select>
|
|
@@ -21,20 +37,34 @@
|
|
|
21
37
|
</el-col>
|
|
22
38
|
<el-col :span="8">
|
|
23
39
|
<el-form-item :label="chMapper.accountLabel">
|
|
24
|
-
<el-input
|
|
40
|
+
<el-input
|
|
41
|
+
:placeholder="chMapper.plcInput"
|
|
42
|
+
v-model="formSearch.accountNo"
|
|
43
|
+
maxlength="64"
|
|
44
|
+
clearable
|
|
45
|
+
></el-input>
|
|
25
46
|
</el-form-item>
|
|
26
47
|
</el-col>
|
|
27
48
|
</el-row>
|
|
28
49
|
<el-row>
|
|
29
50
|
<el-col :span="20">
|
|
30
51
|
<el-form-item :label="chMapper.accountNameLabel">
|
|
31
|
-
<el-input
|
|
52
|
+
<el-input
|
|
53
|
+
:placeholder="chMapper.plcInput"
|
|
54
|
+
v-model="formSearch.accountName"
|
|
55
|
+
maxlength="64"
|
|
56
|
+
clearable
|
|
57
|
+
></el-input>
|
|
32
58
|
</el-form-item>
|
|
33
59
|
</el-col>
|
|
34
60
|
<el-col :span="4">
|
|
35
61
|
<div class="search-btn">
|
|
36
|
-
<el-button type="primary" class="nstc-g6-common-btn-1" @click="searchClick">{{
|
|
37
|
-
|
|
62
|
+
<el-button type="primary" class="nstc-g6-common-btn-1" @click="searchClick">{{
|
|
63
|
+
$t(`common_w_0034`)
|
|
64
|
+
}}</el-button>
|
|
65
|
+
<el-button class="nstc-g6-common-btn-3" style="margin-left: 8px" @click="queryReset">{{
|
|
66
|
+
$t(`common_w_0037`)
|
|
67
|
+
}}</el-button>
|
|
38
68
|
</div>
|
|
39
69
|
</el-col>
|
|
40
70
|
</el-row>
|
|
@@ -44,10 +74,10 @@
|
|
|
44
74
|
</template>
|
|
45
75
|
|
|
46
76
|
<script>
|
|
47
|
-
import request from
|
|
48
|
-
import SelectAndDialog from
|
|
77
|
+
import request from '@/utils/request'
|
|
78
|
+
import SelectAndDialog from '^/Form/SelectAndDialog/src/main.vue'
|
|
49
79
|
export default {
|
|
50
|
-
name:
|
|
80
|
+
name: 'NstcSelectAccount',
|
|
51
81
|
components: { SelectAndDialog },
|
|
52
82
|
props: {
|
|
53
83
|
value: String,
|
|
@@ -65,35 +95,35 @@ export default {
|
|
|
65
95
|
},
|
|
66
96
|
valueKey: {
|
|
67
97
|
type: String,
|
|
68
|
-
default:
|
|
98
|
+
default: 'accountNo'
|
|
69
99
|
},
|
|
70
100
|
labelKey: {
|
|
71
101
|
type: String,
|
|
72
|
-
default:
|
|
102
|
+
default: 'accountNo'
|
|
73
103
|
},
|
|
74
104
|
rowKey: {
|
|
75
105
|
type: String,
|
|
76
|
-
default:
|
|
106
|
+
default: 'accountId'
|
|
77
107
|
},
|
|
78
108
|
optionKey: {
|
|
79
109
|
type: String,
|
|
80
|
-
default:
|
|
110
|
+
default: 'subjectNo'
|
|
81
111
|
},
|
|
82
112
|
labelWidth: {
|
|
83
113
|
type: String,
|
|
84
|
-
default:
|
|
114
|
+
default: '80px'
|
|
85
115
|
},
|
|
86
116
|
chMapper: {
|
|
87
117
|
type: Object,
|
|
88
118
|
default: () => ({
|
|
89
|
-
title:
|
|
90
|
-
plcInput:
|
|
91
|
-
plcSelect:
|
|
92
|
-
noselectmsg:
|
|
93
|
-
accountAgencyLabel:
|
|
94
|
-
accountLabel:
|
|
95
|
-
accountNameLabel:
|
|
96
|
-
accountNameTableLabel:
|
|
119
|
+
title: '选择账号',
|
|
120
|
+
plcInput: '请输入',
|
|
121
|
+
plcSelect: '请输入或选择',
|
|
122
|
+
noselectmsg: '请选择账号',
|
|
123
|
+
accountAgencyLabel: '开户机构',
|
|
124
|
+
accountLabel: '账号',
|
|
125
|
+
accountNameLabel: '账户名',
|
|
126
|
+
accountNameTableLabel: '户名'
|
|
97
127
|
})
|
|
98
128
|
},
|
|
99
129
|
|
|
@@ -106,32 +136,32 @@ export default {
|
|
|
106
136
|
data() {
|
|
107
137
|
return {
|
|
108
138
|
formSearch: {
|
|
109
|
-
brNo:
|
|
110
|
-
accountNo:
|
|
111
|
-
accountName:
|
|
139
|
+
brNo: '',
|
|
140
|
+
accountNo: '',
|
|
141
|
+
accountName: ''
|
|
112
142
|
},
|
|
113
143
|
showDialog: false,
|
|
114
144
|
inputHovering: false,
|
|
115
145
|
columns: [],
|
|
116
|
-
agencyOptionsArr:[],
|
|
146
|
+
agencyOptionsArr: [],
|
|
117
147
|
options: [],
|
|
118
|
-
remoteQuery:
|
|
119
|
-
searchObj:{
|
|
120
|
-
brNo:
|
|
121
|
-
accountNo:
|
|
122
|
-
accountName:
|
|
148
|
+
remoteQuery: '',
|
|
149
|
+
searchObj: {
|
|
150
|
+
brNo: '',
|
|
151
|
+
accountNo: '',
|
|
152
|
+
accountName: ''
|
|
123
153
|
},
|
|
124
154
|
bindProps: {},
|
|
125
155
|
agencyOptionsArr: []
|
|
126
|
-
}
|
|
156
|
+
}
|
|
127
157
|
},
|
|
128
158
|
computed: {
|
|
129
159
|
_value: {
|
|
130
160
|
set(val) {
|
|
131
|
-
this.$emit(
|
|
161
|
+
this.$emit('input', val)
|
|
132
162
|
},
|
|
133
163
|
get() {
|
|
134
|
-
return this.value
|
|
164
|
+
return this.value
|
|
135
165
|
}
|
|
136
166
|
}
|
|
137
167
|
},
|
|
@@ -152,37 +182,37 @@ export default {
|
|
|
152
182
|
},
|
|
153
183
|
|
|
154
184
|
created() {
|
|
155
|
-
let url =
|
|
185
|
+
let url = '/api/nstc-tss/1.0/settle/account/list'
|
|
156
186
|
let props = {
|
|
157
187
|
columns: [
|
|
158
|
-
{ prop:
|
|
159
|
-
{ prop:
|
|
160
|
-
{ prop:
|
|
188
|
+
{ prop: 'accountNo', label: this.chMapper.accountLabel, align: 'center' },
|
|
189
|
+
{ prop: 'accountName', label: this.chMapper.accountNameTableLabel, align: 'center' },
|
|
190
|
+
{ prop: 'brName', label: this.chMapper.accountAgencyLabel, align: 'center' }
|
|
161
191
|
],
|
|
162
192
|
url: this.queryConf.url || url,
|
|
163
193
|
params: this.queryConf.defaultParam || {},
|
|
164
|
-
httpMethod: this.queryConf.httpMethod ||
|
|
194
|
+
httpMethod: this.queryConf.httpMethod || 'POST',
|
|
165
195
|
rowKey: this.rowKey,
|
|
166
196
|
valueKey: this.valueKey,
|
|
167
197
|
labelKey: this.labelKey,
|
|
168
|
-
chMapper: this.chMapper
|
|
169
|
-
}
|
|
170
|
-
this.bindProps = props
|
|
198
|
+
chMapper: this.chMapper
|
|
199
|
+
}
|
|
200
|
+
this.bindProps = props
|
|
171
201
|
},
|
|
172
202
|
|
|
173
203
|
methods: {
|
|
174
204
|
async agencyOptions() {
|
|
175
|
-
let defaultParam = this.agencyOptionsConf.defaultParam
|
|
176
|
-
let res = await this.queryOptionsApi(defaultParam)
|
|
177
|
-
this.agencyOptionsArr = res
|
|
205
|
+
let defaultParam = this.agencyOptionsConf.defaultParam
|
|
206
|
+
let res = await this.queryOptionsApi(defaultParam)
|
|
207
|
+
this.agencyOptionsArr = res
|
|
178
208
|
},
|
|
179
209
|
|
|
180
210
|
queryOptionsApi(param) {
|
|
181
|
-
const { url, method } = this.agencyOptionsConf
|
|
182
|
-
let body = method ===
|
|
183
|
-
let reqConf = { url, method }
|
|
184
|
-
reqConf[body] = param
|
|
185
|
-
return request(reqConf)
|
|
211
|
+
const { url, method } = this.agencyOptionsConf
|
|
212
|
+
let body = method === 'POST' ? 'data' : 'params'
|
|
213
|
+
let reqConf = { url, method }
|
|
214
|
+
reqConf[body] = param
|
|
215
|
+
return request(reqConf)
|
|
186
216
|
},
|
|
187
217
|
|
|
188
218
|
// formatParams(pageParam) {
|
|
@@ -196,43 +226,43 @@ export default {
|
|
|
196
226
|
// return { ...param,...defaultParam, ...page };
|
|
197
227
|
// },
|
|
198
228
|
formatParams(params) {
|
|
199
|
-
console.log(params,'----------params')
|
|
200
|
-
let size = 20
|
|
201
|
-
let current = 1
|
|
202
|
-
if (params[
|
|
203
|
-
size = params[
|
|
204
|
-
current = params[
|
|
229
|
+
console.log(params, '----------params')
|
|
230
|
+
let size = 20
|
|
231
|
+
let current = 1
|
|
232
|
+
if (params['page.size']) {
|
|
233
|
+
size = params['page.size']
|
|
234
|
+
current = params['page.current']
|
|
205
235
|
}
|
|
206
236
|
if (params.page && params.page.size) {
|
|
207
|
-
size = params.page.size
|
|
208
|
-
current = params.page.current
|
|
237
|
+
size = params.page.size
|
|
238
|
+
current = params.page.current
|
|
209
239
|
}
|
|
210
|
-
let page = {
|
|
211
|
-
if(params.diabledValue
|
|
240
|
+
let page = { pageSize: size, pageNo: current }
|
|
241
|
+
if (params.diabledValue && !params.brNo) {
|
|
212
242
|
params.brNo = params.diabledValue
|
|
213
243
|
}
|
|
214
|
-
return { ...params, ...page }
|
|
244
|
+
return { ...params, ...page }
|
|
215
245
|
},
|
|
216
246
|
|
|
217
247
|
formatData(res) {
|
|
218
248
|
let data = [],
|
|
219
|
-
total = 0
|
|
249
|
+
total = 0
|
|
220
250
|
if (res && !res.total && Array.isArray(res)) {
|
|
221
|
-
data = res
|
|
222
|
-
total = res.length
|
|
251
|
+
data = res
|
|
252
|
+
total = res.length
|
|
223
253
|
} else if (res && res.total && res.list) {
|
|
224
|
-
data = res.list || []
|
|
225
|
-
total = res.total
|
|
254
|
+
data = res.list || []
|
|
255
|
+
total = res.total
|
|
226
256
|
}
|
|
227
|
-
return this.filterData({ data, total })
|
|
257
|
+
return this.filterData({ data, total })
|
|
228
258
|
},
|
|
229
259
|
|
|
230
260
|
searchBtnClick(event) {
|
|
231
|
-
this.queryReset()
|
|
232
|
-
this.showDialog = true
|
|
261
|
+
this.queryReset()
|
|
262
|
+
this.showDialog = true
|
|
233
263
|
this.$nextTick(() => {
|
|
234
|
-
this.searchClick()
|
|
235
|
-
})
|
|
264
|
+
this.searchClick()
|
|
265
|
+
})
|
|
236
266
|
},
|
|
237
267
|
|
|
238
268
|
// searchClick() {
|
|
@@ -241,33 +271,32 @@ export default {
|
|
|
241
271
|
// this.$refs.dialog.queryData("searchbtn");
|
|
242
272
|
// },
|
|
243
273
|
|
|
244
|
-
|
|
245
274
|
onShowDialog() {
|
|
246
|
-
this.queryReset()
|
|
247
|
-
this.agencyOptions()
|
|
275
|
+
this.queryReset()
|
|
276
|
+
this.agencyOptions()
|
|
248
277
|
},
|
|
249
278
|
|
|
250
279
|
searchClick() {
|
|
251
|
-
this.$refs.select.queryTableData()
|
|
280
|
+
this.$refs.select.queryTableData()
|
|
252
281
|
},
|
|
253
282
|
|
|
254
283
|
// 返回选中对象
|
|
255
|
-
selectOption
|
|
284
|
+
selectOption(values, opt) {
|
|
256
285
|
if (this.$attrs.selectOpt) {
|
|
257
|
-
this.$emit('confirm',opt)
|
|
258
|
-
this.$attrs.selectOpt[
|
|
286
|
+
this.$emit('confirm', opt)
|
|
287
|
+
this.$attrs.selectOpt['item'] = opt
|
|
259
288
|
}
|
|
260
289
|
},
|
|
261
290
|
|
|
262
291
|
queryReset() {
|
|
263
292
|
this.formSearch = {
|
|
264
293
|
brNo: this.queryConf.defaultParam.diabledValue,
|
|
265
|
-
accountNo:
|
|
266
|
-
accountName:
|
|
267
|
-
}
|
|
294
|
+
accountNo: '',
|
|
295
|
+
accountName: ''
|
|
296
|
+
}
|
|
268
297
|
}
|
|
269
298
|
}
|
|
270
|
-
}
|
|
299
|
+
}
|
|
271
300
|
</script>
|
|
272
301
|
|
|
273
302
|
<style lang="scss" scoped>
|
|
@@ -280,4 +309,4 @@ export default {
|
|
|
280
309
|
.form-wrap ::v-deep .el-input__suffix-inner .el-input__icon {
|
|
281
310
|
line-height: 32px;
|
|
282
311
|
}
|
|
283
|
-
</style>
|
|
312
|
+
</style>
|
|
@@ -6,10 +6,10 @@
|
|
|
6
6
|
* @Description: 下拉+弹窗
|
|
7
7
|
* @FilePath: \nstc_g6_common\packages\Form\SelectAndDialog\index.js
|
|
8
8
|
*/
|
|
9
|
-
import NstcSelectAndDialog from
|
|
9
|
+
import NstcSelectAndDialog from './src/main.vue'
|
|
10
10
|
|
|
11
|
-
NstcSelectAndDialog.install = function(Vue) {
|
|
12
|
-
Vue.component(NstcSelectAndDialog.name, NstcSelectAndDialog)
|
|
13
|
-
}
|
|
11
|
+
NstcSelectAndDialog.install = function (Vue) {
|
|
12
|
+
Vue.component(NstcSelectAndDialog.name, NstcSelectAndDialog)
|
|
13
|
+
}
|
|
14
14
|
|
|
15
|
-
export default NstcSelectAndDialog
|
|
15
|
+
export default NstcSelectAndDialog
|