Merge branch 'dev'

renchao@pashanhoo.com
Showing 9 changed files with 123 additions and 50 deletions
src/views/workflow/components/leftmenu/ordinaryMenu.vue
src/views/ywbl/slsqxx/fdcq2/slxx300.vue
src/views/ywbl/slsqxx/fdcq2/slxxOverview.vue
src/views/ywbl/slsqxx/fwsyq/slxx.vue
src/views/ywbl/slsqxx/jsydsyq/slxx.vue
src/views/ywbl/slsqxx/jsydsyq/slxx300.vue
src/views/ywbl/slsqxx/nydsyq/slxx.vue
src/views/ywbl/slsqxx/zjgcdy/batchSlxx.vue
src/views/ywbl/slsqxx/zjgcdy/slxx.vue
--- a/src/views/workflow/components/leftmenu/ordinaryMenu.vue
View file @efadb4c
+++ b/src/views/workflow/components/leftmenu/ordinaryMenu.vue
View file @efadb4c
 <!--
 * @Description: workFrame左侧菜单列表-普通
 * @Autor: renchao
- * @LastEditTime: 2023-09-13 13:51:33
+ * @LastEditTime: 2023-09-13 14:21:14
 -->
 <template>
  <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
@@ -104,7 +104,7 @@
              that.currentSelectProps = res.result[0];
              that.$emit('getCurrentSelectProps', this.currentSelectProps);
              that.judgeBatchShow();
