修改中獎名單排版 部門資料庫新增欄位

app/Http/Controllers/RecipientsController.php

@@ -181,10 +181,10 @@ class RecipientsController extends Controller
     {
         //
         $prize_id = $request->prize_id;
-        $prizeList = DB::select("SELECT [check_ins].[user_id],[name],[is_claimed],[department_name] FROM [recipients] 
+        $prizeList = DB::select("SELECT [check_ins].[user_id],[name],[is_claimed],[alias] FROM [recipients] 
         LEFT JOIN [check_ins] ON [recipients].[user_id] = [check_ins].[user_id]
         LEFT JOIN [departments] ON [check_ins].[department_id] = [departments].[department_id]
-        WHERE [prize_id] = ?;",[$prize_id]);
+        WHERE [prize_id] = ? ORDER BY [department_name];",[$prize_id]);
         $prize = DB::select("SELECT [name] FROM [prizes] WHERE [id] = ?;",[$prize_id]);
         $response = [
             "prize" => $prize,

app/Models/Department.php

@@ -12,6 +12,8 @@ class Department extends Model
     protected $fillable = [
         'department_id',
         'department_name',
+        'alias',
         'manager',
+        
     ];
 }

database/MAA_department.json

@@ -1,187 +1,217 @@
-[
-  {
-    "department_id": "A00",
-    "department_name": "行政管理部",
-    "manager": "A00"
-  },
-  {
-    "department_id": "A21",
-    "department_name": "行政管理部庶務科",
-    "manager": "A21"
-  },
-  {
-    "department_id": "A22",
-    "department_name": "人力資源科",
-    "manager": "A22"
-  },
-  {
-    "department_id": "A24",
-    "department_name": "行政管理部文書科",
-    "manager": "A24"
-  },
-  {
-    "department_id": "B00",
-    "department_name": "南區辦事處",
-    "manager": "B00"
-  },
-  {
-    "department_id": "B10",
-    "department_name": "中區辦事處",
-    "manager": "B10"
-  },
-  {
-    "department_id": "C00",
-    "department_name": "工程管理一部",
-    "manager": "C00"
-  },
-  {
-    "department_id": "C10",
-    "department_name": "工程管理二部",
-    "manager": "C10"
-  },
-  {
-    "department_id": "D00",
-    "department_name": "發展與企畫部",
-    "manager": "D00"
-  },
-  {
-    "department_id": "E10",
-    "department_name": "工程製圖科",
-    "manager": "E10"
-  },
-  {
-    "department_id": "F10",
-    "department_name": "工務部",
-    "manager": "F10"
-  },
-  {
-    "department_id": "G00",
-    "department_name": "大地工程部",
-    "manager": "G00"
-  },
-  {
-    "department_id": "I00",
-    "department_name": "財務部",
-    "manager": "I00"
-  },
-  {
-    "department_id": "J00",
-    "department_name": "運輸及土木工程部",
-    "manager": "J00"
-  },
-  {
-    "department_id": "J10",
-    "department_name": "城鄉發展部",
-    "manager": "J10"
-  },
-  {
-    "department_id": "J20",
-    "department_name": "軌道工程部",
-    "manager": "J20"
-  },
-  {
-    "department_id": "L00",
-    "department_name": "董事長室",
-    "manager": "L00"
-  },
-  {
-    "department_id": "L10",
-    "department_name": "總經理室",
-    "manager": "L10"
-  },
-  {
-    "department_id": "L40",
-    "department_name": "企業發展中心",
-    "manager": "L40"
-  },
-  {
-    "department_id": "L60",
-    "department_name": "成本中心",
-    "manager": "L60"
-  },
-  {
-    "department_id": "M00",
-    "department_name": "資訊中心",
-    "manager": "M00"
-  },
-  {
-    "department_id": "P00",
-    "department_name": "環境及水資源工程部",
-    "manager": "P00"
-  },
-  {
-    "department_id": "P10",
-    "department_name": "環境水務部",
-    "manager": "P10"
-  },
-  {
-    "department_id": "P20",
-    "department_name": "環境永續部",
-    "manager": "P20"
-  },
-  {
-    "department_id": "R00",
-    "department_name": "機電系統工程部",
-    "manager": "R00"
-  },
-  {
-    "department_id": "S00",
-    "department_name": "結構工程部",
-    "manager": "S00"
-  },
-  {
-    "department_id": "U20",
-    "department_name": "工程設計群",
-    "manager": "U20"
-  },
-  {
-    "department_id": "U30",
-    "department_name": "工程監理群",
-    "manager": "U30"
-  },
-  {
-    "department_id": "U40",
-    "department_name": "總管理處",
-    "manager": "U40"
-  },
-  {
-    "department_id": "U50",
-    "department_name": "建築及設施群",
-    "manager": "U50"
-  },
-  {
-    "department_id": "X05",
-    "department_name": "數位工程發展部",
-    "manager": "X05"
-  },
-  {
-    "department_id": "X06",
-    "department_name": "淡海輕軌計畫監造專案",
-    "manager": "X06"
-  },
-  {
-    "department_id": "X08",
-    "department_name": "安坑輕軌計畫監造專案",
-    "manager": "X08"
-  },
-  {
-    "department_id": "X09",
-    "department_name": "先進技術中心",
-    "manager": "X09"
-  },
-  {
-    "department_id": "X10",
-    "department_name": "塭仔圳市地重劃公共工程專案管理與監造專案",
-    "manager": "X10"
-  },
-  {
-    "department_id": "X12",
-    "department_name": "萬大果菜市場專案",
-    "manager": "X12"
-  },
-  {
-    "department_id": "guest",
-    "department_name": "來賓",
-    "manager": "X05"
-  }  
-]
+[{
+        "department_id": "A00",
+        "department_name": "行政管理部",
+        "alias": "行政管理部",
+        "manager": "A00"
+    },
+    {
+        "department_id": "A21",
+        "department_name": "行政管理部庶務科",
+        "alias": "行管部庶務科",
+        "manager": "A21"
+    },
+    {
+        "department_id": "A22",
+        "department_name": "人力資源科",
+        "alias": "人力資源科",
+        "manager": "A22"
+    },
+    {
+        "department_id": "A24",
+        "department_name": "行政管理部文書科",
+        "alias": "行管部文書科",
+        "manager": "A24"
+    },
+    {
+        "department_id": "B00",
+        "department_name": "南區辦事處",
+        "alias": "南區辦事處",
+        "manager": "B00"
+    },
+    {
+        "department_id": "B10",
+        "department_name": "中區辦事處",
+        "alias": "中區辦事處",
+        "manager": "B10"
+    },
+    {
+        "department_id": "C00",
+        "department_name": "工程管理一部",
+        "alias": "工程管理一部",
+        "manager": "C00"
+    },
+    {
+        "department_id": "C10",
+        "department_name": "工程管理二部",
+        "alias": "工程管理二部",
+        "manager": "C10"
+    },
+    {
+        "department_id": "D00",
+        "department_name": "發展與企畫部",
+        "alias": "發展與企畫部",
+        "manager": "D00"
+    },
+    {
+        "department_id": "E10",
+        "department_name": "工程製圖科",
+        "alias": "工程製圖科",
+        "manager": "E10"
+    },
+    {
+        "department_id": "F10",
+        "department_name": "工務部",
+        "alias": "工務部",
+        "manager": "F10"
+    },
+    {
+        "department_id": "G00",
+        "department_name": "大地工程部",
+        "alias": "大地工程部",
+        "manager": "G00"
+    },
+    {
+        "department_id": "I00",
+        "department_name": "財務部",
+        "alias": "財務部",
+        "manager": "I00"
+    },
+    {
+        "department_id": "J00",
+        "department_name": "運輸及土木工程部",
+        "alias": "運輸土木部",
+        "manager": "J00"
+    },
+    {
+        "department_id": "J10",
+        "department_name": "城鄉發展部",
+        "alias": "城鄉發展部",
+        "manager": "J10"
+    },
+    {
+        "department_id": "J20",
+        "department_name": "軌道工程部",
+        "alias": "軌道工程部",
+        "manager": "J20"
+    },
+    {
+        "department_id": "L00",
+        "department_name": "董事長室",
+        "alias": "董事長室",
+        "manager": "L00"
+    },
+    {
+        "department_id": "L10",
+        "department_name": "總經理室",
+        "alias": "總經理室",
+        "manager": "L10"
+    },
+    {
+        "department_id": "L40",
+        "department_name": "企業發展中心",
+        "alias": "企業發展中心",
+        "manager": "L40"
+    },
+    {
+        "department_id": "L60",
+        "department_name": "成本中心",
+        "alias": "成本中心",
+        "manager": "L60"
+    },
+    {
+        "department_id": "M00",
+        "department_name": "資訊中心",
+        "alias": "資訊中心",
+        "manager": "M00"
+    },
+    {
+        "department_id": "P10",
+        "department_name": "環境水務部",
+        "alias": "環境水務部",
+        "manager": "P10"
+    },
+    {
+        "department_id": "P20",
+        "department_name": "環境永續部",
+        "alias": "環境永續部",
+        "manager": "P20"
+    },
+    {
+        "department_id": "R00",
+        "department_name": "機電系統工程部",
+        "alias": "機電工程部",
+        "manager": "R00"
+    },
+    {
+        "department_id": "S00",
+        "department_name": "結構工程部",
+        "alias": "結構工程部",
+        "manager": "S00"
+    },
+    {
+        "department_id": "U20",
+        "department_name": "工程設計群",
+        "alias": "工程設計群",
+        "manager": "U20"
+    },
+    {
+        "department_id": "U30",
+        "department_name": "工程監理群",
+        "alias": "工程監理群",
+        "manager": "U30"
+    },
+    {
+        "department_id": "U40",
+        "department_name": "總管理處",
+        "alias": "總管理處",
+        "manager": "U40"
+    },
+    {
+        "department_id": "U50",
+        "department_name": "建築及設施群",
+        "alias": "建築及設施群",
+        "manager": "U50"
+    },
+    {
+        "department_id": "X05",
+        "department_name": "數位工程發展部",
+        "alias": "數位發展部",
+        "manager": "X05"
+    },
+    {
+        "department_id": "X06",
+        "department_name": "淡海輕軌計畫監造專案",
+        "alias": "淡海輕軌專案",
+        "manager": "X06"
+    },
+    {
+        "department_id": "X08",
+        "department_name": "安坑輕軌計畫監造專案",
+        "alias": "安坑輕軌專案",
+        "manager": "X08"
+    },
+    {
+        "department_id": "X09",
+        "department_name": "先進技術中心",
+        "alias": "先進技術中心",
+        "manager": "X09"
+    },
+    {
+        "department_id": "X10",
+        "department_name": "塭仔圳專案",
+        "alias": "塭仔圳專案",
+        "manager": "X10"
+    },
+    {
+        "department_id": "X12",
+        "department_name": "萬大果菜市場專案",
+        "alias": "萬大市場專案",
+        "manager": "X12"
+    },
+    {
+        "department_id": "guest",
+        "department_name": "來賓",
+        "alias": "來賓",
+        "manager": "guest"
+    }
+]

database/migrations/2023_02_09_055743_create_departments_table.php

@@ -17,6 +17,7 @@ return new class extends Migration
             $table->id();
             $table->string('department_id');
             $table->string('department_name');
+            $table->string('alias');
             $table->string('manager');
         });
     }

