zhangyan
/
hainan_2024_zhenghe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

问卷调整

Browse Source
main
yanzai 11 months ago
parent 684726c7bd
commit 72700c0702
6 changed files with 645 additions and 376 deletions
Show Stats Download Patch File Download Diff File

36
Laravel/app/Http/Controllers/API/Admin/QuestionItemController.php
Unescape Escape View File

@ -34,6 +34,15 @@ class QuestionItemController extends Controller
$jichu = $request->post('jichu'); $jichu = $request->post('jichu');
$tuijian = $request->post('tuijian'); $tuijian = $request->post('tuijian');
$gaoduan = $request->post('gaoduan'); $gaoduan = $request->post('gaoduan');
$jichu_nan = $request->post('jichu_nan');
$jichu_nv_weihun = $request->post('jichu_nv_weihun');
$jichu_nv_yihun = $request->post('jichu_nv_yihun');
$tuijian_nan = $request->post('tuijian_nan');
$tuijian_nv_weihun = $request->post('tuijian_nv_weihun');
$tuijian_nv_yihun = $request->post('tuijian_nv_yihun');
$gaoduan_nan = $request->post('gaoduan_nan');
$gaoduan_nv_weihun = $request->post('gaoduan_nv_weihun');
$gaoduan_nv_yihun = $request->post('gaoduan_nv_yihun');
if (!$name) { if (!$name) {
return \Yz::echoError('请填写项目名称'); return \Yz::echoError('请填写项目名称');
} }
@ -49,6 +58,15 @@ class QuestionItemController extends Controller
'jichu' => $jichu ?? '[]', 'jichu' => $jichu ?? '[]',
'tuijian' => $tuijian ?? '[]', 'tuijian' => $tuijian ?? '[]',
'gaoduan' => $gaoduan ?? '[]', 'gaoduan' => $gaoduan ?? '[]',
'jichu_nan' => $jichu_nan,
'jichu_nv_yihun' => $jichu_nv_yihun,
'jichu_nv_weihun' => $jichu_nv_weihun,
'tuijian_nan' => $tuijian_nan,
'tuijian_nv_yihun' => $tuijian_nv_yihun,
'tuijian_nv_weihun' => $tuijian_nv_weihun,
'gaoduan_nan' => $gaoduan_nan,
'gaoduan_nv_yihun' => $gaoduan_nv_yihun,
'gaoduan_nv_weihun' => $gaoduan_nv_weihun,
'created_at' => date('Y-m-d H:i:s'), 'created_at' => date('Y-m-d H:i:s'),
'updated_at' => date('Y-m-d H:i:s'), 'updated_at' => date('Y-m-d H:i:s'),
]); ]);
@ -63,6 +81,15 @@ class QuestionItemController extends Controller
$jichu = $request->post('jichu'); $jichu = $request->post('jichu');
$tuijian = $request->post('tuijian'); $tuijian = $request->post('tuijian');
$gaoduan = $request->post('gaoduan'); $gaoduan = $request->post('gaoduan');
$jichu_nan = $request->post('jichu_nan');
$jichu_nv_weihun = $request->post('jichu_nv_weihun');
$jichu_nv_yihun = $request->post('jichu_nv_yihun');
$tuijian_nan = $request->post('tuijian_nan');
$tuijian_nv_weihun = $request->post('tuijian_nv_weihun');
$tuijian_nv_yihun = $request->post('tuijian_nv_yihun');
$gaoduan_nan = $request->post('gaoduan_nan');
$gaoduan_nv_weihun = $request->post('gaoduan_nv_weihun');
$gaoduan_nv_yihun = $request->post('gaoduan_nv_yihun');
if (!$name) { if (!$name) {
return \Yz::echoError('请填写项目名称'); return \Yz::echoError('请填写项目名称');
} }
@ -78,6 +105,15 @@ class QuestionItemController extends Controller
'jichu' => $jichu ?? '[]', 'jichu' => $jichu ?? '[]',
'tuijian' => $tuijian ?? '[]', 'tuijian' => $tuijian ?? '[]',
'gaoduan' => $gaoduan ?? '[]', 'gaoduan' => $gaoduan ?? '[]',
'jichu_nan' => $jichu_nan,
'jichu_nv_yihun' => $jichu_nv_yihun,
'jichu_nv_weihun' => $jichu_nv_weihun,
'tuijian_nan' => $tuijian_nan,
'tuijian_nv_yihun' => $tuijian_nv_yihun,
'tuijian_nv_weihun' => $tuijian_nv_weihun,
'gaoduan_nan' => $gaoduan_nan,
'gaoduan_nv_yihun' => $gaoduan_nv_yihun,
'gaoduan_nv_weihun' => $gaoduan_nv_weihun,
'updated_at' => date('Y-m-d H:i:s'), 'updated_at' => date('Y-m-d H:i:s'),
]); ]);
return \Yz::Return(true, '操作完成'); return \Yz::Return(true, '操作完成');

