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
2a1328cf
Commit
2a1328cf
authored
Aug 05, 2020
by
wangweidong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
计量证书修改
parent
7e352150
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
44 additions
and
36 deletions
+44
-36
MeterSampleManage.vue
pages/meter-entrust/MeterSampleManage.vue
+21
-18
MeterSampleManage.vue
pages/meter-review/MeterSampleManage.vue
+23
-18
No files found.
pages/meter-entrust/MeterSampleManage.vue
View file @
2a1328cf
...
...
@@ -27,7 +27,7 @@
</Col>
<Col
span=
"24"
>
<PTVXETable
ref=
"pageTable"
:table-height=
"tableHeight"
:form-id=
"formId"
:get-page=
"getPage"
:icon-msg=
"iconMsg"
@
on-result-change=
"_tableResultChange"
select-data
>
@
on-result-change=
"_tableResultChange"
select-data
>
<vxe-table-column
v-for=
"item in pageColumns"
:key=
"item.key"
...
...
@@ -43,11 +43,15 @@
{{
scope
.
row
[
item
.
key
]
===
1
?
'是'
:
'否'
}}
</div>
<div
v-else-if=
"item.key==='type'"
>
<Select
v-model=
"scope.row.type"
>
<Option
v-for=
"(item,index) in options"
:key=
"item.name"
:value=
"index"
>
{{
item
.
name
}}
</Option>
</Select>
<span
v-if=
"scope.row[item.key]===0"
>
检定
</span>
<span
v-if=
"scope.row[item.key]===1"
>
校准
</span>
<span
v-if=
"scope.row[item.key]===2"
>
外观检查
</span>
</div>
<div
v-else
>
{{
scope
.
row
[
item
.
key
]
}}
</div>
</
template
>
...
...
@@ -90,11 +94,11 @@ export default {
id
:
'meter-entrust-meter-sample-manage-edit-operation'
,
name
:
'编辑'
},
{
type
:
'ios-flask-outline'
,
id
:
'meter-entrust-meter-sample-manage-test-item-manage'
,
name
:
'管理检测项目'
},
//
{
//
type: 'ios-flask-outline',
//
id: 'meter-entrust-meter-sample-manage-test-item-manage',
//
name: '管理检测项目'
//
},
{
type
:
'trash-a'
,
id
:
'meter-entrust-meter-sample-manage-remove-operation'
,
...
...
@@ -121,12 +125,12 @@ export default {
type
:
'success'
,
id
:
'entrust-meter-sample-manage-subpackage-cancel'
,
name
:
'取消分包'
},
{
type
:
'success'
,
id
:
'entrust-meter-sample-manage-import-test-item'
,
name
:
'导入检测项目'
}
//, {
// type: 'success',
// id: 'entrust-meter-sample-manage-import-test-item',
// name: '导入检测项目'
// }
],
options
:
[
{
...
...
@@ -146,11 +150,10 @@ export default {
selectData
:
[],
getPage
:
{},
pageColumns
:
[
{
title
:
'样品编号'
,
key
:
'code'
,
width
:
1
2
0
},
{
title
:
'样品编号'
,
key
:
'code'
,
width
:
1
4
0
},
{
title
:
'样品名称'
,
key
:
'name'
,
width
:
140
},
{
title
:
'型号规格'
,
key
:
'spec'
,
width
:
140
},
{
title
:
'出厂编号'
,
key
:
'factoryNumber'
,
width
:
140
},
{
title
:
'所检项目'
,
key
:
'itemNames'
,
width
:
140
},
{
title
:
'是否分包'
,
key
:
'jobOut'
,
width
:
110
},
{
title
:
'检测类型'
,
key
:
'type'
,
width
:
140
},
{
title
:
'数量'
,
key
:
'quantity'
,
width
:
140
}
...
...
pages/meter-review/MeterSampleManage.vue
View file @
2a1328cf
...
...
@@ -27,7 +27,7 @@
</Col>
<Col
span=
"24"
>
<PTVXETable
ref=
"pageTable"
:table-height=
"tableHeight"
:form-id=
"formId"
:get-page=
"getPage"
:icon-msg=
"iconMsg"
@
on-result-change=
"_tableResultChange"
select-data
>
@
on-result-change=
"_tableResultChange"
select-data
>
<vxe-table-column
v-for=
"item in pageColumns"
:key=
"item.key"
...
...
@@ -43,11 +43,15 @@
{{
scope
.
row
[
item
.
key
]
===
1
?
'是'
:
'否'
}}
</div>
<div
v-else-if=
"item.key==='type'"
>
<Select
v-model=
"scope.row.type"
>
<Option
v-for=
"(item,index) in options"
:key=
"item.name"
:value=
"index"
>
{{
item
.
name
}}
</Option>
</Select>
<span
v-if=
"scope.row[item.key]===0"
>
检定
</span>
<span
v-if=
"scope.row[item.key]===1"
>
校准
</span>
<span
v-if=
"scope.row[item.key]===2"
>
外观检查
</span>
</div>
<div
v-else
>
{{
scope
.
row
[
item
.
key
]
}}
</div>
</
template
>
...
...
@@ -92,11 +96,11 @@ export default {
id
:
'meter-review-meter-sample-manage-edit-o'
,
name
:
'编辑'
},
{
type
:
'ios-flask-outline'
,
id
:
'meter-review-meter-sample-manage-test-itm-manage-o'
,
name
:
'管理检测项目'
},
//
{
//
type: 'ios-flask-outline',
//
id: 'meter-review-meter-sample-manage-test-itm-manage-o',
//
name: '管理检测项目'
//
},
{
type
:
'trash-a'
,
id
:
'meter-review-meter-sample-manage-remove-o'
,
...
...
@@ -113,12 +117,13 @@ export default {
type
:
'success'
,
id
:
'review-meter-sample-manage-subpackage-cancel'
,
name
:
'取消分包'
},
{
type
:
'success'
,
id
:
'review-meter-sample-manage-import-test-item'
,
name
:
'导入检测项目'
}
// ,
// {
// type: 'success',
// id: 'review-meter-sample-manage-import-test-item',
// name: '导入检测项目'
// }
],
options
:
[
{
...
...
@@ -138,11 +143,11 @@ export default {
selectData
:
[],
getPage
:
{},
pageColumns
:
[
{
title
:
'样品编号'
,
key
:
'code'
,
width
:
1
2
0
},
{
title
:
'样品编号'
,
key
:
'code'
,
width
:
1
4
0
},
{
title
:
'样品名称'
,
key
:
'name'
,
width
:
140
},
{
title
:
'型号规格'
,
key
:
'spec'
,
width
:
140
},
{
title
:
'出厂编号'
,
key
:
'factoryNumber'
,
width
:
140
},
{
title
:
'检测项目'
,
key
:
'itemNames'
,
width
:
140
},
//
{ title: '检测项目', key: 'itemNames', width: 140 },
{
title
:
'是否分包'
,
key
:
'jobOut'
,
width
:
110
},
{
title
:
'检测类型'
,
key
:
'type'
,
width
:
140
},
{
title
:
'数量'
,
key
:
'quantity'
,
width
:
140
}
...
...
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