From c00baedd8c7b274ad73051c7bf4d32ef4df10d16 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Fri, 17 Dec 2021 10:59:13 +0800 Subject: [PATCH 01/11] commit --- .../components/EnterpriseStandardDatabase.vue | 2 +- .../foreignStandardsAndRegulations/index.vue | 30 +++++++++++++------ 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index c8dc4a0a7..88df4843a 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -1026,7 +1026,7 @@ :model="sarBussionessSearch" :inline="true" class="label-input-form table-lattice" - label-width="76px" + label-width="300px" style="display: flex;flex-wrap: wrap"> diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index 92997a4c2..8d6112467 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -465,7 +465,7 @@ @@ -497,7 +497,10 @@ @@ -566,7 +569,10 @@ @@ -575,7 +581,10 @@ @@ -587,7 +596,10 @@ @@ -5366,15 +5378,15 @@ export default { .label-input-form { &.table-lattice { /deep/ .el-input__inner { - height: 30px; + //height: 30px; line-height: 30px; border-radius: 0 !important; } } - .el-date-editor.el-input, .el-date-editor.el-input__inner { - width: 190px - } + //.el-date-editor.el-input, .el-date-editor.el-input__inner { + // width: 190px + //} .classDisplay { display: none; From 93c30650d44754418e6bd1e617f7d34b79818235 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Fri, 17 Dec 2021 16:02:37 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E8=A7=84=E8=8C=83=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/cywbbzzxd/step3.vue | 303 ++++++++++++++++-- .../pages/creatProcess/jrbzhxh/step2.vue | 92 ++++-- 2 files changed, 341 insertions(+), 54 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue index 13a80e735..6d988ab50 100644 --- a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue @@ -37,12 +37,19 @@ placeholder="请输入标准编号" clearable> + 手动查找
@@ -81,23 +88,18 @@ clearable> - -
- - - - -
+ + +
@@ -257,6 +259,134 @@ 流程列表加载中
+ + +
+
+
+
+ + + + + + + + + + + + + 查询 + + + + 清空 + + + +
+ + + + + + + + + + + + + + + + + +
+ +
+
+ +
1){ + this.$message.warning('您只能选择一条标准进行添加') + }else{ + this.wbbzform.standName = this.standList[0].standName || this.standList[0].standEnName + this.wbbzform.standType = this.standList[0].standSort + this.wbbzform.standNumber = this.standList[0].standSort + '\xa0\xa0 '+ this.standList[0].standNumber + this.standModel = false + } + + }, + //添加标准取消事件 + cancelStand() { + this.standModel = false; + }, + typeChange(type) { + this.standardSearch.standType = type; + }, + clearStandSearch() { + this.standardSearch = { + standType: "", + standNumber: "" + }; + this.getStandData(); + }, + getStandDataBtn(){ + this.pageNo =1; + this.getStandData(); + }, + //查询项目下的标准 + getStandData() { + this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageByWk1", { + standType: this.standardSearch.standType, + standNumber: this.standardSearch.standNumber, + page: this.pageNo, + pageSize: this.pageSizeNo + }, { + _this: this + }, res => { + this.standardData = res.data.list; + this.standardData.forEach(item => { + this.$set(item, "ZCCSSRQ", item.zccssrq); + this.$set(item, "XCXSSRQ", item.xcxssrq); + }) + this.totalNo = res.data.count; + }, e => { + }); + }, + // 点击查看 + handlePreview(item) { + let routeUrl = this.$router.resolve({ + name: "OtherStandardDetails", + params: { + id: item.id, + pageType: "INLAND_STAND" + } + }); + window.open(routeUrl.href, "_blank"); + }, + //添加标准select的改变 + selectThree(data) { + this.standList = data; + }, + pageChangeNo(page) { + this.pageNo = page; + this.getStandData(); + }, + pageSizeChangeNo(pageSize) { + this.pageSizeNo = this.$store.getters.userInfo.configContent; + this.getStandData(); + + }, handleSave() { }, //不备案 @@ -520,6 +772,9 @@ export default { background: #E6A23C; } } - + .table-height{ + height: calc(~'100% - 65px'); + overflow: auto; + } } diff --git a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue index eb2c12a78..edfd581ec 100644 --- a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue @@ -33,37 +33,37 @@
- + + v-for="item in comityOptionsOne" + :key="item.id" + :label="item.name" + :value="item.id"> - + + v-for="item in comityOptionsTwo" + :key="item.id" + :label="item.name" + :value="item.id"> - + + v-for="item in comityOptionsOneThree" + :key="item.id" + :label="item.name" + :value="item.id">
- +
@@ -122,7 +122,7 @@ diff --git a/src/pages/processCenter/pages/phone/wfhxzg/step3.vue b/src/pages/processCenter/pages/phone/wfhxzg/step3.vue index f6d315702..34ed8f84a 100644 --- a/src/pages/processCenter/pages/phone/wfhxzg/step3.vue +++ b/src/pages/processCenter/pages/phone/wfhxzg/step3.vue @@ -179,8 +179,10 @@ import ProcessHeaderPhone from '../../components/ProcessHeaderPhone' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' import {changeAssigneeNew, completeTask, inboundLiaisonDetail, saveTaskForPub} from "@/api/process.js"; +import {Base64} from "js-base64"; +import {mapMutations} from "vuex"; export default { - name: "phoneWfhxStep3", + name: "phoneWfhxzgStep3", data() { return { passInfo: 0, @@ -241,6 +243,7 @@ export default { } }, methods: { + ...mapMutations(['setToken', 'setUserInfo', 'resetTime', 'rememberPwd', 'setJESSCookie']), processTable() { this.$http.get("lawss/activiti/get_list_by_instance", { prcNum: this.$route.query.prcNum, diff --git a/src/pages/processCenter/pages/phone/wfhxzg/step5.vue b/src/pages/processCenter/pages/phone/wfhxzg/step5.vue index c2f2fbd80..bb2853221 100644 --- a/src/pages/processCenter/pages/phone/wfhxzg/step5.vue +++ b/src/pages/processCenter/pages/phone/wfhxzg/step5.vue @@ -177,7 +177,7 @@ import ProcessTitle from '../../components/ProcessTitle' import {inboundLiaisonDetail, changeAssigneeNew} from "@/api/process"; export default { - name: "phoneWfhxStep5", + name: "phoneWfhxzgStep5", data() { return { drawerTitle: '', diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue index f31d2b44a..38b2dcab0 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue @@ -452,7 +452,7 @@ @@ -460,7 +460,7 @@ @@ -468,7 +468,7 @@ @@ -2350,6 +2350,9 @@ export default { background: #ffffff; text-align: right; } + /deep/.el-date-editor.el-input { + width: 100%; + } } .labelBox { /deep/ .el-form-item__label { diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue index 628777636..72db242c3 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue @@ -517,7 +517,7 @@ @@ -525,7 +525,7 @@ @@ -533,7 +533,7 @@ @@ -2318,6 +2318,9 @@ export default { background: #ffffff; text-align: right; } + /deep/.el-date-editor.el-input { + width: 100%; + } } .labelBox { diff --git a/src/router/index.js b/src/router/index.js index b0b98c54c..3b9e1ac17 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -4,6 +4,15 @@ import store from '../store' import { Message } from 'element-ui' Vue.use(Router) const routes = [ + { + path: '/phoneIndex', + name: 'phoneIndex', + component: resolve => require(['@/pages/processCenter/pages/phone/index.vue'], resolve), + meta: { + requireAuth: true, + title: '动态跳转', + } + }, { path: '*', redirect: '/loginVerify' @@ -931,7 +940,7 @@ const routes = [ component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step1.vue'), meta: { requireAuth: true, - title: '企标制修订-技术标准' + title: '企标制修订流程及企业标准库流程' } }, { @@ -940,7 +949,7 @@ const routes = [ component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step2.vue'), meta: { requireAuth: true, - title: '企标制修订-技术标准' + title: '企标制修订流程及企业标准库流程' } }, { @@ -949,7 +958,7 @@ const routes = [ component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step3.vue'), meta: { requireAuth: true, - title: '企标制修订-技术标准' + title: '企标制修订流程及企业标准库流程' } },{ path: '/bussLibraryC3', @@ -957,7 +966,7 @@ const routes = [ component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue'), meta: { requireAuth: true, - title: '企标制修订-技术标准' + title: '企标制修订流程及企业标准库流程' } },{ path: '/bussLibrary4', @@ -965,7 +974,7 @@ const routes = [ component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step4.vue'), meta: { requireAuth: true, - title: '企标制修订-技术标准' + title: '企标制修订流程及企业标准库流程' } },{ path: '/bussLibrary5', @@ -973,7 +982,7 @@ const routes = [ component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step5.vue'), meta: { requireAuth: true, - title: '企标制修订-技术标准' + title: '企标制修订流程及企业标准库流程' } },{ path: '/bussLibrary6', @@ -981,7 +990,7 @@ const routes = [ component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step6.vue'), meta: { requireAuth: true, - title: '企标制修订-技术标准' + title: '企标制修订流程及企业标准库流程' } },{ path: '/bussLibraryC6', @@ -989,7 +998,7 @@ const routes = [ component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue'), meta: { requireAuth: true, - title: '企标制修订-技术标准' + title: '企标制修订流程及企业标准库流程' } },{ path: '/bussLibrary7', @@ -997,7 +1006,7 @@ const routes = [ component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step7.vue'), meta: { requireAuth: true, - title: '企标制修订-技术标准' + title: '企标制修订流程及企业标准库流程' } },{ path: '/bussLibrary8', @@ -1005,7 +1014,7 @@ const routes = [ component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step8.vue'), meta: { requireAuth: true, - title: '企标制修订-技术标准' + title: '企标制修订流程及企业标准库流程' } },{ path: '/bussLibrary9', @@ -1013,7 +1022,7 @@ const routes = [ component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step9.vue'), meta: { requireAuth: true, - title: '企标制修订-技术标准' + title: '企标制修订流程及企业标准库流程' } },{ path: '/bussLibrary10', @@ -1021,7 +1030,7 @@ const routes = [ component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step10.vue'), meta: { requireAuth: true, - title: '企标制修订-技术标准' + title: '企标制修订流程及企业标准库流程' } },{ path: '/bussLibrary11', @@ -1029,7 +1038,7 @@ const routes = [ component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step11.vue'), meta: { requireAuth: true, - title: '企标制修订-技术标准' + title: '企标制修订流程及企业标准库流程' } },{ path: '/bussLibrary12', @@ -1037,7 +1046,7 @@ const routes = [ component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step12.vue'), meta: { requireAuth: true, - title: '企标制修订-技术标准' + title: '企标制修订流程及企业标准库流程' } },{ path: '/bussLibraryDetail', @@ -1045,7 +1054,7 @@ const routes = [ component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue'), meta: { requireAuth: true, - title: '企标制修订-技术标准' + title: '企标制修订流程及企业标准库流程' } }, { @@ -2162,8 +2171,8 @@ const routes = [ } }, { - path: '/phoneWfhxStep3', - name: 'phoneWfhxStep3', + path: '/phoneWfhxzgStep3', + name: 'phoneWfhxzgStep3', component: () => import('@/pages/processCenter/pages/phone/wfhxzg/step3.vue'), meta: { isBoolean: true, @@ -2172,8 +2181,8 @@ const routes = [ } }, { - path: '/phoneWfhxStep5', - name: 'phoneWfhxStep5', + path: '/phoneWfhxzgStep5', + name: 'phoneWfhxzgStep5', component: () => import('@/pages/processCenter/pages/phone/wfhxzg/step5.vue'), meta: { isBoolean: true, diff --git a/src/store/isMobile/index.js b/src/store/isMobile/index.js new file mode 100644 index 000000000..6fce31161 --- /dev/null +++ b/src/store/isMobile/index.js @@ -0,0 +1,11 @@ + +/** navigator.userAgent可以获取浏览器信息(类型及系统) + * 获取使用的是手机端还是pc端 */ +export function isMobile () { + if ((navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i))) { + return true // 手机端 + } else { + return false // PC端 + } +} +export default isMobile