数据上报-新增字段

ruoyi-modules/mz-organization-jg/src/main/java/com/ruoyi/organization/domain/YljgJgjs.java

@@ -55,11 +55,11 @@ public class YljgJgjs extends BaseEntity
     private String zxlxdh;
 
     @ApiModelProperty(value = "服务内容")
-    @Size(max = 600, message = "{服务内容}")
+    @Size(max = 1500, message = "{服务内容}")
     private String fwnr;
 
     @ApiModelProperty(value = "服务团队")
-    @Size(max = 600, message = "{服务团队}")
+    @Size(max = 1000, message = "{服务团队}")
     private String fwtd;
 
     @ApiModelProperty(value = "服务时间")
@@ -71,7 +71,7 @@ public class YljgJgjs extends BaseEntity
     private String fwfw;
 
     @ApiModelProperty(value = "范围说明")
-    @Size(max = 600, message = "{范围说明}")
+    @Size(max = 300, message = "{范围说明}")
     private String fwsm;
 
 }

ruoyi-modules/mz-organization-jg/src/main/java/com/ruoyi/organization/domain/YljgsqJcxx.java

@@ -701,5 +701,14 @@ public class YljgsqJcxx extends BaseEntity
     @ApiModelProperty(value = "食堂建设状态")
     private String stjszt;
 
+    @ApiModelProperty(value = "经营方式代码-CH066-当代码IN('02','03','05','06')时，才有下面2个")
+    private String ahae0601;
+
+    @ApiModelProperty(value = "运营机构统一社会信用代码")
+    private String ahae0626;
+
+    @ApiModelProperty(value = "运营机构名称")
+    private String ahae0627;
+
 
 }

ruoyi-modules/mz-organization-jg/src/main/resources/mapper/organization/YljgsqJcxxMapper.xml

@@ -150,11 +150,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="sqstjcrs"    column="sqstjcrs"    />
         <result property="sqstyye"    column="sqstyye"    />
         <result property="sqstyhzc"    column="sqstyhzc"    />
+
+        <result property="ahae0601"    column="ahae0601"    />
+        <result property="ahae0626"    column="ahae0626"    />
+        <result property="ahae0627"    column="ahae0627"    />
     </resultMap>
 
 
     <sql id="selectYljgsqJcxxVo">
         select
+        ahae0601,ahae0626,ahae0627,
         getxzqhcodebycode(szxzqh) szxzqh,
         getxzqhmcbycode(ssxzqh) as ssxzqh_name,
         getxzqhmcbycode(szxzqh) as szxzqh_name,
@@ -558,6 +563,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isQyylzx != null">is_qyylzx,</if>
             <if test="fwrc != null">fwrc,</if>
             <if test="tgfwlx != null">tgfwlx,</if>
+            <if test="ahae0601 != null">ahae0601,</if>
+            <if test="ahae0626 != null">ahae0626,</if>
+            <if test="ahae0627 != null">ahae0627,</if>
             create_time_str,
             create_user_id,
             create_user_type,create_area_code,
@@ -642,6 +650,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isQyylzx != null">#{isQyylzx},</if>
             <if test="fwrc != null">#{fwrc},</if>
             <if test="tgfwlx != null">#{tgfwlx},</if>
+            <if test="ahae0601 != null">#{ahae0601},</if>
+            <if test="ahae0626 != null">#{ahae0626},</if>
+            <if test="ahae0627 != null">#{ahae0627},</if>
             #{createTimeStr},
             #{createUserId},
             #{createUserType},#{createAreaCode},
@@ -741,6 +752,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="sqstyye != null">sqstyye = #{sqstyye},</if>
             <if test="sqstyhzc != null">sqstyhzc = #{sqstyhzc},</if>
             <if test="stjszt != null">stjszt = #{stjszt},</if>
+            <if test="ahae0601 != null">ahae0601 = #{ahae0601},</if>
+            <if test="ahae0626 != null">ahae0626 = #{ahae0626},</if>
+            <if test="ahae0627 != null">ahae0627 = #{ahae0627},</if>
             update_time_str = #{updateTimeStr},
             update_user_id = #{updateUserId},
             update_by = #{updateBy},

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

@@ -74,12 +74,12 @@
           </div>
           <div class="formFlex">
             <el-form-item label="服务团队" prop="fwtd" class="contenrFlex">
