diff --git a/src/components/index.js b/src/components/index.js
index 4d040a51b..cb817aa18 100644
--- a/src/components/index.js
+++ b/src/components/index.js
@@ -26,6 +26,7 @@ import MechanismTree from './mechanismTree'
import SQTree from './SQTree'
import OrgTable from './OrgTable'
import MySelect from './mySelect'
+import PhoneHistortTable from './phoneHistortTable'
import phoneRole from './phoneRole'
@@ -55,6 +56,7 @@ const install = function (Vue) {
Vue.component('MechanismTree', MechanismTree)
Vue.component('MySelect', MySelect)
Vue.component('phoneRole', phoneRole)
+ Vue.component('PhoneHistortTable', PhoneHistortTable)
}
export default {
diff --git a/src/components/phoneHistortTable/index.vue b/src/components/phoneHistortTable/index.vue
new file mode 100644
index 000000000..977f23dcd
--- /dev/null
+++ b/src/components/phoneHistortTable/index.vue
@@ -0,0 +1,94 @@
+
+
+
+
+
+
+
+
+
+ {{ 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/login/index.vue b/src/pages/login/index.vue
index a878c6ba2..e5556a532 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -182,6 +182,9 @@
window.sessionStorage.setItem('menuList', menuList); // del
if (hasHomeMenu) {
this.setMenu(JSON.stringify(menuList)).then(res => {
+ if (this.showIETips) {//判断是否IE浏览器
+ alert('检测到您使用的是IE浏览器,已经和时代脱轨了!建议您更换为谷歌浏览器或火狐浏览器')
+ }
this.$router.push('/home2')
}, e => {
this.$message.warning('未获取到菜单')
diff --git a/src/pages/processCenter/pages/phone/bzdy/step7.vue b/src/pages/processCenter/pages/phone/bzdy/step7.vue
index 622d08ba1..4c8e29e1b 100644
--- a/src/pages/processCenter/pages/phone/bzdy/step7.vue
+++ b/src/pages/processCenter/pages/phone/bzdy/step7.vue
@@ -112,68 +112,7 @@
-
-
-
-
-
-
-
- {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}
-
-
-
-
- {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}
-
-
-
-
- {{ scope.row.commentText }}
-
-
-
-
- {{ scope.row.endTime ? '已完成' : '未完成'}}
-
-
-
+
-
-
-
-
-
-
-
- {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}
-
-
-
-
- {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}
-
-
-
-
- {{ scope.row.commentText }}
-
-
-
-
- {{ scope.row.endTime ? '已完成' : '未完成'}}
-
-
-
+
-
-
-
-
-
-
-
- {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}
-
-
-
-
- {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}
-
-
-
-
- {{ scope.row.commentText }}
-
-
-
-
- {{ scope.row.endTime ? '已完成' : '未完成'}}
-
-
-
+
-
-
-
-
-
-
-
- {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}
-
-
-
-
- {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}
-
-
-
-
- {{ scope.row.commentText }}
-
-
-
-
- {{ scope.row.endTime ? '已完成' : '未完成'}}
-
-
-
+
-
-
-
-
-
-
-
- {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}
-
-
-
-
- {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}
-
-
-
-
- {{ scope.row.commentText }}
-
-
-
-
- {{ scope.row.endTime ? '已完成' : '未完成'}}
-
-
-
+
-
-
-
-
-
-
-
- {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}
-
-
-
-
- {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}
-
-
-
-
- {{ scope.row.commentText }}
-
-
-
-
- {{ scope.row.endTime ? '已完成' : '未完成'}}
-
-
-
+