From d0aa3ec4621541bcd899e2d94febb0c33887a2b8 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Thu, 2 Dec 2021 17:20:31 +0800 Subject: [PATCH] commit --- .../ueditor/ADT/attachment/attachment.css | 4 - src/assets/styles/common.less | 2 + src/assets/styles/phone.less | 4 + src/assets/styles/reset.css | 7 +- .../pages/components/ProcessHeaderPhone.vue | 83 +++ .../pages/creatProcess/bzjd/step4.vue | 9 +- .../processCenter/pages/phone/bzjd/step4.vue | 518 +++++++++++++++++- .../tabComponents/processCenter/index.vue | 2 +- 8 files changed, 602 insertions(+), 27 deletions(-) create mode 100644 src/assets/styles/phone.less create mode 100644 src/pages/processCenter/pages/components/ProcessHeaderPhone.vue diff --git a/public/static/ueditor/ADT/attachment/attachment.css b/public/static/ueditor/ADT/attachment/attachment.css index e1ff867cc..9d0ec4b5f 100644 --- a/public/static/ueditor/ADT/attachment/attachment.css +++ b/public/static/ueditor/ADT/attachment/attachment.css @@ -96,7 +96,6 @@ #upload .placeholder .webuploader-pick { font-size: 18px; background: #00b7ee; - 3px; line-height: 44px; padding: 0 30px; *width: 120px; @@ -198,7 +197,6 @@ overflow: hidden; z-index: 50; margin: 0; - 0; background: none; -webkit-box-shadow: 0 0 0; } @@ -317,7 +315,6 @@ height: 113px; background: url(./images/image.png) no-repeat center 12px; border: 1px solid #eeeeee; - 0; } #upload .filelist li.filePickerBlock div.webuploader-pick { width: 100%; @@ -447,7 +444,6 @@ color: #565656; padding: 0 18px; display: inline-block; - 3px; margin-left: 10px; cursor: pointer; font-size: 14px; diff --git a/src/assets/styles/common.less b/src/assets/styles/common.less index 111d1293c..fd4c13f29 100644 --- a/src/assets/styles/common.less +++ b/src/assets/styles/common.less @@ -1,6 +1,8 @@ /*liuyan 全局公共样式*/ @import './style'; @import './mixins'; +// 移动端公共样式 +@import './phone'; // 左侧菜单样式 @import './navMenu'; // tree组件父组件内样式 diff --git a/src/assets/styles/phone.less b/src/assets/styles/phone.less new file mode 100644 index 000000000..7ab7d7a88 --- /dev/null +++ b/src/assets/styles/phone.less @@ -0,0 +1,4 @@ +.phoneBox { + width: 100%; + height: 100%; +} diff --git a/src/assets/styles/reset.css b/src/assets/styles/reset.css index 1599c94dc..bebcef1bc 100644 --- a/src/assets/styles/reset.css +++ b/src/assets/styles/reset.css @@ -18,7 +18,12 @@ mark{background-color:transparent} a,ins,s,u,del{text-decoration:none} sup,sub{vertical-align:baseline} html {width:100%;height: 100%;font-size: 50px;-webkit-tap-highlight-color: transparent;} -body {font-family: 'PingFang SC', 'Microsoft Yahei', '微软雅黑', Arial, sans-serif !important;color: #333;font-size: 14px;line-height: 1;-webkit-text-size-adjust: none;width:100%;height:100%;min-width:1280px;overflow-x:auto;} +@media screen and (min-width: 1366px) { + body { + min-width:1280px; + } +} +body {font-family: 'PingFang SC', 'Microsoft Yahei', '微软雅黑', Arial, sans-serif !important;color: #333;font-size: 14px;line-height: 1;-webkit-text-size-adjust: none;width:100%;height:100%;overflow-x:auto;} hr {height: .02rem;margin: .1rem 0;border: medium none;border-top: .02rem solid #cacaca;} a {text-decoration: none;} /*意见反馈页面富文本表格宽度*/ diff --git a/src/pages/processCenter/pages/components/ProcessHeaderPhone.vue b/src/pages/processCenter/pages/components/ProcessHeaderPhone.vue new file mode 100644 index 000000000..f419a885f --- /dev/null +++ b/src/pages/processCenter/pages/components/ProcessHeaderPhone.vue @@ -0,0 +1,83 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue index ecf021766..fca2bdbc0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue @@ -325,12 +325,6 @@ submitBTNText="同意" > -
- 123 + + + + +
+
基础信息
+
审批历史
+
+
+
+ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + +
+
+ 隐藏基础信息 + 展开基础信息 + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+
+
+
+
+ + + + + + + + + + + + + + + + + + +
+ +
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index f31618145..2840cdbb3 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -834,7 +834,7 @@ export default { }) } else if (row.taskInfo === '责任人审核') { this.$router.push({ - name: 'bzjdStep4', + name: 'phoneBzjdStep4', query: { taskIds: row.taskIds, prcId: row.prcId,