From 22d81fd4a1a2d9e5d56cd496971893437ef84599 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期三, 03 一月 2024 10:07:30 +0800
Subject: [PATCH] Merge branch 'wn' of http://192.168.5.5:10010/r/web/crm-web into dev
---
src/views/sales/salesDetails/index.vue | 344 +++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 259 insertions(+), 85 deletions(-)
diff --git a/src/views/sales/salesDetails/index.vue b/src/views/sales/salesDetails/index.vue
index f1e49e6..d6612f7 100644
--- a/src/views/sales/salesDetails/index.vue
+++ b/src/views/sales/salesDetails/index.vue
@@ -62,8 +62,8 @@
class="tab-pane"
@click="getTab(0)"
:style="{
- background: isClickProduct ? '#2a78fb' : '#F1F3F8',
- color: isClickProduct ? '#fff' : '#666'
+ background: TabsIndex==0 ? '#2a78fb' : '#F1F3F8',
+ color: TabsIndex==0 ? '#fff' : '#666'
}"
>
浜у搧淇℃伅
@@ -72,21 +72,31 @@
class="tab-pane"
@click="getTab(1)"
:style="{
- background: isClickInventory ? '#2a78fb' : '#F1F3F8',
- color: isClickInventory ? '#fff' : '#666'
+ background: TabsIndex==1 ? '#2a78fb' : '#F1F3F8',
+ color: TabsIndex==1 ? '#fff' : '#666'
}"
>
- 搴撳瓨淇℃伅
+ 鍙戣揣淇℃伅
</div>
<div
class="tab-pane"
@click="getTab(2)"
:style="{
- background: isClickMake ? '#2a78fb' : '#F1F3F8',
- color: isClickMake ? '#fff' : '#666'
+ background: TabsIndex==2 ? '#2a78fb' : '#F1F3F8',
+ color: TabsIndex==2 ? '#fff' : '#666'
}"
>
鍒堕�犱俊鎭�
+ </div>
+ <div
+ class="tab-pane"
+ @click="getTab(3)"
+ :style="{
+ background: TabsIndex==3 ? '#2a78fb' : '#F1F3F8',
+ color: TabsIndex==3 ? '#fff' : '#666'
+ }"
+ >
+ 閲囪喘淇℃伅
</div>
</div>
<div class="list-view">
@@ -102,6 +112,26 @@
</div>
</div>
</div>
+ <!-- 纭鎻愪氦-閫夋嫨椤圭洰 -->
+ <el-dialog title="璇烽�夋嫨椤圭洰" :visible.sync="projectListShow" width="400px" :before-close="handleClose">
+ <el-form label-width="100px" class="demo-ruleForm" ref="form" :rules="rules" :model="projects">
+ <el-form-item label="閫夋嫨椤圭洰" prop="projectId">
+ <el-select v-model="projects.projectId" placeholder="璇烽�夋嫨" size="mini" style="width: 100%">
+ <el-option
+ v-for="item in projectList"
+ :key="item.projectId"
+ :label="item.projectName"
+ :value="item.projectId"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-form>
+ <span slot="footer" class="dialog-footer dialog_btn">
+ <el-button @click="projectListShow = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="affirmCommitBtn">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
<!-- 鏂板缓/缂栬緫 -->
<AddSalesDetailsDialog
v-if="editConfig.visible"
@@ -125,12 +155,13 @@
getProductInventoryInfo,
getProductOrderInfo,
updateStatus,
- createOperation
+ getProjectList,
+ sendSalesDetailsToOtherSystem
} from "@/api/sales/salesDetails"
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
import DetailSpecification from "@/views/sales/salesDetails/DetailSpecification"
import AddCollectionPlan from "@/views/other/payment/collectionPlan/AddCollectionPlan"
-
+import { getDataByType } from "@/api/data"
export default {
name: "SalesDetails",
props: {
@@ -160,36 +191,65 @@
data() {
// 浜у搧淇℃伅
const productColumn = [
- { label: "浜у搧缂栧彿", prop: "Id", default: true },
- { label: "浜у搧鍚嶇О", prop: "Name" },
- { label: "鏁伴噺", prop: "Amount" },
- { label: "鍗曚綅", prop: "Unit" },
- { label: "鍙戣揣鍗�", prop: "shipOrder" },
- { label: "鎵胯繍鍟�", prop: "carrier" },
- { label: "杩愬崟鍙�", prop: "waybillNumber" },
- { label: "閿�鍞崟浠�", prop: "SalePrice", price: true },
- { label: "浠风◣鍚堣", prop: "Valorem", price: true }
+ { label: "浜у搧缂栧彿", prop: "number", default: true },
+ { label: "浜у搧鍚嶇О", prop: "name" },
+ { label: "鏁伴噺", prop: "amount" },
+ { label: "鍗曚綅", prop: "unit" },
+ { label: "閿�鍞崟浠�", prop: "salePrice", price: true },
+ { label: "鎴愭湰鍗曚环", prop: "cost" },
+ { label: "姣涘埄", prop: "profit" },
+ { label: "姣涘埄鐜�(%)", prop: "margin",},
+ { label: "浠风◣鍚堣", prop: "total", price: true }
]
// 搴撳瓨淇℃伅
const inventoryColumn = [
- { label: "浜у搧缂栧彿", prop: "Id", default: true },
- { label: "浜у搧鍚嶇О", prop: "Name" },
- { label: "璁㈠崟鏁伴噺", prop: "OrderAmount" },
- { label: "浠撳簱", prop: "Warehouse" },
- { label: "鍦ㄥ簱鏁伴噺", prop: "Amount" },
- { label: "鍙敤搴撳瓨", prop: "AvailableNumber" },
- { label: "鍗曚綅", prop: "Unit" }
+ { label: "浜у搧缂栧彿", prop: "number", default: true },
+ { label: "浜у搧鍚嶇О", prop: "name" },
+ { label: "璁㈠崟鏁伴噺", prop: "orderAmount" },
+ { label: "鍙戣揣鍗�", prop: "invoice" },
+ { label: "鎵胯繍鍟�", prop: "carrier" },
+ { label: "杩愬崟鍙�", prop: "waybill" },
+ { label: "浠撳簱", prop: "warehouse" },
+ { label: "鍦ㄥ簱鏁伴噺", prop: "amount" },
+ { label: "鍙敤搴撳瓨", prop: "availableNumber" },
+ { label: "鍗曚綅", prop: "unit" }
]
// 鍒堕�犱俊鎭�
const makeColumn = [
- { label: "鐢熶骇璁㈠崟", prop: "OrderId", default: true },
- { label: "浜у搧鍚嶇О", prop: "ProductName" },
- { label: "璁㈠崟鐘舵��", prop: "OrderStatus" },
- { label: "宸ュ崟缂栧彿", prop: "WorkOrderId" },
- { label: "宸ュ崟鐘舵��", prop: "WorkOrderStatus" },
- { label: "璁″垝寮�濮嬫椂闂�", prop: "StartTime" },
- { label: "璁″垝缁撴潫鏃堕棿", prop: "EndTime" }
+ { label: "鐢熶骇璁㈠崟", prop: "orderId", default: true },
+ { label: "浜у搧鍚嶇О", prop: "productName" },
+ { label: "璁㈠崟鐘舵��", prop: "orderStatus" },
+ { label: "宸ュ崟缂栧彿", prop: "workOrderId" },
+ { label: "宸ュ崟鐘舵��", prop: "workOrderStatus" },
+ { label: "璁″垝寮�濮嬫椂闂�", prop: "startTime" },
+ { label: "璁″垝缁撴潫鏃堕棿", prop: "endTime" }
]
+ // 閲囪喘淇℃伅
+ const purchaseColumn=[
+ {
+ label: "閲囪喘鍗曞彿",
+ prop: "purchaseNumber",
+ default: true
+ },
+ {
+ label: "閲囪喘鍗曞悕绉�",
+ prop: "purchaseName",
+ },
+ {
+ label: "渚涘簲鍟嗗悕绉�",
+ prop: "supplierName",
+ },
+ {
+ label: "閲囪喘鏁伴噺",
+ prop: "amount",
+ },
+ {
+ label: "鐘舵��",
+ prop: "status",
+ isCallMethod: true,
+ getCallMethod: this.getpurchaseStatus,
+ },
+ ];
return {
tableList: {},
searchOptions: [],
@@ -202,7 +262,7 @@
show: false,
sumProp: [
"receiveTotalAmount",
- "total",
+ "amountTotal",
"amountReceivable",
"invoicedAmount",
"uninvoicedAmount",
@@ -240,24 +300,35 @@
{ label: "绛剧害鏃ユ湡", prop: "signTime" },
{ label: "浜や粯鏃ユ湡", prop: "deliveryDate" },
{ label: "璁㈠崟鏉ユ簮", prop: "source" },
- { label: "鍚堣", prop: "total", price: true },
+ { label: "鍚堣", prop: "amountTotal", price: true },
{ label: "鐘舵��", prop: "status", isCallMethod: true, getCallMethod: this.getStatus }
],
showCol: ["璁㈠崟缂栧彿", "閿�鍞礋璐ｄ汉", "绛剧害鏃ユ湡", "浜や粯鏃ユ湡", "璁㈠崟鏉ユ簮", "鍚堣", "鐘舵��"],
tableBottomColumn: [],
showBottomCol: [],
- isClickProduct: true, // 浜у搧淇℃伅
- isClickInventory: false, // 搴撳瓨淇℃伅
- isClickMake: false, // 鍒堕�犱俊鎭�
TabsIndex: "0",
productTableList: {},
productColumn: productColumn,
- showProductCol: ["浜у搧缂栧彿", "浜у搧鍚嶇О", "鏁伴噺", "鍗曚綅", "鍙戣揣鍗�", "鎵胯繍鍟�", "杩愬崟鍙�", "閿�鍞崟浠�", "浠风◣鍚堣"],
+ showProductCol: ["浜у搧缂栧彿", "浜у搧鍚嶇О", "鏁伴噺", "鍗曚綅", "閿�鍞崟浠�","鎴愭湰鍗曚环", "姣涘埄", "姣涘埄鐜�(%)","浠风◣鍚堣"],
inventoryColumn: inventoryColumn,
- showInventoryCol: ["浜у搧缂栧彿", "浜у搧鍚嶇О", "璁㈠崟鏁伴噺", "浠撳簱", "鍦ㄥ簱鏁伴噺", "鍙敤搴撳瓨", "鍗曚綅"],
+ showInventoryCol: ["浜у搧缂栧彿", "浜у搧鍚嶇О", "璁㈠崟鏁伴噺", "鍙戣揣鍗�", "鎵胯繍鍟�", "杩愬崟鍙�","浠撳簱", "鍦ㄥ簱鏁伴噺", "鍙敤搴撳瓨", "鍗曚綅"],
makeColumn: makeColumn,
showMakeCol: ["鐢熶骇璁㈠崟", "浜у搧鍚嶇О", "璁㈠崟鐘舵��", "宸ュ崟缂栧彿", "宸ュ崟鐘舵��", "璁″垝寮�濮嬫椂闂�", "璁″垝缁撴潫鏃堕棿"],
- selectRow: {}
+ // 閲囪喘
+ purchaseColumn: purchaseColumn,
+ showPurchaseCol: ['閲囪喘鍗曞彿','閲囪喘鍗曞悕绉�',"渚涘簲鍟嗗悕绉�", "閲囪喘鏁伴噺", "鐘舵��"],
+ selectRow: {},
+ projectList: [],
+ projectListShow: false,
+ projects: {
+ projectId: ""
+ },
+ thatRow: {},
+ rules: {
+ projectId: [{ required: true, message: "璇烽�夋嫨椤圭洰", trigger: "change" }]
+ },
+ purchaseStatusList: getDataByType("purchaseStatus"),
+ loading:false,
}
},
created() {
@@ -270,8 +341,20 @@
this.keywordType = this.addConfig.keywordType
}
this.getData()
+ this.getProjectList()
},
methods: {
+ getpurchaseStatus(val) {
+ if (val) {
+ for (let i in this.purchaseStatusList) {
+ if (this.purchaseStatusList[i].id == val) {
+ return this.purchaseStatusList[i].name;
+ }
+ }
+ } else {
+ return "--";
+ }
+ },
setTable() {
// top 鏄庣粏鍗曞垪琛�
this.tableList = {
@@ -328,7 +411,6 @@
},
// 璇锋眰鏁版嵁
async getData() {
- this.loading = true
let params = {}
console.log(this.addConfig)
if (this.addConfig.keywordType === "瀹㈡埛鍚嶇О") {
@@ -357,9 +439,9 @@
pageSize: this.pagerOptions.pageSize
}
}
+ this.loading = true
await getSalesDetailsList(params)
.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) => {
@@ -367,15 +449,14 @@
...item,
client_name: item.client.name,
member_name: item.Member.username,
- source: "CRM鍚屾"
+ source: ""
}
})
this.tableList.tableInfomation = list || []
this.pagerOptions.totalCount = res.data.count
if (res.data.count > 0) {
this.selectRow = this.tableList.tableInfomation.length > 0 ? this.tableList.tableInfomation[0] : {}
- let row = this.tableList.tableInfomation[0]
- this.getProductInventoryInfo(row.number)
+ this.tableRowClick(this.selectRow)
}
} else {
this.tableList.tableInfomation = []
@@ -392,18 +473,38 @@
})
},
// 鑾峰彇浜у搧/搴撳瓨淇℃伅
- async getProductInventoryInfo(number) {
- await getProductInventoryInfo(number).then((res) => {
- console.log(res)
- this.productTableList.tableInfomation = res.data
- })
+ async getProductInventoryInfo(row) {
+ if (this.TabsIndex == 0||row.status==1) {
+ this.productTableList.tableInfomation = row.products || []
+ } else {
+ if(row.number){
+ this.loading = true
+ await getProductInventoryInfo(row.number).then((res) => {
+ this.productTableList.tableInfomation = res.data?.length > 0 ? res.data : []
+ this.loading = false
+ }).catch(() => {
+ this.productTableList.tableInfomation = []
+ this.loading = false
+ })
+ }
+ }
},
// 鑾峰彇鍒堕�犱俊鎭�
async getProductOrderInfo(number) {
- await getProductOrderInfo(number).then((res) => {
- console.log(res)
- this.productTableList.tableInfomation = res.data
- })
+ if(number){
+ this.loading = true
+ await getProductOrderInfo(number).then((res) => {
+ if(this.TabsIndex == 3){
+ this.productTableList.tableInfomation = (res.data&&res.data.purchaseInfo) ? res.data.purchaseInfo : []
+ }else{
+ this.productTableList.tableInfomation = (res.data&&res.data.makeInfo) ? res.data.makeInfo : []
+ }
+ this.loading = false
+ }).catch(() => {
+ this.productTableList.tableInfomation = []
+ this.loading = false
+ })
+ }
},
// 鎼滅储
onFilterSearch(searchText) {
@@ -428,30 +529,35 @@
},
// 鏌ョ湅 缂栬緫
handleClick(row, title) {
- console.log(row, title)
- this.editConfig.visible = true
+ let params = JSON.parse(JSON.stringify(row));
this.editConfig.title = title
this.editConfig.infomation = {
- ...row,
+ ...params,
currency: "浜烘皯甯�",
- sale_chance_name: row.saleChance.name,
- deliverType: row.deliverType === 0 ? "" : row.deliverType,
- quotation_number: row.quotation.number
+ sale_chance_name: params.saleChance.name,
+ deliverType: params.deliverType === 0 ? "" : params.deliverType,
+ quotation_number: params.quotation.number
}
+ this.editConfig.visible = true
},
// 纭鎻愪氦
async submitClick(row) {
- console.log(row, "纭鎻愪氦")
- let params = {
- ...row,
- status: 2
- }
- await createOperation(params).then((res) => {
- if (res.code == 200) {
- this.$message.success("纭鎻愪氦鎴愬姛")
- this.getData()
+ this.thatRow = row
+ if (row.projectId == "") {
+ this.projectListShow = true
+ } else {
+ let params = {
+ ...row,
+ status: 2
}
- })
+ await sendSalesDetailsToOtherSystem(params).then((res) => {
+ if (res.code == 200) {
+ this.$message.success("鎴愬姛鎺ㄩ�佽嚦aps绯荤粺")
+ this.getData()
+ this.thatRow.status = 2
+ }
+ })
+ }
},
// 鍏抽棴
closeClick(row) {
@@ -530,30 +636,27 @@
getTab(tab) {
this.TabsIndex = tab
if (this.TabsIndex == 0) {
- this.isClickProduct = true
- this.isClickInventory = false
- this.isClickMake = false
// 浜у搧淇℃伅鍒楄〃
this.tableBottomColumn = this.productColumn
this.showBottomCol = this.showProductCol
this.setBottomList()
- this.getProductInventoryInfo(this.selectRow.number)
+ this.getProductInventoryInfo(this.selectRow)
} else if (this.TabsIndex == 1) {
- this.isClickProduct = false
- this.isClickInventory = true
- this.isClickMake = false
// 搴撳瓨淇℃伅鍒楄〃
this.tableBottomColumn = this.inventoryColumn
this.showBottomCol = this.showInventoryCol
this.setBottomList()
- this.getProductInventoryInfo(this.selectRow.number)
+ this.getProductInventoryInfo(this.selectRow)
} else if (this.TabsIndex == 2) {
- this.isClickProduct = false
- this.isClickInventory = false
- this.isClickMake = true
// 鍒堕�犱俊鎭垪琛�
this.tableBottomColumn = this.makeColumn
this.showBottomCol = this.showMakeCol
+ this.setBottomList()
+ this.getProductOrderInfo(this.selectRow.number)
+ } else if (this.TabsIndex == 3) {
+ // 閲囪喘淇℃伅鍒楄〃
+ this.tableBottomColumn = this.purchaseColumn
+ this.showBottomCol = this.showPurchaseCol
this.setBottomList()
this.getProductOrderInfo(this.selectRow.number)
}
@@ -563,16 +666,76 @@
return val === 1 ? "寰呯‘璁�" : val === 2 ? "寰呭嚭搴�" : val === 3 ? "鍑哄簱瀹屾垚" : val === 4 ? "宸插叧闂�" : "--"
},
// top 琛岀偣鍑�
- tableRowClick(row, column, event) {
- console.log(row, column, event)
+ tableRowClick(row) {
this.selectRow = row
if (this.TabsIndex == 0) {
- this.getProductInventoryInfo(this.selectRow.number)
+ this.getProductInventoryInfo(this.selectRow)
} else if (this.TabsIndex == 1) {
- this.getProductInventoryInfo(this.selectRow.number)
+ this.getProductInventoryInfo(this.selectRow)
} else if (this.TabsIndex == 2) {
this.getProductOrderInfo(this.selectRow.number)
+ }else if(this.TabsIndex == 3) {
+ // 閲囪喘淇℃伅
+ this.getProductOrderInfo(this.selectRow.number)
}
+ },
+ // 鑾峰彇椤圭洰鍒楄〃
+ async getProjectList() {
+ await getProjectList({
+ page: 1,
+ pageSize: 100
+ }).then((res) => {
+ this.projectList = res.data?res.data:[]
+ })
+ },
+ handleClose(done) {
+ done()
+ },
+
+ saveParams() {
+ let params = {
+ address: this.thatRow.address || "",
+ addressee: this.thatRow.addressee || "",
+ clientId: this.thatRow.clientId || 0,
+ conditions: this.thatRow.conditions || "",
+ deliveryDate: this.thatRow.deliveryDate || "",
+ memberId: this.thatRow.memberId || 0,
+ number: this.thatRow.number || "",
+ phone: this.thatRow.phone || "",
+ products: this.thatRow.products,
+ remark: this.thatRow.remark || "",
+ saleChanceId: this.thatRow.saleChanceId || 0,
+ saleType: this.thatRow.saleType || 0,
+ signTime: this.thatRow.signTime || "",
+ wechatOrderStatus: this.thatRow.wechatOrderStatus || 0,
+ logisticCompany: this.thatRow.logisticCompany || "",
+ logisticCost: this.thatRow.logisticCost || 0,
+ logisticNumber: this.thatRow.logisticNumber || "",
+ quotationId: this.thatRow.quotationId,
+ deliverType: this.thatRow.deliverType || 0,
+ status: this.thatRow.deliverType,
+ projectId: this.projects.projectId || 0
+ }
+ return params
+ },
+ // 纭鎻愪氦
+ affirmCommitBtn() {
+ let params = this.saveParams()
+ this.$refs["form"].validate((valid) => {
+ if (valid) {
+ console.log()
+ this.projectListShow = false
+ console.log(params, "閫夋嫨椤圭洰鍚庣殑params")
+ params.status = 2
+ sendSalesDetailsToOtherSystem(params).then((res) => {
+ if (res.code == 200) {
+ this.$message.success("鎴愬姛鎺ㄩ�佽嚦aps绯荤粺")
+ this.getData()
+ this.thatRow.status = 2
+ }
+ })
+ }
+ })
}
}
}
@@ -634,6 +797,7 @@
margin-right: 20px;
font-size: 14px !important;
text-align: center;
+ cursor: pointer;
background: #2a78fb;
border-top-left-radius: 20px;
border-top-right-radius: 20px;
@@ -674,4 +838,14 @@
.bgcWhite {
background: #fff !important;
}
+.el-form-item {
+ width: 80%;
+ margin: 20px auto;
+}
+::v-deep .el-dialog__footer {
+ text-align: right !important;
+ .el-button {
+ margin-right: 10px;
+ }
+}
</style>
--
Gitblit v1.8.0