From bca479d1713a6cb914711578251951522c0d1a2d Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期三, 11 十月 2023 17:36:12 +0800
Subject: [PATCH] 收款计划、销售发票样式调整及公共组件no-product清空下行高调整
---
src/views/sales/salesReturn/AddSalesReturnDialog.vue | 487 +++++++++++++++++++++++++++++++++++++----------------
1 files changed, 337 insertions(+), 150 deletions(-)
diff --git a/src/views/sales/salesReturn/AddSalesReturnDialog.vue b/src/views/sales/salesReturn/AddSalesReturnDialog.vue
index e7276ba..a251198 100644
--- a/src/views/sales/salesReturn/AddSalesReturnDialog.vue
+++ b/src/views/sales/salesReturn/AddSalesReturnDialog.vue
@@ -5,13 +5,15 @@
:visible.sync="editConfig.visible"
:width="dialogWidth"
:before-close="handleClose"
+ append-to-body
+ custom-class="iframe-dialog"
>
<el-form
ref="form"
:model="editConfig.infomation"
:rules="rules"
label-position="right"
- label-width="308px"
+ label-width="30%"
size="mini"
style="height: 60vh; overflow-x: hidden"
>
@@ -22,41 +24,68 @@
<div class="basic-info-view">
<el-row>
<el-col :span="12">
- <el-form-item label="瀹㈡埛鍚嶇О" prop="clientId">
+ <el-form-item label="瀹㈡埛鍚嶇О" prop="client_name">
<div class="custom-name">
- <el-input v-model="editConfig.infomation.clientId"></el-input>
- <div class="common-select-btn"><i class="el-icon-circle-plus-outline" title="閫夋嫨"></i></div>
- <div class="common-select-btn"><i class="el-icon-edit" title="缂栬緫"></i></div>
+ <el-autocomplete
+ style="width:100%"
+ v-model="editConfig.infomation.client_name"
+ :fetch-suggestions="
+ (queryString, callback) => {
+ querySearchAsync(queryString, callback, 'client')
+ }
+ "
+ value-key="name"
+ @select="handleSelectClient('client', $event)"
+ ></el-autocomplete>
+ <div class="common-select-btn" @click="selClientClick('client')">
+ <i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
+ </div>
+ <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>
+ <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="閫夋嫨婧愬崟" 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-col :span="12">
+ <el-form-item label="鍚堝悓璁㈠崟">
+ <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.number && editConfig.infomation.number.length > 0"
+ class="common-select-btn"
+ @click="clearupClient('contract')"
>
- </el-option>
- </el-select>
+ <i class="el-icon-remove-outline" title="娓呴櫎"></i>
+ </div>
+ </div>
</el-form-item>
- </el-col> -->
+ </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>
@@ -67,7 +96,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>
@@ -76,7 +105,13 @@
</el-col>
<el-col :span="12">
<el-form-item label="閫�璐ф棩鏈�" prop="returnDate">
- <el-date-picker v-model="editConfig.infomation.returnDate" type="date" placeholder="閫夋嫨鏃ユ湡">
+ <el-date-picker
+ v-model="editConfig.infomation.returnDate"
+ value-format="yyyy-MM-dd"
+ type="date"
+ placeholder="閫夋嫨鏃ユ湡"
+ style="width:100%"
+ >
</el-date-picker>
</el-form-item>
</el-col>
@@ -87,10 +122,11 @@
<div class="basic-info-view">
<el-row>
<el-col :span="12">
- <el-form-item label="鐘舵��" prop="status">
+ <el-form-item label="鐘舵��" prop="salesReturnStatusId">
<div class="common-select">
<el-select
- v-model="editConfig.infomation.status"
+ style="width:100%"
+ v-model="editConfig.infomation.salesReturnStatusId"
placeholder="璇烽�夋嫨"
class="common-select-sel"
size="mini"
@@ -98,7 +134,7 @@
<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 class="common-select-btn"><i class="el-icon-setting"></i></div> -->
</div>
</el-form-item>
</el-col>
@@ -109,8 +145,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"
@@ -120,7 +157,7 @@
</el-row>
</div>
<!-- 闄勪欢淇℃伅 -->
- <div class="basic-info-title">闄勪欢淇℃伅</div>
+ <!-- <div class="basic-info-title">闄勪欢淇℃伅</div>
<div class="basic-info-view">
<el-row>
<el-col :span="12">
@@ -145,20 +182,28 @@
</el-form-item>
</el-col>
</el-row>
- </div>
+ </div> -->
<!-- 浜у搧绠＄悊 -->
<div class="basic-info-title" style="display: flex">
浜у搧绠＄悊
<div style="margin-left: 400px">
甯佺
<el-select v-model="editConfig.infomation.currency" placeholder="璇烽�夋嫨" size="mini" style="width: 63%">
- <el-option v-for="item in currencyOptions" :key="item.value" :label="item.label" :value="item.value">
+ <el-option v-for="item in currencyOptions" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</div>
</div>
<div class="product-view">
- <CommonFormTableView :show-summary="showSummary" :product-table-list="productTableList" />
+ <CommonFormTableView
+ :show-summary="showSummary"
+ :product-table-list="productTableList"
+ @inputContent="inputContent"
+ @addProductClick="addProductClick"
+ @emptyProductClick="emptyProductClick"
+ @recalculateProductClick="recalculateProductClick"
+ @clearupProduct="clearupProduct"
+ />
</div>
</div>
</el-form>
@@ -166,6 +211,18 @@
<el-button type="primary" size="small" @click="saveClick('form')">淇濆瓨</el-button>
<el-button size="small" @click="editConfig.visible = false">鍙栨秷</el-button>
</div>
+ <!-- 閫夋嫨瀹㈡埛 -->
+ <SelectClientDialog
+ v-if="editSelectClientConfig.editVisible"
+ :edit-common-config="editSelectClientConfig"
+ @selClient="selClient"
+ />
+ <!-- 閫夋嫨鍚堝悓璁㈠崟 -->
+ <SelectCommonDialog
+ v-if="editSelCommonConfig.editVisible"
+ :edit-common-config="editSelCommonConfig"
+ @selClient="selClient"
+ />
</el-dialog>
</div>
</template>
@@ -174,6 +231,9 @@
import CommonFormTableView from "@/components/makepager/CommonFormTableView"
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 SelectCommonDialog from "@/views/other/commonDialog/SelectCommonDialog"
export default {
name: "AddSalesReturnDialog",
props: {
@@ -188,11 +248,18 @@
}
}
},
- components: { CommonFormTableView },
- computed: {},
+ 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" }],
@@ -201,80 +268,99 @@
},
memberOptions: [],
selSourceOrderOptions: [], // 閫夋嫨婧愬崟
- repositoryOptions: [
- { value: "1", label: "鎬讳粨" },
- { value: "2", label: "璧犲搧浠�" },
- { value: "3", label: "鍏朵粬浠�" }
- ], // 閫�鍏ヤ粨搴�
+ repositoryOptions: [], // 閫�鍏ヤ粨搴�
statusOptions: [], // 鐘舵��
- currencyOptions: [
- { value: "1", label: "浜烘皯甯�(楼)" },
- { value: "2", label: "鑻遍晳(拢)" },
- { value: "3", label: "娆у厓(鈧�)" }
- ], // 甯佺
+ currencyOptions: [{ id: 1, name: "浜烘皯甯�" }], // 甯佺
productTableList: {},
showSummary: {
show: true,
- total: false,
- refundable: true,
- sumProp: ["other1", "other2", "other3", "other4"],
- mergeNumber: 4
- }
+ total: true,
+ sumProp: ["Amount", "total"],
+ mergeNumber: 2
+ },
+ editSelectClientConfig: {
+ editVisible: false,
+ title: "",
+ infomation: {}
+ },
+ editSelCommonConfig: {
+ editVisible: false,
+ title: "",
+ infomation: {}
+ },
+ productId: 1,
+ isNoProduct: true,
+ clientId: this.editCommonConfig.infomation.clientId,
+ SalesDetailsId: this.editCommonConfig.infomation.SalesDetailsId
}
},
created() {
+ this.$store.dispatch("geClient")
+ this.$store.dispatch("geSalesDetails")
this.setTableForm()
this.getCommonData()
+ this.getProductList()
},
methods: {
getCommonData() {
getAllData()
.then((res) => {
this.memberOptions = res.data.member
+ this.repositoryOptions = res.data.repository
+ this.statusOptions = res.data.salesReturnStatus
})
.catch((err) => {
console.log(err)
})
+ },
+ // 鑾峰彇浜у搧鍒楄〃
+ async getProductList() {
+ await getProductList({
+ page: 0,
+ pageSize: 0,
+ productName: "",
+ productNumber: ""
+ }).then((res) => {
+ console.log(res)
+ })
},
// 淇濆瓨
saveClick(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
console.log(this.editConfig.infomation)
- 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({
- message: "娣诲姞鎴愬姛",
- type: "success"
- })
- this.$parent.getData()
- }
- })
- .catch((err) => {
- console.log(err)
- })
+ 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 {
- getUpdateSalesReturn(params)
- .then((res) => {
+ 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({
- message: "缂栬緫鎴愬姛",
- type: "success"
- })
+ this.$message.success("娣诲姞鎴愬姛")
this.$parent.getData()
}
})
- .catch((err) => {
- console.log(err)
+ } else {
+ 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")
@@ -287,24 +373,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: [
- {
- amount: 0,
- desc: "",
- id: 0,
- name: "",
- number: "",
- price: 0,
- total: 0
- }
- ],
+ products: this.tableData,
reason: data.reason || "",
repository: data.repository || "",
returnDate: data.returnDate || "",
- status: data.status || 0
+ salesReturnStatusId: data.salesReturnStatusId || 0,
+ sourceId: this.SalesDetailsId,
+ sourceType: 1
}
}
return params
@@ -312,31 +390,144 @@
handleClose() {
this.editConfig.visible = false
},
+ // 閫夋嫨鐢ㄦ埛鐩稿叧鏂规硶
+ 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, value) {
+ return (state) => {
+ if (value === "contract") {
+ return state.number.toLowerCase().indexOf(queryString.toLowerCase()) === 0
+ } else {
+ return state.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0
+ }
+ }
+ },
+ handleSelectClient(value, item) {
+ if (value === "client") {
+ this.clientId = item.id
+ } else if (value === "contract") {
+ this.SalesDetailsId = item.id
+ }
+ },
+ selClientClick(value) {
+ console.log(value)
+ if (value === "client") {
+ this.editSelectClientConfig.editVisible = true
+ } else if (value === "contract") {
+ this.editSelCommonConfig.title = "閿�鍞槑缁嗗崟"
+ this.editSelCommonConfig.editVisible = true
+ }
+ },
+ selClient(row, value) {
+ console.log(row, value)
+ if (value === "client") {
+ this.editConfig.infomation.client_name = row.name
+ this.clientId = row.id
+ } else if (value === "contract") {
+ this.editConfig.infomation.salesDetailNumber = row.number
+ this.SalesDetailsId = row.id
+ }
+ },
+ // 娓呴櫎宸查�夋嫨鐢ㄦ埛
+ clearupClient(value) {
+ if (value === "client") {
+ this.editConfig.infomation.client_name = ""
+ this.clientId = 0
+ } else if (value === "contract") {
+ this.editConfig.infomation.salesDetailNumber = ""
+ this.SalesDetailsId = 0
+ }
+ },
// 娣诲姞闄勪欢
addAnnexClick() {},
// 璁剧疆鍏佽涓婁紶鏂囦欢鏍煎紡
setFormatClick() {},
setTableForm() {
+ if (this.editConfig.title === "鏂板缓" || this.editConfig.infomation.products.length === 0) {
+ this.tableData = [
+ {
+ productId: this.productId,
+ id: 0,
+ amount: 0,
+ desc: "",
+ name: "",
+ number: "",
+ price: 0,
+ total: 0
+ }
+ ]
+ } else {
+ this.tableData = this.editConfig.infomation.products
+ this.tableData.map((item, index) => {
+ item.productId = index + 1
+ })
+ }
this.productTableList = {
- tableData: [],
+ tableData: this.tableData,
tableColumn: [
- { label: "#", prop: "id", width: 40 },
- { label: "浜у搧鍚嶇О", prop: "productName", input: true, isRequird: true },
- { label: "浜у搧缂栧彿", prop: "other0" },
- { label: "婧愬崟绫诲瀷", prop: "other5" },
- { label: "婧愬崟", prop: "other6" },
- { label: "鏁伴噺", prop: "other1", input: true, isRequird: true },
- { label: "鍚◣鍗曚环", prop: "other9", input: true },
- { label: "涓嶅惈绋庡崟浠�", prop: "other7", input: true },
- { label: "鎶樻墸鐜�(%)", prop: "other6", input: true },
- { label: "鎶樻墸棰�", prop: "other2" },
- { label: "绋�(閿�鍞�)", prop: "other7", input: true },
- { label: "瀹為檯鍚◣鍗曚环", prop: "other3" },
- { label: "涓嶅惈绋庨噾棰�", prop: "other4" },
- { label: "浠风◣鍚堣", prop: "other3", input: true },
- { label: "鎻忚堪", prop: "other8" }
+ { label: "#", prop: "productId", width: 40 },
+ { label: "浜у搧鍚嶇О", prop: "name", productName: true, isRequird: true },
+ { label: "浜у搧缂栧彿", prop: "number" },
+ { label: "鏁伴噺", prop: "amount", inputNumber: true, isRequird: true },
+ { label: "閿�鍞崟浠�", prop: "price", inputFloat: true },
+ { label: "浠风◣鍚堣", prop: "total", inputFloat: true }
]
}
+ },
+ // 浜у搧鍒楄〃杈撳叆
+ inputContent(val, prop, row) {
+ this.productId = row.productId
+ this.tableData.map((item) => {
+ if (item.productId === row.productId) {
+ item[prop] = val
+ }
+ })
+ },
+ // 浜у搧鏂板
+ addProductClick() {
+ this.productId++
+ this.tableData.push({
+ productId: this.productId,
+ id: 0,
+ amount: 0,
+ desc: "",
+ name: "",
+ number: "",
+ price: 0,
+ total: 0
+ })
+ this.showSummary.show = true
+ },
+ // 浜у搧娓呯┖
+ 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
}
}
}
@@ -344,58 +535,54 @@
<!-- Add "scoped" attribute to limit CSS to this component only -->
<style lang="scss" scoped>
-.add-sales-return {
- .basic-info {
- .basic-info-title {
- background-color: #f4f8fe;
- padding-left: 10px;
- font-size: 15px;
- font-weight: bold;
- color: #666;
- height: 42px;
- line-height: 42px;
- }
- .basic-info-view {
- margin-top: 10px;
- padding-right: 40px;
- .custom-name {
- display: flex;
- .common-select-btn {
- margin-left: 5px;
- font-size: 18px;
+::v-deep {
+ .iframe-dialog .el-dialog__body {
+ .basic-info {
+ .basic-info-title {
+ background-color: #f4f8fe;
+ padding-left: 10px;
+ font-size: 15px;
+ font-weight: bold;
+ color: #666;
+ height: 42px;
+ line-height: 42px;
+ }
+ .basic-info-view {
+ margin-top: 10px;
+ padding-right: 40px;
+ .custom-name,
+ .common-select {
+ display: flex;
+ .common-select-sel {
+ width: 270px;
+ }
+ .common-select-btn {
+ margin-left: 5px;
+ font-size: 16px;
+ cursor: pointer;
+ }
}
}
- .common-select {
+ .annex-view {
display: flex;
- .common-select-sel {
- width: 270px;
- }
- .common-select-btn {
- margin-left: 5px;
- font-size: 16px;
- cursor: pointer;
+ color: #6166d3;
+ .setFormat {
+ margin-left: 10px;
}
}
}
- .annex-view {
+ .unflod-collapse {
display: flex;
+ height: 30px;
+ justify-content: center;
+ align-items: center;
color: #6166d3;
- .setFormat {
- margin-left: 10px;
- }
}
- }
- .unflod-collapse {
- display: flex;
- height: 30px;
- justify-content: center;
- align-items: center;
- color: #6166d3;
- }
- .dialog-footer {
- background-color: #f5f5f5;
- height: 55px;
- line-height: 55px;
+ .dialog-footer {
+ background-color: #f5f5f5;
+ height: 55px;
+ line-height: 55px;
+ }
}
}
</style>
--
Gitblit v1.8.0