Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
patzn-cloud-web-back-soil
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wangweidong
patzn-cloud-web-back-soil
Commits
70e422db
Commit
70e422db
authored
Oct 21, 2020
by
lichengming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改了报告编制
parent
5edd0b93
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
281 additions
and
84 deletions
+281
-84
meter-entrust.js
api/meter/meter-entrust.js
+7
-1
Operation.vue
components/operation/Operation.vue
+26
-0
OriginalRecordView.vue
pages/soil-report-manage/report-make/OriginalRecordView.vue
+16
-12
ReportTemplate.vue
pages/soil-report-manage/report-make/ReportTemplate.vue
+66
-0
ReportTemplateModal.vue
pages/soil-report-manage/report-make/ReportTemplateModal.vue
+63
-0
SampleBackupsManage.vue
...-sample-manage/backups-manage/tab/SampleBackupsManage.vue
+16
-3
SampleBackupsQuery.vue
...l-sample-manage/backups-manage/tab/SampleBackupsQuery.vue
+37
-44
SampleSurplusManage.vue
...-sample-manage/surplus-manage/tab/SampleSurplusManage.vue
+12
-2
SampleSurplusQuery.vue
...l-sample-manage/surplus-manage/tab/SampleSurplusQuery.vue
+38
-22
No files found.
api/meter/meter-entrust.js
View file @
70e422db
...
@@ -154,5 +154,11 @@ export default {
...
@@ -154,5 +154,11 @@ export default {
http
.
post
(
'/meter/v1/contract_attachment/preview/'
+
data
).
then
(
res
=>
res
),
http
.
post
(
'/meter/v1/contract_attachment/preview/'
+
data
).
then
(
res
=>
res
),
// 委托附件预览
// 委托附件预览
entrustPreview
:
data
=>
entrustPreview
:
data
=>
http
.
post
(
'/meter/v1/entrust_attachment/preview/'
+
data
).
then
(
res
=>
res
)
http
.
post
(
'/meter/v1/entrust_attachment/preview/'
+
data
).
then
(
res
=>
res
),
// 余样操作日志分页列表
prepareRecordPage
:
data
=>
http
.
post
(
'soil/v1/prepare_record/page'
,
data
).
then
(
res
=>
res
),
// 备样操作日志分页列表
backupRecordPage
:
data
=>
http
.
post
(
'soil/v1/sample_backup_record/page'
,
data
).
then
(
res
=>
res
)
}
}
components/operation/Operation.vue
View file @
70e422db
...
@@ -88,6 +88,16 @@ export default {
...
@@ -88,6 +88,16 @@ export default {
this
.
formObj
.
entrustId
=
undefined
this
.
formObj
.
entrustId
=
undefined
this
.
_pageTask
()
this
.
_pageTask
()
},
},
_openSurplus
(
samplePrepareId
)
{
this
.
showModal
=
true
this
.
formObj
.
samplePrepareId
=
samplePrepareId
this
.
_pageSurplus
()
},
_openBcakup
(
sampleBackupId
)
{
this
.
showModal
=
true
this
.
formObj
.
sampleBackupId
=
sampleBackupId
this
.
_pageBackup
()
},
_page
:
async
function
()
{
_page
:
async
function
()
{
console
.
log
(
'要传的参数'
)
console
.
log
(
'要传的参数'
)
console
.
log
(
this
.
formObj
)
console
.
log
(
this
.
formObj
)
...
@@ -102,6 +112,22 @@ export default {
...
@@ -102,6 +112,22 @@ export default {
// this.$serializeFormSearch(this.formObj)
// this.$serializeFormSearch(this.formObj)
// )
// )
},
},
_pageSurplus
:
async
function
()
{
const
result
=
await
meterEntrust
.
prepareRecordPage
(
this
.
$serializeForm
(
this
.
formObj
)
)
if
(
result
)
{
this
.
getPage
=
result
}
},
_pageBackup
:
async
function
()
{
const
result
=
await
meterEntrust
.
backupRecordPage
(
this
.
$serializeForm
(
this
.
formObj
)
)
if
(
result
)
{
this
.
getPage
=
result
}
},
_pageTask
:
async
function
()
{
_pageTask
:
async
function
()
{
console
.
log
(
'要传的参数'
)
console
.
log
(
'要传的参数'
)
console
.
log
(
this
.
formObj
)
console
.
log
(
this
.
formObj
)
...
...
pages/soil-report-manage/report-make/OriginalRecordView.vue
View file @
70e422db
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
</Col>
</Col>
<!--操作-->
<!--操作-->
<Col
span=
"24"
>
<Col
span=
"24"
>
<btn-list
:open=
"searchOpen"
:showSearchBtn=
"true"
@
on-result-change=
"_btnClick"
<btn-list
:open=
"searchOpen"
:
msg=
"btn"
:
showSearchBtn=
"true"
@
on-result-change=
"_btnClick"
class=
"contHide"
></btn-list>
class=
"contHide"
></btn-list>
</Col>
</Col>
<!-- 表格 -->
<!-- 表格 -->
...
@@ -60,6 +60,7 @@
...
@@ -60,6 +60,7 @@
</Modal>
</Modal>
<ItemOriginalRecordEdit
ref=
"recordEditModal"
></ItemOriginalRecordEdit>
<ItemOriginalRecordEdit
ref=
"recordEditModal"
></ItemOriginalRecordEdit>
<ItemView
ref=
"itemViewModal"
></ItemView>
<ItemView
ref=
"itemViewModal"
></ItemView>
<ReportTemplateModal
ref=
"templateModal"
@
on-result-change=
"_page"
></ReportTemplateModal>
</div>
</div>
</template>
</template>
<
script
>
<
script
>
...
@@ -70,27 +71,20 @@ import Global from '../../../api/config'
...
@@ -70,27 +71,20 @@ import Global from '../../../api/config'
import
{
soilTest
}
from
'../../../api'
import
{
soilTest
}
from
'../../../api'
import
ItemOriginalRecordEdit
from
'./OriginalRecordEdit'
import
ItemOriginalRecordEdit
from
'./OriginalRecordEdit'
import
ItemView
from
'./ItemView'
import
ItemView
from
'./ItemView'
import
ReportTemplateModal
from
'./ReportTemplateModal'
export
default
{
export
default
{
components
:
{
components
:
{
ItemOriginalRecordEdit
,
ItemOriginalRecordEdit
,
ItemView
ItemView
,
ReportTemplateModal
},
},
data
()
{
data
()
{
return
{
return
{
currentComponent
:
''
,
currentComponent
:
''
,
getPage
:
{},
getPage
:
{},
showModal
:
false
,
showModal
:
false
,
btn
:
[
btn
:
[{
type
:
'primary'
,
id
:
''
,
name
:
'生成报告'
}],
{
type
:
''
,
id
:
''
,
name
:
'纠正填写时间'
,
componentName
:
'EditDateModal'
},
{
type
:
''
,
id
:
''
,
name
:
'设置填写人乙'
},
{
type
:
'error'
,
id
:
''
,
name
:
'删除'
}
],
selectIds
:
[],
selectIds
:
[],
iconMsg
:
[
iconMsg
:
[
{
{
...
@@ -223,6 +217,9 @@ export default {
...
@@ -223,6 +217,9 @@ export default {
case
'设置填写人乙'
:
case
'设置填写人乙'
:
this
.
_setAnotherTester
()
this
.
_setAnotherTester
()
break
break
case
'生成报告'
:
this
.
_reportMake
()
break
case
'删除'
:
case
'删除'
:
this
.
_batchDelete
()
this
.
_batchDelete
()
break
break
...
@@ -232,6 +229,13 @@ export default {
...
@@ -232,6 +229,13 @@ export default {
}
}
})
})
},
},
_reportMake
(
data
)
{
if
(
this
.
selectIds
.
length
===
0
)
{
this
.
$Message
.
warning
(
'请至少选择一条数据'
)
}
else
{
this
.
$refs
.
templateModal
.
_open
(
this
.
selectIds
)
}
},
// 设置填写人乙
// 设置填写人乙
_setAnotherTester
()
{
_setAnotherTester
()
{
if
(
this
.
selectIds
.
length
===
0
)
{
if
(
this
.
selectIds
.
length
===
0
)
{
...
...
pages/soil-report-manage/report-make/ReportTemplate.vue
0 → 100644
View file @
70e422db
<
template
>
<div>
<PTVXETable
ref=
"pageTable"
:tableHeight=
"tableHeight"
@
on-result-change=
"_tableResultChange"
:getPage=
"getPage"
is-radio
>
<vxe-table-column
:field=
"item.key"
:title=
"item.title"
:min-width=
"item.width?item.width:200"
:fixed=
"item.fixed?item.fixed:undefined"
v-for=
"item in pageColumns"
:key=
"item.key"
sortable
>
<template
slot-scope=
"scope"
>
<span>
{{
scope
.
row
[
item
.
key
]
}}
</span>
</
template
>
</vxe-table-column>
</PTVXETable>
</div>
</template>
<
script
>
import
global
from
'../../../api/config'
export
default
{
components
:
{},
data
()
{
return
{
tableHeight
:
'400'
,
pageColumns
:
[{
title
:
'报告模板名称'
,
key
:
'name'
}],
getPage
:
{},
modalTitle
:
'报告模板'
,
tempId
:
''
}
},
methods
:
{
_tableResultChange
(
msg
,
data
)
{
switch
(
msg
)
{
case
'page'
:
this
.
getPage
=
this
.
$store
.
state
.
SysFileTemplate
.
page
if
(
this
.
tempId
)
{
this
.
$refs
.
pageTable
.
templateRadio
=
this
.
tempId
this
.
$emit
(
'on-result-change'
,
{
id
:
this
.
tempId
})
}
break
case
'radioSelect'
:
this
.
$emit
(
'on-result-change'
,
data
)
break
default
:
this
.
_page
()
}
},
_open
(
tempId
)
{
this
.
tempId
=
tempId
||
''
// this._page()
},
_page
()
{
this
.
$refs
.
pageTable
.
_page
(
'report-template-list'
,
'SysFileTemplate/page'
,
{
classifyName
:
'食品报告模板'
,
service
:
global
.
getCode
()
}
)
}
}
}
</
script
>
pages/soil-report-manage/report-make/ReportTemplateModal.vue
0 → 100644
View file @
70e422db
<
template
>
<div>
<Modal
v-model=
"showModal"
:mask-closable=
"false"
width=
"900"
class=
"zIndex-1200"
>
<p
slot=
"header"
>
选择报告模板
</p>
<div>
<ReportTemplate
ref=
"reportTemplate"
@
on-result-change=
"_templateResultChange"
></ReportTemplate>
</div>
<div
slot=
"footer"
>
<modal-footer
ref=
"footerModal"
:footer=
"footerList"
@
on-result-change=
"_footerResult"
></modal-footer>
</div>
</Modal>
</div>
</
template
>
<
script
>
import
ReportTemplate
from
'./ReportTemplate'
/**
* 重新生成的报告选择模板
*/
export
default
{
components
:
{
ReportTemplate
},
data
()
{
return
{
showModal
:
false
,
selectData
:
{},
footerList
:
[
{
type
:
''
,
id
:
''
,
name
:
'取消'
},
{
type
:
'primary'
,
id
:
''
,
name
:
'确定'
}
],
data
:
{}
}
},
methods
:
{
_open
(
data
)
{
this
.
showModal
=
true
this
.
$refs
.
footerModal
.
_hideLoading
()
this
.
data
=
data
this
.
$refs
.
reportTemplate
.
_open
(
data
.
tempId
)
},
_templateResultChange
(
selectData
)
{
this
.
selectData
=
selectData
},
_footerResult
(
name
)
{
switch
(
name
)
{
case
'确定'
:
this
.
$emit
(
'on-result-change'
,
{
id
:
this
.
data
.
id
,
tempId
:
this
.
selectData
.
id
,
reportBatch
:
this
.
data
.
reportBatch
})
this
.
showModal
=
false
break
case
'取消'
:
this
.
showModal
=
false
break
}
}
}
}
</
script
>
pages/soil-sample-manage/backups-manage/tab/SampleBackupsManage.vue
View file @
70e422db
...
@@ -122,6 +122,7 @@
...
@@ -122,6 +122,7 @@
</div>
</div>
</div>
</div>
<SampleParpareApply
ref=
"applyModal"
@
on-result-change=
"_page"
></SampleParpareApply>
<SampleParpareApply
ref=
"applyModal"
@
on-result-change=
"_page"
></SampleParpareApply>
<Operation
ref=
"recordModal"
></Operation>
</div>
</div>
</template>
</template>
<
script
>
<
script
>
...
@@ -130,10 +131,12 @@ import SampleParpareApply from '../SampleParpareApply'
...
@@ -130,10 +131,12 @@ import SampleParpareApply from '../SampleParpareApply'
// eslint-disable-next-line no-unused-vars
// eslint-disable-next-line no-unused-vars
import
http
from
'../../../../api/http'
import
http
from
'../../../../api/http'
import
{
soilEntrust
,
soilSample
}
from
'../../../../api'
import
{
soilEntrust
,
soilSample
}
from
'../../../../api'
import
Operation
from
'../../../../components/operation/Operation'
export
default
{
export
default
{
components
:
{
components
:
{
AutoCompletes
,
AutoCompletes
,
SampleParpareApply
SampleParpareApply
,
Operation
},
},
data
()
{
data
()
{
return
{
return
{
...
@@ -180,9 +183,13 @@ export default {
...
@@ -180,9 +183,13 @@ export default {
}
}
],
],
iconMsg
:
[
iconMsg
:
[
{
type
:
'md-create'
,
id
:
''
,
name
:
'编辑'
}
// food-sample-prepare-edit
{
type
:
'md-create'
,
id
:
''
,
name
:
'编辑'
},
// food-sample-prepare-edit
{
type
:
'ios-clock'
,
id
:
''
,
name
:
'操作日志'
}
// food-sample-prepare-edit
],
iconMsgSave
:
[
{
type
:
'ios-checkmark'
,
id
:
''
,
name
:
'保存'
},
{
type
:
'ios-clock'
,
id
:
''
,
name
:
'操作日志'
}
],
],
iconMsgSave
:
[{
type
:
'ios-checkmark'
,
id
:
''
,
name
:
'保存'
}],
pageColumns
:
[
pageColumns
:
[
{
title
:
'委托商'
,
key
:
'client'
,
width
:
180
},
{
title
:
'委托商'
,
key
:
'client'
,
width
:
180
},
{
title
:
'委托编号'
,
key
:
'entrustCode'
,
width
:
180
},
{
title
:
'委托编号'
,
key
:
'entrustCode'
,
width
:
180
},
...
@@ -315,6 +322,9 @@ export default {
...
@@ -315,6 +322,9 @@ export default {
case
'编辑'
:
case
'编辑'
:
this
.
editIndex
=
index
this
.
editIndex
=
index
break
break
case
'操作日志'
:
this
.
_record
(
data
.
id
)
break
case
'保存'
:
case
'保存'
:
console
.
log
(
'保存'
)
console
.
log
(
'保存'
)
// if (data.endDate !== '') {
// if (data.endDate !== '') {
...
@@ -326,6 +336,9 @@ export default {
...
@@ -326,6 +336,9 @@ export default {
break
break
}
}
},
},
_record
(
id
)
{
this
.
$refs
.
recordModal
.
_openBcakup
(
id
)
},
_locChange
(
msg
,
data
)
{
_locChange
(
msg
,
data
)
{
switch
(
msg
)
{
switch
(
msg
)
{
case
'select'
:
case
'select'
:
...
...
pages/soil-sample-manage/backups-manage/tab/SampleBackupsQuery.vue
View file @
70e422db
...
@@ -8,26 +8,14 @@
...
@@ -8,26 +8,14 @@
<Col
span=
"24"
>
<Col
span=
"24"
>
<Form
id=
"search-form-query"
:label-width=
"80"
v-show=
"searchOpen"
inline
onsubmit=
"return false"
>
<Form
id=
"search-form-query"
:label-width=
"80"
v-show=
"searchOpen"
inline
onsubmit=
"return false"
>
<label
class=
"label-sign"
></label>
<label
class=
"label-sign"
></label>
<Form-item
class=
"search-item"
label=
"样品编号:"
>
<Form-item
class=
"search-item"
label=
"试样编号:"
>
<Input
@
on-enter=
"_formSearch"
name=
"sampleSn"
placeholder=
"请输入样品编号"
clearable
/>
<Input
@
on-enter=
"_formSearch"
v-model=
"formObj.sampleCode"
name=
"sampleCode"
placeholder=
"请输入样品编号"
clearable
/>
</Form-item>
<Form-item
class=
"search-item"
label=
"样品名称:"
>
<Input
@
on-enter=
"_formSearch"
name=
"sampleName"
placeholder=
"请输入样品名称"
clearable
/>
</Form-item>
<Form-item
class=
"search-item"
label=
"存储位置:"
>
<Input
@
on-enter=
"_formSearch"
name=
"backupPlace"
placeholder=
"请输入存储位置"
clearable
/>
</Form-item>
<Form-item
class=
"search-item"
label=
"存储期限:"
>
<Date-picker
@
on-change=
"_dateChange"
:editable=
"false"
type=
"daterange"
split-panels
style=
"width:100%;"
placeholder=
"请选择存储期限"
></Date-picker>
<input
v-model=
"endDateBegin"
type=
"hidden"
name=
"endDateBegin"
>
<input
v-model=
"endDateEnd"
type=
"hidden"
name=
"endDateEnd"
>
</Form-item>
</Form-item>
<Form-item
class=
"search-item"
label=
"委托单位:"
style=
"margin-left: 8px;"
>
<Form-item
class=
"search-item"
label=
"委托单位:"
style=
"margin-left: 8px;"
>
<Input
@
on-enter=
"_formSearch"
name=
"cname
"
placeholder=
"请输入委托单位"
clearable
/>
<Input
@
on-enter=
"_formSearch"
v-model=
"formObj.client"
name=
"client
"
placeholder=
"请输入委托单位"
clearable
/>
</Form-item>
</Form-item>
<Form-item
class=
"search-item"
label=
"委托
名称:
"
>
<Form-item
class=
"search-item"
label=
"委托
编号:"
style=
"margin-left: 8px;
"
>
<Input
@
on-enter=
"_formSearch"
name=
"contractName"
placeholder=
"请输入委托名称
"
clearable
/>
<Input
@
on-enter=
"_formSearch"
v-model=
"formObj.entrustCode"
name=
"entrustCode"
placeholder=
"请输入委托单位
"
clearable
/>
</Form-item>
</Form-item>
<Form-item
class=
"search-btn"
>
<Form-item
class=
"search-btn"
>
<Button
@
click=
"_formSearch"
type=
"primary"
>
搜索
</Button>
<Button
@
click=
"_formSearch"
type=
"primary"
>
搜索
</Button>
...
@@ -40,30 +28,8 @@
...
@@ -40,30 +28,8 @@
</Col>
</Col>
<!-- 表格 -->
<!-- 表格 -->
<Col
span=
"24"
>
<Col
span=
"24"
>
<!--
<ElementTable
:tableHeight=
"tableHeight"
@
on-result-change=
"_tableResultChange"
--
>
<!--ref="pageTable" :getPage="getPage" id="perSampleQuery" selectData>-->
<!--
<el-table-column-->
<!--show-overflow-tooltip-->
<!--sortable-->
<!--:prop="item.key"-->
<!--:label="item.title"-->
<!--:width="item.width"-->
<!--:min-width="200"-->
<!--:fixed="item.fixed?item.fixed:undefined"-->
<!--v-for="item in pageColumns" :key="item.key">-->
<!--
<template
slot-scope=
"scope"
>
-->
<!--
<div
v-if=
"item.date"
>
{{
scope
.
row
[
item
.
key
]?
$dateformat
(
scope
.
row
[
item
.
key
],
'yyyy-mm-dd'
):
''
}}
</div>
-->
<!--
<a
v-else-if=
"item.key==='sampleSn'"
--
>
<!--@click.stop="_sampleDetailModal(scope.row)">
{{
scope
.
row
[
item
.
key
]
}}
</a>
-->
<!--
<div
v-else-if=
"item.key==='progress'"
>
-->
<!--
{{
scope
.
row
[
item
.
key
]
===
undefined
?
''
:
scope
.
row
[
item
.
key
].
display
}}
-->
<!--
</div>
-->
<!--
<div
v-else
>
{{
scope
.
row
[
item
.
key
]
}}
</div>
-->
<!--
</
template
>
-->
<!--</el-table-column>-->
<!--</ElementTable>-->
<PTVXETable
id=
"perSampleQuery"
ref=
"pageTable"
<PTVXETable
id=
"perSampleQuery"
ref=
"pageTable"
:tableHeight=
"tableHeight"
@
on-result-change=
"_tableResultChange"
:getPage=
"getPage"
select-data
>
:tableHeight=
"tableHeight"
:icon-msg=
"iconMsg"
@
on-result-change=
"_tableResultChange"
:getPage=
"getPage"
select-data
>
<vxe-table-column
<vxe-table-column
:field=
"item.key"
:field=
"item.key"
:title=
"item.title"
:title=
"item.title"
...
@@ -89,18 +55,23 @@
...
@@ -89,18 +55,23 @@
</Row>
</Row>
</div>
</div>
</div>
</div>
<Operation
ref=
"recordModal"
></Operation>
</div>
</div>
</template>
</template>
<
script
>
<
script
>
import
{
soilSample
}
from
'../../../../api'
import
{
soilSample
}
from
'../../../../api'
import
Operation
from
'../../../../components/operation/Operation'
export
default
{
export
default
{
components
:
{},
components
:
{
Operation
},
data
()
{
data
()
{
return
{
return
{
currentComponent
:
''
,
currentComponent
:
''
,
selectIds
:
[],
selectIds
:
[],
formObj
:
{},
formObj
:
{
entrustCode
:
''
,
client
:
''
,
sampleCode
:
''
},
btn
:
[
btn
:
[
// { type: '', id: '', name: '导出' },
// { type: '', id: '', name: '导出' },
{
{
...
@@ -109,6 +80,13 @@ export default {
...
@@ -109,6 +80,13 @@ export default {
name
:
'导出样品贮存表'
name
:
'导出样品贮存表'
}
}
],
],
iconMsg
:
[
{
type
:
'ios-clock'
,
id
:
''
,
name
:
'操作日志'
}
],
pageColumns
:
[
pageColumns
:
[
{
title
:
'委托商'
,
key
:
'client'
,
width
:
180
},
{
title
:
'委托商'
,
key
:
'client'
,
width
:
180
},
{
title
:
'委托编号'
,
key
:
'entrustCode'
,
width
:
180
},
{
title
:
'委托编号'
,
key
:
'entrustCode'
,
width
:
180
},
...
@@ -144,7 +122,6 @@ export default {
...
@@ -144,7 +122,6 @@ export default {
methods
:
{
methods
:
{
_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
soilSample
.
pageBackupHis
(
const
result
=
await
soilSample
.
pageBackupHis
(
this
.
$serializeForm
(
this
.
formObj
)
this
.
$serializeForm
(
this
.
formObj
)
)
)
...
@@ -159,6 +136,9 @@ export default {
...
@@ -159,6 +136,9 @@ export default {
this
.
selectIds
=
[]
this
.
selectIds
=
[]
this
.
getPage
=
this
.
$store
.
state
.
FoodSampleBackup
.
page
this
.
getPage
=
this
.
$store
.
state
.
FoodSampleBackup
.
page
break
break
case
'iconClick'
:
this
.
_iconClick
(
data
.
name
,
data
.
rowData
,
data
.
componentName
)
break
case
'selectData'
:
case
'selectData'
:
this
.
selectData
=
data
this
.
selectData
=
data
this
.
selectIds
=
[]
this
.
selectIds
=
[]
...
@@ -173,6 +153,19 @@ export default {
...
@@ -173,6 +153,19 @@ export default {
// this._page();
// this._page();
}
}
},
},
_iconClick
(
res
,
data
,
componentName
,
index
)
{
this
.
currentIndex
=
index
switch
(
res
)
{
case
'操作日志'
:
this
.
_record
(
data
.
id
)
break
default
:
this
.
_page
()
}
},
_record
(
id
)
{
this
.
$refs
.
recordModal
.
_openBcakup
(
id
)
},
_formSearch
()
{
_formSearch
()
{
this
.
$refs
.
pageTable
.
_pageChange
(
1
)
this
.
$refs
.
pageTable
.
_pageChange
(
1
)
},
},
...
...
pages/soil-sample-manage/surplus-manage/tab/SampleSurplusManage.vue
View file @
70e422db
...
@@ -107,6 +107,7 @@
...
@@ -107,6 +107,7 @@
</div>
</div>
</div>
</div>
<SampleParpareApply
ref=
"applyModal"
@
on-result-change=
"_page"
></SampleParpareApply>
<SampleParpareApply
ref=
"applyModal"
@
on-result-change=
"_page"
></SampleParpareApply>
<Operation
ref=
"recordModal"
></Operation>
</div>
</div>
</template>
</template>
<
script
>
<
script
>
...
@@ -115,10 +116,12 @@ import AutoCompletes from '../../../../components/base/AutoCompletes'
...
@@ -115,10 +116,12 @@ import AutoCompletes from '../../../../components/base/AutoCompletes'
// eslint-disable-next-line no-unused-vars
// eslint-disable-next-line no-unused-vars
import
http
from
'../../../../api/http'
import
http
from
'../../../../api/http'
import
{
soilSample
}
from
'../../../../api'
import
{
soilSample
}
from
'../../../../api'
import
Operation
from
'../../../../components/operation/Operation'
export
default
{
export
default
{
components
:
{
components
:
{
AutoCompletes
,
AutoCompletes
,
SampleParpareApply
SampleParpareApply
,
Operation
},
},
data
()
{
data
()
{
return
{
return
{
...
@@ -166,7 +169,8 @@ export default {
...
@@ -166,7 +169,8 @@ export default {
}
}
],
],
iconMsg
:
[
iconMsg
:
[
{
type
:
'md-create'
,
id
:
''
,
name
:
'编辑'
}
// food-sample-prepare-edit
{
type
:
'md-create'
,
id
:
''
,
name
:
'编辑'
},
// food-sample-prepare-edit
{
type
:
'ios-clock'
,
id
:
''
,
name
:
'操作日志'
}
],
],
iconMsgSave
:
[{
type
:
'ios-checkmark'
,
id
:
''
,
name
:
'保存'
}],
iconMsgSave
:
[{
type
:
'ios-checkmark'
,
id
:
''
,
name
:
'保存'
}],
pageColumns
:
[
pageColumns
:
[
...
@@ -288,6 +292,9 @@ export default {
...
@@ -288,6 +292,9 @@ export default {
_iconClick
(
res
,
data
,
componentName
,
index
)
{
_iconClick
(
res
,
data
,
componentName
,
index
)
{
this
.
currentIndex
=
index
this
.
currentIndex
=
index
switch
(
res
)
{
switch
(
res
)
{
case
'操作日志'
:
this
.
_record
(
data
.
id
)
break
case
'编辑'
:
case
'编辑'
:
this
.
editIndex
=
index
this
.
editIndex
=
index
break
break
...
@@ -302,6 +309,9 @@ export default {
...
@@ -302,6 +309,9 @@ export default {
break
break
}
}
},
},
_record
(
id
)
{
this
.
$refs
.
recordModal
.
_openSurplus
(
id
)
},
_locChange
(
msg
,
data
)
{
_locChange
(
msg
,
data
)
{
switch
(
msg
)
{
switch
(
msg
)
{
case
'select'
:
case
'select'
:
...
...
pages/soil-sample-manage/surplus-manage/tab/SampleSurplusQuery.vue
View file @
70e422db
...
@@ -8,26 +8,14 @@
...
@@ -8,26 +8,14 @@
<Col
span=
"24"
>
<Col
span=
"24"
>
<Form
id=
"search-form-query"
:label-width=
"80"
v-show=
"searchOpen"
inline
onsubmit=
"return false"
>
<Form
id=
"search-form-query"
:label-width=
"80"
v-show=
"searchOpen"
inline
onsubmit=
"return false"
>
<label
class=
"label-sign"
></label>
<label
class=
"label-sign"
></label>
<Form-item
class=
"search-item"
label=
"样品编号:"
>
<Input
@
on-enter=
"_formSearch"
name=
"sampleSn"
placeholder=
"请输入样品编号"
clearable
/>
</Form-item>
<Form-item
class=
"search-item"
label=
"样品名称:"
>
<Input
@
on-enter=
"_formSearch"
name=
"sampleName"
placeholder=
"请输入样品名称"
clearable
/>
</Form-item>
<Form-item
class=
"search-item"
label=
"存储位置:"
>
<Input
@
on-enter=
"_formSearch"
name=
"backupPlace"
placeholder=
"请输入存储位置"
clearable
/>
</Form-item>
<Form-item
class=
"search-item"
label=
"存储期限:"
>
<Date-picker
@
on-change=
"_dateChange"
:editable=
"false"
type=
"daterange"
split-panels
style=
"width:100%;"
placeholder=
"请选择存储期限"
></Date-picker>
<input
v-model=
"endDateBegin"
type=
"hidden"
name=
"endDateBegin"
>
<input
v-model=
"endDateEnd"
type=
"hidden"
name=
"endDateEnd"
>
</Form-item>
<Form-item
class=
"search-item"
label=
"委托单位:"
style=
"margin-left: 8px;"
>
<Form-item
class=
"search-item"
label=
"委托单位:"
style=
"margin-left: 8px;"
>
<Input
@
on-enter=
"_formSearch"
name=
"cname
"
placeholder=
"请输入委托单位"
clearable
/>
<Input
@
on-enter=
"_formSearch"
v-model=
"formObj.client"
name=
"client
"
placeholder=
"请输入委托单位"
clearable
/>
</Form-item>
</Form-item>
<Form-item
class=
"search-item"
label=
"委托名称:"
>
<Form-item
class=
"search-item"
label=
"委托编号:"
>
<Input
@
on-enter=
"_formSearch"
name=
"contractName"
placeholder=
"请输入委托名称"
clearable
/>
<Input
@
on-enter=
"_formSearch"
v-model=
"formObj.entrustCode"
name=
"entrustCode"
placeholder=
"请输入委托名称"
clearable
/>
</Form-item>
<Form-item
class=
"search-item"
label=
"试样编号:"
>
<Input
@
on-enter=
"_formSearch"
v-model=
"formObj.sampleCode"
name=
"sampleCode"
placeholder=
"请输入委托名称"
clearable
/>
</Form-item>
</Form-item>
<Form-item
class=
"search-btn"
>
<Form-item
class=
"search-btn"
>
<Button
@
click=
"_formSearch"
type=
"primary"
>
搜索
</Button>
<Button
@
click=
"_formSearch"
type=
"primary"
>
搜索
</Button>
...
@@ -63,7 +51,7 @@
...
@@ -63,7 +51,7 @@
<!--</el-table-column>-->
<!--</el-table-column>-->
<!--</ElementTable>-->
<!--</ElementTable>-->
<PTVXETable
id=
"perSampleQuery"
ref=
"pageTable"
<PTVXETable
id=
"perSampleQuery"
ref=
"pageTable"
:tableHeight=
"tableHeight"
@
on-result-change=
"_tableResultChange"
:getPage=
"getPage"
select-data
>
:tableHeight=
"tableHeight"
:icon-msg=
"iconMsg"
@
on-result-change=
"_tableResultChange"
:getPage=
"getPage"
select-data
>
<vxe-table-column
<vxe-table-column
:field=
"item.key"
:field=
"item.key"
:title=
"item.title"
:title=
"item.title"
...
@@ -89,18 +77,30 @@
...
@@ -89,18 +77,30 @@
</Row>
</Row>
</div>
</div>
</div>
</div>
<Operation
ref=
"recordModal"
></Operation>
</div>
</div>
</template>
</template>
<
script
>
<
script
>
import
{
soilSample
}
from
'../../../../api'
import
{
soilSample
}
from
'../../../../api'
import
Operation
from
'../../../../components/operation/Operation'
export
default
{
export
default
{
components
:
{},
components
:
{
Operation
},
data
()
{
data
()
{
return
{
return
{
currentComponent
:
''
,
currentComponent
:
''
,
selectIds
:
[],
selectIds
:
[],
formObj
:
{},
formObj
:
{
client
:
''
,
entrustCode
:
''
,
sampleCode
:
''
},
iconMsg
:
[
{
type
:
'ios-clock'
,
id
:
''
,
name
:
'操作日志'
}
],
btn
:
[
btn
:
[
// { type: '', id: '', name: '导出' },
// { type: '', id: '', name: '导出' },
{
{
...
@@ -150,6 +150,9 @@ export default {
...
@@ -150,6 +150,9 @@ export default {
this
.
selectIds
=
[]
this
.
selectIds
=
[]
this
.
getPage
=
this
.
$store
.
state
.
FoodSampleBackup
.
page
this
.
getPage
=
this
.
$store
.
state
.
FoodSampleBackup
.
page
break
break
case
'iconClick'
:
this
.
_iconClick
(
data
.
name
,
data
.
rowData
,
data
.
componentName
)
break
case
'selectData'
:
case
'selectData'
:
this
.
selectData
=
data
this
.
selectData
=
data
this
.
selectIds
=
[]
this
.
selectIds
=
[]
...
@@ -164,6 +167,19 @@ export default {
...
@@ -164,6 +167,19 @@ export default {
// this._page();
// this._page();
}
}
},
},
_iconClick
(
res
,
data
,
componentName
,
index
)
{
this
.
currentIndex
=
index
switch
(
res
)
{
case
'操作日志'
:
this
.
_record
(
data
.
id
)
break
default
:
this
.
_page
()
}
},
_record
(
id
)
{
this
.
$refs
.
recordModal
.
_openSurplus
(
id
)
},
_formSearch
()
{
_formSearch
()
{
this
.
$refs
.
pageTable
.
_pageChange
(
1
)
this
.
$refs
.
pageTable
.
_pageChange
(
1
)
},
},
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment