Browse Source

社区机构收费与基本信补充上报字段

953954216 5 months ago
parent
commit
18fd10d554

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

@@ -58,7 +58,7 @@ public class YljgJcxx extends BaseEntity
     /** 机构封面图 */
 //    @Excel(name = "机构封面图")
     @ApiModelProperty(value = "机构封面图")
-    @Size(max = 500, message = "{机构封面图}")
+    @Size(max = 1500, message = "{机构封面图}")
     private String jgUrl;
 
     /** 机构经度 */

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

@@ -57,7 +57,7 @@ public class YljgsqJcxx extends BaseEntity
     /** 机构封面图 */
     // @Excel(name = "机构封面图")
     @ApiModelProperty(value = "机构封面图")
-    @Size(max = 500, message = "{机构封面图}")
+    @Size(max = 1500, message = "{机构封面图}")
     private String jgUrl;
 
     /** 机构经度 */

+ 1 - 1
ruoyi-modules/mz-organization-jg/src/main/java/com/ruoyi/organization/domain/YljgsqJcxxSt.java

@@ -54,7 +54,7 @@ public class YljgsqJcxxSt extends BaseEntity
 
     /** 机构封面图 */
     @ApiModelProperty(value = "机构封面图")
-    @Size(max = 500, message = "{机构封面图}")
+    @Size(max = 1500, message = "{机构封面图}")
     private String jgUrl;
 
     /** 机构经度 */

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

@@ -68,9 +68,7 @@
             <el-form-item label="咨询联系电话" prop="zxlxdh" class="formWidth">
               <el-input v-model="form.zxlxdh"  placeholder="请输入咨询联系电话"/>
             </el-form-item>
-
           </div>
-
           <div class="formFlex">
             <el-form-item label="服务团队" prop="fwtd" class="formWidth">
               <el-input v-model="form.fwtd"  placeholder="请输入服务团队"/>
@@ -94,6 +92,7 @@
               <el-input v-model="form.fwsm"  :maxlength="600" show-word-limit :rows="3" type="textarea" placeholder="请输入范围说明"/>
             </el-form-item>
           </div>
+
           <div class="formFlex">
             <el-form-item label="机构图片" prop="jgUrl" class="contenrFlex">
               <image-upload v-model="form.jgUrl" :limit="10"></image-upload>
@@ -1058,6 +1057,9 @@ export default {
           ],
           fwsm: [
             { required: true, message: '范围说明不能为空,可以填写`无`', trigger: 'blur' }
+          ],
+          jgjs: [
+            { required: true, message: '机构介绍不能为空', trigger: 'blur' }
           ]
         },
         qtDispaly: false,
@@ -1694,7 +1696,6 @@ export default {
               // dwxz:this.form.dwxz.join(','),
               szxzqh: szxzqh
             }
-	          console.log(pamar, 'pamar')
 
             this.form2.jgid=this.form.id;
             this.form2.jgjs=this.form.jgjs;
