Commit 37538382 by lichengming

修改了委托单登记历史记录

parent c9931b17
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
:fixed="item.fixed?item.fixed:undefined" sortable> :fixed="item.fixed?item.fixed:undefined" sortable>
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="item.date">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}</span> <span v-if="item.date">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}</span>
<span v-if="item.status">{{scope.row[item.key].display}}</span>
<span v-else>{{scope.row[item.key]}}</span> <span v-else>{{scope.row[item.key]}}</span>
</template> </template>
</vxe-table-column> </vxe-table-column>
...@@ -47,13 +48,15 @@ ...@@ -47,13 +48,15 @@
</div> </div>
</div> </div>
<MeterEntrustRecord ref="entrustRecordModal" @on-result-change="_page"></MeterEntrustRecord> <MeterEntrustRecord ref="entrustRecordModal" @on-result-change="_page"></MeterEntrustRecord>
<SoilSampleManage ref="sampleManageModal" @on-result-change="_page"></SoilSampleManage>
</div> </div>
</template> </template>
<script> <script>
import { soilAptitude, soilEntrust } from '../../../api' import { soilAptitude, soilEntrust } from '../../../api'
import MeterEntrustRecord from '../../../components/operation/Operation' import MeterEntrustRecord from '../../../components/operation/Operation'
import SoilSampleManage from '../SoilSampleManageHis'
export default { export default {
components: { MeterEntrustRecord }, components: { MeterEntrustRecord, SoilSampleManage },
data() { data() {
return { return {
currentComponent: '', currentComponent: '',
...@@ -68,6 +71,11 @@ export default { ...@@ -68,6 +71,11 @@ export default {
], ],
iconMsg: [ iconMsg: [
{ {
type: 'ios-list',
id: '',
name: '试样列表'
},
{
type: 'ios-clock', type: 'ios-clock',
id: '', id: '',
name: '操作日志' name: '操作日志'
...@@ -145,12 +153,15 @@ export default { ...@@ -145,12 +153,15 @@ export default {
case '查看样品': case '查看样品':
this._sampleManage(data.id) this._sampleManage(data.id)
break break
case '试样列表':
this._sampleManage(data.id)
break
} }
}) })
}, },
_sampleManage(data) { _sampleManage(data) {
// 管理样品 // 管理样品
this.$refs.meterSampleManageModal._open(data) this.$refs.sampleManageModal._open(data)
}, },
_record(id) { _record(id) {
this.$refs.entrustRecordModal._open(id) this.$refs.entrustRecordModal._open(id)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment