Merge branch 'test' into pre-release

src/views/ecw/customer/query.vue

@@ -184,10 +184,11 @@
                     <span style="color: red" v-if="row.isExternalWarehouse">({{ $t("外部仓") }})</span>
                   </template>
                 </el-table-column>
-                <el-table-column :label="$t('运输方式/目的地')" align="center" prop="transportId">
+                <el-table-column :label="$t('运输方式-渠道/目的仓')" align="center" prop="transportId">
                   <template slot-scope="{ row }">
                     <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="row.transportId" />
-                    / {{ row.objectiveName }}
+                    <template v-if="row.channelName"> - {{ row.channelName }} </template>
+                    / {{ row.dstWarehouseName }}
                   </template>
                 </el-table-column>
                 <el-table-column :label="$t('控货')" align="center" prop="transportId">
@@ -308,14 +309,15 @@
                   <template v-slot="{ row }"> +{{ row.relationAreaCode }}{{ row.relationPhone }} </template>
                 </el-table-column>
                 <el-table-column :label="$t('始发仓')">
-                  <template v-slot="{ row }">
-                    {{ getWarehouse(row.startWarehouseId) }}
+                  <template slot-scope="{ row }">
+                    {{ row.startWarehouseName }}
                   </template>
                 </el-table-column>
-                <el-table-column :label="$t('运输方式/目的地')">
+                <el-table-column :label="$t('运输方式-渠道/目的仓')">
                   <template slot-scope="{ row }">
-                    <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="row.transportType" />
-                    / {{ row.objectiveName }}
+                    <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="row.transportId" />
+                    <template v-if="row.channelName"> - {{ row.channelName }} </template>
+                    / {{ row.destWarehouseName }}
                   </template>
                 </el-table-column>
                 <el-table-column :label="$t('销售阶段')">

src/views/ecw/offer/detail.vue

@@ -4,7 +4,7 @@
             <div slot="header" class="card-title">{{$t('报价单详情')}}</div>
           <!-- 列表 -->
           <div class="offer-header">
-              <span style="font-size: 15px;">{{$t('报价单号')}}：{{list.number}}</span>
+              <span style="font-size: 15px;">{{$t('报价单号')}}：{{list.number}} - <dict-tag :type="DICT_TYPE.ECW_OFFER_STATUS" :value="list.status" /></span>
               <div class="btns">
                 <el-button v-hasPermi="['ecw:offer:update']" size="mini" type="primary" v-if="[4,5,6].indexOf(list.status) == -1"  @click="$router.push('edit?id=' + offerId)">{{$t('编辑')}}</el-button>
                 <el-button v-hasPermi="['ecw:offer:loglist']" type="primary" v-if="[1,3,7].indexOf(list.status) > -1"  size="mini" @click="handleAdd">{{$t('跟进')}}</el-button>

src/views/ecw/offer/index.vue

@@ -124,11 +124,12 @@
       <el-table-column :label="$t('联系人')" align="left" prop="relationName" width="120" />
       <el-table-column :label="$t('联系电话')" align="left" prop="relationPhone" width="150" />
       <el-table-column :label="$t('重要程序')" align="center" prop="importance" />
-      <el-table-column :label="$t('始发地')" align="left" prop="departureName" />
-      <el-table-column :label="$t('目的地')" align="center" prop="objectiveName" />
-      <el-table-column :label="$t('运输方式')" align="center">
+      <el-table-column :label="$t('始发仓')" align="left" prop="startWarehouseName" />
+      <el-table-column :label="$t('运输方式-渠道/目的仓')">
         <template slot-scope="{ row }">
-          {{ $l(transportTypes[row.transportType], "label") }}
+          <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="row.transportId" />
+          <template v-if="row.channelName"> - {{ row.channelName }} </template>
+          / {{ row.destWarehouseName }}
         </template>
       </el-table-column>
       <el-table-column :label="$t('销售阶段')" align="left" width="100">
@@ -141,12 +142,6 @@
           <span>{{ parseTime(scope.row.stopTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('运输方式')" align="left">
-        <template slot-scope="scope">
-          <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="scope.row.transportId" />
-        </template>
-      </el-table-column>
-
       <el-table-column :label="$t('预计销售额')" align="left" prop="estCost" width="160">
         <template slot-scope="{ row }">
           <div class="" v-for="(item, feeIndex) in row.estCostVO.feeDtoList" :key="feeIndex">
@@ -209,9 +204,11 @@ import { getCurrencyList } from "@/api/ecw/currency"
 import { getTradeCityList } from "@/api/ecw/region"
 import UserSelector from "@/components/UserSelector"
 import Selector from "@/components/Selector"
+import Template from "@/views/cms/template/index.vue";
 export default {
   name: "EcwOfferIndex",
   components: {
+    Template,
     Selector,
     UserSelector
   },