进销存升级 1.销售台账不能删除和编辑别人维护的数据 2.产品维护固定产品大类为：成品、半成品、原材料。

gaoluyang

11 小时以前 0c4bdf3dca76f9b8c348f2f7e48f9a6319dee4e1

 src/views/basicData/customerFile/index.vue

@@ -612,11 +612,13 @@
  import { onMounted, ref, reactive, getCurrentInstance, toRefs } from "vue";
  import { Search, Paperclip, Upload } from "@element-plus/icons-vue";
  import {
    addCustomer,
    delCustomer,
    addCustomerPrivate,
    delCustomerPrivate,
    getCustomer,
    listCustomer,
    updateCustomer,
    getCustomerPrivatePoolById,
    getCustomerPrivatePoolInfo,
    listCustomerPrivatePool,
    updateCustomerPrivatePool,
    addCustomerFollow,
    updateCustomerFollow,
    delCustomerFollow,
@@ -654,7 +656,7 @@
  const negotiationFormRef = ref();
  const negotiationForm = reactive({
    customerName: "",
    customerId: "",
      customerPrivatePoolId: "",
    followUpMethod: "",
    followUpLevel: "",
    followUpTime: "",
@@ -726,7 +728,7 @@
    },
    {
      label: "地址及联系方式",
      prop: "addressPhone",
      prop: "companyAddress",
      width: 250,
    },
    {
@@ -766,6 +768,24 @@
    {
      label: "维护人",
      prop: "maintainer",
    },
    {
      label: "客户来源",
      prop: "type",
      dataType: "tag",
      width: 100,
      formatData: value => {
        if (value === 1 || value === "1") {
          return "公海";
        }
        return "私海";
      },
      formatType: value => {
        if (value === 1 || value === "1") {
          return "warning";
        }
        return "success";
      },
    },
    {
      label: "维护时间",
@@ -881,7 +901,7 @@
    // 设置上传的请求头部
    headers: { Authorization: "Bearer " + getToken() },
    // 上传的地址
    url: import.meta.env.VITE_APP_BASE_API + "/basic/customer/importData",
    url: import.meta.env.VITE_APP_BASE_API + "/customerPrivate/importData",
    // 文件上传前的回调
    beforeUpload: file => {
      console.log("文件即将上传", file);
@@ -952,10 +972,10 @@
  };
  const getList = () => {
    tableLoading.value = true;
    listCustomer({ ...searchForm.value, ...page }).then(res => {
    listCustomerPrivatePool({ ...searchForm.value, ...page }).then(res => {
      tableLoading.value = false;
      tableData.value = res.records;
      page.total = res.total;
      tableData.value = res.data.records;
      page.total = res.data.total;
    });
  };
  // 表格选择数据
@@ -974,7 +994,7 @@
  }
  /** 下载模板 */
  function importTemplate() {
    proxy.download("/basic/customer/downloadTemplate", {}, "客户导入模板.xlsx");
    proxy.download("/customerPrivate/downloadTemplate", {}, "客户导入模板.xlsx");
  }
  // 打开弹框
  const openForm = (type, row) => {
@@ -992,7 +1012,7 @@
      userList.value = res.data;
    });
    if (type === "edit") {
      getCustomer(row.id).then(res => {
      getCustomerPrivatePoolById(row.id).then(res => {
        form.value = { ...res.data };
        formYYs.value.contactList = res.data.contactPerson
          .split(",")
@@ -1029,7 +1049,7 @@
    form.value.contactPhone = formYYs.value.contactList
      .map(item => item.contactPhone)
      .join(",");
    addCustomer(form.value).then(res => {
    addCustomerPrivate(form.value).then(res => {
      proxy.$modal.msgSuccess("提交成功");
      closeDia();
      getList();
@@ -1043,7 +1063,7 @@
    form.value.contactPhone = formYYs.value.contactList
      .map(item => item.contactPhone)
      .join(",");
    updateCustomer(form.value).then(res => {
    updateCustomerPrivatePool(form.value).then(res => {
      proxy.$modal.msgSuccess("提交成功");
      closeDia();
      getList();
@@ -1062,7 +1082,7 @@
      type: "warning",
    })
      .then(() => {
        proxy.download("/basic/customer/export", {}, "客户档案.xlsx");
        proxy.download("/customerPrivate/export", {}, "客户档案.xlsx");
      })
      .catch(() => {
        proxy.$modal.msg("已取消");
@@ -1072,12 +1092,11 @@
  const handleDelete = () => {
    let ids = [];
    if (selectedRows.value.length > 0) {
      // 检查是否有他人维护的数据
      const unauthorizedData = selectedRows.value.filter(
        item => item.maintainer !== userStore.nickName
        item => item.type === 1 || item.type === "1"
      );
      if (unauthorizedData.length > 0) {
        proxy.$modal.msgWarning("不可删除他人维护的数据");
        proxy.$modal.msgWarning("公海分配的客户不能删除");
        return;
      }
      ids = selectedRows.value.map(item => item.id);
@@ -1092,8 +1111,8 @@
    })
      .then(() => {
        tableLoading.value = true;
        delCustomer(ids)
          .then(res => {
        delCustomerPrivate(ids)
          .then(() => {
            proxy.$modal.msgSuccess("删除成功");
            getList();
          })
@@ -1146,7 +1165,8 @@
        if (reminderForm.id) {
          submitvalue.value = {
            id: reminderForm.id,
            customerId: currentCustomerId.value,
                  customerPrivatePoolId: reminderForm.id,
                  customerPrivatePoolId: currentCustomerId.value,
            isEnabled: reminderForm.reminderSwitch ? 1 : 0,
            content: reminderForm.reminderContent,
            reminderTime: reminderForm.reminderTime,
@@ -1154,15 +1174,13 @@
          };
        } else {
          submitvalue.value = {
            customerId: currentCustomerId.value,
                  customerPrivatePoolId: currentCustomerId.value,
            isEnabled: reminderForm.reminderSwitch ? 1 : 0,
            content: reminderForm.reminderContent,
            reminderTime: reminderForm.reminderTime,
            remindUserId: userStore.id,
          };
        }

        console.log("提交回访提醒数据:", submitvalue.value);

        // 调用接口
        addReturnVisit(submitvalue.value)
@@ -1185,20 +1203,12 @@
  // 打开洽谈进度弹窗
  const openNegotiationDialog = row => {
    negotiationForm.customerName = row.customerName;
    negotiationForm.customerId = row.id;
    negotiationForm.customerPrivatePoolId = row.id;
    negotiationForm.followUpMethod = "";
    negotiationForm.followUpLevel = "";
    negotiationForm.followUpTime = "";
    negotiationForm.followerUserName = userStore.nickName; // 默认当前登录人
    negotiationForm.content = "";
    // {
    //    "customerId": 152,
    //    "followUpMethod": "电话沟通",
    //    "followUpLevel": "没有意向",
    //    "followUpTime": "2026-03-04T15:30:00",
    //    "followerUserName": "管理员账号",
    //    "content": "111"
    // }
    negotiationDialogVisible.value = true;
  };

@@ -1220,26 +1230,9 @@

        if (isEdit) {
          // 修改操作
          console.log("修改洽谈进度数据:", negotiationForm);
          // 这里可以调用更新接口
          // 实际项目中需要根据后端接口进行调整
          // 示例：updateCustomerFollow(negotiationForm).then(res => {
          //   // 更新本地数据
          //   const index = negotiationForm.editIndex;
          //   negotiationRecords.value[index] = {
          //     followUpTime: negotiationForm.followUpTime,
          //     followUpMethod: negotiationForm.followUpMethod,
          //     followUpLevel: negotiationForm.followUpLevel,
          //     followerUserName: negotiationForm.followerUserName,
          //     content: negotiationForm.content,
          //     id: negotiationForm.id,
          //   };
          //   proxy.$modal.msgSuccess("修改成功");
          //   closeNegotiationDialog();
          // });
          updateCustomerFollow(negotiationForm).then(res => {
            // 更新本地数据
            getCustomer(negotiationForm.customerId).then(res => {
            getCustomer(negotiationForm.customerPrivatePoolId).then(res => {
              // 更新本地数据
              negotiationRecords.value = res.data.followUpList || [];
            });
@@ -1271,8 +1264,7 @@

  // 打开详情弹窗
  const openDetailDialog = row => {
    // 调用getCustomer接口获取客户详情
    getCustomer(row.id).then(res => {
    getCustomerPrivatePoolInfo(row.id).then(res => {
      // 填充客户基本信息
      Object.assign(detailForm, res.data);

@@ -1293,7 +1285,7 @@
    // 将当前记录数据填充到表单
    Object.assign(negotiationForm, {
      customerName: row.customerName,
      customerId: row.customerId,
         customerPrivatePoolId: row.customerPrivatePoolId,
      followUpMethod: row.followUpMethod,
      followUpLevel: row.followUpLevel,
      followUpTime: row.followUpTime,
@@ -1321,7 +1313,7 @@
        // });
        delCustomerFollow(row.id).then(() => {
          // 删除成功后更新本地数据
          getCustomer(row.customerId).then(res => {
          getCustomer(row.customerPrivatePoolId).then(res => {
            // 更新本地数据
            negotiationRecords.value = res.data.followUpList || [];
          });