Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁

yuan

23 小时以前 c5aa1b022cc032baee069c865b371107cee5bdd3

 src/views/basicData/customerFile/index.vue

@@ -1,6 +1,7 @@
<template>
  <div class="app-container">
    <div class="search_form" style="margin-bottom: 20px;">
    <div class="search_form"
         style="margin-bottom: 20px;">
      <div>
        <span class="search_title">客户名称：</span>
        <el-input v-model="searchForm.customerName"
@@ -280,7 +281,8 @@
      </el-form>
      <template #footer>
        <div class="dialog-footer">
          <el-button type="primary" @click="submitReminderForm">确认</el-button>
          <el-button type="primary"
                     @click="submitReminderForm">确认</el-button>
          <el-button @click="closeReminderDialog">取消</el-button>
        </div>
      </template>
@@ -363,7 +365,8 @@
      </el-form>
      <template #footer>
        <div class="dialog-footer">
          <el-button type="primary" @click="submitNegotiationForm">确认</el-button>
          <el-button type="primary"
                     @click="submitNegotiationForm">确认</el-button>
          <el-button @click="closeNegotiationDialog">取消</el-button>
        </div>
      </template>
@@ -464,14 +467,9 @@
        </div>
      </div>
      <!-- 洽谈进度记录 -->
      <div class="detail-section">
      <!-- <div class="detail-section">
        <div class="section-header">
          <h3 class="section-title">洽谈进度记录</h3>
          <el-button type="primary"
                     size="small"
                     @click="openNegotiationDialog(detailForm)">
            添加进度
          </el-button>
        </div>
        <el-table :data="negotiationRecords"
                  border
@@ -501,7 +499,6 @@
                  <Paperclip />
                </el-icon>
                附件
                <!-- {{ row.fileList && row.fileList.length > 0 ? row.fileList.length : '上传' }} -->
              </el-button>
            </template>
          </el-table-column>
@@ -526,7 +523,7 @@
             class="no-records">
          暂无洽谈进度记录
        </div>
      </div>
      </div> -->
      <template #footer>
        <div class="dialog-footer">
          <el-button @click="closeDetailDialog">关闭</el-button>
@@ -622,7 +619,14 @@
    addReturnVisit,
    getReturnVisit,
  } from "@/api/basicData/customerFile.js";
  import {listCustomer, getCustomer, addCustomer, updateCustomer, delCustomer, backCustomer} from "@/api/basicData/customer.js";
  import {
    listCustomer,
    getCustomer,
    addCustomer,
    updateCustomer,
    delCustomer,
    backCustomer,
  } from "@/api/basicData/customer.js";
  import { ElMessageBox } from "element-plus";
  import { userListNoPage } from "@/api/system/user.js";
  import useUserStore from "@/store/modules/user";
@@ -654,7 +658,7 @@
  const negotiationFormRef = ref();
  const negotiationForm = reactive({
    customerName: "",
      customerId: "",
    customerId: "",
    followUpMethod: "",
    followUpLevel: "",
    followUpTime: "",
@@ -738,16 +742,16 @@
      prop: "contactPhone",
      width: 150,
    },
    {
      label: "跟进进度",
      prop: "followUpLevel",
      width: 120,
    },
    {
      label: "跟进时间",
      prop: "followUpTime",
      width: 120,
    },
    // {
    //   label: "跟进进度",
    //   prop: "followUpLevel",
    //   width: 120,
    // },
    // {
    //   label: "跟进时间",
    //   prop: "followUpTime",
    //   width: 120,
    // },
    {
      label: "银行基本户",
      prop: "basicBankAccount",
@@ -767,7 +771,7 @@
      label: "维护人",
      prop: "maintainer",
    },
    {
    /*{
      label: "客户来源",
      prop: "type",
      dataType: "tag",
@@ -784,7 +788,7 @@
        }
        return "success";
      },
    },
    },*/
    {
      label: "维护时间",
      prop: "maintenanceTime",
@@ -804,27 +808,27 @@
            openForm("edit", row);
          },
        },
            {
               name: "添加洽谈进度",
               type: "text",
               clickFun: row => {
                  openNegotiationDialog(row);
               },
            },
        // {
        //   name: "添加洽谈进度",
        //   type: "text",
        //   clickFun: row => {
        //     openNegotiationDialog(row);
        //   },
        // },
        // {
        //   name: "回访提醒",
        //   type: "text",
        //   clickFun: row => {
        //     openReminderDialog(row);
        //   },
        // },
        {
          name: "回访提醒",
          name: "详情",
          type: "text",
          clickFun: row => {
            openReminderDialog(row);
            openDetailDialog(row);
          },
        },
            {
               name: "详情",
               type: "text",
               clickFun: row => {
                  openDetailDialog(row);
               },
            },
      ],
    },
  ]);
@@ -855,7 +859,7 @@
    searchForm: {
      customerName: "",
      customerType: "",
      type: 0
      type: 0,
    },
    form: {
      customerName: "",
@@ -870,7 +874,7 @@
      bankAccount: "",
      bankCode: "",
      customerType: "",
      type: 0
      type: 0,
    },
    rules: {
      customerName: [{ required: true, message: "请输入", trigger: "blur" }],
@@ -903,7 +907,7 @@
    // 上传的地址
    url: import.meta.env.VITE_APP_BASE_API + "/basic/customer/importData",
    data: {
      type: 0
      type: 0,
    },
    // 文件上传前的回调
    beforeUpload: file => {
@@ -1086,7 +1090,7 @@
      type: "warning",
    })
      .then(() => {
        proxy.download("/basic/customer/export", {type: 0}, "客户档案.xlsx");
        proxy.download("/basic/customer/export", { type: 0 }, "客户档案.xlsx");
      })
      .catch(() => {
        proxy.$modal.msg("已取消");
@@ -1199,7 +1203,7 @@
        if (reminderForm.id) {
          submitvalue.value = {
            id: reminderForm.id,
                  customerId: currentCustomerId.value,
            customerId: currentCustomerId.value,
            isEnabled: reminderForm.reminderSwitch ? 1 : 0,
            content: reminderForm.reminderContent,
            reminderTime: reminderForm.reminderTime,
@@ -1318,7 +1322,7 @@
    // 将当前记录数据填充到表单
    Object.assign(negotiationForm, {
      customerName: row.customerName,
         customerId: row.customerId,
      customerId: row.customerId,
      followUpMethod: row.followUpMethod,
      followUpLevel: row.followUpLevel,
      followUpTime: row.followUpTime,
@@ -1446,7 +1450,7 @@
  const downloadAttachment = row => {
    if (row.url) {
      // proxy.download(row.url, {}, row.name);
         proxy.$download.byUrl(row.url, row.originalFilename);
      proxy.$download.byUrl(row.url, row.originalFilename);
    } else {
      proxy.$modal.msgError("下载链接不存在");
    }