From 5d0120d2e8a6e5cd2e1e95d4c5ffeecf5fc1c4a6 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期二, 10 十月 2023 15:35:58 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/adjust-style
---
src/views/sales/refundForm/AddRefundFormDialog.vue | 234 ++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 161 insertions(+), 73 deletions(-)
diff --git a/src/views/sales/refundForm/AddRefundFormDialog.vue b/src/views/sales/refundForm/AddRefundFormDialog.vue
index f00aa48..12a58c4 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"
>
@@ -27,45 +27,72 @@
<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="number">
- <el-input v-model="editConfig.infomation.number"></el-input>
+ <el-input v-model="editConfig.infomation.number"
+ style="width:100%"></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-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')"
>
- </el-option>
- </el-select>
+ <i class="el-icon-remove-outline"></i>
+ </div>
+ </div>
</el-form-item>
- </el-col> -->
+ </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 +102,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"
@@ -87,12 +115,18 @@
<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 +134,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 +154,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 +173,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,13 +216,7 @@
浜у搧绠＄悊
<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>
@@ -194,6 +225,7 @@
<div class="product-view">
<CommonFormTableView
:show-summary="showSummary"
+ :detail-enter="detailEnter"
:product-table-list="productTableList"
@inputContent="inputContent"
@addProductClick="addProductClick"
@@ -254,6 +286,12 @@
:edit-common-config="editSelectClientConfig"
@selClient="selClient"
/>
+ <!-- 閫夋嫨閿�鍞��璐у崟 -->
+ <SelectCommonDialog
+ v-if="editSelCommonConfig.editVisible"
+ :edit-common-config="editSelCommonConfig"
+ @selClient="selClient"
+ />
</el-dialog>
</div>
</template>
@@ -263,6 +301,8 @@
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"
export default {
name: "AddRefundFormDialog",
props: {
@@ -277,26 +317,29 @@
}
}
},
- 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: [{ id: 1, name: "浜烘皯甯�" }], // 甯佺
@@ -305,37 +348,46 @@
showSummary: {
show: true,
total: true,
- sumProp: ["other1", "other2", "other3", "other4"],
- mergeNumber: 5
+ sumProp: ["Amount", "total"],
+ mergeNumber: 2
},
editSelectClientConfig: {
editVisible: false,
title: "",
infomation: {}
},
+ editSelCommonConfig: {
+ editVisible: false,
+ title: "",
+ infomation: {}
+ },
clientId: this.editCommonConfig.infomation.client_id,
+ sourceId: this.editCommonConfig.infomation.sourceId,
productId: 1,
- isNoProduct: true
+ isNoProduct: true,
+ detailEnter: true
}
},
created() {
this.$store.dispatch("geClient")
+ this.$store.dispatch("geReturnList")
this.setTableForm()
this.getCommonData()
},
methods: {
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) {
@@ -386,15 +438,17 @@
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
}
}
return params
@@ -403,38 +457,71 @@
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
+ handleSelectClient(value, item) {
+ if (value === "client") {
+ this.clientId = item.id
+ } 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() {
- if (this.editConfig.title === "鏂板缓") {
+ if (this.editConfig.title === "鏂板缓" || this.editConfig.infomation.products.length === 0) {
this.tableData = [
{
productId: this.productId,
@@ -455,8 +542,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 },
--
Gitblit v1.8.0