修改报表标题，机构补充信息按钮都显示，其他类型只能补充 天气行政区域

src/views/core/reportForms/drill.vue

@@ -75,7 +75,7 @@
     </div>
 
     <div class="main-search-box" style="margin-bottom: 0;">
-      <h1 style="text-align:center;">演练统计报表</h1>
+      <h1 style="text-align:center;">预案演练情况表</h1>
     </div>
     <el-table
       v-loading="loading"

src/views/core/reportForms/eduTraining.vue

@@ -79,7 +79,7 @@
     </div>
 
     <div class="main-search-box" style="margin-bottom: 0;">
-      <h1 style="text-align:center;">教育统计报表</h1>
+      <h1 style="text-align:center;">教育培训情况表</h1>
     </div>
     <el-table
       v-loading="loading"

src/views/system/dept/extend.vue

@@ -33,7 +33,7 @@
           </el-descriptions>
         </div>
       </div>
-      <div class="extend_mod ">
+      <div class="extend_mod" v-if="canShowGA38()">
         <div class="info-box">
           <h3 class="title">
             <i class="el-icon-collection-tag"></i>
@@ -144,13 +144,13 @@
         <div class="info-box">
           <el-descriptions class="margin-top" :column="3" size="medium" border>
 
-            <el-descriptions-item v-if="type === org_type.yewd" labelClassName="gx_info_label" label="行政区域气象">
+            <el-descriptions-item labelClassName="gx_info_label" label="气象行政区域">
               <el-cascader
                 clearable
                 v-model="weatherAreaCode"
                 :options="areaList"
                 @change="selectArea"
-                placeholder="请选择行政区域气象"
+                placeholder="请选择气象行政区域"
               ></el-cascader>
             </el-descriptions-item>
             <el-descriptions-item v-if="type === org_type.yewd" labelClassName="gx_info_label" label="产权类型">
@@ -592,7 +592,7 @@ export default {
       dataInfo: [],
       //机构补充信息
       extendId: null,
-      orgType: 1,
+      orgType: null,
       weatherAreaCode: null,
       premisesArea: null,
       ownership: null,
@@ -1229,6 +1229,14 @@ export default {
         this.detachedtitle = "编辑安全防范设施建设达标信息";
       });
     },
+    canShowGA38(){     
+      // console.log("canShowGA38",this.type  ,this.type == '4' || this.type == '10' || this.type == '5') 
+      if(this.type == '4' || this.type == '10' || this.type == '5')
+      {
+        return true;
+      }
+      return false;       
+    },
     /** 提交按钮 */
     submitdetachedForm() {
       if (this.detachedimgs.length > 0) {
@@ -1396,6 +1404,10 @@ export default {
         });
     },
     saveExtend() {
+      if(!this.validBeforeSaveExtend())
+      {
+        return;
+      }
       let dat = {
         safeBox: this.safeBox ? 1 : 0,
         innerCount: this.innerCount,
@@ -1444,6 +1456,25 @@ export default {
         });
       }
     },
+    validBeforeSaveExtend()
+    {
+      if(this.weatherAreaCode==null)
+      {
+        this.$modal.msgError("气象行政区域不能为空，请选择气象行政区域");
+        return false;
+      }
+      if(this.type === this.org_type.yewd && this.ownership==null)
+      {
+        this.$modal.msgError("产权类型不能为空，请选择产权类型");
+        return false;
+      } 
+      if(this.type === this.org_type.yewd && this.outsideArea==null)
+      {
+        this.$modal.msgError("所在位置不能为空，请选择所在位置");
+        return false;
+      }      
+      return true;   
+    },
     nosaveExtend() {
       // this.$router.go(-1);
       this.$tab.closePageAndPushPrev();

src/views/system/dept/index.vue

@@ -225,12 +225,12 @@
                    :to="'/system/dept-extend/extend/' + scope.row.id"
                    class="link-type"
                  > -->
-                <el-button
-                  v-if="
+                 <!-- v-if="
                     scope.row.type == 4 ||
                     scope.row.type == 10 ||
                     scope.row.type == 5
-                  "
+                  " -->
+                <el-button                  
                   size="mini"
                   type="text"
                   icon="el-icon-plus"