diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/ComboController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/ComboController.php
index d963788..46498a0 100644
--- a/Laravel/app/Http/Controllers/API/Admin/YeWu/ComboController.php
+++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/ComboController.php
@@ -141,6 +141,7 @@ class ComboController extends Controller
{
$Info = request('Info');
$u=DB::table('combos')->where(['id'=>$Info['id']])->update([
+ 'checkup_type_id'=>$Info['checkup_type_id'],
'type_id'=>$Info['type_id'],
'crowd_id'=>$Info['crowd_id'],
'tags'=>isset($Info['tags'])?json_encode($Info['tags'],JSON_UNESCAPED_UNICODE):[],
diff --git a/admin/src/views/ComboMngr/Combo.vue b/admin/src/views/ComboMngr/Combo.vue
index b44d625..9df7fb6 100644
--- a/admin/src/views/ComboMngr/Combo.vue
+++ b/admin/src/views/ComboMngr/Combo.vue
@@ -49,17 +49,25 @@
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
@@ -106,7 +114,7 @@
import {
Editor,
Toolbar
- } from '@wangeditor/editor-for-vue'
+ } from '@wangeditor/editor-for-vue'
import {
ElMessage
} from 'element-plus'
@@ -114,7 +122,10 @@
UpFileUrl,
ComboGetList,
ComboGetDetail,
- ComboSave,ComboTypeGetList,ComboCrowdGetList
+ ComboSave,
+ ComboTypeGetList,
+ ComboCrowdGetList,
+ CheckUpTypeGetEnableList
} from '@/api/api.js'
import {
Edit
@@ -144,14 +155,14 @@
logo.value = BaseUrl.value + res.data
Info.value.cover = res.data
}
- let searchInfo=ref({});
+ let searchInfo = ref({});
let Info = ref({});
const GetList = () => {
loading.value = true
ComboGetList({
page: currentPage.value,
pageSize: pageSize.value,
- searchInfo:searchInfo.value
+ searchInfo: searchInfo.value
}).then(res => {
loading.value = false
if (res.status) {
@@ -163,14 +174,14 @@
})
}
const Save = () => {
- Info.value.desc=editorRef.value.getHtml()
- if(!Array.isArray(Info.value.tags)){
+ Info.value.desc = editorRef.value.getHtml()
+ if (!Array.isArray(Info.value.tags)) {
Info.value.tags = toArray(Info.value.tags)
}
- if(!Array.isArray(Info.value.tags2)){
+ if (!Array.isArray(Info.value.tags2)) {
Info.value.tags2 = toArray(Info.value.tags2)
}
-
+
loading.value = true
ComboSave({
Info: Info.value
@@ -203,7 +214,7 @@
})
}
const toArray = (str) => { //字符串转数组
- console.log(str);
+ console.log(str);
if (!str) return
str = str.replace(/,/g, ',')
if (str.endsWith(',')) {
@@ -222,19 +233,19 @@
const toolbarConfig = {}
const editorConfig = {
placeholder: '请输入内容...',
- MENU_CONF: {},
+ MENU_CONF: {},
}
- let mode= 'default' // 'simple\default'
-
-
+ let mode = 'default' // 'simple\default'
+
+
// 修改 uploadImage 菜单配置
editorConfig.MENU_CONF['uploadImage'] = {
- server: upfileurl,
- fieldName: 'WangEditorImageFile',
+ server: upfileurl,
+ fieldName: 'WangEditorImageFile',
headers: headerObj,
- // 继续写其他配置...
-
- //【注意】不需要修改的不用写,wangEditor 会去 merge 当前其他配置
+ // 继续写其他配置...
+
+ //【注意】不需要修改的不用写,wangEditor 会去 merge 当前其他配置
}
// 组件销毁时,也及时销毁编辑器
@@ -248,26 +259,39 @@
editorRef.value = editor // 记录 editor 实例,重要!
}
//获取全部套餐类型
- let ComboTypeList=ref([]);
+ let ComboTypeList = ref([]);
const GetComboType = () => {
loading.value = true
ComboTypeGetList({}).then(res => {
loading.value = false
if (res.status) {
- ComboTypeList.value=res.data.list
+ ComboTypeList.value = res.data.list
} else {
ElMessage.error(res.msg)
}
})
}
//获取全部套餐适应人群
- let ComboCrowdList=ref([]);
+ let ComboCrowdList = ref([]);
const GetComboCrowd = () => {
loading.value = true
ComboCrowdGetList({}).then(res => {
loading.value = false
if (res.status) {
- ComboCrowdList.value=res.data.list
+ ComboCrowdList.value = res.data.list
+ } else {
+ ElMessage.error(res.msg)
+ }
+ })
+ }
+ //可用体检类型列表
+ let CheckUpTypeEnableList = ref([]);
+ const GetCheckUpTypeEnableList_Func = () => {
+ loading.value = true
+ CheckUpTypeGetEnableList().then(res => {
+ loading.value = false
+ if (res.status) {
+ CheckUpTypeEnableList.value = res.data.list
} else {
ElMessage.error(res.msg)
}
@@ -275,6 +299,7 @@
}
onMounted(() => {
GetList()
+ GetCheckUpTypeEnableList_Func()
})