Commit 8ca5aab0 by lichengming

修改了操作日志

parent fbe72935
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<Form id="search-contract-record" :label-width="70" inline onsubmit="return false"> <Form id="search-contract-record" :label-width="70" inline onsubmit="return false">
<label class="label-sign"></label> <label class="label-sign"></label>
<Form-item label="操作阶段:"> <Form-item label="操作阶段:">
<Input v-model="formObj.origin" @on-enter="_search" placeholder="请输入操作阶段" <Input v-model="formObj.origin" @on-enter="_search" name="origin" placeholder="请输入操作阶段"
style="width: 200px" clearable/> style="width: 200px" clearable/>
</Form-item> </Form-item>
<Form-item class="search-btn"> <Form-item class="search-btn">
...@@ -26,7 +26,8 @@ ...@@ -26,7 +26,8 @@
:key="item.key" :key="item.key"
:field="item.key" :field="item.key"
:title="item.title" :title="item.title"
:min-width="item.width?item.width:200" :fixed="item.fixed?item.fixed:undefined"> :min-width="item.width?item.width:200"
:fixed="item.fixed?item.fixed:undefined">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="item.key==='type'"> <span v-if="item.key==='type'">
{{scope.row[item.key] === 0 ? '流转' : scope.row[item.key] === 1 ? '退回': scope.row[item.key] === 2 ?'更新' : {{scope.row[item.key] === 0 ? '流转' : scope.row[item.key] === 1 ? '退回': scope.row[item.key] === 2 ?'更新' :
...@@ -64,9 +65,9 @@ export default { ...@@ -64,9 +65,9 @@ export default {
{ title: '责任人', key: 'liable', width: 80 } { title: '责任人', key: 'liable', width: 80 }
], ],
formObj: { formObj: {
entrustId: '', entrustId: undefined,
origin: undefined, origin: undefined,
sampleId: '' sampleId: undefined
} }
} }
}, },
...@@ -148,7 +149,15 @@ export default { ...@@ -148,7 +149,15 @@ export default {
} }
}, },
_search() { _search() {
this.$refs.pageTable._pageChange(1) if (this.formObj.entrustId !== undefined) {
this._page()
} else if (this.formObj.sampleBackupId !== undefined) {
this._pageBackup()
} else if (this.formObj.samplePrepareId !== undefined) {
this._pageSurplus()
} else {
this._pageTask()
}
} }
} }
} }
......
...@@ -120,7 +120,7 @@ export default { ...@@ -120,7 +120,7 @@ export default {
name: '管理样品和报告' name: '管理样品和报告'
}, },
{ {
type: 'ios-book', type: 'ios-beaker',
id: '', id: '',
name: '查看原始记录' name: '查看原始记录'
}, },
......
...@@ -402,7 +402,6 @@ export default { ...@@ -402,7 +402,6 @@ export default {
}, },
_page: async function() { _page: async function() {
Object.assign(this.formObj, this.$refs.pageTable._searchParams()) Object.assign(this.formObj, this.$refs.pageTable._searchParams())
console.log('this.formObj', this.formObj)
const result = await soilTest.pageExpAllot( const result = await soilTest.pageExpAllot(
this.$serializeForm(this.formObj) this.$serializeForm(this.formObj)
) )
......
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