Преглед на файлове

✨ feat(瑞都日报): 添加非生产时效

Zimo преди 1 ден
родител
ревизия
26e59567d4
променени са 3 файла, в които са добавени 39 реда и са изтрити 4 реда
  1. 16 2
      src/views/pms/iotrddailyreport/fillDailyReport.vue
  2. 15 2
      src/views/pms/iotrddailyreport/index.vue
  3. 8 0
      src/views/pms/iotrddailyreport/statistics.vue

+ 16 - 2
src/views/pms/iotrddailyreport/fillDailyReport.vue

@@ -139,13 +139,27 @@
           <el-table-column label="施工队伍" align="center" prop="deptName" />
           <el-table-column label="项目" align="center" prop="contractName" />
           <el-table-column label="任务" align="center" prop="taskName" />
-          <el-table-column label="非生产时间" align="center" prop="nonProductFlag">
+          <el-table-column label="非生产时间" align="center" prop="nonProductFlag" :min-width="80">
             <template #default="scope">
-              <el-tag :type="scope.row.nonProductFlag ? 'success' : 'danger'">
+              <el-tag
+                :type="
+                  scope.row.nonProductFlag || scope.row.processInstanceId === '2'
+                    ? 'success'
+                    : 'danger'
+                "
+              >
                 {{ scope.row.nonProductFlag ? '已填写' : '未填写' }}
               </el-tag>
             </template>
           </el-table-column>
+          <el-table-column
+            label="非生产时效"
+            align="center"
+            prop="nonProductionRate"
+            :min-width="80"
+            resizable
+            :formatter="(row) => (Number(row.nonProductionRate ?? 0) * 100).toFixed(2) + '%'"
+          />
           <el-table-column label="带班干部" align="center" prop="responsiblePersonNames" />
           <el-table-column label="填报人" align="center" prop="submitterNames" />
           <!--

+ 15 - 2
src/views/pms/iotrddailyreport/index.vue

@@ -225,12 +225,25 @@
           />
           <el-table-column label="非生产时间" align="center" prop="nonProductFlag" :min-width="80">
             <template #default="scope">
-              <el-tag :type="scope.row.nonProductFlag ? 'success' : 'danger'">
+              <el-tag
+                :type="
+                  scope.row.nonProductFlag || scope.row.processInstanceId === '2'
+                    ? 'success'
+                    : 'danger'
+                "
+              >
                 {{ scope.row.nonProductFlag ? '已填写' : '未填写' }}
               </el-tag>
             </template>
           </el-table-column>
-
+          <el-table-column
+            label="非生产时效"
+            align="center"
+            prop="nonProductionRate"
+            :min-width="80"
+            resizable
+            :formatter="(row) => (Number(row.nonProductionRate ?? 0) * 100).toFixed(2) + '%'"
+          />
           <el-table-column
             label="项目"
             align="center"

+ 8 - 0
src/views/pms/iotrddailyreport/statistics.vue

@@ -158,6 +158,14 @@
               </template>
             </el-table-column>
           </el-table-column>
+          <el-table-column
+            label="非生产时效"
+            align="center"
+            prop="nonProductionRate"
+            :min-width="80"
+            resizable
+            :formatter="(row) => (Number(row.nonProductionRate ?? 0) * 100).toFixed(2) + '%'"
+          />
           <el-table-column
             label="甲方"
             align="center"