From d05d95424986dc6e8defefb24fab6dc62e37ee08 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期六, 21 十月 2023 16:23:05 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/adjust-style
---
src/views/sales/generatePlan/index.vue | 121 ++++++++++++++++++++++++++++++----------
1 files changed, 90 insertions(+), 31 deletions(-)
diff --git a/src/views/sales/generatePlan/index.vue b/src/views/sales/generatePlan/index.vue
index a7bf7f2..f6ae8f7 100644
--- a/src/views/sales/generatePlan/index.vue
+++ b/src/views/sales/generatePlan/index.vue
@@ -1,34 +1,53 @@
<template>
<div class="generate-plan">
- <SearchCommonView ref="searchCommonView" :query-class-options="queryClassOptions" :search-options="searchOptions" />
- <div class="btn-pager">
- <PublicFunctionBtnView :operates-list="operatesList" />
- <PagerView class="page" />
+ <div class="top">
+ <SearchCommonView
+ ref="searchCommonView"
+ :query-class-options="queryClassOptions"
+ :search-options="searchOptions"
+ @searchClick="searchClick"
+ @resetClick="resetClick"
+ />
+ <div class="btn-pager">
+ <PublicFunctionBtnView :operates-list="operatesList" @batchDelete="delClick" />
+ <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
+ </div>
</div>
- <TableCommonView ref="tableListRef" :table-list="tableList">
+ <TableCommonView
+ ref="tableListRef"
+ :table-list="tableList"
+ @selCommonClick="selCommonClick"
+ @getSelectArray="getSelectArray"
+ >
<template slot="tableButton">
<el-table-column label="鎿嶄綔" width="100">
<template slot-scope="scope">
<el-button @click="handleClick(scope.row)" type="text" size="small">缂栬緫</el-button>
- <el-button @click="delClick(scope.row.id)" type="text" size="small">鍒犻櫎</el-button>
+ <!-- <el-button @click="delClick(scope.row.id)" type="text" size="small">鍒犻櫎</el-button> -->
</template>
</el-table-column>
</template>
</TableCommonView>
<!-- 鏂板缓/缂栬緫-->
<AddGeneratePlanDialog v-if="editConfig.visible" :edit-common-config="editConfig" />
+ <!-- 鐢熶骇璁″垝璇︽儏 -->
+ <DetailGeneratePlan v-if="planDetail.visible" :plan-detail="planDetail" />
</div>
</template>
<script>
import AddGeneratePlanDialog from "@/views/sales/generatePlan/AddGeneratePlanDialog"
import { getPlanList, getDelPlan } from "@/api/sales/generatePlan"
+import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
+import DetailGeneratePlan from "@/views/sales/generatePlan/DetailGeneratePlan"
export default {
name: "GeneratePlan",
props: {},
+ mixins: [pageMixin],
components: {
- AddGeneratePlanDialog
+ AddGeneratePlanDialog,
+ DetailGeneratePlan
},
computed: {
searchCommonHeight() {
@@ -61,7 +80,13 @@
visible: false,
title: "鏂板缓",
infomation: {}
- }
+ },
+ planDetail: {
+ visible: false,
+ infomation: {}
+ },
+ selValueList: [],
+ search_map: {}
}
},
created() {
@@ -73,7 +98,7 @@
this.tableList = {
tableInfomation: [],
tableColumn: [
- { label: "鍗曟嵁缂栧彿", prop: "number", min: 120 },
+ { label: "鍗曟嵁缂栧彿", prop: "number", min: 120, isCommonClick: true },
{ label: "璐熻矗浜�", prop: "memberId", min: 90 },
{ label: "瀹℃壒鐘舵��", prop: "approvalStatus" },
{ label: "鍒涘缓浜�", prop: "creator", min: 100 },
@@ -89,7 +114,11 @@
// 璇锋眰鏁版嵁
async getData() {
this.loading = true
- await getPlanList()
+ await getPlanList({
+ search_map: this.search_map,
+ page: this.pagerOptions.currPage,
+ pageSize: this.pagerOptions.pageSize
+ })
.then((res) => {
console.log(res)
if (res.code === 200) {
@@ -100,6 +129,7 @@
}
})
this.tableList.tableInfomation = list || []
+ this.pagerOptions.totalCount = res.data.count
} else {
this.tableList.tableInfomation = []
}
@@ -113,6 +143,18 @@
this.tableList.tableInfomation = []
this.loading = false
})
+ },
+ // 鎼滅储
+ searchClick(val, content) {
+ console.log(val, content)
+ this.search_map = {
+ [val.value]: content
+ }
+ this.getData()
+ },
+ resetClick() {
+ this.search_map = {}
+ this.getData()
},
// 鏂板缓
addBtnClick() {
@@ -128,27 +170,41 @@
this.editConfig.infomation = { ...row }
},
// 鍒犻櫎
- delClick(id) {
- this.$confirm("鏄惁纭鍒犻櫎?", "璀﹀憡", {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "warning"
- })
- .then(function () {
- return getDelPlan({ id: id })
+ delClick() {
+ if (this.selValueList && this.selValueList.length > 0) {
+ this.$confirm("鏄惁纭鍒犻櫎?", "璀﹀憡", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning"
})
- .then((response) => {
- if (response.code === 200) {
- this.$message.success("鍒犻櫎鎴愬姛")
- this.getData()
- } else {
- this.$message.warning("鍒犻櫎澶辫触")
- }
- })
- .catch(function () {})
+ .then(() => {
+ getDelPlan({ ids: this.selValueList }).then((response) => {
+ if (response.code === 200) {
+ this.$message.success("鍒犻櫎鎴愬姛")
+ this.getData()
+ } else {
+ this.$message.warning("鍒犻櫎澶辫触")
+ }
+ })
+ })
+ .catch(() => {})
+ } else {
+ this.$message.warning("璇疯嚦灏戦�夋嫨涓�鏉¤褰�")
+ }
},
getSelectArray(val) {
console.log(val)
+ this.selValueList = []
+ const list = val.map((item) => {
+ return item.id
+ })
+ this.selValueList = list
+ },
+ // 鍚堝悓绠＄悊璇︽儏
+ selCommonClick(row) {
+ console.log(row)
+ this.planDetail.visible = true
+ this.planDetail.infomation = { ...row }
}
}
}
@@ -157,10 +213,13 @@
<!-- Add "scoped" attribute to limit CSS to this component only -->
<style lang="scss" scoped>
.generate-plan {
- .btn-pager {
- display: flex;
- .page {
- margin-left: auto;
+ .top {
+ margin-bottom: 20px;
+ .btn-pager {
+ display: flex;
+ .page {
+ margin-left: auto;
+ }
}
}
}
--
Gitblit v1.8.0