feat: 修复BUG

zhanbo.xu
Commit 931c5212dcf6a4d217088de800f76fc0b180af35 931c5212 1 parent 57bbd9d9
Showing 3 changed files with 179 additions and 36 deletions
src/assets/styles/variables.scss
src/views/reportingData/index.vue
src/views/summaryEdit/dialog.vue
--- a/src/assets/styles/variables.scss
View file @931c521
+++ b/src/assets/styles/variables.scss
View file @931c521
 // base color
 $blue: #324157;
-$light-blue: #3A71A8;
+$light-blue: #3a71a8;
-$red: #C03639;
+$red: #c03639;
-$pink: #E65D6E;
+$pink: #e65d6e;
-$green: #30B08F;
+$green: #30b08f;
-$tiffany: #4AB7BD;
+$tiffany: #4ab7bd;
-$yellow: #FEC171;
+$yellow: #fec171;
-$panGreen: #30B08F;
+$panGreen: #30b08f;
 // sidebar
 $menuText: #bfcbd9;
-$menuActiveText: #4D148C;
+$menuActiveText: #4d148c;
-$subMenuActiveText: #4D148C; // https://github.com/ElemeFE/element/issues/12951
+$subMenuActiveText: #4d148c; // https://github.com/ElemeFE/element/issues/12951
 $menuBg: #304156;
 $menuHover: #263445;
@@ -24,16 +24,16 @@ $sidebarLightTitle: #001529;
 $subMenuBg: #1f2d3d;
 $subMenuHover: #001528;
-$sideBarWidth: 220px;
+$sideBarWidth: 210px;
-$fedexColor: #4D148C;
+$fedexColor: #4d148c;
-$fedexBorder: #E3E3E3;
+$fedexBorder: #e3e3e3;
-$fedexButton: #007AB7;
+$fedexButton: #007ab7;
 $fedexError: #de002e;
-$fedexBottonColor: #FF6200;
+$fedexBottonColor: #ff6200;
-$formItemBackgroundColor: #F2F2F2;
+$formItemBackgroundColor: #f2f2f2;
-$fedexTablebackgroundColor: #FAFAFA;
+$fedexTablebackgroundColor: #fafafa;
 $fedexTableBorderColor: #e3e3e3;
-$formDisabledColor: #8E8E8E;
+$formDisabledColor: #8e8e8e;
 // the :export directive is the magic sauce for webpack
 // https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass
@@ -59,5 +59,4 @@ $formDisabledColor: #8E8E8E;
   formDisabledColor: $formDisabledColor;
   fedexTablebackgroundColor: $fedexTablebackgroundColor;
   fedexTableBorderColor: $fedexTableBorderColor;
-
 }
--- a/src/views/reportingData/index.vue
View file @931c521
+++ b/src/views/reportingData/index.vue
View file @931c521
@@ -400,6 +400,11 @@
         :max-height="tableMaxheight"
         :min-height="300"
         ref="tableRef"
+        show-overflow
+        show-header-overflow
+        show-footer-overflow
+        :virtual-y-config="{ enabled: true, gt: 0 }"
+        :auto-resize="false"
         :data="tableData"
         :column-config="{ resizable: true }"
         :row-config="{ isCurrent: true, isHover: true }"
@@ -409,7 +414,12 @@
         @checkbox-all="tableSelectAll"
       >
         <vxe-column type="checkbox" width="50"></vxe-column>
-        <vxe-column field="billNo" title="提运单号" :show-overflow="true">
+        <vxe-column
+          field="billNo"
+          title="提运单号"
+          :show-overflow="true"
+          width="110"
+        >
           <template #default="{ row }">
             <el-tooltip
               class="item"
@@ -424,8 +434,14 @@
         <vxe-column
           field="logisticsWaybillNumber"
           title="物流运单编号"
+          width="110"
         ></vxe-column>
-        <vxe-column field="orderno" title="订单编号" :show-overflow="true">
+        <vxe-column
+          field="orderno"
+          title="订单编号"
+          :show-overflow="true"
+          width="100"
+        >
           <template #default="{ row }">
             <el-tooltip
               class="item"
@@ -437,7 +453,7 @@
             </el-tooltip>
           </template>
         </vxe-column>
-        <vxe-column field="flightNumber" title="航班号"></vxe-column>
+        <vxe-column field="flightNumber" title="航班号" width="80"></vxe-column>
         <vxe-column
           field="regulatoryVenueCode"
           title="监管场所代码"
@@ -468,8 +484,16 @@
           field="orderReceiptStatus"
           title="订单回执"
           :filters="receiptStatusFilters"
+          :show-overflow="true"
+          width="130"
         >
           <template #default="{ row }">
+            <template
+              v-if="
+                row[`orderReceiptStatus${row.declareId}`] &&
+                row.orderReceiptStatus
+              "
+            >
               <el-popover
                 placement="left"
                 popper-class="portLogPopper"
