From f030d4e89acc8dfca8bf2b9df9ac24ad8f66d06c Mon Sep 17 00:00:00 2001
From: gaoluyang <gaoluyang@rengu.cc>
Date: 星期三, 25 九月 2024 17:32:04 +0800
Subject: [PATCH] 1.编辑模板弹框添加取消按钮
---
src/components/do/b1-inspect-order-plan/circuit-parameters2.vue | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/circuit-parameters2.vue b/src/components/do/b1-inspect-order-plan/circuit-parameters2.vue
index e986eb7..c7bbc0c 100644
--- a/src/components/do/b1-inspect-order-plan/circuit-parameters2.vue
+++ b/src/components/do/b1-inspect-order-plan/circuit-parameters2.vue
@@ -33,7 +33,7 @@
</el-col>
</el-row>
</el-col>
- <el-col :span="7">
+ <el-col :span="7" v-if="!isLook">
<div style="display: flex;align-items: center;justify-content: flex-end;" class="btns">
<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>
@@ -72,7 +72,7 @@
</el-select>
<el-button type="primary" size="small" @click="addList(h.projectList,'浜掕皟')" style="margin-left: 16px;" v-if="intermodulationNum>0&&!(state>1)">娣诲姞浜掕皟</el-button>
<el-button size="small" @click="deleteList(0,h.projectList,'浜掕皟')" v-if="intermodulationNum>0&&!(state>1)">鍒犻櫎浜掕皟</el-button>
- <el-button type="primary" size="small" @click="save(h,y)" :disabled="state>1" :loading="loading[y]" style="margin-left: 16px;">淇� 瀛�</el-button>
+ <el-button type="primary" size="small" @click="save(h,y)" :disabled="state>1" :loading="loading[y]" style="margin-left: 16px;" 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>
@@ -180,7 +180,7 @@
<script>
export default {
- props:['insProduct','orderId','sampleId','state'],
+ props:['insProduct','orderId','sampleId','state','num','isLook','currentNum'],
data() {
return {
value: "",
@@ -269,11 +269,15 @@
}
})
})
+ },
+ currentNum(val) {
+ this.initData()
}
},
mounted() {
this.getTypeDicts()
this.initData()
+ console.log(2222,this.currentNum)
},
methods: {
// 瀛楀吀鑾峰彇鏁版嵁
@@ -287,7 +291,7 @@
// 鍒濆鍖栨暟鎹�
initData(){
// 澶勭悊椤圭洰
- this.insProductNew = JSON.parse(JSON.stringify(this.insProduct))
+ this.insProductNew = JSON.parse(JSON.stringify(this.insProduct)).filter(m=>m.inspectionItem.includes('鐢佃矾璇曢獙'))
this.insProductNew.forEach(async item => {
// 鑾峰彇璁惧鍒楄〃
item.equipOptions = await this.getEquipOptions(item)
@@ -343,7 +347,8 @@
often:n.often,
equipName:n.equipName,
equipValue:n.equipValue,
- frequency:n.frequency
+ frequency:n.frequency,
+ sonLaboratory:item.sonLaboratory
}
this.$set(obj,'portList', n.port?portList:[])
this.$set(obj,'angleList', n.angle?angleList:[])
@@ -431,7 +436,8 @@
}).then(() => {
this.$axios.post(this.$api.insOrderPlan.deleteInsContext, {
frequency:list[index].band,
- productIds:list[index].projectList.map(m=>m.id)
+ productIds:list[index].projectList.map(m=>m.id),
+ num:this.num
}, {
headers: {
'Content-Type': 'application/json'
@@ -483,7 +489,6 @@
list.splice(index+1, 0, obj)
}else if(type=='棰戞'){
let obj = JSON.parse(JSON.stringify(list[0]));
- console.log(2222,obj)
obj.band = ''
obj.projectList.forEach(item=>{
item.often = ''
--
Gitblit v1.9.3