修复bug

src/views/ecw/offer/createLog.vue

@@ -13,7 +13,7 @@
       <el-form-item :label="$t('跟进时间')" prop="followUpTime" style="width: 46%;display: inline-block">
         <el-date-picker clearable v-model="form.followUpTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" :placeholder="$t('选择跟进时间')" />
       </el-form-item>
-      <el-form-item :label="$t('跟进业务员')" prop="followUpSalesmanId" style="width: 46%;display: inline-block;;margin-left:8%">
+      <el-form-item :label="$t('客户经理')" prop="followUpSalesmanId" style="width: 46%;display: inline-block;;margin-left:8%">
        <el-select v-model="form.followUpSalesmanId" :placeholder="$t('请选择跟进业务员')">
         <el-option v-for="item in creatorData"
                         :key="item.id" :label="item.nickname" :value="item.id"/>
@@ -21,13 +21,12 @@
       </el-form-item>
       <el-form-item :label="$t('联系人')" prop="contacts" style="width: 46%;display: inline-block">
        <el-select v-model="form.contacts" :placeholder="$t('请选择联系人')">
-            <el-option v-for="item in contactsData"
-                        :key="item.customerId" :label="item.name" :value="item.customerId"/>
-        </el-select>
+          <el-option v-for="item in contactsData" :key="item.id" :label="item.name" :value="item.id"/>
+          </el-select>
       </el-form-item>
       <el-form-item :label="$t('跟进方式')" prop="followUpMethod" style="width: 46%;display: inline-block;margin-left:8%">
         <dict-selector
-          :type="DICT_TYPE.ECW_OFFER_METHOD"
+          :type="DICT_TYPE.CUSTOMER_FOLLOW_METHOD"
           :placeholder="$t('请选择跟进方式')"
           v-model="form.followUpMethod"
           form-type="select"
@@ -54,6 +53,8 @@
   import { userList } from "@/api/system/user"
   import { getCustomerContactsListByCustomer } from "@/api/ecw/customerContacts"
   import {DICT_TYPE} from  '@/utils/dict'
