|  | @@ -210,11 +210,10 @@
 | 
	
		
			
				|  |  |                  <el-radio :label="0">否</el-radio>
 | 
	
		
			
				|  |  |                </el-radio-group>
 | 
	
		
			
				|  |  |              </el-descriptions-item>
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  |            </el-descriptions>
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -          <el-descriptions v-if="type === org_type.yewd"  class="margin-top" :column="3" size="medium" border>
 | 
	
		
			
				|  |  | -            <el-descriptions-item label="穿墙式设备" v-if="this.selfServiceBank==1" labelClassName="info_label_required" :contentStyle='contentStyle' :labelStyle='labelStyle'>
 | 
	
		
			
				|  |  | +          <el-descriptions v-if="type === org_type.yewd || type === org_type.lhzz"  class="margin-top" :column="3" size="medium" border>
 | 
	
		
			
				|  |  | +            <el-descriptions-item label="穿墙式设备" labelClassName="info_label_required" :contentStyle='contentStyle' :labelStyle='labelStyle'>
 | 
	
		
			
				|  |  |                <el-input-number
 | 
	
		
			
				|  |  |                  v-model="wallPenetratingEquipment"
 | 
	
		
			
				|  |  |                  controls-position="right"
 | 
	
	
		
			
				|  | @@ -223,7 +222,7 @@
 | 
	
		
			
				|  |  |                  :max="999"
 | 
	
		
			
				|  |  |                ></el-input-number>
 | 
	
		
			
				|  |  |              </el-descriptions-item>
 | 
	
		
			
				|  |  | -            <el-descriptions-item label="大堂式设备"  v-if="this.selfServiceBank==1"
 | 
	
		
			
				|  |  | +            <el-descriptions-item label="大堂式设备" 
 | 
	
		
			
				|  |  |                                    labelClassName="info_label_required" :contentStyle='contentStyle' :labelStyle='labelStyle'>
 | 
	
		
			
				|  |  |                <el-input-number
 | 
	
		
			
				|  |  |                  v-model="lobbyEquipment"
 | 
	
	
		
			
				|  | @@ -234,7 +233,7 @@
 | 
	
		
			
				|  |  |                ></el-input-number>
 | 
	
		
			
				|  |  |              </el-descriptions-item>
 | 
	
		
			
				|  |  |            </el-descriptions>
 | 
	
		
			
				|  |  | -          <el-descriptions v-if="type === org_type.lhzz"  class="margin-top" :column="3" size="medium" border>
 | 
	
		
			
				|  |  | +          <!-- <el-descriptions v-if="type === org_type.lhzz"  class="margin-top" :column="3" size="medium" border>
 | 
	
		
			
				|  |  |              <el-descriptions-item label="穿墙式设备"  labelClassName="info_label_required" :contentStyle='contentStyle' :labelStyle='labelStyle'>
 | 
	
		
			
				|  |  |                <el-input-number
 | 
	
		
			
				|  |  |                  v-model="wallPenetratingEquipment"
 | 
	
	
		
			
				|  | @@ -253,7 +252,7 @@
 | 
	
		
			
				|  |  |                  :max="999"
 | 
	
		
			
				|  |  |                ></el-input-number>
 | 
	
		
			
				|  |  |              </el-descriptions-item>
 | 
	
		
			
				|  |  | -          </el-descriptions>
 | 
	
		
			
				|  |  | +          </el-descriptions> -->
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |            <el-descriptions class="margin-top" :column="3" v-if="type === org_type.yewd" size="medium" border>
 | 
	
		
			
				|  |  |              <el-descriptions-item label="是否设立网点业务库"  :contentStyle='contentStyle' :labelStyle='labelStyle'  labelClassName="info_label_required">
 | 
	
	
		
			
				|  | @@ -353,7 +352,7 @@
 | 
	
		
			
				|  |  |                  ></el-option>
 | 
	
		
			
				|  |  |                </el-select>
 | 
	
		
			
				|  |  |              </el-descriptions-item>
 | 
	
		
			
				|  |  | -            <el-descriptions-item v-if="type === org_type.jkzx || type === org_type.lhzz" :contentStyle='contentStyle' :labelStyle='labelStyle'
 | 
	
		
			
				|  |  | +            <el-descriptions-item v-if="type === org_type.jkzx" :contentStyle='contentStyle' :labelStyle='labelStyle'
 | 
	
		
			
				|  |  |                                    labelClassName="info_label_required" label="离行式加钞间出入口数量">
 | 
	
		
			
				|  |  |                <el-input-number
 | 
	
		
			
				|  |  |                  v-model="cashAddingRoom"
 | 
	
	
		
			
				|  | @@ -877,25 +876,33 @@ export default {
 | 
	
		
			
				|  |  |          this.reqmsg = false;
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  | -    selfServiceBank(newValue){
 | 
	
		
			
				|  |  | -      if (newValue==0){
 | 
	
		
			
				|  |  | -        this.wallPenetratingEquipment=null;
 | 
	
		
			
				|  |  | -        this.lobbyEquipment=null;
 | 
	
		
			
				|  |  | -      }
 | 
	
		
			
				|  |  | -    },
 | 
	
		
			
				|  |  | +    // selfServiceBank(newValue){
 | 
	
		
			
				|  |  | +      // if (newValue==0){
 | 
	
		
			
				|  |  | +      //   this.wallPenetratingEquipment=null;
 | 
	
		
			
				|  |  | +      //   this.lobbyEquipment=null;
 | 
	
		
			
				|  |  | +      // }
 | 
	
		
			
				|  |  | +    // },
 | 
	
		
			
				|  |  |      businessLibrary(newValue){
 | 
	
		
			
				|  |  |        if (newValue==0){
 | 
	
		
			
				|  |  |          this.businessLibraryType=null;
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  |      askari(newValue){
 | 
	
		
			
				|  |  | +      console.log("askari1",newValue)
 | 
	
		
			
				|  |  |        if (newValue==0){
 | 
	
		
			
				|  |  | +        console.log("askari2",newValue)
 | 
	
		
			
				|  |  |          this.innerCount=null;
 | 
	
		
			
				|  |  |          this.outsideCount=null;
 | 
	
		
			
				|  |  |          this.isAskariCertificate=null;
 | 
	
		
			
				|  |  |          this.askariCertificate=null;
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  | +    isAskariCertificate(newValue)
 | 
	
		
			
				|  |  | +    {
 | 
	
		
			
				|  |  | +      if(!newValue){
 | 
	
		
			
				|  |  | +        this.askariCertificate=null;
 | 
	
		
			
				|  |  | +      }
 | 
	
		
			
				|  |  | +    }
 | 
	
		
			
				|  |  |    },
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |    created() {
 | 
	
	
		
			
				|  | @@ -1550,10 +1557,10 @@ export default {
 | 
	
		
			
				|  |  |          orgType: this.orgType,
 | 
	
		
			
				|  |  |          remoteCount: this.remoteCount,
 | 
	
		
			
				|  |  |          weatherAreaCode: this.weatherAreaCode,
 | 
	
		
			
				|  |  | -        askariCertificate:
 | 
	
		
			
				|  |  | -          this.imgs.length > 0
 | 
	
		
			
				|  |  | -            ? this.imgs[this.imgs.length - 1].toString(",")
 | 
	
		
			
				|  |  | -            : null,
 | 
	
		
			
				|  |  | +        askariCertificate:this.askariCertificate,
 | 
	
		
			
				|  |  | +          // this.imgs.length > 0
 | 
	
		
			
				|  |  | +          //   ? this.imgs[this.imgs.length - 1].toString(",")
 | 
	
		
			
				|  |  | +          //   : null,
 | 
	
		
			
				|  |  |          premisesArea: this.premisesArea,
 | 
	
		
			
				|  |  |          ownership: this.ownership,
 | 
	
		
			
				|  |  |          outsideArea: this.outsideArea,
 | 
	
	
		
			
				|  | @@ -1617,11 +1624,11 @@ export default {
 | 
	
		
			
				|  |  |          this.$modal.msgError("是否设立在行式自助银行不能为空,请选择是否设立在行式自助银行");
 | 
	
		
			
				|  |  |          return false;
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  | -      if (this.type === this.org_type.yewd && this.selfServiceBank == 1&&this.wallPenetratingEquipment==null) {
 | 
	
		
			
				|  |  | +      if (this.type === this.org_type.yewd && this.wallPenetratingEquipment==null) {
 | 
	
		
			
				|  |  |          this.$modal.msgError("穿墙式设备数量不能为空,请输入穿墙式设备数量");
 | 
	
		
			
				|  |  |          return false;
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  | -      if (this.type === this.org_type.yewd && this.selfServiceBank == 1&&this.lobbyEquipment==null) {
 | 
	
		
			
				|  |  | +      if (this.type === this.org_type.yewd && this.lobbyEquipment==null) {
 | 
	
		
			
				|  |  |          this.$modal.msgError("大堂设备数量不能为空,请输入大堂设备数量");
 | 
	
		
			
				|  |  |          return false;
 | 
	
		
			
				|  |  |        }
 | 
	
	
		
			
				|  | @@ -1633,10 +1640,14 @@ export default {
 | 
	
		
			
				|  |  |          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) {
 | 
	
		
			
				|  |  | +      if ((this.type === this.org_type.jkzx)&&this.businessLibrary===1&&this.remoteControl==null) {
 | 
	
		
			
				|  |  |          this.$modal.msgError("出入口远程控制与授权不能为空,请选择出入口远程控制与授权");
 | 
	
		
			
				|  |  |          return false;
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  | +      if ((this.type === this.org_type.jkzx)&&this.cashAddingRoom==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;
 | 
	
	
		
			
				|  | @@ -1645,12 +1656,22 @@ export default {
 | 
	
		
			
				|  |  |          this.$modal.msgError("是否配备保安人员不能为空,请选择是否配备保安人员");
 | 
	
		
			
				|  |  |          return false;
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  | -      if ((this.type === this.org_type.yewd)&&this.askari==1&&this.innerCount==null) {
 | 
	
		
			
				|  |  | -        this.$modal.msgError("内部保安人数不能为空,请输入内部保安人数");
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +      if ((this.type === this.org_type.yewd)&&this.askari==1&& !this.innerCount && !this.outsideCount) {
 | 
	
		
			
				|  |  | +        this.$modal.msgError("网点配备保安人员为“是”,内部保安人数与外聘保安人数不可均为0,请修改");
 | 
	
		
			
				|  |  |          return false;
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  | -      if ((this.type === this.org_type.yewd)&&this.askari==1&&this.outsideCount==null) {
 | 
	
		
			
				|  |  | -        this.$modal.msgError("外聘保安人数不能为空,请输入外聘保安人数");
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +      // 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.isAskariCertificate==null) {
 | 
	
		
			
				|  |  | +        this.$modal.msgError("是否取得保安证书不能为空,请选择是否取得保安证书");
 | 
	
		
			
				|  |  |          return false;
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |        if ((this.type === this.org_type.yewd)&&this.askari==1&&this.isAskariCertificate==1&&this.askariCertificate==null) {
 |