diff --git a/src/components/roleTree/index.vue b/src/components/roleTree/index.vue
index 3b912a230..a9d365639 100644
--- a/src/components/roleTree/index.vue
+++ b/src/components/roleTree/index.vue
@@ -120,6 +120,10 @@
default: () => {
return []
}
+ },
+ type: {
+ type: Number,
+ default: 0
}
},
data () {
diff --git a/src/main.js b/src/main.js
index 1d627a4fd..63dfcd5b5 100644
--- a/src/main.js
+++ b/src/main.js
@@ -113,7 +113,20 @@ router.beforeEach(function (to, from, next) {
/** 判断是不是在手机端操作 */
if (isMobile()) {
if(toName === 'processCenter'){
- hwh5.close();
+ // hwh5.close();
+ //关闭当前窗口
+ let userAgent = navigator.userAgent;
+ if (userAgent.indexOf("Firefox") !== -1 || userAgent.indexOf("Chrome") !==-1) {
+ window.location.href="about:blank";
+ }else if(userAgent.indexOf('Android') > -1 || userAgent.indexOf('Linux') > -1){
+ window.opener=null;window.open('about:blank','_self','').close();
+ }else {
+ window.opener = null;
+ window.open("about:blank", "_self");
+ window.close();
+ }
+ //如果是微信打开，关闭当前微信窗口
+ weixinClosePage()
}else {
if ((token === null || token === '' ) && toName !== 'Login') {
if(toName !== 'phoneIndex'){
@@ -177,7 +190,21 @@ router.beforeEach(function (to, from, next) {
extractedVerify(token)
}
}
-
+ function weixinClosePage() {
+ if (typeof WeixinJSBridge == "undefined") {
+ if (document.addEventListener) {
+ document.addEventListener('WeixinJSBridgeReady', weixin_ClosePage, false);
+ } else if (document.attachEvent) {
+ document.attachEvent('WeixinJSBridgeReady', weixin_ClosePage);
+ document.attachEvent('onWeixinJSBridgeReady', weixin_ClosePage);
+ }
+ } else {
+ weixin_ClosePage();
+ }
+ }
+ function weixin_ClosePage() {
+ WeixinJSBridge.call('closeWindow');
+ }
function extractedVerify() {
if (taskId !== undefined && taskId !== null && prcId !== undefined && prcId !== null) {
get_verify_by_instance({
@@ -187,7 +214,6 @@ router.beforeEach(function (to, from, next) {
let hisCount = res.hisCount === undefined ? 0 : res.hisCount;
let commitStatus = res.commitStatus === undefined ? 0 : res.commitStatus;
let isNotFinished = res.isNotFinished === undefined ? 0 : res.isNotFinished;
-
if ((hisCount && hisCount > 0)) { // 业务系统 当前节点已完成
if(isMobile()){
next('/processedPage')
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
index 89aafdb4f..a867741fe 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
@@ -162,9 +162,11 @@
+ placeholder="查询责任部门"
+ @click.native="choiceZRBM('ZRBMId', '查询责任部门', queryUnqualidiedData.responsibleUnit)">
@@ -317,6 +319,12 @@
:nodeList="nodeList"
@checkedRole="drawerCheck"
/>
+
@@ -339,6 +347,8 @@ export default {
name: "wfhxzgStep1",
data() {
return {
+ modalshowflagZRBM: false,
+ nodeListZRBM: [],
loading: false,
submitFlag: '', //是否是修改节点
commentText: '', // 意见
@@ -404,6 +414,32 @@ export default {
}
},
methods: {
+ drawerCheckZRBM(data) {
+ let idList = ''
+ let nameList = ''
+ data.forEach(item => {
+ // if (item.hasChild === '0') {
+ if (nameList.length > 0) {
+ nameList += ','
+ idList += ','
+ }
+ idList += item.id
+ nameList += item.name
+ // }
+ })
+ if (this.drawerTitle === '责任部门') {
+ this.sarStandardsInfoEO.ZRBMId = idList;
+ this.queryUnqualidiedData.responsibleUnit = nameList;
+ } else if (this.drawerTitle === '查询责任部门') {
+ this.queryUnqualidiedData.responsibleUnit = nameList
+ }
+ },
+ choiceZRBM(type, title, id) {
+ this.nodeListZRBM = []
+ this.nodeListZRBM.push(id)
+ this.drawerTitle = title
+ this.modalshowflagZRBM = true
+ },
getHistoryData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
@@ -808,7 +844,7 @@ export default {