26791

packages/2.0.5/AppGridBlock/components/add.vue

@@ -142,7 +142,7 @@
               <el-form-item label="网格地址" prop="address">
                 <el-input v-model="forms.address" placeholder="限200字" maxlength="200"></el-input>
               </el-form-item>
-              <el-form-item label="网格范围" prop="enclosure">
+              <el-form-item label="网格范围" prop="enclosure" v-if="forms.girdLevel === '2' || isAddLastLevel">
                 <el-button size="small" @click="showMap = true">地图标绘</el-button>
               </el-form-item>
             </template>
@@ -261,6 +261,7 @@ export default {
       polyEditor: "",
       title: "添加网格区块",
       parentGirdInfo: {},
+      isAddLastLevel: false
     };
   },
   computed: {
@@ -309,6 +310,7 @@ export default {
     } else {
       this.forms.parentGirdId = this.params.id;
       this.forms.parentGirdName = this.params.girdName;
+      this.isAddLastLevel = this.params.girdLevel === '1'
       // this.forms.girdLevel = Number(this.info.girdLevel) + 1 +'';
       // this.forms.isLastLevel = ['0','1'].includes(this.forms.girdLevel)?'0':'1';
       this.title = "添加网格区块";
@@ -508,9 +510,8 @@ export default {
       }).then((res) => {
         if (res?.data) {
           this.forms = {...res.data};
-          this.parentGirdInfo = this.forms.parentGirdInfo;
+          this.parentGirdInfo = res.data.parentGirdInfo;
-          this.forms.parentGirdName = this.parentGirdInfo.girdName;
+          this.forms.parentGirdName = res.data.parentGirdInfo && res.data.parentGirdInfo.girdName;
-          // this.forms.isLastLevel =this.forms.girdLevel;
         }
       });
     },

packages/2.0.5/AppGridBlock/components/list.vue

@@ -75,7 +75,7 @@
             <el-button
               type="primary"
               icon="iconfont iconAdd"
-              :disabled="info.girdLevel != '1'"
+              :disabled="info.girdLevel === '3'"
               @click="(isEdit = false), toAdd()"
               >新增
             </el-button>