style:申请单元列表

renchao@pashanhoo.com
Showing 10 changed files with 98 additions and 89 deletions
src/views/workflow/components/leftmenu/ordinaryMenu.vue
src/views/workflow/components/tdytTable.vue
src/views/workflow/flowform.js
src/views/workflow/mixin/public.js
src/views/workflow/workFrame.vue
src/views/ywbl/slsqxx/diyaq/slxx.vue
src/views/ywbl/slsqxx/fdcq1/slxx.vue
src/views/ywbl/slsqxx/fdcq2/slxx.vue
src/views/ywbl/slsqxx/fdcq2/slxx300.vue
src/views/ywbl/slsqxx/ygdy/slxx.vue
--- a/src/views/workflow/components/leftmenu/ordinaryMenu.vue
View file @52385f8
+++ b/src/views/workflow/components/leftmenu/ordinaryMenu.vue
View file @52385f8
 <!--
 * @Description: workFrame左侧菜单列表-普通
 * @Autor: renchao
- * @LastEditTime: 2023-08-30 13:59:09
+ * @LastEditTime: 2023-09-12 11:18:27
 -->
 <template>
  <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
@@ -15,7 +15,7 @@
        申请单元列表({{ unitData.length }})
        <el-button type="text" class="batchDel" @click="handleBatchDel" v-if="unitData.length > 1">批量删除</el-button>
      </div>
-      <el-menu :default-active="activeIndex" @select="unitClick">
+      <el-menu v-model="activeIndex" :default-active="activeIndex" @select="unitClick">
        <el-menu-item v-for="(item, index) in unitData" :index="index.toString()" :key="index">
          <p class="dot" v-if="item.issave == '0'"></p>
          <div class="menu-con">
