FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
super_liu
2021-07-27 14:39:29 +08:00
parent 4f37dc341f 0a64aa2f6b
commit 7d284ac758
13 changed files with 610 additions and 635 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/config/pages/linkManage/index.vue
+7 -1
View File
@@ -48,8 +48,10 @@
width="220px">
</el-table-column>
<el-table-column
prop="url"
label="链接">
<template slot-scope="scope" >
<span @click="linkto(scope.row.url)" style="color: #0c91e5;cursor: pointer;text-decoration: underline">{{ scope.row.url }}</span>
</template>
</el-table-column>
<el-table-column
label="操作"
@@ -149,6 +151,10 @@
}
},
methods: {
//链接点击跳转,链接形式为http://xxxxxx
linkto(link_href){
window.open(link_href)
},
//头部新增按钮
addLink () {
this.type = 1
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+13 -3
View File
@@ -733,6 +733,13 @@
placeholder="请输入采标编号"
clearable
></el-input>
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="position:absolute;top: 10px;right: 0;"
@click="selectLaws('cbbh'),config.attrName = '采标编号'"
>{{'手动查找'}}</el-button>
</el-form-item>
<!-- <el-form-item label="被引用标准" prop="byybj" class="add-form-item form-item-disabled">-->
<!-- <el-input-->
@@ -1841,12 +1848,15 @@
this.replaceLawsNumModel = false
})
// this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
// 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
if(this.replaceLawType === 'dtbjh'){
this.form.dtbjh = textArr.join(',')
this.form.dtbjh = this.form.dtbjh ? this.form.dtbjh + ',' + textArr.join(',') : textArr.join(',')
}else if(this.replaceLawType === 'yybj'){
this.form.yybj = textArr.join(',')
this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',')
}else if(this.replaceLawType === 'cbbh'){
this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',')
}else {
this.form.byybj = textArr.join(',')
this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',')
}
// this.$emit('input', textArr.join(','))
this.$refs.selections.clearSelection()
src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+129 -86
View File
@@ -201,84 +201,84 @@
<template slot="title">文本信息</template>
</ProcessTitle>
<div class="prc-content-border">
<el-row :gutter="24">
<el-col :span="12">
<el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgdName" class="add-form-item form-item-disabled">
<div v-if="form.xgdName">
{{ form.xgdName }}
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">
<div v-if="form.fbgbjbdName">
{{ form.fbgbjbdName }}
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbdName" class="add-form-item form-item-disabled">
<div v-if="form.zbjbdName">
{{ form.zbjbdName }}
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled">
<div v-if="form.bpgName">
{{ form.bpgName }}
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssgName" class="add-form-item form-item-disabled">
<div v-if="form.ssgName">
{{ form.ssgName }}
</div>
<div v-else>
- -
</div>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item v-if="form.standInData === '1'" label="勘误件" prop="kwjName" class="add-form-item form-item-disabled">
<div v-if="form.kwjName">
{{ form.kwjName }}
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjgName" class="add-form-item form-item-disabled">
<div v-if="form.zqyjgName">
{{ form.zqyjgName }}
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item label="草案" prop="caName" class="add-form-item form-item-disabled">
<div v-if="form.caName">
{{ form.caName }}
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="解读文件" prop="jdwjName" class="add-form-item form-item-disabled">
<div v-if="form.jdwjName">
{{ form.jdwjName }}
</div>
<div v-else>
- -
</div>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="12">
<el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgdName" class="add-form-item form-item-disabled">
<div style="cursor: pointer;color: #00b7ee" v-if="form.xgdName" @click="downloadFile('xgd')">
{{ form.xgdName }}
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">
<div style="cursor: pointer;color: #00b7ee" v-if="form.fbgbjbdName" @click="downloadFile('fbgbjbd')">
{{ form.fbgbjbdName }}
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbdName" class="add-form-item form-item-disabled">
<div v-if="form.zbjbdName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zbjbd')">
{{ form.zbjbdName }}
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled">
<div v-if="form.bpgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('bpg')">
{{ form.bpgName }}
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssgName" class="add-form-item form-item-disabled">
<div v-if="form.ssgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ssg')">
{{ form.ssgName }}
</div>
<div v-else>
- -
</div>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item v-if="form.standInData === '1'" label="勘误件" prop="kwjName" class="add-form-item form-item-disabled">
<div v-if="form.kwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('kwj')">
{{ form.kwjName }}
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjgName" class="add-form-item form-item-disabled">
<div v-if="form.zqyjgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zqyjg')">
{{ form.zqyjgName }}
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item label="草案" prop="caName" class="add-form-item form-item-disabled">
<div v-if="form.caName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ca')">
{{ form.caName }}
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="解读文件" prop="jdwjName" class="add-form-item form-item-disabled">
<div v-if="form.jdwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('jdwj')">
{{ form.jdwjName }}
</div>
<div v-else>
- -
</div>
</el-form-item>
</el-col>
</el-row>
</div>
<ProcessTitle>
<template slot="title">适用范围</template>
@@ -467,14 +467,14 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="关联文件" prop="glwjName" class="add-form-item form-item-disabled">
<div v-if="form.glwjName">
{{ form.glwjName }}
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item label="关联文件" prop="glwjName" class="add-form-item form-item-disabled">
<div v-if="form.glwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('glwj')">
{{ form.glwjName }}
</div>
<div v-else>
- -
</div>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
@@ -685,6 +685,16 @@
name: "bzrkStep2",
data () {
return {
xgdFileId: '',
fbgbjbdFileId: '',
bpgFileId: '',
ssgFileId: '',
zqyjgFileId: '',
jdwjFileId: '',
kwjFileId: '',
glwjFileId: '',
caFileId: '',
zbjbdFileId:'',
rules: {
commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
approvalOpinion: [{ required: true, message: '请选择审批意见', trigger: 'change' }]
@@ -844,6 +854,29 @@
},
},
methods: {
downloadFile (fileType) {
if(fileType === 'fbgbjbd'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId
}else if(fileType === 'xgd'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId
}else if(fileType === 'bpg'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.bpgFileId
}else if(fileType === 'ssg'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.ssgFileId
}else if(fileType === 'zqyjg'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zqyjgFileId
}else if(fileType === 'jdwj'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.jdwjFileId
}else if(fileType === 'kwj'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.kwjFileId
}else if(fileType === 'glwj'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.glwjFileId
}else if(fileType === 'ca'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.caFileId
}else if(fileType === 'zbjbd'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zbjbdFileId
}
},
getRule(){
if (this.formTongGuo.approvalOpinion !== '1') {
this.$refs.formTongGuo.clearValidate('commentText')
@@ -910,6 +943,16 @@
}).then(res => {
if (res) {
const processForm = JSON.parse(res.mesg)
this.xgdFileId = processForm.xgd
this.fbgbjbdFileId = processForm.fbgbjbd
this.bpgFileId = processForm.bpg
this.ssgFileId = processForm.ssg
this.zqyjgFileId = processForm.zqyjg
this.jdwjFileId = processForm.jdwj
this.kwjFileId = processForm.kwj
this.glwjFileId = processForm.glwj
this.caFileId = processForm.ca
this.zbjbdFileId = processForm.zbjbd
this.getFormFieldList(processForm)
}
}).catch(e => {
src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+53 -10
View File
@@ -197,7 +197,7 @@
<el-row :gutter="24">
<el-col :span="12">
<el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgdName" class="add-form-item form-item-disabled">
<div v-if="form.xgdName">
<div style="cursor: pointer;color: #00b7ee" v-if="form.xgdName" @click="downloadFile('xgd')">
{{ form.xgdName }}
</div>
<div v-else>
@@ -205,7 +205,7 @@
</div>
</el-form-item>
<el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">
<div v-if="form.fbgbjbdName">
<div style="cursor: pointer;color: #00b7ee" v-if="form.fbgbjbdName" @click="downloadFile('fbgbjbd')">
{{ form.fbgbjbdName }}
</div>
<div v-else>
@@ -213,7 +213,7 @@
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbdName" class="add-form-item form-item-disabled">
<div v-if="form.zbjbdName">
<div v-if="form.zbjbdName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zbjbd')">
{{ form.zbjbdName }}
</div>
<div v-else>
@@ -221,7 +221,7 @@
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled">
<div v-if="form.bpgName">
<div v-if="form.bpgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('bpg')">
{{ form.bpgName }}
</div>
<div v-else>
@@ -229,7 +229,7 @@
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssgName" class="add-form-item form-item-disabled">
<div v-if="form.ssgName">
<div v-if="form.ssgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ssg')">
{{ form.ssgName }}
</div>
<div v-else>
@@ -239,7 +239,7 @@
</el-col>
<el-col :span="12">
<el-form-item v-if="form.standInData === '1'" label="勘误件" prop="kwjName" class="add-form-item form-item-disabled">
<div v-if="form.kwjName">
<div v-if="form.kwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('kwj')">
{{ form.kwjName }}
</div>
<div v-else>
@@ -247,7 +247,7 @@
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjgName" class="add-form-item form-item-disabled">
<div v-if="form.zqyjgName">
<div v-if="form.zqyjgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zqyjg')">
{{ form.zqyjgName }}
</div>
<div v-else>
@@ -255,7 +255,7 @@
</div>
</el-form-item>
<el-form-item label="草案" prop="caName" class="add-form-item form-item-disabled">
<div v-if="form.caName">
<div v-if="form.caName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ca')">
{{ form.caName }}
</div>
<div v-else>
@@ -263,7 +263,7 @@
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="解读文件" prop="jdwjName" class="add-form-item form-item-disabled">
<div v-if="form.jdwjName">
<div v-if="form.jdwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('jdwj')">
{{ form.jdwjName }}
</div>
<div v-else>
@@ -461,7 +461,7 @@
<!-- ></el-input>-->
<!-- </el-form-item>-->
<el-form-item label="关联文件" prop="glwjName" class="add-form-item form-item-disabled">
<div v-if="form.glwjName">
<div v-if="form.glwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('glwj')">
{{ form.glwjName }}
</div>
<div v-else>
@@ -666,6 +666,16 @@ export default {
name: "bzrkStep3",
data () {
return {
xgdFileId: '',
fbgbjbdFileId: '',
bpgFileId: '',
ssgFileId: '',
zqyjgFileId: '',
jdwjFileId: '',
kwjFileId: '',
glwjFileId: '',
caFileId: '',
zbjbdFileId:'',
activeName:'1',
// 当前流程类型(1待办/2已办)
processType: 1,
@@ -818,6 +828,29 @@ export default {
},
},
methods: {
downloadFile (fileType) {
if(fileType === 'fbgbjbd'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId
}else if(fileType === 'xgd'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId
}else if(fileType === 'bpg'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.bpgFileId
}else if(fileType === 'ssg'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.ssgFileId
}else if(fileType === 'zqyjg'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zqyjgFileId
}else if(fileType === 'jdwj'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.jdwjFileId
}else if(fileType === 'kwj'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.kwjFileId
}else if(fileType === 'glwj'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.glwjFileId
}else if(fileType === 'ca'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.caFileId
}else if(fileType === 'zbjbd'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zbjbdFileId
}
},
popoverHide (checkedIds, checkedData) {
if(checkedData) {
this.form.standSystem = checkedData.id
@@ -879,6 +912,16 @@ export default {
}).then(res => {
if (res) {
const processForm = JSON.parse(res.mesg)
this.xgdFileId = processForm.xgd
this.fbgbjbdFileId = processForm.fbgbjbd
this.bpgFileId = processForm.bpg
this.ssgFileId = processForm.ssg
this.zqyjgFileId = processForm.zqyjg
this.jdwjFileId = processForm.jdwj
this.kwjFileId = processForm.kwj
this.glwjFileId = processForm.glwj
this.caFileId = processForm.ca
this.zbjbdFileId = processForm.zbjbd
this.getFormFieldList(processForm)
}
}).catch(e => {
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+15 -5
View File
@@ -718,6 +718,13 @@
placeholder="请输入采标编号"
clearable
></el-input>
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="position:absolute;top: 10px;right: 0;"
@click="selectLaws('cbbh'),config.attrName = '采标编号'"
>{{'手动查找'}}</el-button>
</el-form-item>
<el-form-item label="被引用标准" prop="byybj" class="add-form-item form-item-disabled">
<el-input
@@ -730,7 +737,7 @@
class="common-button-primary"
size="mini"
style="position:absolute;top: 10px;right: 0;"
@click="selectLaws('dtbjh'),config.attrName = '代替标准号'"
@click="selectLaws('byybj'),config.attrName = '代替标准号'"
>{{'手动查找'}}</el-button>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="参会记录" prop="chjl" class="add-form-item form-item-disabled">
@@ -1398,12 +1405,15 @@ export default {
this.replaceLawsNumModel = false
})
// this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
// 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
if(this.replaceLawType === 'dtbjh'){
this.form.dtbjh = textArr.join(',')
this.form.dtbjh = this.form.dtbjh ? this.form.dtbjh + ',' + textArr.join(',') : textArr.join(',')
}else if(this.replaceLawType === 'yybj'){
this.form.yybj = textArr.join(',')
}else {
this.form.byybj = textArr.join(',')
this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',')
}else if(this.replaceLawType === 'cbbh'){
this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',')
} else {
this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',')
}
// this.$emit('input', textArr.join(','))
this.$refs.selections.clearSelection()
src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
+130 -86
View File
@@ -198,84 +198,84 @@
<template slot="title">文本信息</template>
</ProcessTitle>
<div class="prc-content-border">
<el-row :gutter="24">
<el-col :span="12">
<el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgd" class="add-form-item form-item-disabled">
<div v-if="form.xgd">
{{ form.xgd }}
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item label="发布稿" prop="fbgbjbd" class="add-form-item form-item-disabled">
<div v-if="form.fbgbjbd">
{{ form.fbgbjbd }}
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbd" class="add-form-item form-item-disabled">
<div v-if="form.zbjbd">
{{ form.zbjbd }}
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpg" class="add-form-item form-item-disabled">
<div v-if="form.bpg">
{{ form.bpg }}
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssg" class="add-form-item form-item-disabled">
<div v-if="form.ssg">
{{ form.ssg }}
</div>
<div v-else>
- -
</div>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item v-if="form.standInData === '1'" label="勘误件" prop="kwj" class="add-form-item form-item-disabled">
<div v-if="form.kwj">
{{ form.kwj }}
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjg" class="add-form-item form-item-disabled">
<div v-if="form.zqyjg">
{{ form.zqyjg }}
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item label="草案" prop="ca" class="add-form-item form-item-disabled">
<div v-if="form.ca">
{{ form.ca }}
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="解读文件" prop="jdwj" class="add-form-item form-item-disabled">
<div v-if="form.jdwj">
{{ form.jdwj }}
</div>
<div v-else>
- -
</div>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="12">
<el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgdName" class="add-form-item form-item-disabled">
<div style="cursor: pointer;color: #00b7ee" v-if="form.xgdName" @click="downloadFile('xgd')">
{{ form.xgdName }}
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">
<div style="cursor: pointer;color: #00b7ee" v-if="form.fbgbjbdName" @click="downloadFile('fbgbjbd')">
{{ form.fbgbjbdName }}
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbdName" class="add-form-item form-item-disabled">
<div v-if="form.zbjbdName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zbjbd')">
{{ form.zbjbdName }}
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled">
<div v-if="form.bpgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('bpg')">
{{ form.bpgName }}
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssgName" class="add-form-item form-item-disabled">
<div v-if="form.ssgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ssg')">
{{ form.ssgName }}
</div>
<div v-else>
- -
</div>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item v-if="form.standInData === '1'" label="勘误件" prop="kwjName" class="add-form-item form-item-disabled">
<div v-if="form.kwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('kwj')">
{{ form.kwjName }}
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjgName" class="add-form-item form-item-disabled">
<div v-if="form.zqyjgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zqyjg')">
{{ form.zqyjgName }}
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item label="草案" prop="caName" class="add-form-item form-item-disabled">
<div v-if="form.caName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ca')">
{{ form.caName }}
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="解读文件" prop="jdwjName" class="add-form-item form-item-disabled">
<div v-if="form.jdwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('jdwj')">
{{ form.jdwjName }}
</div>
<div v-else>
- -
</div>
</el-form-item>
</el-col>
</el-row>
</div>
<ProcessTitle>
<template slot="title">适用范围</template>
@@ -465,14 +465,15 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="关联文件" prop="glwj" class="add-form-item form-item-disabled">
<div v-if="form.glwj">
{{ form.glwj }}
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item label="关联文件" prop="glwjName" class="add-form-item form-item-disabled">
<div v-if="form.glwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('glwj')">
{{ form.glwjName }}
</div>
<div v-else>
- -
</div>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
@@ -670,6 +671,16 @@
name: "bzrkStep5",
data () {
return {
xgdFileId: '',
fbgbjbdFileId: '',
bpgFileId: '',
ssgFileId: '',
zqyjgFileId: '',
jdwjFileId: '',
kwjFileId: '',
glwjFileId: '',
caFileId: '',
zbjbdFileId:'',
// 当前流程类型(1待办/2已办)
processType: 1,
detailData: [],
@@ -790,6 +801,29 @@
},
},
methods: {
downloadFile (fileType) {
if(fileType === 'fbgbjbd'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId
}else if(fileType === 'xgd'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId
}else if(fileType === 'bpg'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.bpgFileId
}else if(fileType === 'ssg'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.ssgFileId
}else if(fileType === 'zqyjg'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zqyjgFileId
}else if(fileType === 'jdwj'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.jdwjFileId
}else if(fileType === 'kwj'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.kwjFileId
}else if(fileType === 'glwj'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.glwjFileId
}else if(fileType === 'ca'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.caFileId
}else if(fileType === 'zbjbd'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zbjbdFileId
}
},
popoverHide (checkedIds, checkedData) {
console.log(checkedIds);
console.log(checkedData);
@@ -816,6 +850,16 @@
}).then(res => {
if (res) {
const processForm = JSON.parse(res.mesg)
this.xgdFileId = processForm.xgd
this.fbgbjbdFileId = processForm.fbgbjbd
this.bpgFileId = processForm.bpg
this.ssgFileId = processForm.ssg
this.zqyjgFileId = processForm.zqyjg
this.jdwjFileId = processForm.jdwj
this.kwjFileId = processForm.kwj
this.glwjFileId = processForm.glwj
this.caFileId = processForm.ca
this.zbjbdFileId = processForm.zbjbd
this.getFormFieldList(processForm)
}
}).catch(e => {
src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
-6
View File
@@ -304,8 +304,6 @@ export default {
},
//提交事件
handleSubmit() {
this.listForm.dataList.forEach(item => {
if (item.workPeople !== undefined) {
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", {
@@ -321,10 +319,6 @@ export default {
}
}, e => {
});
} else {
this.$message.warning("请选择分发负责人");
}
});
},
//批量分发按钮
batchOperation(id) {
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+80 -155
View File
@@ -80,55 +80,13 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="标准名称" v-if="sarAccessInfoSearch.dataSource !== 'TEMP'" class="search-item">
<el-form-item label="标准名称" class="search-item">
<el-input
v-model="sarAccessInfoSearch.standName"
placeholder="请输入"
:maxlength="100"
></el-input>
</el-form-item>
<el-form-item label="适用车辆类型" class="search-item" v-show="moreSearchShow">
<el-select v-model="sarAccessInfoSearch.applyArctic" filterable clearable>
<el-option
v-for="item in energyKindOptions"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
<el-form-item class="search-item" prop="askType" label="要求类型" v-show="moreSearchShow">
<el-select v-model="sarAccessInfoSearch.askType">
<el-option
v-for="item in accessSarTypeOptions"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="国家/地区" class="search-item" v-show="isListType">
<el-select
v-model="sarAccessInfoSearch.countryArea"
placeholder="请选择"
filterable
>
<el-option
v-for="item in drawerCountryOptions"
:value="item.value"
:key="item.value"
:label="item.label"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="清单名称" prop="detailedListName" class="search-item" v-show="isListType">
<el-input
v-model="sarAccessInfoSearch.detailedListName"
placeholder="请输入"
:maxlength="100"
></el-input>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
type="primary"
@@ -158,46 +116,23 @@
</div>
</div>
<div class="showSelectBox" v-if="!showSelectBox">
<el-form :model="sarAccessInfoSearch" class="label-input-form" v-if="!disabledFlag" inline>
<el-form-item label="文本状态" v-show="!isListType">
<el-select
v-model="sarAccessInfoSearch.textStatus"
placeholder="请选择"
filterable
size="small"
>
<el-option
v-for="item in textStatusOptions"
:value="item.value"
:key="item.value"
:label="item.label"
/>
</el-select>
</el-form-item>
<el-form-item label="发布日期" v-show="!isListType">
<el-date-picker
v-model="sarAccessInfoSearch.issueTime"
type="date"
value-format="yyyy-MM-DD"
size="small"
placeholder="选择发布日期">
</el-date-picker>
</el-form-item>
<el-form-item label="更新人" v-show="isListType">
<el-form :model="sarAccessInfo" class="label-input-form" v-if="!disabledFlag" inline>
<el-form-item label="标准号" class="labelBox">
<el-input
v-model="sarAccessInfoSearch.standName"
v-model="sarAccessInfo.standNumber"
placeholder="请输入"
:maxlength="100"
size="small"/>
</el-form-item>
<el-form-item label="更新时间" v-show="isListType">
<el-date-picker
v-model="sarAccessInfoSearch.modifyTime"
type="date"
size="small"
value-format="yyyy-MM-DD"
placeholder="选择更新日期">
</el-date-picker>
clearable/>
</el-form-item>
<el-form-item label="标准名称" class="labelBox">
<el-input
v-model="sarAccessInfo.standName"
placeholder="请输入"
size="small"
clearable/>
</el-form-item>
<el-form-item>
<el-button size="small" type="primary" @click="selectBtn">查询</el-button>
</el-form-item>
</el-form>
</div>
@@ -243,13 +178,12 @@
width="180px"
label="标准号">
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a>
<span @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</span>
</template>
</el-table-column>
<el-table-column
prop="standName"
label="标准名称"
width="260px"
>
</el-table-column>
<el-table-column
@@ -287,52 +221,6 @@
</template>
</el-table-column>
</el-table>
<el-table
v-show="isListType"
:data="sarAccessInfoSearchList"
style="width: 100%"
border
height="300px"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@selection-change="accessSarTypeSelect"
ref="accessTypeSelect"
>
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="country"
label="国家/地区"
align="center">
<template slot-scope="scope">
<span v-if="scope.row.country !== null && scope.row.country.indexOf(',') > 0">
<span>{{ scope.row.country }}</span>
</span>
<span v-else>{{ countryAreaMap[scope.row.country] }}</span>
</template>
</el-table-column>
<el-table-column
prop="detailedListName"
label="清单名称"
align="center">
</el-table-column>
<el-table-column
prop="modifyTime"
label="更新时间"
align="center">
<template slot-scope="scope">
<div>{{ scope.row.modifyTime ? scope.row.modifyTime.split(' ')[0] : '' }}</div>
</template>
</el-table-column>
<el-table-column
prop="uname"
label="更新人"
align="center">
</el-table-column>
</el-table>
<pagination :page="drawerPage" :total="drawerTotal" @pageChange="drawerPageChange"
@pageSizeChange="drawerPageSizeChange"></pagination>
<loading :loading="dataLoading">{{$t('m.dataAcquisition')}}</loading>
@@ -354,6 +242,7 @@
v-btn-permission="''"
><i class="iconfont">&#xe61b;</i>删除</el-button>
</div>
<!-- 清单条目的列表页 -->
<el-table
ref="entryTable"
:data="sarAccessInfoList"
@@ -541,21 +430,19 @@
>
<el-form :modal="editRowData" label-position="left" ref="editRowData" label-width="150px" style="margin: 20px">
<el-form-item label="标准号">
<el-input v-model.trim="editRowData.standNumber" :disabled="true">
<!-- <a>{{ editRowData.standSortShow }} {{ editRowData.standNumber }}</a>-->
</el-input>
<el-input v-model.trim="editRowData.standNumber" :disabled="true"/>
</el-form-item>
<el-form-item label="标准名称" prop="standName">
<el-input v-model.trim="editRowData.standName" :disabled="true"></el-input>
<el-input v-model.trim="editRowData.standName" :disabled="true"/>
</el-form-item>
<el-form-item label="英文名称" prop="standEnName">
<el-input v-model.trim="editRowData.standEnName" :disabled="true"></el-input>
<el-input v-model.trim="editRowData.standEnName" :disabled="true"/>
</el-form-item>
<el-form-item label="适用车型" prop="typeApplicable">
<el-input v-model.trim="editRowData.typeApplicable" :disabled="true"></el-input>
<el-input v-model.trim="editRowData.typeApplicable" :disabled="true"/>
</el-form-item>
<el-form-item label="能源类型" prop="nylx">
<el-input v-model.trim="editRowData.nylx" :disabled="true"></el-input>
<el-input v-model.trim="editRowData.nylx" :disabled="true"/>
</el-form-item>
<el-form-item label="标准实施日期" prop="putTime">
<el-date-picker
@@ -582,22 +469,22 @@
</el-date-picker>
</el-form-item>
<el-form-item label="责任部门" prop="zrbm">
<el-input v-model.trim="editRowData.zrbm" :disabled="true"></el-input>
<el-input v-model.trim="editRowData.zrbm" :disabled="true"/>
</el-form-item>
<el-form-item label="适用产品线" prop="sycpx">
<el-input v-model.trim="editRowData.sycpx" :disabled="true"></el-input>
<el-input v-model.trim="editRowData.sycpx" :disabled="true"/>
</el-form-item>
<el-form-item label="乘用车VPPS编码" prop="cycvppsbm">
<el-input v-model.trim="editRowData.cycvppsbm" :disabled="true"></el-input>
<el-input v-model.trim="editRowData.cycvppsbm" :disabled="true"/>
</el-form-item>
<el-form-item label="乘用车VPPS中文名称" prop="cycvppscn">
<el-input v-model.trim="editRowData.cycvppscn" :disabled="true"></el-input>
<el-input v-model.trim="editRowData.cycvppscn" :disabled="true"/>
</el-form-item>
<el-form-item label="卡车VPPS编码" prop="kccvppsbm">
<el-input v-model.trim="editRowData.kccvppsbm" :disabled="true"></el-input>
<el-input v-model.trim="editRowData.kccvppsbm" :disabled="true"/>
</el-form-item>
<el-form-item label="卡车VPPS中文名称" prop="kccvppscn">
<el-input v-model.trim="editRowData.kccvppscn" :disabled="true"></el-input>
<el-input v-model.trim="editRowData.kccvppscn" :disabled="true"/>
</el-form-item>
</el-form>
<div class="demo-drawer-footer">
@@ -746,19 +633,23 @@ export default {
{value: 'FOREIGN_STAND', label: '海外标准法规'},
//{value: 'FOREIGN_LAWS', label: '国内外政策'},
// {value: 'BUSINESS', label: '企业标准 '},
{value: 'TEMP', label: '标准法规清单 '}
// {value: 'TEMP', label: '标准法规清单 '}
],
// 新增、编辑 数据搜索字段
sarAccessInfoSearch: {
id: '',
countryArea: '', // 国家
issueTime: '',
standName: '',
textStatus: '',
// applicationScope: '', //适用区域
keywords: '', // 关键字
detailedListName: '', //清单名称
applyArctic: '', // 能源种类
askType: '', // 监管类型
dataSource: 'INLAND_STAND', // 数据来源
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
validFlag: 0,
advanceSearchVOStr: ''
},
sarAccessInfo: {
id: '',
standNumber: '',
standName: '',
askType: '', // 监管类型
dataSource: 'INLAND_STAND', // 数据来源
page: 1,
@@ -1104,15 +995,11 @@ export default {
},
// 点击清空查询条件 按钮事件
clearSearchLaws () {
this.sarAccessInfoSearch.advanceSearchVOStr = ''
this.sarAccessInfoSearch.applyArctic = '' // 能源种类
this.sarAccessInfoSearch.keywords = '' // 关键字
this.sarAccessInfoSearch.askType = '' // 监管类型
this.sarAccessInfoSearch.detailedListName = '' // 清单名称
this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' // 数据来源
this.sarAccessInfoSearch.standName = ''
this.sarAccessInfoSearch.putTime = ''
this.sarAccessInfoSearch.textStatus = ''
this.sarAccessInfo.standName = ''
this.sarAccessInfo.standNumber = ''
this.isListType = false
this.selectLawsStands()
},
@@ -1474,6 +1361,11 @@ export default {
},
// 查询数据搜索 table 数据
selectLawsStands () {
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
} else {
this.sarAccessInfoSearch.standType = 'FOREIGN'
}
StandardsInfoPage(this.sarAccessInfoSearch).then(res =>{
this.sarAccessInfoSearchList = res.data.list
this.sarAccessInfoSearchList.forEach(item => {
@@ -1482,8 +1374,35 @@ export default {
} else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
}
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
})
this.drawerTotal = res.data.list.length
}, e => {
})
},
selectBtn() {
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
} else {
this.sarAccessInfoSearch.standType = 'FOREIGN'
}
StandardsInfoPage(this.sarAccessInfo).then(res =>{
this.sarAccessInfoSearchList = res.data.list
this.sarAccessInfoSearchList.forEach(item => {
if (item.standYear === null) {
item.standNumber = item.standSortShow + ' ' + item.standNumber
} else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
}
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
@@ -2169,6 +2088,12 @@ export default {
text-align: right;
}
}
.labelBox {
/deep/ .el-form-item__label {
padding-right: 5px;
padding-left: 10px;
}
}
.un-select {
user-select: none;
}
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+9 -2
View File
@@ -191,13 +191,13 @@
align="center">
</el-table-column>
<el-table-column
prop="code"
prop="standNumber"
fixed="left"
width="180px"
align="center"
label="标准号">
<template slot-scope="scope">
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standNumber }}</a>
<span class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standNumber }}</span>
</template>
</el-table-column>
<el-table-column
@@ -491,6 +491,13 @@ export default {
_this: this
}, res => {
this.standinfoList = res.data;
this.standinfoList.forEach(item => {
if (item.standYear === null) {
item.standNumber = item.standSortShow + ' ' + item.standNumber
} else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
}
})
this.total = res.data.total;
}, e => {
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+79 -139
View File
@@ -65,40 +65,13 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="标准名称" v-if="sarAccessInfoSearch.dataSource !== 'TEMP'" class="search-item">
<el-form-item label="标准名称" class="search-item">
<el-input
v-model="sarAccessInfoSearch.standName"
placeholder="请输入"
:maxlength="100"
></el-input>
</el-form-item>
<el-form-item label="适用车辆类型" class="search-item" v-show="moreSearchShow">
<el-select v-model="sarAccessInfoSearch.applyArctic" filterable clearable>
<el-option
v-for="item in energyKindOptions"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
<el-form-item class="search-item" prop="askType" label="要求类型" v-show="moreSearchShow">
<el-select v-model="sarAccessInfoSearch.askType">
<el-option
v-for="item in accessSarTypeOptions"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="清单名称" prop="detailedListName" class="search-item" v-show="isListType">
<el-input
v-model="sarAccessInfoSearch.detailedListName"
placeholder="请输入"
:maxlength="100"
></el-input>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
type="primary"
@@ -115,7 +88,11 @@
@click="clearSearchLaws">清空</el-button>
</el-form-item>
<el-form-item>
<el-button type="primary" class="common-button-primary" size="mini" @click="selectMoreBtn">
<el-button type="primary" v-if="showSelectBox" class="common-button-primary" size="mini" @click="selectMoreBtn">
<i class="iconfont">&#xe7a5;</i>
高级查询
</el-button>
<el-button type="primary" v-if="!showSelectBox" class="common-button-primary" size="mini" @click="selectMoreBtn">
<i class="iconfont">&#xe7a5;</i>
高级查询
</el-button>
@@ -124,54 +101,23 @@
</div>
</div>
<div class="showSelectBox" v-if="!showSelectBox">
<el-form :model="sarAccessInfoSearch" class="label-input-form" label-width="70px" v-if="!disabledFlag" inline>
<el-form-item label="文本状态" v-show="!isListType">
<el-select
v-model="sarAccessInfoSearch.textStatus"
placeholder="请选择"
filterable
size="small"
>
<el-option
v-for="item in textStatusOptions"
:value="item.value"
:key="item.value"
:label="item.label"
/>
</el-select>
</el-form-item>
<el-form-item label="发布日期" v-show="!isListType">
<el-date-picker
v-model="sarAccessInfoSearch.issueTime"
type="date"
value-format="yyyy-MM-DD"
size="small"
placeholder="选择发布日期">
</el-date-picker>
</el-form-item>
<el-form-item label="项目类别" v-show="isListType">
<el-form :model="sarAccessInfo" class="label-input-form" v-if="!disabledFlag" inline>
<el-form-item label="标准号" class="labelBox">
<el-input
size="small"
v-model="sarAccessInfoSearch.standSystem"
v-model="sarAccessInfo.standNumber"
placeholder="请输入"
:maxlength="100"
></el-input>
size="small"
clearable/>
</el-form-item>
<el-form-item label="更新人" v-show="isListType">
<el-form-item label="标准名称" class="labelBox">
<el-input
v-model="sarAccessInfoSearch.standName"
v-model="sarAccessInfo.standName"
placeholder="请输入"
:maxlength="100"
size="small"/>
</el-form-item>
<el-form-item label="更新时间" v-show="isListType">
<el-date-picker
v-model="sarAccessInfoSearch.modifyTime"
type="date"
size="small"
value-format="yyyy-MM-DD"
placeholder="选择更新日期">
</el-date-picker>
clearable/>
</el-form-item>
<el-form-item>
<el-button size="small" type="primary" @click="selectBtn">查询</el-button>
</el-form-item>
</el-form>
</div>
@@ -223,7 +169,6 @@
<el-table-column
prop="standName"
label="标准名称"
width="260px"
>
</el-table-column>
<el-table-column
@@ -261,46 +206,6 @@
</template>
</el-table-column>
</el-table>
<el-table
v-show="isListType"
:data="sarAccessInfoSearchList"
style="width: 100%"
border
height="300px"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@selection-change="accessSarTypeSelect"
ref="accessTypeSelect"
>
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="detailedList"
label="清单类别"
align="center">
</el-table-column>
<el-table-column
prop="detailedListName"
label="清单名称"
align="center">
</el-table-column>
<el-table-column
prop="modifyTime"
label="更新时间"
align="center">
<template slot-scope="scope">
<div>{{ scope.row.modifyTime ? scope.row.modifyTime.split(' ')[0] : '' }}</div>
</template>
</el-table-column>
<el-table-column
prop="uname"
label="更新人"
align="center">
</el-table-column>
</el-table>
<pagination :page="drawerPage" :total="drawerTotal" @pageChange="drawerPageChange"
@pageSizeChange="drawerPageSizeChange"></pagination>
<loading :loading="dataLoading">{{$t('m.dataAcquisition')}}</loading>
@@ -405,16 +310,6 @@
width="210px"
align="center"
label="责任部门">
<template slot-scope="scope">
<span
v-for="(item, index) in zrbmOptions"
:key="index"
:value="item.value"
v-if="scope.row.value == item.value"
>
{{ item.label }}
</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
@@ -525,7 +420,7 @@ import CustomRoleTree from '@/components/CustomFormComponents/roleTree'
import stand from "../../../config/pages/attributeCustom/components/stand";
import { mapGetters } from 'vuex'
import {interfaceUrl} from "@/sysConfig";
import {dicTypeData} from "@/api/unqualProcess";
import {dicTypeData, StandardsInfoPage} from "@/api/unqualProcess";
export default {
name: 'OtherAddEit',
components: {
@@ -607,18 +502,14 @@ export default {
dataSourceOptions: [
{value: 'INLAND_STAND', label: '国内标准法规'},
{value: 'FOREIGN_STAND', label: '海外标准法规'},
{value: 'FOREIGN_LAWS', label: '国内外政策'},
// {value: 'FOREIGN_LAWS', label: '国内外政策'},
// {value: 'BUSINESS', label: '企业标准 '},
{value: 'TEMP', label: '标准法规清单 '}
// {value: 'TEMP', label: '标准法规清单 '}
],
// 新增、编辑 数据搜索字段
sarAccessInfoSearch: {
id: '',
countryArea: '', // 国家
// applicationScope: '', //适用区域
keywords: '', // 关键字
detailedListName: '', //清单名称
applyArctic: '', // 能源种类
standName: '',
askType: '', // 监管类型
dataSource: 'INLAND_STAND', // 数据来源
page: 1,
@@ -626,6 +517,17 @@ export default {
validFlag: 0,
advanceSearchVOStr: ''
},
sarAccessInfo: {
id: '',
standName: '',
standNumber: '',
askType: '', // 监管类型
dataSource: 'INLAND_STAND', // 数据来源
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
validFlag: 0,
advanceSearchVOStr: ''
},
moreSearchBtn: true, // 多属性搜索按钮 状态
showTableFlag: true, // 显示添加列表 状态
sarAccessInfoSearchList: [], // 数据搜索 table列表数据
@@ -855,6 +757,9 @@ export default {
methods: {
// 高级检索
selectMoreBtn () {
this.showSelectBox = !this.showSelectBox
this.showTableFlag = false
this.selectLawsStands()
},
// 法规维护人树
getDept () {
@@ -945,11 +850,10 @@ export default {
// 点击清空查询条件 按钮事件
clearSearchLaws () {
this.sarAccessInfoSearch.standName = ''
this.sarAccessInfo.standName = ''
this.sarAccessInfo.standNumber = ''
this.sarAccessInfoSearch.advanceSearchVOStr = ''
this.sarAccessInfoSearch.applyArctic = '' // 能源种类
this.sarAccessInfoSearch.keywords = '' // 关键字
this.sarAccessInfoSearch.askType = '' // 监管类型
this.sarAccessInfoSearch.detailedListName = '' // 清单名称
this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' // 数据来源
this.isListType = false
this.selectLawsStands()
@@ -1278,9 +1182,42 @@ export default {
},
// 查询数据搜索 table 数据
selectLawsStands () {
this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.sarAccessInfoSearch, {
_this: this
}, res =>{
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
} else {
this.sarAccessInfoSearch.standType = 'FOREIGN'
}
StandardsInfoPage(this.sarAccessInfoSearch).then(res =>{
this.sarAccessInfoSearchList = res.data.list
this.sarAccessInfoSearchList.forEach(item => {
if (item.standYear === null) {
item.standNumber = item.standSortShow + ' ' + item.standNumber
} else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
}
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
})
this.drawerTotal = res.data.list.length
}, e => {
})
},
// 高级检索查询按钮
selectBtn() {
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
} else {
this.sarAccessInfoSearch.standType = 'FOREIGN'
}
StandardsInfoPage(this.sarAccessInfo).then(res =>{
this.sarAccessInfoSearchList = res.data.list
this.sarAccessInfoSearchList.forEach(item => {
if (item.standYear === null) {
@@ -1288,8 +1225,6 @@ export default {
} else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
}
})
this.sarAccessInfoSearchList.forEach(item => {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
@@ -1303,7 +1238,6 @@ export default {
})
this.drawerTotal = res.data.list.length
}, e => {
})
},
// 数据搜索table判断checked状态
@@ -1987,6 +1921,12 @@ export default {
text-align: right;
}
}
.labelBox {
/deep/ .el-form-item__label {
padding-right: 5px;
padding-left: 10px;
}
}
.un-select {
user-select: none;
}
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+81 -126
View File
@@ -65,40 +65,13 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="标准名称" v-if="sarAccessInfoSearch.dataSource !== 'TEMP'" class="search-item">
<el-form-item label="标准名称" class="search-item">
<el-input
v-model="sarAccessInfoSearch.standName"
placeholder="请输入"
:maxlength="100"
></el-input>
</el-form-item>
<el-form-item label="适用车辆类型" class="search-item" v-show="moreSearchShow">
<el-select v-model="sarAccessInfoSearch.applyArctic" filterable clearable>
<el-option
v-for="item in energyKindOptions"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
<el-form-item class="search-item" prop="askType" label="要求类型" v-show="moreSearchShow">
<el-select v-model="sarAccessInfoSearch.askType">
<el-option
v-for="item in accessSarTypeOptions"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="清单名称" prop="detailedListName" class="search-item" v-show="isListType">
<el-input
v-model="sarAccessInfoSearch.detailedListName"
placeholder="请输入"
:maxlength="100"
></el-input>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
type="primary"
@@ -128,54 +101,23 @@
</div>
</div>
<div class="showSelectBox" v-if="!showSelectBox">
<el-form :model="sarAccessInfoSearch" class="label-input-form" label-width="70px" v-if="!disabledFlag" inline>
<el-form-item label="文本状态" v-show="!isListType">
<el-select
v-model="sarAccessInfoSearch.textStatus"
placeholder="请选择"
filterable
size="small"
>
<el-option
v-for="item in textStatusOptions"
:value="item.value"
:key="item.value"
:label="item.label"
/>
</el-select>
</el-form-item>
<el-form-item label="发布日期" v-show="!isListType">
<el-date-picker
v-model="sarAccessInfoSearch.issueTime"
type="date"
value-format="yyyy-MM-DD"
size="small"
placeholder="选择发布日期">
</el-date-picker>
</el-form-item>
<el-form-item label="项目名称" v-show="isListType">
<el-form :model="sarAccessInfo" class="label-input-form" v-if="!disabledFlag" inline>
<el-form-item label="标准号" class="labelBox">
<el-input
size="small"
v-model="sarAccessInfoSearch.standSystem"
v-model="sarAccessInfo.standNumber"
placeholder="请输入"
:maxlength="100"
></el-input>
size="small"
clearable/>
</el-form-item>
<el-form-item label="更新人" v-show="isListType">
<el-form-item label="标准名称" class="labelBox">
<el-input
v-model="sarAccessInfoSearch.standName"
v-model="sarAccessInfo.standName"
placeholder="请输入"
:maxlength="100"
size="small"/>
</el-form-item>
<el-form-item label="更新时间" v-show="isListType">
<el-date-picker
v-model="sarAccessInfoSearch.modifyTime"
type="date"
size="small"
value-format="yyyy-MM-DD"
placeholder="选择更新日期">
</el-date-picker>
clearable/>
</el-form-item>
<el-form-item>
<el-button size="small" type="primary" @click="selectBtn">查询</el-button>
</el-form-item>
</el-form>
</div>
@@ -227,7 +169,6 @@
<el-table-column
prop="standName"
label="标准名称"
width="260px"
>
</el-table-column>
<el-table-column
@@ -265,46 +206,6 @@
</template>
</el-table-column>
</el-table>
<el-table
v-show="isListType"
:data="sarAccessInfoSearchList"
style="width: 100%"
border
height="300px"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@selection-change="accessSarTypeSelect"
ref="accessTypeSelect"
>
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="projectName"
label="项目名称"
align="center">
</el-table-column>
<el-table-column
prop="detailedListName"
label="清单名称"
align="center">
</el-table-column>
<el-table-column
prop="modifyTime"
label="更新时间"
align="center">
<template slot-scope="scope">
<div>{{ scope.row.modifyTime ? scope.row.modifyTime.split(' ')[0] : '' }}</div>
</template>
</el-table-column>
<el-table-column
prop="uname"
label="更新人"
align="center">
</el-table-column>
</el-table>
<pagination :page="drawerPage" :total="drawerTotal" @pageChange="drawerPageChange"
@pageSizeChange="drawerPageSizeChange"></pagination>
<loading :loading="dataLoading">{{$t('m.dataAcquisition')}}</loading>
@@ -519,7 +420,7 @@ import CustomRoleTree from '@/components/CustomFormComponents/roleTree'
import stand from "../../../config/pages/attributeCustom/components/stand";
import { mapGetters } from 'vuex'
import {interfaceUrl} from "@/sysConfig";
import {dicTypeData} from "@/api/unqualProcess";
import {dicTypeData, StandardsInfoPage} from "@/api/unqualProcess"
export default {
name: 'OtherAddEit',
components: {
@@ -601,18 +502,25 @@ export default {
dataSourceOptions: [
{value: 'INLAND_STAND', label: '国内标准法规'},
{value: 'FOREIGN_STAND', label: '海外标准法规'},
{value: 'FOREIGN_LAWS', label: '国内外政策'},
// {value: 'FOREIGN_LAWS', label: '国内外政策'},
// {value: 'BUSINESS', label: '企业标准 '},
{value: 'TEMP', label: '标准法规清单 '}
// {value: 'TEMP', label: '标准法规清单 '}
],
// 新增、编辑 数据搜索字段
sarAccessInfoSearch: {
id: '',
countryArea: '', // 国家
// applicationScope: '', //适用区域
keywords: '', // 关键字
detailedListName: '', //清单名称
applyArctic: '', // 能源种类
standName: '',
askType: '', // 监管类型
dataSource: 'INLAND_STAND', // 数据来源
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
validFlag: 0,
advanceSearchVOStr: ''
},
sarAccessInfo: {
id: '',
standName: '',
standNumber: '',
askType: '', // 监管类型
dataSource: 'INLAND_STAND', // 数据来源
page: 1,
@@ -943,11 +851,10 @@ export default {
// 点击清空查询条件 按钮事件
clearSearchLaws () {
this.sarAccessInfoSearch.standName = ''
this.sarAccessInfo.standName = ''
this.sarAccessInfo.standNumber = ''
this.sarAccessInfoSearch.advanceSearchVOStr = ''
this.sarAccessInfoSearch.applyArctic = '' // 能源种类
this.sarAccessInfoSearch.keywords = '' // 关键字
this.sarAccessInfoSearch.askType = '' // 监管类型
this.sarAccessInfoSearch.detailedListName = '' // 清单名称
this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' // 数据来源
this.isListType = false
this.selectLawsStands()
@@ -1276,9 +1183,12 @@ export default {
},
// 查询数据搜索 table 数据
selectLawsStands () {
this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.sarAccessInfoSearch, {
_this: this
}, res =>{
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
} else {
this.sarAccessInfoSearch.standType = 'FOREIGN'
}
StandardsInfoPage(this.sarAccessInfoSearch, this.sarAccessInfo).then(res =>{
this.sarAccessInfoSearchList = res.data.list
this.sarAccessInfoSearchList.forEach(item => {
if (item.standYear === null) {
@@ -1286,10 +1196,49 @@ export default {
} else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
}
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
})
this.drawerTotal = res.data.list.length
}, e => {
})
},
/** 高级查询查询按钮*/
selectBtn() {
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
} else {
this.sarAccessInfoSearch.standType = 'FOREIGN'
}
StandardsInfoPage(this.sarAccessInfo).then(res =>{
this.sarAccessInfoSearchList = res.data.list
this.sarAccessInfoSearchList.forEach(item => {
if (item.standYear === null) {
item.standNumber = item.standSortShow + ' ' + item.standNumber
} else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
}
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
})
this.drawerTotal = res.data.list.length
}, e => {
})
},
// 数据搜索table判断checked状态
@@ -1987,6 +1936,12 @@ export default {
text-align: right;
}
}
.labelBox {
/deep/ .el-form-item__label {
padding-right: 5px;
padding-left: 10px;
}
}
.un-select {
user-select: none;
}
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+4 -6
View File
@@ -188,22 +188,21 @@
</template>
</el-table-column>
<el-table-column
prop="xcxssrq"
prop="XCXSSRQ"
sortable="custom"
width="150px"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ formatText(scope.row.XCXSSRQ) }}</span>
<span>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0,10) : '-' }}</span>
</template>
</el-table-column>
<el-table-column
prop="zccssrq"
prop="ZCCSSRQ"
sortable="custom"
width="150px"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ formatText(scope.row.ZCCSSRQ) }}</span>
<span>{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0,10) : '-' }}</span>
</template>
</el-table-column>
<el-table-column
@@ -2516,7 +2515,6 @@ export default {
console.log(item, 'itemitemitemitem')
const formFieldList = this.formFieldList
this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item))
console.log(item.attrInfoCaseMap, 'gggg大大大滴滴答答')
if(this.sarStandardsInfoEO.standSystem){
this.defaultCheckedKeys = [this.sarStandardsInfoEO.standSystem];
}
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+10 -10
View File
@@ -184,21 +184,21 @@
</template>
</el-table-column>
<el-table-column
prop="XCXSSRQ"
sortable="custom"
width="150px"
label="新车型实施日期">
prop="XCXSSRQ"
sortable="custom"
width="150px"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ formatText(scope.row.XCXSSRQ) }}</span>
<span>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0,10) : '-' }}</span>
</template>
</el-table-column>
<el-table-column
prop="ZCCSSRQ"
sortable="custom"
width="150px"
label="在产车实施日期">
prop="ZCCSSRQ"
sortable="custom"
width="150px"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ formatText(scope.row.ZCCSSRQ) }}</span>
<span>{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0,10) : '-' }}</span>
</template>
</el-table-column>
<el-table-column