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:
fanlin
2021-07-27 16:56:30 +08:00
parent 9a67cf3613 8ff5f85189
commit eb907967f0
19 changed files with 145 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/assets/images/shangqi/sideBar/newside-bar-bg1.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 17 KiB

src/components/navMenu/index.vue
+1 -1
View File
@@ -458,7 +458,7 @@ export default {
overflow-y: auto; overflow-y: auto;
user-select: none; user-select: none;
box-sizing: border-box; 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%; background-size: 100% 100%;
&:not(.is-collapse) { &:not(.is-collapse) {
width: 212px; width: 212px;
src/pages/config/pages/postManage/index.vue
+2 -1
View File
@@ -147,7 +147,8 @@
}, },
sarStandardsInfoRules: { sarStandardsInfoRules: {
name: [ name: [
{ required: true, message: '请输入岗位名称', trigger: 'blur' } { required: true, message: '请输入岗位名称', trigger: 'blur' },
{ min: 0, max: 100, message: '长度应不超过100个字符', trigger: 'blur' }
] ]
}, },
modalRole: false, modalRole: false,
src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue
+2 -2
View File
@@ -327,11 +327,11 @@
var fileSuffix = filename.substring(index1, index2) var fileSuffix = filename.substring(index1, index2)
// const fileSuffix = file.name.split('.')[1] // 后缀名 // 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 return true
} else { } else {
this.spinShow = false this.spinShow = false
this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片') this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件')
return false 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) var fileSuffix = filename.substring(index1, index2)
// const fileSuffix = file.name.split('.')[1] // 后缀名 // 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 return true
} else { } else {
this.spinShow = false this.spinShow = false
this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片') this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件')
return false return false
} }
// 判断文件上传大小 // 判断文件上传大小
src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
+2 -2
View File
@@ -236,11 +236,11 @@
var fileSuffix = filename.substring(index1, index2) var fileSuffix = filename.substring(index1, index2)
// const fileSuffix = file.name.split('.')[1] // 后缀名 // 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 return true
} else { } else {
this.spinShow = false this.spinShow = false
this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片') this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件')
return false return false
} }
// 判断文件上传大小 // 判断文件上传大小
src/pages/processCenter/pages/creatProcess/bzdy/step5.vue
+2 -2
View File
@@ -260,11 +260,11 @@
var fileSuffix = filename.substring(index1, index2) var fileSuffix = filename.substring(index1, index2)
// const fileSuffix = file.name.split('.')[1] // 后缀名 // 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 return true
} else { } else {
this.spinShow = false this.spinShow = false
this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片') this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件')
return false return false
} }
// 判断文件上传大小 // 判断文件上传大小
src/pages/processCenter/pages/creatProcess/bzdy/step6.vue
+2 -2
View File
@@ -259,11 +259,11 @@
var fileSuffix = filename.substring(index1, index2) var fileSuffix = filename.substring(index1, index2)
// const fileSuffix = file.name.split('.')[1] // 后缀名 // 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 return true
} else { } else {
this.spinShow = false this.spinShow = false
this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片') this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件')
return false return false
} }
// 判断文件上传大小 // 判断文件上传大小
src/pages/processCenter/pages/creatProcess/bzdy/step7.vue
+2 -2
View File
@@ -259,11 +259,11 @@
var fileSuffix = filename.substring(index1, index2) var fileSuffix = filename.substring(index1, index2)
// const fileSuffix = file.name.split('.')[1] // 后缀名 // 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 return true
} else { } else {
this.spinShow = false this.spinShow = false
this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片') this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件')
return false return false
} }
// 判断文件上传大小 // 判断文件上传大小
src/pages/processCenter/pages/creatProcess/bzdy/step8.vue
+2 -2
View File
@@ -259,11 +259,11 @@
var fileSuffix = filename.substring(index1, index2) var fileSuffix = filename.substring(index1, index2)
// const fileSuffix = file.name.split('.')[1] // 后缀名 // 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 return true
} else { } else {
this.spinShow = false this.spinShow = false
this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片') this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件')
return false return false
} }
// 判断文件上传大小 // 判断文件上传大小
src/pages/processCenter/pages/creatProcess/bzdy/step9.vue
+2 -2
View File
@@ -259,11 +259,11 @@
var fileSuffix = filename.substring(index1, index2) var fileSuffix = filename.substring(index1, index2)
// const fileSuffix = file.name.split('.')[1] // 后缀名 // 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 return true
} else { } else {
this.spinShow = false this.spinShow = false
this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片') this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件')
return false return false
} }
// 判断文件上传大小 // 判断文件上传大小
src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+90 -127
View File
@@ -165,7 +165,7 @@
<el-input <el-input
v-model="roleForm.deptUserIdName" v-model="roleForm.deptUserIdName"
placeholder="选择标准法规部部长" placeholder="选择标准法规部部长"
@click.native="choiceZRR('deptUserId', '选择标准法规部部长', roleForm.deptUserId)" @click.native="choiceZRRS(roleForm.deptUserId, 0, '')"
/> />
</div> </div>
</el-form-item> </el-form-item>
@@ -313,58 +313,63 @@
</div> </div>
</div> </div>
</el-drawer> </el-drawer>
<el-drawer <Role-tree
:title="drawerTitle" check-box
:visible.sync="modalshowflag" :is-title="drawerTitle"
:wrapperClosable="false" :is-visible.sync="modalshowflag"
size="800px"> @checkedRole="saveUserInfo"
<el-tree :nodeList="nodeList"
v-if="modalshowflag" ></Role-tree>
node-key="id" <!-- <el-drawer-->
style="height: 100%; overflow: auto;" <!-- :title="drawerTitle"-->
class="filter-tree" <!-- :visible.sync="modalshowflag"-->
:data="treeData" <!-- :wrapperClosable="false"-->
:props="defaultProps" <!-- size="800px">-->
:default-checked-keys="nodeList" <!-- <el-tree-->
highlight-current <!-- v-if="modalshowflag"-->
check-strictly <!-- node-key="id"-->
@check="drawerCheck" <!-- style="height: 100%; overflow: auto;"-->
default-expand-all <!-- class="filter-tree"-->
:expand-on-click-node="false" <!-- :data="treeData"-->
show-checkbox <!-- :props="defaultProps"-->
ref="tree"> <!-- :default-checked-keys="nodeList"-->
</el-tree> <!-- highlight-current-->
<div id="roleFormButton" class="demo-drawer-footer"> <!-- check-strictly-->
<el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">确定</el-button> <!-- @check="drawerCheck"-->
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消</el-button> <!-- :expand-on-click-node="false"-->
</div> <!-- show-checkbox-->
</el-drawer> <!-- ref="tree">-->
<el-drawer <!-- </el-tree>-->
title="选择责任部门对接人" <!-- <div id="roleFormButton" class="demo-drawer-footer">-->
:visible.sync="modalshowflag2" <!-- <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">确定</el-button>-->
:wrapperClosable="false" <!-- <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消</el-button>-->
size="800px"> <!-- </div>-->
<el-tree <!-- </el-drawer>-->
v-if="modalshowflag2" <!-- <el-drawer-->
node-key="id" <!-- title="选择责任部门对接人"-->
style="height: 100%; overflow: auto;" <!-- :visible.sync="modalshowflag2"-->
class="filter-tree" <!-- :wrapperClosable="false"-->
:data="treeData" <!-- size="800px">-->
:props="defaultProps" <!-- <el-tree-->
:default-checked-keys="nodeList2" <!-- v-if="modalshowflag2"-->
highlight-current <!-- node-key="id"-->
check-strictly <!-- style="height: 100%; overflow: auto;"-->
@check="drawerCheck2" <!-- class="filter-tree"-->
default-expand-all <!-- :data="treeData"-->
:expand-on-click-node="false" <!-- :props="defaultProps"-->
show-checkbox <!-- :default-checked-keys="nodeList2"-->
ref="tree2"> <!-- highlight-current-->
</el-tree> <!-- check-strictly-->
<div id="roleFormButton2" class="demo-drawer-footer"> <!-- @check="drawerCheck2"-->
<el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo2">确定</el-button> <!-- :expand-on-click-node="false"-->
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo2">取消</el-button> <!-- show-checkbox-->
</div> <!-- ref="tree2">-->
</el-drawer> <!-- </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> </div>
</template> </template>
@@ -392,6 +397,7 @@
saveLoading: false, saveLoading: false,
// 基础信息form表单 // 基础信息form表单
form: { form: {
id: '',
itemsNum: '', itemsNum: '',
itemsName: '', itemsName: '',
standId: '', standId: '',
@@ -570,7 +576,7 @@
this.listModel = false; this.listModel = false;
this.listModel2 = true this.listModel2 = true
this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', { this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', {
infoId: this.form.id, infoId: this.form.standId,
page: 1, page: 1,
pageSize: 9999 pageSize: 9999
}, { }, {
@@ -621,46 +627,25 @@
}, },
/*** **********************************************/ /*** **********************************************/
/** 流程节点负责人的选择 *****************************/ /** 流程节点负责人的选择 *****************************/
choiceZRR (type, title, id) { saveUserInfo (data) {
this.nodeList = [] if (this.type === 0) {
this.nodeList.push(id) this.roleForm.deptUserId = data[0].id
this.type = type this.roleForm.deptUserIdName = data[0].name
this.drawerTitle = title } else if (this.type === 1) {
this.modalshowflag = true this.itemList[this.zrIndex].zrUserId = data[0].id
}, this.itemList[this.zrIndex].zrUserIdName = data[0].name
getTree () { } else {
this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> { this.itemList.forEach( item => {
this.treeData = res.data this.zrIdList.forEach( items => {
}) if (item.id === items) {
}, item.zrUserId = data[0].id
saveUserInfo () { item.zrUserIdName = data[0].name
if (this.type === 'deptUserId') { }
this.roleForm.deptUserId = this.roleRow.id })
this.roleForm.deptUserIdName = this.roleRow.name })
} }
this.modalshowflag = false 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) { handleSelectionChange (val) {
this.zrIdList = [] this.zrIdList = []
val.forEach( item => { val.forEach( item => {
@@ -668,51 +653,30 @@
}) })
}, },
choiceZRRS (row, type, index) { choiceZRRS (row, type, index) {
this.type = type
if (type === 1) { if (type === 1) {
this.nodeList2 = [] this.drawerTitle = '选择责任人'
this.zrIndex= index this.nodeList = []
this.zrIndex = index
this.zrType = type this.zrType = type
this.nodeList2.push(row) this.nodeList.push(row)
this.modalshowflag2 = true this.modalshowflag = true
} else { } else if (type === 2) {
// 批量 // 批量
if (this.zrIdList.length > 0) { if (this.zrIdList.length > 0) {
this.zrType = type this.zrType = type
this.nodeList2 = [] this.nodeList = []
this.modalshowflag2 = true this.modalshowflag = true
this.drawerTitle = '批量选择责任人'
} else { } else {
this.$message.warning('请选择要编辑的数据') 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 { } else {
this.itemList.forEach( item => { this.nodeList = []
this.zrIdList.forEach( items => { this.nodeList.push(row)
if (item.id === items) { this.drawerTitle = '选择标准法规部部长'
item.zrUserId = idList this.modalshowflag = true
item.zrUserIdName = nameList
}
})
})
} }
this.modalshowflag2 = false
},
cancleUserInfo2 () {
this.modalshowflag2 = false
}, },
handleTabs(name) { handleTabs(name) {
this.active = name this.active = name
@@ -766,7 +730,6 @@
} }
}, },
mounted () { mounted () {
this.getTree()
this.sarStandCompareHis() this.sarStandCompareHis()
this.sarStandCompareHis2() this.sarStandCompareHis2()
this.tableHeight = $('.content').height() - 44 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"> <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> <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'4f71b81686079ba2b7e3739d3994e0af'">查看</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
</div> </div>
src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue
+1 -1
View File
@@ -127,7 +127,7 @@
<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> <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'b9abd00768c8ed97be89547c2da3f0eb'">查看</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
</div> </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"> <el-table-column :label="$t('m.operation')" align="center" width="50">
<template slot-scope="scope"> <template slot-scope="scope">
<div @click.stop style="display: inline-block"> <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> <i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="[scope.row, '办理']">办理</el-dropdown-item> <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"> <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> <el-dropdown-item :command="[scope.row, '办理']" v-btn-permission="'fa19fb2dc2cf3055a64732dab6c40cb9'">办理</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
</div> </div>
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue
+11 -2
View File
@@ -138,7 +138,7 @@
ref="multipleTable" ref="multipleTable"
:data="sarProStateListDatas" :data="sarProStateListDatas"
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%" style="width: 100%;"
border border
:height="sarProStateTableHeight" :height="sarProStateTableHeight"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
@@ -157,7 +157,7 @@
<el-table-column <el-table-column
width="150px" width="150px"
align="center" align="center"
prop="standNumber" prop="productId"
label="项目编号"> label="项目编号">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -354,6 +354,13 @@ export default {
loading: 'loading' loading: 'loading'
}, res => { }, res => {
if (res.ok) { if (res.ok) {
res.data.records.forEach((item)=>{
for(let key in item){
if(item[key] == null){
item[key]='无'
}
}
})
this.sarProStateListDatas = res.data.records this.sarProStateListDatas = res.data.records
this.sarProStateTotal = res.data.total this.sarProStateTotal = res.data.total
} }
@@ -385,8 +392,10 @@ export default {
mounted () { mounted () {
this.queryStandAndLaws() this.queryStandAndLaws()
this.tableHeight = $('.regulatory-repository').height() - 159 this.tableHeight = $('.regulatory-repository').height() - 159
this.sarProStateTableHeight=$('.regulatory-repository').height() -120
window.onresize = () => { window.onresize = () => {
this.tableHeight = $('.regulatory-repository').height() - 159 this.tableHeight = $('.regulatory-repository').height() - 159
this.sarProStateTableHeight=$('.regulatory-repository').height() - 120
} }
} }
} }
src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+18 -8
View File
@@ -19,16 +19,17 @@
</p> </p>
<p class="transition-box-p"> <p class="transition-box-p">
<label class="transition-box-label">上传时间：</label> <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" 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> <span class="transition-box-span" v-else>-</span>
</p> <p class="transition-box-p"> </p>
<label class="transition-box-label">征求意见周期：</label>
<span class="transition-box-span">{{ this.$route.query.item.endTime || '-' }}</span>
</p>
</div> </div>
</transition> </transition>
<div class="effect"> <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> <el-button type="primary" class="common-button-primary" size="mini" @click="exportAll">导出</el-button>
</div> </div>
<div class="container" style="position:relative;"> <div class="container" style="position:relative;">
@@ -64,7 +65,7 @@
label="提出人" label="提出人"
> >
</el-table-column> </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"> <template slot-scope="scope">
<div @click.stop style="display: inline-block"> <div @click.stop style="display: inline-block">
<el-dropdown trigger="click" @command="handleCommand"> <el-dropdown trigger="click" @command="handleCommand">
@@ -146,7 +147,9 @@ export default {
page: 1, page: 1,
size: this.$store.getters.userInfo.configContent, size: this.$store.getters.userInfo.configContent,
userId: this.$store.getters.userInfo.userId, userId: this.$store.getters.userInfo.userId,
} // 详情数据 endTime: this.$route.query.item.endTime
}, // 详情数据
ideaKey: false
} }
}, },
methods: { methods: {
@@ -162,6 +165,13 @@ export default {
this.standinfoList = res.data.records this.standinfoList = res.data.records
this.total = res.data.total this.total = res.data.total
this.spinShow = false this.spinShow = false
res.data.records.forEach(item => {
if (item.ideaKey == 1) {
this.ideaKey = false
} else {
this.ideaKey = true
}
})
}, e => { }, e => {
}) })
}, },
src/sysConfig/index.js
+3 -6
View File
@@ -4,12 +4,9 @@
* @date: 2018-09-04 17:47:46 * @date: 2018-09-04 17:47:46
*/ */
// 服务器地址 // 服务器地址
// const devIp = '39.98.140.126' // const devIp = '10.96.10.171'
// const devInterfacePORT = '10005' // const devInterfacePORT = '9999'
// const devIp = '192.168.10.248' const devIp = '192.168.1.145'
// const devIp = '101.36.227.25'
// const devInterfacePORT = '8038'
const devIp = '10.96.170.156'
const devInterfacePORT = '9999' const devInterfacePORT = '9999'
// 云端端口号 // 云端端口号
const DEV_CLOUD_RES_INTERFACE_PORT = '7777' const DEV_CLOUD_RES_INTERFACE_PORT = '7777'