1

renchao@pashanhoo.com
Showing 7 changed files with 68 additions and 56 deletions
src/store/getters.js
src/store/modules/user.js
src/views/djbworkflow/workFrame.vue
src/views/workflow/components/dialog/zsdy.vue
src/views/workflow/components/dialog/zslq.vue
src/views/workflow/components/fzxx.vue
src/views/workflow/components/szxx.vue
--- a/src/store/getters.js
View file @fad4759
+++ b/src/store/getters.js
View file @fad4759
 /*
 * @Description: 
 * @Autor: renchao
- * @LastEditTime: 2023-05-04 11:14:25
+ * @LastEditTime: 2023-07-28 15:27:10
 */
 const getters = {
  sidebar: state => state.app.sidebar,
@@ -20,6 +20,7 @@ const getters = {
  djbxx: state => state.djbxx.djbxx,
  // workflow
  isRefresh: state => state.user.isRefresh,
+  workFresh: state => state.user.workFresh,
  yjsqOptions: state => state.workflow.yjsqOptions
 }
 export default getters
--- a/src/store/modules/user.js
View file @fad4759
+++ b/src/store/modules/user.js
View file @fad4759
 /*
 * @Description: 
 * @Autor: renchao
- * @LastEditTime: 2023-04-12 10:47:33
+ * @LastEditTime: 2023-07-28 15:26:16
 */
 import { getUserInfo } from '@/api/user'
 const state = {
    name: '',
    avatar: 'https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png',
    isRefresh: false,
+    // 业务流程刷新
+    workFresh: false
 }
 const mutations = {
    SET_NAME: (state, data) => {
@@ -15,6 +17,9 @@ const mutations = {
    },
    REFRESH: (state, data) => {
        state.isRefresh = data
+    },
+    SETWORKFRESH: (state, data) => {
+        state.workFresh = data
    }
 }
@@ -29,6 +34,9 @@ const actions = {
    refreshPage ({ commit }, data) {
        commit('REFRESH', data)
    },
+    reWorkFresh ({ commit }, data) {
+        commit('SETWORKFRESH', data)
+    }
 }
 export default {
    namespaced: true,
--- a/src/views/djbworkflow/workFrame.vue
View file @fad4759
+++ b/src/views/djbworkflow/workFrame.vue
View file @fad4759
 <!--
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-07-11 08:58:31
+ * @LastEditTime: 2023-07-28 15:20:00
 -->
 <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>
@@ -54,16 +52,14 @@
              :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>
@@ -72,26 +68,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 { getStepFormInfo } from "@/api/workFlow.js";
+  import { getStepFormInfo } 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 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,
@@ -99,7 +95,7 @@ export default {
      qllxDailog,
    },
    mixins: [WorkFlow],
-  data() {
+    data () {
      return {
        bsmSlsq: this.$route.query.bsmSlsq,
        //当前流程所在环节
@@ -135,7 +131,7 @@ export default {
        ableOperation: false,
      };
    },
-  mounted() {
+    mounted () {
      // this.getleftMenubl()
    },
@@ -145,13 +141,13 @@ export default {
       * @param {*} qllx
       * @author: renchao
       */
-    stepForm(qllx) {
+      stepForm (qllx) {
        this.oneSelectProps.qllx = qllx;
        if (this.$refs.Menu.supplementarylist.length) {
          getStepFormInfo(this.oneSelectProps).then((res) => {
            this.$nextTick(function () {
              this.tabList = res.result;
-            console.log("加载的右侧界面组件名称",this.tabList);
+              console.log("加载的右侧界面组件名称", this.tabList);
              this.tabName = this.tabList[0].value;
              this.ableOperation = this.tabList[0].ableOperation;
              this.getFromRouter(this.tabName);
@@ -170,14 +166,12 @@ export default {
          });
        }
      },
-    // 获取右侧选项卡
      /**
       * @description: 获取右侧选项卡
       * @param {*} val
       * @author: renchao
       */
-    getCurrentSelectProps(val) {
+      getCurrentSelectProps (val) {
-      console.log("渲染右侧选项卡");
        this.bsmRepair = val.bsmRepair;
        if (val.bdcdyid) {
          this.oneSelectProps = val;
@@ -198,7 +192,7 @@ export default {
       * @description: 获取渲染登记簿列表
       * @author: renchao
       */
-    getdjblist() {
+      getdjblist () {
        getBdcqljqtsx({
          bdcdyid: this.currentSelectProps.bdcdyid,
          bdcdyh: this.currentSelectProps.bdcdyh,
@@ -232,7 +226,7 @@ export default {
       * @param {*} activeName
       * @author: renchao
       */
-    beforeLeave(activeName) {
+      beforeLeave (activeName) {
        if (activeName && activeName != 0) this.getFromRouter(activeName);
      },
      //切换选项卡内容组件
@@ -241,7 +235,7 @@ export default {
       * @param {*} tabname
       * @author: renchao
       */
-    getFromRouter(tabname) {
+      getFromRouter (tabname) {
        this.componentTag = getForm(tabname);
      },
      // closefp () {
@@ -258,8 +252,8 @@ export default {
       * @param {*} del
       * @author: renchao
       */
-    addRepairRecord(row, del) {
+      addRepairRecord (row, del) {
-      console.log("row",row,del);
+        console.log("row", row, del);
        let from = {
          bsmQlxx: "",
          bsmSlsq: this.bsmSlsq,
@@ -311,13 +305,13 @@ export default {
      //   this.$popupDialog(title, "ywbl/ywsq/selectBdc", { 'djywbm': this.$route.query.sqywbm, 'isJump': true, 'sqywInfo': data }, "80%", true)
      // }
    },
-};
+  };
 </script>
 <style scoped lang="scss">
-.rightContainer {
+  .rightContainer {
    position: relative;
-}
+  }
-.count {
+  .count {
    font-size: 14px;
    position: absolute;
    right: 25px;
@@ -327,5 +321,5 @@ export default {
      font-weight: 600;
      color: #3498db;
    }
-}
+  }
 </style>
--- a/src/views/workflow/components/dialog/zsdy.vue
View file @fad4759
+++ b/src/views/workflow/components/dialog/zsdy.vue
View file @fad4759
 <!--
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-06-25 11:13:07
+ * @LastEditTime: 2023-07-28 15:27:37
 -->
 <template>
  <div>
@@ -71,7 +71,7 @@
      }
    },
    created () {
-      store.dispatch('user/refreshPage', false)
+      store.dispatch('user/reWorkFresh', false)
      this.columns = datas.columns()
      this.ysxlhList()
      this.getHeadTabBdcqz()
@@ -179,7 +179,7 @@
            this.$popupCacel()
            this.$message.success("提交成功")
            //刷新列表
-            store.dispatch('user/refreshPage', true)
+            store.dispatch('user/reWorkFresh', true)
          } else {
            this.$message.error(res.message)
          }
--- a/src/views/workflow/components/dialog/zslq.vue
View file @fad4759
+++ b/src/views/workflow/components/dialog/zslq.vue
View file @fad4759
 <!--
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-07-24 10:22:41
+ * @LastEditTime: 2023-07-28 15:33:55
 -->
 <template>
  <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px">
@@ -64,6 +64,7 @@
  import table from "@/utils/mixin/table";
  import { getUnclaimedBdcqz, issueCertificate } from "@/api/bdcqz.js";
  import { datas } from "../../javascript/fzxxdata";
+  import { log } from 'bpmn-js-token-simulation';
  export default {
    props: {
      formData: {
@@ -123,9 +124,6 @@
        getUnclaimedBdcqz({ bsmSlsq: Vue.prototype.$currentRoute.query.bsmSlsq }).then(res => {
          if (res.code === 200) {
            this.tableData.data = res.result.list;
-            if(this.tableData.data.length>0) {
-              this.ruleForm.lzrxm = this.tableData.data[0].qlr
-            }
            this.ruleForm.fzrmc = res.result.fzrmc
            this.ruleForm.fzsj = res.result.fzsj
            this.ruleForm.fzsl = res.result.fzsl
@@ -160,7 +158,7 @@
              if (res.code == 200) {
                this.$message.success('保存成功');
                //刷新列表
-                store.dispatch('user/refreshPage', true)
+                store.dispatch('user/reWorkFresh', true)
                this.$popupCacel()
              } else {
                this.$message.error(res.message)
--- a/src/views/workflow/components/fzxx.vue
View file @fad4759
+++ b/src/views/workflow/components/fzxx.vue
View file @fad4759
 <!--
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-07-25 09:26:10
+ * @LastEditTime: 2023-07-28 15:30:23
 -->
 <template>
  <div class="from-clues">
@@ -40,9 +40,10 @@
  </div>
 </template>
 <script>
+  import { mapGetters } from 'vuex'
  import table from "@/utils/mixin/table";
-  import { getCertificateList } from "@/api/bdcqz.js";
  import { datas } from "../javascript/fzxxdata";
+  import { getCertificateList } from "@/api/bdcqz.js";
  export default {
    mixins: [table],
    data () {
@@ -66,6 +67,16 @@
    created () {
      this.ableOperation = this.$parent.currentSelectTab.ableOperation
    },
+    computed: {
+      ...mapGetters(['workFresh'])
+    },
+    watch: {
+      workFresh: {
+        handler (newVal, oldVal) {
+          if (newVal) this.queryClick()
+        }
+      }
+    },
    methods: {
      /**
       * @description: queryClick
--- a/src/views/workflow/components/szxx.vue
View file @fad4759
+++ b/src/views/workflow/components/szxx.vue
View file @fad4759
@@ -92,10 +92,10 @@
      };
    },
    computed: {
-      ...mapGetters(['isRefresh'])
+      ...mapGetters(['workFresh'])
    },
    watch: {
-      isRefresh: {
+      workFresh: {
        handler (newVal, oldVal) {
          if (newVal) this.list()
        }