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/salesReturn/AddSalesReturnDialog.vue | 240 ++++++++++++++++++++++++++++++++++--------------------------
1 files changed, 136 insertions(+), 104 deletions(-)
diff --git a/src/views/sales/salesReturn/AddSalesReturnDialog.vue b/src/views/sales/salesReturn/AddSalesReturnDialog.vue
index cc96f64..fc4697f 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,31 +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="鍚堝悓璁㈠崟">
+ <el-form-item label="閿�鍞槑缁嗗崟" prop="salesDetailNumber">
<div class="custom-name">
<el-autocomplete
- style="width:100%"
+ style="width: 100%"
v-model="editConfig.infomation.salesDetailNumber"
:fetch-suggestions="
(queryString, callback) => {
@@ -88,7 +85,9 @@
<i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
</div>
<div
- v-if="editConfig.infomation.number && editConfig.infomation.number.length > 0"
+ v-if="
+ editConfig.infomation.salesDetailNumber && editConfig.infomation.salesDetailNumber.length > 0
+ "
class="common-select-btn"
@click="clearupClient('contract')"
>
@@ -125,7 +124,7 @@
value-format="yyyy-MM-dd"
type="date"
placeholder="閫夋嫨鏃ユ湡"
- style="width:100%"
+ style="width: 100%"
>
</el-date-picker>
</el-form-item>
@@ -133,14 +132,14 @@
</el-row>
</div>
<!-- 鍔ㄦ�佷俊鎭� -->
- <div class="basic-info-title">鍔ㄦ�佷俊鎭�</div>
- <div class="basic-info-view">
+ <!-- <div class="basic-info-title">鍔ㄦ�佷俊鎭�</div> -->
+ <!-- <div class="basic-info-view">
<el-row>
<el-col :span="12">
<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"
@@ -148,13 +147,14 @@
>
<el-option v-for="item in statusOptions" :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> -->
- </div>
+ </el-select> -->
+ <!-- <div class="common-select-btn"><i class="el-icon-setting"></i></div> -->
+ <!-- </div>
</el-form-item>
</el-col>
</el-row>
- </div>
+ </div> -->
+
<!-- 澶囨敞淇℃伅 -->
<div class="basic-info-title">澶囨敞淇℃伅</div>
<div class="basic-info-view">
@@ -162,7 +162,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"
@@ -211,6 +211,7 @@
</div>
<div class="product-view">
<CommonFormTableView
+ :detail-enter="true"
:show-summary="showSummary"
:product-table-list="productTableList"
@inputContent="inputContent"
@@ -232,7 +233,7 @@
:edit-common-config="editSelectClientConfig"
@selClient="selClient"
/>
- <!-- 閫夋嫨鍚堝悓璁㈠崟 -->
+ <!-- 閿�鍞槑缁嗗崟 -->
<SelectCommonDialog
v-if="editSelCommonConfig.editVisible"
:edit-common-config="editSelCommonConfig"
@@ -247,12 +248,15 @@
import { getAllData } from "@/api/client/client"
import { getAddSalesReturn, getUpdateSalesReturn } from "@/api/sales/salesReturn"
import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
-import { getProductList } from "@/api/common/other"
+// import { getProductList } from "@/api/common/other"
import SelectCommonDialog from "@/views/other/commonDialog/SelectCommonDialog"
-import codeMixin from "@/views/client/followupRecords/mixin/codeMixin";
+import codeMixin from "@/views/client/followupRecords/mixin/codeMixin"
+import { getSalesDetailsList } from "@/api/sales/salesDetails"
+import { mapActions } from "vuex"
+
export default {
name: "AddSalesReturnDialog",
- mixins:[codeMixin],
+ mixins: [codeMixin],
props: {
editCommonConfig: {
type: Object,
@@ -279,9 +283,10 @@
dialogWidth: "50%",
editConfig: this.editCommonConfig,
rules: {
- number: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- repository: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
- memberId: [{ required: true, message: "璇烽�夋嫨璐熻矗浜�", trigger: "change" }]
+ number: [{ required: true, message: "璇疯緭鍏ラ攢鍞��璐у崟鍙�", trigger: "blur" }],
+ repository: [{ required: true, message: "璇烽�夋嫨閫�鍏ヤ粨搴�", trigger: "change" }],
+ memberId: [{ required: true, message: "璇烽�夋嫨璐熻矗浜�", trigger: "change" }],
+ salesDetailNumber: [{ required: true, message: "璇烽�夋嫨閿�鍞槑缁嗗崟", trigger: "change" }]
},
memberOptions: [],
selSourceOrderOptions: [], // 閫夋嫨婧愬崟
@@ -302,8 +307,9 @@
},
editSelCommonConfig: {
editVisible: false,
- title: "",
- infomation: {}
+ title: "閿�鍞槑缁嗗崟",
+ infomation: {},
+ clientId: ""
},
productId: 1,
isNoProduct: true,
@@ -316,28 +322,32 @@
this.$store.dispatch("geSalesDetails")
this.setTableForm()
this.getCommonData()
- this.getProductList()
- this.formInfo();
+ // this.getProductList()
+ this.formInfo()
+ if (this.editConfig.title === "缂栬緫") {
+ this.productTableList.tableData = this.editConfig.infomation.products
+ }
},
- 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(["getSalesDetailsFliter"]),
+ formInfo() {
+ this.objCode.type = "閿�鍞��璐х紪鐮�"
+ this.objCode.codeStandID = ""
+ if (this.editConfig.infomation.codeStandID) {
+ this.objCode.codeStandID = this.editConfig.infomation.codeStandID
}
- this.getRCodeStandardList();
- },
+ this.getRCodeStandardList()
+ },
getCommonData() {
getAllData()
.then((res) => {
@@ -350,58 +360,59 @@
})
},
// 鑾峰彇浜у搧鍒楄〃
- async getProductList() {
- await getProductList({
- page: 0,
- pageSize: 0,
- productName: "",
- productNumber: ""
- }).then((res) => {
- console.log(res)
- })
- },
+ // async getProductList() {
+ // await getProductList({
+ // page: 1,
+ // pageSize: 15,
+ // productName: "",
+ // productNumber: ""
+ // }).then((res) => {
+ // console.log(res)
+ // })
+ // },
// 淇濆瓨
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++) {
- if (this.tableData[i].name.length === 0) {
- this.isNoProduct = true
- break
- } else {
- this.isNoProduct = false
- }
- }
- if (this.isNoProduct) {
- this.$message.error("浜у搧鍚嶇О涓嶈兘涓虹┖")
+ // 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 {
+ const params = this.saveParams()
+ console.log(params)
+ if (this.editConfig.title === "鏂板缓") {
+ getAddSalesReturn(params).then((res) => {
+ console.log(res)
+ this.editConfig.visible = false
+ if (res.code === 200) {
+ this.$message.success("娣诲姞鎴愬姛")
+ this.$parent.getData()
+ }
+ })
} else {
- const params = this.saveParams()
- console.log(params)
- if (this.editConfig.title === "鏂板缓") {
- getAddSalesReturn(params).then((res) => {
- console.log(res)
- this.editConfig.visible = false
- if (res.code === 200) {
- this.$message.success("娣诲姞鎴愬姛")
- this.$parent.getData()
- }
- })
- } else {
- getUpdateSalesReturn(params).then((res) => {
- console.log(res)
- this.editConfig.visible = false
- if (res.code === 200) {
- this.$message.success("缂栬緫鎴愬姛")
- this.$parent.getData()
- }
- })
- }
+ getUpdateSalesReturn(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")
- return false
}
+ // } else {
+ // console.log("error submit")
+ // return false
+ // }
})
},
saveParams() {
@@ -418,7 +429,8 @@
returnDate: data.returnDate || "",
salesReturnStatusId: data.salesReturnStatusId || 0,
sourceId: this.SalesDetailsId,
- sourceType: 1
+ sourceType: 1,
+ codeRule: this.codeRule
}
}
return params
@@ -446,10 +458,18 @@
}
}
},
- handleSelectClient(value, item) {
+ async handleSelectClient(value, item) {
if (value === "client") {
this.clientId = item.id
+ this.editSelCommonConfig.clientId = item.id
+ await getSalesDetailsList({
+ clientId: this.clientId
+ }).then((res) => {
+ this.getSalesDetailsFliter(res.data.list)
+ })
} else if (value === "contract") {
+ this.productTableList.tableData = item.products
+ this.tableData = item.products
this.SalesDetailsId = item.id
}
},
@@ -460,25 +480,37 @@
} else if (value === "contract") {
this.editSelCommonConfig.title = "閿�鍞槑缁嗗崟"
this.editSelCommonConfig.editVisible = true
+ this.editSelCommonConfig.client_name = this.editConfig.infomation.client_name
}
},
- selClient(row, value) {
+ async selClient(row, value) {
console.log(row, value)
if (value === "client") {
this.editConfig.infomation.client_name = row.name
this.clientId = row.id
+ this.editSelCommonConfig.clientId = row.id
+ await getSalesDetailsList({
+ clientId: row.id
+ }).then((res) => {
+ this.getSalesDetailsFliter(res.data.list)
+ })
} else if (value === "contract") {
this.editConfig.infomation.salesDetailNumber = row.number
this.SalesDetailsId = row.id
+ this.productTableList.tableData = row.products
+ this.tableData = row.products
}
},
// 娓呴櫎宸查�夋嫨鐢ㄦ埛
clearupClient(value) {
if (value === "client") {
- this.editConfig.infomation.client_name = ""
- this.clientId = 0
+ this.editConfig.infomation = {}
+ // this.editConfig.infomation.client_name = ""
+ // this.clientId = 0
} else if (value === "contract") {
this.editConfig.infomation.salesDetailNumber = ""
+ this.productTableList.tableData = []
+ this.tableData = []
this.SalesDetailsId = 0
}
},
--
Gitblit v1.8.0