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 | 76 ++++++++------------------------------
1 files changed, 16 insertions(+), 60 deletions(-)
diff --git a/src/views/sales/salesDetails/index.vue b/src/views/sales/salesDetails/index.vue
index 80dde63..b453895 100644
--- a/src/views/sales/salesDetails/index.vue
+++ b/src/views/sales/salesDetails/index.vue
@@ -33,11 +33,11 @@
<!-- <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 || scope.row.status === 4">
+ <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 || scope.row.status === 4">
- <el-button @click.stop="confirmClick(scope.row)" type="text" size="small">纭瀹屾垚</el-button>
+ <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>
@@ -192,15 +192,15 @@
label: "閲囪喘鏁伴噺",
isClass: true,
getClassName: this.getFinishAmountClassName,
- prop: "purchaseAmount2",
+ prop: "purchaseAmount",
},
{
- label: "鐢熶骇鏁伴噺", prop: "makeAmount2",
+ label: "鐢熶骇鏁伴噺", prop: "makeAmount",
isClass: true,
getClassName: this.getFinishAmountClassName,
},
{
- label: "濮斿鏁伴噺", prop: "outsourcingAmount2",
+ label: "濮斿鏁伴噺", prop: "outsourcingAmount",
isClass: true,
getClassName: this.getFinishAmountClassName,
},
@@ -236,8 +236,8 @@
{ 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 = [
@@ -630,6 +630,7 @@
},
// 鑾峰彇鍒堕�犱俊鎭�
async getProductOrderInfo(number) {
+ console.log(number,this.TabsIndex,"number")
if (number) {
if (this.TabsIndex == 0) {
// 浜у搧淇℃伅鍒楄〃
@@ -681,6 +682,7 @@
})
this.loading = false
}
+ this.$forceUpdate()
},
getListValue(res) {
if (this.TabsIndex == 0) {
@@ -694,7 +696,7 @@
let b1 = number1 || number1 == 0 ? number1 : "--";
string1 = b1 + "/" + a1;
}
- item.purchaseAmount2 = string1
+ item.purchaseAmount = string1
let string2 = "--";
let number2 = item.makeFinishAmount;
let val2 = item.makeAmount
@@ -703,7 +705,7 @@
let b2 = number2 || number2 == 0 ? number2 : "--";
string2 = b2 + "/" + a2;
}
- item.makeAmount2 = string2
+ item.makeAmount = string2
let string3 = "--";
let number3 = item.outsourcingFinishAmount;
let val3 = item.outsourcingAmount
@@ -712,7 +714,7 @@
let b3 = number3 || number3 == 0 ? number3 : "--";
string3 = b3 + "/" + a3;
}
- item.outsourcingAmount2 = string3
+ item.outsourcingAmount = string3
}))
}
this.productTableList.tableInfomation = res.data && res.data.productInfo ? res.data.productInfo : []
@@ -794,60 +796,15 @@
console.log(res, "resss")
if (res.data) {
this.productTableList.tableInfomation = res.data?.length > 0 ? res.data : []
- // let accumulator=res.data
- // const reducedArray = array.reduce((accumulator, currentItem) => {
- // // 鏌ユ壘褰撳墠number鏄惁宸插瓨鍦ㄤ簬accumulator涓�
- // const existingItem = accumulator.find(item => item.number === currentItem.number);
- // if (existingItem) {
- // // 濡傛灉瀛樺湪锛岀疮鍔爊um
- // existingItem.amount += currentItem.amount;
- // } else {
- // // 濡傛灉涓嶅瓨鍦紝灏嗗綋鍓嶉」娣诲姞鍒癮ccumulator涓�
- // accumulator.push(currentItem);
- // }
- // return accumulator;
- // }, []); // 鍒濆鍖朼ccumulator涓轰竴涓┖鏁扮粍
-
- // console.log(reducedArray,"鏂版暟缁�");
}
this.loading = false
})
- // let obj=[
- // {
- // name:"灏忔槑",
- // id:1,
- // num:10
- // },
- // {
- // name:"灏忔槑",
- // id:1,
- // num:20
- // },
- // {
- // name:"灏忔槑",
- // id:1,
- // num:5
- // },
- // {
- // name:"灏忕孩",
- // id:1,
- // num:5
- // },
- // {
- // name:"灏忕孩",
- // id:1,
- // num:10
- // },
- // {
- // name:"灏忔埧",
- // id:5,
- // num:3
- // },
- // ]
.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("纭鍙戣揣瀹屾垚")
@@ -857,8 +814,7 @@
},
// 鍏抽棴
closeClick(row) {
- console.log(row, "鍏抽棴")
- this.updateStatus(row.id, 4)
+ this.updateStatus(row.id, 6)
},
// 淇敼鐘舵��
async updateStatus(id, status) {
--
Gitblit v1.8.0