6

src/views/ecw/customer/components/customerFollow.vue

@@ -39,6 +39,12 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('联系方式')">
+              <el-input v-model="form.contactPhone" disabled />
+            </el-form-item>
+          </el-col>
+
           <el-col :span="12">
             <el-form-item :label="$t('客户经理')" required>
               <el-select v-model="form.followUserId" clearable :placeholder="$t('请选择')" :disabled="isView">
@@ -135,6 +141,7 @@
 
 <script>
 import { createCustomerFollow, getCustomerFollowPage, getCustomerFollowPage2, addCustomerFollow, getCustomerFollowList, editCustomerFollow, getFollowupNewNumber } from "@/api/ecw/customerFollow"
+import { getCustomerContactsSelect } from "@/api/ecw/customerContacts"
 import { getOfferPage } from "@/api/ecw/offer"
 import { DICT_TYPE, getDictDataLabel } from "@/utils/dict"
 import { getCustomerContactsListByCustomer } from "@/api/ecw/customerContacts"
@@ -212,12 +219,26 @@ export default {
   },
   methods: {
     init() {
-      if (!!this.form.customerId)
+      if (this.form.customerId) {
         getCustomerContactsListByCustomer({
           customerId: this.form.customerId
         }).then((r) => {
           this.customerContactsList = r.data
         })
+      } else {
+        getCustomerContactsSelect().then((res) => {
+          this.customerContactsList = res.data.list.map((item) => {
+            return {
+              name: item.contactsName,
+              id: item.customerContactsId,
+              customerId: item.customerId,
+              phoneNew: item.phoneNew,
+              areaCode: item.areaCode,
+              customerNumber: item.customerNumber
+            }
+          })
+        })
+      }
     },
     getOfferList() {
       getOfferPage(this.queryParams).then((response) => {
@@ -276,7 +297,9 @@ export default {
         for (const item of this.customerContactsList) {
           if (item.id == val) {
             this.form.contactName = item.name
-            // this.form.contactPhone = `+${item.areaCode}${item.phoneNew}`
+            this.form.customerId = item.customerId
+            this.form.contactPhone = "+" + item.areaCode + item.phoneNew
+            if (item.customerNumber) this.form.customerNumber = item.customerNumber
             break
           }
         }
@@ -362,7 +385,10 @@ export default {
       let r = await getFollowupNewNumber()
       console.log(r)
       this.form.customerId = this.customerId
-      this.form.number = r.data
+      this.form.number = r.data.number
+      this.form.nubmerId = r.data.nubmerId
+      this.form.numberVersion = r.data.numberVersion
+      this.form.status = 0
       this.init()
     },
     async handleUpdate(row, flag) {
@@ -380,8 +406,11 @@ export default {
           parentNumber: row.number,
           followTime: row.nextTime,
           nextTime: "",
-          number: r.data,
-          nextPlan: ""
+          number: r.data.number,
+          nubmerId: r.data.nubmerId,
+          numberVersion: r.data.numberVersion,
+          nextPlan: "",
+          status: 0
         }
       }
       this.init()

src/views/ecw/customer/edit.vue

@@ -370,7 +370,7 @@
           <span class="title-text">{{ $t("设置") }}</span>
           <el-button style="float: right" size="small" type="primary" @click="showSettingFlag = !showSettingFlag">{{ showSettingFlag ? $t("隐藏") : $t("更多") }}</el-button>
         </div>
-        <el-form ref="setForm" label-width="150px" v-if="showSettingFlag">
+        <el-form ref="setForm" label-width="150px" v-show="showSettingFlag">
           <el-row :gutter="10">
             <el-col :span="12">
               <el-form-item :label="$t('是否显示提单价格')" prop="isShowTidanPrice">
@@ -437,7 +437,7 @@
           <span class="title-text">{{ $t("财务") }}</span>
           <el-button style="float: right" size="small" type="primary" @click="showFinanceFlag = !showFinanceFlag">{{ showFinanceFlag ? $t("隐藏") : $t("更多") }}</el-button>
         </div>
-        <el-form ref="financeForm" label-width="150px" v-if="showFinanceFlag">
+        <el-form ref="financeForm" label-width="150px" v-show="showFinanceFlag">
           <el-row :gutter="10">
             <el-col :span="12">
               <el-form-item :label="$t('公司名称')" prop="company">
@@ -518,7 +518,7 @@
           </el-row>
         </el-form>
 
-        <el-form ref="bankForm" :model="form" v-if="showFinanceFlag">
+        <el-form ref="bankForm" :model="form" v-show="showFinanceFlag">
           <el-row type="flex" class="row-bg" justify="space-between">
             <span style="font-size: 15px; line-height: 30px">{{ $t("银行信息") }}</span>
             <el-button size="small" type="primary" @click="addBankData">+</el-button>
@@ -1001,10 +1001,17 @@ export default {
       }
       this.$refs["contactForm"].validate((valid1, err1) => {
         this.$refs["form"].validate((valid2, err2) => {
+          console.log(valid2, "valid2", err2)
           this.$refs.bankForm.validate((valid3, err3) => {
-            console.log(valid3, "valid3")
+            console.log(valid3, "valid3", err3)
             if (!valid1 || !valid2 || !valid3) {
+              console.log(333)
               this.$showFormValidateErrors({ ...err1, ...err2, ...err3 })
+
+              this.showBaseFlag = true
+              this.showShippingFlag = true
+              this.showSettingFlag = true
+              this.showFinanceFlag = true
               return
             }
             if (this.form.customerContacts.length === 0) {

src/views/ecw/offer/logListCommon.vue

@@ -195,8 +195,8 @@ export default {
         exportCustomerFollow({
           ...this.followForm,
           ...this.formatQuery(),
-          pageNo: 1,
-          pageSize: 10000000
+          pageNo: null,
+          pageSize: null
         }).then((r) => {
           this.$message.success(this.$t("已加入导出队列，请稍后在下载日志中下载"))
         })