lambo-design-bi 0.0.220 → 0.0.222
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
CHANGED
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
<div class="flow-title">
|
|
6
6
|
<span class="flow-name">{{ flowInfo.flowName || '审批流程提交' }}</span>
|
|
7
7
|
</div>
|
|
8
|
-
<FlowCopyUsers :copy-users="copyUsers" :editable="
|
|
8
|
+
<FlowCopyUsers :copy-users="copyUsers" :editable="copyUsersEditable"
|
|
9
9
|
@change="handleCopyUsersChange" @add-copy-users="handleShowCopyUserSelector" />
|
|
10
10
|
</div>
|
|
11
11
|
|
|
@@ -117,6 +117,24 @@ export default {
|
|
|
117
117
|
type: Boolean,
|
|
118
118
|
default: true
|
|
119
119
|
},
|
|
120
|
+
/**
|
|
121
|
+
* 附件列表
|
|
122
|
+
* @property {string} fileId - 文件ID
|
|
123
|
+
* @property {string} fileName - 文件名
|
|
124
|
+
* @property {string} fileSize - 文件大小
|
|
125
|
+
*/
|
|
126
|
+
initAttachments: {
|
|
127
|
+
type: Array,
|
|
128
|
+
default: () => []
|
|
129
|
+
},
|
|
130
|
+
/**
|
|
131
|
+
* 抄送人是否可编辑
|
|
132
|
+
* @default true
|
|
133
|
+
*/
|
|
134
|
+
copyUsersEditable: {
|
|
135
|
+
type: Boolean,
|
|
136
|
+
default: true
|
|
137
|
+
},
|
|
120
138
|
/**
|
|
121
139
|
* 抄送人列表
|
|
122
140
|
* @property {string} loginName - 抄送人ID
|
|
@@ -199,7 +217,7 @@ export default {
|
|
|
199
217
|
return {
|
|
200
218
|
applyDescription: '',
|
|
201
219
|
submitting: false,
|
|
202
|
-
attachments: [],
|
|
220
|
+
attachments: [...this.initAttachments],
|
|
203
221
|
previewModalVisible: false,
|
|
204
222
|
previewFileUrl: '',
|
|
205
223
|
previewFileName: '',
|
|
@@ -32,7 +32,7 @@
|
|
|
32
32
|
</Row>
|
|
33
33
|
<export-drawer v-model="showFileList" :file-list="fileList" :export-mode="exportMode" :request-url="requestUrl"
|
|
34
34
|
:request-limit="exportRequestLimit" :requestMethod="reqMethod" :request-success-codes="requestSuccessCodes"
|
|
35
|
-
:searchParams="searchParams" :sortParams="sortParams" :tableColumns="tableColumns" :parsed-columns="
|
|
35
|
+
:searchParams="searchParams" :sortParams="sortParams" :tableColumns="tableColumns" :parsed-columns="tableParsedColumns"
|
|
36
36
|
:show-summary="showSummary" :summary-method="summaryMethod"></export-drawer>
|
|
37
37
|
</div>
|
|
38
38
|
</template>
|
|
@@ -308,11 +308,10 @@ export default {
|
|
|
308
308
|
ajax.request(options).then(function (resp) {
|
|
309
309
|
if (self.requestSuccessCodes.includes(resp.data.code)) {
|
|
310
310
|
let resultData = deepCopy(resp.data.data.rows)
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
// }
|
|
311
|
+
if (self.showSummary && resultData) {
|
|
312
|
+
let sum = self.summaryData(resultData)
|
|
313
|
+
resultData.push(sum)
|
|
314
|
+
}
|
|
316
315
|
self.exportExcel(resultData)
|
|
317
316
|
} else {
|
|
318
317
|
self.$Message.error(resp.data.data)
|
|
@@ -123,8 +123,8 @@ export default {
|
|
|
123
123
|
this.$emit("input", false);
|
|
124
124
|
},
|
|
125
125
|
getFile(index) {
|
|
126
|
-
let self = this
|
|
127
|
-
let file = self.fileList[index]
|
|
126
|
+
let self = this
|
|
127
|
+
let file = self.fileList[index]
|
|
128
128
|
if (file.status === 'finished') {
|
|
129
129
|
++index;
|
|
130
130
|
return self.getFile(index)
|
|
@@ -135,7 +135,7 @@ export default {
|
|
|
135
135
|
exportIndex(index) {
|
|
136
136
|
let self = this;
|
|
137
137
|
let file = self.getFile(index);
|
|
138
|
-
|
|
138
|
+
self.exportFile(file).then(() => {
|
|
139
139
|
if (index < self.fileList.length && self.showFileList) {
|
|
140
140
|
self.exportIndex(++index);
|
|
141
141
|
}
|
|
@@ -338,8 +338,9 @@ export default {
|
|
|
338
338
|
},
|
|
339
339
|
summaryData(data) {
|
|
340
340
|
let sums = {};
|
|
341
|
+
console.log("--summaryData this.parsedColumns:", this.parsedColumns)
|
|
341
342
|
if (this.summaryMethod) {
|
|
342
|
-
sums = this.summaryMethod({ columns: this.
|
|
343
|
+
sums = this.summaryMethod({ columns: this.parsedColumns, data: data });
|
|
343
344
|
} else {
|
|
344
345
|
this.cloneColumns.forEach((column, index) => {
|
|
345
346
|
const key = column.key;
|