From b2a2bdb0c270b71d2a864896dd0ea6bf43a758c2 Mon Sep 17 00:00:00 2001
From: 周宾 <2802492122@qq.com>
Date: 星期四, 11 十二月 2025 13:31:06 +0800
Subject: [PATCH] 润泰生物去除项目名称 协同办公、营销管理
---
src/views/procurementManagement/procurementLedger/index.vue | 154 ++++++++++++------------
src/views/salesManagement/invoiceLedger/index.vue | 2
src/views/salesManagement/receiptPayment/index.vue | 10
src/views/procurementManagement/invoiceEntry/indexOld.vue | 50 ++++----
src/views/procurementManagement/invoiceEntry/index.vue | 14 +-
src/views/salesManagement/salesLedger/index.vue | 22 ++-
src/views/procurementManagement/invoiceEntry/components/Modal.vue | 28 ++--
src/views/salesManagement/invoiceRegistration/index.vue | 55 ++++----
src/views/salesManagement/receiptPaymentHistory/index.vue | 16 +-
9 files changed, 179 insertions(+), 172 deletions(-)
diff --git a/src/views/procurementManagement/invoiceEntry/components/Modal.vue b/src/views/procurementManagement/invoiceEntry/components/Modal.vue
index 0387a6c..6c908a6 100644
--- a/src/views/procurementManagement/invoiceEntry/components/Modal.vue
+++ b/src/views/procurementManagement/invoiceEntry/components/Modal.vue
@@ -33,7 +33,7 @@
/>
</el-form-item>
</el-col>
- <el-col :span="12">
+ <!-- <el-col :span="12">
<el-form-item label="椤圭洰鍚嶇О锛�" prop="projectName">
<el-input
v-model="form.projectName"
@@ -42,7 +42,7 @@
disabled
/>
</el-form-item>
- </el-col>
+ </el-col> -->
<el-col :span="12">
<el-form-item label="鍙戠エ鍙凤細" prop="invoiceNumber">
<el-input
@@ -84,6 +84,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"
+ value-format="YYYY-MM-DD"
+ format="YYYY-MM-DD"
+ clearable
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
<el-form-item label="涓婁紶闄勪欢">
<FileUpload
:showTip="false"
@@ -96,18 +108,6 @@
: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"
- value-format="YYYY-MM-DD"
- format="YYYY-MM-DD"
- clearable
/>
</el-form-item>
</el-col>
diff --git a/src/views/procurementManagement/invoiceEntry/index.vue b/src/views/procurementManagement/invoiceEntry/index.vue
index 87e08e9..8ac0455 100644
--- a/src/views/procurementManagement/invoiceEntry/index.vue
+++ b/src/views/procurementManagement/invoiceEntry/index.vue
@@ -28,13 +28,13 @@
clearable
/>
</el-form-item>
- <el-form-item label="椤圭洰鍚嶇О">
+ <!-- <el-form-item label="椤圭洰鍚嶇О">
<el-input
v-model="filters.projectName"
placeholder="璇疯緭鍏ラ」鐩悕绉�"
clearable
/>
- </el-form-item>
+ </el-form-item> -->
<el-form-item>
<el-button type="primary" @click="getTableData"> 鎼滅储 </el-button>
<el-button @click="resetFilters"> 閲嶇疆 </el-button>
@@ -142,11 +142,11 @@
prop: "supplierName",
width:300
},
- {
- label: "椤圭洰鍚嶇О",
- prop: "projectName",
- width:400
- },
+ // {
+ // label: "椤圭洰鍚嶇О",
+ // prop: "projectName",
+ // width:400
+ // },
{
label: "褰曞叆浜�",
prop: "recorderName",
diff --git a/src/views/procurementManagement/invoiceEntry/indexOld.vue b/src/views/procurementManagement/invoiceEntry/indexOld.vue
index 1b4c6b9..a2c8133 100644
--- a/src/views/procurementManagement/invoiceEntry/indexOld.vue
+++ b/src/views/procurementManagement/invoiceEntry/indexOld.vue
@@ -104,11 +104,11 @@
prop="supplierName"
show-overflow-tooltip
/>
- <el-table-column
+ <!-- <el-table-column
label="椤圭洰鍚嶇О"
prop="projectName"
show-overflow-tooltip
- />
+ /> -->
<el-table-column
label="鍚堝悓閲戦(鍏�)"
prop="contractAmount"
@@ -186,28 +186,6 @@
</el-row>
<el-row :gutter="30">
<el-col :span="12">
- <el-form-item label="渚涘簲鍟嗗悕绉帮細" prop="supplierName">
- <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-form-item>
- </el-col>
- </el-row>
- <el-row :gutter="30">
- <el-col :span="12">
<el-form-item label="鍙戠エ鍙凤細" prop="invoiceNumber">
<el-input
v-model="form.invoiceNumber"
@@ -253,6 +231,28 @@
</el-row>
<el-row :gutter="30">
<el-col :span="12">
+ <el-form-item label="渚涘簲鍟嗗悕绉帮細" prop="supplierName">
+ <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-form-item>
+ </el-col> -->
+ </el-row>
+ <el-row :gutter="30">
+ <el-col :span="24">
<el-form-item label="涓婁紶闄勪欢">
<FileUpload :showTip="false" accept="*" :autoUpload="true" />
</el-form-item>
@@ -599,7 +599,7 @@
getInfo({ id: value }).then((res) => {
let result = res.data;
form.value.salesContractNo = result.salesContractNo;
- form.value.projectName = result.projectName;
+ // form.value.projectName = result.projectName;
productData.value = result.productData;
form.value.supplierName = result.supplierName;
});
diff --git a/src/views/procurementManagement/procurementLedger/index.vue b/src/views/procurementManagement/procurementLedger/index.vue
index f4af529..0ae507d 100644
--- a/src/views/procurementManagement/procurementLedger/index.vue
+++ b/src/views/procurementManagement/procurementLedger/index.vue
@@ -21,10 +21,10 @@
<el-input v-model="searchForm.salesContractNo" placeholder="璇疯緭鍏�" clearable prefix-icon="Search"
@change="handleQuery" />
</el-form-item>
- <el-form-item label="椤圭洰鍚嶇О锛�">
+ <!-- <el-form-item label="椤圭洰鍚嶇О锛�">
<el-input v-model="searchForm.projectName" placeholder="璇疯緭鍏�" clearable prefix-icon="Search"
@change="handleQuery" />
- </el-form-item>
+ </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" />
@@ -112,12 +112,12 @@
prop="supplierName"
show-overflow-tooltip
/>
- <el-table-column
+ <!-- <el-table-column
label="椤圭洰鍚嶇О"
prop="projectName"
width="420"
show-overflow-tooltip
- />
+ /> -->
<el-table-column
label="浠樻鏂瑰紡"
width="100"
@@ -218,33 +218,6 @@
</el-form-item>
</el-col>
</el-row>
- <el-row :gutter="30">
- <el-col :span="12">
- <el-form-item label="渚涘簲鍟嗗悕绉帮細" prop="supplierId">
- <el-select
- v-model="form.supplierId"
- placeholder="璇烽�夋嫨"
- clearable
- >
- <el-option
- v-for="item in supplierList"
- :key="item.id"
- :label="item.supplierName"
- :value="item.id"
- />
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="椤圭洰鍚嶇О锛�" prop="projectName">
- <el-input
- v-model="form.projectName"
- placeholder="璇疯緭鍏�"
- clearable
- />
- </el-form-item>
- </el-col>
- </el-row>
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="浠樻鏂瑰紡">
@@ -302,6 +275,33 @@
/>
</el-form-item>
</el-col>
+ </el-row>
+ <el-row :gutter="30">
+ <el-col :span="12">
+ <el-form-item label="渚涘簲鍟嗗悕绉帮細" prop="supplierId">
+ <el-select
+ v-model="form.supplierId"
+ placeholder="璇烽�夋嫨"
+ clearable
+ >
+ <el-option
+ v-for="item in supplierList"
+ :key="item.id"
+ :label="item.supplierName"
+ :value="item.id"
+ />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <!-- <el-col :span="12">
+ <el-form-item label="椤圭洰鍚嶇О锛�" prop="projectName">
+ <el-input
+ v-model="form.projectName"
+ placeholder="璇疯緭鍏�"
+ clearable
+ />
+ </el-form-item>
+ </el-col> -->
</el-row>
<el-row>
<el-form-item label="浜у搧淇℃伅锛�" prop="entryDate">
@@ -638,29 +638,6 @@
</el-row>
<el-row :gutter="20">
<el-col :span="12">
- <el-form-item label="椤圭洰鍚嶇О锛�" prop="projectName">
- <el-input
- v-model="scanAddForm.projectName"
- placeholder="璇疯緭鍏�"
- clearable
- />
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鍚堝悓閲戦(鍏�)锛�" prop="contractAmount">
- <el-input-number
- v-model="scanAddForm.contractAmount"
- :precision="2"
- :step="0.1"
- clearable
- style="width: 100%"
- placeholder="璇疯緭鍏�"
- />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row :gutter="20">
- <el-col :span="12">
<el-form-item label="浠樻鏂瑰紡锛�">
<el-input
v-model="scanAddForm.paymentMethod"
@@ -672,6 +649,29 @@
<el-col :span="12">
<el-form-item label="褰曞叆浜猴細">
<el-input v-model="scanAddForm.recorderName" disabled />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="20">
+ <!-- <el-col :span="12">
+ <el-form-item label="椤圭洰鍚嶇О锛�" prop="projectName">
+ <el-input
+ v-model="scanAddForm.projectName"
+ placeholder="璇疯緭鍏�"
+ clearable
+ />
+ </el-form-item>
+ </el-col> -->
+ <el-col :span="12">
+ <el-form-item label="鍚堝悓閲戦(鍏�)锛�" prop="contractAmount">
+ <el-input-number
+ v-model="scanAddForm.contractAmount"
+ :precision="2"
+ :step="0.1"
+ clearable
+ style="width: 100%"
+ placeholder="璇疯緭鍏�"
+ />
</el-form-item>
</el-col>
</el-row>
@@ -725,18 +725,6 @@
</el-row>
<el-row :gutter="20">
<el-col :span="12">
- <el-form-item label="椤圭洰鍚嶇О锛�">
- <el-input v-model="scanForm.projectName" disabled />
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鎵爜鏃堕棿锛�">
- <el-input v-model="scanForm.scanTime" disabled />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row :gutter="20">
- <el-col :span="12">
<el-form-item label="鎵爜浜猴細">
<el-input v-model="scanForm.scannerName" disabled />
</el-form-item>
@@ -746,6 +734,18 @@
<el-tag :type="scanForm.scanStatus === '宸叉壂鐮�' ? 'success' : 'warning'">
{{ scanForm.scanStatus }}
</el-tag>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="20">
+ <!-- <el-col :span="12">
+ <el-form-item label="椤圭洰鍚嶇О锛�">
+ <el-input v-model="scanForm.projectName" disabled />
+ </el-form-item>
+ </el-col> -->
+ <el-col :span="12">
+ <el-form-item label="鎵爜鏃堕棿锛�">
+ <el-input v-model="scanForm.scanTime" disabled />
</el-form-item>
</el-col>
</el-row>
@@ -852,7 +852,7 @@
supplierName: "", // 渚涘簲鍟嗗悕绉�
purchaseContractNumber: "", // 閲囪喘鍚堝悓缂栧彿
salesContractNo: "", // 閿�鍞悎鍚岀紪鍙�
- projectName: "", // 椤圭洰鍚嶇О
+ // projectName: "", // 椤圭洰鍚嶇О
entryDate: null, // 褰曞叆鏃ユ湡
entryDateStart: undefined,
entryDateEnd: undefined,
@@ -860,7 +860,7 @@
form: {
purchaseContractNumber: "",
salesLedgerId: "",
- projectName: "",
+ // projectName: "",
recorderId: "",
entryDate: "",
productData: [],
@@ -873,7 +873,7 @@
purchaseContractNumber: [
{ required: true, message: "璇疯緭鍏�", trigger: "blur" },
],
- projectName: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ // projectName: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
supplierId: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
entryDate: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
executionDate: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
@@ -1405,7 +1405,7 @@
var index = salesContractList.value.findIndex((item) => item.id == row);
console.log("index", index);
if (index > -1) {
- form.value.projectName = salesContractList.value[index].projectName;
+ // form.value.projectName = salesContractList.value[index].projectName;
await querygProductInfoByContractNo();
}
};
@@ -1466,7 +1466,7 @@
scanContent: "",
purchaseContractNumber: "",
supplierName: "",
- projectName: "",
+ // projectName: "",
contractAmount: "",
paymentMethod: "",
recorderName: "",
@@ -1475,7 +1475,7 @@
const scanAddRules = {
purchaseContractNumber: [{ required: true, message: "璇疯緭鍏ラ噰璐悎鍚屽彿", trigger: "blur" }],
supplierName: [{ required: true, message: "璇疯緭鍏ヤ緵搴斿晢鍚嶇О", trigger: "blur" }],
- projectName: [{ required: true, message: "璇疯緭鍏ラ」鐩悕绉�", trigger: "blur" }],
+ // projectName: [{ required: true, message: "璇疯緭鍏ラ」鐩悕绉�", trigger: "blur" }],
};
// 鎵爜鐧昏瀵硅瘽妗嗙浉鍏冲彉閲�
@@ -1483,7 +1483,7 @@
const scanForm = reactive({
purchaseContractNumber: "",
supplierName: "",
- projectName: "",
+ // projectName: "",
scanTime: "",
scannerName: "",
scanStatus: "鏈壂鐮�",
@@ -1499,7 +1499,7 @@
scanAddForm.scanContent = "";
scanAddForm.purchaseContractNumber = "";
scanAddForm.supplierName = "";
- scanAddForm.projectName = "";
+ // scanAddForm.projectName = "";
scanAddForm.contractAmount = "";
scanAddForm.paymentMethod = "";
scanAddForm.recorderName = userStore.nickName;
@@ -1517,7 +1517,7 @@
if (parts.length >= 3) {
scanAddForm.purchaseContractNumber = parts[0] || "";
scanAddForm.supplierName = parts[1] || "";
- scanAddForm.projectName = parts[2] || "";
+ // scanAddForm.projectName = parts[2] || "";
scanAddForm.contractAmount = parts[3] || "";
scanAddForm.paymentMethod = parts[4] || "";
}
@@ -1537,7 +1537,7 @@
const newData = {
purchaseContractNumber: scanAddForm.purchaseContractNumber,
supplierName: scanAddForm.supplierName,
- projectName: scanAddForm.projectName,
+ // projectName: scanAddForm.projectName,
contractAmount: scanAddForm.contractAmount,
paymentMethod: scanAddForm.paymentMethod,
recorderName: scanAddForm.recorderName,
@@ -1560,7 +1560,7 @@
const openScanDialog = (row) => {
scanForm.purchaseContractNumber = row.purchaseContractNumber;
scanForm.supplierName = row.supplierName;
- scanForm.projectName = row.projectName;
+ // scanForm.projectName = row.projectName;
scanForm.scanTime = getCurrentDateTime();
scanForm.scannerName = userStore.nickName;
scanForm.scanStatus = "鏈壂鐮�";
diff --git a/src/views/salesManagement/invoiceLedger/index.vue b/src/views/salesManagement/invoiceLedger/index.vue
index d1695c4..147cda5 100644
--- a/src/views/salesManagement/invoiceLedger/index.vue
+++ b/src/views/salesManagement/invoiceLedger/index.vue
@@ -33,7 +33,7 @@
<el-table-column label="閿�鍞悎鍚屽彿" prop="salesContractNo" show-overflow-tooltip width="180" />
<el-table-column label="瀹㈡埛鍚堝悓鍙�" prop="customerContractNo" show-overflow-tooltip width="180" />
<el-table-column label="瀹㈡埛鍚嶇О" prop="customerName" show-overflow-tooltip width="240" />
- <el-table-column label="椤圭洰" prop="projectName" width="320" />
+ <!-- <el-table-column label="椤圭洰" prop="projectName" width="320" /> -->
<el-table-column label="浜у搧澶х被" prop="productCategory" width="200" />
<el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" width="160" show-overflow-tooltip />
<el-table-column label="鍙戠エ鍙�" prop="invoiceNo" width="200" show-overflow-tooltip />
diff --git a/src/views/salesManagement/invoiceRegistration/index.vue b/src/views/salesManagement/invoiceRegistration/index.vue
index 8bf1236..0e1166a 100644
--- a/src/views/salesManagement/invoiceRegistration/index.vue
+++ b/src/views/salesManagement/invoiceRegistration/index.vue
@@ -19,13 +19,13 @@
clearable
/>
</el-form-item>
- <el-form-item label="椤圭洰鍚嶇О">
+ <!-- <el-form-item label="椤圭洰鍚嶇О">
<el-input
v-model="searchForm.projectName"
placeholder="璇疯緭鍏ラ」鐩悕绉�"
clearable
/>
- </el-form-item>
+ </el-form-item> -->
<el-form-item>
<el-checkbox
v-model="searchForm.status"
@@ -142,13 +142,14 @@
show-overflow-tooltip
width="240"
/>
- <el-table-column label="涓氬姟鍛�" prop="salesman" show-overflow-tooltip width="90"/>
- <el-table-column
+ <!-- width="90" -->
+ <el-table-column label="涓氬姟鍛�" prop="salesman" show-overflow-tooltip />
+ <!-- <el-table-column
label="椤圭洰鍚嶇О"
prop="projectName"
show-overflow-tooltip
width="200"
- />
+ /> -->
<el-table-column
label="鍚堝悓閲戦(鍏�)"
prop="contractAmount"
@@ -217,26 +218,6 @@
</el-row>
<el-row :gutter="30">
<el-col :span="12">
- <el-form-item label="涓氬姟鍛橈細" prop="salesman">
- <el-input
- v-model="form.salesman"
- placeholder="鑷姩濉厖"
- disabled
- />
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="椤圭洰鍚嶇О锛�" prop="projectName">
- <el-input
- v-model="form.projectName"
- placeholder="鑷姩濉厖"
- disabled
- />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row :gutter="30">
- <el-col :span="12">
<el-form-item label="褰曞叆浜�" prop="createUer">
<el-input v-model="form.createUer" placeholder="璇疯緭鍏ュ綍鍏ヤ汉" />
</el-form-item>
@@ -276,6 +257,26 @@
/>
</el-form-item>
</el-col>
+ </el-row>
+ <el-row :gutter="30">
+ <el-col :span="12">
+ <el-form-item label="涓氬姟鍛橈細" prop="salesman">
+ <el-input
+ v-model="form.salesman"
+ placeholder="鑷姩濉厖"
+ disabled
+ />
+ </el-form-item>
+ </el-col>
+ <!-- <el-col :span="12">
+ <el-form-item label="椤圭洰鍚嶇О锛�" prop="projectName">
+ <el-input
+ v-model="form.projectName"
+ placeholder="鑷姩濉厖"
+ disabled
+ />
+ </el-form-item>
+ </el-col> -->
</el-row>
<el-row>
<el-form-item label="浜у搧淇℃伅锛�" prop="entryDate"> </el-form-item>
@@ -438,7 +439,7 @@
customerName: "",
status: false,
customerContractNo: undefined, // 瀹㈡埛鍚堝悓鍙�
- projectName: undefined, // 椤圭洰鍚嶇О
+ // projectName: undefined, // 椤圭洰鍚嶇О
createUer: undefined, // 鐧昏浜�
issueDate: undefined, // 寮�绁ㄦ棩鏈�
createTime: undefined, // 褰曞叆鏃ユ湡锛�
@@ -447,7 +448,7 @@
salesLedgerId: "",
customerName: "",
salesman: "",
- projectName: "",
+ // projectName: "",
productData: [],
invoiceNo: "",
createUer: userStore.nickName,
diff --git a/src/views/salesManagement/receiptPayment/index.vue b/src/views/salesManagement/receiptPayment/index.vue
index a2dfcd4..89cae21 100644
--- a/src/views/salesManagement/receiptPayment/index.vue
+++ b/src/views/salesManagement/receiptPayment/index.vue
@@ -22,7 +22,7 @@
prefix-icon="Search"
/>
</el-form-item>
- <el-form-item label="椤圭洰鍚嶇О">
+ <!-- <el-form-item label="椤圭洰鍚嶇О">
<el-input
v-model="searchForm.projectName"
placeholder="璇疯緭鍏�"
@@ -30,7 +30,7 @@
clearable
prefix-icon="Search"
/>
- </el-form-item>
+ </el-form-item> -->
<el-form-item>
<el-checkbox
v-model="searchForm.status"
@@ -166,12 +166,12 @@
show-overflow-tooltip
width="240"
/>
- <el-table-column
+ <!-- <el-table-column
label="椤圭洰鍚嶇О"
prop="projectName"
show-overflow-tooltip
width="340"
- />
+ /> -->
<el-table-column
label="鍥炴鐘舵��"
prop="statusName"
@@ -397,7 +397,7 @@
status: true,
customerName: "",
customerContractNo: "",
- projectName: "",
+ // projectName: "",
},
form: {
salesContractNo: "",
diff --git a/src/views/salesManagement/receiptPaymentHistory/index.vue b/src/views/salesManagement/receiptPaymentHistory/index.vue
index 8475f18..df68ad4 100644
--- a/src/views/salesManagement/receiptPaymentHistory/index.vue
+++ b/src/views/salesManagement/receiptPaymentHistory/index.vue
@@ -19,7 +19,7 @@
:prefix-icon="Search"
/>
</el-form-item>
- <el-form-item label="椤圭洰鍚嶇О">
+ <!-- <el-form-item label="椤圭洰鍚嶇О">
<el-input
v-model="searchForm.projectName"
placeholder="杈撳叆椤圭洰鍚嶇О"
@@ -27,7 +27,7 @@
clearable
:prefix-icon="Search"
/>
- </el-form-item>
+ </el-form-item> -->
<el-form-item label="鍥炴鏃ユ湡">
<el-date-picker
v-model="searchForm.receiptPaymentDate"
@@ -94,11 +94,11 @@
prop: "customerName",
width:240
},
- {
- label: "椤圭洰鍚嶇О",
- prop: "projectName",
- width:200
- },
+ // {
+ // label: "椤圭洰鍚嶇О",
+ // prop: "projectName",
+ // width:200
+ // },
{
label: "鍥炴閲戦锛堝厓锛�",
prop: "receiptPaymentAmount",
@@ -150,7 +150,7 @@
receiptPaymentDateStart: undefined,
receiptPaymentDateEnd: undefined,
customerContractNo: undefined,
- projectName: undefined,
+ // projectName: undefined,
});
const { receipt_payment_type } = proxy.useDict("receipt_payment_type");
const isShowSummarySon = ref(true);
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index 9ceb99d..e34f638 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -14,10 +14,10 @@
<el-input v-model="searchForm.salesContractNo" placeholder="璇疯緭鍏�" clearable prefix-icon="Search"
@change="handleQuery" />
</el-form-item>
- <el-form-item label="椤圭洰鍚嶇О锛�">
+ <!-- <el-form-item label="椤圭洰鍚嶇О锛�">
<el-input v-model="searchForm.projectName" placeholder="璇疯緭鍏�" clearable prefix-icon="Search"
@change="handleQuery" />
- </el-form-item>
+ </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" />
@@ -63,7 +63,7 @@
<el-table-column label="瀹㈡埛鍚堝悓鍙�" prop="customerContractNo" width="180" show-overflow-tooltip />
<el-table-column label="瀹㈡埛鍚嶇О" prop="customerName" width="300" show-overflow-tooltip />
<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="projectName" width="180" show-overflow-tooltip /> -->
<el-table-column label="浠樻鏂瑰紡" prop="paymentMethod" show-overflow-tooltip />
<el-table-column label="鍚堝悓閲戦(鍏�)" prop="contractAmount" width="220" show-overflow-tooltip
:formatter="formattedNumber" />
@@ -120,7 +120,7 @@
</el-form-item>
</el-col>
</el-row>
- <el-row :gutter="30">
+ <!-- <el-row :gutter="30">
<el-col :span="12">
<el-form-item label="椤圭洰鍚嶇О锛�" prop="projectName">
<el-input v-model="form.projectName" placeholder="璇疯緭鍏�" clearable :disabled="operationType === 'view'" />
@@ -132,7 +132,7 @@
format="YYYY-MM-DD" type="date" placeholder="璇烽�夋嫨" clearable :disabled="operationType === 'view'" />
</el-form-item>
</el-col>
- </el-row>
+ </el-row> -->
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="褰曞叆浜猴細" prop="entryPerson">
@@ -156,6 +156,12 @@
<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="executionDate">
+ <el-date-picker style="width: 100%" v-model="form.executionDate" value-format="YYYY-MM-DD"
+ format="YYYY-MM-DD" type="date" placeholder="璇烽�夋嫨" clearable :disabled="operationType === 'view'" />
+ </el-form-item>
+ </el-col>
</el-row>
<el-row>
<el-form-item label="浜у搧淇℃伅锛�" prop="entryDate">
@@ -516,7 +522,7 @@
customerName: "", // 瀹㈡埛鍚嶇О
customerContractNo: "", // 瀹㈡埛鍚堝悓缂栧彿
salesContractNo: "", // 閿�鍞悎鍚岀紪鍙�
- projectName: "", // 椤圭洰鍚嶇О
+ // projectName: "", // 椤圭洰鍚嶇О
entryDate: null, // 褰曞叆鏃ユ湡
entryDateStart: undefined,
entryDateEnd: undefined,
@@ -526,7 +532,7 @@
salesman: "",
customerContractNo: "",
customerId: "",
- projectName: "",
+ // projectName: "",
entryPerson: "",
entryDate: "",
maintenanceTime: "",
@@ -540,7 +546,7 @@
{ required: true, message: "璇疯緭鍏�", trigger: "blur" },
],
customerId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
- projectName: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ // projectName: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
entryPerson: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
entryDate: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
executionDate: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
--
Gitblit v1.9.3