From b01b18c05b3e0d00576a02c9c83df8c8033e5986 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期三, 11 十月 2023 16:28:06 +0800
Subject: [PATCH] Merge branch 'zhengwenfeng/modify-style' into dev
---
src/views/service/serviceContract/AddServiceContractDialog.vue | 1
src/views/service/serviceFollowup/AddServiceFollowupDialog.vue | 2 +
src/views/other/payment/saleInvoice/index.vue | 60 ++++++++++++++++++++++-------
src/views/sales/contractManage/AddContractManageDialog.vue | 3 +
src/views/service/clientServiceOrder/AddCientServiceOrderDialog.vue | 2
5 files changed, 51 insertions(+), 17 deletions(-)
diff --git a/src/views/other/payment/saleInvoice/index.vue b/src/views/other/payment/saleInvoice/index.vue
index 03063bc..d03f622 100644
--- a/src/views/other/payment/saleInvoice/index.vue
+++ b/src/views/other/payment/saleInvoice/index.vue
@@ -20,10 +20,11 @@
</div>
<TableCommonView
ref="tableListRef"
- v-loading="loading"
:table-list="tableList"
- :select-box="!isDetail"
+ @selClientClick="selClientClick"
+ @selCommonClick="selCommonClick"
@getSelectArray="getSelectArray"
+ @selTableCol="selTableCol"
>
<!-- <template slot="tableButton">
<el-table-column label="鎿嶄綔" width="60" fixed="right">
@@ -108,7 +109,31 @@
},
search_map: {},
keyword: "",
- keywordType: ""
+ keywordType: "",
+ tableColumn: [
+ { label: "鍙戠エ缂栧彿", prop: "invoiceNumber", default: true },
+ { label: "涓婚", prop: "subject" },
+ { label: "瀹㈡埛鍚嶇О", prop: "client_name" },
+ { label: "绁ㄦ嵁绫诲瀷", prop: "invoiceType_name" },
+ { label: "寮�绁ㄦ棩鏈�", prop: "invoiceDate" },
+ { label: "閿�鍞礋璐ｄ汉", prop: "principalId" },
+ { label: "浜у搧鍚嶇О", prop: "name", isProductName: true },
+ { label: "鏁伴噺", prop: "amount", isProductAmount: true },
+ { label: "鍚◣鍗曚环", prop: "price", isProductPrice: true },
+ { label: "浠风◣鍚堣", prop: "total", isProductTotal: true }
+ ],
+ showCol: [
+ "鍙戠エ缂栧彿",
+ "涓婚",
+ "瀹㈡埛鍚嶇О",
+ "绁ㄦ嵁绫诲瀷",
+ "寮�绁ㄦ棩鏈�",
+ "閿�鍞礋璐ｄ汉",
+ "浜у搧鍚嶇О",
+ "鏁伴噺",
+ "鍚◣鍗曚环",
+ "浠风◣鍚堣"
+ ]
}
},
created() {
@@ -125,20 +150,13 @@
methods: {
setTable() {
this.tableList = {
+ selectIndex: true,
tableInfomation: [],
- tableColumn: [
- { label: "鍙戠エ缂栧彿", prop: "invoiceNumber" },
- { label: "涓婚", prop: "subject" },
- { label: "瀹㈡埛鍚嶇О", prop: "client_name" },
- { label: "绁ㄦ嵁绫诲瀷", prop: "invoiceType_name" },
- { label: "寮�绁ㄦ棩鏈�", prop: "invoiceDate" },
- { label: "閿�鍞礋璐ｄ汉", prop: "principalId" },
- { label: "浜у搧鍚嶇О", prop: "name", isProductName: true },
- { label: "鏁伴噺", prop: "amount", isProductAmount: true },
- { label: "鍚◣鍗曚环", prop: "price", isProductPrice: true },
- { label: "浠风◣鍚堣", prop: "total", isProductTotal: true }
- ]
+ allcol: [],
+ showcol: this.showCol,
+ tableColumn: this.setColumnVisible(this.showCol)
}
+ this.tableList.allcol = this.tableList.tableColumn.filter((ele) => !ele.default).map((ele) => ele.label)
this.searchOptions = []
for (let i = 0; i < this.tableList.tableColumn.length; i++) {
const label = this.tableList.tableColumn[i].label
@@ -146,6 +164,18 @@
this.searchOptions.push({ value: value, label: label })
}
},
+ setColumnVisible(showCol) {
+ return this.tableColumn.map((ele) => {
+ return {
+ ...ele,
+ isShowColumn: showCol.includes(ele.label)
+ }
+ })
+ },
+ selTableCol(val) {
+ this.showcol = val
+ this.tableList.tableColumn = this.setColumnVisible(val)
+ },
// 璇锋眰鏁版嵁
async getData() {
this.loading = true
diff --git a/src/views/sales/contractManage/AddContractManageDialog.vue b/src/views/sales/contractManage/AddContractManageDialog.vue
index 31f8c7e..8d023ab 100644
--- a/src/views/sales/contractManage/AddContractManageDialog.vue
+++ b/src/views/sales/contractManage/AddContractManageDialog.vue
@@ -253,7 +253,8 @@
dialogWidth: "50%",
editConfig: this.editCommonConfig,
rules: {
- number: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ number: [{ required: true, message: "璇疯緭鍏ュ崟鎹紪鍙�", trigger: "blur" }],
+ client_name: [{ required: true, message: "璇烽�夋嫨瀹㈡埛鍚嶇О", trigger: "change" }],
member_id: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }]
},
memberOptions: [],
diff --git a/src/views/service/clientServiceOrder/AddCientServiceOrderDialog.vue b/src/views/service/clientServiceOrder/AddCientServiceOrderDialog.vue
index 6afd7f5..0248110 100644
--- a/src/views/service/clientServiceOrder/AddCientServiceOrderDialog.vue
+++ b/src/views/service/clientServiceOrder/AddCientServiceOrderDialog.vue
@@ -688,7 +688,7 @@
editConfig: this.editCommonConfig,
rules: {
serviceNumber: [{ required: true, message: "璇疯緭鍏ユ湇鍔″崟缂栧彿", trigger: "blur" }],
- // faultTypeId: [{ required: true, message: "璇烽�夋嫨鏁呴殰绫诲埆", trigger: "change" }],
+ client_name: [{ required: true, message: "璇烽�夋嫨瀹㈡埛鍚嶇О", trigger: "change" }],
subject: [{ required: true, message: "璇疯緭鍏ヤ富棰�", trigger: "blur" }],
// productCategory: [{ required: true, message: "璇烽�夋嫨浜у搧绫诲埆", trigger: "change" }],
serviceManId: [{ required: true, message: "璇烽�夋嫨浜у搧绫诲埆", trigger: "change" }],
diff --git a/src/views/service/serviceContract/AddServiceContractDialog.vue b/src/views/service/serviceContract/AddServiceContractDialog.vue
index 78e80ef..31da80c 100644
--- a/src/views/service/serviceContract/AddServiceContractDialog.vue
+++ b/src/views/service/serviceContract/AddServiceContractDialog.vue
@@ -491,6 +491,7 @@
editConfig: this.editCommonConfig,
rules: {
number: [{ required: true, message: "璇疯緭鍏ユ湇鍔″悎鍚岀紪鍙�", trigger: "blur" }],
+ client_name: [{ required: true, message: "璇烽�夋嫨瀹㈡埛鍚嶇О", trigger: "change" }],
signTime: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
memberId: [{ required: true, message: "璇烽�夋嫨璐熻矗浜�", trigger: "change" }]
},
diff --git a/src/views/service/serviceFollowup/AddServiceFollowupDialog.vue b/src/views/service/serviceFollowup/AddServiceFollowupDialog.vue
index 0c4b224..1677de4 100644
--- a/src/views/service/serviceFollowup/AddServiceFollowupDialog.vue
+++ b/src/views/service/serviceFollowup/AddServiceFollowupDialog.vue
@@ -327,6 +327,8 @@
editConfig: this.editCommonConfig,
rules: {
number: [{ required: true, message: "璇疯緭鍏ュ洖璁垮崟鍗曠紪鍙�", trigger: "blur" }],
+ client_name: [{ required: true, message: "璇烽�夋嫨瀹㈡埛鍚嶇О", trigger: "change" }],
+ service_number: [{ required: true, message: "璇烽�夋嫨瀹㈡埛鏈嶅姟鍗�", trigger: "change" }],
memberId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }]
},
satisfactionOptions: [], // 婊℃剰搴�
--
Gitblit v1.8.0