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

src/views/ecw/offer/detail.vue

@@ -17,7 +17,7 @@
         <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: 0">
+        <el-descriptions :column="4" border class="card" v-if="list.consignorId" :labelStyle="{ width: '110px' }" style="margin-top: 10px">
           <el-descriptions-item :label="$t('客户经理') + ':'">
             {{list.followUpSalesmanName}}
           </el-descriptions-item>
@@ -26,7 +26,7 @@
           </el-descriptions-item>
         </el-descriptions>
 
-        <el-descriptions :column="3" border class="card" v-if="list.consignorId" :labelStyle="{ width: '110px' }">
+        <el-descriptions :column="3" border class="card" v-if="list.consignorId" :labelStyle="{ width: '110px' }" :contentStyle="{ width: '110px' }">
           <el-descriptions-item :label="$t('发货人') + ':'">
             {{ consignorData.contactsName || $t("无") }}
           </el-descriptions-item>
@@ -46,8 +46,6 @@
             <dict-tag :type="DICT_TYPE.SOCIAL" :value="consignorData.social" />
             {{ consignorData.socialNumber ? "(" + consignorData.socialNumber + ")" : "" }}
           </el-descriptions-item>
-        </el-descriptions>
-        <el-descriptions :column="4" border class="card" v-if="list.consignorId" :labelStyle="{ width: '110px' }" style="margin-top: 0">
           <el-descriptions-item :label="$t('客户状态') + ':'">
             <dict-tag :type="DICT_TYPE.ECW_OFFER_CUSTOMER_STATUS" :value="list.customerStatus" />
           </el-descriptions-item>
@@ -58,7 +56,8 @@
             <dict-tag :type="DICT_TYPE.ECW_OFFER_INQUIRY_SOURCE" :value="list.inquirySource" />
           </el-descriptions-item>
         </el-descriptions>
-        <el-descriptions :column="3" border class="card" v-if="list.consigneeId" :labelStyle="{ width: '110px' }">
+
+        <el-descriptions :column="3" border class="card" v-if="list.consigneeId" :labelStyle="{ width: '110px' }" :contentStyle="{ width: '110px' }">
           <el-descriptions-item :label="$t('收货人') + ':'">
             {{ consigneeData.contactsName || $t("无") }}
           </el-descriptions-item>
@@ -252,7 +251,7 @@
     </el-card>
     <el-card class="card">
       <div slot="header" class="card-title">{{ $t("通用信息") }}</div>
-      <el-descriptions :column="4">
+      <el-descriptions :column="4":labelStyle="{ width: '110px' }" :contentStyle="{ width: '110px' }">
         <el-descriptions-item :label="$t('唛头')">
           {{ list.marks || "/" }}
         </el-descriptions-item>
@@ -260,7 +259,7 @@
           <dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="list.customsType"></dict-tag>
         </el-descriptions-item>
       </el-descriptions>
-      <el-descriptions :column="4">
+      <el-descriptions :column="4":labelStyle="{ width: '110px' }" :contentStyle="{ width: '110px' }">
         <el-descriptions-item :label="$t('预计结束时间')">
           {{ list.stopTime || "/" }}
         </el-descriptions-item>
@@ -277,14 +276,14 @@
           <el-rate v-model="list.importance" disabled></el-rate>
         </el-descriptions-item>
       </el-descriptions>
-      <el-descriptions :column="4">
+      <el-descriptions :column="4":labelStyle="{ width: '110px' }" :contentStyle="{ width: '110px' }">
         <el-descriptions-item :label="$t('价格有效期')"> {{ list.startTime + $t("至") }}{{ list.endTime }} </el-descriptions-item>
         <el-descriptions-item :label="$t('交货方式')">
           <dict-tag :type="DICT_TYPE.ECW_TRADE_TYPE" :value="list.tradeType"></dict-tag>
           <span style="margin-left: 10px">{{ list.tradeAdress }}</span>
         </el-descriptions-item>
       </el-descriptions>
-      <el-descriptions>
+      <el-descriptions :column="4":labelStyle="{ width: '110px' }" :contentStyle="{ width: '110px' }">
         <el-descriptions-item :label="$t('厂家')">
           {{ list.manufacturer || "/" }}
         </el-descriptions-item>
@@ -298,7 +297,7 @@
           {{ list.remarks || "/" }}
         </el-descriptions-item>
       </el-descriptions>
