Merge branch 'pre-release' into 'jd_dev'

Pre release代码合并到jd20241211

See merge request !104

src/views/ecw/customer/index.vue

@@ -9,7 +9,7 @@
           <el-input v-model="queryParams.name" :placeholder="$t('请输入客户名称')" clearable @keyup.enter.native="handleQuery" @blur="trimCustomerName" />
         </el-form-item>
         <el-form-item :label="$t('区号')">
-          <el-select filterable v-model="queryParams.areaCode" :placeholder="$t('请选择区号')">
+          <el-select filterable v-model="queryParams.areaCode" clearable :placeholder="$t('请选择区号')">
             <el-option v-for="(item, index) in countryList" :key="index" :label="item.nameShort + (isChinese ? item.nameZh : item.nameEn) + ' +' + item.tel" :value="item.tel" />
           </el-select>
         </el-form-item>
@@ -17,7 +17,7 @@
           <el-input :placeholder="$t('请输入联系方式')" clearable v-model.trim="queryParams.defaultContactPhone" @input="queryParams.defaultContactPhone = queryParams.defaultContactPhone.replace(/\s+/g, '')"></el-input>
         </el-form-item>
         <el-form-item :label="$t('部门')" v-if="path != '/customer/department-customers'">
-          <el-select filterable v-model="queryParams.deptIds" :placeholder="$t('请选择部门')">
+          <el-select filterable clearable v-model="queryParams.deptIds" :placeholder="$t('请选择部门')">
             <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
         </el-form-item>
@@ -57,7 +57,7 @@
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('常用提货网点')" v-show="showSearch">
-          <el-select filterable multiple v-model="form.pickupPoints" :placeholder="$t('请选择提货网点')">
+          <el-select filterable multiple v-model="queryParams.pickupPoints" :placeholder="$t('请选择提货网点')">
             <el-option v-for="dict in getDictDatas(DICT_TYPE.PICKUP_POINTS)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="parseInt(dict.value)" />
           </el-select>
         </el-form-item>
@@ -127,14 +127,14 @@
             <el-option :label="$t('否')" :value="0" />
           </el-select>
         </el-form-item>
-        <el-form-item :label="$t('会员电话')" prop="department" label-width="100px">
+        <el-form-item :label="$t('会员电话')" prop="department" label-width="100px" v-show="showSearch">
           <el-input :placeholder="$t('请输入会员电话')" class="w-200" clearable v-model.trim="queryParams.memberMobile" @input="queryParams.memberMobile = queryParams.memberMobile.replace(/\s+/g, '')">
             <template slot="prepend">
               <area-code-selector v-model="queryParams.memberAreaCode" class="w-50" />
             </template>
           </el-input>
         </el-form-item>
-        <el-form-item :label="$t('会员编号')" prop="number">
+        <el-form-item :label="$t('会员编号')" prop="number" v-show="showSearch">
           <el-input v-model.trim="queryParams.memberCode" :placeholder="$t('请输入会员编号')" clearable @keyup.enter.native="handleQuery" />
         </el-form-item>
         <el-form-item :label="$t('控货无收货人')" v-show="showSearch" label-width="100px">
@@ -251,6 +251,13 @@
           </contacts>
         </template>
       </el-table-column>
+      <el-table-column :label="$t('最新发货时间')" width="120">
+        <template slot-scope="scope" v-if="scope.row.lastLoadOrderId">
+          <router-link :to="`/order/detail?orderId=${scope.row.lastLoadOrderId}`" class="link-type">
+            {{ parseTime(scope.row.lastLoadOrderLoadTime) }}
+          </router-link>
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('最新报价单')" width="120">
         <template slot-scope="scope" v-if="scope.row.offerId">
           <router-link :to="`/offer/detail?offerId=${scope.row.offerId}`" class="link-type">

src/views/ecw/customer/indirectCustomer.vue

@@ -10,13 +10,13 @@
         <el-input :placeholder="$t('请输入联系方式')" v-model.trim="queryParams.defaultContactPhone" @keyup.enter.native="handleQuery" onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"></el-input>
       </el-form-item>
       <el-form-item :label="$t('客户经理')" prop="customerService">
