1.销售管理、采购管理优化

gaoluyang

3 天以前 74ef343394996b2a6c6e196ef30f998e4f156b74

1.销售管理、采购管理优化

 src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue

@@ -53,7 +53,11 @@
                  :key="node.id"
                  style="margin-right: 30px; text-align: center; margin-bottom: 10px;"
                >
                  <div>节点{{ index + 1 }} →</div>
                  <div>
                    <span v-if="index === 0">发起</span>
                    <span v-else>审批</span>
                    →
                  </div>
                  <el-select
                    v-model="node.userId"
                    placeholder="选择人员"
@@ -126,8 +130,8 @@
  approveProcessAdd, approveProcessGetInfo,
  approveProcessUpdate,
  getDept
} from "../../../../api/collaborativeApproval/approvalProcess.js";
import {userListNoPage, getUserProfile} from "../../../../api/system/user.js";
} from "@/api/collaborativeApproval/approvalProcess.js";
import {userListNoPageByTenantId} from "@/api/system/user.js";
const { proxy } = getCurrentInstance()
const emit = defineEmits(['close'])
import useUserStore from "@/store/modules/user";
@@ -174,7 +178,7 @@
const openDialog = (type, row) => {
  operationType.value = type;
  dialogFormVisible.value = true;
  userListNoPage().then((res) => {
    userListNoPageByTenantId().then((res) => {
    userList.value = res.data;
  });
  getProductOptions();

 src/views/collaborativeApproval/approvalProcess/index.vue

@@ -45,9 +45,10 @@
import {ElMessageBox} from "element-plus";
import InfoFormDia from "@/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue";
import ApprovalDia from "@/views/collaborativeApproval/approvalProcess/components/approvalDia.vue";
import {approveProcessDelete, approveProcessListPage} from "../../../api/collaborativeApproval/approvalProcess.js";
import {approveProcessDelete, approveProcessListPage} from "@/api/collaborativeApproval/approvalProcess.js";
import useUserStore from "@/store/modules/user";
const userStore = useUserStore();


const data = reactive({
  searchForm: {
@@ -139,7 +140,7 @@
        clickFun: (row) => {
          openApprovalDia("approval", row);
        },
                disabled: (row) => row.approveUserCurrentId == null || row.approveStatus == 2
                disabled: (row) => row.approveUserCurrentId == null || row.approveStatus == 2 || row.approveUserCurrentId !== userStore.id
      },
      {
        name: "详情",

 src/views/procurementManagement/invoiceEntry/components/ExpandTable.vue

@@ -4,6 +4,8 @@
    :column="columns"
    :tableData="dataList"
    :tableLoading="loading"
        :summaryMethod="summarizeChildrenTable"
        :isShowSummary="true"
    height="auto"
  >
  </PIMTable>
@@ -13,6 +15,7 @@
import { usePaginationApi } from "@/hooks/usePaginationApi";
import { productList } from "@/api/procurementManagement/procurementLedger.js";
import { nextTick } from "vue";
const { proxy } = getCurrentInstance();

defineOptions({
  name: "来票登记折叠表",
@@ -56,6 +59,7 @@
    {
      label: "含税单价(元)",
      prop: "taxInclusiveUnitPrice",
            width:200,
      formatData: (val) => {
        return val ? parseFloat(val).toFixed(2) : "-";
      },
@@ -63,6 +67,7 @@
    {
      label: "含税总价(元)",
      prop: "taxInclusiveTotalPrice",
            width:200,
      formatData: (val) => {
        return val ? parseFloat(val).toFixed(2) : "-";
      },
@@ -70,6 +75,7 @@
    {
      label: "不含税总价(元)",
      prop: "taxExclusiveTotalPrice",
            width:200,
      formatData: (val) => {
        return val ? parseFloat(val).toFixed(2) : "-";
      },
@@ -77,6 +83,7 @@
    {
      label: "本次来票金额(元)",
      prop: "ticketsAmount",
            width:200,
      formatData: (val) => {
        return val ? parseFloat(val).toFixed(2) : "-";
      },
@@ -88,6 +95,7 @@
    {
      label: "未来票金额(元)",
      prop: "futureTicketsAmount",
            width:200,
      formatData: (val) => {
        return val ? parseFloat(val).toFixed(2) : "-";
      },
@@ -105,7 +113,25 @@
  filters.salesLedgerId = id;
  getTableData();
};

// 子表合计方法
const summarizeChildrenTable = (param) => {
    return proxy.summarizeTable(
        param,
        [
            "taxInclusiveUnitPrice",
            "taxInclusiveTotalPrice",
            "taxExclusiveTotalPrice",
            "ticketsNum",
            "ticketsAmount",
            "futureTickets",
            "futureTicketsAmount",
        ],
        {
            ticketsNum: { noDecimal: true }, // 不保留小数
            futureTickets: { noDecimal: true }, // 不保留小数
        }
    );
};
defineExpose({
  getList,
});

 src/views/procurementManagement/invoiceEntry/index.vue

@@ -24,8 +24,8 @@
          <el-button type="primary" @click="handleAdd('add')">
            新增登记
          </el-button>
<!--          <el-button @click="handleOut">导出</el-button>-->
<!--          <el-button type="danger" plain @click="handleDelete">删除</el-button>-->
          <el-button @click="handleOut">导出</el-button>
          <el-button type="danger" plain @click="handleDelete">删除</el-button>
        </div>
      </div>
      <PIMTable
@@ -40,6 +40,8 @@
          total: pagination.total,
        }"
        :expand-row-keys="expandRowKeys"
        :summaryMethod="summarizeMainTable"
        :isShowSummary="true"
        @expand-change="expandChange"
        @selection-change="handleSelectionChange"
        @pagination="changePage"
@@ -65,10 +67,11 @@

<script setup>
import { usePaginationApi } from "@/hooks/usePaginationApi";
import { gePurchaseListPage } from "@/api/procurementManagement/invoiceEntry.js";
import {delRegistration, gePurchaseListPage} from "@/api/procurementManagement/invoiceEntry.js";
import { nextTick, onMounted, getCurrentInstance } from "vue";
import ExpandTable from "./components/ExpandTable.vue";
import Modal from "./components/Modal.vue";
import {ElMessageBox} from "element-plus";

defineOptions({
  name: "来票登记",
@@ -113,7 +116,7 @@
    {
      label: "供应商名称",
      prop: "supplierName",
      width:240
      width:200
    },
    {
      label: "项目名称",
@@ -127,12 +130,12 @@
    {
      label: "录入日期",
      prop: "entryDate",
      width:100
      width:110
    },
    {
      label: "合同金额(元)",
      prop: "contractAmount",
      width:150,
      width:200,
      formatData: (val) => {
        return val ? parseFloat(val).toFixed(2) : 0;
      },
@@ -140,7 +143,7 @@
    {
      label: "已开票金额(元)",
      prop: "receiptPaymentAmount",
      width:150,
      width:200,
      formatData: (val) => {
        return val ? parseFloat(val).toFixed(2) : 0;
      },
@@ -148,7 +151,7 @@
    {
      label: "待开票金额(元)",
      prop: "unReceiptPaymentAmount",
      width:150,
      width:200,
      formatData: (val) => {
        return val ? parseFloat(val).toFixed(2) : 0;
      },
@@ -182,8 +185,44 @@
  modalRef.value.open(type, id);
};

const handleOut = () => {};
const handleDelete = () => {};
// 导出
const handleOut = () => {
    ElMessageBox.confirm("选中的内容将被导出，是否确认导出？", "导出", {
        confirmButtonText: "确认",
        cancelButtonText: "取消",
        type: "warning",
    })
        .then(() => {
            proxy.download("/purchase/registration/export", {}, "来票登记.xlsx");
        })
        .catch(() => {
            proxy.$modal.msg("已取消");
        });
};
// 删除
const handleDelete = () => {
    let ids = [];
    if (selectedRows.value.length > 0) {
        ids = selectedRows.value.map((item) => item.id);
    } else {
        proxy.$modal.msgWarning("请选择数据");
        return;
    }
    ElMessageBox.confirm("选中的内容将被删除，是否确认删除？", "导出", {
        confirmButtonText: "确认",
        cancelButtonText: "取消",
        type: "warning",
    })
        .then(() => {
            delRegistration(ids).then((res) => {
                proxy.$modal.msgSuccess("删除成功");
                getList();
            });
        })
        .catch(() => {
            proxy.$modal.msg("已取消");
        });
};

const expandChange = async (row, expandedRows) => {
  if (expandedRows.length > 0) {
@@ -196,7 +235,17 @@
  pagination.currentPage = page;
  onCurrentChange(page);
};

// 主表合计方法
const summarizeMainTable = (param) => {
    return proxy.summarizeTable(
        param,
        ["contractAmount", "receiptPaymentAmount", "unReceiptPaymentAmount"],
        {
            ticketsNum: { noDecimal: true }, // 不保留小数
            futureTickets: { noDecimal: true }, // 不保留小数
        }
    );
};
onMounted(() => {
  getTableData();
});

 src/views/procurementManagement/invoiceEntry/indexOld.vue

@@ -296,19 +296,19 @@
          <el-table-column label="录入日期" prop="createTime" width="120" />
          <el-table-column
            label="含税单价(元)"
            width="150"
            width="200"
            prop="taxInclusiveUnitPrice"
            :formatter="formattedNumber"
          />
          <el-table-column
            label="含税总价(元)"
            width="150"
            width="200"
            prop="taxInclusiveTotalPrice"
            :formatter="formattedNumber"
          />
          <el-table-column
            label="不含税总价(元)"
            width="150"
            width="200"
            prop="taxExclusiveTotalPrice"
            :formatter="formattedNumber"
          />
@@ -331,7 +331,7 @@
            :min="0"
            :step="0.1"
            :formatter="formattedNumber"
            width="170"
            width="200"
          >
            <template #default="scope">
              <el-input-number

 src/views/procurementManagement/paymentEntry/index.vue

@@ -72,7 +72,7 @@
        @selection-change="handleSelectionChange"
        :tableLoading="tableLoading"
        @pagination="pagination"
        :total="total"
        :total="page.total"
      ></PIMTable>
    </div>
    <el-dialog
@@ -278,8 +278,8 @@
const page = reactive({
  current: 1,
  size: 100,
    total: 0,
});
const total = ref(0);

// 用户信息表单弹框数据
const operationType = ref("");
@@ -348,7 +348,7 @@
  invoiceListPage({ ...searchForm, ...page }).then((res) => {
    tableLoading.value = false;
    tableData.value = res.records;
    total.value = res.total;
        page.total = res.total;
  });
};
// 表格选择数据

 src/views/procurementManagement/paymentHistory/index.vue

@@ -46,7 +46,7 @@
        @selection-change="handleSelectionChange"
        :tableLoading="tableLoading"
        @pagination="pagination"
        :total="total"
        :total="page.total"
      ></PIMTable>
    </div>
  </div>
@@ -97,6 +97,7 @@
const page = reactive({
  current: 1,
  size: 100,
  total: 0,
});
const total = ref(0);
const { form: searchForm } = useFormData({
@@ -126,7 +127,7 @@
  paymentHistoryListPage({ ...rest, ...page }).then((res) => {
    tableLoading.value = false;
    tableData.value = res.records;
    total.value = res.total;
        page.total = res.total;
  });
};
// 子表合计方法

 src/views/procurementManagement/paymentLedger/index.vue

@@ -86,6 +86,7 @@
            :tableLoading="tableLoadingSon"
            :isShowSummary="isShowSummarySon"
            :summaryMethod="summarizeMainTable1"
                        height="calc(100vh - 18.5em)"
          >
            <template #payableAmountSlot="{ row }">
              <el-text type="danger">
@@ -164,10 +165,12 @@
  {
    label: "发生日期",
    prop: "happenTime",
        width: 110,
  },
  {
    label: "发票金额(元)",
    prop: "invoiceAmount",
        width: 200,
    formatData: (params) => {
      return params ? parseFloat(params).toFixed(2) : 0;
    },
@@ -175,6 +178,7 @@
  {
    label: "付款金额(元)",
    prop: "currentPaymentAmount",
        width: 200,
    formatData: (params) => {
      return params ? parseFloat(params).toFixed(2) : 0;
    },
@@ -182,6 +186,7 @@
  {
    label: "应付金额(元)",
    dataType: "slot",
        width: 200,
    prop: "payableAmount",
    slot: "payableAmountSlot",
  },

 src/views/procurementManagement/procurementInvoiceLedger/Form/EditForm.vue

@@ -12,8 +12,8 @@
        </el-form-item>
      </el-col>
      <el-col :span="12">
        <el-form-item label="含税总价(元)：">
          <el-text type="primary">{{ form.taxInclusiveTotalPrice }}</el-text>
        <el-form-item label="含税单价(元)：">
          <el-text type="primary">{{ form.taxInclusiveUnitPrice }}</el-text>
        </el-form-item>
      </el-col>
      <el-col :span="12">
@@ -36,6 +36,11 @@
          <el-text type="success">{{ form.ticketsAmount }}</el-text>
        </el-form-item>
      </el-col>
      <el-col :span="12">
        <el-form-item label="未来票数：">
          <el-text type="success">{{ form.futureTickets }}</el-text>
        </el-form-item>
      </el-col>
    </el-row>
  </el-form>
</template>
@@ -43,6 +48,7 @@
<script setup>
import useFormData from "@/hooks/useFormData";
import { getProductRecordById } from "@/api/procurementManagement/procurementInvoiceLedger";
const { proxy } = getCurrentInstance()

defineOptions({
  name: "来票台账表单",
@@ -56,7 +62,7 @@
  invoiceNumber: undefined, // 发票号
  ticketsNum: undefined, // 来票数
  ticketsAmount: undefined, // 来票金额
  taxInclusiveTotalPrice: undefined, // 含税总价
    taxInclusiveUnitPrice: undefined, // 含税单价
});

const load = async (id) => {
@@ -69,12 +75,18 @@
    form.invoiceNumber = data.invoiceNumber;
    form.ticketsNum = data.ticketsNum;
    form.ticketsAmount = data.ticketsAmount.toFixed(2);
    form.taxInclusiveTotalPrice = data.taxInclusiveTotalPrice;
    form.taxInclusiveUnitPrice = data.taxInclusiveUnitPrice;
    form.futureTickets = data.futureTickets;
  }
};

const inputTicketsNum = (val) => {
  form.ticketsAmount = (val * form.taxInclusiveTotalPrice).toFixed(2);
    if (Number(form.ticketsNum) > Number(form.futureTickets)) {
        proxy.$modal.msgWarning("开票数不得大于未开票数");
        form.ticketsNum = form.futureTickets
        return;
    }
  form.ticketsAmount = (val * form.taxInclusiveUnitPrice).toFixed(2);
};

defineExpose({

 src/views/procurementManagement/procurementInvoiceLedger/index.vue

@@ -142,45 +142,37 @@
    {
      label: "采购合同号",
      prop: "purchaseContractNumber",
      align: "center",
      width: 150,
    },
    {
      label: "销售合同号",
      prop: "salesContractNo",
      align: "center",
      width: 150,
    },
    {
      label: "客户名称",
      prop: "customerName",
      align: "center",
      width: 150,
    },
    {
      label: "供应商名称",
      prop: "supplierName",
      align: "center",
      width: 240,
    },
    {
      label: "规格型号",
      prop: "specificationModel",
      align: "center",
      width: 150,
    },
    {
      label: "发票号",
      prop: "invoiceNumber",
      align: "center",

      width: 200,
    },
    {
      label: "合同金额(元)",
      prop: "taxInclusiveTotalPrice",
      align: "center",
      width: 120,
      width: 200,
      formatData: (cell) => {
        return cell ? parseFloat(cell).toFixed(2) : 0;
      },
@@ -188,14 +180,12 @@
    {
      label: "开票日期",
      prop: "createdAt",
      align: "center",
      width: 100,
      width: 110,
    },
    {
      label: "开票金额",
      prop: "ticketsAmount",
      align: "center",
      width: 100,
      width: 200,
      formatData: (cell) => {
        return cell ? parseFloat(cell).toFixed(2) : 0;
      },
@@ -203,7 +193,6 @@
    {
      label: "不含税金额",
      prop: "unTicketsPrice",
      align: "center",
      width: 100,
      formatData: (cell) => {
        return cell ? parseFloat(cell).toFixed(2) : 0;
@@ -212,7 +201,6 @@
    {
      label: "增值税",
      prop: "invoiceAmount",
      align: "center",
      width: 100,
    },
    {
@@ -220,6 +208,7 @@
      align: "center",
      prop: "commonFiles",
      dataType: "slot",
            fixed: "right",
      slot: "commonFilesRef",
      width: 150,
    },

 src/views/procurementManagement/procurementLedger/index.vue

@@ -106,7 +106,7 @@
        <el-table-column
          label="合同金额(元)"
          prop="contractAmount"
           width="100"
           width="200"
          show-overflow-tooltip
          :formatter="formattedNumber"
        />

 src/views/salesManagement/invoiceLedger/index.vue

@@ -38,7 +38,7 @@
        <el-table-column label="规格型号" prop="specificationModel" width="300" show-overflow-tooltip />
        <el-table-column label="发票号" prop="invoiceNo" width="200" show-overflow-tooltip />
        <el-table-column label="发票金额(元)" prop="invoiceTotal" show-overflow-tooltip :formatter="formattedNumber"
          width="120" />
          width="200" />
        <el-table-column label="税率(%)" prop="taxRate" show-overflow-tooltip />
        <el-table-column label="录入人" prop="invoicePerson" show-overflow-tooltip />
        <el-table-column label="录入日期" prop="createTime" show-overflow-tooltip :formatter="formatDate" width="180" />

 src/views/salesManagement/invoiceRegistration/index.vue

@@ -151,7 +151,7 @@
          prop="contractAmount"
          show-overflow-tooltip
          :formatter="formattedNumber"
          width="120"
                    width="220"

        />
        <el-table-column
@@ -297,16 +297,18 @@
          />
          <el-table-column label="单位" prop="unit" />
          <el-table-column label="数量" prop="quantity" width="70" />
          <el-table-column label="税率(%)" prop="taxRate" width="70" />
          <el-table-column label="税率(%)" prop="taxRate" width="80" />
          <el-table-column
            label="含税单价(元)"
            prop="taxInclusiveUnitPrice"
            :formatter="formattedNumber"
                        width="200"
          />
          <el-table-column
            label="含税总价(元)"
            prop="taxInclusiveTotalPrice"
            :formatter="formattedNumber"
                        width="200"
          />
          <el-table-column
            label="不含税总价(元)"
@@ -314,7 +316,7 @@
            :formatter="formattedNumber"
            width="150"
          />
          <el-table-column label="本次开票数" prop="currentInvoiceNum" width="150">
          <el-table-column label="本次开票数" prop="currentInvoiceNum" width="180">
            <template #default="scope">
              <el-input-number :step="0.1" :min="0" style="width: 100%"
                v-model="scope.row.currentInvoiceNum"
@@ -325,7 +327,7 @@
          <el-table-column
            label="本次开票金额(元)"
            prop="currentInvoiceAmount"
            width="150"
            width="180"
          >
            <template #default="scope">
              <el-input-number :step="0.01" :min="0" style="width: 100%"
@@ -334,7 +336,7 @@
              ></el-input-number>
            </template>
          </el-table-column>
          <el-table-column label="未开票数" prop="noInvoiceNum" width="100">
          <el-table-column label="未开票数" prop="noInvoiceNum" width="120">
            <template #default="scope">
              <el-input
                type="number"
@@ -347,7 +349,7 @@
          <el-table-column
            label="未开票金额(元)"
            prop="noInvoiceAmount"
            width="150"
            width="200"
          >
            <template #default="scope">
              <el-input

 src/views/salesManagement/receiptPayment/index.vue

@@ -184,7 +184,7 @@
          prop="invoiceTotal"
          show-overflow-tooltip
          :formatter="formattedNumber"
          width="150"
          width="200"
        />
        <el-table-column label="税率(%)" prop="taxRate" show-overflow-tooltip />
        <el-table-column
@@ -192,13 +192,13 @@
          prop="receiptPaymentAmountTotal"
          show-overflow-tooltip
          :formatter="formattedNumber"
          width="150"
          width="200"
        />
        <el-table-column
          label="待回款金额(元)"
          prop="noReceiptAmount"
          show-overflow-tooltip
          width="150"
          width="200"
        >
          <template #default="{ row, column }">
            <el-text type="danger">

 src/views/salesManagement/receiptPaymentHistory/index.vue

@@ -101,7 +101,7 @@
  {
    label: "回款金额（元）",
    prop: "receiptPaymentAmount",
    width:150,
    width:200,
    formatData: (params) => {
      return params ? parseFloat(params).toFixed(2) : 0;
    },

 src/views/salesManagement/receiptPaymentLedger/index.vue

@@ -38,23 +38,27 @@
            label="客户名称"
            prop="customerName"
            show-overflow-tooltip
                        width="200"
          />
          <el-table-column
            label="开票金额(元)"
            prop="invoiceTotal"
            show-overflow-tooltip
            :formatter="formattedNumber"
                        width="200"
          />
          <el-table-column
            label="回款金额(元)"
            prop="receiptPaymentAmount"
            show-overflow-tooltip
            :formatter="formattedNumber"
                        width="200"
          />
          <el-table-column
            label="应收金额(元)"
            prop="unReceiptPaymentAmount"
            show-overflow-tooltip
                        width="200"
          >
            <template #default="{ row, column }">
              <el-text type="danger">
@@ -91,23 +95,27 @@
            label="发生日期"
            prop="happenTime"
            show-overflow-tooltip
                        width="110"
          />
          <el-table-column
            label="开票金额(元)"
            prop="invoiceAmount"
            show-overflow-tooltip
            :formatter="formattedNumber"
                        width="200"
          />
          <el-table-column
            label="回款金额(元)"
            prop="receiptAmount"
            show-overflow-tooltip
            :formatter="formattedNumber"
                        width="200"
          />
          <el-table-column
            label="应收金额(元)"
            prop="unReceiptAmount"
            show-overflow-tooltip
                        width="200"
          >
            <template #default="{ row, column }">
              <el-text type="danger">

 src/views/salesManagement/salesLedger/index.vue

@@ -64,7 +64,7 @@
        <el-table-column label="业务员" prop="salesman" width="100" show-overflow-tooltip />
        <el-table-column label="项目名称" prop="projectName" width="180" show-overflow-tooltip />
        <el-table-column label="付款方式" prop="paymentMethod" show-overflow-tooltip />
        <el-table-column label="合同金额(元)" prop="contractAmount" width="180" show-overflow-tooltip
        <el-table-column label="合同金额(元)" prop="contractAmount" width="220" show-overflow-tooltip
          :formatter="formattedNumber" />
        <el-table-column label="录入人" prop="entryPersonName" width="100" show-overflow-tooltip />
        <el-table-column label="录入日期" prop="entryDate" width="120" show-overflow-tooltip />