错误修改

admin/src/main/java/org/springblade/modules/ycwh/entity/FamousDishEntity.java

@@ -57,6 +57,10 @@ public class FamousDishEntity extends BaseEntity {
 	 */
 	@ApiModelProperty(value = "名称")
 	private String name;
+
+
+	@ApiModelProperty(value = "所属菜系")
+	private String cuisineCode;
 	/**
 	 * 副标题
 	 */

admin_ui/src/option/ycwh/famousDish.js

@@ -96,6 +96,15 @@ export default {
       prop: "name",
       type: "input",
       search: true
+    }, {
+      label: "所属菜系",
+      prop: "cuisineCode",
+      dicUrl: "/blade-system/dict-biz/dictionary?code=cuisine",
+      props: {
+        label: 'dictValue',
+        value: 'dictKey'
+      },
+      search: true
     },
     {
       label: "副标题",
@@ -115,11 +124,17 @@ export default {
     //    prop: "content",
     //    type: "input",
     //  },
-    //  {
-    //    label: "所属地区id",
-    //    prop: "regionId",
-    //    type: "input",
-    //  },
+    {
+      label: "所属地区id",
+      prop: "regionId",
+      type: "select",
+      dicUrl: "/blade-system/region/lazy-tree?code=4404",
+      props: {
+        label: 'name',
+        value: 'id'
+      },
+      search: true
+    },
     {
       label: "地址",
       prop: "address",

admin_ui/src/views/ycwh/components/editFamousDish/index.vue

@@ -3,6 +3,20 @@
     <el-form-item label="名称" prop="name">
       <el-input v-model="form.name" maxlength="80" show-word-limit />
     </el-form-item>
+    <el-form-item label="所属菜系" prop="cuisineCode">
+      <div style="display: flex;">
+        <el-select v-model="form.cuisineCode" placeholder="请选择所属菜系">
+          <el-option v-for="item in cuisineList" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey" />
+        </el-select>
+      </div>
+    </el-form-item>
+    <el-form-item label="所属地区" prop="regionId">
+      <div style="display: flex;">
+        <el-select v-model="form.regionId" placeholder="请选择所属区域">
+          <el-option v-for="item in regionList" :key="item.key" :label="item.title" :value="item.key" />
+        </el-select>
+      </div>
+    </el-form-item>
     <el-form-item label="副标题" prop="subTitle">
       <el-input v-model="form.subTitle" type="textarea" maxlength="90" show-word-limit />
     </el-form-item>
@@ -37,13 +51,6 @@
         </el-upload>
       </div>
     </el-form-item>
-    <el-form-item label="所属地区" prop="regionId">
-      <div style="display: flex;">
-        <el-select v-model="form.regionId" placeholder="请选择所属区域">
-          <el-option v-for="item in regionList" :key="item.key" :label="item.title" :value="item.key" />
-        </el-select>
-      </div>
-    </el-form-item>
     <el-form-item label="详细地址" prop="address">
       <div style="display: flex;width: 100%;">
         <el-input v-model="form.address" @focus="showMap('input')" :readonly="!(form.latitude && form.longitude)" placeholder="请填写详细地址"></el-input>
@@ -76,6 +83,7 @@
     uploadFile
   } from "@/api/oss/oss";
   import { getLazyTree } from "@/api/base/region";
+  import { getDictionary } from "@/api/system/dictbiz";
   //
   export default {
     props: ['id'],
@@ -92,6 +100,7 @@
       return {
         loading: false,
         //
+        cuisineList: [],
         regionList: [],
         //
         attachmentList: [],
@@ -103,6 +112,8 @@
           content: '',
           // 标签
           videos: null,
+          cuisineCode: '',
+          regionId: '',
           address: '',
           latitude: '',
           longitude: '',
@@ -151,11 +162,11 @@
             message: '请选择所属区域',
             trigger: 'blur'
           }],
-          address: [{
-            required: true,
-            message: '请输入详细地址',
-            trigger: 'blur'
-          }],
+          //        address: [{
+          //          required: true,
+          //          message: '请输入详细地址',
+          //          trigger: 'blur'
+          //        }],
         },
         // 富文本相关配置
         editorOptions: {
@@ -200,6 +211,7 @@
       if(this.id && this.id > 0) {
         this.getDetail(this.id)
       }
+      this.getCuisineList();
       this.getRegionList();
     },
     watch: {
@@ -212,6 +224,13 @@
       },
     },
     methods: {
+      getCuisineList() {
+        getDictionary({
+          code: "cuisine"
+        }).then(res => {
+          this.cuisineList = res.data.data || [];
+        })
+      },
       getRegionList() {
         getLazyTree("44").then(res => {
           this.regionList = res.data.data || [];

admin_ui/src/views/ycwh/components/editFamousLocation/index.vue

@@ -3,6 +3,13 @@
     <el-form-item label="名称" prop="name">
       <el-input v-model="form.name" maxlength="80" show-word-limit />
     </el-form-item>
+    <el-form-item label="所属地区" prop="regionId">
+      <div style="display: flex;">
+        <el-select v-model="form.regionId" placeholder="请选择所属区域">
+          <el-option v-for="item in regionList" :key="item.key" :label="item.title" :value="item.key" />
+        </el-select>
+      </div>
+    </el-form-item>
     <el-form-item label="副标题" prop="subTitle">
       <el-input v-model="form.subTitle" type="textarea" maxlength="90" show-word-limit />
     </el-form-item>
@@ -37,13 +44,6 @@
         </el-upload>
       </div>
     </el-form-item>
-    <el-form-item label="所属地区" prop="regionId">
-      <div style="display: flex;">
-        <el-select v-model="form.regionId" placeholder="请选择所属区域">
-          <el-option v-for="item in regionList" :key="item.key" :label="item.title" :value="item.key" />
-        </el-select>
-      </div>
-    </el-form-item>
     <el-form-item label="详细地址" prop="address">
       <div style="display: flex;width: 100%;">
         <el-input v-model="form.address" @focus="showMap('input')" :readonly="!(form.latitude && form.longitude)" placeholder="请填写详细地址"></el-input>
@@ -151,11 +151,11 @@
             message: '请选择所属区域',
             trigger: 'blur'
           }],
-          address: [{
-            required: true,
-            message: '请输入详细地址',
-            trigger: 'blur'
-          }],
+//        address: [{
+//          required: true,
+//          message: '请输入详细地址',
+//          trigger: 'blur'
+//        }],
         },
         // 富文本相关配置
         editorOptions: {

admin_ui/src/views/ycwh/components/editFamousStore/index.vue

@@ -3,6 +3,13 @@
     <el-form-item label="名称" prop="name">
       <el-input v-model="form.name" maxlength="80" show-word-limit />
     </el-form-item>
+    <el-form-item label="所属地区" prop="regionId">
+      <div style="display: flex;">
+        <el-select v-model="form.regionId" placeholder="请选择所属区域">
+          <el-option v-for="item in regionList" :key="item.key" :label="item.title" :value="item.key" />
+        </el-select>
+      </div>
+    </el-form-item>
     <el-form-item label="副标题" prop="subTitle">
       <el-input v-model="form.subTitle" type="textarea" maxlength="90" show-word-limit />
     </el-form-item>
@@ -37,13 +44,6 @@
         </el-upload>
       </div>
     </el-form-item>
-    <el-form-item label="所属地区" prop="regionId">
-      <div style="display: flex;">
-        <el-select v-model="form.regionId" placeholder="请选择所属区域">
-          <el-option v-for="item in regionList" :key="item.key" :label="item.title" :value="item.key" />
-        </el-select>
-      </div>
-    </el-form-item>
     <el-form-item label="详细地址" prop="address">
       <div style="display: flex;width: 100%;">
         <el-input v-model="form.address" @focus="showMap('input')" :readonly="!(form.latitude && form.longitude)" placeholder="请填写详细地址"></el-input>
@@ -151,11 +151,11 @@
             message: '请选择所属区域',
             trigger: 'blur'
           }],
-          address: [{
-            required: true,
-            message: '请输入详细地址',
-            trigger: 'blur'
-          }],
+//        address: [{
+//          required: true,
+//          message: '请输入详细地址',
+//          trigger: 'blur'
+//        }],
         },
         // 富文本相关配置
         editorOptions: {

admin_ui/src/views/ycwh/documentInfo.vue

@@ -6,7 +6,7 @@
       </template>
       <template #menu="scope">
         <el-button type="text" icon="el-icon-edit" v-if="permission.documentInfo_edit" @click="toEdit(scope.row)">编辑</el-button>
-        <el-button type="text" icon="el-icon-delete" v-if="permission.documentInfo_delete" @click="handleDelete(scope.row.id)">删 除</el-button>
+        <el-button type="text" icon="el-icon-delete" v-if="permission.documentInfo_delete" @click="rowDel(scope.row)">删 除</el-button>
       </template>
       <template #videos="scope">
         <video v-if="scope.row.videos" :src="scope.row.videos" style="width: 200px; height: 112px; border: 1px dashed #d9d9d9" controls></video>

admin_ui/src/views/ycwh/famousDish.vue

@@ -6,7 +6,7 @@
       </template>
       <template #menu="scope">
         <el-button type="text" icon="el-icon-edit" v-if="permission.famousDish_edit" @click="toEdit(scope.row)">编辑</el-button>
-        <el-button type="text" icon="el-icon-delete" v-if="permission.famousDish_delete" @click="handleDelete(scope.row.id)">删 除</el-button>
+        <el-button type="text" icon="el-icon-delete" v-if="permission.famousDish_delete" @click="rowDel(scope.row)">删 除</el-button>
       </template>
       <template #videos="scope">
         <video v-if="scope.row.videos" :src="scope.row.videos" style="width: 200px; height: 112px; border: 1px dashed #d9d9d9" controls></video>

admin_ui/src/views/ycwh/famousLocation.vue

@@ -6,7 +6,7 @@
       </template>
       <template #menu="scope">
         <el-button type="text" icon="el-icon-edit" v-if="permission.famousLocation_edit" @click="toEdit(scope.row)">编辑</el-button>
-        <el-button type="text" icon="el-icon-delete" v-if="permission.famousLocation_delete" @click="handleDelete(scope.row.id)">删 除</el-button>
+        <el-button type="text" icon="el-icon-delete" v-if="permission.famousLocation_delete" @click="rowDel(scope.row)">删 除</el-button>
       </template>
       <template #videos="scope">
         <video v-if="scope.row.videos" :src="scope.row.videos" style="width: 200px; height: 112px; border: 1px dashed #d9d9d9" controls></video>

admin_ui/src/views/ycwh/famousStore.vue

@@ -6,7 +6,7 @@
       </template>
       <template #menu="scope">
         <el-button type="text" icon="el-icon-edit" v-if="permission.famousStore_edit" @click="toEdit(scope.row)">编辑</el-button>
-        <el-button type="text" icon="el-icon-delete" v-if="permission.famousStore_delete" @click="handleDelete(scope.row.id)">删 除</el-button>
+        <el-button type="text" icon="el-icon-delete" v-if="permission.famousStore_delete" @click="rowDel(scope.row)">删 除</el-button>
       </template>
       <template #videos="scope">
         <video v-if="scope.row.videos" :src="scope.row.videos" style="width: 200px; height: 112px; border: 1px dashed #d9d9d9" controls></video>

admin_ui/src/views/ycwh/informationInfo.vue

@@ -6,7 +6,7 @@
       </template>
       <template #menu="scope">
         <el-button type="text" icon="el-icon-edit" v-if="permission.informationInfo_edit" @click="toEdit(scope.row)">编辑</el-button>
-        <el-button type="text" icon="el-icon-delete" v-if="permission.informationInfo_delete" @click="handleDelete(scope.row.id)">删 除</el-button>
+        <el-button type="text" icon="el-icon-delete" v-if="permission.informationInfo_delete" @click="rowDel(scope.row)">删 除</el-button>
       </template>
       <template #videos="scope">
         <video v-if="scope.row.videos" :src="scope.row.videos" style="width: 200px; height: 112px; border: 1px dashed #d9d9d9" controls></video>

admin_ui/src/views/ycwh/professionalStyle.vue

@@ -6,7 +6,7 @@
       </template>
       <template #menu="scope">
         <el-button type="text" icon="el-icon-edit" v-if="permission.professionalStyle_edit" @click="toEdit(scope.row)">编辑</el-button>
-        <el-button type="text" icon="el-icon-delete" v-if="permission.professionalStyle_delete" @click="handleDelete(scope.row.id)">删 除</el-button>
+        <el-button type="text" icon="el-icon-delete" v-if="permission.professionalStyle_delete" @click="rowDel(scope.row)">删 除</el-button>
       </template>
       <template #videos="scope">
         <video v-if="scope.row.videos" :src="scope.row.videos" style="width: 200px; height: 112px; border: 1px dashed #d9d9d9" controls></video>