-        <el-select clearable  v-model="queryParams.customerService"  @change="handleQuery" :placeholder="$t('请选择客户经理')" clearable size="small">
+        <el-select v-model="queryParams.customerService"  @change="handleQuery" :placeholder="$t('请选择客户经理')" clearable size="small">
           <el-option v-for="dict in customerServiceList"
                      :key="dict.id" :label="dict.nickname" :value="dict.id"/>
         </el-select>
       </el-form-item>
       <el-form-item :label="$t('客户来源')" prop="source">
-        <el-select clearable  v-model="queryParams.source" :placeholder="$t('请选择客户来源')"  @change="handleQuery" clearable size="small">
+        <el-select v-model="queryParams.source" :placeholder="$t('请选择客户来源')"  @change="handleQuery" clearable size="small">
           <el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_SOURCE)"
                        :key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="dict.value"/>
         </el-select>
@@ -25,14 +25,14 @@
       <el-form-item  :label="$t('市场获客')" prop="department">
         <dict-selector clearable  :type="DICT_TYPE.ECW_CUSTOMER_RESOURCE_TYPE" v-model="queryParams.marketType" formatter="number"  @change="handleQuery"></dict-selector>
       </el-form-item>
-      <el-form-item :label="$t('会员电话')" prop="department" label-width="100px">
+      <el-form-item :label="$t('会员电话')" prop="department" label-width="100px" v-show="showSearch">
         <el-input :placeholder="$t('请输入会员电话')" class="w-200" clearable v-model.trim="queryParams.memberMobile" @input="queryParams.memberMobile = queryParams.memberMobile.replace(/\s+/g, '')">
           <template slot="prepend">
             <area-code-selector  v-model="queryParams.memberAreaCode" class="w-50"/>
           </template>
         </el-input>
       </el-form-item>
-      <el-form-item :label="$t('会员编号')" prop="number">
+      <el-form-item :label="$t('会员编号')" prop="number" v-show="showSearch">
         <el-input
           v-model.trim="queryParams.memberCode"
           :placeholder="$t('请输入会员编号')"

src/views/ecw/customerConfirm/index.vue

@@ -18,7 +18,7 @@
           <el-input :placeholder="$t('请输入联系方式')" clearable v-model.trim="queryParams.defaultContactPhone" @input="queryParams.defaultContactPhone = queryParams.defaultContactPhone.replace(/\s+/g, '')"></el-input>
         </el-form-item>
         <el-form-item :label="$t('部门')" v-if="path != '/customer/department-customers'">
-          <el-select v-model="queryParams.deptIds" :placeholder="$t('请选择部门')">
+          <el-select filterable v-model="queryParams.deptIds" :placeholder="$t('请选择部门')" clearable>
             <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
         </el-form-item>
@@ -58,7 +58,7 @@
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('常用提货网点')" v-show="showSearch">
-          <el-select filterable multiple v-model="form.pickupPoints" :placeholder="$t('请选择提货网点')">
+          <el-select filterable multiple v-model="queryParams.pickupPoints" :placeholder="$t('请选择提货网点')">
             <el-option v-for="dict in getDictDatas(DICT_TYPE.PICKUP_POINTS)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="parseInt(dict.value)" />
           </el-select>
         </el-form-item>
@@ -128,14 +128,14 @@
             <el-option :label="$t('否')" :value="0" />
           </el-select>
         </el-form-item>
-        <el-form-item :label="$t('会员电话')" prop="department" label-width="100px">
+        <el-form-item :label="$t('会员电话')" prop="department" label-width="100px" v-show="showSearch">
           <el-input :placeholder="$t('请输入会员电话')" class="w-200" clearable v-model.trim="queryParams.memberMobile" @input="queryParams.memberMobile = queryParams.memberMobile.replace(/\s+/g, '')">
             <template slot="prepend">
               <area-code-selector  v-model="queryParams.memberAreaCode" class="w-50"/>
             </template>
           </el-input>
         </el-form-item>
-        <el-form-item :label="$t('会员编号')" prop="number">
+        <el-form-item :label="$t('会员编号')" prop="number" v-show="showSearch">
           <el-input
             v-model.trim="queryParams.memberCode"
             :placeholder="$t('请输入会员编号')"
