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 | 113 +++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 86 insertions(+), 27 deletions(-)
diff --git a/src/views/service/serviceContract/AddServiceContractDialog.vue b/src/views/service/serviceContract/AddServiceContractDialog.vue
index b8a514b..40e96db 100644
--- a/src/views/service/serviceContract/AddServiceContractDialog.vue
+++ b/src/views/service/serviceContract/AddServiceContractDialog.vue
@@ -25,7 +25,20 @@
<el-row>
<el-col :span="12">
<el-form-item label="鏈嶅姟鍚堝悓缂栧彿" prop="number">
- <WordInput
+ <el-input
+ v-if="
+ editConfig.title == '缂栬緫' ||
+ (editConfig.title == '鏂板缓' && codenumer && (explain != '' || isIdDisabled))
+ "
+ :disabled="editConfig.title == '缂栬緫'"
+ v-model="editConfig.infomation.number"
+ placeholder="璇疯緭鍏ョ紪鐮�"
+ >
+ </el-input>
+ <span v-else-if="editConfig.title == '鏂板缓'" style="color: #f56c6c"
+ >璇蜂紭鍏堥厤缃紪鐮佽鑼� <el-button type="text" @click="numberClick"> 閰嶇疆瑙勮寖 </el-button></span
+ >
+ <!-- <WordInput
v-if="codenumer && (explain != '' || isIdDisabled) && method == 0"
:codenumer="codenumer"
:sum="sum"
@@ -36,7 +49,7 @@
<span v-else-if="method == 0" style="color: #f56c6c"
>璇蜂紭鍏堥厤缃紪鐮佽鑼� <el-button type="text" @click="numberClick"> 閰嶇疆瑙勮寖 </el-button></span
>
- <span v-else>{{ editConfig.title === "鏂板缓" ? "鑷姩鐢熸垚" : editConfig.infomation.number }}</span>
+ <span v-else>{{ editConfig.title === "鏂板缓" ? "鑷姩鐢熸垚" : editConfig.infomation.number }}</span> -->
</el-form-item>
</el-col>
<el-col :span="12">
@@ -355,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"
@@ -447,7 +462,7 @@
import SelectContactDialog from "@/views/other/commonDialog/SelectContactDialog"
import SelectChanceDialog from "@/views/other/commonDialog/SelectChanceDialog"
import SelectCommonDialog from "@/views/other/commonDialog/SelectCommonDialog"
-import codeMixin from "@/views/client/followupRecords/mixin/codeMixin"
+import codeMixin from "@/components/makepager/mixin/codeMixin"
export default {
name: "AddServiceContractDialog",
mixins: [codeMixin],
@@ -489,10 +504,10 @@
dialogWidth: "50%",
editConfig: this.editCommonConfig,
rules: {
- number: [{ required: true, message: "璇疯緭鍏ユ湇鍔″悎鍚岀紪鍙�", trigger: "blur" }],
+ 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: [], // 鍚堝悓绫诲瀷
@@ -551,9 +566,6 @@
if (val) {
this.formInfo()
}
- },
- "editCommonConfig.infomation.codeStandID"() {
- this.formInfo()
}
},
methods: {
@@ -570,8 +582,27 @@
.then((res) => {
if (res.code === 200) {
this.memberOptions = res.data.member
+ // 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,
+ "serviceContractTypeId",
+ this.editConfig.infomation.serviceContractTypeId
+ )
this.contractStatusOptions = res.data.serviceContractStatus
+ this.$set(
+ this.editConfig.infomation,
+ "serviceContractStatusId",
+ this.editConfig.infomation.serviceContractStatusId
+ )
// this.currencyOptions = res.data.currency
}
})
@@ -596,7 +627,6 @@
this.$message.error("浜у搧鍚嶇О涓嶈兘涓虹┖")
} else {
const params = this.saveParams()
- console.log(params)
if (this.editConfig.title === "鏂板缓") {
getAddServiceContract(params).then((res) => {
console.log(res)
@@ -645,8 +675,7 @@
typeId: 0,
serviceContractTypeId: data.serviceContractTypeId || 0,
serviceContractStatusId: data.serviceContractStatusId || 0,
- codeStandID: data.ID,
- codeRule: this.codeRule
+ codeStandID: data.ID
}
return params
},
@@ -761,7 +790,8 @@
name: "",
number: "",
price: 0,
- total: 0
+ total: 0,
+ unit: ""
}
]
} else {
@@ -772,11 +802,13 @@
}
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 },
+ { label: "鍗曚綅", prop: "unit" },
{ label: "閿�鍞崟浠�", prop: "price", inputFloat: true },
{ label: "浠风◣鍚堣", prop: "total", inputFloat: true }
]
@@ -784,26 +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
- })
+ // 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
},
// 浜у搧娓呯┖
@@ -818,7 +868,8 @@
name: "",
number: "",
price: 0,
- total: 0
+ total: 0,
+ unit: ""
}
]
this.productTableList.tableData = this.tableData
@@ -828,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