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
|
@@ -65,9 +65,7 @@ export default {
|
|
|
65
65
|
const rawFile = files[0] // only use files[0]
|
|
66
66
|
|
|
67
67
|
if (!this.isExcel(rawFile)) {
|
|
68
|
-
this.$message.error(
|
|
69
|
-
'Only supports upload .xlsx, .xls, .csv suffix files'
|
|
70
|
-
)
|
|
68
|
+
this.$message.error('Only supports upload .xlsx, .xls, .csv suffix files')
|
|
71
69
|
return false
|
|
72
70
|
}
|
|
73
71
|
this.upload(rawFile)
|
|
@@ -257,12 +255,7 @@ export default {
|
|
|
257
255
|
|
|
258
256
|
datasAll.forEach((item) => {
|
|
259
257
|
for (const key in item) {
|
|
260
|
-
if (
|
|
261
|
-
key === 'recAmount' ||
|
|
262
|
-
key === 'payAmount' ||
|
|
263
|
-
key === 'amount' ||
|
|
264
|
-
key === 'balance'
|
|
265
|
-
) {
|
|
258
|
+
if (key === 'recAmount' || key === 'payAmount' || key === 'amount' || key === 'balance') {
|
|
266
259
|
item[key] && (item[key] = Number(item[key].replace(/,/g, '')))
|
|
267
260
|
}
|
|
268
261
|
if (reg.test(key) || key === 'undefined' || key === '') {
|
|
@@ -284,10 +277,7 @@ export default {
|
|
|
284
277
|
console.log('datas', datasAll)
|
|
285
278
|
let obj = {}
|
|
286
279
|
for (let i = 0; i < this.columnsList.length; i++) {
|
|
287
|
-
if (
|
|
288
|
-
!obj[this.columnsList[i].label] &&
|
|
289
|
-
!obj[this.columnsList[i].prop]
|
|
290
|
-
) {
|
|
280
|
+
if (!obj[this.columnsList[i].label] && !obj[this.columnsList[i].prop]) {
|
|
291
281
|
this.columnsListNew.push(this.columnsList[i])
|
|
292
282
|
obj[this.columnsList[i].label] = true
|
|
293
283
|
obj[this.columnsList[i].prop] = true
|
|
@@ -5,22 +5,22 @@
|
|
|
5
5
|
-->
|
|
6
6
|
<template>
|
|
7
7
|
<div
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
8
|
+
v-loading="loading"
|
|
9
|
+
class="excel-import-box"
|
|
10
|
+
:element-loading-text="analysisText"
|
|
11
|
+
element-loading-spinner="el-icon-loading"
|
|
12
|
+
element-loading-background="rgba(0, 0, 0, 0.8)"
|
|
13
|
+
@drop="handleDrop"
|
|
14
|
+
@dragover="handleDragover"
|
|
15
|
+
@dragenter="handleDragover"
|
|
16
16
|
>
|
|
17
17
|
<input
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
18
|
+
ref="excel-upload-input"
|
|
19
|
+
class="excel-upload-input"
|
|
20
|
+
type="file"
|
|
21
|
+
accept=".xlsx, .xls, .csv"
|
|
22
|
+
@change="handleClick"
|
|
23
|
+
/>
|
|
24
24
|
<i class="el-icon-upload" />
|
|
25
25
|
</div>
|
|
26
26
|
</template>
|
|
@@ -32,7 +32,7 @@ export default {
|
|
|
32
32
|
name: 'NstcUploadExcel',
|
|
33
33
|
props: {
|
|
34
34
|
beforeUpload: Function, // eslint-disable-line
|
|
35
|
-
onSuccess: Function// eslint-disable-line
|
|
35
|
+
onSuccess: Function // eslint-disable-line
|
|
36
36
|
},
|
|
37
37
|
data() {
|
|
38
38
|
return {
|
|
@@ -99,11 +99,11 @@ export default {
|
|
|
99
99
|
this.loading = true
|
|
100
100
|
return new Promise((resolve) => {
|
|
101
101
|
const reader = new FileReader()
|
|
102
|
-
reader.onload = e => {
|
|
102
|
+
reader.onload = (e) => {
|
|
103
103
|
const data = e.target.result
|
|
104
|
-
const workbook = XLSX.read(data,{
|
|
104
|
+
const workbook = XLSX.read(data, {
|
|
105
105
|
type: 'array',
|
|
106
|
-
cellDates: true
|
|
106
|
+
cellDates: true
|
|
107
107
|
})
|
|
108
108
|
const firstSheetName = workbook.SheetNames[0]
|
|
109
109
|
const worksheet = workbook.Sheets[firstSheetName]
|
|
@@ -124,7 +124,8 @@ export default {
|
|
|
124
124
|
let C
|
|
125
125
|
const R = range.s.r
|
|
126
126
|
/* start in the first row */
|
|
127
|
-
for (C = range.s.c; C <= range.e.c; ++C) {
|
|
127
|
+
for (C = range.s.c; C <= range.e.c; ++C) {
|
|
128
|
+
/* walk every column in the range */
|
|
128
129
|
const cell = sheet[XLSX.utils.encode_cell({ c: C, r: R })]
|
|
129
130
|
/* find the cell in the first row */
|
|
130
131
|
let hdr = 'UNKNOWN ' + C // <-- replace with your desired default
|
|
@@ -140,6 +141,4 @@ export default {
|
|
|
140
141
|
}
|
|
141
142
|
</script>
|
|
142
143
|
|
|
143
|
-
<style scoped lang="scss">
|
|
144
|
-
</style>
|
|
145
|
-
|
|
144
|
+
<style scoped lang="scss"></style>
|
|
@@ -23,11 +23,7 @@
|
|
|
23
23
|
<div
|
|
24
24
|
slot="reference"
|
|
25
25
|
class="name-wrapper"
|
|
26
|
-
style="
|
|
27
|
-
overflow: hidden;
|
|
28
|
-
text-overflow: ellipsis;
|
|
29
|
-
white-space: nowrap;
|
|
30
|
-
"
|
|
26
|
+
style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap"
|
|
31
27
|
>
|
|
32
28
|
{{ scope.row.importantInfo }}
|
|
33
29
|
</div>
|
|
@@ -83,11 +79,7 @@
|
|
|
83
79
|
<div
|
|
84
80
|
slot="reference"
|
|
85
81
|
class="name-wrapper"
|
|
86
|
-
style="
|
|
87
|
-
overflow: hidden;
|
|
88
|
-
text-overflow: ellipsis;
|
|
89
|
-
white-space: nowrap;
|
|
90
|
-
"
|
|
82
|
+
style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap"
|
|
91
83
|
>
|
|
92
84
|
{{ scope.row.importantInfo }}
|
|
93
85
|
</div>
|
|
@@ -134,14 +126,9 @@ export default {
|
|
|
134
126
|
console.log(error)
|
|
135
127
|
}
|
|
136
128
|
try {
|
|
137
|
-
let pendingSun = await axios.post(
|
|
138
|
-
`/bems/prod_1.0/activiti/temporaryStorage/addQty`
|
|
139
|
-
)
|
|
129
|
+
let pendingSun = await axios.post(`/bems/prod_1.0/activiti/temporaryStorage/addQty`)
|
|
140
130
|
this.pendingSun = pendingSun.data
|
|
141
|
-
let { data } = await axios.post(
|
|
142
|
-
`/bems/prod_1.0/activiti/temporaryStorage/todoTask`,
|
|
143
|
-
{ pageNo: 1, pageSize: 3 }
|
|
144
|
-
)
|
|
131
|
+
let { data } = await axios.post(`/bems/prod_1.0/activiti/temporaryStorage/todoTask`, { pageNo: 1, pageSize: 3 })
|
|
145
132
|
this.pendingList = data
|
|
146
133
|
} catch (error) {
|
|
147
134
|
console.log(error)
|
|
@@ -35,23 +35,11 @@
|
|
|
35
35
|
<span @click="moreCondition">更多条件</span>
|
|
36
36
|
</div>
|
|
37
37
|
<div class="filter-custom-box-main-footer">
|
|
38
|
-
<el-button
|
|
39
|
-
type="primary"
|
|
40
|
-
class="nstc-g6-common-btn-1 nstc-g6-common-btn-size-b"
|
|
41
|
-
@click="confirmAction"
|
|
38
|
+
<el-button type="primary" class="nstc-g6-common-btn-1 nstc-g6-common-btn-size-b" @click="confirmAction"
|
|
42
39
|
>确定</el-button
|
|
43
40
|
>
|
|
44
|
-
<el-tooltip
|
|
45
|
-
class="
|
|
46
|
-
effect="dark"
|
|
47
|
-
content="重置本次操作"
|
|
48
|
-
placement="top-start"
|
|
49
|
-
>
|
|
50
|
-
<el-button
|
|
51
|
-
class="nstc-g6-common-btn-3 nstc-g6-common-btn-size-b"
|
|
52
|
-
@click="resetAction"
|
|
53
|
-
>重置</el-button
|
|
54
|
-
>
|
|
41
|
+
<el-tooltip class="item" effect="dark" content="重置本次操作" placement="top-start">
|
|
42
|
+
<el-button class="nstc-g6-common-btn-3 nstc-g6-common-btn-size-b" @click="resetAction">重置</el-button>
|
|
55
43
|
</el-tooltip>
|
|
56
44
|
</div>
|
|
57
45
|
</div>
|
|
@@ -180,10 +168,7 @@ export default {
|
|
|
180
168
|
{
|
|
181
169
|
mold: mold.type, // 组件名称
|
|
182
170
|
name: item.name, // 表单选项的名称
|
|
183
|
-
prop:
|
|
184
|
-
item.type == 'select' && item.multiple
|
|
185
|
-
? item.id + 's'
|
|
186
|
-
: item.id, // 绑定的key值
|
|
171
|
+
prop: item.type == 'select' && item.multiple ? item.id + 's' : item.id, // 绑定的key值
|
|
187
172
|
options: options, //item.options ? JSON.parse(item.options):[], // 下拉选择框的选项
|
|
188
173
|
url: that.removeQuotation(item.url), // 远程查询的url
|
|
189
174
|
formConfig: item.formConfig || [], // 弹窗查询的 选择表单
|
|
@@ -209,10 +194,7 @@ export default {
|
|
|
209
194
|
isCache: item.isCache,
|
|
210
195
|
dateType: item.dateType, // 时间选择框 时间范围限制
|
|
211
196
|
class: {
|
|
212
|
-
'filter-condition-input': [
|
|
213
|
-
'input',
|
|
214
|
-
'nstcSelectTree'
|
|
215
|
-
].includes(mold.type), // 用于控制组件长度
|
|
197
|
+
'filter-condition-input': ['input', 'nstcSelectTree'].includes(mold.type), // 用于控制组件长度
|
|
216
198
|
[item.className || 'null-custom-class']: true
|
|
217
199
|
},
|
|
218
200
|
...customConfig,
|
|
@@ -243,10 +225,7 @@ export default {
|
|
|
243
225
|
/**
|
|
244
226
|
* 特殊自定义组件属性处理
|
|
245
227
|
*/
|
|
246
|
-
if (
|
|
247
|
-
item.type === 'nstcSelectTree' ||
|
|
248
|
-
item.type === 'nstcSelectTreeList'
|
|
249
|
-
) {
|
|
228
|
+
if (item.type === 'nstcSelectTree' || item.type === 'nstcSelectTreeList') {
|
|
250
229
|
data[0].defaultProps = item.defaultProps
|
|
251
230
|
data[0].tagProps = item.tagProps
|
|
252
231
|
data[0].nodeKey = item.nodeKey
|
|
@@ -348,18 +327,13 @@ export default {
|
|
|
348
327
|
changeDefaultSet(type) {
|
|
349
328
|
this.defaultSet = this.defaultSet.map((item) => {
|
|
350
329
|
let nItem = Object.assign({}, item)
|
|
351
|
-
nItem.disabled = this.valueConfig[item.id]
|
|
352
|
-
|
|
353
|
-
: false
|
|
354
|
-
this.valueConfig[item.id] &&
|
|
355
|
-
(nItem.label = this.valueConfig[item.id].label)
|
|
330
|
+
nItem.disabled = this.valueConfig[item.id] ? this.valueConfig[item.id].disabled || false : false
|
|
331
|
+
this.valueConfig[item.id] && (nItem.label = this.valueConfig[item.id].label)
|
|
356
332
|
nItem.options = this.valueConfig[item.id]
|
|
357
333
|
? JSON.stringify(this.valueConfig[item.id].options) || []
|
|
358
334
|
: item.options
|
|
359
335
|
nItem.time = new Date().getTime()
|
|
360
|
-
nItem.clearable = this.valueConfig[item.id]
|
|
361
|
-
? this.valueConfig[item.id].clearable
|
|
362
|
-
: true
|
|
336
|
+
nItem.clearable = this.valueConfig[item.id] ? this.valueConfig[item.id].clearable : true
|
|
363
337
|
return nItem
|
|
364
338
|
})
|
|
365
339
|
console.log(this.defaultSet, 123)
|
|
@@ -368,24 +342,16 @@ export default {
|
|
|
368
342
|
let newObj = {}
|
|
369
343
|
for (let key1 in this.valueConfig) {
|
|
370
344
|
let item = this.valueConfig[key1]
|
|
371
|
-
let keyObj = this.defaultSet.find(
|
|
372
|
-
(item) => item.id === key1 && item.type === 'select' && item.multiple
|
|
373
|
-
)
|
|
345
|
+
let keyObj = this.defaultSet.find((item) => item.id === key1 && item.type === 'select' && item.multiple)
|
|
374
346
|
if (item.hasOwnProperty('value')) {
|
|
375
|
-
this.$set(
|
|
376
|
-
newObj,
|
|
377
|
-
keyObj ? key1 + 's' : key1,
|
|
378
|
-
this.reset ? '' : item.value
|
|
379
|
-
)
|
|
347
|
+
this.$set(newObj, keyObj ? key1 + 's' : key1, this.reset ? '' : item.value)
|
|
380
348
|
}
|
|
381
349
|
}
|
|
382
350
|
// this.formModel = {...this.formModel,...this.oldFormModel, ...newObj}
|
|
383
351
|
if (JSON.stringify(this.oldFormModel) !== '{}') {
|
|
384
352
|
// 旧配置中的字段不在新的配置中,则需要移除对应的缓存值
|
|
385
353
|
this.defaultSet.forEach(({ id, multiple, type, queryKey }) => {
|
|
386
|
-
const isExist =
|
|
387
|
-
Reflect.has(this.oldFormModel, id) ||
|
|
388
|
-
Reflect.has(this.oldFormModel, id + 's')
|
|
354
|
+
const isExist = Reflect.has(this.oldFormModel, id) || Reflect.has(this.oldFormModel, id + 's')
|
|
389
355
|
// 在缓存中存在,则取缓存的值
|
|
390
356
|
if (isExist) {
|
|
391
357
|
if (type === 'select' && multiple) {
|
|
@@ -580,4 +546,3 @@ export default {
|
|
|
580
546
|
}
|
|
581
547
|
}
|
|
582
548
|
</style>
|
|
583
|
-
|
|
@@ -21,21 +21,21 @@
|
|
|
21
21
|
</template>
|
|
22
22
|
|
|
23
23
|
<script>
|
|
24
|
-
import NstcSearch from
|
|
24
|
+
import NstcSearch from '../main.vue'
|
|
25
25
|
export default {
|
|
26
|
-
name:
|
|
26
|
+
name: 'Demo',
|
|
27
27
|
components: {
|
|
28
|
-
NstcSearch
|
|
28
|
+
NstcSearch
|
|
29
29
|
},
|
|
30
30
|
data() {
|
|
31
31
|
return {
|
|
32
32
|
conditionSetConfig: {
|
|
33
|
-
pageUUID: encodeURIComponent(
|
|
34
|
-
moduleNo:
|
|
35
|
-
queryType: 1
|
|
33
|
+
pageUUID: encodeURIComponent('53db4bad-6724-4537-b73a-0a3c5e24ec34'),
|
|
34
|
+
moduleNo: 'PTMS',
|
|
35
|
+
queryType: 1
|
|
36
36
|
},
|
|
37
37
|
defaultValue: {
|
|
38
|
-
recordDate: [
|
|
38
|
+
recordDate: ['2021-03-30', '2021-03-30']
|
|
39
39
|
// unitNo: { label: "3423", value: "rewrwe" },
|
|
40
40
|
},
|
|
41
41
|
valueConfig: {
|
|
@@ -55,43 +55,43 @@ export default {
|
|
|
55
55
|
// recCltNameLike: {
|
|
56
56
|
// value: "dd",
|
|
57
57
|
// },
|
|
58
|
-
}
|
|
59
|
-
}
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
60
|
},
|
|
61
61
|
mounted() {
|
|
62
62
|
this.$nextTick(() => {
|
|
63
|
-
console.log(32132)
|
|
64
|
-
this.$refs.ddddd.placement =
|
|
63
|
+
console.log(32132)
|
|
64
|
+
this.$refs.ddddd.placement = 'left'
|
|
65
65
|
this.valueConfig.unitNo = {
|
|
66
66
|
// disabled: true,
|
|
67
|
-
label:
|
|
68
|
-
value:
|
|
69
|
-
}
|
|
70
|
-
})
|
|
67
|
+
label: '总部',
|
|
68
|
+
value: '001'
|
|
69
|
+
}
|
|
70
|
+
})
|
|
71
71
|
},
|
|
72
72
|
methods: {
|
|
73
73
|
searchAction(val) {
|
|
74
|
-
console.log(
|
|
74
|
+
console.log('远程查询条件', val)
|
|
75
75
|
},
|
|
76
76
|
change() {
|
|
77
77
|
this.valueConfig = {
|
|
78
78
|
payCltNos: {
|
|
79
|
-
value:
|
|
80
|
-
label:
|
|
81
|
-
disabled: false
|
|
79
|
+
value: '44444',
|
|
80
|
+
label: '单位1122211',
|
|
81
|
+
disabled: false
|
|
82
82
|
},
|
|
83
83
|
payStates: {
|
|
84
|
-
value: [
|
|
84
|
+
value: ['1'],
|
|
85
85
|
disabled: false,
|
|
86
86
|
options: [
|
|
87
|
-
{ label:
|
|
88
|
-
{ label:
|
|
89
|
-
]
|
|
90
|
-
}
|
|
91
|
-
}
|
|
92
|
-
}
|
|
93
|
-
}
|
|
94
|
-
}
|
|
87
|
+
{ label: '待支付', value: '1' },
|
|
88
|
+
{ label: '全部已付', value: '2' }
|
|
89
|
+
]
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
95
|
</script>
|
|
96
96
|
|
|
97
97
|
<style scoped>
|
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
-->
|
|
9
9
|
<template>
|
|
10
10
|
<div class="filter-custom-demo">
|
|
11
|
-
<div style="height:300px"></div>
|
|
11
|
+
<div style="height: 300px"></div>
|
|
12
12
|
<NstcSearch
|
|
13
13
|
ref="ddddd"
|
|
14
14
|
:config="conditionSetConfig"
|
|
@@ -22,78 +22,78 @@
|
|
|
22
22
|
</template>
|
|
23
23
|
|
|
24
24
|
<script>
|
|
25
|
-
import NstcSearch from
|
|
25
|
+
import NstcSearch from '../main.vue'
|
|
26
26
|
export default {
|
|
27
|
-
name:
|
|
27
|
+
name: 'Demo',
|
|
28
28
|
components: {
|
|
29
|
-
NstcSearch
|
|
29
|
+
NstcSearch
|
|
30
30
|
},
|
|
31
31
|
data() {
|
|
32
32
|
return {
|
|
33
33
|
conditionSetConfig: {
|
|
34
|
-
pageUUID:
|
|
35
|
-
moduleNo:
|
|
36
|
-
queryType: 1
|
|
34
|
+
pageUUID: '22fa262c-ecf4-3f98-1230-4092fbc1ca04',
|
|
35
|
+
moduleNo: 'AIMS',
|
|
36
|
+
queryType: 1
|
|
37
37
|
// userId: sessionStorage.getItem("userNo"),
|
|
38
38
|
},
|
|
39
39
|
defaultValue: {
|
|
40
|
-
recordDate: [
|
|
40
|
+
recordDate: ['2021-03-30', '2021-03-30']
|
|
41
41
|
// unitNo: { label: "3423", value: "rewrwe" },
|
|
42
42
|
},
|
|
43
43
|
valueConfig: {
|
|
44
44
|
payCltNos: {
|
|
45
|
-
value:
|
|
46
|
-
label:
|
|
47
|
-
disabled: true
|
|
45
|
+
value: '126',
|
|
46
|
+
label: '单位111111111',
|
|
47
|
+
disabled: true
|
|
48
48
|
},
|
|
49
49
|
payStates: {
|
|
50
|
-
value: [
|
|
50
|
+
value: ['1', '2'],
|
|
51
51
|
disabled: true,
|
|
52
52
|
options: [
|
|
53
|
-
{ label:
|
|
54
|
-
{ label:
|
|
55
|
-
]
|
|
53
|
+
{ label: '待支付', value: '1' },
|
|
54
|
+
{ label: '全部已付', value: '2' }
|
|
55
|
+
]
|
|
56
56
|
},
|
|
57
57
|
recCltNameLike: {
|
|
58
|
-
value:
|
|
59
|
-
}
|
|
60
|
-
}
|
|
61
|
-
}
|
|
58
|
+
value: 'dd'
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
62
|
},
|
|
63
|
-
mounted(){
|
|
64
|
-
this.$nextTick(()=>{
|
|
63
|
+
mounted() {
|
|
64
|
+
this.$nextTick(() => {
|
|
65
65
|
console.log(32132)
|
|
66
66
|
this.$refs.ddddd.placement = 'left'
|
|
67
67
|
this.valueConfig.unitNo = {
|
|
68
68
|
// disabled: true,
|
|
69
69
|
label: '总部',
|
|
70
|
-
value: '001'
|
|
71
|
-
}
|
|
70
|
+
value: '001'
|
|
71
|
+
}
|
|
72
72
|
})
|
|
73
73
|
},
|
|
74
74
|
methods: {
|
|
75
75
|
searchAction(val) {
|
|
76
|
-
console.log(
|
|
76
|
+
console.log('远程查询条件', val)
|
|
77
77
|
},
|
|
78
78
|
change() {
|
|
79
79
|
this.valueConfig = {
|
|
80
80
|
payCltNos: {
|
|
81
|
-
value:
|
|
82
|
-
label:
|
|
83
|
-
disabled: false
|
|
81
|
+
value: '44444',
|
|
82
|
+
label: '单位1122211',
|
|
83
|
+
disabled: false
|
|
84
84
|
},
|
|
85
85
|
payStates: {
|
|
86
|
-
value: [
|
|
86
|
+
value: ['1'],
|
|
87
87
|
disabled: false,
|
|
88
88
|
options: [
|
|
89
|
-
{ label:
|
|
90
|
-
{ label:
|
|
91
|
-
]
|
|
92
|
-
}
|
|
93
|
-
}
|
|
94
|
-
}
|
|
95
|
-
}
|
|
96
|
-
}
|
|
89
|
+
{ label: '待支付', value: '1' },
|
|
90
|
+
{ label: '全部已付', value: '2' }
|
|
91
|
+
]
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
97
|
</script>
|
|
98
98
|
|
|
99
99
|
<style scoped>
|