增加上下班时间

src/views/emp/empCalc/index.vue

@@ -157,7 +157,7 @@
 
     <el-table v-loading="loading" :data="empCalcList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
-<!--      <el-table-column label="统计ID" align="center" prop="calcId"/>-->
+      <!--      <el-table-column label="统计ID" align="center" prop="calcId"/>-->
       <el-table-column label="姓名" align="center" prop="empName"/>
       <el-table-column label="时间" align="center" prop="empDate" width="180">
         <template #default="scope">
@@ -168,7 +168,7 @@
       <el-table-column label="机台号" align="center" prop="deviceId"/>
       <el-table-column label="稼动率" align="center" prop="efficiency">
         <template #default="scope">
-          <span>{{ (scope.row.efficiency * 100).toFixed(2) }}%</span>
+          <span>{{ (scope.row.efficiency != null ? (scope.row.efficiency * 100).toFixed(2) : '0.00') }} %</span>
         </template>
       </el-table-column>
       <el-table-column label="规格" align="center" prop="spec"/>
@@ -179,7 +179,7 @@
       <el-table-column label="单价" align="center" prop="price"/>
       <el-table-column label="总价" align="center" prop="totalPrice">
         <template #default="scope">
-          <span>{{ (scope.row.totalPrice).toFixed(2) }}</span>
+          <span>{{ (scope.row.totalPrice != null ? (scope.row.totalPrice).toFixed(2) : '0.00') }}</span>
         </template>
       </el-table-column>
       <!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->

src/views/wkEmp/rota/index.vue

@@ -3,26 +3,26 @@
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="时间" prop="empDate">
         <el-date-picker clearable
-          v-model="queryParams.empDate"
-          type="date"
-          value-format="YYYY-MM-DD"
-          placeholder="请选择时间">
+                        v-model="queryParams.empDate"
+                        type="date"
+                        value-format="YYYY-MM-DD"
+                        placeholder="请选择时间">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="员工号" prop="empId">
         <el-input
-          v-model="queryParams.empId"
-          placeholder="请输入员工号"
-          clearable
-          @keyup.enter="handleQuery"
+            v-model="queryParams.empId"
+            placeholder="请输入员工号"
+            clearable
+            @keyup.enter="handleQuery"
         />
       </el-form-item>
       <el-form-item label="员工姓名" prop="empName">
         <el-input
-          v-model="queryParams.empName"
-          placeholder="请输入员工姓名"
-          clearable
-          @keyup.enter="handleQuery"
+            v-model="queryParams.empName"
+            placeholder="请输入员工姓名"
+            clearable
+            @keyup.enter="handleQuery"
         />
       </el-form-item>
       <el-form-item label="班组" prop="empTeam">