@@ -489,7 +513,9 @@
                   ></i>
                 </div>
                 <div style="margin-bottom: 5px">
-                <span style="font-weight: 700; color: #515a6e">订单编号：</span>
+                  <span style="font-weight: 700; color: #515a6e"
+                    >订单编号：</span
+                  >
                   {{ row.orderno }}
                 </div>
                 <el-table
@@ -515,7 +541,7 @@
                 <el-button
                   type="text"
                   slot="reference"
-                @click="
+                  @click.stop="
                     popoverChange({ data: row, status: 'orderReceiptStatus' })
                   "
                 >
@@ -523,13 +549,29 @@
                 </el-button>
               </el-popover>
             </template>
+            <template v-else>
+              <el-button
+                type="text"
+                @click.stop="
+                  popoverChange({ data: row, status: 'orderReceiptStatus' })
+                "
+              >
+                {{ row.orderReceiptStatus }}
+              </el-button>
+            </template>
+          </template>
         </vxe-column>
         <vxe-column
           field="wayBillReceipt"
           title="运单回执"
           :filters="receiptStatusFilters"
+          :show-overflow="true"
+          width="130"
         >
           <template #default="{ row }">
+            <template
+              v-if="row[`wayBillReceipt${row.declareId}`] && row.wayBillReceipt"
+            >
               <el-popover
                 placement="left"
                 popper-class="portLogPopper"
@@ -549,7 +591,9 @@
                   ></i>
                 </div>
                 <div style="margin-bottom: 5px">
-                <span style="font-weight: 700; color: #515a6e">订单编号：</span>
+                  <span style="font-weight: 700; color: #515a6e"
+                    >订单编号：</span
+                  >
                   {{ row.orderno }}
                 </div>
                 <el-table
@@ -575,25 +619,47 @@
                 <el-button
                   type="text"
                   slot="reference"
-                @click="popoverChange({ data: row, status: 'wayBillReceipt' })"
+                  @click.stop="
+                    popoverChange({ data: row, status: 'wayBillReceipt' })
+                  "
                 >
                   {{ row.wayBillReceipt }}
                 </el-button>
               </el-popover>
             </template>
+            <template v-else>
+              <el-button
+                type="text"
+                @click.stop="
+                  popoverChange({ data: row, status: 'wayBillReceipt' })
+                "
+              >
+                {{ row.wayBillReceipt }}
+              </el-button>
+            </template>
+          </template>
         </vxe-column>
         <vxe-column
           field="listReceiptStatus"
           title="清单回执"
           :filters="listStatusFilters"
+          :show-overflow="true"
+          width="130"
         >
           <template #default="{ row }">
+            <template
+              v-if="
+                row[`listReceiptStatus${row.declareId}`] &&
+                row.listReceiptStatus
+              "
+            >
               <el-popover
                 placement="left"
                 popper-class="portLogPopper"
                 :visible-arrow="false"
                 title=""
                 width="750"
+                :offset="200"
                 trigger="manual"
                 v-model="row[`listReceiptStatus${row.declareId}`]"
               >
@@ -607,7 +673,9 @@
                   ></i>
                 </div>
                 <div style="margin-bottom: 5px">
-                <span style="font-weight: 700; color: #515a6e">订单编号：</span>
+                  <span style="font-weight: 700; color: #515a6e"
+                    >订单编号：</span
+                  >
                   {{ row.orderno }}
                 </div>
                 <el-table
@@ -633,7 +701,7 @@
                 <el-button
                   type="text"
                   slot="reference"
-                @click="
+                  @click.stop="
                     popoverChange({ data: row, status: 'listReceiptStatus' })
                   "
                 >
@@ -641,13 +709,33 @@
                 </el-button>
               </el-popover>
             </template>
+
+            <template v-else>
+              <el-button
+                type="text"
+                @click.stop="
+                  popoverChange({ data: row, status: 'listReceiptStatus' })
+                "
+              >
+                {{ row.listReceiptStatus }}
+              </el-button>
+            </template>
+          </template>
         </vxe-column>
         <vxe-column
           field="totalSplitOrderStatus"
           title="清单总分单回执"
           :filters="totalScoreStatusFilters"
+          :show-overflow="true"
+          width="145"
         >
           <template #default="{ row }">
+            <template
+              v-if="
+                row[`totalSplitOrderStatus${row.declareId}`] &&
+                row.totalSplitOrderStatus
+              "
+            >
               <el-popover
                 placement="left"
                 popper-class="portLogPopper"
@@ -660,14 +748,20 @@
                 <div style="text-align: right">
                   <i
                     @click.stop="
-                    popoverCloseNew(row, row.declareId, 'totalSplitOrderStatus')
+                      popoverCloseNew(
+                        row,
+                        row.declareId,
+                        'totalSplitOrderStatus'
+                      )
                     "
                     class="el-icon-close"
                     style="cursor: pointer; font-size: 20px; font-weight: 700"
                   ></i>
                 </div>
                 <div style="margin-bottom: 5px">