-      <el-descriptions :column="4">
+      <el-descriptions :column="4":labelStyle="{ width: '110px' }" :contentStyle="{ width: '110px' }">
         <el-descriptions-item :label="$t('创建人')"> {{ list.creatorName || "/" }} </el-descriptions-item>
         <el-descriptions-item :label="$t('创建时间')"> {{ list.createTime || "/" }} </el-descriptions-item>
         <el-descriptions-item :label="$t('最后更新人')"> {{ list.updaterName || "/" }} </el-descriptions-item>

src/views/ecw/offer/edit.vue

@@ -71,28 +71,29 @@
             <!-- <el-input v-if="$route.query.type==1 && form.relation==2"  v-model="$route.query.customer.defaultEmail" disabled  class="w-200"/>
                     <el-input v-else v-model="form.consigneeEmail" disabled  class="w-200"/> -->
           </el-form-item>
+
+          <el-form-item :label="$t('客户状态')" prop="customerStatus">
+            <el-select v-model="form.customerStatus" clearable :placeholder="$t('请选择')" class="w-200">
+              <el-option v-for="dict in getDictDatas(DICT_TYPE.ECW_OFFER_CUSTOMER_STATUS)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="parseInt(dict.value)" />
+            </el-select>
+          </el-form-item>
+          <el-form-item :label="$t('货物状态')" prop="cargoStatus">
+            <el-select v-model="form.cargoStatus" clearable :placeholder="$t('请选择')" class="w-200">
+              <el-option v-for="dict in getDictDatas(DICT_TYPE.ECW_OFFER_CARGO_STATUS)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="parseInt(dict.value)" />
+            </el-select>
+          </el-form-item>
+          <el-form-item :label="$t('询盘来源')" prop="inquirySource">
+            <el-select v-model="form.inquirySource" clearable :placeholder="$t('请选择')" class="w-200">
+              <el-option v-for="dict in getDictDatas(DICT_TYPE.ECW_OFFER_INQUIRY_SOURCE)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="parseInt(dict.value)" />
+            </el-select>
+          </el-form-item>
+          <el-form-item :label="$t('客户经理')" prop="followUpSalesmanId">
+            <el-select filterable v-model="form.followUpSalesmanId" :placeholder="$t('请选择客户经理')">
+              <el-option v-for="item in serviceUserList" :key="item.id" :label="item.nickname" :value="item.id" />
+            </el-select>
+          </el-form-item>
         </div>
 
-        <el-form-item :label="$t('客户状态')" prop="customerStatus">
-          <el-select v-model="form.customerStatus" clearable :placeholder="$t('请选择')" class="w-200">
-            <el-option v-for="dict in getDictDatas(DICT_TYPE.ECW_OFFER_CUSTOMER_STATUS)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="parseInt(dict.value)" />
-          </el-select>
-        </el-form-item>
-        <el-form-item :label="$t('货物状态')" prop="cargoStatus">
-          <el-select v-model="form.cargoStatus" clearable :placeholder="$t('请选择')" class="w-200">
-            <el-option v-for="dict in getDictDatas(DICT_TYPE.ECW_OFFER_CARGO_STATUS)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="parseInt(dict.value)" />
-          </el-select>
-        </el-form-item>
-        <el-form-item :label="$t('询盘来源')" prop="inquirySource">
-          <el-select v-model="form.inquirySource" clearable :placeholder="$t('请选择')" class="w-200">
-            <el-option v-for="dict in getDictDatas(DICT_TYPE.ECW_OFFER_INQUIRY_SOURCE)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="parseInt(dict.value)" />
-          </el-select>
-        </el-form-item>
-        <el-form-item :label="$t('客户经理')" prop="followUpSalesmanId">
-          <el-select filterable v-model="form.followUpSalesmanId" :placeholder="$t('请选择客户经理')">
-            <el-option v-for="item in serviceUserList" :key="item.id" :label="item.nickname" :value="item.id" />
-          </el-select>
-        </el-form-item>
         <!-- <el-descriptions :column="3" border>
                 <el-descriptions-item :label="$t('*发货人')" :labelStyle="labelStyle" >
                     <el-form-item label="" label-width="0" style="margin-bottom: 0" prop="consignorId" required :error="$t('发货人不能为空')">