机构扩展信息页面调整

src/views/system/dept/extend.vue

@@ -19,15 +19,15 @@
             </el-descriptions-item
             >
             <el-descriptions-item labelClassName="gx_info_label" label="机构组织类型" v-if="false">{{
-              getLabel(dict.type.reality_org_type, orgType)
+                getLabel(dict.type.reality_org_type, orgType)
               }}
             </el-descriptions-item>
             <el-descriptions-item labelClassName="gx_info_label" label="是否停用">{{
-              isLock == 1 ? "是" : "否"
+                isLock == 1 ? "是" : "否"
               }}
             </el-descriptions-item>
             <el-descriptions-item labelClassName="gx_info_label" label="机构类型">{{
-              getLabel(dict.type.sys_org_type, type)
+                getLabel(dict.type.sys_org_type, type)
               }}
             </el-descriptions-item>
           </el-descriptions>
@@ -78,15 +78,17 @@
               width="220"
             >
               <template slot-scope="scope">
-                <span> {{  scope.row.standard === '3'  ? formatTime(scope.row.dateOfComplete, "YYYY-MM-DD") : formatTime(scope.row.dateOfCompliance, "YYYY-MM-DD") }}</span>
+                <span> {{
+                    scope.row.standard === '3' ? formatTime(scope.row.dateOfComplete, "YYYY-MM-DD") : formatTime(scope.row.dateOfCompliance, "YYYY-MM-DD")
+                  }}</span>
               </template>
             </el-table-column>
 
             <el-table-column v-if="false"
-              label="备注"
-              align="center"
-              prop="reason"
-              width="280"
+                             label="备注"
+                             align="center"
+                             prop="reason"
+                             width="280"
             >
             </el-table-column>
 
@@ -143,7 +145,6 @@
         <!--监控中心的补充信息-->
         <div class="info-box">
           <el-descriptions class="margin-top" :column="3" size="medium" border>
-
             <el-descriptions-item labelClassName="gx_info_label" label="气象行政区域">
               <el-cascader
                 clearable
@@ -153,7 +154,7 @@
                 placeholder="请选择气象行政区域"
               ></el-cascader>
             </el-descriptions-item>
-            <el-descriptions-item v-if="type === org_type.yewd" labelClassName="gx_info_label" label="产权类型">
+            <el-descriptions-item v-if="type === org_type.yewd" labelClassName="gx_info_label" label="产权类型" >
               <el-select
                 clearable
                 v-model="ownership"
@@ -167,7 +168,7 @@
                 ></el-option>
               </el-select>
             </el-descriptions-item>
-            <el-descriptions-item v-if="type === org_type.yewd" labelClassName="gx_info_label" label="所在位置">
+            <el-descriptions-item v-if="type === org_type.yewd" labelClassName="gx_info_label" label="所在位置" >
               <el-select
                 clearable
                 v-model="outsideArea"
@@ -181,55 +182,70 @@
                 ></el-option>
               </el-select>
             </el-descriptions-item>
-
-            <el-descriptions-item v-if="type === org_type.yewd" labelClassName="gx_info_label" label="是否设立在行式自助银行">
+            <el-descriptions-item v-if="type === org_type.yewd" labelClassName="gx_info_label" label="夜间值守方式" :contentStyle='contentStyle' :labelStyle='labelStyle'>
+              <el-select
+                clearable
+                v-model="dutyMode"
+                placeholder="请选择夜间值守方式"
+              >
+                <el-option
+                  v-for="dict in dict.type.duty_options"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-descriptions-item>
+            <el-descriptions-item v-if="type === org_type.yewd" labelClassName="gx_info_label" label="是否设立保管箱库" :contentStyle='contentStyle' :labelStyle='labelStyle'>
+              <el-radio-group v-model="safeBox">
+                <el-radio :label="1">是</el-radio>
+                <el-radio :label="0">否</el-radio>
+              </el-radio-group>
+            </el-descriptions-item>
+          </el-descriptions>
+          <el-descriptions class="margin-top" :column="3" size="medium" border>
+            <el-descriptions-item label="是否设立在行式自助银行" v-if="type === org_type.yewd"  :contentStyle='contentStyle' :labelStyle='labelStyle' labelClassName="gx_info_label">
               <el-radio-group v-model="selfServiceBank">
                 <el-radio :label="1">是</el-radio>
                 <el-radio :label="0">否</el-radio>
               </el-radio-group>
             </el-descriptions-item>
 
