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

 /*
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-05-17 10:24:24
+ * @LastEditTime: 2023-07-25 14:46:16
  */
 import request from '@/utils/request'
 let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
@@ -69,6 +69,18 @@ export function leftMenu (data) {
     data
   })
 }
+/**
+ * @description: 进度查询获取左侧列表
+ * @param {*} data
+ * @author: renchao
+ */
+export function jdcxLeftMenu (data) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/business/workFlow/jdcxLeftMenu',
+    method: 'post',
+    data
+  })
+}
 
 /**
  * @description: 获取下一环节信息

 <!--
  * @Description: workFrame左侧菜单列表-普通
  * @Autor: renchao
- * @LastEditTime: 2023-07-25 14:14:04
+ * @LastEditTime: 2023-07-25 14:55:49
 -->
 <template>
   <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
@@ -40,7 +40,7 @@
 </template>
 <script>
   import { mapGetters } from 'vuex'
-  import { leftMenu, deleteSlbdcdy } from "@/api/workFlow.js"
+  import { leftMenu, deleteSlbdcdy, jdcxLeftMenu } from "@/api/workFlow.js"
   export default {
     data () {
       return {
@@ -85,26 +85,47 @@
       loadBdcdylist () {
         var formdata = new FormData();
         formdata.append("bsmSlsq", this.bsmSlsq);
-        formdata.append("bestepid", this.bestepid);
+        if (this.$route.query.bestepid) {
+          formdata.append("bestepid", this.bestepid);
+        }
         if (this.$route.query.bsmBusiness) {
           formdata.append("bsmBusiness", this.$route.query.bsmBusiness);
         }
-        leftMenu(formdata).then((res) => {
-          if (res.code === 200 && res.result) {
-            this.unitData = res.result;
-            window.unitData = res.result;
-            this.currentSelectProps = res.result[0];
-            this.$emit('getCurrentSelectProps', this.currentSelectProps);
-            this.judgeBatchShow();
-            if (this.showBatch) {
-              //满足批量查封/批量抵押按钮出现 即先展示批量表单
-              this.batchUnitClick();
-            } else {
-              //默认选择单元列表第一个
-              this.unitClick(0);
+        if (this.$route.query.type == 'jdcx') {
+          jdcxLeftMenu(formdata).then((res) => {
+            if (res.code === 200 && res.result) {
+              this.unitData = res.result;
+              window.unitData = res.result;
+              this.currentSelectProps = res.result[0];
+              this.$emit('getCurrentSelectProps', this.currentSelectProps);
+              this.judgeBatchShow();
+              if (this.showBatch) {
+                //满足批量查封/批量抵押按钮出现 即先展示批量表单
+                this.batchUnitClick();
+              } else {
+                //默认选择单元列表第一个
+                this.unitClick(0);
+              }
             }
-          }
-        })
+          })
+        } else {
+          leftMenu(formdata).then((res) => {
+            if (res.code === 200 && res.result) {
+              this.unitData = res.result;
+              window.unitData = res.result;
+              this.currentSelectProps = res.result[0];
+              this.$emit('getCurrentSelectProps', this.currentSelectProps);
+              this.judgeBatchShow();
+              if (this.showBatch) {
+                //满足批量查封/批量抵押按钮出现 即先展示批量表单
+                this.batchUnitClick();
+              } else {
+                //默认选择单元列表第一个
+                this.unitClick(0);
+              }
+            }
+          })
+        }
       },
       //批量按钮判断
       /**

 <!--
  * @Description: workFrame左侧菜单列表-分割
  * @Autor: renchao
- * @LastEditTime: 2023-07-17 16:21:24
+ * @LastEditTime: 2023-07-25 14:52:40
 -->
 <template>
   <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
@@ -53,7 +53,7 @@
 </template>
 <script>
   import { mapGetters } from 'vuex'
-  import { leftMenu, deleteFlow } from "@/api/workFlow.js"
+  import { leftMenu, deleteFlow, jdcxLeftMenu } from "@/api/workFlow.js"
   export default {
     data () {
       return {
@@ -102,26 +102,47 @@
       loadBdcdylist () {
         var formdata = new FormData();
         formdata.append("bsmSlsq", this.bsmSlsq);
-        formdata.append("bestepid", this.bestepid);
+        if (this.$route.query.bestepid) {
+          formdata.append("bestepid", this.bestepid);
+        }
         if (this.$route.query.bsmBusiness) {
           formdata.append("bsmBusiness", this.$route.query.bsmBusiness);
         }
-        leftMenu(formdata).then((res) => {
-          if (res.code === 200 && res.result) {
-            this.aroundUnitData = res.result.filter(item => item.bglx == '1')
-            this.afterUnitData = res.result.filter(item => item.bglx == '2')
-            this.currentSelectProps = res.result[0];
-            this.$emit('getCurrentSelectProps', this.currentSelectProps);
-            this.judgeBatchShow();
-            if (this.showBatch) {
-              //满足批量查封/批量抵押按钮出现 即先展示批量表单
-              this.batchUnitClick();
-            } else {
-              //默认选择单元列表第一个
-              this.unitClick(0);
+        if (this.$route.query.type == 'jdcx') {
+          jdcxLeftMenu(formdata).then((res) => {
+            if (res.code === 200 && res.result) {
+              this.aroundUnitData = res.result.filter(item => item.bglx == '1')
+              this.afterUnitData = res.result.filter(item => item.bglx == '2')
+              this.currentSelectProps = res.result[0];
+              this.$emit('getCurrentSelectProps', this.currentSelectProps);
+              this.judgeBatchShow();
+              if (this.showBatch) {
+                //满足批量查封/批量抵押按钮出现 即先展示批量表单
+                this.batchUnitClick();
+              } else {
+                //默认选择单元列表第一个
+                this.unitClick(0);
+              }
             }
-          }
-        })
+          })
+        } else {
+          leftMenu(formdata).then((res) => {
+            if (res.code === 200 && res.result) {
+              this.aroundUnitData = res.result.filter(item => item.bglx == '1')
+              this.afterUnitData = res.result.filter(item => item.bglx == '2')
+              this.currentSelectProps = res.result[0];
+              this.$emit('getCurrentSelectProps', this.currentSelectProps);
+              this.judgeBatchShow();
+              if (this.showBatch) {
+                //满足批量查封/批量抵押按钮出现 即先展示批量表单
+                this.batchUnitClick();
+              } else {
+                //默认选择单元列表第一个
+                this.unitClick(0);
+              }
+            }
+          })
+        }
       },
       //批量按钮判断
       /**
@@ -178,7 +199,7 @@
           });
       },
 
-    //批量按钮点击事件
+      //批量按钮点击事件
       /**
        * @description: 批量按钮点击事件
        * @author: renchao

@@ -32,6 +32,7 @@
             v-model="tdyt"
             :disabled="!ableOperation"
             noOptionsText="暂无数据"
+            placeholder=''
             :show-count="true"
             :options="dictData['tdyt']"
             :normalizer="normalizer"
@@ -315,5 +316,4 @@
   /deep/.el-table th {
     height: 30px !important;
   }
-
 </style>

@@ -93,7 +93,7 @@
         currentSelectProps: {},
         //是否开启材料分屏
         splitScreen: false,
-         ableOperation:false,
+        ableOperation: false,
         //材料分屏表单
         clxxForm: "",
         //材料信息选择卡索引
@@ -126,7 +126,7 @@
             this.tabList = res.result;
             //默认加载第一个表单信息
             this.tabName = res.result[0].value;
-             this.ableOperation=this.tabList[0].ableOperation
+            this.ableOperation = this.tabList[0].ableOperation
             //批量操作无分屏按钮
             if (index != null) {
               //处理分屏材料信息

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-24 14:04:15
+ * @LastEditTime: 2023-07-25 14:47:41
 -->
 <template>
   <div class="from-clues">
@@ -195,23 +195,7 @@
         this.$popupDialog('楼盘表', 'lpb/index', {
           bsm: ''
         }, '85%')
-      },
-      //  ywhClick (item) {
-      //     const { href } = this.$router.resolve(
-      //      "/djbworkFrame?bdcdyid=" +
-      //      item.bdcdyid+
-      //      "&bdcdyh=" +
-      //      item.bdcdyh+
-      //      "&qllx="+
-      //      item.qllx+
-      //      "&bsmQlxx="+
-      //      item.bsmQlxx+
-      //      "&viewtype=1"
-      //      );
-      //     localStorage.setItem('ywbl', JSON.stringify(item));
-      //     window.open(href, `urlname${item.bdcdyid}`);
-
-      //   },
+      }
     }
   }
 </script>

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-24 14:02:07
+ * @LastEditTime: 2023-07-25 14:47:05
 -->
 <template>
   <div class="from-clues">
@@ -151,7 +151,7 @@
        * @author: renchao
        */
       openDialog (item) {
-        const { href } = this.$router.resolve('/workFrameView?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + item.bsmBusiness + '&viewtype=3')
+        const { href } = this.$router.resolve('/workFrameView?bsmSlsq=' + item.bsmSlsq + '&bsmBusiness=' + item.bsmBusiness + '&viewtype=3'+ '&type=jdcx')
         window.open(href, `urlname${item.bsmSlsq}`)
       }
     }