From 8c16c0fdac9d895f8b53a8032f47cddfe8490ff9 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 24 九月 2024 17:34:15 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/tx-lims-before into master
---
src/components/do/b1-inspect-order-plan/circuit-parameters1.vue | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/circuit-parameters1.vue b/src/components/do/b1-inspect-order-plan/circuit-parameters1.vue
index 9eb8c06..d2cda73 100644
--- a/src/components/do/b1-inspect-order-plan/circuit-parameters1.vue
+++ b/src/components/do/b1-inspect-order-plan/circuit-parameters1.vue
@@ -34,7 +34,7 @@
</el-row>
</el-col>
<el-col :span="7">
- <div style="display: flex;align-items: center;justify-content: flex-end;" class="btns">
+ <div style="display: flex;align-items: center;justify-content: flex-end;" class="btns" v-if="!isLook">
<el-button type="primary" size="small" @click="addList(allBandList,'棰戞')" :disabled="state>1">娣诲姞棰戞</el-button>
<el-button size="small" @click="deleteList(allBandList.length-1,allBandList,'鍒犻櫎棰戞')" :disabled="state>1">鍒犻櫎棰戞</el-button>
<el-button type="primary" size="small" @click="addList(angleList)" :disabled="state>1">娣诲姞瑙掑害</el-button>
@@ -70,9 +70,9 @@
:value="item.value">
</el-option>
</el-select>
- <el-button type="primary" size="small" @click="addList(h.projectList,'浜掕皟')" style="margin-left: 16px;" :disabled="state>1">娣诲姞浜掕皟</el-button>
- <el-button size="small" @click="deleteList(0,h.projectList,'浜掕皟')" :disabled="state>1">鍒犻櫎浜掕皟</el-button>
- <el-button type="primary" size="small" @click="save(h,y)" :disabled="state>1" :loading="loading[y]">淇� 瀛�</el-button>
+ <el-button type="primary" size="small" @click="addList(h.projectList,'浜掕皟')" style="margin-left: 16px;" :disabled="state>1" v-show="!isLook">娣诲姞浜掕皟</el-button>
+ <el-button size="small" @click="deleteList(0,h.projectList,'浜掕皟')" :disabled="state>1" v-show="!isLook">鍒犻櫎浜掕皟</el-button>
+ <el-button type="primary" size="small" @click="save(h,y)" :disabled="state>1" :loading="loading[y]" v-show="!isLook">淇� 瀛�</el-button>
</div>
<el-divider></el-divider>
<div class="circuit-parameters-item-content">
@@ -143,7 +143,7 @@
</td>
</tr>
<tr>
- <td>瑙掑害</td>
+ <td>绔彛</td>
<td v-for="(item,index) in n.portList" :key="index+'fff'">
<div style="display: flex;align-items: center;">
<el-input size="small" placeholder="绔彛" v-model="item.value" :disabled="state>1"></el-input>
@@ -261,7 +261,7 @@
<script>
export default {
- props:['insProduct','orderId','sampleId','state','num'],
+ props:['insProduct','orderId','sampleId','state','num','isLook','currentNum'],
data() {
return {
value: "",
@@ -378,6 +378,9 @@
})
})
console.log(this.allBandList)
+ },
+ currentNum(val) {
+ this.initData()
}
},
mounted() {
--
Gitblit v1.9.3