-            <el-descriptions-item v-if="type === org_type.yewd || type === org_type.lhzz" labelClassName="gx_info_label" label="大堂式设备">
+          </el-descriptions>
+
+          <el-descriptions class="margin-top" :column="3" size="medium" border>
+            <el-descriptions-item label="穿墙式设备" v-if="(type === org_type.yewd || type === org_type.lhzz)&&selfServiceBank==1" labelClassName="gx_info_label" :contentStyle='contentStyle' :labelStyle='labelStyle'>
               <el-input-number
-                v-model="lobbyEquipment"
+                v-model="wallPenetratingEquipment"
                 controls-position="right"
                 @change="handleChange"
                 :min="0"
                 :max="999"
               ></el-input-number>
             </el-descriptions-item>
-
-            <el-descriptions-item v-if="type === org_type.yewd || type === org_type.lhzz" labelClassName="gx_info_label" label="穿墙式设备">
+            <el-descriptions-item label="大堂式设备" v-if="(type === org_type.yewd || type === org_type.lhzz)&&selfServiceBank==1"
+                                  labelClassName="gx_info_label" :contentStyle='contentStyle' :labelStyle='labelStyle'>
               <el-input-number
-                v-model="wallPenetratingEquipment"
+                v-model="lobbyEquipment"
                 controls-position="right"
                 @change="handleChange"
                 :min="0"
                 :max="999"
               ></el-input-number>
             </el-descriptions-item>
+          </el-descriptions>
 
-            <el-descriptions-item v-if="type === org_type.yewd" labelClassName="gx_info_label" label="是否设立保管箱库">
-              <el-radio-group v-model="safeBox">
-                <el-radio :label="1">是</el-radio>
-                <el-radio :label="0">否</el-radio>
-              </el-radio-group>
-            </el-descriptions-item>
-
-
-            <el-descriptions-item v-if="type === org_type.yewd" labelClassName="gx_info_label" label="是否设立网点业务库">
+          <el-descriptions class="margin-top" :column="3" size="medium" border>
+            <el-descriptions-item label="是否设立网点业务库" v-if="type === org_type.yewd" :contentStyle='contentStyle' :labelStyle='labelStyle'  labelClassName="gx_info_label">
               <el-radio-group v-model="businessLibrary">
                 <el-radio :label="1">是</el-radio>
                 <el-radio :label="0">否</el-radio>
               </el-radio-group>
             </el-descriptions-item>
-
-            <el-descriptions-item v-if="type === org_type.yewd" labelClassName="gx_info_label" label="业务库类型">
-              <el-select
-                clearable
-                v-model="businessLibraryType"
-                placeholder="请选择业务库类型"
-              >
+          </el-descriptions>
+          <el-descriptions class="margin-top" :column="3" size="medium" border>
+            <el-descriptions-item label="业务库类型" v-if="(type === org_type.yewd)&&businessLibrary==1" :contentStyle='contentStyle' :labelStyle='labelStyle'  labelClassName="gx_info_label">
+              <el-select clearable v-model="businessLibraryType" placeholder="请选择业务库类型" >
                 <el-option
                   v-for="dict in dict.type.business_library_type"
                   :key="dict.value"
@@ -238,30 +254,36 @@
                 ></el-option>
               </el-select>
             </el-descriptions-item>
-
-            <el-descriptions-item v-if="type === org_type.yewd" labelClassName="gx_info_label" label="夜间值守方式">
-              <el-select
-                clearable
-                v-model="dutyMode"
-                placeholder="请选择夜间值守方式"
-              >
-                <el-option
-                  v-for="dict in dict.type.duty_options"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
-              </el-select>
+            <el-descriptions-item label="出入口远程控制与授权"  v-if="(type === org_type.jkzx || type === org_type.yewd|| type === org_type.lhzz || type === org_type.zxywk)&&businessLibrary==1"
+              labelClassName="gx_info_label" >
+              <el-radio-group v-model="remoteControl">
+                <el-radio :label="1">是</el-radio>
+                <el-radio :label="0">否</el-radio>
+              </el-radio-group>
             </el-descriptions-item>