@@ -237,6 +237,13 @@
           </contacts>
         </template>
       </el-table-column>
+      <el-table-column :label="$t('最新发货时间')" width="120">
+        <template slot-scope="scope" v-if="scope.row.lastLoadOrderId">
+          <router-link :to="`/order/detail?orderId=${scope.row.lastLoadOrderId}`" class="link-type">
+            {{ parseTime(scope.row.lastLoadOrderLoadTime) }}
+          </router-link>
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('最新报价单')" width="120">
         <template slot-scope="scope" v-if="scope.row.offerId">
           <router-link :to="`/offer/detail?offerId=${scope.row.offerId}`" class="link-type">

src/views/ecw/customerToBeAssigned/index.vue

@@ -18,7 +18,7 @@
           <el-input :placeholder="$t('请输入联系方式')" clearable v-model.trim="queryParams.defaultContactPhone" @input="queryParams.defaultContactPhone = queryParams.defaultContactPhone.replace(/\s+/g, '')"></el-input>
         </el-form-item>
         <el-form-item :label="$t('部门')" v-if="path != '/customer/department-customers'">
-          <el-select filterable v-model="queryParams.deptIds" :placeholder="$t('请选择部门')">
+          <el-select filterable v-model="queryParams.deptIds" :placeholder="$t('请选择部门')" clearable>
             <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
         </el-form-item>
@@ -58,7 +58,7 @@
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('常用提货网点')" v-show="showSearch">
-          <el-select filterable multiple v-model="form.pickupPoints" :placeholder="$t('请选择提货网点')">
+          <el-select filterable multiple v-model="queryParams.pickupPoints" :placeholder="$t('请选择提货网点')">
             <el-option v-for="dict in getDictDatas(DICT_TYPE.PICKUP_POINTS)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="parseInt(dict.value)" />
           </el-select>
         </el-form-item>
@@ -128,14 +128,14 @@
             <el-option :label="$t('否')" :value="0" />
           </el-select>
         </el-form-item>
-        <el-form-item :label="$t('会员电话')" prop="department" label-width="100px">
+        <el-form-item :label="$t('会员电话')" prop="department" label-width="100px" v-show="showSearch">
           <el-input :placeholder="$t('请输入会员电话')" class="w-200" clearable v-model.trim="queryParams.memberMobile" @input="queryParams.memberMobile = queryParams.memberMobile.replace(/\s+/g, '')">
             <template slot="prepend">
               <area-code-selector  v-model="queryParams.memberAreaCode" class="w-50"/>
             </template>
           </el-input>
         </el-form-item>
-        <el-form-item :label="$t('会员编号')" prop="number">
+        <el-form-item :label="$t('会员编号')" prop="number" v-show="showSearch">
           <el-input
             v-model.trim="queryParams.memberCode"
             :placeholder="$t('请输入会员编号')"
@@ -223,6 +223,13 @@
           </contacts>
         </template>
       </el-table-column>
+      <el-table-column :label="$t('最新发货时间')" width="120">
+        <template slot-scope="scope" v-if="scope.row.lastLoadOrderId">
+          <router-link :to="`/order/detail?orderId=${scope.row.lastLoadOrderId}`" class="link-type">
+            {{ parseTime(scope.row.lastLoadOrderLoadTime) }}
+          </router-link>
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('最新报价单')" width="120">
         <template slot-scope="scope" v-if="scope.row.offerId">
           <router-link :to="`/offer/detail?offerId=${scope.row.offerId}`" class="link-type">

src/views/ecw/myCustomerService/index.vue

@@ -18,12 +18,12 @@
           <el-input :placeholder="$t('请输入联系方式')" clearable v-model.trim="queryParams.defaultContactPhone" @input="queryParams.defaultContactPhone = queryParams.defaultContactPhone.replace(/\s+/g, '')"></el-input>
         </el-form-item>
         <!--        <el-form-item :label="$t('部门')" v-if="path != '/customer/department-customers'">-->
-        <!--          <el-select v-model="queryParams.deptIds" :placeholder="$t('请选择部门')">-->
+        <!--          <el-select filterable v-model="queryParams.deptIds" :placeholder="$t('请选择部门')" clearable>-->
         <!--            <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id" />-->
         <!--          </el-select>-->
         <!--        </el-form-item>-->
         <!--        <el-form-item :label="$t('客户经理')" prop="customerService">-->