-              if (sessionStorage.getItem('keyPath')) {
+              if (sessionStorage.getItem('keyPath') && sessionStorage.getItem('keyPath') >= 0) {
                that.unitClick(sessionStorage.getItem('keyPath') - 0)
              } else {
                that.unitClick(0)
@@ -123,7 +123,7 @@
              this.currentSelectProps = res.result[0];
              this.$emit('getCurrentSelectProps', this.currentSelectProps);
              this.judgeBatchShow();
-              if (sessionStorage.getItem('keyPath')) {
+              if (sessionStorage.getItem('keyPath') && sessionStorage.getItem('keyPath') >= 0) {
                that.unitClick(sessionStorage.getItem('keyPath') - 0)
              } else {
                that.unitClick(0)
@@ -208,6 +208,7 @@
        this.currentSelectProps.batchOperation = true;
        this.activeIndex = "-1";
        this.$parent.stepForm(0);
+        sessionStorage.setItem('keyPath', this.activeIndex);
      },
      /**
       * @description: 批量操作
--- a/src/views/ywbl/slsqxx/fdcq2/slxx300.vue
View file @efadb4c
+++ b/src/views/ywbl/slsqxx/fdcq2/slxx300.vue
View file @efadb4c
 <!--
 * @Description: 受理信息
 * @Autor: renchao
- * @LastEditTime: 2023-09-12 09:56:07
+ * @LastEditTime: 2023-09-13 14:16:46
 -->
 <template>
  <div class="slxx">
@@ -410,9 +410,19 @@
       * @author: renchao
       */
      upDateQlrxxList (val) {
+        if (!_.isEqual(val, this.ruleForm.qlrList)) {
          this.ruleForm.qlrList = _.cloneDeep(val);
          this.czrOptions = this.ruleForm.qlrList;
-        this.key++;
+        }
+        this.num = 0
+        this.ruleForm.qlrList.forEach(item => {
+          if (item.zjh == this.czr) {
+            this.num++
+          }
+        })
+        if (this.num == 0) {
+          this.czr = ''
+        }
      },
      // 更新权利人信息
      /**
--- a/src/views/ywbl/slsqxx/fdcq2/slxxOverview.vue
View file @efadb4c
+++ b/src/views/ywbl/slsqxx/fdcq2/slxxOverview.vue
View file @efadb4c
 <!--
 * @Description: 受理信息
 * @Autor: renchao
- * @LastEditTime: 2023-08-24 15:32:19
+ * @LastEditTime: 2023-09-13 14:31:33
 -->
 <template>
  <div class="slxx">
@@ -336,11 +336,20 @@
       * @author: renchao
       */
      upDateQlrxxList (val) {
+        if (!_.isEqual(val, this.ruleForm.qlrList)) {
          this.ruleForm.qlrList = _.cloneDeep(val);
          this.czrOptions = this.ruleForm.qlrList;
+        }
+        this.num = 0
+        this.ruleForm.qlrList.forEach(item => {
+          if (item.zjh == this.czr) {
+            this.num++
+          }
+        })
+        if (this.num == 0) {
+          this.czr = ''
+        }
      },
      // 是否持证人变化
      /**
       * @description: 是否持证人变化
--- a/src/views/ywbl/slsqxx/fwsyq/slxx.vue
View file @efadb4c
+++ b/src/views/ywbl/slsqxx/fwsyq/slxx.vue
View file @efadb4c
 <!--
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-08-24 15:32:28
+ * @LastEditTime: 2023-09-13 14:31:42
 -->
 <template>
  <!-- 受理信息 -->
@@ -10,6 +10,7 @@
      :model="ruleForm"
      :rules="rules"
      ref="ruleForm"
+      v-Loading="loading"
      :label-position="flag ? 'top' : ''"
      :inline="flag"
      label-width="120px">
@@ -243,11 +244,13 @@
  export default {
    mixins: [ywmix],
    mounted () {
+      this.loading = true
      this.viewEdit = this.$parent.currentSelectTab.ableOperation;
      this.propsParam = this.$attrs;
      var formdata = new FormData();
      formdata.append("bsmSldy", this.propsParam.bsmSldy);
      Init(formdata).then((res) => {
+        this.loading = false
        if (res.code === 200 && res.result) {
          this.ruleForm = {
            ...res.result,
@@ -262,7 +265,9 @@
          });
          this.czrOptions = this.ruleForm.qlrList;
        }
-      });
+      }).catch(() => {
+        this.loading = false
+      })
    },
    components: { qlrCommonTable, tdytTable },
    computed: {
@@ -270,6 +275,7 @@
    },
    data () {
      return {
+        loading: false,
        //表单是否可操作
        viewEdit: false,
        disabled: true,
@@ -314,7 +320,6 @@
      };
    },
    methods: {
-      // 更新土地用途信息
      /**
       * @description: 更新土地用途信息
       * @param {*} val
--- a/src/views/ywbl/slsqxx/jsydsyq/slxx.vue
View file @efadb4c
+++ b/src/views/ywbl/slsqxx/jsydsyq/slxx.vue
View file @efadb4c
 <!--
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-09-11 16:28:26
+ * @LastEditTime: 2023-09-13 14:06:17
 -->
 <template>
  <!-- 受理信息 -->
@@ -10,7 +10,7 @@
      :model="ruleForm"
      :rules="rules"
      :class="{ readonly: editDisabled }"
-      class="loadingtext"
+      v-Loading="loading"
      ref="ruleForm"
      :label-position="flag ? 'top' : ''"
      :inline="flag"
@@ -252,14 +252,14 @@
      this.propsParam = this.$attrs;
      var formdata = new FormData();
      let that = this;
-      this.$startLoading();
+      this.loading = true
      formdata.append("bsmSldy", this.propsParam.bsmSldy);
      formdata.append("djlx", this.propsParam.djlx);
      formdata.append("isEdit", this.viewEdit);
      Init(formdata).then((res) => {
+        this.loading = false
        this.$nextTick(() => {
          that.ruleForm = res.result;
-          that.$endLoading();
          that.isShow = true;
          this.czrOptions = this.ruleForm.qlrList;
          this.ruleForm.qlrList.forEach((item) => {
@@ -267,9 +267,11 @@
              this.czr = item.zjh
              console.log("this.ruleForm.qlrList1", this.ruleForm.qlrList, this.czr);
            }
-          });
+          })
-        });
+        })
-      });
+      }).catch(() => {
+        this.loading = false
+      })
    },
    components: { qlrCommonTable, tdytTable, ywrCommonTable },
    computed: {
@@ -285,6 +287,7 @@
    },
    data () {
      return {
+        loading: false,
        mjdw: "1",
        //表单是否可操作
        viewEdit: true,
--- a/src/views/ywbl/slsqxx/jsydsyq/slxx300.vue
View file @efadb4c
+++ b/src/views/ywbl/slsqxx/jsydsyq/slxx300.vue
View file @efadb4c
@@ -2,7 +2,7 @@
 <!--
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-08-22 16:25:54
+ * @LastEditTime: 2023-09-13 14:17:49
 -->
 <template>
  <!-- 受理信息 -->
@@ -286,9 +286,19 @@
       * @author: renchao
       */
      upDateQlrxxList (val) {
+        if (!_.isEqual(val, this.ruleForm.qlrList)) {
          this.ruleForm.qlrList = _.cloneDeep(val);
          this.czrOptions = this.ruleForm.qlrList;
-        this.key++;
+        }
+        this.num = 0
+        this.ruleForm.qlrList.forEach(item => {
+          if (item.zjh == this.czr) {
+            this.num++
+          }
+        })
+        if (this.num == 0) {
+          this.czr = ''
+        }
      },
      // 是否持证人变化
      /**
--- a/src/views/ywbl/slsqxx/nydsyq/slxx.vue
View file @efadb4c
+++ b/src/views/ywbl/slsqxx/nydsyq/slxx.vue
View file @efadb4c
@@ -4,7 +4,7 @@
    <el-form
      :model="ruleForm"
      :rules="rules"
-      class="loadingtext"
+      v-Loading="loading"
      ref="ruleForm"
      :label-position="flag ? 'top' : ''"
      :inline="flag"
@@ -324,21 +324,23 @@
    mounted () {
      this.viewEdit = this.$parent.currentSelectTab.ableOperation;
      this.propsParam = this.$attrs;
-      this.$startLoading();
+      this.loading = true
      var formdata = new FormData();
      formdata.append("bsmSldy", this.propsParam.bsmSldy);
      formdata.append("djlx", this.propsParam.djlx);
      formdata.append("isEdit", this.viewEdit);
      Init(formdata).then((res) => {
+        this.loading = false
        this.ruleForm = res.result;
        this.czrOptions = this.ruleForm.qlrList;
        this.ruleForm.qlrList.forEach((item) => {
          if (item.sfczr == 1) {
            this.czr = item.zjh
          }
-        });
+        })
-        this.$endLoading();
+      }).catch(() => {
-      });
+        this.loading = false
+      })
    },
    components: { qlrCommonTable, JtcyTable },
    computed: {
@@ -346,6 +348,7 @@
    },
    data () {
      return {
+        loading: false,
        disabled: true,
        //持证人选项
        czrOptions: [],
@@ -446,10 +449,20 @@
       * @author: renchao
       */
      upDateQlrxxList (val) {
+        if (!_.isEqual(val, this.ruleForm.qlrList)) {
          this.ruleForm.qlrList = _.cloneDeep(val);
          this.czrOptions = this.ruleForm.qlrList;
+        }
+        this.num = 0
+        this.ruleForm.qlrList.forEach(item => {
+          if (item.zjh == this.czr) {
+            this.num++
+          }
+        })
+        if (this.num == 0) {
+          this.czr = ''
+        }
      },
-      // 是否持证人变化
      /**
       * @description: 是否持证人变化
       * @param {*} val
--- a/src/views/ywbl/slsqxx/zjgcdy/batchSlxx.vue
View file @efadb4c
+++ b/src/views/ywbl/slsqxx/zjgcdy/batchSlxx.vue
View file @efadb4c
@@ -2,7 +2,7 @@
  <!-- 受理信息 -->
  <div class="slxx">
    <el-form
-      class="loadingtext"
+      v-Loading="loading"
      :label-position="flag ? 'top' : ''"
      :inline="flag"
      label-width="140px">
@@ -211,8 +211,8 @@
                v-model="ruleForm.sldyList[0].sqfbcz"
                :disabled="!viewEdit"
                @input="updaterow()">
-                <el-radio label="1">是</el-radio>
+                <el-radio :label="1">是</el-radio>
-                <el-radio label="0">否</el-radio>
+                <el-radio :label="0">否</el-radio>
              </el-radio-group>
            </el-form-item>
          </el-col>
@@ -229,9 +229,9 @@
                :disabled="!viewEdit">
                <el-option
                  v-for="item in czrOptions"
-                  :key="item.value"
+                  :key="item.zjh"
-                  :label="item.label"
+                  :label="item.sqrmc"
-                  :value="item.value">
+                  :value="item.zjh">
                </el-option>
              </el-select>
            </el-form-item>
@@ -303,12 +303,12 @@
      this.propsParam = this.$attrs;
      var formdata = new FormData();
-      this.$startLoading();
+      this.loading = true
      formdata.append("bsmSlsq", this.$route.query.bsmSlsq);
      formdata.append("djlx", this.propsParam.djlx);
      formdata.append("isEdit", this.viewEdit);
      bacthInit(formdata).then((res) => {
-        this.$endLoading();
+        this.loading = false
        if (res.code === 200 && res.result) {
          this.ruleForm = res.result;
          this.czrOptions = this.ruleForm.qlrList;
@@ -316,11 +316,13 @@
            if (item.sfczr == 1) {
              this.czr = item.zjh
            }
-          });
+          })
        } else {
-          this.$message.error(res.message);
+          this.$message.error(res.message)
        }
-      });
+      }).catch(() => {
+        this.loading = false
+      })
    },
    components: { qlrCommonTable, qjhTable },
    computed: {
@@ -328,6 +330,7 @@
    },
    data () {
      return {
+        loading: false,
        //表单是否可操作
        viewEdit: true,
        disabled: true,
@@ -355,7 +358,7 @@
          });
          return false;
        }
-        if (ruleForm.sldyList[0].gyfs == "0") {
+        if (this.ruleForm.sldyList[0].gyfs == "0") {
          if (this.ruleForm.qlrList.length > 1) {
            this.$message({
              showClose: true,
@@ -379,8 +382,8 @@
          if (this.ruleForm.sldyList[0].sqfbcz == "1") {
            //是
            this.ruleForm.qlrList.forEach((item, index) => {
-              item.sfczr = "1";
+              item.sfczr = "1"
-            });
+            })
          } else {
            if (!that.czr) {
              that.$message({
@@ -416,7 +419,6 @@
          }
        });
      },
-      // 是否持证人变化
      /**
       * @description: 是否持证人变化
       * @param {*} val
@@ -435,6 +437,15 @@
          this.ruleForm.qlrList = _.cloneDeep(val);
          this.czrOptions = this.ruleForm.qlrList;
        }
+        this.num = 0
+        this.ruleForm.qlrList.forEach(item => {
+          if (item.zjh == this.czr) {
+            this.num++
+          }
+        })
+        if (this.num == 0) {
+          this.czr = ''
+        }
      },
      /**
       * @description: 更新义务人信息
@@ -445,9 +456,9 @@
        if (!_.isEqual(val, this.ruleForm.ywrList)) {
          this.ruleForm.ywrList = _.cloneDeep(val);
        }
-      },
+      }
-    },
+    }
-  };
+  }
 </script>
 <style scoped lang="scss">
  @import "~@/styles/public.scss";
--- a/src/views/ywbl/slsqxx/zjgcdy/slxx.vue
View file @efadb4c
+++ b/src/views/ywbl/slsqxx/zjgcdy/slxx.vue
View file @efadb4c
@@ -4,7 +4,7 @@
    <el-form
      :model="ruleForm"
      :rules="rules"
-      class="loadingtext"
+      v-Loading="loading"
      ref="ruleForm"
      :label-position="flag ? 'top' : ''"
      :inline="flag"
@@ -331,11 +331,12 @@
      this.viewEdit = this.$parent.currentSelectTab.ableOperation;
      this.propsParam = this.$attrs;
      var formdata = new FormData();
-      this.$startLoading();
+      this.loading = true
      formdata.append("bsmSldy", this.propsParam.bsmSldy);
      formdata.append("djlx", this.propsParam.djlx);
      formdata.append("isEdit", this.viewEdit);
      Init(formdata).then((res) => {
+        this.loading = false
        if (res.code === 200 && res.result) {
          this.ruleForm = res.result;
          this.czrOptions = this.ruleForm.qlrList;
@@ -343,10 +344,11 @@
            if (item.sfczr == 1) {
              this.czr = item.zjh
            }
-          });
+          })
-          this.$endLoading();
        }
-      });
+      }).catch(() => {
+        this.loading = false
+      })
    },
    components: { qlrCommonTable },
    computed: {
@@ -354,6 +356,7 @@
    },
    data () {
      return {
+        loading: false,
        //表单是否可操作
        viewEdit: true,
        disabled: true,
@@ -453,7 +456,6 @@
          }
        });
      },
      /**
       * @description: 更新权利人信息
       * @param {*} val
@@ -464,6 +466,15 @@
          this.ruleForm.qlrList = _.cloneDeep(val);
          this.czrOptions = this.ruleForm.qlrList;
        }
+        this.num = 0
+        this.ruleForm.qlrList.forEach(item => {
+          if (item.zjh == this.czr) {
+            this.num++
+          }
+        })
+        if (this.num == 0) {
+          this.czr = ''
+        }
      },
      // 是否持证人变化
      /**