diff --git a/src/App.vue b/src/App.vue index f86104cae..b6aa9b9ea 100644 --- a/src/App.vue +++ b/src/App.vue @@ -216,7 +216,8 @@ export default { && this.$route.name !== 'beeEnergyLogin' && this.$route.name !== 'mdLawLogin' && this.$route.name !== 'nuoBLogin' && this.$route.name !== 'sTLogin' && this.$route.name !== 'StandardSearch' && this.$route.name !== 'phoneIndex' - && this.$route.name !== 'blankPage' && this.$route.name !== 'processedPage' ) { + && this.$route.name !== 'AdvancedSearchExternal' && this.$route.name !== 'LoginVerifyNoEncryption' + && this.$route.name !== 'blankPage' && this.$route.name !== 'processedPage') { this.isBoolean = true } else { this.isBoolean = false diff --git a/src/api/process.js b/src/api/process.js index 3f8b1187b..c1dbff26f 100644 --- a/src/api/process.js +++ b/src/api/process.js @@ -561,6 +561,14 @@ export function loginIdm (data) { }) } +export function checkPageNoEncryption (data) { + return axios({ + url: '/api/checkPageNoEncryption', + method: 'get', + params: data + }) +} + // 流程委托接口 export function changeAssigneeNew (data) { return axios({ diff --git a/src/assets/styles/drawer.less b/src/assets/styles/drawer.less index 49276d4e8..ca01dd517 100644 --- a/src/assets/styles/drawer.less +++ b/src/assets/styles/drawer.less @@ -14,7 +14,7 @@ } .el-drawer__body{ height: 100%; - overflow-y: auto; + //overflow-y: auto; display: flex; flex-direction: column; // 底部带 提交、取消按钮 diff --git a/src/main.js b/src/main.js index b11025743..a2c5adf76 100644 --- a/src/main.js +++ b/src/main.js @@ -65,8 +65,27 @@ import isMobile from "./store/isMobile"; // 路由拦截 router.beforeEach(function (to, from, next) { let toName = to.name + if (toName === 'CheckPage') { + next() + return + } + + let fromName = from.name let token = store.state.token let path = to.path; + let userName = "" + if((fromName === undefined || fromName === null) && (path.indexOf("/standardSearch/All&userName=") !== -1 || (path.indexOf("/standardSearch/All") !== -1 && to.query.userName !== undefined))){ + if((path.indexOf("/standardSearch/All") !== -1 && to.query.userName !== undefined)){ + userName = to.query.userName + }else { + userName = path.split("&")[1].split("=")[1] + } + window.sessionStorage.clear() + }else { + if(fromName === 'Home2'){ + localStorage.removeItem("external") + } + } let requireAuth = to.meta.requireAuth; let taskId = to.query.taskIds; let prcId = to.query.prcId; @@ -106,12 +125,14 @@ router.beforeEach(function (to, from, next) { } function extractedLocalStorage(url,param,param4) { + localStorage.removeItem("external") localStorage.removeItem("routerUrl") localStorage.setItem('routerUrl', url) localStorage.removeItem("routerParam") localStorage.setItem('routerParam', param) } // 返回值为登录状态 + // 单点登录 /** 判断是不是在手机端操作 */ if (isMobile()) { if(toName === 'processCenter'){ @@ -171,13 +192,23 @@ router.beforeEach(function (to, from, next) { if (taskId !== undefined && taskId !== null && prcId !== undefined && prcId !== null) { extractedVerify(token) }else { - if(path === '/standardSearch/All'){ - extractedLocalStorage('standardSearch/All',''); + if((fromName === undefined || fromName === null) && (path.indexOf("/standardSearch/All&userName") !== -1 || (path.indexOf("/standardSearch/All") !== -1 && userName !== undefined))){ + extractedLocalStorage("standardSearch/All",userName) + localStorage.setItem('external', "external") + next('/LoginVerifyNoEncryption') }else { - extractedLocalStorage('home2',''); + if (toName === 'LoginVerifyNoEncryption') { + next() + }else { + if(path === '/standardSearch/All'){ + extractedLocalStorage('standardSearch/All',''); + }else { + extractedLocalStorage('home2',''); + } + // ssoLoginUrlDev 默认sso 地址 + window.location.href = ssoLoginUrlDev + } } - // ssoLoginUrlDev 默认sso 地址 - window.location.href = ssoLoginUrlDev } } }else if(webLoginType != null && webLoginType === 'dev'){ @@ -360,7 +391,13 @@ router.beforeEach(function (to, from, next) { next() } }else { - next() + if((fromName === undefined || fromName === null) && (path.indexOf("/standardSearch/All&userName") !== -1 || (path.indexOf("/standardSearch/All") !== -1 && userName !== undefined))) { + extractedLocalStorage("standardSearch/All",userName) + localStorage.setItem('external', "external") + next('/LoginVerifyNoEncryption') + }else { + next() + } } } }) diff --git a/src/pages/details/otherLawsStandDetails/index.vue b/src/pages/details/otherLawsStandDetails/index.vue index 4c3b9b96d..b83f9b801 100644 --- a/src/pages/details/otherLawsStandDetails/index.vue +++ b/src/pages/details/otherLawsStandDetails/index.vue @@ -1679,6 +1679,8 @@ export default { } }) window.open(routeUrl.href, '_blank') + }else { + this.$message.error('政策号已不存在!') } }, e => { }) diff --git a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue index 96974ace8..90abff80d 100644 --- a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue +++ b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue @@ -1508,7 +1508,7 @@ export default { }, res => { if (res.data) { this.batchDeleteItem() - } else if(this.selectedList != null){ + } else if(this.selectedList === null){ this.$message.warning('请选择要删除的数据') } else { this.deleteItemsModal = true diff --git a/src/pages/localTool/standContrast/pages/textComparison.vue b/src/pages/localTool/standContrast/pages/textComparison.vue index dec89accd..2e0f16abc 100644 --- a/src/pages/localTool/standContrast/pages/textComparison.vue +++ b/src/pages/localTool/standContrast/pages/textComparison.vue @@ -163,30 +163,34 @@ export default { this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, { _this: this }, res => { - this.oldLeftId = '#left_' + this.saveItemId - this.oldRightId = '#right_' + this.saveItemIdRight - this.oldLeftContent = $('#itemsLeftText_' + this.saveItemId).html() - this.oldRightContent = $('#itemsRightText_' + this.saveItemIdRight).html() - $('#itemsLeftText_' + this.saveItemId).html(res.data.leftString) - $('#itemsRightText_' + this.saveItemIdRight).html(res.data.rightString) - this.text = res.data.similarityDegree - if (parseFloat(res.data.similarityDegree) >= parseFloat('75%') && parseFloat(res.data.similarityDegree) !== parseFloat('100%')) { - this.textcontent = '相似' - } else if (parseFloat(res.data.similarityDegree) === parseFloat('100%')) { - this.textcontent = '相同' - } else if (parseFloat(res.data.similarityDegree) < parseFloat('75%')) { - this.textcontent = '不相似' - } - const treeNodeLeft = {} + if(res.data.error === '比对数据已删除'){ + this.spinShow = false + this.$message.error('比对数据已删除') + return + }else { + this.oldLeftId = '#left_' + this.saveItemId + this.oldRightId = '#right_' + this.saveItemIdRight + this.oldLeftContent = $('#itemsLeftText_' + this.saveItemId).html() + this.oldRightContent = $('#itemsRightText_' + this.saveItemIdRight).html() + $('#itemsLeftText_' + this.saveItemId).html(res.data.leftString) + $('#itemsRightText_' + this.saveItemIdRight).html(res.data.rightString) + this.text = res.data.similarityDegree + if (parseFloat(res.data.similarityDegree) >= parseFloat('75%') && parseFloat(res.data.similarityDegree) !== parseFloat('100%')) { + this.textcontent = '相似' + } else if (parseFloat(res.data.similarityDegree) === parseFloat('100%')) { + this.textcontent = '相同' + } else if (parseFloat(res.data.similarityDegree) < parseFloat('75%')) { + this.textcontent = '不相似' + } + const treeNodeLeft = {} treeNodeLeft.id = this.saveLeftId - const treeNodeRight = {} + const treeNodeRight = {} treeNodeRight.id = this.saveRightId - console.log(treeNodeLeft) - console.log(treeNodeRight) - this.handleLeftTreeClick("domesticTree1",treeNodeLeft) - this.handleRightTreeClick("domesticTree2",treeNodeRight) - // this.resultModal = true - this.spinShow = false + this.handleLeftTreeClick("domesticTree1",treeNodeLeft) + this.handleRightTreeClick("domesticTree2",treeNodeRight) + // this.resultModal = true + this.spinShow = false + } }, e => { }) }, diff --git a/src/pages/login/checkPage.vue b/src/pages/login/checkPage.vue index 344b231c9..4452395a0 100644 --- a/src/pages/login/checkPage.vue +++ b/src/pages/login/checkPage.vue @@ -26,9 +26,9 @@ export default { }, mounted() { let Base64 = require('js-base64').Base64 - const str = Base64.encode(this.$route.query.username) + const str = Base64.encode(this.$route.query.userName) const params = { - username: this.$route.query.username + username: this.$route.query.userName } checkPage(params).then(res => { if (res.ok) { @@ -40,10 +40,10 @@ export default { this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭 this.loading.close(); }); - this.$router.go(-1) + this.$router.push('login') this.$message.error(res.message) } else { - this.$router.go(-1) + this.$router.push('login') this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭 this.loading.close(); }); diff --git a/src/pages/loginVerifyNoEncryption/index.vue b/src/pages/loginVerifyNoEncryption/index.vue new file mode 100644 index 000000000..98db12ca3 --- /dev/null +++ b/src/pages/loginVerifyNoEncryption/index.vue @@ -0,0 +1,111 @@ + + + + + + diff --git a/src/pages/policyRegulation/problemControl/index.vue b/src/pages/policyRegulation/problemControl/index.vue index 2d0ce2e2c..46e2c122b 100644 --- a/src/pages/policyRegulation/problemControl/index.vue +++ b/src/pages/policyRegulation/problemControl/index.vue @@ -1,14 +1,14 @@ diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue index 2e5b490eb..69420fced 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue @@ -291,61 +291,63 @@ - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + -
- - -
- - -
-
-
-
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue index 90225c661..de60aaac3 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue @@ -674,7 +674,7 @@ export default { this.roleForm = mes.roleForm this.commentText1 = mes.commentText1 || '' if (this.form.standId) { - this.$http.get('SarStandItems/sar-stand-items/getFileType', { + this.$http.get('SarStandItems/sar-stand-items/getFileTypeHG', { standId: this.form.standId }, {}, res => { this.textTypeList = res.data @@ -752,7 +752,7 @@ export default { this.form.standType = bringData[0].standType this.form.standId = bringData[0].id this.listModel = false; - this.$http.get('SarStandItems/sar-stand-items/getFileType', { + this.$http.get('SarStandItems/sar-stand-items/getFileTypeHG', { standId: bringData[0].id }, {}, res => { this.textTypeList = res.data diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue index 18460cb17..a6f6510ba 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue @@ -733,7 +733,7 @@ export default { this.form.standType = bringData[0].standType this.form.standId = bringData[0].id this.listModel = false; - this.$http.get('SarStandItems/sar-stand-items/getFileType', { + this.$http.get('SarStandItems/sar-stand-items/getFileTypeHG', { standId: bringData[0].id }, {}, res => { this.textTypeList = res.data diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue index 2ced168e3..042368745 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue @@ -275,6 +275,7 @@ data() { return { commentText41: '', + onlyKey: '', itermsConditionsFlag: false, itermsConditionsTitle: '', drawerModal: false, @@ -408,6 +409,7 @@ this.isSubmit = true let json = this.json json.info = this.data + json.onlyKey = this.onlyKey json.commentText = this.commentText41 json.bzfgId = this.form.bzfgId json.bzfgName = this.form.bzfgName @@ -432,6 +434,7 @@ if (this.commentText41) { var json = this.json json.spFlag = '1' + json.onlyKey = this.onlyKey json.commentText = this.commentText41 this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), @@ -455,6 +458,7 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) + this.onlyKey = data.form ? data.form.onlyKey :data.onlyKey this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName this.form.fjList = data.fjList || data.form.fjList diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue index dfe399d15..fea0aa562 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue @@ -267,6 +267,7 @@ data() { return { commentText42: '', + onlyKey: '', itermsConditionsFlag: false, itermsConditionsTitle: '', drawerModal: false, @@ -400,6 +401,7 @@ json.info = this.data json.commentText = this.commentText42 json.bzFlag = '0' + json.onlyKey = this.onlyKey this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), taskId: this.taskIds, @@ -416,6 +418,7 @@ if (this.commentText42) { var json = this.json json.bzFlag = '1' + json.onlyKey = this.onlyKey json.commentText = this.commentText42 this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), @@ -440,6 +443,7 @@ }).then(res => { let data = JSON.parse(res.mesg) this.form.fjList = data.fjList || data.form.fjList + this.onlyKey = data.form ? data.form.onlyKey :data.onlyKey this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName this.commentText42 = data.commentText42 || '' diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue index 51c43b171..5dc012984 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue @@ -707,11 +707,6 @@ export default { this.submitShow = true } this.commentText4 = data.commentText4 || '' - if(data.onlyKey){ - this.onlyKey = data.onlyKey - }else{ - this.onlyKey = data.form.onlyKey - } this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName this.form.fjList = data.fjList || data.form.fjList @@ -727,6 +722,11 @@ export default { this.standId = data.standId this.getItemList(data.standId,data.textType) this.data = data.info || data.form.info + if(data.onlyKey){ + this.onlyKey = data.onlyKey + }else{ + this.onlyKey = data.form.onlyKey + } }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue index 94c00c6a9..301facbcf 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue @@ -300,6 +300,7 @@ data() { return { data2: [], + onlyKey: '', commentText6: '', itermsConditionsFlag: false, itermsConditionsTitle: '', @@ -482,6 +483,7 @@ this.isSubmit = true; var json = this.json; json.hqFlag = '0'; + json.onlyKey = this.onlyKey json.commentText = this.commentText6; json.user7 = this.form.user7; json.user7Name = this.form.user7Name; @@ -506,6 +508,7 @@ this.isSubmit = true; var json = this.json; json.hqFlag = '1'; + json.onlyKey = this.onlyKey json.commentText = this.commentText6; this.$http.post("lawss/activiti/completeTask", { json: JSON.stringify(json), @@ -530,6 +533,7 @@ }).then(res => { let data = JSON.parse(res.mesg); this.commentText6 = data.commentText6 || '' + this.onlyKey = data.form ? data.form.onlyKey :data.onlyKey this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName this.form.fjList = data.fjList || data.form.fjList diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue index dbd5afef8..0d6fb63fe 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue @@ -286,6 +286,7 @@ export default { return { data2: [], commentText7: '', + onlyKey: '', itermsConditionsFlag: false, itermsConditionsTitle: '', drawerModal: false, @@ -449,6 +450,7 @@ export default { this.isSubmit = true var json = this.json json.bdFlag = '0' + json.onlyKey = this.onlyKey json.commentText = this.commentText7 this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), @@ -467,6 +469,7 @@ export default { this.isSubmit = true var json = this.json json.bdFlag = '1' + json.onlyKey = this.onlyKey json.commentText = this.commentText7 this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), @@ -491,6 +494,7 @@ export default { }).then(res => { let data = JSON.parse(res.mesg) this.commentText7 = data.commentText7 || '' + this.onlyKey = data.form ? data.form.onlyKey :data.onlyKey this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName this.form.fjList = data.fjList || data.form.fjList diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue index 36b705625..5dab77961 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue @@ -286,6 +286,7 @@ export default { return { data2: [], commentText8: '', + onlyKey: '', itermsConditionsFlag: false, itermsConditionsTitle: '', drawerModal: false, @@ -449,6 +450,7 @@ export default { this.isSubmit = true var json = this.json json.directorFlag = '0' + json.onlyKey = this.onlyKey json.commentText = this.commentText8 this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), @@ -467,6 +469,7 @@ export default { this.isSubmit = true var json = this.json json.directorFlag = '1' + json.onlyKey = this.onlyKey json.commentText = this.commentText8 this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), @@ -491,6 +494,7 @@ export default { }).then(res => { let data = JSON.parse(res.mesg) this.commentText8 = data.commentText8 || '' + this.onlyKey = data.form ? data.form.onlyKey :data.onlyKey this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName this.form.fjList = data.fjList || data.form.fjList diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue index 9b62938e4..54fd7334a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue @@ -286,6 +286,7 @@ export default { return { data2: [], commentText9: '', + onlyKey: '', itermsConditionsFlag: false, itermsConditionsTitle: '', drawerModal: false, @@ -449,6 +450,7 @@ export default { this.isSubmit = true; var json = this.json; json.presidentFlag = '0'; + json.onlyKey = this.onlyKey json.commentText = this.commentText9; this.$http.post("lawss/activiti/completeTask", { json: JSON.stringify(json), @@ -466,6 +468,7 @@ export default { if (this.commentText9) { this.isSubmit = true; var json = this.json; + json.onlyKey = this.onlyKey json.presidentFlag = '1'; json.commentText = this.commentText9; this.$http.post("lawss/activiti/completeTask", { @@ -491,6 +494,7 @@ export default { }).then(res => { let data = JSON.parse(res.mesg) this.commentText9 = data.commentText9 || '' + this.onlyKey = data.form ? data.form.onlyKey :data.onlyKey this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName this.form.fjList = data.fjList || data.form.fjList diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue index 635c706a3..cd8db8be6 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue @@ -2446,27 +2446,23 @@ }, handle3(){ this.formTongGuo.approvalOpinion = 1 - this.form.fsRejectStatus = 1 - const json = JSON.stringify(this.form); - console.log(json) this.$refs['form'].validate((valid) => { if (valid) { + this.form.fsRejectStatus = 1 this.handleSubmit() } }) }, handle4(){ - const json = JSON.stringify(this.form); this.formTongGuo.approvalOpinion = 2 - this.form.fsRejectStatus = 2 this.$refs['form'].validate((valid) => { if (valid) { + this.form.fsRejectStatus = 2 this.handleSubmit() } }) }, handle2(){ - const json = JSON.stringify(this.form); this.formTongGuo.approvalOpinion = 0 this.$refs['form'].validate((valid) => { if (valid) { diff --git a/src/pages/processCenter/pages/phone/bzrk/step2.vue b/src/pages/processCenter/pages/phone/bzrk/step2.vue index 29d878e6f..f7d04fd5c 100644 --- a/src/pages/processCenter/pages/phone/bzrk/step2.vue +++ b/src/pages/processCenter/pages/phone/bzrk/step2.vue @@ -359,9 +359,7 @@
-
-
- +
基础信息
审批历史
-
+
@@ -19,78 +19,15 @@ :rules="formRules" class="label-input-form prc-content-border" label-width="150px"> - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + +
diff --git a/src/pages/processCenter/pages/phone/qbfz/step5.vue b/src/pages/processCenter/pages/phone/qbfz/step5.vue index 20b9b9062..d40f4c2d2 100644 --- a/src/pages/processCenter/pages/phone/qbfz/step5.vue +++ b/src/pages/processCenter/pages/phone/qbfz/step5.vue @@ -2,16 +2,17 @@
- +
基础信息
审批历史
-
+
基础信息 -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- 隐藏基础信息 - 展开基础信息 - + +
+ 隐藏基础信息 + 展开基础信息
- + diff --git a/src/pages/processCenter/pages/phone/qbfz/step6.vue b/src/pages/processCenter/pages/phone/qbfz/step6.vue index 1ed09ed7b..43c463069 100644 --- a/src/pages/processCenter/pages/phone/qbfz/step6.vue +++ b/src/pages/processCenter/pages/phone/qbfz/step6.vue @@ -2,16 +2,17 @@
- +
基础信息
审批历史
-
+
基础信息 -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- 隐藏基础信息 - 展开基础信息 - + +
+ 隐藏基础信息 + 展开基础信息
- + diff --git a/src/pages/processCenter/pages/phone/qbfz/step7.vue b/src/pages/processCenter/pages/phone/qbfz/step7.vue index 8735e1b85..b5e818af0 100644 --- a/src/pages/processCenter/pages/phone/qbfz/step7.vue +++ b/src/pages/processCenter/pages/phone/qbfz/step7.vue @@ -2,16 +2,17 @@
- +
基础信息
审批历史
-
+
基础信息 -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- 隐藏基础信息 - 展开基础信息 - + +
+ 隐藏基础信息 + 展开基础信息
- + diff --git a/src/pages/processCenter/pages/phone/qbrk-product/common/formEditList.vue b/src/pages/processCenter/pages/phone/qbrk-product/common/formEditList.vue index af7ede7dd..103c34cd5 100644 --- a/src/pages/processCenter/pages/phone/qbrk-product/common/formEditList.vue +++ b/src/pages/processCenter/pages/phone/qbrk-product/common/formEditList.vue @@ -9,9 +9,9 @@ @@ -36,12 +36,6 @@ value-format="yyyy-MM-dd" > - - - @@ -86,6 +80,16 @@ + + + + + + + + - - - - - @@ -144,12 +144,12 @@ v-model="form.FBGBUSSName" clearable > -
-
+
+
- {{ item.name }} - - + {{ item.name }} + +
@@ -172,12 +172,12 @@ v-model="form.LSBBBUSSName" clearable > -
-
+
+
- {{ item.name }} - - + {{ item.name }} + +
@@ -202,12 +202,12 @@ v-model="form.XGDName" clearable > -
-
+
+
- {{ item.name }} - - + {{ item.name }} + +
@@ -230,12 +230,12 @@ v-model="form.QTWJBUSSName" clearable > -
-
+
+
- {{ item.name }} - - + {{ item.name }} + +
@@ -361,7 +361,7 @@ class="common-button-primary" size="mini" style="position:absolute;top: 10px;right: 0;" - @click="selectLaws('DTQBBHBUSS'),config.attrName = '代替企标编号'" + @click="selectLaws('DTQBBHBUSS','代替企标编号')" >{{'手动查找'}} @@ -371,12 +371,12 @@ v-model="form.GLWJBUSSName" clearable > -
-
+
+
- {{ item.name }} - - + {{ item.name }} + +
@@ -433,7 +433,7 @@ class="common-button-primary" size="mini" style="position:absolute;top: 10px;right: 0;" - @click="selectLaws('BDTQBBHBUSS'),config.attrName = '被代替企标编号'" + @click="selectLaws('BDTQBBHBUSS','被代替企标编号')" >{{'手动查找'}} @@ -663,6 +663,22 @@ default: false }, }, + filters: { + ellipsis (value) { + if (!value) return '' + if (value.length > 35) { + return value.slice(0,35) + '...' + } + return value + }, + ellipsis2 (value) { + if (!value) return '' + if (value.length > 12) { + return value.slice(0,12) + '...' + } + return value + } + }, data () { return { opinionsStand:[ @@ -797,7 +813,7 @@ }, e => { }) }, - selectLaws (type) { + selectLaws (type,title) { // if (this.standNumFlag === 1) { // this.$refs.selections.selectAll(false) // } @@ -805,7 +821,7 @@ this.replaceLawsNumModel = true this.replaceLawType = '' this.replaceLawType = type - this.$emit('formSelectLawsCancel', this.replaceLawsNumModel,this.replaceLawType); + this.$emit('formSelectLawsCancel', this.replaceLawsNumModel,this.replaceLawType,title); }, fileUpload (type) { // this.fileMadel = true;//此句应在最后执行,否则会有先显示没变换的的文件列表,在显示变换了的文件列表 @@ -963,5 +979,7 @@ diff --git a/src/pages/processCenter/pages/phone/qbrk-product/common/formList.vue b/src/pages/processCenter/pages/phone/qbrk-product/common/formList.vue index 171e328b5..b3f630612 100644 --- a/src/pages/processCenter/pages/phone/qbrk-product/common/formList.vue +++ b/src/pages/processCenter/pages/phone/qbrk-product/common/formList.vue @@ -5,7 +5,7 @@
- + + + + - - - @@ -56,7 +55,34 @@ clearable> - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + @@ -107,12 +125,12 @@
- + -
- {{ item.name | ellipsis22 }} - - +
+ {{ item.name }} + +
@@ -121,10 +139,10 @@ -
- {{ item.name | ellipsis22 }} - - +
+ {{ item.name }} + +
@@ -133,12 +151,12 @@ - + -
- {{ item.name | ellipsis22 }} - - +
+ {{ item.name }} + +
@@ -147,10 +165,10 @@ -
- {{ item.name | ellipsis22 }} - - +
+ {{ item.name }} + +
@@ -166,7 +184,7 @@
- + @@ -200,7 +218,7 @@ - + @@ -241,7 +259,7 @@
- + -
- {{ item.name | ellipsis22 }} - - +
+ {{ item.name }} + +
@@ -273,7 +291,7 @@ - +