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

src/views/dataQuery/flightQuery/index.vue

@@ -21,7 +21,7 @@
           @btnClick="btnClick"
         />
       </div>
-      <Dialog
+      <!-- <Dialog
         :flag="dialogFlag"
         class="dialog-check-group"
         msgTitle="列设置"
@@ -42,14 +42,13 @@
               :default-checked-keys="checkedKeysTemp"
             />
           </div>
-          <!-- <div class="foot right t30">
-            <el-button size="medium" class="r24" type="primary">确定</el-button>
-            <el-button size="medium" @click="dialogFlag = false"
-              >取消</el-button
-            >
-          </div> -->
         </div>
-      </Dialog>
+      </Dialog> -->
+      <TableColumnSet
+        :dialogVisible="dialogVisible"
+        :columnList="state.list"
+        @closeDialog="closeDialog"
+      />
     </div>
   </div>
 </template>
@@ -57,7 +56,8 @@
 import DataTable from "@/components/tableTemp/index.vue";
 import Minheader from "@/components/minheader/index.vue";
 import Dialog from "@/components/dialog/index.vue";
-const dialogFlag = ref<Boolean>(false); //列设置弹窗开关
+import TableColumnSet from "@/components/tableColumnSet/index.vue";
+const dialogVisible = ref<Boolean>(false); //列设置弹窗开关
 const tableCols = ref([
   {
     prop: "flightNO",
@@ -252,11 +252,11 @@ const state = reactive({
 });
 //列设置
 const showForm = () => {
-  dialogFlag.value = true;
+  dialogVisible.value = true;
 };
 //列设置取消
-const columnForm = () => {
-  dialogFlag.value = false;
+const closeDialog = () => {
+  dialogVisible.value = false;
 };
 </script>
 <style lang="scss" scoped>

src/views/dataQuery/freightInquiry/index.vue

@@ -21,35 +21,11 @@
           @btnClick="btnClick"
         />
       </div>
-      <Dialog
-        :flag="dialogFlag"
-        class="dialog-check-group"
-        msgTitle="列设置"
-        @resetForm="columnForm"
-      >
-        <div class="dialog-wrapper">
-          <div class="content">
-            <el-tree
-              :data="tableCols"
-              :class="colsCheckClass"
-              show-checkbox
-              node-key="index"
-              :default-expand-all="true"
-              :props="{
-                label: 'label',
-                children: 'children',
-              }"
-              :default-checked-keys="checkedKeysTemp"
-            />
-          </div>
-          <!-- <div class="foot right t30">
-            <el-button size="medium" class="r24" type="primary">确定</el-button>
-            <el-button size="medium" @click="dialogFlag = false"
-              >取消</el-button
-            >
-          </div> -->
-        </div>
-      </Dialog>
+      <TableColumnSet
+        :dialogVisible="dialogVisible"
+        :columnList="state.list"
+        @closeDialog="closeDialog"
+      />
     </div>
   </div>
 </template>
@@ -57,7 +33,8 @@
 import DataTable from "@/components/tableTemp/index.vue";
 import Minheader from "@/components/minheader/index.vue";
 import Dialog from "@/components/dialog/index.vue";
-const dialogFlag = ref<Boolean>(false); //列设置弹窗开关
+import TableColumnSet from "@/components/tableColumnSet/index.vue";
+const dialogVisible = ref<Boolean>(false); //列设置弹窗开关
 const tableCols = ref([
   {
     prop: "flightNO",
@@ -272,11 +249,11 @@ const state = reactive({
 });
 //列设置
 const showForm = () => {
-  dialogFlag.value = true;
+  dialogVisible.value = true;
 };
 //列设置取消
-const columnForm = () => {
-  dialogFlag.value = false;
+const closeDialog = () => {
+  dialogVisible.value = false;
 };
 </script>
 <style lang="scss" scoped>

src/views/dataQuery/waybillQuery/index.vue

@@ -21,35 +21,11 @@
           @btnClick="btnClick"
         />
       </div>
-      <Dialog
-        :flag="dialogFlag"
-        class="dialog-check-group"
-        msgTitle="列设置"
-        @resetForm="columnForm"
-      >
-        <div class="dialog-wrapper">
-          <div class="content">
-            <el-tree
-              :data="tableCols"
-              :class="colsCheckClass"
-              show-checkbox
-              node-key="index"
-              :default-expand-all="true"
-              :props="{
-                label: 'label',
-                children: 'children',
-              }"
-              :default-checked-keys="checkedKeysTemp"
-            />
-          </div>
-          <!-- <div class="foot right t30">
-            <el-button size="medium" class="r24" type="primary">确定</el-button>
-            <el-button size="medium" @click="dialogFlag = false"
-              >取消</el-button
-            >
-          </div> -->
-        </div>
-      </Dialog>
+      <TableColumnSet
+        :dialogVisible="dialogVisible"
+        :columnList="state.list"
+        @closeDialog="closeDialog"
+      />
     </div>
   </div>
 </template>
@@ -57,7 +33,8 @@
 import DataTable from "@/components/tableTemp/index.vue";
 import Minheader from "@/components/minheader/index.vue";
 import Dialog from "@/components/dialog/index.vue";
-const dialogFlag = ref<Boolean>(false); //列设置弹窗开关
+import TableColumnSet from "@/components/tableColumnSet/index.vue";
+const dialogVisible = ref<Boolean>(false); //列设置弹窗开关
 const tableCols = ref([
   {
     prop: "flightNO",
@@ -256,11 +233,11 @@ const state = reactive({
 });
 //列设置
 const showForm = () => {
-  dialogFlag.value = true;
+  dialogVisible.value = true;
 };
 //列设置取消
-const columnForm = () => {
-  dialogFlag.value = false;
+const closeDialog = () => {
+  dialogVisible.value = false;
 };
 </script>
 <style lang="scss" scoped>