客户跟进3

src/i18n/languages/en_US.json

@@ -4695,5 +4695,14 @@
   "动态": "Dynamics",
   "增值服务": "Added services",
   "开启会员积分系统": "Enable member points system",
-  "是否确认{val}会员积分系统": "Confirm whether to {val} the member points system"
+  "是否确认{val}会员积分系统": "Confirm whether to {val} the member points system",
+  "跟进状态": "Follow-up status",
+  "上一级跟进单": "Follow-up parent number",
+  "跟进结果": "Follow-up result",
+  "目的": "Purpose",
+  "下一步计划": "Next plan",
+  "跟进情况": "Follow-up situation",
+  "下次跟进时间": "Next follow-up time",
+  "提交结果": "Submit result",
+  "增加计划": "Add plan"
 }

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

@@ -27,14 +27,16 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="13" v-if="form.followType == '2'">
+        <!--
+        <el-col :span="13">
           <el-form-item :label="$t('报价单')">
             <el-input v-model="form.offerId" :placeholder="$t('请输入报价单')" disabled />
           </el-form-item>
         </el-col>
+        -->
         <el-col :span="12">
           <el-form-item :label="$t('跟进时间')" required>
-            <el-date-picker v-model="form.followTime" type="datetime" format="yyyy-MM-dd HH:mm:ss" :placeholder="$t('请选择')"></el-date-picker>
+            <el-date-picker v-model="form.followTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" :placeholder="$t('请选择')"></el-date-picker>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -60,7 +62,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item :label="$t('上一级跟进单')" prop="parentNumber">
-            <el-input v-model="form.parentNumber" :placeholder="$t('请输入上一级跟进单')" />
+            <el-input v-model="form.parentNumber" :placeholder="$t('请输入上一级跟进单')" disabled />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -82,7 +84,7 @@
         </el-col>
         <el-col :span="20">
           <el-form-item :label="$t('跟进情况')">
-            <el-input rows="3" class="text_style" type="textarea" placeholder="【客户反馈：】<br>价格高先不出货\n【处理结果：】\n下次联系" v-model="form.feedback" maxlength="500" show-word-limit />
+            <el-input rows="3" class="text_style" type="textarea" placeholder="" v-model="form.feedback" maxlength="500" show-word-limit />
           </el-form-item>
         </el-col>
         <el-col :span="20">
@@ -92,7 +94,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item :label="$t('下次跟进时间')">
-            <el-date-picker v-model="form.nextTime" type="datetime" format="yyyy-MM-dd HH:mm:ss" :placeholder="$t('请选择')" :picker-options="pickerOptions">
+            <el-date-picker v-model="form.nextTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" :placeholder="$t('请选择')" :picker-options="pickerOptions">
             </el-date-picker>
           </el-form-item>
         </el-col>
@@ -129,7 +131,7 @@
     <div slot="footer" class="dialog-footer">
       <el-button type="warning" @click="goBack">{{$t('返 回')}}</el-button>
       <el-button type="primary" @click="customerFollowSubmit(0)">{{$t('保 存')}}</el-button>
-      <el-button type="success" @click="customerFollowSubmit(1)" v-if="!isEdit">{{$t('提交结果')}}</el-button>
+      <el-button type="success" @click="customerFollowSubmit(1)" v-if="isEdit">{{$t('提交结果')}}</el-button>
     </div>
   </el-dialog>
 
