From 06f60dbca0be8009abb813e48e94796e145109aa Mon Sep 17 00:00:00 2001
From: 曹睿 <360930172@qq.com>
Date: 星期四, 03 七月 2025 11:01:30 +0800
Subject: [PATCH] fix: 修复设备，抽屉二次新增时间报错
---
src/views/procurementManagement/invoiceEntry/components/Modal.vue | 122 ++++++++++------------------------------
1 files changed, 32 insertions(+), 90 deletions(-)
diff --git a/src/views/procurementManagement/invoiceEntry/components/Modal.vue b/src/views/procurementManagement/invoiceEntry/components/Modal.vue
index 1fd32e9..3296bb3 100644
--- a/src/views/procurementManagement/invoiceEntry/components/Modal.vue
+++ b/src/views/procurementManagement/invoiceEntry/components/Modal.vue
@@ -1,12 +1,6 @@
<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">
@@ -15,121 +9,61 @@
</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
- :disabled="true"
- />
+ <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-form-item>
</el-col>
</el-row>
- <el-form-item label="浜у搧淇℃伅锛�" prop="entryDate"> </el-form-item>
- <PIMTable
- rowKey="id"
- :column="columns"
- :tableData="form.productData"
- height="auto"
- >
+ <el-form-item label="浜у搧淇℃伅锛�"> </el-form-item>
+ <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>
@@ -155,6 +89,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 +110,7 @@
issUer: userStore.nickName, // 褰曞叆浜�
entryDate: undefined, // 寮�绁ㄦ棩鏈�
salesContractNoId: undefined, // 寮�绁ㄦ棩鏈�
+ enterDate: dayjs().format("YYYY-MM-DD"),
productData: [], // 琛ㄦ牸
tempFileIds: [], // 鏂囦欢
});
@@ -187,6 +123,8 @@
invoiceAmount: [
{ required: true, message: "璇疯緭鍏ュ彂绁ㄩ噾棰�", trigger: "blur" },
],
+ entryDate: [{ required: true, message: "璇烽�夋嫨寮�绁ㄦ棩鏈�", trigger: "change" }],
+ enterDate: [{ required: true, message: "璇烽�夋嫨褰曞叆鏃ユ湡", trigger: "change" }],
});
const {
@@ -235,7 +173,7 @@
prop: "taxInclusiveUnitPrice",
width: 150,
formatData: (val) => {
- return parseFloat(val).toFixed(2) ?? 0;
+ return val ? parseFloat(val).toFixed(2) : 0;
},
},
{
@@ -385,17 +323,21 @@
salesContractNo: form.salesContractNo,
projectName: form.projectName,
productData: form.productData,
- issUerId: form.issUerId, // 褰曞叆浜�
+ issueDate: form.entryDate,
+ issUerId: form.issUerId, // 褰曞叆浜篿d
issUer: form.issUer, // 褰曞叆浜�
salesContractNoId: form.salesContractNoId,
supplierName: form.supplierName,
tempFileIds: form.tempFileIds,
+ enterDate: form.enterDate,
type: 4,
});
modalLoading.value = false;
if (code == 200) {
closeModal();
}
+ } else {
+ modalLoading.value = false;
}
});
};
--
Gitblit v1.9.3