Merge branch 'CH-1101-机构介绍补充版本' of sckj/mz-cloud into master

ruoyi-modules/mz-organization/src/main/java/com/ruoyi/organization/controller/YljgJgsfController.java

@@ -25,7 +25,7 @@ import com.ruoyi.common.core.web.page.TableDataInfo;
 
 /**
  * 机构收费Controller
- * 
+ *
  * @author CH
  * @date 2024-10-20
  */
@@ -87,7 +87,7 @@ public class YljgJgsfController extends BaseController
      */
     @RequiresPermissions("organization:jgsf:edit")
     @Log(title = "机构收费", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping(value ="/update")
     public AjaxResult edit(@Validated @RequestBody YljgJgsf yljgJgsf)
     {
         return toAjax(yljgJgsfService.updateYljgJgsf(yljgJgsf));
@@ -98,7 +98,7 @@ public class YljgJgsfController extends BaseController
      */
     @RequiresPermissions("organization:jgsf:remove")
     @Log(title = "机构收费", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
+    @PostMapping(value ="/delete/{ids}")
     public AjaxResult remove(@PathVariable String[] ids)
     {
         return toAjax(yljgJgsfService.deleteYljgJgsfByIds(ids));

ruoyi-ui/Dockerfile

@@ -13,7 +13,7 @@ RUN npm install
 
 ADD . /code
 
-RUN npm run build:dev
+RUN npm run build:prod
 
 #环境变量写在build后面否则找不到指令
 ENV PROJECT_ENV production

ruoyi-ui/src/api/organization/jggl/jgsf.js

@@ -29,8 +29,8 @@ export function addJgsf(data) {
 // 修改机构收费
 export function updateJgsf(data) {
   return request({
-    url: '/organization/jgsf',
-    method: 'put',
+    url: '/organization/jgsf/update',
+    method: 'post',
     data: data
   })
 }
@@ -38,7 +38,7 @@ export function updateJgsf(data) {
 // 删除机构收费
 export function delJgsf(id) {
   return request({
-    url: '/organization/jgsf/' + id,
-    method: 'delete'
+    url: '/organization/jgsf/delete/' + id,
+    method: 'post'
   })
 }

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

@@ -63,10 +63,10 @@
           </div>
           <div class="formFlex">
             <el-form-item label="咨询联系人" prop="zxlxr" class="formWidth">
-              <el-input v-model="form.zxlxr"  placeholder="请输入咨询联系人"/>
+              <el-input v-model="form.zxlxr" :maxlength="50"  show-word-limit  placeholder="请输入咨询联系人"/>
             </el-form-item>
             <el-form-item label="咨询联系电话" prop="zxlxdh" class="formWidth">
-              <el-input v-model="form.zxlxdh"  placeholder="请输入咨询联系电话"/>
+              <el-input v-model="form.zxlxdh" :maxlength="20"  show-word-limit  placeholder="请输入咨询联系电话"/>
             </el-form-item>
           </div>
           <div class="formFlex">
@@ -116,9 +116,6 @@
         </h3>
         <div class="formBox">
           <div class="formFlex">
-            <el-form-item label="法定代表人或负责人证件号码" prop="frzjhm" class="formWidth2">
-              <el-input v-model="form.frzjhm" :disabled="isBa" placeholder="请输入法定代表人或负责人证件号码"/>
-            </el-form-item>
             <el-form-item label="法定代表人或负责人证件类型" prop="frzjlx" class="formWidth2">
               <el-select v-model="form.frzjlx" :disabled="isBa" placeholder="请选择法定代表人或负责人证件类型"
                          @change="changeFrzjlx('frzjhm',form.frzjlx)">
@@ -130,6 +127,9 @@
                 ></el-option>
               </el-select>
             </el-form-item>
+            <el-form-item label="法定代表人或负责人证件号码" prop="frzjhm" class="formWidth2">
+              <el-input v-model="form.frzjhm" :disabled="isBa" placeholder="请输入法定代表人或负责人证件号码"/>
+            </el-form-item>
           </div>
           <div class="formFlex">
             <el-form-item label="法定代表人或负责人姓名" prop="frxm" class="formWidth2">
@@ -1637,9 +1637,6 @@ export default {
           this.form.nsyljg = this.form.nsyljg ? this.form.nsyljg.split(',') : []
           this.form.yljgqyhz = this.form.yljgqyhz ? this.form.yljgqyhz.split(',') : []
           this.form.fcyhznr = this.form.fcyhznr ? this.form.fcyhznr.split(',') : []
-	        // this.form.isGbmy = '0'
-          // this.form.lat = this.form.lat ? this.form.lat : 43.891193
-          // this.form.lng = this.form.lng ? this.form.lng : 125.353457
 
           this.getSzlrlx(this.form.szlrlx)
           this.changeIsXfsyZt(this.form.isXfsyZt)
@@ -1677,7 +1674,6 @@ export default {
       },
       /** 提交按钮 */
       submitForm() {
-	      console.log('未验证')
         this.$refs['form'].validate((valid,obj) => {
           if (valid) {
 	          console.log(this.form,'submitForm')
@@ -1708,19 +1704,6 @@ export default {
             this.form2.fwsm=this.form.fwsm;
             addJgjs(this.form2);
 
-            // if(this.form2.zt!="0"){
-            //   delJgjs(this.form2.jgid).then(response =>{
-            //     this.form2.jgid=this.form.id;
-            //     addJgjs(this.form2);
-            //     this.form2.zt="1";
-            //   });
-            //   // updateJgjs(this.form2);
-            // }else{
-            //   this.form2.jgid=this.form.id;
-            //   addJgjs(this.form2);
-            //   this.form2.zt="1";
-            // }
-
             if (this.form.id != null) {
               let formData = this.comparisonObject({ ...this.form, ...pamar }, this.copyForm)
               if (formData) {

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

@@ -92,10 +92,10 @@
 
           <div class="formFlex">
             <el-form-item label="咨询联系人" prop="zxlxr" class="formWidth">
-              <el-input v-model="form.zxlxr"  placeholder="请输入咨询联系人"/>
+              <el-input v-model="form.zxlxr" :maxlength="50"  show-word-limit placeholder="请输入咨询联系人"/>
             </el-form-item>
             <el-form-item label="咨询联系电话" prop="zxlxdh" class="formWidth">
-              <el-input v-model="form.zxlxdh"  placeholder="请输入咨询联系电话"/>
+              <el-input v-model="form.zxlxdh"  :maxlength="20"  show-word-limit placeholder="请输入咨询联系电话"/>
             </el-form-item>
           </div>
           <div class="formFlex">
@@ -912,15 +912,9 @@
         >保 存</el-button
       >
     </div>
-    <el-dialog
-      v-dialog-drag
-      title="获取定位（鼠标右键选取）"
-      :visible.sync="isDt"
-      width="1400px"
-      append-to-body
-    >
+    <el-dialog v-dialog-drag title="获取定位（鼠标右键选取）" :visible.sync="isDt" width="1400px" append-to-body>
       <div class="box">
-        <div id="container" style="width: 100%; height: 100%"></div>
+        <div id="container" style="width: 100%;height: 100%"></div>
         <div class="mapBox">
           <el-input placeholder="请输入内容" v-model="input1">
             <template slot="prepend">地址</template>
@@ -929,13 +923,10 @@
             <template slot="prepend">坐标</template>
           </el-input>
           <div>
-            <el-button style="margin-top: 20px" @click="geoCode(input1)"
-              >地址定位</el-button
-            >
-            <el-button style="margin-top: 20px" @click="changeDw()"
-              >确认返回</el-button
-            >
+            <el-button style="margin-top: 20px" @click="geoCode(input1)">地址定位</el-button>
+            <el-button style="margin-top: 20px" @click="changeDw()">确认返回</el-button>
           </div>
+
         </div>
       </div>
     </el-dialog>
@@ -1561,7 +1552,7 @@ export default {
           let that=this;
           this.map.on("rightclick",function(e){
             that.lat=e.lnglat.getLat();
-            that.lng=e.lnglat.getLng();
+            that.lng=e.lnglat.getLng();``
             that.input2=that.lng+','+that.lat;
             if (that.marker) {
               that.marker.setMap(null)
@@ -2103,6 +2094,8 @@ export default {
             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)
               if (formData) {