@@ -232,13 +234,6 @@ export default {
   },
   created() {
     // this.resetCustomerFollowForm()
-    if (!!this.customerId) getCustomerContactsListByCustomer({
-      customerId: this.customerId
-    }).then(r => {
-      this.customerContactsList = r.data
-      this.form.customerId = this.customerId
-      this.form.bizId = this.id
-    })
     listServiceUser().then(r => {
       // console.log( r.data,'r.data跟进业务')
       this.serviceUserList = r.data
@@ -250,6 +245,15 @@ export default {
     // this.reset()
   },
   methods: {
+    init() {
+      if (!!this.customerId) getCustomerContactsListByCustomer({
+        customerId: this.customerId
+      }).then(r => {
+        this.customerContactsList = r.data
+        // this.form.customerId = this.customerId
+        // this.form.bizId = this.id
+      })
+    },
     getOfferList() {
       getOfferPage(this.queryParams).then(response => {
         this.offerList = response.data.list;
@@ -259,9 +263,9 @@ export default {
     handleFollowType(val) {
       console.log(val)
       if (val == '2') {
-        // this.$emit('selectOffer')
-        console.log(2222)
         this.$refs['customerFollowSelectOffer'].offerDialogVisible = true
+      } else {
+        this.form.offerId = undefined
       }
     },
     selectOffer(offerId) {
@@ -271,7 +275,7 @@ export default {
       this.form = {
         attatchment: undefined,
         contactName: undefined,
-        customerId: 0,
+        customerId: this.customerId,
         feedback: undefined,
         followMethod: undefined,
         followTime: undefined,
@@ -298,7 +302,7 @@ export default {
           return
         }
         if (!this.form.followType) {
-          this.$modal.msgError("请选择跟进类型");
+          this.$modal.msgError(this.$t("请选择跟进类型"));
           return
         }
         if (!this.form.followTime) {
@@ -310,7 +314,7 @@ export default {
           return
         }
         if (!this.form.followUserId) {
-          this.$modal.msgError(this.$t('请选择跟进业务'));
+          this.$modal.msgError(this.$t('请选择客户经理'));
           return
         }
         if (!this.form.followMethod) {
@@ -337,8 +341,9 @@ export default {
         ...this.form,
         status
       }).then(r => {
+        this.$message.info(this.$t("操作成功"))
+        this.$emit('refresh')
         this.customerFollowClose()
-        this.getCustomerFollowList()
       })
     },
     goBack() {
@@ -351,7 +356,7 @@ export default {
       })
     },
     customerFollowClose() {
-      this.resetCustomerFollowForm()
+      // this.resetCustomerFollowForm()
       this.customerFollow.dialogVisible = false
     },
     resetCustomerFollowForm() {
@@ -404,7 +409,14 @@ export default {
     handleUpdate(row, flag) {
       this.isEdit = flag
       this.customerFollow.dialogVisible = true
-      this.form = row
+      if (flag) {
+        this.form = row
+      } else {
+        this.form = {
+          ...row,
+          parentNumber: row.number
+        }
+      }
     },
   }
 }
@@ -412,6 +424,6 @@ export default {
 
 <style scoped>
 .text_style{
-  white-space: pre-wrap;   
+  white-space: pre-wrap;
 }
 </style>

src/views/ecw/customer/index.vue

@@ -458,6 +458,7 @@
         width="200px"
         :label="$t('操作')"
         align="center"
+        fixed="right"
         class-name="small-padding fixed-width"
       >
         <template slot-scope="scope">
@@ -1036,6 +1037,7 @@
       :customer-id="customerId"
       :id="customerId"
       ref="CustomerFollowList"
+      v-if="customerFollowVisible"
     ></customer-follow-list>
     <customer-complaints
       :customer-id="customerId"
@@ -1099,7 +1101,7 @@ import { CommonStatusEnum } from "@/utils/constants";
 import { uploadFile } from "@/api/infra/file";
 import upload from "@/components/ImageUpload";
 import { getNodeList } from "@/api/ecw/node";
-import CustomerFollowList from "@/components/CustomerFollowList";
+import CustomerFollowList from "./components/customerFollow";
 import customerComplaints from "@/components/customerComplaints";
 import { listServiceUser } from "@/api/system/user";
 import { getCountryListAll } from "@/api/ecw/country";
@@ -1235,6 +1237,7 @@ export default {
       customData: {},
       currentisNew: false,
       userId: undefined, //lanbm 2024-05-23 add
+      customerFollowVisible: false
     };
   },
   computed: {
@@ -1373,9 +1376,12 @@ export default {
     },
     followUp(row) {
       this.customerId = row.id;
-      this.$nextTick(() => {
-        this.$refs.CustomerFollowList.customerFollow.dialogVisible = true;
-      });
+      this.customerFollowVisible = true
+      this.$nextTick(_ => {
+        // this.$refs.CustomerFollowList.customerFollow.dialogVisible = true;
+        this.$refs['CustomerFollowList'].init()
+        this.$refs['CustomerFollowList'].handleAdd()
+      })
     },
     //报价
     quote(row) {

src/views/ecw/customer/query.vue

@@ -31,7 +31,7 @@
                  <el-button type="text" > 查看图片</el-button>
               </image-display>
             </el-descriptions-item>
-  
+
             <template v-if="showMore">
             <el-descriptions-item :label="$t('客户等级')">{{ getDictDataLabel(DICT_TYPE.CUSTOMER_LEVEL, customer.level) }}</el-descriptions-item>
             <el-descriptions-item :label="$t('推介人')">{{ customer.promoterName }}</el-descriptions-item>
@@ -344,7 +344,7 @@
                 >
                   <template slot-scope="{row}">
                     <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="row.transportType" /> / {{row.objectiveName}}
-                  </template> 
+                  </template>
                 </el-table-column>
                 <el-table-column
                   :label="$t('销售阶段')"
@@ -386,7 +386,7 @@
                   :label="$t('创建时间')"
                 >
                 </el-table-column>
-                <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
+                <el-table-column :label="$t('操作')" align="center" fixed="right" class-name="small-padding fixed-width">
                   <template slot-scope="scope">
                     <!--
                     0 取消                                        恢复
@@ -459,7 +459,7 @@
               <el-table :data="customerFollowList" style="width: 100%">
                 <el-table-column prop="number" :label="$t('编号')"> </el-table-column>
                 <el-table-column prop="followType" :label="$t('跟进类型')" :formatter="(row, column, cellValue) => getDictDataLabel(DICT_TYPE.CUSTOMER_FOLLOWUP_TYPE, cellValue)"></el-table-column>
-                <el-table-column prop="offerId" :label="$t('报价单')"></el-table-column>
+                <el-table-column prop="offerId" :label="$t('报价单号')"></el-table-column>
                 <el-table-column prop="followTime" :label="$t('跟进时间')" :formatter="(row, column, cellValue) => parseTime(cellValue)"></el-table-column>
                 <el-table-column prop="contactName" :label="$t('联系人')"></el-table-column>
                 <el-table-column prop="followUserName" :label="$t('客户经理')"></el-table-column>
@@ -493,10 +493,10 @@
                     {{ parseTime(scope.row.updateTime) }}
                   </template>
                 </el-table-column>
-                <el-table-column width="200px" :label="$t('操作')" align="center" class-name="small-padding fixed-width">
+                <el-table-column width="150px" :label="$t('操作')" align="center" fixed="right" class-name="small-padding fixed-width">
                   <template slot-scope="scope">
-                    <el-button size="mini" type="text" icon="el-icon-edit" @click="handleCustomerFollow(scope.row, true)" v-hasPermi="['ecw:customer:follow-update']">{{ $t("编辑") }}</el-button>
-                    <el-button size="mini" type="text" icon="el-icon-collection" @click="handleCustomerFollow(scope.row, false)" v-has-permi="['ecw:customer:follow-add-plan']">{{ $t("增加计划") }}</el-button>
+                    <el-button size="mini" type="text" icon="el-icon-edit" @click="handleCustomerFollow(scope.row, false)" v-hasPermi="['ecw:customer:follow-update']">{{ $t("编辑") }}</el-button>
+                    <el-button size="mini" type="text" icon="el-icon-collection" @click="handleCustomerFollow(scope.row, true)" v-has-permi="['ecw:customer:follow-add-plan']">{{ $t("增加计划") }}</el-button>
                   </template>
                 </el-table-column>
               </el-table>
@@ -583,9 +583,8 @@
                 <el-descriptions-item :label="$t('税率')">{{ customer.taxRate  }}</el-descriptions-item>
               </el-descriptions>
             </el-card>
-            
           </el-tab-pane>
-          
+
           <el-tab-pane name="special" :label="$t('特殊设置')">
             <el-descriptions :column="2">
               <el-descriptions-item :label="$t('是否显示提单价格')">
@@ -709,7 +708,6 @@
           </el-tab-pane>
         </el-tabs>
 
-        
         <el-card style="margin-top: 15px;">
           <h3>{{$t('银行账户')}}</h3>
           <el-table :data="customer.customerBankBackVOList" border>
@@ -824,7 +822,7 @@
       </div>
     </el-dialog>
 
-    <customer-follow ref="customerFollow" :id="id" :customer-id="id" @refresh="getCustomerFollowList" @selectOffer="handleCustomerFollowSelectOffer" />
+    <customer-follow ref="customerFollow" v-if="customerFollowVisible" :id="id" :customer-id="id" @refresh="getCustomerFollowList" />
   </div>
 </template>
 
@@ -963,7 +961,7 @@ export default {
         this.AddressTown = [];
         this.objectiveId = "";
         this.destWarehouseId = "";
-        
+
         if (this.destCountryId == "") {
           this.getAddressCity()
           this.getAddressTown()
@@ -1137,7 +1135,7 @@ export default {
       destCountryId: null,
       objectiveId: null,
       destWarehouseId: null,
-      customerFollowVisible: true,
+      customerFollowVisible: false,
       followForm: {
         pageNo: 1,
         pageSize: 10
@@ -1199,7 +1197,6 @@ export default {
           this.$nextTick(_ => {
             this.$refs['customerFollow'].handleAdd()
           })
-          
         } else {
           this.$refs['customerComplaint'].handleAdd()
         }

src/views/ecw/myCustomerService/index.vue

@@ -79,7 +79,7 @@
                     clearable
                     v-model.number="queryParams.memberMobile"
                     :placeholder="$t('请输入会员电话')"/>
-        </el-col>    
+        </el-col>
       </el-form-item>
       <el-form-item :label="$t('会员编号')" prop="number">
         <el-input
@@ -224,8 +224,10 @@
         :formatter="countryFormatter"
       ></el-table-column>
       <el-table-column
+        width="200px"
         :label="$t('操作')"
         align="center"
+        fixed="right"
         class-name="small-padding fixed-width"
       >
         <template slot-scope="scope">
@@ -301,6 +303,7 @@
       ref="customerFollowList"
       :customer-id="customerId"
       :id="customerId"
+      v-if="customerFollowVisible"
     ></customer-follow-list>
     <customer-complaints
       ref="customerComplaint"
@@ -324,7 +327,7 @@ import {
 } from "@/api/ecw/customer";
 import { getDictDatas, DICT_TYPE } from "@/utils/dict";
 import upload from "@/components/ImageUpload";
-import customerFollowList from "@/components/CustomerFollowList";
+import customerFollowList from "../customer/components/customerFollow";
 import customerComplaints from "@/components/customerComplaints";
 import { listServiceUser } from "@/api/system/user";
 import { getCountryListAll } from "@/api/ecw/country";
@@ -452,6 +455,7 @@ export default {
       selectCustomerList: [],
       //lanbm 2024-05-26 添加参数
       userId:undefined,
+      customerFollowVisible: false
     };
   },
   activated() {
@@ -690,7 +694,12 @@ export default {
     },
     followUp(row) {
       this.customerId = row.id;
-      this.$refs["customerFollowList"].customerFollow.dialogVisible = true;
+      // this.$refs["customerFollowList"].customerFollow.dialogVisible = true;
+      this.customerFollowVisible = true
+      this.$nextTick(_ => {
+        this.$refs['customerFollowList'].init()
+        this.$refs['customerFollowList'].handleAdd()
+      })
     },
     complaint(row) {
       this.customerId = row.id;