Merge remote-tracking branch 'origin/master'

-<!--
-  功能：申请单元列表批量删除
-  作者：calliope
--->
 <template>
 <template>
   <div class='batchDel'>
   <div class='batchDel'>
     <lb-table :column="columns" :data="formData.dataList" :maxHeight="460" :heightNumSetting="true" :pagination="false"
     <lb-table :column="columns" :data="formData.dataList" :maxHeight="460" :heightNumSetting="true" :pagination="false"

@@ -42,7 +42,7 @@ export default {
             this.judgeBatchShow();
             this.judgeBatchShow();
             if (this.showBatch) {
             if (this.showBatch) {
               //满足批量查封/批量抵押按钮出现 即先展示批量表单
               //满足批量查封/批量抵押按钮出现 即先展示批量表单
-              this.unitClick(-1);
+              this.batchUnitClick();
             } else {
             } else {
               //默认选择单元列表第一个
               //默认选择单元列表第一个
               this.unitClick(0);
               this.unitClick(0);
@@ -54,8 +54,8 @@ export default {
     //批量按钮判断
     //批量按钮判断
     judgeBatchShow () {
     judgeBatchShow () {
       this.showBatch = false;
       this.showBatch = false;
-      let qllx = this.$route.query.sqywbm.substring(0, 3);
       if (this.unitData.length > 1) {
       if (this.unitData.length > 1) {
+        let qllx = this.$route.query.sqywbm.substring(0, 3);
         switch (qllx) {
         switch (qllx) {
           case 'B39':
           case 'B39':
             this.showBatch = true;
             this.showBatch = true;
@@ -65,6 +65,8 @@ export default {
             this.showBatch = true;
             this.showBatch = true;
             this.batchButtonName = '批量抵押';
             this.batchButtonName = '批量抵押';
             break;
             break;
+          default:
+            this.batchButtonName = '批量操作';
         }
         }
       }
       }
     },
     },
@@ -279,6 +281,22 @@ export default {
           message: "action: " + action
           message: "action: " + action
         })
         })
       })
       })
+    },
+    //批量操作
+    handleBatchDel () {
+      let that = this;
+      this.$popup("批量删除", "workflow/components/batchDel", {
+        width: "50%",
+        btnShow: true,
+        height: "600px",
+        formData: {
+          bsmSlsq: this.bsmSlsq,
+          dataList: this.unitData,
+        },
+        confirm: function () {
+          that.loadBdcdylist();
         }
         }
+      })
+    },   
   }
   }
 }
 }

@@ -20,15 +20,13 @@ export default {
     },
     },
     //切换选项卡内容组件
     //切换选项卡内容组件
     getFromRouter (tabname) {
     getFromRouter (tabname) {
-      //根据tabname获取选中的表单 
+      //根据tabname获取选中的表单  此操作为了获取后端返回的表单对象，使用里面的是否可操作的属性
       for(let item of this.tabList){
       for(let item of this.tabList){
         if(item.value === tabname){
         if(item.value === tabname){
           this.currentSelectTab = item
           this.currentSelectTab = item
           break;
           break;
         }
         }
       }
       }
-      console.log(this.currentSelectTab);
-      
       this.componentTag = getForm(tabname, this.$route.query.sqywbm);
       this.componentTag = getForm(tabname, this.$route.query.sqywbm);
     }
     }
   }
   }

@@ -22,7 +22,7 @@
     <div class="containerFrame">
     <div class="containerFrame">
       <!-- 左侧菜单栏 -->
       <!-- 左侧菜单栏 -->
       <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
       <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
-        <div class="title" @click="unitClick(-1)">{{ batchButtonName }}</div>
+        <div class="title" @click="batchUnitClick" v-if="showBatch">{{ batchButtonName }}</div>
         <div v-if="this.isShowdrawer">
         <div v-if="this.isShowdrawer">
           <div class="title">
           <div class="title">
             申请单元列表({{ unitData.length }})
             申请单元列表({{ unitData.length }})
@@ -115,7 +115,11 @@ export default {
       //材料信息选项卡对象
       //材料信息选项卡对象
       clxxTab: {},
       clxxTab: {},
       //页面监听时间
       //页面监听时间
-      _beforeUnload_time: ""
+      _beforeUnload_time: "",
+      //批量操作
+      showBatch: false,
+      //批量操作按钮名称
+      batchButtonName: '',
     }
     }
   },
   },
   mounted () {
   mounted () {
@@ -176,29 +180,8 @@ export default {
           });
           });
         });
         });
     },
     },
