From edcddcb61b5ad146130ffffff55d08272e6d4608 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A3=B7=E5=8F=B6?=
 <14103883+leaf-phos@user.noreply.gitee.com>
Date: Thu, 31 Oct 2024 17:59:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E6=8F=90=E4=BA=A4=EF=BC=88?=
 =?UTF-8?q?=E4=B8=80=E5=8D=8A=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/yh/prodOrder.js                       |  54 ++
 src/assets/styles/index.scss                  |  39 ++
 .../Business/Dept/DeptTreeSelect.vue          |  13 +-
 src/components/FormCol/index.vue              |  16 +-
 src/router/index.js                           |  13 +
 src/utils/constants.js                        |   6 +
 src/views/tool/k3/FieldConverter.vue          |  47 ++
 src/views/tool/k3/index.vue                   |  18 +
 src/views/yh/prodOrder/index.vue              | 497 ++++++++++++++++++
 src/views/yh/report/components/EditIncome.vue | 235 ---------
 src/views/yh/report/components/EditOrder.vue  | 105 ----
 src/views/yh/report/components/EditPrice.vue  | 224 --------
 .../report/components/ReportProductEdit.vue   | 435 +++++++++++++++
 .../components/UserProductBatchDialog.vue     | 133 +++++
 src/views/yh/report/edit.vue                  |  79 ++-
 src/views/yh/report/index.vue                 | 155 ++----
 16 files changed, 1334 insertions(+), 735 deletions(-)
 create mode 100644 src/api/yh/prodOrder.js
 create mode 100644 src/views/tool/k3/FieldConverter.vue
 create mode 100644 src/views/tool/k3/index.vue
 create mode 100644 src/views/yh/prodOrder/index.vue
 delete mode 100644 src/views/yh/report/components/EditIncome.vue
 delete mode 100644 src/views/yh/report/components/EditOrder.vue
 delete mode 100644 src/views/yh/report/components/EditPrice.vue
 create mode 100644 src/views/yh/report/components/ReportProductEdit.vue
 create mode 100644 src/views/yh/report/components/UserProductBatchDialog.vue

