Skip to content

P
patzn-cloud-web-back-soil
Commit f6ba9718 by lichengming
Options

修改了样品进度查询

parent f3896a7c
Showing with 22 additions and 24 deletions
pages/soil-statistics/sample-progress/SampleProgressDetail.vue
...@@ -12,6 +12,12 @@ ...@@ -12,6 +12,12 @@
<Form-item label="样品编号:" class="search-item"> <Form-item label="样品编号:" class="search-item">
<Input @on-enter="_formSearch" v-model="formObj.sampleCode" placeholder="请输入样品编号" clearable/> <Input @on-enter="_formSearch" v-model="formObj.sampleCode" placeholder="请输入样品编号" clearable/>
</Form-item> </Form-item>
<Form-item label="委托编号:" class="search-item">
<Input @on-enter="_formSearch" v-model="formObj.entrustCode" placeholder="请输入委托编号" clearable/>
</Form-item>
<Form-item label="项目名称:" class="search-item">
<Input @on-enter="_formSearch" v-model="formObj.projectName" placeholder="请输入项目名称" clearable/>
</Form-item>
<Form-item class="search-btn"> <Form-item class="search-btn">
<Button @click="_formSearch" type="primary">搜索</Button> <Button @click="_formSearch" type="primary">搜索</Button>
</Form-item> </Form-item>
...@@ -69,18 +75,10 @@ export default { ...@@ -69,18 +75,10 @@ export default {
userColumns: [], userColumns: [],
searchOpen: true, searchOpen: true,
formObj: { formObj: {
cname: '', boreholeName: undefined,
num: '', sampleCode: undefined,
contractName: '', entrustCode: undefined,
code: '', projectName: undefined
finished: '',
reportDateBegin: '',
reportDateEnd: '',
myGroupData: 0,
name: '',
groupIds: '',
salesmans: '',
type: ''
}, },
btn: [ btn: [
{ type: 'primary', id: '', name: '导出' }, { type: 'primary', id: '', name: '导出' },
...@@ -91,6 +89,7 @@ export default { ...@@ -91,6 +89,7 @@ export default {
{ title: '委托编号', key: 'entrustCode', width: 140 }, { title: '委托编号', key: 'entrustCode', width: 140 },
{ title: '钻孔名称', key: 'boreholeName', width: 140 }, { title: '钻孔名称', key: 'boreholeName', width: 140 },
{ title: '样品编号', key: 'sampleCode', width: 140 }, { title: '样品编号', key: 'sampleCode', width: 140 },
{ title: '项目名称', key: 'projectName', width: 140 },
{ title: '状态', key: 'status', width: 80, status: true }, { title: '状态', key: 'status', width: 80, status: true },
{ title: '检测进度', key: 'testProgress', width: 160 } { title: '检测进度', key: 'testProgress', width: 160 }
], ],
......
pages/workbench/SampleProgressDetail.vue
...@@ -12,6 +12,12 @@ ...@@ -12,6 +12,12 @@
<Form-item label="样品编号:" class="search-item"> <Form-item label="样品编号:" class="search-item">
<Input @on-enter="_formSearch" v-model="formObj.sampleCode" placeholder="请输入样品编号" clearable/> <Input @on-enter="_formSearch" v-model="formObj.sampleCode" placeholder="请输入样品编号" clearable/>
</Form-item> </Form-item>
<Form-item label="委托编号:" class="search-item">
<Input @on-enter="_formSearch" v-model="formObj.entrustCode" placeholder="请输入委托编号" clearable/>
</Form-item>
<Form-item label="项目名称:" class="search-item">
<Input @on-enter="_formSearch" v-model="formObj.projectName" placeholder="请输入项目名称" clearable/>
</Form-item>
<Form-item class="search-btn"> <Form-item class="search-btn">
<Button @click="_formSearch" type="primary">搜索</Button> <Button @click="_formSearch" type="primary">搜索</Button>
</Form-item> </Form-item>
...@@ -64,18 +70,10 @@ export default { ...@@ -64,18 +70,10 @@ export default {
userColumns: [], userColumns: [],
searchOpen: true, searchOpen: true,
formObj: { formObj: {
cname: '', boreholeName: undefined,
num: '', sampleCode: undefined,
contractName: '', entrustCode: undefined,
code: '', projectName: undefined
finished: '',
reportDateBegin: '',
reportDateEnd: '',
myGroupData: 0,
name: '',
groupIds: '',
salesmans: '',
type: ''
}, },
btn: [ btn: [
{ type: 'primary', id: '', name: '导出' }, { type: 'primary', id: '', name: '导出' },
...@@ -86,6 +84,7 @@ export default { ...@@ -86,6 +84,7 @@ export default {
{ title: '委托编号', key: 'entrustCode', width: 140 }, { title: '委托编号', key: 'entrustCode', width: 140 },
{ title: '钻孔名称', key: 'boreholeName', width: 140 }, { title: '钻孔名称', key: 'boreholeName', width: 140 },
{ title: '样品编号', key: 'sampleCode', width: 140 }, { title: '样品编号', key: 'sampleCode', width: 140 },
{ title: '项目名称', key: 'projectName', width: 140 },
{ title: '状态', key: 'status', width: 80, status: true }, { title: '状态', key: 'status', width: 80, status: true },
{ title: '检测进度', key: 'testProgress', width: 160 } { title: '检测进度', key: 'testProgress', width: 160 }
], ],
......
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