49
Laravel/app/Http/Controllers/API/Admin/QuestionnaireController.php
Unescape Escape View File

@ -14,9 +14,16 @@ class QuestionnaireController extends Controller
$name = $request->post('name'); $name = $request->post('name');
$items = $request->post('items'); $items = $request->post('items');
$questions = $request->post('questions'); $questions = $request->post('questions');
$jichu_combo_id = $request->post('jichu_combo'); $jichu_nan = $request->post('jichu_nan');
$tuijian_combo_id = $request->post('tuijian_combo'); $jichu_nv_weihun = $request->post('jichu_nv_weihun');
$gaoduan_combo_id = $request->post('gaoduan_combo'); $jichu_nv_yihun = $request->post('jichu_nv_yihun');
$tuijian_nan = $request->post('tuijian_nan');
$tuijian_nv_weihun = $request->post('tuijian_nv_weihun');
$tuijian_nv_yihun = $request->post('tuijian_nv_yihun');
$gaoduan_nan = $request->post('gaoduan_nan');
$gaoduan_nv_weihun = $request->post('gaoduan_nv_weihun');
$gaoduan_nv_yihun = $request->post('gaoduan_nv_yihun');
if (!$name) { if (!$name) {
return \Yz::echoError('请填写问卷名称'); return \Yz::echoError('请填写问卷名称');
} }
@ -31,9 +38,15 @@ class QuestionnaireController extends Controller
'type' => $type, 'type' => $type,
'name' => $name, 'name' => $name,
'items' => $items ?? '[]', 'items' => $items ?? '[]',
'jichu_combo' => $jichu_combo_id, 'jichu_nan' => $jichu_nan,
'tuijian_combo' => $tuijian_combo_id, 'jichu_nv_yihun' => $jichu_nv_yihun,
'gaoduan_combo' => $gaoduan_combo_id, 'jichu_nv_weihun' => $jichu_nv_weihun,
'tuijian_nan' => $tuijian_nan,
'tuijian_nv_yihun' => $tuijian_nv_yihun,
'tuijian_nv_weihun' => $tuijian_nv_weihun,
'gaoduan_nan' => $gaoduan_nan,
'gaoduan_nv_yihun' => $gaoduan_nv_yihun,
'gaoduan_nv_weihun' => $gaoduan_nv_weihun,
'questions' => $questions ?? '[]', 'questions' => $questions ?? '[]',
'created_at' => date('Y-m-d H:i:s'), 'created_at' => date('Y-m-d H:i:s'),
'updated_at' => date('Y-m-d H:i:s'), 'updated_at' => date('Y-m-d H:i:s'),
@ -47,9 +60,15 @@ class QuestionnaireController extends Controller
$type = $request->post('type'); $type = $request->post('type');
$name = $request->post('name'); $name = $request->post('name');
$items = $request->post('items'); $items = $request->post('items');
$jichu_combo_id = $request->post('jichu_combo'); $jichu_nan = $request->post('jichu_nan');
$tuijian_combo_id = $request->post('tuijian_combo'); $jichu_nv_weihun = $request->post('jichu_nv_weihun');
$gaoduan_combo_id = $request->post('gaoduan_combo'); $jichu_nv_yihun = $request->post('jichu_nv_yihun');
$tuijian_nan = $request->post('tuijian_nan');
$tuijian_nv_weihun = $request->post('tuijian_nv_weihun');
$tuijian_nv_yihun = $request->post('tuijian_nv_yihun');
$gaoduan_nan = $request->post('gaoduan_nan');
$gaoduan_nv_weihun = $request->post('gaoduan_nv_weihun');
$gaoduan_nv_yihun = $request->post('gaoduan_nv_yihun');
$questions = $request->post('questions'); $questions = $request->post('questions');
if (!$name) { if (!$name) {
@ -66,9 +85,15 @@ class QuestionnaireController extends Controller
'type' => $type, 'type' => $type,
'name' => $name, 'name' => $name,
'items' => $items ?? '[]', 'items' => $items ?? '[]',
'jichu_combo' => $jichu_combo_id, 'jichu_nan' => $jichu_nan,
'tuijian_combo' => $tuijian_combo_id, 'jichu_nv_yihun' => $jichu_nv_yihun,
'gaoduan_combo' => $gaoduan_combo_id, 'jichu_nv_weihun' => $jichu_nv_weihun,
'tuijian_nan' => $tuijian_nan,
'tuijian_nv_yihun' => $tuijian_nv_yihun,
'tuijian_nv_weihun' => $tuijian_nv_weihun,
'gaoduan_nan' => $gaoduan_nan,
'gaoduan_nv_yihun' => $gaoduan_nv_yihun,
'gaoduan_nv_weihun' => $gaoduan_nv_weihun,
'questions' => $questions ?? '[]', 'questions' => $questions ?? '[]',
'updated_at' => date('Y-m-d H:i:s'), 'updated_at' => date('Y-m-d H:i:s'),
]); ]);

