From a70881cad8fe749f41b06f221d10bb7491259256 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期一, 25 三月 2024 14:40:22 +0800
Subject: [PATCH] 发货完成状态接口联调、页面数据处理
---
src/views/orderManageModule/orderManage/index.vue | 148 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 121 insertions(+), 27 deletions(-)
diff --git a/src/views/orderManageModule/orderManage/index.vue b/src/views/orderManageModule/orderManage/index.vue
index 95eb7d0..c9f67b5 100644
--- a/src/views/orderManageModule/orderManage/index.vue
+++ b/src/views/orderManageModule/orderManage/index.vue
@@ -10,7 +10,7 @@
:otherOptions="otherOptions"
:show-action-btn="false"
:placeholder="'璇疯緭鍏ヨ鍗曠紪鍙�'"
- @searchClick="onFilterSearch"
+ @searchClick="searchClick"
/>
</div>
</div>
@@ -30,8 +30,12 @@
<el-table-column label="鎿嶄綔" width="160" fixed="right">
<template slot-scope="scope">
<template v-if="scope.row.status == 1">
- <el-button type="text" size="small">纭</el-button>
- <el-button type="text" size="small">鍙栨秷</el-button>
+ <el-button type="text" size="small" @click.stop="changeStatusClick(scope.row, '纭')"
+ >纭</el-button
+ >
+ <el-button type="text" size="small" @click.stop="changeStatusClick(scope.row, '鍙栨秷')"
+ >鍙栨秷</el-button
+ >
</template>
<el-button
v-else-if="scope.row.status == 2 || scope.row.status == 4"
@@ -41,12 +45,16 @@
>鐢宠鐗╂枡</el-button
>
<template v-else-if="scope.row.status == 5">
- <el-button type="text" size="small">鐢熶骇瀹屾垚</el-button>
+ <el-button type="text" size="small" @click.stop="changeStatusClick(scope.row, '鐢熶骇瀹屾垚')"
+ >鐢熶骇瀹屾垚</el-button
+ >
<el-button type="text" size="small" @click.stop="deliveryClick(scope.row)">鍙戣揣</el-button>
</template>
<template v-else-if="scope.row.status == 6">
<el-button type="text" size="small" @click.stop="deliveryClick(scope.row)">鍙戣揣</el-button>
- <el-button type="text" size="small">鍏抽棴</el-button>
+ <el-button type="text" size="small" @click.stop="changeStatusClick(scope.row, '鍙戣揣瀹屾垚')"
+ >鍙戣揣瀹屾垚</el-button
+ >
</template>
<span v-else>--</span>
</template>
@@ -132,8 +140,9 @@
outsourceOrderList,
outsourceOrderOverview,
outsourceOrderProductList,
- getMaterialApplyList
- // changeOutsourceOrderStatus
+ getMaterialApplyList,
+ getDeliveryList,
+ changeOutsourceOrderStatus
} from "@/api/orderManageModule/orderManage"
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
import ApplyMaterialsDialog from "@/views/orderManageModule/orderManage/components/ApplyMaterialsDialog"
@@ -200,13 +209,13 @@
{ label: "浜у搧鍚嶇О", prop: "productName", default: true },
{ label: "浜у搧缂栧彿", prop: "productId" },
{ label: "璁㈠崟鏁伴噺", prop: "amount" },
- { label: "鍙戣揣鏁伴噺", prop: "validity_date" },
+ { label: "鍙戣揣鏁伴噺", prop: "sendAmount" },
{ label: "浜у搧瑙勬牸", prop: "specs" },
- { label: "浜у搧鍨嬪彿", prop: "model" },
+ { label: "浜у搧鍨嬪彿", prop: "type" },
{ label: "鍗曚綅", prop: "unit" },
- { label: "杩愬崟鍙�", prop: "validity_date" },
- { label: "鎵胯繍鍟�", prop: "validity_date" },
- { label: "鍒涘缓鏃堕棿", prop: "client_name", min: 100 }
+ { label: "杩愬崟鍙�", prop: "waybillNumber" },
+ { label: "鎵胯繍鍟�", prop: "carrier" },
+ { label: "鍒涘缓鏃堕棿", prop: "createdAt", min: 100 }
],
showDeliveryRquestCol: [
"鍙戣揣鍗曞彿",
@@ -252,13 +261,20 @@
this.searchParam.pageSize = this.pagerOptions.pageSize
let rsp = await outsourceOrderList(this.searchParam)
let list = rsp
- console.log(list)
if (list && list.code == 200) {
this.tableList.tableInfomation = list.data
this.pagerOptions.totalCount = list.total
if (list.total > 0) {
this.selectRow = list.data[0]
- this.getProductListMethod(list.data[0].id)
+ if (this.activeNameBottom == 1) {
+ this.getProductListMethod(this.selectRow.id)
+ } else if (this.activeNameBottom == 2) {
+ this.getMaterialApplyList(this.selectRow.number)
+ } else {
+ this.getDeliveryList(this.selectRow.id)
+ }
+ } else {
+ this.selectRow = {}
}
this.overview()
}
@@ -266,7 +282,6 @@
// 鑾峰彇浜у搧淇℃伅
getProductListMethod(id) {
outsourceOrderProductList({ outsourcingOrderId: id }).then((res) => {
- console.log(res)
if (res.code == 200) {
this.bottomTwoTableList1.tableInfomation = res.data
}
@@ -274,10 +289,32 @@
},
// 鑾峰彇鐗╂枡鐢宠鍗�
getMaterialApplyList(number) {
- getMaterialApplyList({ number: number, page: 1, pageSize: 15 }).then((res) => {
- console.log(res)
+ getMaterialApplyList({ number: number }).then((res) => {
if (res.code == 200) {
this.bottomTwoTableList2.tableInfomation = res.data
+ }
+ })
+ },
+ // 鑾峰彇鍙戣揣鍒楄〃
+ getDeliveryList(id) {
+ getDeliveryList({ outsourcingOrderID: id }).then((res) => {
+ console.log(res)
+ if (res.code == 200) {
+ let list = res.data.map((item) => {
+ return {
+ number: item.outsourcingOrderDelivery.number,
+ productName: item.outsourcingOrderProduct.productName,
+ productId: item.outsourcingOrderProduct.productId,
+ amount: item.outsourcingOrderProduct.amount,
+ sendAmount: item.sendAmount,
+ type: item.outsourcingOrderProduct.type,
+ unit: item.outsourcingOrderProduct.unit,
+ waybillNumber: item.outsourcingOrderDelivery.waybillNumber,
+ carrier: item.outsourcingOrderDelivery.carrier,
+ createdAt: item.createdAt
+ }
+ })
+ this.bottomTwoTableList3.tableInfomation = list
}
})
},
@@ -293,18 +330,23 @@
})
})
},
- addCommonClick() {
- alert("闇茶タ666")
+ searchClick(val) {
+ this.searchParam.keyword = val
+ this.pagerOptions.currPage = 1
+ this.bottomTwoTableList1.tableInfomation = []
+ this.bottomTwoTableList2.tableInfomation = []
+ this.bottomTwoTableList3.tableInfomation = []
+ this.getData()
},
- searchClick() {},
- onFilterSearch() {},
tableRowClick(row, column, event) {
console.log(row, column, event)
this.selectRow = row
if (this.activeNameBottom == 1) {
this.getProductListMethod(this.selectRow.id)
- } else {
+ } else if (this.activeNameBottom == 2) {
this.getMaterialApplyList(this.selectRow.number)
+ } else {
+ this.getDeliveryList(this.selectRow.id)
}
},
tableRowClassName({ row }) {
@@ -313,6 +355,51 @@
}
},
getSelectArray() {},
+ // 鐘舵�佷慨鏀�
+ changeStatusClick(row, val) {
+ if (val == "纭") {
+ this.changeOutsourceOrderStatus(row.number, 2, "纭鎴愬姛")
+ } else if (val == "鍙栨秷") {
+ this.changeOutsourceOrderStatus(row.number, 0, "鍙栨秷鎴愬姛")
+ } else if (val == "鐢熶骇瀹屾垚") {
+ this.$confirm("鏄惁纭鐢熶骇瀹屾垚?", "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning"
+ })
+ .then(() => {
+ this.changeOutsourceOrderStatus(row.number, 6, "鐢熶骇瀹屾垚鎴愬姛")
+ })
+ .catch(() => {
+ this.$message.warning("宸插彇娑堢敓浜у畬鎴�")
+ })
+ } else if (val == "鍙戣揣瀹屾垚") {
+ this.$confirm("鏄惁纭鍏ㄩ儴鍙戣揣瀹屾垚?", "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning"
+ })
+ .then(() => {
+ this.changeOutsourceOrderStatus(row.number, 7, "鍏ㄩ儴鍙戣揣瀹屾垚鎴愬姛")
+ })
+ .catch(() => {
+ this.$message.warning("宸插彇娑堝彂璐у畬鎴�")
+ })
+ }
+ },
+ changeOutsourceOrderStatus(number, status, str) {
+ changeOutsourceOrderStatus({
+ outsourcingOrderNumber: number,
+ status: status
+ })
+ .then((reply) => {
+ if (reply.code == 200) {
+ this.getData()
+ this.$message.success(str)
+ }
+ })
+ .catch(() => {})
+ },
// 鐢宠鐗╂枡
applyClick(row) {
this.editApplyConfig.visible = true
@@ -328,15 +415,20 @@
this.deliveryConfig.visible = true
this.deliveryConfig.title = "鍙戣揣"
this.deliveryConfig.infomation = {
- outsourcingOrderNumber: row.number
+ id: row.id,
+ number: row.number
}
},
tabClickBottom(activeNameBottom) {
this.activeNameBottom = activeNameBottom
- if (activeNameBottom == 1) {
- this.getProductListMethod(this.selectRow.id)
- } else {
- this.getMaterialApplyList(this.selectRow.number)
+ if (Object.keys(this.selectRow).length > 0) {
+ if (activeNameBottom == 1) {
+ this.getProductListMethod(this.selectRow.id)
+ } else if (activeNameBottom == 2) {
+ this.getMaterialApplyList(this.selectRow.number)
+ } else {
+ this.getDeliveryList(this.selectRow.id)
+ }
}
},
setTable() {
@@ -437,6 +529,8 @@
? "鐢熶骇涓�"
: val === 6
? "鐢熶骇瀹屾垚"
+ : val === 7
+ ? "鍙戣揣瀹屾垚"
: "--"
}
}
--
Gitblit v1.8.0