From 55bfb7e8b8d6f8b26796547a67376171e36cac5f Mon Sep 17 00:00:00 2001
From: zhangdi <1104545947@qq.com>
Date: Mon, 30 Mar 2026 19:41:37 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=AE=A1=E7=90=86=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workReportingManagement.js                |   4 +-
 src/views/authority/role.vue                  |  31 +-
 .../processMainte/reworkProcessPlanning.vue   |   2 -
 src/views/processManagement/sinTer/index.vue  |   4 +-
 .../processManagement/taskProcessing.vue      |  25 +-
 .../productionManagement/js/wordReporting.js  | 173 --------
 .../components/wordReporting.vue              | 414 ++++++++++++++++++
 .../components/workReportingLog.vue           | 275 ++++++++++++
 .../workReportingManagement/index.vue         | 231 ++--------
 9 files changed, 753 insertions(+), 406 deletions(-)
 delete mode 100644 src/views/productionManagement/js/wordReporting.js
 create mode 100644 src/views/productionManagement/workReportingManagement/components/wordReporting.vue
 create mode 100644 src/views/productionManagement/workReportingManagement/components/workReportingLog.vue

diff --git a/src/api/productionManagement/workReportingManagement.js b/src/api/productionManagement/workReportingManagement.js
index 8248a93..e935108 100644
--- a/src/api/productionManagement/workReportingManagement.js
+++ b/src/api/productionManagement/workReportingManagement.js
@@ -41,11 +41,11 @@ export const getDataByWpId = (params) => {
 };
 
 //报工调整-保存
