n20-common-lib 1.3.0 → 1.3.3
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/package.json +1 -1
- package/src/components/ECharts/mixins/resize.js +1 -1
- package/src/components/FileImport/index.vue +1 -1
- package/src/components/NstcG6Components/Form/DatepickerCustom/index.vue +32 -32
- package/src/components/NstcG6Components/NstcBranchLazyLoad/NstcBranchLazyLoad.vue +37 -33
- package/src/components/NstcG6Components/NstcCharts/mixins/resize.js +1 -1
- package/src/components/NstcG6Components/NstcDropdownTree/NstcDropdownTree.vue +141 -137
- package/src/components/NstcG6Components/NstcExcelExport/NstcExcelExport.vue +47 -47
- package/src/components/NstcG6Components/NstcExcelImport/NstcExcelImport.vue +1 -1
- package/src/components/NstcG6Components/NstcExcelImportN/NstcExcelImportN.vue +186 -188
- package/src/components/NstcG6Components/NstcFileUpload/NstcFileUpload.vue +429 -451
- package/src/components/NstcG6Components/NstcForm/BusinessSpecific/InputMultiple.vue +66 -68
- package/src/components/NstcG6Components/NstcForm/CascaderCustom/index.vue +7 -7
- package/src/components/NstcG6Components/NstcForm/DatepickerCustom/index.vue +32 -32
- package/src/components/NstcG6Components/NstcForm/InputAndDialog/NstcInputAndDialog.vue +1 -1
- package/src/components/NstcG6Components/NstcForm/InputCustom/index.vue +1 -1
- package/src/components/NstcG6Components/NstcForm/SelectAccount/NstcSelectAccount.vue +1 -1
- package/src/components/NstcG6Components/NstcForm/SelectAndDialog/NstcSelectAndDialog.vue +1 -1
- package/src/components/NstcG6Components/NstcForm/SelectCustom/index.vue +1 -1
- package/src/components/NstcG6Components/NstcForm/SelectindialogCustom/index.vue +1 -1
- package/src/components/NstcG6Components/NstcForm/UploadCustom/index.vue +1 -1
- package/src/components/NstcG6Components/NstcSelectTree/NstcSelectTree.vue +172 -172
- package/src/components/NstcG6Components/NstcSelectTreeList/NstcSelectTreeList.vue +1 -1
- package/src/components/NstcG6Components/NstcSvgIcon/NstcSvgIcon.vue +7 -12
- package/src/components/NstcG6Components/NstcTable/NstcTable.vue +145 -145
- package/src/components/NstcG6Components/NstcTableSet/NstcTableSet.vue +4 -4
- package/src/components/NstcG6Components/NstcWorkBench/NstcWorkBench.vue +45 -36
- package/src/components/NstcG6Components/Search/NstcSearch.vue +6 -6
- package/src/components/NstcG6Components/approvelTwo/main.vue +1 -1
- package/src/components/NstcG6Components/approvelTwo/progress.vue +1 -1
- package/src/components/Search/index.vue +8 -8
package/package.json
CHANGED
|
@@ -16,89 +16,89 @@
|
|
|
16
16
|
</template>
|
|
17
17
|
|
|
18
18
|
<script>
|
|
19
|
-
import dateAndValidator from
|
|
19
|
+
import dateAndValidator from '../../../../utils/dateAndValidator'
|
|
20
20
|
|
|
21
21
|
export default {
|
|
22
|
-
name:
|
|
22
|
+
name: 'DatePickerCustom',
|
|
23
23
|
|
|
24
24
|
inheritAttrs: false,
|
|
25
25
|
|
|
26
26
|
props: {
|
|
27
27
|
value: {
|
|
28
28
|
default: null,
|
|
29
|
-
type: [Date, Array, String]
|
|
29
|
+
type: [Date, Array, String]
|
|
30
30
|
},
|
|
31
|
-
dateType:{
|
|
31
|
+
dateType: {
|
|
32
32
|
type: [String, Number],
|
|
33
|
-
default:
|
|
33
|
+
default: ''
|
|
34
34
|
},
|
|
35
35
|
width: {
|
|
36
36
|
type: [String, Number],
|
|
37
|
-
default:
|
|
37
|
+
default: ''
|
|
38
38
|
},
|
|
39
39
|
|
|
40
40
|
limit: {
|
|
41
41
|
type: Array,
|
|
42
|
-
default: () => []
|
|
42
|
+
default: () => []
|
|
43
43
|
},
|
|
44
44
|
|
|
45
45
|
pickerOptions: {
|
|
46
46
|
type: Object,
|
|
47
|
-
default: () => ({})
|
|
47
|
+
default: () => ({})
|
|
48
48
|
},
|
|
49
49
|
|
|
50
50
|
unlinkPanels: {
|
|
51
51
|
type: Boolean,
|
|
52
|
-
default: true
|
|
52
|
+
default: true
|
|
53
53
|
},
|
|
54
54
|
|
|
55
55
|
valueFormat: {
|
|
56
56
|
type: String,
|
|
57
|
-
default:
|
|
58
|
-
}
|
|
57
|
+
default: 'yyyy-MM-dd'
|
|
58
|
+
}
|
|
59
59
|
},
|
|
60
60
|
|
|
61
61
|
data() {
|
|
62
62
|
return {
|
|
63
|
-
key: `DatePickerCustomID-${Math.random().toString(36).slice(2)}
|
|
64
|
-
}
|
|
63
|
+
key: `DatePickerCustomID-${Math.random().toString(36).slice(2)}`
|
|
64
|
+
}
|
|
65
65
|
},
|
|
66
66
|
created() {
|
|
67
|
-
this.$bus.$on(
|
|
68
|
-
console.log(
|
|
69
|
-
})
|
|
70
|
-
console.log(this.dateType,'----------dateType')
|
|
67
|
+
this.$bus.$on('nstc_custom_form_config_update', (formData) => {
|
|
68
|
+
console.log('监听到的全局事件', formData)
|
|
69
|
+
})
|
|
70
|
+
console.log(this.dateType, '----------dateType')
|
|
71
71
|
},
|
|
72
72
|
beforeDestroy() {
|
|
73
|
-
this.$bus.$off(
|
|
73
|
+
this.$bus.$off('nstc_custom_form_config_update')
|
|
74
74
|
},
|
|
75
75
|
computed: {
|
|
76
76
|
_value: {
|
|
77
77
|
get() {
|
|
78
|
-
return this.value
|
|
78
|
+
return this.value
|
|
79
79
|
},
|
|
80
80
|
set(val) {
|
|
81
|
-
this.$emit(
|
|
82
|
-
this.$emit(
|
|
83
|
-
}
|
|
81
|
+
this.$emit('input', val)
|
|
82
|
+
this.$emit('change', val)
|
|
83
|
+
}
|
|
84
84
|
},
|
|
85
85
|
|
|
86
86
|
_pickerOptions() {
|
|
87
87
|
// 今天以及今天之前
|
|
88
|
-
if(this.dateType == 'includeTodayBefore') {
|
|
88
|
+
if (this.dateType == 'includeTodayBefore') {
|
|
89
89
|
return {
|
|
90
|
-
|
|
90
|
+
disabledDate(time) {
|
|
91
91
|
return time.getTime() > Date.now() - 8.64e6
|
|
92
92
|
}
|
|
93
93
|
}
|
|
94
|
-
} else if(this.dateType == 'todayBefore') {
|
|
94
|
+
} else if (this.dateType == 'todayBefore') {
|
|
95
95
|
// 今天之前
|
|
96
96
|
return {
|
|
97
97
|
disabledDate(time) {
|
|
98
98
|
return time.getTime() > Date.now()
|
|
99
99
|
}
|
|
100
100
|
}
|
|
101
|
-
} else if(this.dateType == 'includeTodayAfter') {
|
|
101
|
+
} else if (this.dateType == 'includeTodayAfter') {
|
|
102
102
|
// 今天以及今天之后
|
|
103
103
|
return {
|
|
104
104
|
disabledDate(time) {
|
|
@@ -112,15 +112,15 @@ export default {
|
|
|
112
112
|
return time.getTime() < Date.now()
|
|
113
113
|
}
|
|
114
114
|
}
|
|
115
|
-
} else{
|
|
115
|
+
} else {
|
|
116
116
|
return {
|
|
117
117
|
...dateAndValidator.limit.pickerOptions(...this.limit),
|
|
118
|
-
...this.pickerOptions
|
|
119
|
-
}
|
|
118
|
+
...this.pickerOptions
|
|
119
|
+
}
|
|
120
120
|
}
|
|
121
|
-
}
|
|
122
|
-
}
|
|
123
|
-
}
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
124
|
</script>
|
|
125
125
|
|
|
126
126
|
<style scoped>
|
|
@@ -1,30 +1,30 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
<div class="BranchLazyLoad">
|
|
3
3
|
<el-select
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
4
|
+
v-model="registerForm.branchBankNo"
|
|
5
|
+
v-el-select-loadmore="loadMore"
|
|
6
|
+
:default-first-option="true"
|
|
7
|
+
:filterable="true"
|
|
8
|
+
clearable
|
|
9
|
+
remote
|
|
10
|
+
:remote-method="remoteMethod"
|
|
11
|
+
@change="changeBranchBank"
|
|
12
|
+
@blur="blurBranchBank"
|
|
13
13
|
>
|
|
14
14
|
<el-option
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
15
|
+
v-for="(item, index) in accountAssociateBankDb"
|
|
16
|
+
:key="index"
|
|
17
|
+
:label="item.label"
|
|
18
|
+
:value="item.value"
|
|
19
19
|
/>
|
|
20
20
|
</el-select>
|
|
21
21
|
</div>
|
|
22
22
|
</template>
|
|
23
23
|
|
|
24
24
|
<script>
|
|
25
|
-
import axios from '
|
|
25
|
+
import axios from '../../../utils/axios'
|
|
26
26
|
export default {
|
|
27
|
-
name:
|
|
27
|
+
name: 'NstcBranchLazyLoad',
|
|
28
28
|
data() {
|
|
29
29
|
return {
|
|
30
30
|
associatePagination: {
|
|
@@ -37,7 +37,7 @@ export default {
|
|
|
37
37
|
registerForm: {
|
|
38
38
|
branchBankNo: ''
|
|
39
39
|
},
|
|
40
|
-
accountAssociateBankDb: []
|
|
40
|
+
accountAssociateBankDb: []
|
|
41
41
|
}
|
|
42
42
|
},
|
|
43
43
|
props: {
|
|
@@ -50,11 +50,11 @@ export default {
|
|
|
50
50
|
'el-select-loadmore': {
|
|
51
51
|
bind(el, binding) {
|
|
52
52
|
const SELECTWRAP_DOM = el.querySelector(
|
|
53
|
-
|
|
53
|
+
'.el-select-dropdown .el-select-dropdown__wrap'
|
|
54
54
|
)
|
|
55
|
-
SELECTWRAP_DOM.addEventListener('scroll', function() {
|
|
55
|
+
SELECTWRAP_DOM.addEventListener('scroll', function () {
|
|
56
56
|
const condition =
|
|
57
|
-
|
|
57
|
+
this.scrollHeight - this.scrollTop <= this.clientHeight
|
|
58
58
|
if (condition) {
|
|
59
59
|
binding.value()
|
|
60
60
|
}
|
|
@@ -81,22 +81,26 @@ export default {
|
|
|
81
81
|
* 获取支行下拉值
|
|
82
82
|
*/
|
|
83
83
|
async getAssociateBank(flag) {
|
|
84
|
-
flag === 'loadMore' &&
|
|
84
|
+
flag === 'loadMore' && this.associatePagination['page.current']++
|
|
85
85
|
// this.associatePagination.bankNo = this.applyForm.bankNo
|
|
86
|
-
await axios
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
86
|
+
await axios
|
|
87
|
+
.get(this.url, this.associatePagination)
|
|
88
|
+
.then((res) => {
|
|
89
|
+
res = res.data.map((i) => {
|
|
90
|
+
return {
|
|
91
|
+
label: i[`branchBankName`],
|
|
92
|
+
value: i[`cnapsNo`],
|
|
93
|
+
bankNo: i[`bankNo`]
|
|
94
|
+
}
|
|
95
|
+
})
|
|
96
|
+
if (flag === 'query') {
|
|
97
|
+
this.accountAssociateBankDb = res
|
|
98
|
+
} else {
|
|
99
|
+
this.accountAssociateBankDb =
|
|
100
|
+
this.accountAssociateBankDb.concat(res)
|
|
92
101
|
}
|
|
93
102
|
})
|
|
94
|
-
|
|
95
|
-
this.accountAssociateBankDb = res
|
|
96
|
-
} else {
|
|
97
|
-
this.accountAssociateBankDb = this.accountAssociateBankDb.concat(res)
|
|
98
|
-
}
|
|
99
|
-
}).catch(() => {})
|
|
103
|
+
.catch(() => {})
|
|
100
104
|
},
|
|
101
105
|
/**
|
|
102
106
|
* 支行失去焦点
|
|
@@ -113,7 +117,7 @@ export default {
|
|
|
113
117
|
},
|
|
114
118
|
async loadMore() {
|
|
115
119
|
await this.getAssociateBank('loadMore')
|
|
116
|
-
}
|
|
120
|
+
}
|
|
117
121
|
}
|
|
118
122
|
}
|
|
119
123
|
</script>
|