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/masterOrder/index.vue | 415 +++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 303 insertions(+), 112 deletions(-)
diff --git a/src/views/sales/masterOrder/index.vue b/src/views/sales/masterOrder/index.vue
index 55e93d7..99aa01c 100644
--- a/src/views/sales/masterOrder/index.vue
+++ b/src/views/sales/masterOrder/index.vue
@@ -1,61 +1,98 @@
<template>
<div class="master-order">
- <SearchCommonView ref="searchCommonView" :query-class-options="queryClassOptions" :search-options="searchOptions" />
- <div class="btn-pager">
- <PublicFunctionBtnView
- :duplicate-check="true"
- :list-button="true"
- :map-button="true"
- :statistics="true"
- :operates-list="operatesList"
- />
- <PagerView class="page" />
+ <div v-if="isDetail" class="detail-top">
+ <DetailListCommonBtn :query-class-options="queryClassOptions" />
</div>
- <TableCommonView ref="tableListRef" :table-list="tableList">
- <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 type="text" size="small">璺熻繘</el-button>
+
+ <div v-else class="filter">
+ <div class="filter-card">
+ <CommonSearch
+ :show-add="false"
+ :amount-view="false"
+ placeholder="璇疯緭鍏ュ崟鎹紪鍙�"
+ @searchClick="onFilterSearch"
+ >
+ <template slot="leftButton">
+ <el-button size="small" type="primary" @click="addBtnClick">鏂板缓</el-button>
+<!-- <el-button size="small" @click="delClick">鍒犻櫎</el-button>-->
</template>
- </el-table-column>
- </template>
- </TableCommonView>
+ </CommonSearch>
+ </div>
+ </div>
+
+ <div class="body">
+ <div class="body-card">
+ <div class="list-view">
+ <TableCommonView
+ ref="tableListRef"
+ :show-summary="showSummary"
+ :table-list="tableList"
+ @selClientClick="selClientClick"
+ @selCommonClick="selCommonClick"
+ @getSelectArray="getSelectArray"
+ @selTableCol="selTableCol"
+ >
+ <template slot="tableButton">
+ <el-table-column label="鎿嶄綔" width="90">
+ <template slot-scope="scope">
+ <el-button @click="handleClick(scope.row)" type="text" size="small">缂栬緫</el-button>
+ <el-button @click="deleteItem(scope.row.id)" 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>
+ </div>
+ </div>
<!-- 鏂板缓/缂栬緫 -->
- <AddSalesLeadDialog v-if="editSalesLeadConfig.visible" :edit-sales-lead-config="editSalesLeadConfig" />
+ <AddMasterOrderDialog v-if="editConfig.visible" :edit-common-config="editConfig" />
+ <!-- 閿�鍞瓙鍗曡鎯� -->
+ <DetailMasterOrder v-if="masterOrderDeail.visible" :master-order-detail="masterOrderDeail" />
+ <!-- 瀹㈡埛璇︽儏 -->
+ <DetailClientManage v-if="clientDeail.visible" :client-manage-detail="clientDeail" />
</div>
</template>
<script>
-import SearchCommonView from "@/components/makepager/SearchCommonView"
-import PublicFunctionBtnView from "@/components/makepager/PublicFunctionBtnView"
-import PagerView from "@/components/makepager/PagerView"
-import TableCommonView from "@/components/makepager/TableCommonView"
-import AddSalesLeadDialog from "@/views/custom/salesLead/AddSalesLeadDialog"
+import AddMasterOrderDialog from "@/views/sales/masterOrder/AddMasterOrderDialog"
+import { getMasterOrderList, getDelMasterOrder } from "@/api/sales/masterOrder"
+import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
+import DetailMasterOrder from "@/views/sales/masterOrder/DetailMasterOrder"
export default {
name: "MasterOrder",
- props: {},
- components: {
- SearchCommonView,
- PublicFunctionBtnView,
- PagerView,
- TableCommonView,
- AddSalesLeadDialog
- },
- computed: {
- searchCommonHeight() {
- return this.$refs.searchCommonView.offsetHeight
+ props: {
+ isDetail: {
+ type: Boolean,
+ default: false
+ },
+ addConfig: {
+ type: Object,
+ default: () => {
+ return {}
+ }
}
},
+ mixins: [pageMixin],
+ components: {
+ AddMasterOrderDialog,
+ DetailMasterOrder,
+ DetailClientManage: () => import("@/views/client/client/DetailClientManage")
+ },
+ computed: {},
data() {
return {
tableList: {},
queryClassOptions: [
{ value: "1", label: "鍏ㄩ儴" },
- { value: "2", label: "骞垮憡瀹ｄ紶" },
- { value: "3", label: "璺熻繘涓�" },
- { value: "4", label: "澶辫触鍏抽棴" }
+ { value: "2", label: "宸叉壒鍑�" },
+ { value: "3", label: "瀹℃壒涓�" },
+ { value: "4", label: "鏈彁浜�" },
+ { value: "5", label: "宸查┏鍥�" },
+ { value: "6", label: "宸叉嫆缁�" }
],
searchOptions: [],
operatesList: [
@@ -66,100 +103,219 @@
{ id: "5", name: "鏇存敼鍒涘缓浜�" },
{ id: "6", name: "鏍戠粨鏋勮缃�" },
{ id: "7", name: "瀹℃壒璁剧疆" },
- { id: "8", name: "鍏捣鍙傛暟璁剧疆" }
+ { id: "8", name: "鎭㈠棰勮鍒楀" }
],
- editSalesLeadConfig: {
+ editConfig: {
visible: false,
title: "鏂板缓",
infomation: {}
- }
+ },
+ showSummary: {
+ show: false,
+ sumProp: ["money"],
+ mergeNumber: 5
+ },
+ masterOrderDeail: {
+ visible: false,
+ infomation: {}
+ },
+ clientDeail: {
+ visible: false,
+ infomation: {}
+ },
+ selValueList: [],
+ search_map: {},
+ searchSel: {
+ value: "number",
+ label: "鍗曟嵁缂栧彿"
+ },
+ tableColumn: [
+ { label: "鍗曟嵁缂栧彿", prop: "number", min: 100, isCommonClick: true, default: true }, // 鍗曟嵁缂栧彿
+ { label: "瀹㈡埛鍚嶇О", prop: "client_name", min: 120, isClientClick: true }, // 瀹㈡埛鍚嶇О
+ { label: "鏈嶅姟寮�濮嬫椂闂�", prop: "start_time" }, // 鏈嶅姟寮�濮嬫椂闂�
+ { label: "鏈嶅姟鎴鏃堕棿", prop: "end_time" }, // 鏈嶅姟鎴鏃堕棿
+ { label: "鍚堝悓閲戦", prop: "money" }, // 鍚堝悓閲戦
+ { label: "璐熻矗浜�", prop: "member_name" } // 璐熻矗浜�
+ // { label: "瀹℃壒鐘舵��", prop: "approvalStatus" } // 瀹℃壒鐘舵��
+ ],
+ showCol:["鍗曟嵁缂栧彿", "瀹㈡埛鍚嶇О", "鏈嶅姟寮�濮嬫椂闂�", "鏈嶅姟鎴鏃堕棿", "鍚堝悓閲戦", "璐熻矗浜�"]
}
},
created() {
this.setTable()
+ if (!this.isDetail) {
+ this.search_map = {}
+ } else {
+ this.search_map = {
+ [this.addConfig.id_name]: this.addConfig.client_name
+ }
+ }
+ this.getData(this.search_map)
},
methods: {
setTable() {
this.tableList = {
- tableInfomation: [
- {
- customName: "123123",
- customType: "鏅�氬鎴�",
- salesHead: "绯荤粺绠＄悊鍛�",
- modifyTime: "2023-0703 11:22:12",
- customerSize: "499浠ヤ笂",
- importantLevel: "A绫诲鎴�",
- customNumber: "AC651",
- customStatus: "娼滃湪瀹㈡埛",
- productName: "鑷姩鎵撳嵃鏈�",
- startDate: "2023-06-27",
- endDate: "2024-07-15"
- }
- ],
- tableColumn: [
- { label: "瀹㈡埛鍚嶇О", prop: "customName", min: 120 }, // 瀹㈡埛鍚嶇О
- { label: "瀹㈡埛绫诲瀷", prop: "customType", min: 90 }, // 瀹㈡埛绫诲瀷
- { label: "閿�鍞礋璐ｄ汉", prop: "salesHead" }, // 閿�鍞礋璐ｄ汉
- { label: "淇敼鏃堕棿", prop: "modifyTime", min: 100 }, // 淇敼鏃堕棿
- { label: "瀹㈡埛瑙勬ā", prop: "customerSize" }, // 瀹㈡埛瑙勬ā
- { label: "閲嶈绾у埆", prop: "importantLevel" }, // 閲嶈绾у埆
- { label: "瀹㈡埛缂栧彿", prop: "customNumber" }, // 瀹㈡埛缂栧彿
- { label: "瀹㈡埛鐘舵��", prop: "customStatus" }, // 瀹㈡埛鐘舵��
- { label: "浜у搧鍚嶇О", prop: "productName" }, // 浜у搧鍚嶇О
- { label: "鏈嶅姟寮�濮嬫棩鏈�", prop: "startDate" }, // 鏈嶅姟寮�濮嬫棩鏈�
- { label: "鏈嶅姟鍒版湡鏃�", prop: "endDate" } // 鏈嶅姟鍒版湡鏃�
- ]
+ selectIndex:true,
+ 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 = []
for (let i = 0; i < this.tableList.tableColumn.length; i++) {
const label = this.tableList.tableColumn[i].label
- this.searchOptions.push({ value: (i + 1).toString(), label: 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)
+ }
+ })
+ },
+ selTableCol(val) {
+ this.showcol = val;
+ this.tableList.tableColumn = this.setColumnVisible(val);
+ },
+ // 璇锋眰鏁版嵁
+ async getData() {
+ this.loading = true
+ await getMasterOrderList({
+ search_map: this.search_map,
+ page: this.pagerOptions.currPage,
+ pageSize: this.pagerOptions.pageSize
+ })
+ .then((res) => {
+ console.log(res)
+ if (res.code === 200) {
+ if (res.data.list && res.data.list.length > 0) {
+ const list = res.data.list.map((item) => {
+ return {
+ ...item,
+ client_name: item.client.name,
+ member_name: item.member.username
+ }
+ })
+ this.tableList.tableInfomation = list || []
+ this.pagerOptions.totalCount = res.data.count
+ } else {
+ this.tableList.tableInfomation = []
+ }
+ } else {
+ this.tableList.tableInfomation = []
+ }
+ this.loading = false
+ })
+ .catch((err) => {
+ console.log(err)
+ this.tableList.tableInfomation = []
+ this.loading = false
+ })
+ },
+ // 鎼滅储
+ onFilterSearch(searchText){
+ if (searchText){
+ this.search_map = {
+ number: searchText
+ }
+ }else{
+ this.search_map = {}
+ }
+ this.pagerOptions.currPage = 1
+ this.getData()
},
// 鏂板缓
addBtnClick() {
- this.editSalesLeadConfig.visible = true
- this.editSalesLeadConfig.title = "鏂板缓"
- this.editSalesLeadConfig.infomation = {
- customName: "",
- saleLeadNumber: "LEA50",
- contactName: "",
- contactDuties: "",
- phoneNumber: "",
- businessStatus: "鏂板缓",
- businessSource: "1",
- owner: "",
- position: "",
- map: "",
- country: "1",
- province: "1",
- city: "1",
- region: "1",
- address: ""
- }
+ this.editConfig.visible = true
+ this.editConfig.title = "鏂板缓"
+ this.editConfig.infomation = { ...this.addConfig }
},
// 缂栬緫
handleClick(row) {
console.log(row)
- this.editSalesLeadConfig.visible = true
- this.editSalesLeadConfig.title = "缂栬緫"
- this.editSalesLeadConfig.infomation = {
- customName: row.customName,
- saleLeadNumber: row.saleLeadNumber,
- contactName: row.contactName,
- contactDuties: row.contactDuties,
- phoneNumber: row.phoneNumber,
- businessStatus: "鏂板缓",
- businessSource: row.businessSource,
- owner: row.owner,
- position: "",
- map: "",
- country: "1",
- province: "1",
- city: "1",
- region: "1",
- address: ""
+ this.editConfig.visible = true
+ this.editConfig.title = "缂栬緫"
+ this.editConfig.infomation = { ...row }
+ },
+ // 鎵归噺鍒犻櫎
+ delClick() {
+ if (this.selValueList && this.selValueList.length > 0) {
+ this.$confirm("鏄惁纭鍒犻櫎?", "璀﹀憡", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning"
+ })
+ .then(() => {
+ getDelMasterOrder({ ids: this.selValueList }).then((response) => {
+ if (response.code === 200) {
+ this.$message.success("鍒犻櫎鎴愬姛")
+ this.getData()
+ } else {
+ this.$message.warning("鍒犻櫎澶辫触")
+ }
+ })
+ })
+ .catch(() => {})
+ } else {
+ this.$message.warning("璇疯嚦灏戦�夋嫨涓�鏉¤褰�")
}
+ },
+ /**
+ * 鍗曚釜鍒犻櫎
+ * @param id 閿�鍞�诲崟id
+ */
+ deleteItem(id) {
+ this.$confirm("鏄惁纭鍒犻櫎?", "璀﹀憡", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning"
+ })
+ .then(() => {
+ getDelMasterOrder({ids: [id]}).then((response) => {
+ if (response.code === 200) {
+ this.$message.success("鍒犻櫎鎴愬姛")
+ this.getData()
+ } else {
+ this.$message.warning("鍒犻櫎澶辫触")
+ }
+ })
+ })
+ .catch((err) => {
+ if (err !== 'cancel') {
+ console.error(err)
+ this.$message.warning("鍒犻櫎澶辫触")
+ }
+ })
+ },
+ getSelectArray(val) {
+ console.log(val)
+ this.selValueList = []
+ const list = val.map((item) => {
+ return item.id
+ })
+ this.selValueList = list
+ },
+ // 瀹㈡埛鍚嶇О璇︽儏
+ selClientClick(row) {
+ console.log(row)
+ this.clientDeail.visible = true
+ this.clientDeail.infomation = {
+ ...row.client,
+ client_name: row.client.name,
+ client_level: row.client.client_level.name,
+ client_status: row.client.client_status.name,
+ contact_name: row.name
+ }
+ },
+ // 鏈轰細鍚嶇О璇︽儏
+ selCommonClick(row) {
+ console.log(row)
+ this.masterOrderDeail.visible = true
+ this.masterOrderDeail.infomation = { ...row }
}
}
}
@@ -167,11 +323,46 @@
<!-- Add "scoped" attribute to limit CSS to this component only -->
<style lang="scss" scoped>
-.master-order {
- .btn-pager {
+.master-order{
+ height: 100%;
+ overflow: hidden;
+ .filter{
+ height: 80px;
display: flex;
- .page {
- margin-left: auto;
+ align-items: center;
+ padding: 12px 20px 0 20px;
+ &-card{
+ height: 80px;
+ display: flex;
+ align-items: center;
+ box-sizing: border-box;
+ padding: 10px 20px;
+ flex: 1;
+ border-radius: 12px;
+ background-color: #fff;
+ }
+ }
+ .body{
+ box-sizing: border-box;
+ padding: 10px 20px;
+ border-radius: 12px;
+ height: calc(100% - 92px);
+ .body-card {
+ background-color: #fff;
+ border-radius: 12px;
+ height: 100%;
+ overflow: hidden;
+ }
+ .list-view {
+ height: calc(100% - 60px);
+ overflow: hidden;
+ }
+ .btn-pager {
+ display: flex;
+ margin-top: 10px;
+ .page {
+ margin-left: auto;
+ }
}
}
}
--
Gitblit v1.8.0