From 747c996003ace8a4afebe61d4623ca3c01994bb3 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期三, 19 六月 2024 01:01:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/do/b1-ins-order/add.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 2beb888..f2ac520 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -132,7 +132,7 @@
<span style="color: #3A7BFA;">淇濆瓨妯℃澘</span>
</el-button>
<el-button size="medium" type="primary" @click="openCableConfig"
- v-if="active==1&&PROJECT=='瑁呭鐢电紗'">鐢电紗閰嶇疆</el-button>
+ v-if="active==1&&PROJECT=='瑁呭鐢电紗'&&addObj.sampleType!=undefined&&addObj.sampleType.indexOf('鐢电紗')>-1">鐢电紗閰嶇疆</el-button>
<el-button size="medium" type="primary" @click="openEquipConfig" v-if="active==1">瀛愭牱鍝侀厤缃�</el-button>
<el-button size="medium" type="primary" @click="openConfig" v-if="addObj.sampleType==='鍏夌紗'">鍏夌氦閰嶇疆</el-button>
<el-button size="medium" type="primary" @click="save" :loading="saveLoad" v-show="active==1">鎻愪氦</el-button>
@@ -1285,7 +1285,6 @@
},
upProductSelect(selection, row) {
row.state = row.state == 1 ? 0 : 1
- this.getProNum()
if (row.bsm === '1' && row.section !== '' && row.section !== null && row.state === 1) {
if (row.section.indexOf('[') > -1) {
this.bsmRow = this.HaveJson(row)
@@ -1331,6 +1330,7 @@
}
return item
})
+ this.getProNum()
},
permute(nums) {
const result = [];
@@ -1561,7 +1561,6 @@
return m
})
}
- this.getProNum()
this.bsmRow3 = [];
this.productList.forEach(p => {
if (p.bsm === '1' && p.section !== '' && p.section !== null && p.state === 1) {
@@ -1617,6 +1616,7 @@
return item
})
}
+ this.getProNum()
this.$nextTick(() => {
this.$refs.productTable.doLayout()
})
--
Gitblit v1.9.3