订单列表收货人、发货人编号支持穿越

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

@@ -8,337 +8,327 @@
       :inline="true"
       label-width="100px"
     >
-      <el-row>
-        <el-form-item>
+      <el-form-item>
+        <el-select
+          v-model="queryParams.dateType"
+          style="width: 172px"
+          clearable
+        >
+          <el-option :label="$t('入仓时间')" value="1" />
+          <el-option :label="$t('处理时间')" value="2" />
+        </el-select>
+        <el-date-picker
+          clearable
+          v-model="queryParams.beginCreateTime"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          format="yyyy-MM-dd HH:mm:ss"
+          type="datetime"
+          :placeholder="$t('请选择开始日期')"
+        />
+        <span style="margin: 0 8px">{{ $t("到") }}</span>
+        <el-date-picker
+          clearable
+          v-model="queryParams.endCreateTime"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          format="yyyy-MM-dd HH:mm:ss"
+          type="datetime"
+          :placeholder="$t('请选择结束日期')"
+        />
+      </el-form-item>
+      <div>
+        <el-form-item :label="$t('始发仓')">
           <el-select
-            v-model="queryParams.dateType"
-            style="width: 172px"
+            v-model="queryParams.startWarehouseIds"
+            multiple
+            :placeholder="$t('请选择始发仓')"
             clearable
           >
-            <el-option :label="$t('入仓时间')" value="1" />
-            <el-option :label="$t('处理时间')" value="2" />
+            <el-option
+              v-for="item in exportWarehouseList"
+              :label="$l(item, 'title')"
+              :value="item.id"
+              :key="item.id"
+            ></el-option>
           </el-select>
-          <el-date-picker
-            clearable
-            v-model="queryParams.beginCreateTime"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            format="yyyy-MM-dd HH:mm:ss"
-            type="datetime"
-            :placeholder="$t('请选择开始日期')"
-          />
-          <span style="margin: 0 8px">{{ $t("到") }}</span>
-          <el-date-picker
-            clearable
-            v-model="queryParams.endCreateTime"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            format="yyyy-MM-dd HH:mm:ss"
-            type="datetime"
-            :placeholder="$t('请选择结束日期')"
-          />
         </el-form-item>
-        <div>
-          <el-form-item :label="$t('始发仓')" prop="startWarehouseIds">
-            <el-select
-              v-model="queryParams.startWarehouseIds"
-              multiple
-              :placeholder="$t('请选择始发仓')"
-              clearable
-            >
-              <el-option
-                v-for="item in exportWarehouseList"
-                :label="$l(item, 'title')"
-                :value="item.id"
-                :key="item.id"
-              ></el-option>
-            </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"
-            >
-              <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"
-            >
-              <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"
-            >
-              <el-option
-                v-for="item in AddressTown"
-                :key="item.id"
-                :label="item.titleZh"
-                :value="item.id"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-        </div>
-      </el-row>
-      <el-row>
-        <el-form-item :label="$t('运输方式') + ':'" v-show="showSearch">
-          <dict-selector
-            :type="DICT_TYPE.ECW_TRANSPORT_TYPE"
-            :clearable="true"
-            v-model="queryParams.transportId"
-          />
-        </el-form-item>
-        <el-form-item :label="$t('订单状态')" prop="status">
-          <dict-selector
-            :type="DICT_TYPE.ORDER_STATUS"
-            v-model="queryParams.orderStatus"
-            @keyup.enter.native="handleQuery"
-            clearable
-          />
-        </el-form-item>
-        <el-form-item :label="$t('跟进客服')" prop="salesmanIds">
+        <el-form-item :label="$t('目的国')" prop="destCountryId">
           <el-select
-            v-model="queryParams.salesmanIds"
+            v-model="destCountryId"
             multiple
-            :placeholder="$t('请选择')"
+            :label="destCountryId"
+            :placeholder="$t('请选择目的国')"
             clearable
+            @change="handleQuery"
           >
             <el-option
