From 574e3e7390170182bef474164597ce719b2327bd Mon Sep 17 00:00:00 2001
From: charles <981744753@qq.com>
Date: 星期三, 24 七月 2024 17:44:57 +0800
Subject: [PATCH] fix:解决crm,之前改了域名，处理各种异常状态，跳转也会出现异常等问题。
---
src/views/sales/salesDetails/index.vue | 542 ++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 384 insertions(+), 158 deletions(-)
diff --git a/src/views/sales/salesDetails/index.vue b/src/views/sales/salesDetails/index.vue
index 4f0f2f8..b453895 100644
--- a/src/views/sales/salesDetails/index.vue
+++ b/src/views/sales/salesDetails/index.vue
@@ -6,14 +6,8 @@
<div v-else class="filter">
<div class="filter-card">
- <CommonSearch
- :show-add="false"
- :show-download="false"
- :amount-view="false"
- :show-action-btn="false"
- placeholder="璇疯緭鍏ヨ鍗曠紪鍙�"
- @searchClick="onFilterSearch"
- >
+ <CommonSearch :show-add="false" :show-download="false" :amount-view="false" :show-action-btn="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> -->
@@ -26,17 +20,9 @@
<!-- <div class="body-card"> -->
<div class="content-top">
<div class="list-view">
- <TableCommonView
- ref="tableListRef"
- :show-summary="showSummary"
- :table-list="tableList"
- @selClientClick="selClientClick"
- @selCommonClick="selCommonClick"
- @getSelectArray="getSelectArray"
- @selTableCol="selTableCol"
- @tableRowClick="tableRowClick"
- :selectClassRow="selectRow"
- >
+ <TableCommonView ref="tableListRef" :show-summary="showSummary" :table-list="tableList"
+ @selClientClick="selClientClick" @selCommonClick="selCommonClick" @getSelectArray="getSelectArray"
+ @selTableCol="selTableCol" @tableRowClick="tableRowClick" :selectClassRow="selectRow">
<template slot="tableButton">
<el-table-column label="鎿嶄綔" width="180">
<template slot-scope="scope">
@@ -46,6 +32,12 @@
<el-button @click.stop="submitClick(scope.row)" type="text" size="small">纭鎻愪氦</el-button>
<!-- <el-button @click="delClick(scope.row.id)" type="text" size="small">鍒犻櫎</el-button> -->
<el-button @click.stop="closeClick(scope.row)" type="text" size="small">鍏抽棴</el-button>
+ </template>
+ <template v-if="scope.row.status === 3">
+ <el-button @click.stop="shipmentsClick(scope.row)" type="text" size="small">鍙戣揣</el-button>
+ </template>
+ <template v-if="scope.row.status === 3">
+ <el-button @click.stop="confirmClick(scope.row)" type="text" size="small">鍙戣揣瀹屾垚</el-button>
</template>
</template>
</el-table-column>
@@ -58,45 +50,35 @@
</div>
<div class="content-bottom">
<div class="bottom-tabs" :class="!isDetail ? 'bgcGrey' : 'bgcWhite'">
- <div
- class="tab-pane"
- @click="getTab(0)"
- :style="{
- background: TabsIndex == 0 ? '#2a78fb' : '#F1F3F8',
- color: TabsIndex == 0 ? '#fff' : '#666'
- }"
- >
+ <div class="tab-pane" @click="getTab(0)" :style="{
+ background: TabsIndex == 0 ? '#2a78fb' : '#F1F3F8',
+ color: TabsIndex == 0 ? '#fff' : '#666'
+ }">
浜у搧淇℃伅
</div>
- <div
- class="tab-pane"
- @click="getTab(1)"
- :style="{
- background: TabsIndex == 1 ? '#2a78fb' : '#F1F3F8',
- color: TabsIndex == 1 ? '#fff' : '#666'
- }"
- >
+ <div class="tab-pane" @click="getTab(1)" :style="{
+ background: TabsIndex == 1 ? '#2a78fb' : '#F1F3F8',
+ color: TabsIndex == 1 ? '#fff' : '#666'
+ }">
鍙戣揣淇℃伅
</div>
- <div
- class="tab-pane"
- @click="getTab(2)"
- :style="{
- background: TabsIndex == 2 ? '#2a78fb' : '#F1F3F8',
- color: TabsIndex == 2 ? '#fff' : '#666'
- }"
- >
+ <div class="tab-pane" @click="getTab(2)" :style="{
+ 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 class="tab-pane" @click="getTab(3)" :style="{
+ background: TabsIndex == 3 ? '#2a78fb' : '#F1F3F8',
+ color: TabsIndex == 3 ? '#fff' : '#666'
+ }">
閲囪喘淇℃伅
+ </div>
+ <div class="tab-pane" @click="getTab(4)" :style="{
+ background: TabsIndex == 4 ? '#2a78fb' : '#F1F3F8',
+ color: TabsIndex == 4 ? '#fff' : '#666'
+ }">
+ 濮斿淇℃伅
</div>
</div>
<div class="list-view">
@@ -117,12 +99,8 @@
<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 v-for="item in projectList" :key="item.projectId" :label="item.projectName"
+ :value="item.projectId">
</el-option>
</el-select>
</el-form-item>
@@ -133,11 +111,11 @@
</span>
</el-dialog>
<!-- 鏂板缓/缂栬緫 -->
- <AddSalesDetailsDialog
- v-if="editConfig.visible"
- :edit-common-config="editConfig"
- @addCollectionPlanClick="addCollectionPlanClick"
- />
+ <AddSalesDetailsDialog v-if="editConfig.visible" :edit-common-config="editConfig"
+ @addCollectionPlanClick="addCollectionPlanClick" />
+ <!-- 鍙戣揣 -->
+ <ShipmentsDialog v-if="editShipmentsConfig.visible" :edit-common-config="editShipmentsConfig"
+ @addCollectionPlanClick="addCollectionPlanClick" />
<!-- 閿�鍞槑缁嗚鎯� -->
<DetailSpecification v-if="specificationDetail.visible" :specification-detail="specificationDetail" />
<!-- 瀹㈡埛璇︽儏 -->
@@ -149,6 +127,7 @@
<script>
import AddSalesDetailsDialog from "@/views/sales/salesDetails/AddSalesDetailsDialog"
+import ShipmentsDialog from "@/views/sales/salesDetails/shipmentsDialog"
import {
getSalesDetailsList,
getDelSalesDetails,
@@ -156,7 +135,8 @@
getProductOrderInfo,
updateStatus,
getProjectList,
- sendSalesDetailsToOtherSystem
+ sendSalesDetailsToOtherSystem,
+ confirmOutputOver
} from "@/api/sales/salesDetails"
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
import DetailSpecification from "@/views/sales/salesDetails/DetailSpecification"
@@ -179,6 +159,7 @@
mixins: [pageMixin],
components: {
AddSalesDetailsDialog,
+ ShipmentsDialog,
DetailSpecification,
DetailClientManage: () => import("@/views/client/client/DetailClientManage"),
AddCollectionPlan
@@ -191,44 +172,108 @@
data() {
// 浜у搧淇℃伅
const productColumn = [
- { label: "浜у搧缂栧彿", prop: "number", default: true },
- { label: "浜у搧鍚嶇О", prop: "name" },
- { label: "鏁伴噺", prop: "amount" },
+ { label: "浜у搧缂栧彿", prop: "productId", default: true },
+ { label: "浜у搧鍚嶇О", prop: "productName" },
+ { label: "浜у搧瑙勬牸", prop: "specs" },
{ label: "鍗曚綅", prop: "unit" },
+ { label: "璁㈠崟鏁伴噺", prop: "amount" },
+ {
+ label: "宸插畬鎴愭暟閲�",
+ prop: "finishAmount",
+ isClass: true,
+ getClassName: this.getAmountClassName,
+ },
+ {
+ label: "宸插彂璐ф暟閲�", prop: "deliveryAmount",
+ isClass: true,
+ getClassName: this.getAmountClassName,
+ },
+ {
+ label: "閲囪喘鏁伴噺",
+ isClass: true,
+ getClassName: this.getFinishAmountClassName,
+ prop: "purchaseAmount",
+ },
+ {
+ label: "鐢熶骇鏁伴噺", prop: "makeAmount",
+ isClass: true,
+ getClassName: this.getFinishAmountClassName,
+ },
+ {
+ label: "濮斿鏁伴噺", prop: "outsourcingAmount",
+ isClass: true,
+ getClassName: this.getFinishAmountClassName,
+ },
{ label: "閿�鍞崟浠�", prop: "price", price: true },
{ label: "鎴愭湰鍗曚环", prop: "cost" },
{ label: "姣涘埄", prop: "profit" },
{ label: "姣涘埄鐜�(%)", prop: "margin" },
{ label: "浠风◣鍚堣", prop: "total", price: true }
]
- // 搴撳瓨淇℃伅
+ // 鍙戣揣淇℃伅
const inventoryColumn = [
+ { label: "鍑哄簱鍗�", prop: "invoice" },
+ { label: "浠撳簱", prop: "warehouse" },
{ label: "浜у搧缂栧彿", prop: "number", default: true },
{ label: "浜у搧鍚嶇О", prop: "name" },
+ { label: "浜у搧瑙勬牸", prop: "specs" },
+ { label: "浜у搧鍗曚綅", prop: "unit" },
+ { label: "鍙戣揣鏁伴噺", prop: "amount" },
{ label: "璁㈠崟鏁伴噺", prop: "orderAmount" },
- { label: "鍙戣揣鍗�", prop: "invoice" },
{ label: "鎵胯繍鍟�", prop: "carrier" },
{ label: "杩愬崟鍙�", prop: "waybill" },
- { label: "浠撳簱", prop: "warehouse" },
- { label: "鍦ㄥ簱鏁伴噺", prop: "amount" },
- { label: "鍙敤搴撳瓨", prop: "availableNumber" },
- { label: "鍗曚綅", prop: "unit" }
+ { label: "鍒涘缓鏃堕棿", prop: "warehouse" },
+ { label: "鐘舵��", prop: "status", isCallMethod: true, getCallMethod: this.getStatusFive },
]
// 鍒堕�犱俊鎭�
const makeColumn = [
{ label: "鐢熶骇璁㈠崟", prop: "orderId", default: true },
+ { label: "浜у搧缂栧彿", prop: "productId" },
{ label: "浜у搧鍚嶇О", prop: "productName" },
- { label: "璁㈠崟鐘舵��", prop: "orderStatus" },
+ { label: "浜у搧瑙勬牸", prop: "specs" },
+ { label: "浜у搧鍗曚綅", prop: "unit" },
+ { label: "璁㈠崟鏁伴噺", prop: "amount" },
+ { label: "瀹屾垚鏁伴噺", prop: "finishAmount" },
{ label: "宸ュ崟缂栧彿", prop: "workOrderId" },
{ label: "宸ュ崟鐘舵��", prop: "workOrderStatus" },
- { label: "璁″垝寮�濮嬫椂闂�", prop: "startTime" },
- { label: "璁″垝缁撴潫鏃堕棿", prop: "endTime" }
+ { label: "璁″垝寮�濮嬫椂闂�", prop: "startTime",min:130 },
+ { label: "璁″垝缁撴潫鏃堕棿", prop: "endTime",min:130 }
]
// 閲囪喘淇℃伅
const purchaseColumn = [
{
label: "閲囪喘鍗曞彿",
prop: "purchaseNumber",
+ default: true
+ },
+ {
+ label: "浜у搧缂栧彿",
+ prop: "productId",
+ default: true
+ },
+ {
+ label: "浜у搧鍚嶇О",
+ prop: "productName",
+ default: true
+ },
+ {
+ label: "浜у搧瑙勬牸",
+ prop: "specs",
+ default: true
+ },
+ {
+ label: "浜у搧鍗曚綅",
+ prop: "unit",
+ default: true
+ },
+ {
+ label: "璁″垝閲囪喘閲�",
+ prop: "amount",
+ default: true
+ },
+ {
+ label: "瀹屾垚閲囪喘閲�",
+ prop: "finishAmount",
default: true
},
{
@@ -239,16 +284,63 @@
label: "渚涘簲鍟嗗悕绉�",
prop: "supplierName"
},
- {
- label: "閲囪喘鏁伴噺",
- prop: "amount"
- },
+ // {
+ // label: "閲囪喘鏁伴噺",
+ // prop: "amount"
+ // },
{
label: "鐘舵��",
prop: "status",
isCallMethod: true,
getCallMethod: this.getpurchaseStatus
}
+ ]
+ // 濮斿
+ const outsourceColumn = [
+ {
+ label: "濮斿璁㈠崟",
+ prop: "outsourcingId",
+ },
+ {
+ label: "浜у搧缂栧彿",
+ prop: "productId",
+ },
+ {
+ label: "浜у搧鍚嶇О",
+ prop: "productName",
+ },
+ {
+ label: "浜у搧瑙勬牸",
+ prop: "specs",
+ },
+ {
+ label: "浜у搧鍗曚綅",
+ prop: "unit",
+ },
+ {
+ label: "濮斿鏁伴噺",
+ prop: "amount",
+ },
+ {
+ label: "瀹屾垚鏁伴噺",
+ prop: "finishAmount",
+ },
+ {
+ label: "璁㈠崟鐘舵��",
+ prop: "outsourcingStatus",
+ },
+ {
+ label: "濮斿渚涘簲鍟�",
+ prop: "supplierName",
+ },
+ {
+ label: "绛剧害鏃ユ湡",
+ prop: "startTime",
+ },
+ {
+ label: "浜や粯鏃ユ湡",
+ prop: "endTime",
+ },
]
return {
tableList: {},
@@ -257,6 +349,15 @@
visible: false,
title: "鏂板缓",
infomation: {}
+ },
+ editShipmentsConfig: {
+ visible: false,
+ title: "鏂板缓",
+ infomation: {
+ saleDetailID: null,
+ saleDetailNumber: null,
+
+ }
},
showSummary: {
show: false,
@@ -299,7 +400,7 @@
{ label: "閿�鍞礋璐ｄ汉", prop: "member_name" },
{ label: "绛剧害鏃ユ湡", prop: "signTime" },
{ label: "浜や粯鏃ユ湡", prop: "deliveryDate" },
- { label: "璁㈠崟鏉ユ簮", prop: "source" },
+ // { label: "璁㈠崟鏉ユ簮", prop: "source" },
{ label: "鍚堣", prop: "amountTotal", price: true },
{ label: "鐘舵��", prop: "status", isCallMethod: true, getCallMethod: this.getStatus }
],
@@ -309,25 +410,29 @@
TabsIndex: "0",
productTableList: {},
productColumn: productColumn,
- showProductCol: ["浜у搧缂栧彿", "浜у搧鍚嶇О", "鏁伴噺", "鍗曚綅", "閿�鍞崟浠�", "鎴愭湰鍗曚环", "姣涘埄", "姣涘埄鐜�(%)", "浠风◣鍚堣"],
+ showProductCol: ["浜у搧缂栧彿", "浜у搧鍚嶇О", "浜у搧瑙勬牸", "鍗曚綅", "璁㈠崟鏁伴噺", "宸插畬鎴愭暟閲�", "宸插彂璐ф暟閲�", "閲囪喘鏁伴噺", "鐢熶骇鏁伴噺", "濮斿鏁伴噺", "閿�鍞崟浠�", "鎴愭湰鍗曚环", "姣涘埄", "姣涘埄鐜�(%)", "浠风◣鍚堣"],
inventoryColumn: inventoryColumn,
showInventoryCol: [
+ "鍑哄簱鍗�",
+ "浠撳簱",
"浜у搧缂栧彿",
"浜у搧鍚嶇О",
+ "浜у搧瑙勬牸",
+ "浜у搧鍗曚綅",
+ "鍙戣揣鏁伴噺",
"璁㈠崟鏁伴噺",
- "鍙戣揣鍗�",
"鎵胯繍鍟�",
"杩愬崟鍙�",
- "浠撳簱",
- "鍦ㄥ簱鏁伴噺",
- "鍙敤搴撳瓨",
- "鍗曚綅"
+ "鍒涘缓鏃堕棿",
+ "鐘舵��"
],
makeColumn: makeColumn,
- showMakeCol: ["鐢熶骇璁㈠崟", "浜у搧鍚嶇О", "璁㈠崟鐘舵��", "宸ュ崟缂栧彿", "宸ュ崟鐘舵��", "璁″垝寮�濮嬫椂闂�", "璁″垝缁撴潫鏃堕棿"],
+ showMakeCol: ["鐢熶骇璁㈠崟", "浜у搧缂栧彿", "浜у搧鍚嶇О", "浜у搧瑙勬牸", "浜у搧鍗曚綅", "璁㈠崟鏁伴噺", "瀹屾垚鏁伴噺", "宸ュ崟缂栧彿", "宸ュ崟鐘舵��", "璁″垝寮�濮嬫椂闂�", "璁″垝缁撴潫鏃堕棿"],
// 閲囪喘
purchaseColumn: purchaseColumn,
- showPurchaseCol: ["閲囪喘鍗曞彿", "閲囪喘鍗曞悕绉�", "渚涘簲鍟嗗悕绉�", "閲囪喘鏁伴噺", "鐘舵��"],
+ outsourceColumn: outsourceColumn,
+ showPurchaseCol: ["閲囪喘鍗曞彿", "浜у搧缂栧彿", "浜у搧鍚嶇О", "浜у搧瑙勬牸", "浜у搧鍗曚綅", "璁″垝閲囪喘閲�", "瀹屾垚閲囪喘閲�", "閲囪喘鍗曞悕绉�", "渚涘簲鍟嗗悕绉�", "鐘舵��"],
+ showOutsourceCol: ["濮斿璁㈠崟", "浜у搧缂栧彿", "浜у搧鍚嶇О", "浜у搧瑙勬牸", "浜у搧鍗曚綅", "濮斿鏁伴噺", "瀹屾垚鏁伴噺", "璁㈠崟鐘舵��", "濮斿渚涘簲鍟�", "绛剧害鏃ユ湡", "浜や粯鏃ユ湡"],
selectRow: {},
projectList: [],
projectListShow: false,
@@ -339,7 +444,9 @@
projectId: [{ required: true, message: "璇烽�夋嫨椤圭洰", trigger: "change" }]
},
purchaseStatusList: getDataByType("purchaseStatus"),
- loading: false
+ loading: false,
+ isRequest: true, //璇锋眰
+ productDataBottom: {},
}
},
created() {
@@ -355,6 +462,29 @@
this.getProjectList()
},
methods: {
+ getFinishAmountClassName(val, row) {
+ let parts = val.split("/");
+ let numerator = parseInt(parts[0], 10); // 鍒嗗瓙
+ let denominator = parseInt(parts[1], 10); // 鍒嗘瘝
+ let classname = "";
+ if (numerator / denominator === 0 || numerator === 0) {
+ classname = "error";
+ } else if (numerator / denominator === 1) {
+ classname = "success";
+ } else if ((numerator / denominator) > 0 && (numerator / denominator) < 1) {
+ classname = "warning-radio";
+ }
+ console.log(classname, numerator, denominator, "鐪嬩笅")
+ return classname;
+ },
+ getAmountClassName(val) {
+ console.log(val, "val11")
+ let classname = "";
+ if (val === 0) {
+ classname = "error";
+ }
+ return classname;
+ },
getpurchaseStatus(val) {
if (val) {
for (let i in this.purchaseStatusList) {
@@ -484,41 +614,116 @@
})
},
// 鑾峰彇浜у搧/搴撳瓨淇℃伅
- 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) => {
+ async getProductInventoryInfo(number) {
+ if (number) {
+ await getProductInventoryInfo(number)
+ .then((res) => {
+ console.log(res, "resss")
+ if (this.TabsIndex == 1) {
this.productTableList.tableInfomation = res.data?.length > 0 ? res.data : []
- this.loading = false
- })
- .catch(() => {
- this.productTableList.tableInfomation = []
- this.loading = false
- })
- }
+ }
+ })
+ .catch(() => {
+ this.productTableList.tableInfomation = []
+ })
}
},
// 鑾峰彇鍒堕�犱俊鎭�
async getProductOrderInfo(number) {
+ console.log(number,this.TabsIndex,"number")
if (number) {
+ if (this.TabsIndex == 0) {
+ // 浜у搧淇℃伅鍒楄〃
+ this.tableBottomColumn = this.productColumn // 琛ㄥご
+ this.showBottomCol = this.showProductCol // 鍔ㄦ�佽〃澶�
+ this.setBottomList()
+ } else if (this.TabsIndex == 1) {
+ // 鍙戣揣淇℃伅鍒楄〃
+ this.tableBottomColumn = this.inventoryColumn
+ this.showBottomCol = this.showInventoryCol
+ this.setBottomList()
+ } else if (this.TabsIndex == 2) {
+ // 鍒堕�犱俊鎭垪琛�
+ this.tableBottomColumn = this.makeColumn
+ this.showBottomCol = this.showMakeCol
+ this.setBottomList()
+
+ } else if (this.TabsIndex == 3) {
+ // 閲囪喘淇℃伅鍒楄〃
+ this.tableBottomColumn = this.purchaseColumn
+ this.showBottomCol = this.showPurchaseCol
+ this.setBottomList()
+ } else if (this.TabsIndex == 4) {
+ // 濮斿淇℃伅鍒楄〃
+ this.tableBottomColumn = this.outsourceColumn
+ this.showBottomCol = this.showOutsourceCol
+ this.setBottomList()
+ }
+
+ if (this.TabsIndex != 1 && this.isRequest == false) {
+ this.isRequest = true;
+ this.getListValue(this.productDataBottom)
+ return true;
+ }
this.loading = true
+ if (this.TabsIndex == 1 && this.selectRow.status == 1) {
+ this.productTableList.tableInfomation = []
+ }
+ this.getProductInventoryInfo(number)
+
+
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
+ this.productDataBottom = res;
+ this.getListValue(this.productDataBottom)
})
.catch(() => {
this.productTableList.tableInfomation = []
- this.loading = false
})
+ this.loading = false
+ }
+ this.$forceUpdate()
+ },
+ getListValue(res) {
+ if (this.TabsIndex == 0) {
+ if (res && res.data) {
+ res.data.productInfo.map((item => {
+ let string1 = "--";
+ let number1 = item.purchaseFinishAmount;
+ let val1 = item.purchaseAmount
+ if ((val1 && val1 != 0) || (number1 && number1 != 0)) {
+ let a1 = val1 || val1 == 0 ? val1 : "--";
+ let b1 = number1 || number1 == 0 ? number1 : "--";
+ string1 = b1 + "/" + a1;
+ }
+ item.purchaseAmount = string1
+ let string2 = "--";
+ let number2 = item.makeFinishAmount;
+ let val2 = item.makeAmount
+ if ((val2 && val2 != 0) || (number2 && number2 != 0)) {
+ let a2 = val2 || val2 == 0 ? val2 : "--";
+ let b2 = number2 || number2 == 0 ? number2 : "--";
+ string2 = b2 + "/" + a2;
+ }
+ item.makeAmount = string2
+ let string3 = "--";
+ let number3 = item.outsourcingFinishAmount;
+ let val3 = item.outsourcingAmount
+ if ((val3 && val3 != 0) || (number3 && number3 != 0)) {
+ let a3 = val3 || val3 == 0 ? val3 : "--";
+ let b3 = number3 || number3 == 0 ? number3 : "--";
+ string3 = b3 + "/" + a3;
+ }
+ item.outsourcingAmount = string3
+ }))
+ }
+ this.productTableList.tableInfomation = res.data && res.data.productInfo ? res.data.productInfo : []
+ } else if (this.TabsIndex == 2) {
+ this.productTableList.tableInfomation = res.data && res.data.makeInfo ? res.data.makeInfo : []
+ } else if (this.TabsIndex == 3) {
+ this.productTableList.tableInfomation = res.data && res.data.purchaseInfo ? res.data.purchaseInfo : []
+ } else if (this.TabsIndex == 4) {
+ this.productTableList.tableInfomation = res.data && res.data.outsourcingInfo ? res.data.outsourcingInfo : []
}
},
// 鎼滅储
@@ -535,6 +740,7 @@
console.log(this.addConfig)
this.editConfig.infomation = {
...this.addConfig,
+ signTime: new Date().toLocaleDateString(),
currency: "浜烘皯甯�",
sale_chance_name: "",
subbill_name: "",
@@ -574,10 +780,41 @@
})
}
},
+ // 鍙戣揣
+ shipmentsClick(row) {
+ this.editShipmentsConfig.visible = true
+ this.editShipmentsConfig.infomation.saleDetailID = row.id
+ this.editShipmentsConfig.infomation.deliverType = row.deliverType ? row.deliverType : 1
+ this.editShipmentsConfig.infomation.saleDetailNumber = row.number
+ this.editShipmentsConfig.infomation.projectId = row.projectId
+ },
+ // 纭鍙戣揣瀹屾垚
+ async confirmClick(row) {
+ this.selectRow = row
+ await getProductInventoryInfo(this.selectRow.number)
+ .then((res) => {
+ console.log(res, "resss")
+ if (res.data) {
+ this.productTableList.tableInfomation = res.data?.length > 0 ? res.data : []
+ }
+ this.loading = false
+ })
+ .catch(() => {
+ this.productTableList.tableInfomation = []
+ this.loading = false
+ })
+
+ this.updateStatus(row.id, 4)
+ // await confirmOutputOver({saleDetailNumber:row.number}).then((res)=>{
+ // if(res&&res.code===200){
+ // this.$message.success("纭鍙戣揣瀹屾垚")
+ // this.getData()
+ // }
+ // })
+ },
// 鍏抽棴
closeClick(row) {
- console.log(row, "鍏抽棴")
- this.updateStatus(row.id, 4)
+ this.updateStatus(row.id, 6)
},
// 淇敼鐘舵��
async updateStatus(id, status) {
@@ -611,7 +848,7 @@
}
})
})
- .catch(() => {})
+ .catch(() => { })
// } else {
// this.$message.warning("璇疯嚦灏戦�夋嫨涓�鏉¤褰�")
// }
@@ -650,57 +887,21 @@
//鑾峰彇褰撳墠閫変腑璧勬簮鐨刬d
getTab(tab) {
this.TabsIndex = tab
- if (this.TabsIndex == 0) {
- // 浜у搧淇℃伅鍒楄〃
- this.tableBottomColumn = this.productColumn
- this.showBottomCol = this.showProductCol
- this.setBottomList()
- this.getProductInventoryInfo(this.selectRow)
- } else if (this.TabsIndex == 1) {
- // 搴撳瓨淇℃伅鍒楄〃
- this.tableBottomColumn = this.inventoryColumn
- this.showBottomCol = this.showInventoryCol
- this.setBottomList()
- if (this.selectRow.status == 1) {
- this.productTableList.tableInfomation = []
- } else {
- this.getProductInventoryInfo(this.selectRow)
- }
- } else if (this.TabsIndex == 2) {
- // 鍒堕�犱俊鎭垪琛�
- 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)
+ if (this.TabsIndex == 1) {
+ this.isRequest = true;
+ } else {
+ this.isRequest = false;
}
+ this.getProductOrderInfo(this.selectRow.number)
},
// 鐘舵��
getStatus(val) {
- return val === 1 ? "寰呯‘璁�" : val === 2 ? "寰呭嚭搴�" : val === 3 ? "鍑哄簱瀹屾垚" : val === 4 ? "宸插叧闂�" : "--"
+ return val === 1 ? "寰呯‘璁�" : val === 2 ? "寰呭垎瑙�" : val === 3 ? "澶囪揣涓�" : val === 4 ? "寰呭嚭搴�" : val === 5 ? "鍑哄簱瀹屾垚" : val === 6 ? "宸插叧闂�" : "--"
},
// top 琛岀偣鍑�
tableRowClick(row) {
this.selectRow = row
- if (this.TabsIndex == 0) {
- this.getProductInventoryInfo(this.selectRow)
- } else if (this.TabsIndex == 1) {
- if (this.selectRow.status == 1) {
- this.productTableList.tableInfomation = []
- } else {
- this.getProductInventoryInfo(this.selectRow)
- }
- } else if (this.TabsIndex == 2) {
- this.getProductOrderInfo(this.selectRow.number)
- } else if (this.TabsIndex == 3) {
- // 閲囪喘淇℃伅
- this.getProductOrderInfo(this.selectRow.number)
- }
+ this.getProductOrderInfo(this.selectRow.number)
},
// 鑾峰彇椤圭洰鍒楄〃
async getProjectList() {
@@ -759,7 +960,14 @@
})
}
})
- }
+ },
+ getStatusFive(val) {
+ if (val) {
+ return val == 0 ? '灏辩华' : '瀹屾垚'
+ } else {
+ return "--";
+ }
+ },
}
}
</script>
@@ -770,6 +978,7 @@
.el-table .el-table__cell {
padding: 0;
}
+
.el-table__footer-wrapper tbody td.el-table__cell {
height: 48px;
}
@@ -778,11 +987,13 @@
.sales-details {
height: 100%;
overflow: hidden;
+
.filter {
height: 80px;
display: flex;
align-items: center;
padding: 12px 20px 0 20px;
+
&-card {
height: 80px;
display: flex;
@@ -794,27 +1005,32 @@
background-color: #fff;
}
}
+
.body {
box-sizing: border-box;
padding: 10px 20px;
border-radius: 12px;
height: calc(100% - 70px);
+
.content-top {
background-color: #fff;
border-radius: 12px;
min-height: 70px;
height: 48%;
position: relative;
+
.list-view {
height: calc(100% - 60px);
}
}
+
.content-bottom {
.bottom-tabs {
height: 40px;
line-height: 40px;
background: #e6ecf2;
display: flex;
+
.tab-pane {
width: 100px;
margin-right: 20px;
@@ -826,28 +1042,34 @@
border-top-right-radius: 20px;
}
}
+
.lable-view {
background: #e6ecf2;
height: 40px;
line-height: 40px;
+
.name {
border-left: 4px solid #2a78fb;
padding-left: 10px;
}
}
+
background-color: #fff;
border-radius: 12px;
min-height: 70px;
height: calc(52% - 60px);
margin-top: 10px;
+
// padding: 10px 20px;
.list-view {
height: calc(100% - 10px);
}
}
+
.btn-pager {
display: flex;
margin-top: 10px;
+
.page {
margin-left: auto;
}
@@ -858,15 +1080,19 @@
.bgcGrey {
background: #e6ecf2;
}
+
.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;
}
--
Gitblit v1.8.0