-        <!--          <el-select multiple clearable v-model="queryParams.customerService" :placeholder="$t('请选择客户经理')" size="small" @change="handleQuery">-->
+        <!--          <el-select filterable multiple clearable v-model="queryParams.customerService" :placeholder="$t('请选择客户经理')" size="small" @change="handleQuery">-->
         <!--            <el-option v-for="dict in customerServiceList" :key="dict.id" :label="dict.nickname" :value="dict.id" />-->
         <!--          </el-select>-->
         <!--        </el-form-item>-->
@@ -58,7 +58,7 @@
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('常用提货网点')" v-show="showSearch">
-          <el-select filterable multiple v-model="form.pickupPoints" :placeholder="$t('请选择提货网点')">
+          <el-select filterable multiple v-model="queryParams.pickupPoints" :placeholder="$t('请选择提货网点')">
             <el-option v-for="dict in getDictDatas(DICT_TYPE.PICKUP_POINTS)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="parseInt(dict.value)" />
           </el-select>
         </el-form-item>
@@ -128,14 +128,14 @@
             <el-option :label="$t('否')" :value="0" />
           </el-select>
         </el-form-item>
-        <el-form-item :label="$t('会员电话')" prop="department" label-width="100px">
+        <el-form-item :label="$t('会员电话')" prop="department" label-width="100px" v-show="showSearch">
           <el-input :placeholder="$t('请输入会员电话')" class="w-200" clearable v-model.trim="queryParams.memberMobile" @input="queryParams.memberMobile = queryParams.memberMobile.replace(/\s+/g, '')">
             <template slot="prepend">
               <area-code-selector v-model="queryParams.memberAreaCode" class="w-50" />
             </template>
           </el-input>
         </el-form-item>
-        <el-form-item :label="$t('会员编号')" prop="number">
+        <el-form-item :label="$t('会员编号')" prop="number" v-show="showSearch">
           <el-input v-model.trim="queryParams.memberCode" :placeholder="$t('请输入会员编号')" clearable @keyup.enter.native="handleQuery" />
         </el-form-item>
         <el-form-item :label="$t('控货无收货人')" v-show="showSearch" label-width="100px">
@@ -240,6 +240,13 @@
           </contacts>
         </template>
       </el-table-column>
+      <el-table-column :label="$t('最新发货时间')" width="120">
+        <template slot-scope="scope" v-if="scope.row.lastLoadOrderId">
+          <router-link :to="`/order/detail?orderId=${scope.row.lastLoadOrderId}`" class="link-type">
+            {{ parseTime(scope.row.lastLoadOrderLoadTime) }}
+          </router-link>
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('最新报价单')" width="120">
         <template slot-scope="scope" v-if="scope.row.offerId">
           <router-link :to="`/offer/detail?offerId=${scope.row.offerId}`" class="link-type">

src/views/ecw/oceanCustomer/index.vue

@@ -19,7 +19,7 @@
           <el-input :placeholder="$t('请输入联系方式')" clearable v-model.trim="queryParams.defaultContactPhone" @input="queryParams.defaultContactPhone = queryParams.defaultContactPhone.replace(/\s+/g, '')"></el-input>
         </el-form-item>
         <el-form-item :label="$t('部门')" v-if="path != '/customer/department-customers'">
-          <el-select v-model="queryParams.deptIds" :placeholder="$t('请选择部门')">
+          <el-select filterable v-model="queryParams.deptIds" :placeholder="$t('请选择部门')" clearable>
             <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
         </el-form-item>
@@ -59,7 +59,7 @@
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('常用提货网点')" v-show="showSearch">
-          <el-select filterable multiple v-model="form.pickupPoints" :placeholder="$t('请选择提货网点')">
+          <el-select filterable multiple v-model="queryParams.pickupPoints" :placeholder="$t('请选择提货网点')">
             <el-option v-for="dict in getDictDatas(DICT_TYPE.PICKUP_POINTS)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="parseInt(dict.value)" />
           </el-select>
         </el-form-item>
