From 9f571972ce45d45facd8ca667376e2d4c99da3af Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期一, 07 四月 2025 13:22:06 +0800
Subject: [PATCH] 原辅料下单修改
---
src/views/business/materialOrder/customsInspection.vue | 24 ++++++++++++------------
src/views/business/productOrder/components/add.vue | 2 +-
src/views/structural/capabilityAndLaboratory/capability/index.vue | 3 +++
src/views/business/materialOrder/index.vue | 2 +-
4 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/src/views/business/materialOrder/customsInspection.vue b/src/views/business/materialOrder/customsInspection.vue
index a5e3baa..4c9dd8c 100644
--- a/src/views/business/materialOrder/customsInspection.vue
+++ b/src/views/business/materialOrder/customsInspection.vue
@@ -971,19 +971,19 @@
})
this.getTotal(sampleList)
let trees = this.selectTree.split(" - ")
- if (trees.length < 3) {
+ if (trees.length < 5) {
this.$message.error('鏈�夋嫨瀵硅薄')
return
}
this.addObj.factory = trees[0]
this.addObj.laboratory = trees[1]
- this.addObj.sampleType = trees[2]
- if ((trees[3] === undefined || trees[3] === '') || trees.length === 4) {
- this.addObj.sample = trees[2]
+ this.addObj.sampleType = trees[3]
+ if ((trees[5] === undefined || trees[5] === '') || trees.length === 6) {
+ this.addObj.sample = trees[4]
} else {
- this.addObj.sample = trees[3]
+ this.addObj.sample = trees[5]
}
- this.addObj.model = (trees[4] == undefined ? null : trees[4])
+ this.addObj.model = (trees[6] == undefined ? null : trees[6])
this.addObj.ifsInventoryId = this.customsInspection.id
this.noNeedCheckLoad = true
addExemptionOrder({
@@ -1017,19 +1017,19 @@
},
saveMethod(sampleList) {
let trees = this.selectTree.split(" - ")
- if (trees.length < 3) {
+ if (trees.length < 5) {
this.$message.error('鏈�夋嫨瀵硅薄')
return
}
this.addObj.factory = trees[0]
this.addObj.laboratory = trees[1]
- this.addObj.sampleType = trees[2]
- if ((trees[3] === undefined || trees[3] === '') || trees.length === 4) {
- this.addObj.sample = trees[2]
+ this.addObj.sampleType = trees[4]
+ if ((trees[5] === undefined || trees[5] === '') || trees.length === 6) {
+ this.addObj.sample = trees[4]
} else {
- this.addObj.sample = trees[3]
+ this.addObj.sample = trees[5]
}
- this.addObj.model = (trees[4] == undefined ? null : trees[4])
+ this.addObj.model = (trees[6] == undefined ? null : trees[6])
this.addObj.ifsInventoryId = this.customsInspection.id
this.saveLoad = true
if (this.addObj.createTime) {
diff --git a/src/views/business/materialOrder/index.vue b/src/views/business/materialOrder/index.vue
index cb80901..4cb05c3 100644
--- a/src/views/business/materialOrder/index.vue
+++ b/src/views/business/materialOrder/index.vue
@@ -74,7 +74,7 @@
<div>
<el-button v-show="tabIndex === 3 || tabIndex === 2" :loading="outLoading" size="small" type="primary"
@click="handleOut">瀵煎嚭</el-button>
- <el-button v-if="tabIndex === 0" size="small" type="primary" @click="copper">閾滄潗鏂欎笅鍗�</el-button>
+ <!-- <el-button v-if="tabIndex === 0" size="small" type="primary" @click="copper">閾滄潗鏂欎笅鍗�</el-button> -->
<el-button v-if="tabIndex !== 0" size="small" type="primary" @click="openPrint">鏍囩鎵撳嵃</el-button>
</div>
</div>
diff --git a/src/views/business/productOrder/components/add.vue b/src/views/business/productOrder/components/add.vue
index 92964be..6135f46 100644
--- a/src/views/business/productOrder/components/add.vue
+++ b/src/views/business/productOrder/components/add.vue
@@ -1418,7 +1418,7 @@
},
activeStandardTree() {
let trees = this.selectTree.split(" - ")
- if (trees.length < 3) {
+ if (trees.length < 4) {
this.$message.error('鏈�夋嫨瀵硅薄')
return
}
diff --git a/src/views/structural/capabilityAndLaboratory/capability/index.vue b/src/views/structural/capabilityAndLaboratory/capability/index.vue
index 5fe1d9b..f184385 100644
--- a/src/views/structural/capabilityAndLaboratory/capability/index.vue
+++ b/src/views/structural/capabilityAndLaboratory/capability/index.vue
@@ -282,6 +282,9 @@
clickFun: (row) => {
this.bindPartFirst(row);
},
+ disabled: (row) => {
+ return row.product
+ }
},
{
name: '杞﹂棿缁戝畾',
--
Gitblit v1.9.3