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

feat: 优化瑞瀛填报列表搜索与卡片展示

- 将瑞恒、瑞瀛、瑞瀛修三个列表页搜索参数统一为 searchKey
- 优化瑞瀛、瑞瀛修列表卡片内容布局,避免字段标签换行显示
Zimo 14 часов назад
Родитель
Сommit
e33ac1d608
3 измененных файлов с 27 добавлено и 16 удалено
  1. 3 4
      pages/ruihen/index.vue
  2. 12 6
      pages/ruiying/index.vue
  3. 12 6
      pages/ruiyingx/index.vue

+ 3 - 4
pages/ruihen/index.vue

@@ -23,7 +23,7 @@
     color: '#797979',
   });
 
-  const orderName = ref('');
+  const searchKey = ref('');
 
   const paging = ref(null);
   const dataList = ref([]);
@@ -32,8 +32,7 @@
     getRuiHenReportPage({
       pageNo,
       pageSize,
-      ...(orderName.value ? { taskName: orderName.value } : {}),
-      ...(orderName.value ? { contractName: orderName.value } : {}),
+      ...(searchKey.value ? { searchKey: searchKey.value } : {}),
       deptId: getDeptId(),
     })
       .then(res => {
@@ -106,7 +105,7 @@
     <template #top>
       <view class="top">
         <uni-easyinput
-          v-model="orderName"
+          v-model="searchKey"
           :styles="inputStyles"
           :placeholderStyle="placeholderStyle"
           :placeholder="$t('operation.searchText')">

+ 12 - 6
pages/ruiying/index.vue

@@ -24,7 +24,7 @@
     color: '#797979',
   });
 
-  const orderName = ref('');
+  const searchKey = ref('');
 
   const paging = ref(null);
   const dataList = ref([]);
@@ -34,8 +34,7 @@
       pageNo,
       pageSize,
       projectClassification: '1',
-      ...(orderName.value ? { taskName: orderName.value } : {}),
-      ...(orderName.value ? { contractName: orderName.value } : {}),
+      ...(searchKey.value ? { searchKey: searchKey.value } : {}),
       deptId: getDeptId(),
     })
       .then(res => {
@@ -108,7 +107,7 @@
     <template #top>
       <view class="top">
         <uni-easyinput
-          v-model="orderName"
+          v-model="searchKey"
           :styles="inputStyles"
           :placeholderStyle="placeholderStyle"
           :placeholder="$t('operation.searchText')">
@@ -234,19 +233,24 @@
         gap: 6px;
 
         .content-item {
+          display: flex;
+          align-items: flex-start;
           font-size: 14px;
           font-weight: 400;
+          line-height: 24px;
 
           .label {
-            display: inline-block;
+            flex: 0 0 72px;
             font-weight: 500;
-            width: 70px;
+            white-space: nowrap;
           }
 
           .constructionStatus {
+            flex: 0 0 auto;
             font-size: 14px;
             font-weight: 500;
             display: inline-flex;
+            line-height: 20px;
             padding: 5px;
             border-radius: 4px;
             color: #4096ff;
@@ -254,9 +258,11 @@
           }
 
           .auditStatus {
+            flex: 0 0 auto;
             font-size: 14px;
             font-weight: 500;
             display: inline-flex;
+            line-height: 20px;
             padding: 5px;
             border-radius: 4px;
 

+ 12 - 6
pages/ruiyingx/index.vue

@@ -23,7 +23,7 @@
     color: '#797979',
   });
 
-  const orderName = ref('');
+  const searchKey = ref('');
 
   const paging = ref(null);
   const dataList = ref([]);
@@ -32,8 +32,7 @@
     getRuiYingReportPage({
       pageNo,
       pageSize,
-      ...(orderName.value ? { taskName: orderName.value } : {}),
-      ...(orderName.value ? { contractName: orderName.value } : {}),
+      ...(searchKey.value ? { searchKey: searchKey.value } : {}),
       deptId: getDeptId(),
       projectClassification: '2',
     })
@@ -107,7 +106,7 @@
     <template #top>
       <view class="top">
         <uni-easyinput
-          v-model="orderName"
+          v-model="searchKey"
           :styles="inputStyles"
           :placeholderStyle="placeholderStyle"
           :placeholder="$t('operation.searchText')">
@@ -235,19 +234,24 @@
         gap: 6px;
 
         .content-item {
+          display: flex;
+          align-items: flex-start;
           font-size: 14px;
           font-weight: 400;
+          line-height: 24px;
 
           .label {
-            display: inline-block;
+            flex: 0 0 72px;
             font-weight: 500;
-            width: 70px;
+            white-space: nowrap;
           }
 
           .constructionStatus {
+            flex: 0 0 auto;
             font-size: 14px;
             font-weight: 500;
             display: inline-flex;
+            line-height: 20px;
             padding: 5px;
             border-radius: 4px;
             color: #4096ff;
@@ -255,9 +259,11 @@
           }
 
           .auditStatus {
+            flex: 0 0 auto;
             font-size: 14px;
             font-weight: 500;
             display: inline-flex;
+            line-height: 20px;
             padding: 5px;
             border-radius: 4px;