@@ -40,27 +40,38 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
-          type="warning"
-          plain
-          icon="Download"
-          @click="handleExport"
-        >导出</el-button>
+            type="warning"
+            plain
+            icon="Download"
+            @click="handleExport"
+        >导出
+        </el-button>
       </el-col>
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="rotaList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-<!--      <el-table-column label="班次ID" align="center" prop="shiftId" />-->
+      <el-table-column type="selection" width="55" align="center"/>
+      <!--      <el-table-column label="班次ID" align="center" prop="shiftId" />-->
       <el-table-column label="时间" align="center" prop="empDate" width="180">
         <template #default="scope">
           <span>{{ parseTime(scope.row.empDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="员工号" align="center" prop="empId" />
-      <el-table-column label="员工姓名" align="center" prop="empName" />
-      <el-table-column label="班组" align="center" prop="empTeam" />
-      <el-table-column label="机台号" align="center" prop="devices" />
+      <el-table-column label="员工号" align="center" prop="empId"/>
+      <el-table-column label="员工姓名" align="center" prop="empName"/>
+      <el-table-column label="班组" align="center" prop="empTeam"/>
+      <el-table-column label="上班时间" align="center" prop="inTime" width="180">
+        <template  #default="scope">
+          <span>{{ parseTime(scope.row.inTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="下班时间" align="center" prop="outTime" width="180">
+        <template  #default="scope">
+          <span>{{ parseTime(scope.row.outTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="机台号" align="center" prop="devices"/>
       <el-table-column label="创建时间" align="center" prop="createdTime" width="180">
         <template #default="scope">
           <span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
@@ -71,7 +82,7 @@
           <span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
-<!--      <el-table-column label="备注" align="center" prop="remark" />-->
+      <!--      <el-table-column label="备注" align="center" prop="remark" />-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
           <el-button link type="primary" icon="View" @click="handleUpdate(scope.row)">查看</el-button>
@@ -80,11 +91,11 @@
     </el-table>
 
     <pagination
-      v-show="total>0"
-      :total="total"
-      v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
+        v-show="total>0"
+        :total="total"
+        v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize"
+        @pagination="getList"
     />
 
     <!-- 添加或修改经编车间员工排班对话框 -->
@@ -94,22 +105,28 @@
           {{ parseTime(form.empDate, '{y}-{m}-{d}') }}
         </el-form-item>
         <el-form-item label="员工号" prop="empId">
-          {{form.empId}}
+          {{ form.empId }}
         </el-form-item>
         <el-form-item label="员工姓名" prop="empName">
-          {{form.empName}}
+          {{ form.empName }}
         </el-form-item>
         <el-form-item label="班组" prop="empTeam">
-          {{form.empTeam}}
+          {{ form.empTeam }}
+        </el-form-item>
+        <el-form-item label="上班时间">
+          {{ form.inTime }}
+        </el-form-item>
+        <el-form-item label="上班时间">
+          {{ form.outTime }}
         </el-form-item>
         <el-form-item label="机台号" prop="devices">
-          {{form.devices}}
+          {{ form.devices }}
         </el-form-item>
         <el-form-item label="创建时间" prop="createdTime">
-          {{form.createdTime}}
+          {{ form.createdTime }}
         </el-form-item>
         <el-form-item label="更新时间" prop="updatedTime">
-          {{form.updatedTime}}
+          {{ form.updatedTime }}
         </el-form-item>
       </el-form>
       <template #footer>
@@ -122,9 +139,9 @@
 </template>
 
 <script setup name="Rota">
-import { listRota, getRota, delRota, addRota, updateRota } from "@/api/wkEmp/rota";
+import {addRota, delRota, getRota, listRota, updateRota} from "@/api/wkEmp/rota";
 
-const { proxy } = getCurrentInstance();
+const {proxy} = getCurrentInstance();
 
 const rotaList = ref([]);
 const open = ref(false);
@@ -145,6 +162,8 @@ const data = reactive({
     empId: null,
     empName: null,
     empTeam: null,
+    inTime: null,
+    outTime: null,
     devices: null,
     createdBy: null,
     createdTime: null,
@@ -152,11 +171,10 @@ const data = reactive({
     updatedTime: null,
     remark: null
   },
-  rules: {
-  }
+  rules: {}
 });
 
-const { queryParams, form, rules } = toRefs(data);
+const {queryParams, form, rules} = toRefs(data);
 
 /** 查询经编车间员工排班列表 */
 function getList() {
@@ -182,6 +200,8 @@ function reset() {
     empId: null,
     empName: null,
     empTeam: null,
+    inTime: null,
+    outTime: null,
     devices: null,
     createdBy: null,
     createdTime: null,
@@ -253,12 +273,13 @@ function submitForm() {
 /** 删除按钮操作 */
 function handleDelete(row) {
   const _shiftIds = row.shiftId || ids.value;
-  proxy.$modal.confirm('是否确认删除经编车间员工排班编号为"' + _shiftIds + '"的数据项？').then(function() {
+  proxy.$modal.confirm('是否确认删除经编车间员工排班编号为"' + _shiftIds + '"的数据项？').then(function () {
     return delRota(_shiftIds);
   }).then(() => {
     getList();
     proxy.$modal.msgSuccess("删除成功");
-  }).catch(() => {});
+  }).catch(() => {
+  });
 }
 
 /** 导出按钮操作 */