From 441f8436a70c22fba6f25154f2f38a072c85b76b Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期二, 27 二月 2024 18:45:02 +0800
Subject: [PATCH] 公共选择产品弹窗相关页面修改
---
src/views/service/serviceContract/AddServiceContractDialog.vue | 70 ++++++++++++++++++++++++++--------
1 files changed, 53 insertions(+), 17 deletions(-)
diff --git a/src/views/service/serviceContract/AddServiceContractDialog.vue b/src/views/service/serviceContract/AddServiceContractDialog.vue
index a2123db..40e96db 100644
--- a/src/views/service/serviceContract/AddServiceContractDialog.vue
+++ b/src/views/service/serviceContract/AddServiceContractDialog.vue
@@ -368,9 +368,11 @@
<div class="product-view">
<CommonFormTableView
:show-summary="showSummary"
+ :addTypeIdMultiple="true"
:product-table-list="productTableList"
@inputContent="inputContent"
@addProductClick="addProductClick"
+ @getSelectArray="getSelectArray"
@emptyProductClick="emptyProductClick"
@recalculateProductClick="recalculateProductClick"
@clearupProduct="clearupProduct"
@@ -505,7 +507,7 @@
number: [{ required: true, validator: this.validateCheckCode, trigger: ["blur", "change"] }],
client_name: [{ required: true, message: "璇烽�夋嫨瀹㈡埛鍚嶇О", trigger: "change" }],
signTime: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
- memberId: [{ required: true, message: "璇烽�夋嫨璐熻矗浜�", trigger: "change" }]
+ memberId: [{ required: true, validator: this.validateMemberId, trigger: "change" }]
},
memberOptions: [],
contractTypeOptions: [], // 鍚堝悓绫诲瀷
@@ -580,7 +582,15 @@
.then((res) => {
if (res.code === 200) {
this.memberOptions = res.data.member
- this.$set(this.editConfig.infomation, "memberId", this.editConfig.infomation.memberId)
+ // this.$set(this.editConfig.infomation, "memberId", this.editConfig.infomation.memberId)
+ if (this.editConfig.title === "鏂板缓") {
+ let username = document.cookie.replace(/(?:(?:^|.*;\s*)username\s*=\s*([^;]*).*$)|^.*$/, "$1")
+ this.memberOptions.map((item) => {
+ if (item.username == username) {
+ this.$set(this.editConfig.infomation, "memberId", item.id)
+ }
+ })
+ }
this.contractTypeOptions = res.data.serviceContractType
this.$set(
this.editConfig.infomation,
@@ -792,8 +802,9 @@
}
this.productTableList = {
tableData: this.tableData,
+ isReturn: true,
tableColumn: [
- { label: "#", prop: "productId", width: 40 },
+ // { label: "#", prop: "productId", width: 40 },
{ label: "浜у搧鍚嶇О", prop: "name", productName: true, isRequird: true },
{ label: "浜у搧缂栧彿", prop: "number" },
{ label: "鏁伴噺", prop: "amount", inputNumber: true, isRequird: true },
@@ -805,27 +816,44 @@
},
// 浜у搧鍒楄〃杈撳叆
inputContent(val, prop, row) {
- this.productId = row.productId
+ // this.productId = row.productId
this.tableData.map((item) => {
- if (item.productId === row.productId) {
+ if (item.number === row.number) {
item[prop] = val
}
})
},
// 浜у搧鏂板
addProductClick() {
- this.productId++
- this.tableData.push({
- productId: this.productId,
- id: 0,
- amount: 0,
- desc: "",
- name: "",
- number: "",
- price: 0,
- total: 0,
- unit: ""
- })
+ // this.productId++
+ // this.tableData.push({
+ // productId: this.productId,
+ // id: 0,
+ // amount: 0,
+ // desc: "",
+ // name: "",
+ // number: "",
+ // price: 0,
+ // total: 0,
+ // unit: ""
+ // })
+ // this.showSummary.show = true
+ },
+ // 鏂板鏂瑰紡淇敼
+ getSelectArray(val) {
+ // if (val.length > 0) {
+ // val.map((item, index) => {
+ // item.productId = this.tableData.length + index + 1
+ // })
+ // }
+ console.log(this.tableData, "ddddaaaqqq")
+ if (this.tableData.length == 1 && this.tableData[0].number.length == 0) {
+ console.log("ssss")
+ this.tableData = []
+ }
+ this.tableData = this.tableData.concat(val)
+ console.log(this.tableData, "55555ddddaaaqqq")
+ this.productTableList.tableData = this.tableData
this.showSummary.show = true
},
// 浜у搧娓呯┖
@@ -851,6 +879,14 @@
clearupProduct(data) {
this.tableData = data
this.productTableList.tableData = this.tableData
+ },
+ // 璐熻矗浜鸿嚜瀹氫箟鏍￠獙瑙勫垯
+ validateMemberId(rule, value, callback) {
+ if (this.editConfig.infomation?.memberId > 0) {
+ callback()
+ } else {
+ callback(new Error("璇疯緭鍏ヨ礋璐ｄ汉"))
+ }
}
}
}
--
Gitblit v1.8.0