Merge branch 'master' of http://git.ius.plus/denny.zhao/VinnoManagementSystem

VinnoManagementSystem/src/api/wing/wing.js

@@ -1,7 +1,7 @@
 
 import http from "@/utils/request"
 import common from "@/utils/common"
-import { ElNotification } from 'element-plus';
+import { ElMessage } from 'element-plus';
 
 export default {
     post: async function (method, params, success, baseUrl) {
@@ -12,10 +12,11 @@ export default {
             "params": [params || {}]
         }, "/", { baseURL: baseUrl || "/api" });
         if (res.code != null) {
-            ElNotification.error({
-                title: '请求错误',
-                message: res.message
-            });
+            // ElNotification.error({
+            //     title: '请求错误',
+            //     message: res.message
+            // });
+            ElMessage.error(res.message);
         }
         else {
             success && success();

VinnoManagementSystem/src/components/admin/selectAdmin.vue

@@ -37,7 +37,8 @@
                 v-model="selectCode"
                 :label="scope.row.AdminCode"
                 @click="selectCode = scope.row.AdminCode"
-              />
+                >{{&nbsp;}}</el-radio
+              >
             </template>
           </el-table-column>
           <el-table-column

VinnoManagementSystem/src/components/user/selectUser.vue

@@ -8,18 +8,18 @@
   >
     <el-container>
       <el-header>
-        <div class="left-panel">
+        <div class="right-panel">
           <div class="right-panel-search">
             <el-input
               v-model="search.Keyword"
               clearable
-              style="width: 320px"
               :placeholder="$t('pleaseInput')"
+              style="min-width: 230px"
             >
               <template #prepend>
                 <el-select
                   v-model="search.QueryType"
-                  style="width: 120px"
+                  style="min-width: 100px"
                   :placeholder="$t('pleaseChoose')"
                   class="filter-item"
                 >
@@ -52,7 +52,8 @@
                 v-model="selectCode"
                 :label="scope.row.UserCode"
                 @click="selectCode = scope.row.UserCode"
-              />
+                >{{&nbsp;}}</el-radio
+              >
             </template>
           </el-table-column>
           <el-table-column

VinnoManagementSystem/src/locales/lang/en.js

@@ -73,7 +73,7 @@ export default {
 		authorityNameRequire: "Please input authority name",
 		uniqueCodeRequire: "Please input unique code",
 		frontAuthority: "Front Authority",
-		selectItem: "Please select the menu on the left to operate",
+		selectItem: "Please select the authority on the left to operate",
 		activated: "Activated",
 		uncertified: "Uncertified",
 		waitcertified: "Wait Certified",

VinnoManagementSystem/src/locales/lang/zh-cn.js

@@ -115,7 +115,7 @@ export default {
 		authorityNameRequire: "请输入权限名称",
 		uniqueCodeRequire: "请输入权限唯一码",
 		frontAuthority: "上级权限",
-		selectItem: "请选择左侧菜单后操作",
+		selectItem: "请选择左侧权限后操作",
 		checkIsPass: "请选择是否审核通过",
 		rank: "职称",
 		userHeadImg: "用户头像",

VinnoManagementSystem/src/views/organizationManage/organizationList.vue

@@ -25,13 +25,12 @@
           <el-input
             v-model="search.Keyword"
             clearable
-            style="width: 320px"
             :placeholder="$t('pleaseInput')"
           >
             <template #prepend>
               <el-select
                 v-model="search.QueryType"
-                style="width: 120px"
+                style="min-width: 120px"
                 :placeholder="$t('pleaseChoose')"
                 class="filter-item"
               >
@@ -48,14 +47,13 @@
           <el-select
             v-model="search.State"
             clearable
-            style="width: 200px"
             :placeholder="$t('organization.organizationState')"
             class="filter-item"
           >
             <el-option
               v-for="item in stateTypes"
               :key="item"
-              :label="$t('organization.' + item)"
+              :label="$t('organization.' + item.replace(/^\S/, s => s.toLowerCase()))"
               :value="item"
             />
           </el-select>