From 42adf7605b0d7f272e1f26b22e5b92c00b293d80 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期五, 22 三月 2024 15:35:52 +0800
Subject: [PATCH] 登录页面接口、订单管理列表页面接口先跟进aps项目接口联调及部分代码删减
---
src/views/orderManageModule/orderManage/index.vue | 147 ++++++++++++++++++++++++++++++++++++-------------
1 files changed, 108 insertions(+), 39 deletions(-)
diff --git a/src/views/orderManageModule/orderManage/index.vue b/src/views/orderManageModule/orderManage/index.vue
index b915842..95eb7d0 100644
--- a/src/views/orderManageModule/orderManage/index.vue
+++ b/src/views/orderManageModule/orderManage/index.vue
@@ -29,7 +29,10 @@
<template slot="tableButton">
<el-table-column label="鎿嶄綔" width="160" fixed="right">
<template slot-scope="scope">
- <el-button v-if="scope.row.status == 0" type="text" size="small">寰呯‘璁�</el-button>
+ <template v-if="scope.row.status == 1">
+ <el-button type="text" size="small">纭</el-button>
+ <el-button type="text" size="small">鍙栨秷</el-button>
+ </template>
<el-button
v-else-if="scope.row.status == 2 || scope.row.status == 4"
type="text"
@@ -125,6 +128,13 @@
</template>
<script>
+import {
+ outsourceOrderList,
+ outsourceOrderOverview,
+ outsourceOrderProductList,
+ getMaterialApplyList
+ // changeOutsourceOrderStatus
+} from "@/api/orderManageModule/orderManage"
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
import ApplyMaterialsDialog from "@/views/orderManageModule/orderManage/components/ApplyMaterialsDialog"
import DeliveryDialog from "@/views/orderManageModule/orderManage/components/DeliveryDialog"
@@ -155,10 +165,10 @@
tableList: {},
tableColumn: [
{ label: "璁㈠崟缂栧彿", prop: "number", min: 90, default: true },
- { label: "浜у搧鏁伴噺", prop: "quotationName", min: 120 },
- { label: "绛剧害鏃ユ湡", prop: "validity_date", min: 100 },
- { label: "浜や粯鏃ユ湡", prop: "client_name", min: 120 },
- { label: "鐘舵��", prop: "quotationStatus", isCallMethod: true, getCallMethod: this.getStatus }
+ { label: "浜у搧鏁伴噺", prop: "productQuantity", min: 120 },
+ { label: "绛剧害鏃ユ湡", prop: "signTime", min: 100 },
+ { label: "浜や粯鏃ユ湡", prop: "deliveryDate", min: 120 },
+ { label: "鐘舵��", prop: "status", isCallMethod: true, getCallMethod: this.getStatus }
],
showCol: ["璁㈠崟缂栧彿", "浜у搧鏁伴噺", "绛剧害鏃ユ湡", "浜や粯鏃ユ湡", "鐘舵��"],
selectRow: {},
@@ -168,32 +178,32 @@
bottomTwoTableList2: {},
bottomTwoTableList3: {},
productColumn: [
- { label: "浜у搧鍚嶇О", prop: "number", min: 90, default: true },
- { label: "浜у搧缂栧彿", prop: "quotationName", min: 120 },
- { label: "Bom缂栧彿", prop: "validity_date", min: 100 },
- { label: "浜у搧瑙勬牸", prop: "client_name", min: 120 },
- { label: "浜у搧鏁伴噺", prop: "quotationStatus" },
- { label: "鍗曚綅", prop: "client_name", min: 120 }
+ { label: "浜у搧鍚嶇О", prop: "productName", min: 90, default: true },
+ { label: "浜у搧缂栧彿", prop: "productId", min: 120 },
+ { label: "Bom缂栧彿", prop: "bomID", min: 100 },
+ { label: "浜у搧瑙勬牸", prop: "specs", min: 120 },
+ { label: "浜у搧鏁伴噺", prop: "amount" },
+ { label: "鍗曚綅", prop: "unit", min: 120 }
],
showProductCol: ["浜у搧鍚嶇О", "浜у搧缂栧彿", "Bom缂栧彿", "浜у搧瑙勬牸", "浜у搧鏁伴噺", "鍗曚綅"],
materialRquestColumn: [
- { label: "浜у搧鍚嶇О", prop: "number", min: 90, default: true },
- { label: "浜у搧缂栧彿", prop: "quotationName", min: 120 },
- { label: "浜у搧鏁伴噺", prop: "validity_date", min: 100 },
- { label: "浜у搧瑙勬牸", prop: "client_name", min: 120 },
- { label: "浜у搧鍨嬪彿", prop: "quotationStatus" },
- { label: "鍗曚綅", prop: "client_name", min: 120 }
+ { label: "浜у搧鍚嶇О", prop: "materialName", min: 90, default: true },
+ { label: "浜у搧缂栧彿", prop: "materialNumber", min: 120 },
+ { label: "浜у搧鏁伴噺", prop: "amount", min: 100 },
+ { label: "浜у搧瑙勬牸", prop: "specs", min: 120 },
+ { label: "浜у搧鍨嬪彿", prop: "type" },
+ { label: "鍗曚綅", prop: "unit", min: 120 }
],
showMaterialRquestCol: ["浜у搧鍚嶇О", "浜у搧缂栧彿", "浜у搧鏁伴噺", "浜у搧瑙勬牸", "浜у搧鍨嬪彿", "鍗曚綅"],
deliveryRquestColumn: [
{ label: "鍙戣揣鍗曞彿", prop: "number", default: true },
- { label: "浜у搧鍚嶇О", prop: "number", default: true },
- { label: "浜у搧缂栧彿", prop: "quotationName" },
- { label: "璁㈠崟鏁伴噺", prop: "validity_date" },
+ { label: "浜у搧鍚嶇О", prop: "productName", default: true },
+ { label: "浜у搧缂栧彿", prop: "productId" },
+ { label: "璁㈠崟鏁伴噺", prop: "amount" },
{ label: "鍙戣揣鏁伴噺", prop: "validity_date" },
- { label: "浜у搧瑙勬牸", prop: "client_name" },
- { label: "浜у搧鍨嬪彿", prop: "quotationStatus" },
- { label: "鍗曚綅", prop: "client_name" },
+ { label: "浜у搧瑙勬牸", prop: "specs" },
+ { label: "浜у搧鍨嬪彿", prop: "model" },
+ { label: "鍗曚綅", prop: "unit" },
{ label: "杩愬崟鍙�", prop: "validity_date" },
{ label: "鎵胯繍鍟�", prop: "validity_date" },
{ label: "鍒涘缓鏃堕棿", prop: "client_name", min: 100 }
@@ -220,22 +230,88 @@
visible: false,
title: "鍙戣揣",
infomation: {}
+ },
+ searchParam: {
+ keyword: "",
+ page: 1,
+ pageSize: 15
}
}
},
created() {
this.setTable()
+ this.getData()
},
methods: {
reRreshData() {
this.getData()
+ },
+ // 鑾峰彇top璁㈠崟鍒楄〃鏁版嵁
+ async getData() {
+ this.searchParam.page = this.pagerOptions.currPage
+ 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)
+ }
+ this.overview()
+ }
+ },
+ // 鑾峰彇浜у搧淇℃伅
+ getProductListMethod(id) {
+ outsourceOrderProductList({ outsourcingOrderId: id }).then((res) => {
+ console.log(res)
+ if (res.code == 200) {
+ this.bottomTwoTableList1.tableInfomation = res.data
+ }
+ })
+ },
+ // 鑾峰彇鐗╂枡鐢宠鍗�
+ getMaterialApplyList(number) {
+ getMaterialApplyList({ number: number, page: 1, pageSize: 15 }).then((res) => {
+ console.log(res)
+ if (res.code == 200) {
+ this.bottomTwoTableList2.tableInfomation = res.data
+ }
+ })
+ },
+ overview() {
+ outsourceOrderOverview().then((reply) => {
+ this.totalObject.value = reply.data.total || 0
+ this.otherOptions.map((item) => {
+ if (item.label === "寰呭垎閰�") {
+ item.value = reply.data.waitAssigned
+ } else if (item.label === "宸插垎閰�") {
+ item.value = reply.data.hasAssigned
+ }
+ })
+ })
},
addCommonClick() {
alert("闇茶タ666")
},
searchClick() {},
onFilterSearch() {},
- tableRowClick() {},
+ tableRowClick(row, column, event) {
+ console.log(row, column, event)
+ this.selectRow = row
+ if (this.activeNameBottom == 1) {
+ this.getProductListMethod(this.selectRow.id)
+ } else {
+ this.getMaterialApplyList(this.selectRow.number)
+ }
+ },
+ tableRowClassName({ row }) {
+ if (row.id == this.selectRow.id) {
+ return "onSelect"
+ }
+ },
getSelectArray() {},
// 鐢宠鐗╂枡
applyClick(row) {
@@ -257,22 +333,17 @@
},
tabClickBottom(activeNameBottom) {
this.activeNameBottom = activeNameBottom
- // if (activeNameBottom == 1) {
- // this.getProductListMethod(this.selectRow.id);
- // } else {
- // this.getMaterialApplyList(this.selectRow.number);
- // }
+ if (activeNameBottom == 1) {
+ this.getProductListMethod(this.selectRow.id)
+ } else {
+ this.getMaterialApplyList(this.selectRow.number)
+ }
},
setTable() {
this.tableList = {
selectIndex: true,
selectBox: true,
- tableInfomation: [
- {
- number: "1111",
- status: 4
- }
- ],
+ tableInfomation: [],
allcol: [],
showcol: this.showCol,
tableColumn: this.setColumnVisible(this.showCol, this.tableColumn)
@@ -354,10 +425,8 @@
},
// 鐘舵��
getStatus(val) {
- return val === 0
- ? "寰呭垎閰�"
- : val === 1
- ? "宸插垎閰�"
+ return val === 1
+ ? "寰呯‘璁�"
: val === 2
? "寰呯敓浜�"
: val === 3
--
Gitblit v1.8.0