需求95 报价单页面和列表调整

src/views/ecw/offer/detail.vue

@@ -17,13 +17,15 @@
         <div class="title-font">
           <label>{{ $t("报价单所属") }}：{{ list.relation ? (list.relation == 1 ? $t("发货人") : $t("收货人")) : $t("发货人") }}</label>
         </div>
-        <el-descriptions :column="4" border class="card" v-if="list.consignorId" :labelStyle="{ width: '110px' }" style="margin-top: 10px">
+        <el-descriptions :column="3" border class="card" v-if="list.consignorId" :labelStyle="{ width: '110px' }" :contentStyle="{ width: '110px' }" style="margin-top: 10px">
           <el-descriptions-item :label="$t('客户经理') + ':'">
             {{list.followUpSalesmanName}}
           </el-descriptions-item>
           <el-descriptions-item :label="$t('销售阶段') + ':'">
             <dict-tag :type="DICT_TYPE.CUSTOMER_FOLLOWUP_SALE_STAGE" :value="list.saleStage" />
           </el-descriptions-item>
+          <el-descriptions-item label="">
+          </el-descriptions-item>
         </el-descriptions>
 
         <el-descriptions :column="3" border class="card" v-if="list.consignorId" :labelStyle="{ width: '110px' }" :contentStyle="{ width: '110px' }">
@@ -304,11 +306,14 @@
         <el-descriptions-item :label="$t('最后更新时间')"> {{ list.updateTime || "/" }} </el-descriptions-item>
       </el-descriptions>
     </el-card>
-    <el-card class="card" v-if="list.transportVO">
+    <el-card class="mt-10" v-if="list.transportVO">
       <div slot="header" class="card-title">
-        <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="list.transportId"></dict-tag>
+        <div class="card-name">
+          <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="list.transportId"></dict-tag>
+          <el-button type="primary" size="mini" icon="el-icon-plus" @click="qiTaTag=!qiTaTag" style="float: right"></el-button>
+        </div>
       </div>
-      <div class="line">
+      <div class="line" v-show="qiTaTag">
 <!--        <el-descriptions>-->
 <!--          <el-descriptions-item :label="[3, 4].indexOf(list.transportId) > -1 ? $t('空运路线') : $t('海运路线')">-->
 <!--            {{ getRouterNameById(list.lineId) || "/" }}-->
@@ -320,49 +325,49 @@
           </el-descriptions-item>
         </el-descriptions>
       </div>
-      <el-descriptions class="card" v-if="[2, 3, 4].indexOf(list.transportId) > -1">
+      <el-descriptions class="card" v-if="[2, 3, 4].indexOf(list.transportId) > -1" v-show="qiTaTag">
         <el-descriptions-item :label="$t('是否双清')">
           <dict-tag :type="DICT_TYPE.ECW_DOUBLE_CLEAR" :value="list.transportVO.doubleClear"></dict-tag>
         </el-descriptions-item>
       </el-descriptions>
-      <el-descriptions v-if="[3, 4].indexOf(list.transportId) > -1">
+      <el-descriptions v-if="[3, 4].indexOf(list.transportId) > -1" v-show="qiTaTag">
         <el-descriptions-item :label="$t('航空公司')">
           {{ airlineCompany ? $l(airlineCompany, "company") : "/" }}
         </el-descriptions-item>
       </el-descriptions>
-      <el-descriptions v-if="list.transportId == 2">
+      <el-descriptions v-if="list.transportId == 2" v-show="qiTaTag">
         <el-descriptions-item :label="$t('船公司')">
           {{ shippingCompany ? $l(shippingCompany, "company") : "/" }}
         </el-descriptions-item>
       </el-descriptions>
-      <el-descriptions v-if="[2, 3, 4].indexOf(list.transportId) > -1">
+      <el-descriptions v-if="[2, 3, 4].indexOf(list.transportId) > -1" v-show="qiTaTag">
         <el-descriptions-item :label="$t('清关证书')">
           <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="list.transportVO.customsClearCert"></dict-tag>
         </el-descriptions-item>
       </el-descriptions>
-      <el-descriptions v-if="[2, 3, 4].indexOf(list.transportId) > -1">
+      <el-descriptions v-if="[2, 3, 4].indexOf(list.transportId) > -1" v-show="qiTaTag">
         <el-descriptions-item :label="$t('清关证书备注')">
           {{ list.transportVO.remarks || "/" }}
         </el-descriptions-item>
       </el-descriptions>
-      <el-descriptions class="card" v-if="[3, 4].indexOf(list.transportId) > -1">
+      <el-descriptions class="card" v-if="[3, 4].indexOf(list.transportId) > -1" v-show="qiTaTag">
         <el-descriptions-item :label="$t('是否拆包')">
           <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="list.transportVO.isUnpack"></dict-tag>
         </el-descriptions-item>
       </el-descriptions>
