|
@@ -10,8 +10,8 @@
|
|
:columnParsing="columnParsing"
|
|
:columnParsing="columnParsing"
|
|
:reduction="reduction"
|
|
:reduction="reduction"
|
|
:plan="[...defaultPlan, ...timePlan, ...paramList, ...morePlan]"
|
|
:plan="[...defaultPlan, ...timePlan, ...paramList, ...morePlan]"
|
|
- :operation="operationShow ? caozuojl : operation"
|
|
|
|
- :operationColumnWidth="(operation ? operationColumnWidth : 0) + (operationShow ? 70 : 0)"
|
|
|
|
|
|
+ :operation="operationShow && pk ? caozuojl : operation"
|
|
|
|
+ :operationColumnWidth="(operation ? operationColumnWidth : 0) + (operationShow && pk ? 70 : 0)"
|
|
:showTable="showTable"
|
|
:showTable="showTable"
|
|
:codeGather="codeGather"
|
|
:codeGather="codeGather"
|
|
:loading="loading"
|
|
:loading="loading"
|
|
@@ -350,9 +350,9 @@ export default {
|
|
size="mini"
|
|
size="mini"
|
|
type="text"
|
|
type="text"
|
|
onClick={() => {
|
|
onClick={() => {
|
|
- if (row[this.operationRecordkey || this.pk || 'id']) {
|
|
|
|
|
|
+ if (row[this.pk]) {
|
|
commonLogList({
|
|
commonLogList({
|
|
- objId: row[this.operationRecordkey || this.pk || 'id'],
|
|
|
|
|
|
+ objId: row[this.pk],
|
|
pageNum: 1,
|
|
pageNum: 1,
|
|
pageSize: -1
|
|
pageSize: -1
|
|
}).then(res => {
|
|
}).then(res => {
|