diff --git a/Laravel/app/Http/Controllers/API/Web/ComboController.php b/Laravel/app/Http/Controllers/API/Web/ComboController.php index afc5614..0032e9c 100644 --- a/Laravel/app/Http/Controllers/API/Web/ComboController.php +++ b/Laravel/app/Http/Controllers/API/Web/ComboController.php @@ -13,6 +13,10 @@ class ComboController extends Controller public function GetList(){ $hospital = request('hospital'); $sex=request('sex'); + if(isset($sex)){ + if($sex=='男') $sex=1; + if($sex=='女') $sex=2; + } $combo_sort = request('combo_sort'); @@ -67,7 +71,7 @@ class ComboController extends Controller $combos = DB::select("select * from combos as a LEFT JOIN ( select combo_id as c_id,count(*) as count from orders where status in(2,4) group by combo_id -) as b on a.combo_id=b.c_id where a.status=1 and a.sex=?" . $sql, $canshu); +) as b on a.combo_id=b.c_id where a.status=1 and a.sex in(0,?)" . $sql, $canshu); foreach ($combos as $key => $combo) { $combo->count=$combo->count?$combo->count:0; @@ -177,6 +181,12 @@ select combo_id as c_id,count(*) as sale_count from orders where status in(2,4) $items = DB::table('items')->whereIn('item_id', $item_ids)->where(['status' => 1])->get(); $groupedData = []; foreach ($items as $item) { + //判断套餐项目和自选项目是否冲突 + if(isset($combo_items)){ + foreach ($combo_items as $comboitem) { + if($comboitem['id']==$item->item_id) return \Yz::echoError1($item->name."已经存在，不可重复选择",['item_id'=>$item->item_id]); + } + } // $price=$price+$item->price; $price = bcadd($price, $item->price, 2); // $all_original_price+=$item->original_price; diff --git a/Laravel/app/Http/Controllers/API/Web/ItemController.php b/Laravel/app/Http/Controllers/API/Web/ItemController.php index a8692c4..f974616 100644 --- a/Laravel/app/Http/Controllers/API/Web/ItemController.php +++ b/Laravel/app/Http/Controllers/API/Web/ItemController.php @@ -23,6 +23,7 @@ class ItemController extends Controller if($item->sex <> $sex and $item->sex<>0){ continue; } + $item->price= number_format($item->price * config('app.globals.ZiXuan_ZheKou'), 2, '.', ''); //所有自选项目打8折 $push_type = false; if ($search == '') { $push_type = true; diff --git a/Laravel/app/Http/Controllers/API/Web/OrderController.php b/Laravel/app/Http/Controllers/API/Web/OrderController.php index 15e56d9..74fd644 100644 --- a/Laravel/app/Http/Controllers/API/Web/OrderController.php +++ b/Laravel/app/Http/Controllers/API/Web/OrderController.php @@ -93,8 +93,9 @@ class OrderController extends Controller if (count($item_ids) != 0) { $items_list = DB::table('items')->whereIn('item_id', $item_ids)->where(['status' => 1])->get(); $existingIds = []; + $item_price = 0; foreach ($items_list as $item) { - $price += $item->price; + $item_price += $item->price; $existingIds[] = $item->item_id; $buy_info['items'][] = [ 'id' => $item->item_id, @@ -111,6 +112,8 @@ class OrderController extends Controller } $missingIds = array_diff($item_ids, $existingIds); if (count($missingIds) > 0) return \Yz::echoError1("部分自选项目不可用，Id:" . implode(', ', $missingIds)); + $item_price = $item_price * config('app.globals.ZiXuan_ZheKou'); //所有自选项目打8折 + $price += $item_price; } $true_price = $price; //如果是团检 diff --git a/Laravel/app/Lib/Yz.php b/Laravel/app/Lib/Yz.php index 87bb32f..18a5692 100644 --- a/Laravel/app/Lib/Yz.php +++ b/Laravel/app/Lib/Yz.php @@ -13,10 +13,11 @@ class Yz{ $result['msg']=$msg; return response()->json($result)->setEncodingOptions(JSON_UNESCAPED_UNICODE); } - public static function echoError1($msg){ + public static function echoError1($msg,$data=[]){ $result=array(); $result['status']=false; $result['msg']=$msg; + $result['data']=$data; return response()->json($result)->setEncodingOptions(JSON_UNESCAPED_UNICODE); } diff --git a/Laravel/public/tool/register.html b/Laravel/public/tool/register.html index 5cb5f2d..d713332 100644 --- a/Laravel/public/tool/register.html +++ b/Laravel/public/tool/register.html @@ -134,7 +134,7 @@
- + @@ -162,7 +162,7 @@ + value-format="YYYY-MM-DD" @change="PlanDateChange()" > 查看号源 @@ -234,7 +234,7 @@
- + @@ -566,13 +566,22 @@ search_input_deep.value = search_input.value saveSelectDeep(); if (!!search_input.value) { - let search_str = search_input.value.toUpperCase(); let il = [] - for (let i in item_list.value) { - if (!!item_list.value[i].pinyin.includes(search_str)) { - il.push(item_list.value[i]) + if(isEnglishOnly(search_input.value)){//如果是纯英文 + let search_str = search_input.value.toUpperCase(); + for (let i in item_list.value) { + if (!!item_list.value[i].pinyin.includes(search_str)) { + il.push(item_list.value[i]) + } + } + }else{ + for (let i in item_list.value) { + if (!!item_list.value[i].title.includes(search_input.value)) { + il.push(item_list.value[i]) + } } } + item_list_show.value = il } else { item_list_show.value = item_list.value @@ -635,7 +644,24 @@ item_ids: item_ids, }); window.$response(response, () => { - pay_info.value = response.data.data; + if(response.data.status===true){ + pay_info.value = response.data.data; + }else{ + if(response.data.data !== undefined && response.data.data.item_id !== undefined){ + item_table_ref.value.toggleRowSelection( + // 此处必须在 tableData 中查找对应的数据，否则 toggleRowSelection 会失效 + item_list_show.value.find((row) => { + console.log(row) + return row.id === response.data.data.item_id; + }), + false + ); + } + + + + return window.$message().error(response.data.msg) + } }) } const getItemGetList = async () => { @@ -660,13 +686,22 @@ const combo_list = ref([]) const combo_list_show = computed(() => { if (!!combo_search_input_deep.value) { - let search_str = combo_search_input_deep.value.toUpperCase(); let il = [] - for (let i in combo_list.value) { - if (!!combo_list.value[i].pinyin.includes(search_str)) { - il.push(combo_list.value[i]) + if(isEnglishOnly(combo_search_input_deep.value)) {//如果是纯英文 + let search_str = combo_search_input_deep.value.toUpperCase(); + for (let i in combo_list.value) { + if (!!combo_list.value[i].pinyin.includes(search_str)) { + il.push(combo_list.value[i]) + } + } + }else{ + for (let i in combo_list.value) { + if (!!combo_list.value[i].name.includes(combo_search_input_deep.value)) { + il.push(combo_list.value[i]) + } } } + return il } else { return combo_list.value @@ -751,11 +786,16 @@ let combo_items = pay_info.value.combo_info.items for (let i in combo_items) { for (let j in combo_items[i].children) { - items.push({ + items.unshift({ ...combo_items[i].children[j], group: combo_items[i].keshi_name, type: '套餐' - }) + }); + // items.push({ + // ...combo_items[i].children[j], + // group: combo_items[i].keshi_name, + // type: '套餐' + // }) } } } @@ -765,11 +805,16 @@ let group_items = pay_info.value.items_info.items for (let i in group_items) { for (let j in group_items[i].children) { - items.push({ + items.unshift({ ...group_items[i].children[j], group: group_items[i].keshi_name, type: '自选' }) + // items.push({ + // ...group_items[i].children[j], + // group: group_items[i].keshi_name, + // type: '自选' + // }) } } } @@ -1005,7 +1050,13 @@ return 'cursor-pointer' } } - + function isEnglishOnly(str) { + // 使用正则表达式检查字符串是否只包含英文字符 + return /^[A-Za-z]+$/.test(str); + } + function PlanDateChange() { + getPlanList() + } onMounted(() => { getQueryData(); getItemGetList(); @@ -1014,6 +1065,8 @@ return { elZh, + PlanDateChange, + isEnglishOnly, itemTableRowClassName, createOrderClick, selectPlanClick,