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

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

Browse Source
This commit is contained in:
super_liu
2021-12-21 21:56:31 +08:00
parent c0cfd4cf12 f9de7cf1f3
commit 8e3a16f15d
34 changed files with 362 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/App.vue
-28
View File
@@ -69,34 +69,6 @@
<el-main>
<nav-menu></nav-menu>
<div class="sub-container" style="margin-left: 200px">
<!-- <div style="background-color: #0068B7; height: 65px; width: 100%">
<span style="color: #fff; line-height: 65px; float: left; font-size: 20px; font-weight: 600;">
标准法规管理系统 Standard and Regulation Management System
</span>
header头部 右侧内容 当前登录人和退出
<div class="header-right" style="display: inline-block; float: right; margin-right: 20px; color: #fff">
<div class="user-info">
<el-dropdown
trigger="click"
@command="handleCommand"
>
<div class="user-box" style="margin-top: 23px;">
<img :src="userAvator" v-if="$store.getters.userInfo.avator">
<span class="iconfont" v-else style="color: #FFFFFF;">&#xe69b;</span>
<span style="color: #FFFFFF;">{{ $store.getters.userInfo.uName }}</span>
<i style="color: #FFFFFF;" class="el-icon-arrow-down"/>
</div>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="loginOut">退出</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
</div>
<div class="logo">
<img :src="logo" />
</div>
</div>
<com-header></com-header>-->
<div class="container-box">
<router-view/>
</div>
src/components/navMenu/index.vue
+4 -1
View File
@@ -617,6 +617,7 @@
color: #fff;
}
.nav-menu /deep/.el-submenu__title i {
font-size: 16px;
color: #fff;
}
.nav-menu{
@@ -642,6 +643,7 @@
}
.el-menu-item {
font-size: 16px;
span {
margin-left: 5px;
font-weight: normal;
@@ -678,6 +680,7 @@
background-color: red;
}
/deep/.el-submenu__title {
font-size: 16px;
padding: 0 16px !important;
span {
font-weight: normal;
@@ -712,7 +715,7 @@
}
.el-menu-item {
padding-left: 29px !important;
font-size: 14px;
font-size: 16px;
font-weight: normal;
height: 40px;
line-height: 40px;
src/pages/home2/components/navMenu/index.vue
+2 -2
View File
@@ -77,11 +77,11 @@
height: 40px;
line-height: 40px;
background: #fff;
font-size: 15px;
font-size: 14px;
border-radius: 10px;
}
.menu-wrap {
height: 240px;
height: 200px;
display: flex;
flex-wrap: wrap;
justify-content: space-between;
src/pages/home2/components/todoList/index.vue
+1 -1
View File
@@ -1310,7 +1310,7 @@ export default {
.to-do-list {
margin-right: 10px;
border-radius: 3px;
height: calc(~'100% - 310px');
height: calc(~'100% - 269px');
overflow: hidden;
background: #FFFFFF;
box-shadow: 1px 1px 10px rgba(0,0,0,0.1);
src/pages/home2/index.vue
+1 -1
View File
@@ -173,7 +173,7 @@ export default {
.right_wrapper {
display: flex;
flex-direction: column;
width: 30vw;
width: 25vw;
height: 100%;
}
.search-condition {
src/pages/localTool/standCalendar/index.vue
+5 -2
View File
@@ -33,8 +33,8 @@
</span>
<!-- 获取当前登录人的会议并表示出来-->
<span v-for="item in dealMyDate(data.day)" :value="item.fillPeopleId">
<el-tag class="tagOne"/>
<el-tag v-if="userId === item.fillPeopleId" class="tagTwo"/>
<el-tag v-else class="tagOne"/>
</span>
</span>
</div>
@@ -58,7 +58,7 @@
</span>
<el-card class="card_info" v-else v-for="(item, index) in todayData" :value="item" :key="index">
<span v-for="res in item.attend" :key="res.fillPeopleId">
<el-tag v-if="userId === res.fillPeopleId" type="success" size="mini">会议</el-tag>
<el-tag v-if="userId === res.fillPeopleId" type="success" size="mini">会议</el-tag>
<el-tag v-else type="warning" size="mini">会议</el-tag>
</span>
<i style="margin-left: 10px;font-weight: bold">{{ item.title }}</i>
@@ -71,6 +71,9 @@
<div class="content_text2">
<span>会议内容 : {{ item.content }}</span>
</div>
<div class="content_text2">
<span>会议地点 : {{ item.place }}</span>
</div>
<div class="content_text">
<span>会议附件 :
<span v-if="item.files.length === 0">{{ '-' }}</span>
src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue
+1 -1
View File
@@ -562,7 +562,7 @@
this.$refs['Form'].validate((valid) => {
if (valid) {
this.isSubmit = true
this.$http.get('lawss/activiti/startProcess', {
this.$http.post('lawss/activiti/startProcessRollBack', {
type: '2'
}, {}, res => {
if (res.ok) {
src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
+1 -1
View File
@@ -559,7 +559,7 @@ export default {
this.$refs['Form'].validate((valid) => {
if (valid) {
this.isSubmit = true
this.$http.get('lawss/activiti/startProcessRollBack', {
this.$http.post('lawss/activiti/startProcessRollBack', {
id: this.bpnId || '',
createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName,
src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue
+67 -61
View File
@@ -22,7 +22,7 @@
v-for="item in rh_pageData.comityOptionsOne"
:key="item.id"
v-if="item.id === rh_pageData.comityName">
{{ item.name || '-'}}
{{ item.name || '-' }}
</span>
</el-form-item>
</el-col>
@@ -74,7 +74,7 @@
<span v-if="infoSourcesLength === 0">{{ '-' }}</span>
<div v-for="item in rh_pageData.infoSources" :key="item.id" style="color: #409EFF;">
<a v-if="item.name.length > 30" style="cursor: pointer" @click="fileLook(item)">
{{ item.name.slice(0,30) + '...' }} {{ ';' }}
{{ item.name.slice(0, 30) + '...' }} {{ ';' }}
</a>
<a v-else style="cursor: pointer" @click="fileLook(item)">
{{ item.name }} {{ ';' }}
@@ -193,12 +193,10 @@
</el-table-column>
<el-table-column prop="fillFile" width="120" align="center" label="资料">
<template slot-scope="scope">
<el-button v-if="scope.row.fillFile.length === 0" type="primary" plain size="mini" @click="fillFile_up(scope.row)">点击上传</el-button>
<el-button v-if="scope.row.fillFile.length === 0" type="primary" plain size="mini" @click="fillFile_up(scope.row)">
点击上传
</el-button>
<el-button v-else size="mini" plain type="primary" @click="fillFile_up(scope.row)">查看附件</el-button>
<!-- <span v-if="scope.row.fillFile.length === 0">{{ '-' }}</span>
<span v-for="item in scope.row.fillFile" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
{{ item.name }} {{ ';' }}
</span>-->
</template>
</el-table-column>
<el-table-column
@@ -301,51 +299,51 @@
:visible.sync="editFlag"
size="500px"
>
<div class="content_form">
<div class="content_form" style="height: 100%">
<el-form class="label-input-form" ref="editForm" :model="editForm" label-width="80px">
<el-form-item class="add-form-item" label="参与人员:">
<el-input v-model="editForm.fillPeopleId" style="display: none;"></el-input>
<el-input
placeholder="请选择参与人员"
style="width: 50%"
@click.native="choiceRole('fillPeopleId','请选择入会成员',editForm.fillPeopleId,)"
v-model="editForm.fillPeople"
/>
</el-form-item>
<el-form-item class="add-form-item" label="单位:">
<el-input v-model="editForm.fillUnit" placeholder=""></el-input>
</el-form-item>
<el-form-item class="add-form-item" label="部门:">
<el-input v-model="editForm.fillDept" placeholder=""></el-input>
</el-form-item>
<el-form-item class="add-form-item" label="身份:">
<el-input v-model="editForm.fillPost" placeholder=""></el-input>
</el-form-item>
<el-form-item class="add-form-item" label="电话:">
<el-input v-model="editForm.fillTel" placeholder=""></el-input>
</el-form-item>
<el-form-item class="add-form-item" label="邮箱:">
<el-input v-model="editForm.fillMail" placeholder=""></el-input>
</el-form-item>
<el-form-item class="add-form-item" label="资料:">
<el-upload
:disabled="acceptShow"
multiple
ref="uploadFile"
:action="actionPath"
name="file"
:file-list="reData"
accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
:before-upload="handleBeforeUpload"
:before-remove="handleBeforeRemove"
:on-success="handleOnsuccess"
>
<el-button type="primary" size="small">
上传文件
</el-button>
</el-upload>
</el-form-item>
</el-form>
<el-form-item class="add-form-item" label="参与人员:">
<el-input v-model="editForm.fillPeopleId" style="display: none;"></el-input>
<el-input
placeholder="请选择参与人员"
style="width: 50%"
@click.native="choiceRole('fillPeopleId','请选择入会成员',editForm.fillPeopleId,)"
v-model="editForm.fillPeople"
/>
</el-form-item>
<el-form-item class="add-form-item" label="单位:">
<el-input v-model="editForm.fillUnit" placeholder=""></el-input>
</el-form-item>
<el-form-item class="add-form-item" label="部门:">
<el-input v-model="editForm.fillDept" placeholder=""></el-input>
</el-form-item>
<el-form-item class="add-form-item" label="身份:">
<el-input v-model="editForm.fillPost" placeholder=""></el-input>
</el-form-item>
<el-form-item class="add-form-item" label="电话:">
<el-input v-model="editForm.fillTel" placeholder=""></el-input>
</el-form-item>
<el-form-item class="add-form-item" label="邮箱:">
<el-input v-model="editForm.fillMail" placeholder=""></el-input>
</el-form-item>
<el-form-item class="add-form-item" label="资料:">
<el-upload
:disabled="acceptShow"
multiple
ref="uploadFile"
:action="actionPath"
name="file"
:file-list="reData"
accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
:before-upload="handleBeforeUpload"
:before-remove="handleBeforeRemove"
:on-success="handleOnsuccess"
>
<el-button type="primary" size="small">
上传文件
</el-button>
</el-upload>
</el-form-item>
</el-form>
</div>
<div class="demo-drawer-footer">
<el-button size="mini" @click="falseDrawer">取消</el-button>
@@ -472,6 +470,7 @@ export default {
fillPost: '',
fillTel: '',
fillMail: '',
fillFile: [],
},
// 上传文件储存
@@ -626,19 +625,26 @@ export default {
this.editFlag = false
},
falseDrawer() {
let item = JSON.parse(localStorage.getItem('obj'))
this.editForm = item
let Item = JSON.parse(localStorage.getItem('obj'))
this.editForm.fillPeopleId = Item.fillPeopleId
this.editForm.fillPeople = Item.fillPeople
this.editForm.fillUnit = Item.fillUnit
this.editForm.fillDept = Item.fillDept
this.editForm.fillPost = Item.fillPost
this.editForm.fillTel = Item.fillTel
this.editForm.fillMail = Item.fillMail
this.editForm.fillFile = Item.fillFile
this.editFlag = false
},
// 编辑框选人
choiceRole(type, title,id) {
choiceRole(type, title, id) {
this.nodeList = []
this.nodeList.push(id)
this.type = type
this.roleShowflag = true
},
drawerCheck(data) {
if(data.length > 0) {
if (data.length > 0) {
this.fileListData.fillPeopleId = data[0].id
this.fileListData.fillPeople = data[0].name
}
@@ -739,16 +745,16 @@ export default {
const attId = file.id
this.getBusStandFileByAttId(attId)
.then(res => {
if(res){
if (res) {
const editFileInfo = res
if(editFileInfo.fileSuffix === 'pdg' || editFileInfo.fileSuffix === 'PDG'){
window.open('book://ssreader/e0?url='+editFileInfo.downLoadUrl)
}else if(editFileInfo.fileSuffix === 'pdf' || editFileInfo.fileSuffix === 'PDF'){
if (editFileInfo.fileSuffix === 'pdg' || editFileInfo.fileSuffix === 'PDG') {
window.open('book://ssreader/e0?url=' + editFileInfo.downLoadUrl)
} else if (editFileInfo.fileSuffix === 'pdf' || editFileInfo.fileSuffix === 'PDF') {
window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))
}else {
} else {
const nowTime = new Date().getTime()
// window.open('http://127.0.0.1:8012/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl)));
window.open('/static/onlyOffice/onlinePreview.html?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName)
window.open('/static/onlyOffice/onlinePreview.html?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime + '&filePath=' + editFileInfo.filePath + '&fileName=' + editFileInfo.fileName)
}
// window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))
}
src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue
+5 -2
View File
@@ -283,7 +283,7 @@
</el-timeline-item>
<el-timeline-item timestamp="批准" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="totalLeader" style="margin-bottom: 0">
<el-form-item prop="directorUserName" style="margin-bottom: 0">
<h4>技术委员会主任</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.directorUserId" style="display: none;"></el-input>
@@ -392,7 +392,9 @@ export default {
fillFile: '',
associaOptionsOne: [],
associaOptionsTwo: [],
associaOptionsTree: []
associaOptionsTree: [],
meetingInRole: '',
meetingInRoleId: ''
},
feeKindOptions: [
@@ -429,6 +431,7 @@ export default {
leaderUser: [{required: true, message: "请选择标准法规部主管中心主任", trigger: ['blur', 'change']}],
feeUser: [{required: true, message: "请选择管理推荐部", trigger: ['blur', 'change']}],
engineerUser: [{required: true, message: "请选择技术委员会常务副主任/总院院长", trigger: ['blur', 'change']}],
directorUserName: [{required: true, message: "请选择技术委员会主任", trigger: ['blur', 'change']}],
},
deleteDataList: [],
src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue
+34 -5
View File
@@ -107,11 +107,12 @@
<ProcessTitle>
<template slot="title">选择人员</template>
</ProcessTitle>
<el-form-item class="add-form-item" label="入会人员:">
<el-form-item class="add-form-item" label="参会人员:">
<el-input v-model="ch_pageData.meetingInRoleId" style="display: none;"></el-input>
<el-input
:disabled="true"
style="width: 30%"
placeholder="请选择入会人员"
placeholder="请选择参会人员"
style="width: 50%"
@click.native="choiceRole('meetingInRoleId','选择参会人员',ch_pageData.meetingInRoleId,)"
v-model="ch_pageData.meetingInRole"
/>
</el-form-item>
@@ -209,6 +210,13 @@
@submit="handleSubmit"
>
</ProcessFooter>
<Role-tree
is-title="选择入会人员"
:is-visible.sync="roleShowflag"
:nodeList="nodeList"
@checkedRole="drawerCheck"
/>
</div>
</template>
@@ -293,10 +301,31 @@ export default {
this.$nextTick(() => {
this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData
this.uploadFileLength = this.ch_pageData.fileTextList.length
this.ch_pageData.meetingInRole = this.$store.getters.userInfo.userName
this.roleForm = JSON.parse(JSON.stringify(item)).roleList
})
},
/** 选择入会人员 */
choiceRole(type,title,id) {
this.nodeList = []
this.nodeList.push(id)
this.roleShowflag = true
},
drawerCheck(data) {
var idList = ''
var nameList = ''
data.forEach(item => {
if (nameList.length > 0) {
nameList += ','
idList += ','
}
idList += item.id;
nameList += item.name;
})
this.ch_pageData.meetingInRole = nameList
this.ch_pageData.meetingInRoleId = idList
this.roleShowflag = false
},
// 退回按钮
handleSubmitNo() {
if (this.commentText === '') {
src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue
+1 -1
View File
@@ -372,7 +372,7 @@ export default {
this.ch_pageData.fillUnit = this.$store.getters.userInfo.upDeptName
this.ch_pageData.fillTel = this.$store.getters.userInfo.phone
this.ch_pageData.fillPeopleId = this.$store.getters.userInfo.userId
this.ch_pageData.fillPeople = this.$store.getters.userInfo.userName
this.ch_pageData.fillPeople = this.$store.getters.userInfo.userName + '(' + this.$store.getters.userInfo.userId + ')'
this.roleForm = JSON.parse(JSON.stringify(item)).roleList
// this.rh_pageData.comityFileNum = this.fileTextList
})
src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue
+143 -10
View File
@@ -113,11 +113,15 @@
</el-form-item>
<el-form-item class="add-form-item" label="入会人员:">
<div class="myPart_btn">
<el-button
type="primary"
size="small"
@click="add_partForm">
新增</el-button>
<el-button
type="danger"
size="small"
icon="el-icon-delete"
@click="del_paryForm">
@click="del_partForm">
批量删除
</el-button>
</div>
@@ -132,11 +136,40 @@
fontWeight: 'bold', height: '20px'}">
<el-table-column type="selection" width="55"/>
<el-table-column type="index" width="50" align="center"/>
<el-table-column prop="fillPeople" align="center" label="人员"/>
<el-table-column prop="fillUnit" align="center" label="单位"/>
<el-table-column prop="fillDept" align="center" label="部门"/>
<el-table-column prop="fillTel" align="center" label="电话"/>
<el-table-column prop="fillMail" align="center" label="邮箱"/>
<el-table-column prop="fillPeople" align="center" label="人员">
<template slot-scope="scope">
{{ scope.row.fillPeople || '' }}
</template>
</el-table-column>
<el-table-column prop="fillUnit" align="center" label="单位">
<template slot-scope="scope">
{{ scope.row.fillUnit || '' }}
</template>
</el-table-column>
<el-table-column prop="fillDept" align="center" label="部门">
<template slot-scope="scope">
{{ scope.row.fillDept || '' }}
</template>
</el-table-column>
<el-table-column prop="fillTel" align="center" label="电话">
<template slot-scope="scope">
{{ scope.row.fillTel || '' }}
</template>
</el-table-column>
<el-table-column prop="fillMail" align="center" label="邮箱">
<template slot-scope="scope">
{{ scope.row.fillMail || '' }}
</template>
</el-table-column>
<el-table-column
fixed="right"
label="操作"
align="center"
width="100">
<template slot-scope="scope">
<el-button type="primary" plain size="mini" @click="edit_partForm(scope.row)">编辑</el-button>
</template>
</el-table-column>
</el-table>
</el-form-item>
</el-form>
@@ -223,6 +256,42 @@
<loading :loading="loading">流程列表加载中</loading>
</div>
</div>
<el-drawer
title="编辑人员信息"
:visible.sync="editFlag"
size="500px"
custom-class="demo-drawer"
>
<div class="content_form" style="height: 100%">
<el-form class="label-input-form" ref="editForm" :model="editForm" label-width="80px">
<el-form-item class="add-form-item" label="参与人员:">
<el-input v-model="editForm.fillPeopleId" style="display: none;"></el-input>
<el-input
placeholder="请选择参与人员"
style="width: 50%"
@click.native="choiceRole('fillPeopleId','请选择入会成员',editForm.fillPeopleId,)"
v-model="editForm.fillPeople"
/>
</el-form-item>
<el-form-item class="add-form-item" label="单位:">
<el-input v-model="editForm.fillUnit" placeholder=""></el-input>
</el-form-item>
<el-form-item class="add-form-item" label="部门:">
<el-input v-model="editForm.fillDept" placeholder=""></el-input>
</el-form-item>
<el-form-item class="add-form-item" label="电话:">
<el-input v-model="editForm.fillTel" placeholder=""></el-input>
</el-form-item>
<el-form-item class="add-form-item" label="邮箱:">
<el-input v-model="editForm.fillMail" placeholder=""></el-input>
</el-form-item>
</el-form>
</div>
<div class="demo-drawer-footer">
<el-button size="mini" @click="falseDrawer">取消</el-button>
<el-button type="primary" size="mini" @click="OkDrawer">确认</el-button>
</div>
</el-drawer>
<ProcessFooter
show-save
show-submit
@@ -232,6 +301,13 @@
@submit="handleSubmit"
>
</ProcessFooter>
<Role-tree
check-box
is-title="选择入会人员"
:is-visible.sync="roleShowflag"
:nodeList="nodeList"
@checkedRole="drawerCheck"
/>
</div>
</template>
@@ -269,7 +345,18 @@ export default {
pId: this.$route.query.prcId,
uploadFileLength: '',
commentText: ''
commentText: '',
roleShowflag: false,
nodeList: [],
// 人员编辑
editFlag: false,
editForm: {
fillPeople: '',
fillUnit: '',
fillDept: '',
fillTel: '',
fillMail: '',
}
}
},
computed: {
@@ -318,9 +405,55 @@ export default {
// this.ch_pageData.comityFileNum = this.fileTextList
})
},
/** 我司参与人员新增 */
add_partForm() {
var list = {
fillPeople: this.fillPeople,
fillUnit: this.fillUnit,
fillDept: this.fillDept,
fillTel: this.fillTel,
fillMail: this.fillMail,
}
this.ch_pageData.myPartRole.push(list)
},
// 编辑框确认按钮
OkDrawer() {
this.editFlag = false
},
falseDrawer() {
let Item = JSON.parse(localStorage.getItem('obj'))
this.editForm.fillPeopleId = Item.fillPeopleId
this.editForm.fillPeople = Item.fillPeople
this.editForm.fillUnit = Item.fillUnit
this.editForm.fillDept = Item.fillDept
this.editForm.fillTel = Item.fillTel
this.editForm.fillMail = Item.fillMail
this.editFlag = false
},
/** 入会人员编辑 */
edit_partForm(row) {
// 用来储存取消时原来的数据，防止取消时修改
localStorage.setItem('obj', JSON.stringify(row))
this.fileListData = row
this.editForm = row
this.editFlag = true
},
// 编辑框选人
choiceRole(type, title, id) {
this.nodeList = []
this.nodeList.push(id)
this.type = type
this.roleShowflag = true
},
drawerCheck(data) {
if (data.length > 0) {
this.fileListData.fillPeopleId = data[0].id
this.fileListData.fillPeople = data[0].name
}
this.roleShowflag = false
},
/** 批量删除 */
del_paryForm() {
del_partForm() {
if (this.deleteDataList.length < 1) {
this.$message.warning("请选择一条数据进行删除");
} else {
src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
+1 -1
View File
@@ -1181,7 +1181,7 @@
this.$message.warning('请选择责任人')
} else {
this.isSubmit = true
this.$http.get('lawss/activiti/startProcess', {
this.$http.post('lawss/activiti/startProcessRollBack', {
type: '9'
}, {}, res => {
if (res.ok) {
src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
+1 -1
View File
@@ -813,7 +813,7 @@ export default {
this.$refs['Form'].validate((valid) => {
if (valid) {
this.isSubmit = true
this.$http.get('lawss/activiti/startProcess', {
this.$http.post('lawss/activiti/startProcessRollBack', {
type: '3'
}, {}, res => {
if (res.ok) {
src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
+1 -1
View File
@@ -829,7 +829,7 @@ export default {
this.$refs['Form'].validate((valid) => {
if (valid) {
this.isSubmit = true
this.$http.get('lawss/activiti/startProcess', {
this.$http.post('lawss/activiti/startProcessRollBack', {
id: this.bpnId || '',
createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName,
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
+7 -7
View File
@@ -96,12 +96,12 @@
placeholder="请选择标准发布时间">
</el-date-picker>
</el-form-item>
<el-form-item label="起草责任单位" prop="unit" class="add-form-item form-item-disabled">
<div v-if="qbfsForm.unit">
<el-tooltip class="item" effect="dark" :content="qbfsForm.unit" placement="top-start">
<el-form-item label="起草责任单位" prop="unitName" class="add-form-item form-item-disabled">
<div v-if="qbfsForm.unitName">
<el-tooltip class="item" effect="dark" :content="qbfsForm.unitName" placement="top-start">
<el-input
readonly
v-model="qbfsForm.unit"
v-model="qbfsForm.unitName"
placeholder="请输入起草责任单位"
clearable
></el-input>
@@ -110,7 +110,7 @@
<div v-else>
<el-input
readonly
v-model="qbfsForm.unit"
v-model="qbfsForm.unitName"
placeholder="请输入起草责任单位"
clearable
></el-input>
@@ -233,7 +233,7 @@
</el-table-column>
<el-table-column
align="center"
prop="unit"
prop="unitName"
label="起草责任单位">
</el-table-column>
</el-table>
@@ -370,7 +370,7 @@ export default {
this.qbfsForm.releaseTime = this.selectList[0].releaseTime
this.qbfsForm.resPersonName = this.selectList[0].resPersonName
this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus === '1'? '制定中' : '未制定')
this.qbfsForm.unit = this.selectList[0].unit
this.qbfsForm.unitName = this.selectList[0].unitName
this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName
this.ListModel = false
}
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
+7 -7
View File
@@ -104,12 +104,12 @@
placeholder="请选择标准发布时间">
</el-date-picker>
</el-form-item>
<el-form-item label="起草责任单位" prop="unit" class="add-form-item form-item-disabled">
<div v-if="qbfsForm.unit">
<el-tooltip class="item" effect="dark" :content="qbfsForm.unit" placement="top-start">
<el-form-item label="起草责任单位" prop="unitName" class="add-form-item form-item-disabled">
<div v-if="qbfsForm.unitName">
<el-tooltip class="item" effect="dark" :content="qbfsForm.unitName" placement="top-start">
<el-input
readonly
v-model="qbfsForm.unit"
v-model="qbfsForm.unitName"
placeholder="请输入起草责任单位"
clearable
></el-input>
@@ -118,7 +118,7 @@
<div v-else>
<el-input
readonly
v-model="qbfsForm.unit"
v-model="qbfsForm.unitName"
placeholder="请输入起草责任单位"
clearable
></el-input>
@@ -249,7 +249,7 @@
</el-table-column>
<el-table-column
align="center"
prop="unit"
prop="unitName"
label="起草责任单位">
</el-table-column>
</el-table>
@@ -391,7 +391,7 @@ export default {
this.qbfsForm.releaseTime = this.selectList[0].releaseTime
this.qbfsForm.resPersonName = this.selectList[0].resPersonName
this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus === '1'? '制定中' : '未制定')
this.qbfsForm.unit = this.selectList[0].unit
this.qbfsForm.unitName = this.selectList[0].unitName
this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName
this.ListModel = false
}
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
+7 -7
View File
@@ -64,10 +64,10 @@
placeholder="请选择计划标准发布时间">
</el-date-picker>
</el-form-item>
<el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" prop="unit" class="add-form-item form-item-disabled">
<el-input v-model="qbfsForm.unitId" style="display: none;"></el-input>
<el-input v-model="qbfsForm.unit" placeholder="请选择起草责任单位"
@click.native="choiceZRBM('unit', '选择起草责任单位', qbfsForm.unitId)">
<el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" prop="unitName" class="add-form-item form-item-disabled">
<el-input v-model="qbfsForm.unit" style="display: none;"></el-input>
<el-input v-model="qbfsForm.unitName" placeholder="请选择起草责任单位"
@click.native="choiceZRBM('unit', '选择起草责任单位', qbfsForm.unit)">
</el-input>
</el-form-item>
<el-form-item label="新增原因" style="width: 100%; margin-right:10px" prop="newReason" class="add-form-item form-item-disabled">
@@ -133,7 +133,7 @@ export default {
qbfsForm: {
type: '5',
unit: '', // 单位
unitId: '',
unitName: '',
esName: '', // 企标名称
planStatus: '', // 计划状态
reviseStatus: '', // 制修订状态
@@ -222,8 +222,8 @@ export default {
idList += item.id
nameList += item.name
})
this.$set(this.qbfsForm, 'unitId', idList)
this.$set(this.qbfsForm, 'unit', nameList)
this.$set(this.qbfsForm, 'unit', idList)
this.$set(this.qbfsForm, 'unitName', nameList)
if(this.qbfsForm.unit){
this.$refs.qbfsForm.validateField('unit')
}
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
+8 -8
View File
@@ -81,10 +81,10 @@
placeholder="请选择初稿完成时间">
</el-date-picker>
</el-form-item>
<el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" prop="unit" class="add-form-item form-item-disabled">
<el-input v-model="qbfsForm.unitId" style="display: none;"></el-input>
<el-input v-model="qbfsForm.unit" placeholder="请选择起草责任单位"
@click.native="choiceZRBM('unit', '选择起草责任单位', qbfsForm.unitId)">
<el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" prop="unitName" class="add-form-item form-item-disabled">
<el-input v-model="qbfsForm.unit" style="display: none;"></el-input>
<el-input v-model="qbfsForm.unitName" placeholder="请选择起草责任单位"
@click.native="choiceZRBM('unit', '选择起草责任单位', qbfsForm.unit)">
</el-input>
<!-- <el-select v-model="qbfsForm.unit" filterable multiple clearable>-->
<!-- <el-option-->
@@ -249,7 +249,7 @@
</el-table-column>
<el-table-column
align="center"
prop="unit"
prop="unitName"
label="起草责任单位">
</el-table-column>
</el-table>
@@ -330,7 +330,7 @@ export default {
esName2: [
{required: true, message: '请选择合并计划企标名称', trigger: 'blur'},
],
unit: [
unitName: [
{required: true, message: '请选择起草单位', trigger: 'change'},
],
esName: [
@@ -444,8 +444,8 @@ export default {
idList += item.id
nameList += item.name
})
this.$set(this.qbfsForm, 'unitId', idList)
this.$set(this.qbfsForm, 'unit', nameList)
this.$set(this.qbfsForm, 'unit', idList)
this.$set(this.qbfsForm, 'unitName', nameList)
if(this.qbfsForm.unit){
this.$refs.qbfsForm.validateField('unit')
}
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
+7 -7
View File
@@ -95,12 +95,12 @@
placeholder="请选择标准发布时间">
</el-date-picker>
</el-form-item>
<el-form-item label="起草责任单位" prop="unit" class="add-form-item form-item-disabled">
<div v-if="qbfsForm.unit">
<el-tooltip class="item" effect="dark" :content="qbfsForm.unit" placement="top-start">
<el-form-item label="起草责任单位" prop="unitName" class="add-form-item form-item-disabled">
<div v-if="qbfsForm.unitName">
<el-tooltip class="item" effect="dark" :content="qbfsForm.unitName" placement="top-start">
<el-input
readonly
v-model="qbfsForm.unit"
v-model="qbfsForm.unitName"
placeholder="请输入起草责任单位"
clearable
></el-input>
@@ -109,7 +109,7 @@
<div v-else>
<el-input
readonly
v-model="qbfsForm.unit"
v-model="qbfsForm.unitName"
placeholder="请输入起草责任单位"
clearable
></el-input>
@@ -240,7 +240,7 @@
</el-table-column>
<el-table-column
align="center"
prop="unit"
prop="unitName"
label="起草责任单位">
</el-table-column>
</el-table>
@@ -379,7 +379,7 @@ export default {
this.qbfsForm.releaseTime = this.selectList[0].releaseTime
this.qbfsForm.resPersonName = this.selectList[0].resPersonName
this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus === '1'? '制定中' : '未制定')
this.qbfsForm.unit = this.selectList[0].unit
this.qbfsForm.unitName = this.selectList[0].unitName
this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName
this.ListModel = false
}
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue
+2 -2
View File
@@ -75,10 +75,10 @@
placeholder="请选择计划标准发布时间">
</el-date-picker>
</el-form-item>
<el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" prop="unit" class="add-form-item form-item-disabled">
<el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" prop="unitName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.unit"
v-model="qbfsForm.unitName"
placeholder="请输入起草责任单位"
:maxlength="500"/>
</el-form-item>
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue
+2 -2
View File
@@ -75,10 +75,10 @@
placeholder="请选择计划标准发布时间">
</el-date-picker>
</el-form-item>
<el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" prop="unit" class="add-form-item form-item-disabled">
<el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" prop="unitName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.unit"
v-model="qbfsForm.unitName"
placeholder="请输入起草责任单位"
:maxlength="500"/>
</el-form-item>
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue
+2 -2
View File
@@ -75,10 +75,10 @@
placeholder="请选择计划标准发布时间">
</el-date-picker>
</el-form-item>
<el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" prop="unit" class="add-form-item form-item-disabled">
<el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" prop="unitName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.unit"
v-model="qbfsForm.unitName"
placeholder="请输入起草责任单位"
:maxlength="500"/>
</el-form-item>
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue
+2 -2
View File
@@ -75,10 +75,10 @@
placeholder="请选择计划标准发布时间">
</el-date-picker>
</el-form-item>
<el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" prop="unit" class="add-form-item form-item-disabled">
<el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" prop="unitName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.unit"
v-model="qbfsForm.unitName"
placeholder="请输入起草责任单位"
:maxlength="500"/>
</el-form-item>
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue
+2 -2
View File
@@ -75,10 +75,10 @@
placeholder="请选择计划标准发布时间">
</el-date-picker>
</el-form-item>
<el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" prop="unit" class="add-form-item form-item-disabled">
<el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" prop="unitName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.unit"
v-model="qbfsForm.unitName"
placeholder="请输入起草责任单位"
:maxlength="500"/>
</el-form-item>
src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
+1 -1
View File
@@ -53,7 +53,7 @@
</el-table-column>
<el-table-column prop="responsibleUnit" label="责任部门" align="center"/>
<el-table-column prop="dutyEngineer" width="150" label="责任工程师" align="center"/>
<el-table-column label="选择分发责任人" prop="dutyPeopleInfo" align="center">
<el-table-column label="选择分发责任人" width="150" prop="dutyPeopleInfo" align="center">
<template slot-scope="scope">
<el-input
@click.native="clickOpen(scope.row)"
src/pages/processCenter/pages/phone/bzqdfb/step4.vue
+3 -12
View File
@@ -69,7 +69,7 @@
:data="dataList"
border
tooltip-effect="dark"
height="60%"
height="50%"
style="width: 100%"
@selection-change="selectStandChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
@@ -109,18 +109,12 @@
min-width="130"
align="center"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="ZCCSSRQ"
min-width="130"
align="center"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
@@ -128,9 +122,6 @@
width="100px"
align="center"
label="文本状态">
<template slot-scope="scope">
<span>{{ textStatusMap[scope.row.textStatus] }}</span>
</template>
</el-table-column>
</el-table>
</div>
@@ -154,7 +145,7 @@
<el-table
height="100%"
ref="selection"
:data="histortData"
:data="detailData"
tooltip-effect="dark"
style="width: 100%"
border
@@ -509,7 +500,7 @@ export default {
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
window.history.back()
}
this.isSubmit = false
});
src/pages/processCenter/pages/phone/wbsm/step3.vue
+1 -1
View File
@@ -77,7 +77,7 @@
<el-table
height="100%"
ref="selection"
:data="histortData"
:data="detailData"
tooltip-effect="dark"
style="width: 100%"
border
src/pages/processCenter/pages/phone/wbsm/step4.vue
+1 -1
View File
@@ -77,7 +77,7 @@
<el-table
height="100%"
ref="selection"
:data="histortData"
:data="detailData"
tooltip-effect="dark"
style="width: 100%"
border
src/pages/processCenter/pages/phone/wbsm/step5.vue
+1 -1
View File
@@ -77,7 +77,7 @@
<el-table
height="100%"
ref="selection"
:data="histortData"
:data="detailData"
tooltip-effect="dark"
style="width: 100%"
border
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+26 -33
View File
@@ -211,26 +211,19 @@
</template>
</el-table-column>
<el-table-column
prop="xcxssrqgj"
prop="xcxssrq"
sortable
align="center"
width="150"
label="新车型实施日期">
<template slot-scope="scope">
<span v-if="scope.row.xcxssrqgj">{{ scope.row.xcxssrqgj }}</span>
<span v-else-if="scope.row.putTime">{{ scope.row.putTime }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="zccssrqgj"
prop="zccssrq"
sortable
align="center"
width="150"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zccssrqgj }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
@@ -341,14 +334,14 @@
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="zccssrqgj"
prop="zccssrq"
sortable
width="210px"
align="center"
label="在产车实施日期">
</el-table-column>
<el-table-column
prop="xcxssrqgj"
prop="xcxssrq"
sortable
align="center"
width="210px"
@@ -464,17 +457,17 @@
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item label="在产车实施日期" prop="zccssrqgj">
<el-form-item label="在产车实施日期" prop="zccssrq">
<el-date-picker
v-model.trim="editRowData.zccssrqgj"
v-model.trim="editRowData.zccssrq"
type="dates"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item label="新车型实施日期" prop="xcxssrqgj">
<el-form-item label="新车型实施日期" prop="xcxssrq">
<el-date-picker
v-model.trim="editRowData.xcxssrqgj"
v-model.trim="editRowData.xcxssrq"
type="dates"
value-format="yyyy-MM-dd"
placeholder="选择日期">
@@ -575,8 +568,8 @@ export default {
typeApplicable: '',
nylx: '',
ssrq: '',
zccssrqgj: '',
xcxssrqgj: '',
zccssrq: '',
xcxssrq: '',
zrbm: '',
sycpx: '',
cycvppsbm: '',
@@ -1251,11 +1244,11 @@ export default {
if (this.editRowData.ssrq !== null) {
this.editRowData.ssrq = this.editRowData.ssrq.split(',')
}
if (this.editRowData.zccssrqgj !== null) {
this.editRowData.zccssrqgj = this.editRowData.zccssrqgj.split(',')
if (this.editRowData.zccssrq !== null) {
this.editRowData.zccssrq = this.editRowData.zccssrq.split(',')
}
if (this.editRowData.xcxssrqgj !== null) {
this.editRowData.xcxssrqgj = this.editRowData.xcxssrqgj.split(',')
if (this.editRowData.xcxssrq !== null) {
this.editRowData.xcxssrq = this.editRowData.xcxssrq.split(',')
}
this.drawerEdit = true
},
@@ -1263,8 +1256,8 @@ export default {
cancelInfo() {
let Item = JSON.parse(localStorage.getItem('obj'))
this.editRowData.ssrq = Item.ssrq
this.editRowData.xcxssrqgj = Item.xcxssrqgj
this.editRowData.zccssrqgj = Item.zccssrqgj
this.editRowData.xcxssrq = Item.xcxssrq
this.editRowData.zccssrq = Item.zccssrq
this.drawerEdit = false
},
// 抽屉提交按钮
@@ -1272,11 +1265,11 @@ export default {
if (this.editRowData.ssrq !== null) {
this.editRowData.ssrq = this.editRowData.ssrq.join(',')
}
if (this.editRowData.xcxssrqgj !== null){
this.editRowData.xcxssrqgj = this.editRowData.xcxssrqgj.join(',')
if (this.editRowData.xcxssrq !== null){
this.editRowData.xcxssrq = this.editRowData.xcxssrq.join(',')
}
if (this.editRowData.zccssrqgj !== null){
this.editRowData.zccssrqgj = this.editRowData.zccssrqgj.join(',')
if (this.editRowData.zccssrq !== null){
this.editRowData.zccssrq = this.editRowData.zccssrq.join(',')
}
this.drawerEdit = false
},
@@ -1351,15 +1344,15 @@ export default {
} else {
rowlist1.push(this.sarAccessInfoList[i].ssrq)
}
if (this.sarAccessInfoList[i].xcxssrqgj === null || this.sarAccessInfoList[i].xcxssrqgj === undefined) {
rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
if (this.sarAccessInfoList[i].xcxssrq === null || this.sarAccessInfoList[i].xcxssrq === undefined) {
rowlist3.push(this.sarAccessInfoList[i].xcxssrq = '-')
} else {
rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj)
rowlist3.push(this.sarAccessInfoList[i].xcxssrq)
}
if (this.sarAccessInfoList[i].zccssrqgj === null || this.sarAccessInfoList[i].zccssrqgj === undefined) {
rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '-')
if (this.sarAccessInfoList[i].zccssrq === null || this.sarAccessInfoList[i].zccssrq === undefined) {
rowlist2.push(this.sarAccessInfoList[i].zccssrq = '-')
} else {
rowlist2.push(this.sarAccessInfoList[i].zccssrqgj)
rowlist2.push(this.sarAccessInfoList[i].zccssrq)
}
}
console.log(rowlist1)
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+7 -7
View File
@@ -369,7 +369,7 @@
width="210px"
label="卡车VPPS中文名称">
</el-table-column>-->
<el-table-column width="240" align="center" fixed="right" label="操作">
<el-table-column width="160" align="center" fixed="right" label="操作">
<template slot-scope="scope">
<el-button
class="common-button-default"
@@ -383,12 +383,12 @@
size="small" @click="moveDown(scope.$index, scope.row)"
v-if="!disabledFlag"
>下移</el-button>
<el-button
size="small"
@click="editTghisRow(scope.row)"
class="common-button-default"
type="warning"
>编辑</el-button>
<!-- <el-button-->
<!-- size="small"-->
<!-- @click="editTghisRow(scope.row)"-->
<!-- class="common-button-default"-->
<!-- type="warning"-->
<!-- >编辑</el-button>-->
</template>
</el-table-column>
</el-table>
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+8 -8
View File
@@ -399,7 +399,7 @@
align="center"
label="适用产品线">
</el-table-column>
<el-table-column width="240" align="center" fixed="right" label="操作">
<el-table-column width="160" align="center" fixed="right" label="操作">
<template slot-scope="scope">
<el-button
class="common-button-default"
@@ -415,13 +415,13 @@
v-if="!disabledFlag"
>下移
</el-button>
<el-button
size="small"
@click="editTghisRow(scope.row)"
class="common-button-default"
type="warning"
>编辑
</el-button>
<!-- <el-button-->
<!-- size="small"-->
<!-- @click="editTghisRow(scope.row)"-->
<!-- class="common-button-default"-->
<!-- type="warning"-->
<!-- >编辑-->
<!-- </el-button>-->
</template>
</el-table-column>
</el-table>