Merge branch 'master' of http://120.26.64.82:3000/BFFE/SZYGM1.0

src/components/tableColumnSet/index.vue

@@ -1,7 +1,7 @@
 <template>
-  <Dialog :flag="dialogVisible" msgTitle="列设置" width="1080px" @submitForm="submitForm">
+  <Dialog :flag="dialogVisible" msgTitle="列设置" width="1080px" @submitForm="submitForm" @resetForm="resetForm">
     <div class="columnSet">
-        <el-checkbox v-for="(item,index) in columnList" :key="index" :label="item.key" v-model="item.isShow" :checked="item.isShow">
+        <el-checkbox v-for="(item,index) in tableHeaderList" :key="index" :label="item.key" v-model="item.isShow" :checked="item.isShow">
           {{item.label}}
         </el-checkbox>
     </div>
@@ -23,13 +23,22 @@ const props = defineProps({
   },
 });
 
-const checkList=ref([])
+const tableHeaderList = ref([])
+
+watchEffect(() => {
+  tableHeaderList.value= JSON.parse(JSON.stringify(props.columnList))
+})
 
 const submitForm=()=>{
-  emit('setColumn',props.columnList)
+  emit('setColumn',tableHeaderList.value)
+}
+
+const resetForm=()=>{
+  emit('closeDialog',false)
 }
 
-const emit = defineEmits(['setColumn'])
+
+const emit = defineEmits(['setColumn','closeDialog'])
 
 </script>
 

src/components/tableTemp/index.vue

@@ -50,7 +50,7 @@
       </template>
     </el-table-column>
     <!-- label-class-name  可通过 tableHeader中传入class来修改某一个或某一类表头的样式-->
-    <el-table-column class="infinite-list-item" v-for="(items, index) in props.tableHeader" :key="index" :label="items.label" :prop="items.key" :width="items.width?items.width:props.tableColumnProperty.width" :sortable="
+    <el-table-column class="infinite-list-item" v-for="(items, index) in tableHeaderList" :key="index" :label="items.label" :prop="items.key" :width="items.width?items.width:props.tableColumnProperty.width" :sortable="
         items.sortable ? items.sortable : props.tableColumnProperty.sortable
       " :show-overflow-tooltip="props.tableColumnProperty.showOverflowTooltip" :align="items.align ? items.align : props.tableColumnProperty.align" :header-align="
         items.headerAlign
@@ -83,7 +83,7 @@
 </template>
 
 <script setup lang="ts">
-import { computed } from "vue";
+import { computed,watchEffect } from "vue";
 //表格参数
 const tablePropertyDefault = {
   height: "100%",
@@ -163,6 +163,19 @@ const props = defineProps({
   },
 });
 
+const tableHeaderList = ref([])
+
+watchEffect(() => {
+  let newArray = []
+  console.log(props.tableHeader)
+  props.tableHeader.map(item => {
+      if(item.isShow != false){
+        newArray.push(item)
+      }
+  })
+  tableHeaderList.value = newArray;
+})
+
 const isChild = computed(() => (item: any) => {
   const msg = typeof item === "string" ? item : `${item}`;
   return msg.includes("-");

src/views/baggageManagement/arrival/flight/index.vue

@@ -43,7 +43,8 @@
       </div> -->
     </div>
     <div class="tableTopBtn">
-        <Search @clear="clear" @search="search" />
+      <TBtnGroup v-model:flag="state.UTCFlag" @columnSet="columnSet" @downLoad="downLoad" @refresh="refresh"></TBtnGroup>
+      <Search @clear="clear" @search="search" />
     </div>
     <div class="waybillList">
       <tableTemp
@@ -55,10 +56,13 @@
           @cellClass="test"
         ></tableTemp>
     </div>
+    <tableColumnSet :dialogVisible="state.dialogVisible" :columnList="state.waybillTableHeader" @setColumn="setColumn" @closeDialog="closeDialog"></tableColumnSet>
   </div>
 </template>
 <script setup lang="ts">
 import tableTemp from "@/components/tableTemp/index.vue";
+import TBtnGroup from "@/components/TBtnGroup/index.vue";
+import tableColumnSet from "@/components/tableColumnSet/index.vue";
 import Search from "@/components/search/index.vue";
 import {CaretRight} from "@element-plus/icons-vue"
 import { ref, onMounted } from 'vue';
@@ -90,6 +94,8 @@ const state = reactive({
     { label: "装载序号", key: "zzxh",isShow:true}
   ],
   listLoading: true,
+  UTCFlag:true,
+  dialogVisible:false
 });
 
 const waybilltableData = ref([
@@ -186,6 +192,42 @@ const loadMore=(data)=>{
 
 }
 
+
+//清空搜索
+const clear=(data) =>{
+  console.log(data)
+}
+
+//点击搜索按钮
+const search=(data) =>{
+  console.log(data)
+}
+
+//点击刷新按钮
+const refresh=(data) =>{
+  console.log(data)
+}
+
+//点击下载按钮
+const downLoad=(data) =>{
+  console.log(data)
+}
+
+//点击列设置按钮
+const columnSet=(data) =>{
+  state.dialogVisible = true;
+}
+
+const setColumn = (data) => {
+  state.waybillTableHeader = data;
+  state.dialogVisible = false;
+}
+
+const closeDialog = (data) => {
+  state.dialogVisible = false;
+}
+
+
 </script>
 <style lang="scss" scoped>
 .pageBody{

src/views/baggageManagement/departure/flight/index.vue

@@ -56,7 +56,7 @@
           @load="loadMore"
         ></tableTemp>
     </div>
-    <tableColumnSet :dialogVisible="state.dialogVisible" :columnList="state.waybillTableHeader"></tableColumnSet>
+    <tableColumnSet :dialogVisible="state.dialogVisible" :columnList="state.waybillTableHeader" @setColumn="setColumn" @closeDialog="closeDialog"></tableColumnSet>
   </div>
 </template>
 <script setup lang="ts">
@@ -97,7 +97,7 @@ const state = reactive({
   ],
   listLoading: true,
   UTCFlag:true,
-  dialogVisible:true
+  dialogVisible:false
 });
 
 const waybilltableData = ref([
@@ -210,11 +210,19 @@ const downLoad=(data) =>{
   console.log(data)
 }
 
-//点击刷新按钮
+//点击列设置按钮
 const columnSet=(data) =>{
-  console.log(data)
+  state.dialogVisible = true;
 }
 
+const setColumn = (data) => {
+  state.waybillTableHeader = data;
+  state.dialogVisible = false;
+}
+
+const closeDialog = (data) => {
+  state.dialogVisible = false;
+}
 
 </script>
 <style lang="scss" scoped>