@@ -1723,7 +1724,6 @@ export default {
             if (this.form.id != null) {
               let formData = this.comparisonObject({ ...this.form, ...pamar }, this.copyForm)
               if (formData) {
-	              console.log(formData,'updateJcxx')
                 this.submitFormLoading = true
                 updateJcxx({ ...formData, id: this.form.id }).then(response => {
                   this.$modal.msgSuccess('修改成功')
@@ -1735,7 +1735,6 @@ export default {
                 this.$modal.msgSuccess('修改成功')
               }
             } else {
-	            console.log(this.form,'addJcxx')
               this.submitFormLoading = true
               addJcxx({ ...this.form, ...pamar }).then(response => {
                 this.$modal.msgSuccess('新增成功')

+ 265 - 0
ruoyi-ui/src/views/organization/jggl/jgsfsq/index.vue

@@ -0,0 +1,265 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item>
+        <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-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['organization:jgsf:add']"
+        >新增</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="jgsfList" >
+      <el-table-column label="序号" align="center">
+        <template slot-scope="scope">
+          {{(queryParams.pageNum-1)*queryParams.pageSize + scope.$index + 1}}
+        </template>
+      </el-table-column>
+      <el-table-column label="项目名称" align="center" prop="xmmc" />
+      <el-table-column label="项目说明" align="center" prop="xmsm" />
+      <el-table-column label="收费标准" align="center" prop="sfbz" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['organization:jgsf:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row,scope.$index)"
+            v-hasPermi="['organization:jgsf:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改机构收费对话框 -->
+    <el-dialog v-dialog-drag :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+
+        <el-form-item label="项目名称" prop="xmmc">
+          <el-input v-model="form.xmmc" placeholder="请输入项目名称" />
+        </el-form-item>
+
+        <el-form-item label="项目说明" prop="xmsm">
+          <el-input v-model="form.xmsm" type="textarea" maxlength="500" show-word-limit placeholder="请输入项目说明" />
+        </el-form-item>
+
+        <el-form-item label="收费标准" prop="sfbz">
+          <el-input v-model="form.sfbz" type="textarea" maxlength="500" show-word-limit placeholder="请输入收费标准" />
+        </el-form-item>
+
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm" :loading="submitFormLoading">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import {addJgsf, delJgsf, getJgsf, listJgsf, updateJgsf} from "@/api/organization/jggl/jgsf";
+  import {chineseOne, idCard, Regular} from '@/utils/regular'
+
+  export default {
+  name: "Jgsfsq",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      submitFormLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 机构收费表格数据
+      jgsfList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        xmmc: [
+          { required: true,trigger: "blur",max: 72, message: '项目名称不能超过72个字符'},
+        ],
+        xmsm: [
+          { required: true,trigger: "blur",max: 500, message: '项目说明不能超过500个字符'},
+        ],
+        sfbz: [
+          { required: true,trigger: "blur",max: 500, message: '收费标准不能超过500个字符'},
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询机构收费列表 */
+    getList() {
+      this.loading = true;
+      listJgsf(this.queryParams).then(response => {
+        this.jgsfList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.submitFormLoading =false;
+      this.form = {
+        id: null,
+        xmmc: null,
+        xmsm: null,
+        sfbz: null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加机构收费";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getJgsf(id).then(response => {
+        this.form = response.data;
+        /****** sks 需要改动的地方 start ******/
+        this.copyForm=this.deepCopy(response.data)
+        /****** sks 需要改动的地方 end ******/
+        this.open = true;
+        this.title = "修改机构收费";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.submitFormLoading = true;
+          if (this.form.id != null) {
+            /****** sks 需要改动的地方 start ******/
+            let formData=this.comparisonObject(this.form,this.copyForm);
+            if(formData) {
+              updateJgsf({...formData,id:this.form.id}).then(response => {
+                this.$modal.msgSuccess("修改成功");
+                this.open = false;
+                this.jgsfList=this.dataReplacement(this.jgsfList,this.form.id,formData);
+                // this.getList();
+              }).finally(()=>this.submitFormLoading =false);
+            }else{
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.submitFormLoading = false;
+            }
+            /****** sks 需要改动的地方 end ******/
+          } else {
+            addJgsf(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              // this.getList();
+              /****** sks 需要改动的地方 start ******/
+              if (this.queryParams.pageSize===this.jgsfList.length)
+              {
+                this.jgsfList.pop();
+              }
+              this.jgsfList.unshift({...this.form,id:response.data});
+              this.total++;
+              /****** sks 需要改动的地方 end ******/
+            }).finally(()=>this.submitFormLoading =false);
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row,index) {
+      const ids = row.id || this.ids;
+      const xh = (this.queryParams.pageNum-1)*this.queryParams.pageSize + index + 1;
+      this.$modal.confirm('确认删除' + this.changeDelData(row,'xmmc','项目名称',xh) + '的记录?').then(function() {
+        return delJgsf(ids);
+      }).then(() => {
+        // this.getList();
+        /****** sks 需要改动的地方 ind参数需要传进来 start ******/
+        this.jgsfList.splice(index,1);
+        if(this.jgsfList.length===0)
+        {
+          this.getList();
+        }else {
+          this.total--;
+        }
+        this.$modal.msgSuccess("删除成功");
+        /****** sks 需要改动的地方 end ******/
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('organization/jgsf/export', {
+        ...this.queryParams
+      }, `jgsf_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

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

@@ -87,26 +87,55 @@
                   清空
                 </el-button>
               </el-form-item>
-              <el-form-item label="机构图片" prop="jgUrl" class="contenrFlex">
-                <image-upload v-model="form.jgUrl"></image-upload>
-              </el-form-item>
-            </div>
-            <div>
-              <el-form :inline="true" ref="form" :model="form2" label-width="120px">
-                <div class="formFlex">
-                  <el-form-item label="机构介绍" prop="jgjs" class="contenrFlex" >
-                    <el-col style="width: 690px">
-                      <el-input v-model="form2.jgjs" :rows="12" type="textarea" />
-                    </el-col>
-                  </el-form-item>
-                </div>
-              </el-form>
             </div>
           </div>
 
+          <div class="formFlex">
+            <el-form-item label="咨询联系人" prop="zxlxr" class="formWidth">
+              <el-input v-model="form.zxlxr"  placeholder="请输入咨询联系人"/>
+            </el-form-item>
+            <el-form-item label="咨询联系电话" prop="zxlxdh" class="formWidth">
+              <el-input v-model="form.zxlxdh"  placeholder="请输入咨询联系电话"/>
+            </el-form-item>
+          </div>
+          <div class="formFlex">
+            <el-form-item label="服务团队" prop="fwtd" class="formWidth">
+              <el-input v-model="form.fwtd"  placeholder="请输入服务团队"/>
+            </el-form-item>
+            <el-form-item label="服务时间" prop="fwsj" class="formWidth">
+              <el-input v-model="form.fwsj"  placeholder="请输入服务时间"/>
+            </el-form-item>
 
 
-        </div>
+          </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-form-item>
+          </div>
+          <div class="formFlex">
+            <el-form-item label="服务范围" prop="fwfw" class="contenrFlex">
+              <el-input v-model="form.fwfw" :maxlength="600" show-word-limit type="textarea"  :rows="3"  placeholder="请输入服务范围"/>
+            </el-form-item>
+          </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-form-item>
+          </div>
+
+          <div class="formFlex">
+            <el-form-item label="机构图片" prop="jgUrl" class="contenrFlex">
+              <image-upload v-model="form.jgUrl" :limit="10"></image-upload>
+            </el-form-item>
+          </div>
+          <div class="formFlex">
+            <el-form-item label="机构介绍" prop="jgjs" class="contenrFlex" >
+              <el-input v-model="form.jgjs" :maxlength="600" show-word-limit :rows="12" type="textarea" />
+            </el-form-item>
+          </div>
+
+          </div>
       </div>
       <div>
         <h3>法定信息:</h3>
@@ -1362,6 +1391,30 @@ export default {
             trigger: "blur",
           },
         ],
+        zxlxr: [
+          { required: true, message: '咨询联系人不能为空,可以填写`无`', trigger: 'blur' }
+        ],
+        zxlxdh: [
+          { required: true, message: '咨询联系电话不能为空,可以填写`无`', trigger: 'blur' }
+        ],
+        fwnr: [
+          { required: true, message: '服务内容不能为空,可以填写`无`', trigger: 'blur' }
+        ],
+        fwtd: [
+          { required: true, message: '服务团队不能为空,可以填写`无`', trigger: 'blur' }
+        ],
+        fwsj: [
+          { required: true, message: '服务时间不能为空,可以填写`无`', trigger: 'blur' }
+        ],
+        fwfw: [
+          { required: true, message: '服务范围不能为空,可以填写`无`', trigger: 'blur' }
+        ],
+        fwsm: [
+          { required: true, message: '范围说明不能为空,可以填写`无`', trigger: 'blur' }
+        ],
+        jgjs: [
+          { required: true, message: '机构介绍不能为空', trigger: 'blur' }
+        ]
       },
       qtDispaly: false,
       isFW: false,
@@ -1752,6 +1805,13 @@ export default {
           id:null,
           jgid:null,
           jgjs:null,
+          zxlxr:null,
+          zxlxdh:null,
+          fwnr:null,
+          fwtd:null,
+          fwsj:null,
+          fwfw:null,
+          fwsm:null,
           zt:null,
         }
         this.form = {
@@ -1822,7 +1882,15 @@ export default {
           updateUserId: null,
           updateBy: null,
           updateUnit: null,
-          updateUnitName: null
+          updateUnitName: null,
+          jgjs:null,
+          zxlxr:null,
+          zxlxdh:null,
+          fwnr:null,
+          fwtd:null,
+          fwsj:null,
+          fwfw:null,
+          fwsm:null,
         }
         this.resetForm('form')
       },
@@ -1941,7 +2009,7 @@ export default {
 
           this.loading = false
           let data = decryptData_ECB(response.data, ["frxm", "frzjhm", "frlxfs", "txdz"], [1, 2, 3, 4]);
-          this.form = {szlrlx:'',nsyljg:'',yljgqyhz:'',fcyhznr:'',szlrlxQt:'',...response.data}
+          this.form = {...this.form2,szlrlx:'',nsyljg:'',yljgqyhz:'',fcyhznr:'',szlrlxQt:'',...response.data}
           const router = this.$route.path.split('/');
           if( (router[2]==='sqJcxx' && router[3]===undefined) && this.form.isSqst=='1'){
             this.disSqstZt=false;
@@ -2026,6 +2094,14 @@ export default {
             }
 
             this.form2.jgid=this.form.id;
+            this.form2.jgjs=this.form.jgjs;
+            this.form2.zxlxr=this.form.zxlxr;
+            this.form2.zxlxdh=this.form.zxlxdh;
+            this.form2.fwnr=this.form.fwnr;
+            this.form2.fwtd=this.form.fwtd;
+            this.form2.fwsj=this.form.fwsj;
+            this.form2.fwfw=this.form.fwfw;
+            this.form2.fwsm=this.form.fwsm;
             addJgjs(this.form2);
             if (this.form.id != null) {
               let formData = this.comparisonObject({ ...this.form, ...pamar }, this.copyForm)