From 51492045cda76a9b651990b075d69f5f3638f3b2 Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期五, 13 十月 2023 14:42:57 +0800
Subject: [PATCH] Merge branch 'dev' of ssh://192.168.5.5:29418/web/crm-web into dev
---
src/views/sales/salesReturn/AddSalesReturnDialog.vue | 56 +++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 45 insertions(+), 11 deletions(-)
diff --git a/src/views/sales/salesReturn/AddSalesReturnDialog.vue b/src/views/sales/salesReturn/AddSalesReturnDialog.vue
index a251198..0b271ca 100644
--- a/src/views/sales/salesReturn/AddSalesReturnDialog.vue
+++ b/src/views/sales/salesReturn/AddSalesReturnDialog.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,16 +66,12 @@
</div>
</el-form-item>
</el-col>
- <el-col :span="12">
- <el-form-item label="閿�鍞��璐у崟缂栧彿" prop="number">
- <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="鍚堝悓璁㈠崟">
<div class="custom-name">
<el-autocomplete
- style="width:100%"
+ style="width: 100%"
v-model="editConfig.infomation.salesDetailNumber"
:fetch-suggestions="
(queryString, callback) => {
@@ -110,7 +122,7 @@
value-format="yyyy-MM-dd"
type="date"
placeholder="閫夋嫨鏃ユ湡"
- style="width:100%"
+ style="width: 100%"
>
</el-date-picker>
</el-form-item>
@@ -125,7 +137,7 @@
<el-form-item label="鐘舵��" prop="salesReturnStatusId">
<div class="common-select">
<el-select
- style="width:100%"
+ style="width: 100%"
v-model="editConfig.infomation.salesReturnStatusId"
placeholder="璇烽�夋嫨"
class="common-select-sel"
@@ -147,7 +159,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"
@@ -234,8 +246,10 @@
import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
import { getProductList } from "@/api/common/other"
import SelectCommonDialog from "@/views/other/commonDialog/SelectCommonDialog"
+import codeMixin from "@/views/client/followupRecords/mixin/codeMixin"
export default {
name: "AddSalesReturnDialog",
+ mixins: [codeMixin],
props: {
editCommonConfig: {
type: Object,
@@ -300,8 +314,27 @@
this.setTableForm()
this.getCommonData()
this.getProductList()
+ 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) => {
@@ -383,7 +416,8 @@
salesReturnStatusId: data.salesReturnStatusId || 0,
sourceId: this.SalesDetailsId,
sourceType: 1
- }
+ },
+ codeRule: this.codeRule
}
return params
},
--
Gitblit v1.8.0