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
7ada7fbd
Commit
7ada7fbd
authored
Jul 14, 2020
by
lichengming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改了检测数据录入的按钮id
parent
60054609
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
69 additions
and
41 deletions
+69
-41
MeterSampleFlow.vue
pages/meter-send/sample-flow/MeterSampleFlow.vue
+13
-9
MeterSampleFlowHis.vue
pages/meter-send/sample-flow/MeterSampleFlowHis.vue
+13
-5
MeterGoOutTestEdit.vue
pages/meter-send/sample-input/MeterGoOutTestEdit.vue
+15
-7
MeterPersonItemTaskManage.vue
pages/meter-send/sample-input/MeterPersonItemTaskManage.vue
+2
-2
MeterSampleInput.vue
pages/meter-send/sample-input/MeterSampleInput.vue
+13
-9
MeterSampleInputHis.vue
pages/meter-send/sample-input/MeterSampleInputHis.vue
+13
-9
No files found.
pages/meter-send/sample-flow/MeterSampleFlow.vue
View file @
7ada7fbd
...
@@ -6,29 +6,29 @@
...
@@ -6,29 +6,29 @@
<Row>
<Row>
<!--查询-->
<!--查询-->
<Col
span=
"24"
style=
"margin-top: 10px"
>
<Col
span=
"24"
style=
"margin-top: 10px"
>
<Form
v-show=
"searchOpen"
id=
"formId
"
:label-width=
"90"
inline
onsubmit=
"return false"
>
<Form
id=
"formId"
v-show=
"searchOpen
"
:label-width=
"90"
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
v-model=
"formObj.name"
name=
"name"
placeholder=
"请输入实验室名称"
clearable
@
on-enter=
"_formSearch"
/>
<Input
v-model=
"formObj.name"
@
on-enter=
"_formSearch"
name=
"name"
placeholder=
"请输入实验室名称"
clearable
/>
</Form-item>
</Form-item>
<Form-item
class=
"search-item"
label=
"资质:"
>
<Form-item
class=
"search-item"
label=
"资质:"
>
<Input
v-model=
"formObj.aptitude"
name=
"aptitude"
placeholder=
"请输入资质"
clearable
@
on-enter=
"_formSearch"
/>
<Input
v-model=
"formObj.aptitude"
@
on-enter=
"_formSearch"
name=
"aptitude"
placeholder=
"请输入资质"
clearable
/>
</Form-item>
</Form-item>
<Form-item
class=
"search-btn"
>
<Form-item
class=
"search-btn"
>
<Button
type=
"primary"
@
click=
"_formSearch
"
>
搜索
</Button>
<Button
@
click=
"_formSearch"
type=
"primary
"
>
搜索
</Button>
</Form-item>
</Form-item>
</Form>
</Form>
</Col>
</Col>
<!--操作-->
<!--操作-->
<Col
span=
"24"
>
<Col
span=
"24"
>
<btn-list
:msg=
"btn"
:open=
"searchOpen"
:show-search-btn=
"true"
class=
"contHide
"
<btn-list
:msg=
"btn"
:open=
"searchOpen"
:show-search-btn=
"true"
@
on-result-change=
"_btnClick
"
@
on-result-change=
"_btnClick
"
></btn-list>
class=
"contHide
"
></btn-list>
</Col>
</Col>
<!--表格-->
<!--表格-->
<Col
span=
"24"
>
<Col
span=
"24"
>
<PTVXETable
ref=
"pageTable"
:table-height=
"tableHeight"
:form-id=
"formId"
:loading=
"true"
<PTVXETable
ref=
"pageTable"
:table-height=
"tableHeight"
:form-id=
"formId"
:loading=
"true"
:get-page=
"getPage"
:icon-msg=
"iconMsg"
select-data
@
on-result-change=
"_tableResultChange"
>
:get-page=
"getPage"
:icon-msg=
"iconMsg"
@
on-result-change=
"_tableResultChange"
select-data
>
<vxe-table-column
<vxe-table-column
v-for=
"item in pageColumns"
v-for=
"item in pageColumns"
:key=
"item.key"
:key=
"item.key"
...
@@ -81,12 +81,16 @@ export default {
...
@@ -81,12 +81,16 @@ export default {
btn
:
[
btn
:
[
{
{
type
:
'success'
,
type
:
'success'
,
id
:
''
,
id
:
'
sample-flow-meter-sample-flow-flow-btn
'
,
name
:
'流转'
name
:
'流转'
}
}
],
],
iconMsg
:
[
iconMsg
:
[
{
type
:
'md-cloud'
,
id
:
''
,
name
:
'附件'
}
{
type
:
'md-cloud'
,
id
:
'sample-flow-meter-sample-flow-accessory'
,
name
:
'附件'
}
// {
// {
// type: 'ios-clock',
// type: 'ios-clock',
// id: '',
// id: '',
...
...
pages/meter-send/sample-flow/MeterSampleFlowHis.vue
View file @
7ada7fbd
...
@@ -62,12 +62,12 @@ export default {
...
@@ -62,12 +62,12 @@ export default {
btn
:
[
btn
:
[
{
{
type
:
'success'
,
type
:
'success'
,
id
:
'
meter-go-out-entrust
-add-btn'
,
id
:
'
sample-flow-meter-sample-flow-his
-add-btn'
,
name
:
'添加'
name
:
'添加'
},
},
{
{
type
:
'success'
,
type
:
'success'
,
id
:
'
meter-go-out-entrust
-submit-btn'
,
id
:
'
sample-flow-meter-sample-flow-his
-submit-btn'
,
name
:
'提交'
name
:
'提交'
}
}
],
],
...
@@ -82,11 +82,19 @@ export default {
...
@@ -82,11 +82,19 @@ export default {
// id: '',
// id: '',
// name: '管理样品'
// name: '管理样品'
// },
// },
{
type
:
'md-cloud'
,
id
:
''
,
name
:
'附件'
},
{
{
type
:
'md-remove-circle'
,
id
:
''
,
name
:
'删除'
},
type
:
'md-cloud'
,
id
:
'sample-flow-meter-sample-flow-his-accessory'
,
name
:
'附件'
},
{
type
:
'md-remove-circle'
,
id
:
'sample-flow-meter-sample-flow-his-remove'
,
name
:
'删除'
},
{
{
type
:
'ios-clock'
,
type
:
'ios-clock'
,
id
:
''
,
id
:
'
sample-flow-meter-sample-flow-his-record
'
,
name
:
'操作日志'
name
:
'操作日志'
}
}
],
],
...
...
pages/meter-send/sample-input/MeterGoOutTestEdit.vue
View file @
7ada7fbd
...
@@ -27,7 +27,7 @@
...
@@ -27,7 +27,7 @@
</Form-item>
</Form-item>
<Form-item
label=
"省、市、区"
prop=
"name"
class=
"width-48"
>
<Form-item
label=
"省、市、区"
prop=
"name"
class=
"width-48"
>
<!--
<Input
v-model=
"formObj.client"
name=
"name"
placeholder=
"请输入委托单位"
/>
-->
<!--
<Input
v-model=
"formObj.client"
name=
"name"
placeholder=
"请输入委托单位"
/>
-->
<CityNameCascader
:value=
"testedCityData.join(',')"
name=
"tested"
@
on-result-change=
"_cascaderResult
"
>
<CityNameCascader
:value=
"testedCityData.join(',')"
@
on-result-change=
"_cascaderResult"
name=
"tested
"
>
</CityNameCascader>
</CityNameCascader>
</Form-item>
</Form-item>
<Form-item
label=
"街道"
prop=
"street"
class=
"width-48"
>
<Form-item
label=
"街道"
prop=
"street"
class=
"width-48"
>
...
@@ -54,7 +54,7 @@
...
@@ -54,7 +54,7 @@
<Col
span=
"24"
>
<Col
span=
"24"
>
<!--
<btn-list
:msg=
"btn"
:open=
"searchOpen"
:showSearchBtn=
"false"
@
on-result-change=
"_btnClick"
--
>
<!--
<btn-list
:msg=
"btn"
:open=
"searchOpen"
:showSearchBtn=
"false"
@
on-result-change=
"_btnClick"
--
>
<!-- class="contHide">
</btn-list>
-->
<!-- class="contHide">
</btn-list>
-->
<Button
type=
"success"
@
click=
"_add()
"
>
添加
</Button>
<Button
id=
"sample-input-meter-go-out-test-edit-add-btn"
@
click=
"_add()"
type=
"success
"
>
添加
</Button>
</Col>
</Col>
<Col
span=
"24"
>
<Col
span=
"24"
>
<PTVXETable
<PTVXETable
...
@@ -76,7 +76,7 @@
...
@@ -76,7 +76,7 @@
>
>
<template
slot-scope=
"scope"
>
<template
slot-scope=
"scope"
>
<div
v-if=
"item.key==='name'"
@
click
.
stop=
"_handleRow(scope)"
>
<div
v-if=
"item.key==='name'"
@
click
.
stop=
"_handleRow(scope)"
>
<el-input
v-model=
"scope.row.name"
blur
placeholder=
"请输入或选择样品名称"
@
on-result-change=
"_judgeBasisChange"
@
click
.
native=
"_selectjudgeBasis(scope.$rowIndex)
"
<el-input
v-model=
"scope.row.name"
@
on-result-change=
"_judgeBasisChange"
@
click
.
native=
"_selectjudgeBasis(scope.$rowIndex)"
blur
placeholder=
"请输入或选择样品名称
"
></el-input>
></el-input>
</div>
</div>
<div
v-if=
"item.key==='spec'"
@
click
.
stop=
"_handleRow(scope)"
>
<div
v-if=
"item.key==='spec'"
@
click
.
stop=
"_handleRow(scope)"
>
...
@@ -97,9 +97,9 @@
...
@@ -97,9 +97,9 @@
<div
v-if=
"item.key==='quantity'"
@
click
.
stop=
"_handleRow(scope)"
>
<div
v-if=
"item.key==='quantity'"
@
click
.
stop=
"_handleRow(scope)"
>
<el-input
<el-input
v-model=
"scope.row.quantity"
v-model=
"scope.row.quantity"
@
keydown
.
native=
"channelInputLimit"
type=
"number"
type=
"number"
placeholder=
"请输入或选择数量"
placeholder=
"请输入或选择数量"
@
keydown
.
native=
"channelInputLimit"
/>
/>
</div>
</div>
</
template
>
</
template
>
...
@@ -110,7 +110,7 @@
...
@@ -110,7 +110,7 @@
<div
slot=
"footer"
>
<div
slot=
"footer"
>
<modal-footer
ref=
"footerModal"
:footer=
"footerList"
@
on-result-change=
"_footerResult"
></modal-footer>
<modal-footer
ref=
"footerModal"
:footer=
"footerList"
@
on-result-change=
"_footerResult"
></modal-footer>
</div>
</div>
<EditModal
ref=
"EditModal"
is-change
@
on-result-change=
"_backData"
/>
<EditModal
ref=
"EditModal"
@
on-result-change=
"_backData"
is-change
/>
</Modal>
</Modal>
</div>
</div>
</template>
</template>
...
@@ -143,8 +143,16 @@ export default {
...
@@ -143,8 +143,16 @@ export default {
},
},
judgeType
:
[{
value
:
1
,
name
:
'是'
},
{
value
:
0
,
name
:
'否'
}],
judgeType
:
[{
value
:
1
,
name
:
'是'
},
{
value
:
0
,
name
:
'否'
}],
iconMsg
:
[
iconMsg
:
[
{
type
:
'ios-clock'
,
id
:
''
,
name
:
'编辑'
},
{
{
type
:
'ios-clock'
,
id
:
''
,
name
:
'删除'
}
type
:
'ios-clock'
,
id
:
'sample-input-meter-go-out-test-edit-deit'
,
name
:
'编辑'
},
{
type
:
'ios-clock'
,
id
:
'sample-input-meter-go-out-test-edit-remove'
,
name
:
'删除'
}
],
],
pageColumns
:
[
pageColumns
:
[
{
title
:
'样品名称'
,
key
:
'name'
,
width
:
160
},
{
title
:
'样品名称'
,
key
:
'name'
,
width
:
160
},
...
...
pages/meter-send/sample-input/MeterPersonItemTaskManage.vue
View file @
7ada7fbd
...
@@ -90,12 +90,12 @@ export default {
...
@@ -90,12 +90,12 @@ export default {
btn
:
[
btn
:
[
{
{
type
:
'success'
,
type
:
'success'
,
id
:
''
,
id
:
'
sample-input-meter-person-item-task-manage-input-btn
'
,
name
:
'填写检测值'
name
:
'填写检测值'
},
},
{
{
type
:
'success'
,
type
:
'success'
,
id
:
''
,
id
:
'
sample-input-meter-person-item-task-manage-judge-btn
'
,
name
:
'判定'
name
:
'判定'
}
}
],
],
...
...
pages/meter-send/sample-input/MeterSampleInput.vue
View file @
7ada7fbd
...
@@ -99,47 +99,51 @@ export default {
...
@@ -99,47 +99,51 @@ export default {
btn
:
[
btn
:
[
{
{
type
:
'success'
,
type
:
'success'
,
id
:
''
,
id
:
'
sample-input-meter-sample-input-take-btn
'
,
name
:
'仪器领用'
name
:
'仪器领用'
},
},
{
{
type
:
'success'
,
type
:
'success'
,
id
:
''
,
id
:
'
sample-input-meter-sample-input-car-btn
'
,
name
:
'车辆管理'
name
:
'车辆管理'
},
},
{
{
type
:
'success'
,
type
:
'success'
,
id
:
''
,
id
:
'
sample-input-meter-sample-input-submit-btn
'
,
name
:
'提交'
name
:
'提交'
},
},
{
{
type
:
'success'
,
type
:
'success'
,
id
:
''
,
id
:
'
sample-input-meter-sample-input-submit-create-btn
'
,
name
:
'提交至证书编制'
name
:
'提交至证书编制'
}
}
],
],
iconMsg
:
[
iconMsg
:
[
{
{
type
:
'ios-bookmarks'
,
type
:
'ios-bookmarks'
,
id
:
''
,
id
:
'
sample-input-meter-sample-input-create
'
,
name
:
'编制证书'
name
:
'编制证书'
},
},
{
{
type
:
'md-create'
,
type
:
'md-create'
,
id
:
''
,
id
:
'
sample-input-meter-sample-input-edit
'
,
name
:
'编辑'
name
:
'编辑'
},
},
{
{
type
:
'md-car'
,
type
:
'md-car'
,
id
:
''
,
id
:
'
sample-input-meter-sample-input-car
'
,
name
:
'车辆管理'
name
:
'车辆管理'
},
},
{
{
type
:
'ios-list-box'
,
type
:
'ios-list-box'
,
id
:
''
,
id
:
'
sample-input-meter-sample-input-take
'
,
name
:
'仪器领用'
name
:
'仪器领用'
},
},
{
type
:
'md-cloud'
,
id
:
''
,
name
:
'附件'
}
{
type
:
'md-cloud'
,
id
:
'sample-input-meter-sample-input-accessory'
,
name
:
'附件'
}
// { type: 'md-remove-circle', id: '', name: '删除' },
// { type: 'md-remove-circle', id: '', name: '删除' },
// {
// {
// type: 'ios-clock',
// type: 'ios-clock',
...
...
pages/meter-send/sample-input/MeterSampleInputHis.vue
View file @
7ada7fbd
...
@@ -6,29 +6,29 @@
...
@@ -6,29 +6,29 @@
<Row>
<Row>
<!--查询-->
<!--查询-->
<Col
span=
"24"
style=
"margin-top: 10px"
>
<Col
span=
"24"
style=
"margin-top: 10px"
>
<Form
v-show=
"searchOpen"
id=
"formId
"
:label-width=
"90"
inline
onsubmit=
"return false"
>
<Form
id=
"formId"
v-show=
"searchOpen
"
:label-width=
"90"
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
v-model=
"formObj.name"
name=
"name"
placeholder=
"请输入样品名称"
clearable
@
on-enter=
"_formSearch"
/>
<Input
v-model=
"formObj.name"
@
on-enter=
"_formSearch"
name=
"name"
placeholder=
"请输入样品名称"
clearable
/>
</Form-item>
</Form-item>
<Form-item
class=
"search-item"
label=
"样品编号:"
>
<Form-item
class=
"search-item"
label=
"样品编号:"
>
<Input
v-model=
"formObj.code"
name=
"aptitude"
placeholder=
"请输入样品编号"
clearable
@
on-enter=
"_formSearch"
/>
<Input
v-model=
"formObj.code"
@
on-enter=
"_formSearch"
name=
"aptitude"
placeholder=
"请输入样品编号"
clearable
/>
</Form-item>
</Form-item>
<Form-item
class=
"search-btn"
>
<Form-item
class=
"search-btn"
>
<Button
type=
"primary"
@
click=
"_formSearch
"
>
搜索
</Button>
<Button
@
click=
"_formSearch"
type=
"primary
"
>
搜索
</Button>
</Form-item>
</Form-item>
</Form>
</Form>
</Col>
</Col>
<!--操作-->
<!--操作-->
<Col
span=
"24"
>
<Col
span=
"24"
>
<btn-list
:msg=
"btn"
:open=
"searchOpen"
:show-search-btn=
"true"
class=
"contHide
"
<btn-list
:msg=
"btn"
:open=
"searchOpen"
:show-search-btn=
"true"
@
on-result-change=
"_btnClick
"
@
on-result-change=
"_btnClick
"
></btn-list>
class=
"contHide
"
></btn-list>
</Col>
</Col>
<!--表格-->
<!--表格-->
<Col
span=
"24"
>
<Col
span=
"24"
>
<PTVXETable
ref=
"pageTable"
:table-height=
"tableHeight"
:form-id=
"formId"
:loading=
"true"
<PTVXETable
ref=
"pageTable"
:table-height=
"tableHeight"
:form-id=
"formId"
:loading=
"true"
:get-page=
"getPage"
:icon-msg=
"iconMsg"
select-data
@
on-result-change=
"_tableResultChange"
>
:get-page=
"getPage"
:icon-msg=
"iconMsg"
@
on-result-change=
"_tableResultChange"
select-data
>
<vxe-table-column
<vxe-table-column
v-for=
"item in pageColumns"
v-for=
"item in pageColumns"
:key=
"item.key"
:key=
"item.key"
...
@@ -121,7 +121,7 @@ export default {
...
@@ -121,7 +121,7 @@ export default {
iconMsg
:
[
iconMsg
:
[
{
{
type
:
'ios-bookmarks'
,
type
:
'ios-bookmarks'
,
id
:
''
,
id
:
'
sample-input-meter-sample-input-his-view
'
,
name
:
'查看证书'
name
:
'查看证书'
},
},
// {
// {
...
@@ -139,7 +139,11 @@ export default {
...
@@ -139,7 +139,11 @@ export default {
// id: '',
// id: '',
// name: '仪器领用'
// name: '仪器领用'
// },
// },
{
type
:
'md-cloud'
,
id
:
''
,
name
:
'附件'
}
{
type
:
'md-cloud'
,
id
:
'sample-input-meter-sample-input-his-accessory'
,
name
:
'附件'
}
// { type: 'md-remove-circle', id: '', name: '删除' },
// { type: 'md-remove-circle', id: '', name: '删除' },
// {
// {
// type: 'ios-clock',
// type: 'ios-clock',
...
...
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