style:权利人信息

renchao@pashanhoo.com
Showing 12 changed files with 120 additions and 119 deletions
src/views/djbworkflow/components/dialog/addQlr.vue
src/views/djbworkflow/components/dialog/addYwr.vue
src/views/djbworkflow/components/leftmenu/ordinaryMenu.vue
src/views/djbworkflow/components/qlrCommonTable.vue
src/views/djbworkflow/components/ywrCommonTable.vue
src/views/djbworkflow/djbBook/components/blxxtabs/dataprocessing.js
src/views/djbworkflow/mixin/index.js
src/views/djbworkflow/workFrameView.vue
src/views/workflow/components/dialog/addQlr.vue
src/views/workflow/components/qlrCommonTable.vue
src/views/workflow/components/ywrCommonTable.vue
src/views/ywbl/slsqxx/jsydsyq/slxx.vue
--- a/src/views/djbworkflow/components/dialog/addQlr.vue
View file @6aac2ce
+++ b/src/views/djbworkflow/components/dialog/addQlr.vue
View file @6aac2ce
 <!--
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-09-22 13:49:53
+ * @LastEditTime: 2023-09-26 16:49:33
 -->
 <template>
  <dialogBox
@@ -514,7 +514,6 @@
              item.zjzlMc = this.dicStatus(item.zjzl, 'A30')
              item.qlrmc = item.qymc
              item.dz = item.dwdz
-              item.id = getUuid(16)
            })
          }
        })
