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/salesDetails/DetailSpecification.vue | 2
src/views/sales/salesReturn/index.vue | 109 +++++++------
src/views/other/payment/receipt/index.vue | 179 ++++++++++-----------
src/views/other/payment/saleInvoice/index.vue | 26 ++
src/views/sales/refundForm/index.vue | 104 +++++++-----
src/views/service/serviceContract/index.vue | 25 ++
6 files changed, 242 insertions(+), 203 deletions(-)
diff --git a/src/views/other/payment/receipt/index.vue b/src/views/other/payment/receipt/index.vue
index 8b1928a..3e8365e 100644
--- a/src/views/other/payment/receipt/index.vue
+++ b/src/views/other/payment/receipt/index.vue
@@ -15,9 +15,7 @@
@searchClick="onFilterSearch"
>
<template slot="leftButton">
- <el-button size="small" type="primary" @click="addBtnClick"
- >鏂板缓</el-button
- >
+ <el-button size="small" type="primary" @click="addBtnClick">鏂板缓</el-button>
<!-- <el-button size="small" @click="delClick">鍒犻櫎</el-button>-->
</template>
</CommonSearch>
@@ -45,11 +43,7 @@
</TableCommonView>
</div>
<div class="btn-pager">
- <PagerView
- class="page"
- :pager-options="pagerOptions"
- v-on="pagerEvents"
- />
+ <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
</div>
</div>
</div>
@@ -59,27 +53,27 @@
</template>
<script>
-import { getReceiptList } from "@/api/common/payment";
-import pageMixin from "@/components/makepager/pager/mixin/pageMixin";
-import AddReceipt from "@/views/other/payment/receipt/addReceipt.vue";
+import { getReceiptList } from "@/api/common/payment"
+import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
+import AddReceipt from "@/views/other/payment/receipt/addReceipt.vue"
export default {
name: "ReceiptView",
props: {
isDetail: {
type: Boolean,
- default: false,
+ default: false
},
addConfig: {
type: Object,
default: () => {
- return {};
- },
+ return {}
+ }
},
sourceType: {
type: Number,
- default: 1,
- },
+ default: 1
+ }
},
mixins: [pageMixin],
components: { AddReceipt },
@@ -94,7 +88,7 @@
{ value: "1", label: "鍏ㄩ儴" },
{ value: "2", label: "浠婃棩鑱旂郴" },
{ value: "3", label: "鏈懆鑱旂郴" },
- { value: "4", label: "鏈湀鑱旂郴" },
+ { value: "4", label: "鏈湀鑱旂郴" }
],
searchOptions: [],
operatesList: [
@@ -105,26 +99,26 @@
{ id: "5", name: "鏇存敼鍒涘缓浜�" },
{ id: "6", name: "鏍戠粨鏋勮缃�" },
{ id: "7", name: "瀹℃壒璁剧疆" },
- { id: "8", name: "鍥炶棰勮鍒楀" },
+ { id: "8", name: "鍥炶棰勮鍒楀" }
],
editConfig: {
visible: false,
title: "鏂板缓",
- infomation: {},
+ infomation: {}
},
saleChanceName: "",
contactsDeail: {
visible: false,
- infomation: {},
+ infomation: {}
},
clientDeail: {
visible: false,
- infomation: {},
+ infomation: {}
},
selValueList: [],
searchSel: {
value: "topic",
- label: "",
+ label: ""
},
search_map: {},
keyword: "",
@@ -136,29 +130,21 @@
{ label: "瀹為檯鏀舵閲戦", prop: "amount" },
{ label: "鏀舵鏂瑰紡", prop: "paymentType_name" },
{ label: "閿�鍞礋璐ｄ汉", prop: "principal_name" },
- { label: "鏀舵鏃ユ湡", prop: "receiptDate" },
+ { label: "鏀舵鏃ユ湡", prop: "receiptDate" }
],
- showCol: [
- "鏀舵鍗曠紪鍙�",
- "瀹㈡埛鍚嶇О",
- "閫夋嫨婧愬崟",
- "瀹為檯鏀舵閲戦",
- "鏀舵鏂瑰紡",
- "閿�鍞礋璐ｄ汉",
- "鏀舵鏃ユ湡",
- ],
- };
+ showCol: ["鏀舵鍗曠紪鍙�", "瀹㈡埛鍚嶇О", "閫夋嫨婧愬崟", "瀹為檯鏀舵閲戦", "鏀舵鏂瑰紡", "閿�鍞礋璐ｄ汉", "鏀舵鏃ユ湡"]
+ }
},
created() {
- this.setTable();
+ this.setTable()
if (!this.isDetail) {
- this.keyword = "";
- this.keywordType = "";
+ this.keyword = ""
+ this.keywordType = ""
} else {
- this.keyword = this.addConfig.keyword;
- this.keywordType = this.addConfig.keywordType;
+ this.keyword = this.addConfig.keyword
+ this.keywordType = this.addConfig.keywordType
}
- this.getData();
+ this.getData()
},
mounted() {
},
@@ -168,95 +154,104 @@
tableInfomation: [],
allcol: [],
showcol: this.showCol,
- tableColumn: this.setColumnVisible(this.showCol),
- };
- this.tableList.allcol = this.tableList.tableColumn
- .filter((ele) => !ele.default)
- .map((ele) => ele.label);
- this.searchOptions = [];
+ tableColumn: this.setColumnVisible(this.showCol)
+ }
+ this.tableList.allcol = this.tableList.tableColumn.filter((ele) => !ele.default).map((ele) => ele.label)
+ this.searchOptions = []
for (let i = 0; i < this.tableList.tableColumn.length; i++) {
- const label = this.tableList.tableColumn[i].label;
- const value = this.tableList.tableColumn[i].prop;
- this.searchOptions.push({ value: value, label: label });
+ const label = this.tableList.tableColumn[i].label
+ const value = this.tableList.tableColumn[i].prop
+ this.searchOptions.push({ value: value, label: label })
}
},
setColumnVisible(showCol) {
return this.tableColumn.map((ele) => {
return {
...ele,
- isShowColumn: showCol.includes(ele.label),
- };
- });
+ isShowColumn: showCol.includes(ele.label)
+ }
+ })
},
selTableCol(val) {
- this.showcol = val;
- this.tableList.tableColumn = this.setColumnVisible(val);
+ this.showcol = val
+ this.tableList.tableColumn = this.setColumnVisible(val)
},
// 璇锋眰鏁版嵁
async getData() {
// console.log()
- this.loading = true;
- await getReceiptList({
- keyword: this.keyword,
- keywordType: this.keywordType,
- page: this.pagerOptions.currPage,
- pageSize: this.pagerOptions.pageSize,
- client_id:this.addConfig.client_id,
- sourceId: this.addConfig.salesDetailsId,
- sourceIdType: this.addConfig.serviceContractId,
- })
+ this.loading = true
+ let params = {}
+ let sourceTyle = this.addConfig.keywordType === "閿�鍞槑缁嗗崟" ? 1 : 2
+ if (this.addConfig.id) {
+ params = {
+ sourceID: this.addConfig.id,
+ sourceType: sourceTyle,
+ page: this.pagerOptions.currPage,
+ pageSize: this.pagerOptions.pageSize,
+ client_id:this.addConfig.client_id,
+ }
+ } else {
+ params = {
+ keyword: this.keyword,
+ keywordType: this.keywordType,
+ page: this.pagerOptions.currPage,
+ pageSize: this.pagerOptions.pageSize,
+ client_id:this.addConfig.client_id,
+ }
+ }
+ await getReceiptList(params)
.then((res) => {
if (res.data.code === 200) {
- const resList = res?.data?.data?.data ?? [];
+ const resList = res?.data?.data?.data ?? []
if (resList.length > 0) {
const list = resList.map((item) => {
return {
...item,
client_name: item.client.name,
paymentType_name: item.paymentType.name,
- principal_name: item.principal.username,
- };
- });
- this.tableList.tableInfomation = list || [];
- this.pagerOptions.totalCount = res.data.data.count;
+ principal_name: item.principal.username
+ }
+ })
+ this.tableList.tableInfomation = list || []
+ this.pagerOptions.totalCount = res.data.data.count
} else {
- this.tableList.tableInfomation = [];
+ this.tableList.tableInfomation = []
}
} else {
- this.tableList.tableInfomation = [];
+ this.tableList.tableInfomation = []
}
- this.loading = false;
+ this.loading = false
})
.catch((err) => {
- console.log(err);
- this.tableList.tableInfomation = [];
- this.loading = false;
- });
+ console.log(err)
+ this.tableList.tableInfomation = []
+ this.loading = false
+ })
},
// 鎼滅储
onFilterSearch(searchText) {
- this.keyword = searchText ?? "";
- this.keywordType = "鏀舵鍗曠紪鍙�";
- this.pagerOptions.currPage = 1;
- this.getData();
+ this.keyword = searchText ?? ""
+ this.keywordType = "鏀舵鍗曠紪鍙�"
+ this.pagerOptions.currPage = 1
+ this.getData()
},
getSelectArray(val) {
- console.log(val);
- this.selValueList = [];
+ console.log(val)
+ this.selValueList = []
const list = val.map((item) => {
- return item.id;
- });
- this.selValueList = list;
+ return item.id
+ })
+ this.selValueList = list
},
// 鏂板缓
addBtnClick() {
- this.editConfig.visible = true;
- this.editConfig.title = "鏂板缓";
- this.editConfig.sourceType = this.sourceType;
- this.editConfig.infomation = { ...this.addConfig, number: "" };
- },
- },
-};
+ this.editConfig.visible = true
+ this.editConfig.title = "鏂板缓"
+ this.editConfig.sourceType = this.sourceType
+ this.editConfig.infomation = { ...this.addConfig, number: "" }
+ }
+ }
+}
</script>
<!-- Add "scoped" attribute to limit CSS to this component only -->
diff --git a/src/views/other/payment/saleInvoice/index.vue b/src/views/other/payment/saleInvoice/index.vue
index ac90903..b430c93 100644
--- a/src/views/other/payment/saleInvoice/index.vue
+++ b/src/views/other/payment/saleInvoice/index.vue
@@ -169,13 +169,25 @@
// 璇锋眰鏁版嵁
async getData() {
this.loading = true
- await getInvoiceList({
- keyword: this.keyword,
- keywordType: this.keywordType,
- page: this.pagerOptions.currPage,
- pageSize: this.pagerOptions.pageSize,
- sourceId:this.addConfig.id
- })
+ console.log(this.addConfig)
+ let params = {}
+ let sourceTyle = this.addConfig.keywordType === "閿�鍞槑缁嗗崟" ? 1 : 2
+ if (this.addConfig.id) {
+ params = {
+ sourceID: this.addConfig.id,
+ sourceType: sourceTyle,
+ page: this.pagerOptions.currPage,
+ pageSize: this.pagerOptions.pageSize
+ }
+ } else {
+ params = {
+ keyword: this.keyword,
+ keywordType: this.keywordType,
+ page: this.pagerOptions.currPage,
+ pageSize: this.pagerOptions.pageSize
+ }
+ }
+ await getInvoiceList(params)
.then((res) => {
if (res.data.code === 200) {
if (res.data.data.data && res.data.data.data.length > 0) {
diff --git a/src/views/sales/refundForm/index.vue b/src/views/sales/refundForm/index.vue
index c91d629..51638cf 100644
--- a/src/views/sales/refundForm/index.vue
+++ b/src/views/sales/refundForm/index.vue
@@ -7,15 +7,15 @@
<div v-else class="filter">
<div class="filter-card">
<CommonSearch
- :show-add="false"
- :show-download="false"
- :amount-view="false"
- :show-action-btn="false"
- placeholder="璇疯緭鍏ラ��娆惧崟缂栧彿"
- @searchClick="onFilterSearch"
+ :show-add="false"
+ :show-download="false"
+ :amount-view="false"
+ :show-action-btn="false"
+ placeholder="璇疯緭鍏ラ��娆惧崟缂栧彿"
+ @searchClick="onFilterSearch"
>
<template slot="leftButton">
- <el-button size="small" type="primary" @click="addBtnClick">鏂板缓</el-button>
+ <el-button size="small" type="primary" @click="addBtnClick">鏂板缓</el-button>
<!-- <el-button size="small" @click="delClick">鍒犻櫎</el-button> -->
</template>
</CommonSearch>
@@ -26,12 +26,12 @@
<div class="body-card">
<div class="list-view">
<TableCommonView
- ref="tableListRef"
- :table-list="tableList"
- @selClientClick="selClientClick"
- @selCommonClick="selCommonClick"
- @getSelectArray="getSelectArray"
- @selTableCol="selTableCol"
+ ref="tableListRef"
+ :table-list="tableList"
+ @selClientClick="selClientClick"
+ @selCommonClick="selCommonClick"
+ @getSelectArray="getSelectArray"
+ @selTableCol="selTableCol"
>
<template slot="tableButton">
<el-table-column label="鎿嶄綔" width="100">
@@ -136,7 +136,7 @@
// { label: "淇敼鏃堕棿", prop: "modifyTime" },
{ label: "浠风◣鍚堣", prop: "amountTotal" }
],
- showCol:["閫�娆惧崟缂栧彿", "瀹㈡埛鍚嶇О", "閫�娆炬棩鏈�", "璐︽埛", "鏄惁寮�绁�", "浠樻鏂瑰紡", "閿�鍞礋璐ｄ汉", "浠风◣鍚堣"]
+ showCol: ["閫�娆惧崟缂栧彿", "瀹㈡埛鍚嶇О", "閫�娆炬棩鏈�", "璐︽埛", "鏄惁寮�绁�", "浠樻鏂瑰紡", "閿�鍞礋璐ｄ汉", "浠风◣鍚堣"]
}
},
created() {
@@ -157,9 +157,9 @@
tableInfomation: [],
allcol: [],
showcol: this.showCol,
- tableColumn:this.setColumnVisible(this.showCol)
+ tableColumn: this.setColumnVisible(this.showCol)
}
- this.tableList.allcol = this.tableList.tableColumn.filter(ele=>!ele.default).map(ele=>ele.label);
+ this.tableList.allcol = this.tableList.tableColumn.filter((ele) => !ele.default).map((ele) => ele.label)
this.searchOptions = []
for (let i = 0; i < this.tableList.tableColumn.length; i++) {
const label = this.tableList.tableColumn[i].label
@@ -167,27 +167,37 @@
this.searchOptions.push({ value: value, label: label })
}
},
- setColumnVisible(showCol){
- return this.tableColumn.map(ele=>{
+ setColumnVisible(showCol) {
+ return this.tableColumn.map((ele) => {
return {
...ele,
- isShowColumn:showCol.includes(ele.label)
+ isShowColumn: showCol.includes(ele.label)
}
})
},
selTableCol(val) {
- this.showcol = val;
- this.tableList.tableColumn = this.setColumnVisible(val);
+ this.showcol = val
+ this.tableList.tableColumn = this.setColumnVisible(val)
},
// 璇锋眰鏁版嵁
async getData() {
this.loading = true
- await getSalesRefundList({
- keyword: this.keyword,
- keywordType: this.keywordType,
- page: this.pagerOptions.currPage,
- pageSize: this.pagerOptions.pageSize
- })
+ let params = {}
+ if (this.addConfig.id) {
+ params = {
+ sourceID: this.addConfig.id,
+ page: this.pagerOptions.currPage,
+ pageSize: this.pagerOptions.pageSize
+ }
+ } else {
+ params = {
+ keyword: this.keyword,
+ keywordType: this.keywordType,
+ page: this.pagerOptions.currPage,
+ pageSize: this.pagerOptions.pageSize
+ }
+ }
+ await getSalesRefundList(params)
.then((res) => {
console.log(res)
if (res.code === 200) {
@@ -218,9 +228,9 @@
})
},
// 鎼滅储
- onFilterSearch(searchText){
+ onFilterSearch(searchText) {
this.keyword = searchText ?? ""
- this.keywordType = '閫�娆惧崟缂栧彿'
+ this.keywordType = "閫�娆惧崟缂栧彿"
this.getData()
},
// 鏂板缓
@@ -239,22 +249,22 @@
// 鍒犻櫎
delClick(rowID) {
// if (this.selValueList && this.selValueList.length > 0) {
- this.$confirm("鏄惁纭鍒犻櫎?", "璀﹀憡", {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "warning"
- })
- .then(() => {
- getDelSalesRefund({ ids: [rowID] }).then((response) => {
- if (response.code === 200) {
- this.$message.success("鍒犻櫎鎴愬姛")
- this.getData()
- } else {
- this.$message.warning("鍒犻櫎澶辫触")
- }
- })
+ this.$confirm("鏄惁纭鍒犻櫎?", "璀﹀憡", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning"
+ })
+ .then(() => {
+ getDelSalesRefund({ ids: [rowID] }).then((response) => {
+ if (response.code === 200) {
+ this.$message.success("鍒犻櫎鎴愬姛")
+ this.getData()
+ } else {
+ this.$message.warning("鍒犻櫎澶辫触")
+ }
})
- .catch(() => {})
+ })
+ .catch(() => {})
// } else {
// this.$message.warning("璇疯嚦灏戦�夋嫨涓�鏉¤褰�")
// }
@@ -293,12 +303,12 @@
.refund-form {
height: 100%;
overflow: hidden;
- .filter{
+ .filter {
height: 80px;
display: flex;
align-items: center;
padding: 12px 20px 0 20px;
- &-card{
+ &-card {
height: 80px;
display: flex;
align-items: center;
@@ -309,7 +319,7 @@
background-color: #fff;
}
}
- .body{
+ .body {
box-sizing: border-box;
padding: 10px 20px;
border-radius: 12px;
diff --git a/src/views/sales/salesDetails/DetailSpecification.vue b/src/views/sales/salesDetails/DetailSpecification.vue
index 4deabf7..23a9264 100644
--- a/src/views/sales/salesDetails/DetailSpecification.vue
+++ b/src/views/sales/salesDetails/DetailSpecification.vue
@@ -48,7 +48,7 @@
<el-tab-pane label="閿�鍞彂绁�" name="invoice"></el-tab-pane>
<el-tab-pane label="閿�鍞��璐у崟" name="return"> </el-tab-pane>
<el-tab-pane label="鏈嶅姟鍚堝悓" name="serviceContract"></el-tab-pane>
- <el-tab-pane label="閿�鍞��娆惧崟" name="refundForm"></el-tab-pane>
+ <!-- <el-tab-pane label="閿�鍞��娆惧崟" name="refundForm"></el-tab-pane> -->
</el-tabs>
</div>
<div v-if="activeName === 'first'" class="detail">
diff --git a/src/views/sales/salesReturn/index.vue b/src/views/sales/salesReturn/index.vue
index f3c5546..a9e77b7 100644
--- a/src/views/sales/salesReturn/index.vue
+++ b/src/views/sales/salesReturn/index.vue
@@ -7,15 +7,15 @@
<div v-else class="filter">
<div class="filter-card">
<CommonSearch
- :show-add="false"
- :show-download="false"
- :amount-view="false"
- :show-action-btn="false"
- placeholder="璇疯緭鍏ラ攢鍞��璐у崟缂栧彿"
- @searchClick="onFilterSearch"
+ :show-add="false"
+ :show-download="false"
+ :amount-view="false"
+ :show-action-btn="false"
+ placeholder="璇疯緭鍏ラ攢鍞��璐у崟缂栧彿"
+ @searchClick="onFilterSearch"
>
<template slot="leftButton">
- <el-button size="small" type="primary" @click="addBtnClick">鏂板缓</el-button>
+ <el-button size="small" type="primary" @click="addBtnClick">鏂板缓</el-button>
<!-- <el-button size="small" @click="delClick">鍒犻櫎</el-button> -->
</template>
</CommonSearch>
@@ -26,12 +26,12 @@
<div class="body-card">
<div class="list-view">
<TableCommonView
- ref="tableListRef"
- :table-list="tableList"
- @selClientClick="selClientClick"
- @selCommonClick="selCommonClick"
- @getSelectArray="getSelectArray"
- @selTableCol="selTableCol"
+ ref="tableListRef"
+ :table-list="tableList"
+ @selClientClick="selClientClick"
+ @selCommonClick="selCommonClick"
+ @getSelectArray="getSelectArray"
+ @selTableCol="selTableCol"
>
<template slot="tableButton">
<el-table-column label="鎿嶄綔" width="90">
@@ -131,7 +131,7 @@
keyword: "",
keywordType: "",
tableColumn: [
- { label: "閿�鍞��璐у崟缂栧彿", prop: "number", min: 120, isCommonClick: true ,default:true },
+ { label: "閿�鍞��璐у崟缂栧彿", prop: "number", min: 120, isCommonClick: true, default: true },
{ label: "瀹㈡埛鍚嶇О", prop: "client_name", min: 90, isClientClick: true },
{ label: "閫�璐ф棩鏈�", prop: "returnDate", min: 130 },
{ label: "鐘舵��", prop: "salesReturnStatus_name" },
@@ -141,7 +141,7 @@
{ label: "閿�鍞礋璐ｄ汉", prop: "member_name" }
// { label: "淇敼鏃堕棿", prop: "modifyTime", isTime: true, min: 130 }
],
- showCol:["閿�鍞��璐у崟缂栧彿", "瀹㈡埛鍚嶇О", "閫�璐ф棩鏈�", "鐘舵��", "閫�鍏ヤ粨搴�", "搴旈��娆�", "宸查��娆�", "閿�鍞礋璐ｄ汉"]
+ showCol: ["閿�鍞��璐у崟缂栧彿", "瀹㈡埛鍚嶇О", "閫�璐ф棩鏈�", "鐘舵��", "閫�鍏ヤ粨搴�", "搴旈��娆�", "宸查��娆�", "閿�鍞礋璐ｄ汉"]
}
},
created() {
@@ -162,9 +162,9 @@
tableInfomation: [],
allcol: [],
showcol: this.showCol,
- tableColumn:this.setColumnVisible(this.showCol)
+ tableColumn: this.setColumnVisible(this.showCol)
}
- this.tableList.allcol = this.tableList.tableColumn.filter(ele=>!ele.default).map(ele=>ele.label);
+ this.tableList.allcol = this.tableList.tableColumn.filter((ele) => !ele.default).map((ele) => ele.label)
this.searchOptions = []
for (let i = 0; i < this.tableList.tableColumn.length; i++) {
const label = this.tableList.tableColumn[i].label
@@ -172,27 +172,38 @@
this.searchOptions.push({ value: value, label: label })
}
},
- setColumnVisible(showCol){
- return this.tableColumn.map(ele=>{
+ setColumnVisible(showCol) {
+ return this.tableColumn.map((ele) => {
return {
...ele,
- isShowColumn:showCol.includes(ele.label)
+ isShowColumn: showCol.includes(ele.label)
}
})
},
selTableCol(val) {
- this.showcol = val;
- this.tableList.tableColumn = this.setColumnVisible(val);
+ this.showcol = val
+ this.tableList.tableColumn = this.setColumnVisible(val)
},
// 璇锋眰鏁版嵁
async getData() {
this.loading = true
- await getSalesReturnList({
- keyword: this.keyword,
- keywordType: this.keywordType,
- page: this.pagerOptions.currPage,
- pageSize: this.pagerOptions.pageSize
- })
+ let params = {}
+ if (this.addConfig.id) {
+ params = {
+ sourceID: this.addConfig.id,
+ sourceType: 1,
+ page: this.pagerOptions.currPage,
+ pageSize: this.pagerOptions.pageSize
+ }
+ } else {
+ params = {
+ keyword: this.keyword,
+ keywordType: this.keywordType,
+ page: this.pagerOptions.currPage,
+ pageSize: this.pagerOptions.pageSize
+ }
+ }
+ await getSalesReturnList(params)
.then((res) => {
console.log(res)
if (res.code === 200) {
@@ -222,8 +233,8 @@
})
},
// 鎼滅储
- onFilterSearch(searchText){
- this.keyword = searchText ?? ''
+ onFilterSearch(searchText) {
+ this.keyword = searchText ?? ""
this.keywordType = "閿�鍞��璐у崟缂栧彿"
this.pagerOptions.currPage = 1
this.getData()
@@ -239,27 +250,27 @@
console.log(row)
this.editConfig.visible = true
this.editConfig.title = "缂栬緫"
- this.editConfig.infomation = { ...row, currency: "浜烘皯甯�"}
+ this.editConfig.infomation = { ...row, currency: "浜烘皯甯�" }
},
// 鍒犻櫎
delClick(rowID) {
// if (this.selValueList && this.selValueList.length > 0) {
- this.$confirm("鏄惁纭鍒犻櫎?", "璀﹀憡", {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "warning"
- })
- .then(() => {
- getDelSalesReturn({ ids:[rowID] }).then((response) => {
- if (response.code === 200) {
- this.$message.success("鍒犻櫎鎴愬姛")
- this.getData()
- } else {
- this.$message.warning("鍒犻櫎澶辫触")
- }
- })
+ this.$confirm("鏄惁纭鍒犻櫎?", "璀﹀憡", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning"
+ })
+ .then(() => {
+ getDelSalesReturn({ ids: [rowID] }).then((response) => {
+ if (response.code === 200) {
+ this.$message.success("鍒犻櫎鎴愬姛")
+ this.getData()
+ } else {
+ this.$message.warning("鍒犻櫎澶辫触")
+ }
})
- .catch(() => {})
+ })
+ .catch(() => {})
// } else {
// this.$message.warning("璇疯嚦灏戦�夋嫨涓�鏉¤褰�")
// }
@@ -299,12 +310,12 @@
.sales-return {
height: 100%;
overflow: hidden;
- .filter{
+ .filter {
height: 80px;
display: flex;
align-items: center;
padding: 12px 20px 0 20px;
- &-card{
+ &-card {
height: 80px;
display: flex;
align-items: center;
@@ -315,7 +326,7 @@
background-color: #fff;
}
}
- .body{
+ .body {
box-sizing: border-box;
padding: 10px 20px;
border-radius: 12px;
diff --git a/src/views/service/serviceContract/index.vue b/src/views/service/serviceContract/index.vue
index 08cd136..a6d125c 100644
--- a/src/views/service/serviceContract/index.vue
+++ b/src/views/service/serviceContract/index.vue
@@ -198,13 +198,24 @@
// 璇锋眰鏁版嵁
async getData() {
this.loading = true
- await getServiceContractList({
- keyword: this.keyword,
- keywordType: this.keywordType,
- page: this.pagerOptions.currPage,
- pageSize: this.pagerOptions.pageSize,
- contactId:this.addConfig.client_id
- })
+ let params = {}
+ if (this.addConfig.id) {
+ params = {
+ salesDetailsId: this.addConfig.id,
+ page: this.pagerOptions.currPage,
+ pageSize: this.pagerOptions.pageSize,
+ contactId:this.addConfig.client_id
+ }
+ } else {
+ params = {
+ keyword: this.keyword,
+ keywordType: this.keywordType,
+ page: this.pagerOptions.currPage,
+ pageSize: this.pagerOptions.pageSize,
+ contactId:this.addConfig.client_id
+ }
+ }
+ await getServiceContractList(params)
.then((res) => {
console.log(res)
if (res.code === 200) {
--
Gitblit v1.8.0