@@ -129,14 +129,14 @@
             <el-option :label="$t('否')" :value="0" />
           </el-select>
         </el-form-item>
-        <el-form-item :label="$t('会员电话')" prop="department" label-width="100px">
+        <el-form-item :label="$t('会员电话')" prop="department" label-width="100px" v-show="showSearch">
           <el-input :placeholder="$t('请输入会员电话')" class="w-200" clearable v-model.trim="queryParams.memberMobile" @input="queryParams.memberMobile = queryParams.memberMobile.replace(/\s+/g, '')">
             <template slot="prepend">
               <area-code-selector  v-model="queryParams.memberAreaCode" class="w-50"/>
             </template>
           </el-input>
         </el-form-item>
-        <el-form-item :label="$t('会员编号')" prop="number">
+        <el-form-item :label="$t('会员编号')" prop="number" v-show="showSearch">
           <el-input
             v-model.trim="queryParams.memberCode"
             :placeholder="$t('请输入会员编号')"
@@ -270,6 +270,13 @@
           </contacts>
         </template>
       </el-table-column>
+      <el-table-column :label="$t('最新发货时间')" width="120">
+        <template slot-scope="scope" v-if="scope.row.lastLoadOrderId">
+          <router-link :to="`/order/detail?orderId=${scope.row.lastLoadOrderId}`" class="link-type">
+            {{ parseTime(scope.row.lastLoadOrderLoadTime) }}
+          </router-link>
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('最新报价单')" width="120">
         <template slot-scope="scope" v-if="scope.row.offerId">
           <router-link :to="`/offer/detail?offerId=${scope.row.offerId}`" class="link-type">

src/views/ecw/order/index.vue

@@ -65,7 +65,7 @@
       </el-form-item> -->
 
       <el-form-item :label="$t('商品')" prop="tidanNo" v-show="showSearch">
-        <el-input v-model.trim="prodParam.value" :placeholder="$t('请输入商品类型、品名或品牌')" clearable @keyup.enter.native="handleQuery" class="w-200">
+        <el-input v-model.trim="prodParam.value" :placeholder="$t('请输入商品')" clearable @keyup.enter.native="handleQuery" class="w-200">
           <template slot="prepend">
             <dict-selector :type="DICT_TYPE.ORDER_QUERY_PROD_FIELD" defaultable v-model="prodParam.key" />
           </template>
@@ -448,8 +448,18 @@
                 </template>
 
                 <!--转异-->
-                <el-dropdown-item @click.native="handleException(scope.row)" v-hasPermi="['ecw:order:turnException']">{{ $t("转异") }}</el-dropdown-item>
-
+                <template
+                  v-if="
+                    (scope.row.status < 12 ||
+                      (scope.row.status == 12 &&
+                        scope.row.shipmentState == 314)) &&
+                    !scope.row.abnormalState &&
+                    exclude(scope.row.inWarehouseState, [204, 205, 206]) &&
+                    exclude(scope.row.shipmentState, [305, 307, 407])
+                  "
+                >
+                  <el-dropdown-item @click.native="handleException(scope.row)" v-hasPermi="['ecw:order:turnException']">{{ $t("转异") }}</el-dropdown-item>
+                </template>
                 <template v-if="scope.row.abnormalState != 0">
                   <el-dropdown-item @click.native="openException(scope.row)">{{ $t("查看异常") }}</el-dropdown-item>
                   <el-dropdown-item @click.native="openException(scope.row)">{{ $t("处理异常") }}</el-dropdown-item>

src/views/ecw/order/success.vue

@@ -57,6 +57,7 @@
             <el-button type="warning" @click="showNotice = true">{{$t('入仓须知')}}</el-button>
             <el-button type="info" @click="$redirect('create')">{{$t('再来一单')}}</el-button>
             <el-button class="copy-btn" :data-clipboard-text="orderInfoForCopy">{{$t('复制订单信息')}}</el-button>
+            <el-button type="danger" @click="$redirect('edit?id=' + order.orderId + '&copy=1')">{{$t('复制并再来一单')}}</el-button>
         </div>
 
         <el-dialog :title="$t('查看须知')" :visible.sync="showNotice" width="700px">