web端 相关调整

Laravel/app/Http/Controllers/API/Web/ComboController.php

@@ -145,7 +145,14 @@ select combo_id as c_id,count(*) as sale_count from orders where status in(2,4)
       $combo_info['price'] = $combo->price;
       $combo_info['original_price'] = $combo->original_price;
       $all_original_price += $combo_info['original_price'];
-      $combo_items = json_decode($combo->items, true);
+      $comboAllItem=DB::table('combo_items')->select('id','name','desc','keshi_name','price')
+        ->where(['combo_id' => $combo_id, 'status' => 1])
+        ->get()
+        ->map(function ($item) {
+          return (array) $item; // 将每个对象转换为数组
+        })
+        ->toArray();
+      $combo_items = $comboAllItem;
       $groupedData = [];
       foreach ($combo_items as $item) {
         $keshiName = $item['keshi_name'];
@@ -181,6 +188,7 @@ 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) {
+        $item->price = $item->price * config('app.globals.ZiXuan_ZheKou');//所有自选项目打8折
         //判断套餐项目和自选项目是否冲突
         if(isset($combo_items)){
           foreach ($combo_items as $comboitem) {

Laravel/app/Http/Controllers/API/Web/OrderController.php

@@ -24,6 +24,7 @@ class OrderController extends Controller
     $item_ids = request('item_ids');//自选item的ids
     $plan_id = request('plan_id');//号源id
     $doctor = request('doctor');//预约的医生名字
+    $appdoctor_department = request('appdoctor_department');//预约的医生的科室
     $appdoctor = request('appdoctor');//协助预约的医生名字
     $person= request('person');  //sex,birthday,married,name,id_number,phone
     $married_array=["未婚","已婚","丧偶","离婚","其他"];
@@ -220,6 +221,7 @@ class OrderController extends Controller
       'hospital_id' => $hospital_id,
       'doctor' => $doctor,
       'appdoctor'=>$appdoctor,
+      'appdoctor_department'=>$appdoctor_department,
       'phone' => $person['phone'],
       'sex' => $person['sex'],
       'birthday' => $person['birthday'],

Laravel/public/tool/register.html

@@ -42,7 +42,7 @@
 
     .select_input_wrapper {
       display: flex;
-      justify-content: space-between;
+
     }
 
     .price_wrapper {
@@ -133,9 +133,9 @@
         <div>
           <div>
             <div class="select_flex_wrapper">
-              <el-form label-width="40px" inline>
+              <el-form label-width="40px" inline  @submit.prevent="handleSubmit">
                 <el-form-item label="名称">
-                  <el-input v-model="combo_search_input" placeholder="" />
+                  <el-input v-model="combo_search_input" placeholder=""  @keyup.enter="comboSearchClick"/>
                 </el-form-item>
               </el-form>
               <el-button type="primary" @click="comboSearchClick()">搜索</el-button>
@@ -228,19 +228,23 @@
             <el-form-item label="登记人">
               <el-input v-model="input_data.doctor" placeholder="请输入登记人" />
             </el-form-item>
+            <el-form-item label="登记科室">
+              <el-input v-model="input_data.appdoctor_department" placeholder="请输入登记科室" />
+            </el-form-item>
           </el-form>
         </div>
         <div class="select_box_wrapper">
           <div class="select_input_wrapper">
             <div class="select_flex_wrapper">
-              <el-form label-width="40px" inline>
-                <el-form-item label="名称">
-                  <el-input v-model="search_input" placeholder="" />
+              <el-form label-width="80px" inline @submit.prevent="handleSubmit">
+                <el-form-item label="项目搜索">
+                  <el-input v-model="search_input" placeholder="" @keyup.enter="searchClick"/>
                 </el-form-item>
               </el-form>
               <el-button type="primary" @click="searchClick()">搜索</el-button>
             </div>
-            <div class="select_flex_wrapper">
+            <div class="select_flex_wrapper" style="margin-left: 20px;">
+              <el-button @click="selectComboFunc()" style="margin-right: 10px" type="primary">选择套餐</el-button>
               <el-form v-if="combo_list.length > 0" label-width="40px" inline>
                 <el-form-item label="套餐">
                   <div class="combo_show_wrapper">
@@ -248,7 +252,7 @@
                   </div>
                 </el-form-item>
               </el-form>
-              <el-button @click="selectComboFunc()" type="primary">选择套餐</el-button>
+
             </div>
           </div>
           <div>
@@ -277,6 +281,7 @@
               @row-click="itemRowClick">
               <el-table-column type="selection" width="38"></el-table-column>
               <el-table-column property="name" label="项目名称" width="120"></el-table-column>
+              <el-table-column property="price" label="价格" width="80"></el-table-column>
               <el-table-column property="group" label="科室" width="100"></el-table-column>
               <el-table-column property="desc" label="备注"></el-table-column>
               <el-table-column property="type" label="类型" width="80"></el-table-column>
@@ -288,6 +293,7 @@
               <span v-if="!!pay_info">合计价格：¥ {{ pay_info.true_price }}</span>
             </div>
             <div>
+              <el-button @click="removeAllClick()" type="danger">清空</el-button>
               <el-button @click="removeItemClick()" type="danger">移除项目</el-button>
               <el-button @click="planDialogShowClick()" type="primary">预约登记</el-button>
             </div>
@@ -511,6 +517,7 @@
         married: "未婚",
         vip: "2",
         doctor: "",
+        appdoctor_department: "",
         birthday: formatDatetime(new Date(), "YYYY-MM-DD"),
       };
       const api_map = {
@@ -859,7 +866,9 @@
           getBuyInfo('1');
         }
       };
-
+      const removeAllClick=()=>{
+        window.location.reload();
+      }
       const select_table_ref = ref(null)
       const removeItemClick = () => {
         const select_items = select_table_ref.value.getSelectionRows();
@@ -1017,6 +1026,7 @@
           combo_id: combo_id,
           item_ids: item_ids,
           appdoctor: input_data.value.doctor,
+          appdoctor_department: input_data.value.appdoctor_department,
           person: {
             sex: input_data.value.gender,
             birthday: input_data.value.birthday,
@@ -1056,6 +1066,9 @@
       }
       function PlanDateChange() {
         getPlanList()
+      }
+      function handleSubmit(){
+
       }
       onMounted(() => {
         getQueryData();
@@ -1065,6 +1078,7 @@
 
       return {
         elZh,
+        handleSubmit,
         PlanDateChange,
         isEnglishOnly,
         itemTableRowClassName,
@@ -1075,6 +1089,7 @@
         comboRowClick,
         itemRowClick,
         removeItemClick,
+        removeAllClick,
         itemSelectionChange,
         searchClick,
         idNumberUpdate,