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

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

Browse Source
This commit is contained in:
super_liu
2022-03-23 15:31:49 +08:00
parent b348e2d816 117adca57e
commit 45d09e4310
8 changed files with 2803 additions and 2767 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
+11 -3
View File
@@ -124,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>
@@ -299,7 +300,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>
@@ -589,6 +590,12 @@ export default {
workChange(data) { workChange(data) {
this.workChangeList = data this.workChangeList = data
}, },
//工作组取消按钮
closeWorkDrawer(){
this.workModel = false
this.workSearch.workGroupName = ''
this.$refs.workGroup.clearSelection()
},
OkWork(){ OkWork(){
if(this.workChangeList.length > 1 ){ if(this.workChangeList.length > 1 ){
this.$message.warning('您只能选择一条数据进行带入') this.$message.warning('您只能选择一条数据进行带入')
@@ -601,6 +608,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()
} }
}, },
@@ -1014,7 +1022,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 {
src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue
+15 -3
View File
@@ -194,7 +194,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 +675,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/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 true
* @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/taskDraft/index.vue
+11 -1
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) {
// 标准入库、 // 标准入库、
@@ -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/pages/details.vue
+1378 -1377
View File
File diff suppressed because it is too large Load Diff
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+1206 -1206
View File
File diff suppressed because it is too large Load Diff
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
-1
View File
@@ -114,7 +114,6 @@
label="章节名称"> label="章节名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="content"
align="center" align="center"
label="修改意见内容(包括理由或依据)" label="修改意见内容(包括理由或依据)"
> >