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 | 177 ++++++++++++++++++++++++++++++++++------------------------
1 files changed, 103 insertions(+), 74 deletions(-)
diff --git a/src/views/sales/salesReturn/AddSalesReturnDialog.vue b/src/views/sales/salesReturn/AddSalesReturnDialog.vue
index 731a46a..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">
@@ -68,7 +83,7 @@
</el-col>
<el-col :span="12">
- <el-form-item label="閿�鍞槑缁嗗崟">
+ <el-form-item label="閿�鍞槑缁嗗崟" prop="salesDetailNumber">
<div class="custom-name">
<el-autocomplete
style="width: 100%"
@@ -85,7 +100,9 @@
<i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
</div>
<div
- v-if="editConfig.infomation.number && editConfig.infomation.number.length > 0"
+ v-if="
+ editConfig.infomation.salesDetailNumber && editConfig.infomation.salesDetailNumber.length > 0
+ "
class="common-select-btn"
@click="clearupClient('contract')"
>
@@ -146,8 +163,8 @@
<el-option v-for="item in statusOptions" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select> -->
- <!-- <div class="common-select-btn"><i class="el-icon-setting"></i></div> -->
- <!-- </div>
+ <!-- <div class="common-select-btn"><i class="el-icon-setting"></i></div> -->
+ <!-- </div>
</el-form-item>
</el-col>
</el-row>
@@ -209,6 +226,7 @@
</div>
<div class="product-view">
<CommonFormTableView
+ :detail-enter="true"
:show-summary="showSummary"
:product-table-list="productTableList"
@inputContent="inputContent"
@@ -230,7 +248,7 @@
:edit-common-config="editSelectClientConfig"
@selClient="selClient"
/>
- <!-- 閫夋嫨鍚堝悓璁㈠崟 -->
+ <!-- 閿�鍞槑缁嗗崟 -->
<SelectCommonDialog
v-if="editSelCommonConfig.editVisible"
:edit-common-config="editSelCommonConfig"
@@ -245,11 +263,11 @@
import { getAllData } from "@/api/client/client"
import { getAddSalesReturn, getUpdateSalesReturn } from "@/api/sales/salesReturn"
import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
-import { getProductList } from "@/api/common/other"
+// 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"
+import { mapActions } from "vuex"
export default {
name: "AddSalesReturnDialog",
@@ -280,9 +298,10 @@
dialogWidth: "50%",
editConfig: this.editCommonConfig,
rules: {
- number: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- repository: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
- memberId: [{ required: true, message: "璇烽�夋嫨璐熻矗浜�", trigger: "change" }]
+ 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" }]
},
memberOptions: [],
selSourceOrderOptions: [], // 閫夋嫨婧愬崟
@@ -303,8 +322,9 @@
},
editSelCommonConfig: {
editVisible: false,
- title: "",
- infomation: {}
+ title: "閿�鍞槑缁嗗崟",
+ infomation: {},
+ clientId: ""
},
productId: 1,
isNoProduct: true,
@@ -317,8 +337,11 @@
this.$store.dispatch("geSalesDetails")
this.setTableForm()
this.getCommonData()
- this.getProductList()
+ // this.getProductList()
this.formInfo()
+ if (this.editConfig.title === "缂栬緫") {
+ this.productTableList.tableData = this.editConfig.infomation.products
+ }
},
watch: {
"editClientManageConfig.visible"(val) {
@@ -326,12 +349,9 @@
this.formInfo()
}
},
- "editClientManageConfig.infomation.codeStandID"() {
- this.formInfo()
- }
},
methods: {
- ...mapActions(["getSalesDetailsFliter"]),
+ ...mapActions(["getSalesDetailsFliter"]),
formInfo() {
this.objCode.type = "閿�鍞��璐х紪鐮�"
this.objCode.codeStandID = ""
@@ -352,58 +372,57 @@
})
},
// 鑾峰彇浜у搧鍒楄〃
- async getProductList() {
- await getProductList({
- page: 1,
- pageSize: 15,
- productName: "",
- productNumber: "",
- // clientId:"100"
- }).then((res) => {
- })
- },
+ // async getProductList() {
+ // await getProductList({
+ // page: 1,
+ // pageSize: 15,
+ // productName: "",
+ // productNumber: ""
+ // }).then((res) => {
+ // console.log(res)
+ // })
+ // },
// 淇濆瓨
saveClick(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
console.log(this.editConfig.infomation)
- for (let i = 0; i < this.tableData.length; i++) {
- if (this.tableData[i].name.length === 0) {
- this.isNoProduct = true
- break
- } else {
- this.isNoProduct = false
- }
- }
- if (this.isNoProduct) {
- this.$message.error("浜у搧鍚嶇О涓嶈兘涓虹┖")
+ // for (let i = 0; i < this.tableData.length; i++) {
+ // if (this.tableData[i].name.length === 0) {
+ // this.isNoProduct = true
+ // break
+ // } else {
+ // this.isNoProduct = false
+ // }
+ // }
+ // if (this.isNoProduct) {
+ // this.$message.error("浜у搧鍚嶇О涓嶈兘涓虹┖")
+ // } else {
+ const params = this.saveParams()
+ if (this.editConfig.title === "鏂板缓") {
+ getAddSalesReturn(params).then((res) => {
+ console.log(res)
+ this.editConfig.visible = false
+ if (res.code === 200) {
+ this.$message.success("娣诲姞鎴愬姛")
+ this.$parent.getData()
+ }
+ })
} else {
- const params = this.saveParams()
- console.log(params)
- if (this.editConfig.title === "鏂板缓") {
- getAddSalesReturn(params).then((res) => {
- console.log(res)
- this.editConfig.visible = false
- if (res.code === 200) {
- this.$message.success("娣诲姞鎴愬姛")
- this.$parent.getData()
- }
- })
- } else {
- getUpdateSalesReturn(params).then((res) => {
- console.log(res)
- this.editConfig.visible = false
- if (res.code === 200) {
- this.$message.success("缂栬緫鎴愬姛")
- this.$parent.getData()
- }
- })
- }
+ getUpdateSalesReturn(params).then((res) => {
+ console.log(res)
+ this.editConfig.visible = false
+ if (res.code === 200) {
+ this.$message.success("缂栬緫鎴愬姛")
+ this.$parent.getData()
+ }
+ })
}
- } else {
- console.log("error submit")
- return false
}
+ // } else {
+ // console.log("error submit")
+ // return false
+ // }
})
},
saveParams() {
@@ -420,9 +439,8 @@
returnDate: data.returnDate || "",
salesReturnStatusId: data.salesReturnStatusId || 0,
sourceId: this.SalesDetailsId,
- sourceType: 1
- },
- codeRule: this.codeRule
+ sourceType: 1,
+ }
}
return params
},
@@ -451,16 +469,17 @@
},
async handleSelectClient(value, item) {
if (value === "client") {
+ this.editConfig.infomation.salesDetailNumber = ""
this.clientId = item.id
+ this.editSelCommonConfig.clientId = item.id
await getSalesDetailsList({
- clientId:this.clientId
- }).then((res)=>{
+ 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.productTableList.tableData = item.products
+ this.tableData = item.products
this.SalesDetailsId = item.id
}
},
@@ -471,26 +490,36 @@
} else if (value === "contract") {
this.editSelCommonConfig.title = "閿�鍞槑缁嗗崟"
this.editSelCommonConfig.editVisible = true
+ // 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
+ this.productTableList.tableData = row.products
+ this.tableData = row.products
}
},
// 娓呴櫎宸查�夋嫨鐢ㄦ埛
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.SalesDetailsId = 0
}
},
// 娣诲姞闄勪欢
--
Gitblit v1.8.0