1.修正CSV2 CosmosDB Client 取得源不正確問題

2.統購畫面多國語對應(進行中)

TEAMModelBI/ClientApp/src/language/lang/zh-cn.js

@@ -608,6 +608,29 @@ const zh_cn = {
         productManagement: '县市产品名额',
         prodSeatsInfo: '产品及名额资讯',
         addNew: '新增',
+        cityOrDistrict: '县市',
+        selectCityOrDistrict: '请选择县市',
+        prodName: '产品名称',
+        selectProd: '请选择产品',
+        space: '空间',
+        inputSpace: '请输入容量',
+        unit: '单位',
+        expirationDate: '使用期限',
+        startDate: '开始时间',
+        endDate: '结束时间',
+        quota: '名额',
+        inputQuota: '请输入名额',
+        school: '学校',
+        schoolName: '学校名称',
+        inputNumber: '请输入数字',
+        receiveNumber: '领取人数',
+        operate: '操作',
+        remove: '移除',
+        selectSchool: '请选择学校',
+        confirmOk: '确定',
+        cancel: '取消',
+        addSchool: '追加学校',
+        extension: '扩充项',
     },
     auth:{
         YMPCVCIM: '学情分析模组',

TEAMModelBI/ClientApp/src/language/lang/zh-tw.js

@@ -604,6 +604,29 @@ const zh_tw = {
         productManagement: '縣市產品名額',
         prodSeatsInfo: '產品及名額資訊',
         addNew: '新增',
+        cityOrDistrict: '縣市',
+        selectCityOrDistrict: '請選擇縣市',
+        prodName: '產品名稱',
+        selectProd: '請選擇產品',
+        space: '空間',
+        inputSpace: '請輸入容量',
+        unit: '單位',
+        expirationDate: '使用期限',
+        startDate: '開始時間',
+        endDate: '結束時間',
+        quota: '名額',
+        inputQuota: '請輸入名額',
+        school: '學校',
+        schoolName: '學校名稱',
+        inputNumber: '請輸入數字',
+        receiveNumber: '領取人數',
+        operate: '操作',
+        remove: '移除',
+        selectSchool: '請選擇學校',
+        confirmOk: '確定',
+        cancel: '取消',
+        addSchool: '追加學校',
+        extension: '擴充項',
     },
     auth:{
         YMPCVCIM: '學情分析模組',

TEAMModelBI/ClientApp/src/view/htcommunity/adminpanel.vue

@@ -17,72 +17,69 @@
         </el-auto-resizer>
       </div>
     </el-card>
-    <el-dialog v-model="dialogFormVisible" title="$t('purchase.prodSeatsInfo')" width="1000" @closed="clearform">
+    <el-dialog v-model="dialogFormVisible" :title="$t('purchase.prodSeatsInfo')" width="1000" @closed="clearform">
         <el-form :model="form" :rules="rules" ref="ruleFormRef" :label-position="Top">
-            <el-form-item label="縣市" :label-width="formLabelWidth" prop="region">
-                <el-select v-model="form.region" placeholder="請選擇縣市" :disabled="isRegionDisabled">
+            <el-form-item :label="$t('purchase.cityOrDistrict')" :label-width="formLabelWidth" prop="region">
+                <el-select v-model="form.region" :placeholder="$t('purchase.selectCityOrDistrict')" :disabled="isRegionDisabled">
                     <el-option v-for="item in optionsData" :key="item.code" :label="item.name" :value="item.code" />
                 </el-select>
             </el-form-item>
-            <el-form-item label="產品名稱" :label-width="formLabelWidth" prop="name">
-                <el-select v-model="form.name" placeholder="請選擇產品" @change="handleChange" :disabled="isNameDisabled">
+            <el-form-item :label="$t('purchase.prodName')" :label-width="formLabelWidth" prop="name">
+                <el-select v-model="form.name" :placeholder="$t('purchase.selectProd')" @change="handleChange" :disabled="isNameDisabled">
                     <el-option v-for="item in nameOptions" :key="item.value" :label="item.label" :value="item.value" />
                 </el-select>
             </el-form-item>
-            <el-form-item label="空間" :label-width="formLabelWidth" v-show="isShowSpace">
-                <el-input v-model.number="form.space" style="width: 240px" placeholder="請輸入容量" /> &nbsp;&nbsp;(單位GB)
+            <el-form-item :label="$t('purchase.space')" :label-width="formLabelWidth" v-show="isShowSpace">
+                <el-input v-model.number="form.space" style="width: 240px" :placeholder="$t('purchase.inputSpace')" /> &nbsp;&nbsp;({{$t('purchase.unit')}}GB)
             </el-form-item>
-            <el-form-item label="擴充項" :label-width="formLabelWidth" v-show="isShowExtensions" style="width: 100%">
+            <el-form-item :label="$t('purchase.extension')" :label-width="formLabelWidth" v-show="isShowExtensions" style="width: 100%">
                 <el-checkbox v-model="form.extensions" v-for="item in extensions" :key="item.Key" :label="item.Key" :value="item.Key" style="width: 240px">
                     {{ item.Name }}
-                    <el-input v-model="exqwen[item.Key]" style="width: 100px" placeholder="請輸入數量"
+                    <el-input v-model="exqwen[item.Key]" style="width: 100px" :placeholder="$t('purchase.inputNumber')"
                       v-show="isShowExQwen(item.Key)" />
                 </el-checkbox>
             </el-form-item>
-            <el-form-item label="使用期限" :label-width="formLabelWidth" prop="time" style="width: 500px">
-                <el-date-picker v-model="form.time" type="daterange" range-separator="To" start-placeholder="開始時間"
-                                end-placeholder="結束時間" :size="size" format="YYYY/MM/DD" value-format="YYYY-MM-DD" />
+            <el-form-item :label="$t('purchase.expirationDate')" :label-width="formLabelWidth" prop="time" style="width: 500px">
+                <el-date-picker v-model="form.time" type="daterange" range-separator="To" :start-placeholder="$t('purchase.startDate')" :end-placeholder="$t('purchase.endDate')" :size="size" format="YYYY/MM/DD" value-format="YYYY-MM-DD" />
             </el-form-item>
-            <el-form-item label="名額" :label-width="formLabelWidth" prop="qwen">
-                <el-input v-model.number="form.qwen" style="width: 240px" placeholder="請輸入名額" />
+            <el-form-item :label="$t('purchase.quota')" :label-width="formLabelWidth" prop="qwen">
+                <el-input v-model.number="form.qwen" style="width: 240px" :placeholder="$t('purchase.inputQuota')" />
             </el-form-item>
-            <el-form-item label="學校" :label-width="formLabelWidth">
+            <el-form-item :label="$t('purchase.school')" :label-width="formLabelWidth">
                 <el-table :data="form.schools" style="width: 100%">
-                    <el-table-column prop="schoolName" label="學校名稱">
+                    <el-table-column prop="schoolName" :label="$t('purchase.schoolName')">
                     </el-table-column>
-                    <el-table-column prop="seats" label="名額">
+                    <el-table-column prop="seats" :label="$t('purchase.quota')">
                         <template #default="scope">
-                            <el-input v-model="scope.row.seats" placeholder="請輸入數字" type="number" @input="(value)=>handleInputSeats(value, scope.row.shortCode)"></el-input>
+                            <el-input v-model="scope.row.seats" :placeholder="$t('purchase.inputNumber')" type="number" @input="(value)=>handleInputSeats(value, scope.row.shortCode)"></el-input>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="used" label="領取人數">
+                    <el-table-column prop="used" :label="$t('purchase.receiveNumber')">
                     </el-table-column>
-                    <el-table-column label="操作">
+                    <el-table-column :label="$t('purchase.operate')">
                         <template #default="scope">
-                            <el-button @click="removeSchoolSeat(scope.$index)">移除</el-button>
+                            <el-button @click="removeSchoolSeat(scope.$index)">{{$t('purchase.remove')}}</el-button>
                         </template>
                     </el-table-column>
                 </el-table>
                 <div style="margin-top: 0px; width: 100%; text-align: left; " v-show="isShowCsSchool">
-                    <el-select v-model="selectedSchInfo" value-key="shortCode" placeholder="請選擇學校" style="width: 50%">
+                    <el-select v-model="selectedSchInfo" value-key="shortCode" :placeholder="$t('purchase.selectSchool')" style="width: 50%">
                         <el-option v-for="item in csSchoolList" :key="item.shortCode" :label="item.name + ' (' + item.shortCode + ')'" :value="item" />
                     </el-select>
-                    <el-button style="margin-left: 5px;" @click="addSchoolSeat()">確定</el-button>
+                    <el-button style="margin-left: 5px;" @click="addSchoolSeat()">{{$t('purchase.confirmOk')}}</el-button>
                 </div>
                 <div style="margin-top: 5px" v-show="isShowSchoolDiv">
-                    <el-button @click="showAddSchool()">追加學校</el-button>
+                    <el-button @click="showAddSchool()">{{$t('purchase.addSchool')}}</el-button>
                 </div>
             </el-form-item>
             </el-form>
             <template #footer>
                 <div class="dialog-footer">
-                    <el-button type="primary" @click="saveData">
-                        確定
-                    </el-button>
-                    <el-button @click="clearform">取消</el-button>
+                    <el-button type="primary" @click="saveData">{{$t('purchase.confirmOk')}}</el-button>
+                    <el-button @click="clearform">{{$t('purchase.cancel')}}</el-button>
                 </div>
             </template>
-            </el-dialog>
+    </el-dialog>
 </div>
 </template>
   

TEAMModelBI/Controllers/BISchool/SchoolController.cs

@@ -2619,7 +2619,7 @@ namespace TEAMModelBI.Controllers.BISchool
             List<object> result = new List<object>();
             try
             {
-                var client = _azureCosmos.GetCosmosClient("CoreServiceV2");
+                var client = _azureCosmos.GetCosmosClient(name:"CoreServiceV2");
                 string sqlPurchase = $"SELECT * FROM c ";
                 List<PurchaseSeats> purchaseSeatsList = new List<PurchaseSeats>();
                 await foreach (PurchaseSeats item in client.GetContainer("Habb", "Auth").GetItemQueryIterator<PurchaseSeats>(queryText: sqlPurchase, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey("purchase") }))