From 2e9370979f871bf47f6dc145c49d7bf32ffa4b51 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期一, 03 六月 2024 09:08:02 +0800
Subject: [PATCH] 完成光纤配置进行检验
---
src/components/view/b1-inspection-order.vue | 52 ++++++++++++++++++++++++++++++----------------------
1 files changed, 30 insertions(+), 22 deletions(-)
diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue
index 8566f6b..b81c76c 100644
--- a/src/components/view/b1-inspection-order.vue
+++ b/src/components/view/b1-inspection-order.vue
@@ -9,6 +9,7 @@
height: 80px;
display: flex;
align-items: center;
+ overflow: hidden;
}
.search_thing {
@@ -81,29 +82,29 @@
</el-row>
</div>
<div class="search" :style="`height: ${more?130:80}px;`">
- <el-row :gutter="10">
- <el-col :span="20" style="display: flex;align-items: center;flex-wrap: wrap;">
- <div class="search_thing">
+ <el-row :gutter="10" style="width: 100%;">
+ <el-col :span="20" style="display: flex;flex-wrap: wrap;">
+ <div class="search_thing" style="width: 20%;">
<div class="search_label">濮旀墭缂栧彿锛�</div>
<div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
v-model="componentData.entity.entrustCode" @keyup.enter.native="refreshTable()"></el-input></div>
</div>
- <div class="search_thing">
+ <div class="search_thing" style="width: 20%;">
<div class="search_label">鏍峰搧鍚嶇О锛�</div>
<div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
v-model="componentData.entity.sampleType" @keyup.enter.native="refreshTable()"></el-input></div>
</div>
- <div class="search_thing">
+ <div class="search_thing" style="width: 20%;">
<div class="search_label">鏍峰搧鍨嬪彿锛�</div>
<div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
v-model="componentData.entity.sampleModel" @keyup.enter.native="refreshTable()"></el-input></div>
</div>
- <div class="search_thing">
+ <div class="search_thing" style="width: 20%;">
<div class="search_label">鏍峰搧缂栧彿锛�</div>
<div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
v-model="componentData.entity.sampleCode" @keyup.enter.native="refreshTable()"></el-input></div>
</div>
- <div class="search_thing">
+ <div class="search_thing" style="width: 20%;">
<div class="search_label">涓嬪崟鏃堕棿锛�</div>
<div class="search_input">
<el-date-picker style="width:100%" v-model="componentData.entity.createTime"
@@ -116,24 +117,24 @@
</el-date-picker>
</div>
</div>
- <div class="search_thing" v-show="more">
+ <div class="search_thing" style="width: 20%;" v-if="more">
<div class="search_label">涓嬪崟浜猴細</div>
<div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
- v-model="componentData.entity.value1" @keyup.enter.native="refreshTable()"></el-input></div>
+ v-model="componentData.entity.name" @keyup.enter.native="refreshTable()"></el-input></div>
</div>
- <div class="search_thing" v-show="more">
+ <div class="search_thing" style="width: 20%;" v-if="more">
<div class="search_label">宸ョ▼鍚嶇О锛�</div>
<div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
- v-model="componentData.entity.value2" @keyup.enter.native="refreshTable()"></el-input></div>
+ v-model="componentData.entity.engineering" @keyup.enter.native="refreshTable()"></el-input></div>
</div>
- <div class="search_thing" v-show="more">
+ <div class="search_thing" style="width: 20%;" v-if="more">
<div class="search_label">鐢熶骇鍗曚綅锛�</div>
<div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
- v-model="componentData.entity.value3" @keyup.enter.native="refreshTable()"></el-input></div>
+ v-model="componentData.entity.production" @keyup.enter.native="refreshTable()"></el-input></div>
</div>
</el-col>
<el-col :span="4">
- <div class="search_thing" style="padding-left: 10px;">
+ <div class="search_thing">
<el-button type="text" :icon="!more?'el-icon-arrow-down':'el-icon-arrow-up'" style="color: #3A7BFA;" @click="more=!more">{{!more?'鏇村':'鏀惰捣'}}</el-button>
<el-button size="small" @click="refresh()">閲� 缃�</el-button>
<el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
@@ -145,7 +146,7 @@
<ul class="tab">
<li v-for="(m,i) in tabList" :key="i" :class="{active:i==tabIndex}" @click="handleTab(m,i)">{{m.label}}</li>
</ul>
- <ValueTable :style="'height: calc(100% - '+(more?'94':'44')+'px)'" ref="ValueTable" :url="$api.insOrder.selectInsOrderParameter" :componentData="componentData"
+ <ValueTable :style="getStyle()" ref="ValueTable" :url="$api.insOrder.selectInsOrderParameter" :componentData="componentData"
:key="'b'+upIndex" />
</div>
<!-- 瀹℃牳 -->
@@ -227,7 +228,6 @@
</div>
<div style="width: 100%;height: 100%;" v-if="active >0">
<Add :active="active" :currentId="currentId" v-if="active<4" />
- <fiberOpticConfig :currentId="currentId" v-if="active==4" />
</div>
</div>
</template>
@@ -235,12 +235,10 @@
<script>
import ValueTable from '../tool/value-table.vue'
import Add from '../do/b1-ins-order/add.vue'
- import fiberOpticConfig from '../do/b1-ins-order/fiberoptic-config.vue'
export default {
components: {
ValueTable,
- Add,
- fiberOpticConfig
+ Add
},
data() {
return {
@@ -271,9 +269,9 @@
sampleModel: null,
sampleCode: null,
state: 0,
- value1:null,
- value2:null,
- value3:null,
+ name:null,
+ engineering:null,
+ production:null,
orderBy: {
field: 'id',
order: 'asc'
@@ -494,6 +492,7 @@
let up = false
let del = false
let add = false
+ let revoke = false
for (var i = 0; i < power.length; i++) {
if (power[i].menuMethod == 'upInsOrder') {
up = true
@@ -501,10 +500,16 @@
if (power[i].menuMethod == 'addInsOrder') {
add = true
}
+ if (power[i].menuMethod == 'updateStatus') {
+ revoke = true
+ }
}
if (!up) {
this.componentData.do.splice(4, 1)
}
+ if (!revoke) {
+ this.componentData.do.splice(3, 1)
+ }
this.addPower = add
},
handleClose() {
@@ -676,6 +681,9 @@
this.componentData.tagField.orderType.select = res.data
})
},
+ getStyle(){
+ return 'height: calc(100% - '+(this.more?'94':'44')+'px)'
+ }
}
}
</script>
--
Gitblit v1.9.3