From ee68edf6417280be572cd26a40c1f2acffea6cb6 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期日, 16 三月 2025 16:20:28 +0800
Subject: [PATCH] 成品下单bug
---
src/views/business/materialOrder/customsInspection.vue | 9 +++++++--
src/views/business/productOrder/components/add.vue | 4 +---
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/views/business/materialOrder/customsInspection.vue b/src/views/business/materialOrder/customsInspection.vue
index 3aa17dc..b7af486 100644
--- a/src/views/business/materialOrder/customsInspection.vue
+++ b/src/views/business/materialOrder/customsInspection.vue
@@ -747,8 +747,10 @@
notificationRawOrder({ifsInventoryId:this.customsInspection.id}).then(res => {
if (res.code === 200) {
if (res.data === 1) {
- this.dialogVisible2 = true
- this.dialogMessage2 = '褰撳墠鎵规鐨勬牱鍝佸凡妫�楠岃繃, 鍙互鍏嶆'
+ if (this.orderType != 1) {
+ this.dialogVisible2 = true
+ this.dialogMessage2 = '褰撳墠鎵规鐨勬牱鍝佸凡妫�楠岃繃, 鍙互鍏嶆'
+ }
} else if (res.data === 2) {
this.dialogVisible2 = true
this.dialogMessage2 = '褰撳墠鎵规鐨勬牱鍝佸凡瓒�20鍚�, 闇�瑕佸绾у娆℃楠�'
@@ -1052,6 +1054,9 @@
this.addObj.model = (trees[4] == undefined ? null : trees[4])
this.addObj.ifsInventoryId = this.customsInspection.id
this.saveLoad = true
+ if (this.addObj.createTime) {
+ delete this.addObj.createTime
+ }
addInsOrder({
insOrder: this.addObj,
sampleList: sampleList.map(a => {
diff --git a/src/views/business/productOrder/components/add.vue b/src/views/business/productOrder/components/add.vue
index e2d0238..350dce2 100644
--- a/src/views/business/productOrder/components/add.vue
+++ b/src/views/business/productOrder/components/add.vue
@@ -298,8 +298,7 @@
</el-table>
<el-table ref="productTable" v-loading="getProductLoad" :data="productList"
:row-class-name="tableRowClassName" border class="el-table"
- :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
- :key="upIndex"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }"
max-height="400px" style="margin-bottom: 10px;" tooltip-effect="dark"
@select="selectOne" @selection-change="selectProduct" @select-all="handleAll">
<el-table-column v-if="active==1" :selectable="selectable0" type="selection" width="65"></el-table-column>
@@ -902,7 +901,6 @@
this.isSpecial = true
this.$nextTick(() => {
this.$refs.productTable.doLayout();
- this.upIndex++
});
},
getQuarterOnOrderList () {
--
Gitblit v1.9.3