Merge remote-tracking branch 'origin/V0.0.8' into V0.0.8

src/views/system/dept/extend.vue

@@ -222,7 +222,7 @@
                 :max="999"
               ></el-input-number>
             </el-descriptions-item>
-            <el-descriptions-item label="大堂式设备" 
+            <el-descriptions-item label="大堂式设备"
                                   labelClassName="info_label_required" :contentStyle='contentStyle' :labelStyle='labelStyle'>
               <el-input-number
                 v-model="lobbyEquipment"
@@ -254,7 +254,7 @@
             </el-descriptions-item>
           </el-descriptions> -->
 
-          <el-descriptions class="margin-top" :column="3" v-if="type === org_type.yewd" size="medium" border>
+          <el-descriptions class="margin-top" :column="3" v-if="(type === org_type.yewd || type === org_type.zxywk)" size="medium" border>
             <el-descriptions-item label="是否设立网点业务库"  :contentStyle='contentStyle' :labelStyle='labelStyle'  labelClassName="info_label_required">
               <el-radio-group v-model="businessLibrary">
                 <el-radio :label="1">是</el-radio>
@@ -362,30 +362,31 @@
                 :max="999"
               ></el-input-number>
             </el-descriptions-item>
-            <el-descriptions-item v-if="type === org_type.jkzx" labelClassName="info_label_required" label="全辖摄像头总路数">
+            <el-descriptions-item v-if="type === org_type.jkzx" :contentStyle='contentStyle' :labelStyle='labelStyle'
+                                  labelClassName="info_label_required" label="可远程控制和实时授权出入口数量(离行式)">
               <el-input-number
-                v-model="totalCameraCount"
+                v-model="cashAddingRoomControlCount"
                 controls-position="right"
                 @change="handleChange"
                 :min="0"
-                :max="999999"
+                :max="cashAddingRoom"
               ></el-input-number>
             </el-descriptions-item>
-            <el-descriptions-item v-if="type === org_type.jkzx" labelClassName="info_label_required" label="全辖高清摄像头路数">
+            <el-descriptions-item v-if="type === org_type.jkzx" labelClassName="info_label_required" label="全辖摄像头总路数">
               <el-input-number
-                v-model="hdCameraCount"
+                v-model="totalCameraCount"
                 controls-position="right"
                 @change="handleChange"
                 :min="0"
                 :max="999999"
               ></el-input-number>
             </el-descriptions-item>
-            <el-descriptions-item label="出入口远程控制与授权"  v-if="(type === org_type.jkzx)" labelClassName="info_label_required" >
+<!--            <el-descriptions-item label="出入口远程控制与授权"  v-if="(type === org_type.jkzx)" labelClassName="info_label_required" >
               <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>-->
             <el-descriptions-item label="业务库防控隔离门出入口数量" v-if="type === org_type.jkzx" labelClassName="info_label_required" >
               <el-input-number
                 v-model="remoteCount"
@@ -395,6 +396,24 @@
                 :max="999"
               ></el-input-number>
             </el-descriptions-item>
+            <el-descriptions-item label="可远程控制和实时授权出入口数量(业务库)" v-if="type === org_type.jkzx" labelClassName="info_label_required" >
+              <el-input-number
+                v-model="remoteControlCount"
+                controls-position="right"
+                @change="handleChange"
+                :min="0"
+                :max="remoteCount"
+              ></el-input-number>
+            </el-descriptions-item>
+            <el-descriptions-item v-if="type === org_type.jkzx" labelClassName="info_label_required" label="全辖高清摄像头路数">
+              <el-input-number
+                v-model="hdCameraCount"
+                controls-position="right"
+                @change="handleChange"
+                :min="0"
+                :max="999999"
+              ></el-input-number>
+            </el-descriptions-item>
           </el-descriptions>
 
         </div>
@@ -441,7 +460,7 @@
             clearable
           >
             <el-option
-              v-for="dict in getGA38TypeByOrgType"          
+              v-for="dict in getGA38TypeByOrgType"
               :key="dict.value"
               :label="dict.label"
               :value="dict.value"
@@ -641,7 +660,9 @@ export default {
       outsideCount: 0,
       safeBox: null,
       remoteCount: 0,
+      remoteControlCount: 0,
       cashAddingRoom: 0,
+      cashAddingRoomControlCount: 0,
       type: null,
       isLock: null,
       dataInfo: [],
@@ -656,7 +677,7 @@ export default {
       businessLibrary: null,
       businessLibraryType: null,
       dutyMode: null,
-      remoteControl: null,
+      //remoteControl: null,
       selfServiceBank: null,
       lobbyEquipment: 0,
       wallPenetratingEquipment: 0,
@@ -771,14 +792,14 @@ export default {
     },
     getGA38TypeByOrgType() {
       let tempArry = [];
-     
+
         // 上传GA38的机构的机构类型是 营业网点
         if(this.type=="4")
         {
           this.dict.type.org_extend_type.forEach(x=>{
             if (x.value == 1 || x.value == 2 || x.value == 5 || x.value == 6) {
               tempArry.push(x);
-            }  
+            }
           });
         }
         // 上传GA38的机构的机构类型是 离行自助银行
@@ -787,7 +808,7 @@ export default {
           this.dict.type.org_extend_type.forEach(x=>{
             if (x.value == 3) {
               tempArry.push(x);
-            }  
+            }
           });
         }
         // 上传GA38的机构的机构类型是 中心业务库
@@ -796,7 +817,7 @@ export default {
           this.dict.type.org_extend_type.forEach(x=>{
             if (x.value == 4) {
               tempArry.push(x);
-            }  
+            }
           });
         }
          // 上传GA38的机构的机构类型是 监控中心
