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
0d0f0ad4
Commit
0d0f0ad4
authored
Oct 31, 2020
by
lichengming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改了检测管理
parent
b1236f6b
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
193 additions
and
97 deletions
+193
-97
AuditIndex.vue
pages/soil-test-manage/test-data-audit/AuditIndex.vue
+31
-14
DataAudit.vue
pages/soil-test-manage/test-data-audit/DataAudit.vue
+26
-14
DataAuditHis.vue
pages/soil-test-manage/test-data-audit/DataAuditHis.vue
+26
-14
CheckIndex.vue
pages/soil-test-manage/test-data-check/CheckIndex.vue
+31
-14
DataCheck.vue
pages/soil-test-manage/test-data-check/DataCheck.vue
+26
-14
DataCheckHis.vue
pages/soil-test-manage/test-data-check/DataCheckHis.vue
+26
-13
DataConsult.vue
pages/soil-test-manage/test-data-consult/DataConsult.vue
+27
-14
No files found.
pages/soil-test-manage/test-data-audit/AuditIndex.vue
View file @
0d0f0ad4
...
@@ -2,14 +2,22 @@
...
@@ -2,14 +2,22 @@
<div>
<div>
<div
class=
"layout-content-padding"
>
<div
class=
"layout-content-padding"
>
<div
class=
"layout-content-main"
>
<div
class=
"layout-content-main"
>
<!--
<el-tabs
v-model=
"activeName"
@
tab-click=
"_changeTabs"
>
-->
<!--
<el-tab-pane
label=
"数据审核"
name=
"check"
>
-->
<!--
<SampleBackupsManage
ref=
"checkTabs"
></SampleBackupsManage>
-->
<!--
</el-tab-pane>
-->
<!--
<el-tab-pane
label=
"历史任务"
name=
"checkHis"
>
-->
<!--
<SampleBackupsQuery
ref=
"checkHisTabs"
></SampleBackupsQuery>
-->
<!--
</el-tab-pane>
-->
<!--
</el-tabs>
-->
<el-tabs
v-model=
"activeName"
@
tab-click=
"_changeTabs"
>
<el-tabs
v-model=
"activeName"
@
tab-click=
"_changeTabs"
>
<el-tab-pane
label=
"数据审核"
name=
"check"
>
<el-tab-pane
label=
"数据审核"
name=
"check"
></el-tab-pane>
<SampleBackupsManage
ref=
"checkTabs"
></SampleBackupsManage>
<el-tab-pane
label=
"历史任务"
name=
"checkHis"
></el-tab-pane>
</el-tab-pane>
<el-tab-pane
label=
"历史任务"
name=
"checkHis"
>
<SampleBackupsQuery
ref=
"checkHisTabs"
></SampleBackupsQuery>
</el-tab-pane>
</el-tabs>
</el-tabs>
<keep-alive>
<!-- eslint-disable-next-line vue/require-component-is -->
<component
ref=
"refModal"
:is=
"currentComponent"
></component>
</keep-alive>
</div>
</div>
</div>
</div>
</div>
</div>
...
@@ -20,28 +28,37 @@ import SampleBackupsManage from './DataAudit'
...
@@ -20,28 +28,37 @@ import SampleBackupsManage from './DataAudit'
import
SampleBackupsQuery
from
'./DataAuditHis'
import
SampleBackupsQuery
from
'./DataAuditHis'
export
default
{
export
default
{
components
:
{
// eslint-disable-next-line vue/no-unused-components
SampleBackupsManage
,
components
:
{
SampleBackupsManage
,
SampleBackupsQuery
},
SampleBackupsQuery
},
data
()
{
data
()
{
return
{
return
{
activeName
:
'check'
activeName
:
'check'
,
currentComponent
:
''
}
}
},
},
mounted
()
{
mounted
()
{
this
.
activeName
=
'check'
this
.
activeName
=
'check'
this
.
$refs
.
checkTabs
.
_page
()
this
.
_page
()
},
},
methods
:
{
methods
:
{
_changeTabs
(
tab
,
event
)
{
_changeTabs
(
tab
,
event
)
{
if
(
tab
.
name
===
'check'
)
{
if
(
tab
.
name
===
'check'
)
{
this
.
$refs
.
checkTabs
.
_page
()
this
.
_page
()
}
else
if
(
tab
.
name
===
'applyRecord'
)
{
}
else
if
(
tab
.
name
===
'applyRecord'
)
{
// this.$refs.applyRecordTabs._page()
// this.$refs.applyRecordTabs._page()
}
else
{
}
else
{
this
.
$refs
.
checkHisTabs
.
_page
()
this
.
currentComponent
=
'SampleBackupsQuery'
this
.
$nextTick
(()
=>
{
this
.
$refs
.
refModal
.
_page
()
})
}
}
},
_page
()
{
this
.
currentComponent
=
'SampleBackupsManage'
this
.
$nextTick
(()
=>
{
this
.
$refs
.
refModal
.
_page
()
})
// this.$refs.entrustTabs._page()
}
}
}
}
}
}
...
...
pages/soil-test-manage/test-data-audit/DataAudit.vue
View file @
0d0f0ad4
...
@@ -61,10 +61,14 @@
...
@@ -61,10 +61,14 @@
</div>
</div>
<!--组件加载-->
<!--组件加载-->
<!--选择领样人-->
<!--选择领样人-->
<UserInfo
ref=
"userModal"
@
on-result-change=
"_userResult"
></UserInfo>
<keep-alive>
<Operation
ref=
"operation"
></Operation>
<!-- eslint-disable-next-line vue/require-component-is -->
<AuditDataModal
ref=
"sampleManageModal"
@
on-result-change=
"_page"
></AuditDataModal>
<component
ref=
"refModal"
:is=
"currentComponent"
@
on-result-change=
"_componentResult"
></component>
<FileManage
ref=
"FileManage"
></FileManage>
</keep-alive>
<!-- <UserInfo ref="userModal" @on-result-change="_userResult"></UserInfo>-->
<!-- <Operation ref="operation"></Operation>-->
<!-- <AuditDataModal ref="sampleManageModal" @on-result-change="_page"></AuditDataModal>-->
<!-- <FileManage ref="FileManage"></FileManage>-->
</div>
</div>
</template>
</template>
<
script
>
<
script
>
...
@@ -73,12 +77,8 @@ import { soilTest } from '../../../api'
...
@@ -73,12 +77,8 @@ import { soilTest } from '../../../api'
import
Operation
from
'../../../components/operation/Operation'
import
Operation
from
'../../../components/operation/Operation'
import
AuditDataModal
from
'./AuditDataModal'
import
AuditDataModal
from
'./AuditDataModal'
export
default
{
export
default
{
components
:
{
// eslint-disable-next-line vue/no-unused-components
UserInfo
,
components
:
{
UserInfo
,
Operation
,
AuditDataModal
},
Operation
,
// eslint-disable-next-line vue/no-unused-components
AuditDataModal
},
data
()
{
data
()
{
return
{
return
{
formObj
:
{
formObj
:
{
...
@@ -139,7 +139,7 @@ export default {
...
@@ -139,7 +139,7 @@ export default {
}
}
},
},
mounted
()
{
mounted
()
{
this
.
_page
()
//
this._page()
// 样品接收是否选择人员
// 样品接收是否选择人员
// this.acceptSelectUserValue = localStorage.getItem('acceptSelectUserValue')
// this.acceptSelectUserValue = localStorage.getItem('acceptSelectUserValue')
},
},
...
@@ -365,7 +365,11 @@ export default {
...
@@ -365,7 +365,11 @@ export default {
})
})
},
},
_editModal
(
id
,
type
,
name
)
{
_editModal
(
id
,
type
,
name
)
{
this
.
$refs
.
sampleManageModal
.
_open
(
id
,
type
,
'数据录入'
)
this
.
currentComponent
=
'AuditDataModal'
this
.
$nextTick
(()
=>
{
this
.
$refs
.
refModal
.
_open
(
id
,
type
,
'数据录入'
)
})
// this.$refs.sampleManageModal._open(id, type, '数据录入')
},
},
_editModals
(
res
,
data
)
{
_editModals
(
res
,
data
)
{
if
(
res
===
'登记协议'
)
{
if
(
res
===
'登记协议'
)
{
...
@@ -430,7 +434,11 @@ export default {
...
@@ -430,7 +434,11 @@ export default {
},
},
_operationRecord
(
id
)
{
_operationRecord
(
id
)
{
// 操作日志
// 操作日志
this
.
$refs
.
operation
.
_open
(
id
)
this
.
currentComponent
=
'Operation'
this
.
$nextTick
(()
=>
{
this
.
$refs
.
refModal
.
_open
(
id
)
})
// this.$refs.operation._open(id)
},
},
_resultChange
(
msg
)
{
_resultChange
(
msg
)
{
if
(
this
.
$store
.
state
.
FoodContract
.
success
)
{
if
(
this
.
$store
.
state
.
FoodContract
.
success
)
{
...
@@ -441,7 +449,11 @@ export default {
...
@@ -441,7 +449,11 @@ export default {
},
},
_upload
(
id
)
{
_upload
(
id
)
{
// 上传文件
// 上传文件
this
.
$refs
.
FileManage
.
_open
(
id
,
'entrustId'
)
this
.
currentComponent
=
'FileManage'
this
.
$nextTick
(()
=>
{
this
.
$refs
.
refModal
.
_open
(
id
,
'entrustId'
)
})
// this.$refs.FileManage._open(id, 'entrustId')
}
}
}
}
}
}
...
...
pages/soil-test-manage/test-data-audit/DataAuditHis.vue
View file @
0d0f0ad4
...
@@ -61,10 +61,14 @@
...
@@ -61,10 +61,14 @@
</div>
</div>
<!--组件加载-->
<!--组件加载-->
<!--选择领样人-->
<!--选择领样人-->
<UserInfo
ref=
"userModal"
@
on-result-change=
"_userResult"
></UserInfo>
<keep-alive>
<Operation
ref=
"operation"
></Operation>
<!-- eslint-disable-next-line vue/require-component-is -->
<FileManage
ref=
"FileManage"
></FileManage>
<component
ref=
"refModal"
:is=
"currentComponent"
@
on-result-change=
"_componentResult"
></component>
<SoilSampleManageHis
ref=
"sampleManageModal"
></SoilSampleManageHis>
</keep-alive>
<!-- <UserInfo ref="userModal" @on-result-change="_userResult"></UserInfo>-->
<!-- <Operation ref="operation"></Operation>-->
<!-- <FileManage ref="FileManage"></FileManage>-->
<!-- <SoilSampleManageHis ref="sampleManageModal"></SoilSampleManageHis>-->
</div>
</div>
</template>
</template>
<
script
>
<
script
>
...
@@ -73,11 +77,8 @@ import { soilTest } from '../../../api'
...
@@ -73,11 +77,8 @@ import { soilTest } from '../../../api'
import
Operation
from
'../../../components/operation/Operation'
import
Operation
from
'../../../components/operation/Operation'
import
SoilSampleManageHis
from
'./SoilSampleManageHis'
import
SoilSampleManageHis
from
'./SoilSampleManageHis'
export
default
{
export
default
{
components
:
{
// eslint-disable-next-line vue/no-unused-components
UserInfo
,
components
:
{
UserInfo
,
Operation
,
SoilSampleManageHis
},
Operation
,
SoilSampleManageHis
},
data
()
{
data
()
{
return
{
return
{
formObj
:
{
formObj
:
{
...
@@ -92,7 +93,6 @@ export default {
...
@@ -92,7 +93,6 @@ export default {
name
:
'管理样品'
name
:
'管理样品'
},
},
{
type
:
'md-cloud'
,
id
:
''
,
name
:
'附件'
},
{
type
:
'md-cloud'
,
id
:
''
,
name
:
'附件'
},
{
type
:
'md-trash'
,
id
:
''
,
name
:
'删除'
},
{
{
type
:
'ios-clock'
,
type
:
'ios-clock'
,
id
:
''
,
id
:
''
,
...
@@ -139,7 +139,7 @@ export default {
...
@@ -139,7 +139,7 @@ export default {
}
}
},
},
mounted
()
{
mounted
()
{
this
.
_page
()
//
this._page()
// 样品接收是否选择人员
// 样品接收是否选择人员
// this.acceptSelectUserValue = localStorage.getItem('acceptSelectUserValue')
// this.acceptSelectUserValue = localStorage.getItem('acceptSelectUserValue')
},
},
...
@@ -365,7 +365,11 @@ export default {
...
@@ -365,7 +365,11 @@ export default {
})
})
},
},
_editModal
(
id
,
type
,
name
)
{
_editModal
(
id
,
type
,
name
)
{
this
.
$refs
.
sampleManageModal
.
_open
(
id
,
type
,
name
)
this
.
currentComponent
=
'SoilSampleManageHis'
this
.
$nextTick
(()
=>
{
this
.
$refs
.
refModal
.
_open
(
id
,
type
,
name
)
})
// this.$refs.sampleManageModal._open(id, type, name)
},
},
_editModals
(
res
,
data
)
{
_editModals
(
res
,
data
)
{
if
(
res
===
'登记协议'
)
{
if
(
res
===
'登记协议'
)
{
...
@@ -430,7 +434,11 @@ export default {
...
@@ -430,7 +434,11 @@ export default {
},
},
_operationRecord
(
id
)
{
_operationRecord
(
id
)
{
// 操作日志
// 操作日志
this
.
$refs
.
operation
.
_open
(
id
)
this
.
currentComponent
=
'Operation'
this
.
$nextTick
(()
=>
{
this
.
$refs
.
refModal
.
_open
(
id
)
})
// this.$refs.operation._open(id)
},
},
_resultChange
(
msg
)
{
_resultChange
(
msg
)
{
if
(
this
.
$store
.
state
.
FoodContract
.
success
)
{
if
(
this
.
$store
.
state
.
FoodContract
.
success
)
{
...
@@ -440,8 +448,12 @@ export default {
...
@@ -440,8 +448,12 @@ export default {
}
}
},
},
_upload
(
id
)
{
_upload
(
id
)
{
this
.
currentComponent
=
'FileManage'
this
.
$nextTick
(()
=>
{
this
.
$refs
.
refModal
.
_open
(
id
,
'entrustId'
)
})
// 上传文件
// 上传文件
this
.
$refs
.
FileManage
.
_open
(
id
,
'entrustId'
)
//
this.$refs.FileManage._open(id, 'entrustId')
}
}
}
}
}
}
...
...
pages/soil-test-manage/test-data-check/CheckIndex.vue
View file @
0d0f0ad4
...
@@ -2,14 +2,22 @@
...
@@ -2,14 +2,22 @@
<div>
<div>
<div
class=
"layout-content-padding"
>
<div
class=
"layout-content-padding"
>
<div
class=
"layout-content-main"
>
<div
class=
"layout-content-main"
>
<!--
<el-tabs
v-model=
"activeName"
@
tab-click=
"_changeTabs"
>
-->
<!--
<el-tab-pane
label=
"数据复核"
name=
"check"
>
-->
<!--
<SampleBackupsManage
ref=
"checkTabs"
></SampleBackupsManage>
-->
<!--
</el-tab-pane>
-->
<!--
<el-tab-pane
label=
"历史任务"
name=
"checkHis"
>
-->
<!--
<SampleBackupsQuery
ref=
"checkHisTabs"
></SampleBackupsQuery>
-->
<!--
</el-tab-pane>
-->
<!--
</el-tabs>
-->
<el-tabs
v-model=
"activeName"
@
tab-click=
"_changeTabs"
>
<el-tabs
v-model=
"activeName"
@
tab-click=
"_changeTabs"
>
<el-tab-pane
label=
"数据复核"
name=
"check"
>
<el-tab-pane
label=
"数据复核"
name=
"check"
></el-tab-pane>
<SampleBackupsManage
ref=
"checkTabs"
></SampleBackupsManage>
<el-tab-pane
label=
"历史任务"
name=
"checkHis"
></el-tab-pane>
</el-tab-pane>
<el-tab-pane
label=
"历史任务"
name=
"checkHis"
>
<SampleBackupsQuery
ref=
"checkHisTabs"
></SampleBackupsQuery>
</el-tab-pane>
</el-tabs>
</el-tabs>
<keep-alive>
<!-- eslint-disable-next-line vue/require-component-is -->
<component
ref=
"refModal"
:is=
"currentComponent"
></component>
</keep-alive>
</div>
</div>
</div>
</div>
</div>
</div>
...
@@ -20,28 +28,37 @@ import SampleBackupsManage from './DataCheck'
...
@@ -20,28 +28,37 @@ import SampleBackupsManage from './DataCheck'
import
SampleBackupsQuery
from
'./DataCheckHis'
import
SampleBackupsQuery
from
'./DataCheckHis'
export
default
{
export
default
{
components
:
{
// eslint-disable-next-line vue/no-unused-components
SampleBackupsManage
,
components
:
{
SampleBackupsManage
,
SampleBackupsQuery
},
SampleBackupsQuery
},
data
()
{
data
()
{
return
{
return
{
activeName
:
'check'
activeName
:
'check'
,
currentComponent
:
''
}
}
},
},
mounted
()
{
mounted
()
{
this
.
activeName
=
'check'
this
.
activeName
=
'check'
this
.
$refs
.
checkTabs
.
_page
()
this
.
_page
()
},
},
methods
:
{
methods
:
{
_changeTabs
(
tab
,
event
)
{
_changeTabs
(
tab
,
event
)
{
if
(
tab
.
name
===
'check'
)
{
if
(
tab
.
name
===
'check'
)
{
this
.
$refs
.
checkTabs
.
_page
()
this
.
_page
()
}
else
if
(
tab
.
name
===
'applyRecord'
)
{
}
else
if
(
tab
.
name
===
'applyRecord'
)
{
// this.$refs.applyRecordTabs._page()
// this.$refs.applyRecordTabs._page()
}
else
{
}
else
{
this
.
$refs
.
checkHisTabs
.
_page
()
this
.
currentComponent
=
'SampleBackupsQuery'
this
.
$nextTick
(()
=>
{
this
.
$refs
.
refModal
.
_page
()
})
}
}
},
_page
()
{
this
.
currentComponent
=
'SampleBackupsManage'
this
.
$nextTick
(()
=>
{
this
.
$refs
.
refModal
.
_page
()
})
// this.$refs.entrustTabs._page()
}
}
}
}
}
}
...
...
pages/soil-test-manage/test-data-check/DataCheck.vue
View file @
0d0f0ad4
...
@@ -61,10 +61,14 @@
...
@@ -61,10 +61,14 @@
</div>
</div>
<!--组件加载-->
<!--组件加载-->
<!--选择领样人-->
<!--选择领样人-->
<UserInfo
ref=
"userModal"
@
on-result-change=
"_userResult"
></UserInfo>
<keep-alive>
<Operation
ref=
"operation"
></Operation>
<!-- eslint-disable-next-line vue/require-component-is -->
<AuditDataModal
ref=
"sampleManageModal"
@
on-result-change=
"_page"
></AuditDataModal>
<component
ref=
"refModal"
:is=
"currentComponent"
@
on-result-change=
"_componentResult"
></component>
<FileManage
ref=
"FileManage"
></FileManage>
</keep-alive>
<!-- <UserInfo ref="userModal" @on-result-change="_userResult"></UserInfo>-->
<!-- <Operation ref="operation"></Operation>-->
<!-- <AuditDataModal ref="sampleManageModal" @on-result-change="_page"></AuditDataModal>-->
<!-- <FileManage ref="FileManage"></FileManage>-->
</div>
</div>
</template>
</template>
<
script
>
<
script
>
...
@@ -73,12 +77,8 @@ import { soilTest } from '../../../api'
...
@@ -73,12 +77,8 @@ import { soilTest } from '../../../api'
import
Operation
from
'../../../components/operation/Operation'
import
Operation
from
'../../../components/operation/Operation'
import
AuditDataModal
from
'./CheckDataModal'
import
AuditDataModal
from
'./CheckDataModal'
export
default
{
export
default
{
components
:
{
// eslint-disable-next-line vue/no-unused-components
UserInfo
,
components
:
{
UserInfo
,
Operation
,
AuditDataModal
},
Operation
,
// eslint-disable-next-line vue/no-unused-components
AuditDataModal
},
data
()
{
data
()
{
return
{
return
{
formObj
:
{
formObj
:
{
...
@@ -139,7 +139,7 @@ export default {
...
@@ -139,7 +139,7 @@ export default {
}
}
},
},
mounted
()
{
mounted
()
{
this
.
_page
()
//
this._page()
// 样品接收是否选择人员
// 样品接收是否选择人员
// this.acceptSelectUserValue = localStorage.getItem('acceptSelectUserValue')
// this.acceptSelectUserValue = localStorage.getItem('acceptSelectUserValue')
},
},
...
@@ -365,7 +365,11 @@ export default {
...
@@ -365,7 +365,11 @@ export default {
})
})
},
},
_editModal
(
id
,
type
,
name
)
{
_editModal
(
id
,
type
,
name
)
{
this
.
$refs
.
sampleManageModal
.
_open
(
id
,
type
,
'数据录入'
)
this
.
currentComponent
=
'AuditDataModal'
this
.
$nextTick
(()
=>
{
this
.
$refs
.
refModal
.
_open
(
id
,
type
,
'数据录入'
)
})
// this.$refs.sampleManageModal._open(id, type, '数据录入')
},
},
_editModals
(
res
,
data
)
{
_editModals
(
res
,
data
)
{
if
(
res
===
'登记协议'
)
{
if
(
res
===
'登记协议'
)
{
...
@@ -429,8 +433,12 @@ export default {
...
@@ -429,8 +433,12 @@ export default {
this
.
_page
()
this
.
_page
()
},
},
_operationRecord
(
id
)
{
_operationRecord
(
id
)
{
this
.
currentComponent
=
'Operation'
this
.
$nextTick
(()
=>
{
this
.
$refs
.
refModal
.
_open
(
id
)
})
// 操作日志
// 操作日志
this
.
$refs
.
operation
.
_open
(
id
)
//
this.$refs.operation._open(id)
},
},
_resultChange
(
msg
)
{
_resultChange
(
msg
)
{
if
(
this
.
$store
.
state
.
FoodContract
.
success
)
{
if
(
this
.
$store
.
state
.
FoodContract
.
success
)
{
...
@@ -440,8 +448,12 @@ export default {
...
@@ -440,8 +448,12 @@ export default {
}
}
},
},
_upload
(
id
)
{
_upload
(
id
)
{
this
.
currentComponent
=
'FileManage'
this
.
$nextTick
(()
=>
{
this
.
$refs
.
refModal
.
_open
(
id
,
'entrustId'
)
})
// 上传文件
// 上传文件
this
.
$refs
.
FileManage
.
_open
(
id
,
'entrustId'
)
//
this.$refs.FileManage._open(id, 'entrustId')
}
}
}
}
}
}
...
...
pages/soil-test-manage/test-data-check/DataCheckHis.vue
View file @
0d0f0ad4
...
@@ -61,10 +61,14 @@
...
@@ -61,10 +61,14 @@
</div>
</div>
<!--组件加载-->
<!--组件加载-->
<!--选择领样人-->
<!--选择领样人-->
<UserInfo
ref=
"userModal"
@
on-result-change=
"_userResult"
></UserInfo>
<keep-alive>
<Operation
ref=
"operation"
></Operation>
<!-- eslint-disable-next-line vue/require-component-is -->
<FileManage
ref=
"FileManage"
></FileManage>
<component
ref=
"refModal"
:is=
"currentComponent"
@
on-result-change=
"_componentResult"
></component>
<SoilSampleManageHis
ref=
"sampleManageModal"
></SoilSampleManageHis>
</keep-alive>
<!-- <UserInfo ref="userModal" @on-result-change="_userResult"></UserInfo>-->
<!-- <Operation ref="operation"></Operation>-->
<!-- <FileManage ref="FileManage"></FileManage>-->
<!-- <SoilSampleManageHis ref="sampleManageModal"></SoilSampleManageHis>-->
</div>
</div>
</template>
</template>
<
script
>
<
script
>
...
@@ -73,11 +77,8 @@ import { soilTest } from '../../../api'
...
@@ -73,11 +77,8 @@ import { soilTest } from '../../../api'
import
Operation
from
'../../../components/operation/Operation'
import
Operation
from
'../../../components/operation/Operation'
import
SoilSampleManageHis
from
'./SoilSampleManageHis'
import
SoilSampleManageHis
from
'./SoilSampleManageHis'
export
default
{
export
default
{
components
:
{
// eslint-disable-next-line vue/no-unused-components
UserInfo
,
components
:
{
UserInfo
,
Operation
,
SoilSampleManageHis
},
Operation
,
SoilSampleManageHis
},
data
()
{
data
()
{
return
{
return
{
formObj
:
{
formObj
:
{
...
@@ -138,7 +139,7 @@ export default {
...
@@ -138,7 +139,7 @@ export default {
}
}
},
},
mounted
()
{
mounted
()
{
this
.
_page
()
//
this._page()
// 样品接收是否选择人员
// 样品接收是否选择人员
// this.acceptSelectUserValue = localStorage.getItem('acceptSelectUserValue')
// this.acceptSelectUserValue = localStorage.getItem('acceptSelectUserValue')
},
},
...
@@ -364,7 +365,11 @@ export default {
...
@@ -364,7 +365,11 @@ export default {
})
})
},
},
_editModal
(
id
,
type
,
name
)
{
_editModal
(
id
,
type
,
name
)
{
this
.
$refs
.
sampleManageModal
.
_open
(
id
,
type
,
name
)
this
.
currentComponent
=
'SoilSampleManageHis'
this
.
$nextTick
(()
=>
{
this
.
$refs
.
refModal
.
_open
(
id
,
type
,
name
)
})
// this.$refs.sampleManageModal._open(id, type, name)
},
},
_editModals
(
res
,
data
)
{
_editModals
(
res
,
data
)
{
if
(
res
===
'登记协议'
)
{
if
(
res
===
'登记协议'
)
{
...
@@ -429,7 +434,11 @@ export default {
...
@@ -429,7 +434,11 @@ export default {
},
},
_operationRecord
(
id
)
{
_operationRecord
(
id
)
{
// 操作日志
// 操作日志
this
.
$refs
.
operation
.
_open
(
id
)
this
.
currentComponent
=
'Operation'
this
.
$nextTick
(()
=>
{
this
.
$refs
.
refModal
.
_open
(
id
)
})
// this.$refs.operation._open(id)
},
},
_resultChange
(
msg
)
{
_resultChange
(
msg
)
{
if
(
this
.
$store
.
state
.
FoodContract
.
success
)
{
if
(
this
.
$store
.
state
.
FoodContract
.
success
)
{
...
@@ -440,7 +449,11 @@ export default {
...
@@ -440,7 +449,11 @@ export default {
},
},
_upload
(
id
)
{
_upload
(
id
)
{
// 上传文件
// 上传文件
this
.
$refs
.
FileManage
.
_open
(
id
,
'entrustId'
)
this
.
currentComponent
=
'FileManage'
this
.
$nextTick
(()
=>
{
this
.
$refs
.
refModal
.
_open
(
id
,
'entrustId'
)
})
// this.$refs.FileManage._open(id, 'entrustId')
}
}
}
}
}
}
...
...
pages/soil-test-manage/test-data-consult/DataConsult.vue
View file @
0d0f0ad4
...
@@ -61,10 +61,14 @@
...
@@ -61,10 +61,14 @@
</div>
</div>
<!--组件加载-->
<!--组件加载-->
<!--选择领样人-->
<!--选择领样人-->
<UserInfo
ref=
"userModal"
@
on-result-change=
"_userResult"
></UserInfo>
<keep-alive>
<Operation
ref=
"operation"
></Operation>
<!-- eslint-disable-next-line vue/require-component-is -->
<FileManage
ref=
"FileManage"
></FileManage>
<component
ref=
"refModal"
:is=
"currentComponent"
@
on-result-change=
"_componentResult"
></component>
<SoilSampleManageHis
ref=
"sampleManageModal"
></SoilSampleManageHis>
</keep-alive>
<!-- <UserInfo ref="userModal" @on-result-change="_userResult"></UserInfo>-->
<!-- <Operation ref="operation"></Operation>-->
<!-- <FileManage ref="FileManage"></FileManage>-->
<!-- <SoilSampleManageHis ref="sampleManageModal"></SoilSampleManageHis>-->
</div>
</div>
</template>
</template>
<
script
>
<
script
>
...
@@ -73,11 +77,8 @@ import { soilTest } from '../../../api'
...
@@ -73,11 +77,8 @@ import { soilTest } from '../../../api'
import
Operation
from
'../../../components/operation/Operation'
import
Operation
from
'../../../components/operation/Operation'
import
SoilSampleManageHis
from
'./SoilSampleManageHis'
import
SoilSampleManageHis
from
'./SoilSampleManageHis'
export
default
{
export
default
{
components
:
{
// eslint-disable-next-line vue/no-unused-components
UserInfo
,
components
:
{
UserInfo
,
Operation
,
SoilSampleManageHis
},
Operation
,
SoilSampleManageHis
},
data
()
{
data
()
{
return
{
return
{
formObj
:
{
formObj
:
{
...
@@ -89,7 +90,7 @@ export default {
...
@@ -89,7 +90,7 @@ export default {
{
{
type
:
'ios-beaker'
,
type
:
'ios-beaker'
,
id
:
''
,
id
:
''
,
name
:
'
审核数据
'
name
:
'
管理样品
'
},
},
{
type
:
'md-cloud'
,
id
:
''
,
name
:
'附件'
},
{
type
:
'md-cloud'
,
id
:
''
,
name
:
'附件'
},
{
{
...
@@ -345,7 +346,7 @@ export default {
...
@@ -345,7 +346,7 @@ export default {
console
.
log
(
res
)
console
.
log
(
res
)
this
.
$nextTick
(()
=>
{
this
.
$nextTick
(()
=>
{
switch
(
res
)
{
switch
(
res
)
{
case
'
审核数据
'
:
case
'
管理样品
'
:
this
.
_editModal
(
data
.
id
,
data
.
type
,
data
.
cname
)
this
.
_editModal
(
data
.
id
,
data
.
type
,
data
.
cname
)
break
break
case
'项目管理'
:
case
'项目管理'
:
...
@@ -364,7 +365,11 @@ export default {
...
@@ -364,7 +365,11 @@ export default {
})
})
},
},
_editModal
(
id
,
type
,
name
)
{
_editModal
(
id
,
type
,
name
)
{
this
.
$refs
.
sampleManageModal
.
_open
(
id
,
type
,
'数据录入'
)
this
.
currentComponent
=
'SoilSampleManageHis'
this
.
$nextTick
(()
=>
{
this
.
$refs
.
refModal
.
_open
(
id
,
type
,
'数据录入'
)
})
// this.$refs.sampleManageModal._open(id, type, '数据录入')
},
},
_editModals
(
res
,
data
)
{
_editModals
(
res
,
data
)
{
if
(
res
===
'登记协议'
)
{
if
(
res
===
'登记协议'
)
{
...
@@ -429,7 +434,11 @@ export default {
...
@@ -429,7 +434,11 @@ export default {
},
},
_operationRecord
(
id
)
{
_operationRecord
(
id
)
{
// 操作日志
// 操作日志
this
.
$refs
.
operation
.
_open
(
id
)
this
.
currentComponent
=
'Operation'
this
.
$nextTick
(()
=>
{
this
.
$refs
.
refModal
.
_open
(
id
)
})
// this.$refs.operation._open(id)
},
},
_resultChange
(
msg
)
{
_resultChange
(
msg
)
{
if
(
this
.
$store
.
state
.
FoodContract
.
success
)
{
if
(
this
.
$store
.
state
.
FoodContract
.
success
)
{
...
@@ -440,7 +449,11 @@ export default {
...
@@ -440,7 +449,11 @@ export default {
},
},
_upload
(
id
)
{
_upload
(
id
)
{
// 上传文件
// 上传文件
this
.
$refs
.
FileManage
.
_open
(
id
,
'entrustId'
)
this
.
currentComponent
=
'FileManage'
this
.
$nextTick
(()
=>
{
this
.
$refs
.
refModal
.
_open
(
id
,
'entrustId'
)
})
// this.$refs.FileManage._open(id, 'entrustId')
}
}
}
}
}
}
...
...
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