--no commit message

 /*
  * @Description: 企业银行接口
  * @Autor: renchao
- * @LastEditTime: 2023-09-20 14:49:22
+ * @LastEditTime: 2023-11-01 08:41:46
  */
 import request from '@/utils/request'
 let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
@@ -64,6 +64,21 @@ export function uploadBatch (data) {
   })
 }
 
+/**
+ * @description: 上传单个文件
+ * @param {*} data
+ * @author: renchao
+ */
+export function uploadSjClmx (data, bsmMaterial) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/sys/company/uploadSjClmx/' + bsmMaterial,
+    method: 'post',
+    headers: {
+      'Content-Type': 'multipart/form-data'
+    },
+    data
+  })
+}
 
 
 /**

@@ -180,6 +180,7 @@
                 });
                 _this.tableHeight = _this.calcHeightx(_this.calcHeight)
               }
+              console.log(_this.tableHeight, '_this.tableHeight');
             })
           } else {
             _this.tableHeight = window.innerHeight - _this.heightNum

 <!--
  * @Description: 
  * @Autor: renchao
- * @LastEditTime: 2023-07-25 16:10:08
+ * @LastEditTime: 2023-11-09 16:47:44
 -->
 <template>
   <transition name="fade">
@@ -41,6 +41,10 @@
         secondAnimationTime: '', // 状态二动画效果
       };
     },
+    mounted () {
+      this.Listener();
+      this.getData()
+    },
     watch: {
       noticeList: {
         handler (newName, oldName) {
@@ -48,7 +52,7 @@
           this.Listener();
           setTimeout(res => {
             that.getData();
-          }, 100);
+          }, 300);
         },
         deep: true
       }

@@ -186,6 +186,7 @@
     },
     mounted () {
       this.$img = this.$refs["img"];
+      this.mouseLeave()
     },
     methods: {
       /**

+import ElCollapse from './src/collapse';
+
+/* istanbul ignore next */
+ElCollapse.install = function(Vue) {
+  Vue.component(ElCollapse.name, ElCollapse);
+};
+
+export default ElCollapse;
+

+<template>
+  <div class="el-collapse-item"
+    :class="{'is-active': isActive, 'is-disabled': disabled }">
+    <div
+      role="tab"
+      :aria-expanded="isActive"
+      :aria-controls="`el-collapse-content-${id}`"
+      :aria-describedby="`el-collapse-content-${id}`">
+      <div
+        class="el-collapse-item__header"
+        @click="handleHeaderClick"
+        role="button"
+        :id="`el-collapse-head-${id}`"
+        :tabindex="disabled ? undefined : 0"
+        @keyup.space.enter.stop="handleEnterClick"
+        :class="{
+          'focusing': focusing,
+          'is-active': isActive
+        }"
+        @focus="handleFocus"
+        @blur="focusing = false">
+        <slot name="title">{{title}}</slot>
+        <i
+          class="el-collapse-item__arrow el-icon-arrow-right"
+          :class="{'is-active': isActive}">
+        </i>
+      </div>
+    </div>
+    <el-collapse-transition>
+      <div
+        class="el-collapse-item__wrap"
+        v-show="isActive"
+        role="tabpanel"
+        :aria-hidden="!isActive"
+        :aria-labelledby="`el-collapse-head-${id}`"
+        :id="`el-collapse-content-${id}`">
+        <div class="el-collapse-item__content">
+          <slot></slot>
+        </div>
+      </div>
+    </el-collapse-transition>
+  </div>
+</template>
+<script>
+  import ElCollapseTransition from 'element-ui/src/transitions/collapse-transition';
+  import Emitter from 'element-ui/src/mixins/emitter';
+  import { generateId } from 'element-ui/src/utils/util';
+
+  export default {
+    name: 'ElCollapseItem',
+
+    componentName: 'ElCollapseItem',
+
+    mixins: [Emitter],
+
+    components: { ElCollapseTransition },
+
+    data () {
+      return {
+        contentWrapStyle: {
+          height: 'auto',
+          display: 'block'
+        },
+        contentHeight: 0,
+        focusing: false,
+        isClick: false,
+        id: generateId()
+      };
+    },
+
+    inject: ['collapse'],
+
+    props: {
+      title: String,
+      name: {
+        type: [String, Number],
+        default () {
+          return this._uid;
+        }
+      },
+      disabled: Boolean
+    },
+
+    computed: {
+      isActive () {
+        return this.collapse.activeNames.indexOf(this.name) > -1;
+      }
+    },
+
+    methods: {
+      handleFocus () {
+        setTimeout(() => {
+          if (!this.isClick) {
+            this.focusing = true;
+          } else {
+            this.isClick = false;
+          }
+        }, 50);
+      },
+      handleHeaderClick () {
+        if (this.disabled) return;
+        this.dispatch('ElCollapse', 'item-click', this);
+        this.focusing = false;
+        this.isClick = true;
+      },
+      handleEnterClick () {
+        this.dispatch('ElCollapse', 'item-click', this);
+      }
+    }
+  };
+</script>

+<!--
+ * @Description: 
+ * @Autor: renchao
+ * @LastEditTime: 2023-11-08 14:36:44
+-->
+<template>
+  <div class="el-collapse" role="tablist" aria-multiselectable="true">
+    <slot></slot>
+  </div>
+</template>
+<script>
+  export default {
+    name: 'ElCollapse',
+
+    componentName: 'ElCollapse',
+
+    props: {
+      accordion: Boolean,
+      value: {
+        type: [Array, String, Number],
+        default () {
+          return [];
+        }
+      }
+    },
+
+    data () {
+      return {
+        activeNames: [].concat(this.value)
+      };
+    },
+
+    provide () {
+      return {
+        collapse: this
+      };
+    },
+
+    watch: {
+      value (value) {
+        this.activeNames = [].concat(value);
+      }
+    },
+
+    methods: {
+      setActiveNames (activeNames) {
+        activeNames = [].concat(activeNames);
+        let value = this.accordion ? activeNames[0] : activeNames;
+        this.activeNames = activeNames;
+        this.$emit('input', value);
+        this.$emit('change', value);
+      },
+      handleItemClick (item) {
+        if (this.accordion) {
+          this.setActiveNames(
+            (this.activeNames[0] || this.activeNames[0] === 0) &&
+              this.activeNames[0] === item.name
+              ? '' : item.name
+          );
+        } else {
+          let activeNames = this.activeNames.slice(0);
+          let index = activeNames.indexOf(item.name);
+
+          if (index > -1) {
+            activeNames.splice(index, 1);
+          } else {
+            activeNames.push(item.name);
+          }
+          this.setActiveNames(activeNames);
+        }
+      }
+    },
+
+    created () {
+      this.$on('item-click', this.handleItemClick);
+    }
+  };
+</script>

@@ -4,7 +4,7 @@
  * @Author: sakuya
  * @Date: 2021年6月10日10:04:07
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2023-07-27 17:21:52
+ * @LastEditTime: 2023-11-07 09:23:12
 -->
 
 <template>
@@ -12,7 +12,7 @@
     :collapse-tags-tooltip="collapseTagsTooltip" :filterable="filterable" :placeholder="placeholder" :disabled="disabled"
     @remove-tag="removeTag" @visible-change="visibleChange" @clear="clear">
     <template #empty>
-      <div class="sc-table-select__table" :style="{width: tableWidth+'px'}" v-loading="loading">
+      <div class="sc-table-select__table" :style="{width: '100%'}" v-loading="loading">
         <div class="sc-table-select__header">
           <slot name="header" :form="formData" :submit="formSubmit"></slot>
         </div>

@@ -10,6 +10,14 @@
   line-height: 16px;
 }
 
+.vue-treeselect--disabled .vue-treeselect__control {
+  background-color: #F5F7FA !important;
+}
+
+.vue-treeselect--disabled .vue-treeselect__single-value {
+  color: #909399 !important;
+}
+
 //input
 .el-input__inner {
   padding: 0 7px !important;

@@ -18,8 +18,8 @@
         display: flex;
         font-size: 12px;
         flex-wrap: wrap;
-        padding-top: 5px;
-        height: 30px;
+        justify-content: flex-start;
+        min-height: 30px;
 
         span {
             display: flex;
@@ -35,18 +35,22 @@
         ul {
             display: flex;
             align-items: center;
+            flex-wrap: wrap;
+            flex: 1;
+            max-height: 38px;
+            padding-left: 0 !important;
 
             li {
                 color: $light-blue;
                 border: 1px solid $light-blue;
                 border-radius: 10px;
-                padding: 2px 8px;
-                line-height: 16px;
+                padding: 1px 3px;
             }
         }
 
         .clean-btn {
-            margin-left: 10px;
+            margin-left: 5px;
+            float: left;
         }
     }
 

@@ -53,20 +53,23 @@
   font-weight: 500;
   color: #4a4a4a;
 }
+
 .bdcqk {
   margin-top: 15px;
   position: relative;
+
   .count {
-   color: blue!important;
-    width: 874px;
+    color: blue !important;
+    width: 85%;
     font-size: 14px;
     position: absolute;
-  left:200px;
+    left: 200px;
     top: -3px;
     height: 30px;
 
+  }
 }
-}
+
 .btn {
   text-align: center;
   padding-top: 10px;
@@ -90,13 +93,14 @@
 /deep/.el-form-item__label {
   padding-bottom: 0px;
 }
+
 // 控制表单是否只读
-.readonly{
-  /deep/.el-form-item__content{
-       pointer-events: none!important;
+.readonly {
+  /deep/.el-form-item__content {
+    pointer-events: none !important;
   }
 
   /deep/.el-input .el-input__inner {
     background-color: #F5F7FA;
   }
- }
+}
\ No newline at end of file

@@ -9,9 +9,9 @@ export default {
       }
     }
   },
-  created() {
+  created () {
 
-},
+  },
   computed: {
     ...mapGetters(['dictData']),
   },