@@ -805,13 +826,13 @@ export default {
           this.dict.type.org_extend_type.forEach(x=>{
             if (x.value == 7) {
               tempArry.push(x);
-            }  
+            }
           });
         }
         else{
           tempArry=this.dict.type.org_extend_type;
         }
-       
+
       // console.log("computed getUserOrgType",tempArry);
       return tempArry;
     },
@@ -1021,14 +1042,16 @@ export default {
           this.innerCount = data.data.innerCount;
           this.outsideCount = data.data.outsideCount;
           this.cashAddingRoom = data.data.cashAddingRoom;
+          this.cashAddingRoomControlCount = data.data.cashAddingRoomControlCount;
           this.remoteCount = data.data.remoteCount;
+          this.remoteControlCount = data.data.remoteControlCount;
           this.orgType = data.data.orgType;
           this.weatherAreaCode = data.data.weatherAreaCode;
           this.premisesArea = data.data.premisesArea;
           this.ownership = data.data.ownership;
           this.outsideArea = data.data.outsideArea;
           this.askari = data.data.askari;
-          this.remoteControl = data.data.remoteControl;
+          //this.remoteControl = data.data.remoteControl;
           this.selfServiceBank = data.data.selfServiceBank;
           this.businessLibrary = data.data.businessLibrary;
           this.lobbyEquipment = data.data.lobbyEquipment;
@@ -1554,8 +1577,10 @@ export default {
         innerCount: this.innerCount,
         outsideCount: this.outsideCount,
         cashAddingRoom: this.cashAddingRoom,
+        cashAddingRoomControlCount: this.cashAddingRoomControlCount,
         orgType: this.orgType,
         remoteCount: this.remoteCount,
+        remoteControlCount: this.remoteControlCount,
         weatherAreaCode: this.weatherAreaCode,
         askariCertificate:this.askariCertificate,
           // this.imgs.length > 0
@@ -1567,7 +1592,7 @@ export default {
         askari: this.askari ? 1 : 0,
         businessLibraryType: this.businessLibraryType,
         dutyMode: this.dutyMode,
-        remoteControl: this.remoteControl ? 1 : 0,
+        //remoteControl: this.remoteControl ? 1 : 0,
         selfServiceBank: this.selfServiceBank ? 1 : 0,
         businessLibrary: this.businessLibrary ? 1 : 0,
         lobbyEquipment: this.lobbyEquipment,
@@ -1632,26 +1657,34 @@ export default {
         this.$modal.msgError("大堂设备数量不能为空，请输入大堂设备数量");
         return false;
       }
-      if (this.type === this.org_type.yewd &&this.businessLibrary==null) {
+      if ((this.type === this.org_type.yewd || this.type === this.org_type.zxywk) &&this.businessLibrary==null) {
         this.$modal.msgError("是否设立网点业务库不能为空，请设置是否设立网点业务库");
         return false;
       }
-      if (this.type === this.org_type.yewd && this.businessLibrary===1&&this.businessLibraryType==null) {
+      if ((this.type === this.org_type.yewd || this.type === this.org_type.zxywk) && this.businessLibrary===1&&this.businessLibraryType==null) {
         this.$modal.msgError("业务库类型不能为空，请选择业务库类型");
         return false;
       }
-      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.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.cashAddingRoomControlCount==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.jkzx || this.type === this.org_type.yewd || this.type === this.org_type.zxywk)&&this.businessLibrary==1&&this.remoteControlCount==null) {
+        this.$modal.msgError("可远程控制和实时授权出入口数量(业务库)不能为空，请输入可远程控制和实时授权出入口数量(业务库)");
+        return false;
+      }
       if ((this.type === this.org_type.yewd)&&this.askari==null) {
         this.$modal.msgError("是否配备保安人员不能为空，请选择是否配备保安人员");
         return false;
@@ -1713,7 +1746,7 @@ export default {
 <style scoped lang="scss">
 
 
- 
+
 
 /*.org-extend{
   background-color: #fff;

src/views/system/version/index.vue

@@ -111,9 +111,9 @@
 			<el-input v-model="form.version" :maxlength="50" placeholder="请输入版本"/>
 			</el-form-item>
 
-			<el-form-item label="类型" prop="type">
+			<el-form-item label="平台" prop="type">
 			<el-select v-model="form.type"
-						placeholder="请选择类型"
+						placeholder="请选择平台"
 						@change="selectedType()"
 						style="width: 100%">
 				<el-option
@@ -141,7 +141,7 @@
                 :limit="1"
                 :fileType="['apk']"
                 :packageName="packageNameList"
-				:fileSize="50"
+				        :fileSize="200"
                 @input="fileListChanged"
               />
             </el-form-item>
@@ -223,7 +223,7 @@
         {validator: validatorVersion, trigger: "blur"}
         ],
         type: [
-        {required: true, message: "请选择机构类型", trigger: "blur"}
+        {required: true, message: "请选择平台", trigger: "blur"}
         ],
         isUse: [
         {required: true, message: "请输入使用", trigger: "blur"}