@@ -282,6 +283,8 @@ export default {
},
data() {
return {
+ tableIndex: 0,
+ itemLists: [],
foldFormFlag: false,
total: 0,
currentPage: 1,
@@ -314,6 +317,16 @@ export default {
};
},
methods: {
+ tableLoading () {
+ this.tableIndex++
+ let index = this.tableIndex * 20
+ let endIndex = index + 20
+ if (this.tableIndex * 20 > this.itemLists.length) {
+ this.$message.warning('没有更多了')
+ }
+ let newData = this.itemLists.slice(index, endIndex)
+ this.itemList = this.itemList.concat(newData)
+ },
//折叠/展开基础信息方法
foldForm() {
this.foldFormFlag = !this.foldFormFlag
diff --git a/src/pages/processCenter/pages/phone/xmpg2/step8.vue b/src/pages/processCenter/pages/phone/xmpg2/step8.vue
new file mode 100644
index 000000000..23749e457
--- /dev/null
+++ b/src/pages/processCenter/pages/phone/xmpg2/step8.vue
@@ -0,0 +1,595 @@
+
+
+
+ 项目合规评估流程
+ 分发负责人审批
+
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 隐藏基础信息
+ 展开基础信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 填写信息
+
+
+
+
+ {{ scope.row.standSort }} {{ scope.row.standNumber
+ }}-{{ scope.row.standYear }}
+ {{ scope.row.standSort }}
+ {{ scope.row.standNumber }}
+
+
+
+
+ {{ scope.row.standName }}
+
+
+
+
+
+
+
+
+ {{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}
+
+
+
+
+ {{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}
+
+
+
+
+
+
+
加载更多...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}
+
+
+
+
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}
+
+
+
+
+ {{ scope.row.commentText }}
+
+
+
+
+ {{ scope.row.endTime ? '已完成' : '未完成'}}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/phone/xmpg2/step9.vue b/src/pages/processCenter/pages/phone/xmpg2/step9.vue
new file mode 100644
index 000000000..02ce9a886
--- /dev/null
+++ b/src/pages/processCenter/pages/phone/xmpg2/step9.vue
@@ -0,0 +1,595 @@
+
+
+
+ 项目合规评估流程
+ 分发负责人审批
+
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 隐藏基础信息
+ 展开基础信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 填写信息
+
+
+
+
+ {{ scope.row.standSort }} {{ scope.row.standNumber
+ }}-{{ scope.row.standYear }}
+ {{ scope.row.standSort }}
+ {{ scope.row.standNumber }}
+
+
+
+
+ {{ scope.row.standName }}
+
+
+
+
+
+
+
+
+ {{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}
+
+
+
+
+ {{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}
+
+
+
+
+
+
+
加载更多...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}
+
+
+
+
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}
+
+
+
+
+ {{ scope.row.commentText }}
+
+
+
+
+ {{ scope.row.endTime ? '已完成' : '未完成'}}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/router/index.js b/src/router/index.js
index 3b9e1ac17..2b3dfee14 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -2110,6 +2110,56 @@ const routes = [
title: '项目合规评估流程'
}
},
+ {
+ path: '/phoneXmpg2Step8',
+ name: 'phoneXmpg2Step8',
+ component: () => import('@/pages/processCenter/pages/phone/xmpg2/step8.vue'),
+ meta: {
+ isBoolean: true,
+ requireAuth: true,
+ title: '项目合规评估流程'
+ }
+ },
+ {
+ path: '/phoneXmpg2Step9',
+ name: 'phoneXmpg2Step9',
+ component: () => import('@/pages/processCenter/pages/phone/xmpg2/step9.vue'),
+ meta: {
+ isBoolean: true,
+ requireAuth: true,
+ title: '项目合规评估流程'
+ }
+ },
+ {
+ path: '/phoneXmpg2Step10',
+ name: 'phoneXmpg2Step10',
+ component: () => import('@/pages/processCenter/pages/phone/xmpg2/step10.vue'),
+ meta: {
+ isBoolean: true,
+ requireAuth: true,
+ title: '项目合规评估流程'
+ }
+ },
+ {
+ path: '/phoneXmpg2Step11',
+ name: 'phoneXmpg2Step11',
+ component: () => import('@/pages/processCenter/pages/phone/xmpg2/step11.vue'),
+ meta: {
+ isBoolean: true,
+ requireAuth: true,
+ title: '项目合规评估流程'
+ }
+ },
+ {
+ path: '/phoneXmpg2Step12',
+ name: 'phoneXmpg2Step12',
+ component: () => import('@/pages/processCenter/pages/phone/xmpg2/step12.vue'),
+ meta: {
+ isBoolean: true,
+ requireAuth: true,
+ title: '项目合规评估流程'
+ }
+ },
{
path: '/phoneXmqdqrStep5',
name: 'phoneXmqdqrStep5',
From d90d1310b469baff624e175b5aa35d4ac972534c Mon Sep 17 00:00:00 2001
From: shenyanpei
Date: Sun, 19 Dec 2021 11:29:28 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=AB=AF=E6=B2=A1?=
=?UTF-8?q?=E6=9C=89=E7=9A=84=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC=E5=88=B0?=
=?UTF-8?q?=E7=A9=BA=E7=99=BD=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/App.vue | 7 +-
src/main.js | 6 +-
src/pages/blankPage/index.vue | 29 ++
.../pages/creatProcess/wfhxzg/step1.vue | 2 +-
.../pages/creatProcess/wfhxzg/step2.vue | 66 +---
.../pages/creatProcess/wfhxzg/step3.vue | 2 +-
.../pages/creatProcess/wfhxzg/step4.vue | 68 +----
.../pages/creatProcess/wfhxzg/step5-1.vue | 68 +----
.../pages/creatProcess/wfhxzg/step5.vue | 2 +-
.../pages/addEdit.vue | 288 +-----------------
.../pages/otherAddEit.vue | 184 -----------
.../pages/projectAddEit.vue | 155 +---------
src/router/index.js | 10 +
13 files changed, 69 insertions(+), 818 deletions(-)
create mode 100644 src/pages/blankPage/index.vue
diff --git a/src/App.vue b/src/App.vue
index 947dc7879..5ddb7f29c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -238,7 +238,12 @@ export default {
},
// 监听路由 控制isBoolean
$route() {
- if (this.$route.name !== 'Login' && this.$route.name !== 'Home' && !this.$route.meta.isBoolean && this.$route.name !== 'beeEChungLogin' && this.$route.name !== 'beeEnergyLogin' && this.$route.name !== 'mdLawLogin' && this.$route.name !== 'nuoBLogin' && this.$route.name !== 'sTLogin' && this.$route.name !== 'StandardSearch' && this.$route.name !== 'phoneIndex') {
+ if (this.$route.name !== 'Login' && this.$route.name !== 'Home'
+ && !this.$route.meta.isBoolean && this.$route.name !== 'beeEChungLogin'
+ && 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.isBoolean = true
} else {
this.isBoolean = false
diff --git a/src/main.js b/src/main.js
index 4d44b6f12..c5055a27d 100644
--- a/src/main.js
+++ b/src/main.js
@@ -276,7 +276,11 @@ router.beforeEach(function (to, from, next) {
}
if(path === '/loginVerify'){
if(webLoginType != null && webLoginType === 'dev'){
- next('/Login')
+ if(isMobile()) {
+ next('/blankPage')
+ } else {
+ next('/Login')
+ }
}else {
next()
}
diff --git a/src/pages/blankPage/index.vue b/src/pages/blankPage/index.vue
new file mode 100644
index 000000000..cecd598ee
--- /dev/null
+++ b/src/pages/blankPage/index.vue
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
index e312fcbca..601528c98 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
@@ -23,7 +23,7 @@
:data="dataList"
border
ref="entryTable"
- height="49%"
+ height="80%"
@selection-change="selectedDelete"
style="width: 100%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
index 90e3f3259..df7fb02ec 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
@@ -13,70 +13,6 @@
基础信息
-
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
index 5d4d4594d..6c6776c5b 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
@@ -28,7 +28,7 @@
border
ref="multipleTable"
@selection-change="handleSelectionMore"
- height="49%"
+ height="80%"
style="width: 100%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
index 6d13ad4df..3663c097b 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
@@ -13,76 +13,10 @@
基础信息
-
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5-1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5-1.vue
index 09501d5fc..69084efee 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5-1.vue
@@ -13,76 +13,10 @@
基础信息
-
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
index 6c902ccab..3264cfc95 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
@@ -16,7 +16,7 @@
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index 79b6974d5..117aa3e11 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -298,7 +298,7 @@
align="center"
label="标准号">
- {{ scope.row.standNumber || scope.row.lawsNumber || scope.row.standCode }}
+ {{ scope.row.standNumber }}
-
-