-export const uploadPlan = (params) => {
+export const uploadPlan = (data) => {
   return request({
     url: '/blade-desk/disTasking/uploadPlan',
     method: 'post',
-    params
+    data:data
   });
 };
 
diff --git a/src/views/authority/role.vue b/src/views/authority/role.vue
index 4aa79c2..78241f6 100644
--- a/src/views/authority/role.vue
+++ b/src/views/authority/role.vue
@@ -92,7 +92,7 @@ export default {
         searchMenuSpan: 6,
         tree: true,
         border: true,
-        index: true,
+        index: false,
         selection: true,
         viewBtn: true,
         labelWidth: 120,
@@ -168,21 +168,20 @@ export default {
           //     },
           //   ],
           // },
-          // {
-          //   label: '角色别名',
-          //   labelTip: '用于权限校验与标注的属性,可手动录入也可点击现有别名快速录入',
-          //   prop: 'roleAlias',
-          //   search: true,
-          //   hide: true,
-          //   span: 24,
-          //   rules: [
-          //     {
-          //       required: true,
-          //       message: '请输入角色别名',
-          //       trigger: 'blur',
-          //     },
-          //   ],
-          // },
+          {
+            label: '角色别名',
+            labelTip: '用于权限校验与标注的属性,可手动录入也可点击现有别名快速录入',
+            prop: 'roleAlias',
+            search: true,
+            span: 24,
+            rules: [
+              {
+                required: true,
+                message: '请输入角色别名',
+                trigger: 'blur',
+              },
+            ],
+          },
           // {
           //   label: '现有别名',
           //   labelTip: '当前系统已存在的角色别名,点击可快速录入',
diff --git a/src/views/processManagement/components/processMainte/reworkProcessPlanning.vue b/src/views/processManagement/components/processMainte/reworkProcessPlanning.vue
index 8df7763..a10d867 100644
--- a/src/views/processManagement/components/processMainte/reworkProcessPlanning.vue
+++ b/src/views/processManagement/components/processMainte/reworkProcessPlanning.vue
@@ -1195,7 +1195,6 @@ export default {
           processMoldToolVOList: this.treeNodes.moldToolList || [],
         });
       }
-      console.log(newArr, this.treeNodes, 'newArr');
       let query_ = {
         craft: this.treeNodes.rawData, //工艺信息
         reworkProcessVOList: newArr,
@@ -1204,7 +1203,6 @@ export default {
         processMeasuringToolDeleteIds: this.form3.deleteIds, //量具删除id
         processMoldToolDeleteIds: this.form4.deleteIds, //工装删除合集
       };
-      console.log(999999, query_);
       reworkAuthorizedAccomplish(query_).then(res => {
         this.$message.success('保存成功');
         this.craftLoading = false;
diff --git a/src/views/processManagement/sinTer/index.vue b/src/views/processManagement/sinTer/index.vue
index 72f2191..1040d2b 100644
--- a/src/views/processManagement/sinTer/index.vue
+++ b/src/views/processManagement/sinTer/index.vue
@@ -265,9 +265,9 @@ export default {
               // 动态计算节点大小
               symbolSize: (val, params) => {
                 const nodeData = params?.data || params;
-                const nodeName = nodeData?.name || '未知节点';
+                const nodeName = nodeData?.name || '工序';
                 const nodePartCode = nodeData?.partCode || '';
-                const nodeQuota = nodeData?.quota !== undefined ? nodeData.quota : '';
+                const nodeQuota = nodeData.quota ? nodeData.quota : '';
 
                 // 计算文本宽度
                 const nameWidth = this.getTextWidth(nodeName);
diff --git a/src/views/processManagement/taskProcessing.vue b/src/views/processManagement/taskProcessing.vue
index 9ecabf3..67c229f 100644
--- a/src/views/processManagement/taskProcessing.vue
+++ b/src/views/processManagement/taskProcessing.vue
@@ -334,9 +334,19 @@ export default {
               },
             ],
           },
+          // {
+          //   label: '分派人',
+          //   prop: 'assignMan',
+          //   sortable: true,
+          //   search: false,
+          //   overHidden: true,
+          //   width: 120,
+          //   headerAlign: 'center',
+          //   align: 'center',
+          // },
           {
-            label: '分派人',
-            prop: 'assignMan',
+            label: '处理人',
+            prop: 'craftMan',
             sortable: true,
             search: false,
             overHidden: true,
@@ -354,16 +364,7 @@ export default {
             headerAlign: 'center',
             align: 'center',
           },
-          // {
-          //   label: '接收人',
-          //   prop: 'craftMan',
-          //   sortable: true,
-          //   search: false,
-          //   overHidden: true,
-          //   width: 120,
-          //   headerAlign: 'center',
-          //   align: 'center',
-          // },
+          
           // {
           //   label: '接收时间',
           //   prop: 'receptionTime',
diff --git a/src/views/productionManagement/js/wordReporting.js b/src/views/productionManagement/js/wordReporting.js
deleted file mode 100644
index e37db29..0000000
--- a/src/views/productionManagement/js/wordReporting.js
+++ /dev/null
@@ -1,173 +0,0 @@
-export default {
-    'workReporting': [
-        {
-            label: '车间订单',
-            prop: 'woCode',
-            span: 24,
-            overflow: true,
-            search: false,
-           
-        },
-        {
-            label: '流程卡号',
-            prop: 'cardNo',
-            span: 24,
-            overflow: true,
-            search: false,
-           
-        },
-        {
-            label: '零件号',
-            prop: 'partCode',
-            span: 24,
-            overflow: true,
-            search: false,
-           
-        },
-        {
-            label: '批次号',
-            prop: 'batchNo',
-            span: 24,
-            overflow: true,
-            search: false,
-           
-        },
-        {
-            label: '当前工序',
-            prop: 'ppsName',
-            span: 24,
-            overflow: true,
-            search: false,
-           
-        },
-        {
-            label: '数量',
-            prop: 'workQty',
-            span: 24,
-            overflow: true,
-            search: false,
-          
-        },
-        {
-            label: '班组',
-            prop: 'tsId',
-            span: 24,
-            overflow: true,
-            search: false,
-            // cell:true,
-        },
-        {
-            label: '现接收人',
-            prop: 'userName',
-            span: 24,
-            overflow: true,
-            search: false,
-            // cell: true,
-        },
-        {
-            label: '报工人详情',
-            prop: 'detail',
-            span: 24,
-            overflow: true,
-            search: false,
-        },
-    ],
-    'workReportingLog': [
-        {
-            label: '车间订单',
-            prop: 'woCode',
-            span: 24,
-            overflow: true,
-            search: false,
-
-        },
-        {
-            label: '流程卡号',
-            prop: 'cardNo',
-            span: 24,
-            overflow: true,
-            search: false,
-
-        },
-        {
-            label: '零件号',
-            prop: 'partCode',
-            span: 24,
-            overflow: true,
-            search: false,
-
-        },
-        {
-            label: '批次号',
-            prop: 'batchNo',
-            span: 24,
-            overflow: true,
-            search: false,
-
-        },
-        {
-            label: '当前工序',
-            prop: 'ppsName',
-            span: 24,
-            overflow: true,
-            search: false,
-
-        },
-        {
-            label: '数量',
-            prop: 'workQty',
-            span: 24,
-            overflow: true,
-            search: false,
-
-        },
-        {
-            label: '原班组',
-            prop: 'oriMakeTeam',
-            span: 24,
-            overflow: true,
-            search: false,
-
-        },
-        {
-            label: '现班组',
-            prop: 'makeTeam',
-            span: 24,
-            overflow: true,
-            search: false,
-
-        },
-        {
-            label: '原接收人',
-            prop: 'oriReceiveMan',
-            span: 24,
-            overflow: true,
-            search: false,
-
-        },
-        {
-            label: '现接收人',
-            prop: 'receiveMan',
-            span: 24,
-            overflow: true,
-            search: false,
-
-        },
-        {
-            label: '调整人',
-            prop: 'adjustName',
-            span: 24,
-            overflow: true,
-            search: false,
-
-        },
-        {
-            label: '调整时间',
-            prop: 'updateTime',
-            span: 24,
-            overflow: true,
-            search: false,
-
-        },
-    ]
-}
\ No newline at end of file
diff --git a/src/views/productionManagement/workReportingManagement/components/wordReporting.vue b/src/views/productionManagement/workReportingManagement/components/wordReporting.vue
new file mode 100644
index 0000000..3c13c89
--- /dev/null
+++ b/src/views/productionManagement/workReportingManagement/components/wordReporting.vue
@@ -0,0 +1,414 @@
+<template>
+  <div>
+    <avue-crud
+      :option="option"
+      :table-loading="loading"
+      :data="data"
+      v-model="form"
+      v-model:page="page"
+      ref="crud"
+      @row-del="rowDel"
+      @search-change="searchChange"
+      @search-reset="searchReset"
+      @selection-change="selectionChange"
+      @current-change="currentChange"
+      @size-change="sizeChange"
+      @refresh-change="refreshChange"
+      @on-load="onLoad"
+    >
+      <template #menu-left>
+        <el-form :inline="true" v-model="searchForm">
+          <el-form-item>
+            <el-input
+              v-model="searchForm.cardNo"
+              placeholder="请扫描流程卡号"
+              @keyup.enter="handleSearchInput"
+              @keydown.enter.prevent
+            ></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button
+              type="primary"
+              @click="saveUpdate"
+              :loading="saveLoading"
+              :disabled="data.length <= 0"
+              >保存</el-button
+            >
+            <el-button
+              type="primary"
+              @click="changeTeam"
+              :loading="saveLoading"
+              :disabled="data.length <= 0"
+              >转班</el-button
+            >
+          </el-form-item>
+        </el-form>
+      </template>
+      <template #menu-right> </template>
+      <template #menu="{ row }"> </template>
+      <template #detail="{ row }">
+        <el-button type="text" @click="handleDetail(row)">详情</el-button>
+      </template>
+
+      <template #heatTreat="scope"> </template>
+    </avue-crud>
+
+    <!-- 详情 -->
+    <el-dialog append-to-body title="详情" v-model="detailDialog">
+      <!-- <div style="display: flex; justify-content: flex-end">
+        <el-button type="primary">保存</el-button>
+      </div> -->
+      <el-table :data="tableData" style="margin-top: 20px">
+        <el-table-column label="数量" prop="workQty"></el-table-column>
+        <el-table-column label="报工时间" prop="makeTime"></el-table-column>
+        <el-table-column label="报工人" prop="worker"> </el-table-column>
+      </el-table>
+    </el-dialog>
+    <!-- 转班 -->
+    <el-dialog append-to-body title="转班" v-model="teamDialog">
+      <el-form ref="teamForm" :model="teamForm" :rules="teamRules">
+        <el-form-item> 旧班组:{{ data[0].prWorkOrder.makeTeam.tsName }} </el-form-item>
+        <el-form-item label="新班组" prop="makeTeam">
+          <el-select v-model="teamForm.makeTeam">
+            <el-option
+              v-for="(item, index) in teamSetList"
+              :key="index"
+              :label="item.tsName"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="teamDialog = false">取 消</el-button>
+          <el-button type="primary" @click="submit" :loading="saveLoading">确 定</el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { getTeamSetList } from '@/api/processManagement/taskProcessing';
+import { getRoleUserList } from '@/api/processManagement/taskDispatch';
+import {
+  getList,
+  getRecordList,
+  getDataByCardNo,
+  getDataByWpId,
+  uploadPlan,
+} from '@/api/productionManagement/workReportingManagement';
+export default {
+  components: {},
+  data() {
+    return {
+      form: {},
+      selectionList: [],
+      query: {},
+      loading: false,
+      page: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0,
+      },
+      option: {
+        columnSort: true,
+        tip: false,
+        height: 'auto',
+        align: 'center',
+        calcHeight: 32,
+        simplePage: false,
+        searchShow: true,
+        searchMenuSpan: 6,
+        searchIcon: true,
+        searchIndex: 3,
+        tree: false,
+        border: true,
+        index: true,
+        selection: false,
+        viewBtn: false,
+        delBtn: false,
+        editBtn: false,
+        addBtnIcon: ' ',
+        viewBtnIcon: ' ',
+        delBtnIcon: ' ',
+        editBtnIcon: ' ',
+        addBtn: false,
+        labelWidth: 120,
+        searchLabelWidth: 120,
+        menu: true,
+        menuWidth: 200,
+        dialogWidth: 600,
+        dialogClickModal: false,
+        searchEnter: true,
+        excelBtn: true,
+        gridBtn: false,
+        searchShowBtn: false,
+        showOverflowTooltip: true,
+        searchLabelPosition: 'left',
+        searchGutter: 24,
+        searchSpan: 6,
+        menuAlign: 'left',
+        gridBtn: false,
+        searchMenuPosition: 'right',
+        menu: false,
+        column: [
+          {
+            label: '车间订单',
+            prop: 'woCode',
+            span: 24,
+            overflow: true,
+            search: false,
+          },
+          {
+            label: '流程卡号',
+            prop: 'cardNo',
+            span: 24,
+            overflow: true,
+            search: false,
+          },
+          {
+            label: '零件号',
+            prop: 'partCode',
+            span: 24,
+            overflow: true,
+            search: false,
+          },
+          {
+            label: '批次号',
+            prop: 'batchNo',
+            span: 24,
+            overflow: true,
+            search: false,
+          },
+          {
+            label: '当前工序',
+            prop: 'ppsName',
+            span: 24,
+            overflow: true,
+            search: false,
+          },
+          {
+            label: '数量',
+            prop: 'workQty',
+            span: 24,
+            overflow: true,
+            search: false,
+          },
+          {
+            label: '班组',
+            prop: 'tsId',
+            span: 24,
+            overflow: true,
+            search: false,
+            cell: true,
+            type: 'select',
+            dicUrl: '/blade-desk/BA/TeamSet/listForSelect',
+            props: {
+              label: 'tsName',
+              value: 'id',
+            },
+          },
+          {
+            label: '现接收人',
+            prop: 'userName',
+            span: 24,
+            overflow: true,
+            search: false,
+            // cell: true,
+          },
+          {
+            label: '报工人详情',
+            prop: 'detail',
+            span: 24,
+            overflow: true,
+            search: false,
+          },
+        ],
+      },
+
+      data: [],
+      searchForm: {
+        cardNo: '',
+      },
+      saveLoading:false,
+      detailDialog: false,
+      teamDialog: false,
+      teamForm: {},
+      teamRules: {
+        makeTeam: [{ required: true, message: '请选择新班组', trigger: 'blur' }],
+      },
+    };
+  },
+  mounted() {
+    this.getTeamSetList();
+    this.getRoleUserList();
+  },
+  methods: {
+    // 获取人员
+    getRoleUserList() {
+      getRoleUserList({ current: 1, size: 9999999 }).then(res => {
+        this.userOptions = res.data.data.records;
+      });
+    },
+    // 报工人详情
+    handleDetail(row) {
+      this.detailDialog = true;
+      getDataByWpId({ wpId: row.wpId }).then(res => {
+        this.detailData = res.data.data;
+      });
+    },
+    // 转班
+    changeTeam() {
+      this.teamDialog = true;
+    },
+    // 转班保存
+    submit() {
+      this.$refs.teamForm.validate(valid => {
+        if (valid) {
+          this.saveLoading = true;
+          shiftTransfer({
+            woId: this.woId,
+            oldTsId: this.teamForm.tsId,
+            newTsId: this.teamForm.tsId,
+          })
+            .then(res => {
+              this.saveLoading = false;
+              this.teamDialog = false;
+            })
+            .catch(err => {
+              this.teamDialog = false;
+              this.saveLoading = false;
+            });
+        }
+      });
+    },
+    // 保存
+    saveUpdate() {
+      this.saveLoading = true;
+      uploadPlan(this.data)
+        .then(res => {
+          this.saveLoading = false;
+        })
+        .catch(err => {
+          this.saveLoading = false;
+        });
+    },
+    // 扫描流程卡号 获取数据
+    handleSearchInput(key, value) {
+      this.loading = true;
+      getDataByCardNo({ cardNo: this.searchForm.cardNo })
+        .then(res => {
+          this.loading = false;
+          this.data = res.data.data;
+          this.data.forEach(item => {
+            item.$cellEdit = true;
+            item.tsId = item.tsId + '';
+            item.userId = item.userId + '';
+          });
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
+    rowSave(row, done, loading) {
+      // addPersonAbility(row).then(
+      //   () => {
+      //     this.onLoad(this.page);
+      //     this.$message({
+      //       type: 'success',
+      //       message: '操作成功!',
+      //     });
+      //     done();
+      //   },
+      //   error => {
+      //     window.console.log(error);
+      //     loading();
+      //   }
+      // );
+    },
+    rowUpdate(row, index, done, loading) {
+      // updatePersonAbility(row).then(
+      //   () => {
+      //     this.onLoad(this.page);
+      //     this.$message({
+      //       type: 'success',
+      //       message: '操作成功!',
+      //     });
+      //     done();
+      //   },
+      //   error => {
+      //     window.console.log(error);
+      //     loading();
+      //   }
+      // );
+    },
+    rowDel(row) {
+      this.$confirm('确定将选择数据删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          // return removePersonAbility(row.id);
+        })
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
+          });
+        });
+    },
+
+    searchReset() {
+      this.query = {};
+      this.onLoad(this.page);
+    },
+    searchChange(params, done) {
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    selectionChange(list) {
+      this.selectionList = list;
+    },
+    selectionClear() {
+      this.selectionList = [];
+      this.$refs.crud.toggleSelection();
+    },
+
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.query);
+    },
+    handleChange(file, fileList) {
+      // proxy.$Export.xlsx(file.raw).then((data) => {
+      //     data.value = data.results;
+      // });
+      this.$message({
+        type: 'success',
+        message: '操作成功!',
+      });
+    },
+
+    onLoad(page, params = {}) {
+      // this.loading = true;
+      // getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+      //   this.data = res.data.data.records;
+      //   this.loading = false;
+      //   this.page.total = res.data.data.total;
+      //   this.selectionClear();
+      // });
+    },
+  },
+};
+</script>
+d
\ No newline at end of file
diff --git a/src/views/productionManagement/workReportingManagement/components/workReportingLog.vue b/src/views/productionManagement/workReportingManagement/components/workReportingLog.vue
new file mode 100644
index 0000000..2b1ec24
--- /dev/null
+++ b/src/views/productionManagement/workReportingManagement/components/workReportingLog.vue
@@ -0,0 +1,275 @@
+<template>
+  <div>
+    <avue-crud
+      :option="option"
+      :table-loading="loading"
+      :data="data"
+      v-model="form"
+      v-model:page="page"
+      ref="crud"
+      @row-del="rowDel"
+      @search-change="searchChange"
+      @search-reset="searchReset"
+      @selection-change="selectionChange"
+      @current-change="currentChange"
+      @size-change="sizeChange"
+      @refresh-change="refreshChange"
+      @on-load="onLoad"
+    >
+      <template #menu-left> </template>
+      <template #menu-right> </template>
+      <template #menu="{ row }"> </template>
+
+      <template #heatTreat="scope"> </template>
+    </avue-crud>
+  </div>
+</template>
+
+<script>
+
+export default {
+  components: {},
+  data() {
+    return {
+      form: {},
+      selectionList: [],
+      query: {},
+      loading: false,
+      page: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0,
+      },
+      option: {
+        columnSort: true,
+        tip: false,
+        height: 'auto',
+        align: 'center',
+        calcHeight: 32,
+        simplePage: false,
+        searchShow: true,
+        searchMenuSpan: 6,
+        searchIcon: true,
+        searchIndex: 3,
+        tree: false,
+        border: true,
+        index: true,
+        selection: false,
+        viewBtn: false,
+        delBtn: false,
+        editBtn: false,
+        addBtnIcon: ' ',
+        viewBtnIcon: ' ',
+        delBtnIcon: ' ',
+        editBtnIcon: ' ',
+        addBtn: false,
+        labelWidth: 120,
+        searchLabelWidth: 120,
+        menu: true,
+        menuWidth: 200,
+        dialogWidth: 600,
+        dialogClickModal: false,
+        searchEnter: true,
+        excelBtn: true,
+        gridBtn: false,
+        searchShowBtn: false,
+        showOverflowTooltip: true,
+        searchLabelPosition: 'left',
+        searchGutter: 24,
+        searchSpan: 6,
+        menuAlign: 'left',
+        gridBtn: false,
+        searchMenuPosition: 'right',
+        column: [
+          {
+            label: '车间订单',
+            prop: 'woCode',
+            span: 24,
+            overflow: true,
+            search: false,
+          },
+          {
+            label: '流程卡号',
+            prop: 'cardNo',
+            span: 24,
+            overflow: true,
+            search: false,
+          },
+          {
+            label: '零件号',
+            prop: 'partCode',
+            span: 24,
+            overflow: true,
+            search: false,
+          },
+          {
+            label: '批次号',
+            prop: 'batchNo',
+            span: 24,
+            overflow: true,
+            search: false,
+          },
+          {
+            label: '当前工序',
+            prop: 'ppsName',
+            span: 24,
+            overflow: true,
+            search: false,
+          },
+          {
+            label: '数量',
+            prop: 'workQty',
+            span: 24,
+            overflow: true,
+            search: false,
+          },
+          {
+            label: '原班组',
+            prop: 'oriMakeTeam',
+            span: 24,
+            overflow: true,
+            search: false,
+          },
+          {
+            label: '现班组',
+            prop: 'makeTeam',
+            span: 24,
+            overflow: true,
+            search: false,
+          },
+          {
+            label: '原接收人',
+            prop: 'oriReceiveMan',
+            span: 24,
+            overflow: true,
+            search: false,
+          },
+          {
+            label: '现接收人',
+            prop: 'receiveMan',
+            span: 24,
+            overflow: true,
+            search: false,
+          },
+          {
+            label: '调整人',
+            prop: 'adjustName',
+            span: 24,
+            overflow: true,
+            search: false,
+          },
+          {
+            label: '调整时间',
+            prop: 'updateTime',
+            span: 24,
+            overflow: true,
+            search: false,
+          },
+        ],
+      },
+
+      data: [],
+    };
+  },
+  methods: {
+    rowSave(row, done, loading) {
+      // addPersonAbility(row).then(
+      //   () => {
+      //     this.onLoad(this.page);
+      //     this.$message({
+      //       type: 'success',
+      //       message: '操作成功!',
+      //     });
+      //     done();
+      //   },
+      //   error => {
+      //     window.console.log(error);
+      //     loading();
+      //   }
+      // );
+    },
+    rowUpdate(row, index, done, loading) {
+      // updatePersonAbility(row).then(
+      //   () => {
+      //     this.onLoad(this.page);
+      //     this.$message({
+      //       type: 'success',
+      //       message: '操作成功!',
+      //     });
+      //     done();
+      //   },
+      //   error => {
+      //     window.console.log(error);
+      //     loading();
+      //   }
+      // );
+    },
+    rowDel(row) {
+      this.$confirm('确定将选择数据删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          // return removePersonAbility(row.id);
+        })
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
+          });
+        });
+    },
+
+    searchReset() {
+      this.query = {};
+      this.onLoad(this.page);
+    },
+    searchChange(params, done) {
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    selectionChange(list) {
+      this.selectionList = list;
+    },
+    selectionClear() {
+      this.selectionList = [];
+      this.$refs.crud.toggleSelection();
+    },
+
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.query);
+    },
+    handleChange(file, fileList) {
+      // proxy.$Export.xlsx(file.raw).then((data) => {
+      //     data.value = data.results;
+      // });
+      this.$message({
+        type: 'success',
+        message: '操作成功!',
+      });
+    },
+
+    onLoad(page, params = {}) {
+      // this.loading = true;
+      // getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+      //   this.data = res.data.data.records;
+      //   this.loading = false;
+      //   this.page.total = res.data.data.total;
+      //   this.selectionClear();
+      // });
+    },
+  },
+  mounted() {},
+};
+</script>
+d
\ No newline at end of file
diff --git a/src/views/productionManagement/workReportingManagement/index.vue b/src/views/productionManagement/workReportingManagement/index.vue
index 514b749..c32b022 100644
--- a/src/views/productionManagement/workReportingManagement/index.vue
+++ b/src/views/productionManagement/workReportingManagement/index.vue
@@ -1,120 +1,21 @@
 <template>
   <basic-container>
     <!-- 报工管理 -->
