From 7d8b8baedfc3d01266bffd45fb7eec582c413ce9 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 11 十一月 2025 17:33:11 +0800
Subject: [PATCH] 成品下单撤销报错问题修复&原材料下单下发时间过滤条件调整为报检时间
---
src/api/business/productOrder.js | 8 ++++++++
src/views/business/productOrder/index.vue | 20 ++++++++++++++++++--
src/views/business/materialOrder/index.vue | 2 +-
3 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/src/api/business/productOrder.js b/src/api/business/productOrder.js
index 881ca80..439a1ce 100644
--- a/src/api/business/productOrder.js
+++ b/src/api/business/productOrder.js
@@ -90,6 +90,14 @@
params: query
})
}
+// 鎾ら攢瀹℃牳锛屾煡璇㈡挙閿�鐨勬娴嬮」
+export function getRevocationInsProductList(query) {
+ return request({
+ url: '/insOrder/getRevocationInsProductList',
+ method: 'get',
+ params: query
+ })
+}
// 鏌ヨ鎴愬搧鏍囩鎵撳嵃淇℃伅
export function labelOrderPrinting(query) {
return request({
diff --git a/src/views/business/materialOrder/index.vue b/src/views/business/materialOrder/index.vue
index 98a7af4..cbf727d 100644
--- a/src/views/business/materialOrder/index.vue
+++ b/src/views/business/materialOrder/index.vue
@@ -48,7 +48,7 @@
<el-option v-for="(a, i) in inspectStatusList" :key="i" :label="a.label" :value="a.value"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="涓嬪彂鏃堕棿" prop="date" v-if="(tabIndex === 2 || tabIndex === 3 || tabIndex === 4) && more">
+ <el-form-item label="鎶ユ鏃堕棿" prop="date" v-if="(tabIndex === 2 || tabIndex === 3 || tabIndex === 4) && more">
<el-date-picker v-model="entity.date" end-placeholder="缁撴潫鏃ユ湡" format="yyyy-MM-dd" placeholder="閫夋嫨鏃ユ湡" @change="goSearch"
range-separator="鑷�" size="small" start-placeholder="寮�濮嬫棩鏈�" type="daterange" value-format="yyyy-MM-dd">
</el-date-picker>
diff --git a/src/views/business/productOrder/index.vue b/src/views/business/productOrder/index.vue
index b674f14..d551fbe 100644
--- a/src/views/business/productOrder/index.vue
+++ b/src/views/business/productOrder/index.vue
@@ -166,7 +166,7 @@
<div v-if="deleteDialogVisible" style="height: 70vh;overflow-y: auto;">
<lims-table :tableData="componentDataDelete" :column="columnDelete" :isSelection="true"
:handleSelectionChange="selectDelete" @pagination="paginationDelete" height="500px"
- key="componentDataDelete" :page="pageDelete" :tableLoading="tableLoadingDelete"></lims-table>
+ :key="orderId" :page="pageDelete" :tableLoading="tableLoadingDelete"></lims-table>
</div>
<span slot="footer" class="dialog-footer">
<el-row>
@@ -330,7 +330,10 @@
import {
checkUpdate, delInsOrder, getSampleByOrderId,
rawAllInsOrderExport,
- selectInsOrderParameter, selectNoProducts, selectOrderManDay,
+ selectInsOrderParameter,
+ selectNoProducts,
+ getRevocationInsProductList,
+ selectOrderManDay,
updateInspected,
updateOrderEntrustCode, updateSampleModel, updateStatus, upInsOrder, upPlanUser2
} from "@/api/business/productOrder";
@@ -1167,8 +1170,21 @@
this.orderId = row.id
this.revocationInsProductIds = row.revocationInsProductIds
this.deleteTilte = '鎾ら攢瀹℃牳'
+ // this.getRevocationInsProductList()
this.deleteDialogVisible = true;
},
+ getRevocationInsProductList(){
+ this.tableLoadingDelete = true
+ getRevocationInsProductList({orderId:this.orderId}).then(res=>{
+ if(res.code===200){
+ this.componentDataDelete = res.data
+ }
+ this.tableLoadingDelete = false
+ }).catch(error=>{
+ console.error(error)
+ this.tableLoadingDelete = false
+ })
+ },
handleNo() {
if (this.deleteTilte == '鎾ら攢') {
this.deleteDialogVisible = false
--
Gitblit v1.9.3