+            <el-descriptions-item label="业务库防控隔离门出入口数量"
+              v-if="(type === org_type.jkzx || type === org_type.yewd || type === org_type.zxywk)&&businessLibrary==1"
+                                  labelClassName="gx_info_label" >
+              <el-input-number
+                v-model="remoteCount"
+                controls-position="right"
+                @change="handleChange"
+                :min="0"
+                :max="999"
+              ></el-input-number>
+            </el-descriptions-item>
+          </el-descriptions>
 
-            <el-descriptions-item v-if="type === org_type.yewd" labelClassName="gx_info_label" label="是否配备保安人员">
+          <el-descriptions class="margin-top" :column="3" size="medium" border>
+            <el-descriptions-item label="是否配备保安人员" v-if="type === org_type.yewd" :contentStyle='contentStyle' :labelStyle='labelStyle'  labelClassName="gx_info_label" >
               <el-radio-group v-model="askari">
                 <el-radio :label="1">是</el-radio>
                 <el-radio :label="0">否</el-radio>
               </el-radio-group>
             </el-descriptions-item>
-
-            <el-descriptions-item v-if="type === org_type.yewd" labelClassName="gx_info_label" label="内部保安人数">
+          </el-descriptions>
+          <el-descriptions class="margin-top" :column="3" size="medium" border>
+            <el-descriptions-item v-if="(type === org_type.yewd)&&askari==1" labelClassName="gx_info_label" label="内部保安人数" :contentStyle='contentStyle' :labelStyle='labelStyle'>
               <el-input-number
                 v-model="innerCount"
                 controls-position="right"
@@ -270,8 +292,7 @@
                 :max="999"
               ></el-input-number>
             </el-descriptions-item>
-
-            <el-descriptions-item v-if="type === org_type.yewd" labelClassName="gx_info_label" label="外聘保安人数">
+            <el-descriptions-item v-if="(type === org_type.yewd)&&askari==1" labelClassName="gx_info_label" label="外聘保安人数" :contentStyle='contentStyle' :labelStyle='labelStyle'>
               <el-input-number
                 v-model="outsideCount"
                 controls-position="right"
@@ -280,7 +301,23 @@
                 :max="999"
               ></el-input-number>
             </el-descriptions-item>
+            <el-descriptions-item v-if="(type === org_type.yewd)&&askari==1" labelClassName="gx_info_label" label="是否取得保安证书">
+              <el-radio-group v-model="isAskariCertificate">
+                <el-radio :label="1">是</el-radio>
+                <el-radio :label="0">否</el-radio>
+              </el-radio-group>
+            </el-descriptions-item>
+            <el-descriptions-item v-if="(type === org_type.yewd)&&isAskariCertificate==1" labelClassName="gx_info_label" label="上传保安证" :contentStyle='contentStyle' :labelStyle='labelStyle'>
+              <image-upload
+                :limit="5"
+                :value="askariCertificate"
+                @input="getImgUrl"
+              ></image-upload>
+            </el-descriptions-item>
+
+          </el-descriptions>
 
+          <el-descriptions class="margin-top" :column="3" size="medium" border>
             <el-descriptions-item v-if="type === org_type.jkzx" labelClassName="gx_info_label" label="建设时间">
               <el-date-picker
                 clearable
@@ -315,25 +352,8 @@
                 ></el-option>
               </el-select>
             </el-descriptions-item>
-
-            <el-descriptions-item v-if="type === org_type.jkzx || type === org_type.yewd|| type === org_type.lhzz || type === org_type.zxywk" labelClassName="gx_info_label" label="出入口远程控制与授权">
-              <el-radio-group v-model="remoteControl">
-                <el-radio :label="1">是</el-radio>
-                <el-radio :label="0">否</el-radio>
-              </el-radio-group>
-            </el-descriptions-item>
-
-            <el-descriptions-item v-if="type === org_type.jkzx || type === org_type.yewd || type === org_type.zxywk" labelClassName="gx_info_label" label="业务库防控隔离门出入口数量">
-              <el-input-number
-                v-model="remoteCount"
-                controls-position="right"
-                @change="handleChange"
-                :min="0"
-                :max="999"
-              ></el-input-number>
-            </el-descriptions-item>
-
-            <el-descriptions-item v-if="type === org_type.jkzx || type === org_type.lhzz  " labelClassName="gx_info_label" label="离行式加钞间出入口数量">
+            <el-descriptions-item v-if="type === org_type.jkzx || type === org_type.lhzz  "
+                                  labelClassName="gx_info_label" label="离行式加钞间出入口数量">
               <el-input-number
                 v-model="cashAddingRoom"
                 controls-position="right"
