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

tianhaohao@pashanhoo.com
Showing 16 changed files with 227 additions and 179 deletions
src/api/clxx.js
src/views/components/imagePreview.vue
src/views/lpb/lpbContent/index.vue
src/views/workflow/components/clxx/clxxUnify.vue
src/views/workflow/components/dialog/clxxDetailDialog.vue
src/views/workflow/components/leftmenu/ordinaryMenu.vue
src/views/workflow/workFrame.vue
src/views/xxba/components/clxx/dialog/clxxDetailDialog.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/api/clxx.js
View file @e20c3cc
+++ b/src/api/clxx.js
View file @e20c3cc
 /*
 * @Description: 材料信息
 * @Autor: renchao
- * @LastEditTime: 2023-09-08 13:41:46
+ * @LastEditTime: 2023-09-13 11:09:48
 */
 import request from '@/utils/request'
 let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
@@ -49,9 +49,9 @@ export function saveClml (data) {
 * @param {*} data
 * @author: renchao
 */
-export function updateClml (data) {
+export function updateClml (data, bsmSldy) {
    return request({
-        url: SERVER.SERVERAPI + '/rest/ywbl/clxx/updateClml',
+        url: SERVER.SERVERAPI + '/rest/ywbl/clxx/updateClml/' + bsmSldy,
        method: 'post',
        data
    })
--- a/src/views/components/imagePreview.vue
View file @e20c3cc
+++ b/src/views/components/imagePreview.vue
View file @e20c3cc
@@ -278,7 +278,7 @@
          }
          uploadBatch(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'
--- a/src/views/lpb/lpbContent/index.vue
View file @e20c3cc
+++ b/src/views/lpb/lpbContent/index.vue
View file @e20c3cc
@@ -225,12 +225,14 @@ export default {
     * @author: renchao
     */
    submitForm () {
-      debugger
      if (this.bsmList.length == 0) {
          this.$message.error("请至少选择一条数据");
          return;
        }
      this.loading = true
+      this.bsmList.forEach(item=>{
+        item['bdcdyid'] = item.dyhbsm
+      })
      startBusinessFlow({
        bsmSqyw: this.sqywInfo.bsmSqyw,
        bdcdysz: this.bsmList,
@@ -250,9 +252,9 @@ export default {
          this.$popupCacel()
        } else {
          if (res.result && res.result.length > 0) {
-              ywPopupDialog("申请错误明细", "components/ywdialog", { result: res.result }, '36%', true)
+            this.$popup("申请错误明细", "components/ywdialog", { width:'36%', formData:{result: res.result} })
          } else {
-              ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message }, '36%', true)
+            this.$popup("申请错误明细", "components/ywdialog", { width:'36%', formData:{message: res.message} })
          }
        }
      }).catch(() => {
--- a/src/views/workflow/components/clxx/clxxUnify.vue
View file @e20c3cc
+++ b/src/views/workflow/components/clxx/clxxUnify.vue
View file @e20c3cc
 <!--
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-09-08 14:18:42
+ * @LastEditTime: 2023-09-13 11:26:39
 -->
 <template>
  <div class="clxx">
@@ -173,7 +173,6 @@
            formdata.append("bsmSldy", this.$parent.bsmRepair);
            formdata.append("clfl", 3);
          } else {
-            //formdata.append("bsmSldy", this.unitData[0]?.bsmSldy);
            formdata.append("bsmSldy", this.$parent.currentSelectProps.bsmSldy);
            formdata.append("clfl", 2);
          }
@@ -235,7 +234,7 @@
          this.previewImg.imgList = [];
          this.tableData.forEach((item, index) => {
            if (this.treeCheckId == item.bsmSj) {
-              item.children = [];
+              item.ys = 0;
              that.treeCheckIndex = index;
            }
          });
@@ -309,24 +308,6 @@
        this.showImg = item;
        this.titleYs = index + 1;
      },
-      /**
-       * @description: 字典
-       * @param {*} val
-       * @param {*} code
-       * @author: renchao
-       */
-      dicStatus (val, code) {
-        let data = this.$store.getters.dictData[code],
-          name = "暂无";
-        if (data) {
-          data.map((item) => {
-            if (item.dcode == val) {
-              name = item.dname;
-            }
-          });
-          return name;
-        }
-      },
      //查看明细
      viewDetail () {
        this.$store.dispatch("user/reWorkFresh", false);
@@ -335,6 +316,7 @@
          "workflow/components/dialog/clxxDetailDialog",
          {
            data: this.tableData,
+            bsmSldy: this.$parent.currentSelectProps.bsmSldy,
            unitData: this.$parent.unitData,
            ableOperation: this.$parent.ableOperation,
            bsmRepair: this.$parent.bsmRepair
--- a/src/views/workflow/components/dialog/clxxDetailDialog.vue
View file @e20c3cc
+++ b/src/views/workflow/components/dialog/clxxDetailDialog.vue
View file @e20c3cc
 <!--
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-09-13 10:33:50
+ * @LastEditTime: 2023-09-13 13:48:47
 -->
 <template>
  <div class="clmlmx-box">
-    <div style="text-align:right">
-      <el-button type="primary" icon="el-icon-top">上移</el-button>
-      <el-button type="primary" icon="el-icon-bottom">下移</el-button>
-    </div>
    <lb-table :column="column" :key="key" row-key="bsmSj" ref="listTable" :heightNumSetting="true" :calcHeight="600"
      :pagination="false" :data="tableData">
    </lb-table>
@@ -38,10 +34,6 @@
        sortable: null,
        column: [
          {
-            label: "选择",
-            type: 'selection'
-          },
-          {
            prop: "isrequired",
            label: "是否必选",
            width: "80",
@@ -66,7 +58,7 @@
            label: "材料名称",
            render: (h, scope) => {
              return (
-                (this.formData.ableOperation && scope.row.isrequired != '1') ?
+                (this.formData.ableOperation && scope.row.sfxjcl == '1') ?
                  <el-input value={scope.row.sjmc} onInput={(val) => { scope.row.sjmc = val }}></el-input> : <span>{scope.row.sjmc}</span>
              )
            }
@@ -132,23 +124,35 @@
            },
          },
          {
+            label: "是否新建材料",
+            width: "80",
+            render: (h, scope) => {
+              if (scope.row.sfxjcl && scope.row.sfxjcl == '1') {
+                return (
+                  <span>是</span>
+                );
+              } else {
+                return (
+                  <span>否</span>
+                );
+              }
+            },
+          },
+          {
            label: "操作",
            width: "100",
            render: (h, scope) => {
              return (
-                <div>
                <el-button
                  type="text"
                  icon="el-icon-delete"
-                    disabled={scope.row.ys == 0 || !this.formData.ableOperation}
+                  disabled={!(scope.row.ys == 0 && scope.row.sfxjcl == '1') || !this.formData.ableOperation}
                  onClick={() => {
                    this.handleDelete(scope.$index, scope.row);
                  }}
                >
                  删除
                </el-button>
-                </div >
              )
            }
          }
@@ -177,7 +181,8 @@
    methods: {
      handleSubmit () {
        this.loading = true
-        updateClml(this.tableData).then(res => {
+        store.dispatch('user/reWorkFresh', false)
+        updateClml(this.tableData, this.formData.bsmSldy).then(res => {
          this.loading = false
          if (res.code == 200) {
            this.$message({
@@ -227,16 +232,13 @@
       * @param {*} row
       */
      handleDelete (index, row) {
-        if (row.children.length > 0) {
-          this.$message.error('页数存在不可删除');
-          return
-        }
        let that = this
        this.$confirm('此操作将永久删除该 是否继续?', '提示', {
          confirmButtonText: '确定',
          cancelButtonText: '取消',
          type: 'warning'
        }).then(() => {
+          this.tableData.splice(index, 1);
        }).catch(() => {
          this.$message({
            type: 'info',
--- a/src/views/workflow/components/leftmenu/ordinaryMenu.vue
View file @e20c3cc
+++ b/src/views/workflow/components/leftmenu/ordinaryMenu.vue
View file @e20c3cc
 <!--
 * @Description: workFrame左侧菜单列表-普通
 * @Autor: renchao
- * @LastEditTime: 2023-09-12 13:29:54
+ * @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/workflow/workFrame.vue
View file @e20c3cc
+++ b/src/views/workflow/workFrame.vue
View file @e20c3cc
 <!--
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-09-12 16:39:53
+ * @LastEditTime: 2023-09-13 13:57:48
 -->
 <template>
  <div class="container">
@@ -258,6 +258,9 @@
            } else {
              this.tabName = res.result[0].value;
            }
+            if (sessionStorage.getItem('activeName') == this.tabName) {
+              this.fresh++;
+            }
            this.ableOperation = this.tabList[0].ableOperation;
            //批量操作无分屏按钮
            if (index != null) {
@@ -298,7 +301,6 @@
          true
        );
      },
-      //选项卡切换事件
      /**
       * @description: 右侧表单选项卡事件
       * @param {*} handleClick
@@ -311,8 +313,8 @@
        if (p) {
          this.ableOperation = this.tabList[a.index].ableOperation;
        }
-      },
+      }
-    },
+    }
  };
 </script>
 <style scoped lang="scss">
--- a/src/views/xxba/components/clxx/dialog/clxxDetailDialog.vue
View file @e20c3cc
+++ b/src/views/xxba/components/clxx/dialog/clxxDetailDialog.vue
View file @e20c3cc
 <!--
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-09-13 09:18:13
+ * @LastEditTime: 2023-09-13 13:46:03
 -->
 <template>
  <div class="clmlmx-box">
-    <lb-table :column="column" :key="key" :heightNumSetting="true" :calcHeight="500" :pagination="false" :data="tableData">
+    <lb-table :column="column" :key="key" row-key="bsmMaterial" ref="listTable" :heightNumSetting="true" :calcHeight="500" :pagination="false"
+      :data="tableData">
    </lb-table>
    <div class="text-center">
      <el-button @click="handleCancel">取消</el-button>
@@ -30,24 +31,28 @@
    data () {
      return {
        loading: false,
+        sortable: null,
        column: [
          {
-            width: '50',
+            prop: "isrequired",
-            renderHeader: (h, scope) => {
+            label: "是否必选",
-              return <div> {
+            width: "80",
-                <i class="el-icon-plus pointer" onClick={() => { this.handleAdd() }}></i>
-              }
-              </div>
-            },
            render: (h, scope) => {
+              if (scope.row.isrequired === "1") {
                return (
                  <div>
-                  {
+                    <span>必选</span>
-                    <i class="el-icon-minus pointer" onClick={() => { this.handleDelete(scope.$index, scope.row) }}></i>
+                  </div>
+                );
              }
+              else {
+                return (
+                  <div>
+                    <span>可选</span>
                  </div>
                )
              }
+            }
          },
          {
            label: "材料名称",
@@ -85,6 +90,15 @@
            }
          },
          {
+            label: "扫描时间",
+            width: "140",
+            render: (h, scope) => {
+              return (
+                <span>{scope.row.sjsj}</span>
+              )
+            }
+          },
+          {
            label: "页数",
            width: "80",
            render: (h, scope) => {
@@ -104,30 +118,35 @@
            },
          },
          {
+            label: "是否新建材料",
+            width: "80",
+            render: (h, scope) => {
+              if (scope.row.sfxjcl && scope.row.sfxjcl == '1') {
+                return (
+                  <span>是</span>
+                );
+              } else {
+                return (
+                  <span>否</span>
+                );
+              }
+            },
+          },
+          {
            label: "操作",
            width: "100",
            render: (h, scope) => {
              return (
-                <div>
                <el-button
                  type="text"
-                    disabled={scope.$index == 0}
+                  icon="el-icon-delete"
+                  disabled={!(scope.row.count == 0 && scope.row.sfxjcl == '1') || !this.formData.ableOperation}
                  onClick={() => {
-                      this.moveUpward(scope.$index, scope.row);
+                    this.handleDelete(scope.$index, scope.row);
                  }}
                >
-                    上移
+                  删除
                </el-button>
-                  <el-button
-                    type="text"
-                    disabled={scope.$index + 1 == this.tableData.length}
-                    onClick={() => {
-                      this.moveDown(scope.$index, scope.row);
-                    }}
-                  >
-                    下移
-                  </el-button>
-                </div >
              )
            }
          }
@@ -136,6 +155,14 @@
        tableData: []
      }
    },
+    mounted () {
+      this.initSort()
+    },
+    beforeDestroy () {
+      if (this.sortable) {
+        this.sortable.destroy();
+      }
+    },
    watch: {
      'formData.data': {
        handler: function (val, oldVal) {
@@ -160,6 +187,7 @@
      },
      handleSubmit () {
        this.loading = true
+        store.dispatch('user/reWorkFresh', false)
        updateClml(this.tableData).then(res => {
          this.loading = false
          if (res.code == 200) {
@@ -198,60 +226,6 @@
        })
      },
      /**
-       * @description: 上移
-       * @param {*} index
-       * @param {*} row
-       * @author: renchao
-       */
-      moveUpward (index, row) {
-        let obj = {
-          xh: row.xh,
-          bsmSlsq: row.bsmSlsq,
-          moveDirection: "UP",
-        };
-        // 接口待调
-        moveClml(obj).then(async (res) => {
-          if (res.code == 200) {
-            let res = await this.clmlInitList()
-            if (res == 200) {
-              this.$message({
-                message: '上移成功',
-                type: 'success'
-              })
-            }
-          } else {
-            this.$message.error(res.message);
-          }
-        })
-      },
-      /**
-       * @description: 下移
-       * @param {*} index
-       * @param {*} row
-       * @author: renchao
-       */
-      moveDown (index, row) {
-        let obj = {
-          xh: row.xh,
-          bsmSlsq: row.bsmSlsq,
-          moveDirection: "DOWN",
-        }
-        // 接口待调
-        moveClml(obj).then(async (res) => {
-          if (res.code == 200) {
-            let res = await this.clmlInitList()
-            if (res == 200) {
-              this.$message({
-                message: '下移成功',
-                type: 'success'
-              })
-            }
-          } else {
-            this.$message.error(res.message);
-          }
-        })
-      },
-      /**
       * @description: 材料目录删除
       * @param {*} index
       * @param {*} row
@@ -281,6 +255,19 @@
            message: '已取消删除'
          })
        })
+      },
+      initSort () {
+        const el = this.$refs.listTable.$el.querySelectorAll('.el-table__body-wrapper > table > tbody')[0]
+        this.sortable = Sortable.create(el, {
+          ghostClass: 'sortable-ghost',
+          setData: function (dataTransfer) {
+            dataTransfer.setData('Text', '')
+          },
+          onEnd: evt => {
+            const targetRow = this.tableData.splice(evt.oldIndex, 1)[0];
+            this.tableData.splice(evt.newIndex, 0, targetRow);
+          }
+        })
      }
    }
  }
--- a/src/views/ywbl/slsqxx/fdcq2/slxx300.vue
View file @e20c3cc
+++ b/src/views/ywbl/slsqxx/fdcq2/slxx300.vue
View file @e20c3cc
 <!--
 * @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 @e20c3cc
+++ b/src/views/ywbl/slsqxx/fdcq2/slxxOverview.vue
View file @e20c3cc
 <!--
 * @Description: 受理信息
 * @Autor: renchao
- * @LastEditTime: 2023-08-17 14:14:53
+ * @LastEditTime: 2023-09-13 14:17:15
 -->
 <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 @e20c3cc
+++ b/src/views/ywbl/slsqxx/fwsyq/slxx.vue
View file @e20c3cc
 <!--
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-08-17 13:38:12
+ * @LastEditTime: 2023-09-13 14:05:26
 -->
 <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 @e20c3cc
+++ b/src/views/ywbl/slsqxx/jsydsyq/slxx.vue
View file @e20c3cc
 <!--
 * @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 @e20c3cc
+++ b/src/views/ywbl/slsqxx/jsydsyq/slxx300.vue
View file @e20c3cc
@@ -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 @e20c3cc
+++ b/src/views/ywbl/slsqxx/nydsyq/slxx.vue
View file @e20c3cc
@@ -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 @e20c3cc
+++ b/src/views/ywbl/slsqxx/zjgcdy/batchSlxx.vue
View file @e20c3cc
@@ -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,
@@ -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 @e20c3cc
+++ b/src/views/ywbl/slsqxx/zjgcdy/slxx.vue
View file @e20c3cc
@@ -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 = ''
+        }
      },
      // 是否持证人变化
      /**