Merge branch 'test' into pre-release

src/views/ecw/offer/detail.vue

 <template>
   <div class="app-container">
         <el-card>
-            <div slot="header" class="card-title">{{$t('报价单详情')}}</div>
+            <div slot="header" class="card-title">{{$t('报价单号')}}：{{list.number}} - <dict-tag :type="DICT_TYPE.ECW_OFFER_STATUS" :value="list.status" /></div>
           <!-- 列表 -->
           <div class="offer-header">
-              <span style="font-size: 15px;">{{$t('报价单号')}}：{{list.number}} - <dict-tag :type="DICT_TYPE.ECW_OFFER_STATUS" :value="list.status" /></span>
+              <span style="font-size: 15px;"></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>