Merge branch 'master' of http://140.143.162.39:3000/shentun/peisweb

src/views/fee-settings/Asbitem.vue

@@ -1963,9 +1963,15 @@ export default {
     },
     //取消按钮
     cancellation() {
-      this.$message.info("操作取消");
+      postapi("/api/app/asbitem/getasbitemlist", { itemTypeId: this.initItemTypeId }).then(
+        (res) => {
+          if (res.code != -1) {
+            this.tableData = res.data;
+                  this.$message.info("操作取消");
       this.isshow = true;
-      this.tableData = this.initTableData;
+          }
+        }
+      );
     },
     //确定排序
     assertion() {

src/views/fee-settings/Item.vue

@@ -1909,7 +1909,7 @@ export default {
       getapi(`/api/app/item/in-item-type/${data.id}`).then((res) => {
         if (res.code != -1) {
           this.tableData = res.data;
-          this.initTableData = [...res.data];
+          // this.initTableData = [...res.data];
         }
         // this.getlist();
       });
@@ -2556,9 +2556,13 @@ export default {
     },
     //取消排序
     cancellation() {
-      this.$message.info("取消操作");
+      getapi(`/api/app/item/in-item-type/${this.initItemTypeId}`).then((res) => {
+        if (res.code != -1) {
+                this.$message.info("取消操作");
       this.isshow = true;
-      this.tableData = this.initTableData;
+          this.tableData = res.data;
+        }
+      });
     },
     //确定拖拽
     assertion() {

src/views/workload/peisworkload.vue

@@ -76,14 +76,15 @@
           "
           id="domTable"
         >
-          <div style="width: 47.7%;background-color: #fff; padding: 15px; border-radius: 8px;" ref="imageDom">
+          <div style="width: 47.7%;background-color: #fff; padding: 15px; border-radius: 8px;">
             <!-- <h3 align="center">登记员工作量统计</h3>
             - 53-18
             <h5 align="right" style="margin-bottom: 5px;">
               时间：<span>{{ startDate }}</span
               >至<span>{{ endDate }}</span>
             </h5> -->
-            <el-table
+            <div ref="imageDom">
+              <el-table
               border
               show-summary
               :summary-method="summarizeRegisterCount"
@@ -129,6 +130,7 @@
                 </el-table-column>
               </el-table-column>
             </el-table>
+            </div>
           </div>
           <div
             :style="
@@ -236,7 +238,9 @@ export default {
             printable: url,
             type: "image",
             documentTitle: "", // 标题
-            style: "@page{size:auto;margin: 0cm 1cm 0cm 1cm;}", // 去除页眉页脚
+            style: `@media print { @page {size: auto; margin: 0 0 0 0; } body{margin:0 5px}canvas{page-break-after: always;page-break-inside: avoid;
+page-break-after: avoid;
+page-break-before: avoid;}}`, // 去除页眉页脚
           });
         });
         cloneDom.style.display = "none";