diff --git a/src/assets/images/shangqi/img/logo5.png b/src/assets/images/shangqi/img/logo5.png
new file mode 100644
index 000000000..4db0cdf9a
Binary files /dev/null and b/src/assets/images/shangqi/img/logo5.png differ
diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue
index 6d99f893f..2c79ebd1f 100644
--- a/src/components/navMenu/index.vue
+++ b/src/components/navMenu/index.vue
@@ -8,8 +8,10 @@
-
-
{{ this.isCollapse ? '' : '' }}
+
+
{{ this.isCollapse ? '' : '' }}
+
+
{{ this.isCollapse ? '' : '' }}
-
- {{ item.title }}
-
+ :key="index"
+ :index="item.path"
+ v-if="item.isChildren && (!item.menuId || $hasPermission(item.menuId))"
+ >
+
+ {{ item.title }}
+
@@ -557,6 +559,7 @@
color: #5ea9f6 !important;
font-weight: bold;
}
+
.el-menu-item {
padding: 0 16px !important;
span {
diff --git a/src/main.js b/src/main.js
index b5ca09e3c..e61c92d04 100644
--- a/src/main.js
+++ b/src/main.js
@@ -68,6 +68,7 @@ router.beforeEach(function (to, from, next) {
let prcNum = to.query.prcNum;
let prcName = to.query.prcName;
let prcType = to.query.prcType;
+ let routerType = to.query.routerType;
let param = "taskIds=" + taskId + "&prcId=" + prcId
+ "&prcNum=" + prcNum + "&prcName=" + prcName + "&prcType=" + prcType;
console.log(store)
@@ -162,12 +163,37 @@ router.beforeEach(function (to, from, next) {
}
} else { // 业务系统 当前节点未完成
// commitStatus 大于0 表示当前节点存在未完成干活流程
- if (isNotFinished && isNotFinished > 0 && commitStatus && commitStatus > 0) {
+ // isNotFinished OA 系统显示接受任务 已置为已办
+ if (routerType && routerType === 'oa' &&isNotFinished && isNotFinished > 0 && commitStatus && commitStatus > 0) {
if (prcType === '3') {
//标准征求意见 接受节点 未完成 oa已办 跳转详情页面
if (path === '/bzzqyjStep3') {
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 {
// oa 待测 sso
diff --git a/src/pages/config/pages/mechanismManage/index.vue b/src/pages/config/pages/mechanismManage/index.vue
index 535421bfe..244d8450e 100644
--- a/src/pages/config/pages/mechanismManage/index.vue
+++ b/src/pages/config/pages/mechanismManage/index.vue
@@ -66,9 +66,9 @@
:header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
+ prop="account"
+ label="账号"
+ width="100px">
-
- {{scope.row.institutionName}}
-
-
- {{scope.row.institutionName}}
-
-
{{scope.row.institutionName.substring(0,15)}}...
-
-
+
+ {{ scope.row.institutionName }}
+
+
+ {{ scope.row.institutionName }}
+
+
{{ scope.row.institutionName.substring(0, 15) }}...
+
+
- {{scope.row.NameList}}
+ {{ scope.row.NameList }}
- {{scope.row.NameList}}
+ {{ scope.row.NameList }}
-
{{scope.row.NameList.substring(0,15)}}...
+
{{ scope.row.NameList.substring(0, 15) }}...
@@ -140,9 +140,15 @@
- 启用
- 禁用
- 配置岗位
+
+ 启用
+
+
+ 禁用
+
+
+ 配置岗位
+
@@ -155,35 +161,57 @@
导入中...
+
+
+
+
+
+ 查询
+
+
+
+ 清空
+
+
+
+ ref="tree2"
+ node-key="id"
+ class="filter-tree"
+ style="height: 100%; overflow: auto;"
+ v-if="modalPost"
+ :props="props"
+ :data="postList"
+ :filter-node-method="filterNode"
+ :default-checked-keys="nodeList"
+ highlight-current
+ check-strictly
+ default-expand-all
+ :expand-on-click-node="false"
+ show-checkbox>
+
@@ -193,12 +221,12 @@