-              v-for="dict in followUpList"
-              :key="parseInt(dict.id)"
-              :label="dict.nickname"
-              :value="parseInt(dict.id)"
-            />
+              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="channelId">
-          <!--嵌套一个form来脱离disabled控制-->
-          <selector
-            :clearable="true"
-            v-model="queryParams.channelIds"
-            multiple
-            :options="channelList"
-            value-field="channelId"
-            :label-field="$l(null, 'name')"
-          ></selector>
-        </el-form-item>
-      </el-row>
-      <el-row>
-        <el-form-item :label="$t('控货') + ':'" v-show="showSearch">
-          <dict-selector
-            :type="DICT_TYPE.ECW_YESNO"
-            :clearable="true"
-            v-model="queryParams.isCargoControl"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item :label="$t('异常状态') + ':'">
-          <dict-selector
-            :type="DICT_TYPE.ORDER_EXCEPTION_STATUS"
-            :clearable="true"
-            v-model="queryParams.orderExceptionStatusList"
+        <el-form-item :label="$t('目的城市')" prop="objectiveId">
+          <el-select
+            v-model="objectiveId"
             multiple
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item :label="$t('异常类型') + ':'">
-          <dict-selector
-            :type="DICT_TYPE.ORDER_ERROR_TYPE"
-            :clearable="true"
-            v-model="queryParams.orderExceptionType"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item :label="$t('订单号') + ':'">
-          <el-input
-            v-model="queryParams.orderNo"
-            :placeholder="$t('请输入订单号')"
+            :placeholder="$t('请选择目的城市')"
+            style="width: 200px"
             clearable
-            @keyup.enter.native="handleQuery"
+            @change="handleQuery"
           >
-            <template slot="prepend">
-              <dict-selector
-                :type="DICT_TYPE.EXCEPTION_SELECT_FILED"
-                v-model="queryParams.orderNoKey"
-                class="w-50"
-              />
-            </template>
-          </el-input>
-        </el-form-item>
-      </el-row>
-      <el-row>
-        <!--        <el-form-item :label="$t('发货人')+':'">
-            <customer-selector v-model="queryParams.consignor" :clearable="true" @change="consignor = $event" />
-        </el-form-item>
-        <el-form-item :label="$t('发货人')+':'">
-            <customer-selector v-model="queryParams.consignor" :clearable="true" @change="consignor = $event" />
-        </el-form-item> -->
-        <el-form-item :label="$t('发货人')" prop="consignorText">
-          <el-input
-            v-model.trim="queryParams.consignorText"
-            :placeholder="$t('发货人')"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item :label="$t('收货人')" prop="consigneeText">
-          <el-input
-            v-model="queryParams.consigneeText"
-            :placeholder="$t('收货人')"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
+            <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('唛头') + ':'" v-show="showSearch">
-          <el-input
-            v-model.trim="queryParams.marks"
-            :placeholder="$t('请输入唛头')"
+        <el-form-item :label="$t('目的仓')" prop="destWarehouseId">
+          <el-select
+            v-model="destWarehouseId"
+            multiple
+            :placeholder="$t('请选择目的仓')"
+            style="width: 200px"
             clearable
-            @keyup.enter.native="handleQuery"
+            @change="handleQuery"
           >
-            <template slot="prepend">
-              <dict-selector
-                :type="DICT_TYPE.EXCEPTION_SELECT_FILED"
-                v-model="queryParams.marksKey"
-                class="w-50"
-              />
-            </template>
-          </el-input>
+            <el-option
+              v-for="item in AddressTown"
+              :key="item.id"
+              :label="item.titleZh"
+              :value="item.id"
+            ></el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item :label="$t('商品') + ':'">
-          <div style="display: flex; width: 100%">
+      </div>
+      <el-form-item :label="$t('运输方式') + ':'" v-show="showSearch">
+        <dict-selector
+          :type="DICT_TYPE.ECW_TRANSPORT_TYPE"
+          :clearable="true"
+          v-model="queryParams.transportId"
+        />
+      </el-form-item>
+      <el-form-item :label="$t('订单状态')" prop="status">
+        <dict-selector
+          :type="DICT_TYPE.ORDER_STATUS"
+          v-model="queryParams.orderStatus"
+          @keyup.enter.native="handleQuery"
+          clearable
+        />
+      </el-form-item>
+      <el-form-item :label="$t('跟进客服')" prop="salesmanIds">
+        <el-select
+          v-model="queryParams.salesmanIds"
+          multiple
+          :placeholder="$t('请选择')"
+          clearable
+        >
+          <el-option
+            v-for="dict in followUpList"
+            :key="parseInt(dict.id)"
+            :label="dict.nickname"
+            :value="parseInt(dict.id)"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="$t('出货渠道')" prop="channelId">
+        <!--嵌套一个form来脱离disabled控制-->
+        <selector
+          :clearable="true"
+          v-model="queryParams.channelIds"
+          multiple
+          :options="channelList"
+          value-field="channelId"
+          :label-field="$l(null, 'name')"
+        ></selector>
+      </el-form-item>
+      <el-form-item :label="$t('控货') + ':'" v-show="showSearch">
+        <dict-selector
+          :type="DICT_TYPE.ECW_YESNO"
+          :clearable="true"
+          v-model="queryParams.isCargoControl"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item :label="$t('异常状态') + ':'">
+        <dict-selector
+          :type="DICT_TYPE.ORDER_EXCEPTION_STATUS"
+          :clearable="true"
+          v-model="queryParams.orderExceptionStatusList"
+          multiple
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item :label="$t('异常类型') + ':'">
+        <dict-selector
+          :type="DICT_TYPE.ORDER_ERROR_TYPE"
+          :clearable="true"
+          v-model="queryParams.orderExceptionType"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item :label="$t('订单号') + ':'">
+        <el-input
+          v-model="queryParams.orderNo"
+          :placeholder="$t('请输入订单号')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        >
+          <template slot="prepend">
             <dict-selector
               :type="DICT_TYPE.EXCEPTION_SELECT_FILED"