@@ -539,9 +538,10 @@
        this.$confirm('是否同步材料信息?', '提示', {
          confirmButtonText: '确定',
          cancelButtonText: '取消',
+          distinguishCancelAndClose: true,//区分取消与关闭
        }).then(() => {
          replace(val.bsmCompany, this.$route.query.bsmSlsq, bsmSldy).then(res => {
-            that.$emit("updateDetail", _.cloneDeep({ ...val, qlrlx: '2' }));
+            that.$emit("updateDetail", _.cloneDeep({ ...val, qlrlx: '2', id: getUuid(16) }));
            that.$emit("input", false);
            if (res.code == 200) {
              that.$message({
@@ -552,11 +552,11 @@
              this.$message.error(res.message);
            }
          })
-        }).catch(() => {
+        }).catch(action => {
-          this.$message({
+          if (action == 'cancel') {
-            type: 'info',
+            that.$emit("updateDetail", _.cloneDeep({ ...val, sqrlx: '2' }));
-            message: '已取消'
+            that.$emit("input", false);
-          })
+          }
        })
      },
      /**
@@ -575,7 +575,6 @@
              item.zjzlMc = this.dicStatus(item.zjzl, 'A30')
              item.qlrmc = item.qymc
              item.dz = item.dwdz
-              item.id = getUuid(16)
            })
          }
        })
--- a/src/views/djbworkflow/components/dialog/addYwr.vue
View file @6aac2ce
+++ b/src/views/djbworkflow/components/dialog/addYwr.vue
View file @6aac2ce
 <!--
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-09-22 13:51:38
+ * @LastEditTime: 2023-09-26 15:40:49
 -->
 <template>
  <dialogBox
@@ -525,6 +525,7 @@
        this.$confirm('是否同步材料信息?', '提示', {
          confirmButtonText: '确定',
          cancelButtonText: '取消',
+          distinguishCancelAndClose: true,//区分取消与关闭
        }).then(() => {
          replace(val.bsmCompany, this.$route.query.bsmSlsq, bsmSldy).then(res => {
            that.$emit("updateDetail", _.cloneDeep({ ...val, ywrlx: '2' }));
@@ -538,11 +539,11 @@
              this.$message.error(res.message)
            }
          })
-        }).catch(() => {
+        }).catch(action => {
-          this.$message({
+          if (action == 'cancel') {
-            type: 'info',
+            that.$emit("updateDetail", _.cloneDeep({ ...val, sqrlx: '2' }));
-            message: '已取消'
+            that.$emit("input", false);
-          })
+          }
        })
      },
      /**
--- a/src/views/djbworkflow/components/leftmenu/ordinaryMenu.vue
View file @6aac2ce
+++ b/src/views/djbworkflow/components/leftmenu/ordinaryMenu.vue
View file @6aac2ce
 <!--
 * @Description: workFrame左侧菜单列表-普通
 * @Autor: renchao
- * @LastEditTime: 2023-09-26 13:38:19
+ * @LastEditTime: 2023-09-26 15:32:20
 -->
 <template>
  <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
@@ -69,6 +69,7 @@
        bsmSlsq: this.$route.query.bsmSlsq,
        //当前流程所在环节
        bestepid: this.$route.query.bestepid,
+        bsmBusiness: this.$route.query.bsmBusiness,
        //受理申请标识码
        bdcdyid: this.$route.query.bdcdyid,
        //当前流程所在环节
@@ -100,16 +101,8 @@
      this.delel = this.$parent.isEdit
      this.loadBdcdylist();
    },
-    computed: {
+    beforeDestroy () {
-      // ...mapGetters(["isRefresh"]),
+      sessionStorage.removeItem('keyPath')
-    },
-    watch: {
-      // isRefresh: {
-      //   handler(newVal, oldVal) {
-      //     if (newVal) this.loadBdcdylist();
-      //   },
-      //   immediate: true,
-      // },
    },
    methods: {
      /**
@@ -120,13 +113,14 @@
        var formdata = new FormData();
        if (this.bsmSlsq) {
          formdata.append("bsmSlsq", this.bsmSlsq);
-          formdata.append("bestepid", this.bestepid);
+          formdata.append("bestepid", this.bestepid ? this.bestepid : '');
+          formdata.append("bsmBusiness", this.bsmBusiness ? this.bsmBusiness : '');
          leftMenu(formdata).then((res) => {
            if (res.code === 200 && res.result) {
              this.currentSelectProps = res.result[0];
              this.$emit("getCurrentSelectProps", this.currentSelectProps);
            }
-          })
+          });
        }
      },
      /**
@@ -135,26 +129,38 @@
       * @author: renchao
       */
      getleftMenubl (row) {
+        let that = this
        leftMenubl(this.bsmSlsq).then((res) => {
          this.supplementarylist = res.result;
          if (row) {
            this.supplementarylist.forEach((item, index) => {
              if (item.bsmRepair == row.bsmRepair) {
                this.activeIndex = index.toString()
-                // 补录成功后定位到该条记录
                this.unitClick(this.activeIndex)
              }
            })
-            if (row == "change") {
+            // if (row == "change") {
-              this.unitClick(0)
+            //   if (sessionStorage.getItem('keyPath') && sessionStorage.getItem('keyPath') >= 0) {
-            }
+            //     that.unitClick(sessionStorage.getItem('keyPath') - 0)
+            //     that.activeIndex = sessionStorage.getItem('keyPath')
+            //   } else {
+            //     that.unitClick(0)
+            //     that.activeIndex = "0"
+            //   }
+            // }
          } else {
            if (this.supplementarylist.length) {
-              this.unitClick(0)
+              if (sessionStorage.getItem('keyPath') && sessionStorage.getItem('keyPath') >= 0) {
-              this.activeIndex = "0"
+                that.unitClick(sessionStorage.getItem('keyPath') - 0)
+                that.activeIndex = sessionStorage.getItem('keyPath')
+              } else {
+                that.loadBdcdylist()
+                this.activeIndex = "-1";
+                // that.unitClick(0)
+                // that.activeIndex = "0"
+              }
            } else {
              this.loadBdcdylist()
-              // this.$emit("getCurrentSelectProps", this.currentSelectProps);
            }
          }
        })
@@ -190,7 +196,7 @@
        this.loadBdcdylist()
        window.currentSelect = {}
        this.activeIndex = "-1";
-        sessionStorage.setItem('keyPath', -1);
+        sessionStorage.removeItem('keyPath')
      },
      /**
       * @description: 删除补录记录
--- a/src/views/djbworkflow/components/qlrCommonTable.vue
View file @6aac2ce
+++ b/src/views/djbworkflow/components/qlrCommonTable.vue
View file @6aac2ce
 <!--
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-09-21 16:02:53
+ * @LastEditTime: 2023-09-26 15:38:25
 -->
 <template>
  <div>
@@ -216,7 +216,6 @@
    },
    methods: {
      /**
-       * @handleupdateDetail: 删除
       * @param {*} value
       * @author: renchao
       */
--- a/src/views/djbworkflow/components/ywrCommonTable.vue
View file @6aac2ce
+++ b/src/views/djbworkflow/components/ywrCommonTable.vue
View file @6aac2ce
@@ -178,12 +178,12 @@
          this.$nextTick(() => {
            if (val.length == 0 || !val) {
              that.tableDataList = _.cloneDeep([
-                {
+                // {
-                  ywrmc: "",
+                //   ywrmc: "",
-                  dlrzjlx: "",
+                //   dlrzjlx: "",
-                  dlrzjh: "",
+                //   dlrzjh: "",
-                  fr: "",
+                //   fr: "",
-                },
+                // },
              ]);
            } else {
              that.tableDataList = _.cloneDeep(val);
@@ -247,10 +247,8 @@
        this.isaddupdate = true;
      },
      /**
-       * @description: 删除
       * @param {*} index
       * @param {*} row
-       * @author: renchao
       */
      deleClick (index, row) {
        this.tableDataList.splice(index, 1);
--- a/src/views/djbworkflow/djbBook/components/blxxtabs/dataprocessing.js
View file @6aac2ce
+++ b/src/views/djbworkflow/djbBook/components/blxxtabs/dataprocessing.js
View file @6aac2ce
@@ -226,7 +226,6 @@ export default {
        this.loading = false
      })
    },
-    // 更新土地用途信息
    /**
     * @description: 更新土地用途信息
     * @param {*} val
@@ -246,7 +245,6 @@ export default {
      this.czrOptions = this.ruleForm.qlrData;
      this.key++;
    },
-    // 更新义务人信息
    /**
     * @description: 更新义务人信息
     * @param {*} val
@@ -299,7 +297,7 @@ export default {
              return false;
            }
          }
+          this.$store.dispatch("user/refreshPage", false);
          save(this.ruleForm).then((res) => {
            if (res.code === 200) {
              this.$message({
--- a/src/views/djbworkflow/mixin/index.js
View file @6aac2ce
+++ b/src/views/djbworkflow/mixin/index.js
View file @6aac2ce
 /*
 * @Description:workFramezu.vue组件的方法  头部按钮弹框方法
 * @Autor: miaofang
- * @LastEditTime: 2023-09-22 13:34:56
+ * @LastEditTime: 2023-09-26 14:25:23
 */
 import { getPrintTemplateByCode } from "@/api/print";
 import { getQllxByBdcdyid } from "@/api/djbDetail.js";
@@ -23,6 +23,8 @@ export default {
      //是否开启材料分屏
      splitScreen: false,
      //设置表单组件是否刷选值
+      bsmSlsq: this.$route.query.bsmSlsq,
+      bestepid: this.$route.query.bestepid,
      fresh: 10,
      //左侧菜单数据集合
      unitData: [],
@@ -327,10 +329,8 @@ export default {
        }
      })
    },
