Merge remote-tracking branch 'origin/dev_天津_建诚恒商贸' into dev_天津_建诚恒商贸

yuan

16 小时以前 b21afc26b596a5a7cb77b36cd96f6e0df91637eb

 src/views/basicData/customerFile/index.vue

@@ -738,16 +738,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",
@@ -795,7 +795,7 @@
      label: "操作",
      align: "center",
      fixed: "right",
      width: 290,
      width: 130,
      operation: [
        {
          name: "编辑",
@@ -804,20 +804,20 @@
            openForm("edit", row);
          },
        },
            {
               name: "添加洽谈进度",
               type: "text",
               clickFun: row => {
                  openNegotiationDialog(row);
               },
            },
        {
          name: "回访提醒",
          type: "text",
          clickFun: row => {
            openReminderDialog(row);
          },
        },
            // {
            //    name: "添加洽谈进度",
            //    type: "text",
            //    clickFun: row => {
            //       openNegotiationDialog(row);
            //    },
            // },
        // {
        //   name: "回访提醒",
        //   type: "text",
        //   clickFun: row => {
        //     openReminderDialog(row);
        //   },
        // },
            {
               name: "详情",
               type: "text",