|
|
@@ -258,9 +258,6 @@
|
|
|
<a-menu-item key="10">
|
|
|
<a v-if="$auth('sb-infos-edit')" @click="handleCopy(record)">复制</a>
|
|
|
</a-menu-item>
|
|
|
- <a-menu-item key="11">
|
|
|
- <a @click="addLogBySb(record)">新增履历</a>
|
|
|
- </a-menu-item>
|
|
|
<a-menu-item key="4">
|
|
|
<a @click="handlePrint(record)">打印</a>
|
|
|
</a-menu-item>
|
|
|
@@ -280,10 +277,20 @@
|
|
|
:status="DictCache.COLOR.SB_MEASURE_STATUS[text]"
|
|
|
:text="yesNoMap[text]" />
|
|
|
</span>
|
|
|
- <!-- <div slot="expandedRowRender" slot-scope="record" style="width:100%;padding-right:120px;">
|
|
|
+ <div slot="expandedRowRender" slot-scope="record" style="width:100%;padding-right:120px;">
|
|
|
<a-card :bordered="false" style="width:100%;position: relative; z-inde:9999">
|
|
|
<div slot="title">
|
|
|
- <a-button type="primary" icon="plus" @click="addLogBySb(record)">新增</a-button>
|
|
|
+ <a-row :gutter="20">
|
|
|
+ <a-col :span="8">
|
|
|
+ <a-input v-model.trim="createdUserName" placeholder="请输入操作人"/>
|
|
|
+ </a-col>
|
|
|
+ <a-col :span="8">
|
|
|
+ <a-button type="primary" @click="getLogBySbId({sbId: record.id,createdUserName})">查询</a-button>
|
|
|
+ <a-button style="margin-left: 8px" @click="()=>{getLogBySbId({sbId: record.id});createdUserName=''}">重置</a-button>
|
|
|
+ <a-button style="margin-left: 8px" type="primary" icon="plus" @click="addLogBySb(record)">新增</a-button>
|
|
|
+ </a-col>
|
|
|
+ </a-row>
|
|
|
+
|
|
|
</div>
|
|
|
<a-table :columns="childColumns1" :data-source="childMap">
|
|
|
<template #sbMeasureLogCredential="text">
|
|
|
@@ -291,7 +298,7 @@
|
|
|
</template>
|
|
|
</a-table>
|
|
|
</a-card>
|
|
|
- </div> -->
|
|
|
+ </div>
|
|
|
</s-table>
|
|
|
</div>
|
|
|
</a-col>
|
|
|
@@ -432,6 +439,7 @@ export default {
|
|
|
useTypeMap: {},
|
|
|
statusMap: {},
|
|
|
yesNoMap: {},
|
|
|
+ createdUserName: '',
|
|
|
expandedKeys: [],
|
|
|
selectedKeys: [],
|
|
|
sourceTypeMap: {},
|
|
|
@@ -1056,11 +1064,14 @@ export default {
|
|
|
console.log(expanded, record)
|
|
|
this.childMap = []
|
|
|
if (expanded) {
|
|
|
- getLogBySbId({ sbId: record.id }).then(res => {
|
|
|
- this.childMap = res.data.rows
|
|
|
- })
|
|
|
+ this.getLogBySbId({ sbId: record.id })
|
|
|
}
|
|
|
},
|
|
|
+ getLogBySbId (params) {
|
|
|
+ getLogBySbId(params).then(res => {
|
|
|
+ this.childMap = res.data.rows
|
|
|
+ })
|
|
|
+ },
|
|
|
addLogBySb (record) {
|
|
|
this.$refs.addLogForm.base(record)
|
|
|
},
|
