Commit 96a6b329 by lichengming

修改了检测依据管理查看附件

parent 9075c453
...@@ -85,10 +85,10 @@ ...@@ -85,10 +85,10 @@
<DownloadTemplateImport ref="importModal" @on-result-change="_page"></DownloadTemplateImport> <DownloadTemplateImport ref="importModal" @on-result-change="_page"></DownloadTemplateImport>
<SubstitutionalRelation ref="relationModal" @on-result-change="_page"></SubstitutionalRelation> <SubstitutionalRelation ref="relationModal" @on-result-change="_page"></SubstitutionalRelation>
<UploadModal ref="uploadModal" @on-result-change="_page"></UploadModal> <UploadModal ref="uploadModal" @on-result-change="_page"></UploadModal>
<StanardFileManage ref="FileManage"></StanardFileManage>
<!-- <component ref="refModal" :is="currentComponent" @on-result-change="_page"></component>--> <!-- <component ref="refModal" :is="currentComponent" @on-result-change="_page"></component>-->
</div> </div>
</template> </template>
<script> <script>
import http from '../../../api/http' import http from '../../../api/http'
import { soilAptitude } from '../../../api' import { soilAptitude } from '../../../api'
...@@ -97,13 +97,14 @@ import DownloadTemplateImport from '../../../components/import/DownloadTemplateI ...@@ -97,13 +97,14 @@ import DownloadTemplateImport from '../../../components/import/DownloadTemplateI
import StandardsManageEdit from './StandardsManageEdit' // 添加、编辑 import StandardsManageEdit from './StandardsManageEdit' // 添加、编辑
import SubstitutionalRelation from './SubstitutionalRelation' // 查看替代关系 import SubstitutionalRelation from './SubstitutionalRelation' // 查看替代关系
import UploadModal from './UploadFileModal' // 上传文件 import UploadModal from './UploadFileModal' // 上传文件
import StanardFileManage from './StanardFileManage'
export default { export default {
components: { components: {
StandardsManageEdit, StandardsManageEdit,
DownloadTemplateImport, DownloadTemplateImport,
SubstitutionalRelation, SubstitutionalRelation,
UploadModal UploadModal,
StanardFileManage
}, },
data() { data() {
return { return {
...@@ -126,7 +127,8 @@ export default { ...@@ -126,7 +127,8 @@ export default {
// 表格 // 表格
pageColumns: [ pageColumns: [
{ title: '检测依据', key: 'code' }, { title: '检测依据', key: 'code' },
{ title: '检测依据名称', key: 'name' } { title: '检测依据名称', key: 'name' },
{ title: '附件是否已上传', key: 'uploaded' }
// { title: '标准状态', key: 'status', width: 120 }, // { title: '标准状态', key: 'status', width: 120 },
// { title: '标准分类', key: 'classify' }, // { title: '标准分类', key: 'classify' },
// { title: '标准类型', key: 'type' }, // { title: '标准类型', key: 'type' },
...@@ -153,8 +155,11 @@ export default { ...@@ -153,8 +155,11 @@ export default {
id: '', id: '',
name: '上传' name: '上传'
}, },
{ type: 'ios-download', id: '', name: '下载' }, {
{ type: 'ios-book', id: '', name: '预览' }, type: 'ios-cloud',
id: '',
name: '查看附件'
},
{ type: 'md-remove-circle', id: '', name: '删除' } { type: 'md-remove-circle', id: '', name: '删除' }
], ],
searchOpen: false, searchOpen: false,
...@@ -232,11 +237,8 @@ export default { ...@@ -232,11 +237,8 @@ export default {
case '上传': case '上传':
this._upload(data.id) this._upload(data.id)
break break
case '下载': case '查看附件':
this._download(data) this._fileManage(data.id)
break
case '预览':
this._viewReport(data)
break break
case '查看替代关系': case '查看替代关系':
this.$refs.relationModal._open(data.id) this.$refs.relationModal._open(data.id)
...@@ -247,6 +249,9 @@ export default { ...@@ -247,6 +249,9 @@ export default {
} }
}) })
}, },
_fileManage(id) {
this.$refs.FileManage._openByEntrustId(id)
},
_upload(id) { _upload(id) {
const obj = { const obj = {
importUrl: '/soil/v1/standard_annex/upload/' + id importUrl: '/soil/v1/standard_annex/upload/' + id
...@@ -384,7 +389,7 @@ export default { ...@@ -384,7 +389,7 @@ export default {
title: '提示', title: '提示',
content: '确定要下载文件?', content: '确定要下载文件?',
onOk: () => { onOk: () => {
if (!data.fileUrl) { if (data.uploaded !== '是') {
this.$Message.error('附件未上传,请上传附件!') this.$Message.error('附件未上传,请上传附件!')
return return
} }
......
...@@ -126,7 +126,7 @@ import { meterEntrust, meterSample, soilEntrust } from '../../../api' ...@@ -126,7 +126,7 @@ import { meterEntrust, meterSample, soilEntrust } from '../../../api'
import importModal from '../../../components/import/DownloadTemplateImport' import importModal from '../../../components/import/DownloadTemplateImport'
import AutoComplete from '../../../components/base/AutoCompletes' import AutoComplete from '../../../components/base/AutoCompletes'
import SampleItemSelect from '../../meter-aptitude/standard-manage/SampleItemSelect' import SampleItemSelect from '../../meter-aptitude/standard-manage/SampleItemSelect'
import assignPerson from '../../../components/user-info-single/assignPerson' import assignPerson from '../../../components/user-info-single/AssignPerson'
import Global from '../../../api/config' import Global from '../../../api/config'
export default { export default {
components: { components: {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment