Merge remote-tracking branch 'origin/dev_天津_阳光印刷' into dev_天津_阳光印刷

云

8 天以前 efdd816c74c5910d20e9133461154116cdd5334c

 src/views/productionManagement/productionCosting/index.vue

@@ -67,7 +67,11 @@
              :tableLoading="tableLoading1"
              style="margin-right: 20px;"
              @pagination="pagination1"
          ></PIMTable>
          >
            <template #personWorkMinutes="{ row }">
              {{ row.personWorkMinutes ?? row.workMinutes ?? '-' }}
            </template>
          </PIMTable>
            </div>
         </el-col>
      </el-row>
@@ -173,6 +177,13 @@
    prop: "workMinutes",
    width: 110,
  },
  {
    label: "人员工时(分钟)",
    prop: "personWorkMinutes",
    width: 120,
    dataType: "slot",
    slot: "personWorkMinutes",
  },
]);

// 左侧汇总台账列（生产人、产量、工资、合格率）