From 5fbfc19daae6017e0522b281b39ab102a685c06d Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 08 七月 2025 11:06:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/procurementManagement/procurementInvoiceLedger/index.vue | 97 ++++++++++--
src/views/procurementManagement/procurementInvoiceLedger/Form/EditForm.vue | 87 ++++++++++
src/views/procurementManagement/procurementInvoiceLedger/Modal/UploadModal.vue | 85 ++++++++++
src/api/procurementManagement/procurementInvoiceLedger.js | 24 +++
src/views/equipmentManagement/ledger/Modal.vue | 2
src/views/procurementManagement/procurementInvoiceLedger/Modal/EditModal.vue | 59 +++++++
src/views/procurementManagement/invoiceEntry/components/Modal.vue | 109 +++++++++++--
7 files changed, 429 insertions(+), 34 deletions(-)
diff --git a/src/api/procurementManagement/procurementInvoiceLedger.js b/src/api/procurementManagement/procurementInvoiceLedger.js
index b828c4a..ae6a77b 100644
--- a/src/api/procurementManagement/procurementInvoiceLedger.js
+++ b/src/api/procurementManagement/procurementInvoiceLedger.js
@@ -66,3 +66,27 @@
params: query,
});
}
+
+export function productUploadFile(data) {
+ return request({
+ url: "/file/uploadFile",
+ method: "post",
+ data: data,
+ });
+}
+
+export function getProductRecordById(params) {
+ return request({
+ url: "/purchase/registration/getProductRecordById",
+ method: "get",
+ params: params,
+ });
+}
+
+export function updateRegistration(data) {
+ return request({
+ url: "/purchase/registration/updateRegistration",
+ method: "post",
+ data: data,
+ });
+}
diff --git a/src/views/equipmentManagement/ledger/Modal.vue b/src/views/equipmentManagement/ledger/Modal.vue
index e9ed16a..b8b17d9 100644
--- a/src/views/equipmentManagement/ledger/Modal.vue
+++ b/src/views/equipmentManagement/ledger/Modal.vue
@@ -48,8 +48,8 @@
};
const close = () => {
- closeModal();
formRef.value.resetForm();
+ closeModal();
};
const loadForm = async (id) => {
diff --git a/src/views/procurementManagement/invoiceEntry/components/Modal.vue b/src/views/procurementManagement/invoiceEntry/components/Modal.vue
index 3296bb3..4c19cfd 100644
--- a/src/views/procurementManagement/invoiceEntry/components/Modal.vue
+++ b/src/views/procurementManagement/invoiceEntry/components/Modal.vue
@@ -1,6 +1,12 @@
<template>
<el-dialog :title="modalOptions.title" v-model="visible" width="70%">
- <el-form ref="formRef" :model="form" :rules="rules" label-width="120px" label-position="top">
+ <el-form
+ ref="formRef"
+ :model="form"
+ :rules="rules"
+ label-width="120px"
+ label-position="top"
+ >
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="閲囪喘鍚堝悓鍙凤細" prop="purchaseLedgerNo">
@@ -9,61 +15,130 @@
</el-col>
<el-col :span="12">
<el-form-item label="閿�鍞悎鍚屽彿锛�" prop="salesContractNo">
- <el-input v-model="form.salesContractNo" placeholder="鑷姩濉厖" clearable disabled />
+ <el-input
+ v-model="form.salesContractNo"
+ placeholder="鑷姩濉厖"
+ clearable
+ disabled
+ />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="渚涘簲鍟嗗悕绉帮細" prop="supplierName">
- <el-input v-model="form.supplierName" placeholder="鑷姩濉厖" clearable disabled />
+ <el-input
+ v-model="form.supplierName"
+ placeholder="鑷姩濉厖"
+ clearable
+ disabled
+ />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="椤圭洰鍚嶇О锛�" prop="projectName">
- <el-input v-model="form.projectName" placeholder="鑷姩濉厖" clearable disabled />
+ <el-input
+ v-model="form.projectName"
+ placeholder="鑷姩濉厖"
+ clearable
+ disabled
+ />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="鍙戠エ鍙凤細" prop="invoiceNumber">
- <el-input v-model="form.invoiceNumber" placeholder="璇疯緭鍏�" clearable />
+ <el-input
+ v-model="form.invoiceNumber"
+ placeholder="璇疯緭鍏�"
+ clearable
+ />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="鍙戠エ閲戦(鍏�)锛�" prop="invoiceAmount">
- <el-input type="number" :step="0.01" :min="0" v-model="form.invoiceAmount" placeholder="鑷姩濉厖" clearable />
+ <el-input
+ type="number"
+ :step="0.01"
+ :min="0"
+ v-model="form.invoiceAmount"
+ placeholder="鑷姩濉厖"
+ clearable
+ />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="褰曞叆浜猴細" prop="issUer">
- <el-input v-model="form.issUer" placeholder="璇疯緭鍏�" clearable disabled />
+ <el-input
+ v-model="form.issUer"
+ placeholder="璇疯緭鍏�"
+ clearable
+ disabled
+ />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="寮�绁ㄦ棩鏈燂細" prop="entryDate">
- <el-date-picker style="width: 100%" v-model="form.entryDate" type="date" clearable />
+ <el-date-picker
+ style="width: 100%"
+ v-model="form.entryDate"
+ type="date"
+ clearable
+ />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="涓婁紶闄勪欢">
- <FileUpload :showTip="false" accept="*" :autoUpload="true" :action="action" :headers="{
- Authorization: 'Bearer ' + getToken(),
- }" :limit="10" @success="uploadSuccess" @remove="removeFile" />
+ <FileUpload
+ :showTip="false"
+ accept="*"
+ :autoUpload="true"
+ :action="action"
+ :headers="{
+ Authorization: 'Bearer ' + getToken(),
+ }"
+ :limit="10"
+ @success="uploadSuccess"
+ @remove="removeFile"
+ />
</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-date-picker
+ style="width: 100%"
+ v-model="form.enterDate"
+ type="date"
+ clearable
+ />
</el-form-item>
</el-col>
</el-row>
<el-form-item label="浜у搧淇℃伅锛�"> </el-form-item>
- <PIMTable rowKey="id" :column="columns" :tableData="form.productData" height="auto">
+ <PIMTable
+ rowKey="id"
+ :column="columns"
+ :tableData="form.productData"
+ height="auto"
+ >
<template #ticketsNumRef="{ row }">
- <el-input-number v-model="row.ticketsNum" placeholder="璇烽�夋嫨" :min="0" :step="0.1" clearable style="width: 100%"
- @change="invoiceNumBlur(row)" />
+ <el-input-number
+ v-model="row.ticketsNum"
+ placeholder="璇烽�夋嫨"
+ :min="0"
+ :step="0.1"
+ clearable
+ style="width: 100%"
+ @change="invoiceNumBlur(row)"
+ />
</template>
<template #ticketsAmountRef="{ row }">
- <el-input-number v-model="row.ticketsAmount" placeholder="璇烽�夋嫨" :min="0" :step="0.1" clearable
- style="width: 100%" @change="invoiceAmountBlur(row)" />
+ <el-input-number
+ v-model="row.ticketsAmount"
+ placeholder="璇烽�夋嫨"
+ :min="0"
+ :step="0.1"
+ clearable
+ style="width: 100%"
+ @change="invoiceAmountBlur(row)"
+ />
</template>
</PIMTable>
</el-form>
diff --git a/src/views/procurementManagement/procurementInvoiceLedger/Form/EditForm.vue b/src/views/procurementManagement/procurementInvoiceLedger/Form/EditForm.vue
new file mode 100644
index 0000000..c00251a
--- /dev/null
+++ b/src/views/procurementManagement/procurementInvoiceLedger/Form/EditForm.vue
@@ -0,0 +1,87 @@
+<template>
+ <el-form :model="form">
+ <el-row :gutter="20">
+ <el-col :span="12">
+ <el-form-item label="閲囪喘鍚堝悓鍙凤細">
+ <el-tag size="large">{{ form.purchaseContractNumber }}</el-tag>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="閿�鍞悎鍚屽彿锛�">
+ <el-text>{{ form.salesContractNo }}</el-text>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鏉ョエ閲戦锛�">
+ <el-text type="primary">{{ form.taxInclusiveTotalPrice }}</el-text>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鍒涘缓鏃堕棿锛�">
+ <el-text>{{ form.createdAt }}</el-text>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鍙戠エ鍙凤細">
+ <el-input v-model="form.invoiceNumber" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鏉ョエ鏁帮細">
+ <el-input v-model="form.ticketsNum" @input="inputTicketsNum" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鏉ョエ閲戦锛�">
+ <el-text type="success">{{ form.ticketsAmount }}</el-text>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+</template>
+
+<script setup>
+import useFormData from "@/hooks/useFormData";
+import { getProductRecordById } from "@/api/procurementManagement/procurementInvoiceLedger";
+
+defineOptions({
+ name: "鏉ョエ鍙拌处琛ㄥ崟",
+});
+
+const { form, resetForm } = useFormData({
+ id: undefined,
+ purchaseContractNumber: undefined, // 閲囪喘鍚堝悓鍙�
+ salesContractNo: undefined, // 閿�鍞悎鍚屽彿
+ createdAt: undefined, // 鍒涘缓鏃堕棿
+ invoiceNumber: undefined, // 鍙戠エ鍙�
+ ticketsNum: undefined, // 鏉ョエ鏁�
+ ticketsAmount: undefined, // 鏉ョエ閲戦
+ taxInclusiveTotalPrice: undefined, // 鍚◣鎬讳环
+});
+
+const load = async (id) => {
+ const { code, data } = await getProductRecordById({ id });
+ if (code === 200) {
+ form.id = data.id;
+ form.purchaseContractNumber = data.purchaseContractNumber;
+ form.salesContractNo = data.salesContractNo;
+ form.createdAt = data.createdAt;
+ form.invoiceNumber = data.invoiceNumber;
+ form.ticketsNum = data.ticketsNum;
+ form.ticketsAmount = data.ticketsAmount.toFixed(2);
+ form.taxInclusiveTotalPrice = data.taxInclusiveTotalPrice;
+ }
+};
+
+const inputTicketsNum = (val) => {
+ form.ticketsAmount = (val * form.taxInclusiveTotalPrice).toFixed(2);
+};
+
+defineExpose({
+ load,
+ form,
+ resetForm,
+});
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/procurementManagement/procurementInvoiceLedger/Modal/EditModal.vue b/src/views/procurementManagement/procurementInvoiceLedger/Modal/EditModal.vue
new file mode 100644
index 0000000..2ac2c10
--- /dev/null
+++ b/src/views/procurementManagement/procurementInvoiceLedger/Modal/EditModal.vue
@@ -0,0 +1,59 @@
+<template>
+ <el-dialog :title="modalOptions.title" v-model="visible" @close="close">
+ <EditForm ref="editFormRef" />
+ <template #footer>
+ <el-button @click="closeModal">{{ modalOptions.cancelText }}</el-button>
+ <el-button type="primary" :loading="loading" @click="sendForm">
+ {{ modalOptions.confirmText }}
+ </el-button>
+ </template>
+ </el-dialog>
+</template>
+
+<script setup>
+import { useModal } from "@/hooks/useModal";
+import EditForm from "../Form/EditForm.vue";
+import { updateRegistration } from "@/api/procurementManagement/procurementInvoiceLedger";
+import { ElMessage } from "element-plus";
+
+defineOptions({
+ name: "鏉ョエ鍙拌处缂栬緫",
+});
+const emits = defineEmits(["success"]);
+
+const editFormRef = ref();
+const {
+ id,
+ visible,
+ loading,
+ openModal,
+ modalOptions,
+ handleConfirm,
+ closeModal,
+} = useModal({ title: "鏉ョエ鍙拌处" });
+
+const open = async (id) => {
+ openModal(id);
+ await nextTick();
+ editFormRef.value.load(id);
+};
+
+const close = () => {
+ editFormRef.value.resetForm();
+ closeModal();
+};
+
+const sendForm = async () => {
+ const form = editFormRef.value.form;
+ const { code } = await updateRegistration(form);
+ if (code === 200) {
+ emits("success");
+ ElMessage({ message: "鎿嶄綔鎴愬姛", type: "success" });
+ close();
+ }
+};
+
+defineExpose({
+ open,
+});
+</script>
diff --git a/src/views/procurementManagement/procurementInvoiceLedger/Modal/UploadModal.vue b/src/views/procurementManagement/procurementInvoiceLedger/Modal/UploadModal.vue
new file mode 100644
index 0000000..594ba6c
--- /dev/null
+++ b/src/views/procurementManagement/procurementInvoiceLedger/Modal/UploadModal.vue
@@ -0,0 +1,85 @@
+<template>
+ <el-dialog v-model="upload.open" :title="upload.title" :width="500">
+ <FileUpload
+ ref="fileUploadRef"
+ accept=".xlsx, .xls, .pdf"
+ :headers="upload.headers"
+ :autoUpload="true"
+ :action="upload.url"
+ :disabled="upload.isUploading"
+ :showTip="false"
+ :limit="10"
+ @success="handleFileSuccess"
+ @remove="removeFile"
+ />
+ <template #footer>
+ <div class="dialog-footer">
+ <el-button type="primary" @click="submitFileForm">纭� 瀹�</el-button>
+ <el-button @click="upload.open = false">鍙� 娑�</el-button>
+ </div>
+ </template>
+ </el-dialog>
+</template>
+
+<script setup>
+import { reactive } from "vue";
+import { getToken } from "@/utils/auth.js";
+import { FileUpload } from "@/components/Upload";
+import { ElMessage } from "element-plus";
+import { ref } from "vue";
+import useFormData from "@/hooks/useFormData";
+
+defineOptions({
+ name: "鏉ョエ鍙拌处闄勪欢琛ュ厖",
+});
+
+const { form, resetForm } = useFormData({
+ id: undefined,
+ tempFileIds: [],
+});
+const emits = defineEmits(["uploadSuccess"]);
+const fileUploadRef = ref();
+const upload = reactive({
+ // 鏄惁鏄剧ず寮瑰嚭灞傦紙渚涘簲鍟嗗鍏ワ級
+ open: false,
+ // 寮瑰嚭灞傛爣棰橈紙渚涘簲鍟嗗鍏ワ級
+ title: "",
+ // 鏄惁绂佺敤涓婁紶
+ isUploading: false,
+ // 璁剧疆涓婁紶鐨勮姹傚ご閮�
+ headers: { Authorization: "Bearer " + getToken() },
+ // 涓婁紶鐨勫湴鍧�
+ url: import.meta.env.VITE_APP_BASE_API + "/file/upload",
+});
+// 鐐瑰嚮瀵煎叆
+const handleImport = (id) => {
+ form.id = id;
+ upload.open = true;
+ upload.title = "鏉ョエ鍙拌处闄勪欢琛ュ厖";
+};
+
+const submitFileForm = () => {
+ upload.open = false;
+ resetForm();
+ emits("uploadSuccess", form);
+};
+
+const handleFileSuccess = (response) => {
+ const { code, msg } = response;
+ form.tempFileIds.push(response.data.tempId);
+ if (code == 200) {
+ ElMessage({ message: "瀵煎叆鎴愬姛", type: "success" });
+ } else {
+ ElMessage({ message: msg, type: "error" });
+ }
+};
+
+const removeFile = (file) => {
+ const { tempId } = file.response.data;
+ form.tempFileIds = form.tempFileIds.filter((item) => item !== tempId);
+};
+
+defineExpose({
+ handleImport,
+});
+</script>
diff --git a/src/views/procurementManagement/procurementInvoiceLedger/index.vue b/src/views/procurementManagement/procurementInvoiceLedger/index.vue
index 339b020..15d362b 100644
--- a/src/views/procurementManagement/procurementInvoiceLedger/index.vue
+++ b/src/views/procurementManagement/procurementInvoiceLedger/index.vue
@@ -59,33 +59,66 @@
@pagination="changePage"
>
<template #commonFilesRef="{ row }">
+ <el-dropdown @command="(command) => handleCommand(command, row)">
+ <el-button link :icon="Files" type="danger"> 闄勪欢 </el-button>
+ <template #dropdown>
+ <el-dropdown-menu>
+ <el-dropdown-item
+ v-if="row.commonFiles.length !== 0"
+ :icon="Download"
+ command="download"
+ >
+ 涓嬭浇
+ </el-dropdown-item>
+ <el-dropdown-item :icon="Upload" command="upload">
+ 涓婁紶
+ </el-dropdown-item>
+ </el-dropdown-menu>
+ </template>
+ </el-dropdown>
+ </template>
+ <template #operation="{ row }">
<el-button
- v-if="row.commonFiles.length !== 0"
+ type="primary"
text
- icon="Files"
- type="danger"
- @click="handleFiles(row.commonFiles)"
+ :icon="EditPen"
+ @click="openEdit(row.id)"
>
- 闄勪欢涓嬭浇
+ 缂栬緫
</el-button>
- <el-text v-else type="danger">鏆傛棤闄勪欢</el-text>
</template>
</PIMTable>
</div>
+ <UploadModal ref="modalRef" @uploadSuccess="uploadSuccess"></UploadModal>
+ <EditModal ref="editmodalRef" @success="getTableData"></EditModal>
</div>
</template>
<script setup>
import { ref, getCurrentInstance } from "vue";
import { usePaginationApi } from "@/hooks/usePaginationApi";
-import { Search } from "@element-plus/icons-vue";
-import { productRecordPage } from "@/api/procurementManagement/procurementInvoiceLedger.js";
+import {
+ Files,
+ Download,
+ Search,
+ Upload,
+ EditPen,
+} from "@element-plus/icons-vue";
+import {
+ productRecordPage,
+ productUploadFile,
+} from "@/api/procurementManagement/procurementInvoiceLedger.js";
import { onMounted } from "vue";
import { ElMessageBox } from "element-plus";
+import UploadModal from "./Modal/UploadModal.vue";
+import EditModal from "./Modal/EditModal.vue";
defineOptions({
name: "鏉ョエ鍙拌处",
});
+
+const modalRef = ref();
+const editmodalRef = ref();
const { proxy } = getCurrentInstance();
const multipleVal = ref([]);
@@ -178,14 +211,14 @@
slot: "commonFilesRef",
width: 150,
},
- // {
- // fixed: "right",
- // width: 120,
- // label: "鎿嶄綔",
- // dataType: "slot",
- // slot: "operation",
- // align: "center",
- // },
+ {
+ fixed: "right",
+ width: 120,
+ label: "鎿嶄綔",
+ dataType: "slot",
+ slot: "operation",
+ align: "center",
+ },
],
{},
{
@@ -243,6 +276,38 @@
onCurrentChange(page);
};
+const handleCommand = (command, row) => {
+ switch (command) {
+ case "download":
+ handleFiles(row.commonFiles);
+ break;
+ case "upload":
+ console.log(row.commonFiles);
+ openUoload(row.ticketRegistrationId);
+ break;
+ }
+};
+
+const openUoload = (id) => {
+ modalRef.value.handleImport(id);
+};
+
+const openEdit = (id) => {
+ editmodalRef.value.open(id);
+};
+
+// 涓婁紶鎴愬姛鍚庡仛浠�涔�
+const uploadSuccess = async (data) => {
+ const { code } = await productUploadFile({
+ ticketRegistrationId: data.id,
+ tempFileIds: data.tempFileIds,
+ });
+ if (code === 200) {
+ proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
+ getTableData();
+ }
+};
+
onMounted(() => {
getTableData();
});
--
Gitblit v1.9.3