@@ -342,15 +362,6 @@
                 :max="999"
               ></el-input-number>
             </el-descriptions-item>
-
-            <el-descriptions-item v-if="type === org_type.yewd" labelClassName="gx_info_label" label="上传保安证">
-              <image-upload
-                :limit="5"
-                :value="askariCertificate"
-                @input="getImgUrl"
-              ></image-upload>
-            </el-descriptions-item>
-            
             <el-descriptions-item v-if="type === org_type.jkzx" labelClassName="gx_info_label" label="全辖摄像头总路数">
               <el-input-number
                 v-model="totalCameraCount"
@@ -360,7 +371,6 @@
                 :max="999999"
               ></el-input-number>
             </el-descriptions-item>
-          </el-descriptions>
             <el-descriptions-item v-if="type === org_type.jkzx" labelClassName="gx_info_label" label="全辖高清摄像头路数">
               <el-input-number
                 v-model="hdCameraCount"
@@ -370,12 +380,12 @@
                 :max="999999"
               ></el-input-number>
             </el-descriptions-item>
-           
+          </el-descriptions>
+
         </div>
       </div>
 
 
-
       <div style="
       line-height: 50px;
       width: 100%;
@@ -440,7 +450,8 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item v-show="orgform.standard === '2' || orgform.standard === '1'" label="达标日期" prop="dateOfCompliance">
+        <el-form-item v-show="orgform.standard === '2' || orgform.standard === '1'" label="达标日期"
+                      prop="dateOfCompliance">
           <el-date-picker
             clearable
             v-model="orgform.dateOfCompliance"
@@ -450,7 +461,7 @@
           >
           </el-date-picker>
         </el-form-item>
-        <el-form-item v-show="orgform.standard === '3'" label="计划达标日期" >
+        <el-form-item v-show="orgform.standard === '3'" label="计划达标日期">
           <el-date-picker
             clearable
             v-model="orgform.dateOfComplete"
@@ -460,7 +471,7 @@
           >
           </el-date-picker>
         </el-form-item>
-        <el-form-item v-show="orgform.standard === '3'" label="未达标原因" >
+        <el-form-item v-show="orgform.standard === '3'" label="未达标原因">
           <el-input type="textarea" rows="5" v-model="orgform.reason" placeholder="请输入未达标原因"/>
         </el-form-item>
 
@@ -495,42 +506,43 @@
 </template>
 
 <script>
