更新业务：1.数据上报新增字段。2.老年食堂新增导出。3.社区机构导出去掉区划编码，增加区划名称。

ruoyi-modules/mz-lnst/src/main/java/com/ruoyi/lnst/domain/LnstJcxx.java

@@ -59,19 +59,17 @@ public class LnstJcxx extends BaseEntity
     private String tyshxydm;
 
     /** 所属行政区划 */
-    @Excel(name = "所在行政区划")
     @ApiModelProperty(value = "所在行政区划", required = true)
     private String ssxzqh;
 
     /** 所在行政区划 */
-    @Excel(name = "所在行政区划")
     @ApiModelProperty(value = "所在行政区划", required = true)
     @NotBlank(message = "{所在行政区划}",groups = AddGroup.class)
     @Size(min = 1, max = 12, message = "{所在行政区划}")
     private String szxzqh;
 
     /** 通信地址 */
-    @Excel(name = "通信地址")
+    @Excel(name = "食堂门牌号")
     @ApiModelProperty(value = "通信地址", required = true)
     @NotBlank(message = "{通信地址}",groups = AddGroup.class)
     @Size(min = 1, max = 400, message = "{通信地址}")
@@ -86,21 +84,18 @@ public class LnstJcxx extends BaseEntity
     private String stjs;
 
     /** 食堂照片 */
-    @Excel(name = "食堂照片")
     @ApiModelProperty(value = "食堂照片")
 //    @Size(max = 100, message = "{食堂照片}")
 
     private String stzp;
 
     /** 食堂地理坐标(经度) */
-    @Excel(name = "食堂地理坐标(经度)")
     @ApiModelProperty(value = "食堂地理坐标(经度)")
     @Size(max = 100, message = "{食堂地理坐标(经度)}")
 
     private String lat;
 
     /** 食堂地理坐标(纬度) */
-    @Excel(name = "食堂地理坐标(纬度)")
     @ApiModelProperty(value = "食堂地理坐标(纬度)")
     @Size(max = 100, message = "{食堂地理坐标(纬度)}")
 
@@ -130,7 +125,7 @@ public class LnstJcxx extends BaseEntity
     private String frlxdh;
 
     /** 法定代表人证件类型 */
-    @Excel(name = "法定代表人证件类型")
+//    @Excel(name = "法定代表人证件类型")
     @ApiModelProperty(value = "法定代表人证件类型")
     @DictV(type = "C0015",message = "{法定代表人证件类型}")
     private String frzjlx;
@@ -150,56 +145,56 @@ public class LnstJcxx extends BaseEntity
     private String frdjjg;
 
     /** 法定代表人性质 */
-    @Excel(name = "法定代表人性质")
+//    @Excel(name = "法定代表人性质")
     @ApiModelProperty(value = "法定代表人性质", required = true)
     @NotBlank(message = "{法定代表人性质}",groups = AddGroup.class)
     @Size(min = 1, max = 2, message = "{法定代表人性质}")
     private String frxz;
 
     /** 产权性质 */
-    @Excel(name = "产权性质")
+//    @Excel(name = "产权性质")
     @ApiModelProperty(value = "产权性质", required = true)
     @NotBlank(message = "{产权性质}",groups = AddGroup.class)
     @Size(min = 1, max = 2, message = "{产权性质}")
     private String cqxz;
 
     /** 兴办主体 */
-    @Excel(name = "兴办主体")
+//    @Excel(name = "兴办主体")
     @ApiModelProperty(value = "兴办主体", required = true)
     @NotBlank(message = "{兴办主体}",groups = AddGroup.class)
     @Size(min = 1, max = 2, message = "{兴办主体}")
     private String xbzt;
 
     /** 所处位置 */
-    @Excel(name = "所处位置")
+//    @Excel(name = "所处位置")
     @ApiModelProperty(value = "所处位置", required = true)
     @NotBlank(message = "{所处位置}",groups = AddGroup.class)
     @Size(min = 1, max = 2, message = "{所处位置}")
     private String scwz;
 
     /** 运营方式 */
-    @Excel(name = "运营方式")
+//    @Excel(name = "运营方式")
     @ApiModelProperty(value = "运营方式", required = true)
     @NotBlank(message = "{运营方式}",groups = AddGroup.class)
     @Size(min = 1, max = 2, message = "{运营方式}")
     private String yyfs;
 
     /** 是否提供送餐服务 */