-    <el-tabs v-model="tabPosition" class="demo-tabs" @tab-change="tabPositionChange">
+    <el-tabs v-model="tabPosition" class="demo-tabs">
       <el-tab-pane label="报工调整" name="workReporting"></el-tab-pane>
       <el-tab-pane label="报工调整记录" name="workReportingLog"></el-tab-pane>
     </el-tabs>
 
-    <avue-crud
-      :option="option"
-      :table-loading="loading"
-      :data="data"
-      v-model="form"
-      v-model:page="page"
-      ref="crud"
-      @search-change="searchChange"
-      @search-reset="searchReset"
-      @selection-change="selectionChange"
-      @current-change="currentChange"
-      @size-change="sizeChange"
-      @refresh-change="refreshChange"
-      @on-load="onLoad"
-    >
-      <template #menu-left v-if="tabPosition == 'workReporting'">
-        <el-form :inline="true" v-model="searchForm">
-          <el-form-item>
-            <el-input
-              v-model="searchForm.cardNo"
-              placeholder="请扫描流程卡号"
-              @keyup.enter="handleSearchInput"
-              @keydown.enter.prevent
-            ></el-input>
-          </el-form-item>
-          <el-form-item>
-            <el-button
-              type="primary"
-              @click="saveUpdate"
-              :loading="saveLoading"
-              :disabled="data.length <= 0"
-              >保存</el-button
-            >
-            <el-button
-              type="primary"
-              @click="changeTeam"
-              :loading="saveLoading"
-              :disabled="data.length <= 0"
-              >转班</el-button
-            >
-          </el-form-item>
-        </el-form>
-      </template>
+    <!-- 报工调整 -->
+    <wordReporting v-if="tabPosition == 'workReporting'"></wordReporting>
 
