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

@@ -17,7 +17,7 @@
     <div class="thumb-wrap">
       <div class="thumb-wrap-button">
         <el-button type="primary" @click="clickImage">（放大） 显示（缩小）</el-button>
-        <el-upload class="fileUpdate" action="" :show-file-list="false" multiple :limit="5" :auto-upload="false"
+        <el-upload class="fileUpdate" action="" :show-file-list="false" multiple :auto-upload="false"
           :on-change="handleChange" accept=".JPG, .PNG, .JPEG,.jpg, .png, .jpeg" :before-upload="beforeUpload">
           <el-button icon="el-icon-upload" type="primary">上传</el-button>
         </el-upload>

@@ -29,7 +29,7 @@
             </el-collapse-transition>
           </div>
         </div>
-        <image-preview :previewImg="previewImg" @updateList="updateList" />
+        <image-preview ref='imageRef' :previewImg="previewImg" @updateList="updateList" />
       </div>
     </div>
     <clxxAddDialog v-model="isDialog" />
@@ -233,6 +233,7 @@ export default {
       })
     },
     updateList (val) {
+      if(val!=null){ //删除最后一张图片时 val=null
         this.tableData.forEach(item => {
         if (item.bsmSj === val.bsmSj) {
           item.children = val.children
@@ -242,6 +243,15 @@ export default {
       if (this.previewImg.index == this.previewImg.imgList.length) {
         this.previewImg.index = this.previewImg.index - 1
       }
+      }else{
+        this.previewImg.imgList = []
+        this.tableData.forEach(item => {
+          if(this.treeCheckId == item.bsmSj){
+             item.children = []
+          }
+      })
+      }
+     
     },
     // 左侧菜单点击
     menuClick (item) {

@@ -145,6 +145,8 @@ export default {
     },
     //流程环节操作按钮
     operation (index, item) {
+      //按钮 B1:流程图 B2:材料分屏 B3:材料导入 B4:登记簿 B5:证书预览 B6：打印申请书
+      //操作按钮 登簿：record  转件：transfer  退回：back  退出：signout
       let that = this;
       switch (item.value) {
         case "B1":
@@ -157,10 +159,10 @@ export default {
             })
           })
           break;
-        case "zsyl":
+        case "B5":
           this.zsylFlag = true;
           break;
-        case "clfp": //材料分屏按钮
+        case "B2": //材料分屏按钮
           this.splitScreen = this.splitScreen ? false : true;
           this.$store.dispatch('app/settScreen', this.splitScreen)
           if (this.splitScreen) {
@@ -174,9 +176,9 @@ export default {
             this.tabList.splice(this.clxxIndex, 1, this.clxxTab);
           }
           break;
-        case "th": //退回按钮
+        case "back": //退回按钮
           break;
-        case "zc": //转件按钮
+        case "transfer": //转件按钮
           getNextLinkInfo({
             bsmSlsq: this.bsmSlsq,
             bestepid: this.bestepid,
@@ -186,10 +188,10 @@ export default {
             }
           });
           break;
-        case "tc":
+        case "signout":
           window.close();
           break;
-        case "db":
+        case "record":
           var formdata = new FormData();
           formdata.append("bsmSlsq", this.bsmSlsq);
           formdata.append("bestepid", this.bestepid);