-    @Excel(name = "是否提供送餐服务")
+//    @Excel(name = "是否提供送餐服务")
     @ApiModelProperty(value = "是否提供送餐服务", required = true)
 //    @NotBlank(message = "{是否提供送餐服务}",groups = AddGroup.class)
     @Size(min = 1, max = 2, message = "{是否提供送餐服务}")
     private String sftgscfw;
 
     /** 食堂类型 */
-    @Excel(name = "食堂类型")
+//    @Excel(name = "食堂类型")
     @ApiModelProperty(value = "食堂类型", required = true)
     @NotBlank(message = "{食堂类型}",groups = AddGroup.class)
     @Size(min = 1, max = 2, message = "{食堂类型}")
     private String stlx;
 
     /** 食堂状态 */
-    @Excel(name = "食堂状态")
+//    @Excel(name = "食堂状态")
     @ApiModelProperty(value = "食堂状态", required = true)
     @NotBlank(message = "{食堂状态}",groups = AddGroup.class)
     @Size(min = 1, max = 2, message = "{食堂状态}")
@@ -211,7 +206,7 @@ public class LnstJcxx extends BaseEntity
     private String lrzptype;
 
     /** 是否生效 */
-    @Excel(name = "是否生效")
+//    @Excel(name = "是否生效")
     @ApiModelProperty(value = "是否生效")
     private String sczt;
 
@@ -274,6 +269,7 @@ public class LnstJcxx extends BaseEntity
 
     /** 单位所属行政区划  id拼接 */
     @TableField(exist = false)
+    @Excel(name = "区划名称")
     private String ssxzqhName;
 
     /** 单位所在行政区划 id拼接 */

ruoyi-modules/mz-lnst/src/main/resources/mapper/lnst/LnstJcxxMapper.xml

@@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <sql id="selectLnstJcxxVo">
         select
-            *
+            *,getxzqhmcbycode(ssxzqh) as ssxzqh_name
         from lnst_jcxx
     </sql>
 

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

@@ -876,4 +876,14 @@ public class YljgJcxx extends BaseEntity
     @ApiModelProperty(value = "财务填报-是否确认")
     private String iscwqr;
 
+    @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/java/com/ruoyi/organization/domain/YljgsqJcxx.java

@@ -79,6 +79,11 @@ public class YljgsqJcxx extends BaseEntity
     @Size(min  = 1, max = 100, message = "{单位名称}")
     private String jgmc;
 
+    /** 单位所属行政区划 */
+    @TableField(exist = false)
+    @Excel(name = "单位所属行政区划")
+    private String ssxzqhName;
+
     /** 单位建立日期 */
      @Excel(name = "单位建立日期")
     @ApiModelProperty(value = "单位建立日期", required = true)
@@ -87,13 +92,13 @@ public class YljgsqJcxx extends BaseEntity
     private String jlrq;
 
     /** 单位所属行政区划 */
-    @Excel(name = "单位所属行政区划")
+//    @Excel(name = "单位所属行政区划")
     @ApiModelProperty(value = "单位所属行政区划", required = true)
 //    @Size(min  = 1, max = 12, message = "{单位所属行政区划}")
     private String ssxzqh;
 
     /** 单位所在行政区划 */
-    @Excel(name = "单位所在行政区划")
+//    @Excel(name = "单位所在行政区划")
     @ApiModelProperty(value = "单位所在行政区划", required = true)
 //    @NotBlank(message = "{单位所在行政区划}",groups = AddGroup.class)
     private String szxzqh;
@@ -527,9 +532,7 @@ public class YljgsqJcxx extends BaseEntity
     @TableField(exist = false)
     private String szxzqhIds;
 
-    /** 单位所属行政区划 */
-    @TableField(exist = false)
-    private String ssxzqhName;
+
 
     /** 单位所属行政区划 */
     @TableField(exist = false)

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

@@ -129,6 +129,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="fwsj"    column="fwsj"    />
         <result property="zxlxr"    column="zxlxr"    />
         <result property="zxlxr"    column="zxlxr"    />
+        <result property="ahae0601"    column="ahae0601"    />
+        <result property="ahae0626"    column="ahae0626"    />
+        <result property="ahae0627"    column="ahae0627"    />
     </resultMap>
 
     <resultMap type="YljgJcxx" id="YljgJcxxResultExport">
@@ -575,6 +578,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         getxzqhcodebycode(szxzqh) as szxzqh_ids,
         getxzqhcodebycode(ssxzqh) as ssxzqh_ids,
         bhsqs, jgdjzs, cns, qtcl,is_szzhzq,zqmj,zqcw,pbrys,