-              style="width: 90px"
-              v-model="queryParams.goodsNameKey"
+              v-model="queryParams.orderNoKey"
+              class="w-50"
             />
-            <product-selector
-              v-model="queryParams.goodsName"
-              style="flex: 1"
-              :clearable="true"
-              @keyup.enter.native="handleQuery"
+          </template>
+        </el-input>
+      </el-form-item>
+
+      <!-- <el-form-item :label="$t('发货人')+':'">
+          <customer-selector v-model="queryParams.consignor" :clearable="true" @change="consignor = $event" />
+      </el-form-item>
+      <el-form-item :label="$t('发货人')+':'">
+          <customer-selector v-model="queryParams.consignor" :clearable="true" @change="consignor = $event" />
+      </el-form-item> -->
+      <el-form-item :label="$t('发货人')" prop="consignorText">
+        <el-input
+          v-model.trim="queryParams.consignorText"
+          :placeholder="$t('发货人')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item :label="$t('收货人')" prop="consigneeText">
+        <el-input
+          v-model="queryParams.consigneeText"
+          :placeholder="$t('收货人')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item :label="$t('唛头') + ':'" v-show="showSearch">
+        <el-input
+          v-model.trim="queryParams.marks"
+          :placeholder="$t('请输入唛头')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        >
+          <template slot="prepend">
+            <dict-selector
+              :type="DICT_TYPE.EXCEPTION_SELECT_FILED"
+              v-model="queryParams.marksKey"
+              class="w-50"
             />
-          </div>
-        </el-form-item>
-      </el-row>
-      <el-row>
-        <el-form-item :label="$t('备案') + ':'" v-show="showSearch">
+          </template>
+        </el-input>
+      </el-form-item>
+      <el-form-item :label="$t('商品') + ':'">
+        <div style="display: flex; width: 100%">
           <dict-selector
-            :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE"
+            :type="DICT_TYPE.EXCEPTION_SELECT_FILED"
+            style="width: 90px"
+            v-model="queryParams.goodsNameKey"
+          />
+          <product-selector
+            v-model="queryParams.goodsName"
+            style="flex: 1"
             :clearable="true"
-            v-model="queryParams.productRecord"
-            multiple
             @keyup.enter.native="handleQuery"
           />
-        </el-form-item>
-        <el-form-item :label="$t('客户经理') + ':'">
-          <el-select
-            v-model="queryParams.customerIds"
-            multiple
-            :placeholder="$t('请选择客户经理')"
-            clearable
+        </div>
+      </el-form-item>
+
+      <el-form-item :label="$t('备案') + ':'" v-show="showSearch">
+        <dict-selector
+          :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE"
+          :clearable="true"
+          v-model="queryParams.productRecord"
+          multiple
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item :label="$t('客户经理') + ':'">
+        <el-select
+          v-model="queryParams.customerIds"
+          multiple
+          :placeholder="$t('请选择客户经理')"
+          clearable
+        >
+          <el-option
+            v-for="item in creatorData"
+            :key="item.id"
+            :label="item.nickname"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="$t('外部仓')" prop="number" v-show="showSearch">
+        <el-select
+          v-model="queryParams.isExternalWarehouse"
+          :placeholder="$t('请选择')"
+          clearable
+          @change="handleQuery"
+        >
+          <el-option :label="$t('外部仓')" :value="1"></el-option>
+          <el-option :label="$t('自有仓')" :value="0"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="$t('特需')" prop="packageType" v-show="showSearch">
+        <el-select
+          v-model="queryParams.packageTypeArr"
+          multiple
+          :placeholder="$t('请选择')"
+          clearable
+        >
+          <template
+            v-for="item in getDictDatas(DICT_TYPE.ORDER_SPECIAL_NEEDS)"
           >
             <el-option