@@ -74,18 +74,20 @@
    watch: {
      isRefresh: {
        handler (newVal, oldVal) {
-          if (newVal) this.loadBdcdylist()
+          if (newVal) {
+            this.loadBdcdylist()
+          }
        },
        immediate: true
      }
    },
    methods: {
-      //读取申请单元信息
      /**
       * @description: 读取申请单元信息
       * @author: renchao
       */
      loadBdcdylist () {
+        let that = this
        var formdata = new FormData();
        formdata.append("bsmSlsq", this.bsmSlsq);
        if (this.$route.query.bestepid) {
@@ -97,24 +99,28 @@
        if (this.$route.query.type == 'jdcx') {
          jdcxLeftMenu(formdata).then((res) => {
            if (res.code === 200 && res.result) {
-              this.unitData = res.result;
+              that.unitData = res.result;
              window.unitData = res.result;
-              this.currentSelectProps = res.result[0];
+              that.currentSelectProps = res.result[0];
-              this.$emit('getCurrentSelectProps', this.currentSelectProps);
+              that.$emit('getCurrentSelectProps', this.currentSelectProps);
-              this.judgeBatchShow();
+              that.judgeBatchShow();
-              if (this.showBatch) {
+              if (that.showBatch) {
                //满足批量查封/批量抵押按钮出现 即先展示批量表单
-                this.batchUnitClick();
+                that.batchUnitClick();
              } else {
                //默认选择单元列表第一个
-                this.unitClick(0);
+                if (sessionStorage.getItem('keyPath')) {
+                  that.unitClick(sessionStorage.getItem('keyPath') - 0)
+                } else {
+                  that.unitClick(0);
+                }
              }
            }
          })
        } else {
          leftMenu(formdata).then((res) => {
            if (res.code === 200 && res.result) {
-              this.unitData = res.result;
+              that.unitData = res.result;
              window.unitData = res.result;
              this.currentSelectProps = res.result[0];
              this.$emit('getCurrentSelectProps', this.currentSelectProps);
@@ -124,13 +130,16 @@
                this.batchUnitClick();
              } else {
                //默认选择单元列表第一个
-                this.unitClick(0);
+                if (sessionStorage.getItem('keyPath')) {
+                  that.unitClick(sessionStorage.getItem('keyPath') - 0)
+                } else {
+                  that.unitClick(0);
+                }
              }
            }
          })
        }
      },
-      //批量按钮判断
      /**
       * @description: 批量按钮判断
       * @author: renchao
@@ -224,6 +233,7 @@
        this.currentSelectProps = this.unitData[index];
        this.currentSelectProps.batchOperation = false;
        this.activeIndex = index.toString();
+        sessionStorage.setItem('keyPath', this.activeIndex);
        //选中表单传递数据
        this.$emit('getCurrentSelectProps', this.currentSelectProps);
        this.$parent.stepForm(index);
--- a/src/views/workflow/components/tdytTable.vue
View file @52385f8
+++ b/src/views/workflow/components/tdytTable.vue
View file @52385f8
 <!--
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-08-30 11:01:54
+ * @LastEditTime: 2023-09-12 09:40:17
 -->
 <template>
  <div>
@@ -14,15 +14,13 @@
      :heightNumSetting="true"
      :minHeight="150"
      height="150"
-      style="width: 100%"
+      style="width: 100%">
-    >
      <el-table-column prop="index" width="50" :render-header="renderHeader">
        <template slot-scope="scope">
          <i
            class="el-icon-minus pointer"
            @click="deleClick(scope.$index, scope.row)"
-            v-if="ableOperation"
+            v-if="ableOperation"></i>
-          ></i>
          <div style="text-align: center" v-else>
            {{ scope.$index + 1 }}
          </div>
@@ -40,8 +38,7 @@
            :normalizer="normalizer"
            :appendToBody="true"
            z-index="9999"
-            @input="addrow(scope.row)"
+            @input="addrow(scope.row)" />
-          />
        </template>
      </el-table-column>
      <el-table-column prop="qssj" label="土地使用起始时间" min-width="100">
@@ -54,8 +51,7 @@
            placeholder="选择日期"
            value-format="yyyy-MM-dd HH:mm:ss"
            format="yyyy-MM-dd"
-            @input="startTime(scope.$index)"
+            @input="startTime(scope.$index)">
-          >
          </el-date-picker>
        </template>
      </el-table-column>
@@ -69,8 +65,7 @@
            placeholder="选择日期"
            value-format="yyyy-MM-dd HH:mm:ss"
            format="yyyy-MM-dd"
-            @input="endTime(scope.$index)"
+            @input="endTime(scope.$index)">
-          >
          </el-date-picker>
        </template>
      </el-table-column>
@@ -82,18 +77,16 @@
            v-model="scope.row.tdsyqx"
            oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"
            placeholder="请输入内容"
-            @input="sumTime(scope.$index, scope.row.tdsyqx)"
+            @input="sumTime(scope.$index, scope.row.tdsyqx)">
-          >
+            ></el-input>
-            ></el-input
-          >
        </template>
      </el-table-column>
    </el-table>
  </div>
 </template>
 <script>
-import { mapGetters } from "vuex";
+  import { mapGetters } from "vuex";
-export default {
+  export default {
    computed: {
      ...mapGetters(["dictData"]),
    },
@@ -109,7 +102,7 @@ export default {
        default: true,
      },
    },
-  data() {
+    data () {
      return {
        // 键名转换，方法默认是label和children进行树状渲染
        key: 0,
@@ -123,7 +116,7 @@ export default {
        // 起始时间选择范围
        pickerStart: {},
        pickerEnd: {},
-      normalizer(node) {
+        normalizer (node) {
          if (node.children == null || node.children == "null") {
            delete node.children;
          }
@@ -135,7 +128,7 @@ export default {
        },
      };
    },
-  mounted() {},
+    mounted () { },
    watch: {
      tableData: {
        handler: function (val, oldVal) {
@@ -164,7 +157,7 @@ export default {
       * @description: renderHeader
       * @author: renchao
       */
-    renderHeader() {
+      renderHeader () {
        return (
          <div>
            {" "}
@@ -186,8 +179,7 @@ export default {
       * @description: 修改事件
       * @author: renchao
       */
-    addrow(a) {
+      addrow (a) {
-      console.log(a);
        // this.tableDataList = this.tableDataList.map((item) => {
        //   return {
        //     ...item,
@@ -201,7 +193,7 @@ export default {
       * @param {*} index
       * @author: renchao
       */
-    startTime(index) {
+      startTime (index) {
        console.log("index", index);
        //  let startTime = this.tableDataList[index].tdsyqssj;
        let endTime = this.tableDataList[index].jssj;
@@ -227,7 +219,7 @@ export default {
       * @param {*} index
       * @author: renchao
       */
-    endTime(index) {
+      endTime (index) {
        //  let startTime = this.tableDataList[index].tdsyqssj;
        let startTime = this.tableDataList[index].qssj;
        let endTime = this.tableDataList[index].jssj;
@@ -253,7 +245,7 @@ export default {
       * @param {*} tdsyqx
       * @author: renchao
       */
-    sumTime(index, tdsyqx) {
+      sumTime (index, tdsyqx) {
        let startTime = this.tableDataList[index].qssj;
        this.tableDataList[index].jssj =
          Number(startTime.substring(0, 4)) +
@@ -266,7 +258,7 @@ export default {
       * @description: 新增
       * @author: renchao
       */
-    addClick() {
+      addClick () {
        // this.tableDataList[this.tableDataList.length] = _.cloneDeep(this.newdata);
        this.tableDataList.push(_.cloneDeep(this.newdata))
        this.$emit("upDateTdytxxList", this.tableDataList);
@@ -279,7 +271,7 @@ export default {
       * @param {*} row
       * @author: renchao
       */
-    deleClick(index, row) {
+      deleClick (index, row) {
        this.$confirm("确定要删除吗, 是否继续?", "提示", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
@@ -289,25 +281,25 @@ export default {
            this.tableDataList.splice(index, 1);
            this.$emit("upDateTdytxxList", this.tableDataList);
          })
-        .catch(() => {});
+          .catch(() => { });
      },
    },
-};
+  };
 </script>
 <style scoped lang="scss">
-.el-input {
+  .el-input {
    border: none !important;
-}
+  }
-/deep/.el-table__row {
+  /deep/.el-table__row {
    border: none !important;
-}
+  }
-.el-date-editor.el-input {
+  .el-date-editor.el-input {
    width: 100%;
-}
+  }
-/deep/.el-table th {
+  /deep/.el-table th {
    height: 30px !important;
-}
+  }
-/deep/ .el-table--border .el-table__cell:first-child .cell{
+  /deep/ .el-table--border .el-table__cell:first-child .cell {
    text-align: center;
-}
+  }
 </style>
--- a/src/views/workflow/flowform.js
View file @52385f8
+++ b/src/views/workflow/flowform.js
View file @52385f8
 /*
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-08-17 15:34:33
+ * @LastEditTime: 2023-09-12 09:41:27
 */
 //流程环节操作按钮
 /**
@@ -10,7 +10,7 @@
 * @param {*} djywbm
 * @author: renchao
 */
-export function getForm(tabName, djywbm) {
+export function getForm (tabName, djywbm) {
  let form;
  switch (tabName) {
    case "tdsyqslxx":
--- a/src/views/workflow/mixin/public.js
View file @52385f8
+++ b/src/views/workflow/mixin/public.js
View file @52385f8
 /*
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-09-05 15:05:56
+ * @LastEditTime: 2023-09-12 10:52:24
 */
 import { getForm } from "../flowform";
 import { getHomeNoticeList } from "@/api/home.js"
@@ -32,7 +32,6 @@ export default {
        }
      })
    },
-    //右侧表单选项卡事件
    /**
     * @description: 右侧表单选项卡事件
     * @param {*} activeName
@@ -40,9 +39,9 @@ export default {
     * @author: renchao
     */
    beforeLeave (activeName, oldActiveName) {
+      sessionStorage.setItem('activeName', activeName);
      if (activeName && activeName != 0) this.getFromRouter(activeName)
    },
-    //切换选项卡内容组件
    /**
     * @description: 切换选项卡内容组件
     * @param {*} tabname
--- a/src/views/workflow/workFrame.vue
View file @52385f8
+++ b/src/views/workflow/workFrame.vue
View file @52385f8
 <!--
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-08-30 14:14:55
+ * @LastEditTime: 2023-09-12 10:52:18
 -->
 <template>
  <div class="container">
@@ -162,7 +162,6 @@
      stepForm (index) {
        getStepFormInfo(this.currentSelectProps).then((res) => {
          if (res.code === 200) {
-            // this.fresh++;
            //获取单元对应的所有表单信息
            this.tabList = res.result;
            //默认加载第一个表单信息
@@ -172,6 +171,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) {
--- a/src/views/ywbl/slsqxx/diyaq/slxx.vue
View file @52385f8
+++ b/src/views/ywbl/slsqxx/diyaq/slxx.vue
View file @52385f8
 <!--
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-09-12 09:01:09
+ * @LastEditTime: 2023-09-12 09:59:18
 -->
 <template>
  <!-- 受理信息 -->
@@ -9,7 +9,7 @@
    <el-form
      :model="ruleForm"
      :rules="rules"
-      class="loadingtext"
+      v-Loading="loading"
      ref="ruleForm"
      :label-position="flag ? 'top' : ''"
      :inline="flag"
@@ -365,18 +365,21 @@
  import { mapGetters } from "vuex";
  export default {
    mounted () {
+      this.loading = true
      this.viewEdit = this.$parent.currentSelectTab.ableOperation;
      this.propsParam = this.$attrs;
      var formdata = new FormData();
      if (this.propsParam.djlx == "400") {
        this.isJfOperation = true;
      }
-      this.$startLoading();
      formdata.append("bsmSldy", this.propsParam.bsmSldy);
      formdata.append("bsmSlsq", this.$route.query.bsmSlsq);
      formdata.append("djlx", this.propsParam.djlx);
      formdata.append("isEdit", this.viewEdit);
      Init(formdata).then((res) => {
+        setTimeout(() => {
+          this.loading = false
+        }, 200)
        if (res.code === 200 && res.result) {
          this.ruleForm = res.result;
          this.czrOptions = this.ruleForm.qlrList;
@@ -386,8 +389,9 @@
            this.czr = item.sqrmc;
          }
        });
-        this.$endLoading();
+      }).catch(() => {
-      });
+        this.loading = false
+      })
    },
    components: { qlrCommonTable },
    computed: {
@@ -395,6 +399,7 @@
    },
    data () {
      return {
+        loading: false,
        //表单是否可操作
        viewEdit: true,
        disabled: true,
--- a/src/views/ywbl/slsqxx/fdcq1/slxx.vue
View file @52385f8
+++ b/src/views/ywbl/slsqxx/fdcq1/slxx.vue
View file @52385f8
 <!--
 * @Description: 房屋多幢受理信息
 * @Autor: ssq
- * @LastEditTime: 2023-09-11 16:28:02
+ * @LastEditTime: 2023-09-12 09:55:25
 -->
 <template>
  <div class="slxx">
@@ -271,6 +271,9 @@
      formdata.append("djlx", this.propsParam.djlx);
      formdata.append("isEdit", this.viewEdit);
      Init(formdata).then((res) => {
+        setTimeout(() => {
+          this.loading = false
+        }, 200)
        if (res.code === 200 && res.result) {
          this.ruleForm = {
            ...res.result,
@@ -281,16 +284,9 @@
              this.czr = item.sqrmc;
            }
          });
-          setTimeout(() => {
-            this.loading = false
-          }, 200)
-          //初始化发证方式，1：小证，2：大正
-          this.ruleForm.slsq.fzfs == null
-            ? (this.ruleForm.slsq.fzfs = "1")
-            : this.ruleForm.slsq.fzfs;
          this.czrOptions = this.ruleForm.qlrList;
        }
-      });
+      })
    },
    components: { qlrCommonTable, tdytTable, fdcqxmTable, ywrCommonTable },
    computed: {
--- a/src/views/ywbl/slsqxx/fdcq2/slxx.vue
View file @52385f8
+++ b/src/views/ywbl/slsqxx/fdcq2/slxx.vue
View file @52385f8
 <!--
 * @Description: 受理信息
 * @Autor: renchao
- * @LastEditTime: 2023-09-11 16:28:20
+ * @LastEditTime: 2023-09-12 10:04:14
 -->
 <template>
  <div class="slxx">
@@ -9,6 +9,7 @@
      :model="ruleForm"
      :rules="rules"
      ref="ruleForm"
+      v-Loading="loading"
      :label-position="flag ? 'top' : ''"
      :inline="flag"
      label-width="120px">
@@ -417,6 +418,7 @@
  export default {
    mixins: [ywmix],
    mounted () {
+      this.loading = true
      this.viewEdit = this.$parent.currentSelectTab.ableOperation;
      this.propsParam = this.$attrs;
      var formdata = new FormData();
@@ -424,6 +426,9 @@
      formdata.append("djlx", this.propsParam.djlx);
      formdata.append("isEdit", this.viewEdit);
      Init(formdata).then((res) => {
+        setTimeout(() => {
+          this.loading = false
+        }, 200)
        if (res.code === 200 && res.result) {
          this.ruleForm = {
            ...res.result,
@@ -434,13 +439,11 @@
              this.czr = item.sqrmc;
            }
          });
-          //初始化发证方式，1：小证，2：大正
-          this.ruleForm.slsq.fzfs == null
-            ? (this.ruleForm.slsq.fzfs = "1")
-            : this.ruleForm.slsq.fzfs;
          this.czrOptions = this.ruleForm.qlrList;
        }
-      });
+      }).catch(() => {
+        this.loading = false
+      })
    },
    components: { qlrCommonTable, tdytTable, ywrCommonTable },
    computed: {
@@ -448,6 +451,7 @@
    },
    data () {
      return {
+        loading: false,
        mjdw: "1",
        // 键名转换，方法默认是label和children进行树状渲染
        normalizer (node) {
@@ -602,6 +606,7 @@
            });
          }
        }
+        this.$store.dispatch("user/refreshPage", false);
        saveData(this.ruleForm).then((res) => {
          if (res.code === 200) {
            this.$message({
@@ -615,10 +620,10 @@
              showClose: true,
              message: res.message,
              type: "error",
-            });
+            })
+          }
+        })
      }
-        });
-      },
    },
  };
 </script>
--- a/src/views/ywbl/slsqxx/fdcq2/slxx300.vue
View file @52385f8
+++ b/src/views/ywbl/slsqxx/fdcq2/slxx300.vue
View file @52385f8
--- a/src/views/ywbl/slsqxx/ygdy/slxx.vue
View file @52385f8
+++ b/src/views/ywbl/slsqxx/ygdy/slxx.vue
View file @52385f8
@@ -136,7 +136,7 @@
              label-width="200px">
              <el-radio-group
                v-model="ruleForm.ygdj.sfczjzhxz"
-                :disabled="!viewEdit || isJfOperation">
+                :disabled="!viewEdit">
                <el-radio label="1">是</el-radio>
                <el-radio label="0">否</el-radio>
              </el-radio-group>
@@ -318,14 +318,14 @@
      Init(formdata).then((res) => {
        if (res.code === 200 && res.result) {
          that.ruleForm = res.result;
-          this.czrOptions = this.ruleForm.qlrList;
+          that.czrOptions = this.ruleForm.qlrList;
-          this.ruleForm.qlrList.forEach((item) => {
+          that.ruleForm.qlrList.forEach((item) => {
            if (item.sfczr == 1) {
-              this.czr = item.sqrmc;
+              that.czr = item.sqrmc;
            }
          });
          setTimeout(() => {
-            this.loading = false
+            that.loading = false
          }, 200)
        }
      })