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

web端调整

Browse Source
main
yanzai 9 months ago
parent 2908620fe1
commit d79855845c
3 changed files with 41 additions and 9 deletions
Show Stats Download Patch File Download Diff File

1
Laravel/app/Http/Controllers/API/Web/ComboController.php
Unescape Escape View File

@ -189,6 +189,7 @@ select combo_id as c_id,count(*) as sale_count from orders where status in(2,4)
$groupedData = [];
foreach ($items as $item) {
$item->price = $item->price * config('app.globals.ZiXuan_ZheKou');//所有自选项目打8折
$item->price = number_format( $item->price , 2, '.', '');
//判断套餐项目和自选项目是否冲突
if(isset($combo_items)){
foreach ($combo_items as $comboitem) {

12
Laravel/app/Http/Controllers/API/Web/ItemController.php
Unescape Escape View File

@ -12,13 +12,20 @@ class ItemController extends Controller
public function GetList()
{
$hospital = request('hospital');
$appointment = request('appointment');
$sex=request('sex');
//查询所有可以自选的项目
$items=DB::table('items')->where(['is_choose'=>1,'status'=>1])->get();
$items=DB::table('items');
if(isset($appointment)){
$items=$items->where('keshi_id',$appointment);
}
$items=$items->where(['is_choose'=>1,'status'=>1])->get();
$search= request('search');
$list = [];
$group_arr = [];
$group_list = [];
$keshi_list = [];
$keshi_list=DB::table('items')->select('keshi_id','keshi_name')->where(['is_choose'=>1,'status'=>1])->groupBy('keshi_id','keshi_name')->get();
foreach ($items as $item) {
if($item->sex <> $sex and $item->sex<>0){
continue;
@ -52,6 +59,7 @@ class ItemController extends Controller
'children' => [],
];
$group_arr[] = $item->keshi_id;
}
$group_list["科室{$item->keshi_id}"]['children'][] = [
@ -69,6 +77,6 @@ class ItemController extends Controller
}
}
return \Yz::Return(true,"查询成功",['list'=>$group_list]);
return \Yz::Return(true,"查询成功",['list'=>$group_list,'keshi_list'=>$keshi_list]);
}
}

37
Laravel/public/tool/register.html
Unescape Escape View File

@ -142,7 +142,7 @@
</div>
</div>
<el-table border :data="combo_list_show" style="width: 100%" height="calc(50vh - 45px)" show-overflow-tooltip
ref="combo_table_ref" @row-click="comboRowClick" :row-class-name="comboRowClassName">
ref="combo_table_ref" @row-click="comboRowClick" :row-class-name="comboRowClassName" :default-sort="{ prop: 'price' }">
<el-table-column property="combo_id" label="套餐ID" width="120"></el-table-column>
<el-table-column property="name" label="套餐名称"></el-table-column>
<el-table-column label="性别" width="60">
@ -151,7 +151,7 @@
</template>
</el-table-column>
<el-table-column property="pinyin" label="套餐简拼" width="120"></el-table-column>
<el-table-column property="price" label="价格" width="120"></el-table-column>
<el-table-column property="price" sortable label="价格" width="120"></el-table-column>
</el-table>
</div>
</el-dialog>
@ -225,7 +225,7 @@
<el-date-picker v-model="input_data.birthday" type="date" placeholder="请选择出生日期" format="YYYY-MM-DD"
value-format="YYYY-MM-DD"></el-date-picker>
</el-form-item>
<el-form-item label="登记人">
<el-form-item label="登记医生">
<el-input v-model="input_data.doctor" placeholder="请输入登记人" />
</el-form-item>
<el-form-item label="登记科室">
@ -240,6 +240,12 @@
<el-form-item label="项目搜索">
<el-input v-model="search_input" placeholder="" @keyup.enter="searchClick"/>
</el-form-item>
<el-form-item label="科室" style="margin-left: -50px">
<el-select v-model="search_appointment" placeholder="请选择科室" style="width: 150px" @change="searchClick()" >
<el-option label="全部" value="0" ></el-option>
<el-option v-for="(item,index) in ResKeShilist" :label="item.keshi_name" :value="item.keshi_id" :key="item.keshi_id" ></el-option>
</el-select>
</el-form-item>
</el-form>
<el-button type="primary" @click="searchClick()">搜索</el-button>
</div>
@ -291,6 +297,7 @@
<div class="price_wrapper">
<div class="price_value_wrapper">
<span v-if="!!pay_info">合计价格：¥ {{ pay_info.true_price }}</span>
<span v-if="!!pay_info" style="font-size: 14px;color: #bbb;"> 原价:¥{{ pay_info.original_price }}</span>
</div>
<div>
<el-button @click="removeAllClick()" type="danger">清空</el-button>
@ -457,6 +464,7 @@
};
const search_input = ref("");
const search_appointment=ref("");
const select_items_deep = ref("");
const select_data_default = {
combo: "",
@ -567,9 +575,9 @@
combo_search_input_deep.value = combo_search_input.value
}
const searchClick = () => {
if (search_input_deep.value === search_input.value) {
return
}
// if (search_input_deep.value === search_input.value) {
// return
// }
search_input_deep.value = search_input.value
saveSelectDeep();
if (!!search_input.value) {
@ -593,6 +601,14 @@
} else {
item_list_show.value = item_list.value
}
if(!!search_appointment.value){
if(search_appointment.value === "0"){
}else{
item_list_show.value = item_list_show.value.filter(item => item.group_id === search_appointment.value)
}
}
nextTick(() => {
let select_deep = JSON.parse(JSON.stringify(select_items_deep.value)).split(',')
get_buy_info.value = false
@ -671,9 +687,13 @@
}
})
}
let ResKeShilist=ref([]);
const getItemGetList = async () => {
const response = await axios.post($api("ItemGetList"));
const response = await axios.post($api("ItemGetList"),{
appointment: search_appointment.value,
});
window.$response(response.data, () => {
ResKeShilist.value = response.data.data.keshi_list;
let il_map = response.data.data.list;
let il = [];
for (let i in il_map) {
@ -1078,6 +1098,7 @@
return {
elZh,
getItemGetList,
handleSubmit,
PlanDateChange,
isEnglishOnly,
@ -1113,7 +1134,9 @@
select_table_computed,
item_table_ref,
item_list,
ResKeShilist,
search_input,
search_appointment,
select_data,
input_data,
button_config,

Write Preview
Loading…
Cancel
Save