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

commit

Browse Source
This commit is contained in:
zhutianqi
2021-07-27 15:49:45 +08:00
parent 3fc632c351
commit 2eca268fd0
15 changed files with 129 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/navMenu/index.vue
+1 -1
View File
@@ -458,7 +458,7 @@ export default {
overflow-y: auto;
user-select: none;
box-sizing: border-box;
background: url("~assets/images/shangqi/sideBar/side-bar-isCollapse-bg.png") no-repeat;
background: url("~assets/images/shangqi/sideBar/newside-bar-bg1.png") no-repeat;
background-size: 100% 100%;
&:not(.is-collapse) {
width: 212px;
src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue
+2 -2
View File
@@ -327,11 +327,11 @@
var fileSuffix = filename.substring(index1, index2)
// const fileSuffix = file.name.split('.')[1] // 后缀名
// 判断上传文件格式
if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') {
if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
return true
} else {
this.spinShow = false
this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片')
this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件')
return false
}
// 判断文件上传大小
src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
+2 -2
View File
@@ -318,11 +318,11 @@ export default {
var fileSuffix = filename.substring(index1, index2)
// const fileSuffix = file.name.split('.')[1] // 后缀名
// 判断上传文件格式
if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') {
if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
return true
} else {
this.spinShow = false
this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片')
this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件')
return false
}
// 判断文件上传大小
src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
+2 -2
View File
@@ -236,11 +236,11 @@
var fileSuffix = filename.substring(index1, index2)
// const fileSuffix = file.name.split('.')[1] // 后缀名
// 判断上传文件格式
if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') {
if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
return true
} else {
this.spinShow = false
this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片')
this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件')
return false
}
// 判断文件上传大小
src/pages/processCenter/pages/creatProcess/bzdy/step5.vue
+2 -2
View File
@@ -260,11 +260,11 @@
var fileSuffix = filename.substring(index1, index2)
// const fileSuffix = file.name.split('.')[1] // 后缀名
// 判断上传文件格式
if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') {
if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
return true
} else {
this.spinShow = false
this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片')
this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件')
return false
}
// 判断文件上传大小
src/pages/processCenter/pages/creatProcess/bzdy/step6.vue
+2 -2
View File
@@ -259,11 +259,11 @@
var fileSuffix = filename.substring(index1, index2)
// const fileSuffix = file.name.split('.')[1] // 后缀名
// 判断上传文件格式
if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') {
if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
return true
} else {
this.spinShow = false
this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片')
this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件')
return false
}
// 判断文件上传大小
src/pages/processCenter/pages/creatProcess/bzdy/step7.vue
+2 -2
View File
@@ -259,11 +259,11 @@
var fileSuffix = filename.substring(index1, index2)
// const fileSuffix = file.name.split('.')[1] // 后缀名
// 判断上传文件格式
if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') {
if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
return true
} else {
this.spinShow = false
this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片')
this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件')
return false
}
// 判断文件上传大小
src/pages/processCenter/pages/creatProcess/bzdy/step8.vue
+2 -2
View File
@@ -259,11 +259,11 @@
var fileSuffix = filename.substring(index1, index2)
// const fileSuffix = file.name.split('.')[1] // 后缀名
// 判断上传文件格式
if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') {
if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
return true
} else {
this.spinShow = false
this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片')
this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件')
return false
}
// 判断文件上传大小
src/pages/processCenter/pages/creatProcess/bzdy/step9.vue
+2 -2
View File
@@ -259,11 +259,11 @@
var fileSuffix = filename.substring(index1, index2)
// const fileSuffix = file.name.split('.')[1] // 后缀名
// 判断上传文件格式
if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') {
if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
return true
} else {
this.spinShow = false
this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片')
this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件')
return false
}
// 判断文件上传大小
src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+90 -127
View File
@@ -165,7 +165,7 @@
<el-input
v-model="roleForm.deptUserIdName"
placeholder="选择标准法规部部长"
@click.native="choiceZRR('deptUserId', '选择标准法规部部长', roleForm.deptUserId)"
@click.native="choiceZRRS(roleForm.deptUserId, 0, '')"
/>
</div>
</el-form-item>
@@ -313,58 +313,63 @@
</div>
</div>
</el-drawer>
<el-drawer
:title="drawerTitle"
:visible.sync="modalshowflag"
:wrapperClosable="false"
size="800px">
<el-tree
v-if="modalshowflag"
node-key="id"
style="height: 100%; overflow: auto;"
class="filter-tree"
:data="treeData"
:props="defaultProps"
:default-checked-keys="nodeList"
highlight-current
check-strictly
@check="drawerCheck"
default-expand-all
:expand-on-click-node="false"
show-checkbox
ref="tree">
</el-tree>
<div id="roleFormButton" class="demo-drawer-footer">
<el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">确定</el-button>
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消</el-button>
</div>
</el-drawer>
<el-drawer
title="选择责任部门对接人"
:visible.sync="modalshowflag2"
:wrapperClosable="false"
size="800px">
<el-tree
v-if="modalshowflag2"
node-key="id"
style="height: 100%; overflow: auto;"
class="filter-tree"
:data="treeData"
:props="defaultProps"
:default-checked-keys="nodeList2"
highlight-current
check-strictly
@check="drawerCheck2"
default-expand-all
:expand-on-click-node="false"
show-checkbox
ref="tree2">
</el-tree>
<div id="roleFormButton2" class="demo-drawer-footer">
<el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo2">确定</el-button>
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo2">取消</el-button>
</div>
</el-drawer>
<Role-tree
check-box
:is-title="drawerTitle"
:is-visible.sync="modalshowflag"
@checkedRole="saveUserInfo"
:nodeList="nodeList"
></Role-tree>
<!-- <el-drawer-->
<!-- :title="drawerTitle"-->
<!-- :visible.sync="modalshowflag"-->
<!-- :wrapperClosable="false"-->
<!-- size="800px">-->
<!-- <el-tree-->
<!-- v-if="modalshowflag"-->
<!-- node-key="id"-->
<!-- style="height: 100%; overflow: auto;"-->
<!-- class="filter-tree"-->
<!-- :data="treeData"-->
<!-- :props="defaultProps"-->
<!-- :default-checked-keys="nodeList"-->
<!-- highlight-current-->
<!-- check-strictly-->
<!-- @check="drawerCheck"-->
<!-- :expand-on-click-node="false"-->
<!-- show-checkbox-->
<!-- ref="tree">-->
<!-- </el-tree>-->
<!-- <div id="roleFormButton" class="demo-drawer-footer">-->
<!-- <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">确定</el-button>-->
<!-- <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消</el-button>-->
<!-- </div>-->
<!-- </el-drawer>-->
<!-- <el-drawer-->
<!-- title="选择责任部门对接人"-->
<!-- :visible.sync="modalshowflag2"-->
<!-- :wrapperClosable="false"-->
<!-- size="800px">-->
<!-- <el-tree-->
<!-- v-if="modalshowflag2"-->
<!-- node-key="id"-->
<!-- style="height: 100%; overflow: auto;"-->
<!-- class="filter-tree"-->
<!-- :data="treeData"-->
<!-- :props="defaultProps"-->
<!-- :default-checked-keys="nodeList2"-->
<!-- highlight-current-->
<!-- check-strictly-->
<!-- @check="drawerCheck2"-->
<!-- :expand-on-click-node="false"-->
<!-- show-checkbox-->
<!-- ref="tree2">-->
<!-- </el-tree>-->
<!-- <div id="roleFormButton2" class="demo-drawer-footer">-->
<!-- <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo2">确定</el-button>-->
<!-- <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo2">取消</el-button>-->
<!-- </div>-->
<!-- </el-drawer>-->
</div>
</template>
@@ -392,6 +397,7 @@
saveLoading: false,
// 基础信息form表单
form: {
id: '',
itemsNum: '',
itemsName: '',
standId: '',
@@ -570,7 +576,7 @@
this.listModel = false;
this.listModel2 = true
this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', {
infoId: this.form.id,
infoId: this.form.standId,
page: 1,
pageSize: 9999
}, {
@@ -621,46 +627,25 @@
},
/*** **********************************************/
/** 流程节点负责人的选择 *****************************/
choiceZRR (type, title, id) {
this.nodeList = []
this.nodeList.push(id)
this.type = type
this.drawerTitle = title
this.modalshowflag = true
},
getTree () {
this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
this.treeData = res.data
})
},
saveUserInfo () {
if (this.type === 'deptUserId') {
this.roleForm.deptUserId = this.roleRow.id
this.roleForm.deptUserIdName = this.roleRow.name
saveUserInfo (data) {
if (this.type === 0) {
this.roleForm.deptUserId = data[0].id
this.roleForm.deptUserIdName = data[0].name
} else if (this.type === 1) {
this.itemList[this.zrIndex].zrUserId = data[0].id
this.itemList[this.zrIndex].zrUserIdName = data[0].name
} else {
this.itemList.forEach( item => {
this.zrIdList.forEach( items => {
if (item.id === items) {
item.zrUserId = data[0].id
item.zrUserIdName = data[0].name
}
})
})
}
this.modalshowflag = false
},
cancleUserInfo () {
this.modalshowflag = false
},
drawerCheck (data) {
var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
if(getlist.length == 1) {
this.roleRow = getlist[0]
}else {
this.$refs.tree.setCheckedKeys([data.id]);
this.roleRow = this.$refs.tree.getCheckedNodes()[0]
}
},
drawerCheck2 (data) {
var getlist = this.$refs.tree2.getCheckedNodes().concat(this.$refs.tree2.getHalfCheckedNodes());
if(getlist.length == 1) {
this.roleRow = getlist[0]
}else {
this.$refs.tree2.setCheckedKeys([data.id]);
this.roleRow = this.$refs.tree2.getCheckedNodes()[0]
}
},
handleSelectionChange (val) {
this.zrIdList = []
val.forEach( item => {
@@ -668,51 +653,30 @@
})
},
choiceZRRS (row, type, index) {
this.type = type
if (type === 1) {
this.nodeList2 = []
this.zrIndex= index
this.drawerTitle = '选择责任人'
this.nodeList = []
this.zrIndex = index
this.zrType = type
this.nodeList2.push(row)
this.modalshowflag2 = true
} else {
this.nodeList.push(row)
this.modalshowflag = true
} else if (type === 2) {
// 批量
if (this.zrIdList.length > 0) {
this.zrType = type
this.nodeList2 = []
this.modalshowflag2 = true
this.nodeList = []
this.modalshowflag = true
this.drawerTitle = '批量选择责任人'
} else {
this.$message.warning('请选择要编辑的数据')
}
}
},
saveUserInfo2 () {
var idList = ''
var nameList = ''
this.$refs.tree2.getCheckedNodes().concat(this.$refs.tree2.getHalfCheckedNodes()).forEach( item => {
if (nameList.length > 0) {
nameList += ','
idList += ','
}
idList += item.id
nameList += item.name
})
if (this.zrType == 1) {
this.itemList[this.zrIndex].zrUserId = idList
this.itemList[this.zrIndex].zrUserIdName = nameList
} else {
this.itemList.forEach( item => {
this.zrIdList.forEach( items => {
if (item.id === items) {
item.zrUserId = idList
item.zrUserIdName = nameList
}
})
})
this.nodeList = []
this.nodeList.push(row)
this.drawerTitle = '选择标准法规部部长'
this.modalshowflag = true
}
this.modalshowflag2 = false
},
cancleUserInfo2 () {
this.modalshowflag2 = false
},
handleTabs(name) {
this.active = name
@@ -766,7 +730,6 @@
}
},
mounted () {
this.getTree()
this.sarStandCompareHis()
this.sarStandCompareHis2()
this.tableHeight = $('.content').height() - 44
src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue
+1 -1
View File
@@ -127,7 +127,7 @@
<el-dropdown trigger="click" @command="handleCommand">
<i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="[scope.row, '查看']">查看</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'4f71b81686079ba2b7e3739d3994e0af'">查看</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue
+1 -1
View File
@@ -127,7 +127,7 @@
<el-dropdown trigger="click" @command="handleCommand">
<i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="[scope.row, '查看']">查看</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'b9abd00768c8ed97be89547c2da3f0eb'">查看</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+1 -1
View File
@@ -124,7 +124,7 @@
<el-table-column :label="$t('m.operation')" align="center" width="50">
<template slot-scope="scope">
<div @click.stop style="display: inline-block">
<el-dropdown trigger="click" @command="handleCommand">
<el-dropdown trigger="click" @command="handleCommand" v-btn-permission="'4219fdb5e33dbbc84d845af98c947e66'">
<i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="[scope.row, '办理']">办理</el-dropdown-item>
src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
+1 -1
View File
@@ -127,7 +127,7 @@
<el-dropdown trigger="click" @command="handleCommand">
<i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="[scope.row, '办理']">办理</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '办理']" v-btn-permission="'fa19fb2dc2cf3055a64732dab6c40cb9'">办理</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+18 -8
View File
@@ -19,16 +19,17 @@
</p>
<p class="transition-box-p">
<label class="transition-box-label">上传时间：</label>
<span class="transition-box-span">{{ this.$route.query.item.endTime || '-' }}</span>
</p>
<p class="transition-box-p">
<label class="transition-box-label">征求意见周期：</label>
<span class="transition-box-span" v-if="this.$route.query.item.startTime && this.$route.query.item.endTime">{{ this.$route.query.item.startTime + ' ~ ' + this.$route.query.item.endTime}}</span>
<span class="transition-box-span">-</span>
</p> <p class="transition-box-p">
<label class="transition-box-label">征求意见周期：</label>
<span class="transition-box-span">{{ this.$route.query.item.endTime || '-' }}</span>
</p>
<span class="transition-box-span" v-else>-</span>
</p>
</div>
</transition>
<div class="effect">
<el-button type="primary" class="common-button-primary" size="mini" @click="selectStandardPro('add')">添加</el-button>
<el-button v-if="ideaKey" type="primary" class="common-button-primary" size="mini" @click="selectStandardPro('add')">添加</el-button>
<el-button type="primary" class="common-button-primary" size="mini" @click="exportAll">导出</el-button>
</div>
<div class="container" style="position:relative;">
@@ -64,7 +65,7 @@
label="提出人"
>
</el-table-column>
<el-table-column label="操作" align="center" width="50" fixed="right">
<el-table-column label="操作" align="center" width="50" fixed="right" v-if="ideaKey">
<template slot-scope="scope">
<div @click.stop style="display: inline-block">
<el-dropdown trigger="click" @command="handleCommand">
@@ -146,7 +147,9 @@ export default {
page: 1,
size: this.$store.getters.userInfo.configContent,
userId: this.$store.getters.userInfo.userId,
} // 详情数据
endTime: this.$route.query.item.endTime
}, // 详情数据
ideaKey: false
}
},
methods: {
@@ -162,6 +165,13 @@ export default {
this.standinfoList = res.data.records
this.total = res.data.total
this.spinShow = false
res.data.records.forEach(item => {
if (item.ideaKey == 1) {
this.ideaKey = false
} else {
this.ideaKey = true
}
})
}, e => {
})
},