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,243 +47,243 @@
 </template>
 </template>
 
 
 <script>
 <script>
-import LbColumn from './lb-column'
-export default {
-  props: {
-    column: Array,
-    data: Array,
-    spanMethod: Function,
-    pagination: {
-      type: Boolean,
-      default: true,
+  import LbColumn from './lb-column'
+  export default {
+    props: {
+      column: Array,
+      data: Array,
+      spanMethod: Function,
+      pagination: {
+        type: Boolean,
+        default: true,
+      },
+      isRadio: {
+        type: Boolean,
+        default: false,
+      },
+      border: {
+        type: Boolean,
+        default: true,
+      },
+      showHeader: {
+        type: Boolean,
+        default: true,
+      },
+      paginationTop: {
+        type: String,
+        default: '0',
+      },
+      heightNum: {
+        type: Number,
+        default: 355,
+      },
+      maxHeight: {
+        type: Number,
+        default: 500
+      },
+      minHeight: {
+        type: Number,
+        default: undefined
+      },
+      heightNumSetting: {
+        type: Boolean,
+        default: false,
+      },
+      customClass: {
+        type: String,
+        default: '',
+      },
+      paginationAlign: {
+        type: String,
+        default: 'left',
+      },
+      calcHeight: {
+        type: Number,
+        default: 170
+      },
+      merge: Array,
     },
     },
-    isRadio: {
-      type: Boolean,
-      default: false,
+    components: {
+      LbColumn,
     },
     },
-    border: {
-      type: Boolean,
-      default: true,
-    },
-    showHeader: {
-      type: Boolean,
-      default: true,
-    },
-    paginationTop: {
-      type: String,
-      default: '0',
-    },
-    heightNum: {
-      type: Number,
-      default: 355,
-    },
-    maxHeight: {
-      type: Number,
-      default: 500
-    },
-    minHeight: {
-      type: Number,
-      default: undefined
-    },
-    heightNumSetting: {
-      type: Boolean,
-      default: false,
-    },
-    customClass: {
-      type: String,
-      default: '',
-    },
-    paginationAlign: {
-      type: String,
-      default: 'left',
-    },
-    calcHeight: {
-      type: Number,
-      default: 170
+    data () {
+      return {
+        tableHeight: 'auto',
+        mergeLine: {},
+        mergeIndex: {},
+        selected: ''
+      }
     },
     },
-    merge: Array,
-  },
-  components: {
-    LbColumn,
-  },
-  data () {
-    return {
-      tableHeight: 'auto',
-      mergeLine: {},
-      mergeIndex: {},
-      selected: ''
-    }
-  },
-  created () {
-    this.getMergeArr(this.data, this.merge)
-    this.getHeight()
-  },
-  computed: {
-    dataLength () {
-      return [] || this.data.length
+    created () {
+      this.getMergeArr(this.data, this.merge)
+      this.getHeight()
     },
     },
-  },
-  methods: {
-    // 单选
-    singleElection (row) {
-      this.selected = this.data.indexOf(row);
+    computed: {
+      dataLength () {
+        return [] || this.data.length
+      },
     },
     },
+    methods: {
+      // 单选
+      singleElection (row) {
+        this.selected = this.data.indexOf(row);
+      },
 
 
-    tableRowClassName ({ row, rowIndex }) {
-      if (rowIndex % 2 === 1) {
-        return 'interlaced';
-      }
-    },
-    getHeight () {
-      if (!this.heightNumSetting) {
-        let _this = this
-        if (this.heightNum) {
-          _this.$nextTick(() => {
-            if (document.querySelector(".tags-view-container")) {
-              window.addEventListener('resize', () => {
+      tableRowClassName ({ row, rowIndex }) {
+        if (rowIndex % 2 === 1) {
+          return 'interlaced';
+        }
+      },
+      getHeight () {
+        if (!this.heightNumSetting) {
+          let _this = this
+          if (this.heightNum) {
+            _this.$nextTick(() => {
+              if (document.querySelector(".tags-view-container")) {
+                window.addEventListener('resize', () => {
+                  if (_this.calcHeight == 170) {
+                    _this.tableHeight = _this.calcHeightx(170)
+                  } else {
+                    _this.tableHeight = _this.calcHeightx(_this.calcHeight)
+                  }
+                });
                 if (_this.calcHeight == 170) {
                 if (_this.calcHeight == 170) {
                   _this.tableHeight = _this.calcHeightx(170)
                   _this.tableHeight = _this.calcHeightx(170)
                 } else {
                 } else {
                   _this.tableHeight = _this.calcHeightx(_this.calcHeight)
                   _this.tableHeight = _this.calcHeightx(_this.calcHeight)
                 }
                 }
-              });
-              if (_this.calcHeight == 170) {
-                _this.tableHeight = _this.calcHeightx(170)
               } else {
               } else {
+                window.addEventListener('resize', () => {
+                  _this.tableHeight = _this.calcHeightx(_this.calcHeight)
+                });
                 _this.tableHeight = _this.calcHeightx(_this.calcHeight)
                 _this.tableHeight = _this.calcHeightx(_this.calcHeight)
               }
               }
-            } else {
-              window.addEventListener('resize', () => {
-                _this.tableHeight = _this.calcHeightx(_this.calcHeight)
-              });
-              _this.tableHeight = _this.calcHeightx(_this.calcHeight)
-            }
-          })
+            })
+          } else {
+            _this.tableHeight = window.innerHeight - _this.heightNum
+          }
         } else {
         } else {
-          _this.tableHeight = window.innerHeight - _this.heightNum
+          // this.tableHeight = this.heightNum
+          this.$nextTick(() => {
+            this.minHeight && (document.getElementById('heightNumSetting').style.minHeight = this.minHeight + 'px')
+          })
         }
         }
-      } else {
-        this.tableHeight = this.heightNum
-        this.$nextTick(() => {
-          this.minHeight && (document.getElementById('heightNumSetting').style.minHeight = this.minHeight + 'px')
-        })
-      }
-    },
-    calcHeightx (value, wappered = true) {
-      //项目自定义的公共header部分的高度，可忽略
-      let header = document.querySelector(".from-clues-header").offsetHeight;
+      },
+      calcHeightx (value, wappered = true) {
+        //项目自定义的公共header部分的高度，可忽略
+        let header = document.querySelector(".from-clues-header").offsetHeight;
 
 
-      //value为动态计算table界面高度时，减去的其他空白部分，需自行在调试找到临界值，剩下的就是table表格的高度（包含header+body部分）
-      value = value == undefined ? 100 : value;
-      if (document.querySelector(".tags-view-container")) {
-        let tagsView = document.querySelector(".tags-view-container").offsetHeight;
-        var res = window.innerHeight - parseInt(header) - value - parseInt(tagsView);
-      } else {
-        var res = window.innerHeight - parseInt(header) - value;
-      }
-      if (wappered) {
-        //通过原生方法，获取dom节点的高度------获取element-ui table表格body的元素
-        let wapper = window.document.getElementsByClassName('el-table__body-wrapper');
-        //通过原生方法，获取dom节点的高度------获取element-ui table表格header的元素
-        let header = window.document.getElementsByClassName('el-table__header-wrapper');
-        //必须加延时，要不然赋不上去值
-        setTimeout(() => {
-          //通过上边计算得到的table高度的value值，减去table表格的header高度，剩下的通过dom节点直接强行赋给table表格的body
-          wapper[0].style.height = (value - header[0].clientHeight)
-        }, 100)
-      }
-      return res;
-    },
-    clearSelection () {
-      this.$refs.elTable.clearSelection()
-    },
-    toggleRowSelection (row, selected) {
-      this.$refs.elTable.toggleRowSelection(row, selected)
-    },
-    toggleAllSelection () {
-      this.$refs.elTable.toggleAllSelection()
-    },
-    toggleRowExpansion (row, expanded) {
-      this.$refs.elTable.toggleRowExpansion(row, expanded)
-    },
-    setCurrentRow (row) {
-      this.$refs.elTable.setCurrentRow(row)
-    },
-    clearSort () {
-      this.$refs.elTable.clearSort()
-    },
-    clearFilter (columnKey) {
-      this.$refs.elTable.clearFilter(columnKey)
-    },
-    doLayout () {
-      this.$refs.elTable.doLayout()
-    },
-    sort (prop, order) {
-      this.$refs.elTable.sort(prop, order)
-    },
-    paginationCurrentChange (val) {
-      this.$emit('p-current-change', val)
-    },
-    getMergeArr (tableData, merge) {
-      if (!merge) return
-      this.mergeLine = {}
-      this.mergeIndex = {}
-      merge.forEach((item, k) => {
-        tableData.forEach((data, i) => {
-          if (i === 0) {
-            this.mergeIndex[item] = this.mergeIndex[item] || []
-            this.mergeIndex[item].push(1)
-            this.mergeLine[item] = 0
-          } else {
-            if (data[item] === tableData[i - 1][item]) {
-              this.mergeIndex[item][this.mergeLine[item]] += 1
-              this.mergeIndex[item].push(0)
-            } else {
+        //value为动态计算table界面高度时，减去的其他空白部分，需自行在调试找到临界值，剩下的就是table表格的高度（包含header+body部分）
+        value = value == undefined ? 100 : value;
+        if (document.querySelector(".tags-view-container")) {
+          let tagsView = document.querySelector(".tags-view-container").offsetHeight;
+          var res = window.innerHeight - parseInt(header) - value - parseInt(tagsView);
+        } else {
+          var res = window.innerHeight - parseInt(header) - value;
+        }
+        if (wappered) {
+          //通过原生方法，获取dom节点的高度------获取element-ui table表格body的元素
+          let wapper = window.document.getElementsByClassName('el-table__body-wrapper');
+          //通过原生方法，获取dom节点的高度------获取element-ui table表格header的元素
+          let header = window.document.getElementsByClassName('el-table__header-wrapper');
+          //必须加延时，要不然赋不上去值
+          setTimeout(() => {
+            //通过上边计算得到的table高度的value值，减去table表格的header高度，剩下的通过dom节点直接强行赋给table表格的body
+            wapper[0].style.height = (value - header[0].clientHeight)
+          }, 100)
+        }
+        return res;
+      },
+      clearSelection () {
+        this.$refs.elTable.clearSelection()
+      },
+      toggleRowSelection (row, selected) {
+        this.$refs.elTable.toggleRowSelection(row, selected)
+      },
+      toggleAllSelection () {
+        this.$refs.elTable.toggleAllSelection()
+      },
+      toggleRowExpansion (row, expanded) {
+        this.$refs.elTable.toggleRowExpansion(row, expanded)
+      },
+      setCurrentRow (row) {
+        this.$refs.elTable.setCurrentRow(row)
+      },
+      clearSort () {
+        this.$refs.elTable.clearSort()
+      },
+      clearFilter (columnKey) {
+        this.$refs.elTable.clearFilter(columnKey)
+      },
+      doLayout () {
+        this.$refs.elTable.doLayout()
+      },
+      sort (prop, order) {
+        this.$refs.elTable.sort(prop, order)
+      },
+      paginationCurrentChange (val) {
+        this.$emit('p-current-change', val)
+      },
+      getMergeArr (tableData, merge) {
+        if (!merge) return
+        this.mergeLine = {}
+        this.mergeIndex = {}
+        merge.forEach((item, k) => {
+          tableData.forEach((data, i) => {
+            if (i === 0) {
+              this.mergeIndex[item] = this.mergeIndex[item] || []
               this.mergeIndex[item].push(1)
               this.mergeIndex[item].push(1)
-              this.mergeLine[item] = i
+              this.mergeLine[item] = 0
+            } else {
+              if (data[item] === tableData[i - 1][item]) {
+                this.mergeIndex[item][this.mergeLine[item]] += 1
+                this.mergeIndex[item].push(0)
+              } else {
+                this.mergeIndex[item].push(1)
+                this.mergeLine[item] = i
+              }
             }
             }
-          }
+          })
         })
         })
-      })
-    },
-    mergeMethod ({ row, column, rowIndex, columnIndex }) {
-      const index = this.merge.indexOf(column.property)
-      if (index > -1) {
-        const _row = this.mergeIndex[this.merge[index]][rowIndex]
-        const _col = _row > 0 ? 1 : 0
-        return {
-          rowspan: _row,
-          colspan: _col,
+      },
+      mergeMethod ({ row, column, rowIndex, columnIndex }) {
+        const index = this.merge.indexOf(column.property)
+        if (index > -1) {
+          const _row = this.mergeIndex[this.merge[index]][rowIndex]
+          const _col = _row > 0 ? 1 : 0
+          return {
+            rowspan: _row,
+            colspan: _col,
+          }
         }
         }
-      }
+      },
     },
     },
-  },
-  watch: {
-    merge () {
-      this.getMergeArr(this.data, this.merge)
+    watch: {
+      merge () {
+        this.getMergeArr(this.data, this.merge)
+      },
+      dataLength () {
+        this.getMergeArr(this.data, this.merge)
+      }
     },
     },
-    dataLength () {
-      this.getMergeArr(this.data, this.merge)
-    }
-  },
-}
+  }
 </script>
 </script>
 <style  rel="stylesheet/scss" scoped lang="scss">
 <style  rel="stylesheet/scss" scoped lang="scss">