-      <template #detail="{ row }" v-if="tabPosition == 'workReporting'">
-        <el-button type="text" @click="handleDetail(row)">详情</el-button>
-      </template>
-      <!-- 班组 -->
-      <template #tsId="{ row }" v-if="tabPosition == 'workReporting'">
-        <el-select v-model="teamForm.makeTeam">
-          <el-option
-            v-for="(item, index) in teamSetList"
-            :label="item.tsName"
-            :value="item.id"
-          ></el-option>
-        </el-select>
-      </template>
-      <!-- 接收人 -->
-      <template #tsId="{ row }" v-if="tabPosition == 'workReporting'">
-        <el-select v-model="row.userId" placeholder="请选择" clearable filterable>
-          <el-option
-            v-for="item in userOptions"
-            :key="item.id"
-            :label="item.realName"
-            :value="item.id"
-          >
-          </el-option>
-        </el-select>
-      </template>
-    </avue-crud>
-
-    <!-- 详情 -->
-    <el-dialog append-to-body title="详情" v-model="detailDialog">
-      <div style="display: flex; justify-content: flex-end">
-        <el-button type="primary">保存</el-button>
-      </div>
-      <el-table :data="tableData" style="margin-top: 20px">
-        <el-table-column label="数量" prop="workQty"></el-table-column>
-        <el-table-column label="报工时间" prop="makeTime"></el-table-column>
-        <el-table-column label="报工人" prop="worker"> </el-table-column>
-      </el-table>
-    </el-dialog>
-    <!-- 转班 -->
-    <el-dialog append-to-body title="转班" v-model="teamDialog">
-      <el-form ref="teamForm" :model="teamForm" :rules="teamRules">
-        <el-form-item> 旧班组:{{ data[0].prWorkOrder.makeTeam.tsName }} </el-form-item>
-        <el-form-item label="新班组" prop="makeTeam">
-          <el-select v-model="teamForm.makeTeam">
-            <el-option
-              v-for="(item, index) in teamSetList"
-              :label="item.tsName"
-              :value="item.id"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-      </el-form>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="teamDialog = false">取 消</el-button>
-          <el-button type="primary" @click="submit" :loading="saveLoading">确 定</el-button>
-        </span>
-      </template>
-    </el-dialog>
+    <!-- 报工调整记录 -->
+    <workReportingLog v-if="tabPosition == 'workReportingLog'"></workReportingLog>
+    
   </basic-container>
 </template>
 
 <script>
