bugfix:折扣设备-新增问题；

src/api/consumption/xfDiscount/types.ts

@@ -16,7 +16,7 @@ export interface XfDiscountVO {
    */
   mealType: number;
 
-  mealTypeName: string;
+  /* mealTypeName: string; */
 
   /**
    * 折扣类型，默认为0
@@ -68,7 +68,7 @@ export interface XfDiscountForm extends BaseEntity {
   /**
    * 餐类Id
    */
-  mealType?: number;
+  mealType?: string;
 
   /**
    * 折扣类型，默认为0

src/views/basics/basicParameter/ptMealtype/DetailForm.vue

@@ -5,20 +5,36 @@
         <el-form-item label="餐类名称" prop="mealName">
           <el-select v-model="formData.mealName" placeholder="请选择餐类名称" @change="selectMealType($event)">
             <el-option
-                v-for="dict in meal_type"
-                :key="dict.label"
-                :label="dict.label"
-                :value="{mealName: dict.label, typeId:dict.value}"
+              v-for="dict in meal_type"
+              :key="dict.label"
+              :label="dict.label"
+              :value="{ mealName: dict.label, typeId: dict.value }"
             ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="开始时间" prop="beginTime">
-          <el-time-select v-model="formData.beginTime" :max-time="formData.endTime" style="width: 240px" start="05:00"
-          step="00:15" end="23:59" format="HH:mm:ss" placeholder="请选择时间"/>
+          <el-time-select
+            v-model="formData.beginTime"
+            :max-time="formData.endTime"
+            style="width: 240px"
+            start="05:00"
+            step="00:15"
+            end="23:59"
+            format="HH:mm:ss"
+            placeholder="请选择时间"
+          />
         </el-form-item>
         <el-form-item label="结束时间" prop="endTime">
-          <el-time-select v-model="formData.endTime" :min-time="formData.beginTime" style="width: 240px" start="05:00"
-          step="00:15" end="23:59" format="HH:mm:ss" placeholder="请选择结束时间"/>
+          <el-time-select
+            v-model="formData.endTime"
+            :min-time="formData.beginTime"
+            style="width: 240px"
+            start="05:00"
+            step="00:15"
+            end="23:59"
+            format="HH:mm:ss"
+            placeholder="请选择结束时间"
+          />
         </el-form-item>
         <el-form-item label="类别说明" prop="mealNotes">
           <el-input v-model="formData.mealNotes" placeholder="请输入类别说明" />
@@ -70,14 +86,14 @@ const formData = ref<PtMealTypeForm>({
   mealName: '',
   beginTime: '',
   endTime: '',
-  mealNotes: '',
+  mealNotes: ''
 });
 // 表单校验规则
 const formRules = reactive({
   mealId: [{ required: true, message: '营业时段id不能为空', trigger: 'blur' }],
   mealName: [{ required: true, message: '餐类名称不能为空', trigger: 'blur' }],
   beginTime: [{ required: true, message: '开始时间不能为空', trigger: 'blur' }],
-  endTime: [{ required: true, message: '结束时间不能为空', trigger: 'blur' }],
+  endTime: [{ required: true, message: '结束时间不能为空', trigger: 'blur' }]
 });
 /** 当前组件方法 */
 /** 窗体打开事件 */
@@ -104,15 +120,15 @@ const resetForm = () => {
     mealName: '',
     beginTime: '',
     endTime: '',
-    mealNotes: '',
+    mealNotes: ''
   };
   formRef.value?.resetFields();
 };
 
 const selectMealType = (event) => {
-  formData.value.typeId = event.typeId
-  formData.value.mealName = event.mealName
-}
+  formData.value.typeId = event.typeId;
+  formData.value.mealName = event.mealName;
+};
 // 传回给父组件的属性与方法
 // 提供 open 方法，用于打开弹窗
 defineExpose({ open });
@@ -122,7 +138,7 @@ const emit = defineEmits(['success']);
 /** 提交按钮 */
 const submitForm = async () => {
   // 校验表单
-  if (!formRef) return;
+  if (!formRef.value) return;
   const valid = await formRef.value?.validate();
   if (!valid) return;
   // 提交请求

src/views/consumption/xfDiscount/DetailForm.vue

@@ -9,7 +9,7 @@
         </el-form-item>
         <el-form-item label="餐类" prop="mealType">
           <el-select v-model="formData.mealType" placeholder="请选择餐类" clearable style="width: 100%">
-            <el-option v-for="item in mealTypeOptions" :key="item.mealId" :label="item.mealName" :value="item.mealId" />
+            <el-option v-for="item in meal_type" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
         </el-form-item>
         <el-form-item label="状态" prop="status">
@@ -82,6 +82,8 @@ const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 // 国际化
 const { t } = useI18n();
 
+const { meal_type } = toRefs<any>(proxy?.useDict('meal_type'));
+
 // 对话框
 const dialog = reactive<DialogOption>({
   visible: false,
@@ -99,7 +101,7 @@ const formRef = ref<ElFormInstance>();
 const formData = ref<XfDiscountForm>({
   discountId: undefined,
   cardType: undefined,
-  mealType: undefined,
+  mealType: '',
   rateType: '0',
   oneRate: undefined,
   twoRate: undefined,
@@ -185,14 +187,14 @@ const submitForm = async () => {
 // const mealTypeOptions = await getAllPtMealtype();
 
 const cardTypeOptions = ref<PtCardTypeVO[]>([]);
-const mealTypeOptions = ref<PtMealTypeVO[]>([]);
+// const mealTypeOptions = ref<PtMealTypeVO[]>([]);
 /** 初始化 */
 onMounted(() => {
   listUsePtCardType().then((res) => {
     cardTypeOptions.value = res.data;
   });
-  getAllPtMealType().then((res) => {
+  /* getAllPtMealType().then((res) => {
     mealTypeOptions.value = res.data;
-  });
+  }); */
 });
 </script>

src/views/consumption/xfDiscount/index.vue

@@ -43,7 +43,11 @@
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column v-if="false" label="折扣Id,主键" align="center" prop="discountId" />
         <el-table-column v-if="columns[0].visible" label="卡类" align="center" prop="cardTypeName" />
-        <el-table-column v-if="columns[1].visible" label="餐类" align="center" prop="mealTypeName" />
+        <el-table-column v-if="columns[1].visible" label="餐类" align="center" prop="mealType">
+          <template #default="scope">
+            <dict-tag :options="meal_type" :value="scope.row.mealType" />
+          </template>
+        </el-table-column>
         <el-table-column v-if="columns[8].visible" label="启用状态" align="center" prop="status">
           <template #default="scope">
             <dict-tag :options="useableStatus" :value="scope.row.status" />
@@ -100,6 +104,7 @@ import router from '@/router';
 defineOptions({ name: 'XfDiscount' });
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { meal_type } = toRefs<any>(proxy?.useDict('meal_type'));
 // 是否加载遮罩层
 const loading = ref(true);
 // 是否显示查询项