From da3dbb56388ae49097e50ded584ed2abb7f5022d Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期二, 17 十月 2023 14:16:25 +0800
Subject: [PATCH] bug修复（5243）
---
src/views/sales/refundForm/AddRefundFormDialog.vue | 450 ++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 326 insertions(+), 124 deletions(-)
diff --git a/src/views/sales/refundForm/AddRefundFormDialog.vue b/src/views/sales/refundForm/AddRefundFormDialog.vue
index 2d4e02b..eff816e 100644
--- a/src/views/sales/refundForm/AddRefundFormDialog.vue
+++ b/src/views/sales/refundForm/AddRefundFormDialog.vue
@@ -13,7 +13,7 @@
:model="editConfig.infomation"
:rules="rules"
label-position="right"
- label-width="308px"
+ label-width="30%"
size="mini"
style="height: 60vh; overflow-x: hidden"
>
@@ -24,48 +24,85 @@
<div class="basic-info-view">
<el-row>
<el-col :span="12">
+ <el-form-item label="閫�娆惧崟缂栧彿" prop="number">
+ <WordInput
+ v-if="codenumer && (explain != '' || isIdDisabled) && method == 0"
+ :codenumer="codenumer"
+ :sum="sum"
+ :disabled="editConfig.title !== '鏂板缓' || isIdDisabled"
+ :inputValue="inputValue"
+ @codeList="codeList"
+ />
+ <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>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
<el-form-item label="瀹㈡埛鍚嶇О" prop="client_name">
<div class="custom-name">
<el-autocomplete
+ style="width: 100%"
v-model="editConfig.infomation.client_name"
- :fetch-suggestions="querySearchAsync"
+ :fetch-suggestions="
+ (queryString, callback) => {
+ querySearchAsync(queryString, callback, 'client')
+ }
+ "
value-key="name"
- @select="handleSelectClient"
+ @select="handleSelectClient('client', $event)"
></el-autocomplete>
- <div class="common-select-btn" @click="selClientClick">
+ <div class="common-select-btn" @click="selClientClick('client')">
<i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
</div>
- <div class="common-select-btn" @click="clearupClient">
- <i class="el-icon-edit-outline" title="娓呴櫎"></i>
+ <div
+ v-if="editConfig.infomation.client_name && editConfig.infomation.client_name.length > 0"
+ class="common-select-btn"
+ @click="clearupClient('client')"
+ >
+ <i class="el-icon-remove-outline" title="娓呴櫎"></i>
+ </div>
+ </div>
+ </el-form-item>
+ </el-col>
+
+ <el-col :span="12">
+ <el-form-item label="閿�鍞��璐у崟" prop="sale_return_nunber">
+ <div class="custom-name">
+ <el-autocomplete
+ style="width: 100%"
+ v-model="editConfig.infomation.sale_return_nunber"
+ :fetch-suggestions="
+ (queryString, callback) => {
+ querySearchAsync(queryString, callback, 'salesReturn')
+ }
+ "
+ value-key="number"
+ @select="handleSelectClient('salesReturn', $event)"
+ ></el-autocomplete>
+ <div class="common-select-btn" @click="selClientClick('salesReturn')">
+ <i class="el-icon-circle-plus-outline"></i>
+ </div>
+ <div
+ v-if="
+ editConfig.infomation.sale_return_nunber && editConfig.infomation.sale_return_nunber.length > 0
+ "
+ class="common-select-btn"
+ @click="clearupClient('salesReturn')"
+ >
+ <i class="el-icon-remove-outline"></i>
</div>
</div>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="閫�娆惧崟缂栧彿" prop="number">
- <el-input v-model="editConfig.infomation.number"></el-input>
- </el-form-item>
- </el-col>
- <!-- <el-col :span="12">
- <el-form-item label="閫夋嫨婧愬崟" prop="selSourceOrder">
- <el-select v-model="editConfig.infomation.selSourceOrder" size="mini" style="width: 63%">
- <el-option
- v-for="item in selSourceOrderOptions"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
- </el-form-item>
- </el-col> -->
- <el-col :span="12">
<el-form-item label="閿�鍞礋璐ｄ汉" prop="memberId">
<el-select
+ style="width: 100%"
v-model="editConfig.infomation.memberId"
placeholder="璇烽�夋嫨"
size="mini"
- style="width: 63%"
>
<el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id">
</el-option>
@@ -75,6 +112,7 @@
<el-col :span="12">
<el-form-item label="閫�娆炬棩鏈�" prop="refundDate">
<el-date-picker
+ style="width: 100%"
v-model="editConfig.infomation.refundDate"
value-format="yyyy-MM-dd"
type="date"
@@ -84,15 +122,21 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="浠樻鏂瑰紡" prop="paymentTypeId">
+ <el-form-item label="閫�娆炬柟寮�" prop="paymentTypeId">
<div class="common-select">
<el-select
+ style="width: 100%"
v-model="editConfig.infomation.paymentTypeId"
placeholder="璇烽�夋嫨"
class="common-select-sel"
size="mini"
>
- <el-option v-for="item in refundMethodOptions" :key="item.id" :label="item.name" :value="item.id">
+ <el-option
+ v-for="item in paymentTypeListOptions"
+ :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> -->
@@ -100,10 +144,11 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="璐︽埛" prop="accountId">
+ <el-form-item label="璐︽埛" prop="bankAccountId">
<div class="common-select">
<el-select
- v-model="editConfig.infomation.accountId"
+ style="width: 100%"
+ v-model="editConfig.infomation.bankAccountId"
placeholder="璇烽�夋嫨"
class="common-select-sel"
size="mini"
@@ -119,6 +164,7 @@
<el-form-item label="鏄惁寮�绁�" prop="isInvoice">
<div class="common-select">
<el-select
+ style="width: 100%"
v-model="editConfig.infomation.isInvoice"
placeholder="璇烽�夋嫨"
class="common-select-sel"
@@ -137,8 +183,9 @@
<div class="basic-info-view">
<el-row>
<el-col :span="24">
- <el-form-item label="閫�娆惧師鍥�" prop="reason">
+ <el-form-item label="閫�娆惧師鍥�" prop="reason" label-width="15%">
<el-input
+ style="width: 100%"
type="textarea"
:autosize="{ minRows: 2 }"
v-model="editConfig.infomation.reason"
@@ -179,20 +226,23 @@
浜у搧绠＄悊
<div style="margin-left: 400px">
甯佺
- <el-select
- v-model="editConfig.infomation.currency"
- placeholder="璇烽�夋嫨"
- size="mini"
- style="width: 63%"
- disabled
- >
+ <el-select v-model="editConfig.infomation.currency" placeholder="璇烽�夋嫨" size="mini" style="width: 63%">
<el-option v-for="item in currencyOptions" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</div>
</div>
<div class="product-view">
- <CommonFormTableView :show-summary="showSummary" :product-table-list="productTableList" />
+ <CommonFormTableView
+ :show-summary="showSummary"
+ :detail-enter="detailEnter"
+ :product-table-list="productTableList"
+ @inputContent="inputContent"
+ @addProductClick="addProductClick"
+ @emptyProductClick="emptyProductClick"
+ @recalculateProductClick="recalculateProductClick"
+ @clearupProduct="clearupProduct"
+ />
</div>
<!-- 閫夋嫨瀹℃壒娴佺▼ -->
<!-- <div v-if="editConfig.title === '鏂板缓'" class="basic-info-title">閫夋嫨瀹℃壒娴佺▼</div>
@@ -246,6 +296,12 @@
:edit-common-config="editSelectClientConfig"
@selClient="selClient"
/>
+ <!-- 閫夋嫨閿�鍞��璐у崟 -->
+ <SelectCommonDialog
+ v-if="editSelCommonConfig.editVisible"
+ :edit-common-config="editSelCommonConfig"
+ @selClient="selClient"
+ />
</el-dialog>
</div>
</template>
@@ -255,8 +311,15 @@
import { getAllData } from "@/api/client/client"
import { getAddSalesRefund, getUpdateSalesRefund } from "@/api/sales/refundForm"
import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
+import SelectCommonDialog from "@/views/other/commonDialog/SelectCommonDialog"
+import { getPaymentTypeList } from "@/api/common/payment"
+import codeMixin from "@/views/client/followupRecords/mixin/codeMixin"
+import { getSalesReturnList } from "@/api/sales/salesReturn"
+import { mapActions } from "vuex"
+
export default {
name: "AddRefundFormDialog",
+ mixins: [codeMixin],
props: {
editCommonConfig: {
type: Object,
@@ -269,89 +332,137 @@
}
}
},
- components: { CommonFormTableView, SelectClientDialog },
+ components: { CommonFormTableView, SelectClientDialog, SelectCommonDialog },
computed: {
clientList() {
return this.$store.state.getClientName.clientList
+ },
+ salesReturnList() {
+ return this.$store.state.getClientName.salesReturnList
}
},
data() {
return {
- dialogWidth: "80%",
+ dialogWidth: "50%",
editConfig: this.editCommonConfig,
rules: {
- clientId: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- number: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- refundDate: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
- memberId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
- account: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }]
+ client_name: [{ required: true, message: "璇烽�夋嫨瀹㈡埛鍚嶇О", trigger: "change" }],
+ number: [{ required: true, message: "璇疯緭鍏ラ��娆惧崟缂栧彿", trigger: "blur" }],
+ refundDate: [{ required: true, message: "璇烽�夋嫨閫�娆炬棩鏈�", trigger: "change" }],
+ memberId: [{ required: true, message: "璇烽�夋嫨閿�鍞礋璐ｄ汉", trigger: "change" }],
+ sale_return_nunber: [{ required: true, message: "璇烽�夋嫨閿�鍞��璐у崟", trigger: "change" }]
},
memberOptions: [],
// selSourceOrderOptions: [{ value: "1", label: "閿�鍞��璐у崟" }], // 閫夋嫨婧愬崟
- refundMethodOptions: [], // 浠樻鏂瑰紡
+ paymentTypeListOptions: [], // 浠樻鏂瑰紡
accountOptions: [], // 璐︽埛
isInvoiceOptions: ["鏄�", "鍚�"], // 鏄惁寮�绁�
- currencyOptions: [], // 甯佺
+ currencyOptions: [{ id: 1, name: "浜烘皯甯�" }], // 甯佺
approvalWorkflowOptions: [], // 瀹℃壒娴佺▼
productTableList: {},
showSummary: {
show: true,
total: true,
- sumProp: ["other1", "other2", "other3", "other4"],
- mergeNumber: 5
+ sumProp: ["Amount", "total"],
+ mergeNumber: 2
},
editSelectClientConfig: {
editVisible: false,
title: "",
infomation: {}
},
- clientId: this.editCommonConfig.infomation.client_id
+ editSelCommonConfig: {
+ editVisible: false,
+ title: "",
+ infomation: {},
+ clientId: ""
+ },
+ clientId: this.editCommonConfig.infomation.client_id,
+ sourceId: this.editCommonConfig.infomation.sourceId,
+ productId: 1,
+ isNoProduct: true,
+ detailEnter: true
}
},
created() {
this.$store.dispatch("geClient")
+ this.$store.dispatch("geReturnList")
this.setTableForm()
this.getCommonData()
+ this.formInfo()
+ },
+ watch: {
+ "editClientManageConfig.visible"(val) {
+ if (val) {
+ this.formInfo()
+ }
+ },
+ "editClientManageConfig.infomation.codeStandID"() {
+ this.formInfo()
+ }
},
methods: {
+ ...mapActions(["getReturnListFliter"]),
+ formInfo() {
+ this.objCode.type = "閿�鍞��娆剧紪鐮�"
+ this.objCode.codeStandID = ""
+ if (this.editConfig.infomation.codeStandID) {
+ this.objCode.codeStandID = this.editConfig.infomation.codeStandID
+ }
+ this.getRCodeStandardList()
+ },
getCommonData() {
- getAllData()
- .then((res) => {
- this.memberOptions = res.data.member
- this.refundMethodOptions = res.data.refundMethod
- this.accountOptions = res.data.accountId
- // this.isInvoiceOptions = res.data.isInvoice
- this.currencyOptions = res.data.currency
- })
- .catch((err) => {
- console.log(err)
- })
+ getAllData().then((res) => {
+ this.memberOptions = res.data.member
+ this.accountOptions = res.data.accountId
+ })
+ this.getPaymentTypeList()
+ },
+ async getPaymentTypeList() {
+ await getPaymentTypeList().then((res) => {
+ if (res.data.code === 200) {
+ this.paymentTypeListOptions = res.data.data.data
+ }
+ })
},
// 淇濆瓨
saveClick(formName) {
this.$refs[formName].validate((valid) => {
+ this.validateFormNumber()
if (valid) {
console.log(this.editConfig.infomation)
- const params = this.saveParams()
- console.log(params)
- if (this.editConfig.title === "鏂板缓") {
- getAddSalesRefund(params).then((res) => {
- console.log(res)
- this.editConfig.visible = false
- if (res.code === 200) {
- this.$message.success("娣诲姞鎴愬姛")
- this.$parent.getData()
- }
- })
+ 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 {
- getUpdateSalesRefund(params).then((res) => {
- console.log(res)
- this.editConfig.visible = false
- if (res.code === 200) {
- this.$message.success("缂栬緫鎴愬姛")
- this.$parent.getData()
- }
- })
+ const params = this.saveParams()
+ console.log(params)
+ if (this.editConfig.title === "鏂板缓") {
+ getAddSalesRefund(params).then((res) => {
+ console.log(res)
+ this.editConfig.visible = false
+ if (res.code === 200) {
+ this.$message.success("娣诲姞鎴愬姛")
+ this.$parent.getData()
+ }
+ })
+ } else {
+ getUpdateSalesRefund(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")
@@ -364,15 +475,18 @@
let params = {
id: this.editConfig.title === "鏂板缓" ? 0 : data.id,
salesRefund: {
- accountId: data.accountId || 0,
+ bankAccountId: data.bankAccountId || 0,
clientId: this.clientId || 0,
isInvoice: data.isInvoice || "",
memberId: data.memberId || 0,
number: data.number || "",
- products: data.products || [],
+ paymentTypeId: data.paymentTypeId || 0,
+ products: this.tableData,
reason: data.reason || "",
refundDate: data.refundDate || "",
- refundMethod: data.refundMethod || ""
+ sourceId: this.sourceId || 0,
+ sourceType: 1,
+ codeRule: this.codeRule
}
}
return params
@@ -381,67 +495,155 @@
this.editConfig.visible = false
},
// 閫夋嫨瀹㈡埛鐩稿叧鏂规硶
- querySearchAsync(queryString, cb) {
- var restaurants = this.clientList
- var results = queryString ? restaurants.filter(this.createStateFilter(queryString)) : restaurants
+ querySearchAsync(queryString, cb, value) {
+ var restaurants = []
+ if (value === "client") {
+ restaurants = this.clientList
+ } else if (value === "salesReturn") {
+ restaurants = this.salesReturnList
+ }
+ var results = queryString ? restaurants.filter(this.createStateFilter(queryString, value)) : restaurants
cb(results)
},
- createStateFilter(queryString) {
+ createStateFilter(queryString, value) {
return (state) => {
- return state.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0
+ if (value === "salesReturn") {
+ return state.number.toLowerCase().indexOf(queryString.toLowerCase()) === 0
+ } else if (value === "productName") {
+ return state.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0
+ }
}
},
- handleSelectClient(item) {
- this.clientId = item.id
+ async handleSelectClient(value, item) {
+ if (value === "client") {
+ this.clientId = item.id
+ this.editSelCommonConfig.clientId = item.id
+ console.log("瀹㈡埛鍚嶇О", this.clientId, value, item)
+ await getSalesReturnList({
+ clientId: this.clientId
+ }).then((res) => {
+ this.getReturnListFliter(res.data.list)
+ })
+ } else if (value === "salesReturn") {
+ console.log(item)
+ this.editConfig.infomation.sale_return_nunber = item.number
+ this.sourceId = item.id
+ this.tableData = item.products
+ this.productTableList.tableData = item.products
+ }
},
- selClientClick() {
- this.editSelectClientConfig.editVisible = true
+ selClientClick(value) {
+ if (value === "client") {
+ this.editSelectClientConfig.editVisible = true
+ } else if (value === "salesReturn") {
+ this.editSelCommonConfig.title = "閿�鍞��璐у崟"
+ this.editSelCommonConfig.editVisible = true
+ }
},
- selClient(row) {
- console.log(row)
- this.editConfig.infomation.client_name = row.name
- this.clientId = row.id
+ selClient(row, value) {
+ if (value === "client") {
+ this.editConfig.infomation.client_name = row.name
+ this.clientId = row.id
+ } else if (value === "salesReturn") {
+ this.editConfig.infomation.sale_return_nunber = row.number
+ this.sourceId = row.id
+ this.tableData = row.products
+ this.productTableList.tableData = row.products
+ }
},
// 娓呴櫎宸查�夋嫨鐢ㄦ埛
- clearupClient() {
- this.editConfig.infomation.client_name = ""
- this.clientId = 0
+ clearupClient(value) {
+ if (value === "client") {
+ this.editConfig.infomation.client_name = ""
+ this.clientId = 0
+ } else if (value === "salesReturn") {
+ this.editConfig.infomation.sale_return_nunber = ""
+ this.sourceId = 0
+ }
},
// 娣诲姞闄勪欢
addAnnexClick() {},
// 璁剧疆鍏佽涓婁紶鏂囦欢鏍煎紡
setFormatClick() {},
setTableForm() {
- this.productTableList = {
- tableData: [
+ if (this.editConfig.title === "鏂板缓" || this.editConfig.infomation.products.length === 0) {
+ this.tableData = [
{
- id: "1",
- productName: "涓婃捣鏈夐檺鍏徃",
- other0: "ZDYBD03-1",
- other1: "12",
- other2: "5.00",
- other4: "3.00",
- other3: "2.00"
+ productId: this.productId,
+ id: 0,
+ amount: 0,
+ desc: "",
+ name: "",
+ number: "",
+ price: 0,
+ total: 0
}
- ],
+ ]
+ } else {
+ this.tableData = this.editConfig.infomation.products
+ this.tableData.map((item, index) => {
+ item.productId = index + 1
+ })
+ }
+ this.productTableList = {
+ tableData: this.tableData,
+ isReturn: true,
tableColumn: [
- { label: "#", prop: "id", width: 40 },
- { label: "浜у搧鍚嶇О", prop: "productName", input: true, isRequird: true },
- { label: "浜у搧缂栧彿", prop: "other0" },
- { label: "婧愬崟绫诲瀷", prop: "other5" },
- { label: "婧愬崟", prop: "other6" },
- { label: "鏁伴噺", prop: "other1", input: true, isRequird: true },
- { label: "鍚◣鍗曚环", prop: "other9", input: true },
- { label: "涓嶅惈绋庡崟浠�", prop: "other7", input: true },
- { label: "鎶樻墸鐜�(%)", prop: "other6", input: true },
- { label: "鎶樻墸棰�", prop: "other2" },
- { label: "绋�(閿�鍞�)", prop: "other7", input: true },
- { label: "瀹為檯鍚◣鍗曚环", prop: "other3" },
- { label: "涓嶅惈绋庨噾棰�", prop: "other4" },
- { label: "浠风◣鍚堣", prop: "other3", input: true },
- { label: "鎻忚堪", prop: "other8" }
+ // { label: "#", prop: "productId", width: 40 },
+ { label: "浜у搧鍚嶇О", prop: "name", productName: true, isRequird: true },
+ { label: "浜у搧缂栧彿", prop: "number" },
+ { label: "鏁伴噺", prop: "amount", inputNumber: true, isRequird: true },
+ { label: "閿�鍞崟浠�", prop: "price", inputFloat: true },
+ { label: "浠风◣鍚堣", prop: "total", inputFloat: true }
]
}
+ },
+ // 浜у搧鍒楄〃杈撳叆
+ inputContent(val, prop, row) {
+ this.productId = row.productId
+ this.tableData.map((item) => {
+ if (item.productId === row.productId) {
+ item[prop] = val
+ }
+ })
+ },
+ // 浜у搧鏂板
+ addProductClick() {
+ this.productId++
+ this.tableData.push({
+ productId: this.productId,
+ id: 0,
+ amount: 0,
+ desc: "",
+ name: "",
+ number: "",
+ price: 0,
+ total: 0
+ })
+ this.showSummary.show = true
+ },
+ // 浜у搧娓呯┖
+ emptyProductClick() {
+ this.productId = 1
+ this.tableData = [
+ {
+ productId: this.productId,
+ id: 0,
+ amount: 0,
+ desc: "",
+ name: "",
+ number: "",
+ price: 0,
+ total: 0
+ }
+ ]
+ this.productTableList.tableData = this.tableData
+ },
+ // 浜у搧閲嶇畻
+ recalculateProductClick() {},
+ clearupProduct(data) {
+ this.tableData = data
+ this.productTableList.tableData = this.tableData
}
}
}
--
Gitblit v1.8.0