feat: 6/28内容调整

曹睿

昨天 344551aecaab6762c7dc7b4b4f85bbff18898ab9

feat: 6/28内容调整

 src/components/PIMTable/PIMTable.vue

@@ -207,8 +207,8 @@
    </el-table-column>
  </el-table>
  <pagination
    v-show="total > 0"
    :total="total"
    v-if="page.total > 0"
    :total="page.total"
    :layout="page.layout"
    :page="page.current"
    :limit="page.size"
@@ -245,7 +245,7 @@
  },
  height: {
    type: [Number, String],
    default: "calc(100vh - 18.5em)",
    default: "calc(100vh - 22em)",
  },
  expandRowKeys: {
    type: Array,

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

@@ -101,8 +101,18 @@
            />
          </el-form-item>
        </el-col>
        <el-col :span="12">
          <el-form-item label="录入日期：" prop="enterDate">
            <el-date-picker
              style="width: 100%"
              v-model="form.enterDate"
              type="date"
              clearable
            />
          </el-form-item>
        </el-col>
      </el-row>
      <el-form-item label="产品信息：" prop="entryDate"> </el-form-item>
      <el-form-item label="产品信息："> </el-form-item>
      <PIMTable
        rowKey="id"
        :column="columns"
@@ -155,6 +165,7 @@
import { getPurchaseById } from "@/api/procurementManagement/procurementLedger.js";
import { getToken } from "@/utils/auth";
import useUserStore from "@/store/modules/user";
import dayjs from "dayjs";

defineOptions({
  name: "来票登记模态框",
@@ -175,6 +186,7 @@
  issUer: userStore.nickName, // 录入人
  entryDate: undefined, // 开票日期
  salesContractNoId: undefined, // 开票日期
  enterDate: dayjs().format("YYYY-MM-DD"),
  productData: [], // 表格
  tempFileIds: [], // 文件
});
@@ -187,6 +199,8 @@
  invoiceAmount: [
    { required: true, message: "请输入发票金额", trigger: "blur" },
  ],
  entryDate: [{ required: true, message: "请选择开票日期", trigger: "change" }],
  enterDate: [{ required: true, message: "请选择录入日期", trigger: "change" }],
});

const {
@@ -391,6 +405,7 @@
        salesContractNoId: form.salesContractNoId,
        supplierName: form.supplierName,
        tempFileIds: form.tempFileIds,
        enterDate: form.enterDate,
        type: 4,
      });
      modalLoading.value = false;

 src/views/procurementManagement/invoiceEntry/index.vue

@@ -42,6 +42,7 @@
        :expand-row-keys="expandRowKeys"
        @expand-change="expandChange"
        @selection-change="handleSelectionChange"
        @pagination="onCurrentChange"
      >
        <template #expand="{ row }">
          <ExpandTable ref="expandTableRef" />
@@ -87,6 +88,7 @@
  pagination,
  getTableData,
  resetFilters,
  onCurrentChange,
} = usePaginationApi(
  gePurchaseListPage,
  {
@@ -99,6 +101,10 @@
      slot: "expand",
    },
    {
      label: "采购订单号",
      prop: "purchaseContractNumber",
    },
    {
      label: "销售合同号",
      prop: "salesContractNo",
    },
@@ -111,6 +117,14 @@
      prop: "projectName",
    },
    {
      label: "录入人",
      prop: "recorderName",
    },
    {
      label: "录入日期",
      prop: "entryDate",
    },
    {
      label: "合同金额(元)",
      prop: "contractAmount",
      formatData: (val) => {

 src/views/procurementManagement/paymentLedger/index.vue

@@ -181,6 +181,7 @@
  {
    label: "应付金额(元)",
    dataType: "slot",
    prop: "payableAmount",
    slot: "payableAmountSlot",
  },
]);
@@ -207,20 +208,20 @@
const summarizeMainTable1 = (param) => {
  let summarizeTable = proxy.summarizeTable(
    param,
    ["invoiceAmount", "currentPaymentAmount"],
    ["invoiceAmount", "currentPaymentAmount", "payableAmount"],
    {
      ticketsNum: { noDecimal: true }, // 不保留小数
      futureTickets: { noDecimal: true }, // 不保留小数
    }
  );
  if (originalTableDataSon.value.length > 0) {
    summarizeTable[summarizeTable.length - 1] =
      originalTableDataSon.value[
        originalTableDataSon.value.length - 1
      ].payableAmount.toFixed(2);
  } else {
    summarizeTable[summarizeTable.length - 1] = 0.0;
  }
  // if (originalTableDataSon.value.length > 0) {
  //   summarizeTable[summarizeTable.length - 1] =
  //     originalTableDataSon.value[
  //       originalTableDataSon.value.length - 1
  //     ].payableAmount.toFixed(2);
  // } else {
  //   summarizeTable[summarizeTable.length - 1] = 0.0;
  // }
  return summarizeTable;
};
/** 搜索按钮操作 */

 src/views/procurementManagement/procurementInvoiceLedger/index.vue

@@ -47,13 +47,13 @@
        :tableLoading="loading"
        :tableData="dataList"
        :isSelection="true"
        height="calc(100vh - 18.5em)"
        height="calc(100vh - 15em)"
        :isShowSummary="true"
        :summaryMethod="summarizeMainTable"
        :page="{
          current: pagination.currentPage,
          size: pagination.pageSize,
          total: pagination.total,
          total: 0,
        }"
        @selection-change="handleSelectionChange"
        @pagination="onCurrentChange"

 src/views/salesManagement/invoiceRegistration/index.vue

@@ -218,7 +218,7 @@
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="录入人">
            <el-form-item label="录入人" prop="createUer">
              <el-input v-model="form.createUer" placeholder="请输入录入人" />
            </el-form-item>
          </el-col>
@@ -391,6 +391,7 @@
import { invoiceRegistrationSave } from "@/api/salesManagement/invoiceRegistration.js";
import useFormData from "@/hooks/useFormData";
import useUserStore from "@/store/modules/user";
import dayjs from "dayjs";

const { proxy } = getCurrentInstance();
const userStore = useUserStore();
@@ -423,11 +424,14 @@
    projectName: "",
    productData: [],
    invoiceNo: "",
    createUer: "",
    issueDate: "",
    createUer: userStore.nickName,
    issueDate: dayjs().format("YYYY-MM-DD"),
  },
  rules: {
    salesLedgerId: [{ required: true, message: "请选择", trigger: "change" }],
    createUer: [{ required: true, message: "请选择", trigger: "blur" }],
    issueDate: [{ required: true, message: "请选择", trigger: "change" }],
    createTime: [{ required: true, message: "请选择", trigger: "change" }],
  },
});
const { form, rules } = toRefs(data);