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

@@ -636,6 +636,15 @@ export default {
                 this.ssQlxxList = res.result;
               }
             });
+               //获取上手信息
+            getZtQlxx({
+              bdcdyid: this.propsParam.bdcdyid,
+              bsmQlxx: this.ruleForm.qlxx.bsmQlxx,
+            }).then((res) => {
+              if (res.code == 200) {
+                this.ztQlxxList = res.result;
+              }
+            });
           }
         });
       },

@@ -12,7 +12,8 @@
         <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>
@@ -21,7 +22,8 @@
         <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>
@@ -50,19 +52,22 @@
           <el-tabs
             v-model="tabName"
             :before-leave="beforeLeave"
-            @tab-click="handleClick">
+            @tab-click="handleClick"
+          >
             <el-tab-pane
               :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>
@@ -71,26 +76,26 @@
   </div>
 </template>
 <style scoped lang="scss">
-  @import "~@/styles/mixin.scss";
-  @import "./workFrame.scss";
+@import "~@/styles/mixin.scss";
+@import "./workFrame.scss";
 </style>
 <script>
-  import WorkFlow from "./mixin/index";
-  import { getForm } from "./flowform";
-  import { getStepFormInfo } from "@/api/workFlow.js";
-  import NoticeBar from "@/components/NoticeBar/index";
-  // import ProcessViewer from "./components/processViewer.vue";
+import WorkFlow from "./mixin/index";
+import { getForm } from "./flowform";
+import { getStepFormInfo } from "@/api/workFlow.js";
+import NoticeBar from "@/components/NoticeBar/index";
+// import ProcessViewer from "./components/processViewer.vue";
 
-  import ordinaryMenu from "./components/leftmenu/ordinaryMenu.vue";
-  import qllxDailog from "./djbBook/components/qllxDailog";
-  import selectBdc from "@/views/ywbl/ywsq/selectBdc.vue";
-  import { loadTreeData, getNode } from "./components/leftmenu/djbFrameData.js";
-  // 登记簿数据信息
-  import { addRepairRecord } from "@/api/djbRepair.js";
-  // 获取权利类型数组
+import ordinaryMenu from "./components/leftmenu/ordinaryMenu.vue";
+import qllxDailog from "./djbBook/components/qllxDailog";
+import selectBdc from "@/views/ywbl/ywsq/selectBdc.vue";
+import { loadTreeData, getNode } from "./components/leftmenu/djbFrameData.js";
+// 登记簿数据信息
+import { addRepairRecord } from "@/api/djbRepair.js";
+// 获取权利类型数组
 
-  import { getBdcqljqtsx } from "@/api/djbDetail.js";
-  export default {
+import { getBdcqljqtsx } from "@/api/djbDetail.js";
+export default {
   components: {
     selectBdc,
     NoticeBar,
@@ -98,7 +103,7 @@
     qllxDailog,
   },
   mixins: [WorkFlow],
-    data () {
+  data() {
     return {
       bsmSlsq: this.$route.query.bsmSlsq,
       //当前流程所在环节
@@ -134,7 +139,7 @@
       ableOperation: false,
     };
   },
-    mounted () {
+  mounted() {
     // this.getleftMenubl()
   },
 
@@ -144,7 +149,7 @@
      * @param {*} qllx
      * @author: renchao
      */
-      stepForm (qllx) {
+    stepForm(qllx) {
       this.oneSelectProps.qllx = qllx;
       if (this.$refs.Menu.supplementarylist.length) {
         getStepFormInfo(this.oneSelectProps).then((res) => {
@@ -174,7 +179,7 @@
      * @param {*} val
      * @author: renchao
      */
-      getCurrentSelectProps (val) {
+    getCurrentSelectProps(val) {
       this.bsmRepair = val.bsmRepair;
       if (val.bdcdyid) {
         this.oneSelectProps = val;
@@ -195,7 +200,7 @@
      * @description: 获取渲染登记簿列表
      * @author: renchao
      */
-      getdjblist () {
+    getdjblist() {
       getBdcqljqtsx({
         bdcdyid: this.currentSelectProps.bdcdyid,
         bdcdyh: this.currentSelectProps.bdcdyh,
@@ -236,7 +241,6 @@
       if (p) {
         this.ableOperation = this.tabList[a.index].ableOperation;
       }
-
     },
     //右侧表单选项卡事件
     /**
@@ -244,7 +248,7 @@
      * @param {*} activeName
      * @author: renchao
      */
-      beforeLeave (activeName) {
+    beforeLeave(activeName) {
       if (activeName && activeName != 0) this.getFromRouter(activeName);
     },
     //切换选项卡内容组件
@@ -253,16 +257,12 @@
      * @param {*} tabname
      * @author: renchao
      */
-      getFromRouter (tabname) {
+    getFromRouter(tabname) {
       this.componentTag = getForm(tabname);
     },
-      // closefp () {
-      //   this.splitScreen = this.splitScreen ? false : true;
-      //   this.$store.dispatch("app/set1tScreen", this.splitScreen);
-      //   this.getFromRouter(this.tabList[0].value);
-      //   this.clxxForm = getForm(this.tabList[1].value);
-      //   this.tabName = this.tabList[0].value
-      // },
+    changeywh() {
+      this.$refs.Menu.getleftMenubl("change");
+    },
     // 增加补录记录
     /**
      * @description: 增加补录记录
@@ -270,7 +270,7 @@
      * @param {*} del
      * @author: renchao
      */
-      addRepairRecord (row, del) {
+    addRepairRecord(row, del) {
       console.log("row", row, del);
       let from = {
         bsmQlxx: "",
@@ -323,13 +323,13 @@
     //   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;
@@ -339,5 +339,5 @@
     font-weight: 600;
     color: #3498db;
   }
-  }
+}
 </style>