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

@@ -22,6 +22,7 @@ const getters = {
   // workflow
   isRefresh: state => state.user.isRefresh,
   workFresh: state => state.user.workFresh,
-  yjsqOptions: state => state.workflow.yjsqOptions
+  yjsqOptions: state => state.workflow.yjsqOptions,
+  dqhj: state => state.getdqhj.dqhj
 }
 export default getters

+const state = {
+  dqhj: "",
+}
+
+const mutations = {
+  SET_DQHJ: (state, data) => {
+    state.dqhj = data
+  }
+}
+
+const actions = {
+  setdqjh ({ commit }, data) {
+    commit('SET_DQHJ', data)
+  }
+}
+
+export default {
+  namespaced: true,
+  state,
+  mutations,
+  actions
+}

@@ -75,23 +75,17 @@ import { mapGetters } from "vuex";
 import { getNewDatesh } from "@/utils/util";
 export default {
   computed: {
-    ...mapGetters(["userData", "yjsqOptions", "userInfo"]),
+    ...mapGetters(["dqhj", "yjsqOptions", "userInfo"]),
   },
   data() {
     return {
-      isNoData: false,
       currentindex: 0,
-      bsmSlsq: "",
       refresh: 10,
       viewEdit: false,
       bsmSlsq: this.$route.query.bsmSlsq,
       bestepid: this.$route.query.bestepid,
       propsParam: {},
       tableData: [],
-      falg: false,
-      falg1: false,
-      jdmc: "",
-      indexdqlc: 0,
       shows: false,
     };
   },
@@ -104,30 +98,44 @@ export default {
       deep: true,
       immediate: true,
     },
-  },
-  created() {},
-  mounted() {
+     dqhj: {
+      handler(val) {
         this.propsParam = this.$attrs;
-    this.viewEdit = this.$parent.currentSelectTab.ableOperation;
+        this.dataset()
+        if(this.$parent.dqhj){
             this.getShList();
-
-    switch (this.$parent.dqhj) {
-      case "cs":
-        this.indexdqlc = 0;
-        this.jdmc = "初审";
-        break;
-      case "fs":
-        this.indexdqlc = 1;
-        this.jdmc = "复审";
-        break;
-      case "hd":
-        this.indexdqlc = 2;
-        this.jdmc = "核定";
-        break;
         }
       },
+      deep: true,
+      immediate: true,
+    },
+
+  },
+  created() {},
   methods: {
      /**
+     * @description: dataset
+     * @param {*} 数据处理
+     * @author: renchao
+     */
+    dataset(){
+      this.viewEdit = this.$parent.currentSelectTab.ableOperation;
+    // switch (this.$parent.dqhj) {
+    //   case "cs":
+    //     this.indexdqlc = 0;
+    //     this.jdmc = "初审";
+    //     break;
+    //   case "fs":
+    //     this.indexdqlc = 1;
+    //     this.jdmc = "复审";
+    //     break;
+    //   case "hd":
+    //     this.indexdqlc = 2;
+    //     this.jdmc = "核定";
+    //     break;
+    // }
+    },
+    /**
      * @description: getShList
      * @param {*} obj
      * @author: renchao
@@ -139,9 +147,8 @@ export default {
       formdata.append("bestepid", this.$route.query.bestepid);
 
       getSpyjList(formdata).then((res) => {
-        this.$endLoading();
+
         if (res.code === 200 && res.result) {
-          this.$nextTick(() => {
             this.tableData = res.result;
             if (this.shows) {
               this.shows = false;
@@ -174,17 +181,14 @@ export default {
                 item.show = false;
               }
             });
-          });
+            this.$endLoading();
+        
         }
+
       });
+
     },
     /**
-     * @description: judgment
-     * @param {*} obj
-     * @author: renchao
-     */
-    judgment(obj) {},
-    /**
      * @description: onSubmit
      * @author: renchao
      */
@@ -195,7 +199,7 @@ export default {
             item["czjg"] = "1";
           });
              var index = this.tableData.findIndex(
-              (item) => item.shyj === null||item.shyj === ""
+              (item) => item.shyj ==null||item.shyj ==""
             );
             if(index==-1){
               this.shows = true;

@@ -60,6 +60,7 @@ export default {
           this.leftButtonList = res.result.button;
           if (res.result.properties && res.result.properties.length) {
             this.dqhj = res.result.properties[0].value
+            this.$store.dispatch('getdqhj/setdqjh', this.dqhj);
           }
           this.rightButtonList = res.result.operation;
           this.slsq = res.result.slsq
@@ -220,7 +221,6 @@ export default {
             record(formdata).then((res) => {
               if (res.code === 200) {
                 if (res.result.length === 1) {
-                  console.log(res.result, 'res.result');
                   res.result[0].state ? that.$message({
                     message: '登簿成功',
                     type: 'success'

@@ -174,7 +174,6 @@
               <el-form-item label="共有方式：">
                 <el-radio-group
                   :disabled="!viewEdit"
-                  @change="showCZInfo"
                   v-model="ruleForm.sldy.gyfs"
                 >
                   <el-radio label="0">单独所有</el-radio>
@@ -359,13 +358,7 @@ export default {
       this.czrOptions = this.ruleForm.qlrList;
       this.key++;
     },
-    // /**
-    //  * @description: showCZInfo
-    //  * @author: renchao
-    //  */
-    // showCZInfo() {
-    //   console.log(this.ruleForm.slsq.gyfs);
-    // },
+
     // 是否持证人变化
     /**
      * @description: 是否持证人变化

@@ -151,7 +151,6 @@
             <el-form-item label="共有方式：">
               <el-radio-group
                 :disabled="!viewEdit"
-                @change="showCZInfo"
                 v-model="ruleForm.sldyList[0].gyfs"
               >
                 <el-radio label="0">单独所有</el-radio>
@@ -352,13 +351,8 @@ export default {
       this.ruleForm.qlrList = _.cloneDeep(val);
       this.czrOptions = this.ruleForm.qlrList;
     },
-    /**
-     * @description: showCZInfo
-     * @author: renchao
-     */
-    showCZInfo() {
-      // console.log(this.ruleForm.slsq.gyfs);
-    },
+
+
     // 是否持证人变化
     /**
      * @description: 是否持证人变化