From c92029d888ea7c7f54ea02f13688743b00cd8870 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期一, 22 七月 2024 17:15:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/b1-material-inspection-order.vue | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/src/components/view/b1-material-inspection-order.vue b/src/components/view/b1-material-inspection-order.vue
index 75eb15d..ce7051b 100644
--- a/src/components/view/b1-material-inspection-order.vue
+++ b/src/components/view/b1-material-inspection-order.vue
@@ -1,12 +1,12 @@
<template>
<div>
- <div style="width: 100%;height: 100%;">
+ <div style="width: 100%;height: 100%;" v-show="active === 0">
<div>
<el-row class="title">
<el-col :span="12" style="padding-left: 20px;text-align: left;">鍘熸潗鏂欐楠屼笅鍗�</el-col>
<el-col :span="12" style="text-align: right;">
<el-button size="medium" type="primary" v-if="tabIndex === 0" @click="openIFS">鑾峰彇IFS璁㈠崟</el-button>
- <el-button size="medium" type="primary" v-if="tabIndex === 0">鎶ユ</el-button>
+ <el-button size="medium" type="primary" v-if="tabIndex === 0" @click="playOrder(1)">鎶ユ</el-button>
</el-col>
</el-row>
</div>
@@ -41,6 +41,9 @@
:key="'b'+ upIndex" />
</div>
</div>
+ <div style="width: 100%;height: 100%;" v-if="active >0">
+ <CustomsInspection :active="active" :currentId="currentId" v-if="active<4" />
+ </div>
<el-dialog title="鑾峰彇IFS璁㈠崟琛�" :visible.sync="IFSDialog" width="70%">
<div class="search">
<div class="search_thing">
@@ -70,11 +73,12 @@
<script>
import ValueTable from "../tool/value-table.vue";
+import CustomsInspection from "../do/b1-material-ins-order/customs-inspection.vue";
export default {
name: "b1-material-inspection-order",
// import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
- components: {ValueTable},
+ components: {CustomsInspection, ValueTable},
data() {
// 杩欓噷瀛樻斁鏁版嵁
return {
@@ -142,7 +146,9 @@
entityCopy: {},
entityCopyIFS: {},
IFSDialog: false,
- IFSGetLoading: false
+ IFSGetLoading: false,
+ active: 0, //1锛氭姤妫�锛�2锛氭煡鐪嬶紝3锛氬鏍革紝4锛氬厜绾ら厤缃�,榛樿涓�0
+ currentId: null,
}
},
mounted () {
@@ -169,6 +175,17 @@
submitPrint () {
},
+ // 鎶ユ
+ playOrder(num) {
+ // if (this.multipleSelection.length < 1) {
+ // this.$message.error('璇烽�夋嫨闇�瑕佹姤妫�鐨勬暟鎹�')
+ // return
+ // }
+ this.active = num
+ if (num === 0) {
+ this.refreshTable('page')
+ }
+ },
// 鍒囨崲tab琛ㄦ牸
handleTab(m, i) {
this.tabIndex = i;
--
Gitblit v1.9.3