update docs_0822

src/assets/scss/common.scss

@@ -538,7 +538,7 @@ img {
 .aui-content {
   position: relative;
   padding: $content--padding;
-  min-height: calc(100vh - #{$navbar--height});
+  min-height: calc(100vh - 30px - #{$navbar--height});
   &__wrapper {
     position: relative;
     margin-left: $sidebar--width;
@@ -673,7 +673,8 @@ img {
         z-index: 830;
       }
       > .el-tab-pane {
-        min-height: calc(#{$content--fill-height-tabs});
+        // min-height: calc(#{$content--fill-height-tabs});
+        min-height: calc(100vh - 144px);
         > .aui-card--fill > .el-card__body {
           min-height: calc(#{$content--fill-height-tabs} - 2px);
         }

src/components/DialogJustForm.vue

@@ -792,7 +792,7 @@ export default {
 
 .dialog-just-form >>> .el-form {
   padding: 16px;
-  max-height: 55vh;
+  max-height: 56vh;
   overflow-y: auto;
 }
 

src/views/atomViews/ListViewWithHead.vue

@@ -238,7 +238,9 @@ export default {
             page: this.page,
             limit: this.size,
           };
-
+      // this.dataList = [{}];
+      // this.tableLoading = false;
+      // return;
       this.$http[this.urls.pageIsPostApi ? "post" : "get"](
         this.urls.page,
         this.urls.pageIsPostApi
@@ -666,6 +668,38 @@ export default {
         case "导入":
           this.openUploadDialog();
           break;
+        case "导出":
+          this.$http({
+            method: "post",
+            url: this.urls.export,
+            data: { page: this.page },
+            responseType: "blob",
+          }).then((res) => {
+            // console.log("导出", res);
+            const filename = res.headers['content-disposition'].split('filename=')[1];
+            const blob = new Blob([res.data]);
+            /** 通知 */
+            this.$notify({
+              title: "成功",
+              message: "开始下载",
+              type: "success",
+              duration: 1200,
+            });
+            if ("download" in document.createElement("a")) {
+              const alink = document.createElement("a");
+              alink.download = filename;
+              alink.style.display = "none";
+              alink.target = "_blank";
+              alink.href = URL.createObjectURL(blob);
+              document.body.appendChild(alink);
+              alink.click();
+              URL.revokeObjectURL(alink.href);
+              document.body.removeChild(alink);
+            } else {
+              navigator.msSaveBlob(blob, filename);
+            }
+          });
+          break;
         case "手动添加": {
           this.openDialog();
           return;
@@ -762,14 +796,14 @@ export default {
               duration: 1500,
             });
           }
-          // 尾托检测
+          // // 尾托检测 - 由后端限制
-          if (this.tableSelectedIds.length == 1 && this.tableSelectedIds[0].typeDictValue != "2") {
+          // if (this.tableSelectedIds.length == 1 && this.tableSelectedIds[0].typeDictValue != "2") {
-            return this.$message({
+          //   return this.$message({
-              message: "只能选择尾托",
+          //     message: "只能选择尾托",
-              type: "warning",
+          //     type: "warning",
-              duration: 1500,
+          //     duration: 1500,
-            });
+          //   });
-          }
+          // }
           this.palletDialogVisible = true;
           this.$nextTick(() => {
             this.$refs["pallet-dialog"].init();

src/views/modules/pms/workReport/config.js

@@ -8,12 +8,15 @@ export default function () {
   const tableProps = [
     { width: 120, prop: "orderCode", label: "订单号", fixed: "left" },
     { width: 60, prop: "orderCate", label: "子号" },
+    { width: 60, prop: "qty", label: "生产数量" },
+    { width: 128, prop: "goodqty", label: "合格数量" },
+    { width: 128, prop: "badqty", label: "报废数量" },
+    { width: 128, prop: "badratio", label: "报废率" },
     { width: 100, prop: "productCode", label: "物料" },
     { width: 100, prop: "shapeCode", label: "砖型" },
     { width: 160, prop: "brand", label: "牌号" },
     { width: 100, prop: "bomCode", label: "配方编码" },
     // { width: 60, prop: "ai", label: "版本" },
-    { width: 60, prop: "prodqty", label: "数量" },
     { width: 80, prop: "blenderCode", label: "混料机号" },
     { width: 80, prop: "pressCode", label: "压机号" },
     { width: 80, prop: "kilnCode", label: "隧道窑号" },
@@ -34,16 +37,21 @@ export default function () {
     { width: 120, prop: "prodqty", label: "要求生产数量" },
     { width: 128, prop: "paperboard", label: "是否贴纸板", filter: (val) => ["否", "是"][val] },
     { width: 128, prop: "palletType", label: "托盘类型", filter: dictFilter("pallet_type") },
-    { width: 128, prop: "goodqty", label: "合格数量" },
-    { width: 128, prop: "badqty", label: "报废数量" },
     { width: 120, prop: "remark", label: "备注" },
-    { width: 120, prop: "createTime", label: "添加时间", filter: timeFilter },
+    { width: 120, prop: "createTime", label: "报工时间", filter: timeFilter },
+    { width: 120, prop: "creatorName", label: "报工人" },
     {
       width: 128,
       prop: "team",
       label: "班次",
       filter: (val) => (val != null ? ["早班", "中班", "晚班"][val] : "-"),
     },
+    {
+      width: 120,
+      prop: "externalCode",
+      label: "工序",
+      filter: (val) => (val != null ? ["压机", "检测线", "包装"][val] : "-"),
+    },
     {
       prop: "operations",
       name: "操作",
@@ -130,6 +138,16 @@ export default function () {
         plain: true,
       },
     },
+    {
+      button: {
+        type: "warning",
+        name: "导出",
+        permission: "pms:workReport:export",
+      },
+      bind: {
+        plain: true,
+      },
+    },
   ];
 
   /**
@@ -158,9 +176,9 @@ export default function () {
             label: "工序",
             prop: "externalCode",
             options: [
-              { label: "压机", value: '0' },
+              { label: "压机", value: "0" },
-              { label: "检测线", value: '1' },
+              { label: "检测线", value: "1" },
-              { label: "包装", value: '2' },
+              { label: "包装", value: "2" },
             ],
             elparams: { placeholder: "请选择工序" },
           },
@@ -171,9 +189,9 @@ export default function () {
             label: "班次",
             prop: "team",
             options: [
-              { label: "早班", value: '0' },
+              { label: "早班", value: "0" },
-              { label: "中班", value: '1' },
+              { label: "中班", value: "1" },
-              { label: "晚班", value: '2' },
+              { label: "晚班", value: "2" },
             ],
             elparams: { placeholder: "请选择班次" },
           },
@@ -268,6 +286,7 @@ export default function () {
       base: "/pms/workReport",
       page: "/pms/workReport/pageView",
       pageIsPostApi: true,
+      export: '/pms/workReport/export',
     },
   };
 }