From e5454b769d44a34af423bf87ac8a740bf8c20341 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 29 四月 2025 13:25:29 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides
---
src/components/Table/lims-table.vue | 385 +++++++++++++++++++++++++-----------------------------
1 files changed, 181 insertions(+), 204 deletions(-)
diff --git a/src/components/Table/lims-table.vue b/src/components/Table/lims-table.vue
index 8b5b5b4..2df0ddc 100644
--- a/src/components/Table/lims-table.vue
+++ b/src/components/Table/lims-table.vue
@@ -1,82 +1,29 @@
<template>
<div>
<!-- 琛ㄦ牸 -->
- <el-table
- ref="multipleTable"
- v-loading="tableLoading"
- :border="border"
- :data="tableData"
- :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }"
- :height="height"
- :highlight-current-row="highlightCurrentRow"
- :row-class-name="rowClassName"
- :row-style="rowStyle"
- :row-key="rowKey"
- :span-method="spanMethod"
- stripe
- style="width: 100%"
- tooltip-effect="dark"
- @row-click="rowClick"
- @current-change="currentChange"
- @selection-change="handleSelectionChange"
- >
- <el-table-column
- align="center"
- type="selection"
- width="55"
- v-if="isSelection"
- />
- <el-table-column
- align="center"
- label="搴忓彿"
- type="index"
- width="60"
- :index="indexMethod"
- />
+ <el-table ref="multipleTable" v-loading="tableLoading" :border="border" :data="tableData"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" :height="height"
+ :highlight-current-row="highlightCurrentRow" :row-class-name="rowClassName" :row-style="rowStyle"
+ :row-key="rowKey" :span-method="spanMethod" stripe style="width: 100%" tooltip-effect="dark" @row-click="rowClick"
+ @current-change="currentChange" @selection-change="handleSelectionChange" class="lims-table">
+ <el-table-column align="center" type="selection" width="55" v-if="isSelection" />
+ <el-table-column align="center" label="搴忓彿" type="index" width="60" :index="indexMethod" />
- <el-table-column
- v-for="(item, index) in column"
- :key="index"
- :column-key="item.columnKey"
- :filter-method="item.filterHandler"
- :filter-multiple="item.filterMultiple"
- :filtered-value="item.filteredValue"
- :filters="item.filters"
- :fixed="item.fixed"
- :label="item.label"
- :min-width="item.minWidth"
- :prop="item.prop"
- show-overflow-tooltip
- :sortable="item.sortable ? true : false"
- :type="item.type"
- :width="
- item.dataType === 'action' ? getWidth(item.operation) : item.width
- "
- align="center"
- >
+ <el-table-column v-for="(item, index) in column" :key="index" :column-key="item.columnKey"
+ :filter-method="item.filterHandler" :filter-multiple="item.filterMultiple" :filtered-value="item.filteredValue"
+ :filters="item.filters" :fixed="item.fixed" :label="item.label" :prop="item.prop"
+ :show-overflow-tooltip="item.dataType === 'action' || item.dataType === 'slot' ? false : true"
+ :min-width="item.dataType == 'action' ? btnWidth : item.width"
+ :sortable="item.sortable ? true : false" :type="item.type" :width="item.dataType == 'action' ? btnWidth : item.width" align="center">
<!-- <div class="123" v-if="item.type == ''"> -->
- <template
- v-if="item.hasOwnProperty('colunmTemplate')"
- :slot="item.colunmTemplate"
- slot-scope="scope"
- >
- <slot
- v-if="item.theadSlot"
- :index="index"
- :name="item.theadSlot"
- :row="scope.row"
- />
+ <template v-if="item.hasOwnProperty('colunmTemplate')" :slot="item.colunmTemplate" slot-scope="scope">
+ <slot v-if="item.theadSlot" :index="index" :name="item.theadSlot" :row="scope.row" />
</template>
<template slot-scope="scope">
<!-- 鎻掓Ы -->
<div v-if="item.dataType == 'slot'">
- <slot
- v-if="item.slot"
- :index="scope.$index"
- :name="item.slot"
- :row="scope.row"
- />
+ <slot v-if="item.slot" :index="scope.$index" :name="item.slot" :row="scope.row" />
</div>
<!-- 杩涘害鏉� -->
<div v-else-if="item.dataType == 'progress'">
@@ -84,107 +31,69 @@
</div>
<!-- 鍥剧墖 -->
<div v-else-if="item.dataType == 'image'">
- <img
- :src="javaApi + '/img/' + item.prop"
- alt=""
- style="width: 40px; height: 40px; margin-top: 10px"
- />
+ <img :src="javaApi + '/img/' + scope.row[item.prop]" alt=""
+ style="width: 40px; height: 40px; margin-top: 10px" />
</div>
<!-- tag -->
<div v-else-if="item.dataType == 'tag'">
- <el-tag
- v-if="
- typeof dataTypeFn(scope.row[item.prop], item.formatData) ==
- 'string'
- "
- :title="scope.row[item.prop] | formatters(item.formatData)"
- :type="formatType(scope.row[item.prop], item.formatType)"
- >{{ scope.row[item.prop] | formatters(item.formatData) }}</el-tag
- >
- <el-tag
- v-for="(tag, index) in dataTypeFn(
- scope.row[item.prop],
- item.formatData
- )"
- v-else-if="
- typeof dataTypeFn(scope.row[item.prop], item.formatData) ==
- 'object'
- "
- :key="index"
- :title="scope.row[item.prop] | formatters(item.formatData)"
- :type="formatType(tag, item.formatType)"
- >{{
+ <el-tag v-if="
+ typeof dataTypeFn(scope.row[item.prop], item.formatData) ==
+ 'string'
+ " :title="scope.row[item.prop] | formatters(item.formatData)"
+ :type="formatType(scope.row[item.prop], item.formatType)">{{ scope.row[item.prop] |
+ formatters(item.formatData) }}</el-tag>
+ <el-tag v-for="(tag, index) in dataTypeFn(
+ scope.row[item.prop],
+ item.formatData
+ )" v-else-if="
+ typeof dataTypeFn(scope.row[item.prop], item.formatData) ==
+ 'object'
+ " :key="index" :title="scope.row[item.prop] | formatters(item.formatData)"
+ :type="formatType(tag, item.formatType)">{{
item.tagGroup
? tag[item.tagGroup.label]
? tag[item.tagGroup.label]
: tag
: tag
- }}</el-tag
- >
- <el-tag
- v-else
- :title="scope.row[item.prop] | formatters(item.formatData)"
- :type="formatType(scope.row[item.prop], item.formatType)"
- >{{ scope.row[item.prop] | formatters(item.formatData) }}</el-tag
- >
+ }}</el-tag>
+ <el-tag v-else :title="scope.row[item.prop] | formatters(item.formatData)"
+ :type="formatType(scope.row[item.prop], item.formatType)">{{ scope.row[item.prop] |
+ formatters(item.formatData) }}</el-tag>
</div>
<!-- 鎸夐挳 -->
- <div v-else-if="item.dataType == 'action'">
+ <div v-else-if="item.dataType == 'action'"
+ :style="`min-width:${getWidth(item.operation, scope.row)}`">
<template v-for="(o, key) in item.operation">
- <el-button
- v-if="o.type != 'upload'"
- size="mini"
- v-show="o.showHide ? o.showHide(scope.row) : true"
- :disabled="o.disabled ? o.disabled(scope.row) : false"
- :icon="iconFn(o)"
- :plain="o.plain"
- :style="{ color: o.name === '鍒犻櫎' ? '#f56c6c' : o.color }"
- :type="o.type | typeFn(scope.row)"
- @click="o.clickFun(scope.row)"
- :key="key"
- >
+ <el-button v-show="o.type != 'upload'" size="mini" v-if="o.showHide ? o.showHide(scope.row) : true"
+ :disabled="o.disabled ? o.disabled(scope.row) : false" :icon="iconFn(o)" :plain="o.plain"
+ :style="{ color: o.name === '鍒犻櫎' ? '#f56c6c' : o.color }" :type="o.type | typeFn(scope.row)"
+ @click="o.clickFun(scope.row)" :key="key">
{{ o.name }}
</el-button>
- <el-upload
- action="#"
- size="mini"
- :on-change="
- (file, fileList) => o.clickFun(scope.row, file, fileList)
- "
- :multiple="o.multiple ? o.multiple : false"
- :limit="o.limit ? o.limit : 1"
- :disabled="o.disabled ? o.disabled(scope.row) : false"
- :accept="
- o.accept
- ? o.accept
- : '.jpg,.jpeg,.png,.gif,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.zip,.rar'
- "
- v-if="o.type == 'upload'"
- style="display: inline-block; width: 50px"
- v-show="o.showHide ? o.showHide(scope.row) : true"
- :auto-upload="false"
- :on-exceed="onExceed"
- :show-file-list="false"
- :key="key"
- >
- <el-button
- :size="o.size ? o.size : 'small'"
- type="text"
- :disabled="o.disabled ? o.disabled(scope.row) : false"
- >{{ o.name }}</el-button
- >
+ <el-upload :action="javaApi + o.url + '?id=' + (o.uploadIdFun ? o.uploadIdFun(scope.row) : scope.row.id)"
+ :key="uploadKeys[scope.$index]"
+ ref="uploadRef"
+ size="mini" :multiple="o.multiple ? o.multiple : false" :limit="1"
+ :disabled="o.disabled ? o.disabled(scope.row) : false" :accept="o.accept
+ ? o.accept
+ : '.jpg,.jpeg,.png,.gif,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.zip,.rar'
+ " v-if="o.type == 'upload'" style="display: inline-block; width: 50px"
+ v-show="o.showHide ? o.showHide(scope.row) : true" :headers="uploadHeader"
+ :before-upload="(file) => beforeUpload(file, scope.$index)"
+ :on-change="(file, fileList) => handleChange(file, fileList, scope.$index)"
+ :on-error="(error, file, fileList) => onError(error, file, fileList, scope.$index)"
+ :on-success="(response, file, fileList) => handleSuccessUp(response, file, fileList, scope.$index)"
+ :on-exceed="onExceed" :show-file-list="false">
+ <el-button :size="o.size ? o.size : 'small'" type="text"
+ :disabled="o.disabled ? o.disabled(scope.row) : false">{{ o.name }}</el-button>
</el-upload>
</template>
</div>
<!-- 鍙偣鍑荤殑鏂囧瓧 -->
- <div
- v-else-if="item.dataType == 'link'"
- class="cell link"
- style="width: 100%"
- @click="goLink(scope.row, item.linkMethod)"
- >
+ <div v-else-if="item.dataType == 'link'" class="cell link" style="width: 100%"
+ @click="goLink(scope.row, item.linkMethod)">
<span v-if="!item.formatData">{{ scope.row[item.prop] }}</span>
</div>
<!-- 榛樿绾睍绀烘暟鎹� -->
@@ -197,14 +106,8 @@
</template>
</el-table-column>
</el-table>
- <pagination
- v-show="page.total > 0"
- :total="page.total"
- :layout="page.layout"
- :page.sync="page.current"
- :limit.sync="page.size"
- @pagination="pagination"
- />
+ <pagination v-show="page.total > 0" :total="page.total" :layout="page.layout" :page.sync="page.current"
+ :limit.sync="page.size" @pagination="pagination" />
</div>
</template>
@@ -262,7 +165,6 @@
name: "ZTTable",
filters: {
typeFn(val, row) {
- // console.log(val, row, '11111111');
if (typeof val === "function") {
return val(row);
} else return val;
@@ -294,19 +196,19 @@
handleSelectionChange: {
type: Function,
default: () => {
- return () => {};
+ return () => { };
},
},
rowClick: {
type: Function,
default: () => {
- return () => {};
+ return () => { };
},
},
currentChange: {
type: Function,
default: () => {
- return () => {};
+ return () => { };
},
},
border: {
@@ -331,11 +233,11 @@
},
rowClassName: {
type: Function,
- default: () => {},
+ default: () => { },
},
rowStyle: {
type: Object || Function,
- default: () => {},
+ default: () => null,
},
tableData: {
type: Array,
@@ -362,33 +264,70 @@
data() {
return {
spanList: [],
+ btnWidth: "120px",
+ uploadRefs: [],
+ currentFiles: {}, // 鐢ㄤ簬瀛樺偍姣忚鐨勫綋鍓嶆枃浠�
+ uploadKeys: {} // 鐢ㄤ簬鍔ㄦ�侀噸缃粍浠�
};
},
mounted() {
this.calculateSpanInfo();
+ this.$nextTick(() => {
+ this.$refs.multipleTable.doLayout();
+ this.tableData.forEach((_, index) => {
+ if (this.$refs.uploadRef) {
+ this.$refs.uploadRef[index] = this.$refs.uploadRef[index] || {};
+ }
+ });
+ })
+ },
+ watch: {
+ tableData: {
+ handler() {
+ // 褰撹〃鏍兼暟鎹彉鍖栨椂锛屽垵濮嬪寲 uploadKeys
+ this.tableData.forEach((_, index) => {
+ this.$set(this.uploadKeys, index, Date.now());
+ });
+ },
+ immediate: true
+ }
},
methods: {
- getWidth(row) {
+ getWidth(row, row0) {
let count = 0;
- console.log("row---", row);
row.forEach((a) => {
- count += a.name.length;
+ if (a.showHide !== undefined && a.showHide(row0)) {
+ count += a.name.length;
+ } else if (!a.showHide) {
+ count += a.name.length;
+ }
});
- return count * 15 + 40 + "px";
+ this.btnWidth = count * 15 + 60 + "px";
+ return count * 15 + 60 + "px";
+ },
+ getTitleWidth(row) {
+ if (row.label.includes('鏃堕棿') || row.label.includes('缂栧彿') || row.label.includes('鏍峰搧鍚嶇О') || row.label.includes('闆朵欢')) {
+ return 160
+ } else if (row.label.includes('鎿嶄綔')) {
+ return row.width
+ } else {
+ const span = document.createElement('span');
+ span.innerText = row.label;
+ document.body.appendChild(span);
+ const width = `${span.offsetWidth + 50}px`;
+ document.body.removeChild(span);
+
+ return width;
+ }
},
iconFn(row) {
if (row.name === "缂栬緫" || row.name === "淇敼") {
return "el-icon-edit";
- } else if (row.name === "鍒犻櫎") {
- return "el-icon-delete";
} else if (row.name === "鏌ョ湅") {
return "el-icon-view";
} else {
return row.icon;
}
- // if (typeof (val) === 'function') {
- // return val(row);
- // } else return val;
},
formatType(val, format) {
if (typeof format === "function") {
@@ -403,6 +342,54 @@
setCurrent(row) {
this.$refs.multipleTable.setCurrentRow();
},
+ handleSuccessUp(response, file, fileList, index) {
+ if (response.code == 200) {
+ // 娓呴櫎鏂囦欢鍒楄〃骞舵洿鏂板綋鍓嶆枃浠�
+ if (this.uploadRefs[index]) {
+ this.uploadRefs[index].clearFiles();
+ }
+ this.currentFiles[index] = file;
+ this.$message.success("涓婁紶鎴愬姛");
+ // 閲嶇疆缁勪欢鐘舵��
+ this.resetUploadComponent(index);
+
+ } else {
+ this.$message.error(response.message);
+ }
+ },
+ resetUploadComponent(index) {
+ // 鍔ㄦ�佹敼鍙� key 鏉ュ己鍒堕噸缃粍浠�
+ this.uploadKeys[index] = Date.now(); // 浣跨敤鏃堕棿鎴充綔涓烘柊鐨� key
+ },
+ handleChange(file, fileList, index) {
+ // 濡傛灉鏂囦欢鏁伴噺瓒呰繃闄愬埗锛岀Щ闄ゆ渶鏃╃殑鏂囦欢
+ if (fileList.length > 1) {
+ // 绉婚櫎鏈�鏃╃殑鏂囦欢
+ const earliestFile = fileList[0];
+ this.uploadRefs[index].handleRemove(earliestFile);
+ }
+
+ // 鏇存柊褰撳墠鏂囦欢
+ this.currentFiles[index] = file;
+ },
+ beforeUpload (file, index) {
+ this.currentFiles[index] = {}
+ if (file.size > 1024 * 1024 * 10) {
+ this.$message.error('涓婁紶鏂囦欢涓嶈秴杩�10M');
+ // this.$refs.upload.clearFiles()
+ return false;
+ } else {
+ return true;
+ }
+ },
+ onError(error, file, fileList, index) {
+ this.$message.error('鏂囦欢涓婁紶澶辫触锛岃閲嶈瘯');
+
+ // 娓呴櫎鏂囦欢鍒楄〃
+ if (this.uploadRefs[index]) {
+ this.uploadRefs[index].clearFiles();
+ }
+ },
onExceed() {
this.$message.warning("瓒呭嚭鏂囦欢涓暟");
},
@@ -410,7 +397,6 @@
this.$emit("pagination", { page: page, limit: limit });
},
indexMethod(index) {
- // return index * 2;
return (this.page.current - 1) * this.page.size + index + 1;
},
// 鐐瑰嚮鍗曞厓鏍糽ink浜嬩欢
@@ -479,39 +465,21 @@
};
}
}
- // // 鐗规畩鐨勫悎骞惰
- // if (
- // this.data.spanConfig != undefined &&
- // this.data.spanConfig.special &&
- // this.data.spanConfig.special.main &&
- // this.data.spanConfig.special.rows &&
- // this.data.spanConfig.special.rows.length > 0
- // ) {
- // let i = null;
- // let obj = this.data.spanConfig.special.rows.find((item, index) => {
- // i = index;
- // return item.index == columnIndex;
- // });
- // if (obj) {
- // const _row = this.specialSpanList[i].arr[rowIndex];
- // const _col = _row > 0 ? 1 : 0;
- // return {
- // rowspan: _row,
- // colspan: _col,
- // };
- // }
- // }
},
},
};
</script>
<style scoped>
-.el-table >>> .el-table__empty-text {
+.el-table>>>.el-table__empty-text {
text-align: center;
}
->>> .cell {
+.link {
+ color: rgb(64, 158, 255);
+ cursor: pointer;
+}
+>>>.cell {
padding: 0 !important;
}
.cell {
@@ -521,11 +489,20 @@
padding-right: 4px !important;
padding-left: 10px !important;
}
-.link {
- color: rgb(64, 158, 255);
- cursor: pointer;
+
+.lims-table .highlight-warning-row-border td:first-child {
+ border-left: 4px solid #ffcd29;
}
->>> .el-table__body-wrapper::-webkit-scrollbar {
- height: 14px; /* 璁剧疆婊氬姩鏉″搴� */
+
+.lims-table .highlight-warning-row-border td:last-child {
+ border-right: 4px solid #ffcd29;
+}
+
+.lims-table .highlight-danger-row-border td:first-child {
+ border-left: 4px solid #f56c6c;
+}
+
+.lims-table .highlight-danger-row-border td:last-child {
+ border-right: 4px solid #f56c6c;
}
</style>
--
Gitblit v1.9.3