Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web

 /*
 /*
  * @Description: 引入公共组件
  * @Description: 引入公共组件
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-04-26 17:26:12
+ * @LastEditTime: 2023-04-28 13:30:31
  */
  */
-import dialogBox from '@/components/dialogBox/dialogBox.vue'
+import dialogBox from '@/components/DialogBox/dialogBox.vue'
 import LbTable from '@/components/LbTable/lb-table.vue'
 import LbTable from '@/components/LbTable/lb-table.vue'
 import Theme from '@/components/Theme/theme.vue'
 import Theme from '@/components/Theme/theme.vue'
 import Popup from '@/components/Popup/index'
 import Popup from '@/components/Popup/index'

@@ -47,8 +47,8 @@
 </template>
 </template>
 
 
 <script>
 <script>
-import LbColumn from './lb-column'
-export default {
+  import LbColumn from './lb-column'
+  export default {
     props: {
     props: {
       column: Array,
       column: Array,
       data: Array,
       data: Array,
@@ -163,7 +163,7 @@ export default {
             _this.tableHeight = window.innerHeight - _this.heightNum
             _this.tableHeight = window.innerHeight - _this.heightNum
           }
           }
         } else {
         } else {
-        this.tableHeight = this.heightNum
+          // this.tableHeight = this.heightNum
           this.$nextTick(() => {
           this.$nextTick(() => {
             this.minHeight && (document.getElementById('heightNumSetting').style.minHeight = this.minHeight + 'px')
             this.minHeight && (document.getElementById('heightNumSetting').style.minHeight = this.minHeight + 'px')
           })
           })
@@ -266,24 +266,24 @@ export default {
         this.getMergeArr(this.data, this.merge)
         this.getMergeArr(this.data, this.merge)
       }
       }
     },
     },
-}
+  }
 </script>
 </script>
 <style  rel="stylesheet/scss" scoped lang="scss">
 <style  rel="stylesheet/scss" scoped lang="scss">
-.lb-table {
+  .lb-table {
     margin-top: 1px;
     margin-top: 1px;
 
 
     .interlaced {
     .interlaced {
       background: #fafcff;
       background: #fafcff;
       border: 1px solid #ebf2fa;
       border: 1px solid #ebf2fa;
     }
     }
-}
+  }
 
 
-/deep/.el-table .cell {
+  /deep/.el-table .cell {
     padding-left: 3px;
     padding-left: 3px;
     padding-right: 3px;
     padding-right: 3px;
-}
+  }
 
 
-/deep/.el-radio__label {
+  /deep/.el-radio__label {
     display: none;
     display: none;
-}
+  }
 </style>
 </style>

 <template>
 <template>
-  <lb-table :column="column" :maxHeight="300" heightNumSetting :pagination="false" :key="key" :data="tableData">
+  <lb-table :column="column" :maxHeight="200" :heightNumSetting="true" :pagination="false" :key="key" :data="tableData">
   </lb-table>
   </lb-table>
 </template>
 </template>
 <script>
 <script>
-import addQlr from './addQlr.vue'
-import { mapGetters } from 'vuex'
-export default {
+  import addQlr from './addQlr.vue'
+  import { mapGetters } from 'vuex'
+  export default {
     components: {
     components: {
       addQlr
       addQlr
     },
     },
@@ -111,8 +111,7 @@ export default {
     },
     },
     methods: {
     methods: {
     }
     }
-}
+  }
 </script>
 </script>
 <style scoped lang='scss'>
 <style scoped lang='scss'>
-
 </style>
 </style>
\ No newline at end of file

@@ -154,10 +154,10 @@
   </div>
   </div>
 </template>
 </template>
 <script>
 <script>
-import cfBdcdyTable from "@/views/workflow/components/cfBdcdyTable";
-import { BatchInit, batchSaveData } from "@/api/workflow/cfdjFlow.js";
-import { mapGetters } from "vuex";
-export default {
+  import cfBdcdyTable from "@/views/workflow/components/cfBdcdyTable";
+  import { BatchInit, batchSaveData } from "@/api/workflow/cfdjFlow.js";
+  import { mapGetters } from "vuex";
+  export default {
     data () {
     data () {
       return {
       return {
         disabled: true,
         disabled: true,
@@ -166,7 +166,10 @@ export default {
         //传递参数
         //传递参数
         propsParam: {},
         propsParam: {},
         //页面数据
         //页面数据
-      ruleForm: {},
+        ruleForm: {
+          slywxx: {},
+          cfdj: {},
+        },
         isJfOperation: false,
         isJfOperation: false,
         tableData: []
         tableData: []
       };
       };
@@ -183,10 +186,7 @@ export default {
         if (res.code === 200 && res.result) {
         if (res.code === 200 && res.result) {
           this.ruleForm = res.result
           this.ruleForm = res.result
         }
         }
-    });
-  },
-  watch: {
-
+      })
     },
     },
     components: { cfBdcdyTable },
     components: { cfBdcdyTable },
     props: {
     props: {
@@ -220,9 +220,9 @@ export default {
         this.ruleForm.cfdj.cflxmc = cflxItem.dname;
         this.ruleForm.cfdj.cflxmc = cflxItem.dname;
       }
       }
     },
     },
-};
+  };
 </script>
 </script>
 <style scoped lang='scss'>
 <style scoped lang='scss'>
-@import "~@/styles/public.scss";
-@import "~@/styles/slxx/slxx.scss";
+  @import "~@/styles/public.scss";
+  @import "~@/styles/slxx/slxx.scss";
 </style>
 </style>
\ No newline at end of file