-              v-for="item in creatorData"
-              :key="item.id"
-              :label="item.nickname"
-              :value="item.id"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item :label="$t('外部仓')" prop="number" v-show="showSearch">
-          <el-select
-            v-model="queryParams.isExternalWarehouse"
-            :placeholder="$t('请选择')"
-            clearable
-            @change="handleQuery"
-          >
-            <el-option :label="$t('外部仓')" :value="1"></el-option>
-            <el-option :label="$t('自有仓')" :value="0"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item :label="$t('特需')" prop="packageType" v-show="showSearch">
-          <el-select
-            v-model="queryParams.packageTypeArr"
-            multiple
-            :placeholder="$t('请选择')"
-            clearable
-          >
-            <template
-              v-for="item in getDictDatas(DICT_TYPE.ORDER_SPECIAL_NEEDS)"
-            >
-              <el-option
-                :label="$l(item, 'label')"
-                :value="item.value"
-              ></el-option>
-            </template>
-          </el-select>
-        </el-form-item>
-        <el-form-item :label="$t('商品类型')" prop="goodsTypes" v-show="showSearch">
-          <selector v-model="queryParams.goodsTypes" multiple :options="productAttrList" label-field="attrName" value-field="id">
-          </selector>
-        </el-form-item>
-        <el-form-item :label="$t('增值服务')" prop="types" v-show="showSearch">
-          <el-select
-            v-model="queryParams.types"
-            multiple
-            :placeholder="$t('请选择')"
-            clearable
-            @change="handleQuery"
-          >
-            <el-option :label="$t('普通订单')" :value="0"></el-option>
-            <el-option :label="$t('集运服务')" :value="1"></el-option>
-            <el-option :label="$t('海外仓')" :value="2"></el-option>
-          </el-select>
-        </el-form-item>
-      </el-row>
-      <el-row>
-        <el-form-item label="">
-          <el-checkbox
-            style="margin-left: 60px"
-            v-model="queryParams.isHaveCustomer"
-            @change="handleQuery"
-            >{{ $t("无归属订单") }}</el-checkbox
-          >
-        </el-form-item>
-        <el-form-item>
-          <el-button
-            type="primary"
-            icon="el-icon-search"
-            @click="handleQuery"
-            >{{ $t("搜索") }}</el-button
-          >
-          <el-button icon="el-icon-refresh" @click="reset">{{
-            $t("重置")
-          }}</el-button>
-        </el-form-item>
-      </el-row>
+              :label="$l(item, 'label')"
+              :value="item.value"
+            ></el-option>
+          </template>
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="$t('商品类型')" prop="goodsTypes" v-show="showSearch">
+        <selector v-model="queryParams.goodsTypes" multiple :options="productAttrList" label-field="attrName" value-field="id">
+        </selector>
+      </el-form-item>
+      <el-form-item :label="$t('增值服务')" prop="types" v-show="showSearch">
+        <el-select
+          v-model="queryParams.types"
+          multiple
+          :placeholder="$t('请选择')"
+          clearable
+          @change="handleQuery"
+        >
+          <el-option :label="$t('普通订单')" :value="0"></el-option>
+          <el-option :label="$t('集运服务')" :value="1"></el-option>
+          <el-option :label="$t('海外仓')" :value="2"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-checkbox
+          style="margin-left: 60px"
+          v-model="queryParams.isHaveCustomer"
+          @change="handleQuery"
+          >{{ $t("无归属订单") }}</el-checkbox
+        >
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          @click="handleQuery"
+          >{{ $t("搜索") }}</el-button
+        >
+        <el-button icon="el-icon-refresh" @click="reset">{{
+          $t("重置")
+        }}</el-button>
+      </el-form-item>
     </el-form>
 
     <!-- 操作工具栏 -->

src/views/ecw/order/index.vue

@@ -523,8 +523,20 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('发货人编号')" align="center" prop="consignorCustomerNumber" />
-      <el-table-column :label="$t('收货人编号')" align="center" prop="consigneeCustomerNumber" />
+      <el-table-column :label="$t('发货人编号')" align="center">
+        <template slot-scope="{ row }">
+          <router-link :to="`/customer/query/${row.consignorCustomerId}`" class="link-type">
+            {{row.consignorCustomerNumber}}
+          </router-link>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('收货人编号')" align="center" prop="consigneeCustomerNumber">
+        <template slot-scope="{ row }">
+          <router-link :to="`/customer/query/${row.consigneeCustomerId}`" class="link-type">
+            {{row.consigneeCustomerNumber}}
+          </router-link>
+        </template>
+      </el-table-column>
       <el-table-column
         :label="$t('总箱数/入仓箱数')"
         align="center"