From 0d6464400b1b1852b10cc7cd0863ea74c0a4803a Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 08 十二月 2025 16:05:32 +0800
Subject: [PATCH] 1.南洋电缆修改
---
src/views/procurementManagement/procurementInvoiceLedger/index.vue | 2
src/views/basicData/supplierManage/index.vue | 6 --
src/views/salesManagement/receiptPayment/index.vue | 2
src/views/procurementManagement/invoiceEntry/index.vue | 10 +-
src/views/procurementManagement/paymentEntry/index.vue | 20 +++---
src/views/salesManagement/salesLedger/index.vue | 38 +++++-------
src/views/equipmentManagement/ledger/Form.vue | 6 +-
src/views/procurementManagement/procurementLedger/index.vue | 52 +++++++++--------
src/views/salesManagement/invoiceLedger/index.vue | 10 +-
src/views/equipmentManagement/measurementEquipment/index.vue | 6 --
src/views/basicData/customerFile/index.vue | 6 --
src/views/customerService/feedbackRegistration/index.vue | 6 --
src/views/procurementManagement/invoiceEntry/components/Modal.vue | 3
src/views/salesManagement/receiptPaymentHistory/index.vue | 10 +-
14 files changed, 76 insertions(+), 101 deletions(-)
diff --git a/src/views/basicData/customerFile/index.vue b/src/views/basicData/customerFile/index.vue
index 2d53a72..c6c346f 100644
--- a/src/views/basicData/customerFile/index.vue
+++ b/src/views/basicData/customerFile/index.vue
@@ -555,12 +555,6 @@
const handleDelete = () => {
let ids = [];
if (selectedRows.value.length > 0) {
- // 妫�鏌ユ槸鍚︽湁浠栦汉缁存姢鐨勬暟鎹�
- const unauthorizedData = selectedRows.value.filter(item => item.maintainer !== userStore.nickName);
- if (unauthorizedData.length > 0) {
- proxy.$modal.msgWarning("涓嶅彲鍒犻櫎浠栦汉缁存姢鐨勬暟鎹�");
- return;
- }
ids = selectedRows.value.map((item) => item.id);
} else {
proxy.$modal.msgWarning("璇烽�夋嫨鏁版嵁");
diff --git a/src/views/basicData/supplierManage/index.vue b/src/views/basicData/supplierManage/index.vue
index 5d55907..debfdfc 100644
--- a/src/views/basicData/supplierManage/index.vue
+++ b/src/views/basicData/supplierManage/index.vue
@@ -493,12 +493,6 @@
const handleDelete = () => {
let ids = [];
if (selectedRows.value.length > 0) {
- // 妫�鏌ユ槸鍚︽湁浠栦汉缁存姢鐨勬暟鎹�
- const unauthorizedData = selectedRows.value.filter(item => item.maintainUserName !== userStore.nickName);
- if (unauthorizedData.length > 0) {
- proxy.$modal.msgWarning("涓嶅彲鍒犻櫎浠栦汉缁存姢鐨勬暟鎹�");
- return;
- }
ids = selectedRows.value.map((item) => item.id);
} else {
proxy.$modal.msgWarning("璇烽�夋嫨鏁版嵁");
diff --git a/src/views/customerService/feedbackRegistration/index.vue b/src/views/customerService/feedbackRegistration/index.vue
index 3d97ef8..47a36be 100644
--- a/src/views/customerService/feedbackRegistration/index.vue
+++ b/src/views/customerService/feedbackRegistration/index.vue
@@ -172,12 +172,6 @@
const handleDelete = () => {
let ids = [];
if (selectedRows.value.length > 0) {
- // 妫�鏌ユ槸鍚︽湁浠栦汉缁存姢鐨勬暟鎹�
- const unauthorizedData = selectedRows.value.filter(item => item.checkUserId !== userStore.id);
- if (unauthorizedData.length > 0) {
- proxy.$modal.msgWarning("涓嶅彲鍒犻櫎浠栦汉缁存姢鐨勬暟鎹�");
- return;
- }
ids = selectedRows.value.map((item) => item.id);
} else {
proxy.$modal.msgWarning("璇烽�夋嫨鏁版嵁");
diff --git a/src/views/equipmentManagement/ledger/Form.vue b/src/views/equipmentManagement/ledger/Form.vue
index d14f4ff..27414af 100644
--- a/src/views/equipmentManagement/ledger/Form.vue
+++ b/src/views/equipmentManagement/ledger/Form.vue
@@ -81,8 +81,8 @@
clearable
@change="mathNum"
>
- <el-option label="1" :value="1" />
- <el-option label="6" :value="6" />
+<!-- <el-option label="1" :value="1" />-->
+<!-- <el-option label="6" :value="6" />-->
<el-option label="13" :value="13" />
</el-select>
</el-form-item>
@@ -171,7 +171,7 @@
number: 1, // 鏁伴噺
taxIncludingPriceUnit: undefined, // 鍚◣鍗曚环
taxIncludingPriceTotal: undefined, // 鍚◣鎬讳环
- taxRate: undefined, // 绋庣巼
+ taxRate: '13', // 绋庣巼
unTaxIncludingPriceTotal: undefined, // 涓嶅惈绋庢�讳环
// createUser: useUserStore().nickName, // 褰曞叆浜�
createTime: dayjs().format("YYYY-MM-DD HH:mm:ss"), // 褰曞叆鏃ユ湡
diff --git a/src/views/equipmentManagement/measurementEquipment/index.vue b/src/views/equipmentManagement/measurementEquipment/index.vue
index e983a99..23711a4 100644
--- a/src/views/equipmentManagement/measurementEquipment/index.vue
+++ b/src/views/equipmentManagement/measurementEquipment/index.vue
@@ -221,12 +221,6 @@
const handleDelete = () => {
let ids = [];
if (selectedRows.value.length > 0) {
- // 妫�鏌ユ槸鍚︽湁浠栦汉缁存姢鐨勬暟鎹�
- const unauthorizedData = selectedRows.value.filter(item => item.userId !== userStore.id);
- if (unauthorizedData.length > 0) {
- proxy.$modal.msgWarning("涓嶅彲鍒犻櫎浠栦汉缁存姢鐨勬暟鎹�");
- return;
- }
ids = selectedRows.value.map((item) => item.id);
} else {
proxy.$modal.msgWarning("璇烽�夋嫨鏁版嵁");
diff --git a/src/views/procurementManagement/invoiceEntry/components/Modal.vue b/src/views/procurementManagement/invoiceEntry/components/Modal.vue
index f29b78a..b56a673 100644
--- a/src/views/procurementManagement/invoiceEntry/components/Modal.vue
+++ b/src/views/procurementManagement/invoiceEntry/components/Modal.vue
@@ -199,8 +199,7 @@
const rules = ref({
invoiceNumber: [
- { required: true, message: "璇疯緭鍏ュ彂绁ㄥ彿", trigger: "blur" },
- { type: "string" },
+ { required: false, message: "璇疯緭鍏ュ彂绁ㄥ彿", trigger: "blur" },
],
invoiceAmount: [
{ required: true, message: "璇疯緭鍏ュ彂绁ㄩ噾棰�", trigger: "blur" },
diff --git a/src/views/procurementManagement/invoiceEntry/index.vue b/src/views/procurementManagement/invoiceEntry/index.vue
index 87e08e9..03e1f98 100644
--- a/src/views/procurementManagement/invoiceEntry/index.vue
+++ b/src/views/procurementManagement/invoiceEntry/index.vue
@@ -151,11 +151,11 @@
label: "褰曞叆浜�",
prop: "recorderName",
},
- {
- label: "褰曞叆鏃ユ湡",
- prop: "entryDate",
- width:110
- },
+ // {
+ // label: "褰曞叆鏃ユ湡",
+ // prop: "entryDate",
+ // width:110
+ // },
{
label: "鍚堝悓閲戦(鍏�)",
prop: "contractAmount",
diff --git a/src/views/procurementManagement/paymentEntry/index.vue b/src/views/procurementManagement/paymentEntry/index.vue
index 658b027..9174ed5 100644
--- a/src/views/procurementManagement/paymentEntry/index.vue
+++ b/src/views/procurementManagement/paymentEntry/index.vue
@@ -95,7 +95,7 @@
</template>
</el-table-column>
<el-table-column label="鐧昏浜�" prop="registrant" />
- <el-table-column label="鐧昏鏃ユ湡" prop="registrationtDate" />
+<!-- <el-table-column label="鐧昏鏃ユ湡" prop="registrationtDate" />-->
<el-table-column label="鎿嶄綔" width="150">
<template #default="scope">
<el-button
@@ -244,15 +244,15 @@
/>
</el-form-item>
</el-col>
- <el-col :span="12">
- <el-form-item label="鐧昏鏃ユ湡锛�" prop="registrationtDate">
- <el-input
- v-model="form.registrationtDate"
- placeholder="璇疯緭鍏�"
- clearable
- />
- </el-form-item>
- </el-col>
+<!-- <el-col :span="12">-->
+<!-- <el-form-item label="鐧昏鏃ユ湡锛�" prop="registrationtDate">-->
+<!-- <el-input-->
+<!-- v-model="form.registrationtDate"-->
+<!-- placeholder="璇疯緭鍏�"-->
+<!-- clearable-->
+<!-- />-->
+<!-- </el-form-item>-->
+<!-- </el-col>-->
</el-row>
</el-form>
<template #footer>
diff --git a/src/views/procurementManagement/procurementInvoiceLedger/index.vue b/src/views/procurementManagement/procurementInvoiceLedger/index.vue
index b33e3e4..efe8c37 100644
--- a/src/views/procurementManagement/procurementInvoiceLedger/index.vue
+++ b/src/views/procurementManagement/procurementInvoiceLedger/index.vue
@@ -188,7 +188,7 @@
},
},
{
- label: "寮�绁ㄦ棩鏈�",
+ label: "鏉ョエ鏃ユ湡",
prop: "createdAt",
width: 110,
},
diff --git a/src/views/procurementManagement/procurementLedger/index.vue b/src/views/procurementManagement/procurementLedger/index.vue
index 9b456e6..bccd55a 100644
--- a/src/views/procurementManagement/procurementLedger/index.vue
+++ b/src/views/procurementManagement/procurementLedger/index.vue
@@ -25,7 +25,7 @@
<el-input v-model="searchForm.projectName" placeholder="璇疯緭鍏�" clearable prefix-icon="Search"
@change="handleQuery" />
</el-form-item>
- <el-form-item label="褰曞叆鏃ユ湡锛�">
+ <el-form-item label="绛捐鏃ユ湡锛�">
<el-date-picker v-model="searchForm.entryDate" value-format="YYYY-MM-DD" format="YYYY-MM-DD" type="daterange"
placeholder="璇烽�夋嫨" clearable @change="changeDaterange" />
</el-form-item>
@@ -138,7 +138,7 @@
show-overflow-tooltip
/>
<el-table-column
- label="褰曞叆鏃ユ湡"
+ label="绛捐鏃ユ湡"
prop="entryDate"
width="100"
show-overflow-tooltip
@@ -256,11 +256,24 @@
/>
</el-form-item>
</el-col>
+<!-- <el-col :span="12">-->
+<!-- <el-form-item label="绛捐鏃ユ湡锛�" prop="executionDate">-->
+<!-- <el-date-picker-->
+<!-- style="width: 100%"-->
+<!-- v-model="form.executionDate"-->
+<!-- value-format="YYYY-MM-DD"-->
+<!-- format="YYYY-MM-DD"-->
+<!-- type="date"-->
+<!-- placeholder="璇烽�夋嫨"-->
+<!-- clearable-->
+<!-- />-->
+<!-- </el-form-item>-->
+<!-- </el-col>-->
<el-col :span="12">
- <el-form-item label="绛捐鏃ユ湡锛�" prop="executionDate">
+ <el-form-item label="绛捐鏃ユ湡锛�" prop="entryDate">
<el-date-picker
style="width: 100%"
- v-model="form.executionDate"
+ v-model="form.entryDate"
value-format="YYYY-MM-DD"
format="YYYY-MM-DD"
type="date"
@@ -286,19 +299,6 @@
:value="item.userId"
/>
</el-select>
- </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"
- value-format="YYYY-MM-DD"
- format="YYYY-MM-DD"
- type="date"
- placeholder="璇烽�夋嫨"
- clearable
- />
</el-form-item>
</el-col>
</el-row>
@@ -480,8 +480,8 @@
clearable
@change="mathNum"
>
- <el-option label="1" value="1" />
- <el-option label="6" value="6" />
+<!-- <el-option label="1" value="1" />-->
+<!-- <el-option label="6" value="6" />-->
<el-option label="13" value="13" />
</el-select>
</el-form-item>
@@ -852,7 +852,7 @@
purchaseContractNumber: "", // 閲囪喘鍚堝悓缂栧彿
salesContractNo: "", // 閿�鍞悎鍚岀紪鍙�
projectName: "", // 椤圭洰鍚嶇О
- entryDate: null, // 褰曞叆鏃ユ湡
+ entryDate: null, // 绛捐鏃ユ湡
entryDateStart: undefined,
entryDateEnd: undefined,
},
@@ -866,7 +866,7 @@
supplierName: "",
supplierId: "",
paymentMethod: "",
- executionDate: "",
+ // executionDate: "",
},
rules: {
purchaseContractNumber: [
@@ -875,7 +875,7 @@
projectName: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
supplierId: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
entryDate: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
- executionDate: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+ // executionDate: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
},
});
const { form, rules } = toRefs(data);
@@ -895,10 +895,10 @@
unit: "",
quantity: "",
taxInclusiveUnitPrice: "",
- taxRate: "",
+ taxRate: 13,
taxInclusiveTotalPrice: "",
taxExclusiveTotalPrice: "",
- invoiceType: "",
+ invoiceType: "澧炰笓绁�",
warnNum: "",
},
productRules: {
@@ -1142,6 +1142,10 @@
proxy.resetForm("productFormRef");
if (type === "edit") {
productForm.value = { ...row };
+ } else {
+ // 鏂板浜у搧鏃堕粯璁ょ◣鐜囦负13%锛屽彂绁ㄧ被鍨嬩负澧炰笓绁�
+ productForm.value.taxRate = "13";
+ productForm.value.invoiceType = "澧炰笓绁�";
}
productFormVisible.value = true;
getProductOptions();
diff --git a/src/views/salesManagement/invoiceLedger/index.vue b/src/views/salesManagement/invoiceLedger/index.vue
index 8352dc6..e8b2b21 100644
--- a/src/views/salesManagement/invoiceLedger/index.vue
+++ b/src/views/salesManagement/invoiceLedger/index.vue
@@ -11,10 +11,10 @@
format="YYYY-MM-DD" type="daterange" start-placeholder="寮�濮嬫椂闂�" end-placeholder="缁撴潫鏃堕棿" clearable
@change="changeDateRange" @clear="clearRange" />
</el-form-item>
- <el-form-item label="褰曞叆鏃ユ湡">
- <el-date-picker style="width: 100%" v-model="searchForm.createTimeStart" value-format="YYYY-MM-DD HH:mm:ss"
- format="YYYY-MM-DD" type="date" placeholder="璇烽�夋嫨" clearable @change="handleQuery" />
- </el-form-item>
+<!-- <el-form-item label="褰曞叆鏃ユ湡">-->
+<!-- <el-date-picker style="width: 100%" v-model="searchForm.createTimeStart" value-format="YYYY-MM-DD HH:mm:ss"-->
+<!-- format="YYYY-MM-DD" type="date" placeholder="璇烽�夋嫨" clearable @change="handleQuery" />-->
+<!-- </el-form-item>-->
<el-form-item label="涓嶆樉绀烘湁鍙戠エ琛�">
<el-checkbox v-model="searchForm.status" @change="handleQuery" />
</el-form-item>
@@ -41,7 +41,7 @@
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" />
+<!-- <el-table-column label="褰曞叆鏃ユ湡" prop="createTime" show-overflow-tooltip :formatter="formatDate" width="180" />-->
<el-table-column label="寮�绁ㄦ棩鏈�" prop="invoiceDate" show-overflow-tooltip width="120" />
<el-table-column label="鍙戠エ" prop="invoiceFileName" width="120" align="center" show-overflow-tooltip fixed="right">
<template #default="scope">
diff --git a/src/views/salesManagement/receiptPayment/index.vue b/src/views/salesManagement/receiptPayment/index.vue
index 26f089b..24a9e0a 100644
--- a/src/views/salesManagement/receiptPayment/index.vue
+++ b/src/views/salesManagement/receiptPayment/index.vue
@@ -113,7 +113,7 @@
</template>
</el-table-column>
<el-table-column label="鐧昏浜�" prop="registrant" width="90"/>
- <el-table-column label="鐧昏鏃ユ湡" prop="createTime" width="130"/>
+<!-- <el-table-column label="鐧昏鏃ユ湡" prop="createTime" width="130"/>-->
<el-table-column label="鎿嶄綔" width="150" align="center">
<template #default="scope">
<el-button
diff --git a/src/views/salesManagement/receiptPaymentHistory/index.vue b/src/views/salesManagement/receiptPaymentHistory/index.vue
index 589d567..9683662 100644
--- a/src/views/salesManagement/receiptPaymentHistory/index.vue
+++ b/src/views/salesManagement/receiptPaymentHistory/index.vue
@@ -128,11 +128,11 @@
label: "鐧昏浜�",
prop: "registrant",
},
- {
- label: "鐧昏鏃ユ湡",
- prop: "createTime",
- width:100
- },
+ // {
+ // label: "鐧昏鏃ユ湡",
+ // prop: "createTime",
+ // width:100
+ // },
]);
const tableData = ref([]);
const selectedRows = ref([]);
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index f24e1d6..e731552 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -18,10 +18,10 @@
<el-input v-model="searchForm.projectName" placeholder="璇疯緭鍏�" clearable prefix-icon="Search"
@change="handleQuery" />
</el-form-item>
- <el-form-item label="褰曞叆鏃ユ湡锛�">
- <el-date-picker v-model="searchForm.entryDate" value-format="YYYY-MM-DD" format="YYYY-MM-DD" type="daterange"
- placeholder="璇烽�夋嫨" clearable @change="changeDaterange" />
- </el-form-item>
+<!-- <el-form-item label="褰曞叆鏃ユ湡锛�">-->
+<!-- <el-date-picker v-model="searchForm.entryDate" value-format="YYYY-MM-DD" format="YYYY-MM-DD" type="daterange"-->
+<!-- placeholder="璇烽�夋嫨" clearable @change="changeDaterange" />-->
+<!-- </el-form-item>-->
<el-form-item>
<el-button type="primary" @click="handleQuery"> 鎼滅储 </el-button>
</el-form-item>
@@ -68,7 +68,7 @@
<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 />
+<!-- <el-table-column label="褰曞叆鏃ユ湡" prop="entryDate" width="120" show-overflow-tooltip />-->
<el-table-column label="绛捐鏃ユ湡" prop="executionDate" width="120" show-overflow-tooltip />
<el-table-column fixed="right" label="鎿嶄綔" min-width="200" align="center">
<template #default="scope">
@@ -139,19 +139,17 @@
</el-select>
</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" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
- type="date" placeholder="璇烽�夋嫨" clearable />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row :gutter="30">
- <el-col :span="12">
- <el-form-item label="浠樻鏂瑰紡">
- <el-input v-model="form.paymentMethod" placeholder="璇疯緭鍏�" clearable :disabled="operationType === 'view'" />
- </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" value-format="YYYY-MM-DD" format="YYYY-MM-DD"-->
+<!-- type="date" placeholder="璇烽�夋嫨" clearable />-->
+<!-- </el-form-item>-->
+<!-- </el-col>-->
+ <el-col :span="12">
+ <el-form-item label="浠樻鏂瑰紡">
+ <el-input v-model="form.paymentMethod" placeholder="璇疯緭鍏�" clearable :disabled="operationType === 'view'" />
+ </el-form-item>
+ </el-col>
</el-row>
<el-row>
<el-form-item label="浜у搧淇℃伅锛�" prop="entryDate">
@@ -241,8 +239,6 @@
<el-col :span="12">
<el-form-item label="绋庣巼(%)锛�" prop="taxRate">
<el-select v-model="productForm.taxRate" placeholder="璇烽�夋嫨" clearable @change="calculateFromTaxRate">
- <el-option label="1" value="1" />
- <el-option label="6" value="6" />
<el-option label="13" value="13" />
</el-select>
</el-form-item>
@@ -547,7 +543,7 @@
unit: "",
quantity: "",
taxInclusiveUnitPrice: "",
- taxRate: "",
+ taxRate: "13",
taxInclusiveTotalPrice: "",
taxExclusiveTotalPrice: "",
invoiceType: "",
--
Gitblit v1.9.3