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
0a314aee
Commit
0a314aee
authored
Oct 28, 2020
by
lichengming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改了批量填写试验项目信息
parent
3596c945
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
258 additions
and
3 deletions
+258
-3
soil-sample.js
api/soil/soil-sample.js
+2
-0
PrepareItemBatchEdit.vue
...sample-manage/sample-preparation/PrepareItemBatchEdit.vue
+235
-0
SoilSampleItemManageEdit.vue
...le-manage/sample-preparation/SoilSampleItemManageEdit.vue
+21
-3
No files found.
api/soil/soil-sample.js
View file @
0a314aee
...
...
@@ -132,6 +132,8 @@ export default {
http
.
post
(
'res/v1/dict/dict_query?type='
+
data
).
then
(
res
=>
res
),
editBackup
:
data
=>
http
.
put
(
'soil/v1/sample_backup/'
+
data
.
id
,
data
.
obj
).
then
(
res
=>
res
),
editItem
:
data
=>
http
.
post
(
'soil/v1/experiment/bath_update_info'
,
data
).
then
(
res
=>
res
),
// 余样编辑
editPrepare
:
data
=>
http
.
put
(
'soil/v1/prepare/'
+
data
.
id
,
data
.
obj
).
then
(
res
=>
res
),
...
...
pages/soil-sample-manage/sample-preparation/PrepareItemBatchEdit.vue
0 → 100644
View file @
0a314aee
<
template
>
<div>
<Modal
v-model=
"showModal"
:mask-closable=
"false"
>
<p
slot=
"header"
>
填写试验项目信息
</p>
<div>
<Form
id=
"storage-location-form"
ref=
"formObj"
:model=
"formObj"
:rules=
"ruleValidate"
:label-width=
"100"
>
<Form-item
label=
"英文简写:"
prop=
"shortName"
>
<el-input
v-model=
"formObj.shortName"
name=
"shortName"
placeholder=
"请输入英文简写"
>
</el-input>
</Form-item>
<Form-item
label=
"大类:"
prop=
"mainType"
>
<el-input
v-model=
"formObj.mainType"
name=
"mainType"
placeholder=
"请输入大类"
>
</el-input>
</Form-item>
<Form-item
label=
"小类:"
prop=
"smallType"
>
<el-input
v-model=
"formObj.smallType"
name=
"smallType"
placeholder=
"请输入小类"
>
</el-input>
</Form-item>
<Form-item
label=
"试验方法:"
prop=
"testMethod"
>
<el-input
v-model=
"formObj.testMethod"
name=
"testMethod"
placeholder=
"请输入试验方法"
>
</el-input>
</Form-item>
<Form-item
label=
"试验科室:"
>
<el-select
:value=
"formObj.groupName"
@
change=
"selGroupName"
style=
"width:100%"
size=
"small"
>
<el-option
v-for=
"item in groupoptions"
:value=
"item.id"
:label=
"item.name"
:key=
"item.name"
>
{{
item
.
name
}}
</el-option>
</el-select>
</Form-item>
<Form-item
label=
"检测依据:"
>
<AutoCompletes
v-model=
"formObj.testBasis"
:down-data=
"testBasisList"
@
on-result-change=
"_selTestBasis"
style=
"editable:false"
clearable
placeholder=
"请选择检测依据"
show-key=
"name"
></AutoCompletes>
</Form-item>
</Form>
</div>
<div
slot=
"footer"
>
<modal-footer
ref=
"footerModal"
@
on-result-change=
"_footerResult"
:footer=
"footerList"
></modal-footer>
</div>
</Modal>
</div>
</
template
>
<
script
>
import
{
soilAptitude
,
soilSample
}
from
'../../../api'
import
AutoCompletes
from
'../../../components/base/AutoCompletes'
export
default
{
components
:
{
AutoCompletes
},
data
()
{
return
{
ids
:
[],
// 委托ids
showModal
:
false
,
formObj
:
{},
ruleValidate
:
{},
footerList
:
[
{
id
:
''
,
name
:
'取消'
,
type
:
''
},
{
id
:
''
,
name
:
'保存'
,
type
:
'primary'
}
],
conditionList
:
[],
locList
:
[],
backupUserList
:
[],
prepareWayList
:
[],
keepWayList
:
[],
keepContainerList
:
[],
groupoptions
:
[],
testBasisList
:
[],
sampleUnit
:
''
}
},
mounted
()
{
this
.
_getGroupList
()
this
.
_getTestBasisList
()
},
methods
:
{
_locChange
(
msg
,
data
)
{
switch
(
msg
)
{
case
'select'
:
this
.
formObj
.
backupPlace
=
data
.
backupPlace
this
.
_getCondition
(
data
.
backupPlace
)
break
case
'query'
:
this
.
formObj
.
backupPlace
=
data
.
backupPlace
this
.
_getLocList
(
data
.
backupPlace
)
break
}
},
_getGroupList
:
async
function
()
{
const
result
=
await
soilAptitude
.
getGroupList
()
if
(
result
)
{
this
.
groupoptions
=
result
console
.
log
(
'试验科室'
,
result
)
}
},
_getTestBasisList
:
async
function
()
{
const
result
=
await
soilAptitude
.
getBasisList
()
if
(
result
)
{
this
.
testBasisList
=
result
}
},
_selTestBasis
(
msg
,
data
)
{
if
(
msg
===
'select'
)
{
this
.
formObj
.
testBasis
=
data
.
name
}
},
channelInputLimit
(
e
)
{
const
key
=
e
.
key
// 不允许输入'e'和'.'
if
(
key
===
'e'
||
key
===
'.'
)
{
e
.
returnValue
=
false
return
false
}
return
true
},
selPrepareWay
(
data
)
{
this
.
$forceUpdate
()
this
.
formObj
.
prepareWay
=
data
},
selKeepWay
(
data
)
{
this
.
$forceUpdate
()
this
.
formObj
.
keepWay
=
data
},
selKeepContainer
(
msg
,
data
)
{
this
.
$forceUpdate
()
if
(
msg
===
'select'
)
{
this
.
formObj
.
keepContainer
=
data
.
name
}
else
if
(
msg
===
'query'
)
{
this
.
formObj
.
keepContainer
=
data
.
name
}
},
selGroupName
(
data
)
{
this
.
$forceUpdate
()
if
(
data
)
{
for
(
let
i
=
0
;
i
<
this
.
groupoptions
.
length
;
i
++
)
{
if
(
this
.
groupoptions
[
i
].
id
===
data
)
{
this
.
formObj
.
groupName
=
this
.
groupoptions
[
i
].
name
}
}
}
else
{
this
.
getPage
.
records
[
this
.
currentIndex
].
groupName
=
''
}
this
.
formObj
.
groupId
=
data
// this.$forceUpdate()
// this.getPage.records[this.currentIndex].backupUser = data
// this.getPage.records[this.currentIndex].backupUser = data
},
// 存储条件 回调
_locChangeCondition
(
msg
,
data
)
{
switch
(
msg
)
{
case
'select'
:
this
.
formObj
.
storageCondition
=
data
.
name
this
.
_getLocCondition
(
data
.
name
)
break
case
'query'
:
this
.
formObj
.
storageCondition
=
data
.
name
this
.
_getLocConditionList
(
data
.
name
)
break
}
},
_footerResult
(
name
)
{
switch
(
name
)
{
case
'取消'
:
this
.
_cancel
()
break
case
'保存'
:
this
.
_ok
()
break
}
},
_open
(
data
)
{
this
.
showModal
=
true
this
.
formObj
=
this
.
$resetFields
(
this
.
formObj
)
this
.
sampleUnit
=
''
this
.
$refs
.
footerModal
.
_hideLoading
()
this
.
ids
=
data
// 循环遍历数据
},
_getPrepareWay
:
async
function
()
{
const
result
=
await
soilSample
.
getDictList
(
'制备方式'
)
if
(
result
)
{
this
.
prepareWayList
=
result
}
},
_getkeepWayList
:
async
function
()
{
const
result
=
await
soilSample
.
getDictList
(
'保存方式'
)
if
(
result
)
{
this
.
keepWayList
=
result
}
},
_getkeepContainerList
:
async
function
()
{
const
result
=
await
soilSample
.
getDictList
(
'保存容器'
)
if
(
result
)
{
this
.
keepContainerList
=
result
}
},
_getUserList
:
async
function
()
{
const
result
=
await
soilSample
.
getUserList
()
if
(
result
)
{
console
.
log
(
result
)
this
.
backupUserList
=
result
.
records
}
},
//
_dateChange
(
data
)
{
this
.
formObj
.
endDate
=
data
},
_cancel
()
{
this
.
showModal
=
false
this
.
$refs
.
footerModal
.
_hideLoading
()
},
_hideLoading
()
{
this
.
$refs
.
footerModal
.
_hideLoading
()
},
_ok
()
{
this
.
$refs
.
formObj
.
validate
(
valid
=>
{
if
(
valid
)
{
console
.
log
(
this
.
formObj
)
const
tempData
=
this
.
formObj
tempData
.
ids
=
this
.
ids
.
join
(
','
)
this
.
_saveInfo
(
tempData
)
}
else
{
this
.
$Message
.
error
(
'表单验证失败!'
)
this
.
$refs
.
footerModal
.
_hideLoading
()
}
})
},
_saveInfo
:
async
function
(
data
)
{
const
result
=
await
soilSample
.
editItem
(
data
)
if
(
result
)
{
this
.
showModal
=
false
this
.
$refs
.
footerModal
.
_hideLoading
()
this
.
$emit
(
'on-result-change'
)
this
.
$Message
.
success
(
'保存成功'
)
}
}
}
}
</
script
>
pages/soil-sample-manage/sample-preparation/SoilSampleItemManageEdit.vue
View file @
0a314aee
...
...
@@ -31,7 +31,7 @@
<!-- 表格 -->
<Col
span=
"24"
>
<PTVXETable
ref=
"pageTable"
:table-height=
"tableHeight"
:form-id=
"formId"
:loading=
"true"
:get-page=
"getPage"
@
on-result-change=
"_tableResultChange"
is-edit
>
:get-page=
"getPage"
@
on-result-change=
"_tableResultChange"
is-edit
select-data
>
<vxe-table-column
v-for=
"item in pageColumns"
:key=
"item.key"
...
...
@@ -110,19 +110,27 @@
<modal-footer
ref=
"footerModal"
:footer=
"footerList"
@
on-result-change=
"_footerResult"
/>
</div>
</Modal>
<PrepareItemBatchEdit
ref=
"batchEdit"
@
on-result-change=
"_page"
></PrepareItemBatchEdit>
</div>
</template>
<
script
>
import
http
from
'../../../api/http'
import
{
soilAptitude
,
soilEntrust
}
from
'../../../api'
import
AutoCompletes
from
'../../../components/base/AutoCompletes'
import
PrepareItemBatchEdit
from
'./PrepareItemBatchEdit'
export
default
{
components
:
{
AutoCompletes
},
components
:
{
AutoCompletes
,
PrepareItemBatchEdit
},
data
()
{
return
{
formId
:
'SampleItemManage'
,
currentComponent
:
''
,
btn
:
[],
btn
:
[
{
type
:
'success'
,
id
:
''
,
name
:
'批量填写试验项目信息'
}
],
iconMsg
:
[{
type
:
'pt-a-end'
,
id
:
''
,
name
:
'删除'
}],
sampleId
:
''
,
// 样品id
entrustId
:
''
,
...
...
@@ -307,6 +315,9 @@ export default {
this
.
currentComponent
=
componentName
this
.
$nextTick
(
function
()
{
switch
(
msg
)
{
case
'批量填写试验项目信息'
:
this
.
_writeInfo
()
break
case
'提交分包'
:
this
.
_submitOutPack
()
break
...
...
@@ -346,6 +357,13 @@ export default {
}
})
},
_writeInfo
()
{
if
(
this
.
selectIds
.
length
===
0
)
{
this
.
$Message
.
warning
(
'请选择一条或多条数据!'
)
}
else
{
this
.
$refs
.
batchEdit
.
_open
(
this
.
selectIds
)
}
},
_backData
(
data
)
{
this
.
getPage
.
records
[
this
.
index
].
code
=
data
.
code
this
.
_codeEdit
({
id
:
this
.
itemId
,
obj
:
{
code
:
data
.
code
}
})
...
...
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