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/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index ad3d8ac6a..8a4d22587 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -288,7 +288,7 @@ v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'" /> - OCR + 上传时间：{{ dateFormat(file.modifyTime) }} @@ -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="请选择结束日期"> + + +
+
{{ item.fileName }}
+
+ @@ -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 @@ 选择附件 - + +
{{ item.fileName }}
@@ -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="请选择结束日期"> + + +
+
{{ item.fileName }}
+
+ { 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="请选择结束日期"> + + +
+
{{ item.fileName }}
+
+ @@ -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="请选择结束日期"> + + +
+
{{ item.fileName }}
+
+ @@ -226,7 +235,6 @@ { }); }); 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="请选择结束日期"> + + +
+
{{ item.fileName }}
+
+ @@ -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="请选择结束日期"> + + +
+
{{ item.fileName }}
+
+ @@ -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="请选择结束日期"> + + +
+
{{ item.fileName }}
+
+ @@ -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 => { }); }); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue index 7ad7547ab..78963c902 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue @@ -226,7 +226,7 @@
+ @click.native="choiceZRR('statuteMinister', '选择标准法规部部长', roleForm.statuteMinister)">
@@ -533,6 +533,13 @@ export default { }, //项目的多选框改变 selectListChange(data) { + // 单选 + if (data.length > 1) { + this.$refs.selection.clearSelection() + this.$refs.selection.toggleRowSelection(data.pop()) + } + this.multipleSelection = data + this.selectedList = data; }, pageChange(page) { diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue index 0a35e1982..3c394b217 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue @@ -592,10 +592,24 @@ export default { }, //清单勾选框数据 selectListChange(data) { + // 单选 + if (data.length > 1) { + this.$refs.selection.clearSelection() + this.$refs.selection.toggleRowSelection(data.pop()) + } + this.multipleSelection = data + this.selectedList = data; }, //项目勾选框数据 selectProjectChange(data) { + // 单选 + if (data.length > 1) { + this.$refs.selection.clearSelection() + this.$refs.selection.toggleRowSelection(data.pop()) + } + this.multipleSelection = data + this.selectProject = data; }, //提交事件 diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-2.vue index 4529bca2e..fb27029e4 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-2.vue @@ -325,7 +325,7 @@ export default { let routeUrl = this.$router.resolve({ name: "OtherStandardDetails", params: { - id: item.standId, + id: item.id, pageType: "INLAND_STAND" } }); diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue index 9121f3ef6..d6786ff8b 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue @@ -493,7 +493,7 @@ export default { let routeUrl = this.$router.resolve({ name: "OtherStandardDetails", params: { - id: item.standId, + id: item.id, pageType: "INLAND_STAND" } }); @@ -671,11 +671,11 @@ export default { } this.standardData = res.data.records; this.standardData.forEach(item => { - if (item.zccssrqgj === "-") { + if (item.zccssrqgj === "-" || item.zccssrqgj === 'null' || item.zccssrqgj === 'undefined') { item.zccssrqgj = ""; } - if (item.xcxssrqgj === "-") { - item.xcxssrq = ""; + if (item.xcxssrqgj === "-" || item.xcxssrqgj === 'null' || item.xcxssrqgj === 'undefined' ) { + item.xcxssrqgj = ""; } }); this.total = res.data.total;