From 9d3f1aa7571cd532c0c27bf8376ebf4b2178a252 Mon Sep 17 00:00:00 2001
From: charles <981744753@qq.com>
Date: 星期三, 24 七月 2024 17:45:45 +0800
Subject: [PATCH] fix:解决srm之前改了域名，处理各种异常状态，跳转也会出现异常等问题。
---
src/views/purchaseManage/returned/index.vue | 239 +++++++++++++++++++++++++++++++++--------------------------
1 files changed, 135 insertions(+), 104 deletions(-)
diff --git a/src/views/purchaseManage/returned/index.vue b/src/views/purchaseManage/returned/index.vue
index f5d798d..ce8dc79 100644
--- a/src/views/purchaseManage/returned/index.vue
+++ b/src/views/purchaseManage/returned/index.vue
@@ -1,37 +1,49 @@
<template>
- <div class="rightContent">
- <div class="content-box">
- <div class="supplier-search">
- <SearchCommonView
- ref="searchCommonView"
- :inputSelect="false"
- placeholder="鍙緭鍏ラ噰璐崟,渚涘簲鍟嗗悕绉扮瓑鎼滅储"
- @searchClick="searchClick"
- @resetClick="resetClick"
+ <div class="returned">
+ <div class="filter">
+ <div class="filter-card">
+ <CommonSearch
+ :show-add="false"
+ :show-download="false"
+ :amount-view="false"
+ :show-action-btn="false"
+ placeholder="璇疯緭鍏ラ噰璐崟/渚涘簲鍟嗗悕绉扮瓑"
+ @searchClick="onFilterSearch"
/>
-
</div>
- <template>
- <TableCommonView
- class="content-table"
- ref="tableListRef"
- :table-list="tableList"
- @selCommonClick="selCommonClick"
- @getSelectArray="getSelectArray"
- >
- <template slot="tableButton">
- <el-table-column label="鎿嶄綔" width="120">
- <template slot-scope="scope">
- <el-button @click="confirmClick(scope.row)" type="text" size="small">纭鍙戣揣</el-button>
- </template>
- </el-table-column>
- </template>
- </TableCommonView>
+ </div>
+
+ <div class="body">
+ <div class="body-card">
+ <div class="list-view">
+ <TableCommonView
+ class="content-table"
+ ref="tableListRef"
+ :table-list="tableList"
+ @selCommonClick="selCommonClick"
+ @selTableCol="selTableCol"
+ >
+ <template slot="tableButton">
+ <el-table-column align="center" label="鐘舵��" width="120">
+ <template slot-scope="scope">
+ {{ getReturnedStatus(scope.row.member_name) }}
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鎿嶄綔" width="120">
+ <template slot-scope="scope">
+ <el-button @click="confirmClick(scope.row)" type="text" size="small">纭鍙戣揣</el-button>
+ </template>
+ </el-table-column>
+ </template>
+ </TableCommonView>
+ </div>
<div class="btn-pager">
<PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
</div>
- </template>
+ </div>
+
</div>
+
<!-- 鏂板缓/缂栬緫閿�鍞嚎绱� -->
<!-- <AddSalesLeadDialog v-if="editSalesLeadConfig.visible" :edit-rightContent-config="editSalesLeadConfig" /> -->
@@ -42,9 +54,11 @@
<script>
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
-import { getSalesLeadsList, getDeleteSalesLeads } from "@/api/client/salesLead"
+import {
+ getPurchaseList,getPurchaseInfo,submitPurchase,
+} from "@/api/purchaseManage/purchase";
import DetailSupplier from "@/views/purchaseManage/returned/DetailSupplier"
-
+import { getDataByType } from "@/api/data";
export default {
name: "SupplierManage",
props: {},
@@ -59,7 +73,21 @@
visible: false,
infomation: {}
},
- search_map: {}
+ search: '',
+ returnedStatusList:getDataByType('returnedStatus'),
+ tableColumn: [
+ { label: "閫�璐у崟缂栧彿", prop: "number", min: 190, isCommonClick: true ,default:true},
+ { label: "閲囪喘鍗曠紪鍙�", prop: "name", min: 130, isCommonClick: true},
+ { label: "鍗曟嵁绫诲瀷", prop: "contact_name", min: 130 },
+ { label: "渚涘簲鍟嗗悕绉�", prop: "contact_phone", min: 130 },
+ { label: "閫�璐т粨搴�", prop: "sales_resources", min: 130 },
+ { label: "閫�璐х悊鐢�", prop: "province", min: 180 },
+ { label: "缁忓姙浜�", prop: "city", min: 130 },
+ { label: "鍒跺崟浜�", prop: "member_name", min: 130 },
+ { label: "閫�璐ф棩鏈�", prop: "member_name", min: 150 },
+ // { label: "鐘舵��", prop: "member_name", min: 110 }
+ ],
+ showCol: ['閫�璐у崟缂栧彿', '閲囪喘鍗曠紪鍙�', '鍗曟嵁绫诲瀷', '渚涘簲鍟嗗悕绉�', '閫�璐т粨搴�', '閫�璐х悊鐢�', '閫�璐ф棩鏈�']
}
},
created() {
@@ -67,58 +95,58 @@
this.getData()
},
methods: {
+ getReturnedStatus(val) {
+ if (val) {
+ for (let i in this.returnedStatusList) {
+ if (this.returnedStatusList[i].id == val) {
+ return this.returnedStatusList[i].name;
+ }
+ }
+ } else {
+ return "--";
+ }
+ },
+ setColumnVisible(showCol){
+ return this.tableColumn.map(ele=>{
+ return {
+ ...ele,
+ isShowColumn:showCol.includes(ele.label)
+ }
+ })
+ },
setTable() {
this.tableList = {
tableInfomation: [],
selectIndex: true,
- tableColumn: [
- { label: "閫�璐у崟缂栧彿", prop: "number", min: 190, isCommonClick: true },
- { label: "閲囪喘鍗曠紪鍙�", prop: "name", min: 130, isCommonClick: true},
- { label: "鍗曟嵁绫诲瀷", prop: "contact_name", min: 130 },
- { label: "渚涘簲鍟嗗悕绉�", prop: "contact_phone", min: 130 },
- { label: "閫�璐т粨搴�", prop: "sales_resources", min: 130 },
- { label: "閫�璐х悊鐢�", prop: "province", min: 180 },
- { label: "缁忓姙浜�", prop: "city", min: 130 },
- { label: "鍒跺崟浜�", prop: "member_name", min: 130 },
- { label: "閫�璐ф棩鏈�", prop: "member_name", min: 150 },
- { label: "鐘舵��", prop: "member_name", min: 110 }
- ]
+ showcol: this.showCol,
+ allcol: [],
+ tableColumn:this.setColumnVisible(this.showCol)
}
+ this.tableList.allcol = this.tableList.tableColumn.filter(ele=>!ele.default).map(ele=>ele.label);
+ },
+ selTableCol(val) {
+ this.showcol = val;
+ this.tableList.tableColumn = this.setColumnVisible(val);
},
// 璇锋眰鏁版嵁
async getData() {
- await getSalesLeadsList({
- search_map: this.search_map,
+ await getPurchaseList({
+ keyword: this.search,
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize
})
.then((res) => {
- const list = res.data.list.map((item) => {
- return {
- ...item,
- province: item.Province.name,
- city: item.City.name,
- sales_resources: item.sales_sources.name,
- member_name: item.member.username
- }
- })
+ const list = res.data.data.list
this.tableList.tableInfomation = list || []
- this.pagerOptions.totalCount = res.data.count
+ this.pagerOptions.totalCount = res.data.data.total
})
.catch((err) => {
console.log(err)
})
},
- // 鎼滅储
- searchClick(val, content) {
- console.log(val, content)
- this.search_map = {
- [val.value]: content
- }
- this.getData()
- },
- resetClick() {
- this.search_map = {}
+ onFilterSearch(searchText){
+ this.search = searchText ?? ''
+ this.pagerOptions.currPage = 1
this.getData()
},
@@ -131,7 +159,7 @@
})
.then(() => {
console.log("dddd")
- getDeleteSalesLeads({ ids: this.selValueList }).then((response) => {
+ submitPurchase({ ids: this.selValueList }).then((response) => {
if (response.code === 200) {
this.$message.success("纭鍙戣揣鎴愬姛")
this.getData()
@@ -142,18 +170,21 @@
})
.catch(() => {})
},
- getSelectArray(val) {
- this.selValueList = []
- const list = val.map((item) => {
- return item.id
- })
- this.selValueList = list
- },
+
// 璇︽儏
selCommonClick(row) {
console.log(row)
- this.commonDetail.visible = true
- this.commonDetail.infomation = { ...row }
+ getPurchaseInfo({id:row.ID}).then((res) => {
+ if (res.code == 200) {
+ this.commonDetail.visible = true
+ this.commonDetail.infomation = {
+ productList:res.data.productList,
+ ...res.data.purchase
+ }
+ }else{
+ this.$message.error(res.msg?res.msg+',':''+'鑾峰彇淇℃伅澶辫触锛�')
+ }
+ })
}
}
}
@@ -161,40 +192,40 @@
<!-- Add "scoped" attribute to limit CSS to this component only -->
<style lang="scss" scoped>
-.rightContent {
- width:100%;
- height:calc(100% - 10px);
- .content-box {
- height:100%;
- .supplier-search {
+.returned{
+ height: 100%;
+ overflow: hidden;
+ background-color: transparent;
+ .filter{
+ height: 80px;
+ display: flex;
+ align-items: center;
+ padding: 12px 20px 0 20px;
+ &-card{
+ height: 80px;
display: flex;
align-items: center;
- .add-view {
- margin-left: auto;
- margin-right: 20px;
- }
- }
- .content-table{
- // height:calc(100% - 60px - 42px);
- }
- .btn-pager {
- display: flex;
- .page {
- margin-left: auto;
- }
+ box-sizing: border-box;
+ padding: 10px 20px;
+ flex: 1;
+ border-radius: 12px;
+ background-color: #fff;
}
}
- .bottom {
- .product-search {
- display: flex;
- align-items: center;
- .search {
- margin-left: auto;
- }
- .add-view {
- margin-left: 20px;
- margin-right: 20px;
- }
+ .body{
+ box-sizing: border-box;
+ padding: 10px 20px;
+ border-radius: 12px;
+ height: calc(100% - 92px);
+ &-card {
+ background-color: #fff;
+ border-radius: 12px;
+ height: 100%;
+ overflow: hidden;
+ }
+ .list-view {
+ height: calc(100% - 60px);
+ overflow: hidden;
}
.btn-pager {
display: flex;
--
Gitblit v1.8.0