-              <el-input v-model="form.fwtd" :maxlength="600" show-word-limit type="textarea"  :rows="3"  placeholder="请输入服务团队"/>
+              <el-input v-model="form.fwtd" :maxlength="1000" show-word-limit type="textarea"  :rows="3"  placeholder="请输入服务团队"/>
             </el-form-item>
           </div>
           <div class="formFlex">
             <el-form-item label="服务内容" prop="fwnr" class="contenrFlex">
-              <el-input v-model="form.fwnr" :maxlength="600" show-word-limit type="textarea"  :rows="3"  placeholder="请输入服务内容"/>
+              <el-input v-model="form.fwnr" :maxlength="1500" show-word-limit type="textarea"  :rows="3"  placeholder="请输入服务内容"/>
             </el-form-item>
           </div>
           <div class="formFlex">
@@ -89,7 +89,7 @@
           </div>
           <div class="formFlex">
             <el-form-item label="范围说明" prop="fwsm" class="contenrFlex">
-              <el-input v-model="form.fwsm"  :maxlength="600" show-word-limit :rows="3" type="textarea" placeholder="请输入范围说明"/>
+              <el-input v-model="form.fwsm"  :maxlength="300" show-word-limit :rows="3" type="textarea" placeholder="请输入范围说明"/>
             </el-form-item>
           </div>
 
@@ -261,7 +261,7 @@
 			        <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="是否公建民营AAA" prop="isGbmy" class="formWidth2">-->
+<!--		        <el-form-item label="是否公建民营" prop="isGbmy" class="formWidth2">-->
 <!--			        <el-radio-group v-model="form.isGbmy" >-->
 <!--				        <el-radio-->
 <!--					        v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value"-->
@@ -291,7 +291,7 @@
               </el-tooltip>
             </el-form-item>
           </div>
-          .
+
 
           <div class="formFlex" v-if="['02','03','05','06'].includes(form.ahae0601)">
             <el-form-item label="运营机构统一社会信用代码" prop="ahae0626" class="formWidth2">

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

@@ -103,12 +103,12 @@
           </div>
           <div class="formFlex">
             <el-form-item label="服务团队" prop="fwtd" class="contenrFlex">
-              <el-input v-model="form.fwtd" :maxlength="600" show-word-limit type="textarea"  :rows="3"  placeholder="请输入服务团队"/>
+              <el-input v-model="form.fwtd" :maxlength="1000" show-word-limit type="textarea"  :rows="3"  placeholder="请输入服务团队"/>
             </el-form-item>
           </div>
           <div class="formFlex">
             <el-form-item label="服务内容" prop="fwnr" class="contenrFlex">
-              <el-input v-model="form.fwnr" :maxlength="600" show-word-limit type="textarea"  :rows="3"  placeholder="请输入服务内容"/>
+              <el-input v-model="form.fwnr" :maxlength="1500" show-word-limit type="textarea"  :rows="3"  placeholder="请输入服务内容"/>
             </el-form-item>
           </div>
           <div class="formFlex">
@@ -118,7 +118,7 @@
           </div>
           <div class="formFlex">
             <el-form-item label="范围说明" prop="fwsm" class="contenrFlex">
-              <el-input v-model="form.fwsm"  :maxlength="600" show-word-limit :rows="3" type="textarea" placeholder="请输入范围说明"/>
+              <el-input v-model="form.fwsm"  :maxlength="300" show-word-limit :rows="3" type="textarea" placeholder="请输入范围说明"/>
             </el-form-item>
           </div>
 
@@ -370,17 +370,50 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="机构运营方式" prop="yylb"  class="formWidth2">
-              <el-select v-model="form.yylb" placeholder="请填写运营方式" >
+<!--            <el-form-item label="机构运营方式" prop="yylb"  class="formWidth2">-->
+<!--              <el-select v-model="form.yylb" placeholder="请填写运营方式" >-->
+<!--                <el-option-->
+<!--                  v-for="dict in dict.type.XZ126"-->
+<!--                  :key="dict.value"-->
+<!--                  :label="dict.label"-->
+<!--                  :value="dict.value"-->
+<!--                ></el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+
+            <el-form-item label="经营方式" prop="ahae0601" class="formWidth2">
+              <el-select v-model="form.ahae0601" placeholder="请选择经营方式">
                 <el-option
