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

src/api/ecw/offer.js

@@ -43,6 +43,15 @@ export function getOfferPage(query) {
   })
 }
 
+// 汇总
+export function statistics(query) {
+  return request({
+    url: "/ecw/offer/statistics",
+    method: "get",
+    params: query
+  })
+}
+
 // 导出报价单管理 Excel
 export function exportOfferExcel(query) {
   return request({

src/i18n/languages/en_US.json

@@ -4941,6 +4941,10 @@
   "标题(英文)": "Title (English)",
   "标题(法文)": "Title (French)",
   "是否确认删除广告设置编号为'{0}'的数据项?": "Are you sure you want to delete the advertisement setting with ID '{0}'?",
-  "渠道已关闭，禁止下单": "The channel has been closed and orders are prohibited"
-
+  "渠道已关闭，禁止下单": "The channel has been closed and orders are prohibited",
+  "询盘来源": "Inquiry Source",
+  "货物状态": "Goods Status",
+  "厂家": "Manufacturer",
+  "厂家电话": "Manufacturer Phone",
+  "预计发货时间": "Estimated Delivery Time"
 }

src/utils/dict.js

@@ -170,6 +170,10 @@ export const DICT_TYPE = {
   CUSTOMER_FOLLOWUP_TYPE: "customer_followup_type", //跟进类型
   CUSTOMER_FOLLOWUP_METHOD: "customer_followup_method", //跟进方式
   CUSTOMER_FOLLOWUP_SALE_STAGE: "sale_stage", //销售阶段
+  ECW_OFFER_CUSTOMER_STATUS: "ecw_offer_customer_status", //客户状态
+  ECW_OFFER_CARGO_STATUS: "ecw_offer_cargo_status", //货物状态
+  ECW_OFFER_INQUIRY_SOURCE: "ecw_offer_inquiry_source", //询盘来源
+  ECW_OFFER_REASON_DICT: "ecw_offer_reason_dict", //输单原因
   CUSTOMER_FOLLOWUP_RESULT_TYPE: "customer_followup_result_type", //跟进结果
   CUSTOMER_FOLLOWUP_STATUS: "customer_followup_status", //跟进状态
   CUSTOMER_QUERY_NUMBER_FIELD: "customer_query_number_field", //客户查询数字字段

src/views/ecw/offer/detail.vue

@@ -38,7 +38,20 @@
             {{ 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.CUSTOMER_FOLLOWUP_SALE_STAGE" :value="list.saleStage" />
+          </el-descriptions-item>
+          <el-descriptions-item :label="$t('客户状态') + ':'">
+            <dict-tag :type="DICT_TYPE.ECW_OFFER_CUSTOMER_STATUS" :value="list.customerStatus" />
+          </el-descriptions-item>
+          <el-descriptions-item :label="$t('货物状态') + ':'">
+            <dict-tag :type="DICT_TYPE.ECW_OFFER_CARGO_STATUS" :value="list.cargoStatus" />
+          </el-descriptions-item>
+          <el-descriptions-item :label="$t('询盘来源') + ':'">
+            <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-item :label="$t('收货人') + ':'">
             {{ consigneeData.contactsName || $t("无") }}
@@ -124,6 +137,26 @@
                 <template>{{ $t("全包价") }} {{ row.oneSeaFreight }} {{ currentcyMap[row.seaFreightCurrency] }} / {{ unitMap[row.seaFreightVolume] }}</template>
               </template>
               <template v-else-if="!row.oneSeaFreight && !row.oneClearanceFreight">{{ $t("未报价") }}</template>
+              <template v-else-if="row.specialPriceType">
+                <div style="color: red;font-weight: 700;">
+                  {{ $t("原价") }}
+                </div>
+                <div>
+                  {{ $t("运费") }}：{{ row.originalSeaFreight }} {{ currentcyMap[row.seaFreightCurrency] }} / {{ unitMap[row.seaFreightVolume] }}
+                </div>
+                <div>
+                  {{ $t("清关费") }}：{{ row.originalClearanceFreight }} {{ currentcyMap[row.clearanceFreightCurrency] }} / {{ unitMap[row.clearanceFreightVolume] }}
+                </div>
+                <div style="color: red;font-weight: 700;">
+                  {{ $t("特价") }}
+                </div>
+                <div>
+                  {{ $t("运费") }}：{{ row.oneSeaFreight }} {{ currentcyMap[row.seaFreightCurrency] }} / {{ unitMap[row.seaFreightVolume] }}
+                </div>
+                <div>
+                  {{ $t("清关费") }}：{{ row.oneClearanceFreight }} {{ currentcyMap[row.clearanceFreightCurrency] }} / {{ unitMap[row.clearanceFreightVolume] }}
+                </div>
+              </template>
               <template v-else>
                 <div>{{ $t("运费") }}：{{ row.oneSeaFreight }} {{ currentcyMap[row.seaFreightCurrency] }} / {{ unitMap[row.seaFreightVolume] }}</div>
                 <div v-if="row.oneClearanceFreight">{{ $t("清关费") }}：{{ row.oneClearanceFreight }} {{ currentcyMap[row.clearanceFreightCurrency] }} / {{ unitMap[row.clearanceFreightVolume] }}</div>
@@ -159,12 +192,12 @@
           </template>
           <template v-if="otherFeeList.length == 0"> 0 </template>
         </el-descriptions-item>
-        <el-descriptions-item :label="$t('原价')" :span="2">
-          <template v-if="originalFeeList.length > 0" v-for="item in originalFeeList">
-            <div :key="item.currencyId">{{ item.amount || 0 }}{{ currentcyMap[item.currencyId] }}</div>
-          </template>
-          <template v-if="originalFeeList.length == 0"> 0 </template>
-        </el-descriptions-item>
+<!--        <el-descriptions-item :label="$t('原价')" :span="2">-->
+<!--          <template v-if="originalFeeList.length > 0" v-for="item in originalFeeList">-->
+<!--            <div :key="item.currencyId">{{ item.amount || 0 }}{{ currentcyMap[item.currencyId] }}</div>-->
+<!--          </template>-->
+<!--          <template v-if="originalFeeList.length == 0"> 0 </template>-->
+<!--        </el-descriptions-item>-->
       </el-descriptions>
 
       <div class="card-title" style="padding: 20px 0">{{ $t("优惠信息") }}</div>
@@ -225,6 +258,9 @@
         <el-descriptions-item :label="$t('预计结束时间')">
           {{ list.stopTime || "/" }}
         </el-descriptions-item>
+        <el-descriptions-item :label="$t('预计发货时间')">
+          {{ list.estimatedShippingTime || "/" }}
+        </el-descriptions-item>
         <el-descriptions-item :label="$t('控货')">
           {{ list.control ? $t("是") : $t("否") }}
         </el-descriptions-item>

src/views/ecw/offer/result.vue

@@ -35,7 +35,12 @@
         </el-form-item>
       </template>
       <template v-else>
-        <el-form-item :label="$t('原因')" prop="reason">
+        <el-form-item :label="$t('原因')" prop="reasonDict">
+          <el-select v-model="form.reasonDict " clearable :placeholder="$t('请选择')">
+            <el-option v-for="dict in getDictDatas(DICT_TYPE.ECW_OFFER_REASON_DICT)" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('备注')" prop="reason">
           <el-input style="width: 500px;" type="textarea" placeholder="" v-model="form.reason"></el-input>
         </el-form-item>
       </template>
@@ -94,10 +99,10 @@ export default {
     if(this.$route.query.offerId){
       this.form.offerId = this.$route.query.offerId
     }
-    
+
   },
   methods: {
-    
+
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate((valid) => {
@@ -131,4 +136,4 @@ export default {
     }
   },
 };
-</script>
\ No newline at end of file
+</script>