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

Merge branch 'develop' into FOTON

Browse Source
This commit is contained in:
super_liu
2022-03-24 23:01:40 +08:00
parent d096510113 9f1e1f5ef9
commit 95a9ad61c7
68 changed files with 9540 additions and 9224 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/CustomFormComponents/InputForAllStandards.vue
+1 -1
View File
@@ -283,7 +283,7 @@ export default {
} }
if (this.selectedListRep.length + textArr.length > 20) { if (this.selectedListRep.length + textArr.length > 20) {
return this.$message({ return this.$message({
message: '代替标准号最多选择20项', message: '标准号最多选择20项',
type: 'warning' type: 'warning'
}) })
} }
src/components/mechanismTree/index.vue
+1
View File
@@ -8,6 +8,7 @@
@close="handleTreeDrawerCancel" @close="handleTreeDrawerCancel"
size="400px"> size="400px">
<el-form <el-form
@submit.native.prevent
ref="attributeEO" ref="attributeEO"
class="label-input-form" class="label-input-form"
:inline="true" :inline="true"
src/components/navMenu/index.vue
+3 -2
View File
@@ -124,7 +124,7 @@
{ {
title: '企标计划', title: '企标计划',
path: '/enterpriseStandardPlan', path: '/enterpriseStandardPlan',
// menuId: '8a9c87fe06244fb9d55e78fb281f625b' menuId: 'b07296765085f06eb3c158147f3a7312'
}, },
{ {
title: '法规清单', title: '法规清单',
@@ -139,6 +139,7 @@
{ {
title: '工作组', title: '工作组',
path: '/workingGroup', path: '/workingGroup',
menuId: 'b64240325f0e01ec4a318ee0cfedd82e'
}, },
{ {
title: '征求意见', title: '征求意见',
@@ -323,7 +324,7 @@
{ {
title: '操作日志', title: '操作日志',
path: '/OperationLog', path: '/OperationLog',
menuId: '' menuId: 'eb1565c40ca7506f89655f79f7a1ca65'
}, },
// { // {
// title: '资料中心管理', // title: '资料中心管理',
src/pages/config/pages/attributeCustom/components/buss.vue
+6 -6
View File
@@ -2,7 +2,7 @@
<template> <template>
<div class="attribute-custom v-class"> <div class="attribute-custom v-class">
<div class="action-bar1"> <div class="action-bar1">
<el-button class="common-button-primary add-button" style="margin-right: 5px" size="mini" v-btn-permission="'bbef9712ff6ffdf1c63697720cc3d4bd'" type="primary" @click="showAddModel">新增</el-button> <el-button class="common-button-primary add-button" style="margin-right: 5px" size="mini" v-btn-permission="'264c235efd8aae1eaff42fbea4efe0f8'" type="primary" @click="showAddModel">新增</el-button>
<el-button class="common-button-default" size="small" v-btn-permission="'ee838a0ff0d332cac850fd553e81048d'" @click="showDisplayLocationDialog" >展示区域管理</el-button> <el-button class="common-button-default" size="small" v-btn-permission="'ee838a0ff0d332cac850fd553e81048d'" @click="showDisplayLocationDialog" >展示区域管理</el-button>
</div> </div>
<loading :loading="attributeDataLoading">数据处理中</loading> <loading :loading="attributeDataLoading">数据处理中</loading>
@@ -76,8 +76,8 @@
<el-dropdown trigger="click" @command="handleCommand"> <el-dropdown trigger="click" @command="handleCommand">
<i class="iconfont">&#xe61e;</i> <i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'b1e60ec7b60389713bf5b450ec2d1115'">编辑</el-dropdown-item> <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'1e8a5e0eb6127b2d440b84a19e522e95'">编辑</el-dropdown-item>
<el-dropdown-item :disabled="scope.row.isEdit==='1'" v-btn-permission="'c157be4e073787ea6c4a04bd39686c2d'" :command="[scope.row, '删除']">删除</el-dropdown-item> <el-dropdown-item :disabled="scope.row.isEdit==='1'" v-btn-permission="'074bc85966e5ca7153f4620a76c5897b'" :command="[scope.row, '删除']">删除</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
</div> </div>
@@ -205,7 +205,7 @@
width="400px" width="400px"
> >
<div style="margin-bottom: 10px;"> <div style="margin-bottom: 10px;">
<el-button class="common-button-primary add-button" type="primary" icon="add" @click="showAddDisplayLocationDialog(undefined)" v-btn-permission="'692d7f644dd96941c64a8b5946a4e651'" >新增</el-button> <el-button class="common-button-primary add-button" type="primary" icon="add" @click="showAddDisplayLocationDialog(undefined)" v-btn-permission="'16d1a83a89ad4781d34163a45c04e3cb'" >新增</el-button>
</div> </div>
<el-table <el-table
:loading="displayLocationDialogTableConfig.loading" :loading="displayLocationDialogTableConfig.loading"
@@ -236,8 +236,8 @@
<el-dropdown trigger="click" @command="handleCommand2"> <el-dropdown trigger="click" @command="handleCommand2">
<i class="iconfont">&#xe61e;</i> <i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="[scope.row, '修改']" v-btn-permission="'b282a53b0c1c4aca76b29197b15ed931'" >修改</el-dropdown-item> <el-dropdown-item :command="[scope.row, '修改']" v-btn-permission="'c87d81feecb75a364f7969f8df8f8eb9'" >修改</el-dropdown-item>
<el-dropdown-item :disabled="scope.row.validFlag===1" :command="[scope.row, '删除']" v-btn-permission="'aa33df0f6f1890e3381aa4f1ed6aebec'" >删除</el-dropdown-item> <el-dropdown-item :disabled="scope.row.validFlag===1" :command="[scope.row, '删除']" v-btn-permission="'0cbf713be29e63b6c6eff5d1aec59c64'" >删除</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
</div> </div>
src/pages/config/pages/attributeCustom/components/laws.vue
+7 -7
View File
@@ -2,8 +2,8 @@
<template> <template>
<div class="attribute-custom v-class"> <div class="attribute-custom v-class">
<div class="action-bar1"> <div class="action-bar1">
<el-button class="common-button-primary add-button" style="margin-right: 5px" size="mini" type="primary" v-btn-permission="'fe7880ecf38dc55c02d9013f72b6242a'" @click="showAddModel">新增</el-button> <el-button class="common-button-primary add-button" style="margin-right: 5px" size="mini" type="primary" v-btn-permission="'fa21906587bacdcaf0a72f995db4e40d'" @click="showAddModel">新增</el-button>
<el-button class="common-button-default" size="small" @click="showDisplayLocationDialog" v-btn-permission="'85b2b303cce28234fafa1f5ab12ba61d'">展示区域管理</el-button> <el-button class="common-button-default" size="small" v-btn-permission="'85b2b303cce28234fafa1f5ab12ba61d'" @click="showDisplayLocationDialog">展示区域管理</el-button>
</div> </div>
<loading :loading="attributeDataLoading">数据处理中</loading> <loading :loading="attributeDataLoading">数据处理中</loading>
<div class="content"> <div class="content">
@@ -76,8 +76,8 @@
<el-dropdown trigger="click" @command="handleCommand"> <el-dropdown trigger="click" @command="handleCommand">
<i class="iconfont">&#xe61e;</i> <i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'18f50c76137df9b3112d07942b0d517f'">编辑</el-dropdown-item> <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'1954a5c1fbef6722037b8e12b035d13f'">编辑</el-dropdown-item>
<el-dropdown-item :disabled="scope.row.isEdit==='1'" v-btn-permission="'8040f3cbceb668f7791c2182e620a051'" :command="[scope.row, '删除']">删除</el-dropdown-item> <el-dropdown-item :disabled="scope.row.isEdit==='1'" v-btn-permission="'2ede47a179e37347b7aacfd9d139085f'" :command="[scope.row, '删除']">删除</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
</div> </div>
@@ -199,7 +199,7 @@
width="400px" width="400px"
> >
<div style="margin-bottom: 10px;"> <div style="margin-bottom: 10px;">
<el-button class="common-button-primary add-button" type="primary" icon="add" @click="showAddDisplayLocationDialog(undefined)" v-btn-permission="'b12bdf78f2f6cff502bf5e520832d8ea'">新增</el-button> <el-button class="common-button-primary add-button" type="primary" icon="add" @click="showAddDisplayLocationDialog(undefined)" v-btn-permission="'1468f4d8f5b784512a8942db2da1a13b'">新增</el-button>
</div> </div>
<el-table <el-table
:loading="displayLocationDialogTableConfig.loading" :loading="displayLocationDialogTableConfig.loading"
@@ -230,8 +230,8 @@
<el-dropdown trigger="click" @command="handleCommand2"> <el-dropdown trigger="click" @command="handleCommand2">
<i class="iconfont">&#xe61e;</i> <i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="[scope.row, '修改']" v-btn-permission="'7c7a446f6dd661bce1e0bb9319b38753'">修改</el-dropdown-item> <el-dropdown-item :command="[scope.row, '修改']" v-btn-permission="'d1ed6ed77afa8395d2fd9ee6351bb78d'">修改</el-dropdown-item>
<el-dropdown-item :disabled="scope.row.validFlag===1" :command="[scope.row, '删除']" v-btn-permission="'681bb0153c74b070b76e63ce020b8477'">删除</el-dropdown-item> <el-dropdown-item :disabled="scope.row.validFlag===1" :command="[scope.row, '删除']" v-btn-permission="'dcddb2abd19e51067fef994736057b8c'">删除</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
</div> </div>
src/pages/config/pages/attributeCustom/index.vue
+42 -7
View File
@@ -1,19 +1,19 @@
<template> <template>
<div class="wx-custom-tab"> <div class="wx-custom-tab">
<el-tabs v-model="tabValue" style="height: 100%;"> <el-tabs v-model="tabValue" style="height: 100%;">
<el-tab-pane label="国内外标准法规" name="stand"> <el-tab-pane label="国内外标准法规" name="stand" v-if="regulations" >
<div style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;"> <div style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
<stand v-if="tabValue === 'stand'" v-btn-permission="'ad3ef2b8b8487229e52a7fe93416c437'"></stand> <stand v-if="tabValue === 'stand'"></stand>
</div> </div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="国内外政策" name="laws" > <el-tab-pane label="国内外政策" name="laws" v-if="policy">
<div style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;"> <div style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
<laws v-if="tabValue === 'laws'" v-btn-permission="'efcbe65f90d3a23f0be5df5ad60d1dac'"></laws > <laws v-if="tabValue === 'laws'" ></laws >
</div> </div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="企业标准库" name="buss"> <el-tab-pane label="企业标准库" name="buss" v-if="library">
<div style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;"> <div style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
<buss v-if="tabValue === 'buss'" v-btn-permission="'7feeb73929c25a6f1fd67952704ec02b'"></buss> <buss v-if="tabValue === 'buss'" ></buss>
</div> </div>
</el-tab-pane> </el-tab-pane>
<!-- <el-tab-pane label="其他" name="other"> <!-- <el-tab-pane label="其他" name="other">
@@ -40,7 +40,42 @@ export default {
}, },
data () { data () {
return { return {
tabValue: 'stand' tabValue: 'stand',
regulations: false,
policy: false,
library: false,
menuName: [ "国内外标准法规", "国内外政策", "企业标准库"]
}
},
mounted() {
const menuList = this.$store.getters.getMenuList;
let menuData = [];
let menuID = ["ad3ef2b8b8487229e52a7fe93416c437", "efcbe65f90d3a23f0be5df5ad60d1dac", "7feeb73929c25a6f1fd67952704ec02b"];
this.menuName.forEach(item => {
for (let i = 0; i < menuList.length; i++) {
let entity = menuList[i];
if (item != entity.menuName) continue;
if (menuID.indexOf(entity.id) >= 0 && menuData.indexOf(entity.id) == -1) {
menuData.push(entity.id);
if (entity.id === "ad3ef2b8b8487229e52a7fe93416c437") {
this.regulations = true
} else if (entity.id === "efcbe65f90d3a23f0be5df5ad60d1dac") {
this.policy = true
} else if (entity.id === "7feeb73929c25a6f1fd67952704ec02b") {
this.library = true
}
}
}
});
if (this.regulations === true) {
this.activeName = "stand"
return;
} else if (this.skill === true) {
this.policy = "laws"
return;
}else if (this.skill === true) {
this.library = "buss"
return;
} }
} }
} }
src/pages/config/pages/linkManage/index.vue
+98 -68
View File
@@ -1,68 +1,98 @@
<!-- 配置管理 - 链接管理 --> <!-- 配置管理 - 链接管理 -->
<template> <template>
<div class="data-link"> <div class="data-link">
<el-tabs v-model="activeName"> <el-tabs v-model="activeName">
<el-tab-pane label="第一行链接" name="firstLink"> <el-tab-pane label="第一行链接" name="firstLink" v-if="project">
<first-link v-if="activeName === 'firstLink'"></first-link> <first-link v-if="activeName === 'firstLink'" ></first-link>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="第二行链接" name="secondLink"> <el-tab-pane label="第二行链接" name="secondLink" v-if="skill">
<second-link v-if="activeName === 'secondLink'"></second-link> <second-link v-if="activeName === 'secondLink'" ></second-link>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
</template> </template>
<script> <script>
import firstLink from "./linkType/firstLink"; import firstLink from "./linkType/firstLink";
import secondLink from "./linkType/secondLink"; import secondLink from "./linkType/secondLink";
export default { export default {
name: "linkManage", name: "linkManage",
components: { components: {
firstLink, firstLink,
secondLink secondLink
}, },
data() { data() {
return { return {
activeName: 'firstLink', skill: false,
} project: false,
}, activeName: 'firstLink',
methods: { menuName: [ "第一行链接", "第二行链接"]
}, }
} },
</script> methods: {
<style lang="less" scoped> },
@import '~@/assets/styles/mixins'; mounted() {
.data-link{ const menuList = this.$store.getters.getMenuList;
height: 100%; let menuData = [];
padding: 0 10px; let menuID = ["c8355290d8ece5202db506405c7df6fd", "b22bdd0959e5a445fd90a9e0e7a8f607"];
background: #fff; this.menuName.forEach(item => {
display: flex; for (let i = 0; i < menuList.length; i++) {
flex-direction: column; let entity = menuList[i];
if (item != entity.menuName) continue;
/deep/ .el-tabs { if (menuID.indexOf(entity.id) >= 0 && menuData.indexOf(entity.id) == -1) {
flex: auto; menuData.push(entity.id);
display: flex; if (entity.id === "c8355290d8ece5202db506405c7df6fd") {
flex-direction: column; this.project = true
} else if (entity.id === "b22bdd0959e5a445fd90a9e0e7a8f607") {
/deep/ .el-tabs__header { this.skill = true
margin: 0 !important; }
} }
}
.el-tabs__content { });
height: 100% !important; if (this.project === true) {
flex: auto; this.activeName = "firstLink"
position: relative; return;
display: flex; } else if (this.skill === true) {
flex-direction: column; this.activeName = "secondLink"
return;
.el-tab-pane { }
height: 100%; }
flex: auto; }
display: flex; </script>
flex-direction: column;
} <style lang="less" scoped>
} @import '~@/assets/styles/mixins';
} .data-link{
} height: 100%;
</style> padding: 0 10px;
background: #fff;
display: flex;
flex-direction: column;
/deep/ .el-tabs {
flex: auto;
display: flex;
flex-direction: column;
/deep/ .el-tabs__header {
margin: 0 !important;
}
.el-tabs__content {
height: 100% !important;
flex: auto;
position: relative;
display: flex;
flex-direction: column;
.el-tab-pane {
height: 100%;
flex: auto;
display: flex;
flex-direction: column;
}
}
}
}
</style>
src/pages/config/pages/linkManage/linkType/firstLink.vue
+4 -4
View File
@@ -6,8 +6,8 @@
<el-button <el-button
type="primary" type="primary"
class="common-button-primary add-button" class="common-button-primary add-button"
@click="addLink"
v-btn-permission="'a87f58f50bed49452ee2a9147254b16b'" v-btn-permission="'a87f58f50bed49452ee2a9147254b16b'"
@click="addLink"
size="mini">新增 size="mini">新增
</el-button> </el-button>
<!-- <el-button <!-- <el-button
@@ -21,7 +21,7 @@
type="danger" type="danger"
class="common-button-primary add-button" class="common-button-primary add-button"
@click="deleteAllLink" @click="deleteAllLink"
v-btn-permission="'cd639217443270d5c858fc593b439f79'" v-btn-permission="'436653a7e2e55c427dda1f1d0faa4fca'"
size="mini">删除 size="mini">删除
</el-button> </el-button>
</div> </div>
@@ -65,10 +65,10 @@
show-overflow-tooltip show-overflow-tooltip
label="链接"> label="链接">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.url.slice(0,7) === 'http://' || scope.row.url.slice(0,8) === 'https://'" @click="linkto(scope.row.url)" style="color: #0c91e5;cursor: pointer;text-decoration: underline"> <span v-if="scope.row.url.slice(0,7) === 'http://' || scope.row.url.slice(0,8) === 'https://'" @click="linkto(scope.row.url)" style="color: #0c91e5;cursor: pointer;text-decoration: underline" v-btn-permission="'7ce85b4b537f2a78db0c468beec5c08f'">
{{ scope.row.url }} {{ scope.row.url }}
</span> </span>
<span v-else @click="linkto('http://' + scope.row.url)" style="color: #0c91e5;cursor: pointer;text-decoration: underline"> <span v-else @click="linkto('http://' + scope.row.url)" style="color: #0c91e5;cursor: pointer;text-decoration: underline" v-btn-permission="'7ce85b4b537f2a78db0c468beec5c08f'">
{{ 'http://' + scope.row.url }} {{ 'http://' + scope.row.url }}
</span> </span>
</template> </template>
src/pages/config/pages/linkManage/linkType/secondLink.vue
+3 -3
View File
@@ -21,7 +21,7 @@
type="danger" type="danger"
class="common-button-primary add-button" class="common-button-primary add-button"
@click="deleteAllLink" @click="deleteAllLink"
v-btn-permission="'74725d0f8bf0df73bc9c297358803588'" v-btn-permission="'20ddefa1588cbebeee5372d7f5389693'"
size="mini">删除 size="mini">删除
</el-button> </el-button>
</div> </div>
@@ -65,10 +65,10 @@
show-overflow-tooltip show-overflow-tooltip
label="链接"> label="链接">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.url.slice(0,7) === 'http://' || scope.row.url.slice(0,8) === 'https://'" @click="linkto(scope.row.url)" style="color: #0c91e5;cursor: pointer;text-decoration: underline"> <span v-if="scope.row.url.slice(0,7) === 'http://' || scope.row.url.slice(0,8) === 'https://'" @click="linkto(scope.row.url)" style="color: #0c91e5;cursor: pointer;text-decoration: underline" v-btn-permission="'ce8bfa18d70a122aa96b945a766cf290'">
{{ scope.row.url }} {{ scope.row.url }}
</span> </span>
<span v-else @click="linkto('http://' + scope.row.url)" style="color: #0c91e5;cursor: pointer;text-decoration: underline"> <span v-else @click="linkto('http://' + scope.row.url)" style="color: #0c91e5;cursor: pointer;text-decoration: underline" v-btn-permission="'ce8bfa18d70a122aa96b945a766cf290'">
{{ 'http://' + scope.row.url }} {{ 'http://' + scope.row.url }}
</span> </span>
</template> </template>
src/pages/config/pages/operationLog/index.vue
+222 -220
View File
@@ -1,220 +1,222 @@
<template> <template>
<div class="Operation-log"> <div class="Operation-log">
<div class="search-area"> <div class="search-area">
<div class="left"> <div class="left">
<el-form <el-form
ref="searchForm" ref="searchForm"
:model="searchForm" :model="searchForm"
inline inline
> >
<el-form-item label="操作人" class="search-item"> <el-form-item label="操作人" class="search-item">
<el-input <el-input
v-model="searchForm.account" v-model="searchForm.account"
style="display: none;" style="display: none;"
></el-input> ></el-input>
<el-input <el-input
v-model="searchForm.accountName" v-model="searchForm.accountName"
placeholder="请选择操作人" placeholder="请选择操作人"
readonly="readonly" readonly="readonly"
@click.native="choiceZRR" @click.native="choiceZRR"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="开始日期" > <el-form-item label="开始日期" >
<el-date-picker <el-date-picker
v-model="searchForm.sTime" v-model="searchForm.sTime"
type="datetime" type="datetime"
placeholder="请选择开始日期" placeholder="请选择开始日期"
size="small" size="small"
value-format="yyyy-MM-dd HH:mm:ss"> value-format="yyyy-MM-dd HH:mm:ss">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="结束日期" > <el-form-item label="结束日期" >
<el-date-picker <el-date-picker
v-model="searchForm.eTime" v-model="searchForm.eTime"
type="datetime" type="datetime"
placeholder="请选择结束日期" placeholder="请选择结束日期"
size="small" size="small"
value-format="yyyy-MM-dd HH:mm:ss"> value-format="yyyy-MM-dd HH:mm:ss">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="操作类型" class="search-item"> <el-form-item label="操作类型" class="search-item">
<el-select v-model="searchForm.oper" clearable placeholder="请选择操作类型"> <el-select v-model="searchForm.oper" clearable placeholder="请选择操作类型">
<el-option <el-option
v-for="(item, index) in typeList" v-for="(item, index) in typeList"
placeholder="请选择操作类型" placeholder="请选择操作类型"
:key="index" :key="index"
:value="item.oper" :value="item.oper"
:label="item.oper" :label="item.oper"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="操作内容" class="search-item"> <el-form-item label="操作内容" class="search-item">
<el-input <el-input
v-model="searchForm.content" v-model="searchForm.content"
placeholder="请选择操作内容" placeholder="请选择操作内容"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="" class="search-item btn-box"> <el-form-item label="" class="search-item btn-box">
<el-button <el-button
class="common-button-primary" class="common-button-primary"
type="primary" type="primary"
size="mini" size="mini"
@click="searchBtn" @click="searchBtn"
>搜索</el-button> v-btn-permission="'ef2d8c0d8ab743e8b344c8a0f5c330cf'"
</el-form-item> >搜索</el-button>
<el-form-item label="" class="search-item btn-box"> </el-form-item>
<el-button <el-form-item label="" class="search-item btn-box">
class="common-button-default" <el-button
@click="resetSelect" class="common-button-default"
size="mini" @click="resetSelect"
>清空</el-button> size="mini"
</el-form-item> v-btn-permission="'c8605037fd040fd480b052d6e9dd8d13'"
</el-form> >清空</el-button>
</div> </el-form-item>
</div> </el-form>
<div class="content"> </div>
<el-table </div>
stripe <div class="content">
ref="selections" <el-table
tooltip-effect="dark" stripe
border ref="selections"
height="100%" tooltip-effect="dark"
:data="data" border
class="table" height="100%"
:header-cell-style="{ :data="data"
background: '#e8e8e8', class="table"
color: '#333333', :header-cell-style="{
fontSize: '16px', background: '#e8e8e8',
fontWeight: 'bold', color: '#333333',
height: '48px', fontSize: '16px',
}"> fontWeight: 'bold',
<el-table-column prop="account" label="操作人"> height: '48px',
</el-table-column> }">
<el-table-column prop="dept" label="所属部门"> <el-table-column prop="account" label="操作人">
</el-table-column> </el-table-column>
<el-table-column prop="operTime" label="操作时间"> <el-table-column prop="dept" label="所属部门">
</el-table-column> </el-table-column>
<el-table-column prop="oper" label="操作类型"> <el-table-column prop="operTime" label="操作时间">
</el-table-column> </el-table-column>
<el-table-column prop="special" label="操作内容"> <el-table-column prop="oper" label="操作类型">
</el-table-column> </el-table-column>
</el-table> <el-table-column prop="special" label="操作内容">
<loading :loading="dataLoading">数据处理中</loading> </el-table-column>
</div> </el-table>
<pagination <loading :loading="dataLoading">数据处理中</loading>
:total="total" </div>
:pageChange="searchForm.page" <pagination
:pageSizeChange="searchForm.pageSize" :total="total"
@pageChange="pageChange" :pageChange="searchForm.page"
@pageSizeChange="pageSizeChange" :pageSizeChange="searchForm.pageSize"
></pagination> @pageChange="pageChange"
<Role-tree @pageSizeChange="pageSizeChange"
check-box ></pagination>
:is-title="'选择操作人'" <Role-tree
:is-visible.sync="modalshowflag" check-box
@checkedRole="checkedRole" :is-title="'选择操作人'"
:nodeList="nodeList" :is-visible.sync="modalshowflag"
></Role-tree> @checkedRole="checkedRole"
</div> :nodeList="nodeList"
</template> ></Role-tree>
<script> </div>
export default { </template>
name: "OperationLog", <script>
data () { export default {
return { name: "OperationLog",
dataLoading: false, data () {
total: 0, return {
data: [], dataLoading: false,
typeList: [], total: 0,
styles: { data: [],
height: 'calc(100% - 55px)', typeList: [],
overflow: 'auto', styles: {
paddingBottom: '53px', height: 'calc(100% - 55px)',
position: 'static' overflow: 'auto',
}, paddingBottom: '53px',
searchForm: { position: 'static'
accountName: '', },
account: '', searchForm: {
sTime: '', accountName: '',
eTime: '', account: '',
oper: '', sTime: '',
content: '', eTime: '',
page: 1, oper: '',
pageSize: this.$store.getters.userInfo.configContent, content: '',
}, page: 1,
nodeList: [], pageSize: this.$store.getters.userInfo.configContent,
modalshowflag: false, },
} nodeList: [],
}, modalshowflag: false,
methods: { }
checkedRole (data) { },
this.searchForm.account = data[0].id methods: {
this.searchForm.accountName = data[0].name checkedRole (data) {
}, this.searchForm.account = data[0].id
choiceZRR () { this.searchForm.accountName = data[0].name
this.nodeList = [] },
this.nodeList.push(this.searchForm.account) choiceZRR () {
this.modalshowflag = true this.nodeList = []
}, this.nodeList.push(this.searchForm.account)
searchBtn () { this.modalshowflag = true
this.searchForm.page = 1 },
this.getData() searchBtn () {
}, this.searchForm.page = 1
getData () { this.getData()
this.$http.get('sysLog/sys-log/getAllLog', this.searchForm, { },
_this: this, getData () {
loading: 'dataLoading' this.$http.get('sysLog/sys-log/getAllLog', this.searchForm, {
}, res => { _this: this,
if (res.ok) { loading: 'dataLoading'
this.total = res.data.total; }, res => {
res.data.records.forEach(item => { if (res.ok) {
item.account = "(" + item.account + ")" + item.accountName; this.total = res.data.total;
}); res.data.records.forEach(item => {
this.data = res.data.records; item.account = "(" + item.account + ")" + item.accountName;
} });
}) this.data = res.data.records;
}, }
pageChange (page) { })
this.searchForm.page = page },
this.getData() pageChange (page) {
}, this.searchForm.page = page
pageSizeChange (pageSize) { this.getData()
this.searchForm.pageSize = pageSize },
this.getData() pageSizeChange (pageSize) {
}, this.searchForm.pageSize = pageSize
resetSelect () { this.getData()
this.searchForm.page = 1 },
this.searchForm.accountName = '' resetSelect () {
this.searchForm.account = '' this.searchForm.page = 1
this.searchForm.sTime = '' this.searchForm.accountName = ''
this.searchForm.eTime = '' this.searchForm.account = ''
this.searchForm.oper = '' this.searchForm.sTime = ''
this.searchForm.content = '' this.searchForm.eTime = ''
this.getData() this.searchForm.oper = ''
}, this.searchForm.content = ''
}, this.getData()
mounted () { },
this.getData() },
this.$http.get('sysLog/sys-log/getLogOper', {}, { mounted () {
_this: this, this.getData()
}, res => { this.$http.get('sysLog/sys-log/getLogOper', {}, {
if (res.ok) { _this: this,
this.typeList = res.data }, res => {
} if (res.ok) {
}) this.typeList = res.data
} }
} })
</script> }
<style lang="less" scoped> }
.Operation-log { </script>
height: 100%; <style lang="less" scoped>
.content { .Operation-log {
height: calc(~"100% - 55px - 56px"); height: 100%;
overflow-y: auto; .content {
} height: calc(~"100% - 55px - 56px");
.search-select.el-dropdown { overflow-y: auto;
width: 100%; }
} .search-select.el-dropdown {
} width: 100%;
</style> }
}
</style>
src/pages/config/pages/postManage/index.vue
+4 -2
View File
@@ -244,7 +244,8 @@
this.submitLoading = true this.submitLoading = true
this.$http.postData('sarPosition/position/role', { this.$http.postData('sarPosition/position/role', {
positionId: this.selectList[0].id, positionId: this.selectList[0].id,
roleIds: this.$refs.tree.getCheckedKeys().concat(this.$refs.tree.getHalfCheckedKeys()) roleIds: this.$refs.tree.getCheckedKeys().concat(this.$refs.tree.getHalfCheckedKeys()),
operator: this.$store.getters.userInfo.account,
}, {}, res=> { }, {}, res=> {
if (res.ok) { if (res.ok) {
this.$message.success('配置成功') this.$message.success('配置成功')
@@ -336,7 +337,8 @@
} else { } else {
this.$http.put('sarPosition/position', { this.$http.put('sarPosition/position', {
id: this.editId, id: this.editId,
name: this.sarStandardsInfoEO.name name: this.sarStandardsInfoEO.name,
operator : this.$store.getters.userInfo.account
}, { }, {
_this: this, _this: this,
loading: 'Loading' loading: 'Loading'
src/pages/config/pages/roleManage/index.vue
+13 -3
View File
@@ -183,7 +183,7 @@
<div slot="footer"> <div slot="footer">
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="closeDialogData">取消 <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="closeDialogData">取消
</el-button> </el-button>
<el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="confirmDialogData"> <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" :loading="btnLoading" @click="confirmDialogData">
确定 确定
</el-button> </el-button>
</div> </div>
@@ -214,7 +214,7 @@
<div slot="footer"> <div slot="footer">
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="closeDialogData2">取消 <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="closeDialogData2">取消
</el-button> </el-button>
<el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="confirmDialogData2"> <el-button class="common-button-primary" size="mini" icon="el-icon-check" :loading="btnLoading" type="primary" @click="confirmDialogData2">
确定 确定
</el-button> </el-button>
</div> </div>
@@ -311,7 +311,7 @@
title="查看人员" title="查看人员"
:visible.sync="RoleModel" :visible.sync="RoleModel"
@close="RoleCancle" @close="RoleCancle"
size="1100px" size="900px"
class="not-footer-drawer" class="not-footer-drawer"
> >
<div class="demo-drawer-content"> <div class="demo-drawer-content">
@@ -358,6 +358,11 @@
height="100%" height="100%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}"> fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
<el-table-column
align="center"
prop="institutionName"
label="所属部门">
</el-table-column>
<el-table-column <el-table-column
align="center" align="center"
prop="uname" prop="uname"
@@ -438,6 +443,7 @@ export default {
label: 'menuName' label: 'menuName'
}, },
nodeList2: [], nodeList2: [],
btnLoading: false,
nodeList4: [], nodeList4: [],
modalflag: false, modalflag: false,
modalflag2: false, modalflag2: false,
@@ -683,6 +689,7 @@ export default {
}) })
}, },
confirmDialogData() { confirmDialogData() {
this.btnLoading = true
this.$http.postData('sarRole/role/resource', { this.$http.postData('sarRole/role/resource', {
resourceIds: this.$refs.tree3.getCheckedKeys().concat(this.$refs.tree3.getHalfCheckedKeys()), resourceIds: this.$refs.tree3.getCheckedKeys().concat(this.$refs.tree3.getHalfCheckedKeys()),
roleId: this.id roleId: this.id
@@ -691,10 +698,12 @@ export default {
this.$message.success('设置权限成功') this.$message.success('设置权限成功')
this.modalflag = false this.modalflag = false
} }
this.btnLoading = false
}) })
}, },
//配置数据确定按钮 //配置数据确定按钮
confirmDialogData2(){ confirmDialogData2(){
this.btnLoading = true
let menuIds = this.$refs.tree4.getCheckedKeys().join(',') let menuIds = this.$refs.tree4.getCheckedKeys().join(',')
this.$http.postData('tsRoleMeunData/ts-role-menu-data/saveBatch', { this.$http.postData('tsRoleMeunData/ts-role-menu-data/saveBatch', {
menuIds: menuIds, menuIds: menuIds,
@@ -706,6 +715,7 @@ export default {
}else{ }else{
this.$message.warning(res.message) this.$message.warning(res.message)
} }
this.btnLoading = false
}) })
}, },
closeDialogData() { closeDialogData() {
src/pages/details/otherBussStandardDetails/index.vue
+76 -54
View File
@@ -351,81 +351,83 @@
<template v-if = "item.label === '基础信息'"> <template v-if = "item.label === '基础信息'">
<div class="details-content-modular basic-information" style="margin-bottom: 0"> <div class="details-content-modular basic-information" style="margin-bottom: 0">
<div class="basic-information-content"> <div class="basic-information-content">
<p class="" style="color: #C42626;"><label style=" margin-right: 171px;">企标号</label><span>{{ sarStandardsInfoEO.standCode }}</span></p> <p class=""><label style=" margin-right: 171px;">企标号</label><span>{{ sarStandardsInfoEO.standCode }}</span></p>
<template v-for="(child, childIndex) in item.child1"> <template v-for="(child, childIndex) in item.child1">
<div class="files-title" style="border-bottom: 1px solid #E5E5E5"> <div class="files-title" style="border-bottom: 1px solid #E5E5E5">
<label style=" margin-right: 172px;">{{ child.attrName }}</label> <label style="float: left;">{{ child.attrName }}</label>
<template v-if="child.value && child.value.length > 0" v-for="(file, fileIndex) in child1Func(child.value)"> <div style="margin-left: 220px;">
<!-- 单个文件--> <div v-if="child.value && child.value.length > 0" v-for="(file, fileIndex) in child1Func(child.value)" style="line-height: 50px;">
<span v-if="child.value && child.value.length > 0 && child.value.length === 1"> <!-- 单个文件-->
<a style="font-size: 16px;color: #409EFF;cursor: pointer" @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">{{ file.oldFileName }}</a> <span v-if="child.value && child.value.length > 0 && child.value.length === 1">
<a style="font-size: 16px;color: #409EFF;cursor: pointer" @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">{{ file.oldFileName | ellipsis50 }}</a>
<i <i
title="下载" title="下载"
@click="downloadFile(file.id)" @click="downloadFile(file.id)"
class="icon-download" class="icon-download"
v-btn-permission="QFTP ? '7f13a22a53f9f76f56f5193f9a04389d' : '9882f477aad895ec56a7464f3e9c0b11'" v-btn-permission="QFTP ? '7f13a22a53f9f76f56f5193f9a04389d' : '9882f477aad895ec56a7464f3e9c0b11'"
/> />
<i <i
title="下载带水印" title="下载带水印"
v-show="file.fileSuffix === 'pdf' || file.fileSuffix === 'PDF'" v-show="file.fileSuffix === 'pdf' || file.fileSuffix === 'PDF'"
@click="downloadFileByWater(file.id, file.fileSuffix)" @click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2" class="icon-download2"
v-btn-permission="QFTP ? '6dbbd2d6b808cc0f02b22c97e9d34c54' : '9bab2662fbd9d0507b39be813371a597'" v-btn-permission="QFTP ? '6dbbd2d6b808cc0f02b22c97e9d34c54' : '9bab2662fbd9d0507b39be813371a597'"
/> />
<!-- <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>--> <!-- <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
</span> </span>
<!-- 多个文件--> <!-- 多个文件-->
<div v-else-if="child.value && child.value.length > 0"> <div v-else-if="child.value && child.value.length > 0" style="line-height: 50px;">
<span style="margin-left: 19%"> <span>
<a style="font-size: 16px;color: #409EFF;cursor: pointer" <a style="font-size: 16px;color: #409EFF;cursor: pointer"
@click="openFileInPdf(file.id, file.oldFileName)" target="_blank" @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
:title="file.oldFileName">{{ file.oldFileName }}</a> :title="file.oldFileName">{{ file.oldFileName | ellipsis50}}</a>
<i <i
title="下载" title="下载"
@click="downloadFile(file.id)" @click="downloadFile(file.id)"
class="icon-download" class="icon-download"
v-btn-permission="QFTP ? '7f13a22a53f9f76f56f5193f9a04389d' : '9882f477aad895ec56a7464f3e9c0b11'" v-btn-permission="QFTP ? '7f13a22a53f9f76f56f5193f9a04389d' : '9882f477aad895ec56a7464f3e9c0b11'"
/> />
<i <i
title="下载带水印" title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)" @click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2" class="icon-download2"
v-btn-permission="QFTP ? '6dbbd2d6b808cc0f02b22c97e9d34c54' : '9bab2662fbd9d0507b39be813371a597'" v-btn-permission="QFTP ? '6dbbd2d6b808cc0f02b22c97e9d34c54' : '9bab2662fbd9d0507b39be813371a597'"
/> />
</span> </span>
<!-- <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>--> <!-- <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
</div> </div>
<!-- <el-button--> <!-- <el-button-->
<!-- v-if="child.attrField === itemNam "--> <!-- v-if="child.attrField === itemNam "-->
<!-- v-for="(itemNam,index) in itemExistList"--> <!-- v-for="(itemNam,index) in itemExistList"-->
<!-- :key="index"--> <!-- :key="index"-->
<!-- @click="showItemsModel(child.attrField)"--> <!-- @click="showItemsModel(child.attrField)"-->
<!-- class="decomposition-btn"--> <!-- class="decomposition-btn"-->
<!-- style="right:62px"--> <!-- style="right:62px"-->
<!-- icon="icon-separate"--> <!-- icon="icon-separate"-->
<!-- >标准分解单--> <!-- >标准分解单-->
<!-- </el-button>--> <!-- </el-button>-->
<!-- <el-button v-if="child.value.length > 1" style="color:#409EFF;border: 1px solid #409EFF;background: rgba(64, 158, 255, 0.1);"--> <!-- <el-button v-if="child.value.length > 1" style="color:#409EFF;border: 1px solid #409EFF;background: rgba(64, 158, 255, 0.1);"-->
<!-- class="decomposition-btn" icon="icon-relation" @click="relateEvent1(child.value)">更多</el-button>--> <!-- class="decomposition-btn" icon="icon-relation" @click="relateEvent1(child.value)">更多</el-button>-->
</template> </div>
</div>
<template v-if="child.value === null" >-</template> <template v-if="child.value === null" >-</template>
</div> </div>
</template> </template>
<p><label style="margin-right: 157px;">中文名称</label><span>{{ sarStandardsInfoEO.standName || '-' }}</span></p> <p><label style="margin-right: 157px;">中文名称</label><span>{{ sarStandardsInfoEO.standName || '-' }}</span></p>
<p v-if="activeState"><label style=" margin-right: 157px;">英文名称</label><span>{{ sarStandardsInfoEO.standEnName || '-' }}</span></p> <p v-if="activeState" style="border-bottom: none;"><label style=" margin-right: 157px;">英文名称</label><span>{{ sarStandardsInfoEO.standEnName || '-' }}</span></p>
<p class="half"> <p class="half">
<label style=" margin-right: 156px;" <label style=" margin-right: 156px;"
title="“修订中”为现行有效版本；“已修订”标准的有效性需根据实际实施情况判定" title="“修订中”为现行有效版本；“已修订”标准的有效性需根据实际实施情况判定"
>文本状态</label><span style="color: #409EFF;">{{ sarStandardsInfoEO.textStatusBussShow || '-' }}</span> >文本状态</label><span>{{ sarStandardsInfoEO.textStatusBussShow || '-' }}</span>
</p> </p>
<p class="half"><label style=" margin-right: 157px;">发布日期</label><span>{{ sarStandardsInfoEO.issueTime || '-' }}</span></p> <p class="half"><label style=" margin-right: 157px;">发布日期</label><span>{{ sarStandardsInfoEO.issueTime || '-' }}</span></p>
<p class="half" style=""><label style=" margin-right: 122px;">标准实施日期</label><span>{{ sarStandardsInfoEO.putTime || '-' }}</span></p> <p class="half" style=""><label style=" margin-right: 122px;">企标实施日期</label><span>{{ sarStandardsInfoEO.putTime || '-' }}</span></p>
<template <template
v-for="(child, childIndex) in item.child" v-for="(child, childIndex) in item.child"
v-if="child.isShowImp === '0'" v-if="child.isShowImp === '0'"
> >
<p class="half"> <p class="half">
<label style=" margin-right: 157px;" :title="child.attrName">{{child.attrName}}</label> <label style=" margin-right: 150px;" :title="child.attrName">{{child.attrName}}</label>
<span :title="child.value || '-'"> <span :title="child.value || '-'">
<template v-if="child.value"> <template v-if="child.value">
{{ child.value }} {{ child.value }}
@@ -519,17 +521,18 @@
> >
{{ child.value || '-' }} {{ child.value || '-' }}
</span> </span>
<div v-else class="modular-content-p-flies"> <div v-else :class="(child.value === null || child.value.length === 0) ? 'file2' : 'modular-content-p-flies'">
<p <p
class="files-title" class="files-title"
v-for="(file, fileIndex) in child.value" v-for="(file, fileIndex) in child.value"
:key="fileIndex" :key="fileIndex"
> >
<a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{ file.oldFileName }}</a> <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{ file.oldFileName | ellipsis50}}</a>
<i title="下载" @click="downloadFile(file.id)" class="icon-download" v-btn-permission="'9882f477aad895ec56a7464f3e9c0b11'"/> <i title="下载" @click="downloadFile(file.id)" class="icon-download" v-btn-permission="'9882f477aad895ec56a7464f3e9c0b11'"/>
<i title="下载带水印" @click="downloadFileByWater(file.id, file.fileSuffix)" class="icon-download2" v-btn-permission="'9bab2662fbd9d0507b39be813371a597'"/> <i title="下载带水印" @click="downloadFileByWater(file.id, file.fileSuffix)" class="icon-download2" v-btn-permission="'9bab2662fbd9d0507b39be813371a597'"/>
<!-- <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>--> <!-- <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
</p> </p>
<template v-if="child.value === null || child.value.length === 0" >-</template>
<!-- <el-button--> <!-- <el-button-->
<!-- @click="showItemsModel(child.attrField)"--> <!-- @click="showItemsModel(child.attrField)"-->
<!-- class="decomposition-btn"--> <!-- class="decomposition-btn"-->
@@ -1321,6 +1324,13 @@ export default {
return value.slice(0,12) + '...' return value.slice(0,12) + '...'
} }
return value return value
},
ellipsis50 (value) {
if (!value) return ''
if (value.length > 50) {
return value.slice(0,50) + '...'
}
return value
} }
}, },
data () { data () {
@@ -2275,7 +2285,7 @@ export default {
_this: this _this: this
}, res => { }, res => {
this.sarStandardsInfoEO = res.data || {} this.sarStandardsInfoEO = res.data || {}
if (this.sarStandardsInfoEO.standCode.indexOf('Q/FT P') !== -1) { if (this.sarStandardsInfoEO.standCode && this.sarStandardsInfoEO.standCode.indexOf('Q/FT P') !== -1) {
this.QFTP = true this.QFTP = true
} }
// this.textOptions.forEach(item => { // this.textOptions.forEach(item => {
@@ -3226,6 +3236,18 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
@import '~@/assets/styles/mixins'; @import '~@/assets/styles/mixins';
@import '~@/assets/styles/style'; @import '~@/assets/styles/style';
/deep/ .file2 {
display: inline-block;
width: calc(100% - 225px);
min-height: 50px;
line-height: 50px;
font-size: 16px;
color: #333333;
word-break: break-all;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
/deep/ .el-collapse{ /deep/ .el-collapse{
border: none; border: none;
} }
@@ -3404,11 +3426,11 @@ export default {
min-height: 50px; min-height: 50px;
line-height: 50px; line-height: 50px;
font-size: 16px; font-size: 16px;
color: #999999; color: #333333;
word-break: break-all; word-break: break-all;
//overflow: hidden; overflow: hidden;
//white-space: nowrap; white-space: nowrap;
//text-overflow: ellipsis; text-overflow: ellipsis;
} }
.modular-content-p-flies{ .modular-content-p-flies{
position: relative; position: relative;
src/pages/details/otherStandardDetails/components/RelatedTermsSelect.vue
+6 -1
View File
@@ -48,6 +48,7 @@
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%;" style="width: 100%;"
height="100%" height="100%"
@selection-change="handleSelectionChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}" fontWeight: 'bold', height: '48px'}"
row-key="id" row-key="id"
@@ -115,6 +116,7 @@ export default {
return { return {
tableDataLoading: false, tableDataLoading: false,
total: 0, total: 0,
handleList: [],
selectRoleId: '', selectRoleId: '',
searchForm: { searchForm: {
standardKey: '', standardKey: '',
@@ -170,6 +172,10 @@ export default {
// this.resetSearchForm() // this.resetSearchForm()
this.queryTablePage() this.queryTablePage()
}, },
handleSelectionChange(data){
this.handleList = data
this.$emit('func',this.handleList)
},
pageChange (page) { pageChange (page) {
this.pageNo = page this.pageNo = page
@@ -183,7 +189,6 @@ export default {
resetPageNo() { resetPageNo() {
this.pageNo = 1 this.pageNo = 1
}, },
// 查询、加载表格 // 查询、加载表格
queryTablePage () { queryTablePage () {
const formData = { const formData = {
src/pages/details/otherStandardDetails/index.vue
+50 -33
View File
@@ -66,34 +66,35 @@
<!--发布稿（必读）--> <!--发布稿（必读）-->
<template v-for="(child, childIndex) in item.child1"> <template v-for="(child, childIndex) in item.child1">
<div class="files-titles" style="border-bottom: 1px solid #E5E5E5"> <div class="files-titles" style="border-bottom: 1px solid #E5E5E5">
<label style="margin-right: 164px;">{{ child.attrName }}</label> <label style="float: left">{{ child.attrName }}</label>
<template v-if="child.value && child.value.length > 0"> <template v-if="child.value && child.value.length > 0">
<!-- 单个文件时--> <!-- 单个文件时-->
<div v-for="(file, fileIndex) in child1Func(child.value)" style="position: relative;display: flex;"> <div style="position: relative;margin-left: 214px;">
<div v-for="(file, fileIndex) in child1Func(child.value)" style="display: flex;">
<span v-if="child.value && child.value.length > 0 && child.value.length === 1" style="display: flex; align-items: center;"> <span v-if="child.value && child.value.length > 0 && child.value.length === 1" style="display: flex; align-items: center;">
<a style="font-size: 16px;color: #409EFF;cursor: pointer;" <a style="font-size: 16px;color: #409EFF;cursor: pointer;"
@click="openFileInPdf(file.id, file.oldFileName)" target="_blank" @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
:title="file.oldFileName">{{ file.oldFileName }}</a> :title="file.oldFileName">{{ file.oldFileName | ellipsis50}}</a>
<i <i
title="下载" title="下载"
@click="downloadFile(file.id)" @click="downloadFile(file.id)"
class="icon-download" class="icon-download"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
/> />
<i <i
title="下载带水印" title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)" @click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2" class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
/> />
<!-- <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>--> <!-- <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
</span> </span>
<!-- 多个文件时--> <!-- 多个文件时-->
<div v-else-if="child.value && child.value.length > 0"> <div v-else-if="child.value && child.value.length > 0">
<span style="margin-left: 19%;display: flex; align-items: center;"> <span style="display: flex; align-items: center;">
<a style="font-size: 16px;color: #409EFF;cursor: pointer" <a style="font-size: 16px;color: #409EFF;cursor: pointer"
@click="openFileInPdf(file.id, file.oldFileName)" target="_blank" @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
:title="file.oldFileName">{{ file.oldFileName }}</a> :title="file.oldFileName">{{ file.oldFileName | ellipsis50}}</a>
<i <i
title="下载" title="下载"
@click="downloadFile(file.id)" @click="downloadFile(file.id)"
@@ -107,16 +108,15 @@
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
/> />
</span> </span>
<!-- <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>--> <!-- <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
</div> </div>
<el-button </div>
v-if="child.attrField === itemNam" <el-button
v-for="(itemNam,index) in itemExistList" v-if="child.attrField === 'FBGBJBD'"
:key="index"
@click="showItemsModel(child.attrField)" @click="showItemsModel(child.attrField)"
class="decomposition-btn" class="decomposition-btn"
>标准分解单 >标准分解单
</el-button> </el-button>
</div> </div>
<!-- <el-button v-if="child.value && child.value.length > 1"--> <!-- <el-button v-if="child.value && child.value.length > 1"-->
<!-- style="color:#409EFF;border: 1px solid #409EFF;background: rgba(64, 158, 255, 0.1);"--> <!-- style="color:#409EFF;border: 1px solid #409EFF;background: rgba(64, 158, 255, 0.1);"-->
@@ -1734,6 +1734,7 @@
> >
<div class="demo-drawer-content"> <div class="demo-drawer-content">
<related-terms-select <related-terms-select
@func="handleChangeList"
ref="relatedTermsSelect" ref="relatedTermsSelect"
:fileType="fileType" :fileType="fileType"
:stand-id="standId" :stand-id="standId"
@@ -1783,10 +1784,18 @@ export default {
return value.slice(0, 12) + '...' return value.slice(0, 12) + '...'
} }
return value return value
},
ellipsis50 (value) {
if (!value) return ''
if (value.length > 50) {
return value.slice(0,50) + '...'
}
return value
} }
}, },
data() { data() {
return { return {
handleList: [],
CycxOptions: [], CycxOptions: [],
activeNames: ['基础信息', '过程稿件', '实施日期'], activeNames: ['基础信息', '过程稿件', '实施日期'],
activeState: true, activeState: true,
@@ -2112,6 +2121,9 @@ export default {
props: {}, props: {},
watch: {}, watch: {},
methods: { methods: {
handleChangeList(data){
this.handleList = data
},
child1Func(child1) { child1Func(child1) {
const list = [] const list = []
if (child1 && child1.length > 1) { if (child1 && child1.length > 1) {
@@ -3647,17 +3659,22 @@ export default {
this.$refs['relatedTermsSelect'].handleCancel() this.$refs['relatedTermsSelect'].handleCancel()
}, },
//关联成功的提示
handleRelatedTermsDrawerSubmit() { handleRelatedTermsDrawerSubmit() {
this.btnLoading = true this.btnLoading = true
this.$refs['relatedTermsSelect'].handleSubmit(() => { if(this.handleList.length){
this.selectSarStandItems() this.$refs['relatedTermsSelect'].handleSubmit(() => {
this.selectSarStandItems()
this.btnLoading = false
this.$message({
message: '关联成功',
type: 'success'
});
})
}else{
this.$message.warning('请至少勾选一条条款进行关联')
this.btnLoading = false this.btnLoading = false
this.$message({ }
message: '关联成功',
type: 'success'
});
})
}, },
closeRelatedTermsDrawer() { closeRelatedTermsDrawer() {
this.$refs['relatedTermsDrawer'].closeDrawer() this.$refs['relatedTermsDrawer'].closeDrawer()
src/pages/home2/components/todoList/index.vue
+2 -2
View File
@@ -205,7 +205,7 @@ export default {
prcType: row.prcType prcType: row.prcType
} }
}) })
}else if (row.taskInfo === '批准'){ }else if (row.taskInfo === '起草单位高级经理审核'){
this.$router.push({ this.$router.push({
name: 'bussLibrary8', name: 'bussLibrary8',
query: { query: {
@@ -238,7 +238,7 @@ export default {
prcType: row.prcType prcType: row.prcType
} }
}) })
}else if (row.taskInfo === '培训'){ }else if (row.taskInfo === '批准'){
this.$router.push({ this.$router.push({
name: 'bussLibrary11', name: 'bussLibrary11',
query: { query: {
src/pages/localTool/standAutoSplit/index.vue
+18 -13
View File
@@ -993,19 +993,24 @@ export default {
}, { }, {
_this: this, loading: 'loading' _this: this, loading: 'loading'
}, res => { }, res => {
res.data.list.map((item, index) => { if(res.data.list.length){
if (item.collectId != null && item.collectId !== '') { res.data.list.map((item, index) => {
item.showNumber= item.splitStatus=='0' ? item.showNumber : item.standNumSplit if (item.collectId != null && item.collectId !== '') {
item.standName=item.splitStatus=='0' ? item.standName : item.standNameSplit item.showNumber= item.splitStatus=='0' ? item.showNumber : item.standNumSplit
item.collectBtn = false item.standName=item.splitStatus=='0' ? item.standName : item.standNameSplit
} else { item.collectBtn = false
item.showNumber= item.splitStatus=='0' ? item.showNumber : item.standNumSplit } else {
item.standName=item.splitStatus=='0' ? item.standName : item.standNameSplit item.showNumber= item.splitStatus=='0' ? item.showNumber : item.standNumSplit
item.collectBtn = true item.standName=item.splitStatus=='0' ? item.standName : item.standNameSplit
} item.collectBtn = true
}) }
this.standInfoList = res.data.list })
this.total = res.data.count this.standInfoList = res.data.list
this.total = res.data.count
}else{
this.splitInfoPage = 1
this.getSarFileSplitInfoEOPage()
}
}, e => { }, e => {
}) })
}, },
src/pages/localTool/standContrast/pages/contrastDetails.vue
+1 -1
View File
@@ -22,7 +22,7 @@
@click="getSarFileSplitInfoEOPage"> @click="getSarFileSplitInfoEOPage">
搜索 搜索
</el-button> </el-button>
<el-button size="mini" v-btn-permission="'c77d866909a907aff3afa2b6d2ac2204'" class="common-button-default" @click="clearSearchStand">清1空</el-button> <el-button size="mini" v-btn-permission="'c77d866909a907aff3afa2b6d2ac2204'" class="common-button-default" @click="clearSearchStand">清空</el-button>
</el-formItem> </el-formItem>
</el-form> </el-form>
</div> </div>
src/pages/personal/pages/my-collection/components/CollectionLaws.vue
+561 -561
View File
File diff suppressed because it is too large Load Diff
src/pages/personal/pages/my-collection/components/CollectionStandard.vue
+338 -338
View File
@@ -1,338 +1,338 @@
<!-- 已收藏的标准法规 --> <!-- 已收藏的标准法规 -->
<template> <template>
<div id="CollectionStandard"> <div id="CollectionStandard">
<table-tools-bar> <table-tools-bar>
<div slot="left"> <div slot="left">
<div class="search-area"> <div class="search-area">
<el-form :inline="true" class="label-input-form" @keyup.enter.native="selectStandardBtn"> <el-form :inline="true" class="label-input-form" @keyup.enter.native="selectStandardBtn">
<el-form-item label="标准法规标题" class="search-item search-item-last"> <el-form-item label="标准法规标题" class="search-item search-item-last">
<el-input v-model="search.name" <el-input v-model="search.name"
placeholder="请输入标准法规信息" placeholder="请输入标准法规信息"
clearable clearable
:maxlength="100" :maxlength="100"
@keyup.enter.native="selectStandardBtn"></el-input> @keyup.enter.native="selectStandardBtn"></el-input>
</el-form-item> </el-form-item>
<el-form-item class="search-item btn-box"> <el-form-item class="search-item btn-box">
<el-button <el-button
:loading="searching" :loading="searching"
type="primary" type="primary"
class="common-button-primary" class="common-button-primary"
size="mini" size="mini"
v-btn-permission="'a0926c279e15ef0a3a2bc782f93d15fa'" v-btn-permission="'b19a4a9ad4f0767f70d622f257800dd5'"
@click="selectStandardBtn"> @click="selectStandardBtn">
查询 查询
</el-button> </el-button>
<el-button <el-button
class="common-button-default" class="common-button-default"
size="mini" size="mini"
v-btn-permission="'63d0dbbae0bee0f0888295d6cc6ef9c3'" v-btn-permission="'16c7a9cd3d9c5d8e0575593e0f632d85'"
@click="resetSelect">清空</el-button> @click="resetSelect">清空</el-button>
<!-- <el-button--> <!-- <el-button-->
<!-- class="common-button-default"--> <!-- class="common-button-default"-->
<!-- size="mini"--> <!-- size="mini"-->
<!-- @click="cancleCollectBatch">--> <!-- @click="cancleCollectBatch">-->
<!--&lt;!&ndash; <i class="iconfont">&#xe602;</i>&ndash;&gt;--> <!--&lt;!&ndash; <i class="iconfont">&#xe602;</i>&ndash;&gt;-->
<!-- 取消收藏--> <!-- 取消收藏-->
<!-- </el-button>--> <!-- </el-button>-->
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
</div> </div>
<div slot="right"></div> <div slot="right"></div>
</table-tools-bar> </table-tools-bar>
<div class="content"> <div class="content">
<el-checkbox :value="checkAll" size="large" @change="handleSelectAll" :indeterminate="indeterminate" style="padding: 6px;padding-left: 15px " v-if="total > 0">全选</el-checkbox> <el-checkbox :value="checkAll" size="large" @change="handleSelectAll" :indeterminate="indeterminate" style="padding: 6px;padding-left: 15px " v-if="total > 0">全选</el-checkbox>
<div class="content-detail" v-if="total >0 && contentOpen"> <div class="content-detail" v-if="total >0 && contentOpen">
<div v-for="(item, index1) in standardList" :key="index1"> <div v-for="(item, index1) in standardList" :key="index1">
<div class="card domBtn"> <div class="card domBtn">
<el-col :span="1"><el-checkbox v-model="item.checked" size="large"></el-checkbox></el-col> <el-col :span="1"><el-checkbox v-model="item.checked" size="large"></el-checkbox></el-col>
<el-row> <el-row>
<div> <div>
<el-col :span="5" :offset="1" > <el-col :span="5" :offset="1" >
<i class="el-icon-collection-tag" style="position: relative; left: -15px" /> <i class="el-icon-collection-tag" style="position: relative; left: -15px" />
所属板块：{{ item.collectType === 'INLAND_STAND' ? '国内标准法规' : (item.collectType === 'FOREIGN_STAND' ? '海外标准法规' : '企业标准') }} 所属板块：{{ item.collectType === 'INLAND_STAND' ? '国内标准法规' : (item.collectType === 'FOREIGN_STAND' ? '海外标准法规' : '企业标准') }}
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-tooltip class="item" effect="dark" :content="item.collectTitle" placement="top" v-if="item.collectTitle"> <el-tooltip class="item" effect="dark" :content="item.collectTitle" placement="top" v-if="item.collectTitle">
<div class="left-contents" @click="getDetail(item)">标题：{{ item.collectTitle }}</div> <div class="left-contents" @click="getDetail(item)">标题：{{ item.collectTitle }}</div>
</el-tooltip> </el-tooltip>
<div v-else> <div v-else>
<div class="left-contents" @click="getDetail(item)">标题：{{ item.collectTitle }}</div> <div class="left-contents" @click="getDetail(item)">标题：{{ item.collectTitle }}</div>
</div> </div>
</el-col> </el-col>
<el-col :span="4" :offset="3">创建时间：{{getDate(item.creationTime)}}</el-col> <el-col :span="4" :offset="3">创建时间：{{getDate(item.creationTime)}}</el-col>
</div> </div>
<el-col :span="4"> <el-col :span="4">
<el-button size="mini" v-btn-permission="'fc2b045e1fe8a5e14feab48d3138df53'" @click="cancelStandard(item)" style="margin-top: -5px; border: 1px dashed #dcdee2">取消收藏</el-button> <el-button size="mini" v-btn-permission="'e0815e0f82f6b2af3a9b232cb916bdf8'" @click="cancelStandard(item)" style="margin-top: -5px; border: 1px dashed #dcdee2">取消收藏</el-button>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
</div> </div>
</div> </div>
<has-no-data pClass="content-detail" v-if="total === 0"></has-no-data> <has-no-data pClass="content-detail" v-if="total === 0"></has-no-data>
<loading :loading="loading">数据获取中</loading> <loading :loading="loading">数据获取中</loading>
</div> </div>
<pagination :total="total" :page="page" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination> <pagination :total="total" :page="page" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
name: 'collectionStandard', name: 'collectionStandard',
data () { data () {
return { return {
contentOpen: true, contentOpen: true,
searching: false, searching: false,
saveNote: '', saveNote: '',
// 加载 // 加载
loading: false, loading: false,
loadDate: false, loadDate: false,
// 查询 // 查询
search: { search: {
name: '' name: ''
}, },
// 分页 // 分页
total: 0, total: 0,
page: 1, page: 1,
rows: 10, rows: 10,
// 数据内容 // 数据内容
standardList: [], standardList: [],
checkAll: false, // 是否全选 checkAll: false, // 是否全选
indeterminate: false, // 是否半选 indeterminate: false, // 是否半选
selectedList: [], selectedList: [],
selectedAllInfoList: [] selectedAllInfoList: []
} }
}, },
methods: { methods: {
getDetail(item) { getDetail(item) {
let routeUrl = this.$router.resolve({ let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails', name: 'OtherStandardDetails',
params: { params: {
id: item.collectResId, id: item.collectResId,
pageType: 'INLAND_STAND' pageType: 'INLAND_STAND'
} }
}) })
window.open(routeUrl.href, '_blank') window.open(routeUrl.href, '_blank')
}, },
// 重置 // 重置
resetSelect () { resetSelect () {
this.search.name = '' this.search.name = ''
this.pageChange(1) this.pageChange(1)
}, },
// 分页 // 分页
pageChange (page) { pageChange (page) {
this.page = page this.page = page
this.selectStandard() this.selectStandard()
}, },
pageSizeChange (pageSize) { pageSizeChange (pageSize) {
this.rows = pageSize this.rows = pageSize
this.selectStandard() this.selectStandard()
}, },
// 搜索 // 搜索
selectStandardBtn () { selectStandardBtn () {
this.page = 1 this.page = 1
this.selectStandard() this.selectStandard()
}, },
// 查询、加载数据 // 查询、加载数据
selectStandard () { selectStandard () {
this.$http.get('person/personCollect/page', { this.$http.get('person/personCollect/page', {
pageNo: this.page, pageNo: this.page,
pageSize: this.$store.getters.userInfo.configContent, pageSize: this.$store.getters.userInfo.configContent,
userId: this.$store.getters.userInfo.userId, userId: this.$store.getters.userInfo.userId,
collectTitle: this.search.name collectTitle: this.search.name
}, { }, {
_this: this, _this: this,
loading: 'loading' loading: 'loading'
}, res => { }, res => {
this.standardList = [] this.standardList = []
this.standardList = res.data.records this.standardList = res.data.records
this.total = res.data.total this.total = res.data.total
this.contentOpen = true this.contentOpen = true
}, e => {}) }, e => {})
}, },
// 取消收藏 // 取消收藏
cancelStandard (item) { cancelStandard (item) {
this.$confirm('确定取消收藏此数据?', '提示', { this.$confirm('确定取消收藏此数据?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning', type: 'warning',
confirmButtonClass: 'common-button-primary', confirmButtonClass: 'common-button-primary',
roundButton: true roundButton: true
}).then(() => { }).then(() => {
// var json = { // var json = {
// id: item.collectId // id: item.collectId
// } // }
// json.userId = this.$store.getters.userInfo.userId // json.userId = this.$store.getters.userInfo.userId
this.$http.put('person/personCollect/updateByUserId',{'id': item.id}, { this.$http.put('person/personCollect/updateByUserId',{'id': item.id}, {
_this: this _this: this
}, res => { }, res => {
if (res.ok) { if (res.ok) {
this.$message.success('已取消收藏') this.$message.success('已取消收藏')
this.contentOpen = false this.contentOpen = false
this.pageChange(1) this.pageChange(1)
this.selectStandard() this.selectStandard()
} }
}, e => { }, e => {
}) })
}).catch(() => { }).catch(() => {
}) })
}, },
getDate (date) { getDate (date) {
return date != null ? date.substring(0, date.indexOf(' ')) : '' return date != null ? date.substring(0, date.indexOf(' ')) : ''
}, },
cancleCollectBatch () { cancleCollectBatch () {
if (this.selectedList.length === 0) { if (this.selectedList.length === 0) {
this.$confirm('请先选择数据进行取消收藏', '提示', { this.$confirm('请先选择数据进行取消收藏', '提示', {
showCancelButton: false, showCancelButton: false,
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning', type: 'warning',
confirmButtonClass: 'common-button-primary', confirmButtonClass: 'common-button-primary',
roundButton: true roundButton: true
}) })
} else { } else {
( (
this.$confirm('确定取消这些数据?', '提示', { this.$confirm('确定取消这些数据?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning', type: 'warning',
confirmButtonClass: 'common-button-primary', confirmButtonClass: 'common-button-primary',
roundButton: true roundButton: true
}).then(() => { }).then(() => {
this.$http.post('/person/personCollect/cancelCollectByBatch', { this.$http.post('/person/personCollect/cancelCollectByBatch', {
ids: this.selectedList ids: this.selectedList
}, { }, {
_this: this _this: this
}, res => { }, res => {
if (res.ok) { if (res.ok) {
this.pageChange(1) this.pageChange(1)
} }
}) })
}).catch(() => { }).catch(() => {
}) })
) )
} }
}, },
handleCardClick (item, event) { handleCardClick (item, event) {
item.checked = !item.checked item.checked = !item.checked
}, },
// 全选 // 全选
handleSelectAll (checked) { handleSelectAll (checked) {
if (checked) { if (checked) {
this.selectedList = [] this.selectedList = []
for (let i = 0; i < this.standardList.length; i++) { for (let i = 0; i < this.standardList.length; i++) {
this.$set(this.standardList[i], 'checked', true) this.$set(this.standardList[i], 'checked', true)
this.selectedList.push(this.standardList[i].id) this.selectedList.push(this.standardList[i].id)
this.selectedAllInfoList.push(this.standardList[i]) this.selectedAllInfoList.push(this.standardList[i])
} }
} else { } else {
for (let i = 0; i < this.standardList.length; i++) { for (let i = 0; i < this.standardList.length; i++) {
this.$set(this.standardList[i], 'checked', false) this.$set(this.standardList[i], 'checked', false)
this.selectedList = [] this.selectedList = []
this.selectedAllInfoList = [] this.selectedAllInfoList = []
} }
} }
} }
}, },
watch: { watch: {
standardList: { standardList: {
deep: true, deep: true,
handler (newVal, oldVal) { handler (newVal, oldVal) {
this.selectedList = [] this.selectedList = []
for (let i = 0; i < newVal.length; i++) { for (let i = 0; i < newVal.length; i++) {
if (newVal[i].checked) { if (newVal[i].checked) {
this.selectedList.push(newVal[i].id) this.selectedList.push(newVal[i].id)
this.selectedAllInfoList.push(newVal[i]) this.selectedAllInfoList.push(newVal[i])
} }
} }
if (this.selectedList.length === newVal.length && newVal.length !== 0) { if (this.selectedList.length === newVal.length && newVal.length !== 0) {
this.checkAll = true this.checkAll = true
this.indeterminate = false this.indeterminate = false
} else if (this.selectedList.length === 0) { } else if (this.selectedList.length === 0) {
this.checkAll = false this.checkAll = false
} else { } else {
this.checkAll = false this.checkAll = false
this.indeterminate = false this.indeterminate = false
} }
} }
}, },
// 已选择的列表 // 已选择的列表
selectedList (newVal, oldVal) { selectedList (newVal, oldVal) {
if (oldVal.length === this.standardList.length && newVal.length !== 0) { if (oldVal.length === this.standardList.length && newVal.length !== 0) {
this.checkAll = false this.checkAll = false
this.indeterminate = true this.indeterminate = true
} else if (newVal.length === 0) { } else if (newVal.length === 0) {
this.checkAll = false this.checkAll = false
this.indeterminate = false this.indeterminate = false
} }
} }
}, },
mounted () { mounted () {
this.selectStandard() this.selectStandard()
} }
} }
</script> </script>
<style lang="less"> <style lang="less">
//@import '~styles/style'; //@import '~styles/style';
//@import '~styles/mixins'; //@import '~styles/mixins';
#CollectionStandard{ #CollectionStandard{
height: 100%; height: 100%;
.content{ .content{
height: calc(~'100% - 150px'); height: calc(~'100% - 150px');
.content-detail{ .content-detail{
width: 100%; width: 100%;
height:100%; height:100%;
overflow-y: auto; overflow-y: auto;
overflow-x: hidden; overflow-x: hidden;
/*padding: 0.1rem;*/ /*padding: 0.1rem;*/
background-color: white; background-color: white;
.card{ .card{
width: 100%; width: 100%;
height: 1rem; height: 1rem;
line-height:1rem; line-height:1rem;
border: 1px solid #EEE; border: 1px solid #EEE;
margin-bottom: 4px; margin-bottom: 4px;
transition: all .2s ease-in-out; transition: all .2s ease-in-out;
cursor: pointer; cursor: pointer;
/*padding: 14px;*/ /*padding: 14px;*/
background: #FFF; background: #FFF;
padding-left: 14px; padding-left: 14px;
overflow: hidden; overflow: hidden;
//.un-select(); //.un-select();
.left-contents{ .left-contents{
width: 100%; width: 100%;
//.ellipsis() //.ellipsis()
} }
.ivu-row{ .ivu-row{
height: 100%; height: 100%;
.ivu-col{ .ivu-col{
height: 100%; height: 100%;
line-height: 50px; line-height: 50px;
} }
} }
&:hover{ &:hover{
box-shadow: 0px 1px 13px 0px #DDD; box-shadow: 0px 1px 13px 0px #DDD;
} }
} }
.note{ .note{
font-size:15px; font-size:15px;
line-height: 1rem; line-height: 1rem;
height: 1rem; height: 1rem;
clear: both; clear: both;
margin: 0 1rem; margin: 0 1rem;
.noteLeft{ .noteLeft{
float: left; float: left;
width: 70%; width: 70%;
height: auto; height: auto;
} }
.noteRight{ .noteRight{
float: right; float: right;
width: 30%; width: 30%;
height: auto; height: auto;
} }
} }
} }
} }
} }
</style> </style>
src/pages/personal/pages/my-collection/index.vue
+117 -100
View File
@@ -1,100 +1,117 @@
<template> <template>
<div class="my-collection v-class"> <div class="my-collection v-class">
<panel-header :tabs="tabsList" @activated="showComponent" :active="active"></panel-header> <panel-header :tabs="tabsList" @activated="showComponent" :active="active"></panel-header>
<panel-content class="panel-content-box"> <transition enter-active-class="" leave-active-class="">
<components :is="active"></components> <components :is="active"></components>
</panel-content> </transition>
</div> </div>
</template> </template>
<script> <script>
import CollectionDynamics from './components/CollectionDynamics' import CollectionDynamics from './components/CollectionDynamics'
import CollectionLaws from './components/CollectionLaws' import CollectionLaws from './components/CollectionLaws'
import CollectionStandard from './components/CollectionStandard' import CollectionStandard from './components/CollectionStandard'
import CollectionBreak from './components/CollectionBreak' import CollectionBreak from './components/CollectionBreak'
export default { export default {
name: 'MyCollection', name: 'MyCollection',
data () { data () {
return { return {
active: 'CollectionStandard', active: 'CollectionStandard',
tabsList: [ }
{ },
title: '已收藏的标准法规', computed: {
name: 'CollectionStandard' tabsList() {
}, const list = [
// { {
// title: '已收藏的动态&资料 ', title: '已收藏的标准法规',
// name: 'CollectionDynamics' name: 'CollectionStandard',
// }, permission:'f3686f4736acca57b1c0a97a990f96fc'
{ },
title: '已收藏的政策', // {
name: 'CollectionLaws' // title: '已收藏的动态&资料 ',
}, // name: 'CollectionDynamics'
// { // },
// title: '已收藏的标准拆分', {
// name: 'CollectionBreak' title: '已收藏的政策',
// } name: 'CollectionLaws',
] permission:'200212748ffc5fd3d93179789446535a'
} },
}, // {
methods: { // title: '已收藏的标准拆分',
showComponent (name) { // name: 'CollectionBreak'
this.active = name // }
} ]
// getCookie (name) {
// // 获取指定名称的cookie值 return list.filter(item => {
// // (^| )name=([^;]*)(;|$),match[0]为与整个正则表达式匹配的字符串，match[i]为正则表达式捕获数组相匹配的数组； if (item.permission) {
// let arr = document.cookie.match(new RegExp('(^| )' + name + '=([^;]*)(;|$)')) return this.$hasPermission(item.permission)
// if (arr != null) { } else {
// return unescape(arr[2]) return false
// } }
// return null })
// } }
}, },
components: { methods: {
CollectionDynamics, showComponent(name) {
CollectionLaws, if (this.active !== name) {
CollectionStandard, this.active = name
CollectionBreak const location = this.$router.replace({ query: { tabsName: name } })
}, }
mounted () { }
if (this.$route.query.type === '1') { // getCookie (name) {
this.active = 'CollectionBreak' // // 获取指定名称的cookie值
} // // (^| )name=([^;]*)(;|$),match[0]为与整个正则表达式匹配的字符串，match[i]为正则表达式捕获数组相匹配的数组；
// let collecttype = this.getCookie('collectionType') // let arr = document.cookie.match(new RegExp('(^| )' + name + '=([^;]*)(;|$)'))
// if (collecttype == null || collecttype === '') { // if (arr != null) {
// this.active = 'CollectionLaws' // return unescape(arr[2])
// } else if (collecttype === 'INLAND_LAWS' || collecttype === 'FOREIGN_LAWS') { // }
// this.active = 'CollectionLaws' // return null
// } else if (collecttype === 'INLAND_STAND' || collecttype === 'FOREIGN_STAND' || collecttype === 'BUSINESS_STAND') { // }
// this.active = 'CollectionStandard' },
// } else { components: {
// this.active = 'CollectionDynamics' CollectionDynamics,
// } CollectionLaws,
// document.cookie = 'collectionType=' + '' CollectionStandard,
} CollectionBreak
} },
</script> mounted () {
if (this.$route.query.type === '1') {
<style lang="less" scoped> this.active = 'CollectionBreak'
.my-collection { }
height: calc(~'100% - 50px'); // let collecttype = this.getCookie('collectionType')
.panel-content-box{ // if (collecttype == null || collecttype === '') {
height: 100%; // this.active = 'CollectionLaws'
} // } else if (collecttype === 'INLAND_LAWS' || collecttype === 'FOREIGN_LAWS') {
/deep/.el-input__inner { // this.active = 'CollectionLaws'
/*@media screen and (min-width: 1920px) {*/ // } else if (collecttype === 'INLAND_STAND' || collecttype === 'FOREIGN_STAND' || collecttype === 'BUSINESS_STAND') {
/* height: 40px !important;*/ // this.active = 'CollectionStandard'
/* line-height: 40px !important;*/ // } else {
/*}*/ // this.active = 'CollectionDynamics'
} // }
/deep/#labelInput { // document.cookie = 'collectionType=' + ''
label { }
/*@media screen and (min-width: 1920px) {*/ }
/* height: 40px !important;*/ </script>
/* line-height: 40px !important;*/
/*}*/ <style lang="less" scoped>
} .my-collection {
} height: calc(~'100% - 50px');
} .panel-content-box{
</style> height: 100%;
}
/deep/.el-input__inner {
/*@media screen and (min-width: 1920px) {*/
/* height: 40px !important;*/
/* line-height: 40px !important;*/
/*}*/
}
/deep/#labelInput {
label {
/*@media screen and (min-width: 1920px) {*/
/* height: 40px !important;*/
/* line-height: 40px !important;*/
/*}*/
}
}
}
</style>
src/pages/processCenter/pages/components/ProcessMixin.vue
+6 -6
View File
@@ -101,17 +101,17 @@ export default {
value: "22" value: "22"
}, },
{ {
label: "企标复审流程", label: "企标废止流程",
value: "23"
},
{
label: '企标废止流程',
value: "24" value: "24"
}, },
{ {
label: '企标制修订计划管控', label: "企标制修订计划管控",
value: "25" value: "25"
}, },
{
label: "企标制修订立项",
value: "26"
}
], ],
formDisableFlag: false, formDisableFlag: false,
pickerOptions: { pickerOptions: {
src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+55 -53
View File
@@ -428,59 +428,61 @@
<div v-if="itermsConditions" v-html="itermsConditions" class="itemsTextBox" style="margin: 5px; padding: 5px; width: 100%; overflow: auto;"></div> <div v-if="itermsConditions" v-html="itermsConditions" class="itemsTextBox" style="margin: 5px; padding: 5px; width: 100%; overflow: auto;"></div>
<div v-else style="margin: 5px; padding: 5px; width: 100%; overflow: auto;">无内容</div> <div v-else style="margin: 5px; padding: 5px; width: 100%; overflow: auto;">无内容</div>
</div> </div>
<el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150 :style="PLmodalType === 2 ? 'width: 100%;' : ''"> <div style="width: 80%">
<el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1"> <el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150 :style="PLmodalType === 2 ? 'width: 100%;' : ''">
<el-input <el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">
type="textarea" <el-input
v-model="plForm.technicalRequir" type="textarea"
placeholder="请输入核心技术要求" v-model="plForm.technicalRequir"
maxlength="500" placeholder="请输入核心技术要求"
></el-input> maxlength="500"
</el-form-item> ></el-input>
<el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1"> </el-form-item>
<el-input <el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1">
type="textarea" <el-input
v-model="plForm.changePoint" type="textarea"
placeholder="请输入国内标准的差异点" v-model="plForm.changePoint"
maxlength="500" placeholder="请输入国内标准的差异点"
></el-input> maxlength="500"
</el-form-item> ></el-input>
<el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1"> </el-form-item>
<el-input <el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1">
type="textarea" <el-input
:autosize="{ minRows: 4, maxRows: 14}" type="textarea"
v-model="plForm.changePoint" :autosize="{ minRows: 4, maxRows: 14}"
placeholder="请输入上一版本差异点" v-model="plForm.changePoint"
maxlength="500" placeholder="请输入上一版本差异点"
></el-input> maxlength="500"
</el-form-item> ></el-input>
<custom-date-pick-group </el-form-item>
class="myDataPick" <custom-date-pick-group
:config="{attrName: '新车型实施日期'}" class="myDataPick"
v-model="plForm.newData" :config="{attrName: '新车型实施日期'}"
></custom-date-pick-group> v-model="plForm.newData"
<custom-date-pick-group ></custom-date-pick-group>
class="myDataPick" <custom-date-pick-group
:config="{attrName: '在产车实施日期'}" class="myDataPick"
v-model="plForm.onlineData" :config="{attrName: '在产车实施日期'}"
></custom-date-pick-group> v-model="plForm.onlineData"
<el-form-item label="适用车型" prop="applyArctic" class="add-form-item" > ></custom-date-pick-group>
<el-select multiple v-model="plForm.applyArctic"> <el-form-item label="适用车型" prop="applyArctic" class="add-form-item" >
<el-option v-for="(item,index) in cxList" :value="item.label" :label="item.label" :key="index"></el-option> <el-select multiple v-model="plForm.applyArctic">
</el-select> <el-option v-for="(item,index) in cxList" :value="item.label" :label="item.label" :key="index"></el-option>
</el-form-item> </el-select>
<el-form-item label="责任人" prop="zrUserId" class="add-form-item"> </el-form-item>
<el-input <el-form-item label="责任人" prop="zrUserId" class="add-form-item">
style="display: none;" <el-input
v-model="plForm.zrUserId" style="display: none;"
></el-input> v-model="plForm.zrUserId"
<el-input ></el-input>
@click.native="choiceZRRS(plForm.zrUserId, PLmodalType, PLmodalIndex)" <el-input
placeholder="请选择责任人" @click.native="choiceZRRS(plForm.zrUserId, PLmodalType, PLmodalIndex)"
v-model="plForm.zrUserName" placeholder="请选择责任人"
></el-input> v-model="plForm.zrUserName"
</el-form-item> ></el-input>
</el-form> </el-form-item>
</el-form>
</div>
</div> </div>
</div> </div>
<div id="roleFormButton2" class="demo-drawer-footer"> <div id="roleFormButton2" class="demo-drawer-footer">
src/pages/processCenter/pages/creatProcess/bzpg/step1.vue
+6
View File
@@ -80,6 +80,7 @@
</el-form-item> </el-form-item>
<el-form-item label="截止日期" prop="endTime" class="add-form-item form-item-disabled"> <el-form-item label="截止日期" prop="endTime" class="add-form-item form-item-disabled">
<el-date-picker <el-date-picker
:picker-options="pickerOptions"
v-model="listForm.endTime" v-model="listForm.endTime"
type="date" type="date"
placeholder="请选择截止日期" placeholder="请选择截止日期"
@@ -508,6 +509,11 @@ export default {
}, },
data() { data() {
return { return {
pickerOptions: {
disabledDate(time) {
return time.getTime() < Date.now() - 8.64e7;
},
},
submitFlag: '', submitFlag: '',
managementHostName: [], //管理主体名称下拉框 managementHostName: [], //管理主体名称下拉框
developmentHostName: [], //开发主体名称下拉框 developmentHostName: [], //开发主体名称下拉框
src/pages/processCenter/pages/creatProcess/bzpg/step3.vue
+29 -18
View File
@@ -638,25 +638,36 @@ export default {
} else if(this.dataList.length > 5) { } else if(this.dataList.length > 5) {
this.$message.warning('您最多只能选择五条数据') this.$message.warning('您最多只能选择五条数据')
}else{ }else{
this.listForm.dataList = this.dataList; let subFlag = true
this.listForm.breakdownList = this.breakdownList this.dataList.forEach(item => {
this.listForm.commentText = this.commentText; if(!item.unameId){
const json = JSON.stringify(this.listForm); subFlag = false
this.isSubmit = true; return
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
json: json
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
} }
this.isSubmit = false; })
}, e => { if(subFlag){
}); this.listForm.dataList = this.dataList;
this.listForm.breakdownList = this.breakdownList
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
this.isSubmit = true;
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
json: json
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
this.isSubmit = false;
}, e => {
});
}else{
this.$message.warning('请选择项目经理')
}
} }
}, },
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+1
View File
@@ -2456,6 +2456,7 @@ export default {
if (this.form.standType === '') { if (this.form.standType === '') {
this.$message.warning('请选择标准来源') this.$message.warning('请选择标准来源')
} else { } else {
this.standardSearchForm.page = 1
this.standardDrawer = true this.standardDrawer = true
this.$nextTick(() => { this.$nextTick(() => {
// 动态设置表格高度 // 动态设置表格高度
src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+1
View File
@@ -1259,6 +1259,7 @@ export default {
this.form.zrgcs = ""; this.form.zrgcs = "";
} }
this.form.menuIds = this.form.treeListId; this.form.menuIds = this.form.treeListId;
this.form.BBFDTBZ = this.form.bfbdtbzh
const json = JSON.stringify(this.form); const json = JSON.stringify(this.form);
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds, taskIds: this.taskIds,
src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
+1 -1
View File
@@ -831,7 +831,7 @@ export default {
if (valid) { if (valid) {
this.isSubmit = true this.isSubmit = true
this.$http.post('lawss/activiti/startProcessRollBack', { this.$http.post('lawss/activiti/startProcessRollBack', {
id: this.bpnId || '', id: '',
createUser: this.$store.getters.userInfo.userId, createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName, createUserName: this.$store.getters.userInfo.userName,
type: '3', type: '3',
src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
+3 -3
View File
@@ -62,7 +62,7 @@
</el-form-item> </el-form-item>
<el-form-item label="其他附件" prop="model" class="add-form-item form-item-disabled"> <el-form-item label="其他附件" prop="model" class="add-form-item form-item-disabled">
<div v-if="form.modelList.length > 0"> <div v-if="form.modelList.length > 0">
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;"> <div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;padding-left: 10px;">
<span @click="fileLook(item)">{{ item.name }}</span> <span @click="fileLook(item)">{{ item.name }}</span>
<el-button <el-button
size="small" size="small"
@@ -82,12 +82,12 @@
style="display: none;" style="display: none;"
clearable clearable
></el-input> ></el-input>
<el-button type="primary" @click="choiceZRR">选择责任人</el-button> <el-button type="primary" @click="choiceZRR" style="padding-left: 10px">选择责任人</el-button>
<div @click="choiceZRR"> <div @click="choiceZRR">
<div v-if="form.responUserListName" style="color: #666;"> <div v-if="form.responUserListName" style="color: #666;">
{{ form.responUserListName }} {{ form.responUserListName }}
</div> </div>
<div v-else style="color: #ccc;"> <div v-else style="color: #ccc;padding-left: 10px;" >
请选择责任人 请选择责任人
</div> </div>
</div> </div>
src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+1 -1
View File
@@ -62,7 +62,7 @@
</el-form-item> </el-form-item>
<el-form-item label="其他附件" prop="model" class="add-form-item form-item-disabled"> <el-form-item label="其他附件" prop="model" class="add-form-item form-item-disabled">
<div v-if="form.modelList.length > 0"> <div v-if="form.modelList.length > 0">
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;"> <div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;padding-left: 10px;">
<span @click="fileLook(item)">{{ item.name }}</span> <span @click="fileLook(item)">{{ item.name }}</span>
<el-button <el-button
size="small" size="small"
src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue
+13 -16
View File
@@ -143,19 +143,19 @@
</el-table> </el-table>
</div> </div>
<div> <div>
<el-collapse accordion> <!-- <el-collapse accordion>-->
<el-collapse-item title="审批意见"> <!-- <el-collapse-item title="审批意见">-->
<div style="margin: 10px 0;"> <!-- <div style="margin: 10px 0;">-->
<el-input <!-- <el-input-->
type="textarea" <!-- type="textarea"-->
:rows="3" <!-- :rows="3"-->
resize="none" <!-- resize="none"-->
placeholder="请输入意见" <!-- placeholder="请输入意见"-->
v-model="commentText"> <!-- v-model="commentText">-->
</el-input> <!-- </el-input>-->
</div> <!-- </div>-->
</el-collapse-item> <!-- </el-collapse-item>-->
</el-collapse> <!-- </el-collapse>-->
</div> </div>
</div> </div>
<div class="content" v-show="active === '3'"> <div class="content" v-show="active === '3'">
@@ -277,9 +277,6 @@ export default {
nextStatus: "" nextStatus: ""
}, },
formRules: { formRules: {
nextStatus: [
{ required: true, message: "请选择下一步状态", trigger: "change" }
]
}, },
associationOptions: [{ associationOptions: [{
value: "修订", value: "修订",
src/pages/processCenter/pages/creatProcess/qbfz/step4.vue
+579 -579
View File
File diff suppressed because it is too large Load Diff
src/pages/processCenter/pages/creatProcess/qbfz/step5.vue
+606 -606
View File
File diff suppressed because it is too large Load Diff
src/pages/processCenter/pages/creatProcess/qbfz/step6.vue
+606 -606
View File
File diff suppressed because it is too large Load Diff
src/pages/processCenter/pages/creatProcess/qbrk/step2.vue
+4 -4
View File
@@ -1195,11 +1195,11 @@
}, },
calScope(){ calScope(){
if(this.evaluationMap){ if(this.evaluationMap){
const hqSum = this.evaluationMap["会签征求意见"] const hqSum = this.evaluationMap["征求意见"]
const jsWySum = this.evaluationMap["技术委员会评审/评审意见修改评审"] const jsWySum = this.evaluationMap["技术委员会评审、评审意见修改"]
const fsSum = this.evaluationMap["复审"] const fsSum = this.evaluationMap["标准化复审"]
const shSum = this.evaluationMap["标准法规部高级经理审核"] const shSum = this.evaluationMap["标准法规部高级经理审核"]
const aveCount = (hqSum ? hqSum * 0.3 : 0) + (jsWySum ? jsWySum * 0.4 : 0) + (fsSum ? fsSum * 0.3 : 0) + (shSum ? shSum * 0.3 : 0) const aveCount = (hqSum ? hqSum * 0.3 : 0) + (jsWySum ? jsWySum * 0.4 : 0) + ((parseFloat(fsSum) + parseFloat(shSum)) / 2 * 0.3)
return parseFloat(aveCount).toFixed(1) return parseFloat(aveCount).toFixed(1)
} }
return 0 return 0
src/pages/processCenter/pages/creatProcess/qbrk/step9.vue
+2 -2
View File
@@ -1218,9 +1218,9 @@
if(this.evaluationMap){ if(this.evaluationMap){
const hqSum = this.evaluationMap["征求意见"] const hqSum = this.evaluationMap["征求意见"]
const jsWySum = this.evaluationMap["技术委员会评审、评审意见修改"] const jsWySum = this.evaluationMap["技术委员会评审、评审意见修改"]
const fsSum = this.evaluationMap["标准化复审"] const fsSum = this.evaluationMap["标准化复审"] ? this.evaluationMap["标准化复审"] : 0
const shSum = this.form.evaluationData && this.form.evaluationData.length > 0 ? this.form.evaluationData[0].sum : 0 const shSum = this.form.evaluationData && this.form.evaluationData.length > 0 ? this.form.evaluationData[0].sum : 0
const aveCount = (hqSum ? hqSum * 0.3 : 0) + (jsWySum ? jsWySum * 0.4 : 0) + ((fsSum ? fsSum : 0) + (shSum ? shSum: 0)) / 2 * 0.3 const aveCount = (hqSum ? hqSum * 0.3 : 0) + (jsWySum ? jsWySum * 0.4 : 0) + ((parseFloat(fsSum) + parseFloat(shSum)) / 2 * 0.3)
return parseFloat(aveCount).toFixed(1) return parseFloat(aveCount).toFixed(1)
} }
return 0 return 0
src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue
+1 -1
View File
@@ -1222,7 +1222,7 @@
const jsWySum = this.evaluationMap["技术委员会评审、评审意见修改"] const jsWySum = this.evaluationMap["技术委员会评审、评审意见修改"]
const fsSum = this.evaluationMap["标准化复审"] const fsSum = this.evaluationMap["标准化复审"]
const shSum = this.evaluationMap["标准法规部高级经理审核"] const shSum = this.evaluationMap["标准法规部高级经理审核"]
const aveCount = (hqSum ? hqSum * 0.3 : 0) + (jsWySum ? jsWySum * 0.4 : 0) + ((fsSum ? fsSum : 0) + (shSum ? shSum: 0)) / 2 * 0.3 const aveCount = (hqSum ? hqSum * 0.3 : 0) + (jsWySum ? jsWySum * 0.4 : 0) + ((parseFloat(fsSum) + parseFloat(shSum)) / 2 * 0.3)
return parseFloat(aveCount).toFixed(1) return parseFloat(aveCount).toFixed(1)
} }
return 0 return 0
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
+18 -13
View File
@@ -42,11 +42,23 @@
</el-form-item> </el-form-item>
<el-form-item prop="reviseStatus" label="制修订类型" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled"> <el-form-item prop="reviseStatus" label="制修订类型" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-select disabled v-model="qbfsForm.reviseStatus" placeholder="请选择制修订类型"> <el-select disabled v-model="qbfsForm.reviseStatus" placeholder="请选择制修订类型">
<el-option label="制定完成" value="制定完成"></el-option> <el-option label="制定" value="制定"></el-option>
<el-option label="制定中" value="制定中"></el-option> <el-option label="修订" value="修订"></el-option>
<el-option label="未制定" value="未制定"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="qbfsForm.reviseStatus === '修订'" prop="rqbName" label="代替企标编号" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input
style="display: none;"
v-model="qbfsForm.rqbJson">
</el-input>
<el-input
clearable
v-model="qbfsForm.rqbName"
placeholder="请选择代替企标编号"
readonly
@click.native="choiceQYBZ">
</el-input>
</el-form-item>
<el-form-item prop="area" label="适用车型" style="width: 100%; margin-right:10px" <el-form-item prop="area" label="适用车型" style="width: 100%; margin-right:10px"
class="add-form-item form-item-disabled"> class="add-form-item form-item-disabled">
<el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择适用车型" style="width: 100%;"> <el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择适用车型" style="width: 100%;">
@@ -204,13 +216,6 @@
<el-option label="修订" value="修订"></el-option> <el-option label="修订" value="修订"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="qbfsForm.reviseStatus === '修订'" label="代替企标编号" style="width: 100%; margin-right:10px" prop="rqbName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.rqbName"
placeholder="请输入代替企标编号"
:maxlength="500"/>
</el-form-item>
<el-form-item class="search-item btn-box"> <el-form-item class="search-item btn-box">
<el-button <el-button
type="primary" type="primary"
@@ -380,9 +385,9 @@ export default {
} }
}, },
mounted(){ mounted(){
if(this.qbfsForm.passFlag){ // if(this.qbfsForm.passFlag){
this.qbfsForm = {} // this.qbfsForm = {}
} // }
//查询下拉框数据 //查询下拉框数据
this.$http.get('sys/dictype/getDicTypeListCode', '',{ this.$http.get('sys/dictype/getDicTypeListCode', '',{
_this: this _this: this
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
+16 -10
View File
@@ -46,6 +46,19 @@
<el-option label="修订" value="2"></el-option> <el-option label="修订" value="2"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="qbfsForm.reviseStatus === '修订'" prop="rqbName" label="代替企标编号" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input
style="display: none;"
v-model="qbfsForm.rqbJson">
</el-input>
<el-input
clearable
v-model="qbfsForm.rqbName"
placeholder="请选择代替企标编号"
readonly
@click.native="choiceQYBZ">
</el-input>
</el-form-item>
<el-form-item prop="area" label="适用车型" style="width: 100%; margin-right:10px" <el-form-item prop="area" label="适用车型" style="width: 100%; margin-right:10px"
class="add-form-item form-item-disabled"> class="add-form-item form-item-disabled">
<el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择适用车型" style="width: 100%;"> <el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择适用车型" style="width: 100%;">
@@ -219,13 +232,6 @@
<el-option label="修订" value="修订"></el-option> <el-option label="修订" value="修订"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="qbfsForm.reviseStatus === '修订'" label="代替企标编号" style="width: 100%; margin-right:10px" prop="rqbName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.rqbName"
placeholder="请输入代替企标编号"
:maxlength="500"/>
</el-form-item>
<el-form-item class="search-item btn-box"> <el-form-item class="search-item btn-box">
<el-button <el-button
type="primary" type="primary"
@@ -401,9 +407,9 @@ export default {
} }
}, },
mounted(){ mounted(){
if(this.qbfsForm.passFlag){ // if(this.qbfsForm.passFlag){
this.qbfsForm = {} // this.qbfsForm = {}
} // }
//查询下拉框数据 //查询下拉框数据
this.$http.get('sys/dictype/getDicTypeListCode', '',{ this.$http.get('sys/dictype/getDicTypeListCode', '',{
_this: this _this: this
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
+15 -7
View File
@@ -139,7 +139,7 @@
<custom-input-for-all-standards2 <custom-input-for-all-standards2
class="classDisplay" class="classDisplay"
:config="{attrName: '采用标准'}" :config="{attrName: '采用标准'}"
:labelWidth="'180px'" :labelWidth="'150px'"
v-model="qbfsForm.esStandRelations" v-model="qbfsForm.esStandRelations"
></custom-input-for-all-standards2> ></custom-input-for-all-standards2>
</template> </template>
@@ -160,7 +160,7 @@
:enterpriseStandard="true" :enterpriseStandard="true"
:placeholderText="'包括已有、应有的关联标准，如企业标准、行业标准、国家标准'" :placeholderText="'包括已有、应有的关联标准，如企业标准、行业标准、国家标准'"
:config="{attrName: '引用标准'}" :config="{attrName: '引用标准'}"
:labelWidth="'180px'" :labelWidth="'150px'"
v-model="qbfsForm.esMatingRelations" v-model="qbfsForm.esMatingRelations"
></custom-input-for-all-standards2> ></custom-input-for-all-standards2>
</template> </template>
@@ -206,7 +206,7 @@
type="primary" type="primary"
size="mini" size="mini"
class="common-button-primary" class="common-button-primary"
@click="QYBZget">查询 @click="QYBZgetBtn">查询
</el-button> </el-button>
<el-button <el-button
class="common-button-default" class="common-button-default"
@@ -223,7 +223,7 @@
:data="QYBZList" :data="QYBZList"
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%;padding:0 0 20px 0;" style="width: 100%;padding:0 0 20px 0;"
height="100%" class="table-height"
border border
@selection-change="handleSelectionQYBZ" @selection-change="handleSelectionQYBZ"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"> :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
@@ -550,9 +550,9 @@ export default {
}, },
mounted(){ mounted(){
this.getWorkData() this.getWorkData()
if(this.qbfsForm.passFlag){ // if(this.qbfsForm.passFlag){
this.qbfsForm = {} // this.qbfsForm = {}
} // }
//查询下拉框数据 //查询下拉框数据
this.$http.get('sys/dictype/getDicTypeListCode', '',{ this.$http.get('sys/dictype/getDicTypeListCode', '',{
_this: this _this: this
@@ -753,6 +753,10 @@ export default {
this.QYBZform.pageSize = pageSize this.QYBZform.pageSize = pageSize
this.QYBZget() this.QYBZget()
}, },
QYBZgetBtn(){
this.QYBZform.page = 1
this.QYBZget()
},
QYBZget () { QYBZget () {
this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.QYBZform, { this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.QYBZform, {
_this: this, loading: 'QYBZShow' _this: this, loading: 'QYBZShow'
@@ -958,5 +962,9 @@ export default {
} }
} }
} }
.table-height{
height: calc(~'100% - 65px');
overflow: auto;
}
} }
</style> </style>
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
+36 -20
View File
@@ -70,6 +70,19 @@
<el-option label="修订" value="修订"></el-option> <el-option label="修订" value="修订"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="qbfsForm.reviseStatus === '修订'" prop="rqbName" label="代替企标编号" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input
style="display: none;"
v-model="qbfsForm.rqbJson">
</el-input>
<el-input
clearable
v-model="qbfsForm.rqbName"
placeholder="请选择代替企标编号"
readonly
@click.native="choiceQYBZ">
</el-input>
</el-form-item>
<el-form-item prop="area" label="适用车型" style="width: 100%; margin-right:10px" <el-form-item prop="area" label="适用车型" style="width: 100%; margin-right:10px"
class="add-form-item form-item-disabled"> class="add-form-item form-item-disabled">
<el-select v-model="qbfsForm.area" multiple filterable placeholder="请选择适用车型" style="width: 100%;"> <el-select v-model="qbfsForm.area" multiple filterable placeholder="请选择适用车型" style="width: 100%;">
@@ -101,7 +114,7 @@
:enterpriseStandard="true" :enterpriseStandard="true"
:placeholderText="'包括已有、应有的关联标准，如企业标准、行业标准、国家标准'" :placeholderText="'包括已有、应有的关联标准，如企业标准、行业标准、国家标准'"
:config="{attrName: '引用标准'}" :config="{attrName: '引用标准'}"
:labelWidth="'180px'" :labelWidth="'150px'"
v-model="qbfsForm.esMatingRelations" v-model="qbfsForm.esMatingRelations"
></custom-input-for-all-standards2> ></custom-input-for-all-standards2>
</template> </template>
@@ -215,19 +228,6 @@
<el-option label="修订" value="修订"></el-option> <el-option label="修订" value="修订"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item prop="rqbName" v-if="qbfsForm.reviseStatus === '修订'" label="代替企标编号" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input
style="display: none;"
v-model="qbfsForm.rqbJson">
</el-input>
<el-input
clearable
v-model="qbfsForm.rqbName"
placeholder="请选择代替企标编号"
readonly
@click.native="choiceQYBZ">
</el-input>
</el-form-item>
<el-form-item class="search-item btn-box"> <el-form-item class="search-item btn-box">
<el-button <el-button
type="primary" type="primary"
@@ -359,7 +359,7 @@
type="primary" type="primary"
size="mini" size="mini"
class="common-button-primary" class="common-button-primary"
@click="QYBZget">查询 @click="QYBZgetBtn">查询
</el-button> </el-button>
<el-button <el-button
class="common-button-default" class="common-button-default"
@@ -376,7 +376,7 @@
:data="QYBZList" :data="QYBZList"
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%;padding:0 0 20px 0;" style="width: 100%;padding:0 0 20px 0;"
height="100%" class="table-height"
border border
@selection-change="handleSelectionQYBZ" @selection-change="handleSelectionQYBZ"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"> :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
@@ -712,9 +712,9 @@ export default {
} }
}, },
mounted() { mounted() {
if(this.qbfsForm.passFlag){ // if(this.qbfsForm.passFlag){
this.qbfsForm = {} // this.qbfsForm = {}
} // }
//查询下拉框数据 //查询下拉框数据
this.$http.get('sys/dictype/getDicTypeListCode', '',{ this.$http.get('sys/dictype/getDicTypeListCode', '',{
_this: this _this: this
@@ -801,6 +801,13 @@ export default {
}, },
TXJGenterDrawer () { TXJGenterDrawer () {
let list = this.$refs.TXJGTree.getCheckedNodes() let list = this.$refs.TXJGTree.getCheckedNodes()
if(list.length > 0){
let parenList = list.filter ( item => item.parentId === null || item.parentId === '');
if (parenList.length > 0) {
this.$message.error('请选择二级及以下目录')
return
}
}
let id = '' let id = ''
let name = '' let name = ''
list.map(item => { list.map(item => {
@@ -838,7 +845,7 @@ export default {
}, },
QYBZenterDrawer () { QYBZenterDrawer () {
if (this.QYBZformSelect.length > 1) { if (this.QYBZformSelect.length > 1) {
this.$message.warning('请选择一条标准') this.$message.warning('您只能选择一条标准进行带入')
} else if (this.QYBZformSelect.length < 1){ } else if (this.QYBZformSelect.length < 1){
this.$message.warning('请选择要带入的标准') this.$message.warning('请选择要带入的标准')
} else { } else {
@@ -859,6 +866,11 @@ export default {
this.QYBZform.pageSize = pageSize this.QYBZform.pageSize = pageSize
this.QYBZget() this.QYBZget()
}, },
//企业标准查询
QYBZgetBtn(){
this.QYBZform.page = 1
this.QYBZget()
},
QYBZget () { QYBZget () {
this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.QYBZform, { this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.QYBZform, {
_this: this, loading: 'QYBZShow' _this: this, loading: 'QYBZShow'
@@ -1150,5 +1162,9 @@ export default {
} }
} }
} }
.table-height{
height: calc(~'100% - 65px');
overflow: auto;
}
} }
</style> </style>
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
+16 -10
View File
@@ -46,6 +46,19 @@
<el-option label="修订" value="修订"></el-option> <el-option label="修订" value="修订"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="qbfsForm.reviseStatus === '修订'" prop="rqbName" label="代替企标编号" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input
style="display: none;"
v-model="qbfsForm.rqbJson">
</el-input>
<el-input
clearable
v-model="qbfsForm.rqbName"
placeholder="请选择代替企标编号"
readonly
@click.native="choiceQYBZ">
</el-input>
</el-form-item>
<el-form-item prop="area" label="适用车型" style="width: 100%; margin-right:10px" <el-form-item prop="area" label="适用车型" style="width: 100%; margin-right:10px"
class="add-form-item form-item-disabled"> class="add-form-item form-item-disabled">
<el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择适用车型" style="width: 100%;"> <el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择适用车型" style="width: 100%;">
@@ -210,13 +223,6 @@
<el-option label="修订" value="修订"></el-option> <el-option label="修订" value="修订"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="qbfsForm.reviseStatus === '修订'" label="代替企标编号" style="width: 100%; margin-right:10px" prop="rqbName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.rqbName"
placeholder="请输入代替企标编号"
:maxlength="500"/>
</el-form-item>
<el-form-item class="search-item btn-box"> <el-form-item class="search-item btn-box">
<el-button <el-button
type="primary" type="primary"
@@ -389,9 +395,9 @@ export default {
} }
}, },
mounted(){ mounted(){
if(this.qbfsForm.passFlag){ // if(this.qbfsForm.passFlag){
this.qbfsForm = {} // this.qbfsForm = {}
} // }
this.$http.get('sys/dictype/getDicTypeListCode', '',{ this.$http.get('sys/dictype/getDicTypeListCode', '',{
_this: this _this: this
}, res => { }, res => {
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
+1
View File
@@ -529,6 +529,7 @@ export default {
this.$refs["roleForm"].validate((valid) => { this.$refs["roleForm"].validate((valid) => {
if (valid) { if (valid) {
this.isSubmit = true; this.isSubmit = true;
qbzxdFrom.commentText = this.commentText;
var json = Object.assign(qbzxdFrom, this.roleForm); var json = Object.assign(qbzxdFrom, this.roleForm);
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
+32 -7
View File
@@ -104,6 +104,7 @@
<el-timeline> <el-timeline>
<el-form <el-form
ref="roleForm" ref="roleForm"
:rules="roleFormRules"
:model="roleForm" :model="roleForm"
class="label-input-form"> class="label-input-form">
<el-timeline-item timestamp="起草" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''"> <el-timeline-item timestamp="起草" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
@@ -123,7 +124,8 @@
<h4>责任工程师</h4> <h4>责任工程师</h4>
<div style="margin-top: 10px;width: 300px;"> <div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.dockUser" style="display: none;"></el-input> <el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
<el-input v-model="roleForm.dockUserName" placeholder="责任工程师" @click.native="choiceZRR('2')"> <el-input v-model="roleForm.dockUserName" placeholder="责任工程师"
@click.native="choiceZRR('2', '选择标准立项单位整车/系统总工', roleForm.dockUser)">
</el-input> </el-input>
</div> </div>
</el-form-item> </el-form-item>
@@ -227,6 +229,7 @@
title="选择工作组组长" title="选择工作组组长"
:visible.sync="workModel" :visible.sync="workModel"
size="900px" size="900px"
@close="closeWorkDrawer"
custom-class="demo-drawer" custom-class="demo-drawer"
> >
<div class="demo-drawer-content"> <div class="demo-drawer-content">
@@ -259,14 +262,14 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
<loading :loading="tableLoading">数据加载中...</loading>
<el-table <el-table
ref="workGroup" ref="workGroup"
:data="workData" :data="workData"
tooltip-effect="dark" tooltip-effect="dark"
border border
style="width: 100%; flex: auto;" style="width: 100%; flex: auto;"
class="drag-table" class="table-height"
height="100%"
@selection-change="workChange" @selection-change="workChange"
:header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"> fontWeight: 'bold', height: '48px'}">
@@ -298,7 +301,7 @@
</div> </div>
</div> </div>
<div class="demo-drawer-footer"> <div class="demo-drawer-footer">
<el-button size="mini" @click="closeDrawer">取消</el-button> <el-button size="mini" @click="closeWorkDrawer">取消</el-button>
<el-button type="primary" size="mini" @click="OkWork">带入</el-button> <el-button type="primary" size="mini" @click="OkWork">带入</el-button>
</div> </div>
</el-drawer> </el-drawer>
@@ -349,7 +352,7 @@
:before-upload="beforeUpload" :before-upload="beforeUpload"
:action="importExcelUrl" :action="importExcelUrl"
:file-list="defaultFileList" :file-list="defaultFileList"
accept=".xlsx" accept=".xls"
name="file" name="file"
ref="importFileAboutStand"> ref="importFileAboutStand">
<div style="padding: 20px 0"> <div style="padding: 20px 0">
@@ -378,6 +381,7 @@ export default {
name: "qbzxdlxStep1", name: "qbzxdlxStep1",
data() { data() {
return { return {
tableLoading: false,
importModalshowflag: false, //导入弹窗 importModalshowflag: false, //导入弹窗
showUploadlist: true, // 导入过程中新增数据时，如果数据错误，不出现导入列表 showUploadlist: true, // 导入过程中新增数据时，如果数据错误，不出现导入列表
importExcelUrl: 'api/att/attFile/upload', // 导入EXCEL文档 importExcelUrl: 'api/att/attFile/upload', // 导入EXCEL文档
@@ -419,6 +423,11 @@ export default {
dockUser: '', dockUser: '',
dockUserName: '', dockUserName: '',
}, },
roleFormRules:{
dockUserName: [
{required: true, message: '请选择责任工程师', trigger: 'change'},
],
},
// 上传路径 // 上传路径
uploadPath: 'api/att/attFile/upload', uploadPath: 'api/att/attFile/upload',
acceptShow: false, acceptShow: false,
@@ -583,6 +592,13 @@ export default {
workChange(data) { workChange(data) {
this.workChangeList = data this.workChangeList = data
}, },
//工作组取消按钮
closeWorkDrawer(){
this.workModel = false
this.workSearch.workGroupName = ''
this.getWorkData()
this.$refs.workGroup.clearSelection()
},
OkWork(){ OkWork(){
if(this.workChangeList.length > 1 ){ if(this.workChangeList.length > 1 ){
this.$message.warning('您只能选择一条数据进行带入') this.$message.warning('您只能选择一条数据进行带入')
@@ -595,6 +611,7 @@ export default {
this.$refs.qblx_pageData.validateField('wgLeaderName') this.$refs.qblx_pageData.validateField('wgLeaderName')
} }
this.workModel = false this.workModel = false
this.workSearch.workGroupName = ''
this.$refs.workGroup.clearSelection() this.$refs.workGroup.clearSelection()
} }
}, },
@@ -608,10 +625,12 @@ export default {
}, res => { }, res => {
this.workData = res.data.records; this.workData = res.data.records;
this.total = res.data.total; this.total = res.data.total;
this.tableLoading = false
}, e => { }, e => {
}); });
}, },
choiceLeader(){ choiceLeader(){
this.getWorkData()
this.workModel = true this.workModel = true
}, },
choiceZRBM(type, title, id) { choiceZRBM(type, title, id) {
@@ -819,6 +838,8 @@ export default {
if (this.btnType === 'edit') { if (this.btnType === 'edit') {
let Items = JSON.parse(localStorage.getItem('obj')) let Items = JSON.parse(localStorage.getItem('obj'))
this.addQblxData.esName = Items.esName this.addQblxData.esName = Items.esName
this.addQblxData.unit = Items.unit
this.addQblxData.unitName = Items.unitName
this.addQblxData.dutyUnit = Items.dutyUnit this.addQblxData.dutyUnit = Items.dutyUnit
this.addQblxData.dutyPeopleId = Items.dutyPeopleId this.addQblxData.dutyPeopleId = Items.dutyPeopleId
this.addQblxData.dutyPeople = Items.dutyPeople this.addQblxData.dutyPeople = Items.dutyPeople
@@ -977,7 +998,7 @@ export default {
} }
if (finishCount === jsonData.length) { if (finishCount === jsonData.length) {
this.isSubmit = false this.isSubmit = false
this.$router.push("/processCenter"); this.$router.push('/processCenter')
} }
this.isSubmit = false this.isSubmit = false
} else { } else {
@@ -1006,7 +1027,7 @@ export default {
height: 100%; height: 100%;
/deep/ .el-upload-list__item-name { /deep/ .el-upload-list__item-name {
margin-left: 48px; //margin-left: 48px;
} }
/deep/ .el-upload-list { /deep/ .el-upload-list {
@@ -1098,6 +1119,10 @@ export default {
border: 0; border: 0;
} }
} }
.table-height{
height: calc(~'100% - 65px');
overflow: auto;
}
} }
</style> </style>
src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue
+17 -4
View File
@@ -25,6 +25,7 @@
<el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled"> <el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
<div class="file-box" v-if="fileList.length > 0"> <div class="file-box" v-if="fileList.length > 0">
<p v-for="item in fileList" <p v-for="item in fileList"
style="margin-left: 10px;"
:key="item.id" @click.stop="clickButtonToUpload2(item.id)"> {{ item.name }} :key="item.id" @click.stop="clickButtonToUpload2(item.id)"> {{ item.name }}
<i <i
title="下载" title="下载"
@@ -173,7 +174,7 @@
<custom-input-for-all-standards2 <custom-input-for-all-standards2
class="classDisplay" class="classDisplay"
:config="{attrName: '采用标准'}" :config="{attrName: '采用标准'}"
:labelWidth="'180px'" :labelWidth="'150px'"
v-model="qbfsForm.esStandRelations" v-model="qbfsForm.esStandRelations"
></custom-input-for-all-standards2> ></custom-input-for-all-standards2>
</template> </template>
@@ -194,7 +195,7 @@
:enterpriseStandard="true" :enterpriseStandard="true"
:placeholderText="'包括已有、应有的关联标准，如企业标准、行业标准、国家标准'" :placeholderText="'包括已有、应有的关联标准，如企业标准、行业标准、国家标准'"
:config="{attrName: '引用标准'}" :config="{attrName: '引用标准'}"
:labelWidth="'180px'" :labelWidth="'150px'"
v-model="qbfsForm.esMatingRelations" v-model="qbfsForm.esMatingRelations"
></custom-input-for-all-standards2> ></custom-input-for-all-standards2>
</template> </template>
@@ -675,8 +676,20 @@ export default {
//必填人员校验规则 //必填人员校验规则
roleFormRules: { roleFormRules: {
dockUserName: [ dockUserName: [
{ required: true, message: "请选择工作组组长", trigger: "change" } { required: true, message: "请选择标准立项单位整车/系统总工", trigger: "change" }
] ],
countersignerName:[
{required: true, message:'请选择会签人员', trigger: "change" }
],
examineName:[
{required: true, message:'请选择标准体系工作组组长', trigger: "change" }
],
approverName:[
{required: true, message:'请选择总院技术委员会覆盖领域企业标准：专委会主任/总院技术委员会未覆盖领域企业标准：总院院长或总院主管副院长', trigger: "change" }
],
engineerName:[
{required: true, message:'请选择相关单位、工程研究总院标准法规部', trigger: "change" }
],
}, },
roleForm: { roleForm: {
prcCreateUserName: this.$store.getters.userInfo.userName, prcCreateUserName: this.$store.getters.userInfo.userName,
src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+6
View File
@@ -46,6 +46,7 @@
</el-form-item> </el-form-item>
<el-form-item label="截止日期" prop="endTime" class="add-form-item form-item-disabled"> <el-form-item label="截止日期" prop="endTime" class="add-form-item form-item-disabled">
<el-date-picker <el-date-picker
:picker-options="pickerOptions"
v-model="listForm.endTime" v-model="listForm.endTime"
type="date" type="date"
placeholder="请选择截止日期" placeholder="请选择截止日期"
@@ -454,6 +455,11 @@ export default {
}, },
data() { data() {
return { return {
pickerOptions: {
disabledDate(time) {
return time.getTime() < Date.now() - 8.64e7;
},
},
managementHostName: [], //管理主体名称下拉框 managementHostName: [], //管理主体名称下拉框
developmentHostName: [], //开发主体名称下拉框 developmentHostName: [], //开发主体名称下拉框
categoryName: [], //项目细分类下拉框 categoryName: [], //项目细分类下拉框
src/pages/processCenter/pages/newProcess/index.vue
+761 -746
View File
File diff suppressed because it is too large Load Diff
src/pages/processCenter/pages/processList/index.vue
+117 -111
View File
@@ -1,111 +1,117 @@
<!-- 流程中心 --> <!-- 流程中心 -->
<template> <template>
<div class="processCenter"> <div class="processCenter">
<panel-header :tabs="tabsList" @activated="showComponent" :active="active"></panel-header> <panel-header :tabs="tabsList" @activated="showComponent" :active="active"></panel-header>
<panel-content> <panel-content>
<transition enter-active-class="" leave-active-class=""> <transition enter-active-class="" leave-active-class="">
<components :is="active"></components> <components :is="active"></components>
</transition> </transition>
</panel-content> </panel-content>
</div> </div>
</template> </template>
<script> <script>
import ProcessCenter from './tabComponents/processCenter' import ProcessCenter from './tabComponents/processCenter'
import AlreadyProcess from './tabComponents/alreadyProcess' import AlreadyProcess from './tabComponents/alreadyProcess'
import AlreadySend from './tabComponents/alreadySend' import AlreadySend from './tabComponents/alreadySend'
import MonitorProcess from './tabComponents/monitorProcess' import MonitorProcess from './tabComponents/monitorProcess'
import TaskDraft from './tabComponents/taskDraft' import TaskDraft from './tabComponents/taskDraft'
import NewProcess from './tabComponents/newProcess' import NewProcess from './tabComponents/newProcess'
export default { export default {
name: 'index', name: 'index',
data() { data() {
return { return {
active: 'ProcessCenter', active: 'ProcessCenter',
} }
}, },
computed: { computed: {
tabsList() { tabsList() {
const list = [ const list = [
{ {
title: '待办流程', title: '待办流程',
name: 'ProcessCenter' name: 'ProcessCenter',
}, permission:'4219fdb5e33dbbc84d845af98c947e66'
{ },
title: '已办流程', {
name: 'AlreadyProcess' title: '已办流程',
}, name: 'AlreadyProcess',
{ permission:'4f71b81686079ba2b7e3739d3994e0af'
title: '已发流程', },
name: 'AlreadySend' {
}, title: '已发流程',
{ name: 'AlreadySend',
title: '监控流程', permission:'b9abd00768c8ed97be89547c2da3f0eb'
name: 'MonitorProcess', },
}, {
{ title: '监控流程',
title: '草稿', name: 'MonitorProcess',
name: 'TaskDraft' permission:'e1eb3e91143c1cf356889e013e698672'
}, },
{ {
title: '新建流程', title: '草稿',
name: 'NewProcess' name: 'TaskDraft',
}, permission:'fa19fb2dc2cf3055a64732dab6c40cb9'
] },
{
return list.filter(item => { title: '新建流程',
if (item.permission) { name: 'NewProcess',
return this.$hasPermission(item.permission) permission:'b53e6722b33a37c0fa2d87a9b06cca40'
} else { },
return true ]
}
}) return list.filter(item => {
} if (item.permission) {
}, return this.$hasPermission(item.permission)
methods: { } else {
/** return false
* @description: 边栏收缩 }
* @author: chenxiaoxi })
* @date: 2018-09-18 11:11:46 }
*/ },
// tabs 切换事件 methods: {
showComponent(name) { /**
if (this.active !== name) { * @description: 边栏收缩
this.active = name * @author: chenxiaoxi
const location = this.$router.replace({query: {tabsName: name}}) * @date: 2018-09-18 11:11:46
} */
// this.$route.query = {tabsName2: name} // tabs 切换事件
// this.$router.push('/processCenter/' + name) showComponent(name) {
} if (this.active !== name) {
}, this.active = name
components: { const location = this.$router.replace({query: {tabsName: name}})
ProcessCenter, }
AlreadyProcess, // this.$route.query = {tabsName2: name}
AlreadySend, // this.$router.push('/processCenter/' + name)
MonitorProcess, }
TaskDraft, },
NewProcess components: {
// SideBar, ProcessCenter,
// MyProcess AlreadyProcess,
}, AlreadySend,
watch: {}, MonitorProcess,
mounted() { TaskDraft,
if (this.$route.query.tabsName) { NewProcess
this.active = this.$route.query.tabsName // SideBar,
} else { // MyProcess
this.$router.replace({query: {tabsName: this.active}}) },
} watch: {},
this.$store.commit('setDetailMap', '') mounted() {
} if (this.$route.query.tabsName) {
} this.active = this.$route.query.tabsName
</script> } else {
this.$router.replace({query: {tabsName: this.active}})
<style lang="less" scoped> }
.processCenter { this.$store.commit('setDetailMap', '')
position: relative; }
height: 100%; }
background-color: #fff; </script>
}
</style> <style lang="less" scoped>
.processCenter {
position: relative;
height: 100%;
background-color: #fff;
}
</style>
src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue
+1 -1
View File
@@ -187,7 +187,7 @@ export default {
size: this.$store.getters.userInfo.configContent, size: this.$store.getters.userInfo.configContent,
userId: this.$store.getters.userInfo.userId, userId: this.$store.getters.userInfo.userId,
prcName: this.searchForm.prcName, prcName: this.searchForm.prcName,
prcType: parseInt(this.searchForm.prcType) || '', prcType: parseInt(this.searchForm.prcType) || this.searchForm.prcType || '',
prcNum: this.searchForm.prcNum prcNum: this.searchForm.prcNum
}, { }, {
loading: 'loading', loading: 'loading',
src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue
+1 -1
View File
@@ -216,7 +216,7 @@ export default {
size: this.$store.getters.userInfo.configContent, size: this.$store.getters.userInfo.configContent,
userId: this.$store.getters.userInfo.userId, userId: this.$store.getters.userInfo.userId,
prcName: this.searchForm.prcName, prcName: this.searchForm.prcName,
prcType: parseInt(this.searchForm.prcType) || '', prcType: parseInt(this.searchForm.prcType) || this.searchForm.prcType ||'',
prcNum: this.searchForm.prcNum prcNum: this.searchForm.prcNum
}, },
{ {
src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue
+5 -5
View File
@@ -1,7 +1,7 @@
<!--新建流程页面--> <!--新建流程页面-->
<template> <template>
<div id="NewProcess"> <div id="NewProcess">
<div v-if="bzfggllc"> <div >
<el-divider content-position="left"><h2>标准法规政策相关流程</h2></el-divider> <el-divider content-position="left"><h2>标准法规政策相关流程</h2></el-divider>
<div class="process-box"> <div class="process-box">
<div class="process-name"> <div class="process-name">
@@ -612,10 +612,10 @@ export default {
* 标准法规管理流程 * 标准法规管理流程
* @returns {boolean} * @returns {boolean}
*/ */
bzfggllc() { // bzfggllc() {
const idArray = ['2564bd61852551b99e0fe3d49a89b288', '2d0f99ba961c551b1d8cad8ad5223731', '7751d25f72d0a6515e4110ae41837db8', '90c7bae6308595f053c6f6f90167e493', '9adff72ab464793564c5d1de20b45620', 'a151f5e2ee44f8df81e201b8696fca31', 'f4eeb9ed48eac5686a456a5582508d9c', 'fc25b770ad3752cdec52f3bd7b35a6a1'] // const idArray = ['2564bd61852551b99e0fe3d49a89b288', '2d0f99ba961c551b1d8cad8ad5223731', '7751d25f72d0a6515e4110ae41837db8', '90c7bae6308595f053c6f6f90167e493', '9adff72ab464793564c5d1de20b45620', 'a151f5e2ee44f8df81e201b8696fca31', 'f4eeb9ed48eac5686a456a5582508d9c', 'fc25b770ad3752cdec52f3bd7b35a6a1']
return this.checkPermission(idArray) // return this.checkPermission(idArray)
}, // },
/** /**
* 政策管理流程 * 政策管理流程
* @returns {boolean} * @returns {boolean}
src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+6 -6
View File
@@ -76,7 +76,7 @@
width="150" width="150"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<a @click="dealWith(scope.row)" class="table-jump">{{ scope.row.prcNum }}</a> <a @click="dealWith(scope.row)" class="table-jump" v-btn-permission="'4219fdb5e33dbbc84d845af98c947e66'">{{ scope.row.prcNum }}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -86,7 +86,7 @@
width="180" width="180"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span @click="dealWith(scope.row)" class="table-jump">{{ getPrcName(scope.row.prcType) }}</span> <span @click="dealWith(scope.row)" class="table-jump" v-btn-permission="'4219fdb5e33dbbc84d845af98c947e66'">{{ getPrcName(scope.row.prcType) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -97,7 +97,7 @@
min-width="250" min-width="250"
><!--scope.row.prcName--> ><!--scope.row.prcName-->
<template slot-scope="scope"> <template slot-scope="scope">
<a @click="dealWith(scope.row)" class="table-jump">{{ getPrcNameFilter(scope.row) }}</a> <a @click="dealWith(scope.row)" class="table-jump" v-btn-permission="'4219fdb5e33dbbc84d845af98c947e66'">{{ getPrcNameFilter(scope.row) }}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -254,7 +254,7 @@ export default {
size: parseInt(this.$store.getters.userInfo.configContent), size: parseInt(this.$store.getters.userInfo.configContent),
userId: this.$store.getters.userInfo.usid || this.$store.getters.userInfo.userId, userId: this.$store.getters.userInfo.usid || this.$store.getters.userInfo.userId,
prcName: this.searchForm.prcName, prcName: this.searchForm.prcName,
prcType: parseInt(this.searchForm.prcType) || '', prcType: parseInt(this.searchForm.prcType) || this.searchForm.prcType ||'',
prcNum: this.searchForm.prcNum prcNum: this.searchForm.prcNum
}, },
{ {
@@ -421,7 +421,7 @@ export default {
prcType: row.prcType prcType: row.prcType
} }
}) })
}else if (row.taskInfo === '批准'){ }else if (row.taskInfo === '起草单位高级经理审核'){
this.$router.push({ this.$router.push({
name: 'bussLibrary8', name: 'bussLibrary8',
query: { query: {
@@ -454,7 +454,7 @@ export default {
prcType: row.prcType prcType: row.prcType
} }
}) })
}else if (row.taskInfo === '培训'){ }else if (row.taskInfo === '批准'){
this.$router.push({ this.$router.push({
name: 'bussLibrary11', name: 'bussLibrary11',
query: { query: {
src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
+13 -3
View File
@@ -247,7 +247,6 @@ export default {
//草稿办理待开发 //草稿办理待开发
const { prcType, id } = row const { prcType, id } = row
const mes = JSON.parse(row.mes) const mes = JSON.parse(row.mes)
console.log(mes)
this.$store.commit('setDetailMap', this.$route.path) this.$store.commit('setDetailMap', this.$route.path)
switch (prcType) { switch (prcType) {
// 标准入库、 // 标准入库、
@@ -394,7 +393,7 @@ export default {
verifySarStandard: true, verifySarStandard: true,
} }
}) })
}else if (mes.taskInfo === '批准'){ }else if (mes.taskInfo === '起草单位高级经理审核'){
this.$router.push({ this.$router.push({
name: 'bussLibrary8', name: 'bussLibrary8',
query: { query: {
@@ -426,7 +425,7 @@ export default {
verifySarStandard: true, verifySarStandard: true,
} }
}) })
}else if (mes.taskInfo === '培训'){ }else if (mes.taskInfo === '批准'){
this.$router.push({ this.$router.push({
name: 'bussLibrary11', name: 'bussLibrary11',
query: { query: {
@@ -899,6 +898,17 @@ export default {
} }
}) })
break break
//企标制修订立项计划
case '26':
this.$router.push({
name: 'qbzxdlxStep1',
query: {
type: '26',
processName: '企标制修订立项计划',
bpnId: id
}
})
break
} }
}, },
...mapMutations(['setProcess', 'setHandleInfo']), ...mapMutations(['setProcess', 'setHandleInfo']),
src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue
+1421 -1417
View File
File diff suppressed because it is too large Load Diff
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+1378 -1377
View File
File diff suppressed because it is too large Load Diff
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+5 -5
View File
@@ -2748,11 +2748,11 @@ export default {
synopsis: [ synopsis: [
{type: 'string', max: 500, message: '文本说明不能超过500个字符', trigger: 'change'} {type: 'string', max: 500, message: '文本说明不能超过500个字符', trigger: 'change'}
], ],
standYear: [ // standYear: [
{required: true, message: '标准年份不能为空', trigger: 'change'}, // {required: true, message: '标准年份不能为空', trigger: 'change'},
// {validator: this.verify.testNumberCode, trigger: 'change'}, // // {validator: this.verify.testNumberCode, trigger: 'change'},
{type: 'string', max: 100, message: '标准年份不能超过100个字符', trigger: 'change'} // {type: 'string', max: 100, message: '标准年份不能超过100个字符', trigger: 'change'}
], // ],
standName: [ standName: [
{required: true, message: '中文名称不能为空', trigger: 'change'}, {required: true, message: '中文名称不能为空', trigger: 'change'},
{type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change'} {type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change'}
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+141 -130
View File
@@ -71,8 +71,8 @@
<el-form :modal="sarBussionessSearch" :inline="true" class="high-search-form" label-width="110px"> <el-form :modal="sarBussionessSearch" :inline="true" class="high-search-form" label-width="110px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="标准号" class="search-item"> <el-form-item label="企标编号" class="search-item">
<el-input v-model="sarBussionessSearch.standCode" placeholder="根据标准号查找" clearable :maxlength="100"></el-input> <el-input v-model="sarBussionessSearch.standCode" placeholder="根据企标编号查找" clearable :maxlength="100"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
@@ -187,11 +187,11 @@
<!-- <el-option v-for="opt in standSortOptions" :value="opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>--> <!-- <el-option v-for="opt in standSortOptions" :value="opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>-->
<!-- </el-select>--> <!-- </el-select>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-formItem label="标准号" prop="numberName" class="search-item"> <el-formItem label="企标编号" prop="numberName" class="search-item">
<el-input v-model="sarBussionessSearch.standCode" clearable placeholder="根据标准号查找" :maxlength="100"/> <el-input v-model="sarBussionessSearch.standCode" clearable placeholder="根据企标编号查找" :maxlength="100"/>
</el-formItem> </el-formItem>
<el-formItem label="标准名称" prop="standName" class="search-item"> <el-formItem label="中文名称" prop="standName" class="search-item">
<el-input v-model="sarBussionessSearch.standName" clearable placeholder="根据标准名称查找" :maxlength="100"/> <el-input v-model="sarBussionessSearch.standName" clearable placeholder="根据中文名称查找" :maxlength="100"/>
</el-formItem> </el-formItem>
<el-form-item class="search-item btn-box"> <el-form-item class="search-item btn-box">
<el-button <el-button
@@ -416,27 +416,27 @@
<el-table-column fixed="right" <el-table-column fixed="right"
v-if="isPermission('d9730d984627af948053df56a2db7997,dd4ea796dab7a01b105ba657b1968a84,a7a38a95ea374695fc3128037f6feccf')>0" label="收藏" align="center" width="50"> v-if="isPermission('d9730d984627af948053df56a2db7997,dd4ea796dab7a01b105ba657b1968a84,a7a38a95ea374695fc3128037f6feccf')>0" label="收藏" align="center" width="50">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="isPermission('d9730d984627af948053df56a2db7997,dd4ea796dab7a01b105ba657b1968a84,a7a38a95ea374695fc3128037f6feccf') == 1" <!-- <div v-if="isPermission('d9730d984627af948053df56a2db7997,dd4ea796dab7a01b105ba657b1968a84,a7a38a95ea374695fc3128037f6feccf') == 1"-->
@command="handleCommand" <!-- @command="handleCommand"-->
> <!-- >-->
<el-button type="text" v-btn-permission="'d9730d984627af948053df56a2db7997'" <!-- <el-button type="text" v-btn-permission="'d9730d984627af948053df56a2db7997'"-->
v-if="scope.row.collectBtn" <!-- v-if="scope.row.collectBtn"-->
@click="handleCommand([scope.row, '收藏'])" <!-- @click="handleCommand([scope.row, '收藏'])"-->
>收藏 <!-- >收藏-->
</el-button> <!-- </el-button>-->
<el-button type="text" v-btn-permission="'d9730d984627af948053df56a2db7997'" <!-- <el-button type="text" v-btn-permission="'d9730d984627af948053df56a2db7997'"-->
v-else <!-- v-else-->
@click="handleCommand([scope.row, '取消收藏'])" <!-- @click="handleCommand([scope.row, '取消收藏'])"-->
>取消收藏 <!-- >取消收藏-->
</el-button> <!-- </el-button>-->
<el-button type="text" @click="handleCommand([scope.row, '编辑'])" <!-- <el-button type="text" @click="handleCommand([scope.row, '编辑'])"-->
v-btn-permission="'dd4ea796dab7a01b105ba657b1968a84'">编辑 <!-- v-btn-permission="'dd4ea796dab7a01b105ba657b1968a84'">编辑-->
</el-button> <!-- </el-button>-->
<el-button type="text" @click="handleCommand([scope.row, '删除']) " <!-- <el-button type="text" @click="handleCommand([scope.row, '删除']) "-->
v-btn-permission="'a7a38a95ea374695fc3128037f6feccf'">删除 <!-- v-btn-permission="'a7a38a95ea374695fc3128037f6feccf'">删除-->
</el-button> <!-- </el-button>-->
</div> <!-- </div>-->
<div v-else> <div>
<div @click.stop style="display: inline-block"> <div @click.stop style="display: inline-block">
<el-button title="收藏" class="collection-btn" icon="el-icon-star-off" v-btn-permission="'d9730d984627af948053df56a2db7997'" <el-button title="收藏" class="collection-btn" icon="el-icon-star-off" v-btn-permission="'d9730d984627af948053df56a2db7997'"
v-if="scope.row.collectBtn" v-if="scope.row.collectBtn"
@@ -449,9 +449,7 @@
> >
</el-button> </el-button>
</div> </div>
</div> </div>
</template> </template>
@@ -573,10 +571,17 @@
<el-input <el-input
:config="field" :config="field"
clearable clearable
:title="sarBussionessStandEO[field.attrField]"
v-model="sarBussionessStandEO[field.attrField]" v-model="sarBussionessStandEO[field.attrField]"
:disabled="formdisableflag" placeholder="选择起草部门" :disabled="formdisableflag" placeholder="选择起草部门">
@click.native="choiceQCDW('QCDWId', '起草部门', sarBussionessStandEO.QCDWId)">
</el-input> </el-input>
<el-button
type="primary"
size="mini"
style="position:absolute;top: 10px;right: 0;"
@click="choiceQCDW('QCDWId', '起草部门', sarBussionessStandEO.QCDW)"
class="common-button-primary">手动查找
</el-button>
</el-form-item> </el-form-item>
</template> </template>
<!--起草人QCRBUSS--> <!--起草人QCRBUSS-->
@@ -587,7 +592,7 @@
class="add-form-item" class="add-form-item"
> >
<template slot="label">起草人</template> <template slot="label">起草人</template>
<el-input v-model="sarBussionessStandEO[field.attrField]" placeholder="选择起草人" @click.native="choiceQCR('QCRBUSS', '选择起草人', sarBussionessStandEO[field.attrField])"> <el-input v-model="sarBussionessStandEO[field.attrField]" :title="sarBussionessStandEO[field.attrField]" placeholder="选择起草人" @click.native="choiceQCR('QCRBUSS', '选择起草人', sarBussionessStandEO[field.attrField])">
</el-input> </el-input>
<!-- <el-input--> <!-- <el-input-->
<!-- :key="field.attrField"--> <!-- :key="field.attrField"-->
@@ -642,7 +647,7 @@
<el-input <el-input
v-model="sarBussionessStandEO.CYCVPPSBMBUSS" v-model="sarBussionessStandEO.CYCVPPSBMBUSS"
placeholder="选择VPPS编码" placeholder="选择VPPS编码"
@click.native="choiceZRR2('car', '乘用车VPPS编码', sarBussionessStandEO.KCVPPSBMBUSS,true)"></el-input> @click.native="choiceZRR2('car', '关联模块--乘用车VPPS编码', sarBussionessStandEO.KCVPPSBMBUSS,true)"></el-input>
</el-form-item> </el-form-item>
</el-tooltip> </el-tooltip>
</template> </template>
@@ -1078,11 +1083,6 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="中文名称" class="add-form-item form-item-disabled">
<el-input v-model="sarBussionessSearch.standName"
placeholder="请输入企标名称"
clearable></el-input>
</el-form-item>
<el-form-item label="英文名称" title="企标英文名称" class="add-form-item form-item-disabled"> <el-form-item label="英文名称" title="企标英文名称" class="add-form-item form-item-disabled">
<el-input v-model="sarBussionessSearch.standEnName" <el-input v-model="sarBussionessSearch.standEnName"
placeholder="请输入企标英文名称" placeholder="请输入企标英文名称"
@@ -1123,10 +1123,6 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="企标编号" class="add-form-item form-item-disabled">
<el-input v-model="sarBussionessSearch.standCode" clearable
placeholder="请输入企标编号"></el-input>
</el-form-item>
<el-form-item label="标准年份" class="add-form-item form-item-disabled"> <el-form-item label="标准年份" class="add-form-item form-item-disabled">
<el-input v-model.number="sarBussionessSearch.standYear" <el-input v-model.number="sarBussionessSearch.standYear"
placeholder="请输入标准年份" placeholder="请输入标准年份"
@@ -1226,11 +1222,29 @@
<el-form-item label="体系类别" class="add-form-item form-item-disabled"> <el-form-item label="体系类别" class="add-form-item form-item-disabled">
<el-input v-model="sarBussionessSearch.TXLBBUSS" placeholder="选择体系类别" clearable @click.native="choiceZRR1('TXLBBUSS', '体系类别', sarBussionessStandEO.TXLBBUSS)"></el-input> <el-input v-model="sarBussionessSearch.TXLBBUSS" placeholder="选择体系类别" clearable @click.native="choiceZRR1('TXLBBUSS', '体系类别', sarBussionessStandEO.TXLBBUSS)"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="模块VPPS编码" title="模块VPPS编码" class="add-form-item form-item-disabled"> <el-form-item label="关联模块--乘用车VPPS编码" title="关联模块--乘用车VPPS编码" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="sarBussionessSearch.VPPSBMBUSS" v-model="sarBussionessSearch.CYCVPPSBMBUSS"
placeholder="选择VPPS编码" placeholder="请输入关联模块--乘用车VPPS编码"
@click.native="choiceZRR2('car', 'VPPS编码', sarBussionessStandEO.VPPSBMBUSS,true)"></el-input> ></el-input>
</el-form-item>
<el-form-item label="关联模块--卡车VPPS编码" title="关联模块--卡车VPPS编码" class="add-form-item form-item-disabled">
<el-input
v-model="sarBussionessSearch.KCVPPSBMBUSS"
placeholder="请输入关联模块--卡车VPPS编码"
></el-input>
</el-form-item>
<el-form-item label="模块结构单元变型号(卡车)" title="模块结构单元变型号(卡车)" class="add-form-item form-item-disabled">
<el-input
v-model="sarBussionessSearch.DYBXHBUSS"
placeholder="请输入模块结构单元变型号(卡车)"
></el-input>
</el-form-item>
<el-form-item label="模块结构单元变型号(乘用车)" title="模块结构单元变型号(乘用车)" class="add-form-item form-item-disabled">
<el-input
v-model="sarBussionessSearch.CYCDYBXHBUSS"
placeholder="请输入模块结构单元变型号(乘用车)"
></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@@ -1244,18 +1258,6 @@
@click.native="choiceQCR('QCRBUSS', '查询起草人', sarBussionessSearch['QCRBUSS'])"> @click.native="choiceQCR('QCRBUSS', '查询起草人', sarBussionessSearch['QCRBUSS'])">
</el-input> </el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item label="起草人" class="add-form-item form-item-disabled">-->
<!-- <el-input v-model="sarBussionessSearch.QCRBUSS" clearable placeholder="请输入起草人"></el-input>-->
<!--&lt;!&ndash; <el-select v-model="sarBussionessSearch.QCRBUSS" filterable clearable>&ndash;&gt;-->
<!--&lt;!&ndash; <el-option&ndash;&gt;-->
<!--&lt;!&ndash; v-for="item in qcrOptions"&ndash;&gt;-->
<!--&lt;!&ndash; placeholder="请选择"&ndash;&gt;-->
<!--&lt;!&ndash; :key="item.value"&ndash;&gt;-->
<!--&lt;!&ndash; :value="item.value"&ndash;&gt;-->
<!--&lt;!&ndash; :label="item.label"&ndash;&gt;-->
<!--&lt;!&ndash; ></el-option>&ndash;&gt;-->
<!--&lt;!&ndash; </el-select>&ndash;&gt;-->
<!-- </el-form-item>-->
<!-- 能源类型--> <!-- 能源类型-->
<template> <template>
<custom-select-array <custom-select-array
@@ -1264,18 +1266,6 @@
v-model="sarBussionessSearch['NYLXCLASS']" v-model="sarBussionessSearch['NYLXCLASS']"
></custom-select-array> ></custom-select-array>
</template> </template>
<!-- <el-form-item label="能源类型" class="add-form-item form-item-disabled">-->
<!-- <el-select v-model="sarBussionessSearch.NYLXCLASS" filterable clearable>-->
<!-- <el-option-->
<!-- v-for="item in categoryOptions"-->
<!-- placeholder="请选择"-->
<!-- :key="item.value"-->
<!-- :value="item.value"-->
<!-- :label="item.label"-->
<!-- ></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- 适用产品线（新增字段）-->
<template> <template>
<custom-select-array <custom-select-array
:config="sycpxOptions" :config="sycpxOptions"
@@ -1283,20 +1273,30 @@
v-model="sarBussionessSearch['SYCPXCLASS']" v-model="sarBussionessSearch['SYCPXCLASS']"
></custom-select-array> ></custom-select-array>
</template> </template>
<!-- <el-form-item label="适用产品线" title="适用产品线" class="add-form-item form-item-disabled">--> <el-form-item label="关联模块--乘用车vpps中文名称" title="关联模块--乘用车vpps中文名称" class="add-form-item form-item-disabled">
<!-- <el-select v-model="sarBussionessSearch.SYCPXCLASS" filterable clearable>--> <el-input
<!-- <el-option--> v-model="sarBussionessSearch.CYCVPPSCNBUSS"
<!-- v-for="item in sycpxOptions"--> placeholder="请输入关联模块--乘用车vpps中文名称"
<!-- placeholder="请选择"--> ></el-input>
<!-- :key="item.value"--> </el-form-item>
<!-- :value="item.value"--> <el-form-item label="关联模块--卡车vpps中文名称" title="关联模块--卡车vpps中文名称" class="add-form-item form-item-disabled">
<!-- :label="item.label"--> <el-input
<!-- ></el-option>--> v-model="sarBussionessSearch.KCVPPSCNBUSS"
<!-- </el-select>--> placeholder="请输入关联模块--卡车vpps中文名称"
<!-- </el-form-item>--> ></el-input>
<!-- <el-form-item label="模块中文名称" title="模块中文名称" class="add-form-item form-item-disabled"> </el-form-item>
<el-input v-model="sarBussionessSearch.VPPSCNBUSS" placeholder="请输入模块中文名称" clearable></el-input> <el-form-item label="模块结构单元名称(卡车)" title="模块结构单元名称(卡车)" class="add-form-item form-item-disabled">
</el-form-item>--> <el-input
v-model="sarBussionessSearch.DYMCBUSS"
placeholder="请输入模块结构单元名称(卡车)"
></el-input>
</el-form-item>
<el-form-item label="模块结构单元名称(乘用车)" title="关联模块--乘用车vpps中文名称" class="add-form-item form-item-disabled">
<el-input
v-model="sarBussionessSearch.CYCDYMCBUSS"
placeholder="请输入关联模块--乘用车vpps中文名称"
></el-input>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
@@ -1398,17 +1398,11 @@
border border
:height="300" :height="300"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}" fontWeight: 'bold', height: '48px'}">
@selection-change="selectReplaceStandNumRowChange">
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column <el-table-column
label="企标编号"> label="企标编号">
<template slot-scope="scope"> <template slot-scope="scope">
<a v-if="scope.row.standCode" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standCode }}</a> <a v-if="scope.row.standCode" class="table-jump" @click="handlePreview(scope.row,'fs')">{{ scope.row.standCode }}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -2591,17 +2585,17 @@ export default {
popoverHideBusVs(checkedIds, checkedData, isShow, isLoadChild, topId) { popoverHideBusVs(checkedIds, checkedData, isShow, isLoadChild, topId) {
if (checkedData && checkedData.length != 0) { if (checkedData && checkedData.length != 0) {
if (checkedData.length > 0) { if (checkedData.length > 0) {
if (this.drawerTitle2 === 'VPPS编码') { if (this.drawerTitle2 === '关联模块--乘用车VPPS编码') {
this.sarBussionessSearch.VPPSBMBUSS = checkedData.map(item => item.code).join(",") this.sarBussionessSearch.CYCVPPSBMBUSS = checkedData.map(item => item.code).join(",")
this.sarBussionessSearch.VPPSCNBUSS = checkedData.map(item => item.chineseName).join(",") this.sarBussionessSearch.CYCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
} else { } else {
this.sarBussionessStandEO.CYCVPPSBMBUSS = checkedData.map(item => item.code).join(",") this.sarBussionessStandEO.CYCVPPSBMBUSS = checkedData.map(item => item.code).join(",")
this.sarBussionessStandEO.CYCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",") this.sarBussionessStandEO.CYCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
} }
} else { } else {
if (this.drawerTitle2 === 'VPPS编码') { if (this.drawerTitle2 === '关联模块--乘用车VPPS编码') {
this.sarBussionessSearch.VPPSBMBUSS = checkedData.code this.sarBussionessSearch.CYCVPPSBMBUSS = checkedData.code
this.sarBussionessSearch.VPPSCNBUSS = checkedData.chineseName this.sarBussionessSearch.CYCVPPSCNBUSS = checkedData.chineseName
} else { } else {
this.sarBussionessStandEO.CYCVPPSBMBUSS = checkedData.code this.sarBussionessStandEO.CYCVPPSBMBUSS = checkedData.code
this.sarBussionessStandEO.CYCVPPSCNBUSS = checkedData.chineseName this.sarBussionessStandEO.CYCVPPSCNBUSS = checkedData.chineseName
@@ -3368,7 +3362,7 @@ export default {
}) })
}, },
// 点击查看 // 点击查看
handlePreview(item) { handlePreview(item,fs) {
// const mj = item.attrInfoMap.QBMJ // const mj = item.attrInfoMap.QBMJ
// if (mj === 'GXNX7D6H59') { // if (mj === 'GXNX7D6H59') {
// // C1所有人都可查看 // // C1所有人都可查看
@@ -3446,10 +3440,11 @@ export default {
let routeUrl = this.$router.resolve({ let routeUrl = this.$router.resolve({
name: 'OtherBussStandardDetails', name: 'OtherBussStandardDetails',
params: { params: {
id: item.id, id: fs ? (fs === 'fs' ? item.standId:item.id) : item.id,
pageType: 'BUSINESS_STAND' pageType: 'BUSINESS_STAND'
} }
}) })
console.log(routeUrl)
window.open(routeUrl.href, '_blank') window.open(routeUrl.href, '_blank')
}, },
// 编辑 // 编辑
@@ -3539,9 +3534,20 @@ export default {
// $('#deptBtn').click() // $('#deptBtn').click()
$('#deptBtn2').click() $('#deptBtn2').click()
}, },
choiceQCR(type, title, id) { choiceQCR(type, title, nameId) {
this.nodeList = [] this.nodeList2 = []
this.nodeList.push(id) if (nameId) {
let nameId1 = nameId.split(',')
let idList = []
nameId1.forEach(item => {
let a, b
a = item.substring(item.indexOf('(') +1)
b = a.substring(0, a.lastIndexOf(')'))
idList.push(b)
})
idList = idList.join(',')
this.nodeList2.push(idList)
}
this.userType = type this.userType = type
this.drawerTitle = title this.drawerTitle = title
this.modalShowRoleFlag = true this.modalShowRoleFlag = true
@@ -3572,7 +3578,9 @@ export default {
}, },
choiceQCDW(type, title, id) { choiceQCDW(type, title, id) {
this.nodeListZRBM = [] this.nodeListZRBM = []
this.nodeListZRBM.push(id) if(this.sarBussionessStandEO.QCDWID && this.sarBussionessStandEO.QCDWID.length > 0){
this.nodeListZRBM = this.sarBussionessStandEO.QCDWID.split(',')
}
this.drawerTitle = title this.drawerTitle = title
this.modalshowflagZRBM = true this.modalshowflagZRBM = true
}, },
@@ -3593,7 +3601,16 @@ export default {
this.sarBussionessSearch.QCDW = nameList this.sarBussionessSearch.QCDW = nameList
} }
this.$set(this.sarBussionessStandEO, 'QCDWId', idList) this.$set(this.sarBussionessStandEO, 'QCDWId', idList)
this.$set(this.sarBussionessStandEO, 'QCDW', nameList) let tNameList = (this.sarBussionessStandEO.QCDW === null || this.sarBussionessStandEO.QCDW === '') ? nameList : this.sarBussionessStandEO.QCDW+','+nameList
const arr=new Set()
let permission = tNameList.split(",");
permission.forEach((item, index) => {
arr.add(item)
})
let nameNew=Array.from(arr).join(',')
this.$set(this.sarBussionessStandEO, 'QCDW', nameNew)
if (this.sarBussionessStandEO.QCRBUSS) { if (this.sarBussionessStandEO.QCRBUSS) {
this.$refs.sarBussionessStandForm.validateField('QCDW') this.$refs.sarBussionessStandForm.validateField('QCDW')
} }
@@ -3624,8 +3641,8 @@ export default {
nowstandinfo.putTime = this.$dateFormat(this.sarBussionessStandEO.putTime, 'yyyy-MM-dd hh:mm:ss') nowstandinfo.putTime = this.$dateFormat(this.sarBussionessStandEO.putTime, 'yyyy-MM-dd hh:mm:ss')
} }
// 代替标准号 // 代替标准号
if (nowstandinfo.replaceStandNum != null) { if (this.sarBussionessStandEO["DTQBBHBUSS"] != null) {
nowstandinfo.replaceStandNum = nowstandinfo.replaceStandNum.replace(/，/ig, ',') nowstandinfo.replaceStandNum = this.sarBussionessStandEO["DTQBBHBUSS"].replace(/，/ig, ',')
} }
if (nowstandinfo.replaceStandNum != null && nowstandinfo.replaceStandNum !== '') { if (nowstandinfo.replaceStandNum != null && nowstandinfo.replaceStandNum !== '') {
nowstandinfo.replaceStandNum = nowstandinfo.replaceStandNum.replace(/\r\n/g, '<br />') nowstandinfo.replaceStandNum = nowstandinfo.replaceStandNum.replace(/\r\n/g, '<br />')
@@ -4323,37 +4340,29 @@ export default {
formFieldList.forEach((item) => { formFieldList.forEach((item) => {
const value = this.sarBussionessSearch[item.attrField] const value = this.sarBussionessSearch[item.attrField]
// 时间格式处理 // 时间格式处理
if (value !== undefined && value !== null && value !== "" && item.attrField === 'VPPSBMBUSS') { if (value !== undefined && value !== null && value !== "" && item.attrField === 'BARQ') {
advanceSearchVOList.push({ advanceSearchVOList.push({
connect: "and", connect: "and",
field: 'CYCVPPSBM', field: item.attrField || "",
type: 'like', type: 'EQUALS',
value: value value: value
}); });
}else if (value !== undefined && value !== null && value !== "" && item.attrField === 'VPPSCNBUSS') { }else if (value !== undefined && value !== null && value !== "" && (item.attrField === 'FZRQBUSS' || item.attrField === 'FSRQBUSS')) {
advanceSearchVOList.push({
connect: "and",
field: 'CYCVPPSCN',
type: 'like',
value: value
});
}else if (value !== undefined && value !== null && value !== "" && item.attrField !== 'BARQ') {
advanceSearchVOList.push({ advanceSearchVOList.push({
connect: advanceSearchVOList.length > 0 ? "and" : "", connect: advanceSearchVOList.length > 0 ? "and" : "",
field: item.attrField || "", field: item.attrField || "",
type: "between", type: "between",
value: (value ? value[0]+','+value[1] : "") || "",
});
}else if (value !== undefined && value !== null && value !== "") {
advanceSearchVOList.push({
connect: "and",
field: item.attrField || "",
type: 'like',
value: value value: value
}); });
} }
}) })
if (formData.BARQ !== undefined && formData.BARQ !== null && formData.BARQ !== '') {
advanceSearchVOList.push({
connect: "and",
field: 'BARQ',
type: 'EQUALS',
value: formData.BARQ
});
}
} }
formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList); formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList);
this.SarExportSearchEo = formData; this.SarExportSearchEo = formData;
@@ -4744,6 +4753,8 @@ export default {
} }
if (item.attrLen && item.attrType === 'INPUT_STR' && item.attrField === 'DTQBBHBUSS') { if (item.attrLen && item.attrType === 'INPUT_STR' && item.attrField === 'DTQBBHBUSS') {
rule.push({type: 'string', max: 500, message: '代替企标编号不能超过500个字符', trigger: 'change'}) rule.push({type: 'string', max: 500, message: '代替企标编号不能超过500个字符', trigger: 'change'})
}else if(item.attrLen && item.attrType === 'INPUT_STR'){
rule.push({type: 'string', max: item.attrLen, message: `${item.attrName}不能超过${item.attrLen}个字符`, trigger: 'change'})
} }
if (item.attrLen && item.attrType !== 'DATE_PICKER' && item.attrType !== 'SEL_OPTION' && item.attrType !== 'SEL_OPTS' && item.attrType !== 'INPUT_STR') { if (item.attrLen && item.attrType !== 'DATE_PICKER' && item.attrType !== 'SEL_OPTION' && item.attrType !== 'SEL_OPTS' && item.attrType !== 'INPUT_STR') {
rule.push({ rule.push({
src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+7 -3
View File
@@ -34,6 +34,7 @@
</el-form-item> </el-form-item>
<el-form-item class="search-item btn-box"> <el-form-item class="search-item btn-box">
<el-button <el-button
v-btn-permission="'1595c63ae9b14631ff3adefe51a92bdb'"
type="primary" type="primary"
class="common-button-primary" class="common-button-primary"
size="mini" size="mini"
@@ -43,6 +44,7 @@
</el-form-item> </el-form-item>
<el-form-item class="search-item btn-box"> <el-form-item class="search-item btn-box">
<el-button <el-button
v-btn-permission="'5c8347d102094d48139b30723e187113'"
class="common-button-default" class="common-button-default"
size="mini" size="mini"
@click="clearData"> @click="clearData">
@@ -56,6 +58,7 @@
<el-button type="primary" <el-button type="primary"
class="common-button-primary add-button" class="common-button-primary add-button"
size="mini" size="mini"
v-btn-permission="'66ae947771821e3bd064c5594a14d145'"
@click="addData"><i class="el-icon-plus"></i>新增 @click="addData"><i class="el-icon-plus"></i>新增
</el-button> </el-button>
<!-- <el-button class="common-button-default in-button"--> <!-- <el-button class="common-button-default in-button"-->
@@ -71,6 +74,7 @@
<!-- </el-button>--> <!-- </el-button>-->
<el-button class="common-button-default" <el-button class="common-button-default"
size="mini" size="mini"
v-btn-permission="'74c437f9bfce7198144aa08e9a52950e'"
@click="deleteList"><i class="iconfont">&#xe611;</i>删除 @click="deleteList"><i class="iconfont">&#xe611;</i>删除
</el-button> </el-button>
</div> </div>
@@ -171,13 +175,13 @@
<el-dropdown trigger="click" @command="handleCommand"> <el-dropdown trigger="click" @command="handleCommand">
<i class="iconfont">&#xe61e;</i> <i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="[scope.row, '查看']"> <el-dropdown-item v-btn-permission="'68bc53399a9e0daf1cc2f1bb2aa1d566'" :command="[scope.row, '查看']">
查看 查看
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item :command="[scope.row, '编辑']"> <el-dropdown-item v-btn-permission="'cc5d8f1a15726c62c5016e595246ec8b'" :command="[scope.row, '编辑']">
编辑 编辑
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item :command="[scope.row, '删除']"> <el-dropdown-item v-btn-permission="'74c437f9bfce7198144aa08e9a52950e'" :command="[scope.row, '删除']">
删除 删除
</el-dropdown-item> </el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
+6 -4
View File
@@ -1419,13 +1419,13 @@
}, },
productModelAdd: { productModelAdd: {
id : "", id : "",
sorDivide : "INLAND_STAND", sorDivide : "FOREIGN_LAWS",
menuName : "", menuName : "",
parentId : null, parentId : null,
parentIds : null, parentIds : null,
parentIdsName : "", parentIdsName : "",
displaySeq : "", displaySeq : "",
validFlag : "", validFlag : "0",
creationTime : "", creationTime : "",
modifyTime : "", modifyTime : "",
remarks : "", remarks : "",
@@ -2257,6 +2257,8 @@
saveProduct (name) { saveProduct (name) {
this.$refs[name].validate((valid) => { this.$refs[name].validate((valid) => {
if (valid) { if (valid) {
this.productModelAdd.sorDivide = 'FOREIGN_LAWS'
this.productModelAdd.validFlag = '0'
if (this.modalType === 1) { if (this.modalType === 1) {
this.$http.postData('sarResource/ts-resource/add', this.productModelAdd, { this.$http.postData('sarResource/ts-resource/add', this.productModelAdd, {
_this: this _this: this
@@ -2337,11 +2339,11 @@
if(row.parentIds.indexOf(res.data.id) != -1){ if(row.parentIds.indexOf(res.data.id) != -1){
this.productModelAdd.parentIds = row.parentIds this.productModelAdd.parentIds = row.parentIds
}else { }else {
this.productModelAdd.parentIds = row.parentIds + ',' + res.data.id this.productModelAdd.parentIds = row.parentIds + res.data.id+','
idsName = row.parentIdsName + ',' + res.data.menuName idsName = row.parentIdsName + ',' + res.data.menuName
} }
}else { }else {
this.productModelAdd.parentIds = res.data.id this.productModelAdd.parentIds = +','+res.data.id+','
idsName = res.data.menuName; idsName = res.data.menuName;
} }
this.productModelAdd.parentId = res.data.id this.productModelAdd.parentId = res.data.id
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+1 -1
View File
@@ -160,7 +160,7 @@
</el-button> </el-button>
<el-button class="common-button-default" <el-button class="common-button-default"
size="mini" @click="OCRAdd('2')" size="mini" @click="OCRAdd('2')"
v-btn-permission="'247cebaefa7cf1683092af160af11502'"><i class="iconfont">&#xe611;</i>编辑 v-btn-permission="'e8d690904ee1895dd0d17d9c794fbcd7'"><i class="iconfont">&#xe611;</i>编辑
</el-button> </el-button>
<!--&lt;!&ndash; <el-button class="common-button-default" <!--&lt;!&ndash; <el-button class="common-button-default"
size="mini" :loading="searching" size="mini" :loading="searching"
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+1206 -1206
View File
File diff suppressed because it is too large Load Diff
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue
+1 -1
View File
@@ -83,7 +83,7 @@
width="80" width="80"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="primary" class="common-button-primary" @click="handleProjectCompliance(scope.row)">查看</el-button> <el-button size="mini" type="primary" class="common-button-primary" @click="handleProjectCompliance(scope.row)" v-btn-permission="'08e9f28f1afb80b706217bdd9c6323bd'">查看</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue
+1 -1
View File
@@ -104,7 +104,7 @@
width="100" width="100"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button class="common-button-primary" type="primary" size="mini" @click="handleProjectCompliance(scope.row)">查看</el-button> <el-button class="common-button-primary" type="primary" size="mini" @click="handleProjectCompliance(scope.row)" v-btn-permission="'7d79b9521e77c73857ee788e30670e8d'">查看</el-button>
<!-- <i class="el-icon-view btn-i" @click="handleProjectCompliance(scope.row)"></i>--> <!-- <i class="el-icon-view btn-i" @click="handleProjectCompliance(scope.row)"></i>-->
</template> </template>
</el-table-column> </el-table-column>
src/pages/regulatoryRepository/nonConfomity/pages/keyIssues.vue
+65 -65
View File
@@ -1,65 +1,65 @@
<!--重点问题项管控--> <!--重点问题项管控-->
<template> <template>
<div id="key-issues"> <div id="key-issues">
<div class="non-content"> <div class="non-content">
<el-tabs v-model="keynoteActiveName" @tab-click="handleClick"> <el-tabs v-model="keynoteActiveName" @tab-click="handleClick">
<el-tab-pane label="事业部" name="cause"> <el-tab-pane label="事业部" name="cause">
<business-division></business-division> <business-division></business-division>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="产品规划部" name="product"> <el-tab-pane label="产品规划部" name="product">
<product-department></product-department> <product-department></product-department>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import businessDivision from "@/pages/regulatoryRepository/nonConfomity/pages/businessDivision"; import businessDivision from "@/pages/regulatoryRepository/nonConfomity/pages/businessDivision";
import productDepartment from "@/pages/regulatoryRepository/nonConfomity/pages/productDepartment"; import productDepartment from "@/pages/regulatoryRepository/nonConfomity/pages/productDepartment";
export default { export default {
name: "keyIssues", name: "keyIssues",
props:['keynoteActiveName'], props:['keynoteActiveName'],
components: { components: {
businessDivision, businessDivision,
productDepartment, productDepartment,
}, },
data() { data() {
return { return {
activeName:'cause', activeName:'cause',
} }
}, },
methods: { methods: {
handleClick(tab, event) { handleClick(tab, event) {
console.log(tab, event); console.log(tab, event);
} }
}, },
}; };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
#key-issues { #key-issues {
height: 100%; height: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
background-color: #FFFFFF; background-color: #FFFFFF;
.non-content { .non-content {
height: 100%; height: 100%;
/deep/ .el-tabs { /deep/ .el-tabs {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.el-tabs__content { .el-tabs__content {
flex: 1; flex: 1;
overflow: hidden; overflow: hidden;
.el-tab-pane { .el-tab-pane {
height: 100%; height: 100%;
} }
} }
} }
} }
.el-tabs__nav { .el-tabs__nav {
margin-left:20px; margin-left:20px;
} }
} }
</style> </style>
src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+747 -747
View File
File diff suppressed because it is too large Load Diff
src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue
+6
View File
@@ -7,6 +7,7 @@
<div class="header-right"> <div class="header-right">
<el-button <el-button
type="primary" type="primary"
v-btn-permission="'141c18729a988fe5d9c52296f35ba9f4'"
size="mini" size="mini"
class="common-button-primary" class="common-button-primary"
v-if="addButton" v-if="addButton"
@@ -16,6 +17,7 @@
<el-button <el-button
type="primary" type="primary"
size="mini" size="mini"
v-btn-permission="'42a77131e13b8cc67886025b44d9948d'"
class="common-button-primary" class="common-button-primary"
v-if="addItemButton" v-if="addItemButton"
@click="addItem2"> @click="addItem2">
@@ -26,6 +28,7 @@
size="mini" size="mini"
class="common-button-primary" class="common-button-primary"
v-if="editButton" v-if="editButton"
v-btn-permission="'a3803aae3f65134dee97c6b03680d4f9'"
@click="editItem"> @click="editItem">
编辑 编辑
</el-button> </el-button>
@@ -33,6 +36,7 @@
type="primary" type="primary"
size="mini" size="mini"
class="common-button-primary" class="common-button-primary"
v-btn-permission="'db4ab168afb99c61d4f986c9746a7c65'"
v-if="seeButton" v-if="seeButton"
@click="seeItem"> @click="seeItem">
查看 查看
@@ -42,6 +46,7 @@
size="mini" size="mini"
class="common-button-primary" class="common-button-primary"
v-if="seeItemButton" v-if="seeItemButton"
v-btn-permission="'e99a7847d5d9d04d4423e8f69e77f080'"
@click="handlePreview(standId)"> @click="handlePreview(standId)">
查看标准 查看标准
</el-button> </el-button>
@@ -50,6 +55,7 @@
size="mini" size="mini"
class="common-button-default" class="common-button-default"
v-if="delectButton" v-if="delectButton"
v-btn-permission="'b1391e768988c363b177419e2ae16633'"
@click="delItem"> @click="delItem">
删除 删除
</el-button> </el-button>
src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue
+6
View File
@@ -10,6 +10,7 @@
size="mini" size="mini"
class="common-button-primary" class="common-button-primary"
v-if="addButton" v-if="addButton"
v-btn-permission="'9b99ffc92c0100dab08b9fd0037e2b06'"
@click="addItem"> @click="addItem">
新增 新增
</el-button> </el-button>
@@ -18,6 +19,7 @@
size="mini" size="mini"
class="common-button-primary" class="common-button-primary"
v-if="addItemButton" v-if="addItemButton"
v-btn-permission="'fc429d36f2d117f13f079aab59c28338'"
@click="addItem2"> @click="addItem2">
新增政策 新增政策
</el-button> </el-button>
@@ -26,6 +28,7 @@
size="mini" size="mini"
class="common-button-primary" class="common-button-primary"
v-if="editButton" v-if="editButton"
v-btn-permission="'8088f3612c206cb5ca5040091a08ac86'"
@click="editItem"> @click="editItem">
编辑 编辑
</el-button> </el-button>
@@ -34,6 +37,7 @@
size="mini" size="mini"
class="common-button-primary" class="common-button-primary"
v-if="seeButton" v-if="seeButton"
v-btn-permission="'4abd63ca838a6845bdf6a9e8cbc8ad5b'"
@click="seeItem"> @click="seeItem">
查看 查看
</el-button> </el-button>
@@ -42,6 +46,7 @@
size="mini" size="mini"
class="common-button-primary" class="common-button-primary"
v-if="seeItemButton" v-if="seeItemButton"
v-btn-permission="'acc9bf3585de7dbf7282cc3cf4fb6337'"
@click="handlePreview(standId)"> @click="handlePreview(standId)">
查看政策 查看政策
</el-button> </el-button>
@@ -50,6 +55,7 @@
size="mini" size="mini"
class="common-button-default" class="common-button-default"
v-if="delectButton" v-if="delectButton"
v-btn-permission="'19e9ff56a1d5dcde2710036d5cc53ebb'"
@click="delItem"> @click="delItem">
删除 删除
</el-button> </el-button>
src/pages/regulatoryRepository/workingGroup/index.vue
+1 -1
View File
@@ -14,7 +14,7 @@
<workingGroup2 v-if="activeName === 'workingGroup2'"></workingGroup2> <workingGroup2 v-if="activeName === 'workingGroup2'"></workingGroup2>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<el-button size="mini" type="primary" @click="statisticsBtn" class="statistics">工作组统计</el-button> <el-button size="mini" type="primary" @click="statisticsBtn" v-btn-permission="'2331baafd7d298b87ab3c0b5430d608d'" class="statistics">工作组统计</el-button>
</div> </div>
</template> </template>
<script> <script>