-    handleBatchDel () {
-      let that = this;
-      this.$popup("批量删除", "workflow/components/batchDel", {
-        width: "50%",
-        btnShow: true,
-        height: "600px",
-        formData: {
-          bsmSlsq: this.bsmSlsq,
-          dataList: this.unitData,
-        },
-        confirm: function () {
-          that.loadBdcdylist();
-        }
-      })
-    },
     //申请单元点击事件
     //申请单元点击事件
-    unitClick (index) {
-      if (index >= 0) {
-        this.currentSelectProps = this.unitData[index];
-        this.currentSelectProps.batchOperation = false;
-      } else {
-        this.currentSelectProps.batchOperation = true;
-      }
+    stepForm (index) {
       getStepFormInfo(this.currentSelectProps).then((res) => {
       getStepFormInfo(this.currentSelectProps).then((res) => {
         if (res.code === 200) {
         if (res.code === 200) {
           this.fresh++;
           this.fresh++;
@@ -206,6 +189,8 @@ export default {
           this.tabList = res.result;
           this.tabList = res.result;
           //默认加载第一个表单信息
           //默认加载第一个表单信息
           this.tabName = res.result[0].value;
           this.tabName = res.result[0].value;
+          //批量操作无分屏按钮 
+          if(index != null){
             //处理分屏材料信息  
             //处理分屏材料信息  
             let that = this;
             let that = this;
             this.tabList.forEach(function (item, index) {
             this.tabList.forEach(function (item, index) {
@@ -216,7 +201,19 @@ export default {
               }
               }
             })
             })
           }
           }
+        }
       })
       })
+    },
+    //申请单元点击事件
+    unitClick (index) {
+      this.currentSelectProps = this.unitData[index];
+      this.currentSelectProps.batchOperation = false;
+      this.stepForm(index);
+    },
+    //批量按钮点击事件
+    batchUnitClick(){
+      this.currentSelectProps.batchOperation = true;
+      this.stepForm();
     }
     }
   }
   }
 }
 }

@@ -81,7 +81,7 @@
           </el-col>
           </el-col>
           <el-col :span="8">
           <el-col :span="8">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="查封起始时间：" prop="cfdj.cfqssj">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="查封起始时间：" prop="cfdj.cfqssj">
-              <el-date-picker v-model="ruleForm.cfdj.cfqssj" class="width100" disabled type="date" placeholder="选择日期"
+              <el-date-picker v-model="ruleForm.cfdj.cfqssj" class="width100" type="date" placeholder="选择日期"
                 value-format="yyyy-MM-dd"></el-date-picker>
                 value-format="yyyy-MM-dd"></el-date-picker>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>

@@ -126,7 +126,7 @@
           </el-col>
           </el-col>
           <el-col :span="8">
           <el-col :span="8">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="查封起始时间：" prop="cfdj.cfqssj">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="查封起始时间：" prop="cfdj.cfqssj">
-              <el-date-picker v-model="ruleForm.cfdj.cfqssj" class="width100" disabled type="date" placeholder="选择日期"
+              <el-date-picker v-model="ruleForm.cfdj.cfqssj" class="width100" type="date" placeholder="选择日期"
                 value-format="yyyy-MM-dd"></el-date-picker>
                 value-format="yyyy-MM-dd"></el-date-picker>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>

@@ -3,7 +3,7 @@ export default {
     jump (data, type) {
     jump (data, type) {
       this.$emit("closeDialog");
       this.$emit("closeDialog");
       const { href } = this.$router.resolve(
       const { href } = this.$router.resolve(
-        "/workFrame?bsmSlsq=" +
+        "/workFramecs?bsmSlsq=" +
         data.bsmSlsq +
         data.bsmSlsq +
         "&bestepid=" +
         "&bestepid=" +
         data.bestepid + '&bsmBusiness=' + '&sqywbm=' + type
         data.bestepid + '&bsmBusiness=' + '&sqywbm=' + type

@@ -165,7 +165,7 @@ export default {
             type: "success",
             type: "success",
           });
           });
           if (!this.isJump) {
           if (!this.isJump) {
-            this.jump(res.result, this.djywbm);
+            this.jump(res.result, this.sqywInfo.djywbm);
           } else {
           } else {
             this.$emit("updateDialog", true);
             this.$emit("updateDialog", true);
           }
           }