feature/人员工时bug修改

src/views/report/workhourinfo/prodthours/index.vue

@@ -1,14 +1,28 @@
 <template>
   <div class="mainContentBox">
-    <avue-crud ref="crudRef1" v-model:search="data1.search" :data="data1.data" :option="data1.option"
-      v-model:page="data1.page" @row-update="updateRow" @row-del="deleteRow" @search-change="dataList"
-      @search-reset="resetChange" @size-change="dataList" @current-change="dataList"
-      @selection-change="selectionChange">
+    <avue-crud
+      ref="crudRef1"
+      v-model:search="data1.search"
+      :data="data1.data"
+      :option="data1.option"
+      v-model:page="data1.page"
+      @row-save="createRow"
+      @row-update="updateRow"
+      @row-del="deleteRow"
+      @search-change="searchChange"
+      @search-reset="resetChange"
+      @size-change="dataList"
+      @current-change="dataList"
+      @selection-change="selectionChange"
+    >
       <template #header="{ size }">
         <div id="dailystoragecharts"></div>
       </template>
       <template #menu-right="{}">
-        <el-button class="ml-3" @click="exportData('/api/v1/process/census/productWorkHours/export')">
+        <el-button
+          class="ml-3"
+          @click="exportData('/api/v1/process/census/productWorkHours/export')"
+        >
           <template #icon> <i-ep-download /> </template>导出
         </el-button>
       </template>
@@ -94,33 +108,6 @@ data1.value.option = Object.assign(data1.value.option, {
       editDisabled: true,
       hide: true,
     },
-    {
-      label: "工单编码",
-      prop: "workOrderCode",
-      width: 140,
-      overHidden: true,
-      search: true,
-      editDisabled: true,
-      hide: true,
-    },
-    {
-      label: "工序code",
-      prop: "operationCode",
-      width: 140,
-      overHidden: true,
-      search: true,
-      editDisabled: true,
-      hide: true,
-    },
-    {
-      label: "报工人员",
-      prop: "userName",
-      width: 140,
-      overHidden: true,
-      search: true,
-      editDisabled: true,
-      hide: true,
-    },
     //展示
     {
       label: "订单编码",

src/views/report/workhourinfo/sumhours/index.vue

@@ -1,39 +1,89 @@
 <template>
   <div class="mainContentBox">
-    <avue-crud ref="crudRef1" v-model:search="data1.search" :data="data1.data" :option="data1.option"
-      v-model:page="data1.page" @row-save="createRow" @row-update="updateRow" @row-del="deleteRow"
-      @search-change="searchChange" @search-reset="resetChange" @size-change="dataList" @current-change="dataList"
-      @selection-change="selectionChange" @cell-click="ckickCell">
+    <avue-crud
+      ref="crudRef1"
+      v-model:search="data1.search"
+      :data="data1.data"
+      :option="data1.option"
+      v-model:page="data1.page"
+      @row-save="createRow"
+      @row-update="updateRow"
+      @row-del="deleteRow"
+      @search-change="searchChange"
+      @search-reset="resetChange"
+      @size-change="dataList"
+      @current-change="dataList"
+      @selection-change="selectionChange"
+      @cell-click="ckickCell"
+    >
       <template #menu="{ row, index, type }">
-        <el-button @click="ckickCell(row)" icon="el-icon-view" text type="primary">查看</el-button>
+        <el-button
+          @click="ckickCell(row)"
+          icon="el-icon-view"
+          text
+          type="primary"
+          >查看</el-button
+        >
       </template>
       <template #menu-right="{}">
-        <el-button class="ml-3" @click="
-          data1.Utils.exportData(
-            '/api/v1/process/census/peopleWorkHoursTotal/export'
-          )
-          ">
-          <template #icon> <i-ep-download /> </template>导出
-        </el-button>
+        <div style="display: flex">
+          <el-button
+            class="ml-3"
+            @click="
+              data1.Utils.exportData(
+                '/api/v1/process/census/peopleWorkHoursTotal/export'
+              )
+            "
+          >
+            <template #icon> <i-ep-download /> </template>导出
+          </el-button>
+          <el-button
+            class="ml-3"
+            @click="
+              data1.Utils.exportData(
+                '/api/v1/process/census/peopleWorkHoursTotalDetails/export'
+              )
+            "
+          >
+            <template #icon> <i-ep-download /> </template>详情导出
+          </el-button>
+        </div>
       </template>
     </avue-crud>
-    <el-dialog v-model="editDialog.visible" :title="editDialog.title" width="1200px"
-      @close="editDialog.visible = false">
+    <el-dialog
+      v-model="editDialog.visible"
+      :title="editDialog.title"
+      width="1200px"
+      @close="editDialog.visible = false"
+    >
       <div class="mainContentBox">
-        <avue-crud ref="crudRef2" v-model:search="data2.search" :data="data2.data" :option="data2.option"
-          v-model:page="data2.page" @row-update="data2.Methords.updateRow" @row-del="data2.Methords.deleteRow"
-          @search-change="data2.Methords.dataList" @search-reset="data2.Methords.resetChange"
-          @size-change="data2.Methords.dataList" @current-change="data2.Methords.dataList"
-          @selection-change="data2.Methords.selectionChange">
+        <avue-crud
+          ref="crudRef2"
+          v-model:search="data2.search"
+          :data="data2.data"
+          :option="data2.option"
+          v-model:page="data2.page"
+          @row-update="data2.Methords.updateRow"
+          @row-del="data2.Methords.deleteRow"
+          @search-change="data2.Methords.dataList"
+          @search-reset="data2.Methords.resetChange"
+          @size-change="data2.Methords.dataList"
+          @current-change="data2.Methords.dataList"
+          @selection-change="data2.Methords.selectionChange"
+        >
           <template #menu-right="{}">
-            <el-button class="ml-3" @click="
-              data2.Utils.exportData(
-                '/api/v1/process/census/peopleWorkHoursTotalDetails/export'
-              )
-              ">
+            <el-button
+              class="ml-3"
+              @click="
+                data2.Utils.exportData(
+                  '/api/v1/process/census/peopleWorkHoursTotalDetails/export'
+                )
+              "
+            >
               <template #icon> <i-ep-download /> </template>导出
             </el-button>
-          </template></avue-crud>
+          </template></avue-crud
+        >
       </div>
     </el-dialog>
   </div>
@@ -72,6 +122,7 @@ const { selectionChange, multipleDelete } = data1.value.Methords;
 
 const ckickCell = (row) => {
   data2.value.search.userName = row.userName;
+  data2.value.search.searchTime = data1.value.search.searchTime;
   editDialog.value.visible = true;
 };
 // 设置表格列或者其他自定义的option