From 1841205a49811e9f209e2dd2bc39bccd9818b22c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E4=B8=BD=E5=90=9B?= <664953382@qq.com>
Date: Fri, 16 Apr 2021 13:23:01 +0800
Subject: [PATCH] =?UTF-8?q?element+xlsx+file-saver=E9=85=8D=E7=BD=AE?=
=?UTF-8?q?=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
package.json | 9 +-
.../workOrderManage/orderApproval/detail.vue | 30 +-
.../workOrderManage/orderHistory/detail.vue | 318 ++++++++++++------
3 files changed, 243 insertions(+), 114 deletions(-)
diff --git a/package.json b/package.json
index c4fed59..8b6a539 100644
--- a/package.json
+++ b/package.json
@@ -46,24 +46,25 @@
"core-js": "3.6.5",
"echarts": "4.2.1",
"element-ui": "2.13.2",
- "file-saver": "2.0.1",
- "js-beautify": "1.10.2",
+ "file-saver": "^2.0.1",
"fuse.js": "3.4.4",
+ "js-beautify": "1.10.2",
"js-cookie": "2.2.0",
"jsencrypt": "3.0.0-rc.1",
"normalize.css": "7.0.0",
"nprogress": "0.2.0",
"path-to-regexp": "2.4.0",
+ "quill": "1.3.7",
"screenfull": "4.2.0",
"sortablejs": "1.8.4",
"vue": "2.6.10",
"vue-count-to": "1.0.13",
- "quill": "1.3.7",
"vue-cropper": "0.4.9",
"vue-router": "3.0.2",
"vue-splitpane": "1.0.4",
"vuedraggable": "2.20.0",
- "vuex": "3.1.0"
+ "vuex": "3.1.0",
+ "xlsx": "^0.16.9"
},
"devDependencies": {
"@vue/cli-plugin-babel": "4.4.4",
diff --git a/src/views/workOrderManage/orderApproval/detail.vue b/src/views/workOrderManage/orderApproval/detail.vue
index 33ced09..0c6be4b 100644
--- a/src/views/workOrderManage/orderApproval/detail.vue
+++ b/src/views/workOrderManage/orderApproval/detail.vue
@@ -19,21 +19,41 @@
-
+
+
{{ props.row.writeForm.resultNote }}
+
+
+
- {{ props.row.writeForm.isOk==1?'是':'否' }}
+ {{ props.row.writeForm.isOk == 1 ? '是' : '否' }}
+
+
- {{ props.row.writeForm.isReturn==1?'是':'否' }}
+ {{
+ props.row.writeForm.isReturn == 1 ? '是' : '否'
+ }}
-
+
+
+
{{ props.row.writeForm.returnNum }}
-
+
+
+
{{ props.row.writeForm.returnOrder }}
+
+
diff --git a/src/views/workOrderManage/orderHistory/detail.vue b/src/views/workOrderManage/orderHistory/detail.vue
index 1fa08a3..803412f 100644
--- a/src/views/workOrderManage/orderHistory/detail.vue
+++ b/src/views/workOrderManage/orderHistory/detail.vue
@@ -1,6 +1,6 @@
-
- {{tableHeader.id}}
+ {{ tableHeader.id }}
- {{tableHeader.createTime | formatDate}}
+ {{ tableHeader.createTime | formatDate }}
- {{tableHeader.nick_name}}
+ {{ tableHeader.nick_name }}
- {{tableHeader.updateTime | formatDate}}
+ {{ tableHeader.updateTime | formatDate }}
- {{tableHeader.finishTime | formatDate}}
+ {{ tableHeader.finishTime | formatDate }}
- {{tableHeader.note}}
+ {{ tableHeader.note }}
- 报表导出
+ 报表导出
- {{tableHeader.rejectNote}}
+ {{ tableHeader.rejectNote }}
-
+ -->
-
-
-
-
-
- {{ props.row.writeForm.resultNote }}
-
-
- {{ props.row.writeForm.isOk==1?'是':'否' }}
-
-
- {{ props.row.writeForm.isReturn==1?'是':'否' }}
-
-
- {{ props.row.writeForm.returnNum }}
-
-
- {{ props.row.writeForm.returnOrder }}
-
-
-
-
-
-
-
- {{ scope.row.workInfo.proName + scope.row.workInfo.cityName + scope.row.workInfo.disName }}
-
-
-
-
-
-
- {{ scope.row.workInfo.warningLevel | toChinaNum }}级
-
-
-
-
-
-
-
-
-
- {{ scope.row.workInfo.createTime | formatDate }}
-
+
+ 报表导出
+
+
+
+
+
+ {{ tableHeader.id }}
+
+
+
+
+
+
+
+ {{
+ props.row.writeForm.resultNote
+ }}
+
+
+
+
+ {{
+ props.row.writeForm.isOk == 1 ? '是' : '否'
+ }}
+
+
+
+
+ {{
+ props.row.writeForm.isReturn == 1 ? '是' : '否'
+ }}
+
+
+
+
+ {{ props.row.writeForm.returnNum }}
+
+
+
+
+ {{ props.row.writeForm.returnOrder }}
+
+
+
+
+
+
+
+
+
+ {{
+ scope.row.workInfo.proName +
+ scope.row.workInfo.cityName +
+ scope.row.workInfo.disName
+ }}
+
+
+
+
+
+
+ {{ scope.row.workInfo.warningLevel | toChinaNum }}级
+
+
+
+
+
+
+
+
+
+ {{ scope.row.workInfo.createTime | formatDate }}
+
+
+
+
@@ -196,4 +297,11 @@ export default {
margin-right: 0;
margin-bottom: 0;
}
+.table_content {
+ display: flex;
+ justify-content: space-around;
+ span {
+ flex: 1;
+ }
+}