订单相关列表优化

src/views/ecw/order/exception/index.vue

@@ -72,6 +72,7 @@
       <el-form-item :label="$t('目的国')" prop="destCountryId">
         <el-select
           v-model="destCountryId"
+          filterable
           multiple
           :label="destCountryId"
           :placeholder="$t('请选择目的国')"
@@ -90,6 +91,7 @@
       <el-form-item :label="$t('目的城市')" prop="objectiveId">
         <el-select
           v-model="objectiveId"
+          filterable
           multiple
           :placeholder="$t('请选择目的城市')"
           style="width: 200px"
@@ -108,6 +110,7 @@
       <el-form-item :label="$t('目的仓')" prop="destWarehouseId">
         <el-select
           v-model="destWarehouseId"
+          filterable
           multiple
           :placeholder="$t('请选择目的仓')"
           style="width: 200px"
@@ -203,7 +206,7 @@
           :placeholder="$t('请输入唛头')"
           clearable
           @keyup.enter.native="handleQuery"
-          @input="replaceSpace(queryParams, 'marks')"
+          @blur="trimMarks"
           class="w-200"
         >
           <template slot="prepend">
@@ -338,7 +341,7 @@
               @change="handleQuery"
             >{{ $t("无归属订单") }}</el-checkbox>
           </div>
-        
+
           <el-button
             type="primary"
             icon="el-icon-search"
@@ -412,7 +415,7 @@
           <span>{{ scope.$index + 1 }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('订单号')" align="center">
+      <el-table-column :label="$t('订单号')" align="center" fixed>
         <template slot-scope="scope">
           <router-link
             :to="{
@@ -440,7 +443,7 @@
           <!--             <span>{{specialNeedTag(scope.row.specialNeed)}}</span>-->
         </template>
       </el-table-column>
-      <el-table-column :label="$t('唛头')" align="center">
+      <el-table-column :label="$t('唛头')" align="center" fixed>
         <template slot-scope="scope">
           <span>{{ scope.row.marks || $t("无") }}</span>
         </template>
@@ -1188,6 +1191,10 @@ export default {
         })
       }
     },