61
Laravel/app/Http/Controllers/API/H5/QuestionnairesLogsController.php
Unescape Escape View File

@ -202,12 +202,43 @@ class QuestionnairesLogsController extends Controller
if (!$person_info) { if (!$person_info) {
return \Yz::echoError('人员信息不存在'); return \Yz::echoError('人员信息不存在');
} }
$question_ids = [];
$question_map = [];
$content_sex='';
$content_hunyin='';
foreach ($content as $key => $value) {
$question_ids[] = $value['id'];
$question_map["q{$value['id']}"] = $value;
if ($value['question'] == '性别') {
$content_sex=$value['value'];
}
if (strpos($value['question'], "婚姻状况") !== false) {
$content_hunyin=$value['value'];
}
}
$type = $question_info->type; $type = $question_info->type;
$items = json_decode($question_info->items, true); $items = json_decode($question_info->items, true);
//获取绑定套餐的id //获取绑定套餐的id
$jichu_combo_new = (isset($question_info->jichu_combo) and !empty($question_info->jichu_combo))?$question_info->jichu_combo:0; if(strpos($content_sex, "男") !== false){
$tuijian_combo_new = (isset($question_info->tuijian_combo) and !empty($question_info->tuijian_combo))?$question_info->tuijian_combo:0; $jichu_combo_new = (isset($question_info->jichu_nan) and !empty($question_info->jichu_nan))?$question_info->jichu_nan:0;
$gaoduan_combo_new = (isset($question_info->gaoduan_combo) and !empty($question_info->gaoduan_combo))?$question_info->gaoduan_combo:0; $tuijian_combo_new = (isset($question_info->tuijian_nan) and !empty($question_info->tuijian_nan))?$question_info->tuijian_nan:0;
$gaoduan_combo_new = (isset($question_info->gaoduan_nan) and !empty($question_info->gaoduan_nan))?$question_info->gaoduan_nan:0;
}
if(strpos($content_sex, "女") !== false){
if(strpos($content_hunyin, "未婚")!== false){
$jichu_combo_new = (isset($question_info->jichu_nv_weihun) and !empty($question_info->jichu_nv_weihun))?$question_info->jichu_nv_weihun:0;
$tuijian_combo_new = (isset($question_info->tuijian_nv_weihun) and !empty($question_info->tuijian_nv_weihun))?$question_info->tuijian_nv_weihun:0;
$gaoduan_combo_new = (isset($question_info->gaoduan_nv_weihun) and !empty($question_info->gaoduan_nv_weihun))?$question_info->gaoduan_nv_weihun:0;
}
if(strpos($content_hunyin, "已婚")!== false){
$jichu_combo_new = (isset($question_info->jichu_nv_yihun) and !empty($question_info->jichu_nv_yihun))?$question_info->jichu_nv_yihun:0;
$tuijian_combo_new = (isset($question_info->tuijian_nv_yihun) and !empty($question_info->tuijian_nv_yihun))?$question_info->tuijian_nv_yihun:0;
$gaoduan_combo_new = (isset($question_info->gaoduan_nv_yihun) and !empty($question_info->gaoduan_nv_yihun))?$question_info->gaoduan_nv_yihun:0;
}
}
//获取套餐的项目 //获取套餐的项目
$jichu_items_ids = []; $jichu_items_ids = [];
if ($jichu_combo_new) { if ($jichu_combo_new) {
@ -252,12 +283,7 @@ class QuestionnairesLogsController extends Controller
'items' => $gaoduan_items_ids 'items' => $gaoduan_items_ids
], ],
]; ];
$question_ids = [];
$question_map = [];
foreach ($content as $key => $value) {
$question_ids[] = $value['id'];
$question_map["q{$value['id']}"] = $value;
}
if (!!count($question_ids)) { if (!!count($question_ids)) {
$question_questions = DB::table('question_questions')->whereIn('id', $question_ids)->get(); $question_questions = DB::table('question_questions')->whereIn('id', $question_ids)->get();
@ -301,6 +327,23 @@ class QuestionnairesLogsController extends Controller
foreach ($item_option['items'] as $item) { foreach ($item_option['items'] as $item) {
if (!in_array($item, $check_items)) { if (!in_array($item, $check_items)) {
$check_items_info = DB::table('question_items')->where('id', $item)->first(); $check_items_info = DB::table('question_items')->where('id', $item)->first();
if(strpos($content_sex, "男") !== false){
$check_items_info->jichu = $check_items_info->jichu_nan;
$check_items_info->tuijian = $check_items_info->tuijian_nan;
$check_items_info->gaoduan = $check_items_info->gaoduan_nan;
}
if(strpos($content_sex, "女")!== false){
if(strpos($content_hunyin, "未婚")!== false){
$check_items_info->jichu = $check_items_info->jichu_nv_weihun;
$check_items_info->tuijian = $check_items_info->tuijian_nv_weihun;
$check_items_info->gaoduan = $check_items_info->gaoduan_nv_weihun;
}
if(strpos($content_hunyin, "已婚")!== false){
$check_items_info->jichu = $check_items_info->jichu_nv_yihun;
$check_items_info->tuijian = $check_items_info->tuijian_nv_yihun;
$check_items_info->gaoduan = $check_items_info->gaoduan_nv_yihun;
}
}
if (!!$check_items_info) { if (!!$check_items_info) {
$check_items[] = (string)$item; $check_items[] = (string)$item;

128
admin/src/views/Question/Question.vue
Unescape Escape View File

@ -4,10 +4,19 @@
* user：sa0ChunLuyu * user：sa0ChunLuyu
* date：2024年10月12日 16:29:26 * date：2024年10月12日 16:29:26
*/ */
import {ref, onMounted, computed} from 'vue'; import {
ref,
onMounted,
computed
} from 'vue';
import $router from '@/router' import $router from '@/router'
import {onBeforeRouteUpdate} from "vue-router"; import {
import {ElMessage, ElMessageBox} from 'element-plus' onBeforeRouteUpdate
} from "vue-router";
import {
ElMessage,
ElMessageBox
} from 'element-plus'
import { import {
QuestionCreateAction, QuestionCreateAction,
QuestionUpdateAction, QuestionUpdateAction,
@ -79,7 +88,9 @@ const routerChange = (query) => {
//获取可用套餐列表 //获取可用套餐列表
let combolist = ref([]); let combolist = ref([]);
const GetCombolist = async () => { const GetCombolist = async () => {
const response = await ComboGetAllList({status:"enable"}) const response = await ComboGetAllList({
status: "enable"
})
if (response.status) { if (response.status) {
combolist.value = response.data.list combolist.value = response.data.list
} else { } else {
@ -134,7 +145,9 @@ const editDoneClick = async () => {
} }
const QuestionDelete = async (id) => { const QuestionDelete = async (id) => {
const response = await QuestionDeleteAction({id}) const response = await QuestionDeleteAction({
id
})
if (response.status !== 'no') { if (response.status !== 'no') {
await QuestionList() await QuestionList()
} else { } else {
@ -145,16 +158,14 @@ const QuestionDelete = async (id) => {
const deleteClick = (id) => { const deleteClick = (id) => {
ElMessageBox.confirm( ElMessageBox.confirm(
'是否确认删除该问卷？', '是否确认删除该问卷？',
'提示', '提示', {
{
confirmButtonText: '确认', confirmButtonText: '确认',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning', type: 'warning',
} }
).then(() => { ).then(() => {
QuestionDelete(id) QuestionDelete(id)
}).catch(() => { }).catch(() => {})
})
} }
const edit_item_data = ref([]) const edit_item_data = ref([])
const edit_item_show = ref(false) const edit_item_show = ref(false)
@ -167,7 +178,8 @@ const editItemDoneClick = () => {
edit_item_show.value = false edit_item_show.value = false
} }
const filterMethod = (query, item) => { const filterMethod = (query, item) => {
return item.name.toLowerCase().includes(query.toLowerCase()) || item.pinyin.toLowerCase().includes(query.toLowerCase()) return item.name.toLowerCase().includes(query.toLowerCase()) || item.pinyin.toLowerCase().includes(query
.toLowerCase())
} }
const moveQuestionClick = (index, type) => { const moveQuestionClick = (index, type) => {
if (edit_data.value.questions.length - 1 >= index + type) { if (edit_data.value.questions.length - 1 >= index + type) {
@ -204,21 +216,13 @@ onMounted(() => {
</script> </script>
<template> <template>
<div> <div>
<el-dialog v-model="edit_item_show" title="关联项目管理" width="910px" <el-dialog v-model="edit_item_show" title="关联项目管理" width="910px" :close-on-click-modal="false"
:close-on-click-modal="false" :close-on-press-escape="false" :show-close="false">
:close-on-press-escape="false"
:show-close="false">
<div> <div>
<div class="eltransfer"> <div class="eltransfer">
<el-transfer <el-transfer :titles="['可选项目', '已选项目']" :props="{key: 'item_id', label: 'name'}"
:titles="['可选项目', '已选项目']" v-model="edit_item_data" filterable :filter-method="filterMethod" filter-placeholder="搜索"
:props="{key: 'item_id', label: 'name'}" :data="item_list" />
v-model="edit_item_data"
filterable
:filter-method="filterMethod"
filter-placeholder="搜索"
:data="item_list"
/>
</div> </div>
</div> </div>
@ -246,28 +250,77 @@ onMounted(() => {
<el-button type="primary" size="small" @click="editItemClick()">编辑项目</el-button> <el-button type="primary" size="small" @click="editItemClick()">编辑项目</el-button>
</el-form-item> </el-form-item>
<el-form-item label="基础"> <el-form-item label="基础">
<el-select v-model="edit_data.jichu_combo" <el-form label-width="100px">
placeholder="选择套餐"> <el-form-item label=" 男">
<el-option v-for="(item,index) in combolist" :key="index" :label="item.name" :value="item.combo_id" ></el-option> <el-select v-model="edit_data.jichu_nan" placeholder="选择套餐">
<el-option v-for="(item,index) in combolist" :key="index" :label="item.name"
:value="item.combo_id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label=" 女未婚">
<el-select v-model="edit_data.jichu_nv_weihun" placeholder="选择套餐">
<el-option v-for="(item,index) in combolist" :key="index" :label="item.name"
:value="item.combo_id"></el-option>
</el-select>
</el-form-item>
<el-form-item label=" 女已婚">
<el-select v-model="edit_data.jichu_nv_yihun" placeholder="选择套餐">
<el-option v-for="(item,index) in combolist" :key="index" :label="item.name"
:value="item.combo_id"></el-option>
</el-select>
</el-form-item>
</el-form>
</el-form-item>
<el-form-item label="推荐"> <el-form-item label="推荐">
<el-select v-model="edit_data.tuijian_combo" <el-form label-width="100px">
placeholder="选择套餐"> <el-form-item label=" 男">
<el-option v-for="(item,index) in combolist" :key="index" :label="item.name" :value="item.combo_id" ></el-option> <el-select v-model="edit_data.tuijian_nan" placeholder="选择套餐">
<el-option v-for="(item,index) in combolist" :key="index" :label="item.name"
:value="item.combo_id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label=" 女未婚">
<el-select v-model="edit_data.tuijian_nv_weihun" placeholder="选择套餐">
<el-option v-for="(item,index) in combolist" :key="index" :label="item.name"
:value="item.combo_id"></el-option>
</el-select>
</el-form-item>
<el-form-item label=" 女已婚">
<el-select v-model="edit_data.tuijian_nv_yihun" placeholder="选择套餐">
<el-option v-for="(item,index) in combolist" :key="index" :label="item.name"
:value="item.combo_id"></el-option>
</el-select>
</el-form-item>
</el-form>
</el-form-item>
<el-form-item label="高端"> <el-form-item label="高端">
<el-select v-model="edit_data.gaoduan_combo" <el-form label-width="100px">
placeholder="选择套餐"> <el-form-item label=" 男">
<el-option v-for="(item,index) in combolist" :key="index" :label="item.name" :value="item.combo_id" ></el-option> <el-select v-model="edit_data.gaoduan_nan" placeholder="选择套餐">
<el-option v-for="(item,index) in combolist" :key="index" :label="item.name"
:value="item.combo_id"></el-option>
</el-select>
</el-form-item>
<el-form-item label=" 女未婚">
<el-select v-model="edit_data.gaoduan_nv_weihun" placeholder="选择套餐">
<el-option v-for="(item,index) in combolist" :key="index" :label="item.name"
:value="item.combo_id"></el-option>
</el-select>
</el-form-item>
<el-form-item label=" 女已婚">
<el-select v-model="edit_data.gaoduan_nv_yihun" placeholder="选择套餐">
<el-option v-for="(item,index) in combolist" :key="index" :label="item.name"
:value="item.combo_id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-form>
</el-form-item>
<el-form-item label="题目"> <el-form-item label="题目">
<div class="question_edit_title_wrapper"> <div class="question_edit_title_wrapper">
<el-select style="width: 300px;margin-right: 10px;" v-model="edit_question_active" <el-select style="width: 300px;margin-right: 10px;" v-model="edit_question_active"
placeholder="请选择题目"> placeholder="请选择题目">
<el-option v-for="(i,k) in question_list" :key="k" :label="i.question" :value="i.id"></el-option> <el-option v-for="(i,k) in question_list" :key="k" :label="i.question"
:value="i.id"></el-option>
</el-select> </el-select>
<el-button type="primary" size="small" @click="addQuestionClick()">添加题目</el-button> <el-button type="primary" size="small" @click="addQuestionClick()">添加题目</el-button>
</div> </div>
@ -282,8 +335,8 @@ onMounted(() => {
@click="moveQuestionClick(scope.$index, -1)"> @click="moveQuestionClick(scope.$index, -1)">
↑ ↑
</el-button> </el-button>
<el-button :disabled="scope.$index===edit_data.questions.length - 1" type="primary" size="small" <el-button :disabled="scope.$index===edit_data.questions.length - 1" type="primary"
@click="moveQuestionClick(scope.$index, 1)">↓ size="small" @click="moveQuestionClick(scope.$index, 1)">↓
</el-button> </el-button>
<el-button :disabled="edit_data.questions.length === 1" type="primary" size="small" <el-button :disabled="edit_data.questions.length === 1" type="primary" size="small"
@click="delQuestionClick(scope.$index)">X @click="delQuestionClick(scope.$index)">X
@ -346,8 +399,8 @@ onMounted(() => {
</el-table> </el-table>
<div class="page"> <div class="page">
<el-pagination v-if="last_page > 0" :current-page="page_options.page" mt-2 background layout="prev, pager, next" <el-pagination v-if="last_page > 0" :current-page="page_options.page" mt-2 background
:page-count="last_page" @update:current-page="searchClick"/> layout="prev, pager, next" :page-count="last_page" @update:current-page="searchClick" />
</div> </div>
</div> </div>
</template> </template>
@ -368,6 +421,7 @@ onMounted(() => {
justify-content: flex-end; justify-content: flex-end;
margin-top: 10px; margin-top: 10px;
} }
.eltransfer>>>.el-transfer-panel { .eltransfer>>>.el-transfer-panel {
width: 350px; width: 350px;
} }

117
admin/src/views/Question/QuestionItem.vue
Unescape Escape View File

@ -111,7 +111,7 @@ const deleteClick = (id) => {
.catch(() => {}) .catch(() => {})
} }
const comboNameShow = (combo_id) => { const comboNameShow = (combo_id) => {
if (Number(combo_id) === 0) return '无关联套餐' if (Number(combo_id) === 0) return '-'
return combo_list.value.find((i) => i.combo_id == combo_id)?.name return combo_list.value.find((i) => i.combo_id == combo_id)?.name
} }
@ -131,7 +131,7 @@ onMounted(() => {
<el-form-item label="项目说明"> <el-form-item label="项目说明">
<el-input v-model="edit_data.desc" placeholder="请输入项目说明"></el-input> <el-input v-model="edit_data.desc" placeholder="请输入项目说明"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="基础项目"> <!-- <el-form-item label="基础项目">
<el-select filterable v-model="edit_data.jichu" placeholder="请选择"> <el-select filterable v-model="edit_data.jichu" placeholder="请选择">
<el-option <el-option
v-for="(i, k) in [{ combo_id: '0', name: '暂不关联' }, ...combo_list]" v-for="(i, k) in [{ combo_id: '0', name: '暂不关联' }, ...combo_list]"
@ -160,6 +160,72 @@ onMounted(() => {
:value="i.combo_id" :value="i.combo_id"
/> />
</el-select> </el-select>
</el-form-item> -->
<el-form-item label="基础">
<el-form label-width="100px">
<el-form-item label=" 男">
<el-select v-model="edit_data.jichu_nan" placeholder="选择套餐">
<el-option v-for="(item,index) in combo_list" :key="index" :label="item.name"
:value="item.combo_id"></el-option>
</el-select>
</el-form-item>
<el-form-item label=" 女未婚">
<el-select v-model="edit_data.jichu_nv_weihun" placeholder="选择套餐">
<el-option v-for="(item,index) in combo_list" :key="index" :label="item.name"
:value="item.combo_id"></el-option>
</el-select>
</el-form-item>
<el-form-item label=" 女已婚">
<el-select v-model="edit_data.jichu_nv_yihun" placeholder="选择套餐">
<el-option v-for="(item,index) in combo_list" :key="index" :label="item.name"
:value="item.combo_id"></el-option>
</el-select>
</el-form-item>
</el-form>
</el-form-item>
<el-form-item label="推荐">
<el-form label-width="100px">
<el-form-item label=" 男">
<el-select v-model="edit_data.tuijian_nan" placeholder="选择套餐">
<el-option v-for="(item,index) in combo_list" :key="index" :label="item.name"
:value="item.combo_id"></el-option>
</el-select>
</el-form-item>
<el-form-item label=" 女未婚">
<el-select v-model="edit_data.tuijian_nv_weihun" placeholder="选择套餐">
<el-option v-for="(item,index) in combo_list" :key="index" :label="item.name"
:value="item.combo_id"></el-option>
</el-select>
</el-form-item>
<el-form-item label=" 女已婚">
<el-select v-model="edit_data.tuijian_nv_yihun" placeholder="选择套餐">
<el-option v-for="(item,index) in combo_list" :key="index" :label="item.name"
:value="item.combo_id"></el-option>
</el-select>
</el-form-item>
</el-form>
</el-form-item>
<el-form-item label="高端">
<el-form label-width="100px">
<el-form-item label=" 男">
<el-select v-model="edit_data.gaoduan_nan" placeholder="选择套餐">
<el-option v-for="(item,index) in combolist" :key="index" :label="item.name"
:value="item.combo_id"></el-option>
</el-select>
</el-form-item>
<el-form-item label=" 女未婚">
<el-select v-model="edit_data.gaoduan_nv_weihun" placeholder="选择套餐">
<el-option v-for="(item,index) in combolist" :key="index" :label="item.name"
:value="item.combo_id"></el-option>
</el-select>
</el-form-item>
<el-form-item label=" 女已婚">
<el-select v-model="edit_data.gaoduan_nv_yihun" placeholder="选择套餐">
<el-option v-for="(item,index) in combolist" :key="index" :label="item.name"
:value="item.combo_id"></el-option>
</el-select>
</el-form-item>
</el-form>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
@ -197,7 +263,7 @@ onMounted(() => {
<el-table-column prop="id" label="ID" width="100" /> <el-table-column prop="id" label="ID" width="100" />
<el-table-column prop="name" label="项目名称" width="200" /> <el-table-column prop="name" label="项目名称" width="200" />
<el-table-column prop="desc" label="项目说明" show-overflow-tooltip /> <el-table-column prop="desc" label="项目说明" show-overflow-tooltip />
<el-table-column label="基础项目" show-overflow-tooltip> <!-- <el-table-column label="基础" show-overflow-tooltip>
<template #default="scope"> <template #default="scope">
{{ comboNameShow(scope.row.jichu) }} {{ comboNameShow(scope.row.jichu) }}
</template> </template>
@ -211,6 +277,51 @@ onMounted(() => {
<template #default="scope"> <template #default="scope">
{{ comboNameShow(scope.row.gaoduan) }} {{ comboNameShow(scope.row.gaoduan) }}
</template> </template>
</el-table-column> -->
<el-table-column label="基础男" show-overflow-tooltip>
<template #default="scope">
{{ comboNameShow(scope.row.jichu_nan) }}
</template>
</el-table-column>
<el-table-column label="基础女未婚" show-overflow-tooltip>
<template #default="scope">
{{ comboNameShow(scope.row.jichu_nv_weihun) }}
</template>
</el-table-column>
<el-table-column label="基础女已婚" show-overflow-tooltip>
<template #default="scope">
{{ comboNameShow(scope.row.jichu_nv_yihun) }}
</template>
</el-table-column>
<el-table-column label="推荐男" show-overflow-tooltip>
<template #default="scope">
{{ comboNameShow(scope.row.tuijian_nan) }}
</template>
</el-table-column>
<el-table-column label="推荐女未婚" show-overflow-tooltip>
<template #default="scope">
{{ comboNameShow(scope.row.tuijian_nv_weihun) }}
</template>
</el-table-column>
<el-table-column label="推荐女已婚" show-overflow-tooltip>
<template #default="scope">
{{ comboNameShow(scope.row.tuijian_nv_yihun) }}
</template>
</el-table-column>
<el-table-column label="高端男" show-overflow-tooltip>
<template #default="scope">
{{ comboNameShow(scope.row.gaoduan_nan) }}
</template>
</el-table-column>
<el-table-column label="高端女未婚" show-overflow-tooltip>
<template #default="scope">
{{ comboNameShow(scope.row.gaoduan_nv_weihun) }}
</template>
</el-table-column>
<el-table-column label="高端女已婚" show-overflow-tooltip>
<template #default="scope">
{{ comboNameShow(scope.row.gaoduan_nv_yihun) }}
</template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="140"> <el-table-column label="操作" width="140">
<template #default="scope"> <template #default="scope">

4
h5/config.js
Unescape Escape View File

@ -1,7 +1,7 @@
const app_type = 'gzh' const app_type = 'gzh'
//const base_url = "https://api.hainan2024.sa0.online" //开发环境 //const base_url = "https://api.hainan2024.sa0.online" //开发环境
const base_url="https://tj-h5.hnxdfe.com" //正式环境 //const base_url="https://tj-h5.hnxdfe.com" //正式环境
//const base_url="http://124.225.137.54:39081" //测试环境 const base_url="http://124.225.137.54:39081" //测试环境
const config = { const config = {
api_map_url: base_url + '/api/ApiMap/h5', api_map_url: base_url + '/api/ApiMap/h5',
base_assets_url: base_url, base_assets_url: base_url,

Write Preview
Loading…
Cancel
Save