代码更新，图标增加，bug修复

jinhui.wang
Commit 894ebc60a091d99802ea408e12164ad16a0cd57c 894ebc60 1 parent 638905f1
Showing 7 changed files with 64 additions and 38 deletions
src/assets/icons/svg/cargo.svg
src/assets/icons/svg/download.svg
src/assets/icons/svg/home.svg
src/assets/icons/svg/role.svg
src/components/Table/index.vue
src/views/allocationConfig/cargoAllocation/index.vue
src/views/basicInformation/queryCargo/index.vue
--- a/src/assets/icons/svg/cargo.svg 0 → 100644
View file @894ebc6
+++ b/src/assets/icons/svg/cargo.svg 0 → 100644
View file @894ebc6
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1640932660027" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9915" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M682.496 420.864V597.333333a42.666667 42.666667 0 0 0 85.333333 0V388.565333l128-48.469333v436.736l-341.333333 124.245333V469.333333l128-48.469333zM415.957333 161.834667L511.829333 128l362.666667 128-113.450667 40.021333L416 161.834667z m-102.229333 36.096l345.088 134.186666L511.829333 384l-362.666666-128 164.565333-58.069333z m212.736 799.402666l426.624-155.136a42.666667 42.666667 0 0 0 28.074667-40.106666V243.2a42.666667 42.666667 0 0 0-28.074667-40.106667L526.506667 48.042667a42.666667 42.666667 0 0 0-29.354667 0.085333L70.570667 205.397333A42.666667 42.666667 0 0 0 42.666667 245.674667l3.285333 556.714666a42.666667 42.666667 0 0 0 27.989333 39.808l423.253334 155.093334a42.666667 42.666667 0 0 0 29.269333 0.042666zM469.162667 469.333333v429.226667l-341.333334-124.202667V337.621333l341.333334 131.712z" p-id="9916"></path></svg>
\ No newline at end of file
--- a/src/assets/icons/svg/download.svg
View file @894ebc6
+++ b/src/assets/icons/svg/download.svg
View file @894ebc6
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1569915748289" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3062" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M768.35456 416a256 256 0 1 0-512 0 192 192 0 1 0 0 384v64a256 256 0 0 1-58.88-505.216 320.128 320.128 0 0 1 629.76 0A256.128 256.128 0 0 1 768.35456 864v-64a192 192 0 0 0 0-384z m-512 384h64v64H256.35456v-64z m448 0h64v64h-64v-64z" fill="#333333" p-id="3063"></path><path d="M539.04256 845.248V512.192a32.448 32.448 0 0 0-32-32.192c-17.664 0-32 14.912-32 32.192v333.056l-36.096-36.096a32.192 32.192 0 0 0-45.056 0.192 31.616 31.616 0 0 0-0.192 45.056l90.88 90.944a31.36 31.36 0 0 0 22.528 9.088 30.08 30.08 0 0 0 22.4-9.088l90.88-90.88a32.192 32.192 0 0 0-0.192-45.12 31.616 31.616 0 0 0-45.056-0.192l-36.096 36.096z" fill="#333333" p-id="3064"></path></svg>
\ No newline at end of file
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1569915748289" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3062" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M768.35456 416a256 256 0 1 0-512 0 192 192 0 1 0 0 384v64a256 256 0 0 1-58.88-505.216 320.128 320.128 0 0 1 629.76 0A256.128 256.128 0 0 1 768.35456 864v-64a192 192 0 0 0 0-384z m-512 384h64v64H256.35456v-64z m448 0h64v64h-64v-64z" p-id="3063"></path><path d="M539.04256 845.248V512.192a32.448 32.448 0 0 0-32-32.192c-17.664 0-32 14.912-32 32.192v333.056l-36.096-36.096a32.192 32.192 0 0 0-45.056 0.192 31.616 31.616 0 0 0-0.192 45.056l90.88 90.944a31.36 31.36 0 0 0 22.528 9.088 30.08 30.08 0 0 0 22.4-9.088l90.88-90.88a32.192 32.192 0 0 0-0.192-45.12 31.616 31.616 0 0 0-45.056-0.192l-36.096 36.096z" p-id="3064"></path></svg>
\ No newline at end of file
--- a/src/assets/icons/svg/home.svg 0 → 100644
View file @894ebc6
+++ b/src/assets/icons/svg/home.svg 0 → 100644
View file @894ebc6
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1645581110679" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2204" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M950.555 411.291l-380.258-300.594c-32.737-25.963-84.018-25.963-116.754 0l-380.097 300.594c-13.062 10.321-15.158 29.189-4.999 42.090s28.705 15.158 41.768 4.999l11.772-9.676v363.326c0 51.443 54.346 89.985 101.918 89.985h599.899c47.089 0 78.052-36.123 78.052-89.985v-362.036l10.966 8.386c5.483 4.354 12.256 6.451 18.868 6.451 8.87 0 17.739-3.87 23.706-11.45 10.321-12.901 8.225-31.769-4.838-42.090zM481.924 842.025v-166.424c0-8.225 14.997-12.417 29.995-12.417s29.995 4.192 29.995 12.417v166.263l-59.99 0.161zM842.025 812.030c0 19.836-5.483 29.995-18.062 29.995h-221.414c0-0.484-0.645-0.806-0.645-1.29v-165.133c0-34.833-28.059-72.407-89.985-72.407s-89.985 37.574-89.985 72.407v165.133c0 0.484 0.806 0.806 0.806 1.29h-198.676c-18.868 0-41.929-16.287-41.929-29.995v-410.899l308.174-243.346c11.127-8.708 31.124-8.708 42.090 0l309.464 244.797v409.447z" p-id="2205"></path></svg>
\ No newline at end of file
--- a/src/assets/icons/svg/role.svg 0 → 100644
View file @894ebc6
+++ b/src/assets/icons/svg/role.svg 0 → 100644
View file @894ebc6
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1640932917338" class="icon" viewBox="0 0 1333 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="16956" xmlns:xlink="http://www.w3.org/1999/xlink" width="260.3515625" height="200"><defs><style type="text/css"></style></defs><path d="M 1101.48 342.52 a 155.844 155.844 0 1 0 -226.753 0 a 244.675 244.675 0 0 0 -53.7662 38.1818 A 197.922 197.922 0 0 0 484.34 373.688 a 243.896 243.896 0 0 0 -63.1169 -48.3117 a 155.844 155.844 0 1 0 -226.753 0 A 245.454 245.454 0 0 0 62.003 544.337 a 38.961 38.961 0 0 0 77.9221 0 a 168.311 168.311 0 0 1 298.441 -105.974 a 38.1818 38.1818 0 0 0 17.1428 13.2468 a 190.909 190.909 0 0 0 66.2337 180.78 a 319.48 319.48 0 0 0 -189.351 290.649 a 38.961 38.961 0 0 0 77.9221 0 a 241.559 241.559 0 0 1 482.337 0 a 38.961 38.961 0 0 0 77.9221 0 a 319.48 319.48 0 0 0 -189.351 -290.649 a 197.922 197.922 0 0 0 69.3506 -149.61 a 196.363 196.363 0 0 0 0 -28.052 a 37.4026 37.4026 0 0 0 17.922 -10.1299 a 166.753 166.753 0 0 1 123.117 -52.9869 A 168.311 168.311 0 0 1 1152.9 559.143 a 38.961 38.961 0 0 0 77.9221 0 a 245.454 245.454 0 0 0 -129.351 -216.623 Z M 308.236 295.767 a 77.9221 77.9221 0 1 1 77.9221 -77.9221 a 77.9221 77.9221 0 0 1 -77.9221 77.9221 Z m 342.857 311.688 a 120.779 120.779 0 1 1 121.558 -124.675 A 121.558 121.558 0 0 1 651.093 607.454 Z m 336.623 -290.649 a 77.9221 77.9221 0 1 1 77.9221 -77.9221 a 77.9221 77.9221 0 0 1 -77.9221 74.8052 Z" p-id="16957"></path></svg>
\ No newline at end of file
--- a/src/components/Table/index.vue
View file @894ebc6
+++ b/src/components/Table/index.vue
View file @894ebc6
@@ -229,6 +229,7 @@ export default {
       if (this.shiftKey) {
         const sum = Math.abs(this.start - end);
         const min = Math.min(this.start, end);
+        const max = Math.max(this.start, end);
         let i;
         if (this.start === -1 && selection.includes(this.data[row.index])) {
           for (i = 0; i < sum; i++) {
@@ -238,15 +239,19 @@ export default {
         } else if (selection.includes(this.data[row.index])) {
           if (!selection.includes(this.data[this.start])) {
             this.$refs.tables.toggleRowSelection(this.data[this.start], true);
-            this.selectTable.push(this.data[this.start]);
+            if(this.selectTable.includes(this.data[this.start])){
+              this.selectTable.push(this.data[this.start]);
+            }
           }
-          for (i = this.start + 1; i <= this.start + sum; i++) {
+          for (i = min; i <= sum + min; i++) {
             this.$refs.tables.toggleRowSelection(this.data[i], true);
-            this.selectTable.push(this.data[i]);
+            if(!this.selectTable.includes(this.data[i])){
+              this.selectTable.push(this.data[i]);
+            } 
           }
         } else if (!selection.includes(this.data[row.index])) {
-          this.selectTable.splice(end - 1, sum + 1);
+          this.selectTable.splice(min > 1 ? min - 2 : min, sum + 1);
-          for (i = end; i <= this.start; i++) {
+          for (i = min; i <= max; i++) {
             this.$refs.tables.toggleRowSelection(this.data[i], false);
           }
         }
@@ -254,7 +259,7 @@ export default {
       } else {
         this.start = end;
         if (selection.includes(this.data[end])) {
-          this.selectTable.push(row);
+          this.selectTable = selection;
         } else {
           for (let i = 0; i < this.selectTable.length; i++) {
             if (this.selectTable[i].index == row.index) {
@@ -263,10 +268,11 @@ export default {
           }
         }
       }
-      selection = this.selectTable;
+      selection = this.selectTable.sort(this.compare('index','ascending'));
       this.$emit("tableSelect", { selection, row });
     },
     tableSelectAll(selection) {
+      this.selectTable = selection;
       this.$emit("tableSelectAll", selection);
     },
     SelectChange(selection) {
@@ -289,7 +295,7 @@ export default {
     //   console.log(val);
     // },
     sortChange({ column, prop, order }) {
-      this.$emit("sortChange",{prop:prop, order:order})
+      this.$emit("sortChange", { prop: prop, order: order });
     },
     compare(propertyName, sort) {
       return function (obj1, obj2) {
--- a/src/views/allocationConfig/cargoAllocation/index.vue
View file @894ebc6
+++ b/src/views/allocationConfig/cargoAllocation/index.vue
View file @894ebc6
@@ -1016,27 +1016,25 @@ export default {
     },
     //排序
     sortChange(val){
-      this.tableData.sort(this.$refs.newTables.compare(val.prop,val.order));
+      let data = []
+      let nullData = []
+      this.tableData.forEach(item=>{
+          if(item[val.prop]){
+            data.push(item)
+          }else{
+            nullData.push(item)
+          }
+        })
+        data = data.sort(this.$refs.newTables.compare(val.prop,val.order))
+      if(val.order != "ascending"){
+        this.tableData = nullData.concat(data)
+      }else{
+        this.tableData = data.concat(nullData)
+      }
     },
     //添加到航班
     addFit() {
-      let open = true;
+      this.dialogVisible = true;
-      this.tableSelection.forEach((item) => {
-        if (item.statusId != 107966) {
-          open = false;
-        }
-      });
-      if (open) {
-        this.dialogVisible = open;
-      } else {
-        this.$message({
-          message: "包含不可手动配舱货物",
-          type: "warning",
-        });
-        this.tableSelection = [];
-        this.cargoTotal();
-        this.$refs.newTables.clearTable();
-      }
     },
     //关闭弹框
     dialogBeforeClose(val) {
--- a/src/views/basicInformation/queryCargo/index.vue
View file @894ebc6
+++ b/src/views/basicInformation/queryCargo/index.vue
View file @894ebc6
@@ -243,8 +243,8 @@
           <span style="paddingRight: 50px">总重量:{{ allWeight }}</span>
           <span>总件数:{{ allQty }}</span>
         </div>
-        <RightToolbar :showSearch.sync="formShow" size="small"></RightToolbar>
+        <!-- <RightToolbar :showSearch.sync="formShow" size="small"></RightToolbar> -->
-        <!-- <div style="formShow" @click="formShow = !formShow">{{formShow?'收起条件':'更多条件'}}</div> -->
+        <div class="formShow" @click="formShow = !formShow"><i class="el-icon-s-tools"></i>{{formShow?'收起条件':'更多条件'}}</div>
       </div>
     </el-form>
     <Tables
@@ -256,7 +256,7 @@
       :limitSize="limitSize"
       :limitStart="limitStart"
       :shiftKey="shiftKey"
-      height="430"
+      height="550"
       @tableSelect="tableSelect"
       @tableSelectAll="tableSelectAll"
       @currentChange="currentChange"
@@ -755,12 +755,9 @@ export default {
       limitSize: 100, //无限制-1
       page:1,
       progress:0,
-      formShow:true,
+      formShow:false,
     };
   },
-  activated(){
-    console.log("cargo")
-  },
   created() {
     //查询条件
     findConditionData().then((res) => {
@@ -826,6 +823,7 @@ export default {
       this.$refs.newTables.clearTable();
       this.cargoTotal();
     },
+    //数据初始化
     dataInfo(){
       if(this.formData.customsReceiptStatusId != null && this.formData.customsReceiptStatusId.length < 1){
         this.formData.customsReceiptStatusId = null;
@@ -859,6 +857,7 @@ export default {
         this.formData.cargoPlaneEnd = null;
       }
     },
+    //总和
     cargoTotal(){
       this.allWeight = 0;
       this.allQty = 0;
@@ -867,25 +866,43 @@ export default {
           this.allWeight = this.allWeight + item.actualWeight;
           this.allQty = this.allQty + item.qty;
         })
-        this.allWeight = this.allWeight.toFixed();
+        this.allWeight = this.allWeight.toFixed(2);
         this.allQty = this.allQty.toFixed();
       }
     },
+    //表格多选
     tableSelect(val){
       this.selectTable = val.selection;
       this.cargoTotal();
     },
+    //表格全选
     tableSelectAll(val){
       this.selectTable = val;
       this.cargoTotal();
     },
+    //分页
     currentChange(val){
       this.formData.limitStart = val.start;
       this.page = val.page;
       this.select()
     },
+    //排序
     sortChange(val){
-      this.tableData.sort();
+      let data = []
+      let nullData = []
+      this.tableData.forEach(item=>{
+          if(item[val.prop]){
+            data.push(item)
+          }else{
+            nullData.push(item)
+          }
+        })
+        data = data.sort(this.$refs.newTables.compare(val.prop,val.order))
+      if(val.order != "ascending"){
+        this.tableData = nullData.concat(data)
+      }else{
+        this.tableData = data.concat(nullData)
+      }
     },
     // 导出表格
     xlse(page) {
@@ -908,7 +925,7 @@ export default {
           this.downLoadingTip.tip = "";
         })
       } else {
-        if(this.totalCount < 100000){
+        if(this.totalCount < 80000){
           this.downLoadingTip.tip = "正在导出全部结果集请耐心等待"
           cargoXlse.cargoConditionDto.limitStart = 0;
           cargoXlse.cargoConditionDto.limitSize = -1;
@@ -923,7 +940,7 @@ export default {
         }else{
           this.downLoadingTip.downloading = false;
           this.$message({
-            message: "导出数据量过大，请不要超过10W条",
+            message: "导出数据量过大，请不要超过8万条",
             type: "warning",
           });
         }
@@ -981,11 +998,13 @@ export default {
   margin:0 0 0 20px;
 }
 .formShow{
+  width: max-content;
   height:48px;
   line-height: 48px;
   font-weight: 900;
   color: rgb(64, 158, 255);
   font-size: 14px;
   float: right;
+  margin-right:20px;
 }
 </style>
\ No newline at end of file