-    // 上传
    /**
     * @description: 上传
-     * @param {*} file
     * @author: renchao
     */
    beforeUpload (file) {
--- a/src/views/djbworkflow/workFrameView.vue
View file @6aac2ce
+++ b/src/views/djbworkflow/workFrameView.vue
View file @6aac2ce
 <!--
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-05-24 15:31:00
+ * @LastEditTime: 2023-09-26 15:30:36
 -->
 <template>
  <div class="container">
@@ -12,8 +12,7 @@
        <li
          @click="operation(item)"
          v-for="(item, index) in leftButtonList"
-          :key="index"
+          :key="index">
-        >
          <svg-icon class="icon" :icon-class="item.icon" />
          <span class="iconName">{{ item.name }}</span>
        </li>
@@ -22,8 +21,7 @@
        <li
          @click="operation(item)"
          v-for="(item, index) in rightButtonList"
-          :key="index"
+          :key="index">
-        >
          <svg-icon class="icon" :icon-class="item.icon" />
          <span class="iconName">{{ item.name }}</span>
        </li>
@@ -48,21 +46,18 @@
          <el-tabs
            v-model="tabName"
            :before-leave="beforeLeave"
-            @tab-click="handleClick"
+            @tab-click="handleClick">
-          >
            <el-tab-pane
              :label="item.name"
              :name="item.value"
              v-for="item in tabList"
-              :key="item.value"
+              :key="item.value">
-            >
            </el-tab-pane>
          </el-tabs>
          <component
            :key="fresh"
            :is="componentTag"
-            v-bind="currentSelectProps"
+            v-bind="currentSelectProps" />
-          />
        </div>
      </div>
    </div>
@@ -71,26 +66,26 @@
  </div>
 </template>
 <style scoped lang="scss">
-@import "~@/styles/mixin.scss";
+  @import "~@/styles/mixin.scss";
-@import "./workFrame.scss";
+  @import "./workFrame.scss";
 </style>
 <script>
-import WorkFlow from "./mixin/index";
+  import WorkFlow from "./mixin/index";
-import { getForm } from "./flowform";
+  import { getForm } from "./flowform";
-import { getBlYbxStepFormInfo } from "@/api/workFlow.js";
+  import { getBlYbxStepFormInfo } from "@/api/workFlow.js";
-import NoticeBar from "@/components/NoticeBar/index";
+  import NoticeBar from "@/components/NoticeBar/index";
-// import ProcessViewer from "./components/processViewer.vue";
+  // import ProcessViewer from "./components/processViewer.vue";
-// 引入左侧菜单
+  // 引入左侧菜单
-import { leftMenubl } from "@/api/djbRepair.js";
+  import { leftMenubl } from "@/api/djbRepair.js";
-import ordinaryMenu from "./components/leftmenu/ordinaryMenu.vue";
+  import ordinaryMenu from "./components/leftmenu/ordinaryMenu.vue";
-import qllxDailog from "./djbBook/components/qllxDailog";
+  import qllxDailog from "./djbBook/components/qllxDailog";
-import selectBdc from "@/views/ywbl/ywsq/selectBdc.vue";
+  import selectBdc from "@/views/ywbl/ywsq/selectBdc.vue";
-import { loadTreeData, getNode } from "./components/leftmenu/djbFrameData.js";
+  import { loadTreeData, getNode } from "./components/leftmenu/djbFrameData.js";
-// 登记簿数据信息
+  // 登记簿数据信息
-import { addRepairRecord } from "@/api/djbRepair.js";
+  import { addRepairRecord } from "@/api/djbRepair.js";
-import { getBdcqljqtsx } from "@/api/djbDetail.js";
+  import { getBdcqljqtsx } from "@/api/djbDetail.js";
-export default {
+  export default {
    components: {
      selectBdc,
      NoticeBar,
@@ -98,7 +93,7 @@ export default {
      qllxDailog,
    },
    mixins: [WorkFlow],
-  data() {
+    data () {
      return {
        bsmSlsq: this.$route.query.bsmSlsq,
        bestepid: this.$route.query.bestepid,
@@ -128,7 +123,7 @@ export default {
        ableOperation: false,
      };
    },
-  mounted() {
+    mounted () {
      // this.getleftMenubl()
    },
@@ -138,7 +133,7 @@ export default {
       * @param {*} qllx
       * @author: renchao
       */
-    stepForm(qllx) {
+      stepForm (qllx) {
        this.oneSelectProps.qllx = qllx;
        if (this.$refs.Menu.supplementarylist.length) {
          this.oneSelectProps.type = this.type;
@@ -152,13 +147,12 @@ export default {
          });
        }
      },
-    // 获取右侧选项卡
      /**
       * @description: 获取右侧选项卡
       * @param {*} val
       * @author: renchao
       */
-    getCurrentSelectProps(val) {
+      getCurrentSelectProps (val) {
        this.bsmRepair = val.bsmRepair;
        if (val.bdcdyid) {
          this.oneSelectProps = val;
@@ -179,7 +173,7 @@ export default {
       * @description: 获取渲染登记簿列表
       * @author: renchao
       */
-    getdjblist() {
+      getdjblist () {
        getBdcqljqtsx({
          bdcdyid: this.currentSelectProps.bdcdyid,
          bdcdyh: this.currentSelectProps.bdcdyh,
@@ -213,7 +207,7 @@ export default {
       * @param {*} handleClick
       * @author: renchao
       */
-    handleClick(a) {
+      handleClick (a) {
        let p = Object.keys(this.tabList[0]).filter(
          (item) => item == "ableOperation"
        );
@@ -227,7 +221,7 @@ export default {
       * @param {*} activeName
       * @author: renchao
       */
-    beforeLeave(activeName) {
+      beforeLeave (activeName) {
        if (activeName && activeName != 0) this.getFromRouter(activeName);
      },
      //切换选项卡内容组件
@@ -236,14 +230,14 @@ export default {
       * @param {*} tabname
       * @author: renchao
       */
-    getFromRouter(tabname) {
+      getFromRouter (tabname) {
        this.componentTag = getForm(tabname);
      },
      /**
       * @description: closefp
       * @author: renchao
       */
-    closefp() {
+      closefp () {
        this.splitScreen = this.splitScreen ? false : true;
        this.$store.dispatch("app/set1tScreen", this.splitScreen);
        this.getFromRouter(this.tabList[0].value);
@@ -256,7 +250,7 @@ export default {
       * @param {*} del
       * @author: renchao
       */
-    addRepairRecord(row, del) {
+      addRepairRecord (row, del) {
        let from = {
          bsmQlxx: "",
          bsmSlsq: this.bsmSlsq,
@@ -296,6 +290,6 @@ export default {
          });
      },
    },
-};
+  };
 </script>
 <style scoped lang="scss"></style>
--- a/src/views/workflow/components/dialog/addQlr.vue
View file @6aac2ce
+++ b/src/views/workflow/components/dialog/addQlr.vue
View file @6aac2ce
 <!--
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-09-26 14:02:42
+ * @LastEditTime: 2023-09-26 16:47:20
 -->
 <template>
  <dialogBox
@@ -512,11 +512,10 @@
            let { total, records } = res.result;
            this.tableDataQy.total = total;
            this.tableDataQy.data = records;
-            this.tableDataQy.data.forEach(item => {
+            this.tableDataQy.data.forEach((item, index) => {
              item.zjzlMc = this.dicStatus(item.zjzl, 'A30')
              item.sqrmc = item.qymc
              item.txdz = item.dwdz
-              item.id = getUuid(16)
            })
          }
        })
@@ -544,7 +543,7 @@
          distinguishCancelAndClose: true,//区分取消与关闭
        }).then(() => {
          replace(val.bsmCompany, this.$route.query.bsmSlsq, bsmSldy).then(res => {
-            that.$emit("updateDetail", _.cloneDeep({ ...val, sqrlx: '2' }));
+            that.$emit("updateDetail", _.cloneDeep({ ...val, sqrlx: '2', id: getUuid(16) }));
            that.$emit("input", false);
            if (res.code == 200) {
              that.$message({
@@ -574,11 +573,10 @@
            let { total, records } = res.result;
            this.tableDataYh.total = total;
            this.tableDataYh.data = records;
-            this.tableDataYh.data.forEach(item => {
+            this.tableDataYh.data.forEach((item, index) => {
              item.zjzlMc = this.dicStatus(item.zjzl, 'A30')
              item.sqrmc = item.qymc
              item.txdz = item.dwdz
-              item.id = getUuid(16)
            })
          }
        })
--- a/src/views/workflow/components/qlrCommonTable.vue
View file @6aac2ce
+++ b/src/views/workflow/components/qlrCommonTable.vue
View file @6aac2ce
 <!--
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-09-26 14:10:02
+ * @LastEditTime: 2023-09-26 16:40:49
 -->
 <template>
  <div>
@@ -167,23 +167,35 @@
      handleupdateDetail (value) {
        let that = this
        let arr = this.tableData.map(item => item.zjh)
+        // if (this.isaddupdate) {
+        //   if (!arr.includes(value.zjh)) {
+        //     this.tableDataList[this.tableDataList.length] = _.cloneDeep(value);
+        //     this.$emit('upDateQlrxxList', this.tableDataList)
+        //   } else {
+        //     setTimeout(() => {
+        //       that.$message.error('证件号不能重复')
+        //     }, 1500)
+        //   }
+        // } else {
+        //   if (!arr.includes(value.zjh) || this.tableData[this.dataIndex].zjh == value.zjh) {
+        //     this.tableDataList[this.dataIndex] = _.cloneDeep(value);
+        //     this.$emit('upDateQlrxxList', this.tableDataList)
+        //   } else {
+        //     setTimeout(() => {
+        //       that.$message.error('证件号不能重复')
+        //     }, 1500)
+        //   }
+        // }
        if (this.isaddupdate) {
-          if (!arr.includes(value.zjh)) {
+          if (!_.isEqual(value, this.tableData)) {
            this.tableDataList[this.tableDataList.length] = _.cloneDeep(value);
-            this.$emit('upDateQlrxxList', this.tableDataList)
+            this.$emit("upDateQlrxxList", this.tableDataList);
-          } else {
-            setTimeout(() => {
-              that.$message.error('证件号不能重复')
-            }, 1500)
          }
        } else {
-          if (!arr.includes(value.zjh) || this.tableData[this.dataIndex].zjh == value.zjh) {
+          if (!_.isEqual(value, this.tableData)) {
            this.tableDataList[this.dataIndex] = _.cloneDeep(value);
-            this.$emit('upDateQlrxxList', this.tableDataList)
+            this.$emit("upDateQlrxxList", this.tableDataList);
-          } else {
-            setTimeout(() => {
-              that.$message.error('证件号不能重复')
-            }, 1500)
          }
        }
        this.key++
--- a/src/views/workflow/components/ywrCommonTable.vue
View file @6aac2ce
+++ b/src/views/workflow/components/ywrCommonTable.vue
View file @6aac2ce
 <!--
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-09-01 13:33:27
+ * @LastEditTime: 2023-09-26 15:45:06
 -->
 <template>
  <div>
@@ -124,12 +124,6 @@
          let that = this
          this.$nextTick(() => {
            if (val.length == 0 || !val) {
-              // that.tableDataList = _.cloneDeep([{
-              //   sqrmc: '',
-              //   dlrzjlx: '',
-              //   dlrzjh: '',
-              //   fr: ''
-              // }])
            } else {
              that.tableDataList = _.cloneDeep(val)
            }
@@ -209,6 +203,7 @@
       * @author: renchao
       */
      deleClick (index, row) {
+        debugger
        this.tableDataList.splice(index, 1)
        this.$emit('upDateQlrxxList', this.tableDataList)
      },
--- a/src/views/ywbl/slsqxx/jsydsyq/slxx.vue
View file @6aac2ce
+++ b/src/views/ywbl/slsqxx/jsydsyq/slxx.vue
View file @6aac2ce
 <!--
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-09-20 14:27:17
+ * @LastEditTime: 2023-09-26 15:16:04
 -->
 <template>
  <!-- 受理信息 -->
@@ -446,6 +446,7 @@
         * @description: saveData
         * @author: renchao
         */
+        this.$store.dispatch("user/refreshPage", false);
        saveData(this.ruleForm).then((res) => {
          if (res.code === 200) {
            this.$message({