diff --git a/src/api/yh/prodOrder.js b/src/api/yh/prodOrder.js
new file mode 100644
index 0000000..dcd81bb
--- /dev/null
+++ b/src/api/yh/prodOrder.js
@@ -0,0 +1,54 @@
+import request from '@/utils/request'
+
+// 查询生产订单列表
+export function listProdOrder(query) {
+  return request({
+    url: '/yh/prodOrder/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询生产订单详细
+export function getProdOrder(id) {
+  return request({
+    url: '/yh/prodOrder/' + id,
+    method: 'get'
+  })
+}
+
+// 新增生产订单
+export function addProdOrder(data) {
+  return request({
+    url: '/yh/prodOrder',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改生产订单
+export function updateProdOrder(data) {
+  return request({
+    url: '/yh/prodOrder',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除生产订单
+export function delProdOrder(id) {
+  return request({
+    url: '/yh/prodOrder/' + id,
+    method: 'delete'
+  })
+}
+
+// 同步生产订单
+export function syncProdOrder() {
+  return request({
+    url: '/yh/prodOrder/sync',
+    method: 'put'
+  })
+}
+
+
diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index 2675571..94c9ae4 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -195,3 +195,42 @@ aside {
   justify-content: right;
   align-items: center;
 }
+
+.required-label::before {
+  content: "*";
+  color: #F56C6C;
+}
+
+// mini版本的树选择器
+.mini-tree-select {
+  /*TreeSelect 样式*/
+  .el-input__inner,
+  .vue-treeselect__input,
+  .vue-treeselect__placeholder,
+  .vue-treeselect__single-value,
+  .popper__arrow::after,
+  .vue-treeselect__value-container{
+    height: 26px;
+    line-height: 26px;
+  }
+  .vue-treeselect__control {
+    height:28px;
+  }
+}
+
+// small版本的树选择器
+.small-tree-select {
+  /*TreeSelect 样式*/
+  .el-input__inner,
+  .vue-treeselect__input,
+  .vue-treeselect__placeholder,
+  .vue-treeselect__single-value,
+  .popper__arrow::after,
+  .vue-treeselect__value-container{
+    height: 30px;
+    line-height: 30px;
+  }
+  .vue-treeselect__control {
+    height:32px;
+  }
+}
diff --git a/src/components/Business/Dept/DeptTreeSelect.vue b/src/components/Business/Dept/DeptTreeSelect.vue
index 5ea5ec8..48825bf 100644
--- a/src/components/Business/Dept/DeptTreeSelect.vue
+++ b/src/components/Business/Dept/DeptTreeSelect.vue
@@ -7,7 +7,6 @@
     :disabled="disabled"
     @select="onSelect"
     :style="{
-      height: height,
       width: width
     }"
   />
@@ -35,13 +34,9 @@ export default {
       type: Boolean,
       default: false
     },
-    height: {
-      type: String,
-      default: '32px'
-    },
     width: {
       type: String,
-      default: '100%'
+      default: '215px'
     }
   },
   data() {
@@ -89,9 +84,3 @@ export default {
 }
 
 </script>
-
-<style lang="scss">
-.vue-treeselect__input-container {
-  height: 34px !important;
-}
-</style>
diff --git a/src/components/FormCol/index.vue b/src/components/FormCol/index.vue
index 2543509..9b5f8c8 100644
--- a/src/components/FormCol/index.vue
+++ b/src/components/FormCol/index.vue
@@ -1,6 +1,6 @@
 <template>
   <el-col :span="span">
-    <el-form-item :label="label" :prop="prop" :label-width="labelWidth">
+    <el-form-item :label="label" :prop="prop" :label-width="labelWidth" :rules="rules" :class="table ? 'table-form-item' : ''">
       <slot></slot>
     </el-form-item>
   </el-col>
@@ -25,7 +25,21 @@ export default {
     labelWidth: {
       type: String,
       default: null
+    },
+    rules: {
+      type: Array,
+      default: null
+    },
+    table: {
+      type: Boolean,
+      default: false
     }
   }
 }
 </script>
+
+<style scoped lang="scss">
+.table-form-item {
+  margin: 0 0 12px;
+}
+</style>
diff --git a/src/router/index.js b/src/router/index.js
index 8c3f412..c65a194 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -106,6 +106,19 @@ export const constantRoutes = [
         meta: { title: '个人中心', icon: 'user' }
       }
     ]
+  },
+  {
+    path: '/util',
+    component: Layout,
+    redirect: 'noredirect',
+    children: [
+      {
+        path: 'k3',
+        component: () => import('@/views/tool/k3/index.vue'),
+        name: 'K3',
+        meta: { title: '金蝶工具', icon: 'tool' }
+      }
+    ]
   }
 ]
 
diff --git a/src/utils/constants.js b/src/utils/constants.js
index 93a5cd0..12b80ce 100644
--- a/src/utils/constants.js
+++ b/src/utils/constants.js
@@ -33,3 +33,9 @@ export const PriceStatus = {
     return [this.PASS].includes(status);
   }
 }
+
+// 工资模式
+export const IncomeMode = {
+  SCORE: "1", // 计分
+  COUNT: "2", // 计量
+}
diff --git a/src/views/tool/k3/FieldConverter.vue b/src/views/tool/k3/FieldConverter.vue
new file mode 100644
index 0000000..cdb1113
--- /dev/null
+++ b/src/views/tool/k3/FieldConverter.vue
@@ -0,0 +1,47 @@
+<template>
+  <div>
+    <el-input type="textarea" v-model="data" rows="5" placeholder="输入源数据"/>
+    <el-button @click="parse">转换主表</el-button>
+    <el-input type="textarea" v-model="staticProp" rows="20" placeholder="主表字段数据"/>
+    <el-input type="textarea" v-model="enums" rows="20" placeholder="主表字段数据"/>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "FieldConverter",
+  data() {
+    return {
+      data: '',
+      staticProp: '',
+      enums: ''
+    }
+  },
+  methods: {
+    parse() {
+      let staticProp = ''
+      let enums = ''
+      let json = JSON.parse(this.data)
+      json.Result.NeedReturnData.Entrys.forEach(entry => {
+        entry.Fields.forEach(item => {
+          staticProp += `public static final String ${this.getFieldName(item.Key)} = "${item.Key}"; // ${item.Name[0].Value} \n`;
+          enums += `${this.getFieldName(item.Key)}("${item.Key}", "${item.Name[0].Value}", ),\n`;
+        })
+        staticProp += "\n\n"
+        enums += "\n\n"
+      })
+      this.staticProp = staticProp;
+      this.enums = enums;
+    },
+    getFieldName(field) {
+      // 转为下划线大写常量类型，中间下划线，前后无需下划线，连续大写无需下划线
+      return field
+        .replace(/([a-z])([A-Z])/g, '$1_$2') // 在小写字母和大写字母之间插入下划线
+        .replace(/([A-Z]+)([A-Z][a-z])/g, '$1_$2') // 在连续大写字母和后续小写字母之间插入下划线
+        .replace(/^_/, '') // 去除字符串开头的下划线
+        .replace(/_$/, '') // 去除字符串结尾的下划线
+        .toUpperCase(); // 转换为大写
+    }
+  }
+}
+</script>
diff --git a/src/views/tool/k3/index.vue b/src/views/tool/k3/index.vue
new file mode 100644
index 0000000..7ba8a70
--- /dev/null
+++ b/src/views/tool/k3/index.vue
@@ -0,0 +1,18 @@
+<template>
+  <div class="app-container">
+    <el-tabs>
+      <el-tab-pane label="字段转换">
+        <field-converter/>
+      </el-tab-pane>
+    </el-tabs>
+
+  </div>
+</template>
+<script>
+import FieldConverter from "@/views/tool/k3/FieldConverter.vue";
+
+export default {
+  name: "K3",
+  components: {FieldConverter},
+}
+</script>
diff --git a/src/views/yh/prodOrder/index.vue b/src/views/yh/prodOrder/index.vue
new file mode 100644
index 0000000..023b84e
--- /dev/null
+++ b/src/views/yh/prodOrder/index.vue
@@ -0,0 +1,497 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="单据编号" prop="billNo">
+        <el-input
+          v-model="queryParams.billNo"
+          placeholder="请输入单据编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="规格型号" prop="spec">
+        <el-input
+          v-model="queryParams.spec"
+          placeholder="请输入规格型号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="生产车间" prop="deptId">
+        <dept-tree-select v-model="queryParams.deptId" class="small-tree-select"/>
+      </el-form-item>
+      <el-form-item label="单位" prop="unit">
+        <el-input
+          v-model="queryParams.unit"
+          placeholder="请输入单位"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="批号" prop="batchNo">
+        <el-input
+          v-model="queryParams.batchNo"
+          placeholder="请输入批号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="下达时间" prop="releaseTime">
+        <el-date-picker clearable
+          v-model="queryParams.releaseTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择下达时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="源单编号" prop="sourceNo">
+        <el-input
+          v-model="queryParams.sourceNo"
+          placeholder="请输入源单编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="需求单据" prop="demandBill">
+        <el-input
+          v-model="queryParams.demandBill"
+          placeholder="请输入需求单据"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="计划跟踪号" prop="planTrackNo" label-width="6em">
+        <el-input
+          v-model="queryParams.planTrackNo"
+          placeholder="请输入计划跟踪号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="物料编码" prop="materialNo">
+        <el-input
+          v-model="queryParams.materialNo"
+          placeholder="请输入物料编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-has-permi="['yh:prodOrder:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-has-permi="['yh:prodOrder:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-has-permi="['yh:prodOrder:export']"
+        >导出</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          icon="el-icon-refresh"
+          size="mini"
+          @click="handleSync"
+          v-has-permi="['yh:prodOrder:sync']"
+        >同步</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="prodOrderList" @selection-change="handleSelectionChange" :default-sort="defaultSort"  @sort-change="onSortChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <template v-for="column of showColumns">
+        <el-table-column
+            :key="column.key"
+            :label="column.label"
+            :prop="column.key"
+            :align="column.align"
+            :min-width="column.minWidth"
+            :sort-orders="orderSorts"
+            :sortable="column.sortable"
+            :show-overflow-tooltip="column.overflow"
+            :width="column.width"
+        >
+          <template slot-scope="d">
+            <template v-if="column.key === 'id'">
+              {{d.row[column.key]}}
+            </template>
+            <template v-else-if="column.key === 'bizStatus'">
+              <dict-tag :value="d.row[column.key]" :options="dict.type.prod_order_biz_status"/>
+            </template>
+            <template v-else>
+              {{d.row[column.key]}}
+            </template>
+          </template>
+        </el-table-column>
+      </template>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-has-permi="['yh:prodOrder:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-has-permi="['yh:prodOrder:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改生产订单对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-row>
+          <form-col :span="span"  label="单据编号" prop="billNo">
+            <el-input v-model="form.billNo" placeholder="请输入单据编号" />
+          </form-col>
+          <form-col :span="span"  label="单据日期" prop="billDate">
+            <el-date-picker clearable
+              v-model="form.billDate"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="请选择单据日期">
+            </el-date-picker>
+          </form-col>
+          <form-col :span="span"  label="规格型号" prop="spec">
+            <el-input v-model="form.spec" placeholder="请输入规格型号" />
+          </form-col>
+          <form-col :span="span"  label="生产车间ID" prop="deptId">
+            <el-input v-model="form.deptId" placeholder="请输入生产车间ID" />
+          </form-col>
+          <form-col :span="span"  label="单位" prop="unit">
+            <el-input v-model="form.unit" placeholder="请输入单位" />
+          </form-col>
+          <form-col :span="span"  label="数量" prop="num">
+            <el-input v-model="form.num" placeholder="请输入数量" />
+          </form-col>
+          <form-col :span="span"  label="批号" prop="batchNo">
+            <el-input v-model="form.batchNo" placeholder="请输入批号" />
+          </form-col>
+          <form-col :span="span"  label="备注" prop="remark">
+            <el-input v-model="form.remark" placeholder="请输入备注" />
+          </form-col>
+          <form-col :span="span"  label="下达时间" prop="releaseTime">
+            <el-date-picker clearable
+              v-model="form.releaseTime"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="请选择下达时间">
+            </el-date-picker>
+          </form-col>
+          <form-col :span="span"  label="源单编号" prop="sourceNo">
+            <el-input v-model="form.sourceNo" placeholder="请输入源单编号" />
+          </form-col>
+          <form-col :span="span"  label="需求单据" prop="demandBill">
+            <el-input v-model="form.demandBill" placeholder="请输入需求单据" />
+          </form-col>
+          <form-col :span="span"  label="辅助属性(json)" prop="auxProp">
+            <el-input v-model="form.auxProp" placeholder="请输入辅助属性(json)" />
+          </form-col>
+          <form-col :span="span"  label="计划跟踪号" prop="planTrackNo">
+            <el-input v-model="form.planTrackNo" placeholder="请输入计划跟踪号" />
+          </form-col>
+          <form-col :span="span"  label="物料编码" prop="materialNo">
+            <el-input v-model="form.materialNo" placeholder="请输入物料编码" />
+          </form-col>
+          <form-col :span="span"  label="合格品入库数量" prop="quaStore">
+            <el-input v-model="form.quaStore" placeholder="请输入合格品入库数量" />
+          </form-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  listProdOrder,
+  getProdOrder,
+  delProdOrder,
+  addProdOrder,
+  updateProdOrder,
+  syncProdOrder
+} from "@/api/yh/prodOrder";
+import { $showColumns } from '@/utils/mixins';
+import FormCol from "@/components/FormCol/index.vue";
+import DeptTreeSelect from "@/components/Business/Dept/DeptTreeSelect.vue";
+
+// 默认排序字段
+const defaultSort = {
+  prop: "createTime",
+  order: "descending"
+}
+
+export default {
+  name: "ProdOrder",
+  mixins: [$showColumns],
+  dicts: ['prod_order_biz_status'],
+  components: {DeptTreeSelect, FormCol},
+  data() {
+    return {
+      span: 24,
+      // 字段列表
+      columns: [
+        {key: 'id', visible: false, label: '生产订单ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'erpId', visible: true, label: '单据ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'billNo', visible: true, label: '单据编号', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'type', visible: true, label: '单据类型', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'billDate', visible: true, label: '单据日期', minWidth: null, sortable: false, overflow: false, align: 'center', width: "100"},
+        {key: 'status', visible: true, label: '单据状态', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'transferStatus', visible: true, label: '调拨状态', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'pickStatus', visible: true, label: '领料状态', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'materialName', visible: true, label: '物料名称', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'spec', visible: true, label: '规格型号', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'unit', visible: true, label: '单位', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'num', visible: true, label: '数量', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'bizStatus', visible: true, label: '业务状态', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'batchNo', visible: true, label: '批号', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'remark', visible: true, label: '备注', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'releaseTime', visible: true, label: '下达时间', minWidth: null, sortable: false, overflow: false, align: 'center', width: "100"},
+        {key: 'sourceNo', visible: true, label: '源单编号', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'demandBill', visible: true, label: '需求单据', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'planTrackNo', visible: true, label: '计划跟踪号', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'productType', visible: true, label: '产品类型', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'materialNo', visible: true, label: '物料编码', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'quaStore', visible: true, label: '合格品入库数量', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'deptId', visible: true, label: '部门ID(本系统)', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'erpDeptId', visible: true, label: '部门ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+      ],
+      // 排序方式
+      orderSorts: ['ascending', 'descending', null],
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 生产订单表格数据
+      prodOrderList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      defaultSort,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        orderByColumn: defaultSort.prop,
+        isAsc: defaultSort.order,
+        id: null,
+        billNo: null,
+        type: null,
+        status: null,
+        transferStatus: null,
+        pickStatus: null,
+        spec: null,
+        deptId: null,
+        unit: null,
+        bizStatus: null,
+        batchNo: null,
+        releaseTime: null,
+        sourceNo: null,
+        demandBill: null,
+        planTrackNo: null,
+        productType: null,
+        materialNo: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        billNo: [
+          { required: true, message: "单据编号不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    handleSync() {
+      syncProdOrder().then(res => {
+        if (res.code === 200) {
+          this.$message.success("同步成功");
+        }
+      })
+    },
+    /** 当排序按钮被点击时触发 **/
+    onSortChange(column) {
+      if (column.order == null) {
+        this.queryParams.orderByColumn = defaultSort.prop;
+        this.queryParams.isAsc = defaultSort.order;
+      } else {
+        this.queryParams.orderByColumn = column.prop;
+        this.queryParams.isAsc = column.order;
+      }
+      this.getList();
+    },
+    /** 查询生产订单列表 */
+    getList() {
+      this.loading = true;
+      listProdOrder(this.queryParams).then(response => {
+        this.prodOrderList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        billNo: null,
+        type: null,
+        billDate: null,
+        status: null,
+        transferStatus: null,
+        pickStatus: null,
+        spec: null,
+        deptId: null,
+        unit: null,
+        num: null,
+        bizStatus: null,
+        batchNo: null,
+        remark: null,
+        releaseTime: null,
+        sourceNo: null,
+        demandBill: null,
+        auxProp: null,
+        planTrackNo: null,
+        productType: null,
+        materialNo: null,
+        quaStore: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加生产订单";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getProdOrder(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改生产订单";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateProdOrder(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addProdOrder(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除生产订单编号为"' + ids + '"的数据项？').then(function() {
+        return delProdOrder(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('yh/prodOrder/export', {
+        ...this.queryParams
+      }, `prodOrder_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>
diff --git a/src/views/yh/report/components/EditIncome.vue b/src/views/yh/report/components/EditIncome.vue
deleted file mode 100644
index 0df5bca..0000000
--- a/src/views/yh/report/components/EditIncome.vue
+++ /dev/null
@@ -1,235 +0,0 @@
-<template>
-  <div>
-    <el-row class="edit-table-operate">
-      <el-button type="primary" icon="el-icon-plus" size="mini" @click="addRow" plain>添加一行</el-button>
-      <el-button type="success" icon="el-icon-plus" size="mini" @click="showUserDialog = true" plain>批量选择员工</el-button>
-
-      <el-row class="edit-table-operate-right">
-        <div>未分配工资: {{waitIncome | dv}} 元</div>
-      </el-row>
-    </el-row>
-
-    <el-table :data="data" size="mini" stripe show-summary :header-cell-style="headerCellStyle">
-      <el-table-column type="index" width="80" label="序号" align="center"/>
-      <el-table-column label="员工" align="center">
-        <template scope="d">
-          <el-form-item label-width="0" :prop="getProp(d.$index, 'userId')" :rules="rules.userId">
-            <user-input v-model="d.row.userId"/>
-          </el-form-item>
-        </template>
-      </el-table-column>
-<!--      <el-table-column label="工资模式" align="center" width="300">-->
-<!--        <template scope="d">-->
-<!--          <el-form-item label-width="0" :prop="getProp(d.$index, 'mode')" :rules="rules.mode">-->
-<!--            <el-radio-group v-model="d.row.mode">-->
-<!--              <el-radio v-for="(item, index) in dict.type.income_mode" :key="item.value" :label="item.value">{{item.label}}</el-radio>-->
-<!--            </el-radio-group>-->
-<!--          </el-form-item>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-      <el-table-column label="分数" align="center" prop="score">
-        <template #header>
-          分数
-          <el-tooltip class="item" effect="dark" content="批量修改" placement="top">
-            <el-button type="text" icon="el-icon-edit" size="mini" @click="handleBatchScore"/>
-          </el-tooltip>
-        </template>
-        <template scope="d">
-          <el-form-item label-width="0" :prop="getProp(d.$index, 'score')" :rules="rules.score">
-            <el-input v-model="d.row.score" type="number" placeholder="请输入分数"/>
-          </el-form-item>
-        </template>
-      </el-table-column>
-      <el-table-column label="完成数量" align="center" prop="num">
-        <template scope="d">
-          <el-form-item label-width="0" :prop="getProp(d.$index, 'num')" :rules="rules.num">
-            {{d.row.num | fix2 | dv}}
-          </el-form-item>
-        </template>
-      </el-table-column>
-      <el-table-column label="工时" align="center" prop="num">
-        <template scope="d">
-          <el-form-item label-width="0" :prop="getProp(d.$index, 'num')" :rules="rules.num">
-            {{d.row.num | fix2 | dv}}
-          </el-form-item>
-        </template>
-      </el-table-column>
-      <el-table-column label="工资" align="center" prop="income">
-        <template scope="d">
-          <el-form-item label-width="0" :prop="getProp(d.$index, 'income')" :rules="rules.income">
-            {{d.row.income | fix2 | dv}} 元
-          </el-form-item>
-        </template>
-      </el-table-column>
-      <el-table-column label="工资占比" align="center" >
-        <template scope="d">
-          <el-form-item label-width="0">
-            {{ incomePoint(d.row.income) | fix2 | dv }} %
-          </el-form-item>
-        </template>
-      </el-table-column>
-
-      <el-table-column width="200" align="center" label="操作">
-        <template slot-scope="d">
-          <el-button
-            type="danger"
-            icon="el-icon-delete"
-            size="mini"
-            plain
-            @click="handleDel(d.$index)">
-            删除
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <user-dialog
-      multiple
-      :show.sync="showUserDialog"
-      @select="onSelectUsers"
-    />
-  </div>
-
-</template>
-
-<script>
-import UserInput from "@/components/Business/User/UserInput.vue";
-import UserDialog from "@/components/Business/User/UserDialog.vue";
-import {isEmpty} from "@/utils";
-import Decimal from "decimal.js";
-
-export default {
-  name: "EditIncome",
-  components: {UserDialog, UserInput},
-  dicts: ['income_mode'],
-  props: {
-    data: {
-      type: Array,
-      default: () => {
-        return []
-      }
-    },
-    listProp: {
-      type: String,
-      default: 'incomeList',
-    },
-    rules: {
-      type: Object,
-      default: () => {
-        return {}
-      }
-    },
-    headerCellStyle: {
-      type: Object,
-      default: () => {
-        return {}
-      }
-    },
-    totalPrice: {
-      type: Number,
-      default: 0,
-    }
-  },
-  computed: {
-    getProp() {
-      return (index, prop) => {
-        return `${this.listProp}[${index}].${prop}`
-      }
-    },
-    // 总工资
-    totalIncome() {
-      let total = 0;
-      if (this.data != null) {
-        this.data.forEach(item => {
-          total += item.income;
-        })
-      }
-      return total;
-    },
-    // 工资占比
-    incomePoint() {
-      return (income) => {
-        if (income == null) {
-          return 0;
-        }
-        return income / this.totalIncome;
-      }
-    },
-    // 总分数
-    totalScore() {
-      let total = 0;
-      if (this.data != null) {
-        this.data.forEach(item => {
-          total += item.score;
-        })
-      }
-      return total;
-    },
-    // 待分配工资
-    waitIncome() {
-      return this.totalPrice - this.totalIncome;
-    }
-  },
-  data() {
-    return {
-      showUserDialog: false,
-    }
-  },
-  created() {
-
-  },
-  methods: {
-    // 添加一行
-    addRow(data) {
-      this.data.push({
-        userId: null,
-        score: 10,
-        income: null,
-        mode: '1',
-        ...data
-      })
-      // 计算工资
-      this.computeIncome();
-    },
-    // 计算工资
-    computeIncome() {
-      if (isEmpty(this.data)) {
-        return;
-      }
-
-    },
-    // 确认添加用户
-    onSelectUsers(list) {
-      list.forEach(item => {
-        this.addRow({
-          userId: item.userId
-        })
-      })
-      this.showUserDialog = false;
-    },
-    // 删除
-    handleDel(index) {
-      if (this.data != null) {
-        this.data.splice(index, 1);
-      }
-    },
-    // 批量修改分数
-    handleBatchScore() {
-      if (this.data == null || this.data.length === 0) {
-        this.$message.info('数据为空，无法批量修改')
-        return;
-      }
-      this.$prompt('请输入分数', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        inputPattern: /^[0-9]*$/,
-        inputErrorMessage: '请输入数字'
-      }).then(({value}) => {
-        this.data.forEach(item => {
-          item.score = value;
-        })
-      })
-    }
-  }
-}
-</script>
diff --git a/src/views/yh/report/components/EditOrder.vue b/src/views/yh/report/components/EditOrder.vue
deleted file mode 100644
index 7259b13..0000000
--- a/src/views/yh/report/components/EditOrder.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-<template>
-  <div>
-    <el-row style="margin-bottom: 1em">
-      <el-button type="primary" icon="el-icon-plus" size="mini" @click="addRow" plain>添加</el-button>
-    </el-row>
-    <el-table :data="data" size="mini" stripe show-summary :header-cell-style="headerCellStyle">
-      <el-table-column type="index" width="80" label="序号" align="center"/>
-      <el-table-column label="订单" align="center">
-        <template scope="d">
-          <el-form-item label-width="0" :prop="getProp(d.$index, 'userId')" :rules="rules.userId">
-            <user-input v-model="d.row.userId" placeholder="点击选择订单"/>
-          </el-form-item>
-        </template>
-      </el-table-column>
-      <el-table-column label="完成数量" align="center" prop="num">
-        <template scope="d">
-          <el-form-item label-width="0" :prop="getProp(d.$index, 'num')" :rules="rules.num">
-            <el-input v-model="d.row.num" type="number" placeholder="请输入完成数量" :min="1"/>
-          </el-form-item>
-        </template>
-      </el-table-column>
-
-      <el-table-column width="200" align="center" label="操作">
-        <!--        <template #header>-->
-        <!--          <el-button type="primary" icon="el-icon-plus" size="mini" @click="addRow" plain>添加</el-button>-->
-        <!--        </template>-->
-        <template slot-scope="d">
-          <el-button
-            type="danger"
-            icon="el-icon-delete"
-            size="mini"
-            plain
-            @click="handleDel(d.$index)">
-            删除
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-  </div>
-
-</template>
-
-<script>
-import UserInput from "@/components/Business/User/UserInput.vue";
-
-export default {
-  name: "EditIncome",
-  components: {UserInput},
-  props: {
-    data: {
-      type: Array,
-      default: () => {
-        return []
-      }
-    },
-    listProp: {
-      type: String,
-      default: 'orderList',
-    },
-    rules: {
-      type: Object,
-      default: () => {
-        return {}
-      }
-    },
-    headerCellStyle: {
-      type: Object,
-      default: () => {
-        return {}
-      }
-    }
-  },
-  computed: {
-    getProp() {
-      return (index, prop) => {
-        return `${this.listProp}[${index}].${prop}`
-      }
-    }
-  },
-  data() {
-    return {
-
-    }
-  },
-  created() {
-
-  },
-  methods: {
-    // 添加一行
-    addRow() {
-      this.data.push({
-        userId: null,
-        score: null,
-        income: null,
-      })
-    },
-    // 删除
-    handleDel(index) {
-      if (this.data != null) {
-        this.data.splice(index, 1);
-      }
-    }
-  }
-}
-</script>
diff --git a/src/views/yh/report/components/EditPrice.vue b/src/views/yh/report/components/EditPrice.vue
deleted file mode 100644
index 296f53e..0000000
--- a/src/views/yh/report/components/EditPrice.vue
+++ /dev/null
@@ -1,224 +0,0 @@
-<template>
-  <div>
-    <el-row class="edit-table-operate">
-      <el-button type="primary" icon="el-icon-plus" size="mini" @click="addRow" plain>添加一行</el-button>
-      <el-button type="success" icon="el-icon-plus" size="mini" @click="showPriceDialog = true" plain>批量选择工序</el-button>
-
-      <el-row class="edit-table-operate-right">
-      </el-row>
-    </el-row>
-
-    <el-table :data="data" size="mini" stripe :header-cell-style="headerCellStyle">
-      <el-table-column type="index" width="80" label="序号" align="center"/>
-      <el-table-column label="工序" align="center">
-        <template scope="d">
-          <el-form-item label-width="0" :prop="getProp(d.$index, 'priceId')" :rules="rules.priceId">
-            <price-input v-model="d.row.priceId" @change="(val) => {onChangePrice(d.row, val)}"/>
-          </el-form-item>
-        </template>
-      </el-table-column>
-      <el-table-column label="生产数量" align="center" prop="num">
-        <template scope="d">
-          <el-form-item label-width="0" :prop="getProp(d.$index, 'num')" :rules="rules.num">
-            <el-input v-model="d.row.num" type="number" :min="0" placeholder="请输入完成数量"/>
-          </el-form-item>
-        </template>
-      </el-table-column>
-      <el-table-column label="单价" align="center" prop="price">
-        <template scope="d">
-          <el-form-item label-width="0" :prop="getProp(d.$index, 'price')" :rules="rules.price">
-            {{d.row.price | dv}} 元
-          </el-form-item>
-        </template>
-      </el-table-column>
-      <el-table-column label="总价" align="center" >
-        <template scope="d">
-          <el-form-item label-width="0">
-            {{ totalPrice(d.row) | dv }} 元
-          </el-form-item>
-        </template>
-      </el-table-column>
-      <el-table-column label="工序类型" align="center" >
-        <template scope="d">
-          <el-form-item label-width="0">
-            订单工序、辅助工序、公共工序
-          </el-form-item>
-        </template>
-      </el-table-column>
-      <el-table-column label="关联生产订单" align="center" type="expand" width="100">
-        <template scope="d">
-          <el-table :data="d.row.orderList" style="margin-left: 16px; width: calc(100% - 16px)" border>
-            <el-table-column label="序号" align="center" type="index" width="100"/>
-            <el-table-column label="订单" align="center">
-              <template slot-scope="dd">
-                <el-form-item label-width="0">
-                  <el-input v-model="dd.row.orderId"/>
-                </el-form-item>
-              </template>
-            </el-table-column>
-            <el-table-column label="生产数量" align="center">
-              <template slot-scope="dd">
-                <el-form-item label-width="0">
-                  <el-input v-model="dd.row.num"/>
-                </el-form-item>
-              </template>
-            </el-table-column>
-            <el-table-column label="计划数量" align="center">
-              <template slot-scope="dd">
-                1000
-              </template>
-            </el-table-column>
-            <el-table-column label="已生产数量" align="center">
-              <template slot-scope="dd">
-                300
-              </template>
-            </el-table-column>
-            <el-table-column label="生产进度" align="center">
-              <template slot-scope="dd">
-                <el-progress :text-inside="true" :stroke-width="20" :percentage="50" status="exception"/>
-              </template>
-            </el-table-column>
-            <el-table-column align="center" width="200">
-              <template #header>
-                <el-button
-                  type="success"
-                  icon="el-icon-plus"
-                  size="mini"
-                  plain>
-                  添加关联
-                </el-button>
-              </template>
-            </el-table-column>
-          </el-table>
-        </template>
-      </el-table-column>
-
-      <el-table-column width="200" align="center" label="操作">
-        <template slot-scope="d">
-          <el-button
-            type="danger"
-            icon="el-icon-delete"
-            size="mini"
-            plain
-            @click="handleDel(d.$index)">
-            删除
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <price-dialog
-      multiple
-      :show.sync="showPriceDialog"
-      @select="onSelectPrices"
-    />
-  </div>
-
-</template>
-
-<script>
-import UserInput from "@/components/Business/User/UserInput.vue";
-import PriceDialog from "@/components/Business/Price/PriceDialog.vue";
-import PriceInput from "@/components/Business/Price/PriceInput.vue";
-import {notNullDecimal} from "@/utils";
-
-export default {
-  name: "EditPrice",
-  components: {PriceInput, PriceDialog, UserInput},
-  props: {
-    data: {
-      type: Array,
-      default: () => {
-        return []
-      }
-    },
-    listProp: {
-      type: String,
-      default: 'priceList',
-    },
-    rules: {
-      type: Object,
-      default: () => {
-        return {}
-      }
-    },
-    headerCellStyle: {
-      type: Object,
-      default: () => {
-        return {}
-      }
-    },
-  },
-  computed: {
-    getProp() {
-      return (index, prop) => {
-        return `${this.listProp}[${index}].${prop}`
-      }
-    },
-    // 总价计算
-    totalPrice() {
-      return (row ) => {
-        if (row == null) {
-          return 0;
-        }
-        return notNullDecimal(row.price).mul(notNullDecimal(row.num));
-      }
-    }
-  },
-  data() {
-    return {
-      showPriceDialog: false,
-    }
-  },
-  created() {
-
-  },
-  methods: {
-    // 添加一行
-    addRow(data) {
-      this.data.push({
-        priceId: null,
-        price: null,
-        orderList: [],
-        ...data
-      })
-    },
-    // 确认添加工序
-    onSelectPrices(list) {
-      list.forEach(item => {
-        this.addRow({
-          priceId: item.priceId,
-          price: item.price,
-        })
-      })
-      this.showPriceDialog = false;
-    },
-    onChangePrice(row, price) {
-      row.price = price.price;
-    },
-    // 删除
-    handleDel(index) {
-      if (this.data != null) {
-        this.data.splice(index, 1);
-      }
-    },
-    // 批量修改分数
-    handleBatchScore() {
-      if (this.data == null || this.data.length === 0) {
-        this.$message.info('数据为空，无法批量修改')
-        return;
-      }
-      this.$prompt('请输入分数', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        inputPattern: /^[0-9]*$/,
-        inputErrorMessage: '请输入数字'
-      }).then(({value}) => {
-        this.data.forEach(item => {
-          item.score = value;
-        })
-      })
-    }
-  }
-}
-</script>
diff --git a/src/views/yh/report/components/ReportProductEdit.vue b/src/views/yh/report/components/ReportProductEdit.vue
new file mode 100644
index 0000000..41c13e4
--- /dev/null
+++ b/src/views/yh/report/components/ReportProductEdit.vue
@@ -0,0 +1,435 @@
+<template>
+  <div>
+    <el-row class="edit-table-operate">
+      <el-button type="primary" icon="el-icon-plus" size="mini" @click="addRow" plain>添加一行</el-button>
+      <el-button type="success" icon="el-icon-plus" size="mini" @click="showPriceDialog = true" plain>批量选择工序</el-button>
+
+      <el-row class="edit-table-operate-right">
+      </el-row>
+    </el-row>
+
+    <el-table
+      border
+      :data="data"
+      size="mini"
+      stripe
+      :header-cell-style="headerCellStyle"
+      @selection-change="onSelectionChange"
+    >
+      <el-table-column type="selection" align="center"/>
+      <el-table-column type="index" width="60" label="序号" align="center"/>
+      <el-table-column label="工序" align="center">
+        <template #header>
+          <span class="required-label">工序</span>
+        </template>
+        <template scope="d">
+          <form-col table label-width="0" :prop="getProp(d.$index, 'priceId')" :rules="rules.priceId">
+            <price-input v-model="d.row.priceId" @change="(val) => {onChangePrice(d.row, val)}" placeholder="点击选择工序" title="选择工序"/>
+          </form-col>
+        </template>
+      </el-table-column>
+      <el-table-column label="总产量" align="center" prop="num">
+        <template #header>
+          <span class="required-label">总产量</span>
+        </template>
+        <template scope="d">
+          <form-col table label-width="0" :prop="getProp(d.$index, 'num')" :rules="rules.num">
+            <el-input v-model="d.row.num" type="number" :min="0" placeholder="请输入产量">
+              <template #suffix>
+                {{d.row.priceUnit}}
+              </template>
+            </el-input>
+          </form-col>
+        </template>
+      </el-table-column>
+      <el-table-column label="单价" align="center" prop="pricePrice" width="100">
+        <template scope="d">
+          <form-col table label-width="0">
+            {{d.row.pricePrice | dv}} 元
+          </form-col>
+        </template>
+      </el-table-column>
+      <el-table-column label="总价" align="center" width="100">
+        <template scope="d">
+          <form-col table label-width="0">
+            {{ totalPrice(d.row) | dv }} 元
+          </form-col>
+        </template>
+      </el-table-column>
+<!--      <el-table-column label="工序类型" align="center" >-->
+<!--        <template scope="d">-->
+<!--          <form-col table label-width="0" :prop="getProp(d.$index, 'priceType')" :rules="rules.priceType">-->
+<!--            <el-select v-model="d.row.priceType">-->
+<!--              <el-option v-for="(item, index) in dict.type.price_type" :key="index" :label="item.label" :value="item.value"/>-->
+<!--            </el-select>-->
+<!--          </form-col>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+      <el-table-column label="员工产量" align="center" prop="userProduct" width="500">
+        <template #header>
+          <span class="required-label">员工产量</span>
+          <el-tooltip placement="top" content="批量编辑">
+            <el-button type="text" icon="el-icon-edit" @click="handleBatchUserProduct"/>
+          </el-tooltip>
+        </template>
+        <template scope="d">
+          <el-row >
+            <template v-for="(item, itemIndex) of d.row.userProductList">
+              <form-col
+                table
+                :span="8"
+                label-width="0"
+                :prop="getSubProp(d.$index, 'userProductList', itemIndex, 'userId')"
+                :rules="rules.userProductList.userId"
+              >
+                <user-input v-model="item.userId"/>
+              </form-col >
+              <form-col
+                table
+                :span="8"
+                label-width="0"
+                :prop="getSubProp(d.$index, 'userProductList', itemIndex, 'num')"
+                :rules="rules.userProductList.num"
+              >
+                <el-input v-model="item.num" type="number" placeholder="请输入员工产量" :min="0">
+                  <template #suffix>{{d.row.priceUnit}}</template>
+                </el-input>
+              </form-col >
+              <form-col table :span="5" label-width="0">
+                ¥ {{calcIncome(item.num, d.row.pricePrice) | dv }}
+              </form-col>
+              <form-col table :span="1" label-width="0">
+                <el-button circle icon="el-icon-delete" type="danger" plain size="mini" @click="handleDelUserProduct(d.row, itemIndex)"/>
+              </form-col>
+            </template>
+            <el-col :span="24">
+              <el-button size="mini" icon="el-icon-plus" type="text" @click="handleAddUserProduct(d.row)">添加</el-button>
+            </el-col>
+          </el-row>
+        </template>
+      </el-table-column>
+      <el-table-column label="关联生产订单" align="center" type="expand" width="100">
+        <template scope="d">
+          <el-table :data="d.row.orderList" style="margin-left: 16px; width: calc(100% - 16px)" border>
+            <el-table-column label="序号" align="center" type="index" width="100"/>
+            <el-table-column label="订单" align="center">
+              <template slot-scope="dd">
+                <form-col table label-width="0">
+                  <el-input v-model="dd.row.orderId"/>
+                </form-col>
+              </template>
+            </el-table-column>
+            <el-table-column label="生产数量" align="center">
+              <template slot-scope="dd">
+                <form-col table label-width="0">
+                  <el-input v-model="dd.row.num"/>
+                </form-col>
+              </template>
+            </el-table-column>
+            <el-table-column label="计划数量" align="center">
+              <template slot-scope="dd">
+                1000
+              </template>
+            </el-table-column>
+            <el-table-column label="已生产数量" align="center">
+              <template slot-scope="dd">
+                300
+              </template>
+            </el-table-column>
+            <el-table-column label="生产进度" align="center">
+              <template slot-scope="dd">
+                <el-progress :text-inside="true" :stroke-width="20" :percentage="50" status="exception"/>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" width="200">
+              <template #header>
+                <el-button
+                  type="success"
+                  icon="el-icon-plus"
+                  size="mini"
+                  plain>
+                  添加关联
+                </el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </template>
+      </el-table-column>
+
+      <el-table-column width="200" align="center" label="操作">
+        <template slot-scope="d">
+          <el-button
+            type="danger"
+            icon="el-icon-delete"
+            size="mini"
+            plain
+            @click="handleDel(d.$index)">
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!--工序选择-->
+    <price-dialog
+      multiple
+      :show.sync="showPriceDialog"
+      @select="onSelectPrices"
+    />
+
+    <!--用户选择-->
+    <user-dialog
+      multiple
+      :show.sync="showUserDialog"
+      @select="onSelectUsers"
+    />
+
+    <!--批量修改用户产量-->
+    <user-product-batch-dialog
+      :show.sync="showUserProductBatchDialog"
+      @submit="onSubmitUserProductBatch"
+    />
+
+  </div>
+
+</template>
+
+<script>
+import UserInput from "@/components/Business/User/UserInput.vue";
+import PriceDialog from "@/components/Business/Price/PriceDialog.vue";
+import PriceInput from "@/components/Business/Price/PriceInput.vue";
+import {isEmpty, notNullDecimal, notNullNum} from "@/utils";
+import FormCol from "@/components/FormCol/index.vue";
+import UserDialog from "@/components/Business/User/UserDialog.vue";
+import UserProductBatchDialog from "@/views/yh/report/components/UserProductBatchDialog.vue";
+import {IncomeMode} from "@/utils/constants";
+import Decimal from "decimal.js";
+
+export default {
+  name: "ReportProductEdit",
+  dicts: ['price_type'],
+  components: {UserProductBatchDialog, UserDialog, FormCol, PriceInput, PriceDialog, UserInput},
+  props: {
+    data: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
+    listProp: {
+      type: String,
+      default: 'productList',
+    },
+    rules: {
+      type: Object,
+      default: () => {
+        return {
+          userProductList: {}
+        }
+      }
+    },
+    headerCellStyle: {
+      type: Object,
+      default: () => {
+        return {}
+      }
+    },
+  },
+  computed: {
+    // 获取子属性名
+    getSubProp() {
+      return (index, prop, subIndex, subProp) => {
+        return `${this.getProp(index, prop)}[${subIndex}].${subProp}`;
+      }
+    },
+    // 计算工资
+    calcIncome() {
+      return (num, price) => {
+        return notNullDecimal(num).mul(notNullDecimal(price)).toNumber()
+      }
+    },
+    // 获取属性名
+    getProp() {
+      return (index, prop) => {
+        return `${this.listProp}[${index}].${prop}`
+      }
+    },
+    // 总价计算
+    totalPrice() {
+      return (row ) => {
+        if (row == null) {
+          return 0;
+        }
+        return notNullDecimal(row.pricePrice).mul(notNullDecimal(row.num));
+      }
+    }
+  },
+  data() {
+    return {
+      row: {},  // 当前操作行
+      selection: [],  // 当前选中的所有行
+      showPriceDialog: false,
+      showUserDialog: false,
+      showUserProductBatchDialog: false,
+    }
+  },
+  created() {
+
+  },
+  methods: {
+    // 添加一行
+    addRow(data) {
+      let row = {
+        id: null,
+        reportId: null,
+        priceId: null,
+        pricePrice: null,
+        priceType: '1',
+        num: null,
+        orderList: [],
+        userProductList: [],
+        ...data
+      }
+      this.data.push(row)
+      return row;
+    },
+    // 添加用户产量
+    addUserProduct(row, data) {
+      if (row.userProductList == null) {
+        row.userProductList = [];
+      }
+      row.userProductList.push({
+        userId: null,
+        num: null,
+        ...data
+      })
+    },
+    // 添加用户产量
+    handleAddUserProduct(row) {
+      this.row = row;
+      this.showUserDialog = true;
+    },
+    // 删除用户产量
+    handleDelUserProduct(row, index) {
+      row.userProductList.splice(index, 1);
+    },
+    // 确认添加工序
+    onSelectPrices(list) {
+      list.forEach(item => {
+        let row = this.convertPriceToRow(item);
+        this.addRow(row)
+      })
+      this.showPriceDialog = false;
+    },
+    // 将单价转为行数据
+    convertPriceToRow(price) {
+      return {
+        priceId: price.priceId,
+        priceCategory: price.category,
+        priceSize: price.size,
+        priceName: price.name,
+        priceSubName: price.subName,
+        pricePattern: price.pattern,
+        priceSpec: price.spec,
+        pricePrice: price.price,
+        priceUnit: price.unit,
+        priceClassify: price.classify,
+        priceQuantity: price.quantity
+      }
+    },
+    // 确认添加用户
+    onSelectUsers(list) {
+      list.forEach(item => {
+        this.addUserProduct(this.row, {
+          userId: item.userId,
+          num: null,
+        })
+      })
+      this.showUserDialog = false;
+    },
+    // 工序修改后操作
+    onChangePrice(row, price) {
+      row = {
+        ...row,
+        ...this.convertPriceToRow(price)
+      }
+    },
+    // 表格选择项发生变化后
+    onSelectionChange(selection) {
+      this.selection = selection;
+    },
+    // 删除
+    handleDel(index) {
+      if (this.data != null) {
+        this.data.splice(index, 1);
+      }
+    },
+    // 批量修改产量
+    handleBatchUserProduct(){
+      if (isEmpty(this.selection)) {
+        this.$message.warning("请先至少选中一行");
+        return;
+      }
+      this.showUserProductBatchDialog = true;
+    },
+    // 批量修改员工产量
+    onSubmitUserProductBatch(data) {
+      if (data == null || isEmpty(data.list)) {
+        return;
+      }
+      // 分值模式
+      if (IncomeMode.SCORE === data.mode) {
+        // 计算总分
+        let totalScore = new Decimal(0);
+        data.list.forEach(item => {
+          totalScore = totalScore.plus(notNullDecimal(item.score));
+        })
+        // 计算员工产量
+        this.selection.forEach(row => {
+          let rowNum = notNullDecimal(row.num); // 本行的总产量
+          row.userProductList = data.list.map(item => {
+            return {
+              userId: item.userId,
+              num: rowNum.mul(notNullDecimal(item.score)).div(totalScore).toNumber().toFixed(2)
+            }
+          })
+          // 若员工产量相加含有误差，则由第一个员工抹平
+          let totalNum = notNullDecimal(0);
+          if (row.userProductList != null && !isEmpty(row.userProductList)) {
+            row.userProductList.forEach(item => {
+              totalNum = notNullDecimal(item.num).add(totalNum);
+            })
+            if (totalNum.toNumber() !== rowNum.toNumber()) {
+              if (isEmpty(row.userProductList[0].num)) {
+                row.userProductList[0].num = totalNum.toNumber();
+              } else {
+                row.userProductList[0].num = notNullDecimal(row.userProductList[0].num).add(totalNum.sub(rowNum)).toNumber();
+              }
+            }
+          }
+        })
+      }
+      // 数量模式
+      else if (IncomeMode.COUNT === data.mode) {
+        this.selection.forEach(row => {
+          // 覆盖员工产量
+          row.userProductList = data.list.map(item => {
+            return {
+              userId: item.userId,
+              num: item.num
+            }
+          })
+          // 计算总产量
+          let totalCount = notNullDecimal(0);
+          row.userProductList.forEach(item => {
+            totalCount = notNullDecimal(item.num).add(totalCount);
+          })
+          row.num = totalCount.toNumber();
+        })
+        this.$message.success("批量编辑成功");
+      }
+      this.showUserProductBatchDialog = false;
+    }
+  }
+}
+</script>
diff --git a/src/views/yh/report/components/UserProductBatchDialog.vue b/src/views/yh/report/components/UserProductBatchDialog.vue
new file mode 100644
index 0000000..337017e
--- /dev/null
+++ b/src/views/yh/report/components/UserProductBatchDialog.vue
@@ -0,0 +1,133 @@
+<template>
+  <el-dialog :visible.sync="visible" title="批量编辑员工产量" close-on-click-modal>
+    <el-form :model="form" label-width="6em" size="mini">
+      <el-row>
+        <form-col :span="24" label="工资模式">
+          <el-radio-group v-model="form.mode">
+            <el-radio :label="IncomeMode.COUNT">产量</el-radio>
+            <el-radio :label="IncomeMode.SCORE">计分</el-radio>
+          </el-radio-group>
+          <div v-show="form.mode === IncomeMode.SCORE" style="color: red; ">
+            请注意！计分模式下，需要提前输入选中行的<strong>总产量</strong>，否则无法计算员工产量！
+          </div>
+        </form-col>
+      </el-row>
+      <el-row class="edit-table-operate">
+        <el-button type="primary" plain @click="handleAdd" icon="el-icon-plus" size="mini">添加员工</el-button>
+      </el-row>
+      <el-table :data="form.list" border size="mini">
+        <el-table-column label="序号" type="index" width="50" align="center"/>
+        <el-table-column label="员工" align="center">
+          <template #header>
+            <span class="required-label">
+              员工
+            </span>
+          </template>
+          <template slot-scope="d">
+            <form-col table label-width="0">
+              <user-input v-model="d.row.userId"/>
+            </form-col>
+          </template>
+        </el-table-column>
+        <el-table-column align="center">
+          <template #header>
+            <span class="required-label" v-if="form.mode === IncomeMode.COUNT">
+              产量
+            </span>
+            <span class="required-label" v-if="form.mode === IncomeMode.SCORE">
+              分数
+            </span>
+          </template>
+          <template slot-scope="d">
+            <form-col table label-width="0" v-if="form.mode === IncomeMode.COUNT">
+              <el-input v-model="d.row.num" type="number" placeholder="请输入员工产量" :min="0"/>
+            </form-col>
+            <form-col table label-width="0" v-if="form.mode === IncomeMode.SCORE">
+              <el-input v-model="d.row.score" type="number" placeholder="请输入员工分数" :min="0"/>
+            </form-col>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="100">
+          <template slot-scope="d">
+            <el-button type="danger" plain size="mini" icon="el-icon-delete" @click="handleDel(d.$index)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-form>
+
+    <user-dialog
+      :show.sync="showUserDialog"
+      multiple
+      @select="onSelectUsers"
+    />
+
+    <template #footer>
+      <el-button @click="visible = false">取消</el-button>
+      <el-button type="primary" @click="onSubmit()">确定</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import FormCol from "@/components/FormCol/index.vue";
+import UserInput from "@/components/Business/User/UserInput.vue";
+import UserDialog from "@/components/Business/User/UserDialog.vue";
+import {isEmpty} from "@/utils";
+import {IncomeMode} from "@/utils/constants";
+
+export default {
+  name: "UserProductBatchDialog",
+  components: {UserDialog, UserInput, FormCol},
+  props: {
+    show: {
+      type: Boolean,
+      default: false
+    },
+  },
+  computed: {
+    IncomeMode() {
+      return IncomeMode
+    },
+    visible: {
+      get() {
+        return this.show;
+      },
+      set(val) {
+        this.$emit('update:show', val);
+      }
+    },
+  },
+  data() {
+    return {
+      form: {
+        mode: IncomeMode.COUNT
+      },
+      showUserDialog: false,
+    }
+  },
+  methods: {
+    onSubmit() {
+      this.$emit('submit', this.form);
+    },
+    handleDel(index) {
+      this.form.list.splice(index, 1);
+    },
+    handleAdd() {
+      this.showUserDialog = true;
+    },
+    onSelectUsers(list) {
+      if (isEmpty(this.form.list)) {
+        this.form.list = [];
+      }
+      list.forEach(item => {
+        this.form.list.push({
+          userId: item.userId,
+          num: 0,
+          score: 10,
+        })
+      })
+      this.showUserDialog = false;
+    }
+  }
+}
+</script>
diff --git a/src/views/yh/report/edit.vue b/src/views/yh/report/edit.vue
index a1842b1..dcef8f1 100644
--- a/src/views/yh/report/edit.vue
+++ b/src/views/yh/report/edit.vue
@@ -5,51 +5,29 @@
     </edit-header>
 
     <div class="app-container" v-loading="loading">
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px" size="small">
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px" size="mini">
         <div class="edit-title">基础信息</div>
         <el-row>
           <form-col :span="span"  label="部门" prop="deptId">
-            <dept-tree-select v-model="form.deptId" height="28px"/>
+            <dept-tree-select v-model="form.deptId" class="mini-tree-select"/>
           </form-col>
           <form-col :span="span"  label="报表日期" prop="reportDate">
-            <el-date-picker v-model="form.reportDate" type="date" placeholder="选择日期" style="width: 100%;" :clearable="false"/>
+            <el-date-picker v-model="form.reportDate" type="date" value-format="yyyy-MM-dd" placeholder="选择日期" style="width: 100%;" :clearable="false"/>
           </form-col>
-          <form-col :span="span" label="工资模式" prop="incomeMode">
-            <el-radio-group v-model="form.incomeMode">
-              <el-radio v-for="item in dict.type.income_mode" :key="item.value" :label="item.value">{{item.label}}</el-radio>
-            </el-radio-group>
-          </form-col>
-<!--          <form-col :span="span"  label="选择工序" prop="priceId">-->
-<!--            <price-input v-model="form.priceId" @change="onChangePrice" placeholder="点击选择工序" title="选择工序"/>-->
-<!--          </form-col>-->
-<!--          <form-col :span="span"  label="完成数量" prop="num">-->
-<!--            <el-input v-model="form.num" placeholder="请输入工序完成数量" :min="1" type="number"/>-->
-<!--          </form-col>-->
-          <form-col :span="span" label="总价">
+          <form-col :span="span" label="总金额">
             {{totalPrice.toNumber() | dv}} 元
           </form-col>
         </el-row>
         <el-row>
         </el-row>
 
-        <div class="edit-title">工序列表</div>
-        <edit-price
-          :data="form.priceList"
-          :rules="incomeRules"
+        <div class="edit-title">工序产量</div>
+        <report-product-edit
+          :data="form.productList"
+          :rules="productRules"
           :header-cell-style="headerCellStyle"
         />
 
-
-        <div class="edit-title">工资详情</div>
-        <edit-income
-          :data="form.incomeList"
-          :rules="incomeRules"
-          :header-cell-style="headerCellStyle"
-          :total-price="totalPrice.toNumber()"
-        />
-
-<!--        <div class="edit-title">关联订单</div>-->
-<!--        <edit-order :data="form.orderList" :rules="incomeRules" :header-cell-style="headerCellStyle"/>-->
       </el-form>
     </div>
   </div>
@@ -62,17 +40,16 @@ import PriceInput from "@/components/Business/Price/PriceInput.vue";
 import DeptTreeSelect from "@/components/Business/Dept/DeptTreeSelect.vue";
 import {addReport, getReport, updateReport} from "@/api/yh/report";
 import EditHeader from "@/components/EditHeader/index.vue";
-import EditIncome from "@/views/yh/report/components/EditIncome.vue";
 import {isEmpty, notNullDecimal} from "@/utils";
-import EditOrder from "@/views/yh/report/components/EditOrder.vue";
 import {mapGetters} from "vuex";
-import EditPrice from "@/views/yh/report/components/EditPrice.vue";
 import Decimal from "decimal.js";
+import ReportProductEdit from "@/views/yh/report/components/ReportProductEdit.vue";
+import {parseTime} from "@/utils/ruoyi";
 
 export default {
   name: "ReportEdit",
   dicts: ['income_mode'],
-  components: {EditPrice, EditOrder, EditIncome, EditHeader, DeptTreeSelect, PriceInput, FormCol},
+  components: {ReportProductEdit, EditHeader, DeptTreeSelect, PriceInput, FormCol},
   data() {
     return {
       title: null,
@@ -93,14 +70,24 @@ export default {
           { required: true, message: "工资模式不能为空", trigger: "blur" }
         ]
       },
-      incomeRules: {
-        userId: [
-          { required: true, message: "员工不能为空", trigger: "change" }
+      productRules: {
+        priceId: [
+          { required: true, message: "工序不能为空", trigger: "change" }
         ],
-        score: [
-          { required: true, message: "分数不能为空", trigger: "blur" },
-          { pattern: /^[0-9]*$/, message: "分数只能为数字", trigger: "blur"}
-        ]
+        num: [
+          { required: true, message: "产量不能为空", trigger: "change" }
+        ],
+        priceType: [
+          { required: true, message: "工序类型不能为空", trigger: "change" }
+        ],
+        userProductList: {
+          userId: [
+            { required: true, message: "用户不能为空", trigger: "change" }
+          ],
+          num: [
+            { required: true, message: "产量不能为空", trigger: "change" }
+          ]
+        }
       },
       headerCellStyle: {
         backgroundColor: "#f5f7fa",
@@ -112,8 +99,8 @@ export default {
     // 总价
     totalPrice() {
       let total = new Decimal(0);
-      if (this.form != null && !isEmpty(this.form.priceList)) {
-        this.form.priceList.forEach(item => {
+      if (this.form != null && !isEmpty(this.form.productList)) {
+        this.form.productList.forEach(item => {
           total = total.plus(notNullDecimal(item.price).mul(notNullDecimal(item.num)))
         })
       }
@@ -184,10 +171,8 @@ export default {
         updateTime: null,
         updateId: null,
         updateBy: null,
-        reportDate: new Date(),
-        incomeList: [],
-        orderList: [],
-        priceList: [],
+        reportDate: parseTime(new Date(), '{y}-{m}-{d}'),
+        productList: [],
       };
       this.resetForm("form");
     },
diff --git a/src/views/yh/report/index.vue b/src/views/yh/report/index.vue
index 0d3f178..5a991e5 100644
--- a/src/views/yh/report/index.vue
+++ b/src/views/yh/report/index.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="部门" prop="deptId">
-        <dept-tree-select v-model="queryParams.deptId" width="215px"/>
+        <dept-tree-select v-model="form.deptId" class="small-tree-select" @change="handleQuery"/>
       </el-form-item>
       <el-form-item label="状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="请选择状态" clearable @change="handleQuery">
@@ -14,70 +14,6 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="类别" prop="priceCategory">
-        <el-input
-          v-model="queryParams.priceCategory"
-          placeholder="请输入单价类别"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="大小" prop="priceSize">
-        <el-input
-          v-model="queryParams.priceSize"
-          placeholder="请输入单价大小"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="工序" prop="priceName">
-        <el-input
-          v-model="queryParams.priceName"
-          placeholder="请输入单价工序名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="子工序" prop="priceSubName">
-        <el-input
-          v-model="queryParams.priceSubName"
-          placeholder="请输入单价子工序名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="图案" prop="pricePattern">
-        <el-input
-          v-model="queryParams.pricePattern"
-          placeholder="请输入单价图案"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="规格" prop="priceSpec">
-        <el-input
-          v-model="queryParams.priceSpec"
-          placeholder="请输入单价规格"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="单位" prop="priceUnit">
-        <el-input
-          v-model="queryParams.priceUnit"
-          placeholder="请输入单价单位"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="分类" prop="priceClassify">
-        <el-input
-          v-model="queryParams.priceClassify"
-          placeholder="请输入单价分类"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="创建人" prop="createBy">
         <el-input
           v-model="queryParams.createBy"
@@ -147,15 +83,15 @@
       <el-table-column type="selection" width="55" align="center" />
       <template v-for="column of showColumns">
         <el-table-column
-            :key="column.key"
-            :label="column.label"
-            :prop="column.key"
-            :align="column.align"
-            :min-width="column.minWidth"
-            :sort-orders="orderSorts"
-            :sortable="column.sortable"
-            :show-overflow-tooltip="column.overflow"
-            :width="column.width"
+          :key="column.key"
+          :label="column.label"
+          :prop="column.key"
+          :align="column.align"
+          :min-width="column.minWidth"
+          :sort-orders="orderSorts"
+          :sortable="column.sortable"
+          :show-overflow-tooltip="column.overflow"
+          :width="column.width"
         >
           <template slot-scope="d">
             <template v-if="column.key === 'reportId'">
@@ -164,13 +100,16 @@
             <template v-else-if="column.key === 'status'">
               <dict-tag :options="dict.type.report_status" :value="d.row[column.key]"/>
             </template>
+            <template v-else-if="column.key === 'totalAmount'">
+              {{d.row.totalAmount | dv}} 元
+            </template>
             <template v-else>
-              {{d.row[column.key]}}
+              {{d.row[column.key] | dv}}
             </template>
           </template>
         </el-table-column>
       </template>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -201,12 +140,10 @@
 </template>
 
 <script>
-import { listReport, getReport, delReport, addReport, updateReport } from "@/api/yh/report";
+import { listReport, delReport } from "@/api/yh/report";
 import { $showColumns } from '@/utils/mixins';
 import FormCol from "@/components/FormCol/index.vue";
 import DeptTreeSelect from "@/components/Business/Dept/DeptTreeSelect.vue";
-import PriceInput from "@/components/Business/Price/PriceInput.vue";
-import {mapGetters} from "vuex";
 
 // 默认排序字段
 const defaultSort = {
@@ -218,35 +155,22 @@ export default {
   name: "Report",
   mixins: [$showColumns],
   dicts: ['report_status'],
-  components: {PriceInput, DeptTreeSelect, FormCol},
-  computed: {
-    ...mapGetters(['deptId'])
-  },
+  components: {DeptTreeSelect, FormCol},
   data() {
     return {
       // 字段列表
       columns: [
         {key: 'reportId', visible: false, label: 'ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'deptName', visible: true, label: '部门', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'num', visible: true, label: '完成数量', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100"},
+        {key: 'reportDate', visible: true, label: '报表日期', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'totalAmount', visible: true, label: '总金额', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'status', visible: true, label: '状态', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'priceId', visible: false, label: '单价ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100"},
-        {key: 'priceCategory', visible: true, label: '类别', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'priceSize', visible: true, label: '大小', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'priceName', visible: true, label: '工序', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'priceSubName', visible: true, label: '子工序', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100"},
-        {key: 'pricePattern', visible: true, label: '图案', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'priceSpec', visible: true, label: '规格', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'pricePrice', visible: true, label: '单价', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'priceUnit', visible: true, label: '单位', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'priceClassify', visible: true, label: '分类', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'priceQuantity', visible: false, label: '生产数量倍数', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'createBy', visible: true, label: '创建人', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100"},
-        {key: 'createTime', visible: true, label: '创建时间', minWidth: null, sortable: false, overflow: false, align: 'center', width: "100"},
-        {key: 'verifyBy', visible: true, label: '审核人', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100"},
-        {key: 'verifyTime', visible: true, label: '审核时间', minWidth: null, sortable: false, overflow: false, align: 'center', width: "100"},
-        {key: 'updateBy', visible: true, label: '更新人', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100"},
-        {key: 'updateTime', visible: true, label: '更新时间', minWidth: null, sortable: false, overflow: false, align: 'center', width: "100"},
+        {key: 'createBy', visible: true, label: '创建人', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'createTime', visible: true, label: '创建时间', minWidth: null, sortable: true, overflow: false, align: 'center', width: "180"},
+        {key: 'updateBy', visible: true, label: '更新人', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'updateTime', visible: true, label: '更新时间', minWidth: null, sortable: true, overflow: false, align: 'center', width: "180"},
+        {key: 'verifyBy', visible: true, label: '审核人', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'verifyTime', visible: true, label: '审核时间', minWidth: null, sortable: false, overflow: false, align: 'center', width: "180"},
       ],
       // 排序方式
       orderSorts: ['ascending', 'descending', null],
@@ -278,22 +202,31 @@ export default {
         reportId: null,
         deptId: null,
         status: null,
-        priceId: null,
-        priceCategory: null,
-        priceSize: null,
-        priceName: null,
-        priceSubName: null,
-        pricePattern: null,
-        priceSpec: null,
-        priceUnit: null,
-        priceClassify: null,
         createId: null,
         createBy: null,
+        verifyTime: null,
         verifyId: null,
         verifyBy: null,
         updateId: null,
         updateBy: null
       },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        deptId: [
+          { required: true, message: "部门ID不能为空", trigger: "blur" }
+        ],
+        status: [
+          { required: true, message: "状态不能为空", trigger: "change" }
+        ],
+        createTime: [
+          { required: true, message: "创建时间不能为空", trigger: "blur" }
+        ],
+        createBy: [
+          { required: true, message: "创建人名称不能为空", trigger: "blur" }
+        ],
+      }
     };
   },
   created() {
@@ -338,7 +271,7 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.$router.push(`/edit/report/add`)
+      this.$router.push("/edit/report/add")
     },
     /** 修改按钮操作 */
     handleUpdate(row) {