From 2762603d467165368f53f299b911c753f09dd563 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期六, 30 三月 2024 16:29:40 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/crm-web into dev
---
src/views/sales/salesDetails/index.vue | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/views/sales/salesDetails/index.vue b/src/views/sales/salesDetails/index.vue
index bae53a7..a11be66 100644
--- a/src/views/sales/salesDetails/index.vue
+++ b/src/views/sales/salesDetails/index.vue
@@ -33,10 +33,10 @@
<!-- <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">
+ <template v-if="scope.row.status === 3">
<el-button @click.stop="confirmClick(scope.row)" type="text" size="small">纭瀹屾垚</el-button>
</template>
</template>
@@ -192,15 +192,15 @@
label: "閲囪喘鏁伴噺",
isClass: true,
getClassName: this.getFinishAmountClassName,
- prop: "purchaseAmount",
+ prop: "purchaseAmount2",
},
{
- label: "鐢熶骇鏁伴噺", prop: "makeAmount",
+ label: "鐢熶骇鏁伴噺", prop: "makeAmount2",
isClass: true,
getClassName: this.getFinishAmountClassName,
},
{
- label: "濮斿鏁伴噺", prop: "outsourcingAmount",
+ label: "濮斿鏁伴噺", prop: "outsourcingAmount2",
isClass: true,
getClassName: this.getFinishAmountClassName,
},
@@ -630,6 +630,7 @@
},
// 鑾峰彇鍒堕�犱俊鎭�
async getProductOrderInfo(number) {
+ console.log(number,this.TabsIndex,"number")
if (number) {
if (this.TabsIndex == 0) {
// 浜у搧淇℃伅鍒楄〃
@@ -694,7 +695,7 @@
let b1 = number1 || number1 == 0 ? number1 : "--";
string1 = b1 + "/" + a1;
}
- item.purchaseAmount = string1
+ item.purchaseAmount2 = string1
let string2 = "--";
let number2 = item.makeFinishAmount;
let val2 = item.makeAmount
@@ -703,7 +704,7 @@
let b2 = number2 || number2 == 0 ? number2 : "--";
string2 = b2 + "/" + a2;
}
- item.makeAmount = string2
+ item.makeAmount2 = string2
let string3 = "--";
let number3 = item.outsourcingFinishAmount;
let val3 = item.outsourcingAmount
@@ -712,7 +713,7 @@
let b3 = number3 || number3 == 0 ? number3 : "--";
string3 = b3 + "/" + a3;
}
- item.outsourcingAmount = string3
+ item.outsourcingAmount2 = string3
}))
}
this.productTableList.tableInfomation = res.data && res.data.productInfo ? res.data.productInfo : []
--
Gitblit v1.8.0