From 0b89c49a1e3ab87368b689d985e28a977a9bb84e Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 22 三月 2024 13:08:20 +0800
Subject: [PATCH] 合并冲突
---
src/components/view/b1-inspect-order-plan.vue | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/src/components/view/b1-inspect-order-plan.vue b/src/components/view/b1-inspect-order-plan.vue
index a16fdd5..9311104 100644
--- a/src/components/view/b1-inspect-order-plan.vue
+++ b/src/components/view/b1-inspect-order-plan.vue
@@ -3,26 +3,26 @@
font-size: 20px;
color: #3A7BFA
}
-
+
.search {
background-color: #fff;
height: 80px;
display: flex;
align-items: center;
}
-
+
.search_thing {
display: flex;
align-items: center;
height: 50px;
}
-
+
.search_label {
width: 120px;
font-size: 14px;
text-align: right;
}
-
+
.search_input {
width: calc(100% - 120px);
}
@@ -105,7 +105,7 @@
</style>
<template>
<div class="ins-order-plan-main">
- <div v-if="activeFace == 0" style="height: 100%;">
+ <div v-show="activeFace == 0&&state==0" style="height: 100%;">
<p style="font-size: 16px;padding:19.5px 0px">妫�楠屼换鍔�</p>
<div class="search">
<div class="search_thing">
@@ -150,7 +150,7 @@
</el-row>
</div>
<ValueTable :tableRowClassName="changeRowClass" class="value-table" ref="insOrderPlan"
- :url="$api.insOrderPlan.selectInsOrderPlanList" :upUrl="$api.user.updateUser" :componentData="componentData"
+ :url="$api.insOrderPlan.selectInsOrderPlanList" :upUrl="$api.user.updateUser" :componentData="componentData" @handleInspection="handleInspection"
:key="upIndex"/>
</div>
</div>
@@ -164,11 +164,13 @@
<div style="width: 100%;height: 100%;" v-if="activeFace >0">
<Add :active="activeFace" :currentId="currentId"/>
</div>
+ <Inspection v-if="state==1" @goback="state=0"/>
</div>
</template>
<script>
import ValueTable from '../tool/value-table.vue'
+ import Inspection from '../do/b1-inspect-order-plan/Inspection.vue'
import {
getYearAndMonthAndDays
} from '../../util/date'
@@ -177,6 +179,7 @@
export default {
components: {
ValueTable,
+ Inspection,
Add
},
data() {
@@ -205,7 +208,7 @@
id: '',
font: '妫�楠�',
type: 'text',
- method: ''
+ method: 'handleInspection'
}, {
id: '',
font: '浜ゆ帴',
@@ -247,8 +250,9 @@
upIndex: 0,
planTotal: 0,
insStateList: [],
+ state:0,//0:鍙拌处椤碉紝1锛氭楠岄〉闈紝榛樿涓�0
activeFace: 0, //1锛氫笅鍗曪紝2锛氭煡鐪嬶紝3锛氬鏍�
- currentId: null
+ currentId: null,
}
},
created() {
@@ -379,7 +383,10 @@
},
playOrder(num) {
this.activeFace = num
- }
+ },
+ handleInspection(row){
+ this.state = 1;
+ }
}
}
</script>
--
Gitblit v1.9.3