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

src/views/ecw/offer/detail.vue

@@ -17,6 +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: 0">
+          <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>
+
         <el-descriptions :column="3" border class="card" v-if="list.consignorId" :labelStyle="{ width: '110px' }">
           <el-descriptions-item :label="$t('发货人') + ':'">
             {{ consignorData.contactsName || $t("无") }}
@@ -39,9 +48,6 @@
           </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>
@@ -285,6 +291,9 @@
         <el-descriptions-item :label="$t('厂家电话')">
           {{ list.manufacturerPhone || "/" }}
         </el-descriptions-item>
+        <el-descriptions-item :label="$t('优惠信息')">
+          {{ list.specialOffers || "/" }}
+        </el-descriptions-item>
         <el-descriptions-item :label="$t('备注')">
           {{ list.remarks || "/" }}
         </el-descriptions-item>
@@ -301,11 +310,11 @@
         <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="list.transportId"></dict-tag>
       </div>
       <div class="line">
-        <el-descriptions>
-          <el-descriptions-item :label="[3, 4].indexOf(list.transportId) > -1 ? $t('空运路线') : $t('海运路线')">
-            {{ getRouterNameById(list.lineId) || "/" }}
-          </el-descriptions-item>
-        </el-descriptions>
+<!--        <el-descriptions>-->
+<!--          <el-descriptions-item :label="[3, 4].indexOf(list.transportId) > -1 ? $t('空运路线') : $t('海运路线')">-->
+<!--            {{ getRouterNameById(list.lineId) || "/" }}-->
+<!--          </el-descriptions-item>-->
+<!--        </el-descriptions>-->
         <el-descriptions v-if="[3, 4].indexOf(list.transportId) > -1">
           <el-descriptions-item :label="$t('出货渠道')">
             {{ channelName || "/" }}
@@ -382,6 +391,7 @@ import Decimal from "decimal.js"
 window.Decimal = Decimal
 
 import CustomerFollow from "@/views/ecw/customer/components/customerFollow"
+import { listServiceUser } from "@/api/system/user"
 export default {
   name: "detail",
   components: { CustomerFollow },
@@ -415,7 +425,8 @@ export default {
       airlineCompany: null,
       // 船公司
       shippingCompany: null,
-      curData: {}
+      curData: {},
+      serviceUserList: []
     }
   },
   computed: {
@@ -666,6 +677,13 @@ export default {
           if (consignee) that.consigneeData = consignee
           that.getCnsigneeData()
         })
+        listServiceUser().then((r) => {
+            for (var a in r.data) {
+              if(r.data[a].id == that.list.followUpSalesmanId) {
+                this.$set(that.list, "followUpSalesmanName", r.data[a].nickname)
+              }
+            }
+        })
         that.list.offerProdRespVOList.forEach((item) => {
           var arr = item.prodAttrIds.split(",")
           var prodAttrName = []

src/views/ecw/offer/edit.vue

@@ -88,7 +88,11 @@
             <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('发货人不能为空')">
@@ -241,41 +245,31 @@
             </template>
           </el-table-column>
           <el-table-column width="100px">
-            <template slot="header" slot-scope="scope"> {{ $t('总体积') + '(m³)' }} <span class="red">*</span> </template>
+            <template slot="header" slot-scope="scope"> {{ $t('总体积') + '(m³)' }}</template>
             <template slot-scope="scope">
               <el-form-item
                 style="margin-bottom: 0;"
                 label=""
                 :prop="`prodCreateReqVOList.${scope.$index}.volume`"
-                :rules="{
-                  required: true,
-                  message: $t('不能为空'),
-                  trigger: 'blur'
-                }"
               >
                 <el-input v-model="scope.row.volume" @input="calculationPrice" :disabled="!canAddProduct" />
               </el-form-item>
             </template>
           </el-table-column>
           <el-table-column :label="$t('总重量') + '(kg)'" width="100px">
-            <template slot="header" slot-scope="scope"> {{ $t('总重量') + '(kg)' }} <span class="red">*</span> </template>
+            <template slot="header" slot-scope="scope"> {{ $t('总重量') + '(kg)' }}</template>
             <template slot-scope="scope">
               <el-form-item
                 style="margin-bottom: 0;"
                 label=""
                 :prop="`prodCreateReqVOList.${scope.$index}.weight`"
-                :rules="{
-                  required: true,
-                  message: $t('不能为空'),
-                  trigger: 'blur'
-                }"
               >
                 <el-input v-model="scope.row.weight" @input="calculationPrice" :disabled="!canAddProduct" />
               </el-form-item>
             </template>
           </el-table-column>
           <el-table-column :label="$t('总货值') + '(RMB)'" width="120px">
-            <template slot="header" slot-scope="scope"> {{ $t("总货值") }}(RMB) <span class="red">*</span> </template>
+            <template slot="header" slot-scope="scope"> {{ $t("总货值") }}(RMB)</template>
             <template slot-scope="scope">
               <el-form-item
                 label=""
@@ -418,6 +412,13 @@
             <el-input v-model="form.otherFee" placeholder="" class="w-100 mr-10"></el-input>
             <selector v-model="form.otherFeeCurrencyId" :options="currencyList" :label-field="$l('title')" value-field="id" defaultable class="w-100" />
           </el-descriptions-item>
+          <el-descriptions-item :label="$t('预计费用')" :span="1">
+            <div>
+              <template v-for="item in estimatedCosts">
+                <div :key="item.currencyId">{{ item.amount || 0 }}{{ currencyMap[item.currencyId] }}</div>
+              </template>
+            </div>
+          </el-descriptions-item>
 <!--          <el-descriptions-item :label="$t('原价')" :span="2">-->
 <!--            <template v-for="item in originalFeeList">-->
 <!--              <div :key="item.currencyId">{{ item.amount || 0 }}{{ currencyMap[item.currencyId] }}</div>-->
