diff --git a/src/components/roleTree/index.vue b/src/components/roleTree/index.vue
index 951b77249..e6a1e0880 100644
--- a/src/components/roleTree/index.vue
+++ b/src/components/roleTree/index.vue
@@ -308,7 +308,8 @@
}
})
this.$http.get('SarInstitution/institution/getNextById', {
- ids: ids
+ ids: ids,
+ topNum: 3,
}, {
_this: this
}, res => {
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue
index 4afbccc7f..84aa9df3e 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue
@@ -63,6 +63,38 @@
- -
+
+
+
+ {{ item.name }}
+
+
+
+ - -
+
+
+
+
+
+ {{ item.name }}
+
+
+
+ - -
+
+
@@ -263,7 +295,9 @@
date: '', // 完成时间
hzfileId: '',
hzfileName: '',
- textpz: ''
+ textpz: '',
+ modelList:[],
+ fjList: []
},
formRules: {
textpz: [
@@ -285,6 +319,10 @@
const attId = file
this.$preview(attId)
},
+ clickButtonToUpload(file) {
+ const attId = file.attId
+ this.$preview(attId)
+ },
handleTransfer() {
this.drawerModal = true
},
@@ -331,6 +369,10 @@
updateFile (fileId) {
window.location.href = '/api/att/attFile/downloadFile?fileId=' + fileId
},
+ updateFile2 (item) {
+ let id = item.id
+ window.location.href = '/api/att/attFile/downloadFile?fileId=' + id
+ },
// 导入按钮 上传之前的钩子
beginImportFile (file) {
var filename = file.name
@@ -428,6 +470,7 @@
this.form.hzfileId = data.hzfileId || data.form.hzfileId
this.form.hzfileName = data.hzfileName || data.form.hzfileName
this.commentText9 = data.commentText9 || ''
+ this.form.modelList = data.form ? data.form.modelList : data.modelList
}).catch(e => {
})
})
diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue
index 8069a53e0..7778e27b6 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue
@@ -321,8 +321,8 @@ export default {
this.formKey++
}
if(data && data.length > 0){
- const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
- const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
+ const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
+ const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
this.qbfsForm.QCDWID = institutionIdList
this.qbfsForm.QCDW = institutionNameList
}
diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/stepC4.vue b/src/pages/processCenter/pages/creatProcess/qbfs/stepC4.vue
index 9bad3576c..567354376 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfs/stepC4.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfs/stepC4.vue
@@ -316,12 +316,12 @@ export default {
this.qbfsForm.QCRBUSS=nameList;
this.formKey++
}
- if(data !== undefined && data && data.length > 0){
- const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
- const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
- this.qbfsForm.QCDWID = institutionIdList
- this.qbfsForm.QCDW = institutionNameList
- }
+ if(data && data.length > 0){
+ const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
+ const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
+ this.qbfsForm.QCDWID = institutionIdList
+ this.qbfsForm.QCDW = institutionNameList
+ }
this.modalShowRoleFlag = false
},
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
index 8cdd2205c..ab0ff19ee 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
@@ -1868,11 +1868,13 @@
}
if(data && data.length > 0){
- const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
- const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
+ const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
+ const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
this.form.QCDWID = institutionIdList
this.form.QCDW = institutionNameList
}
+
+ this.modalShowRoleFlag = false
},
checkedRole (data) {
if (this.type === 0) {
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
index 028384d5e..0e9745896 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
@@ -1340,7 +1340,24 @@
}else if(this.userType === 'hqUserId'){
this.roleForm.hqUserId=idList;
this.roleForm.hqUserName=nameList;
+ }else if(this.userType === 'QCRBUSS'){
+ this.form.QCRBUSSID=idList;
+ this.form.QCRBUSS=nameList;
+ this.formKey++
}
+
+ if(data && data.length > 0){
+ const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
+ const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
+ this.form.QCDWID = institutionIdList
+ this.form.QCDW = institutionNameList
+ }
+
+ this.modalShowRoleFlag = false
+ },
+ unique(newArr) {
+ const res = new Map();
+ return newArr.filter((newArr) => !res.has(newArr) && res.set(newArr, 1));
},
checkedRole (data) {
if (this.type === 0) {
@@ -2459,8 +2476,6 @@
this.form.reviseStatus = 'buss2_'+this.form.standStatus
this.form.textStatusBuss = '6jnqba2mby'
const json = JSON.stringify(this.form);
- this.processCreateBuss(json)
-return
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds,
userId : this.userId,
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue
index 7a3eb350e..afa08139b 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue
@@ -1397,11 +1397,13 @@
}
if(data && data.length > 0){
- const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
- const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
+ const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
+ const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
this.form.QCDWID = institutionIdList
this.form.QCDW = institutionNameList
}
+
+ this.modalShowRoleFlag = false
},
unique(newArr) {
const res = new Map();
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
index 70834da99..6d08b7c77 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
@@ -1485,11 +1485,13 @@
}
if(data && data.length > 0){
- const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
- const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
+ const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
+ const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
this.form.QCDWID = institutionIdList
this.form.QCDW = institutionNameList
}
+
+ this.modalShowRoleFlag = false
},
unique(newArr) {
const res = new Map();
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
index 5ec58d3af..12889b35d 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
@@ -1398,11 +1398,13 @@
}
if(data && data.length > 0){
- const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
- const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
+ const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
+ const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
this.form.QCDWID = institutionIdList
this.form.QCDW = institutionNameList
}
+
+ this.modalShowRoleFlag = false
},
unique(newArr) {
const res = new Map();
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue
index 882b4b85a..037674c80 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue
@@ -1495,11 +1495,13 @@
}
if(data && data.length > 0){
- const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
- const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
+ const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
+ const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
this.form.QCDWID = institutionIdList
this.form.QCDW = institutionNameList
}
+
+ this.modalShowRoleFlag = false
},
unique(newArr) {
const res = new Map();
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
index 531523a04..43a95ddc1 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
@@ -1790,9 +1790,10 @@
this.roleForm.bzUserName = nameList
}
- if(data !== undefined && data && data.length > 0){
- const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
- const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
+ if(data && data.length > 0){
+ console.log(data)
+ const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
+ const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
this.form.QCDWID = institutionIdList
this.form.QCDW = institutionNameList
}
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
index b84238721..b3ad5f10f 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
@@ -1378,7 +1378,23 @@
}else if(this.userType === 'hqUserId'){
this.roleForm.hqUserId=idList;
this.roleForm.hqUserName=nameList;
+ }else if(this.userType === 'QCRBUSS'){
+ this.form.QCRBUSSID=idList;
+ this.form.QCRBUSS=nameList;
+ this.formKey++
}
+ if(data !== undefined && data && data.length > 0){
+ const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
+ const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
+ this.form.QCDWID = institutionIdList
+ this.form.QCDW = institutionNameList
+ }
+
+ this.modalShowRoleFlag = false
+ },
+ unique(newArr) {
+ const res = new Map();
+ return newArr.filter((newArr) => !res.has(newArr) && res.set(newArr, 1));
},
checkedRole (data) {
if (this.type === 0) {
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
index 7f1b07def..1a3857e00 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
@@ -1433,8 +1433,8 @@
this.formKey++
}
if(data !== undefined && data && data.length > 0){
- const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
- const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
+ const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
+ const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
this.form.QCDWID = institutionIdList
this.form.QCDW = institutionNameList
}
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
index d6f4c86a0..30fa57398 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
@@ -1768,8 +1768,8 @@
this.formKey++
}
if(data !== undefined && data && data.length > 0){
- const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
- const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
+ const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
+ const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
this.form.QCDWID = institutionIdList
this.form.QCDW = institutionNameList
}
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue
index a355675ef..f81cc7ba9 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue
@@ -1640,6 +1640,18 @@
this.roleForm.bzUserId = idList
this.roleForm.bzUserName = nameList
}
+ if(data && data.length > 0){
+ console.log(data)
+ const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
+ const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
+ this.form.QCDWID = institutionIdList
+ this.form.QCDW = institutionNameList
+ }
+ this.modalShowRoleFlag = false
+ },
+ unique(newArr) {
+ const res = new Map();
+ return newArr.filter((newArr) => !res.has(newArr) && res.set(newArr, 1));
},
checkedRole (data) {
if (this.type === 0) {
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue
index d0440fca4..d215e44f0 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue
@@ -1421,8 +1421,8 @@
this.formKey++
}
if(data !== undefined && data && data.length > 0){
- const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
- const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
+ const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
+ const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
this.form.QCDWID = institutionIdList
this.form.QCDW = institutionNameList
}
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
index e9b7cc330..3bf2284f8 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
@@ -1767,8 +1767,8 @@
this.formKey++
}
if(data !== undefined && data && data.length > 0){
- const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
- const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
+ const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
+ const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
this.form.QCDWID = institutionIdList
this.form.QCDW = institutionNameList
}
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
index f33243c47..6f3786354 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
@@ -856,8 +856,8 @@ export default {
let idList = "", nameList = ""
let unitList = "", unitNameList = ""
data.forEach(item => {
- unList.push(item.institutionName)
- uidList.push(item.institutionId)
+ unList.push(item.topUnit)
+ uidList.push(item.topUnitId)
if (nameList.length) {
nameList += ",";
idList += ",";
@@ -866,8 +866,8 @@ export default {
}
idList += item.id;
nameList += item.name;
- unitList += item.institutionId
- unitNameList += item.institutionName
+ unitList += item.topUnit
+ unitNameList += item.topUnitId
});
let unNameList = []
let unIdList = []
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
index b807dce55..b8f46ee97 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
@@ -717,8 +717,8 @@ export default {
}
idList += item.id;
nameList += item.name;
- unitList += item.institutionId
- unitNameList += item.institutionName
+ unitList += item.topUnitId
+ unitNameList += item.topUnit
});
if(this.roleType === '1'){
this.$set(this.addQblxData, 'drafter', idList)
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue
index b21ed321d..79b565e5b 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue
@@ -1254,8 +1254,8 @@ export default {
}
idList += item.id;
nameList += item.name;
- unitList += item.institutionId
- unitNameList += item.institutionName
+ unitList += item.topUnitId
+ unitNameList += item.topUnit
});
if(this.roleType === '1'){
this.$set(this.qbfsForm, 'drafter', idList)
diff --git a/src/pages/processCenter/pages/phone/bzdy/step2.vue b/src/pages/processCenter/pages/phone/bzdy/step2.vue
index d3882d6dc..405de4a03 100644
--- a/src/pages/processCenter/pages/phone/bzdy/step2.vue
+++ b/src/pages/processCenter/pages/phone/bzdy/step2.vue
@@ -108,6 +108,7 @@
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
import {inboundLiaisonDetail,processCreateStand,saveTaskForPub,changeAssigneeNew} from 'api/process'
+ import hwh5 from '@/api/hwh5-cloudonline.js'
import axios from "axios";
export default {
@@ -170,6 +171,7 @@
this.drawerModal = false
this.$message.success('调整成功')
this.processNum()
+ hwh5.close()
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
} else {
this.$message.warning(res.message)
@@ -258,6 +260,7 @@
}, {}, res => {
if (res.success) {
this.$message.success('提交成功')
+ hwh5.close()
this.$router.push('/processCenter')
}
this.isSubmit = false
diff --git a/src/pages/processCenter/pages/phone/bzpg/step6.vue b/src/pages/processCenter/pages/phone/bzpg/step6.vue
index 47aad5c0b..57246fc43 100644
--- a/src/pages/processCenter/pages/phone/bzpg/step6.vue
+++ b/src/pages/processCenter/pages/phone/bzpg/step6.vue
@@ -2,7 +2,7 @@