From d4f4c52402b91cb8e17c1845da71c5e39662fde0 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期三, 03 一月 2024 15:28:06 +0800
Subject: [PATCH] 销售报价单列表页增加统计内容及接口联调、添加报价单天天客户名称及对应限制功能
---
src/views/sales/salesReturn/AddSalesReturnDialog.vue | 423 +++++++++++++++++++++++++++++++++++-----------------
1 files changed, 282 insertions(+), 141 deletions(-)
diff --git a/src/views/sales/salesReturn/AddSalesReturnDialog.vue b/src/views/sales/salesReturn/AddSalesReturnDialog.vue
index fc3c689..784e0f2 100644
--- a/src/views/sales/salesReturn/AddSalesReturnDialog.vue
+++ b/src/views/sales/salesReturn/AddSalesReturnDialog.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"
>
@@ -24,50 +24,95 @@
<div class="basic-info-view">
<el-row>
<el-col :span="12">
+ <el-form-item label="閿�鍞��璐у崟缂栧彿" prop="number">
+ <el-input
+ v-if="
+ editConfig.title == '缂栬緫' ||
+ (editConfig.title == '鏂板缓' && codenumer && (explain != '' || isIdDisabled))
+ "
+ :disabled="editConfig.title == '缂栬緫'"
+ v-model="editConfig.infomation.number"
+ placeholder="璇疯緭鍏ョ紪鐮�"
+ >
+ </el-input>
+ <span v-else-if="editConfig.title == '鏂板缓'" style="color: #f56c6c"
+ >璇蜂紭鍏堥厤缃紪鐮佽鑼� <el-button type="text" @click="numberClick"> 閰嶇疆瑙勮寖 </el-button></span
+ >
+ <!-- <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%"
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="salesDetailNumber">
+ <div class="custom-name">
+ <el-autocomplete
+ style="width: 100%"
+ v-model="editConfig.infomation.salesDetailNumber"
+ :fetch-suggestions="
+ (queryString, callback) => {
+ querySearchAsync(queryString, callback, 'contract')
+ }
+ "
+ value-key="number"
+ @select="handleSelectClient('contract', $event)"
+ ></el-autocomplete>
+ <div class="common-select-btn" @click="selClientClick('contract')">
+ <i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
+ </div>
+ <div
+ v-if="
+ editConfig.infomation.salesDetailNumber && editConfig.infomation.salesDetailNumber.length > 0
+ "
+ class="common-select-btn"
+ @click="clearupClient('contract')"
+ >
+ <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-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-option>
- </el-select>
- </el-form-item>
- </el-col> -->
- <el-col :span="12">
<el-form-item label="閫�鍏ヤ粨搴�" prop="repository">
- <el-select v-model="editConfig.infomation.repository" size="mini" style="width: 63%">
- <el-option
- v-for="item in repositoryOptions"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
+ <el-select v-model="editConfig.infomation.repository" size="mini" style="width: 100%">
+ <el-option v-for="item in repositoryOptions" :key="item.id" :label="item.name" :value="item.name">
</el-option>
</el-select>
</el-form-item>
@@ -78,7 +123,7 @@
v-model="editConfig.infomation.memberId"
placeholder="璇烽�夋嫨"
size="mini"
- style="width: 63%"
+ style="width: 100%"
>
<el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id">
</el-option>
@@ -92,6 +137,7 @@
value-format="yyyy-MM-dd"
type="date"
placeholder="閫夋嫨鏃ユ湡"
+ style="width: 100%"
>
</el-date-picker>
</el-form-item>
@@ -99,13 +145,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%"
v-model="editConfig.infomation.salesReturnStatusId"
placeholder="璇烽�夋嫨"
class="common-select-sel"
@@ -113,20 +160,22 @@
>
<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">
<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"
@@ -175,13 +224,13 @@
</div>
<div class="product-view">
<CommonFormTableView
+ ref="commonFormTableView"
+ :detail-enter="true"
+ :select-box="true"
:show-summary="showSummary"
:product-table-list="productTableList"
@inputContent="inputContent"
- @addProductClick="addProductClick"
- @emptyProductClick="emptyProductClick"
- @recalculateProductClick="recalculateProductClick"
- @clearupProduct="clearupProduct"
+ @getSelectArray="getSelectArray"
/>
</div>
</div>
@@ -196,6 +245,12 @@
:edit-common-config="editSelectClientConfig"
@selClient="selClient"
/>
+ <!-- 閿�鍞槑缁嗗崟 -->
+ <SelectCommonDialog
+ v-if="editSelCommonConfig.editVisible"
+ :edit-common-config="editSelCommonConfig"
+ @selClient="selClient"
+ />
</el-dialog>
</div>
</template>
@@ -205,9 +260,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 "@/components/makepager/mixin/codeMixin"
+import { getSalesDetailsList } from "@/api/sales/salesDetails"
+// import { mapActions } from "vuex"
+
export default {
name: "AddSalesReturnDialog",
+ mixins: [codeMixin],
props: {
editCommonConfig: {
type: Object,
@@ -220,20 +281,24 @@
}
}
},
- components: { CommonFormTableView, SelectClientDialog },
+ components: { CommonFormTableView, SelectClientDialog, SelectCommonDialog },
computed: {
clientList() {
return this.$store.state.getClientName.clientList
}
+ // salesDetailsList() {
+ // return this.$store.state.getClientName.salesDetailsList
+ // }
},
data() {
return {
- dialogWidth: "80%",
+ 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, validator: this.validateCheckCode, trigger: ["blur", "change"] }],
+ repository: [{ required: true, message: "璇烽�夋嫨閫�鍏ヤ粨搴�", trigger: "change" }],
+ memberId: [{ required: true, validator: this.validateMemberId, trigger: "change" }],
+ salesDetailNumber: [{ required: true, message: "璇烽�夋嫨閿�鍞槑缁嗗崟", trigger: "change" }]
},
memberOptions: [],
selSourceOrderOptions: [], // 閫夋嫨婧愬崟
@@ -252,21 +317,61 @@
title: "",
infomation: {}
},
+ editSelCommonConfig: {
+ editVisible: false,
+ title: "閿�鍞槑缁嗗崟",
+ infomation: {},
+ clientId: ""
+ },
productId: 1,
- isNoProduct: true
+ isNoProduct: true,
+ clientId: this.editCommonConfig.infomation.clientId,
+ SalesDetailsId: this.editCommonConfig.infomation.SalesDetailsId,
+ tableData: [],
+ selProductData: [],
+ salesDetailsList: []
}
},
created() {
this.$store.dispatch("geClient")
+ // this.$store.dispatch("geSalesDetails")
this.setTableForm()
this.getCommonData()
- this.getProductList()
+ // this.getProductList()
+ this.formInfo()
+ if (this.editConfig.title === "缂栬緫") {
+ this.productTableList.tableData = this.editConfig.infomation.products
+ }
+ },
+ watch: {
+ "editClientManageConfig.visible"(val) {
+ if (val) {
+ this.formInfo()
+ }
+ }
},
methods: {
+ // ...mapActions(["getSalesDetailsFliter"]),
+ 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
+ if (this.editConfig.title === "鏂板缓") {
+ let username = document.cookie.replace(/(?:(?:^|.*;\s*)username\s*=\s*([^;]*).*$)|^.*$/, "$1")
+ this.memberOptions.map((item) => {
+ if (item.username == username) {
+ this.$set(this.editConfig.infomation, "memberId", item.id)
+ }
+ })
+ }
this.repositoryOptions = res.data.repository
this.statusOptions = res.data.salesReturnStatus
})
@@ -275,23 +380,23 @@
})
},
// 鑾峰彇浜у搧鍒楄〃
- 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) => {
if (valid) {
console.log(this.editConfig.infomation)
- for (let i = 0; i < this.tableData.length; i++) {
- if (this.tableData[i].name.length === 0) {
+ for (let i = 0; i < this.selProductData.length; i++) {
+ if (this.selProductData[i].name.length === 0) {
this.isNoProduct = true
break
} else {
@@ -299,7 +404,7 @@
}
}
if (this.isNoProduct) {
- this.$message.error("浜у搧鍚嶇О涓嶈兘涓虹┖")
+ this.$message.error("璇烽�夋嫨浜у搧")
} else {
const params = this.saveParams()
console.log(params)
@@ -318,10 +423,6 @@
this.editConfig.visible = false
if (res.code === 200) {
this.$message.success("缂栬緫鎴愬姛")
- this.$message({
- message: "缂栬緫鎴愬姛",
- type: "success"
- })
this.$parent.getData()
}
})
@@ -338,14 +439,16 @@
let params = {
id: this.editConfig.title === "鏂板缓" ? 0 : data.id,
salesReturn: {
- clientId: data.clientId || 0,
+ clientId: this.clientId || 0,
memberId: data.memberId || 0,
number: data.number || "",
- products: this.tableData,
+ products: this.selProductData,
reason: data.reason || "",
repository: data.repository || "",
returnDate: data.returnDate || "",
- status: data.status || 0
+ salesReturnStatusId: data.salesReturnStatusId || 0,
+ sourceId: this.SalesDetailsId,
+ sourceType: 1
}
}
return params
@@ -353,57 +456,120 @@
handleClose() {
this.editConfig.visible = false
},
- // 閫夋嫨瀹㈡埛鐩稿叧鏂规硶
- querySearchAsync(queryString, cb) {
- var restaurants = this.clientList
- var results = queryString ? restaurants.filter(this.createStateFilter(queryString)) : restaurants
+ // 鑾峰彇閿�鍞槑缁�
+ async getSalesDetailsList(id, value) {
+ await getSalesDetailsList({
+ clientId: id
+ }).then((res) => {
+ if (res.code == 200) {
+ this.salesDetailsList = res.data.list
+ if (value === "鍏ㄩ儴浜у搧") {
+ this.salesDetailsList.map((item) => {
+ if (item.id === this.editConfig.infomation.sourceId) {
+ this.tableData = item.products
+ this.tableData.map((item, index) => {
+ item.productId = index + 1
+ this.selProductData.forEach((key) => {
+ if (item.number === key.number) {
+ item.amount = key.amount
+ item.id = key.id
+ }
+ })
+ })
+ this.productTableList.tableData = this.tableData
+ this.selProductData.forEach((key) => {
+ this.tableData.forEach((row) => {
+ if (key.number === row.number) {
+ this.$refs.commonFormTableView.$refs.fromTable.toggleRowSelection(row, true)
+ }
+ })
+ })
+ }
+ })
+ }
+ }
+ })
+ },
+ // 閫夋嫨鐢ㄦ埛鐩稿叧鏂规硶
+ querySearchAsync(queryString, cb, value) {
+ var restaurants = []
+ if (value === "client") {
+ restaurants = this.clientList
+ } else if (value === "contract") {
+ restaurants = this.salesDetailsList
+ }
+ 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 === "contract") {
+ return state.number.toLowerCase().indexOf(queryString.toLowerCase()) === 0
+ } else {
+ return state.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0
+ }
}
},
- handleSelectClient(item) {
- this.editConfig.infomation.client_id = item.id
+ async handleSelectClient(value, item) {
+ if (value === "client") {
+ this.editConfig.infomation.salesDetailNumber = ""
+ this.clientId = item.id
+ this.editSelCommonConfig.clientId = item.id
+ this.getSalesDetailsList(item.id)
+ } else if (value === "contract") {
+ this.productTableList.tableData = item.products
+ this.SalesDetailsId = item.id
+ }
},
- selClientClick() {
- this.editSelectClientConfig.editVisible = true
+ selClientClick(value) {
+ console.log(value)
+ if (value === "client") {
+ this.editSelectClientConfig.editVisible = true
+ } else if (value === "contract") {
+ this.editSelCommonConfig.title = "閿�鍞槑缁嗗崟"
+ this.editSelCommonConfig.editVisible = true
+ this.editSelCommonConfig.clientId = this.clientId
+ // this.editSelCommonConfig.salesDetailNumber = this.editConfig.infomation.salesDetailNumber
+ }
},
- selClient(row) {
- console.log(row)
- this.editConfig.infomation.client_name = row.name
- this.editConfig.infomation.client_id = row.id
+ async selClient(row, value) {
+ console.log(row, value)
+ if (value === "client") {
+ this.editConfig.infomation.salesDetailNumber = ""
+ this.editConfig.infomation.client_name = row.name
+ this.clientId = row.id
+ this.editSelCommonConfig.clientId = row.id
+ this.getSalesDetailsList(row.id)
+ } else if (value === "contract") {
+ this.editConfig.infomation.salesDetailNumber = row.number
+ this.SalesDetailsId = row.id
+ this.productTableList.tableData = row.products
+ }
},
// 娓呴櫎宸查�夋嫨鐢ㄦ埛
- clearupClient() {
- this.editConfig.infomation.client_name = ""
- this.editConfig.infomation.client_id = 0
+ clearupClient(value) {
+ if (value === "client") {
+ this.editConfig.infomation.salesDetailNumber = ""
+ this.editConfig.infomation.client_name = ""
+ this.clientId = 0
+ this.productTableList.tableData = []
+ } else if (value === "contract") {
+ this.editConfig.infomation.salesDetailNumber = ""
+ this.productTableList.tableData = []
+ }
},
// 娣诲姞闄勪欢
addAnnexClick() {},
// 璁剧疆鍏佽涓婁紶鏂囦欢鏍煎紡
setFormatClick() {},
setTableForm() {
- if (this.editConfig.title === "鏂板缓") {
- this.tableData = [
- {
- productId: this.productId,
- id: 0,
- amount: 0,
- desc: "",
- name: "",
- number: "",
- price: 0,
- total: 0
- }
- ]
+ if (this.editConfig.title === "鏂板缓" || this.editConfig.infomation.products.length === 0) {
+ this.tableData = []
} else {
- this.tableData = this.editConfig.infomation.products
- this.tableData.map((item, index) => {
- item.productId = index + 1
- })
+ this.selProductData = this.editConfig.infomation.products
+ this.getSalesDetailsList(this.editConfig.infomation.clientId, "鍏ㄩ儴浜у搧")
}
+ console.log(this.tableData)
this.productTableList = {
tableData: this.tableData,
tableColumn: [
@@ -411,6 +577,7 @@
{ label: "浜у搧鍚嶇О", prop: "name", productName: true, isRequird: true },
{ label: "浜у搧缂栧彿", prop: "number" },
{ label: "鏁伴噺", prop: "amount", inputNumber: true, isRequird: true },
+ { label: "鍗曚綅", prop: "unit" },
{ label: "閿�鍞崟浠�", prop: "price", inputFloat: true },
{ label: "浠风◣鍚堣", prop: "total", inputFloat: true }
]
@@ -425,43 +592,17 @@
}
})
},
- // 浜у搧鏂板
- addProductClick() {
- this.productId++
- this.tableData.push({
- productId: this.productId,
- id: 0,
- amount: 0,
- desc: "",
- name: "",
- number: "",
- price: 0,
- total: 0
- })
- this.showSummary.show = true
+ // 閫夋嫨浜у搧
+ getSelectArray(val) {
+ this.selProductData = val
},
- // 浜у搧娓呯┖
- emptyProductClick() {
- this.productId = 1
- this.tableData = [
- {
- productId: this.productId,
- id: 0,
- amount: 0,
- desc: "",
- name: "",
- number: "",
- price: 0,
- total: 0
- }
- ]
- this.productTableList.tableData = this.tableData
- },
- // 浜у搧閲嶇畻
- recalculateProductClick() {},
- clearupProduct(data) {
- this.tableData = data
- this.productTableList.tableData = this.tableData
+ // 閿�鍞礋璐ｄ汉鑷畾涔夋牎楠岃鍒�
+ validateMemberId(rule, value, callback) {
+ if (this.editConfig.infomation?.memberId > 0) {
+ callback()
+ } else {
+ callback(new Error("璇烽�夋嫨閿�鍞礋璐ｄ汉"))
+ }
}
}
}
--
Gitblit v1.8.0