From 94ad4de767b25b0e6b2486287da90a7cb78ad3d3 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期四, 12 十月 2023 18:48:13 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/add-token
---
src/views/sales/refundForm/AddRefundFormDialog.vue | 86 +++++++++++++++++++++++++++++++++++-------
1 files changed, 71 insertions(+), 15 deletions(-)
diff --git a/src/views/sales/refundForm/AddRefundFormDialog.vue b/src/views/sales/refundForm/AddRefundFormDialog.vue
index aecb816..91c3ed7 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,6 +27,7 @@
<el-form-item label="瀹㈡埛鍚嶇О" prop="client_name">
<div class="custom-name">
<el-autocomplete
+ style="width:100%"
v-model="editConfig.infomation.client_name"
:fetch-suggestions="
(queryString, callback) => {
@@ -39,21 +40,42 @@
<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('client')">
- <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>
+ <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%"
v-model="editConfig.infomation.sale_return_nunber"
:fetch-suggestions="
(queryString, callback) => {
@@ -66,8 +88,14 @@
<div class="common-select-btn" @click="selClientClick('salesReturn')">
<i class="el-icon-circle-plus-outline"></i>
</div>
- <div class="common-select-btn" @click="clearupClient('salesReturn')">
- <i class="el-icon-edit-outline"></i>
+ <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>
@@ -75,10 +103,10 @@
<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>
@@ -88,6 +116,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"
@@ -100,6 +129,7 @@
<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"
@@ -121,6 +151,7 @@
<el-form-item label="璐︽埛" prop="bankAccountId">
<div class="common-select">
<el-select
+ style="width:100%"
v-model="editConfig.infomation.bankAccountId"
placeholder="璇烽�夋嫨"
class="common-select-sel"
@@ -137,6 +168,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"
@@ -155,8 +187,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"
@@ -284,8 +317,10 @@
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";
export default {
name: "AddRefundFormDialog",
+ mixins:[codeMixin],
props: {
editCommonConfig: {
type: Object,
@@ -309,14 +344,14 @@
},
data() {
return {
- dialogWidth: "80%",
+ dialogWidth: "50%",
editConfig: this.editCommonConfig,
rules: {
- 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" }]
+ 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: "閿�鍞��璐у崟" }], // 閫夋嫨婧愬崟
@@ -354,8 +389,27 @@
this.$store.dispatch("geReturnList")
this.setTableForm()
this.getCommonData()
+ this.formInfo();
+ },
+ watch:{
+ 'editClientManageConfig.visible'(val){
+ if(val){
+ this.formInfo()
+ }
+ },
+ '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;
+ }
+ this.getRCodeStandardList();
+ },
getCommonData() {
getAllData().then((res) => {
this.memberOptions = res.data.member
@@ -430,7 +484,9 @@
refundDate: data.refundDate || "",
sourceId: this.sourceId || 0,
sourceType: 1
- }
+ },
+ codeRule:this.codeRule,
+
}
return params
},
--
Gitblit v1.8.0