diff --git a/src/components/comHeader/index.vue b/src/components/comHeader/index.vue
index 015755d84..4204dba45 100644
--- a/src/components/comHeader/index.vue
+++ b/src/components/comHeader/index.vue
@@ -74,10 +74,10 @@ export default {
confirmButtonClass: 'common-button-primary',
roundButton: false
}).then(() => {
- this.$http.post('/logout', {}, res => {
- window.location.href = 'http://testsso1.foton.com.cn/oauth2.0/authorize?client_id=app_slrs&redirect_uri=http://127.0.0.1:9090&response_type=code'
- })
- return
+ // this.$http.post('/logout', {}, res => {
+ // window.location.href = 'http://testsso1.foton.com.cn/oauth2.0/authorize?client_id=app_slrs&redirect_uri=http://127.0.0.1:9090&response_type=code'
+ // })
+ // return
this.$store.commit('setTypeFlag', 'loginOut')
this.$http.get('logout', {}, {
_this: this
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
index a1dcfe0a3..311d62d39 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
@@ -52,6 +52,20 @@
placeholder="请选择结束日期">
+
+
+ 选择附件
+
+
+
+
+
+
@@ -254,6 +268,38 @@
@checkedRole="checkedRole"
:nodeList="nodeList"
>
+
+
+
@@ -268,6 +314,10 @@
name: "bzzqyjStep1-1",
data() {
return {
+ addFjList: [],
+ fzShow: false,
+ fzlistModel: false,
+ fjList: [],
commentText: '',
textarea: '', // 意见
title: '', // 新增抽屉标题
@@ -280,6 +330,10 @@
cid: '', // 编号
endTime: '', // 结束日期
cname: '', // 名称
+ standType: '',
+ standId: '',
+ fjList: [],
+ fjListId: ''
},
formRules: {
cid: [
@@ -291,6 +345,9 @@
cname: [
{ required: true, message: '请输入标准名称', trigger: 'change' },
],
+ fjListId: [
+ { required: true, message: '请选择附件', trigger: 'change' },
+ ]
},
// 标准征求意见数据可库
standCommonlySearch: {
@@ -361,6 +418,40 @@
}
},
methods: {
+ updataFj (item) {
+ let id
+ let type = item.fileName.split('.')
+ if (type[1] === 'pdf') {
+ id = item.attId
+ } else {
+ id = item.oriAttId
+ }
+ window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
+ },
+ addfjList () {
+ this.$http.get('lawss/sarStandFile/queryFileInfo', {
+ standId: this.form.standId
+ }, {}, res => {
+ this.fjList = res.data
+ })
+ this.fzlistModel = true
+ },
+ handleSelection2 (data) {
+ this.addFjList = data
+ },
+ closeDrawer2 () {
+ this.fzlistModel = false
+ this.addFjList = []
+ },
+ enterDrawer2 () {
+ this.fzlistModel = false
+ this.form.fjList = this.addFjList
+ let idList
+ this.addFjList.forEach( item => {
+ idList += item.id + ','
+ })
+ this.form.fjListId = idList
+ },
// 点击查看
handlePreview (item) {
let pageType
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue
index ee4045a82..066791139 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue
@@ -48,6 +48,15 @@
placeholder="请选择结束日期">
+
+
+
+
@@ -252,6 +261,16 @@ export default {
ProcessTitle
},
methods: {
+ updataFj (item) {
+ let id
+ let type = item.fileName.split('.')
+ if (type[1] === 'pdf') {
+ id = item.attId
+ } else {
+ id = item.oriAttId
+ }
+ window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
+ },
getHistoryData () {
this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.$route.query.prcNum,
@@ -324,6 +343,8 @@ export default {
this.form.cid = data.cid
this.form.endTime = data.endTime
this.form.cname = data.cname
+ this.form.fjList = data.fjList
+ this.form.fjListId = data.fjListId
var arr = []
data.summaryList.forEach( item => {
if (item.state != '3') {
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
index bd8699ea8..5ea4fe86e 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
@@ -57,7 +57,11 @@
选择附件
-
+
+
@@ -329,7 +333,8 @@ export default {
cname: '', // 名称
standType: '',
standId: '',
- fjList: []
+ fjList: [],
+ fjListId: ''
},
formRules: {
cid: [
@@ -341,6 +346,9 @@ export default {
cname: [
{ required: true, message: '请输入标准名称', trigger: 'change' },
],
+ fjListId: [
+ { required: true, message: '请选择附件', trigger: 'change' },
+ ]
},
// 标准征求意见数据可库
standCommonlySearch: {
@@ -411,7 +419,16 @@ export default {
}
},
methods: {
- updataFj (item) {},
+ updataFj (item) {
+ let id
+ let type = item.fileName.split('.')
+ if (type[1] === 'pdf') {
+ id = item.attId
+ } else {
+ id = item.oriAttId
+ }
+ window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
+ },
addfjList () {
this.$http.get('lawss/sarStandFile/queryFileInfo', {
standId: this.form.standId
@@ -421,7 +438,6 @@ export default {
this.fzlistModel = true
},
handleSelection2 (data) {
- console.log(data);
this.addFjList = data
},
closeDrawer2 () {
@@ -431,6 +447,11 @@ export default {
enterDrawer2 () {
this.fzlistModel = false
this.form.fjList = this.addFjList
+ let idList
+ this.addFjList.forEach( item => {
+ idList += item.id + ','
+ })
+ this.form.fjListId = idList
},
// 点击查看
handlePreview (item) {
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
index 313e30fb3..b0c3ffbd5 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
@@ -48,6 +48,15 @@
placeholder="请选择结束日期">
+
+
+
+
{
- let data = JSON.parse(res.mesg);
- if (data.form === undefined) {
- this.form.cid = data.cid;
- this.form.endTime = data.endTime;
- this.form.cname = data.cname;
- this.json = data;
- } else {
- this.form = data.form
- this.form.cid = data.form.cid;
- this.form.endTime = data.form.endTime;
- this.form.cname = data.form.cname;
- this.json = data.form;
- }
-
+ let data = JSON.parse(res.mesg)
+ this.form.cid = data.cid
+ this.form.endTime = data.endTime
+ this.form.cname = data.cname
+ this.form.fjList = data.fjList
+ this.form.fjListId = data.fjListId
+ this.json = data
}).catch(e => {
});
});
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
index 43822317f..d134c589b 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
@@ -48,6 +48,15 @@
placeholder="请选择结束日期">
+
+
+
+
@@ -208,7 +217,6 @@
{
let data = JSON.parse(res.mesg)
+ this.form.fjList = data.fjList || data.form.fjList
+ this.form.fjListId = data.fjListId || data.form.fjListId
this.form.cid = data.cid || data.form.cid
this.form.endTime = data.endTime || data.form.endTime
this.form.cname = data.cname || data.form.cname
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
index 8f2419ce2..3b464f68c 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
@@ -48,6 +48,15 @@
placeholder="请选择结束日期">
+
+
+
+
@@ -231,6 +240,8 @@
cid: '', // 编号
endTime: '', // 结束日期
cname: '', // 名称
+ fjList: [],
+ fjListId: '',
},
formRules: {
responUserList: [
@@ -246,6 +257,16 @@
ProcessTitle
},
methods: {
+ updataFj (item) {
+ let id
+ let type = item.fileName.split('.')
+ if (type[1] === 'pdf') {
+ id = item.attId
+ } else {
+ id = item.oriAttId
+ }
+ window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
+ },
getHistoryData () {
this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.$route.query.prcNum,
@@ -301,6 +322,8 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
+ this.form.fjList = data.fjList || data.form.fjList
+ this.form.fjListId = data.fjListId || data.form.fjListId
this.form.cid = data.cid || data.form.cid
this.form.endTime = data.endTime || data.form.endTime
this.form.cname = data.cname || data.form.cname
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
index cc5a6fc4f..c7688ae01 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
@@ -48,6 +48,15 @@
placeholder="请选择结束日期">
+
+
+
+
@@ -226,7 +235,6 @@
{
let data = JSON.parse(res.mesg);
- console.log(data);
+ this.form.fjList = data.fjList || data.form.fjList
+ this.form.fjListId = data.fjListId || data.form.fjListId
this.form.cid = data.cid || data.form.cid;
this.form.endTime = data.endTime || data.form.endTime;
this.form.cname = data.cname || data.form.cname;
- if (data.summaryList === undefined && data.info === undefined) {
- this.oldData = JSON.parse(JSON.stringify(data.form));
- this.data = data.form.data;
- }
- if (data.summaryList.length !== 0) {
- this.oldData = JSON.parse(JSON.stringify(data.summaryList));
- }
- if (data.info.length !== 0) {
- this.oldData = JSON.parse(JSON.stringify(data.info));
- }
+ this.oldData = JSON.parse(JSON.stringify(data.summaryList))
data.summaryList.forEach(item => {
if (item.state) {
} else {
@@ -397,19 +409,8 @@ export default {
}
item.type = false;
});
- data.info.forEach(item => {
- if (item.state) {
- } else {
- item.state = "1";
- }
- item.type = false;
- });
this.json = data;
- if (data.summaryList.length === 0) {
- this.data = data.info;
- } else {
- this.data = data.summaryList;
- }
+ this.data = data.summaryList
if (data.introduce) {
} else {
this.$http.get("slrs/sar-public-idea-all/getPublicIdea", {
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
index b559eec49..bc6e8f871 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
@@ -48,6 +48,15 @@
placeholder="请选择结束日期">
+
+
+
+
@@ -253,7 +262,9 @@ export default {
form: {
cid: "", // 编号
endTime: "", // 结束日期
- cname: "" // 名称
+ cname: "", // 名称
+ fjList: [],
+ fjListId: '',
},
formRules: {
responUserList: [
@@ -269,6 +280,16 @@ export default {
ProcessTitle
},
methods: {
+ updataFj (item) {
+ let id
+ let type = item.fileName.split('.')
+ if (type[1] === 'pdf') {
+ id = item.attId
+ } else {
+ id = item.oriAttId
+ }
+ window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
+ },
getHistoryData() {
this.$http.get("lawss/activiti/get_list_by_instance", {
prcNum: this.$route.query.prcNum
@@ -366,34 +387,20 @@ export default {
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg);
- console.log(data);
- if (data.oldinfo === undefined) {
- this.form.cid = data.cid;
- this.form.endTime = data.endTime;
- this.form.cname = data.cname;
- var arr = [];
- data.summaryList.forEach(item => {
- if (item.state != "3") {
- arr.push(item);
- }
- });
- this.json = data;
- this.data = arr;
- this.oldData = data.oldinfo;
- } else {
- this.form.cid = data.oldinfo.cid;
- this.form.endTime = data.oldinfo.endTime;
- this.form.cname = data.oldinfo.cname;
- var arr = [];
- data.oldinfo.data.forEach(item => {
- if (item.state != "3") {
- arr.push(item);
- }
- });
- this.json = data;
- this.data = arr;
- this.oldData = data.oldinfo;
- }
+ this.form.cid = data.cid
+ this.form.endTime = data.endTime
+ this.form.cname = data.cname
+ this.form.fjList = data.fjList
+ this.form.fjListId = data.fjListId
+ var arr = []
+ data.summaryList.forEach( item => {
+ if (item.state != '3') {
+ arr.push(item)
+ }
+ })
+ this.json = data
+ this.data = arr
+ this.oldData = data.oldinfo
}).catch(e => {
});
});
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
index dfadeae1d..2d116fc5f 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
@@ -48,6 +48,15 @@
placeholder="请选择结束日期">
+
+
+
+
@@ -249,6 +258,8 @@
cid: '', // 编号
endTime: '', // 结束日期
cname: '', // 名称
+ fjList: [],
+ fjListId: '',
},
formRules: {
responUserList: [
@@ -264,6 +275,16 @@
ProcessTitle
},
methods: {
+ updataFj (item) {
+ let id
+ let type = item.fileName.split('.')
+ if (type[1] === 'pdf') {
+ id = item.attId
+ } else {
+ id = item.oriAttId
+ }
+ window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
+ },
getHistoryData () {
this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.$route.query.prcNum,
@@ -355,34 +376,19 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
- if (data.oldinfo === undefined) {
- this.form.cid = data.cid;
- this.form.endTime = data.endTime;
- this.form.cname = data.cname;
- var arr = [];
- data.summaryList.forEach(item => {
- if (item.state != "3") {
- arr.push(item);
- }
- });
- this.json = data;
- this.data = arr;
- this.oldData = data.oldinfo;
- } else {
- this.form.cid = data.oldinfo.cid;
- this.form.endTime = data.oldinfo.endTime;
- this.form.cname = data.oldinfo.cname;
- var arr = [];
- data.oldinfo.data.forEach(item => {
- if (item.state != "3") {
- arr.push(item);
- }
- });
- this.json = data;
- this.data = arr;
- this.oldData = data.oldinfo;
- }
-
+ this.form.cid = data.cid
+ this.form.endTime = data.endTime
+ this.form.cname = data.cname
+ this.form.fjList = data.fjList
+ this.form.fjListId = data.fjListId
+ var arr = []
+ data.summaryList.forEach( item => {
+ if (item.state != '3') {
+ arr.push(item)
+ }
+ })
+ this.json = data
+ this.data = arr
}).catch(e => {
})
})
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
index 8cc1a33ff..75efde0eb 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
@@ -48,6 +48,15 @@
placeholder="请选择结束日期">
+
+
+
+
@@ -249,6 +258,8 @@
cid: '', // 编号
endTime: '', // 结束日期
cname: '', // 名称
+ fjList: [],
+ fjListId: '',
},
formRules: {
responUserList: [
@@ -264,6 +275,16 @@
ProcessTitle
},
methods: {
+ updataFj (item) {
+ let id
+ let type = item.fileName.split('.')
+ if (type[1] === 'pdf') {
+ id = item.attId
+ } else {
+ id = item.oriAttId
+ }
+ window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
+ },
getHistoryData () {
this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.$route.query.prcNum,
@@ -355,33 +376,20 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
- if (data.oldinfo === undefined) {
- this.form.cid = data.cid;
- this.form.endTime = data.endTime;
- this.form.cname = data.cname;
- var arr = [];
- data.summaryList.forEach(item => {
- if (item.state != "3") {
- arr.push(item);
- }
- });
- this.json = data;
- this.data = arr;
- this.oldData = data.oldinfo;
- } else {
- this.form.cid = data.oldinfo.cid;
- this.form.endTime = data.oldinfo.endTime;
- this.form.cname = data.oldinfo.cname;
- var arr = [];
- data.oldinfo.data.forEach(item => {
- if (item.state != "3") {
- arr.push(item);
- }
- });
- this.json = data;
- this.data = arr;
- this.oldData = data.oldinfo;
- }
+ this.form.cid = data.cid
+ this.form.endTime = data.endTime
+ this.form.cname = data.cname
+ this.form.fjList = data.fjList
+ this.form.fjListId = data.fjListId
+ var arr = []
+ data.summaryList.forEach( item => {
+ if (item.state != '3') {
+ arr.push(item)
+ }
+ })
+ this.json = data
+ this.data = arr
+ this.oldData = data.oldinfo
}).catch(e => {
})
})
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
index 4703b35e0..2fb277a75 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
@@ -48,6 +48,15 @@
placeholder="请选择结束日期">
+
+
+
+
@@ -250,7 +259,9 @@ export default {
form: {
cid: "", // 编号
endTime: "", // 结束日期
- cname: "" // 名称
+ cname: "", // 名称
+ fjList: [],
+ fjListId: '',
},
formRules: {
responUserList: [
@@ -266,6 +277,16 @@ export default {
ProcessTitle
},
methods: {
+ updataFj (item) {
+ let id
+ let type = item.fileName.split('.')
+ if (type[1] === 'pdf') {
+ id = item.attId
+ } else {
+ id = item.oriAttId
+ }
+ window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
+ },
getHistoryData() {
this.$http.get("lawss/activiti/get_list_by_instance", {
prcNum: this.$route.query.prcNum
@@ -359,34 +380,21 @@ export default {
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
- let data = JSON.parse(res.mesg);
- if (data.oldinfo === undefined) {
- this.form.cid = data.cid;
- this.form.endTime = data.endTime;
- this.form.cname = data.cname;
- var arr = [];
- data.summaryList.forEach(item => {
- if (item.state != "3") {
- arr.push(item);
- }
- });
- this.json = data;
- this.data = arr;
- this.oldData = data.oldinfo;
- } else {
- this.form.cid = data.oldinfo.cid;
- this.form.endTime = data.oldinfo.endTime;
- this.form.cname = data.oldinfo.cname;
- var arr = [];
- data.oldinfo.data.forEach(item => {
- if (item.state != "3") {
- arr.push(item);
- }
- });
- this.json = data;
- this.data = arr;
- this.oldData = data.oldinfo;
- }
+ let data = JSON.parse(res.mesg)
+ this.form.cid = data.cid
+ this.form.endTime = data.endTime
+ this.form.cname = data.cname
+ this.form.fjList = data.fjList
+ this.form.fjListId = data.fjListId
+ var arr = []
+ data.summaryList.forEach( item => {
+ if (item.state != '3') {
+ arr.push(item)
+ }
+ })
+ this.json = data
+ this.data = arr
+ this.oldData = data.oldinfo
}).catch(e => {
});
});