+        ahae0601,ahae0626,ahae0627,
         id, zzjgdm, tyshxydm, jgmc, jlrq, czyy, czsj,lat,lng,jg_url,
         ssxzqh, szxzqh, txdz, frxm, frlxfs, frzjlx, frzjhm, frdjjg, frlx,
         qtcws, rtcws, hlxcws, cwzs, jzmj, zdmj, csxz, is_xfsy_zt, xfsy_yy, xfsy_yj,
@@ -941,6 +945,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="zqcw != null">zqcw = #{zqcw},</if>
             <if test="pbrys != null">pbrys = #{pbrys},</if>
             <if test="szzhzqRzlnrs != null">szzhzq_rzlnrs = #{szzhzqRzlnrs},</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/lnst/stxxcx/index.vue

@@ -59,6 +59,7 @@
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
           </el-form-item>
+
         </el-form>
             <el-table v-loading="loading" :data="jcxxList">
               <el-table-column label="序号" align="center">
@@ -354,10 +355,14 @@ export default {
         this.title = '食堂详细信息'
       })
     },
+    handleExport() {
+      this.download('lnst/jcxx/export', {
+        ...this.queryParams
+      }, `食堂信息_${new Date().getTime()}.xlsx`)
+    },
     /** 修改按钮操作 */
     handleUpdate(row, is) {
       this.reset();
-      console.log(22222222222222222,row.id)
       this.jgId = row.id;
       this.openXG = true;
       this.title = '食堂信息'

ruoyi-ui/src/views/lnst/stxxzc/index.vue

@@ -52,6 +52,16 @@
           hasPermi="['lnst:lnstJcxx:add']"
         >新增</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          hasPermi="['lnst:lnstJcxx:exprot']"
+        >导出</el-button>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -885,6 +895,11 @@ export default {
       this.open = true;
       this.title = "添加食堂账号管理";
     },
+    handleExport() {
+      this.download('lnst/lnstJcxx/export', {
+        ...this.queryParams
+      }, `食堂信息_${new Date().getTime()}.xlsx`)
+    },
     /** 修改按钮操作 */
     handleUpdate(row,is) {
       this.reset();

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

@@ -261,15 +261,48 @@
 			        <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" >
-				        <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>
+<!--		        <el-form-item label="是否公建民营AAA" 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"-->
+<!--				        >{{ dict.label }}-->
+<!--				        </el-radio>-->
+<!--			        </el-radio-group>-->
+<!--		        </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.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">
 		        <el-form-item label="所处位置" prop="scwz" class="formWidth2">
 			        <el-select v-model="form.scwz" :disabled="isBa" placeholder="请选择所处位置">
@@ -762,7 +795,7 @@ import { decryptData_ECB, decryptRowData_ECB } from "@/api/tool/sm4";
 
 export default {
     name: 'Jcxx',
-    dicts: ['CH010', 'CH052', 'CZ035', 'C0038', 'CH014', 'C0015', 'CH013', 'CH012', 'CH007', 'CH059', 'CH026', 'CH060', 'CH009', 'CZ032'],
+    dicts: ['CH010', 'CH052', 'CH066', 'CZ035', 'C0038', 'CH014', 'C0015', 'CH013', 'CH012', 'CH007', 'CH059', 'CH026', 'CH060', 'CH009', 'CZ032'],
     data() {
       return {
         props: {
@@ -770,6 +803,7 @@ export default {
           checkStrictly: true
         },
         checked: false,
+        checkedDq: false,
         // 遮罩层
         loading: true,
         submitFormLoading: false,
@@ -802,7 +836,7 @@ export default {
           tyshxydm: [
             { required: true, message: '统一社会信用代码不能为空', trigger: 'blur' },
             // { pattern: Regular.CreditCode, message: '统一社会信用代码格式不对', trigger: 'blur' }
-            { max: 18, message: '统一社会信用代码不能超过18个字符', trigger: 'blur' },
+            { min: 18, max: 18, message: '统一社会信用代码必须为18个字符', trigger: 'blur' },
           ],
           jgmc: [
             { required: true, message: '单位名称不能为空', trigger: 'blur' },
@@ -906,6 +940,16 @@ export default {
           scwz: [
             { required: true, message: '所处位置不能为空', trigger: 'change' }
           ],
+          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' }
+          ],
           xbzt: [
             { required: true, message: '兴办主体不能为空', trigger: 'change' }
           ],
@@ -1483,6 +1527,13 @@ export default {
             { max: 18, message: '统一社会信用代码不能超过18个字符', trigger: 'blur' },
           ]
         }
+      },
+      changeCheckedDq(value) {
+        if (value) {
+          this.form.ahae0626 = this.form.tyshxydm;
+        } else {
+          this.form.ahae0626 =''
+        }
       },
 	    changeDwxz(value){
 		    if (['1', '2'].includes(value?.slice(0, 1))) {
@@ -1539,6 +1590,9 @@ export default {
           isGry: null,
           isQyxylfwzx: null,
           scwz: null,
+          ahae0626: null,
+          ahae0627: null,
+          ahae0601: null,
           xbzt: null,
 	        isGbmy: null,
           szlrlx: [],
@@ -1659,6 +1713,7 @@ export default {
               this.form.tyshxydm = ''
               this.rules.tyshxydm = []
             }
+            if(this.form.ahae0626 === this.form.tyshxydm)this.checkedDq=true;
             this.szxzqhNames=this.form.szxzqhNames
             let copyData = {
               ...this.form,

ruoyi-ui/src/views/search/xxcx/fwjg/yljg/jbxx/detail.vue

@@ -81,6 +81,21 @@
 								<td>{{ form.pbrys }}</td>
 							</tr>
 						</table>
+<!--            <h3>机构介绍</h3>-->
+<!--            <table>-->
+<!--              <tr>-->
+<!--                <td>统一社会信用代码</td>-->
+<!--                <td>{{ form.tyshxydm }}</td>-->
+<!--                <td>单位建立日期</td>-->
+<!--                <td>{{ special(form.jlrq) }}</td>-->
+<!--                <td>备案日期</td>-->
+<!--                <td>{{ special(form.basj) }}</td>-->
+<!--              </tr>-->
+<!--              <tr>-->
+<!--                <td>单位通信地址</td>-->
+<!--                <td colspan="5">{{ form.szxzqhName + form.txdz }}</td>-->
+<!--              </tr>-->
+<!--            </table>-->
 					</el-tab-pane>
 					<el-tab-pane label="扩展信息" name="second">
 						<h3>扩展信息</h3>

ruoyi-ui/src/views/system/zhgl/sqyljg/index.vue

@@ -149,6 +149,39 @@
             <el-input :disabled="isXQ"  v-model="form.frlxfs" />
           </el-form-item>
         </div>
+        <div class="formFlex">
+          <el-form-item label="经营方式" prop="ahae0601" class="formWidth2">
+            <el-select :disabled="isXQ" v-model="form.ahae0601" placeholder="请选择经营方式">
+              <el-option
+                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-form-item>
+          <el-form-item label="运营机构名称" prop="ahae0627" class="formWidth2">
+            <el-input v-model="form.ahae0627" placeholder="运营机构名称" maxlength="40"/>
+          </el-form-item>
+        </div>
+
         <div v-if="isXQ">
           <div class="formFlex">
             <el-form-item label="账号" prop="userName" class="formWidth2">
@@ -231,7 +264,7 @@ import { decryptData_ECB, decryptRowData_ECB } from "@/api/tool/sm4";
 
 export default {
   name: "Zhgl",
-  dicts: ['CZ035', 'XZ078'],
+  dicts: ['CZ035', 'XZ078','CH066'],
   data() {
     return {
       // 遮罩层
@@ -288,7 +321,7 @@ export default {
         tyshxydm: [
           { required: true, message: "统一社会信用代码不能为空", trigger: "blur" },
 	        // { pattern: Regular.CreditCode, message: '统一社会信用代码格式不对', trigger: 'blur' },
-          { max: 18, message: '统一社会信用代码不能超过18个字符', trigger: 'blur'},
+          { min: 18, max: 18, message: '统一社会信用代码必须为18个字符', trigger: 'blur' },
         ],
         frxm: [
           { required: true, message: "负责人不能为空", trigger: "blur" },
@@ -300,6 +333,16 @@ export default {
           {pattern: Regular.Mobile, message: "消防安全负责人手机号码格式不对", trigger: "blur"},
           { max: 11, message: '联系电话不能超过11个字符', trigger: 'blur'},
         ],
+        ahae0601: [
+          { required: true, message: '经营方式不能为空', trigger: 'blur' },
+        ],
+        ahae0626: [
+          { required: true, message: '运营机构统一社会信用代码不能为空', trigger: 'change' },
+          { min: 18, max: 18, message: '运营机构统一社会信用代码必须为18个字符', trigger: 'blur' },
+        ],
+        ahae0627: [
+          { required: true, message: '运营机构名称不能为空', trigger: 'change' }
+        ],
         // ssxzqh: [
         //   { max: 12, message: '所属区划不能超过12个字符', trigger: 'blur'},
         // ],
@@ -396,6 +439,19 @@ export default {
         // ]
       }
     },
+
+    changeCheckedDq(value) {
+      if (value) {
+        this.form.ahae0626 = this.form.tyshxydm;
+        // this.rules.tyshxydm = []
+      } else {
+        this.form.tyshxydm =''
+        // this.rules.tyshxydm = [
+        //   { required: true, message: '统一社会信用代码不能为空', trigger: 'blur' },
+        //   { pattern: Regular.CreditCode, message: '统一社会信用代码格式不对', trigger: 'blur' }
+        // ]
+      }
+    },
     submit(){
       updateZhgl(this.form).then(response => {
         this.$modal.msgSuccess("修改成功");
@@ -428,6 +484,9 @@ export default {
         tyshxydm: null,
         frxm: null,
         frlxfs: null,
+        ahae0601: null,
+        ahae0626: null,
+        ahae0627: null,
         ssxzqh: null,
         userName: null,
         password: null,
@@ -460,7 +519,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加机构账号管理";
+      this.title = "添加社区机构账号管理";
     },
     /** 修改按钮操作 */
     handleUpdate(row,is) {

ruoyi-ui/src/views/system/zhgl/yljg/index.vue

@@ -96,6 +96,40 @@
             <el-input :disabled="form.id ? true : false" v-model="form.frlxfs" />
           </el-form-item>
         </div>
+        <div class="formFlex">
+          <el-form-item label="经营方式" prop="ahae0601" class="formWidth2">
+            <el-select :disabled="form.id ? true : false" v-model="form.ahae0601" placeholder="请选择经营方式">
+              <el-option
+                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-form-item>
+          <el-form-item label="运营机构名称" prop="ahae0627" class="formWidth2">
+            <el-input v-model="form.ahae0627" placeholder="运营机构名称" maxlength="40"/>
+          </el-form-item>
+        </div>
+
+
         <div v-if="form.id">
           <div class="formFlex">
             <el-form-item label="账号" prop="userName" class="formWidth2">
@@ -140,7 +174,7 @@ import { decryptData_ECB, decryptRowData_ECB } from "@/api/tool/sm4";
 
 export default {
   name: 'Zhgl',
-  dicts: ['CZ035', 'XZ078'],
+  dicts: ['CZ035', 'CH066', 'XZ078'],
   data() {
     return {
       // 遮罩层
@@ -182,7 +216,7 @@ export default {
         tyshxydm: [
           { required: true, message: '统一社会信用代码不能为空', trigger: 'blur' },
           // { pattern: Regular.CreditCode, message: '统一社会信用代码格式不对', trigger: 'blur' },
-          { max: 18, message: '统一社会信用代码不能超过18个字符', trigger: 'blur'},
+          { min: 18, max: 18, message: '统一社会信用代码必须为18个字符', trigger: 'blur' },
         ],
         frxm: [
           { required: true, message: '负责人不能为空', trigger: 'blur' },
@@ -194,6 +228,16 @@ export default {
           { pattern: Regular.Mobile, message: '消防安全负责人手机号码格式不对', trigger: 'blur' },
           { max: 11, message: '联系电话不能超过11个字符', trigger: 'blur' }
         ],
+        ahae0601: [
+          { required: true, message: '经营方式不能为空', trigger: 'blur' },
+        ],
+        ahae0626: [
+          { required: true, message: '运营机构统一社会信用代码不能为空', trigger: 'change' },
+          { min: 18, max: 18, message: '运营机构统一社会信用代码必须为18个字符', trigger: 'blur' },
+        ],
+        ahae0627: [
+          { required: true, message: '运营机构名称不能为空', trigger: 'change' }
+        ],
         // ssxzqh: [
         //   { max: 12, message: '所属区划不能超过12个字符', trigger: 'blur'},
         // ],
@@ -288,6 +332,9 @@ export default {
         tyshxydm: null,
         frxm: null,
         frlxfs: null,
+        ahae0601: null,
+        ahae0626: null,
+        ahae0627: null,
         ssxzqh: null,
         userName: null,
         password: null,