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

Merge branch 'develop' into 'test'

Browse Source 
Develop

See merge request LAWS/laws-system-front-FOTON!179
This commit is contained in:
王夏晖
2021-10-14 15:36:43 +08:00
parent 5b43eb6037 33d711071c
commit 6a3660f4b0
11 changed files with 227 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/assets/images/shangqi/img/logo5.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 33 KiB

src/components/navMenu/index.vue
+12 -9
View File
@@ -8,8 +8,10 @@
</div> </div>
</div> </div>
</div> </div>
<div class="toggle-btn iconfont" style="margin: 10px 0; display: flex;justify-content: center; font-size: 30px; color: #333333;" @click="handleToggleSideBar"> <div class="toggle-btn el-icon-s-fold" v-if="isCollapse === false" style="margin: 10px 0; display: flex;justify-content: center; font-size: 30px; color: #333333;" @click="handleToggleSideBar">
<div style="font-size: 14px; line-height: 30px;">{{ this.isCollapse ? '' : '' }}</div>&#xe647;</div> <div style="font-size: 14px; line-height: 30px;">{{ this.isCollapse ? '' : '' }}</div><i class=""></i></div>
<div class="toggle-btn el-icon-s-unfold" v-else style="margin: 10px 0; display: flex;justify-content: center; font-size: 30px; color: #333333;" @click="handleToggleSideBar">
<div style="font-size: 14px; line-height: 30px;">{{ this.isCollapse ? '' : '' }}</div></div>
<div class="left-tree"> <div class="left-tree">
<el-menu <el-menu
unique-opened unique-opened
@@ -54,13 +56,13 @@
</el-menu-item> </el-menu-item>
</el-submenu> </el-submenu>
<el-menu-item <el-menu-item
:key="index" :key="index"
:index="item.path" :index="item.path"
v-if="item.isChildren && (!item.menuId || $hasPermission(item.menuId))" v-if="item.isChildren && (!item.menuId || $hasPermission(item.menuId))"
> >
<i class="shangqi-icon" :class="item['icon-class']"></i> <i class="shangqi-icon" :class="item['icon-class']"></i>
<span slot="title">{{ item.title }}</span> <span slot="title">{{ item.title }}</span>
</el-menu-item> </el-menu-item>
</template> </template>
</el-menu> </el-menu>
</div> </div>
@@ -557,6 +559,7 @@
color: #5ea9f6 !important; color: #5ea9f6 !important;
font-weight: bold; font-weight: bold;
} }
.el-menu-item { .el-menu-item {
padding: 0 16px !important; padding: 0 16px !important;
span { span {
src/main.js
+27 -1
View File
@@ -68,6 +68,7 @@ router.beforeEach(function (to, from, next) {
let prcNum = to.query.prcNum; let prcNum = to.query.prcNum;
let prcName = to.query.prcName; let prcName = to.query.prcName;
let prcType = to.query.prcType; let prcType = to.query.prcType;
let routerType = to.query.routerType;
let param = "taskIds=" + taskId + "&prcId=" + prcId let param = "taskIds=" + taskId + "&prcId=" + prcId
+ "&prcNum=" + prcNum + "&prcName=" + prcName + "&prcType=" + prcType; + "&prcNum=" + prcNum + "&prcName=" + prcName + "&prcType=" + prcType;
console.log(store) console.log(store)
@@ -162,12 +163,37 @@ router.beforeEach(function (to, from, next) {
} }
} else { // 业务系统 当前节点未完成 } else { // 业务系统 当前节点未完成
// commitStatus 大于0 表示当前节点存在未完成干活流程 // commitStatus 大于0 表示当前节点存在未完成干活流程
if (isNotFinished && isNotFinished > 0 && commitStatus && commitStatus > 0) { // isNotFinished OA 系统显示接受任务 已置为已办
if (routerType && routerType === 'oa' &&isNotFinished && isNotFinished > 0 && commitStatus && commitStatus > 0) {
if (prcType === '3') { if (prcType === '3') {
//标准征求意见 接受节点 未完成 oa已办 跳转详情页面 //标准征求意见 接受节点 未完成 oa已办 跳转详情页面
if (path === '/bzzqyjStep3') { if (path === '/bzzqyjStep3') {
extracted2("processAcceptDetail","prcNum=" + prcNum + "&tabsName=AlreadyProcess"); extracted2("processAcceptDetail","prcNum=" + prcNum + "&tabsName=AlreadyProcess");
} }
}else if (prcType === '5') {
if (path === '/xmpgStep4') {
extracted2("processAcceptDetail","prcNum=" + prcNum + "&tabsName=AlreadyProcess");
}
}else if (prcType === '2') {
if (path === '/bzdyStep3') {
extracted2("processAcceptDetail","prcNum=" + prcNum + "&tabsName=AlreadyProcess");
}
}else if (prcType === '9') {
if (path === '/bzjdStep3') {
extracted2("processAcceptDetail","prcNum=" + prcNum + "&tabsName=AlreadyProcess");
}
}else if (prcType === '6') {
if (path === '/xmpg2Step6') {
extracted2("processAcceptDetail","prcNum=" + prcNum + "&tabsName=AlreadyProcess");
}
}else if (prcType === '10') {
if (path === '/xmqdqrStep2') {
extracted2("processAcceptDetail","prcNum=" + prcNum + "&tabsName=AlreadyProcess");
}
}else if (prcType === '8') {
if (path === '/wfhxzgStep4') {
extracted2("processAcceptDetail","prcNum=" + prcNum + "&tabsName=AlreadyProcess");
}
} }
} else { } else {
// oa 待测 sso // oa 待测 sso
src/pages/config/pages/mechanismManage/index.vue
+156 -78
View File
@@ -66,9 +66,9 @@
:header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"> fontWeight: 'bold', height: '48px'}">
<el-table-column <el-table-column
prop="account" prop="account"
label="账号" label="账号"
width="100px"> width="100px">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="uname" prop="uname"
@@ -98,15 +98,15 @@
prop="institutionName" prop="institutionName"
label="所属部门"> label="所属部门">
<template slot-scope="scope"> <template slot-scope="scope">
<el-popover trigger="hover" placement="top"> <el-popover trigger="hover" placement="top">
{{scope.row.institutionName}} {{ scope.row.institutionName }}
<div slot="reference" class="name-wrapper"> <div slot="reference" class="name-wrapper">
<p v-if="!scope.row.institutionName || scope.row.institutionName.length<15"> <p v-if="!scope.row.institutionName || scope.row.institutionName.length<15">
{{scope.row.institutionName}} {{ scope.row.institutionName }}
</p> </p>
<p v-else> {{scope.row.institutionName.substring(0,15)}}...</p> <p v-else> {{ scope.row.institutionName.substring(0, 15) }}...</p>
</div> </div>
</el-popover> </el-popover>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -114,12 +114,12 @@
label="所属岗位"> label="所属岗位">
<template slot-scope="scope"> <template slot-scope="scope">
<el-popover trigger="hover" placement="top"> <el-popover trigger="hover" placement="top">
{{scope.row.NameList}} {{ scope.row.NameList }}
<div slot="reference" class="name-wrapper"> <div slot="reference" class="name-wrapper">
<p v-if="!scope.row.institutionName ||scope.row.NameList.length<15"> <p v-if="!scope.row.institutionName ||scope.row.NameList.length<15">
{{scope.row.NameList}} {{ scope.row.NameList }}
</p> </p>
<p v-else> {{scope.row.NameList.substring(0,15)}}...</p> <p v-else> {{ scope.row.NameList.substring(0, 15) }}...</p>
</div> </div>
</el-popover> </el-popover>
</template> </template>
@@ -140,9 +140,15 @@
<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 v-btn-permission="'30db3b395deb5004266cd65d302c2776'" v-if="scope.row.disableFlag === '1'" :command="[scope.row, '启用']">启用</el-dropdown-item> <el-dropdown-item v-btn-permission="'30db3b395deb5004266cd65d302c2776'" v-if="scope.row.disableFlag === '1'" :command="[scope.row, '启用']">
<el-dropdown-item v-btn-permission="'30db3b395deb5004266cd65d302c2776'" v-if="scope.row.disableFlag === '0'" :command="[scope.row, '禁用']">禁用</el-dropdown-item> 启用
<el-dropdown-item v-btn-permission="'ce2d2b9bb8004e0d9efcabc42a9f354d'" :command="[scope.row, '配置岗位']">配置岗位</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item v-btn-permission="'30db3b395deb5004266cd65d302c2776'" v-if="scope.row.disableFlag === '0'" :command="[scope.row, '禁用']">
禁用
</el-dropdown-item>
<el-dropdown-item v-btn-permission="'ce2d2b9bb8004e0d9efcabc42a9f354d'" :command="[scope.row, '配置岗位']">
配置岗位
</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
</div> </div>
@@ -155,35 +161,57 @@
</div> </div>
<loading style="z-index: 2099;" :loading="treeLoading">导入中...</loading> <loading style="z-index: 2099;" :loading="treeLoading">导入中...</loading>
<el-drawer <el-drawer
title="配置岗位" class="postPage"
:visible.sync="modalPost" title="配置岗位"
:wrapperClosable="false" :visible.sync="modalPost"
size="800px" :wrapperClosable="false"
@close="resetFormPost" size="800px"
@close="resetFormPost"
> >
<el-form ref="" :model="sarPost" inline>
<el-form-item class="search-item" style="padding-left: 25px">
<el-input v-model="sarPost.name"
size="small"
placeholder="岗位名称查找"
clearable></el-input>
</el-form-item>
<el-form-item label="" class="search-item btn-box">
<el-button class="common-button-primary" type="primary" size="mini" @click="searchPostName"
v-btn-permission="">查询
</el-button>
</el-form-item>
<el-form-item label="" class="search-item btn-box">
<el-button class="common-button-default" @click="resetSelect" size="mini"
v-btn-permission="">清空
</el-button>
</el-form-item>
</el-form>
<el-tree <el-tree
ref="tree2" ref="tree2"
node-key="id" node-key="id"
class="filter-tree" class="filter-tree"
style="height: 100%; overflow: auto;" style="height: 100%; overflow: auto;"
v-if="modalPost" v-if="modalPost"
:props="props" :props="props"
:data="postList" :data="postList"
:default-checked-keys="nodeList" :filter-node-method="filterNode"
highlight-current :default-checked-keys="nodeList"
check-strictly highlight-current
default-expand-all check-strictly
:expand-on-click-node="false" default-expand-all
show-checkbox> :expand-on-click-node="false"
show-checkbox>
</el-tree> </el-tree>
<pagination :page="page" :pageSize="pageSize" :total="total2" @pageChange="pageChange2" @pageSizeChange="pageSizeChange2"></pagination>
<div id="roleFormButton" class="demo-drawer-footer"> <div id="roleFormButton" class="demo-drawer-footer">
<el-button <el-button
size="mini" size="mini"
class="common-button-primary" class="common-button-primary"
icon="el-icon-check" icon="el-icon-check"
type="primary" type="primary"
@click="PostSubmit" @click="PostSubmit"
>确定</el-button> >确定
</el-button>
<el-button size="mini" class="common-button-default" icon="el-icon-close" @click="resetFormPost">取消</el-button> <el-button size="mini" class="common-button-default" icon="el-icon-close" @click="resetFormPost">取消</el-button>
</div> </div>
</el-drawer> </el-drawer>
@@ -193,12 +221,12 @@
<script> <script>
export default { export default {
name: 'MechanismManage', name: 'MechanismManage',
data () { data() {
return { return {
nodeKeyId:'', nodeKeyId: '',
searchForm: { searchForm: {
uname:"", uname: "",
email:"" email: ""
}, },
userId: '', userId: '',
postList: [], postList: [],
@@ -208,6 +236,9 @@ export default {
}, },
nodeList: [], nodeList: [],
modalPost: false, modalPost: false,
sarPost: {
name: "", // 岗位名称
},
filterText: '', // 树结构检索条件 filterText: '', // 树结构检索条件
defaultProps: { defaultProps: {
children: 'children', children: 'children',
@@ -216,6 +247,7 @@ export default {
treeData: [], // 树结构数据 treeData: [], // 树结构数据
page: 1, page: 1,
total: 0, total: 0,
total2: 0,
pageSize: this.$store.getters.userInfo.configContent, pageSize: this.$store.getters.userInfo.configContent,
sideClose: false, sideClose: false,
data: [], // table数据 data: [], // table数据
@@ -233,22 +265,31 @@ export default {
this.page = 1 this.page = 1
this.getData() this.getData()
}, },
resetFormPost () { resetFormPost() {
this.modalPost= false this.modalPost = false
}, },
PostSubmit () { PostSubmit() {
this.$http.postData('sarUser/user/position', { this.$http.postData('sarUser/user/position', {
positionIds: this.$refs.tree2.getCheckedKeys(), positionIds: this.$refs.tree2.getCheckedKeys(),
userId: this.userId userId: this.userId
}, {}, res => { }, {}, res => {
if (res.ok) { if (res.ok) {
this.$message.success('配置岗位成功') this.$message.success('配置岗位成功')
this.modalPost = false this.modalPost = false
this.getData() this.getData()
} }
}) })
}, },
handleCommand (command) { searchPostName() {
this.page = 1;
this.getTree2();
}, // 查询
resetSelect() {
this.sarPost.name = "";
this.getTree2();
}, // 外层清空条件查询
handleCommand(command) {
switch (command[1]) { switch (command[1]) {
case '启用': case '启用':
this.disableFlagEdit(command[0], 0) this.disableFlagEdit(command[0], 0)
@@ -261,29 +302,35 @@ export default {
break break
} }
}, },
getTree2 () {
this.$http.get('sarPosition/position', {}, { getTree2() {
this.$http.get('sarPosition/position', {
current: this.page,
pageSize: this.pageSize,
...this.sarPost,
}, {
_this: this, _this: this,
}, res=> { }, res => {
this.postList = res.data this.postList = res.data.records
this.total2 = res.data.total
}) })
}, },
postsConfigure (row) { postsConfigure(row) {
var arr = [] var arr = []
this.userId = row.userId this.userId = row.userId
row.positions.forEach((item) => { row.positions.forEach((item) => {
arr.push(item.id) arr.push(item.id)
}) })
this.nodeList = arr this.nodeList = arr
this.modalPost= true this.modalPost = true
}, },
disableFlagEdit (row, type) { disableFlagEdit(row, type) {
let json = {} let json = {}
json.userId = row.userId json.userId = row.userId
json.disableFlag = type json.disableFlag = type
this.$http.postData('sarUser/user/disable', json, {}, this.$http.postData('sarUser/user/disable', json, {},
res => { res => {
if (res.ok){ if (res.ok) {
if (type === 0) { if (type === 0) {
this.$message.success('已启用') this.$message.success('已启用')
} else { } else {
@@ -293,18 +340,18 @@ export default {
} }
}) })
}, },
treeCollapse () { treeCollapse() {
this.sideClose = !this.sideClose this.sideClose = !this.sideClose
}, },
filterNode(value, data) { filterNode(value, data) {
if (!value) return true; if (!value) return true;
return data.name.indexOf(value) !== -1; return data.name.indexOf(value) !== -1;
}, },
handleNodeClick (data) { handleNodeClick(data) {
this.id = data.id this.id = data.id
this.getData() this.getData()
}, },
getTree () { getTree() {
this.$http.get('SarInstitution/institution', {}, { this.$http.get('SarInstitution/institution', {}, {
_this: this, _this: this,
loading: 'treeLoading' loading: 'treeLoading'
@@ -321,9 +368,9 @@ export default {
console.log(e); console.log(e);
}) })
}, },
getData () { getData() {
this.$http.post('SarInstitution/institution/user', { this.$http.post('SarInstitution/institution/user', {
current:this.page, current: this.page,
size: this.pageSize, size: this.pageSize,
institutionId: this.id, institutionId: this.id,
uname: this.searchForm.uname, uname: this.searchForm.uname,
@@ -347,14 +394,22 @@ export default {
this.total = res.data.total this.total = res.data.total
}) })
}, },
pageChange (page) { pageChange(page) {
this.page = page this.page = page
this.getData() this.getData()
}, },
pageSizeChange (pageSize) { pageSizeChange(pageSize) {
this.pageSize = pageSize this.pageSize = pageSize
this.getData() this.getData()
}, },
pageChange2(page) {
this.page = page
this.getTree2()
},
pageSizeChange2(pageSize) {
this.pageSize = pageSize
this.getTree2()
},
}, },
computed: {}, computed: {},
watch: { watch: {
@@ -362,7 +417,7 @@ export default {
this.$refs.tree.filter(val); this.$refs.tree.filter(val);
}, },
}, },
mounted () { mounted() {
// 获取组织结构树 // 获取组织结构树
this.getTree() this.getTree()
this.getTree2() this.getTree2()
@@ -372,47 +427,63 @@ export default {
<style lang="less"> <style lang="less">
@import '~@/assets/styles/mixins'; @import '~@/assets/styles/mixins';
#mechanism-manage { #mechanism-manage {
display: flex; display: flex;
height: 100%; height: 100%;
.tree-close{
.tree{ .tree-close {
.tree {
left: -200px !important; left: -200px !important;
} }
.tree-right{
.tree-right {
width: calc(~'100% - 15px') !important; width: calc(~'100% - 15px') !important;
} }
.side-bar-collapse{
.side-bar-collapse {
background: #5596CC !important; background: #5596CC !important;
color: #FFF; color: #FFF;
} }
} }
.tree-closed { .tree-closed {
width: 15px !important; width: 15px !important;
} }
.postPage {
.pagination {
position: initial;
}
}
.tree-content { .tree-content {
background: #fff; background: #fff;
width: 300px; width: 300px;
position: relative; position: relative;
.tree { .tree {
width: 95%; width: 95%;
position: absolute; position: absolute;
left: 0; left: 0;
} }
.tree-collapse { .tree-collapse {
position: absolute; position: absolute;
right: 0; right: 0;
} }
} }
.tree-right { .tree-right {
overflow-y: hidden; overflow-y: hidden;
padding:0; padding: 0;
position: relative; position: relative;
width: 100%; width: 100%;
height: 100%; height: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.content{
.content {
padding: 0px; padding: 0px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@@ -420,7 +491,8 @@ export default {
flex: auto; flex: auto;
//height: calc(~'100% - 105px - 56px'); //height: calc(~'100% - 105px - 56px');
} }
.pagination{
.pagination {
position: static; position: static;
width: 100% !important; width: 100% !important;
left: 0 !important; left: 0 !important;
@@ -429,25 +501,31 @@ export default {
} }
</style> </style>
<style lang="less" scoped> <style lang="less" scoped>
#mechanism-manage{ #mechanism-manage {
height: 100%; height: 100%;
.content { .content {
height: calc(~'100% - 105px - 56px') height: calc(~'100% - 105px - 56px')
} }
/deep/.el-select__tags {
/deep/ .el-select__tags {
overflow-x: hidden; overflow-x: hidden;
} }
/deep/.width-all{
/deep/ .width-all {
width: 100%; width: 100%;
} }
.filter-tree { .filter-tree {
height: calc(~'100% - 50px') height: calc(~'100% - 50px')
} }
.laws-tree{
/deep/.clearable { .laws-tree {
/deep/ .clearable {
top: 20px; top: 20px;
} }
} }
.add-form-item { .add-form-item {
display: flex; display: flex;
} }
src/pages/processCenter/pages/components/ProcessFooter.vue
+2 -2
View File
@@ -70,7 +70,7 @@
size="mini" size="mini"
class="common-button-primary" class="common-button-primary"
@click="handleSave" @click="handleSave"
:loading="saveLoading" :loading="submitLoading"
v-if="showSave"> v-if="showSave">
<i class="iconfont">&#xe608;</i> <i class="iconfont">&#xe608;</i>
保存 保存
@@ -80,7 +80,7 @@
size="small" size="small"
class="common-button-danger" class="common-button-danger"
@click="beforeBack" @click="beforeBack"
:loading="isSubmitBack" :loading="submitLoading"
v-if="showBack"> v-if="showBack">
<i class="iconfont" style="font-size: 12px;">&#xe615;</i> <i class="iconfont" style="font-size: 12px;">&#xe615;</i>
{{ backBTNText }}</el-button> {{ backBTNText }}</el-button>
src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
+2 -2
View File
@@ -183,13 +183,13 @@
</el-table> </el-table>
</div> </div>
<ProcessFooter <ProcessFooter
show-save :show-save="submitShow"
show-submit show-submit
:submitLoading="isSubmit" :submitLoading="isSubmit"
:saveLoading="saveLoading" :saveLoading="saveLoading"
:show-submit="submitShow" :show-submit="submitShow"
:show-confirm="acceptShow" :show-confirm="acceptShow"
show-transfer :show-transfer="submitShow"
@transfer="handleTransfer" @transfer="handleTransfer"
@save="handleSave" @save="handleSave"
@submit="handleSubmit" @submit="handleSubmit"
src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+4
View File
@@ -230,6 +230,7 @@
</el-input> </el-input>
<el-input <el-input
v-else v-else
:disabled="acceptShow"
v-model="dataList[scope.$index].complianceReasons" v-model="dataList[scope.$index].complianceReasons"
placeholder="请输入合规原因" placeholder="请输入合规原因"
> >
@@ -256,6 +257,7 @@
</el-input> </el-input>
<el-input <el-input
v-else v-else
:disabled="acceptShow"
v-model="dataList[scope.$index].noCompliance" v-model="dataList[scope.$index].noCompliance"
placeholder="请输入不合规项目" placeholder="请输入不合规项目"
> >
@@ -277,6 +279,7 @@
</el-input> </el-input>
<el-input <el-input
v-else v-else
:disabled="acceptShow"
v-model="dataList[scope.$index].countermeasures" v-model="dataList[scope.$index].countermeasures"
placeholder="请输入应对措施" placeholder="请输入应对措施"
> >
@@ -298,6 +301,7 @@
</el-date-picker> </el-date-picker>
<el-date-picker <el-date-picker
v-else v-else
:disabled="acceptShow"
class="datePickLen" class="datePickLen"
clearable clearable
v-model="dataList[scope.$index].completionTime" v-model="dataList[scope.$index].completionTime"
src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+7 -3
View File
@@ -44,7 +44,7 @@
</process-title> </process-title>
<div class="tableTitle"> <div class="tableTitle">
<div class="tableButton"> <div class="tableButton">
<el-button class="common-button-primary add-button" type="primary" size="mini" @click="batchEdit">批量编辑 <el-button :disabled="acceptShow" class="common-button-primary add-button" type="primary" size="mini" @click="batchEdit">批量编辑
</el-button> </el-button>
</div> </div>
</div> </div>
@@ -142,6 +142,7 @@
</el-input> </el-input>
<el-input <el-input
v-else v-else
:disabled="acceptShow"
v-model="scope.row.complianceReasons" v-model="scope.row.complianceReasons"
placeholder="请输入合规原因" placeholder="请输入合规原因"
> >
@@ -168,6 +169,7 @@
</el-input> </el-input>
<el-input <el-input
v-else v-else
:disabled="acceptShow"
v-model="scope.row.noCompliance" v-model="scope.row.noCompliance"
placeholder="请输入不合规项目" placeholder="请输入不合规项目"
> >
@@ -189,6 +191,7 @@
</el-input> </el-input>
<el-input <el-input
v-else v-else
:disabled="acceptShow"
v-model="scope.row.countermeasures" v-model="scope.row.countermeasures"
placeholder="请输入应对措施" placeholder="请输入应对措施"
> >
@@ -210,6 +213,7 @@
</el-date-picker> </el-date-picker>
<el-date-picker <el-date-picker
v-else v-else
:disabled="acceptShow"
class="datePickLen" class="datePickLen"
clearable clearable
v-model="scope.row.completionTime" v-model="scope.row.completionTime"
@@ -422,9 +426,9 @@
</div> </div>
</div> </div>
<ProcessFooter <ProcessFooter
show-save :show-save="submitShow"
show-submit show-submit
show-transfer :show-transfer="submitShow"
:show-submit="submitShow" :show-submit="submitShow"
:show-confirm="acceptShow" :show-confirm="acceptShow"
:submitLoading="isSubmit" :submitLoading="isSubmit"
src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
+7 -7
View File
@@ -52,8 +52,8 @@
</process-title> </process-title>
<div class="tableTitle"> <div class="tableTitle">
<div class="tableButton"> <div class="tableButton">
<el-button plain class="common-button-primary" size="mini" @click="addList">添加</el-button> <el-button :disabled="acceptShow" plain class="common-button-primary" size="mini" @click="addList">添加</el-button>
<el-button plain class="common-button-primary" size="mini" @click="delectList">批量删除</el-button> <el-button :disabled="acceptShow" plain class="common-button-primary" size="mini" @click="delectList">批量删除</el-button>
</div> </div>
</div> </div>
<el-table <el-table
@@ -382,10 +382,10 @@
</div> </div>
</el-drawer> </el-drawer>
<ProcessFooter <ProcessFooter
show-save :show-save="submitShow"
show-transfer :show-transfer="submitShow"
show-affirm :show-affirm="submitShow"
show-confirm :show-submit="submitShow"
:show-confirm="acceptShow" :show-confirm="acceptShow"
:submitLoading="isSubmit" :submitLoading="isSubmit"
:transfer-loading="isTransfer" :transfer-loading="isTransfer"
@@ -412,7 +412,7 @@
import ProcessHeader from "../../components/ProcessHeader"; import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter"; import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle"; import ProcessTitle from "../../components/ProcessTitle";
import { inboundLiaisonDetail, queryDetail, saveTaskForPub ,changeAssigneeNew} from "api/process"; import { inboundLiaisonDetail, queryDetail, saveTaskForPub ,changeAssigneeNew, execTask} from "api/process";
export default { export default {
name: "xmqdqrStep2", name: "xmqdqrStep2",
src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+1
View File
@@ -64,6 +64,7 @@
height="100%" height="100%"
border border
style="width: 100%" style="width: 100%"
:default-sort = "{prop: 'partCode', order: 'ascending'}"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"> fontWeight: 'bold', height: '48px'}">
<el-table-column <el-table-column
src/router/index.js
+9
View File
@@ -249,6 +249,15 @@ const routes = [
title: '流程详情' title: '流程详情'
} }
}, },
{
path: '/processAcceptDetail',
name: 'ProcessAcceptDetail',
component: () => import('@/pages/processCenter/pages/processAcceptDetail/index.vue'),
meta: {
requireAuth: true,
title: '流程详情'
}
},
{ {
path: '/bzffStep1', path: '/bzffStep1',
name: 'bzffStep1', name: 'bzffStep1',