-.lb-table {
-  margin-top: 1px;
+  .lb-table {
+    margin-top: 1px;
 
 
-  .interlaced {
-    background: #fafcff;
-    border: 1px solid #ebf2fa;
+    .interlaced {
+      background: #fafcff;
+      border: 1px solid #ebf2fa;
+    }
   }
   }
-}
 
 
-/deep/.el-table .cell {
-  padding-left: 3px;
-  padding-right: 3px;
-}
+  /deep/.el-table .cell {
+    padding-left: 3px;
+    padding-right: 3px;
+  }
 
 
-/deep/.el-radio__label {
-  display: none;
-}
+  /deep/.el-radio__label {
+    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 {
-  components: {
-    addQlr
-  },
-  computed: {
-    ...mapGetters(["dictData"]),
-  },
-  props: {
-    tableData: {
-      type: Array,
-      default: function () {
-        return []
+  import addQlr from './addQlr.vue'
+  import { mapGetters } from 'vuex'
+  export default {
+    components: {
+      addQlr
+    },
+    computed: {
+      ...mapGetters(["dictData"]),
+    },
+    props: {
+      tableData: {
+        type: Array,
+        default: function () {
+          return []
+        }
+      },
+      gyfs: {
+        type: String,
+        default: '1'
       }
       }
     },
     },
-    gyfs: {
-      type: String,
-      default: '1'
-    }
-  },
-  data () {
-    return {
-      key: 0,
-      dataIndex: 0,
-      dialog: false,
-      details: {},
-      tableDataList: [],
-      qlrCommonTable: [
-        {
-          label: '序号',
-          type: 'index',
-          width: '50',
-          render: (h, scope) => {
-            return (
-              <div>
-                {scope.$index + 1}
-              </div>
-            )
+    data () {
+      return {
+        key: 0,
+        dataIndex: 0,
+        dialog: false,
+        details: {},
+        tableDataList: [],
+        qlrCommonTable: [
+          {
+            label: '序号',
+            type: 'index',
+            width: '50',
+            render: (h, scope) => {
+              return (
+                <div>
+                  {scope.$index + 1}
+                </div>
+              )
+            }
+          },
+          {
+            prop: "qllxmc",
+            label: "权利类型"
+          },
+          {
+            prop: "bdcqzh",
+            label: "不动产权证号"
+          },
+          {
+            prop: "qlrmc",
+            label: "权利人"
+          },
+          {
+            prop: "ytmc",
+            label: "用途"
+          },
+          {
+            prop: "mj",
+            label: "面积"
+          },
+          {
+            prop: "zl",
+            label: "坐落"
+          },
+        ],
+        column: this.qlrCommonTable
+      }
+    },
+    watch: {
+      tableData: {
+        handler: function (val, oldVal) {
+          let that = this
+          if (val.length == 0 || !val) {
+            that.tableDataList = _.cloneDeep([{
+              sqrmc: '',
+              dlrzjlx: '',
+              dlrzjh: '',
+              fr: ''
+            }])
+          } else {
+            that.tableDataList = _.cloneDeep(val)
           }
           }
         },
         },
-        {
-          prop: "qllxmc",
-          label: "权利类型"
-        },
-        {
-          prop: "bdcqzh",
-          label: "不动产权证号"
-        },
-        {
-          prop: "qlrmc",
-          label: "权利人"
-        },
-        {
-          prop: "ytmc",
-          label: "用途"
-        },
-        {
-          prop: "mj",
-          label: "面积"
-        },
-        {
-          prop: "zl",
-          label: "坐落"
-        },
-      ],
-      column: this.qlrCommonTable
-    }
-  },
-  watch: {
-    tableData: {
-      handler: function (val, oldVal) {
-        let that = this
-        if (val.length == 0 || !val) {
-          that.tableDataList = _.cloneDeep([{
-            sqrmc: '',
-            dlrzjlx: '',
-            dlrzjh: '',
-            fr: ''
-          }])
-        } else {
-          that.tableDataList = _.cloneDeep(val)
-        }
+        immediate: true,
+        deep: true
       },
       },
-      immediate: true,
-      deep: true
+      gyfs: {
+        handler (newVal, oldValue) {
+          let dataList = _.cloneDeep(this.qlrCommonTable)
+          if (newVal == '1') {
+            this.column = _.cloneDeep(dataList).slice(1, dataList.length)
+          } else if ((newVal == '2')) {
+            this.column = dataList
+          } else {
+            this.column = _.cloneDeep(dataList)
+            this.column.splice(
+              2, 0, {
+              prop: "fs",
+              label: "份数"
+            })
+          }
+        },
+        immediate: true
+      }
     },
     },
-    gyfs: {
-      handler (newVal, oldValue) {
-        let dataList = _.cloneDeep(this.qlrCommonTable)
-        if (newVal == '1') {
-          this.column = _.cloneDeep(dataList).slice(1, dataList.length)
-        } else if ((newVal == '2')) {
-          this.column = dataList
-        } else {
-          this.column = _.cloneDeep(dataList)
-          this.column.splice(
-            2, 0, {
-            prop: "fs",
-            label: "份数"
-          })
-        }
-      },
-      immediate: true
+    methods: {
     }
     }
-  },
-  methods: {
   }
   }
-}
 </script>
 </script>
 <style scoped lang='scss'>
 <style scoped lang='scss'>
-
 </style>
 </style>
\ No newline at end of file

@@ -154,75 +154,75 @@
   </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 {
-  data () {
-    return {
-      disabled: true,
-      flagTop: this.flag ? "top" : "",
-      rules: {},
-      //传递参数
-      propsParam: {},
-      //页面数据
-      ruleForm: {},
-      isJfOperation: false,
-      tableData: []
-    };
-  },
-  created () {
-    this.propsParam = this.$attrs;
-    var formdata = new FormData();
-    if (this.propsParam.djlx == '400') {
-      this.isJfOperation = true;
-    }
-    formdata.append("bsmSlsq", this.$route.query.bsmSlsq);
-    formdata.append("djlx", this.propsParam.djlx);
-    BatchInit(formdata).then((res) => {
-      if (res.code === 200 && res.result) {
-        this.ruleForm = res.result
+  import cfBdcdyTable from "@/views/workflow/components/cfBdcdyTable";
+  import { BatchInit, batchSaveData } from "@/api/workflow/cfdjFlow.js";
+  import { mapGetters } from "vuex";
+  export default {
+    data () {
+      return {
+        disabled: true,
+        flagTop: this.flag ? "top" : "",
+        rules: {},
+        //传递参数
+        propsParam: {},
+        //页面数据
+        ruleForm: {
+          slywxx: {},
+          cfdj: {},
+        },
+        isJfOperation: false,
+        tableData: []
+      };
+    },
+    created () {
+      this.propsParam = this.$attrs;
+      var formdata = new FormData();
+      if (this.propsParam.djlx == '400') {
+        this.isJfOperation = true;
       }
       }
-    });
-  },
-  watch: {
-
-  },
-  components: { cfBdcdyTable },
-  props: {
-    flag: {
-      type: Boolean,
-      default: false,
+      formdata.append("bsmSlsq", this.$route.query.bsmSlsq);
+      formdata.append("djlx", this.propsParam.djlx);
+      BatchInit(formdata).then((res) => {
+        if (res.code === 200 && res.result) {
+          this.ruleForm = res.result
+        }
+      })
     },
     },
-    fetch: {
-      type: Boolean,
-      default: false,
+    components: { cfBdcdyTable },
+    props: {
+      flag: {
+        type: Boolean,
+        default: false,
+      },
+      fetch: {
+        type: Boolean,
+        default: false,
+      },
+    },
+    computed: {
+      ...mapGetters(["dictData"]),
     },
     },
-  },
-  computed: {
-    ...mapGetters(["dictData"]),
-  },
 
 
-  methods: {
-    onSubmit () {
-      this.ruleForm.bsmSlsq = this.$route.query.bsmSlsq;
-      batchSaveData(this.ruleForm).then((res) => {
-        if (res.code === 200) {
-          this.$message.success('保存成功');
-        }
-      });
+    methods: {
+      onSubmit () {
+        this.ruleForm.bsmSlsq = this.$route.query.bsmSlsq;
+        batchSaveData(this.ruleForm).then((res) => {
+          if (res.code === 200) {
+            this.$message.success('保存成功');
+          }
+        });
+      },
+      changeCflx (e) {
+        let cflxItem = {}
+        cflxItem = this.dictData['A32'].find((item) => {
+          return item.dcode == e
+        })
+        this.ruleForm.cfdj.cflxmc = cflxItem.dname;
+      }
     },
     },
-    changeCflx (e) {
-      let cflxItem = {}
-      cflxItem = this.dictData['A32'].find((item) => {
-        return item.dcode == e
-      })
-      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