@@ -25,8 +25,8 @@ export default {
      * @param {*} e
      * @author: renchao
      */
-    handkeyCode(e) {
-      if(e.keyCode === 13){
+    handkeyCode (e) {
+      if (e.keyCode === 13) {
         this.handleSearch()
       }
     },
@@ -34,7 +34,7 @@ export default {
      * @description: handleSearch
      * @author: renchao
      */
-    handleSearch(){
+    handleSearch () {
       this.pageData.currentPage = 1
       if (this.fetchData) {
         this.fetchData()
@@ -78,7 +78,7 @@ export default {
      * @param {*} isYwbl
      * @author: renchao
      */
-    resetForm(isYwbl){
+    resetForm (isYwbl) {
       if (isYwbl) {
         this.queryForm = defaultParameters.defaultParameters();
         this.pageData.currentPage = 1;

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-10-13 15:02:59
+ * @LastEditTime: 2023-10-31 14:03:38
 -->
 <template>
   <div class="rlPopup">
@@ -53,7 +53,7 @@
 <script>
   import PhotoZoom from '@/components/PhotoZoom'
   import { getAltimeterInfo, getUuid } from '@/utils/operation.js'
-  import { uploadBatch, deleteClmx, move } from "@/api/clxx.js";
+  import { uploadBatch, deleteClmx, move, uploadSjClmx } from "@/api/clxx.js";
   import publicPicture from '@/components/publicPicture/index.vue'
   export default {
     name: 'PreviewImage',
@@ -194,9 +194,12 @@
           formData.append('file', file)
           formData.append("bsmSj", this.previewImg.bsmSj);
           formData.append("bsmSlsq", this.previewImg.bsmSlsq);
+          if (this.previewImg.imgList.length > 0) {
+            formData.append("ssBsmClmx", this.previewImg.imgList[this.previewImg.index].bsmClmx);
+          }
           uploadSjClmx(formData).then((res) => {
             if (res.code == 200) {
-              this.$emit('updateList', res.result)
+              this.$emit('updateList', { children: res.result, bsmSj: this.previewImg.bsmSj })
               this.$message({
                 message: '上传成功!',
                 type: 'success'

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-10-08 15:08:19
+ * @LastEditTime: 2023-10-24 17:15:25
 -->
 <template>
   <div class="clmlmx-box">
@@ -19,7 +19,7 @@
   import Sortable from 'sortablejs'
   import store from '@/store/index.js'
   import { ywPopupCacel } from "@/utils/popup.js";
-  import { InitClml, updateClml } from "@/api/clxx.js";
+  import { updateClml } from "@/api/clxx.js";
   export default {
     props: {
       formData: {
@@ -173,6 +173,7 @@
     },
     mounted () {
       this.initSort()
+      console.log(this.formData);
     },
     beforeDestroy () {
       if (this.sortable) {
@@ -201,31 +202,6 @@
         })
       },
       /**
-       * @description: 材料目录明细初始化
-       * @author: renchao
-       */
-      clmlInitList () {
-        return new Promise(resolve => {
-          this.unitData = this.$parent.unitData;
-          var formdata = new FormData();
-          formdata.append("bsmSlsq", Vue.prototype.$currentRoute.query.bsmSlsq);
-          formdata.append("bsmSldy", this.formData.bsmRepair);
-          formdata.append("clfl", 3);
-          InitClml(formdata).then((res) => {
-            if (res.code == 200) {
-              resolve(res.code)
-              if (res.result && res.result.length > 0) {
-                this.tableData = res.result;
-              } else {
-                this.tableData = []
-              }
-            } else {
-              this.$message.error(res.message)
-            }
-          })
-        })
-      },
-      /**
        * @description: 材料目录删除
        * @param {*} index
        * @param {*} row

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-10-12 10:00:08
+ * @LastEditTime: 2023-11-01 08:55:44
 -->
 <template>
   <div class="rlPopup">
@@ -53,7 +53,7 @@
 <script>
   import PhotoZoom from '@/components/PhotoZoom'
   import { getAltimeterInfo, getUuid } from '@/utils/operation.js'
-  import { uploadBatch, deleteClmx, move } from "@/api/clxx.js";
+  import { uploadBatch, deleteClmx, move, uploadSjClmx } from "@/api/clxx.js";
   import publicPicture from '@/components/publicPicture/index.vue'
   export default {
     name: 'PreviewImage',
@@ -193,10 +193,12 @@
           var formData = new FormData();
           formData.append('file', file)
           formData.append("bsmSj", this.previewImg.bsmSj);
-          formData.append("bsmSlsq", this.previewImg.bsmSlsq);
+          if (this.previewImg.imgList.length > 0) {
+            formData.append("index", this.previewImg.imgList[this.previewImg.index].sxh);
+          }
           uploadSjClmx(formData).then((res) => {
             if (res.code == 200) {
-              this.$emit('updateList', res.result)
+              this.$emit('updateList', { children: res.result, bsmSj: this.previewImg.bsmSj })
               this.$message({
                 message: '上传成功!',
                 type: 'success'

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-10-19 16:28:06
+ * @LastEditTime: 2023-10-24 17:17:46
 -->
 <template>
   <div class="clxx">
@@ -98,14 +98,14 @@
     watch: {
       workFresh: {
         handler (newValue, oldValue) {
-          if (newValue) this.clmlInitList()
+          if (newValue) this.clmlInitList(1)
         },
         deep: true,
         immediate: true
       }
     },
     created () {
-      this.clmlInitList()
+      this.clmlInitList(1)
     },
     methods: {
       /**
@@ -173,7 +173,7 @@
                 this.tableData = res.result;
                 if (type == 1) {
                   this.treeClick(this.tableData[0], 0);
-                } else {
+                } else if (type == 2) {
                   //新增材料后刷新列表焦点置于新增的对象上
                   this.treeClick(
                     this.tableData[this.tableData.length - 1],
@@ -296,10 +296,12 @@
         this.titleYs = index + 1;
       },
       //查看明细
-      viewDetail () {
+      async viewDetail () {
+        await this.clmlInitList();
         store.dispatch("user/reWorkFresh", false);
         ywPopupDialog("申请材料目录", "djbworkflow/components/clxx/dialog/clxxDetailDialog", {
           data: this.tableData,
+          ableOperation: this.$parent.ableOperation
         }, "60%", true, false)
       },
       //设置tableData

 <!--
  * @Description: workFrame左侧菜单列表-普通
  * @Autor: renchao
- * @LastEditTime: 2023-10-18 14:06:31
+ * @LastEditTime: 2023-10-31 10:42:21
 -->
 <template>
   <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">

@@ -88,15 +88,8 @@
         completeTask(this.queryForm).then((res) => {
           if (res.code === 200) {
             this.$message.success("转件成功");
-            // setTimeout(() => {
-            //   window.opener = null;
-            //   window.open("about:blank", "_self");
-            //   window.close();
-            //   this.$emit("input", false);
-            // }, 1000);
             popupCacel();
             setTimeout(() => {
-              // window.opener.location.reload(); //刷新父窗口
               if (window.opener && window.opener.getBpageList) {
                 window.opener.getBpageList();
               } else {
@@ -110,12 +103,6 @@
           }
         });
       },
-      // add (val) {
-      //   if (val != "") {
-      //     this.shyj;
-      //   }
-      // },
-
       /**
        * @description: closeDialog
        * @author: renchao

@@ -2,7 +2,7 @@
  * @Description:
  * @Autor: renchao
  :show-message="false"
- * @LastEditTime: 2023-08-22 16:27:25
+ * @LastEditTime: 2023-11-07 09:25:19
 -->
 <template>
   <!-- 受理信息 -->
@@ -49,7 +49,6 @@
               :rules="rules.ztQlxxrules">
               <select-table
                 v-model="ruleForm.ztQlxx"
-                :table-width="730"
                 :tableData="ztQlxxList"
                 :props="props"
                 @change="ztQlxxchange">
@@ -138,7 +137,6 @@
               v-if="ruleForm.qlxx.djlx == '300'">
               <select-table
                 v-model="ruleForm.ssQlxx"
-                :table-width="730"
                 :tableData="ssQlxxList"
                 :props="props"
                 @change="ssQlxxchange">
@@ -191,8 +189,8 @@
               prop="cfdj.sfbxf"
               :rules="rules.sfbxfrules">
               <el-radio-group v-model="ruleForm.qlxx.djlx" @change="djlxchange">
-                <el-radio label="800">是</el-radio>
-                <el-radio label="300">否</el-radio>
+                <el-radio label="300">是</el-radio>
+                <el-radio label="800">否</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -477,7 +475,6 @@
         this.ruleForm.qlxx.ssywh = val.ywh;
         this.ssQlxxchangediolog(val);
       },
-      // 弹框事件
       /**
        * @description: 弹框事件
        * @param {*} val
@@ -585,7 +582,6 @@
        */
       onSubmit () {
         this.$refs.ruleForm.validate((valid) => {
-          console.log("valid", valid);
           if (valid) {
             save(this.ruleForm).then((res) => {
               if (res.code === 200) {
@@ -605,6 +601,11 @@
               }
             });
           } else {
+            this.$message({
+              showClose: true,
+              message: "请完善表单信息",
+              type: "error"
+            })
             return false;
           }
         });

@@ -316,6 +316,11 @@ export default {
             }
           });
         } else {
+          this.$message({
+            showClose: true,
+            message: "请完善表单信息",
+            type: "error"
+          })
           return false;
         }
       });

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-26 13:25:47
+ * @LastEditTime: 2023-11-07 09:33:53
 -->
 <template>
   <!-- 受理信息 -->
@@ -45,10 +45,10 @@
             <el-form-item
               label="抵押不动产信息："
               prop="ztQlxx.bdcqzh"
+              style="display:flex"
               :rules="rules.ztQlxxrules">
               <select-table
                 v-model="ruleForm.ztQlxx"
-                :table-width="730"
                 :tableData="ztQlxxList"
                 :props="props"
                 @change="ztQlxxchange">
@@ -131,7 +131,6 @@
               :rules="rules.ssQlxxrules">
               <select-table
                 v-model="ruleForm.ssQlxx"
-                :table-width="730"
                 :tableData="ssQlxxList"
                 :props="props"
                 @change="ssQlxxchange">
@@ -287,7 +286,7 @@
                 v-model="ruleForm.diyaq.zwlxqssj"
                 type="date"
                 placeholder="选择日期"
-                value-format="yyyy-MM-dd HH:mm:ss"
+                value-format="yyyy-MM-dd"
                 format="yyyy-MM-dd">
               </el-date-picker>
             </el-form-item>
@@ -301,7 +300,7 @@
                 v-model="ruleForm.diyaq.zwlxjssj"
                 type="date"
                 placeholder="选择日期"
-                value-format="yyyy-MM-dd HH:mm:ss"
+                value-format="yyyy-MM-dd"
                 format="yyyy-MM-dd">
               </el-date-picker>
             </el-form-item>
@@ -382,7 +381,7 @@
                 type="date"
                 class="width100"
                 placeholder="选择日期"
-                value-format="yyyy-MM-dd HH:mm:ss"
+                value-format="yyyy-MM-dd"
                 format="yyyy-MM-dd">
               </el-date-picker>
             </el-form-item>
@@ -439,7 +438,7 @@
           <div class="triangle"></div>
         </div>
         <el-row :gutter="10">
-          <el-col :span="12">
+          <el-col :span="24">
             <el-form-item label="共有方式：">
               <el-radio-group
                 :disabled="!ableOperation"

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-26 13:26:40
+ * @LastEditTime: 2023-11-07 09:25:27
 -->
 <template>
   <!-- 受理信息 -->
@@ -43,11 +43,11 @@
           <div class="count">
             <el-form-item
               label="地役权不动产情况"
+              style="display:flex"
               prop="ztQlxx.bdcqzh"
               :rules="rules.ztQlxxrules">
               <select-table
                 v-model="ruleForm.ztQlxx"
-                :table-width="730"
                 :tableData="ztQlxxList"
                 :props="props"
                 @change="ztQlxxchange">
@@ -130,7 +130,6 @@
               :rules="rules.ssQlxxrules">
               <select-table
                 v-model="ruleForm.ssQlxx"
-                :table-width="730"
                 :tableData="ssQlxxList"
                 :props="props"
                 @change="ssQlxxchange">

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-26 13:34:22
+ * @LastEditTime: 2023-11-03 14:47:38
 -->
 <template>
   <!-- 受理信息 -->
@@ -48,7 +48,6 @@
               :rules="rules.ssQlxxrules">
               <select-table
                 v-model="ruleForm.ssQlxx"
-                :table-width="730"
                 :tableData="ssQlxxList"
                 :props="props"
                 @change="ssQlxxchange">
@@ -709,6 +708,11 @@
               }
             });
           } else {
+            this.$message({
+              showClose: true,
+              message: "请完善表单信息",
+              type: "error"
+            })
             return false;
           }
         });

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-10-08 10:05:16
+ * @LastEditTime: 2023-11-03 14:47:55
 -->
 <template>
   <!-- 受理信息 -->
@@ -45,7 +45,6 @@
               :rules="rules.ssQlxxrules">
               <select-table
                 v-model="ruleForm.ssQlxx"
-                :table-width="730"
                 :tableData="ssQlxxList"
                 :props="props"
                 @change="ssQlxxchange">
@@ -592,9 +591,14 @@
               }
             });
           } else {
+            this.$message({
+              showClose: true,
+              message: "请完善表单信息",
+              type: "error"
+            })
             return false;
           }
-        });
+        })
       }
     }
   }

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-26 13:27:29
+ * @LastEditTime: 2023-11-03 14:48:15
 -->
 <template>
   <!-- 受理信息 -->
@@ -47,7 +47,6 @@
               :rules="rules.ssQlxxrules">
               <select-table
                 v-model="ruleForm.ssQlxx"
-                :table-width="730"
                 :tableData="ssQlxxList"
                 :props="props"
                 @change="ssQlxxchange">
@@ -692,12 +691,17 @@
               }
             });
           } else {
+            this.$message({
+              showClose: true,
+              message: "请完善表单信息",
+              type: "error"
+            })
             return false;
           }
-        });
-      },
-    },
-  };
+        })
+      }
+    }
+  }
 </script>
 <style scoped lang="scss">
   @import "~@/styles/public.scss";

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-10-08 09:46:31
+ * @LastEditTime: 2023-11-03 14:48:37
 -->
 <template>
   <!-- 受理信息 -->
@@ -44,10 +44,10 @@
             <el-form-item
               label="上手权利信息："
               prop="ssQlxx.bdcqzh"
+              style="display:flex"
               :rules="rules.ssQlxxrules">
               <select-table
                 v-model="ruleForm.ssQlxx"
-                :table-width="730"
                 :tableData="ssQlxxList"
                 :props="props"
                 @change="ssQlxxchange">
@@ -693,11 +693,16 @@
               }
             });
           } else {
+            this.$message({
+              showClose: true,
+              message: "请完善表单信息",
+              type: "error"
+            })
             return false;
           }
-        });
-      },
-    },
+        })
+      }
+    }
   };
 </script>
 <style scoped lang="scss">

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-26 13:31:57
+ * @LastEditTime: 2023-11-07 09:26:12
  :show-message="false"
 -->
 <template>
@@ -45,11 +45,11 @@
           <div class="count">
             <el-form-item
               label="预告买卖登记"
+              style="display:flex"
               prop="ztQlxx.bdcqzh"
               :rules="rules.ztQlxxrules">
               <select-table
                 v-model="ruleForm.ztQlxx"
-                :table-width="730"
                 :tableData="ztQlxxList"
                 :props="props"
                 @change="ztQlxxchange">
@@ -127,10 +127,10 @@
             <el-form-item
               label="上手权利信息："
               prop="ssQlxx.bdcqzh"
