上传

Reviewed-on: http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web/pulls/1

src/api/system/menu/index.ts

@@ -17,7 +17,10 @@ export interface MenuVO {
   alwaysShow?: boolean
   createTime: Date
 }
-
+// 获取服务列表
+export const getServiceAppList = () => {
+  return request.get({ url: '/admin-api/system/service/list' })
+}
 // 查询菜单（精简）列表
 export const getSimpleMenusList = () => {
   return request.get({ url: '/admin-api/system/menu/list-all-simple' })

src/views/Basic/Menu/MenuForm.vue

@@ -7,6 +7,16 @@
       :rules="formRules"
       label-width="100px"
     >
+      <el-form-item label="服务类型" prop="serviceId">
+        <el-select v-model="formData.serviceId" placeholder="选择服务类型" filterable>
+          <el-option
+            v-for="item in appList"
+            :key="item.serviceId"
+            :label="item.serviceName"
+            :value="item.serviceId"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="上级菜单">
         <el-tree-select
           v-model="formData.parentId"
@@ -132,7 +142,8 @@ const formData = ref({
   status: CommonStatusEnum.ENABLE,
   visible: true,
   keepAlive: true,
-  alwaysShow: true
+  alwaysShow: true,
+  serviceId: undefined
 })
 const formRules = reactive({
   name: [{ required: true, message: '菜单名称不能为空', trigger: 'blur' }],
@@ -148,6 +159,7 @@ const open = async (type: string, id?: number, parentId?: number) => {
   dialogTitle.value = t('action.' + type)
   formType.value = type
   resetForm()
+  getOptions()
   if (parentId) {
     formData.value.parentId = parentId
   }
@@ -165,6 +177,13 @@ const open = async (type: string, id?: number, parentId?: number) => {
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
+const appList = ref([])
+const getOptions = () => {
+  MenuApi.getServiceAppList().then((data) => {
+    appList.value = data
+  })
+}
+
 /** 提交表单 */
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
 const submitForm = async () => {
@@ -233,7 +252,8 @@ const resetForm = () => {
     status: CommonStatusEnum.ENABLE,
     visible: true,
     keepAlive: true,
-    alwaysShow: true
+    alwaysShow: true,
+    serviceId: undefined
   }
   formRef.value?.resetFields()
 }

src/views/Clue/Order/Comp/DialogDelivery.vue

@@ -210,7 +210,7 @@ async function onSubmit() {
         warehouseId: form.value.warehouseId
       }
     } else {
-      params.detailList = inventoryList.value
+      params.detailList = deliveryArr.value
     }
 
     await createDelivery(params)

src/views/SchoolManagement/Class/Comp/DialogClass.vue

@@ -204,7 +204,7 @@
           </el-form-item>
           <el-form-item label="计算规则：">
             <div class="flex items-center" v-if="profitEmployeeForm.profitMode == 1">
-              <span>公司利润 = （ 成交价 </span>
+              <span>员工利润 = （ 成交价 </span>
               <el-select
                 v-model="profitEmployeeForm.profitRule.mark"
                 size="small"
@@ -257,7 +257,7 @@
                   style="width: 80px"
                   :controls="false"
                 />
-                <span>，公司利润为</span>
+                <span>，员工利润为</span>
                 <el-input-number
                   v-model="item.profit"
                   size="small"