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
4d33b278
Commit
4d33b278
authored
Jun 11, 2020
by
lichengming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改了出检委托单
parent
671e6039
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
598 additions
and
0 deletions
+598
-0
MeterGoOutEntrust.vue
pages/meter-entrust/go-out-test/MeterGoOutEntrust.vue
+235
-0
MeterGoOutTestEdit.vue
pages/meter-entrust/go-out-test/MeterGoOutTestEdit.vue
+357
-0
meter-routes.js
router/meter-routes.js
+6
-0
No files found.
pages/meter-entrust/go-out-test/MeterGoOutEntrust.vue
0 → 100644
View file @
4d33b278
<
template
>
<div>
<!--内容-->
<div
class=
"layout-content-padding"
>
<div
class=
"layout-content-main"
>
<Row>
<!--查询-->
<Col
span=
"24"
style=
"margin-top: 10px"
>
<Form
id=
"formId"
v-show=
"searchOpen"
:label-width=
"90"
inline
onsubmit=
"return false"
>
<label
class=
"label-sign"
></label>
<Form-item
class=
"search-item"
label=
"实验室名称:"
>
<Input
v-model=
"formObj.name"
@
on-enter=
"_formSearch"
name=
"name"
placeholder=
"请输入实验室名称"
clearable
/>
</Form-item>
<Form-item
class=
"search-item"
label=
"资质:"
>
<Input
v-model=
"formObj.aptitude"
@
on-enter=
"_formSearch"
name=
"aptitude"
placeholder=
"请输入资质"
clearable
/>
</Form-item>
<Form-item
class=
"search-btn"
>
<Button
@
click=
"_formSearch"
type=
"primary"
>
搜索
</Button>
</Form-item>
</Form>
</Col>
<!--操作-->
<Col
span=
"24"
>
<btn-list
:msg=
"btn"
:open=
"searchOpen"
:show-search-btn=
"true"
@
on-result-change=
"_btnClick"
class=
"contHide"
></btn-list>
</Col>
<!--表格-->
<Col
span=
"24"
>
<PTVXETable
ref=
"pageTable"
:table-height=
"tableHeight"
:form-id=
"formId"
:loading=
"true"
:get-page=
"getPage"
:icon-msg=
"iconMsg"
@
on-result-change=
"_tableResultChange"
hide-checkbox
>
<vxe-table-column
v-for=
"item in pageColumns"
:key=
"item.key"
:field=
"item.key"
:title=
"item.title"
:min-width=
"item.width?item.width:200"
:fixed=
"item.fixed?item.fixed:undefined"
sortable
>
<template
slot-scope=
"scope"
>
<span>
{{
scope
.
row
[
item
.
key
]
}}
</span>
</
template
>
</vxe-table-column>
</PTVXETable>
</Col>
</Row>
</div>
</div>
<MeterSubcontractorEdit
ref=
"editSubcontractorModal"
@
on-result-change=
"_formSearch"
></MeterSubcontractorEdit>
</div>
</template>
<
script
>
import
{
meterEntrust
,
meterSubcontractor
}
from
'../../../api'
import
MeterSubcontractorEdit
from
'./MeterGoOutTestEdit'
export
default
{
components
:
{
MeterSubcontractorEdit
},
data
()
{
return
{
currentComponent
:
''
,
formId
:
'meterSubcontractorFormId'
,
searchOpen
:
false
,
btn
:
[
{
type
:
'success'
,
id
:
'meter-subcontractor-add-btn'
,
name
:
'添加'
}
],
iconMsg
:
[
{
type
:
'ios-clock'
,
id
:
''
,
name
:
'编辑'
},
{
type
:
'ios-clock'
,
id
:
''
,
name
:
'资质项目'
},
{
type
:
'ios-clock'
,
id
:
''
,
name
:
'附件'
},
{
type
:
'ios-clock'
,
id
:
''
,
name
:
'删除'
},
{
type
:
'ios-clock'
,
id
:
''
,
name
:
'操作日志'
}
],
formObj
:
{
name
:
undefined
,
aptitude
:
undefined
},
selectIds
:
[],
getPage
:
{},
pageColumns
:
[
{
title
:
'委托单位'
,
key
:
'client'
,
width
:
200
},
{
title
:
'联系人'
,
key
:
'person'
,
width
:
120
},
{
title
:
'联系电话'
,
key
:
'tel'
,
width
:
120
},
{
title
:
'传真'
,
key
:
'fax'
,
width
:
120
},
{
title
:
'详细地址'
,
key
:
'address'
,
width
:
250
},
{
title
:
'邮编'
,
key
:
'postcode'
},
{
title
:
'E-mail'
,
key
:
'email'
,
width
:
120
},
{
title
:
'委托日期'
,
key
:
'edate'
,
width
:
120
},
{
title
:
'费用合计'
,
key
:
'fee'
,
width
:
120
},
{
title
:
'合同号'
,
key
:
'contractCode'
,
width
:
120
},
{
title
:
'备注'
,
key
:
'remark'
}
]
}
},
computed
:
{
tableHeight
:
function
()
{
if
(
this
.
searchOpen
)
{
return
this
.
$tableHeight
(
'search'
)
}
else
{
return
this
.
$tableHeight
(
'noSearch'
)
}
}
},
mounted
()
{
this
.
_page
()
},
methods
:
{
_modalResult
()
{
if
(
this
.
currentComponent
===
'FoodSubcontracterEdit'
)
{
this
.
_page
()
}
},
_btnClick
(
msg
,
componentName
)
{
this
.
currentComponent
=
componentName
this
.
$nextTick
(
function
()
{
switch
(
msg
)
{
case
'添加'
:
this
.
_editModal
(
false
)
break
case
'search'
:
this
.
searchOpen
=
!
this
.
searchOpen
break
}
})
},
_iconClick
(
res
,
data
,
componentName
)
{
this
.
currentComponent
=
componentName
this
.
$nextTick
(
function
()
{
switch
(
res
)
{
case
'编辑'
:
this
.
_editModal
(
true
,
data
.
id
)
break
case
'资质项目'
:
this
.
_itemModal
(
data
.
id
)
break
case
'附件'
:
this
.
_upload
(
data
.
id
)
break
case
'删除'
:
this
.
_deleteByIds
([
data
.
id
])
break
case
'操作日志'
:
this
.
_record
(
data
.
id
)
break
}
})
},
_record
(
id
)
{
this
.
$refs
.
refModal
.
_open
(
id
)
},
_tableResultChange
(
msg
,
data
)
{
switch
(
msg
)
{
case
'page'
:
this
.
getPage
=
this
.
$store
.
state
.
FoodSubcontracter
.
page
break
case
'iconClick'
:
this
.
_iconClick
(
data
.
name
,
data
.
rowData
,
data
.
componentName
)
break
case
'changeSize'
:
this
.
_page
()
break
}
},
_page
:
async
function
()
{
Object
.
assign
(
this
.
formObj
,
this
.
$refs
.
pageTable
.
_searchParams
())
console
.
log
(
'this.formObj'
,
this
.
formObj
)
const
result
=
await
meterEntrust
.
pageSendEntrust
(
this
.
formObj
)
if
(
result
)
{
this
.
$refs
.
pageTable
.
_hideLoading
()
this
.
getPage
=
result
}
},
_formSearch
()
{
this
.
$refs
.
pageTable
.
_pageChange
(
1
)
},
// 删除
_deleteByIds
(
ids
,
content
)
{
this
.
$Modal
.
confirm
({
title
:
'提示'
,
content
:
content
||
'确定删除该记录?'
,
onOk
:
()
=>
{
this
.
_delete
(
ids
)
}
})
},
// 编辑&添加
_editModal
(
edit
,
id
)
{
if
(
edit
)
{
// 编辑
// this.$refs.editSubcontractorModal._open(id)
this
.
_getById
(
id
)
}
else
{
// 添加
this
.
$refs
.
editSubcontractorModal
.
_open
()
}
},
// 追加项目
_itemModal
(
data
)
{
this
.
$refs
.
refModal
.
_open
(
data
)
},
_upload
(
id
)
{
// 上传文件
this
.
$refs
.
refModal
.
_open
(
id
,
'subcontractorId'
)
},
_getById
:
async
function
(
id
)
{
const
result
=
await
meterSubcontractor
.
getById
(
id
)
if
(
result
)
{
this
.
$refs
.
editSubcontractorModal
.
_open
(
result
)
}
},
_delete
:
async
function
(
ids
)
{
const
result
=
await
meterSubcontractor
.
deleteById
(
ids
)
if
(
result
)
{
this
.
_formSearch
()
this
.
$Message
.
success
(
'删除成功!'
)
}
}
}
}
</
script
>
pages/meter-entrust/go-out-test/MeterGoOutTestEdit.vue
0 → 100644
View file @
4d33b278
<
template
>
<div>
<Modal
v-model=
"showModal"
:mask-closable=
"false"
width=
"1000"
>
<p
slot=
"header"
>
{{
modalTitle
}}
</p>
<div>
<Form
id=
"edit-form"
ref=
"formObj"
:model=
"formObj"
:rules=
"ruleValidate"
:label-width=
"90"
inline
>
<Form-item
label=
"委托方是否第一次送检"
prop=
"firsted"
class=
"width-48"
>
<Input
v-model=
"formObj.firsted"
name=
"firsted"
placeholder=
"委托方是否第一次送检"
/>
</Form-item>
<Form-item
label=
"委托单位"
prop=
"client"
class=
"width-48"
>
<Input
v-model=
"formObj.client"
name=
"client"
placeholder=
"请输入委托单位"
/>
</Form-item>
<Form-item
label=
"联系人"
prop=
"operation.person"
class=
"width-48"
>
<Input
v-model=
"formObj.operation.person"
name=
"operation.person"
placeholder=
"请输入委托单位"
/>
</Form-item>
<Form-item
label=
"联系电话"
prop=
"operation.tel"
class=
"width-48"
>
<Input
v-model=
"formObj.operation.tel"
name=
"operation.tel"
placeholder=
"请输入委托单位"
/>
</Form-item>
<Form-item
label=
"传真"
prop=
"operation.fax"
class=
"width-48"
>
<Input
v-model=
"formObj.operation.fax"
name=
"operation.fax"
placeholder=
"请输入委托单位"
/>
</Form-item>
<Form-item
label=
"省、市、区"
prop=
"name"
class=
"width-48"
>
<Input
v-model=
"formObj.client"
name=
"name"
placeholder=
"请输入委托单位"
/>
</Form-item>
<Form-item
label=
"街道"
prop=
"street"
class=
"width-48"
>
<Input
v-model=
"formObj.street"
name=
"street"
placeholder=
"请输入委托单位"
/>
</Form-item>
<Form-item
label=
"邮编"
prop=
"operation.postcode"
class=
"width-48"
>
<Input
v-model=
"formObj.operation.postcode"
name=
"operation.postcode"
placeholder=
"请输入委托单位"
/>
</Form-item>
<Form-item
label=
"E-mail"
prop=
"operation.email"
class=
"width-48"
>
<Input
v-model=
"formObj.operation.email"
name=
"operation.email"
placeholder=
"请输入实验室名称"
/>
</Form-item>
<Form-item
label=
"委托日期:"
prop=
"edate"
class=
"width-48"
>
<Input
v-model=
"formObj.edate"
name=
"edate"
placeholder=
"请输入联系人"
/>
</Form-item>
<Form-item
label=
"合同号:"
prop=
"contractCode"
class=
"width-48"
>
<Input
v-model=
"formObj.contractCode"
name=
"contractCode"
placeholder=
"请输入联系人"
/>
</Form-item>
<Form-item
label=
"备注:"
prop=
"remark"
style=
"width: 99.8%"
>
<Input
v-model=
"formObj.remark"
:rows=
"3"
name=
"remark"
type=
"textarea"
placeholder=
"请输入备注"
/>
</Form-item>
</Form>
<Col
span=
"24"
>
<!--
<btn-list
:msg=
"btn"
:open=
"searchOpen"
:showSearchBtn=
"false"
@
on-result-change=
"_btnClick"
--
>
<!-- class="contHide">
</btn-list>
-->
<Button
@
click=
"_add()"
type=
"success"
>
添加
</Button>
</Col>
<Col
span=
"24"
>
<PTVXETable
ref=
"pageTable"
:form-id=
"formId"
:tableHeight=
"500"
:getPage=
"getPage"
:iconMsg=
"iconMsg"
@
on-result-change=
"_tableResultChange"
>
<vxe-table-column
v-for=
"item in pageColumns"
:key=
"item.key"
:field=
"item.key"
:title=
"item.title"
:width=
"item.width"
:min-width=
"200"
:fixed=
"item.fixed?item.fixed:undefined"
sortable
>
<template
slot-scope=
"scope"
>
<div
v-if=
"item.key==='name'"
@
click
.
stop=
"_handleRow(scope)"
>
<el-input
v-model=
"scope.row.name"
blur
placeholder=
"请输入或选择样品名称"
></el-input>
</div>
<div
v-if=
"item.key==='spec'"
@
click
.
stop=
"_handleRow(scope)"
>
<el-input
v-model=
"scope.row.spec"
blur
placeholder=
"请输入或选择型号规格"
></el-input>
</div>
<div
v-if=
"item.key==='factoryNumber'"
@
click
.
stop=
"_handleRow(scope)"
>
<el-input
v-model=
"scope.row.factoryNumber"
blur
placeholder=
"请输入或选择出厂编号"
></el-input>
</div>
<div
v-if=
"item.key==='type'"
@
click
.
stop=
"_handleRow(scope)"
>
<!--<!–
<el-input
v-model=
"scope.row.type"
blur
placeholder=
"请输入或选择检测类型"
&
ndash
;&
gt
;
--
>
<!--<!– >
</el-input>
–>
-->
<Select
v-model=
"scope.row.type"
>
<Option
v-for=
"(item,index) in options"
:key=
"item.name"
:value=
"index"
>
{{
item
.
name
}}
</Option>
</Select>
</div>
<div
v-if=
"item.key==='quantity'"
@
click
.
stop=
"_handleRow(scope)"
>
<!--
<el-input
v-model=
"scope.row.quantity"
blur
placeholder=
"请输入或选择数量"
--
>
<!-- >
</el-input>
-->
<el-input
v-model=
"scope.row.quantity"
@
keydown
.
native=
"channelInputLimit"
type=
"number"
placeholder=
"请输入或选择数量"
/>
</div>
</
template
>
</vxe-table-column>
</PTVXETable>
</Col>
</div>
<div
slot=
"footer"
>
<modal-footer
ref=
"footerModal"
:footer=
"footerList"
@
on-result-change=
"_footerResult"
></modal-footer>
</div>
</Modal>
</div>
</template>
<
script
>
/**
* 添加编辑分包商
*/
import
{
lmsBaseDict
,
meterEntrust
}
from
'../../../api'
export
default
{
components
:
{},
data
()
{
return
{
formId
:
'meterSendTestEditFormId'
,
getPage
:
{
records
:
[]
},
iconMsg
:
[
{
type
:
'ios-clock'
,
id
:
''
,
name
:
'编辑'
},
{
type
:
'ios-clock'
,
id
:
''
,
name
:
'删除'
}
],
pageColumns
:
[
{
title
:
'样品名称'
,
key
:
'name'
,
width
:
160
},
{
title
:
'型号规格'
,
key
:
'spec'
},
{
title
:
'出厂编号'
,
key
:
'factoryNumber'
},
{
title
:
'检测类型'
,
key
:
'type'
},
{
title
:
'数量'
,
key
:
'quantity'
}
// {title: '限制范围或说明', key: 'limitDescription'},
],
options
:
[
{
name
:
'检定'
},
{
name
:
'校准'
},
{
name
:
'外观检查'
}
],
id
:
''
,
modalTitle
:
''
,
subcontractorId
:
''
,
formObj
:
{
client
:
''
,
linkman
:
''
,
tel
:
''
,
email
:
''
,
address
:
''
,
remark
:
''
,
street
:
''
,
aptitude
:
[],
assessFormSn
:
''
,
subArea
:
''
,
personCondition
:
''
,
edate
:
''
,
contractCode
:
''
,
operation
:
{
person
:
''
,
tel
:
''
,
fax
:
''
,
postcode
:
''
,
email
:
''
,
fee
:
''
}
},
ruleValidate
:
{
client
:
[
{
required
:
true
,
message
:
'委托单位不能为空'
,
trigger
:
'blur'
}
]
},
clearingWayList
:
[
'款到后测试'
,
'先测试后付款'
,
'其他情况()'
],
clearingWayListTemp
:
[
'款到后测试'
,
'先测试后付款'
,
'其他情况()'
],
showModal
:
false
,
footerList
:
[
{
id
:
''
,
name
:
'取消'
,
type
:
''
},
{
id
:
''
,
name
:
'保存'
,
type
:
'primary'
}
],
aptitudeData
:
[]
}
},
methods
:
{
_add
()
{
const
data
=
{
name
:
''
,
spec
:
''
,
factoryNumber
:
''
,
quantity
:
''
,
type
:
''
}
this
.
getPage
.
records
.
unshift
(
data
)
},
_tableResultChange
(
msg
,
data
)
{
switch
(
msg
)
{
case
'page'
:
// this.getPage = this.$store.state.FoodJudgeBasis.page
break
case
'selectIds'
:
// this.selectIds = data
break
case
'iconClick'
:
this
.
_iconClick
(
data
.
name
,
data
.
rowData
,
data
.
rowIndex
)
break
// case 'changeSize':
// this._page()
// break
}
},
_iconClick
(
res
,
data
,
index
)
{
switch
(
res
)
{
case
'编辑'
:
// this._editModal(true, data.id)
break
case
'删除'
:
// this._deleteById(data.id)
console
.
log
(
'点击了删除按钮'
)
console
.
log
(
index
)
this
.
getPage
.
records
.
splice
(
index
,
1
)
break
case
'操作日志'
:
// this._record(data.id)
break
}
},
_handleRow
(
data
)
{
this
.
currentRow
=
data
.
row
this
.
currentIndex
=
data
.
rowIndex
},
channelInputLimit
(
e
)
{
const
key
=
e
.
key
// 不允许输入'e'和'.'
if
(
key
===
'e'
||
key
===
'.'
)
{
e
.
returnValue
=
false
return
false
}
return
true
},
/** *modal-footer */
_footerResult
(
name
)
{
switch
(
name
)
{
case
'取消'
:
this
.
_cancel
()
break
case
'保存'
:
this
.
_ok
()
break
}
},
_hideLoading
()
{
this
.
$refs
.
footerModal
.
_hideLoading
()
},
_resultChange
(
msg
)
{
this
.
showModal
=
false
this
.
$Message
.
success
(
msg
)
this
.
$emit
(
'on-result-change'
)
this
.
_hideLoading
()
},
_ok
()
{
this
.
$refs
.
formObj
.
validate
(
valid
=>
{
if
(
valid
)
{
const
data
=
this
.
$serialize
(
'edit-form'
)
Object
.
assign
(
this
.
formObj
,
data
)
if
(
this
.
$string
(
this
.
id
).
isEmpty
())
{
// 添加
console
.
log
(
'data'
,
data
)
console
.
log
(
'this.formObj'
,
this
.
formObj
)
console
.
log
(
this
.
getPage
.
records
)
// this._save(this.formObj)
}
else
{
// 编辑
this
.
_edit
({
id
:
this
.
formObj
.
id
,
obj
:
data
})
}
}
else
{
this
.
$Message
.
error
(
'表单验证失败!'
)
this
.
_hideLoading
()
}
})
},
_wayResult
(
msg
,
data
)
{
switch
(
msg
)
{
case
'select'
:
this
.
formObj
.
clearingWay
=
data
break
case
'query'
:
this
.
formObj
.
clearingWay
=
data
this
.
_wayQuery
(
data
)
break
}
},
_wayQuery
(
query
)
{
if
(
query
===
''
)
{
this
.
clearingWayList
=
this
.
clearingWayListTemp
}
else
{
this
.
clearingWayList
=
this
.
clearingWayListTemp
.
filter
(
item
=>
item
.
indexOf
(
query
)
>
-
1
)
}
},
_cancel
()
{
this
.
showModal
=
false
},
_open
(
formObj
)
{
this
.
showModal
=
true
this
.
$refs
.
formObj
.
resetFields
()
this
.
_hideLoading
()
this
.
_getAptitudeList
()
if
(
this
.
$string
(
formObj
).
isEmpty
())
{
this
.
getPage
.
records
=
[]
this
.
id
=
''
this
.
formObj
.
aptitude
=
[]
this
.
modalTitle
=
'分包商管理新增'
}
else
{
this
.
id
=
formObj
.
id
this
.
formObj
=
formObj
this
.
modalTitle
=
'分包商管理编辑'
this
.
_showTime
(
formObj
)
}
},
_getAptitudeList
:
async
function
()
{
const
result
=
await
lmsBaseDict
.
getItem
(
'subcontractorAptitude'
)
if
(
result
)
{
this
.
aptitudeData
=
result
}
},
_showTime
(
formObj
)
{
// 回显资质类型
if
(
formObj
.
aptitude
!==
undefined
||
''
)
{
this
.
formObj
.
aptitude
=
formObj
.
aptitude
.
split
(
','
)
}
else
{
this
.
formObj
.
aptitude
=
[]
}
},
_save
:
async
function
(
data
)
{
const
result
=
await
meterEntrust
.
save
(
data
)
console
.
log
(
result
)
if
(
result
)
{
this
.
_resultChange
(
'添加成功!'
)
}
},
_edit
:
async
function
(
data
)
{
const
result
=
await
meterEntrust
.
edit
(
data
)
if
(
result
)
{
this
.
_resultChange
(
'编辑成功!'
)
}
}
}
}
</
script
>
router/meter-routes.js
View file @
4d33b278
...
@@ -11,6 +11,7 @@ import MeterAptitudeManage from '../pages/meter-aptitude/manage/MeterAptitudeMan
...
@@ -11,6 +11,7 @@ import MeterAptitudeManage from '../pages/meter-aptitude/manage/MeterAptitudeMan
import
MeterAptitudeStandard
from
'../pages/meter-aptitude/standard/MeterAptitudeStandard'
import
MeterAptitudeStandard
from
'../pages/meter-aptitude/standard/MeterAptitudeStandard'
import
MeterSubcontractor
from
'../pages/meter-subcontract/subcontractor/MeterSubcontractor'
import
MeterSubcontractor
from
'../pages/meter-subcontract/subcontractor/MeterSubcontractor'
import
MeterSendEntrust
from
'../pages/meter-entrust/send-test/MeterSendEntrust'
import
MeterSendEntrust
from
'../pages/meter-entrust/send-test/MeterSendEntrust'
import
MeterGoOutEntruse
from
'../pages/meter-entrust/go-out-test/MeterGoOutEntrust'
import
Blank
from
'~/pages/blank'
import
Blank
from
'~/pages/blank'
export
default
[
export
default
[
{
{
...
@@ -53,6 +54,11 @@ export default [
...
@@ -53,6 +54,11 @@ export default [
path
:
'send_test'
,
path
:
'send_test'
,
component
:
MeterSendEntrust
,
component
:
MeterSendEntrust
,
meta
:
{
title
:
'送检委托登记'
}
meta
:
{
title
:
'送检委托登记'
}
},
{
path
:
'go_out_test'
,
component
:
MeterGoOutEntruse
,
meta
:
{
title
:
'出检委托登记'
}
}
}
]
]
}
}
...
...
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