--no commit message

@@ -136,7 +136,7 @@
           </el-col>
 
           <el-col :span="8">
-            <el-form-item label="预告登记种类">
+            <el-form-item label="预告登记种类"  prop="ygdj.ygdjlx" :rules="rules.ygdjlxrules">
               <el-select v-model="ruleForm.ygdj.ygdjlx">
                 <el-option
                   v-for="item in dictData['A29']"
@@ -375,6 +375,7 @@ export default {
         djjgrules: [{ required: true, message: "登记机构", trigger: "change" }],
         dbrrules: [{ required: true, message: "登簿人", trigger: "blur" }],
         djsjrules: [{ required: true, message: "登记时间", trigger: "change" }],
+        ygdjlxrules: [{ required: true, message: "预告登记种类", trigger: "change" }],
       },
     };
   },

@@ -35,7 +35,7 @@ export default {
       batchButtonName: '',
       // 受理申请信息
       slsq: {},
-      isshow:true
+      ableOperation:true
     }
   },
   mounted () {
@@ -60,9 +60,12 @@ export default {
             })
 
             if(arr.length){
-              this.$refs.Menu.getleftMenubl(1);
-            }else{
+              console.log("1111111111111111111");
               this.$refs.Menu.getleftMenubl();
+            }else{
+              this.ableOperation=false
+              console.log("22222222222222");
+              this.$refs.Menu.getleftMenubl(1);
             }
         }
       })

@@ -22,7 +22,12 @@
           <template slot-scope="scope">
           <i
             class="el-icon-minus pointer"
-            @click="deleClick(scope.$index, scope.row)"></i>
+            @click="deleClick(scope.$index, scope.row)"
+            v-if="!$route.query.viewtype == 1"
+          ></i>
+            <div style="text-align:center;" v-else>
+            {{ scope.$index+1}}
+          </div>
         </template>
       </el-table-column>
       <el-table-column prop="yt" label="土地用途" min-width="100">

@@ -217,7 +217,7 @@
                 "&sqywbm=" +
                 item.djywbm
               );
-               window.open(href, `urlname${item.bsmSlsq}`);
+               window.open(href, `djbworkFrame${item.bsmSlsq}`);
               }else{
                      const { href } = this.$router.resolve(
                 "/workFrame?bsmSlsq=" +
@@ -228,7 +228,7 @@
                 "&sqywbm=" +
                 item.djywbm
               );
-               window.open(href, `urlname${item.bsmSlsq}`);
+               window.open(href, `workFrame${item.bsmSlsq}`);
               }
 
               localStorage.setItem('ywbl', JSON.stringify(item));

@@ -202,7 +202,7 @@
             "&bsmBusiness=" +
             "&viewtype=1"
           );
-          window.open(href, `urlname${item.bsmSlsq}`);
+          window.open(href, `djbworkFrameview${item.bsmSlsq}`);
         } else {
           const { href } = this.$router.resolve(
             "/workFrameView?bsmSlsq=" +
@@ -212,7 +212,7 @@
             "&bsmBusiness=" +
             "&viewtype=1"
           );
-          window.open(href, `urlname${item.bsmSlsq}`);
+          window.open(href, `workFrameView${item.bsmSlsq}`);
         }