From d05d95424986dc6e8defefb24fab6dc62e37ee08 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期六, 21 十月 2023 16:23:05 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/adjust-style
---
src/views/sales/refundForm/AddRefundFormDialog.vue | 122 +++++++++++++++++++++++-----------------
1 files changed, 71 insertions(+), 51 deletions(-)
diff --git a/src/views/sales/refundForm/AddRefundFormDialog.vue b/src/views/sales/refundForm/AddRefundFormDialog.vue
index 81745ae..5736232 100644
--- a/src/views/sales/refundForm/AddRefundFormDialog.vue
+++ b/src/views/sales/refundForm/AddRefundFormDialog.vue
@@ -24,10 +24,26 @@
<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%"
+ style="width: 100%"
v-model="editConfig.infomation.client_name"
:fetch-suggestions="
(queryString, callback) => {
@@ -50,32 +66,12 @@
</div>
</el-form-item>
</el-col>
- <el-col :span="12">
- <el-form-item label="閫�娆惧崟缂栧彿" prop="number">
- <WordInput
- v-if="codenumer && (explain != '' || isIdDisabled)&&method == 0"
- :codenumer="codenumer"
- :sum="sum"
- :disabled="editConfig.infomation.id || 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="sale_return_nunber">
<div class="custom-name">
<el-autocomplete
-
- style="width:100%"
+ style="width: 100%"
v-model="editConfig.infomation.sale_return_nunber"
:fetch-suggestions="
(queryString, callback) => {
@@ -103,7 +99,7 @@
<el-col :span="12">
<el-form-item label="閿�鍞礋璐ｄ汉" prop="memberId">
<el-select
- style="width:100%"
+ style="width: 100%"
v-model="editConfig.infomation.memberId"
placeholder="璇烽�夋嫨"
size="mini"
@@ -116,7 +112,7 @@
<el-col :span="12">
<el-form-item label="閫�娆炬棩鏈�" prop="refundDate">
<el-date-picker
- style="width:100%"
+ style="width: 100%"
v-model="editConfig.infomation.refundDate"
value-format="yyyy-MM-dd"
type="date"
@@ -126,10 +122,10 @@
</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%"
+ style="width: 100%"
v-model="editConfig.infomation.paymentTypeId"
placeholder="璇烽�夋嫨"
class="common-select-sel"
@@ -151,7 +147,7 @@
<el-form-item label="璐︽埛" prop="bankAccountId">
<div class="common-select">
<el-select
- style="width:100%"
+ style="width: 100%"
v-model="editConfig.infomation.bankAccountId"
placeholder="璇烽�夋嫨"
class="common-select-sel"
@@ -168,7 +164,7 @@
<el-form-item label="鏄惁寮�绁�" prop="isInvoice">
<div class="common-select">
<el-select
- style="width:100%"
+ style="width: 100%"
v-model="editConfig.infomation.isInvoice"
placeholder="璇烽�夋嫨"
class="common-select-sel"
@@ -189,7 +185,7 @@
<el-col :span="24">
<el-form-item label="閫�娆惧師鍥�" prop="reason" label-width="15%">
<el-input
- style="width:100%"
+ style="width: 100%"
type="textarea"
:autosize="{ minRows: 2 }"
v-model="editConfig.infomation.reason"
@@ -316,11 +312,14 @@
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 {getBankAccountList, 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],
+ mixins: [codeMixin],
props: {
editCommonConfig: {
type: Object,
@@ -375,7 +374,8 @@
editSelCommonConfig: {
editVisible: false,
title: "",
- infomation: {}
+ infomation: {},
+ clientId: ""
},
clientId: this.editCommonConfig.infomation.client_id,
sourceId: this.editCommonConfig.infomation.sourceId,
@@ -389,44 +389,56 @@
this.$store.dispatch("geReturnList")
this.setTableForm()
this.getCommonData()
- this.formInfo();
+ this.formInfo()
},
- watch:{
- 'editClientManageConfig.visible'(val){
- if(val){
+ watch: {
+ "editClientManageConfig.visible"(val) {
+ if (val) {
this.formInfo()
}
},
- 'editClientManageConfig.infomation.codeStandID'(){
+ "editClientManageConfig.infomation.codeStandID"() {
this.formInfo()
}
},
methods: {
- formInfo(){
- this.objCode.type='閿�鍞��娆剧紪鐮�'
- this.objCode.codeStandID = ''
- if(this.editConfig.infomation.codeStandID){
- this.objCode.codeStandID = this.editConfig.infomation.codeStandID;
+ ...mapActions(["getReturnListFliter"]),
+ formInfo() {
+ this.objCode.type = "閿�鍞��娆剧紪鐮�"
+ this.objCode.codeStandID = ""
+ if (this.editConfig.infomation.codeStandID) {
+ this.objCode.codeStandID = this.editConfig.infomation.codeStandID
}
- this.getRCodeStandardList();
- },
+ this.getRCodeStandardList()
+ this.getBankAccountList()
+ },
getCommonData() {
getAllData().then((res) => {
this.memberOptions = res.data.member
- this.accountOptions = res.data.accountId
+ // this.accountOptions = res.data.accountId
})
this.getPaymentTypeList()
},
async getPaymentTypeList() {
await getPaymentTypeList().then((res) => {
- if (res.data.code === 200) {
- this.paymentTypeListOptions = res.data.data.data
+ if (res.code === 200) {
+ this.paymentTypeListOptions = res.data.data ?? []
+ }
+ })
+ },
+ async getBankAccountList() {
+ await getBankAccountList().then((res) => {
+ console.log("璐︽埛")
+ console.log('璐︽埛',res)
+ if (res.code === 200) {
+ this.accountOptions = res.data.data
}
})
},
// 淇濆瓨
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++) {
@@ -483,7 +495,8 @@
reason: data.reason || "",
refundDate: data.refundDate || "",
sourceId: this.sourceId || 0,
- sourceType: 1
+ sourceType: 1,
+ codeRule: this.codeRule
}
}
return params
@@ -511,9 +524,16 @@
}
}
},
- handleSelectClient(value, item) {
+ 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
--
Gitblit v1.8.0