Merge branch 'dev'

src/views/ecw/box/indexSea.vue

@@ -335,7 +335,7 @@
               <!--lanbm 2024-06-11 添加海运批量加价功能-->
               <el-dropdown-item
                 command="batchMarkup"
-                v-has-permi="['shipment:air:batchMarkup']"
+                v-has-permi="['shipment:sea:batchMarkup']"
                 >{{ $t("批量加价") }}</el-dropdown-item
               >
             </el-dropdown-menu>

src/views/ecw/order/index.vue

 <template>
   <div class="app-container">
-    <!-- 搜索工作栏 -->
     <el-form
       :model="queryParams"
       ref="queryForm"
@@ -1349,7 +1348,6 @@ export default {
       //destCountryId:'',
       objectiveId: [],
       destWarehouseId: "",
-
       // 选中数组
       ids: [],
       //目的国

src/views/ecw/order/prepayDeal.vue

@@ -2903,6 +2903,7 @@ export default {
           };
           this.handlerParams.channelPriceList.push(listItem);
         });
+        
         if (priceUnit) {
           this.$modal.msgError(
             this.$t("请先去设置运费或清关费本身的货币单位、计价单位")

src/views/report/customer_analysis/index.vue

@@ -34,6 +34,7 @@
           v-model="queryParams.deptid"
           :options="deptOptions"
           :show-count="true"
+          :multiple="true"
           :placeholder="$t('请选择部门')"
           :normalizer="normalizer"
         />
@@ -280,7 +281,7 @@
         >
       </el-form-item>
     </el-form>
-    <el-table v-loading="loading" :data="list">
+    <el-table v-loading="loading" :data="list" @sort-change="handleSort">
       <el-table-column label="排名" align="center" prop="px" />
       <el-table-column label="客户编号" align="center" prop="number">
         <template slot-scope="{ row }">
@@ -294,14 +295,24 @@
       <el-table-column label="客户姓名" align="center" prop="name" />
       <el-table-column label="客户经理" align="center" prop="salesman" />
       <el-table-column label="部门" align="center" prop="deptname" />
-      <el-table-column label="总V值" align="center" prop="allsumvolume" />
+      <el-table-column
+        label="总V值"
+        align="center"
+        prop="allsumvolume"
+        sortable="allsumvolume"
+      />
       <el-table-column
         label="总V值同比"
         align="center"
         prop="allsumvolumeTbShow"
       />
 
-      <el-table-column label="海运拼柜" align="center" prop="sumvolumeV1" />
+      <el-table-column
+        label="海运拼柜"
+        align="center"
+        prop="sumvolumeV1"
+        sortable="sumvolumeV1"
+      />
       <el-table-column label="海运占比" align="center" prop="seaZb" />
       <el-table-column
         label="海运拼柜同比"
@@ -309,7 +320,12 @@
         prop="sumvolumeTbShow1"
       />
 
-      <el-table-column label="专线空运" align="center" prop="sumweightV3" />
+      <el-table-column
+        label="专线空运"
+        align="center"
+        prop="sumweightV3"
+        sortable="sumweightV3"
+      />
       <el-table-column label="空运占比" align="center" prop="airZb" />
       <el-table-column
         label="专线空运同比"
@@ -530,6 +546,8 @@ export default {
         edate4: undefined, //客户创建时间
         sdate5: undefined, //首次成交时间
         edate5: undefined, //首次成交时间
+        orderfield:undefined,//排序字段
+        ordertype:undefined,//排序方式
       },
       // 表单参数
       form: {},
@@ -567,6 +585,13 @@ export default {
     //created ------> computed ------> mounted ------> watch
   },
   methods: {
+    handleSort(obj) {
+      if (obj.order != null && obj.prop != null) {
+        this.queryParams.orderfield=obj.prop;  //排序字段
+        this.queryParams.ordertype=obj.order;   //排序方式
+        this.getList();
+      }
+    },
     /** 查询列表 */
     getList() {
       this.loading = true;