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

Merge branch 'develop' into 'test'

Browse Source 
Develop

See merge request !66
This commit is contained in:
王夏晖
2021-08-08 07:58:25 +00:00
parent 6dc7473e05 d02f6fc3c1
commit ec5c587680
27 changed files with 161 additions and 81 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/details/otherStandardDetails/index.vue
+6 -6
View File
@@ -376,12 +376,12 @@
<span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
</template>
</p>
<!-- <el-button-->
<!-- v-if="child.attrField === 'FBGBJBD' || child.attrField === 'SSG' || child.attrField === 'ZQYJG' || child.attrField === 'BPG' || child.attrField === 'ZBJBD' || child.attrField === 'CA'"-->
<!-- @click="showItemsModel(child.attrField)"-->
<!-- class="decomposition-btn"-->
<!-- icon="icon-separate"-->
<!-- >标准分解单</el-button>-->
<el-button
v-if="child.attrField === 'FBGBJBD' || child.attrField === 'SSG' || child.attrField === 'ZQYJG' || child.attrField === 'BPG' || child.attrField === 'ZBJBD' || child.attrField === 'CA'"
@click="showItemsModel(child.attrField)"
class="decomposition-btn"
icon="icon-separate"
>标准分解单</el-button>
</div>
</div>
src/pages/localTool/standAutoSplit/index.vue
+19
View File
@@ -186,12 +186,20 @@
prop="standNumber"
label="标准号/政策号"
align="center">
<template slot-scope="scope">
<a class="table-jump"
@click="handlePreview1(scope.row)">{{ scope.row.standNumber }}</a>
</template>
</el-table-column>
<el-table-column
prop="standName"
label="标准名称/政策名称"
align="center"
>
<template slot-scope="scope">
<a class="table-jump"
@click="handlePreview1(scope.row)">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column
prop="standFileClassifyShow"
@@ -819,6 +827,17 @@ export default {
})
window.open(routeUrl.href, '_blank')
},
//拆分页点击查看详情
handlePreview1(item) {
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: item.standId,
pageType: item.sarType + '_STAND'
}
})
window.open(routeUrl.href, '_blank')
},
// 查询政策和标准
getSearch () {
if (this.conditionForm.standType === 'FOREIGN2') {
src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
+1 -1
View File
@@ -39,7 +39,7 @@
<div class="action-bar">
<el-button v-btn-permission="'SRE2ZRX3MJSSH5YYLRGH'" size="mini" @click="importItemInfo" ><i class="iconfont">&#xe6de;</i>导入</el-button>
<el-button v-btn-permission="''" size="mini" @click="exportItemInfo"><i class="iconfont">&#xe6e9;</i>导出</el-button>
<el-button v-btn-permission="''" size="mini" @click="judgebatchDeleteItem"><i class="iconfont">&#xe61b;</i>删除</el-button>
<!-- <el-button v-btn-permission="''" size="mini" @click="judgebatchDeleteItem"><i class="iconfont">&#xe61b;</i>删除</el-button>-->
<el-button v-btn-permission="'QULWGFSB3NMP84REU7BP'" size="mini" @click="uploadImportModal"><i class="iconfont">&#xe825;</i>模板下载</el-button>
<el-button v-btn-permission="''" size="mini" @click="batchCopy">批量复制</el-button>
<el-button v-btn-permission="'TE39XUT4KRTPZGQH5KLF'" size="mini" @click="combineItems">合并条款</el-button>
src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
+2 -2
View File
@@ -103,13 +103,13 @@
<el-table-column
prop="itemsName"
label="条款名称"
width="170"
width="230"
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
prop="itermsConditions"
label="条款内容"
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+2 -2
View File
@@ -104,13 +104,13 @@
<el-table-column
prop="itemsName"
label="条款名称"
width="170"
width="230"
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
prop="itermsConditions"
label="条款内容"
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
+2 -2
View File
@@ -98,13 +98,13 @@
<el-table-column
prop="itemsName"
label="条款名称"
width="170"
width="230"
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
prop="itermsConditions"
label="条款内容"
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+7 -7
View File
@@ -99,15 +99,15 @@
<el-table-column
prop="itemsName"
label="条款名称"
width="100"
width="230"
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
prop="itemsTitle"
label="条款内容"
align="center">
</el-table-column>
<!-- <el-table-column-->
<!-- prop="itemsTitle"-->
<!-- label="条款内容"-->
<!-- show-overflow-tooltip-->
<!-- align="center">-->
<!-- </el-table-column>-->
<el-table-column
prop="technicalRequir"
width="150"
src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
+2 -2
View File
@@ -94,13 +94,13 @@
<el-table-column
prop="itemsName"
label="条款名称"
width="100"
width="230"
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
prop="itemsTitle"
label="条款内容"
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
+2 -2
View File
@@ -94,13 +94,13 @@
<el-table-column
prop="itemsName"
label="条款名称"
width="100"
width="230"
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
prop="itemsTitle"
label="条款内容"
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
+2 -2
View File
@@ -95,13 +95,13 @@
<el-table-column
prop="itemsName"
label="条款名称"
width="100"
width="230"
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
prop="itemsTitle"
label="条款内容"
show-overflow-tooltip
align="center">
</el-table-column>
<el-table-column
src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
+28 -24
View File
@@ -397,7 +397,7 @@
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import { inboundLiaisonDetail, saveinboundTask } from "api/process";
import { inboundLiaisonDetail, saveTaskForPub } from "api/process";
export default {
name: "bzqdfbStep3",
@@ -693,16 +693,24 @@ export default {
getFormFieldList (item) {
this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item))
this.listForm.prcNum = this.prcNum
this.listForm.prcName = this.prcName
this.listForm['id'] = item.id
this.listForm.dataList = item.dataList
this.dataList = item.dataList
this.listForm.applyUpdUserId = item.applyUpdUserId
this.listForm.jlUserId = item.jlUserId
this.listForm.zrUserId = item.zrUserId
this.fileIds = item.fileId;
this.getFileInfo();
if(item.form === undefined){
this.listForm.prcNum = this.prcNum
this.listForm.prcName = this.prcName
this.listForm['id'] = item.id
this.listForm.dataList = item.dataList
this.dataList = item.dataList
this.listForm.applyUpdUserId = item.applyUpdUserId
this.listForm.jlUserId = item.jlUserId
this.listForm.zrUserId = item.zrUserId
this.fileIds = item.fileId;
this.getFileInfo();
} else {
this.listForm = item.form
this.dataList = item.form.dataList
this.listForm.dataList = item.form.dataList
this.fileIds = item.form.fileId;
this.getFileInfo();
}
})
},
//保存事件
@@ -713,23 +721,19 @@ export default {
_formData.append("createUser", this.$store.getters.userInfo.userId);
_formData.append("createUserName", this.$store.getters.userInfo.userName);
_formData.append("prcType", "4");
_formData.append('taskIds', this.taskIds)
_formData.append("json", JSON.stringify({
taskInfo: '根据会签意见修订',
form: this.listForm,
roleForm: this.roleForm,
prcNum: this.$route.query.prcNum,
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
commentText: this.commentText
}));
saveinboundTask(_formData).then(res => {
this.saveLoading = false;
this.$message.success("保存成功");
this.$router.push('/processCenter')
this.bpnId = res.result;
}).catch(e => {
this.saveLoading = false;
});
// saveTaskForPub(_formData).then(res => {
// this.saveLoading = false;
// this.$message.success("保存成功");
// this.bpnId = res.result;
// }).catch(e => {
// this.saveLoading = false;
// });
},
//提交事件
handleSubmit() {
src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
+4 -2
View File
@@ -537,7 +537,7 @@ export default {
this.commentText = mes.commentText;
this.dataList = mes.form.dataList;
this.dataList.forEach(item => {
if(!item.projectLine){
if(!item.productLine){
this.dataList = null
}
})
@@ -760,8 +760,10 @@ export default {
//选择拆分标准确定事件
OkDrawer() {
if (this.selectedList.length == 1) {
this.listForm.standNumber = this.selectedList[0].standNumber;
this.listForm.standNumber = this.selectedList[0].standSortShow + '\xa0\xa0' + this.selectedList[0].standNumber + '-' + this.selectedList[0].standYear ;
this.listForm.standName = this.selectedList[0].standName;
this.listForm.standType = this.selectedList[0].standType;
this.listForm.standId = this.selectedList[0].id;
this.listForm.id = this.selectedList[0].id;
this.$http.get("SarStandItems/sar-stand-items/findAllItems", {
ids: this.listForm.id,
src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+4 -1
View File
@@ -470,6 +470,7 @@ export default {
listForm: {
standNumber: "", //标准编号
standName: "",//标准名称
standType: "", //标准类型
XCXSSRQ: "", //新车型实施日期
ZCCSSRQ: "", //在产车实施日期
certifiedEngineer: "", //认证工程师
@@ -732,8 +733,10 @@ export default {
//选择拆分标准确定事件
OkDrawer() {
if (this.selectedList.length === 1) {
this.listForm.standNumber = this.selectedList[0].standSortShow + '-' + this.selectedList[0].standNumber + '-' + this.selectedList[0].standYear ;
this.listForm.standNumber = this.selectedList[0].standSortShow + '\xa0\xa0' + this.selectedList[0].standNumber + '-' + this.selectedList[0].standYear ;
this.listForm.standName = this.selectedList[0].standName;
this.listForm.standType = this.selectedList[0].standType;
this.listForm.standId = this.selectedList[0].id;
this.listForm.XCXSSRQ = this.selectedList[0].xcxssrqgj
this.listForm.ZCCSSRQ = this.selectedList[0].zccssrqgj
this.listForm.id = this.selectedList[0].id;
src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+1 -1
View File
@@ -64,7 +64,7 @@
style="width: 100%"
border
@selection-change="selectStandChange"
:height="sarProStateTableHeight"
height="56%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
<el-table-column
src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
+1 -1
View File
@@ -64,7 +64,7 @@
style="width: 100%"
border
@selection-change="selectStandChange"
:height="sarProStateTableHeight"
height="55%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
<el-table-column
src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
+1 -1
View File
@@ -64,7 +64,7 @@
style="width: 100%"
border
@selection-change="selectStandChange"
:height="sarProStateTableHeight"
height="55%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
<el-table-column
src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
+1 -1
View File
@@ -64,7 +64,7 @@
style="width: 100%"
border
@selection-change="selectStandChange"
:height="sarProStateTableHeight"
height="55%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
<el-table-column
src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
-1
View File
@@ -370,7 +370,6 @@ export default {
if(this.peopleFlag === true){
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
console.log(json)
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
+3 -1
View File
@@ -64,7 +64,7 @@
align="center">
</el-table-column>
<el-table-column
prop="standEnName"
prop="standNumber"
label="标准号"
>
<template slot-scope="scope">
@@ -333,6 +333,8 @@ export default {
this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList;
this.dataList = item.dataList;
console.log(this.dataList);
// this.dataList.standNumber = item.dataList.standSort + '\xa0\xa0' +item.dataList.standSort + '-' + item.dataList.standYear
let children = [];
item.breakdownList.forEach(
item => {
src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
-3
View File
@@ -400,7 +400,6 @@ export default {
methods: {
// 点击查看
handlePreview(item) {
console.log(item)
let routeUrl = this.$router.resolve({
name: "OtherStandardDetails",
params: {
@@ -471,13 +470,11 @@ export default {
getFormFieldList(item) {
this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item));
console.log(this.listForm)
this.listForm.prcNum = this.prcNum;
this.listForm.prcName = this.prcName;
this.listForm["id"] = item.id;
// this.listForm.dataList = item.dataList;
this.dataList = this.listForm.dataList;
console.log(this.dataList)
});
},
//保存事件
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/details.vue
+10 -3
View File
@@ -12,8 +12,14 @@
<el-row style="margin-top: 10px">
<el-col :span="5">产品平台: <span class="valueColor">{{ localProEO.projectPlatfor }}</span></el-col>
<el-col :span="5" :push="1">项目编号: <span class="valueColor">{{ localProEO.projectNumber }}</span></el-col>
<el-col :span="5" :push="2">项目名称: <span class="valueColor">{{ localProEO.projectName }}</span></el-col>
<!-- <el-col :span="5" :push="2">车型系列:<span class="valueColor">{{ localProEO.productSet }}</span></el-col>-->
<el-col :span="5" :push="2">
<el-tooltip class="item" effect="dark" :content="localProEO.projectName" placement="top">
<div slot="content" class="toolip-content" v-if="localProEO.projectName !== undefined && localProEO.projectName.length>15">{{ localProEO.projectName }}</div>
<div v-else></div>
<div class="check-item-value" v-if="localProEO.projectName !== undefined && localProEO.projectName.length>15">项目名称: <span class="valueColor">{{localProEO.projectName && localProEO.projectName.substring(0,15)+"..." }}</span></div>
<div class="check-item-value" v-else>项目名称: <span class="valueColor">{{localProEO.projectName}}</span></div>
</el-tooltip>
</el-col>
<el-col :span="4" :push="3">项目分类:<span class="valueColor">{{ localProEO.projectClassification }}</span>
</el-col>
</el-row>
@@ -449,7 +455,7 @@ export default {
let deleteTagList = []
this.selectList1.forEach(item => {
//项目id-标准id,项目id-标准id
deleteTagList.push( this.proId + '-' + item )
deleteTagList.push(this.proId + '-' + item)
})
this.id = deleteTagList.join(',')
this.$http.post('sarStandProjectLibrary/deleteByIds', {
@@ -726,6 +732,7 @@ export default {
this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
this.setMap(this.zrbmMap, res.data.ZRBMCLASS)
this.setMap(this.textStatusMap, res.data.WBZTCLASS)
console.log(this.getLocalPro)
this.showLocalProductData(this.getLocalPro)
}, e => {
})
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