fix: 优化和调整列

zhanbo.xu
Commit 5b51f55415134aa717ebd02a818bbdbd54702e4d 5b51f554 1 parent c611516b
Showing 4 changed files with 50 additions and 31 deletions
src/views/hs-code/index.vue
src/views/log-search/index.vue
src/views/reportingData/index.vue
src/views/reportingData/weight-adjust.vue
--- a/src/views/hs-code/index.vue
View file @5b51f55
+++ b/src/views/hs-code/index.vue
View file @5b51f55
@@ -106,6 +106,24 @@
       @sizeChange="sizeChange"
       @currentChange="currentChange"
     >
+      <template v-slot:skuname="scope">
+        <el-popover trigger="hover" placement="top">
+          <div class="name-wrapper-content">{{ scope.row.skuname }}</div>
+          <span slot="reference" class="name-wrapper">
+            {{ scope.row.skuname }}
+          </span>
+        </el-popover>
+      </template>
+      <template v-slot:declarationElement="scope">
+        <el-popover trigger="hover" placement="top">
+          <div class="name-wrapper-content">
+            {{ scope.row.declarationElement }}
+          </div>
+          <span slot="reference" class="name-wrapper">
+            {{ scope.row.declarationElement }}
+          </span>
+        </el-popover>
+      </template>
       <template slot="optionColumn">
         <el-table-column align="center" label="操作" width="150">
           <template slot-scope="scope">
@@ -156,13 +174,13 @@ export default {
         {
           name: "序号",
           value: "gnum",
-          width: "",
+          width: "60px",
           align: "left",
         },
         {
           name: "商品编号",
           value: "skuCode",
-          width: "",
+          width: "150px",
           align: "left",
         },
         {
@@ -170,29 +188,33 @@ export default {
           value: "skuname",
           width: "",
           align: "left",
+          slot: true,
+          showOverflowTooltip: false,
         },
         {
           name: "申报要素",
           value: "declarationElement",
           width: "",
           align: "left",
+          slot: true,
+          showOverflowTooltip: false,
         },
         {
           name: "第一法定单位",
           value: "unitLegalFirst",
-          width: "",
+          width: "130px",
           align: "left",
         },
         {
           name: "第二法定单位",
           value: "unitLegalSecond",
-          width: "",
+          width: "130px",
           align: "left",
         },
         {
           name: "更新时间",
           value: "updateTime",
-          width: "",
+          width: "140px",
           align: "left",
         },
       ],
@@ -390,4 +412,14 @@ export default {
   transform: translate(0, -50%);
   z-index: 10;
 }
+.name-wrapper {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  max-width: 100%;
+  display: inline-block;
+}
+.name-wrapper-content {
+  max-width: 400px;
+}
 </style>
--- a/src/views/log-search/index.vue
View file @5b51f55
+++ b/src/views/log-search/index.vue
View file @5b51f55
@@ -182,7 +182,7 @@ export default {
         {
           name: "操作接口",
           value: "interfaceName",
-          width: "",
+          width: "200px",
           align: "left",
           slot: true,
           showOverflowTooltip: false,
@@ -190,7 +190,7 @@ export default {
         {
           name: "IP地址",
           value: "ipAddress",
-          width: "150px",
+          width: "140px",
           align: "left",
         },
         {
@@ -352,7 +352,7 @@ export default {
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
-  max-width: 200px;
+  max-width: 100%;
   display: inline-block;
 }
 .name-wrapper-content {
--- a/src/views/reportingData/index.vue
View file @5b51f55
+++ b/src/views/reportingData/index.vue
View file @5b51f55
@@ -535,12 +535,6 @@ export default {
           align: "left",
         },
         {
-          name: "航班号",
-          value: "flightNumber",
-          width: "",
-          align: "left",
-        },
-        {
           name: "物流运单编号",
           value: "logisticsWaybillNumber",
           width: "",
@@ -553,6 +547,12 @@ export default {
           align: "left",
         },
         {
+          name: "航班号",
+          value: "flightNumber",
+          width: "",
+          align: "left",
+        },
+        {
           name: "电商企业名称",
           value: "ecomEntName",
           width: "",
--- a/src/views/reportingData/weight-adjust.vue
View file @5b51f55
+++ b/src/views/reportingData/weight-adjust.vue
View file @5b51f55
@@ -17,8 +17,6 @@
         label-position="left"
         size="small"
       >
-        <el-row :gutter="5">
-          <el-col :span="16">
         <Formitem label="提运单号" prop="billNo" type="edit">
           <el-input
             type="text"
@@ -31,8 +29,6 @@
             @change="inputChange"
           ></el-input>
         </Formitem>
-          </el-col>
-          <el-col :span="8">
         <Formitem label="件数" prop="count" type="edit">
           <el-input
             type="text"
@@ -45,10 +41,6 @@
             placeholder="请输入件数"
           ></el-input>
         </Formitem>
-          </el-col>
-        </el-row>
-        <el-row :gutter="5">
-          <el-col :span="12">
         <Formitem label="原毛重" prop="totalWeight" type="edit">
           <el-input
             type="text"
@@ -61,8 +53,6 @@
             placeholder="请输入原毛重"
           ></el-input>
         </Formitem>
-          </el-col>
-          <el-col :span="12">
         <Formitem label="修改后毛重" prop="weight" type="edit">
           <el-input
             type="text"
@@ -75,8 +65,6 @@
             @change="weightChange"
           ></el-input>
         </Formitem>
-          </el-col>
-          <el-col :span="24">
         <Formitem label="" prop="content" type="edit">
           <!-- <el-input
             type="textarea"
@@ -95,8 +83,6 @@
             </div>
           </div>
         </Formitem>
-          </el-col>
-        </el-row>
       </el-form>
     </div>
     <div class="dialogOption entrySave revokeOperation">
@@ -233,14 +219,15 @@ export default {
                 this.msgSuccess("修改成功");
                 this.cancelModify(1);
               } else {
-                this.alertWarningMsg(res.message);
+                this.msgError(res.message);
-                this.cancelModify(0);
+                // this.cancelModify(0);
+                this.dialogLoading = false;
               }
             })
             .catch((err) => {
               console.log(err);
               this.alertWarningMsg(err.message);
-              this.cancelModify(0);
+              // this.cancelModify(0);
             });
         } else {
           return false;