+
               :rules="rules.ssQlxxrules">
               <select-table
                 v-model="ruleForm.ssQlxx"
-                :table-width="730"
                 :tableData="ssQlxxList"
                 :props="props"
                 @change="ssQlxxchange">

@@ -45,11 +45,11 @@
           <div class="count" v-if="ssqlxxshow">
             <el-form-item
               label="上手权利信息："
+              style="display:flex"
               prop="ssQlxx.bdcqzh"
               :rules="rules.ssQlxxrules">
               <select-table
                 v-model="ruleForm.ssQlxx"
-                :table-width="730"
                 :tableData="ssQlxxList"
                 :props="props"
                 @change="ssQlxxchange">

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-10-08 09:35:26
+ * @LastEditTime: 2023-11-07 09:26:20
 -->
 <template>
   <!-- 受理信息 -->
@@ -44,11 +44,11 @@
           <div class="count">
             <el-form-item
               label="抵押不动产信息："
+              style="display:flex"
               prop="ztQlxx.bdcqzh"
               :rules="rules.ztQlxxrules">
               <select-table
                 v-model="ruleForm.ztQlxx"
-                :table-width="550"
                 :tableData="ztQlxxList"
                 :props="props"
                 @change="ztQlxxchange">
@@ -125,11 +125,11 @@
           <div class="count" v-if="ssqlxxshow">
             <el-form-item
               label="上手权利信息："
+              style="display:flex"
               prop="ssQlxx.bdcqzh"
               :rules="rules.ssQlxxrules">
               <select-table
                 v-model="ruleForm.ssQlxx"
-                :table-width="550"
                 :tableData="ssQlxxList"
                 :props="props"
                 @change="ssQlxxchange">

@@ -281,8 +281,8 @@
             } else {
               this.$alert(res.message, "提示", {
                 confirmButtonText: "确定",
-                type: "warning",
-              });
+                type: "warning"
+              })
             }
           })
           .catch((res) => {

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-10-09 11:02:50
+ * @LastEditTime: 2023-11-02 13:21:39
 -->
 <template>
   <div class="djxxTable">
@@ -157,7 +157,6 @@
         }
         return name;
       },
-      // 新增一条补录信息
       /**
        * @description: 新增一条补录信息
        * @param {*} row

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-23 15:54:12
+ * @LastEditTime: 2023-11-02 13:38:33
 -->
 <template>
   <div class="djxxTable">
@@ -175,10 +175,10 @@
         })
           .then(() => {
             this.$parent.addRepairRecord(row, del);
-            this.$message({
-              type: "success",
-              message: "补录成功!",
-            });
+            // this.$message({
+            //   type: "success",
+            //   message: "补录成功!",
+            // });
           })
           .catch(() => {
             this.$message({

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-10-09 10:35:11
+ * @LastEditTime: 2023-11-02 13:38:48
 -->
 <template>
   <div class="djxxTable">
@@ -171,10 +171,10 @@
           .then(() => {
             this.$parent.addRepairRecord(row, del);
 
-            this.$message({
-              type: "success",
-              message: "补录成功!",
-            });
+            // this.$message({
+            //   type: "success",
+            //   message: "补录成功!",
+            // });
           })
           .catch(() => {
             this.$message({

@@ -177,10 +177,10 @@
         }).then(() => {
           this.$parent.addRepairRecord(row, del)
 
-          this.$message({
-            type: 'success',
-            message: '补录成功!'
-          });
+          // this.$message({
+          //   type: 'success',
+          //   message: '补录成功!'
+          // });
         }).catch(() => {
           this.$message({
             type: 'info',

@@ -166,10 +166,10 @@
         }).then(() => {
           this.$parent.addRepairRecord(row, del)
 
-          this.$message({
-            type: 'success',
-            message: '补录成功!'
-          });
+          // this.$message({
+          //   type: 'success',
+          //   message: '补录成功!'
+          // });
         }).catch(() => {
           this.$message({
             type: 'info',

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-22 09:56:51
+ * @LastEditTime: 2023-11-02 13:39:06
 -->
 <template>
   <div class="all">
@@ -134,10 +134,10 @@
           .then(() => {
             this.$parent.addRepairRecord(row, del);
 
-            this.$message({
-              type: "success",
-              message: "补录成功!",
-            });
+            // this.$message({
+            //   type: "success",
+            //   message: "补录成功!",
+            // });
           })
           .catch(() => {
             this.$message({

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-25 17:19:17
+ * @LastEditTime: 2023-11-02 13:39:10
 -->
 <template>
   <div class="djxxTable">
@@ -217,10 +217,10 @@
         }).then(() => {
           this.$parent.addRepairRecord(row, del)
 
-          this.$message({
-            type: 'success',
-            message: '补录成功!'
-          });
+          // this.$message({
+          //   type: 'success',
+          //   message: '补录成功!'
+          // });
         }).catch(() => {
           this.$message({
             type: 'info',

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-25 17:14:29
+ * @LastEditTime: 2023-11-02 13:39:13
 -->
 <template>
   <div class="djxxTable">
@@ -166,10 +166,10 @@
         }).then(() => {
           this.$parent.addRepairRecord(row, del)
 
-          this.$message({
-            type: 'success',
-            message: '补录成功!'
-          });
+          // this.$message({
+          //   type: 'success',
+          //   message: '补录成功!'
+          // });
         }).catch(() => {
           this.$message({
             type: 'info',

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-24 16:15:45
+ * @LastEditTime: 2023-11-02 13:39:17
 -->
 <template>
   <div class="djxxTable">
@@ -166,10 +166,10 @@
         }).then(() => {
           this.$parent.addRepairRecord(row, del)
 
-          this.$message({
-            type: 'success',
-            message: '补录成功!'
-          });
+          // this.$message({
+          //   type: 'success',
+          //   message: '补录成功!'
+          // });
         }).catch(() => {
           this.$message({
             type: 'info',

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-19 09:52:07
+ * @LastEditTime: 2023-11-08 14:12:17
 -->
 <template>
   <div class="bdcqljqtsx">
     <el-button class="print" v-print="printObj">打印</el-button>
     <div class="content" v-if="qlxxList.ztqlmc" id="box">
       <div class="title">不动产权利及其他事项<br />登记信息</div>
-      <div>
+      <div style="text-align:center">
         不动产单元号:
         <div class="underline">{{ propsParam.bdcdyh }}</div>
       </div>
       <br /><br /><br />
-      <div>
+      <div class="detail">
         <div class="underline">{{ qlxxList.ztqlmc }}</div>
         登记 共
         <div class="underline">{{ qlxxList.ztql.total }}</div>
         条
       </div>
       <br /><br />
-      <div>
+      <div class="detail">
         抵押权登记 共
         <div class="underline">{{ qlxxList.diyaq.total }}</div>
         条
       </div>
       <br />
-      <div>
+      <div class="detail">
         地役权登记 共
         <div class="underline">{{ qlxxList.diyiq.total }}</div>
         条
       </div>
       <br />
-      <div>
+      <div class="detail">
         预告登记 共
         <div class="underline">{{ qlxxList.ygdj.total }}</div>
         条
       </div>
       <br />
-      <div>
+      <div class="detail">
         异议登记 共
         <div class="underline">{{ qlxxList.yydj.total }}</div>
         条
       </div>
       <br />
-      <div>
+      <div class="detail">
         查封登记 共
         <div class="underline">{{ qlxxList.cfdj.total }}</div>
         条
@@ -83,6 +83,9 @@
 </script>
 
 <style lang="scss" scoped>
+  .detail {
+    margin-right: 19%;
+  }
   .bdcqljqtsx {
     width: 100%;
     height: 100%;
@@ -95,7 +98,6 @@
       left: 11px;
       top: 5px;
     }
-
   }
   .content {
     width: 50%;
@@ -108,7 +110,6 @@
     font-size: 18px;
     line-height: 16px;
 
-
     .title {
       font-size: 32px;
       text-align: center;

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-10-09 10:50:50
+ * @LastEditTime: 2023-10-30 11:07:58
 -->
 <template>
   <div class="djxxTable">

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-10-23 16:46:47
+ * @LastEditTime: 2023-11-02 13:39:28
 -->
 <template>
   <div class="tableBox">
@@ -96,7 +96,7 @@
 </template>
 <script>
   import Router from '@/router'
-  import { mapGetters } from "vuex";
+  import store from '@/store/index.js'
   import { datas } from "../qlxxFormData.js";
   import { ywPopupDialog } from "@/utils/popup.js";
   import printTemplate from "../components/printTemplate.vue";
@@ -129,9 +129,6 @@
         default: () => []
       },
     },
-    computed: {
-      ...mapGetters(["dictData"]),
-    },
     data () {
       return {
         qsztList: datas.columns().qsztList,
@@ -152,7 +149,11 @@
           sfygdj: (label) => ztObj[label] || label,
           sfczjzhxz: (label) => ztObj[label] || label,
           dyrlx: (label) => {
-            let arr = this.dictData['A36'].filter(item => item.dcode === label);
+            let arr = store.getters.dictData['A36'].filter(item => item.dcode === label);
+            return arr.length > 0 ? arr[0].dname : label;
+          },
+          qlrzjzl: (label) => {
+            let arr = store.getters.dictData['A30'].filter(item => item.dcode === label);
             return arr.length > 0 ? arr[0].dname : label;
           },
           default: (label) => label
@@ -227,10 +228,10 @@
         })
           .then(() => {
             this.$parent.$parent.addRepairRecord(row, del);
-            this.$message({
-              type: "success",
-              message: "补录成功!"
-            })
+            // this.$message({
+            //   type: "success",
+            //   message: "补录成功!"
+            // })
           })
           .catch(() => {
             this.$message({

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-10-09 10:44:26
+ * @LastEditTime: 2023-10-30 10:43:28
 -->
 <template>
   <div class="djxxTable">

 <!--
  * @Description:
  * @Autor: miaofang
- * @LastEditTime: 2023-10-09 10:44:45
+ * @LastEditTime: 2023-10-30 10:36:43
 -->
 <template>
   <div class="djxxTable">

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-10-13 14:30:26
+ * @LastEditTime: 2023-11-09 08:45:33
 -->
 <template>
   <div class="content">
@@ -16,15 +16,15 @@
         node-key="id"
         :default-checked-keys="[showTab]">
       </el-tree>
-      <el-collapse v-model="activeName" accordion>
-        <el-collapse-item
+      <ElCollapse v-model="activeName" accordion>
+        <ElCollapse-item
           class="sfqqq"
           ref="sfq"
           v-for="(item, index) in sfqdata"
           :key="index"
           :name="index">
           <template slot="title">
-            <span class="text" @click="tap(item, index)">
+            <span class="text" :class="[titleActive == index ? 'nameSelect' : '']" @click="tap(item, index)">
               <span> {{ item.label }}</span>
             </span>
           </template>
@@ -41,8 +41,8 @@
               {{ item.zt }}
             </span>
           </p>
-        </el-collapse-item>
-      </el-collapse>
+        </ElCollapse-item>
+      </ElCollapse>
     </div>
     <div class="right">
       <component
@@ -54,11 +54,17 @@
 </template>
 <script>
   import { getBdcqljqtsx } from "@/api/djbDetail.js";
+  import ElCollapse from "@/components/collapse/index";
+  import ElCollapseItem from "@/components/collapse/src/collapse-item.vue";
   import { loadTreeData, loadsfqData, getNode } from "./djbFrameData.js";
   export default {
+    comments: {
+      ElCollapse, ElCollapseItem
+    },
     data () {
       return {
         activeName: 0,
+        titleActive: "",
         //接收参数
         // propsParam: this.$attrs,
         //左侧目录
@@ -109,19 +115,30 @@
           if (res.code === 200) {
             if (this.sfqdata.some((item) => item.bdcdyid === val.bdcdyid)) {
               let index = this.sfqdata.findIndex((item) => {
-                return item.bdcdyid == val.bdcdyid;
-              });
-              this.activeName = index;
-
-              // this.setstyle(index, 0, this.iskey);
+                return item.bdcdyid == val.bdcdyid
+              })
+              this.activeName = index
+              this.titleActive = -1
+              this.titleActive = this.activeName
             } else {
               this.sfqdata.push(loadsfqData(res.result, val.bdcdyh, val.bdcdyid));
               this.activeName = this.sfqdata.length - 1;
               this.isActive = ""
-              // this.$nextTick(() => {
-              //   this.setstyle(this.sfqdata.length - 1, 0, this.iskey);
-              // })
+              this.titleActive = this.activeName
             }
+
+            this.$nextTick(function () {
+              this.defaultNode = getNode(
+                this.formData.qllx,
+                { linShi: 0, xianShi: 0, liShi: 0 },
+                res.result.bdcdylx || ""
+              );
+              this.sfqdata[0].children.forEach((item, index) => {
+                if (item.id == this.defaultNode.id) {
+                  this.loadComponent(item.form);
+                }
+              });
+            });
           }
         });
         this.currentSelectProps = {
@@ -157,7 +174,6 @@
                   this.isActive = index;
                 }
               });
-              // this.setstyle(0, 0, this.iskey);
             });
           }
         });
@@ -176,25 +192,6 @@
       handleNodeClick (data) {
         this.loadComponent(data.form);
       },
-      // setstyle(newindex, index, key) {
-      //   if (key != undefined || this.keyy == index) {
-      //     if (key != undefined) {
-      //       this.keyy = key;
-      //     }
-      //     this.loadComponent(
-      //       this.$refs.sfq[newindex].$children[this.keyy].$attrs.re.form
-      //     );
-      //     let dpme = this.$refs.sfq[newindex].$children[this.keyy].$el;
-      //     dpme.style.backgroundColor = "#f5f5f5";
-      //     dpme.style.color = "#0079fe";
-      //     dpme.style.borderRight = "4px solid #0079fe";
-      //   } else {
-      //     let dpme = this.$refs.sfq[newindex].$children[this.keyy].$el;
-      //     dpme.style.backgroundColor = "#ffffff";
-      //     dpme.style.color = "black";
-      //     dpme.style.border = "none";
-      //   }
-      // },
       /**
        * @description: addlist
        * @param {*} data
@@ -202,6 +199,9 @@
        * 新增列表功能
        */
       tap (data, index) {
+        this.activeName = index.toString()
+        this.isActive = -1
+        this.titleActive = index
         this.loadComponent(data.form);
       },
       taplist (data, index) {
@@ -216,15 +216,11 @@
       loadComponent (form) {
         this.componentTag = (r) =>
           require.ensure([], () => r(require("@/views/registerBook/" + form)));
-      },
-    },
-  };
+      }
+    }
+  }
 </script>
 <style scoped lang="scss">