-import wordReporting from '../js/wordReporting';
-import workReportingData from '../js/workReportingData';
 import { getTeamSetList } from '@/api/processManagement/taskProcessing';
 import { getRoleUserList } from '@/api/processManagement/taskDispatch';
 
@@ -125,10 +26,14 @@ import {
   getDataByWpId,
   uploadPlan,
 } from '@/api/productionManagement/workReportingManagement';
+import wordReporting from './components/wordReporting.vue';
+import workReportingLog from './components/workReportingLog.vue';
 
 export default {
+  components: { wordReporting, workReportingLog },
   data() {
     return {
+      tableData: [],
       saveLoading: false,
       tabPosition: 'workReporting',
       loading: false,
@@ -148,80 +53,45 @@ export default {
         currentPage: 1,
         total: 0,
       },
-      option: {
-        columnSort: true,
-        tip: false,
-        height: 'auto',
-        align: 'center',
-        calcHeight: 32,
-        simplePage: false,
-        searchShow: true,
-        searchMenuSpan: 6,
-        searchIcon: true,
-        searchIndex: 3,
-        tree: false,
-        border: true,
-        index: true,
-        selection: false,
-        viewBtn: false,
-        delBtn: false,
-        editBtn: false,
-        addBtnIcon: ' ',
-        viewBtnIcon: ' ',
-        delBtnIcon: ' ',
-        editBtnIcon: ' ',
-        addBtn: false,
-        labelWidth: 120,
-        searchLabelWidth: 120,
-        menu: true,
-        menuWidth: 200,
-        dialogWidth: 600,
-        dialogClickModal: false,
-        searchEnter: true,
-        excelBtn: true,
-        gridBtn: false,
-        searchShowBtn: false,
-        showOverflowTooltip: true,
-        searchLabelPosition: 'left',
-        searchGutter: 24,
-        searchSpan: 6,
-        menuAlign: 'left',
-        gridBtn: false,
-        searchMenuPosition: 'right',
-        column: [],
-      },
-      teamSetList: [], //班组列表
-      userOptions: [], //接收人列表
     };
   },
   mounted() {
-    this.option.menu = false;
-    this.option.column = wordReporting[this.tabPosition];
-    this.getTeamSetList();
-    this.getRoleUserList();
+    // this.option.menu = false;
+    // this.option.column = wordReporting[this.tabPosition];
+    // this.getTeamSetList();
+    // this.getRoleUserList();
   },
   methods: {
     // 获取人员
     getRoleUserList() {
       getRoleUserList({ current: 1, size: 9999999 }).then(res => {
         this.userOptions = res.data.data.records;
+        if (this.tabPosition == 'workReporting') {
+          this.option.column[6].dicData = res.data.data;
+        }
       });
     },
     // 获取班组列表
     getTeamSetList() {
       getTeamSetList().then(res => {
-        this.teamSetList = res.data.data;
+        // this.teamSetList = res.data.data;
+        if (this.tabPosition == 'workReporting') {
+          this.option.column[6].dicData = res.data.data;
+          console.log(this.option.column[6], res.data.data);
+        }
       });
     },
     // 扫描流程卡号 获取数据
     handleSearchInput(key, value) {
-      this.loading= true
-      getDataByCardNo({ cardNo: this.searchForm.cardNo }).then(res => {
-         this.loading= false
-        this.data = res.data.data.record;
-      }).catch(() => {
-        this.loading= false
-      });
+      this.loading = true;
+      getDataByCardNo({ cardNo: this.searchForm.cardNo })
+        .then(res => {
+          this.loading = false;
+          this.data = res.data.data;
+        })
+        .catch(() => {
+          this.loading = false;
+        });
     },
     // 保存
     saveUpdate() {
@@ -235,44 +105,7 @@ export default {
           this.saveLoading = false;
         });
     },
-    // tab切换
-    tabPositionChange() {
-      this.option.column = wordReporting[this.tabPosition];
-      this.onLoad(this.page, this.query);
-      // this.page.total = this.data.length;
-    },
-    // 报工人详情
-    handleDetail(row) {
-      this.detailDialog = true;
-      getDataByWpId({ wpId: row.wpId }).then(res => {
-        // this.detailData = res.data.data
-      });
-    },
-    // 转班
-    changeTeam() {
-      this.teamDialog = true;
-    },
-    // 转班保存
-    submit() {
-      this.$refs.teamForm.validate(valid => {
-        if (valid) {
-          this.saveLoading = true;
-          shiftTransfer({
-            woId: this.woId,
-            oldTsId: this.teamForm.tsId,
-            newTsId: this.teamForm.tsId,
-          })
-            .then(res => {
-              this.saveLoading = false;
-              this.teamDialog = false;
-            })
-            .catch(err => {
-              this.teamDialog = false;
-              this.saveLoading = false;
-            });
-        }
-      });
-    },
+
     selectionChange() {},
     currentChange(currentPage) {
       this.page.currentPage = currentPage;