Merge branch 'nan' of sckj/mz-cloud into master

ruoyi-ui/src/views/business/fwjggl/bn/index.vue

@@ -282,7 +282,7 @@
             <div class="formBox">
               <div class="formFlex">
                 <el-form-item label="单位性质" prop="dwxz" class="formWidth">
-                  <el-cascader v-model="form.dwxz" :options="dict.tree.C0038" :props="props"></el-cascader>
+                  <el-cascader v-model="form.dwxz" :options="dict.tree.C0038" :props="props" @change="changeDwxz"></el-cascader>
                 </el-form-item>
                 <el-form-item label="所处位置" prop="scwz" class="formWidth">
                   <el-select v-model="form.scwz" placeholder="请选择所处位置">
@@ -292,22 +292,22 @@
                   </el-select>
                 </el-form-item>
                 <el-form-item label="兴办主体" prop="xbzt" class="formWidth">
-                  <el-select v-model="form.xbzt" placeholder="请选择兴办主体" @change="changeXbzt">
+                  <el-select v-model="form.xbzt" placeholder="请选择兴办主体">
                     <el-option v-for="dict in dict.type.CH010" :key="dict.value" :label="dict.label"
                       :value="dict.value">
                     </el-option>
                   </el-select>
                 </el-form-item>
               </div>
-              <div class="formFlex">
-	              <el-form-item label="是否公办民营" prop="isGbmy" class="formWidth2">
-		              <el-radio-group v-model="form.isGbmy" :disabled="isChooseGbmy">
-			              <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">
-				              {{dict.label}}
-			              </el-radio>
-		              </el-radio-group>
-	              </el-form-item>
-              </div>
+              <!--<div class="formFlex">-->
+	            <!--  <el-form-item label="是否公办民营" prop="isGbmy" class="formWidth2">-->
+		          <!--    <el-radio-group v-model="form.isGbmy" :disabled="isChooseGbmy">-->
+			        <!--      <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">-->
+				      <!--        {{dict.label}}-->
+			        <!--      </el-radio>-->
+		          <!--    </el-radio-group>-->
+	            <!--  </el-form-item>-->
+              <!--</div>-->
               <div class="formFlex">
                 <el-form-item label="收住老人类型" prop="szlrlx" class="formWidth4">
                   <el-checkbox-group v-model="form.szlrlx" @change="getSzlrlx(form.szlrlx)">
@@ -1108,11 +1108,11 @@ export default {
       return row.bnCjzt==1?'登记':'变更';
     },
 	  // 兴办主体