-  // /deep/.rollTable {
-  //   height: calc(100vh - 300px) !important;
-  // }
-
   .content {
     width: 100%;
     height: 100%;
@@ -322,7 +318,10 @@
       align-items: center;
     }
   }
-
+  .nameSelect {
+    color: #000000;
+    font-weight: 700;
+  }
   .select {
     border: none;
     cursor: pointer;

 <!--
  * @Description:
  * @Autor: miaofang
- * @LastEditTime: 2023-10-23 16:48:02
+ * @LastEditTime: 2023-11-02 13:39:22
 -->
 <template>
   <div class="djxxTable">
@@ -101,7 +101,7 @@
                 <div
                   v-for="(label, index) in row.djQlxxFdcqxmDoList"
                   :key="index">
-                  {{ label[item.prop] }}
+                  {{ getLable(item.prop,label[item.prop]) }}
                 </div>
               </div>
             </td>
@@ -116,6 +116,7 @@
 <script>
   import Router from '@/router'
   import printJS from "print-js";
+  import store from '@/store/index.js'
   import { datas } from "./qlxxFormData.js";
   import { getSjlx } from "@/utils/dictionary.js";
   import { getFdcq1List } from "@/api/djbDetail.js";
@@ -165,7 +166,11 @@
           sfygdj: (label) => ztObj[label] || label,
           sfczjzhxz: (label) => ztObj[label] || label,
           dyrlx: (label) => {
-            let arr = this.dictData['A36'].filter(item => item.dcode === label);
+            let arr = store.getters.dictData['A36'].filter(item => item.dcode === label);
+            return arr.length > 0 ? arr[0].dname : label;
+          },
+          fwjg: (label) => {
+            let arr = store.getters.dictData['A46'].filter(item => item.dcode === label);
             return arr.length > 0 ? arr[0].dname : label;
           },
           default: (label) => label
@@ -282,10 +287,10 @@
           .then(() => {
             this.$parent.addRepairRecord(row, del);
 
-            this.$message({
-              type: "success",
-              message: "补录成功!",
-            });
+            // this.$message({
+            //   type: "success",
+            //   message: "补录成功!",
+            // });
           })
           .catch(() => {
             this.$message({

 <!--
  * @Description:
  * @Autor: miaofang
- * @LastEditTime: 2023-10-09 10:46:58
+ * @LastEditTime: 2023-10-30 10:40:48
 -->
 <template>
   <div class="djxxTable">

+<!--
+ * @Description:
+ * @Autor: renchao
+ * @LastEditTime: 2023-05-26 15:40:23
+-->
+<template>
+  <div class="loadingtext">
+    <el-input
+      type="textarea"
+      :rows="8"
+      v-model="formData.json">
+    </el-input>
+    <div class="text-center pt-10">
+      <el-button type="primary" @click="pushRecord">推送</el-button>
+    </div>
+  </div>
+</template>
+<script>
+  import { push } from "@/api/sysPushRecord.js";
+  export default {
+    props: {
+      formData: {
+        type: Object,
+        default: () => {
+          return {}
+        }
+      }
+    },
+    methods: {
+      /**
+       * @description: pushRecord
+       * @author: renchao
+       */
+      pushRecord () {
+        this.$startLoading()
+        push(this.formData).then((res) => {
+          this.$endLoading()
+          if (res.code === 200) {
+            this.$message.success("推送成功");
+          } else {
+            this.$message.warning(res.message);
+          }
+          this.$popupCacel()
+        })
+      }
+    }
+  }
+</script>

+import filter from '@/utils/filter.js'
+let vm = null
+
+const sendThis = (_this) => {
+  vm = _this
+}
+class data extends filter {
+  constructor() {
+    super()
+  }
+  columns () {
+    return [
+      {
+        label: '序号',
+        type: 'index',
+        width: '50',
+        render: (h, scope) => {
+          return (
+            <div>
+              {(vm.pageData.currentPage - 1) * vm.pageData.pageSize + scope.$index + 1}
+            </div>
+          )
+        }
+      },
+      
+      {
+        label: "推送状态",
+        render: (h, scope) => {
+          let obj = {
+            "0": {
+              text: '成功',
+              color: '#4BD863'
+            },
+            "1": {
+              text: '失败',
+              color: 'red'
+            }
+          }
+          let textName = obj[scope.row.status]?.text || ''
+          let colorName = obj[scope.row.status]?.color || ''
+          return (
+            <div>
+              <span style={`color:${colorName}`}>●&nbsp;</span>
+              <span >{textName}</span>
+            </div>
+          )
+        }
+      },
+      {
+        prop: "ywh",
+        label: "业务号",
+        // width: '110',
+      },
+      {
+        prop: "ywh1",
+        label: "登记业务名称",
+        // width: '110',
+      },
+      {
+        prop: "ywh2",
+        label: "登记情形名称",
+        // width: '110',
+      },
+      {
+        prop: "bdcdyh",
+        label: "不动产单元号",
+        // width: '110',
+      },
+      {
+        prop: "createtime",
+        label: "创建时间",
+      },
+      {
+        prop: "createtime",
+        label: "推送时间",
+      },
+      {
+        prop: "createtime1",
+        label: "响应时间",
+      },
+      {
+        label: '操作',
+        width: '100',
+        render: (h, scope) => {
+          return (
+            <div>
+              <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.detail(scope.row) }}>详情</el-button>
+            </div>
+          )
+        }
+      }
+    ]
+  }
+
+}
+let datas = new data()
+export {
+  datas,
+  sendThis
+}

-<!--
- * @Description: 
- * @Autor: renchao
- * @LastEditTime: 2023-07-19 15:04:38
--->
 <template>
   <div class="from-clues">
     <!-- 表单部分 -->
     <div class="from-clues-header">
-      <el-form :model="queryForm" ref="queryForm" label-width="70px">
+      <el-form :model="queryForm" ref="queryForm" @submit.native.prevent label-width="70px">
         <el-row>
           <el-col :span="5">
-            <el-form-item label="接口类型">
-              <el-input
-                placeholder="请输入编号"
-                v-model="queryForm.jklx"
-                class="width200px"
-                clearable></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="5">
-            <el-form-item label="调用状态">
-              <el-input
-                placeholder="请输入编号"
-                v-model="queryForm.dyzt"
-                class="width200px"
-                clearable></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="5">
-            <el-form-item label="访问IP">
-
-              <el-input
-                placeholder="请输入IP"
-                v-model="queryForm.fwip"
-                class="width200px"
-                clearable></el-input>
-
-            </el-form-item>
-          </el-col>
-          <el-col :span="5">
-            <el-form-item label="访问时间">
-              <el-input placeholder="请输入业务号" v-model="queryForm.fwsj" clearable class="width200px">
+            <el-form-item label="业务号">
+              <el-input placeholder="请输入业务号" v-model="queryForm.ywh" clearable class="width100">
               </el-input>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="10">
-            <el-form-item label="请求地址">
-
-              <el-input
-                placeholder="请输入url"
-                v-model="queryForm.qqdz"
-                class="width500px"
-                clearable></el-input>
 
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        </el-row>
-        <el-row>
-          <el-col :span="20">
-            <el-form-item label="请求头数据">
-
-              <el-input
-                placeholder="请输入请求头数据"
-                v-model="queryForm.qqtsj"
-                class="width500px"
-                clearable></el-input>
-
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="20">
-            <el-form-item label="入参数据">
-
-              <el-input
-                placeholder="请输入参数"
-                v-model="queryForm.rcsj"
-                class="width500px"
-                clearable></el-input>
-
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row>
-          <el-col :span="5">
-            <el-form-item label="调用描述">
-
-              <el-input
-                placeholder="调用描述"
-                v-model="queryForm.dyms"
-                class="width200px"
-                clearable></el-input>
-
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row>
-          <el-col :span="5">
-            <el-form-item label="返回数据">
-
-              <el-input
-                placeholder="返回数据"
-                v-model="queryForm.fhsj"
-                class="width200px"
-                clearable></el-input>
-
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row>
           <el-col :span="4" class="btnColRight">
             <el-form-item>
-              <el-button type="primary" @click="queryClick()">发送</el-button>
-
+              <el-button type="primary" native-type="submit" @click="handleSearch">查询</el-button>
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
     </div>
     <!-- 表格 -->
-
+    <div class="from-clues-content">
+      <lb-table :page-size="pageData.size" class="loadingtext"
+                :current-page.sync="pageData.current" :total="tableData.total" @size-change="handleSizeChange"
+                @p-current-change="handleCurrentChange" :column="tableData.columns" :data="tableData.data">
+      </lb-table>
+    </div>
   </div>
 </template>
 <script>
-
-
-  export default {
-
+import { mapGetters } from "vuex";
+import table from "@/utils/mixin/table";
+import { datas, sendThis } from "./djbcxdata";
+import { list, detail } from "@/api/sysPushRecord.js";
+
+export default {
+  name: "djbcx",
+  mixins: [table],
+  mounted () {
+    sendThis(this);
+    this.queryClick()
+  },
   data () {
     return {
       queryForm: {
-          jklx: "",
-          dyzt: "",
-          fwip: "",
-          fwsj: "",
-          qqdz: "",
-          qqtsj: "",
-          rcsj: "",
-          dyms: "",
-          fhsj: "",
+        qllx: "",
+        bdcdyh: "",
+        bdcqzh: "",
+        ywh: "",
+        interfaceType: "5"
+      },
+      pageData: {
+        current: 1,
+        size: 10,
+        total: 0,
       },
+      tableData: {
+        columns: datas.columns(),
+        data: [],
+      }
     }
   },
-
+  computed: {
+    ...mapGetters(["dictData"])
+  },
+  methods: {
+    // 初始化数据
+    /**
+     * @description: 初始化数据
+     * @author: renchao
+     */
+    queryClick () {
+      this.$startLoading()
+      list({ ...this.queryForm, ...this.pageData }).then((res) => {
+        this.$endLoading()
+        if (res.code === 200) {
+          let { total, records } = res.result;
+          this.tableData.data = records;
+          this.tableData.total = total;
+        }
+      });
+    },
+    /**
+     * @description: openDialog
+     * @param {*} scroll
+     * @author: renchao
+     */
+    openDialog (scroll) {
+      const h = this.$createElement;
+      this.$msgbox({
+        title: '推送',
+        message: h('p', null, [
+          h('span', null, '是否推送 '),
+          h('i', { style: 'color: teal' }, scroll.ywh),
+          h('span', null, ' 记录')
+        ]),
+        showCancelButton: true,
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        beforeClose: (action, instance, done) => {
+          if (action === 'confirm') {
+            this.pushRecord(scroll, done);
+          } else {
+            done();
+          }
+        }
+      }).then(action => { });
+    },
+    /**
+     * @description: detail
+     * @param {*} row
+     * @author: renchao
+     */
+    detail (row) {
+      detail(row.bsm).then((res) => {
+        this.$endLoading()
+        if (res.code === 200) {
+          this.$popupDialog("详情", "sjgx/sbxtsjts/dialog/detail", res.result, "60%")
+        } else {
+          this.$message.warning(res.message);
+        }
+      })
+    }
   }
+}
 </script>
 <style scoped lang="scss">
-  @import "~@/styles/public.scss";
+@import "~@/styles/public.scss";
+
+.icon-circle {
+  position: relative;
+}
+
+.icon-circle::before {
+  content: "";
+  width: 4px;
+  height: 4px;
+  border-radius: 50%;
+  background: #000;
+  top: 0px;
+  left: 0px;
+}
 </style>

@@ -48,6 +48,7 @@
           bdcdyh: "",
           bdcqzh: "",
           ywh: "",
+          interfaceType: "1"
         },
         pageData: {
           current: 1,

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-10-10 14:40:07
+ * @LastEditTime: 2023-10-24 16:08:44
 -->
 <template>
   <div class="clxx">
@@ -167,13 +167,7 @@
           this.unitData = this.$parent.unitData;
           var formdata = new FormData();
           formdata.append("bsmSlsq", this.$parent.bsmSlsq);
-          if (this.$route.query.sqywbm == "DJBBL") {
-            formdata.append("bsmSldy", this.$parent.bsmRepair);
-            formdata.append("clfl", 3);
-          } else {
           formdata.append("bsmSldy", this.$parent.currentSelectProps.bsmSldy);
-            formdata.append("clfl", 2);
-          }
 
           InitClml(formdata).then((res) => {
             if (res.code == 200) {
@@ -182,7 +176,7 @@
                 this.tableData = res.result;
                 if (type == 1) {
                   this.treeClick(this.tableData[0], 0);
-                } else {
+                } else if (type == 2) {
                   //新增材料后刷新列表焦点置于新增的对象上
                   this.treeClick(
                     this.tableData[this.tableData.length - 1],
@@ -266,7 +260,7 @@
         if (data.sfggcl == "0") {
           obj["bsmSldy"] = this.$parent.currentSelectProps.bsmSldy;
         }
-        if (this.$route.query.sqywbm == "DJBBL") {
+        if (this.$route.query?.djywbm == "DJBBL") {
           obj.bsmSldy = this.$parent.bsmRepair
         }
         saveClml(obj).then(async (res) => {
@@ -310,7 +304,8 @@
         this.titleYs = index + 1;
       },
       //查看明细
-      viewDetail () {
+      async viewDetail () {
+        await this.clmlInitList();
         this.$store.dispatch("user/reWorkFresh", false);
         this.$popupDialog(
           "申请材料目录",
@@ -322,9 +317,9 @@
             ableOperation: this.$parent.ableOperation,
             bsmRepair: this.$parent.bsmRepair
           },
-          "50%",
+          "60%",
           true
-        );
+        )
       },
       //设置tableData
       setTableData (tableData) {
@@ -407,7 +402,7 @@
         height: 100%;
         font-size: 14px;
         border-right: 1px dotted #d9d9d9;
-        padding: 0 15px;
+        padding: 0 10px;
 
         .item {
           line-height: 30px;
@@ -452,6 +447,7 @@
           .checked {
             border: 1px solid $light-blue;
             color: $light-blue;
+            box-sizing: border-box;
           }
         }
       }

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-19 10:14:56
+ * @LastEditTime: 2023-10-24 17:16:18
 -->
 <template>
   <div class="clmlmx-box">
@@ -18,7 +18,7 @@
   import Vue from 'vue'
   import Sortable from 'sortablejs'
   import store from '@/store/index.js'
-  import { InitClml, updateClml } from "@/api/clxx.js";
+  import { updateClml } from "@/api/clxx.js";
   export default {
     props: {
       formData: {
@@ -197,36 +197,6 @@
         })
       },
       /**
-       * @description: 材料目录明细初始化
-       * @author: renchao
-       */
-      clmlInitList () {
-        return new Promise(resolve => {
-          this.unitData = this.$parent.unitData;
-          var formdata = new FormData();
-          formdata.append("bsmSlsq", Vue.prototype.$currentRoute.query.bsmSlsq);
-          if (Vue.prototype.$currentRoute.query.sqywbm == "DJBBL") {
-            formdata.append("bsmSldy", this.formData.bsmRepair);
-            formdata.append("clfl", 3);
-          } else {
-            formdata.append("bsmSldy", this.formData.unitData[0]?.bsmSldy);
-            formdata.append("clfl", 2);
-          }
-          InitClml(formdata).then((res) => {
-            if (res.code == 200) {
-              resolve(res.code)
-              if (res.result && res.result.length > 0) {
-                this.tableData = res.result;
-              } else {
-                this.tableData = []
-              }
-            } else {
-              this.$message.error(res.message)
-            }
-          })
-        })
-      },
-      /**
        * @description: 材料目录删除
        * @param {*} index
        * @param {*} row

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-06 15:32:50
+ * @LastEditTime: 2023-11-08 13:27:03
 -->
 <template>
   <div>
@@ -67,6 +67,7 @@
   import { getPrintTemplateByCode } from "@/api/print";
   import { getLodop } from "@/utils/LodopFuncs"
   import { readYsxlh, certificate, getBdcqzDetail, invalidCertificate } from "@/api/bdcqz.js";
+  import { log } from 'bpmn-js-token-simulation';
   export default {
     props: {
       formData: {
@@ -239,7 +240,7 @@
           context.fillText(this.bdcqz.qlxz ? this.bdcqz.qlxz : '', 129, 303);
           context.fillText(this.bdcqz.yt ? this.bdcqz.yt : '', 129, 346);
           let lines6 = this.bdcqz.mj ? this.bdcqz.mj.split(' ') : [];
-          if (getByteLen(this.bdcqz.mj) > 41) {
+          if (getByteLen(this.bdcqz.mj) > 37) {
             lines6.forEach((line, index) => {
               const y = 378 + (index * 27); // 每行文本的垂直位置
               let currentLine = '';
@@ -247,7 +248,7 @@
               for (let word of line) {
                 const testLine = currentLine + word;
                 const lineWidth = context.measureText(testLine).width;
-                if (lineWidth <= 330) {
+                if (lineWidth <= 336) {
                   currentLine = testLine;
                 } else {
                   arr.push(currentLine);
@@ -267,7 +268,7 @@
               for (let word of line) {
                 const testLine = currentLine + word;
                 const lineWidth = context.measureText(testLine).width;
-                if (lineWidth <= 330) {
+                if (lineWidth <= 336) {
                   currentLine = testLine;
                 } else {
                   arr.push(currentLine);
@@ -284,8 +285,8 @@
           const maxWidth = 332; // 最大宽度限制
           let lines = this.bdcqz.qlqtzk ? this.bdcqz.qlqtzk.split('\n') : [];
           for (let i = 0; i < lines.length; i++) {
-            let num = Math.ceil(getByteLen(lines[i]) / 41)
-            if (getByteLen(lines[i]) > 41) {
+            let num = Math.ceil(getByteLen(lines[i]) / 37)
+            if (getByteLen(lines[i]) > 37) {
               let currentLine = '';
               let arr = [];
               for (let word of lines[i]) {
@@ -301,18 +302,18 @@
               arr.push(currentLine);
               if (i > 0) {
                 arr.forEach((line, index) => {
-                  context.fillText(line, 129, 480 + (26 * (i - 1)) + 5 * num + (index * 13)); // 调整行高
+                  context.fillText(line, 129, 495 + (29 * (i - 1)) + 4 * num + (index * 14)); // 调整行高
                 })
               } else {
                 arr.forEach((line, index) => {
-                  context.fillText(line, 129, 480 + (26 * (i - 1)) + (index * 13)); // 调整行高
+                  context.fillText(line, 129, 493 + (26 * (i - 1)) + (index * 14)); // 调整行高
                 })
               }
             } else {
               if (i > 0) {
-                context.fillText(lines[i] ? lines[i] : '', 129, 490 + 4 * num + (24 * (i - 1)));
+                context.fillText(lines[i] ? lines[i] : '', 129, 500 + 4 * num + (29 * (i - 1)));
               } else {
-                context.fillText(lines[i] ? lines[i] : '', 129, 490 + (24 * (i - 1)));
+                context.fillText(lines[i] ? lines[i] : '', 129, 505 + (27 * (i - 1)));
               }
             }
           }
@@ -338,7 +339,7 @@
             })
           })
           let lines3 = this.bdcqz.syqx ? this.bdcqz.syqx.split(' ') : [];
-          if (getByteLen(this.bdcqz.syqx) > 41) {
+          if (getByteLen(this.bdcqz.syqx) > 37) {
             lines3.forEach((line, index) => {
               const y = 423 + (index * 27); // 每行文本的垂直位置
               let currentLine = '';
@@ -381,7 +382,7 @@
           }
 
           let lines2 = this.bdcqz.zl ? this.bdcqz.zl.split(' ') : [];
-          if (getByteLen(this.bdcqz.zl) > 41) {
+          if (getByteLen(this.bdcqz.zl) > 37) {
             lines2.forEach((line, index) => {
               const y = 170 + (index * 20); // 每行文本的垂直位置
               let currentLine = '';
@@ -469,7 +470,7 @@
           // 义务人
           context.fillText(this.bdcqz.ywr ? this.bdcqz.ywr : '', 775, 275);
           let lines2 = this.bdcqz.zl ? this.bdcqz.zl.split(' ') : [];
-          if (getByteLen(this.bdcqz.zl) > 41) {
+          if (getByteLen(this.bdcqz.zl) >= 39) {
             lines2.forEach((line, index) => {
               const y = 315 + (index * 20); // 每行文本的垂直位置
               let currentLine = '';
@@ -518,6 +519,7 @@
           const maxWidth = 290; // 最大宽度限制
           let lines = this.bdcqz.qlqtzk ? this.bdcqz.qlqtzk.split('\n') : [];
           for (let i = 0; i < lines.length; i++) {
+            console.log(getByteLen(lines[i]));
             let num = Math.ceil(getByteLen(lines[i]) / 37)
             if (getByteLen(lines[i]) > 37) {
               let currentLine = '';
@@ -570,25 +572,24 @@
               arr.push(currentLine);
               if (i > 0) {
                 arr.forEach((line, index) => {
-                  context.fillText(line, 770, 610 + (25 * (i - 1)) + 5 * num + (index * 15)); // 调整行高
+                  context.fillText(line, 770, 610 + (25 * (i - 1)) + 5 * num + (index * 22)); // 调整行高
                 })
               } else {
                 arr.forEach((line, index) => {
-                  context.fillText(line, 770, 610 + (25 * (i - 1)) + (index * 15)); // 调整行高
+                  context.fillText(line, 770, 610 + (25 * (i - 1)) + (index * 22)); // 调整行高
                 })
               }
             } else {
               if (i > 0) {
-                context.fillText(lines1[i] ? lines1[i] : '', 770, 610 + 5 * num + (23 * (i - 1)));
+                context.fillText(lines1[i] ? lines1[i] : '', 770, 610 + 5 * num + (24 * (i - 1)));
               } else {
-                context.fillText(lines1[i] ? lines1[i] : '', 770, 610 + (23 * (i - 1)));
+                context.fillText(lines1[i] ? lines1[i] : '', 770, 610 + (24 * (i - 1)));
               }
             }
           }
         }
         image.src = this.bdczmSrc;
       },
-      // 打印
       /**
        * @description: 打印
        * @author: renchao

-          <!--
+<!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-10-17 16:16:41
+ * @LastEditTime: 2023-11-07 08:46:12
 -->
 <template>
   <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px">
@@ -234,7 +234,6 @@
               }
             })
           } else {
-            this.$message.error("请填写领取人信息！")
             return false;
           }
         })

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-10-19 10:00:27
+ * @LastEditTime: 2023-11-08 13:25:20
 -->
 <template>
   <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;">
@@ -163,7 +163,7 @@
           context.fillText(this.bdcqz.yt ? this.bdcqz.yt : '', 129, 346);
           // context.fillText(this.bdcqz.mj ? this.bdcqz.mj : '', 129, 386);
           let lines6 = this.bdcqz.mj ? this.bdcqz.mj.split(' ') : [];
-          if (getByteLen(this.bdcqz.mj) > 41) {
+          if (getByteLen(this.bdcqz.mj) > 37) {
             lines6.forEach((line, index) => {
               const y = 378 + (index * 27); // 每行文本的垂直位置
               let currentLine = '';
@@ -208,7 +208,7 @@
           let lines = this.bdcqz.qlqtzk ? this.bdcqz.qlqtzk.split('\n') : [];
           for (let i = 0; i < lines.length; i++) {
             let num = Math.ceil(getByteLen(lines[i]) / 38)
-            if (getByteLen(lines[i]) > 38) {
+            if (getByteLen(lines[i]) > 37) {
               let currentLine = '';
               let arr = [];
               for (let word of lines[i]) {
@@ -224,18 +224,18 @@
               arr.push(currentLine);
               if (i > 0) {
                 arr.forEach((line, index) => {
-                  context.fillText(line, 129, 485 + (24 * (i - 1)) + 4 * num + (index * 14)); // 调整行高
+                  context.fillText(line, 129, 495 + (29 * (i - 1)) + 4 * num + (index * 14)); // 调整行高
                 })
               } else {
                 arr.forEach((line, index) => {
-                  context.fillText(line, 129, 495 + (26 * (i - 1)) + (index * 14)); // 调整行高
+                  context.fillText(line, 129, 493 + (26 * (i - 1)) + (index * 14)); // 调整行高
                 })
               }
             } else {
               if (i > 0) {
-                context.fillText(lines[i] ? lines[i] : '', 129, 495 + 4 * num + (24 * (i - 1)));
+                context.fillText(lines[i] ? lines[i] : '', 129, 500 + 4 * num + (29 * (i - 1)));
               } else {
-                context.fillText(lines[i] ? lines[i] : '', 129, 500 + (24 * (i - 1)));
+                context.fillText(lines[i] ? lines[i] : '', 129, 505 + (27 * (i - 1)));
               }
             }
           }
@@ -261,7 +261,7 @@
             })
           })
           let lines3 = this.bdcqz.syqx ? this.bdcqz.syqx.split(' ') : [];
-          if (getByteLen(this.bdcqz.syqx) > 41) {
+          if (getByteLen(this.bdcqz.syqx) > 37) {
             lines3.forEach((line, index) => {
               const y = 423 + (index * 27); // 每行文本的垂直位置
               let currentLine = '';
@@ -304,7 +304,7 @@
           }
 
           let lines2 = this.bdcqz.zl ? this.bdcqz.zl.split(' ') : [];
-          if (getByteLen(this.bdcqz.zl) > 41) {
+          if (getByteLen(this.bdcqz.zl) > 37) {
             lines2.forEach((line, index) => {
               const y = 170 + (index * 20); // 每行文本的垂直位置
               let currentLine = '';
@@ -497,18 +497,18 @@
               arr.push(currentLine);
               if (i > 0) {
                 arr.forEach((line, index) => {
-                  context.fillText(line, 770, 610 + (25 * (i - 1)) + 5 * num + (index * 15)); // 调整行高
+                  context.fillText(line, 770, 610 + (25 * (i - 1)) + 5 * num + (index * 22)); // 调整行高
                 })
               } else {
                 arr.forEach((line, index) => {
-                  context.fillText(line, 770, 610 + (25 * (i - 1)) + (index * 15)); // 调整行高
+                  context.fillText(line, 770, 610 + (25 * (i - 1)) + (index * 22)); // 调整行高
                 })
               }
             } else {
               if (i > 0) {
-                context.fillText(lines1[i] ? lines1[i] : '', 770, 610 + 5 * num + (23 * (i - 1)));
+                context.fillText(lines1[i] ? lines1[i] : '', 770, 610 + 5 * num + (24 * (i - 1)));
               } else {
-                context.fillText(lines1[i] ? lines1[i] : '', 770, 610 + (23 * (i - 1)));
+                context.fillText(lines1[i] ? lines1[i] : '', 770, 610 + (24 * (i - 1)));
               }
             }
           }

@@ -14,7 +14,7 @@
   /deep/.el-menu-item {
     display: flex;
     align-items: center;
-    justify-content: space-between;
+    // justify-content: space-between;
   }
 }
 

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-10-12 09:55:54
+ * @LastEditTime: 2023-11-01 08:47:49
 -->
 <template>
   <div class="rlPopup">
@@ -53,7 +53,7 @@
 <script>
   import PhotoZoom from '@/components/PhotoZoom'
   import { getAltimeterInfo, getUuid } from '@/utils/operation.js'
-  import { uploadBatch, deleteFile, move } from "@/api/company.js"
+  import { uploadBatch, deleteFile, move, uploadSjClmx } from "@/api/company.js"
   import publicPicture from '@/components/publicPicture/index.vue'
   export default {
     name: 'PreviewImage',
@@ -196,11 +196,12 @@
           let file = blobToFile(blob);
           var formData = new FormData();
           formData.append('file', file)
-          formData.append("bsmMaterial ", this.previewImg.bsmMaterial);
-          formData.append("bsmSlsq", this.previewImg.bsmSlsq);
-          uploadSjClmx(formData).then((res) => {
+          if (this.previewImg.imgList.length > 0) {
+            formData.append("index", this.previewImg.imgList[this.previewImg.index].sxh);
+          }
+          uploadSjClmx(formData, this.previewImg.bsmMaterial).then((res) => {
             if (res.code == 200) {
-              this.$emit('updateList', res.result)
+              this.$emit('updateList', { children: res.result, bsmMaterial: this.previewImg.bsmMaterial })
               this.$message({
                 message: '上传成功!',
                 type: 'success'

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-10-12 09:58:32
+ * @LastEditTime: 2023-10-24 17:18:02
 -->
 <template>
   <div class="clxx">
@@ -98,14 +98,14 @@
     watch: {
       workFresh: {
         handler (newValue, oldValue) {
-          this.clmlInitList()
+          this.clmlInitList(1)
         },
         deep: true,
         immediate: true
       }
     },
     created () {
-      this.clmlInitList()
+      this.clmlInitList(1)
     },
     methods: {
       /**
@@ -173,7 +173,7 @@
                 this.tableData = res.result;
                 if (type == 1) {
                   this.treeClick(this.tableData[0], 0);
-                } else {
+                } else if (type == 2) {
                   //新增材料后刷新列表焦点置于新增的对象上
                   this.treeClick(
                     this.tableData[this.tableData.length - 1],
@@ -287,12 +287,13 @@
         this.titleYs = index + 1;
       },
       //查看明细
-      viewDetail () {
+      async viewDetail () {
+        await this.clmlInitList();
         store.dispatch("user/reWorkFresh", false);
         ywPopupDialog("申请材料目录", "xxba/components/clxx/dialog/clxxDetailDialog", {
           data: this.tableData,
           bsmCompany: this.formData.bsmCompany
-        }, "50%", true, false)
+        }, "60%", true, false)
       },
       //设置tableData
       setTableData (tableData) {

@@ -106,7 +106,7 @@
        * @author: renchao
        */
       handleAdd () {
-        this.$popupDialog("添加企业", "xxba/components/addDialog", { isAdd: 1, }, "75%")
+        this.$popupDialog("添加企业", "xxba/components/addDialog", { isAdd: 1 }, "75%")
       },
       /**
        * @description: handleDelete

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-15 15:47:37
+ * @LastEditTime: 2023-11-07 13:32:51
 -->
 <template>
   <div class="from-clues">
@@ -105,7 +105,7 @@
        * @author: renchao
        */
       handleAdd () {
-        this.$popupDialog("添加企业", "xxba/components/addDialog", {}, "75%")
+        this.$popupDialog("添加银行", "xxba/components/addDialog", { isAdd: 1 }, "75%")
       },
       /**
        * @description: handleDelete

 /*
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-25 09:31:27
+ * @LastEditTime: 2023-10-27 17:31:20
  */
 export default {
   data () {
@@ -40,11 +40,11 @@ export default {
      * @author: renchao
      */
     handleEmpty (el) {
-      for (var i = 0; i < this.searchList.length; i++) {
-        if (el == this.searchList[i].zdm) {
-          this.searchList.splice(i, 1)
-        }
-      }
+      // for (var i = 0; i < this.searchList.length; i++) {
+      //   if (el == this.searchList[i].zdm) {
+      //     this.searchList.splice(i, 1)
+      //   }
+      // }
       let obj = {
         ywlymc: 'ywly',
         qllxmc: 'qllx',
@@ -88,7 +88,7 @@ export default {
     iterationData () {
       let obj = {
         ywlymc: '业务来源', qllxmc: '权利类型', djlxmc: '登记类型', ywh: '业务号', sqywmc: '申请业务名称',
-        bdcdyh: '不动产单元号',
+        bdcdyh: '不动产单元号', qlrmc: '权利人', ywrmc: '义务人', slsj: '受理时间',
         sqrmc: '申请人', sqrzjhm: '申请人证件号', zl: '坐落'
       }
       this.searchList = Object.entries({ ...this.searchForm, ...this.otherForm }).map((item) => {
@@ -102,8 +102,11 @@ export default {
      * @author: renchao
      */
     getSearch (val) {
+      this.$nextTick(() => {
         this.otherForm = val
         this.iterationData()
+        this.$refs.Lbtable.getHeight()
+      })
       this.queryClick()
     },
     /**

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-10-12 17:05:40
+ * @LastEditTime: 2023-10-27 17:23:24
 -->
 <template>
   <div class="from-clues">
@@ -73,7 +73,7 @@
             <el-form-item label="业务号">
               <el-input
                 placeholder="请输入业务号"
-                v-model="queryForm.ywh"
+                v-model.trim="queryForm.ywh"
                 clearable
                 class="width100">
               </el-input>
@@ -95,7 +95,7 @@
             <el-form-item label="不动产单元号">
               <el-input
                 placeholder="请输入不动产单元号"
-                v-model="queryForm.bdcdyh"
+                v-model.trim="queryForm.bdcdyh"
                 clearable
                 class="width100">
               </el-input>
@@ -105,7 +105,7 @@
             <el-form-item label="申请人">
               <el-input
                 placeholder="如需要模糊查询，前后输入%"
-                v-model="queryForm.sqrmc"
+                v-model.trim="queryForm.sqrmc"
                 clearable
                 class="width100">
               </el-input>
@@ -115,13 +115,13 @@
             <el-form-item label="申请人证件号">
               <el-input
                 placeholder="如需要模糊查询，前后输入%"
-                v-model="queryForm.sqrzjhm"
+                v-model.trim="queryForm.sqrzjhm"
                 clearable
                 class="width100">
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="9">
             <el-form-item label="坐落">
               <el-input
                 placeholder="如需要模糊查询，前后输入%"
@@ -141,18 +141,19 @@
                 class="el-icon-circle-close"
                 @click="handelItem(item, index)"></i>
             </li>
-          </ul>
             <el-button
               class="clean-btn"
               type="text"
               v-if="searchList.length > 0"
               @click.native="hanldeCleanAll">清除全部
             </el-button>
+          </ul>
         </el-row>
       </el-form>
     </div>
     <div class="from-clues-content">
       <lb-table
+        ref="Lbtable"
         :page-size="pageData.size"
         class="loadingtext"
         @sort-change="handleSort"
@@ -202,18 +203,12 @@
           columns: datas.columns(),
           data: [],
         },
-        jumpid: "",
-      };
+        jumpid: ""
+      }
     },
     mounted () {
       sendThis(this);
     },
-    watch: {
-      queryForm: {
-        handler (newName, oldName) { },
-        immediate: true,
-      },
-    },
     activated () {
       this.queryClick();
       window["getBpageList"] = () => {

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-10-23 17:17:34
+ * @LastEditTime: 2023-10-24 17:35:49
 -->
 <template>
   <!-- 受理信息 -->
@@ -105,7 +105,14 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="权利设定方式：">
-              <el-input maxlength="25" :disabled="!viewEdit" v-model="ruleForm.zdjbxx.qlsdfsmc"></el-input>
+              <el-select v-model="ruleForm.zdjbxx.qlsdfs" :disabled="!viewEdit">
+                <el-option
+                  v-for="item in dictData['A10']"
+                  :key="item.dcode"
+                  :label="item.dname"
+                  :value="item.dcode">
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">

@@ -2,7 +2,7 @@
 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-10-10 14:24:08
+ * @LastEditTime: 2023-10-25 11:28:05
 -->
 <template>
   <!-- 受理信息 -->
@@ -79,22 +79,16 @@
         </el-row>
         <el-row :gutter="10">
           <el-col :span="8">
-            <el-form-item label="宗地面积：">
-              <el-input :disabled="!viewEdit" v-model="ruleForm.zdjbxx.zdmj"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="土地用途：">
-              <el-input :disabled="!viewEdit" v-model="ruleForm.qlxx.ytmc"></el-input>
+            <el-form-item label="权利设定方式：">
+              <el-input disabled v-model="ruleForm.zdjbxx.qlsdfsmc"></el-input>
             </el-form-item>
           </el-col>
+
           <el-col :span="8">
-            <el-form-item label="权利设定方式：">
-              <el-input disabled v-model="ruleForm.zdjbxx.qlsdfsmc"></el-input>
+            <el-form-item label="宗地面积：">
+              <el-input :disabled="!viewEdit" v-model="ruleForm.zdjbxx.zdmj"></el-input>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="10">
           <el-col :span="8">
             <el-form-item label="取得价格：">
               <div style="display: flex">
@@ -115,7 +109,45 @@
               </div>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row :gutter="10">
+          <el-col :span="8">
+            <el-form-item label="土地等级：">
+              <el-select placeholder="" v-model="ruleForm.zdjbxx.dj" disabled>
+                <el-option
+                  v-for="item in dictData['A50']"
+                  :key="item.dcode"
+                  :label="item.dname"
+                  :value="item.dcode">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="图幅号：">
+              <el-input
+                disabled
+                v-model="ruleForm.zdjbxx.tfh"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="地籍号：">
+              <el-input
+                v-model="ruleForm.zdjbxx.djh"
+                disabled></el-input>
+            </el-form-item>
+          </el-col>
 
+        </el-row>
+        <el-row :gutter="10">
+          <el-col :span="8">
+            <el-form-item label="地块代码：">
+              <el-input
+                v-model="ruleForm.zdjbxx.dkdm"
+                disabled></el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="16">
             <el-form-item label="坐落：">
               <el-input :disabled="!viewEdit" v-model="ruleForm.sldy.zl"></el-input>

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-25 11:08:07
+ * @LastEditTime: 2023-10-27 17:19:42
 -->
 <template>
   <div class="from-clues">
@@ -74,7 +74,7 @@
             <el-form-item label="业务号">
               <el-input
                 placeholder="请输入业务号"
-                v-model="queryForm.ywh"
+                v-model.trim="queryForm.ywh"
                 clearable
                 class="width100">
               </el-input>
@@ -96,7 +96,7 @@
             <el-form-item label="不动产单元号">
               <el-input
                 placeholder="请输入不动产单元号"
-                v-model="queryForm.bdcdyh"
+                v-model.trim="queryForm.bdcdyh"
                 clearable
                 class="width100">
               </el-input>
@@ -106,7 +106,7 @@
             <el-form-item label="申请人">
               <el-input
                 placeholder="如需要模糊查询，前后输入%"
-                v-model="queryForm.sqrmc"
+                v-model.trim="queryForm.sqrmc"
                 clearable
                 class="width100">
               </el-input>
@@ -116,13 +116,13 @@
             <el-form-item label="申请人证件号">
               <el-input
                 placeholder="如需要模糊查询，前后输入%"
-                v-model="queryForm.sqrzjhm"
+                v-model.trim="queryForm.sqrzjhm"
                 clearable
                 class="width100">
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="9">
             <el-form-item label="坐落">
               <el-input
                 placeholder="如需要模糊查询，前后输入%"
@@ -142,24 +142,24 @@
                 class="el-icon-circle-close"
                 @click="handelItem(item, index)"></i>
             </li>
-          </ul>
             <el-button
               class="clean-btn"
               type="text"
               v-if="searchList.length > 0"
               @click.native="hanldeCleanAll">清除全部
             </el-button>
+          </ul>
         </el-row>
       </el-form>
     </div>
     <!-- 表格 -->
     <div class="from-clues-content">
       <lb-table
+        ref="Lbtable"
         :page-size="pageData.size"
         class="loadingtext"
         @sort-change="handleSort"
         :current-page.sync="pageData.currentPage"
-        :heightNum="350"
         :total="tableData.total"
         @size-change="handleSizeChange"
         @p-current-change="handleCurrentChange"
@@ -278,7 +278,7 @@
           const { href } = this.$router.resolve(
             "/djbworkFrameview?bsmSlsq=" + item.bsmSlsq +
             "&bestepid=" + item.bestepid +
-            "&sqywbm=" + item.djywbm
+            "&djywbm=" + item.djywbm
           );
           window.open(href, `djbworkFrameview${item.bsmSlsq}`);
         } else {

@@ -65,6 +65,11 @@ class data extends filter {
         width: '200'
       },
       {
+        prop: "djqxmc",
+        label: "登记情形",
+        width: '200'
+      },
+      {
         label: "权利人",
         width: '120',
         render: (h, scope) => {

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-17 15:20:56
+ * @LastEditTime: 2023-10-26 15:04:32
 -->
 <template>
   <div class="from-clues">

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-10-17 10:42:49
+ * @LastEditTime: 2023-10-31 10:33:11
 -->
 <template>
   <div class="from-clues">
@@ -111,7 +111,7 @@
           label="权利性质">
         </el-table-column>
         <el-table-column
-          property="mj"
+          property="syqmj"
           label="使用权面积">
         </el-table-column>
         <el-table-column
@@ -282,6 +282,7 @@
       handleRowClick (row) {
         this.queryForm.bhqkbsm = row.bhqkbsm
         this.radioVal = row.bdcdyh
+        row.bglx = '1'
         selectZdjbxxSplitMergeLast({ ...this.queryForm }).then((res) => {
           this.$endLoading();
           if (res.code === 200) {

 /*
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-29 13:04:44
+ * @LastEditTime: 2023-10-31 08:52:14
  */
 import filter from '@/utils/filter.js'
 let vm = null
@@ -109,7 +109,8 @@ class data extends filter {
       },
       {
         label: '操作',
-        width: '100',
+        width: '80',
+        fixed: 'right',
         render: (h, scope) => {
           return (
             <div>
@@ -120,8 +121,6 @@ class data extends filter {
       }
     ]
   }
-
-
 }
 let datas = new data()
 export {

@@ -35,6 +35,7 @@ class data extends filter {
       {
         prop: "status",
         label: "状态",
+        width: '120',
         render: (h, scope) => {
           return (
             <div>
@@ -93,8 +94,15 @@ class data extends filter {
         label: "共有情况",
       },
       {
-        prop: "qlrmc",
         label: "权利人",
+        width: '100',
+        render: (h, scope) => {
+          return (
+            <el-tooltip effect="dark" content={scope.row.qlrmc} placement="top" popper-class="tooltip-width">
+              <span class="ellipsis-table"> {scope.row.qlrmc}</span>
+            </el-tooltip>
+          )
+        }
       },
       {
         prop: "qlrzjhm",
@@ -104,6 +112,7 @@ class data extends filter {
       {
         prop: "ywrmc",
         label: "义务人",
+        width: '100',
       },
       {
         prop: "ywrzjhm",
@@ -112,6 +121,7 @@ class data extends filter {
       },
       {
         prop: "qlxzmc",
+        width: '100',
         label: "权利性质",
       },
       {
@@ -121,6 +131,7 @@ class data extends filter {
       {
         prop: "qlytmc",
         label: "用途",
+        width: '100',
       },
       {
         label: "坐落",

 /*
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-15 17:25:11
+ * @LastEditTime: 2023-10-31 08:50:23
  */
 import filter from '@/utils/filter.js'
 let vm = null
@@ -123,8 +123,9 @@ class data extends filter {
       },
       {
         label: '操作',
-        width: '110',
+        width: '80',
         align: 'center',
+        fixed: 'right',
         render: (h, scope) => {
           return (
             <div>

 /*
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-06 17:03:59
+ * @LastEditTime: 2023-10-26 15:11:19
  */
 import filter from '@/utils/filter.js'
 let vm = null
@@ -158,15 +158,15 @@ class datatwo extends filter {
         label: "权利性质",
       },
       {
-        prop: "mj",
+        prop: "syqmj",
         label: "宗地面积(㎡)",
       },
+      // {
+      //   prop: "qlsdfsmc",
+      //   label: "权利设定方式",
+      // },
       {
-        prop: "qlsdfsmc",
-        label: "权利设定方式",
-      },
-      {
-        prop: "ytmc",
+        prop: "qlytmc",
         label: "土地用途",
       },
       {

 /*
 * @Description: 土地所有权对象处理
 * @Autor: ssq
- * @LastEditTime: 2023-08-29 13:10:12
+ * @LastEditTime: 2023-10-31 08:48:59
 */
 import filter from '@/utils/filter.js'
 let vm = null
@@ -75,12 +75,26 @@ class data extends filter {
         label: "共有方式",
       },
       {
-        prop: "qlrmc",
         label: "使用权人",
+        width: 100,
+        render: (h, scope) => {
+          return (
+            <el-tooltip effect="dark" content={scope.row.qlrmc} placement="top" popper-class="tooltip-width ">
+              <span class="ellipsis-table"> {scope.row.qlrmc}</span>
+            </el-tooltip>
+          )
+        }
       },
       {
-        prop: "qlrzjhm",
         label: "证件号",
+        width: 100,
+        render: (h, scope) => {
+          return (
+            <el-tooltip effect="dark" content={scope.row.qlrzjhm} placement="top" popper-class="tooltip-width ">
+              <span class="ellipsis-table"> {scope.row.qlrzjhm}</span>
+            </el-tooltip>
+          )
+        }
       },
       {
         prop: "qlxzmc",
@@ -105,7 +119,6 @@ class data extends filter {
         label: '操作',
         width: '80',
         align: 'center',
-        fixed: 'right',
         render: (h, scope) => {
           return (
             <div>

 /*
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-07 10:04:33
+ * @LastEditTime: 2023-10-31 08:56:52
  */
 import filter from '@/utils/filter.js'
 let vm = null
@@ -35,6 +35,7 @@ class data extends filter {
       {
         prop: "status",
         label: "状态",
+        width: '120',
         render: (h, scope) => {
           return (
             <div>
@@ -93,9 +94,15 @@ class data extends filter {
         label: "房屋面积(㎡)",
       },
       {
-        prop: "zl",
         label: "坐落",
-        minWidth: '130'
+        minWidth: '150',
+        render: (h, scope) => {
+          return (
+            <el-tooltip effect="dark" content={scope.row.zl} placement="top" popper-class="tooltip-width ">
+              <span class="ellipsis-table"> {scope.row.zl}</span>
+            </el-tooltip>
+          )
+        }
       },
       {
         label: '操作',

@@ -101,7 +101,8 @@ class data extends filter {
       },
       {
         label: '操作',
-        width: '100',
+        width: '80',
+        fixed: 'right',
         render: (h, scope) => {
           return (
             <div>
@@ -112,8 +113,6 @@ class data extends filter {
       }
     ]
   }
-
-
 }
 let datas = new data()
 export {

@@ -40,8 +40,10 @@ export function queueDjywmc (djywbm, djqxbm) {
         case "A06100": // 宅基地使用权/房屋所有权 || 首次登记
             vm = "zjdfwsyq";
             break;
-        case "A04100"://国有建设用地使用权/房屋所有权(首次登记)
         case "A08100": // 集体建设用地使用权/房屋所有权 || 首次登记
+            vm = "jtjsydfwsyq";
+            break;
+        case "A04100"://国有建设用地使用权/房屋所有权(首次登记)
         case "B37100": // 在建工程抵押权 || 首次登记
             vm = "fwsyq";
             break;

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-10-19 10:30:56
+ * @LastEditTime: 2023-10-27 13:17:15
 -->
 <template>
   <div class="from-clues">
@@ -37,7 +37,7 @@
           <el-col :span="4" class="btnColRight">
             <el-form-item>
               <el-button type="primary" native-type="submit" @click="handleSearch">查询</el-button>
-              <el-button @click="moreQueryClick">高级查询</el-button>
+              <!-- <el-button @click="moreQueryClick">高级查询</el-button> -->
             </el-form-item>
           </el-col>
         </el-row>

@@ -65,9 +65,8 @@ class data extends filter {
       },
       {
         label: '操作',
-        width: '90',
+        width: '80',
         align: 'center',
-        fixed: 'right',
         render: (h, scope) => {
           return <el-button type="text" icon="el-icon-film" onClick={() => { vm.openlpbClick(scope) }}>楼盘表</el-button>
         }

@@ -69,7 +69,7 @@ class data extends filter {
       },
       {
         label: "业务号",
-        minWidth: '100',
+        width: '100',
         render: (h, scope) => {
           return (
             <div>

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-10-18 14:49:25
+ * @LastEditTime: 2023-10-30 09:19:40
 -->
 <template>
   <div class="from-clues">
@@ -55,7 +55,7 @@
   import table from "@/utils/mixin/table";
   import { datas, sendThis } from "./zslqcx";
   import { getBdcqzReceiveList } from "@/api/search.js"
-  import { bdcqzPreview } from "@/api/bdcqz.js"
+  import { getXtParamsByYwh } from '@/api/djyw'
   export default {
     name: "zslqcx",
     mixins: [table],
@@ -114,26 +114,22 @@
        * @author: renchao
        */
       openYwDialog (item) {
+        getXtParamsByYwh(item.ywh).then(res => {
+          let data = res.result
           if (item.sjlx == "3") {
             item.djywbm = "DJBBL";
             const { href } = this.$router.resolve(
               "/djbworkFrameview?bsmSlsq=" +
-            item.bsmSlsq +
-            "&bsmBusiness=" +
-            item.bsmBusiness +
-            "&sqywbm=" +
+              data.bsmSlsq + "&bsmBusiness=" +
+              data.bsmBusiness + "&djywbm=" +
               item.djywbm
             );
             window.open(href, `djbworkFrameview${item.bsmSlsq}`);
           } else {
-          const { href } = this.$router.resolve(
-            "/workFrameView?bsmSlsq=" +
-            item.bsmSlsq +
-            "&bsmBusiness=" +
-            item.bsmBusiness
-          );
-          window.open(href, `workFrameView${item.bsmSlsq}`)
+            const { href } = this.$router.resolve('/workFrameView?bsmSlsq=' + data.bsmSlsq + '&bsmBusiness=' + data.bsmBusiness)
+            window.open(href, `urlname${new Date().getTime()}`)
           }
+        })
       }
     }
   }

@@ -51,7 +51,7 @@
       <el-input type="textarea" v-model="ruleForm.bz" :rows="4" :disabled="!readOnly"></el-input>
     </el-form-item>
 
-    <el-form-item v-if="readOnly">
+    <el-form-item v-if="readOnly" style="text-align:center">
       <el-button type="primary" @click="submitForm">保存</el-button>
       <el-button @click="closeDialog">取消</el-button>
     </el-form-item>
@@ -59,10 +59,11 @@
 </template>
 
 <script>
-import { getZsStartNo, getZsEndNo, zsff, getZsglInfo } from "@/api/zsgl.js"
-import { getSysSerialSingle } from "@/api/sysSerial.js"
-import axios from "axios";
-export default {
+  import store from '@/store/index.js'
+  import { getZsStartNo, getZsEndNo, zsff, getZsglInfo } from "@/api/zsgl.js"
+  import { getSysSerialSingle } from "@/api/sysSerial.js"
+  import axios from "axios";
+  export default {
     props: {
       formData: {
         type: Object,
@@ -137,32 +138,31 @@ export default {
       this.getreceiver()
     },
     methods: {
-        //领取人列表
       /**
        * @description: 领取人列表
        * @author: renchao
        */
-    getreceiver(){
-      let url=window._config.services.management+"/management/rest/users?organizationId="+this.formData.organizationId
+      getreceiver () {
+        let url = window._config.services.management + "/management/rest/users?organizationId=" + this.formData.organizationId
         axios.get(url).then(res => {
           res.data.content.forEach((item) => {
             this.usernames.push(item.name)
           })
         })
       },
-    //表单提交
       /**
        * @description: 表单提交
        * @author: renchao
        */
       submitForm () {
+        store.dispatch("user/refreshPage", false);
         zsff(this.ruleForm).then(res => {
           if (res.code == 200) {
             this.$message.success('保存成功')
-          this.$emit("input", false);
             this.$refs['ruleForm'].resetFields();
             this.resetTableFields();
-          this.$parent.queryClick();
+            this.$popupCacel()
+            store.dispatch("user/refreshPage", true);
           } else {
             this.$message.error(res.message)
           }
@@ -201,7 +201,6 @@ export default {
           }
         })
       },
-    //初始化开始序列号
       /**
        * @description: 初始化开始序列号
        * @author: renchao
@@ -239,7 +238,6 @@ export default {
           this.updateRuleForm('', 0, item);
         }
       },
-    //更新表单数据
       /**
        * @description: 更新表单数据
        * @param {*} endno
@@ -290,17 +288,20 @@ export default {
         this.resetTableFields();
       }
     }
-}
+  }
 </script>
 <style scoped lang="scss">
-@import "~@/styles/mixin.scss";
-@import "~@/styles/dialogBoxheader.scss";
+  @import "~@/styles/mixin.scss";
+  @import "~@/styles/dialogBoxheader.scss";
+  /deep/.cell .el-form-item {
+    margin-bottom: 0;
+  }
 
-.font-red {
-  color: red
-}
+  .font-red {
+    color: red;
+  }
 
-.middle-margin-bottom {
-  margin-top: 20px
-}
+  .middle-margin-bottom {
+    margin-top: 20px;
+  }
 </style>

@@ -44,22 +44,30 @@
   </div>
 </template>
 <script>
+  import { mapGetters } from "vuex";
   import table from "@/utils/mixin/table";
   import { datas, sendThis } from "./zsffdata";
-  import { mapGetters } from "vuex";
   import { getZsglffList, removeZsgl, confirmZsff } from "@/api/zsgl.js"
   export default {
-  computed: {
-    ...mapGetters(["userInfo"]),
-  },
     name: "zsff",
     mixins: [table],
     mounted () {
       sendThis(this);
     },
+    computed: {
+      ...mapGetters(['isRefresh', 'userInfo'])
+    },
     activated () {
       this.queryClick()
     },
+    watch: {
+      isRefresh: {
+        handler (newVal, oldVal) {
+          if (newVal) this.queryClick()
+        },
+        immediate: true
+      }
+    },
     data () {
       return {
         value: '',
@@ -96,17 +104,16 @@
       }
     },
     methods: {
-      // 查看弹框
       /**
        * @description: 查看弹框
        * @param {*} bsmBatch
        * @author: renchao
        */
       openDialog (bsmBatch) {
-        console.log("this.userInfo",this.userInfo);
+        console.log("this.userInfo", this.userInfo);
         this.$popupDialog("证书分发", "zsgl/zsff/components/addDialog", {
           bsmBatch: bsmBatch,
-          organizationId:this.userInfo.organizationId
+          organizationId: this.userInfo.organizationId
         }, "50%")
       },
       /**
@@ -122,7 +129,6 @@
           }
         })
       },
-      //确定证书分发
       /**
        * @description: 确定证书分发
        * @param {*} item
@@ -149,7 +155,6 @@
           });
         });
       },
-      //删除证书分发数据
       /**
        * @description: 删除证书分发数据
        * @param {*} item

@@ -29,21 +29,28 @@
         </el-form-item>
       </el-col>
     </el-row>
-    <div>
-      <el-table :data="tableForm" border style="width: 100%"
+    <el-table :data="ruleForm.tableForm" border style="width: 100%"
       :header-cell-style="{ 'text-align': 'center', background: 'rgb(236, 245, 255)' }"
       :cell-style="{ 'text-align': 'center' }">
       <el-table-column prop="name" label="纸质证书类型" width="200"></el-table-column>
       <el-table-column prop="ksysxlh" label="开始印刷序列号" width="200">
         <template slot-scope="scope">
+          <el-form-item
+            :prop="'tableForm.' + scope.$index + '.ksysxlh'"
+            :rules="rules.ksysxlh">
             <el-input v-model="scope.row.ksysxlh" @blur="ysxlhDeal(scope.row)" maxlength="11"
               oninput="value=value.replace(/[^\d.]/g,'')" :disabled="!readOnly"></el-input>
+          </el-form-item>
         </template>
       </el-table-column>
       <el-table-column prop="jsysxlh" label="结束印刷序列号" width="200">
         <template slot-scope="scope">
+          <el-form-item
+            :prop="'tableForm.' + scope.$index + '.jsysxlh'"
+            :rules="rules.jsysxlh">
             <el-input v-model="scope.row.jsysxlh" @blur="ysxlhDeal(scope.row)" maxlength="11"
               oninput="value=value.replace(/[^\d.]/g,'')" :disabled="!readOnly"></el-input>
+          </el-form-item>
         </template>
       </el-table-column>
       <el-table-column prop="bs" label="本数">
@@ -54,11 +61,10 @@
         </template>
       </el-table-column>
     </el-table>
-    </div>
     <el-form-item label="备注" class="middle-margin-bottom">
       <el-input type="textarea" v-model="ruleForm.bz" :rows="4" :disabled="!readOnly"></el-input>
     </el-form-item>
-    <el-form-item v-if="readOnly">
+    <el-form-item v-if="readOnly" style="text-align:center">
       <el-button type="primary" @click="submitForm">保存</el-button>
       <el-button @click="closeDialog">取消</el-button>
     </el-form-item>
@@ -92,8 +98,7 @@
           zsnum: '',
           zmstarno: '',
           zmendno: '',
-          zmnum: ''
-        },
+          zmnum: '',
           //表格数据
           tableForm: [
             {
@@ -110,7 +115,8 @@
               bs: 0,
               zslx: 2
             }
-        ],
+          ]
+        },
         //证书入库业务号参数
         ywhQueryForm: {
           serialtype: 'zsrkbh',
@@ -128,13 +134,19 @@
           rksj: [
             { required: true, message: '请选择入库时间', trigger: 'change' }
           ],
+          ksysxlh: [
+            { required: true, message: '开始印刷序列号不能为空', trigger: 'blur' }
+          ],
+          jsysxlh: [
+            { required: true, message: '结束印刷序列号不能为空', trigger: 'blur' }
+          ]
         },
       }
     },
     mounted () {
       if (this.formData.bsmBatch) {
-        this.tableForm[0].bs = null;
-        this.tableForm[1].bs = null;
+        this.ruleForm.tableForm[0].bs = null;
+        this.ruleForm.tableForm[1].bs = null;
         this.getDetailInfo(this.formData.bsmBatch);
       } else {
         this.ywhSerial();
@@ -146,24 +158,31 @@
        * @author: renchao
        */
       submitForm () {
-        this.tableForm.forEach((item, index) => {
-          if (item.bs < 0) {
-            return;
+        let that = this
+        this.$refs['ruleForm'].validate((valid) => {
+          if (valid) {
+            let arr = this.ruleForm.tableForm.filter(item => item.bs > 0)
+            if (arr.length < 2) {
+              that.$message.error('本书必须大于0，请检查印刷序列号');
+              return
             }
-        })
+            store.dispatch("user/refreshPage", false);
             zsrk(this.ruleForm).then(res => {
               if (res.code == 200) {
-            this.$message.success('保存成功')
-            this.$emit("input", false);
-            this.$refs['ruleForm'].resetFields();
-            this.resetTableFields();
-            this.$parent.queryClick();
+                that.$message.success('保存成功')
+                that.$popupCacel()
+                that.$refs['ruleForm'].resetFields()
+                that.resetTableFields()
+                store.dispatch("user/refreshPage", true);
+              } else {
+                that.$message.error(res.message);
+              }
+            })
           } else {
-            this.$message.error(res.message);
+            return false;
           }
         })
       },
-      //序列号获取
       /**
        * @description: 序列号获取
        * @author: renchao
@@ -176,7 +195,6 @@
           }
         })
       },
-      //获取详情信息
       /**
        * @description: 获取详情信息
        * @param {*} bsmBatch
@@ -188,16 +206,15 @@
             this.ruleForm = res.result;
             this.$refs.ruleForm.resetFields()
             this.readOnly = false;
-            this.tableForm[0].ksysxlh = res.result.zsstarno;
-            this.tableForm[0].jsysxlh = res.result.zsendno;
-            this.tableForm[0].bs = res.result.zsnum;
-            this.tableForm[1].ksysxlh = res.result.zmstarno;
-            this.tableForm[1].jsysxlh = res.result.zmendno;
-            this.tableForm[1].bs = res.result.zmnum;
+            this.ruleForm.tableForm[0].ksysxlh = res.result.zsstarno;
+            this.ruleForm.tableForm[0].jsysxlh = res.result.zsendno;
+            this.ruleForm.tableForm[0].bs = res.result.zsnum;
+            this.ruleForm.tableForm[1].ksysxlh = res.result.zmstarno;
+            this.ruleForm.tableForm[1].jsysxlh = res.result.zmendno;
+            this.ruleForm.tableForm[1].bs = res.result.zmnum;
           }
         })
       },
-      //印刷序列号处理
       /**
        * @description: 印刷序列号处理
        * @param {*} item
@@ -245,7 +262,7 @@
        * @author: renchao
        */
       resetTableFields () {
-        this.tableForm = [
+        this.ruleForm.tableForm = [
           {
             name: '不动产权证书',
             ksysxlh: '',
@@ -277,7 +294,9 @@
 <style scoped lang="scss">
   @import "~@/styles/mixin.scss";
   @import "~@/styles/dialogBoxheader.scss";
-
+  /deep/.cell .el-form-item {
+    margin-bottom: 0;
+  }
   .font-red {
     color: red;
   }

@@ -42,6 +42,7 @@
   </div>
 </template>
 <script>
+  import { mapGetters } from 'vuex'
   import table from "@/utils/mixin/table";
   import { datas, sendThis } from "./zsrkdata";
   import { getZsglrkList, removeZsgl, verifyZsrk } from "@/api/zsgl.js";
@@ -51,9 +52,20 @@
     mounted () {
       sendThis(this);
     },
+    computed: {
+      ...mapGetters(['isRefresh'])
+    },
     activated () {
       this.queryClick()
     },
+    watch: {
+      isRefresh: {
+        handler (newVal, oldVal) {
+          if (newVal) this.queryClick()
+        },
+        immediate: true
+      }
+    },
     data () {
       return {
         ruleForm: {