From 2e4a6c4526b6c22808d5877f2050da852bfaebe7 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 30 十二月 2025 14:31:47 +0800
Subject: [PATCH] 外购成品检验功能迁移v1
---
src/views/business/materialOrder/index.vue | 35 ++++++++++++++++++++++-------------
1 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/src/views/business/materialOrder/index.vue b/src/views/business/materialOrder/index.vue
index 3ee3dcf..cf30a2a 100644
--- a/src/views/business/materialOrder/index.vue
+++ b/src/views/business/materialOrder/index.vue
@@ -82,25 +82,25 @@
<!--妫�楠屼腑-->
<div class="table">
<lims-table :tableData="tableData1" :column="column1" v-if="tabIndex === 1" :isSelection="true"
- :rowClassName="changeRowClass2" :handleSelectionChange="selectMethod" @pagination="pagination1"
+ :rowClassName="changeRowClass" :handleSelectionChange="selectMethod" @pagination="pagination1"
:height="'calc(100vh - 290px)'" key="tableData1" :page="page1" :tableLoading="tableLoading1"></lims-table>
</div>
<!--宸叉楠�-->
<div class="table">
<lims-table :tableData="tableData2" :column="column2" v-if="tabIndex === 2" :isSelection="true"
- :rowClassName="changeRowClass2" :handleSelectionChange="selectMethod" @pagination="pagination2"
+ :rowClassName="changeRowClass" :handleSelectionChange="selectMethod" @pagination="pagination2"
:height="'calc(100vh - 290px)'" key="tableData2" :page="page2" :tableLoading="tableLoading2"></lims-table>
</div>
<!--鍏ㄩ儴-->
<div class="table">
<lims-table :tableData="tableData3" :column="column3" v-if="tabIndex === 3" :isSelection="true"
- :rowClassName="changeRowClass2" :handleSelectionChange="selectMethod" @pagination="pagination3"
+ :rowClassName="changeRowClass" :handleSelectionChange="selectMethod" @pagination="pagination3"
:height="'calc(100vh - 290px)'" key="tableData3" :page="page3" :tableLoading="tableLoading3"></lims-table>
</div>
<!--瀛ｅ害妫�楠�-->
<div class="table">
<lims-table :tableData="tableData4" :column="column4" v-if="tabIndex === 4" :isSelection="true"
- :rowClassName="changeRowClass2" :handleSelectionChange="selectMethod" @pagination="pagination4"
+ :rowClassName="changeRowClass" :handleSelectionChange="selectMethod" @pagination="pagination4"
:height="'calc(100vh - 290px)'" key="tableData4" :page="page4" :tableLoading="tableLoading4"></lims-table>
</div>
</div>
@@ -201,7 +201,8 @@
repealEnterRawOrder,
repealQuarterRawOrder,
revokeInspectionReport,
- updateEntrustCode
+ updateEntrustCode,
+ getOrderCountByIfsId
} from "@/api/business/rawMaterialOrder";
import { getWarehouseSubmit } from "@/api/business/materialInspection";
import {mapGetters} from "vuex";
@@ -1190,11 +1191,21 @@
},
// 涓嬪崟
playOrder(row) {
- this.$router.push({ path: "/materialOrder/customsInspectionOrder", query: { orderType: 0, customsInspection: row, active: 1 } });
+ //鏌ヨ褰撳墠鎵规鏄惁宸茬粡涓嬪崟
+ getOrderCountByIfsId(row.id).then(res=>{
+ if(res.code===200 && res.data>0){
+ this.$message.warning('璇ユ壒娆″凡涓嬪崟锛岃鍕块噸澶嶄笅鍗�')
+ this.refreshTable('page')
+ return
+ }
+ this.$router.push({ path: "/materialOrder/customsInspectionOrder", query: {isOutsourcing:'f', orderType: 0, customsInspection: row, active: 1 } });
+ }).catch(error=>{
+ console.error(error)
+ })
},
// 瀛ｅ害妫�楠屼笅鍗�
playOrderSec(row) {
- this.$router.push({ path: "/materialOrder/customsInspectionOrder", query: { orderType: 1, customsInspection: row, active: 1 } });
+ this.$router.push({ path: "/materialOrder/customsInspectionOrder", query: {isOutsourcing:'f', orderType: 1, customsInspection: row, active: 1 } });
},
// 鐐瑰嚮鏍峰搧鍚嶇О鏌ョ湅璇︽儏
selectAllByOne(row) {
@@ -1357,6 +1368,7 @@
} else {
params = {...this.entity}
}
+ params.orderType = "01raw";
rawAllExport(params).then(res => {
this.outLoading = false
const blob = new Blob([res], { type: 'application/octet-stream' });
@@ -1394,13 +1406,10 @@
},
changeRowClass({ row, rowIndex }) {
if (row.isFirst != 1 && row.lotBatchNoHasRepeat) {
- return 'highlight-danger-row-border'
+ return 'highlight-warning-row-border'
}
- return ''
- },
- changeRowClass2({ row, rowIndex }) {
- if (row.isFirst == 1) {
- return 'highlight-danger-row-border'
+ if(row.isFirst == 1){
+ return "highlight-danger-row-border";
}
return ''
},
--
Gitblit v1.9.3