-      <el-descriptions v-if="[3, 4].indexOf(list.transportId) > -1">
+      <el-descriptions v-if="[3, 4].indexOf(list.transportId) > -1" v-show="qiTaTag">
         <el-descriptions-item :label="$t('单票立刻转运')">
           <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="list.transportVO.isSingleTicketTransport"></dict-tag>
 
           <span style="margin-left: 10px; color: #0000ff">{{ $t("注：若只有一件，货到仓库立即发，选“是”，多件需仓库集运待发，选“否”") }}</span>
         </el-descriptions-item>
       </el-descriptions>
-      <el-descriptions>
+      <el-descriptions v-show="qiTaTag">
         <el-descriptions-item :label="$t('特殊要求')">
           <dict-selector form-type="checkbox" :type="DICT_TYPE.ORDER_SPECIAL_NEEDS" multiple v-model="list.transportVO.packageType" :disabled="true" />
         </el-descriptions-item>
       </el-descriptions>
-      <el-descriptions>
+      <el-descriptions v-show="qiTaTag">
         <el-descriptions-item :label="$t('特殊要求备注')">
           {{ list.transportVO.packageRemarks || "/" }}
         </el-descriptions-item>
@@ -425,7 +430,8 @@ export default {
       // 船公司
       shippingCompany: null,
       curData: {},
-      serviceUserList: []
+      serviceUserList: [],
+      qiTaTag: false
     }
   },
   computed: {

src/views/ecw/offer/index.vue

@@ -19,10 +19,6 @@
         <dict-selector :type="DICT_TYPE.CUSTOMER_FOLLOWUP_SALE_STAGE" multiple v-model="queryParams.saleStageList" clearable @change="handleQuery" />
       </el-form-item>
 
-      <el-form-item :label="$t('创建时间')">
-        <el-date-picker v-model="queryTmp.createTime" type="datetimerange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" value-format="yyyy-MM-dd HH:mm:ss" @change="handleQuery"> </el-date-picker>
-      </el-form-item>
-
       <el-form-item :label="$t('编号')" prop="searchNumber" v-show="showSearch">
         <el-input v-model.trim="queryParams.searchNumber" :placeholder="$t('请输入报价单号、订单号')" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
@@ -56,17 +52,16 @@
         </el-select>
       </el-form-item>
       <el-form-item :label="$t('目的城市')" prop="objectiveId" v-show="showSearch">
-        <el-select v-model="objectiveId" multiple :placeholder="$t('请选择目的城市')" style="width: 200px" clearable @change="handleQuery">
+        <el-select v-model="objectiveId" multiple :placeholder="$t('请选择目的城市')"  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" v-show="showSearch">
-        <el-select v-model="destWarehouseId" multiple :placeholder="$t('请选择目的仓')" style="width: 200px" clearable @change="handleQuery">
+        <el-select v-model="destWarehouseId" multiple :placeholder="$t('请选择目的仓')" 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>
 
-
       <el-form-item :label="$t('客户来源')" prop="sourceIds" v-show="showSearch">
         <dict-selector :type="DICT_TYPE.CUSTOMER_SOURCE" multiple v-model="queryParams.sourceIds" clearable @change="handleQuery" />
       </el-form-item>
@@ -108,20 +103,23 @@
         <el-input v-model.trim="queryParams.manufacturerPhone" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
 
-      <el-form-item :label="$t('预计发货时间')" v-show="showSearch">
-        <el-date-picker v-model="queryTmp.estimatedShippingTime" type="datetimerange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" value-format="yyyy-MM-dd HH:mm:ss" @change="handleQuery"> </el-date-picker>
-      </el-form-item>
-
       <el-form-item :label="$t('创建人')" prop="creatorIds" v-show="showSearch">
         <user-selector v-model="queryParams.creatorIds" multiple clearable @change="handleQuery" />
       </el-form-item>
 
+      <el-form-item :label="$t('预计发货时间')" v-show="showSearch">
+        <el-date-picker v-model="queryTmp.estimatedShippingTime" type="datetimerange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" value-format="yyyy-MM-dd HH:mm:ss" @change="handleQuery"> </el-date-picker>
+      </el-form-item>
       <el-form-item :label="$t('有效期开始')" v-show="showSearch">
         <el-date-picker v-model="queryTmp.startTime" type="datetimerange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" value-format="yyyy-MM-dd HH:mm:ss" @change="handleQuery"> </el-date-picker>
       </el-form-item>
       <el-form-item :label="$t('有效期结束')" v-show="showSearch">
         <el-date-picker v-model="queryTmp.endTime" type="datetimerange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" value-format="yyyy-MM-dd HH:mm:ss" @change="handleQuery"> </el-date-picker>
       </el-form-item>
+
+      <el-form-item :label="$t('创建时间')">
+        <el-date-picker v-model="queryTmp.createTime" type="datetimerange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" value-format="yyyy-MM-dd HH:mm:ss" @change="handleQuery"> </el-date-picker>
+      </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="resetQuery">{{ $t("重置") }}</el-button>