瀏覽代碼

fix(seizeData,dailyRunData): 修正表格和表单的文案与计算逻辑

1. 为 seizedData 页面的合计列添加自定义计算渲染,正确显示T1+T2总数
2. 将 dailyRunData 页面的"道口"统一改为"国内道口"和"国际道口",同步修改表单label、占位符和校验提示文案
huoyi 1 月之前
父節點
當前提交
8f6898361d
共有 2 個文件被更改,包括 15 次插入11 次删除
  1. 10 10
      src/views/runData/dailyRunData/index.vue
  2. 5 1
      src/views/runData/seizeData/index.vue

+ 10 - 10
src/views/runData/dailyRunData/index.vue

@@ -53,11 +53,11 @@
53
       <el-table-column label="一楼" align="center" prop="floor1CenterStaff" />
53
       <el-table-column label="一楼" align="center" prop="floor1CenterStaff" />
54
       <el-table-column label="负一楼" align="center" prop="floorB1WestStaff" />
54
       <el-table-column label="负一楼" align="center" prop="floorB1WestStaff" />
55
       <el-table-column label="国内货站" align="center" prop="domesticCargo" />
55
       <el-table-column label="国内货站" align="center" prop="domesticCargo" />
56
-      <el-table-column label="道口" align="center" prop="domesticGate" />
56
+      <el-table-column label="国内道口" align="center" prop="domesticGate" />
57
       <el-table-column label="南侧车检" align="center" prop="southVehicleCheck" />
57
       <el-table-column label="南侧车检" align="center" prop="southVehicleCheck" />
58
       <el-table-column label="防爆" align="center" prop="domesticBomb" />
58
       <el-table-column label="防爆" align="center" prop="domesticBomb" />
59
       <el-table-column label="国际货站" align="center" prop="intlCargo" />
59
       <el-table-column label="国际货站" align="center" prop="intlCargo" />
60
-      <el-table-column label="道口" align="center" prop="intlGate" />
60
+      <el-table-column label="国际道口" align="center" prop="intlGate" />
61
       <el-table-column label="北侧车检" align="center" prop="northVehicleCheck" />
61
       <el-table-column label="北侧车检" align="center" prop="northVehicleCheck" />
62
       <el-table-column label="防爆" align="center" prop="intlBomb" />
62
       <el-table-column label="防爆" align="center" prop="intlBomb" />
63
       <el-table-column label="操作" width="180px" align="center" class-name="small-padding fixed-width">
63
       <el-table-column label="操作" width="180px" align="center" class-name="small-padding fixed-width">
@@ -134,8 +134,8 @@
134
             <el-form-item label="国内货站" prop="domesticCargo">
134
             <el-form-item label="国内货站" prop="domesticCargo">
135
               <el-input-number :precision="0" v-model="form.domesticCargo" :min="0" placeholder="请输入国内货站数据" style="width: 100%" />
135
               <el-input-number :precision="0" v-model="form.domesticCargo" :min="0" placeholder="请输入国内货站数据" style="width: 100%" />
136
             </el-form-item>
136
             </el-form-item>
137
-            <el-form-item label="道口" prop="domesticGate">
138
-              <el-input-number :precision="0" v-model="form.domesticGate" :min="0" placeholder="请输入道口数据" style="width: 100%" />
137
+            <el-form-item label="国内道口" prop="domesticGate">
138
+              <el-input-number :precision="0" v-model="form.domesticGate" :min="0" placeholder="请输入国内道口数据" style="width: 100%" />
139
             </el-form-item>
139
             </el-form-item>
140
             <el-form-item label="南侧车检" prop="southVehicleCheck">
140
             <el-form-item label="南侧车检" prop="southVehicleCheck">
141
               <el-input-number :precision="0" v-model="form.southVehicleCheck" :min="0" placeholder="请输入南侧车检数据"
141
               <el-input-number :precision="0" v-model="form.southVehicleCheck" :min="0" placeholder="请输入南侧车检数据"
@@ -147,8 +147,8 @@
147
             <el-form-item label="国际货站" prop="intlCargo">
147
             <el-form-item label="国际货站" prop="intlCargo">
148
               <el-input-number :precision="0" v-model="form.intlCargo" :min="0" placeholder="请输入国际货站数据" style="width: 100%" />
148
               <el-input-number :precision="0" v-model="form.intlCargo" :min="0" placeholder="请输入国际货站数据" style="width: 100%" />
149
             </el-form-item>
149
             </el-form-item>
150
-            <el-form-item label="道口" prop="intlGate">
151
-              <el-input-number :precision="0" v-model="form.intlGate" :min="0" placeholder="请输入道口数据" style="width: 100%" />
150
+            <el-form-item label="国际道口" prop="intlGate">
151
+              <el-input-number :precision="0" v-model="form.intlGate" :min="0" placeholder="请输入国际道口数据" style="width: 100%" />
152
             </el-form-item>
152
             </el-form-item>
153
             <el-form-item label="北侧车检" prop="northVehicleCheck">
153
             <el-form-item label="北侧车检" prop="northVehicleCheck">
154
               <el-input-number :precision="0" v-model="form.northVehicleCheck" :min="0" placeholder="请输入北侧车检数据"
154
               <el-input-number :precision="0" v-model="form.northVehicleCheck" :min="0" placeholder="请输入北侧车检数据"
@@ -301,8 +301,8 @@ const data = reactive({
301
       { type: "integer", message: "国内货站数据必须为整数", trigger: "blur" }
301
       { type: "integer", message: "国内货站数据必须为整数", trigger: "blur" }
302
     ],
302
     ],
303
     domesticGate: [
303
     domesticGate: [
304
-      { required: true, message: "道口数据不能为空", trigger: "blur" },
305
-      { type: "integer", message: "道口数据必须为整数", trigger: "blur" }
304
+      { required: true, message: "国内道口数据不能为空", trigger: "blur" },
305
+      { type: "integer", message: "国内道口数据必须为整数", trigger: "blur" }
306
     ],
306
     ],
307
     southVehicleCheck: [
307
     southVehicleCheck: [
308
       { required: true, message: "南侧车检数据不能为空", trigger: "blur" },
308
       { required: true, message: "南侧车检数据不能为空", trigger: "blur" },
@@ -317,8 +317,8 @@ const data = reactive({
317
       { type: "integer", message: "国际货站数据必须为整数", trigger: "blur" }
317
       { type: "integer", message: "国际货站数据必须为整数", trigger: "blur" }
318
     ],
318
     ],
319
     intlGate: [
319
     intlGate: [
320
-      { required: true, message: "道口数据不能为空", trigger: "blur" },
321
-      { type: "integer", message: "道口数据必须为整数", trigger: "blur" }
320
+      { required: true, message: "国际道口数据不能为空", trigger: "blur" },
321
+      { type: "integer", message: "国际道口数据必须为整数", trigger: "blur" }
322
     ],
322
     ],
323
     northVehicleCheck: [
323
     northVehicleCheck: [
324
       { required: true, message: "北侧车检数据不能为空", trigger: "blur" },
324
       { required: true, message: "北侧车检数据不能为空", trigger: "blur" },

+ 5 - 1
src/views/runData/seizeData/index.vue

@@ -81,7 +81,11 @@
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" />
84
+      <el-table-column label="T1总数+T2总数" align="center" prop="total" >
85
+        <template #default="scope">
86
+          {{ scope.row.t1Total + scope.row.t2Total }}
87
+        </template>
88
+      </el-table-column>
85
       
89
       
86
       <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width" fixed="right">  
90
       <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width" fixed="right">  
87
         <template #default="scope">
91
         <template #default="scope">