- import ImgsUpload from "@/components/ImgsUpload";
-  import uploadpng from "@/assets/images/upload.png";
-  import uplpng from "@/assets/images/upl.png";
-  import request from "@/utils/request";
-  import {statusOptions, getLabel} from "./../../commonOption";
-  import {
-    listExtend,
-    getExtend,
-    addExtend,
-    updateExtend,
-    delExtend,
-    getExtendByOrgId,
-    uploadFile,
-  } from "@/api/system/extend";
-
-  import {
-    listDept,
-    getDept,
-    delDept,
-    addDept,
-    updateDept,
-    listDeptExcludeChild,
-  } from "@/api/system/dept";
-
-  import {
-    listOrgPhysicalDefenseConstruction,
-    getOrgPhysicalDefenseConstruction,
-    addOrgPhysicalDefenseConstruction,
-    updateOrgPhysicalDefenseConstruction,
-    delOrgPhysicalDefenseConstruction,
-  } from "@/api/system/OrgPhysicalDefenseConstruction";
-  import {selectCityInfoVoList} from "@/api/core/weather";
-  import TreeNodeDialogVue from "../../tool/build/TreeNodeDialog.vue";
+import ImgsUpload from "@/components/ImgsUpload";
+import uploadpng from "@/assets/images/upload.png";
+import uplpng from "@/assets/images/upl.png";
+import request from "@/utils/request";
+import {statusOptions, getLabel} from "./../../commonOption";
+import {
+  listExtend,
+  getExtend,
+  addExtend,
+  updateExtend,
+  delExtend,
+  getExtendByOrgId,
+  uploadFile,
+} from "@/api/system/extend";
+
+import {
+  listDept,
+  getDept,
+  delDept,
+  addDept,
+  updateDept,
+  listDeptExcludeChild,
+} from "@/api/system/dept";
+
+import {
+  listOrgPhysicalDefenseConstruction,
+  getOrgPhysicalDefenseConstruction,
+  addOrgPhysicalDefenseConstruction,
+  updateOrgPhysicalDefenseConstruction,
+  delOrgPhysicalDefenseConstruction,
+} from "@/api/system/OrgPhysicalDefenseConstruction";
+import {selectCityInfoVoList} from "@/api/core/weather";
+import TreeNodeDialogVue from "../../tool/build/TreeNodeDialog.vue";
+
 export default {
   dicts: [
-  "duty_options",
+    "duty_options",
     "sys_org_type",
     "org_platform_brand",
     "org_platform_supplier_brand",
@@ -566,7 +578,14 @@ export default {
       }
     };
     return {
-      org_type:{
+      //内容样式
+      contentStyle: {
+        'text-align': 'left',
+      },
+      //label样式
+      labelStyle: { 'width': '200px' }
+    ,
+      org_type: {
         jkzx: '10',
         yewd: '4',
         lhzz: '5',
@@ -578,7 +597,7 @@ export default {
       rules: {
         type: [{required: true, message: "请选择机构类型", trigger: "change"}],
         standard: [{required: true, message: "请选择标准", trigger: "change"}],
-      //  certificate: [{required: true, message: "请选择上传证书", trigger: "change"}],
+        //certificate: [{required: true, message: "请选择上传证书", trigger: "change"}],
       },
       remoteCountoptions: [
         {label: "0", value: 0},
@@ -617,7 +636,7 @@ export default {
       ownership: null,
       outsideArea: null,
       askari: null,
-      businessLibrary: 0,
+      businessLibrary: null,
       businessLibraryType: null,
       dutyMode: null,
       remoteControl: null,
@@ -632,9 +651,12 @@ export default {
       detachedWallPenetratingEquipment: null,
       cashAddingRoomRemoteControl: null,
       source: null,
+      //是否取得保安证书
+      isAskariCertificate: null,
       askariCertificate: null,
-      hdCameraCount:0,
-      totalCameraCount:0,
+      hdCameraCount: 0,
+      totalCameraCount: 0,
+      certificate: null,
       //机构建设数据
 
       // 遮罩层
@@ -807,8 +829,8 @@ export default {
   },
 
   methods: {
-    closePictrue(){
-      this.orgform.certificate=null;
+    closePictrue() {
+      this.orgform.certificate = null;
     },
     closeImgViewer() {
       this.imageViewer = false;
@@ -934,8 +956,8 @@ export default {
             data.data.detachedWallPenetratingEquipment;
           this.cashAddingRoomRemoteControl =
             data.data.cashAddingRoomRemoteControl;
-          this.hdCameraCount=data.data.hdCameraCount?data.data.hdCameraCount:0;
-          this.totalCameraCount=data.data.totalCameraCount?data.data.totalCameraCount:0;
+          this.hdCameraCount = data.data.hdCameraCount ? data.data.hdCameraCount : 0;
+          this.totalCameraCount = data.data.totalCameraCount ? data.data.totalCameraCount : 0;
 
           // if (
           //   this.askariCertificate &&
@@ -1253,10 +1275,9 @@ export default {
         this.detachedtitle = "编辑安全防范设施建设达标信息";
       });
     },
-    canShowGA38(){
+    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')
-      {
+      if (this.type == '4' || this.type == '10' || this.type == '5') {
         return true;
       }
       return false;
@@ -1325,7 +1346,7 @@ export default {
         id: null,
         standard: null,
         dateOfCompliance: null,
-        dateOfComplete:null,
+        dateOfComplete: null,
         certificateEvidence: 0,
         certificate: null,
         evidence: null,
@@ -1340,11 +1361,11 @@ export default {
     },
     // 取消按钮
     orgcancel() {
-      console.log(this.orgform.certificate,123123);
-      console.log(  this.orgimgs,'123123');
+      console.log(this.orgform.certificate, 123123);
+      console.log(this.orgimgs, '123123');
       this.orgopen = false;
-      this.orgform.certificate=null;
-      this.orgimgs=null;
+      this.orgform.certificate = null;
+      this.orgimgs = null;
       this.orgreset();
     },
     // 多选框选中数据
@@ -1383,10 +1404,11 @@ export default {
       //certificate
       this.$refs.orgform.validate((valid) => {
         if (valid) {
-          if (this.orgform.standard !== '3' && (this.orgform.certificate == null||this.orgform.certificate == 0)) {
+          if (this.orgform.standard !== '3' && (this.orgform.certificate == null || this.orgform.certificate == 0)) {
             this.$modal.alertError("请上传证书");
             return;
           }
+
           // 表单验证通过，提交数据或执行其他操作
           this.orgform.orgId = this.$route.params.id;
           // this.orgform.type = 1;
@@ -1428,8 +1450,7 @@ export default {
         });
     },
     saveExtend() {
-      if(!this.validBeforeSaveExtend())
-      {
+      if (!this.validBeforeSaveExtend()) {
         return;
       }
       let dat = {
@@ -1464,8 +1485,8 @@ export default {
         detachedLobbyEquipment: this.detachedLobbyEquipment,
         detachedWallPenetratingEquipment: this.detachedWallPenetratingEquipment,
         cashAddingRoomRemoteControl: this.cashAddingRoomRemoteControl,
-        hdCameraCount:this.hdCameraCount,
-        totalCameraCount:this.totalCameraCount,
+        hdCameraCount: this.hdCameraCount,
+        totalCameraCount: this.totalCameraCount,
       };
       // console.log(dat);
       if (this.extendId) {
@@ -1482,23 +1503,73 @@ export default {
         });
       }
     },
-    validBeforeSaveExtend()
-    {
-      if(this.weatherAreaCode==null)
-      {
+    validBeforeSaveExtend() {
+      if (this.weatherAreaCode == null) {
         this.$modal.msgError("气象行政区域不能为空，请选择气象行政区域");
         return false;
       }
-      if(this.type === this.org_type.yewd && this.ownership==null)
-      {
+      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)
-      {
+      if (this.type === this.org_type.yewd && this.outsideArea == null) {
         this.$modal.msgError("所在位置不能为空，请选择所在位置");
         return false;
       }
+      if (this.type === this.org_type.yewd && this.dutyMode == null) {
+        this.$modal.msgError("夜间值守不能为空，请选择夜间值守方式");
+        return false;
+      }
+      if (this.type === this.org_type.yewd && this.safeBox == null) {
+        this.$modal.msgError("是否设立保管箱库不能为空，请选择是否设立保管箱库");
+        return false;
+      }
+      if (this.type === this.org_type.yewd && this.selfServiceBank == null) {
+        this.$modal.msgError("是否设立在行式自助银行不能为空，请选择是否设立在行式自助银行");
+        return false;
+      }
+      if (this.type === this.org_type.yewd && this.selfServiceBank == 1&&this.wallPenetratingEquipment==null) {
+        this.$modal.msgError("穿墙式设备数量不能为空，请输入穿墙式设备数量");
+        return false;
+      }
+      if (this.type === this.org_type.yewd && this.selfServiceBank == 1&&this.lobbyEquipment==null) {
+        this.$modal.msgError("大堂设备数量不能为空，请输入大堂设备数量");
+        return false;
+      }
+      if (this.type === this.org_type.yewd &&this.businessLibrary==null) {
+        this.$modal.msgError("是否设立网点业务库不能为空，请设置是否设立网点业务库");
+        return false;
+      }
+      if (this.type === this.org_type.yewd && this.businessLibrary===1&&this.businessLibraryType==null) {
+        this.$modal.msgError("业务库类型不能为空，请选择业务库类型");
+        return false;
+      }
+      if ((this.type === this.org_type.jkzx || this.type === this.org_type.yewd|| this.type === this.org_type.lhzz || this.type === this.org_type.zxywk)&&this.businessLibrary===1&&this.remoteControl==null) {
+        this.$modal.msgError("出入口远程控制与授权不能为空，请选择出入口远程控制与授权");
+        return false;
+      }
+      if ((this.type === this.org_type.jkzx || this.type === this.org_type.yewd || this.type === this.org_type.zxywk)&&this.businessLibrary==1&&this.remoteCount==null) {
+        this.$modal.msgError("业务库防控隔离门出入口数量不能为空，请输入业务库防控隔离门出入口数量");
+        return false;
+      }
+      if ((this.type === this.org_type.yewd)&&this.askari==null) {
+        this.$modal.msgError("是否配备保安人员不能为空，请选择是否配备保安人员");
+        return false;
+      }
+      if ((this.type === this.org_type.yewd)&&this.askari==1&&this.innerCount==null) {
+        this.$modal.msgError("内部保安人数不能为空，请输入内部保安人数");
+        return false;
+      }
+      if ((this.type === this.org_type.yewd)&&this.askari==1&&this.outsideCount==null) {
+        this.$modal.msgError("外聘保安人数不能为空，请输入外聘保安人数");
+        return false;
+      }
+      if ((this.type === this.org_type.yewd)&&this.askari==1&&this.askariCertificate==null) {
+        this.$modal.msgError("保安人员证书不能为空，请上传保安人员证书");
+        return false;
+      }
+
+
       return true;
     },
     nosaveExtend() {
@@ -1530,91 +1601,98 @@ export default {
 </script>
 
 <style scoped lang="scss">
-  /*.org-extend{
-    background-color: #fff;
-    padding: 10px;
-  }*/
-  .title {
-    font-size: 18px;
-    text-align: left;
-    color: #008cd6;
-    height: 36px;
-    line-height: 36px;
-    padding-left: 8px;
-    margin: 0;
-  }
-
-  .info-box {
-    margin: 20px;
-  }
 
-  .demo-form-inline {
+/*.org-extend{
+  background-color: #fff;
+  padding: 10px;
+}*/
+.title {
+  font-size: 18px;
+  text-align: left;
+  color: #008cd6;
+  height: 36px;
+  line-height: 36px;
+  padding-left: 8px;
+  margin: 0;
+}
+
+.info-box {
+  margin: 20px;
+}
+
+.demo-form-inline {
+}
+
+.dialog-footer {
+}
+
+.container {
+}
+
+.zoom-image {
+  transition: transform 0.3s ease;
+}
+
+.zoom-image:hover {
+  transform: scale(1.02);
+}
+
+.border-color-change {
+  border: 1px solid #ccc;
+  transition: border-color 0.3s ease;
+}
+
+.border-color-change:hover {
+  border-color: #1ea8e9;
+  /* 您可以将此颜色更改为所需的颜色 */
+}
+
+.extend_mod {
+  background-color: #fff;
+  padding: 1px 15px 1px 15px;
+  margin-bottom: 2px;
+  -webkit-box-shadow: 0 2px 8px #ccc;
+  box-shadow: 0 2px 8px #ccc;
+}
+
+.el-table thead > tr > th {
+  background-color: #fafafa !important;
+}
+
+
+.el-row {
+  margin-bottom: 20px;
+
+  &:last-child {
+    margin-bottom: 0;
   }
+}
 
-  .dialog-footer {
-  }
+.el-col {
+  border-radius: 4px;
+}
 
-  .container {
-  }
+.bg-purple-dark {
+  background: #99a9bf;
+}
 
-  .zoom-image {
-    transition: transform 0.3s ease;
-  }
+.bg-purple {
+  background: #d3dce6;
+}
 
-  .zoom-image:hover {
-    transform: scale(1.02);
-  }
+.bg-purple-light {
+  background: #e5e9f2;
+}
 
-  .border-color-change {
-    border: 1px solid #ccc;
-    transition: border-color 0.3s ease;
-  }
+.grid-content {
+  border-radius: 4px;
+  min-height: 36px;
+}
 
-  .border-color-change:hover {
-    border-color: #1ea8e9;
-    /* 您可以将此颜色更改为所需的颜色 */
-  }
-
-  .extend_mod {
-    background-color: #fff;
-    padding: 1px 15px 1px 15px;
-    margin-bottom: 2px;
-    -webkit-box-shadow: 0 2px 8px #ccc;
-    box-shadow: 0 2px 8px #ccc;
-  }
-
-  .el-table thead > tr > th {
-    background-color: #fafafa !important;
-  }
-
-
-
-  .el-row {
-    margin-bottom: 20px;
-    &:last-child {
-      margin-bottom: 0;
-    }
-  }
-  .el-col {
-    border-radius: 4px;
-  }
-  .bg-purple-dark {
-    background: #99a9bf;
-  }
-  .bg-purple {
-    background: #d3dce6;
-  }
-  .bg-purple-light {
-    background: #e5e9f2;
-  }
-  .grid-content {
-    border-radius: 4px;
-    min-height: 36px;
-  }
-  .row-bg {
-    padding: 10px 0;
-    background-color: #f9fafc;
-  }
+.row-bg {
+  padding: 10px 0;
+  background-color: #f9fafc;
+}
 
 
 </style>