-	  changeXbzt(value){
-		  if(value === '04' || value === '05'){
-			  this.isChooseGbmy= false
-		  }else{
-			  this.isChooseGbmy= true
+	  changeDwxz(value){
+		  if (['1', '2'].includes(value.slice(0, 1))) {
+			  this.isChooseGbmy = false;
+		  } else {
+			  this.isChooseGbmy = true;
 		  }
 	  },
     changeChecked(is) {

ruoyi-ui/src/views/organization/jggl/jcxx/index.vue

@@ -194,24 +194,33 @@
           扩展信息：
         </h3>
         <div class="formBox">
-          <div class="formFlex">
-            <el-form-item label="单位性质" prop="dwxz" class="formWidth2">
-              <el-cascader v-model="form.dwxz" :disabled="isBa" :options="dict.tree.C0038" :props="props"></el-cascader>
-            </el-form-item>
-            <el-form-item label="所处位置" prop="scwz" class="formWidth2">
-              <el-select v-model="form.scwz" :disabled="isBa" placeholder="请选择所处位置">
-                <el-option
-                  v-for="dict in dict.type.CH012"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
+	        <div class="formFlex">
+		        <el-form-item label="单位性质" prop="dwxz" class="formWidth2">
+			        <el-cascader v-model="form.dwxz" @change="changeDwxz" :disabled="isBa" :options="dict.tree.C0038"
+				        :props="props"></el-cascader>
+		        </el-form-item>
+		        <el-form-item label="是否公办民营" prop="isGbmy" class="formWidth2">
+			        <el-radio-group v-model="form.isGbmy" :disabled="isChooseGbmy">
+				        <el-radio
+					        v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value"
+				        >{{ dict.label }}
+				        </el-radio>
+			        </el-radio-group>
+		        </el-form-item>
           </div>
 	        <div class="formFlex">
+		        <el-form-item label="所处位置" prop="scwz" class="formWidth2">
+			        <el-select v-model="form.scwz" :disabled="isBa" placeholder="请选择所处位置">
+				        <el-option
+					        v-for="dict in dict.type.CH012"
+					        :key="dict.value"
+					        :label="dict.label"
+					        :value="dict.value"
+				        ></el-option>
+			        </el-select>
+		        </el-form-item>
 		        <el-form-item label="兴办主体" prop="xbzt" class="formWidth2">
-			        <el-select v-model="form.xbzt" :disabled="isBa" placeholder="请选择兴办主体" @change="changeXbzt">
+			        <el-select v-model="form.xbzt" :disabled="isBa" placeholder="请选择兴办主体">
 				        <el-option
 					        v-for="dict in dict.type.CH010"
 					        :key="dict.value"
@@ -220,14 +229,6 @@
 				        ></el-option>
 			        </el-select>
 		        </el-form-item>
-		        <el-form-item label="是否公办民营" prop="isGbmy" class="formWidth2">
-			        <el-radio-group v-model="form.isGbmy" :disabled="isChooseGbmy">
-				        <el-radio
-					        v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value"
-				        >{{dict.label}}
-				        </el-radio>
-			        </el-radio-group>
-		        </el-form-item>
 	        </div>
           <div class="formFlex">
             <el-form-item label="享受政府扶持优惠政策内容" prop="fcyhznr" class="formWidth3">
@@ -1388,12 +1389,12 @@ export default {
           ]
         }
       },
-	    changeXbzt(value){
-				if(value === '04' || value === '05'){
-					this.isChooseGbmy= false
-				}else{
-					this.isChooseGbmy= true
-				}
+	    changeDwxz(value){
+		    if (['1', '2'].includes(value.slice(0, 1))) {
+			    this.isChooseGbmy = false;
+		    } else {
+			    this.isChooseGbmy = true;
+		    }
 	    },
       getMessage() {
 

ruoyi-ui/src/views/organization/zwyw/babgsq/module/index.vue

@@ -221,7 +221,7 @@
             <div class="formBox">
               <div class="formFlex">
                 <el-form-item label="单位性质" prop="dwxz" class="formWidth">
-                  <el-cascader v-model="form.dwxz" :options="dict.tree.C0038" :props="props"></el-cascader>
+                  <el-cascader v-model="form.dwxz" :options="dict.tree.C0038" :props="props" @change="changeDwxz"></el-cascader>
                 </el-form-item>
                 <el-form-item label="所处位置" prop="scwz" class="formWidth">
                   <el-select v-model="form.scwz" placeholder="请选择所处位置">
@@ -230,21 +230,21 @@
                   </el-select>
                 </el-form-item>
                 <el-form-item label="兴办主体" prop="xbzt" class="formWidth">
-                  <el-select v-model="form.xbzt" placeholder="请选择兴办主体" @change="changeXbzt">
+                  <el-select v-model="form.xbzt" placeholder="请选择兴办主体">
                     <el-option v-for="dict in dict.type.CH010" :key="dict.value" :label="dict.label"
                       :value="dict.value"></el-option>
                   </el-select>
                 </el-form-item>
               </div>
-              <div class="formFlex">
-	              <el-form-item label="是否公办民营" prop="isGbmy" class="formWidth2">
-		              <el-radio-group v-model="form.isGbmy" :disabled="isChooseGbmy">
-			              <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">
-				              {{dict.label}}
-			              </el-radio>
-		              </el-radio-group>
-	              </el-form-item>
-              </div>
+              <!--<div class="formFlex">-->
+	            <!--  <el-form-item label="是否公办民营" prop="isGbmy" class="formWidth2">-->
+		          <!--    <el-radio-group v-model="form.isGbmy" :disabled="isChooseGbmy">-->
+			        <!--      <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">-->
+				      <!--        {{dict.label}}-->
+			        <!--      </el-radio>-->
+		          <!--    </el-radio-group>-->
+	            <!--  </el-form-item>-->
+              <!--</div>-->
               <div class="formFlex">
                 <el-form-item label="收住老人类型" prop="szlrlx" class="formWidth4">
                   <el-checkbox-group v-model="form.szlrlx" @change="getSzlrlx(form.szlrlx)">
@@ -886,12 +886,11 @@ export default {
     }
   },
   methods: {
-		// 兴办主体
-	  changeXbzt(value){
-		  if(value === '04' || value === '05'){
-			  this.isChooseGbmy= false
-		  }else{
-			  this.isChooseGbmy= true
+	  changeDwxz(value) {
+		  if (['1', '2'].includes(value.slice(0, 1))) {
+			  this.isChooseGbmy = false;
+		  } else {
+			  this.isChooseGbmy = true;
 		  }
 	  },
     // 接收子组件传来的号码

ruoyi-ui/src/views/search/xxtj/ylcwtj/sqylfwjghss/index.vue

@@ -12,11 +12,11 @@
                   :userId="user.userData.dept.parentId" @handleNodeClick="NodeClick(activeName1, activeName2, $event)">
                 </dept-tree>
               </div>
-              <Echarts-box3 danwei="张" v-loading="loading" title="社区养老服务机构和设施床位统计-月度" :echartsId="'one' + dict.value"
+              <Echarts-box danwei="张" v-loading="loading" title="社区养老服务机构和设施床位统计-月度" :echartsId="'one' + dict.value"
                 :tableList="formData[3 * index + 1].vales" :labelKeys="formData[3 * index + 1].keys" type="line" xStr="year"
                 :unit="formData[3 * index + 1].unit">
                 <Echarts-select @change-year="getNewYear"></Echarts-select>
-              </Echarts-box3>
+              </Echarts-box>
             </div>
             <div class="echarts-text">注：统计数据为“0”，对于自建和部省两级部署的省份有3种原因：一是数据未上报；二是数据已上报正在抽取或清洗中；三是已上报数据但不包括此类数据。
               对于大集中部署模式的省份则是数据未填报。</div>
@@ -46,10 +46,10 @@
                   :userId="user.userData.dept.parentId" @handleNodeClick="NodeClick(activeName1, activeName2, $event)">
                 </dept-tree>
               </div>
-              <Echarts-box3 danwei="张" v-loading="loading" title="社区养老服务机构和设施床位统计-行政区划" :echartsId="'two' + dict.value"
+              <Echarts-box danwei="张" v-loading="loading" title="社区养老服务机构和设施床位统计-行政区划" :echartsId="'two' + dict.value"
                 type="bar" xStr="ssqh" :tableList="formData[3 * index + 2].vales" :labelKeys="formData[3 * index + 2].keys">
                 <Echarts-date @change-dateYear="changDateYear" @change-dateMonth="changeDateMonth"></Echarts-date>
-              </Echarts-box3>
+              </Echarts-box>
             </div>
             <div class="echarts-text">注：统计数据为“0”，对于自建和部省两级部署的省份有3种原因：一是数据未上报；二是数据已上报正在抽取或清洗中；三是已上报数据但不包括此类数据。
               对于大集中部署模式的省份则是数据未填报。</div>
@@ -79,9 +79,9 @@
                   :userId="user.userData.dept.parentId" @handleNodeClick="NodeClick(activeName1, activeName2, $event)">
                 </dept-tree>
               </div>
-              <Echarts-box3 danwei="张" hengzhu="yes" v-loading="loading" title="社区养老服务机构和设施床位统计"
+              <Echarts-box danwei="张" hengzhu="yes" v-loading="loading" title="社区养老服务机构和设施床位统计"
                 :echartsId="'three' + dict.value" type="bar" :isPie="false" :tableList="formData[3 * index + 3].vales"
-                :labelKeys="formData[3 * index + 3].keys" isX="value" isY="category"> </Echarts-box3>
+                :labelKeys="formData[3 * index + 3].keys" isX="value" isY="category"> </Echarts-box>
             </div>
             <div class="left-bottom-text">
               <span>注：本功能统计截止当天的数量及占比</span>
@@ -228,7 +228,6 @@ export default {
         }
       })
       this.formData[this.formDataidx].keys = arr;
-
     },
     // 获取表格数据
     async getTableList() {
@@ -238,7 +237,7 @@ export default {
       if (retdata.code == 200) {
         var data = this.$DBRetToObjA(retdata.data)
         this.formData[this.formDataidx] = data[0];
-        this.keys()
+        // this.keys()
       }
     }
   },