-                <span style="font-weight: 700; color: #515a6e">订单编号：</span>
+                  <span style="font-weight: 700; color: #515a6e"
+                    >订单编号：</span
+                  >
                   {{ row.orderno }}
                 </div>
                 <el-table
@@ -693,14 +787,28 @@
                 <el-button
                   type="text"
                   slot="reference"
-                @click="
+                  @click.stop="
-                  popoverChange({ data: row, status: 'totalSplitOrderStatus' })
+                    popoverChange({
+                      data: row,
+                      status: 'totalSplitOrderStatus',
+                    })
                   "
                 >
                   {{ row.totalSplitOrderStatus }}
                 </el-button>
               </el-popover>
             </template>
+            <template v-else>
+              <el-button
+                type="text"
+                @click.stop="
+                  popoverChange({ data: row, status: 'totalSplitOrderStatus' })
+                "
+              >
+                {{ row.totalSplitOrderStatus }}
+              </el-button>
+            </template>
+          </template>
         </vxe-column>
         <vxe-column title="操作" fixed="right" width="110">
           <template #default="{ row }">
@@ -1347,6 +1455,7 @@ export default {
       row[`${type}${declareId}`] = false;
       this.$forceUpdate();
     },
+
     popoverChange(val) {
       this.popoverTableData = [];
       if (this.visiblePopover.flag) {
@@ -1696,5 +1805,8 @@ export default {
   .vxe-table--render-default.border--outer .vxe-cell--col-resizable:before {
     background-color: #ffffff;
   }
+  .portLogPopper {
+    right: 135px !important;
+  }
 }
 </style>
--- a/src/views/summaryEdit/dialog.vue
View file @931c521
+++ b/src/views/summaryEdit/dialog.vue
View file @931c521
@@ -2,7 +2,7 @@
   <el-dialog
     class="entryDialog classCUploadDialog"
     :title="pageData.ebpName"
-    :visible.sync="outerVisible"
+    :visible="outerVisible"
     :show-close="false"
     width="900px"
     :close-on-click-modal="false"
@@ -21,9 +21,9 @@
     </div>
     <Table
       class="fedexDetialTable fedexSreachTable"
-      ref="entryTable"
       :data="pageData.value"
       :headerData="headerData"
+      :maxHeight="tableMaxheight"
       :border="true"
       :pagination="true"
       :order="false"
@@ -36,12 +36,13 @@
       @tableSelect="tableSelect"
       @tableSelectAll="tableSelectAll"
       :selected="tableSelected"
+      :loading="loadings.searchLoading"
     >
     </Table>
     <div class="dialogOption entrySave">
       <el-button
         class="entrySaveButton"
-        :disabled="loadings.submitLoading"
+        :loading="loadings.submitLoading"
         @click="submit"
       >
         提 交
@@ -80,6 +81,7 @@ export default {
       loadings: {
         dialogLoading: false,
         submitLoading: false,
+        searchLoading: false,
       },
       title: "",
       tableSelected: [],
@@ -126,8 +128,12 @@ export default {
           align: "left",
         },
       ],
+      tableMaxheight: null,
     };
   },
+  mounted() {
+    this.tableMaxheight = window.innerHeight - 400;
+  },
   methods: {
     tableSelect(val) {
       this.tableSelected = val.selection;
@@ -136,10 +142,12 @@ export default {
       this.tableSelected = val;
     },
     fetchPreview() {
+      this.loadings.searchLoading = true;
       preview({
         ...this.selected,
         ...this.page,
-      }).then((res) => {
+      })
+        .then((res) => {
           if (res.code === "200") {
             console.log(res.data);
             this.pageData = {
@@ -149,6 +157,12 @@ export default {
             console.log(this.pageData);
             this.page.total = res.data.pageData.totalItems;
           }
+        })
+        .catch((err) => {
+          console.log(err);
+        })
+        .finally(() => {
+          this.loadings.searchLoading = false;
         });
     },
     search(val) {
@@ -171,17 +185,28 @@ export default {
         this.msgError("请选择数据");
         return;
       }
+      this.loadings.submitLoading = true;
       declareSummaryApplication({
         ...this.selected,
         logisticsNos: this.tableSelected.map((item) => item.logisticsNo),
-      }).then((response) => {
+      })
+        .then((response) => {
           if (response.data) {
             this.msgSuccess("汇总申报成功");
+            this.close(true);
+            this.$nextTick(() => {
               this.$router.push("summaryDataSearch");
+            });
           } else {
             this.msgError(response.message);
           }
+        })
+        .catch((err) => {
+          console.log(err);
+        })
+        .finally(() => {
+          this.loadings.submitLoading = false;
         });
     },
     //新增
@@ -216,4 +241,11 @@ export default {
 <style lang="scss" scoped>
 @import "@/assets/styles/variables.scss";
+.entryDialog {
+  ::v-deep {
+    .el-dialog {
+      margin-top: 5vh !important;
+    }
+  }
+}
 </style>