Просмотр исходного кода

修复中英文切换任务管理

pm 1 месяц назад
Родитель
Сommit
cdd4bcc157

+ 4 - 4
src/components/MyTask.tsx

@@ -1894,22 +1894,22 @@ export default function MyTask() {
           <div className="flex flex-wrap items-center gap-2 lg:gap-3 min-w-0">
             {/* 搜索条件:按原宽度 200px,不超出,可缩小 */}
             <div className="flex items-center gap-2 lg:gap-3 w-[200px] min-w-[100px] flex-shrink">
-              <span className="text-sm font-medium text-gray-700 whitespace-nowrap flex-shrink-0">作业编号:</span>
+              <span className="text-sm font-medium text-gray-700 whitespace-nowrap flex-shrink-0">{t('form.workOrderNo')}:</span>
               <Input
                 value={searchOrderNo}
                 onChange={(e) => setSearchOrderNo(e.target.value)}
-                placeholder="请输入作业编号"
+                placeholder={t('form.workOrderNoPlaceholder')}
                 allowClear
                 className="min-w-0 w-full"
                 onPressEnter={handleSearch}
               />
             </div>
             <div className="flex items-center gap-2 lg:gap-3 w-[200px] min-w-[100px] flex-shrink">
-              <span className="text-sm font-medium text-gray-700 whitespace-nowrap flex-shrink-0">作业名称:</span>
+              <span className="text-sm font-medium text-gray-700 whitespace-nowrap flex-shrink-0">{t('form.workName')}:</span>
               <Input
                 value={searchName}
                 onChange={(e) => setSearchName(e.target.value)}
-                placeholder="请输入作业名称"
+                placeholder={t('form.workNamePlaceholder')}
                 allowClear
                 className="min-w-0 w-full"
                 onPressEnter={handleSearch}

+ 10 - 11
src/components/TaskManagement.tsx

@@ -1994,40 +1994,39 @@ export default function TaskManagement() {
       <div className="bg-white rounded-2xl border border-gray-200/50 shadow-sm overflow-hidden">
         {/* 查询与操作栏 */}
         <div className="p-4 lg:p-5 border-b border-gray-200/50">
-          <div className="flex flex-wrap gap-2 lg:gap-3 items-center min-w-0">
-            {/* 搜索条件:按原宽度 200px,不超出,可缩小 */}
-            <div className="flex items-center gap-2 lg:gap-3 w-[200px] min-w-[100px] flex-shrink">
-              <span className="text-sm font-medium text-gray-700 whitespace-nowrap flex-shrink-0">作业编号:</span>
+          <div className="flex flex-wrap items-center gap-2 lg:gap-3 min-w-0">
+            {/* 搜索条件:放宽到 280px,可缩小但不挤压不可见 */}
+            <div className="flex items-center gap-2 lg:gap-3 w-[280px] min-w-[180px] flex-shrink">
+              <span className="text-sm font-medium text-gray-700 whitespace-nowrap flex-shrink-0">{t('form.workOrderNo')}:</span>
               <Input
                 value={searchOrderNo}
                 onChange={(e) => setSearchOrderNo(e.target.value)}
-                placeholder="请输入作业编号"
+                placeholder={t('form.workOrderNoPlaceholder')}
                 allowClear
                 className="min-w-0 w-full"
                 onPressEnter={handleSearch}
               />
             </div>
-            <div className="flex items-center gap-2 lg:gap-3 w-[200px] min-w-[100px] flex-shrink">
-              <span className="text-sm font-medium text-gray-700 whitespace-nowrap flex-shrink-0">作业名称:</span>
+            <div className="flex items-center gap-2 lg:gap-3 w-[280px] min-w-[180px] flex-shrink">
+              <span className="text-sm font-medium text-gray-700 whitespace-nowrap flex-shrink-0">{t('form.workName')}:</span>
               <Input
                 value={searchName}
                 onChange={(e) => setSearchName(e.target.value)}
-                placeholder="请输入作业名称"
+                placeholder={t('form.workNamePlaceholder')}
                 allowClear
                 className="min-w-0 w-full"
                 onPressEnter={handleSearch}
               />
             </div>
 
-            {/* 按钮组:小屏整行,大屏右对齐 */}
-            <div className="flex gap-2 w-full sm:w-auto sm:ml-auto justify-start sm:justify-end">
+            <Space size="small">
               <Button type="primary" icon={<Search className="w-4 h-4" />} onClick={handleSearch}>
                 {t('common.search')}
               </Button>
               <Button icon={<RotateCcw className="w-4 h-4" />} onClick={handleReset}>
                 {t('common.reset')}
               </Button>
-            </div>
+            </Space>
           </div>
         </div>
 

+ 8 - 2
src/components/UserManagement.tsx

@@ -516,9 +516,15 @@ export default function UserManagement({ subMenu }: UserManagementProps) {
           background-color: #52c41a !important;
         }
       `}</style>
-      <div className="flex gap-6 h-full">
+      <div className="flex flex-row gap-6 h-full min-w-0">
       {/* 左侧岗位树 */}
-      <div className="w-80 flex-shrink-0">
+      <div
+
+
+
+        className="flex-shrink min-w-[200px] max-w-[280px]"
+        style={{ flexBasis: 'clamp(200px, 18vw, 280px)' }}
+      >
         <div className="bg-white rounded-2xl border border-gray-200/50 shadow-sm h-full overflow-hidden flex flex-col">
           <DeptTree onNodeClick={handleDeptNodeClick} />
         </div>

+ 1 - 0
src/locales/en.json

@@ -783,6 +783,7 @@
     "viewDetail": "View Detail",
     "workDetail": "Work Detail",
     "workOrderNo": "Work Order No",
+    "workOrderNoPlaceholder": "Please enter work order number",
     "workResponsible": "Work Responsible",
     "taskResponsible": "Task Responsible",
     "initiationTime": "Initiation Time",

+ 1 - 0
src/locales/zh.json

@@ -785,6 +785,7 @@
     "viewDetail": "查看详情",
     "workDetail": "作业详情",
     "workOrderNo": "作业编号",
+    "workOrderNoPlaceholder": "请输入作业编号",
     "workResponsible": "作业发起人",
     "taskResponsible": "任务负责人",
     "initiationTime": "发起时间",