From 01cea4bc73210e43f748d82a02a432cce615be2d Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期二, 24 十月 2023 17:52:04 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/crm-web into wn
---
src/views/sales/salesReturn/AddSalesReturnDialog.vue | 58 ++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 36 insertions(+), 22 deletions(-)
diff --git a/src/views/sales/salesReturn/AddSalesReturnDialog.vue b/src/views/sales/salesReturn/AddSalesReturnDialog.vue
index a684527..825b387 100644
--- a/src/views/sales/salesReturn/AddSalesReturnDialog.vue
+++ b/src/views/sales/salesReturn/AddSalesReturnDialog.vue
@@ -25,7 +25,22 @@
<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 +51,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">
@@ -233,7 +248,7 @@
:edit-common-config="editSelectClientConfig"
@selClient="selClient"
/>
- <!-- 閫夋嫨鍚堝悓璁㈠崟 -->
+ <!-- 閿�鍞槑缁嗗崟 -->
<SelectCommonDialog
v-if="editSelCommonConfig.editVisible"
:edit-common-config="editSelCommonConfig"
@@ -250,7 +265,7 @@
import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
// import { getProductList } from "@/api/common/other"
import SelectCommonDialog from "@/views/other/commonDialog/SelectCommonDialog"
-import codeMixin from "@/views/client/followupRecords/mixin/codeMixin"
+import codeMixin from "@/components/makepager/mixin/codeMixin"
import { getSalesDetailsList } from "@/api/sales/salesDetails"
import { mapActions } from "vuex"
@@ -283,7 +298,7 @@
dialogWidth: "50%",
editConfig: this.editCommonConfig,
rules: {
- number: [{ required: true, message: "璇疯緭鍏ラ攢鍞��璐у崟鍙�", trigger: "blur" }],
+ number: [{ required: true, validator: this.validateCheckCode, trigger: "blur" }],
repository: [{ required: true, message: "璇烽�夋嫨閫�鍏ヤ粨搴�", trigger: "change" }],
memberId: [{ required: true, message: "璇烽�夋嫨璐熻矗浜�", trigger: "change" }],
salesDetailNumber: [{ required: true, message: "璇烽�夋嫨閿�鍞槑缁嗗崟", trigger: "change" }]
@@ -307,9 +322,9 @@
},
editSelCommonConfig: {
editVisible: false,
- title: "",
+ title: "閿�鍞槑缁嗗崟",
infomation: {},
- clientId:""
+ clientId: ""
},
productId: 1,
isNoProduct: true,
@@ -334,9 +349,6 @@
this.formInfo()
}
},
- "editClientManageConfig.infomation.codeStandID"() {
- this.formInfo()
- }
},
methods: {
...mapActions(["getSalesDetailsFliter"]),
@@ -373,7 +385,6 @@
// 淇濆瓨
saveClick(formName) {
this.$refs[formName].validate((valid) => {
- this.validateFormNumber()
if (valid) {
console.log(this.editConfig.infomation)
// for (let i = 0; i < this.tableData.length; i++) {
@@ -388,7 +399,6 @@
// this.$message.error("浜у搧鍚嶇О涓嶈兘涓虹┖")
// } else {
const params = this.saveParams()
- console.log(params)
if (this.editConfig.title === "鏂板缓") {
getAddSalesReturn(params).then((res) => {
console.log(res)
@@ -429,9 +439,8 @@
returnDate: data.returnDate || "",
salesReturnStatusId: data.salesReturnStatusId || 0,
sourceId: this.SalesDetailsId,
- sourceType: 1
- },
- codeRule: this.codeRule
+ sourceType: 1,
+ }
}
return params
},
@@ -460,15 +469,15 @@
},
async handleSelectClient(value, item) {
if (value === "client") {
+ this.editConfig.infomation.salesDetailNumber = ""
this.clientId = item.id
- this.editSelCommonConfig.clientId=item.id
+ this.editSelCommonConfig.clientId = item.id
await getSalesDetailsList({
clientId: this.clientId
}).then((res) => {
this.getSalesDetailsFliter(res.data.list)
})
} else if (value === "contract") {
- console.log(item, item.number, "閫夋嫨妗�66")
this.productTableList.tableData = item.products
this.tableData = item.products
this.SalesDetailsId = item.id
@@ -481,14 +490,21 @@
} else if (value === "contract") {
this.editSelCommonConfig.title = "閿�鍞槑缁嗗崟"
this.editSelCommonConfig.editVisible = true
- this.editSelCommonConfig.client_name = this.editConfig.infomation.client_name
+ // this.editSelCommonConfig.salesDetailNumber = this.editConfig.infomation.salesDetailNumber
}
},
- selClient(row, value) {
+ async selClient(row, value) {
console.log(row, value)
if (value === "client") {
+ this.editConfig.infomation.salesDetailNumber = ""
this.editConfig.infomation.client_name = row.name
this.clientId = row.id
+ this.editSelCommonConfig.clientId = row.id
+ await getSalesDetailsList({
+ clientId: row.id
+ }).then((res) => {
+ this.getSalesDetailsFliter(res.data.list)
+ })
} else if (value === "contract") {
this.editConfig.infomation.salesDetailNumber = row.number
this.SalesDetailsId = row.id
@@ -499,13 +515,11 @@
// 娓呴櫎宸查�夋嫨鐢ㄦ埛
clearupClient(value) {
if (value === "client") {
+ this.editConfig.infomation.salesDetailNumber = ""
this.editConfig.infomation.client_name = ""
this.clientId = 0
} else if (value === "contract") {
this.editConfig.infomation.salesDetailNumber = ""
- this.productTableList.tableData = []
- this.tableData = []
- this.SalesDetailsId = 0
}
},
// 娣诲姞闄勪欢
--
Gitblit v1.8.0