+    // 去掉唛头首尾空格
+    trimMarks(){
+      this.queryParams.marks = this.queryParams.marks.trim()
+    },
     // 自动去除空格
     replaceSpace(obj, field){
       obj[field] = obj[field].replace(/\s+/g, '');

src/views/ecw/order/index.vue

@@ -196,10 +196,10 @@
     </el-row>
 
     <!-- 列表 -->
-    <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" border :data="list" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
 
-      <el-table-column :label="$t('订单编号')" width="120px" align="center" prop="orderNo">
+      <el-table-column :label="$t('订单编号')" width="120px" align="center" prop="orderNo" fixed>
         <template slot-scope="scope">
           <router-link
             :to="{
@@ -215,7 +215,7 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('唛头')" align="center" prop="marks" />
+      <el-table-column :label="$t('唛头')" align="center" prop="marks" fixed/>
 
       <el-table-column :label="$t('总箱数/入仓箱数')" align="center" prop="sumNum" width="200px">
         <template slot-scope="{ row }">

src/views/ecw/order/penddingList.vue

@@ -26,6 +26,7 @@
         <el-form-item :label="$t('目的国')" prop="destCountryId">
           <el-select
             v-model="destCountryId"
+            filterable
             multiple
             class="w-200"
             :label="destCountryId"
@@ -44,6 +45,7 @@
         <el-form-item :label="$t('目的城市')" prop="objectiveId">
           <el-select
             v-model="objectiveId"
+            filterable
             multiple
             class="w-200"
             :placeholder="$t('请选择目的城市')"
@@ -62,6 +64,7 @@
         <el-form-item :label="$t('目的仓')" prop="destWarehouseId">
           <el-select
             v-model="destWarehouseId"
+            filterable
             multiple
             class="w-200"
             :placeholder="$t('请选择目的仓')"
@@ -175,10 +178,10 @@
     </el-row>
 
     <!-- 列表 -->
-    <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" border :data="list" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
 
-      <el-table-column :label="$t('订单编号')" width="120px" align="center" prop="orderNo" >
+      <el-table-column :label="$t('订单编号')" width="120px" align="center" prop="orderNo" fixed>
         <template slot-scope="scope">
           <router-link :to="{path: '/order/detail',query: {orderId: scope.row.orderId}}" class="link-type">
             <span>{{ scope.row.orderNo }}</span>
@@ -188,7 +191,7 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('唛头')" align="center" prop="marks" />
+      <el-table-column :label="$t('唛头')" align="center" prop="marks" fixed/>
       <el-table-column :label="$t('总箱数/入仓箱数')" align="center" prop="sumNum">
         <template slot-scope="{row}">
           <div :style="{color:row.customsType != 1 ? 'red' : null}">{{row.totalNum}}{{$t('箱')}}/{{row.sumNum}}{{$t('箱')}}</div>

src/views/ecw/order/stockingList.vue

@@ -52,6 +52,7 @@
         <el-form-item :label="$t('目的国')" prop="destCountryId">
           <el-select
             v-model="destCountryId"
+            filterable
             multiple
             :label="destCountryId"
             :placeholder="$t('请选择目的国')"
@@ -70,6 +71,7 @@
         <el-form-item :label="$t('目的城市')" prop="objectiveId">
           <el-select
             v-model="objectiveId"
+            filterable
             multiple
             :placeholder="$t('请选择目的城市')"
             clearable
@@ -87,6 +89,7 @@
         <el-form-item :label="$t('目的仓')" prop="destWarehouseId">
           <el-select
             v-model="destWarehouseId"
+            filterable
             multiple
             :placeholder="$t('请选择目的仓')"
             clearable
@@ -301,6 +304,7 @@
     <!-- 列表 -->
     <el-table
       v-loading="loading"
+      border
       :data="list"
       @selection-change="handleSelectionChange"
     >
@@ -311,6 +315,7 @@
         width="120px"
         align="center"
         prop="orderNo"
+        fixed
       >
         <template slot-scope="scope">
           <router-link
@@ -339,7 +344,7 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('唛头')" align="center" prop="marks" />
+      <el-table-column :label="$t('唛头')" align="center" prop="marks" fixed/>
       <el-table-column
         :label="$t('总箱数/入仓箱数')"
         align="center"

src/views/ecw/order/warningCargoControl.vue

@@ -22,17 +22,17 @@
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('目的国')" prop="destCountryId">
-          <el-select v-model="destCountryId" multiple :label="destCountryId" :placeholder="$t('请选择目的国')" clearable @change="handleQuery" class="w-200">
+          <el-select v-model="destCountryId" filterable multiple :label="destCountryId" :placeholder="$t('请选择目的国')" clearable @change="handleQuery" class="w-200">
             <el-option v-for="item in AddressProvince" :key="item.guojia" :label="item.guojiaName" :value="item.guojia"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('目的城市')" prop="objectiveId">
-          <el-select v-model="objectiveId" multiple :placeholder="$t('请选择目的城市')" style="width: 200px" clearable @change="handleQuery" class="w-200">
+          <el-select v-model="objectiveId" filterable multiple :placeholder="$t('请选择目的城市')" style="width: 200px" clearable @change="handleQuery" class="w-200">
             <el-option v-for="item in AddressCity" :key="item.shi" :label="item.shiName" :value="item.shi"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('目的仓')" prop="destWarehouseId">
-          <el-select v-model="destWarehouseId" multiple :placeholder="$t('请选择目的仓')" style="width: 200px" clearable @change="handleQuery" class="w-200">
+          <el-select v-model="destWarehouseId" filterable multiple :placeholder="$t('请选择目的仓')" style="width: 200px" clearable @change="handleQuery" class="w-200">
             <el-option v-for="item in AddressTown" :key="item.id" :label="item.titleZh" :value="item.id"></el-option>
           </el-select>
         </el-form-item>
@@ -93,15 +93,15 @@
     </el-row>
 
     <!-- 列表 -->
-    <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" border :data="list" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
 
-      <el-table-column :label="$t('订单编号')" width="120px" align="center" prop="orderNo">
+      <el-table-column :label="$t('订单编号')" width="120px" align="center" prop="orderNo" fixed>
         <template slot-scope="scope">
           <router-link :to="`detail?orderId=` + scope.row.orderId">{{ scope.row.orderNo }}</router-link>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('唛头')" align="center" prop="marks" />
+      <el-table-column :label="$t('唛头')" align="center" prop="marks" fixed/>
       <el-table-column :label="$t('箱数')" align="center" prop="sumNum">
         <template v-slot="{ row }">
           {{ row.sumNum > 0 ? row.sumNum : row.totalNum }}