+  import {getOffer} from '@/api/ecw/offer'
+  import {getCustomerContactsSelect} from '@/api/ecw/customerContacts'
   export default {
     name: "OfferLog",
     components: {
@@ -69,39 +70,52 @@
         form: {
           type:'2',
           offerId:0,
-          number:0
+          number:0,
         },
         relationId:0,
         // 表单校验
         rules: {
           type: [{ required: true, message: this.$t("请选择跟进类型"), trigger: "change" }],
           followUpTime: [{ required: true, message: this.$t("跟进时间不能为空"), trigger: "blur" }],
-          followUpSalesmanId: [{ required: true, message: this.$t("跟进业务员不能为空"), trigger: "change" }],
+          followUpSalesmanId: [{ required: true, message: this.$t("客户经理不能为空"), trigger: "change" }],
           contacts: [{ required: true, message: this.$t("联系人不能为空"), trigger: "blur" }],
           followUpMethod: [{ required: true, message: this.$t("请选择跟进方式"), trigger: "change" }],
           customerFeedback: [{ required: true, message: this.$t("客户反馈不能为空"), trigger: "blur" }],
           processingResults: [{ required: true, message: this.$t("处理结果不能为空"), trigger: "blur" }],
-        }
+        },
+        list:[]
       };
     },
     created() {
       if(this.$route.query.offerId){
         this.form.offerId = this.$route.query.offerId
-        }
-      if(this.$route.query.relationId){
-        this.relationId = this.$route.query.relationId
-        this.getContactsData()
+        this.getList();
         }
         if(this.$route.query.number){
           this.form.number = this.$route.query.number
         }
-        userList('salesman').then(res =>this.creatorData = res.data)
+        userList('documentary customer service').then(res =>this.creatorData = res.data)
     },
     methods: {
+      getList() {
+        let that = this
+        // 执行查询
+        getOffer(that.form.offerId).then(response => {
+          that.list = response.data;
+          that.getContactsData()
+        })
+      },
       getContactsData(){
-        getCustomerContactsListByCustomer({customerId:this.relationId}).then(response => {
-          this.contactsData = response.data
+        getCustomerContactsSelect({ids: [this.list.consigneeId, this.list.consignorId].join(',')}).then((res) => {
+            if(res.data.list.length>0){
+              this.contactsData.push({name:res.data.list[0].contactsName+'('+this.$t('发货人')+')',id:res.data.list[0].customerContactsId})
+              this.contactsData.push({name:res.data.list[1].contactsName+'('+this.$t('收货人')+')',id:res.data.list[1].customerContactsId})
+            }
+
         })
+        // getCustomerContactsListByCustomer({customerId:this.relationId}).then(response => {
+        //   this.contactsData = response.data
+        // })
       },
       /** 提交按钮 */
       submitForm() {
@@ -114,7 +128,7 @@
           this.form.followUpMethod = parseInt(this.form.followUpMethod)
           createOfferLog(this.form).then(response => {
             this.$modal.msgSuccess(this.$t("新增成功"));
-            this.open = false;
+            this.$store.dispatch('tagsView/delCurrentView')
           });
         });
       },

src/views/ecw/offer/logList.vue

 <template>
   <div class="app-container">
         <el-card>
-            <div slot="header" class="card-title">跟进记录列表</div>
+            <div slot="header" class="card-title">{{$t('跟进记录列表')}}</div>
           <!-- 列表 -->
           <div class="offer-header">
-              <span style="font-size: 15px;">报价单号：{{number}}</span>
+              <span style="font-size: 15px;">{{$t('报价单号')}}：{{number}}</span>
               <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-              >新增</el-button>
+              >{{$t('新增')}}</el-button>
           </div>
 
           <el-table v-loading="loading" :data="list">
-            <el-table-column label="序号" align="center" prop="id" type="index">
+            <el-table-column :label="$t('序号')" align="center" prop="id" type="index">
               <template slot-scope="scope">
                   <span>{{scope.$index + 1}}</span>
                 </template>
               </el-table-column>
-            <el-table-column label="跟进类型" align="center" prop="type" >
+            <el-table-column :label="$t('跟进类型')" align="center" prop="type" >
               <template slot-scope="scope">
                   <dict-tag :type="DICT_TYPE.ECW_OFFER_TYPE" :value="scope.row.type"></dict-tag>
                 </template>
               </el-table-column>
-            <el-table-column label="联系人" align="center" prop="contactName" />
+            <el-table-column :label="$t('联系人')" align="center" prop="contactName" />
 
-            <el-table-column label="跟进方式" align="center" prop="followUpMethod">
+            <el-table-column :label="$t('跟进方式')" align="center" prop="followUpMethod">
            <template slot-scope="scope">
-                <dict-tag :type="DICT_TYPE.ECW_OFFER_METHOD" :value="scope.row.followUpMethod"></dict-tag>
+                <dict-tag :type="DICT_TYPE.CUSTOMER_FOLLOW_METHOD" :value="scope.row.followUpMethod"></dict-tag>
               </template>
             </el-table-column>
-            <el-table-column label="跟进时间" align="center" prop="followUpTime" width="180">
+            <el-table-column :label="$t('跟进时间')" align="center" prop="followUpTime" width="180">
            <template slot-scope="scope">
                 <span>{{ scope.row.followUpTime}}</span>
               </template>
             </el-table-column>
-            <el-table-column label="客户反馈" align="center" prop="customerFeedback" />
-            <el-table-column label="处理结果" align="center" prop="processingResults" />
-            <el-table-column label="跟进业务员" align="center" prop="followUpSalesmanName" />
+            <el-table-column :label="$t('客户反馈')" align="center" prop="customerFeedback" />
+            <el-table-column :label="$t('处理结果')" align="center" prop="processingResults" />
+            <el-table-column :label="$t('客户经理')" align="center" prop="followUpSalesmanName" />
 
           </el-table>
               <pagination v-show="total > 0" :total="total" :page.sync="params.page" :limit.sync="params.rows"
@@ -101,8 +101,7 @@ export default {
         path: "/offer/createLog",
         query:{
           offerId:this.params.offerId,
-          number:this.number,
-          relationId:this.relationId,
+          number:this.number
         }
       });
     },

src/views/ecw/order/prepayDeal.vue

@@ -112,7 +112,11 @@
                  </el-table-column>
                 <el-table-column :label="$t('中文名')" align="center"  prop="prodTitleZh" />
                 <el-table-column :label="$t('英文名')" align="center"  prop="prodTitleEn" />
-                <el-table-column :label="$t('品牌')" align="center" prop="brand" />
+                <el-table-column :label="$t('品牌')" align="center" prop="brandType">
+                  <template slot-scope="scope">
+                      <dict-tag :type="DICT_TYPE.ECW_IS_BRAND" :value="scope.row.brandType"></dict-tag>
+                    </template>
+                  </el-table-column>
                 <el-table-column :label="$t('填单箱数')" prop="num" />
                 <el-table-column :label="$t('入仓箱数')">
                   <template slot-scope="scope">
@@ -304,12 +308,12 @@
           if(response.data.hasOwnProperty('orderItemId')){
             that.getShopData(response.data.orderItemId)
           }
-          
+
           if(that.orderExceptionData.orderExceptionType == 'order_pay_exception'){
             that.getOrderFeeByIdData()
             that.getPreExceptionData()
           }
-          
+
         });
       },
       getOrderData(){