Przeglądaj źródła

refactor(seizeData): 统一字段命名为grandTotal

调整了班次选择的字典键名、表格列、表单字段的命名,将total统一改为grandTotal,保持代码命名一致性
huoyi 1 miesiąc temu
rodzic
commit
c153fa8396
1 zmienionych plików z 8 dodań i 10 usunięć
  1. 8 10
      src/views/runData/seizeData/index.vue

+ 8 - 10
src/views/runData/seizeData/index.vue

@@ -8,7 +8,7 @@
8
       </el-form-item>
8
       </el-form-item>
9
       <el-form-item label="班次" prop="shift">
9
       <el-form-item label="班次" prop="shift">
10
         <el-select v-model="queryParams.shift" placeholder="请选择班次" clearable style="width: 200px">
10
         <el-select v-model="queryParams.shift" placeholder="请选择班次" clearable style="width: 200px">
11
-          <el-option v-for="item in shiftOptions" :key="item.value" :label="item.label" :value="item.value" />
11
+          <el-option v-for="item in shiftOptions" :key="item.value" :label="item.label" :value="item.label" />
12
         </el-select>
12
         </el-select>
13
       </el-form-item>
13
       </el-form-item>
14
       <el-form-item label="当班大队" prop="brigade">
14
       <el-form-item label="当班大队" prop="brigade">
@@ -81,10 +81,8 @@
81
       <el-table-column label="T2其他" align="center" prop="t2Other" />
81
       <el-table-column label="T2其他" align="center" prop="t2Other" />
82
       <el-table-column label="T2总数" align="center" prop="t2Total" />
82
       <el-table-column label="T2总数" align="center" prop="t2Total" />
83
       
83
       
84
-      <el-table-column label="T1总数+T2总数" align="center" prop="total" >
85
-        <template #default="scope">
86
-          {{ scope.row.t1Total + scope.row.t2Total }}
87
-        </template>
84
+      <el-table-column label="T1总数+T2总数" align="center" prop="grandTotal" >
85
+        
88
       </el-table-column>
86
       </el-table-column>
89
       
87
       
90
       <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width" fixed="right">  
88
       <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width" fixed="right">  
@@ -233,8 +231,8 @@
233
             </el-form-item>
231
             </el-form-item>
234
           </el-col>
232
           </el-col>
235
           <el-col :span="8">
233
           <el-col :span="8">
236
-            <el-form-item label="T1总数+T2总数" prop="total">
237
-              <el-input v-model="form.total" placeholder="自动计算" readonly style="width: 100%" />
234
+            <el-form-item label="T1总数+T2总数" prop="grandTotal">
235
+              <el-input v-model="form.grandTotal" placeholder="自动计算" readonly style="width: 100%" />
238
             </el-form-item>
236
             </el-form-item>
239
           </el-col>
237
           </el-col>
240
         </el-row>
238
         </el-row>
@@ -280,7 +278,7 @@ import { listDept } from '@/api/system/dept'
280
 import { getToken } from '@/utils/auth'
278
 import { getToken } from '@/utils/auth'
281
 
279
 
282
 const { proxy } = getCurrentInstance()
280
 const { proxy } = getCurrentInstance()
283
-const { base_shift } = proxy.useDict('base_shift')
281
+const { shift } = proxy.useDict('shift')
284
 
282
 
285
 const seizeDataList = ref([])
283
 const seizeDataList = ref([])
286
 const open = ref(false)
284
 const open = ref(false)
@@ -293,7 +291,7 @@ const total = ref(0)
293
 const title = ref("")
291
 const title = ref("")
294
 
292
 
295
 // 班次字典
293
 // 班次字典
296
-const shiftOptions = base_shift
294
+const shiftOptions = shift
297
 
295
 
298
 // 大队选项
296
 // 大队选项
299
 const brigadeOptions = ref([])
297
 const brigadeOptions = ref([])
@@ -488,7 +486,7 @@ function reset() {
488
     t2Illegal: null,
486
     t2Illegal: null,
489
     t2Other: null,
487
     t2Other: null,
490
     t2Total: null,
488
     t2Total: null,
491
-    total: null
489
+    grandTotal: null
492
   }
490
   }
493
   proxy.resetForm("seizeDataRef")
491
   proxy.resetForm("seizeDataRef")
494
 }
492
 }