-                  v-for="dict in dict.type.XZ126"
+                  v-for="dict in dict.type.CH066"
                   :key="dict.value"
                   :label="dict.label"
                   :value="dict.value"
                 ></el-option>
               </el-select>
+              <el-tooltip class="item" effect="dark" placement="top">
+                <div slot="content">
+                  公办公营:由政府出资建设并直接运营，行政力量主导服务供给，通常以无偿或低偿形式。<br><br>
+                  公建民营:政府投资建设基础设施，通过租赁、委托经营等模式交由社会力量运营。<br><br>
+                  公办民营:政府保留养老设施所有权，通过招标或协议方式将运营权委托给社会组织或企业，实现所有权与经营权分离。<br><br>
+                  民办民营:民间资本独立投资建设并自主运营，市场化程度高。<br><br>
+                  民办委托:民办养老机构将部分或全部运营管理权委托给第三方专业团队管理运营。<br><br>
+                  民办连锁:企业通过直营或加盟形式实现规模化运营。
+                </div>
+                <i class="el-icon-chat-dot-round" style="margin-left: 10px; font-size: 25px; cursor: pointer;"></i>
+              </el-tooltip>
             </el-form-item>
           </div>
+
+          <div class="formFlex" v-if="['02','03','05','06'].includes(form.ahae0601)">
+            <el-form-item label="运营机构统一社会信用代码" prop="ahae0626" class="formWidth2">
+              <el-input v-model="form.ahae0626" placeholder="运营机构统一社会信用代码" maxlength="18"/>
+              <el-checkbox  v-model="checkedDq" @change="changeCheckedDq">与当前机构信用代码一致</el-checkbox>
+            </el-form-item>
+            <el-form-item label="运营机构名称" prop="ahae0627" class="formWidth2">
+              <el-input v-model="form.ahae0627" placeholder="运营机构名称" maxlength="40"/>
+            </el-form-item>
+          </div>
+
           <div class="formFlex" v-if="form.fxlb.includes('06')">
             <el-form-item label="老年食堂运营方式" prop="sqstlx" class="formWidth2">
               <el-radio-group v-model="form.sqstlx">
@@ -961,10 +994,10 @@ export default {
 	  "XZ126",
 	  "XZ128",
 	  "XZ129",
+	  "CH066",
   ],
   data() {
     return {
-
       props: {
         emitPath: false,
         checkStrictly: true,
@@ -1026,6 +1059,9 @@ export default {
         sqstyhzc: null,
         csxz: null,
         scwz: null,
+        ahae0626: null,
+        ahae0627: null,
+        ahae0601: null,
         isJm: null,
         dwxz: null,
         xbzt: null,
@@ -1302,6 +1338,16 @@ export default {
         isQyxylfwzx: [
           { required: true, message: "是否为街道不能为空", trigger: "blur" },
         ],
+        ahae0601: [
+          { required: true, message: '经营方式不能为空', trigger: 'change' }
+        ],
+        ahae0626: [
+          { required: true, message: '运营机构统一社会信用代码不能为空', trigger: 'change' },
+          { min: 18, max: 18, message: '运营机构统一社会信用代码必须为18个字符', trigger: 'blur' },
+        ],
+        ahae0627: [
+          { required: true, message: '运营机构名称不能为空', trigger: 'change' }
+        ],
         isTgjjylsmfw: [
           {
             required: true,
@@ -1413,6 +1459,7 @@ export default {
       isXF: false,
       isXK: false,
       checked: false,
+      checkedDq: false,
       isZS: false,
       sqJgId: null,
       isDt: false,
@@ -1692,6 +1739,13 @@ export default {
         }
 
       },
+    changeCheckedDq(value) {
+      if (value) {
+        this.form.ahae0626 = this.form.tyshxydm;
+      } else {
+        this.form.ahae0626 =''
+      }
+    },
       changeIsKzylfw(value) {
         if (value == Constant.IS) {
           this.isYF = false
@@ -2050,6 +2104,7 @@ export default {
             if(this.user.userData.userType && this.user.userData.userType == '00'){
               this.isStjszt = false;
             }
+            if(this.form.ahae0626 === this.form.tyshxydm)this.checkedDq=true;
             let copyData = {
               ...this.form,
               cwzs:parseInt(this.form.cwzs),