diff --git a/hb_client/package.json b/hb_client/package.json
index 6c22a7f..6df0f70 100644
--- a/hb_client/package.json
+++ b/hb_client/package.json
@@ -40,7 +40,8 @@
"vue-router": "^3.5.2",
"vuex": "^3.6.2",
"webpack-dev-server": "^4.7.3",
- "xlsx": "^0.17.1"
+ "xlsx": "^0.17.1",
+ "html-docx-js": "^0.3.1"
},
"devDependencies": {
"@babel/core": "^7.15.0",
diff --git a/hb_client/src/views/mtm/material.vue b/hb_client/src/views/mtm/material.vue
index 3a4e51d..b11ba35 100644
--- a/hb_client/src/views/mtm/material.vue
+++ b/hb_client/src/views/mtm/material.vue
@@ -44,9 +44,8 @@
fit
stripe
highlight-current-row
- max-height="620"
height="100"
- v-el-height-adaptive-table="{bottomOffset: 40}"
+ v-el-height-adaptive-table="{bottomOffset: 50}"
>
diff --git a/hb_client/src/views/mtm/process.vue b/hb_client/src/views/mtm/process.vue
index a32c419..b958077 100644
--- a/hb_client/src/views/mtm/process.vue
+++ b/hb_client/src/views/mtm/process.vue
@@ -14,9 +14,9 @@
border
fit
stripe
- max-height="620"
height="100"
- v-el-height-adaptive-table="{bottomOffset: 10}"
+ highlight-current-row
+ v-el-height-adaptive-table="{bottomOffset: 50}"
>
diff --git a/hb_client/src/views/mtm/productprocess.vue b/hb_client/src/views/mtm/productprocess.vue
index 431e799..9b540f4 100644
--- a/hb_client/src/views/mtm/productprocess.vue
+++ b/hb_client/src/views/mtm/productprocess.vue
@@ -4,7 +4,7 @@
- 产品列表
@@ -14,33 +14,26 @@
border
fit
stripe
+ height="100"
+ @current-change="handleCurrentChange"
highlight-current-row
- height="660px"
- @current-change="handleCurrentChange">
-
+ v-el-height-adaptive-table="{bottomOffset: 10}"
+ >
-
- {{ scope.row.number }}
+ {{ scope.row.number }}
{{ scope.row.name }}
-
{{ scope.row.specification }}
-
-
-
-
-
-
-
+
流程分解
-
+
新增
@@ -259,6 +253,7 @@
border
fit
stripe
+ :height="halfHeight"
>
@@ -359,6 +354,7 @@
fit
stripe
style="width: 100%"
+ :height="halfHeight"
>
@@ -447,6 +443,7 @@
border
fit
stripe
+ :height="halfHeight"
>
@@ -536,6 +533,7 @@
新增
@@ -87,8 +86,8 @@
fit
stripe
highlight-current-row
- height="620"
- v-el-height-adaptive-table="{bottomOffset: 40}"
+ height="100"
+ v-el-height-adaptive-table="{bottomOffset: 42}"
>
@@ -127,7 +126,7 @@
stripe
highlight-current-row
height="620"
- v-el-height-adaptive-table="{bottomOffset: 40}"
+ v-el-height-adaptive-table="{bottomOffset: 42}"
>
@@ -204,7 +203,7 @@
stripe
highlight-current-row
height="620"
- v-el-height-adaptive-table="{bottomOffset: 40}"
+ v-el-height-adaptive-table="{bottomOffset: 42}"
>
diff --git a/hb_client/src/views/qm/product.vue b/hb_client/src/views/qm/product.vue
index 3c943fa..1884153 100644
--- a/hb_client/src/views/qm/product.vue
+++ b/hb_client/src/views/qm/product.vue
@@ -8,7 +8,6 @@
fit
stripe
highlight-current-row
- max-height="700"
height="100"
v-el-height-adaptive-table="{bottomOffset: 42}"
>
diff --git a/hb_client/src/views/qm/producttest.vue b/hb_client/src/views/qm/producttest.vue
index 10c9e74..9585dd4 100644
--- a/hb_client/src/views/qm/producttest.vue
+++ b/hb_client/src/views/qm/producttest.vue
@@ -7,7 +7,8 @@
fit
stripe
highlight-current-row
- max-height="600"
+ height="100"
+ v-el-height-adaptive-table="{bottomOffset: 42}"
>
diff --git a/hb_client/src/views/qm/unproduct.vue b/hb_client/src/views/qm/unproduct.vue
index b303293..0037a2f 100644
--- a/hb_client/src/views/qm/unproduct.vue
+++ b/hb_client/src/views/qm/unproduct.vue
@@ -4,12 +4,14 @@
@@ -70,8 +72,8 @@
fit
stripe
highlight-current-row
- height="620"
- v-el-height-adaptive-table="{ bottomOffset: 40 }"
+ height="100"
+ v-el-height-adaptive-table="{bottomOffset: 42}"
>
@@ -129,14 +131,13 @@
diff --git a/hb_client/src/views/wpm/need.vue b/hb_client/src/views/wpm/need.vue
index 4091f7b..407bbca 100644
--- a/hb_client/src/views/wpm/need.vue
+++ b/hb_client/src/views/wpm/need.vue
@@ -716,6 +716,7 @@
:title="formName"
:visible.sync="recordFinishedVisible"
:close-on-click-modal="false"
+ id="showForm"
>
@@ -742,6 +743,7 @@
+ 导出
@@ -767,6 +769,8 @@
import {getTestRecord, getTestRecordItem, putTestRecordItem, delTestRecordItem, subTestRecordItem} from "@/api/qm";
// import {genTree} from "@/utils";
import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+ import {saveAs} from "file-saver";
+ import htmlDocx from "html-docx-js/dist/html-docx";
const defaultetestitem = {};
export default {
inject: ['reload'],
@@ -934,6 +938,15 @@
// this.getLists();
},
methods: {
+ exportDom() {
+ let dom = document.querySelector("#showForm .el-dialog");
+ let str = dom.innerHTML;
+ debugger;
+ console.log(str);
+ let htmlStr = ` ${str}`;
+ saveAs(htmlDocx.asBlob(htmlStr, {orientation: "landscape"}), "报告.doc");
+ },
+
checkPermission,
handleClick(tab) {
this.listLoading = true;