database/seeders/DepartmentSeeder.php

@@ -24,6 +24,7 @@ class DepartmentSeeder extends Seeder
             Department::insert([
                 'department_id' => $value->department_id,
                 'department_name' => $value->department_name,
+                'alias' => $value->alias,
                 'manager' => $value->manager,
             ]);
         }

resources/js/src/views/lottery/Activities/bs-table/PrizeList.vue

@@ -12,7 +12,7 @@
       <b-row style=" margin-right: 0rem; margin-left: 0rem;">
         <!-- <table-custom-render /> -->
         <b-col class="prize-list" :key="index" v-for="(item, index) in prizeList" lg="3" md="3">
-          <b-badge pill :variant="isClaim(item.is_claimed)">{{ item.user_id + " " + item.name }}</b-badge>
+          <b-badge pill :variant="isClaim(item.is_claimed)">{{ item.alias.padEnd(6,"　") + " " + item.user_id + " " + item.name.padEnd(4,"　") }}</b-badge>
         </b-col>
 
         <b-button variant="danger"
@@ -120,7 +120,13 @@ export default {
         /* IE/Edge */
         document.msExitFullscreen();
       }
+    },padEnd(string){
+      string.padEnd(6, "　");
     }
+
+  },
+  computed:{
+    
   },
 }
 </script>