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

src/assets/styles/ruoyi.scss

@@ -367,7 +367,16 @@
  .el-collapse-item__header{
    font-size: 16px!important;
  }
+ .info_label_required{
+	text-align: center !important;
+	color: #1e1e1e;
+  }
 
+ .info_label_required:before {
+    content: '*';
+    color: #F56C6C;
+    margin-right: 4px;
+ }
 
  .gx_info_label{
    text-align: center !important;

src/components/orgTreeSelect/index.vue

@@ -80,7 +80,7 @@ export default {
       default: false,
     },
     queryData: {
-      type: Number,
+      type: [Number,String],
       default: null,
       required: false,
     },
@@ -151,8 +151,10 @@ export default {
     },
     queryData: {
       handler(n) {
+        //console.log("queryData",n);
         if (n) {
           this.queryForm.type = parseInt(n);
+          //console.log("queryData",this.queryForm.type);
           this.serchTreeHandler();
         }
       },

src/views/core/accessPlan/index.vue

@@ -431,19 +431,17 @@
           >
           </el-date-picker>
         </el-form-item>
-        <el-form-item
-          v-show="form.orgType"
-          label="调阅机构"
-          prop="planExecOrgIdList">
+        <el-form-item v-show="form.orgType" label="调阅机构" prop="planExecOrgIdList">
         <org-tree-select
             v-model="form.planExecOrgIdList"
             :queryData="form.orgType"
             ref="orgTreeSelect"
-            checkShow="true"  
-            :enabledCheckOrgTypes="parseInt(form.orgType)"
-            :disabled="form.isComplete"                
+            :checkShow="true" 
+            :disable="true"
+            :disabled="form.isEdit || form.isComplete"                
           >
           </org-tree-select>
+          <!-- :enabledCheckOrgTypes="parseInt(form.orgType)" -->
         </el-form-item>
         <el-form-item label="备注" prop="description">
           <el-input
@@ -642,7 +640,7 @@ export default {
         orgId: null,
         orgPath: null,
         orgName: null,
-        orgType: "4",
+        orgType: null,
         roleId: "121",
         planCycle: "2",
         planFrequency: 1,

src/views/core/drill/plan/index.vue

@@ -446,11 +446,12 @@
                 :disabled="tableDisable()"
                 v-model="form.planExecOrgIdList"
                 :queryData="form.execOrgType"
-                ref="orgTreeSelect"
-                :enabledCheckOrgTypes="form.execOrgType"
-                :disable="true"
+                ref="orgTreeSelect"                
+                :disable="true"                
+                :checkShow="true"
               >
               </org-tree-select>
+              <!-- :enabledCheckOrgTypes="form.execOrgType" -->
             </el-form-item>
           </el-col>
         </el-row>

src/views/core/edu/plan/index.vue

@@ -467,10 +467,12 @@
                 v-model="form.planExecOrgIdList"
                 :queryData="form.execOrgType"
                 ref="orgTreeSelect"
-                :enabledCheckOrgTypes="form.execOrgType"
+                :checkShow="true" 
+                :disable="true"  
                 :disabled="tableDisable()"
               >
               </org-tree-select>
+              <!-- :enabledCheckOrgTypes="form.execOrgType" -->
             </el-form-item>
           </el-col>
         </el-row>

src/views/resumption/plan/dialog.edit.vue

@@ -193,10 +193,12 @@
                   v-model="formData.orgList"
                   class="org-selector"
                   :queryData="parseInt(formData.execOrgType)"
-                  :enabledCheckOrgTypes="parseInt(formData.execOrgType)"
-                  :disable="true"
+                  :disable="true"             
+                :checkShow="true"
                 >
                 </org-tree-select>
+                <!-- :enabledCheckOrgTypes="parseInt(formData.execOrgType)" -->
+                
               </el-form-item>
             </el-col>
             <el-col :span="12" v-if="formData.planCycle==0">

src/views/safetycheck/plan/dialog.edit.vue

@@ -214,12 +214,14 @@
                       ? null
                       : parseInt(formData.checkOrgTypes[0])
                   "
-                  :enabledCheckOrgTypes="
-                    formData.checkOrgTypes.map((t) => parseInt(t))
-                  "
-                  :disable="true"
+                  
+                  :disable="true"           
+                :checkShow="true"
                 >
                 </org-tree-select>
+                <!-- :enabledCheckOrgTypes="
+                    formData.checkOrgTypes.map((t) => parseInt(t))
+                  " -->
               </el-form-item>
             </el-col>
             <!-- <el-col :span="6"> -->

src/views/system/dept/extend.vue

@@ -145,7 +145,7 @@
         <!--监控中心的补充信息-->
         <div class="info-box">
           <el-descriptions class="margin-top" :column="3" size="medium" border>
-            <el-descriptions-item labelClassName="gx_info_label" :contentStyle='contentStyle' :labelStyle='labelStyle' label="气象行政区域">
+            <el-descriptions-item labelClassName="info_label_required" :contentStyle='contentStyle' :labelStyle='labelStyle' label="气象行政区域">
               <el-cascader
                 clearable
                 v-model="weatherAreaCode"
@@ -154,7 +154,7 @@
                 placeholder="请选择气象行政区域"
               ></el-cascader>
             </el-descriptions-item>
-            <el-descriptions-item v-if="type === org_type.yewd" labelClassName="gx_info_label" label="产权类型" :contentStyle='contentStyle' :labelStyle='labelStyle'>
+            <el-descriptions-item v-if="type === org_type.yewd" labelClassName="info_label_required" label="产权类型" :contentStyle='contentStyle' :labelStyle='labelStyle'>
               <el-select
                 clearable
                 v-model="ownership"
@@ -168,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="info_label_required" label="所在位置" >
               <el-select
                 clearable
                 v-model="outsideArea"
@@ -182,7 +182,7 @@
                 ></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-descriptions-item v-if="type === org_type.yewd" labelClassName="info_label_required" label="夜间值守方式" :contentStyle='contentStyle' :labelStyle='labelStyle'>
               <el-select
                 clearable
                 v-model="dutyMode"
@@ -196,7 +196,7 @@
                 ></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-descriptions-item v-if="type === org_type.yewd" labelClassName="info_label_required" label="是否设立保管箱库" :contentStyle='contentStyle' :labelStyle='labelStyle'>
               <el-radio-group v-model="safeBox">
                 <el-radio :label="1">是</el-radio>
                 <el-radio :label="0">否</el-radio>
@@ -204,7 +204,7 @@
             </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="是否设立在行式自助银行"  :contentStyle='contentStyle' :labelStyle='labelStyle' labelClassName="gx_info_label">
+            <el-descriptions-item label="是否设立在行式自助银行"  :contentStyle='contentStyle' :labelStyle='labelStyle' labelClassName="info_label_required">
               <el-radio-group v-model="selfServiceBank">
                 <el-radio :label="1">是</el-radio>
                 <el-radio :label="0">否</el-radio>
@@ -214,7 +214,7 @@
           </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="gx_info_label" :contentStyle='contentStyle' :labelStyle='labelStyle'>
+            <el-descriptions-item label="穿墙式设备" v-if="this.selfServiceBank==1" labelClassName="info_label_required" :contentStyle='contentStyle' :labelStyle='labelStyle'>
               <el-input-number
                 v-model="wallPenetratingEquipment"
                 controls-position="right"
@@ -224,7 +224,7 @@
               ></el-input-number>
             </el-descriptions-item>
             <el-descriptions-item label="大堂式设备"  v-if="this.selfServiceBank==1"
-                                  labelClassName="gx_info_label" :contentStyle='contentStyle' :labelStyle='labelStyle'>
+                                  labelClassName="info_label_required" :contentStyle='contentStyle' :labelStyle='labelStyle'>
               <el-input-number
                 v-model="lobbyEquipment"
                 controls-position="right"
@@ -235,7 +235,7 @@
             </el-descriptions-item>
           </el-descriptions>
           <el-descriptions v-if="type === org_type.lhzz"  class="margin-top" :column="3" size="medium" border>
-            <el-descriptions-item label="穿墙式设备"  labelClassName="gx_info_label" :contentStyle='contentStyle' :labelStyle='labelStyle'>
+            <el-descriptions-item label="穿墙式设备"  labelClassName="info_label_required" :contentStyle='contentStyle' :labelStyle='labelStyle'>
               <el-input-number
                 v-model="wallPenetratingEquipment"
                 controls-position="right"
@@ -244,7 +244,7 @@
                 :max="999"
               ></el-input-number>
             </el-descriptions-item>
-            <el-descriptions-item label="大堂式设备"  labelClassName="gx_info_label" :contentStyle='contentStyle' :labelStyle='labelStyle'>
+            <el-descriptions-item label="大堂式设备"  labelClassName="info_label_required" :contentStyle='contentStyle' :labelStyle='labelStyle'>
               <el-input-number
                 v-model="lobbyEquipment"
                 controls-position="right"
@@ -256,7 +256,7 @@
           </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="gx_info_label">
+            <el-descriptions-item label="是否设立网点业务库"  :contentStyle='contentStyle' :labelStyle='labelStyle'  labelClassName="info_label_required">
               <el-radio-group v-model="businessLibrary">
                 <el-radio :label="1">是</el-radio>
                 <el-radio :label="0">否</el-radio>
@@ -264,7 +264,7 @@
             </el-descriptions-item>
           </el-descriptions>
           <el-descriptions class="margin-top" v-if="this.businessLibrary==1" :column="3" size="medium" border>
-            <el-descriptions-item label="业务库类型" :contentStyle='contentStyle' :labelStyle='labelStyle'  labelClassName="gx_info_label">
+            <el-descriptions-item label="业务库类型" :contentStyle='contentStyle' :labelStyle='labelStyle'  labelClassName="info_label_required">
               <el-select clearable v-model="businessLibraryType" placeholder="请选择业务库类型" >
                 <el-option
                   v-for="dict in dict.type.business_library_type"
@@ -276,7 +276,7 @@
             </el-descriptions-item>
           </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="gx_info_label" >
+            <el-descriptions-item label="是否配备保安人员" :contentStyle='contentStyle' :labelStyle='labelStyle'  labelClassName="info_label_required" >
               <el-radio-group v-model="askari">
                 <el-radio :label="1">是</el-radio>
                 <el-radio :label="0">否</el-radio>
@@ -284,7 +284,7 @@
             </el-descriptions-item>
           </el-descriptions>
           <el-descriptions class="margin-top" :column="3" v-if="this.askari==1" size="medium" border>
-            <el-descriptions-item  labelClassName="gx_info_label" label="内部保安人数" :contentStyle='contentStyle' :labelStyle='labelStyle'>
+            <el-descriptions-item  labelClassName="info_label_required" label="内部保安人数" :contentStyle='contentStyle' :labelStyle='labelStyle'>
               <el-input-number
                 v-model="innerCount"
                 controls-position="right"
@@ -293,7 +293,7 @@
                 :max="999"
               ></el-input-number>
             </el-descriptions-item>
-            <el-descriptions-item  labelClassName="gx_info_label"  label="外聘保安人数" :contentStyle='contentStyle' :labelStyle='labelStyle'>
+            <el-descriptions-item  labelClassName="info_label_required"  label="外聘保安人数" :contentStyle='contentStyle' :labelStyle='labelStyle'>
               <el-input-number
                 v-model="outsideCount"
                 controls-position="right"
@@ -302,13 +302,13 @@
                 :max="999"
               ></el-input-number>
             </el-descriptions-item>
-            <el-descriptions-item  labelClassName="gx_info_label" label="是否取得保安证书">
+            <el-descriptions-item  labelClassName="info_label_required" 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="isAskariCertificate==1" labelClassName="gx_info_label" label="上传保安证" :contentStyle='contentStyle' :labelStyle='labelStyle'>
+            <el-descriptions-item v-if="isAskariCertificate==1" labelClassName="info_label_required" label="上传保安证" :contentStyle='contentStyle' :labelStyle='labelStyle'>
               <image-upload
                 v-model="askariCertificate"
                 :limit="5"
@@ -319,7 +319,7 @@
           </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-descriptions-item v-if="type === org_type.jkzx" labelClassName="info_label_required" label="建设时间">
               <el-date-picker
                 clearable
                 v-model="constructionTime"
@@ -329,7 +329,7 @@
               >
               </el-date-picker>
             </el-descriptions-item>
-            <el-descriptions-item v-if="type === org_type.jkzx" labelClassName="gx_info_label" label="最近一次改造时间">
+            <el-descriptions-item v-if="type === org_type.jkzx" labelClassName="info_label_required" label="最近一次改造时间">
               <el-date-picker
                 clearable
                 v-model="lastUpdateTime"
@@ -339,7 +339,7 @@
               >
               </el-date-picker>
             </el-descriptions-item>
-            <el-descriptions-item v-if="type === org_type.jkzx" labelClassName="gx_info_label" label="系统平台品牌">
+            <el-descriptions-item v-if="type === org_type.jkzx" labelClassName="info_label_required" label="系统平台品牌">
               <el-select
                 clearable
                 v-model="platformBrand"
@@ -354,7 +354,7 @@
               </el-select>
             </el-descriptions-item>
             <el-descriptions-item v-if="type === org_type.jkzx || type === org_type.lhzz" :contentStyle='contentStyle' :labelStyle='labelStyle'
-                                  labelClassName="gx_info_label" label="离行式加钞间出入口数量">
+                                  labelClassName="info_label_required" label="离行式加钞间出入口数量">
               <el-input-number
                 v-model="cashAddingRoom"
                 controls-position="right"
@@ -363,7 +363,7 @@
                 :max="999"
               ></el-input-number>
             </el-descriptions-item>
-            <el-descriptions-item v-if="type === org_type.jkzx" labelClassName="gx_info_label" label="全辖摄像头总路数">
+            <el-descriptions-item v-if="type === org_type.jkzx" labelClassName="info_label_required" label="全辖摄像头总路数">
               <el-input-number
                 v-model="totalCameraCount"
                 controls-position="right"
@@ -372,7 +372,7 @@
                 :max="999999"
               ></el-input-number>
             </el-descriptions-item>
-            <el-descriptions-item v-if="type === org_type.jkzx" labelClassName="gx_info_label" label="全辖高清摄像头路数">
+            <el-descriptions-item v-if="type === org_type.jkzx" labelClassName="info_label_required" label="全辖高清摄像头路数">
               <el-input-number
                 v-model="hdCameraCount"
                 controls-position="right"
@@ -381,13 +381,13 @@
                 :max="999999"
               ></el-input-number>
             </el-descriptions-item>
-            <el-descriptions-item label="出入口远程控制与授权"  v-if="(type === org_type.jkzx)" labelClassName="gx_info_label" >
+            <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 label="业务库防控隔离门出入口数量" v-if="type === org_type.jkzx" labelClassName="gx_info_label" >
+            <el-descriptions-item label="业务库防控隔离门出入口数量" v-if="type === org_type.jkzx" labelClassName="info_label_required" >
               <el-input-number
                 v-model="remoteCount"
                 controls-position="right"
@@ -1643,6 +1643,9 @@ export default {
 
 <style scoped lang="scss">
 
+
+ 
+
 /*.org-extend{
   background-color: #fff;
   padding: 10px;