@@ -460,13 +461,6 @@
           <el-descriptions-item :label="$t('优惠费用')" v-if="couponTotalAmountList && couponTotalAmountList.length">
             <div v-for="(item, discountIndex) in couponTotalAmountList" :key="discountIndex">{{ item.totalAmount }} {{ currencyMap[item.currencyId] }}</div>
           </el-descriptions-item>
-          <el-descriptions-item :label="$t('预计费用')" :span="1">
-            <div>
-              <template v-for="item in estimatedCosts">
-                <div :key="item.currencyId">{{ item.amount || 0 }}{{ currencyMap[item.currencyId] }}</div>
-              </template>
-            </div>
-          </el-descriptions-item>
         </el-descriptions>
       </el-card>
 
@@ -527,12 +521,14 @@
           <el-form-item :label="$t('厂家')" prop="manufacturer">
             <el-input v-model="form.manufacturer" type="textarea" style="width: 410px; height: 50px"></el-input>
           </el-form-item>
-          <br>
           <el-form-item :label="$t('厂家电话')" prop="manufacturerPhone">
             <el-input v-model="form.manufacturerPhone"  type="textarea" style="width: 410px; height: 50px"></el-input>
           </el-form-item>
         </div>
         <div class="form-section">
+          <el-form-item :label="$t('优惠信息')" :span="2" prop="remarks">
+            <el-input v-model="form.specialOffers" :rows ="6" type="textarea" placeholder="" style="width: 410px; height: 100px"></el-input>
+          </el-form-item>
           <el-form-item :label="$t('备注')" :span="2" prop="remarks">
             <el-input v-model="form.remarks" :rows ="6" type="textarea" placeholder="" style="width: 410px; height: 100px"></el-input>
           </el-form-item>
@@ -664,6 +660,7 @@ import { getRegionList } from "@/api/ecw/order"
 import { competitorListAll, addCompetitor } from "@/api/ecw/customer"
 import { getCustomerContactsListByCustomer } from "@/api/ecw/customerContacts"
 import { parse } from "querystring"
+import { listServiceUser } from "@/api/system/user"
 
 window.Decimal = Decimal
 const createDefaultForm = () => {
@@ -752,7 +749,8 @@ export default {
       AddressProvince: [],
       AddressCity: [],
       competitorList: [],
-      qiTaTag: false
+      qiTaTag: false,
+      serviceUserList: []
     }
   },
   computed: {
@@ -841,8 +839,8 @@ export default {
         lineId: [{ required: true, message: this.$t("请选择线路") }],
         /* consignorId:    [{ required: true, message: this.$t("发货人不能为空"),}],
             consigneeId:    [{ required: true, message: this.$t("收货人不能为空")}], */
-        startTime: [{ required: true, message: this.$t("有效期开始时间不能为空") }],
-        endTime: [{ required: true, message: this.$t("有效期结束时间不能为空") }],
+        // startTime: [{ required: true, message: this.$t("有效期开始时间不能为空") }],
+        // endTime: [{ required: true, message: this.$t("有效期结束时间不能为空") }],
         transportId: [{ required: true, message: this.$t("选择运输方式") }],
         // departureId: [{required: true, message: this.$t('请选择始发城市')}],
         destCountryId: [{ required: true, message: this.$t("请选择目的国家") }],
@@ -851,6 +849,7 @@ export default {
         estimatedShippingTime: [{ required: true, message: this.$t("不能为空") }],
         relation: [{ required: true, message: this.$t("请选择所属人") }],
         saleStage:  [{ required: true, message: this.$t("销售阶段不能为空") }],
+        followUpSalesmanId: [{ required: true, message: this.$t("客户经理不能为空") }],
         // control: [{ required: true, message: this.$t("请选择是否控货") }],
         // importance: [
         //   { required: true, message: this.$t("请选择重要程度") },
@@ -859,6 +858,9 @@ export default {
         remarks: [
           { max: 500, message: '500max', trigger: 'blur' }
         ],
+        specialOffers: [
+          { max: 200, message: '200max', trigger: 'blur' }
+        ],
         manufacturer: [
           { max: 100, message: '100max', trigger: 'blur' }
         ],
@@ -1169,7 +1171,18 @@ export default {
     getRegionList(1, 1).then((res) => (this.AddressProvince = res.data))
     getRegionList(4, 4).then((res) => (this.AddressCity = res.data))
     competitorListAll().then((res) => (this.competitorList = res.data))
-
+    listServiceUser().then((r) => {
+      this.serviceUserList = r.data
+        if (this.$route.query.id || this.$route.query.copyId) {
+        } else if (this.$route.query.type && this.$route.query.type == 1) {
+        } else {
+          for (var a in r.data) {
+            if(r.data[a].id == this.$store.state.user.id) {
+              this.$set(this.form, "followUpSalesmanId", r.data[a].id)
+            }
+          }
+        }
+    })
     if (this.$route.query.id || this.$route.query.copyId) {
       console.log("编辑或复制报价单转进")
       this.getOffer()
@@ -1311,7 +1324,7 @@ export default {
           }
 
           formData.channelId = formData.channelId || null
-
+          formData.followUpSalesmanId = formData.followUpSalesmanId?formData.followUpSalesmanId*1:''
           this.$set(this, "form", formData)
           console.log("报价单归属", this.form.relation == 1? "发货人":"收货人")
           // 接口只返回了发货人和收货人ID，还需要调用接口获取详细信息回显