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:
zhutianqi
2021-08-08 11:46:49 +08:00
parent 79dacb01de dd4cf4a36c
commit 81f303f93c
12 changed files with 194 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/navMenu/index.vue
+2 -2
View File
@@ -300,11 +300,11 @@ export default {
// path: '/convertDocView',
// menuId: '3F52K25546'
// },
{
/*{
title: '菜单管理',
path: '/menuManage',
menuId: '87b8b4f5817a7829696e63185c744d52'
},
},*/
{
title: '链接管理',
path: '/linkManage',
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+105 -31
View File
@@ -217,14 +217,15 @@
clearable
></el-input>
<div v-if="form.xgdName">
{{ form.xgdName }}
<!-- {{ form.xgdName }}-->
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px"
@click="fileUpload('xgd')">
重新上传
<i class="el-icon-upload el-icon--right"></i>
查看已上传的文件
</el-button>
</div>
<div v-else>
@@ -233,7 +234,8 @@
class="common-button-primary"
size="mini"
@click="fileUpload('xgd')">
点击上传
<i class="el-icon-upload el-icon--right"></i>
点击上传
</el-button>
</div>
</el-form-item>
@@ -245,14 +247,15 @@
clearable
></el-input>
<div v-if="form.fbgbjbdName">
{{ form.fbgbjbdName }}
<!-- {{ form.fbgbjbdName }}-->
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px"
@click="fileUpload('fbgbjbd')">
重新上传
<i class="el-icon-upload el-icon--right"></i>
查看已上传的文件
</el-button>
</div>
<div v-else>
@@ -261,6 +264,7 @@
class="common-button-primary"
size="mini"
@click="fileUpload('fbgbjbd')">
<i class="el-icon-upload el-icon--right"></i>
点击上传
</el-button>
</div>
@@ -273,14 +277,15 @@
clearable
></el-input>
<div v-if="form.zbjbdName">
{{ form.zbjbdName }}
<!-- {{ form.zbjbdName }}-->
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px"
@click="fileUpload('zbjbd')">
重新上传
<i class="el-icon-upload el-icon--right"></i>
查看已上传的文件
</el-button>
</div>
<div v-else>
@@ -289,6 +294,7 @@
class="common-button-primary"
size="mini"
@click="fileUpload('zbjbd')">
<i class="el-icon-upload el-icon--right"></i>
点击上传
</el-button>
</div>
@@ -301,14 +307,15 @@
clearable
></el-input>
<div v-if="form.bpgName">
{{ form.bpgName }}
<!-- {{ form.bpgName }}-->
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px"
@click="fileUpload('bpg')">
重新上传
<i class="el-icon-upload el-icon--right"></i>
查看已上传的文件
</el-button>
</div>
<div v-else>
@@ -317,6 +324,7 @@
class="common-button-primary"
size="mini"
@click="fileUpload('bpg')">
<i class="el-icon-upload el-icon--right"></i>
点击上传
</el-button>
</div>
@@ -329,14 +337,15 @@
clearable
></el-input>
<div v-if="form.ssgName">
{{ form.ssgName }}
<!-- {{ form.ssgName }}-->
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px"
@click="fileUpload('ssg')">
重新上传
<i class="el-icon-upload el-icon--right"></i>
查看已上传的文件
</el-button>
</div>
<div v-else>
@@ -345,6 +354,7 @@
class="common-button-primary"
size="mini"
@click="fileUpload('ssg')">
<i class="el-icon-upload el-icon--right"></i>
点击上传
</el-button>
</div>
@@ -359,14 +369,15 @@
clearable
></el-input>
<div v-if="form.kwjName">
{{ form.kwjName }}
<!-- {{ form.kwjName }}-->
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px"
@click="fileUpload('kwj')">
重新上传
<i class="el-icon-upload el-icon--right"></i>
查看已上传的文件
</el-button>
</div>
<div v-else>
@@ -375,6 +386,7 @@
class="common-button-primary"
size="mini"
@click="fileUpload('kwj')">
<i class="el-icon-upload el-icon--right"></i>
点击上传
</el-button>
</div>
@@ -387,14 +399,15 @@
clearable
></el-input>
<div v-if="form.zqyjgName">
{{ form.zqyjgName }}
<!-- {{ form.zqyjgName }}-->
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px"
@click="fileUpload('zqyjg')">
重新上传
<i class="el-icon-upload el-icon--right"></i>
查看已上传的文件
</el-button>
</div>
<div v-else>
@@ -403,6 +416,7 @@
class="common-button-primary"
size="mini"
@click="fileUpload('zqyjg')">
<i class="el-icon-upload el-icon--right"></i>
点击上传
</el-button>
</div>
@@ -415,14 +429,15 @@
clearable
></el-input>
<div v-if="form.caName">
{{ form.caName }}
<!-- {{ form.caName }}-->
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px"
@click="fileUpload('ca')">
重新上传
<i class="el-icon-upload el-icon--right"></i>
查看已上传的文件
</el-button>
</div>
<div v-else>
@@ -431,6 +446,7 @@
class="common-button-primary"
size="mini"
@click="fileUpload('ca')">
<i class="el-icon-upload el-icon--right"></i>
点击上传
</el-button>
</div>
@@ -443,14 +459,15 @@
clearable
></el-input>
<div v-if="form.jdwjName">
{{ form.jdwjName }}
<!-- {{ form.jdwjName }}-->
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px"
@click="fileUpload('jdwj')">
重新上传
<i class="el-icon-upload el-icon--right"></i>
查看已上传的文件
</el-button>
</div>
<div v-else>
@@ -459,6 +476,7 @@
class="common-button-primary"
size="mini"
@click="fileUpload('jdwj')">
<i class="el-icon-upload el-icon--right"></i>
点击上传
</el-button>
</div>
@@ -702,7 +720,16 @@
clearable
></el-input>
<div v-if="form.glwjName">
{{ form.glwjName }}
<el-button
type="primary"
class="common-button-primary"
size="mini"
@click="fileUpload('glwj')">
<i class="el-icon-upload el-icon--right"></i>
查看已上传文件
</el-button>
<!-- {{ form.glwjName }}-->
</div>
<div v-else>
<el-button
@@ -710,6 +737,7 @@
class="common-button-primary"
size="mini"
@click="fileUpload('glwj')">
<i class="el-icon-upload el-icon--right"></i>
点击上传
</el-button>
</div>
@@ -1196,6 +1224,16 @@
data () {
return {
fileList: [],
caFileList: [],
FBGBJBDFileList: [],
xgdFileList: [],
bpgFileList: [],
ssgFileList: [],
zqyjgFileList: [],
jdwjFileList: [],
zbjbdFileList: [],
kwjFileList: [],
qlwjFileList: [],
filterText:'',
textStatusMap: {}, // 文本状态id与name对应
standardDrawer: false,
@@ -1332,7 +1370,7 @@
zqyjg: '', // 征求意见稿
jdwj: '', // 解读文件
zbjbd: '', // 增补件
kwj: '', // 勘误件
kwj: '', // 勘 误件
caName: '', // 草案
fbgbjbdName: '', // 发布稿
xgdName: '', // 修改单
@@ -1413,9 +1451,9 @@
{ required: true, message: '请选择文本状态', trigger: 'change' }
]
,
// issueTime: [
// { required: true, message: '请选择标准发布日期', trigger: 'change' }
// ],
issueTime: [
{ required: false, message: '请选择标准发布日期', trigger: 'change' }
],
qcdw: [
{ required: true, message: '请选择起草单位', trigger: 'change' }
],
@@ -2040,43 +2078,54 @@
// 导入标准数据成功后执行
importFileSuccess (response, file,fileList) {
// 上传成功后判断是否是两条数据是的话替换掉旧数据
if (fileList.length > 1) {
this.fileList = fileList.splice(0, 1)
}
// if (fileList.length > 1) {
// this.fileList = fileList.splice(0, 1)
// }
if (response.ok) {
this.fileMadel = false
this.fileList = []
// this.fileMadel = false
// this.fileList = []
if(this.fileType === 'fbgbjbd'){
this.FBGBJBDFileList=fileList;
this.form.fbgbjbd = response.data.id;
this.form.fbgbjbdName = response.data.name;
}else if(this.fileType === 'xgd'){
this.form.xgd = response.data.id;
this.xgdFileList=fileList;
this.form.xgd = response.data.id;
this.form.xgdName = response.data.name;
}else if(this.fileType === 'bpg'){
this.bpgFileList=fileList;
this.form.bpg = response.data.id;
this.form.bpgName = response.data.name;
}else if(this.fileType === 'ssg'){
this.ssgFileList=fileList;
this.form.ssg = response.data.id;
this.form.ssgName = response.data.name;
}else if(this.fileType === 'zqyjg'){
this.zqyjgFileList=fileList;
this.form.zqyjg = response.data.id;
this.form.zqyjgName = response.data.name;
}else if(this.fileType === 'jdwj'){
this.jdwjFileList=fileList;
this.form.jdwj = response.data.id;
this.form.jdwjName = response.data.name;
}else if(this.fileType === 'kwj'){
this.kwjFileList=fileList;
this.form.kwj = response.data.id;
this.form.kwjName = response.data.name;
}else if(this.fileType === 'xgd'){
this.xgdFileList=fileList;
this.form.xgd = response.data.id;
this.form.xgdName = response.data.name;
}else if(this.fileType === 'glwj'){
this.qlwjFileList=fileList;
this.form.glwj = response.data.id;
this.form.glwjName = response.data.name;
}else if(this.fileType === 'ca'){
this.caFileList=fileList;
this.form.ca = response.data.id;
this.form.caName = response.data.name;
}else if(this.fileType === 'zbjbd'){
this.zbjbdFileList=fileList;
this.form.zbjbd = response.data.id;
this.form.zbjbdName = response.data.name;
}
@@ -2089,8 +2138,33 @@
},
fileUpload (type) {
this.fileType = '';
this.fileMadel = true
// this.fileMadel = true;//此句应在最后执行,否则会有先显示没变换的的文件列表,在显示变换了的文件列表
this.fileType = type;
if (type==='ca'){
this.fileList=this.caFileList;
}else if (type==='fbgbjbd'){
this.fileList=this.FBGBJBDFileList;
}else if (type==='xgd'){
this.fileList=this.xgdFileList;
}else if(type==='bpg'){
this.fileList=this.bpgFileList;
}else if (type==='ssg'){
this.fileList=this.ssgFileList;
}else if (type==='zqyjg'){
this.fileList=this.zqyjgFileList;
}else if (type==='jdwj'){
this.fileList=this.jdwjFileList;
}else if (type==='zbjbd'){
this.fileList=this.zbjbdFileList;
}else if (type==='kwj'){
this.fileList=this.kwjFileList;
}else if (type==='glwj'){
this.fileList=this.qlwjFileList;
}
this.fileMadel = true;
},
popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
if(checkedData) {
src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+11 -14
View File
@@ -836,29 +836,26 @@ export default {
methods: {
downloadFile (fileType) {
if(fileType === 'fbgbjbd'){
if(this.fbgbjbdFileId.search(',')){
this.fbgbjbdFileId=this.fbgbjbdFileId.replace(",","");
console.log(this.fbgbjbdFileId);
}
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId.replace(",","");
}else if(fileType === 'xgd'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId.replace(",","");
}else if(fileType === 'bpg'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.bpgFileId
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.bpgFileId.replace(",","");
}else if(fileType === 'ssg'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.ssgFileId
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.ssgFileId.replace(",","");
}else if(fileType === 'zqyjg'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zqyjgFileId
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zqyjgFileId.replace(",","");
}else if(fileType === 'jdwj'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.jdwjFileId
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.jdwjFileId.replace(",","");
}else if(fileType === 'kwj'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.kwjFileId
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.kwjFileId.replace(",","");
}else if(fileType === 'glwj'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.glwjFileId
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.glwjFileId.replace(",","");
}else if(fileType === 'ca'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.caFileId
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.caFileId.replace(",","");
}else if(fileType === 'zbjbd'){
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zbjbdFileId
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zbjbdFileId.replace(",","");
}
},
popoverHide (checkedIds, checkedData) {
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+2 -2
View File
@@ -1138,13 +1138,13 @@ export default {
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }
],
standNature: [
{ required: false, message: '请选择标准性质', trigger: 'change' }
{ required: true, message: '请选择标准性质', trigger: 'change' }
],
textStatus: [
{ required: true, message: '请选择文本状态', trigger: 'change' }
],
issueTime: [
{ required: true, message: '请选择标准发布日期', trigger: 'change' }
{ required: false, message: '请选择标准发布日期', trigger: 'change' }
],
qcdw: [
{ required: true, message: '请选择起草单位', trigger: 'change' }
src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
+12 -7
View File
@@ -533,9 +533,14 @@ export default {
}).then(res => {
let mes = JSON.parse(res.mes);
this.listForm = mes.form;
this.dataList = mes.form.dataList;
this.roleForm = mes.roleForm;
this.commentText = mes.commentText;
this.dataList = mes.form.dataList;
this.dataList.forEach(item => {
if(!item.projectLine){
this.dataList = null
}
})
});
},
checkedRole(data) {
@@ -866,12 +871,12 @@ export default {
},
computed: {},
watch: {
dataList: {
deep: true,
handler (val) {
console.log('dataList update', val)
}
}
// dataList: {
// deep: true,
// handler (val) {
// console.log('dataList update', val)
// }
// }
},
mounted() {
//从数据库中查询下拉框数据
src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
-1
View File
@@ -662,7 +662,6 @@ export default {
saveTaskFirst(_formData).then(res => {
this.saveLoading = false;
this.$message.success("保存成功");
this.$router.push("/processCenter");
}).catch(e => {
this.saveLoading = false;
});
src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
+1 -1
View File
@@ -315,7 +315,7 @@ export default {
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
console.log(res.mesg)
console.log(res.mesg);
if (res) {
const processForm = JSON.parse(res.mesg);
this.getFormFieldList(processForm);
src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue
+4 -4
View File
@@ -9,9 +9,9 @@
<div v-else-if="tabValue === 'listProject'" style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
<list-project></list-project>
</div>
<div v-else-if="tabValue === 'listTracking'" style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
<!-- <div v-else-if="tabValue === 'listTracking'" style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
<list-tracking></list-tracking>
</div>
</div>-->
<div v-else-if="tabValue === 'listOther'" style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
<list-other></list-other>
</div>
@@ -68,13 +68,13 @@ export default {
name: "listProject"
});
continue;
} else if (entity.id === "418123d180abf67bd2c46d5a694baaa5") {
}/* else if (entity.id === "418123d180abf67bd2c46d5a694baaa5") {
list.push({
label: "重点标准跟踪清单",
name: "listTracking"
});
continue;
} else if (entity.id === "5a75523729b04102a565167004d640e9") {
}*/ else if (entity.id === "5a75523729b04102a565167004d640e9") {
list.push({
label: "其他清单",
name: "listOther"
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
-1
View File
@@ -646,7 +646,6 @@ export default {
},
// 点击查看
handlePreview(data) {
debugger
let routeUrl = this.$router.resolve({
name: "OtherStandardDetails",
params: {
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue
+17 -1
View File
@@ -60,13 +60,18 @@
width="180"
>
<template slot-scope="scope">
<div><span>{{ scope.row.standSort }} {{ scope.row.standNumber }}</span> <span v-if="scope.row.standYear">-{{ scope.row.standYear }}</span></div>
<a class="table-jump"
@click="handlePreview(scope.row)">{{ scope.row.standNumber }}</a>
</template>
</el-table-column>
<el-table-column
prop="standName"
label="标准/政策名称"
>
<template slot-scope="scope">
<a class="table-jump"
@click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column
prop="interpretationTime"
@@ -322,6 +327,17 @@ export default {
this.$store.getters.userInfo.configContent = pageSize
this.queryStandAndLaws()
},
//点击查看详情
handlePreview(item) {
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: item.standId,
pageType: 'INLAND_STAND'
}
})
window.open(routeUrl.href, '_blank')
},
queryStandAndLaws () {
this.sarProject.current = this.page
this.sarProject.size = this.pageSize
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue
+21 -4
View File
@@ -65,14 +65,19 @@
label="标准/政策号"
width="180"
>
<template slot-scope="scope">
<div><span>{{ scope.row.standSort }} {{ scope.row.standNumber }}</span> <span v-if="scope.row.standYear">-{{ scope.row.standYear }}</span></div>
</template>
<template slot-scope="scope">
<a class="table-jump"
@click="handlePreview(scope.row)">{{ scope.row.standNumber }}</a>
</template>
</el-table-column>
<el-table-column
prop="standName"
label="标准/政策名称"
>
<template slot-scope="scope">
<a class="table-jump"
@click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column
prop="interpretationTime"
@@ -259,7 +264,19 @@ name: "technologyInvolveProject",
this.sarProjectListDatas = res.data.records
this.total = res.data.total
}, e=> {})
}, // 分页查询
},
//点击查看详情
handlePreview(item) {
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: item.standId,
pageType: item.standType + '_STAND'
}
})
window.open(routeUrl.href, '_blank')
},
// 分页查询
resetSelect () {
this.sarProject.country = ''
this.sarProject.standCode=''
src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+19 -4
View File
@@ -11,19 +11,19 @@
<div v-show="heightShow" class="transition-box">
<p class="transition-box-p">
<label class="transition-box-label">标准号：</label>
<span class="transition-box-span">{{ this.$route.query.item.cid }}</span>
<span class="transition-box-span" @click="handlePreview($route.query.item)">{{ $route.query.item.cid }}</span>
</p>
<p class="transition-box-p">
<label class="transition-box-label">标准名称：</label>
<span class="transition-box-span">{{ this.$route.query.item.cname || '-' }}</span>
<span class="transition-box-span">{{ $route.query.item.cname || '-' }}</span>
</p>
<p class="transition-box-p">
<label class="transition-box-label">上传时间：</label>
<span class="transition-box-span">{{ this.$route.query.item.endTime || '-' }}</span>
<span class="transition-box-span">{{ $route.query.item.endTime || '-' }}</span>
</p>
<p class="transition-box-p">
<label class="transition-box-label">征求意见周期：</label>
<span class="transition-box-span" v-if="this.$route.query.item.startTime && this.$route.query.item.endTime">{{ this.$route.query.item.startTime + ' ~ ' + this.$route.query.item.endTime}}</span>
<span class="transition-box-span" v-if="$route.query.item.startTime && $route.query.item.endTime">{{ $route.query.item.startTime + ' ~ ' + $route.query.item.endTime}}</span>
<span class="transition-box-span" v-else>-</span>
</p>
</div>
@@ -166,6 +166,21 @@
}
})
},
//点击查看
handlePreview(data) {
console.log(data);
return
let routeUrl = this.$router.resolve({
name: "OtherStandardDetails",
params: {
id: data.id,
pageType: data.standType
}
});
window.open(routeUrl.href, "_blank");
},
// 获取详情信息列表
getList() {
this.spinShow = true