From ce6898816f56f7dbddd7684c106ca9e803ab9a3a 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: Wed, 20 Nov 2024 18:18:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/index.scss                  |    4 +-
 src/assets/styles/ipad.scss                   |    2 +-
 .../Business/ProdOrder/ProdOrderCheck.vue     |   63 +-
 .../Business/ProdOrder/ProdOrderDialog.vue    |   17 +-
 .../Business/ProdOrder/ProdOrderDrawer.vue    |    1 +
 .../Business/ProdOrder/ProdOrderInput.vue     |    8 +
 src/components/DateRangePicker/index.vue      |   64 ++
 src/components/FormCol/index.vue              |    5 +-
 src/layout/components/Navbar.vue              |   17 +-
 src/main.js                                   |  117 ++
 src/plugins/tab.js                            |    5 +
 src/utils/constants.js                        |   21 +
 src/utils/index.js                            |   57 +
 src/views/index.vue                           | 1012 +----------------
 src/views/yh-ipad/report/index.vue            |   53 +-
 src/views/yh/prodOrder/index.vue              |   22 +-
 .../edit/components/ReportProductEdit.vue     |   23 +-
 .../components/ReportProductOrderListEdit.vue |   87 +-
 .../edit/components/ReportProductRowEdit.vue  |   94 +-
 .../components/ReportProductUserListEdit.vue  |   20 +-
 src/views/yh/report/edit/edit.vue             |   41 +-
 src/views/yh/report/mixins.js                 |   29 +
 .../ReportOrderProdDescriptions.vue           |   55 +-
 .../components/ReportUserProdDescriptions.vue |    6 +-
 src/views/yh/reportProd/index.vue             |   37 +-
 25 files changed, 671 insertions(+), 1189 deletions(-)
 create mode 100644 src/components/DateRangePicker/index.vue
 create mode 100644 src/views/yh/report/mixins.js

diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index 7a995ac..56aa8fa 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -262,9 +262,11 @@ aside {
 
   .drawer-content {
     position: relative;
+    width: 100%;
     padding: 8px;
     flex: 1;
-    overflow: auto;
+    overflow-x: hidden;
+    overflow-y: auto;
     height: calc(100vh - 100px);
   }
   .drawer-operator-box {
diff --git a/src/assets/styles/ipad.scss b/src/assets/styles/ipad.scss
index a86a6f6..7dfd079 100644
--- a/src/assets/styles/ipad.scss
+++ b/src/assets/styles/ipad.scss
@@ -16,7 +16,7 @@
     width: 100%;
     overflow-y: auto;
     overflow-x: hidden;
-    padding: 8px 20px;
+    padding: 8px 20px 32px;
   }
 }
 
diff --git a/src/components/Business/ProdOrder/ProdOrderCheck.vue b/src/components/Business/ProdOrder/ProdOrderCheck.vue
index 7975097..54b26e8 100644
--- a/src/components/Business/ProdOrder/ProdOrderCheck.vue
+++ b/src/components/Business/ProdOrder/ProdOrderCheck.vue
@@ -1,14 +1,6 @@
 <template>
   <div>
     <el-form :model="queryParams" ref="queryForm" size="small"  v-show="showSearch" :inline="true" label-width="100px">
-      <el-form-item label="单据ID" prop="erpId">
-        <el-input
-          v-model="queryParams.erpId"
-          placeholder="请输入单据ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="单据编号" prop="erpBillNo">
         <el-input
           v-model="queryParams.erpBillNo"
@@ -82,7 +74,6 @@
           :width="column.width"
         >
           <template slot-scope="d">
-
             <template v-if="column.key === 'id'">
               {{d.row[column.key]}}
             </template>
@@ -98,6 +89,10 @@
             <template v-else-if="column.key === 'erpIsRework'">
               <boolean-tag :value="d.row.erpIsRework"/>
             </template>
+            <template v-else-if="['erpQty', 'erpNoStockInQty'].includes(column.key)">
+              {{d.row[column.key]}}
+              <template v-if="!isEmpty(d.row.unitName)">{{d.row.unitName}}</template>
+            </template>
             <template v-else>
               {{d.row[column.key] | dv}}
             </template>
@@ -123,7 +118,7 @@ import Price from "@/views/yh/price/index.vue";
 import DeptTreeSelect from "@/components/Business/Dept/DeptTreeSelect.vue";
 import {$showColumns} from "@/utils/mixins";
 import {listPrice} from "@/api/yh/price";
-import {deepClone} from "@/utils";
+import {deepClone, isEmpty} from "@/utils";
 import {listProdOrder} from "@/api/yh/prodOrder";
 
 const defaultSort = {
@@ -172,7 +167,8 @@ export default {
         pageSize: 10,
         orderByColumn: defaultSort.prop,
         isAsc: defaultSort.order,
-        erpStatusList: []
+        erpStatusList: [],
+        erpIsRework: null,
       },
       total: 0,
       selected: [],
@@ -180,42 +176,45 @@ export default {
       columns: [
         {key: 'id', visible: false, label: '生产订单ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'erpId', visible: false, label: '单据ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'erpBillNo', visible: true, label: '单据编号', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100"},
+        {key: 'erpBillNo', visible: true, label: '编号', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'erpDocumentStatus', visible: false, label: '单据状态', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100"},
         {key: 'erpCreateDate', visible: false, label: '创建日期', minWidth: null, sortable: false, overflow: false, align: 'center', width: "100"},
         {key: 'erpModifyDate', visible: false, label: '修改日期', minWidth: null, sortable: false, overflow: false, align: 'center', width: "100"},
         {key: 'erpDescription', visible: false, label: '主表备注', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'erpDate', visible: false, label: '单据日期', minWidth: null, sortable: false, overflow: false, align: 'center', width: "100"},
-        {key: 'materialNumber', visible: true, label: '物料编码', minWidth: null, sortable: false, overflow: false, align: 'center', width: "100"},
-        {key: 'erpIsRework', visible: true, label: '是否返工', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100"},
+        {key: 'materialNumber', visible: true, label: '物料', minWidth: null, sortable: false, overflow: false, align: 'center', width: null},
+        {key: 'erpIsRework', visible: true, label: '返工', minWidth: null, sortable: false, overflow: false, align: 'center', width: "60"},
         {key: 'erpRowId', visible: false, label: '行标识', minWidth: null, sortable: true, overflow: true, align: 'center', width: null},
-        {key: 'erpMemoItem', visible: true, label: '备注', minWidth: null, sortable: true, overflow: true, align: 'center', width: "100"},
-        {key: 'erpConveyDate', visible: true, label: '下达日期', minWidth: null, sortable: false, overflow: false, align: 'center', width: "100"},
-        {key: 'erpStatus', visible: true, label: '状态', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'workShopName', visible: true, label: '车间', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'erpMemoItem', visible: true, label: '备注', minWidth: null, sortable: false, overflow: true, align: 'center', width: null},
+        {key: 'erpConveyDate', visible: true, label: '下达日期', minWidth: null, sortable: false, overflow: false, align: 'center', width: "90"},
+        {key: 'erpStatus', visible: true, label: '状态', minWidth: null, sortable: false, overflow: false, align: 'center', width: "60"},
+        {key: 'workShopName', visible: true, label: '车间', minWidth: null, sortable: false, overflow: false, align: 'center', width: null},
         {key: 'erpReqSrc', visible: false, label: '需求来源', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'erpQty', visible: true, label: '数量', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'erpNoStockInQty', visible: true, label: '未入库', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'erpBaseUnitQty', visible: false, label: '基本单位数量', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'unitName', visible: true, label: '单位', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'unitName', visible: false, label: '单位', minWidth: null, sortable: false, overflow: false, align: 'center', width: "50"},
+        {key: 'erpQty', visible: true, label: '数量', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100"},
+        {key: 'erpBaseUnitQty', visible: false, label: '基本单位数量', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100"},
+        {key: 'erpNoStockInQty', visible: true, label: '未入库', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100"},
+        {key: 'erpBaseNoStockInQty', visible: false, label: '基本未入库', minWidth: null, sortable: true, overflow: false, align: 'center', width: "120"},
       ],
     }
   },
   created() {
-      this.queryParams = {
-        ...this.queryParams,
-        ...this.query,
-      }
+    console.log("created", this.query);
+    this.queryParams = {
+      ...this.queryParams,
+      ...this.query,
+    }
 
-      if (this.initSelect) {
-        this.selected = deepClone(this.initSelect);
-      } else {
-        this.selected = [];
-      }
+    if (this.initSelect) {
+      this.selected = deepClone(this.initSelect);
+    } else {
+      this.selected = [];
+    }
 
-      this.getList();
+    this.getList();
   },
   methods: {
+    isEmpty,
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
diff --git a/src/components/Business/ProdOrder/ProdOrderDialog.vue b/src/components/Business/ProdOrder/ProdOrderDialog.vue
index c50e004..696695e 100644
--- a/src/components/Business/ProdOrder/ProdOrderDialog.vue
+++ b/src/components/Business/ProdOrder/ProdOrderDialog.vue
@@ -3,15 +3,14 @@
 
 <template>
   <el-dialog :title="title" :visible="show" width="90%" top="2vh" @close="close" :append-to-body="true">
-      <el-scrollbar style="height: 50vh">
-        <prod-order-check
-          v-if="show"
-          ref="check"
-          :multiple="multiple"
-          :init-select="initSelect"
-          v-on="$listeners"
-        />
-      </el-scrollbar>
+    <prod-order-check
+      v-if="show"
+      ref="check"
+      :multiple="multiple"
+      :init-select="initSelect"
+      v-on="$listeners"
+      :query="query"
+    />
     <template #footer>
       <el-button type="primary" @click="submit()">确定</el-button>
     </template>
diff --git a/src/components/Business/ProdOrder/ProdOrderDrawer.vue b/src/components/Business/ProdOrder/ProdOrderDrawer.vue
index c294fd2..c5d451b 100644
--- a/src/components/Business/ProdOrder/ProdOrderDrawer.vue
+++ b/src/components/Business/ProdOrder/ProdOrderDrawer.vue
@@ -13,6 +13,7 @@
           ref="check"
           :multiple="multiple"
           :init-select="initSelect"
+          :query="query"
           v-on="$listeners"
         />
       </div>
diff --git a/src/components/Business/ProdOrder/ProdOrderInput.vue b/src/components/Business/ProdOrder/ProdOrderInput.vue
index ffc6b2c..ee82a6b 100644
--- a/src/components/Business/ProdOrder/ProdOrderInput.vue
+++ b/src/components/Business/ProdOrder/ProdOrderInput.vue
@@ -85,6 +85,14 @@ export default {
       type: String,
       default: 'dialog',
     },
+    title: {
+      type: String,
+      default: "选择生产订单"
+    },
+    placeholder: {
+      type: String,
+      default: "点击选择生产订单"
+    }
   }
 }
 </script>
diff --git a/src/components/DateRangePicker/index.vue b/src/components/DateRangePicker/index.vue
new file mode 100644
index 0000000..c6fcc97
--- /dev/null
+++ b/src/components/DateRangePicker/index.vue
@@ -0,0 +1,64 @@
+<template>
+  <el-date-picker
+    v-model="dateRange"
+    type="daterange"
+    value-format="yyyy-MM-dd"
+    range-separator="至"
+    start-placeholder="开始日期"
+    end-placeholder="结束日期"
+    :picker-options="pickerOptions"
+    :clearable="false"
+    v-on="$listeners"
+  />
+</template>
+<script >
+import { getLastDate, getLastMonth } from '@/utils'
+
+export default {
+  name: "DateRangePicker",
+  props: {
+    value: {
+      type: Array,
+      default: null,
+    },
+  },
+  data() {
+    return {
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = getLastDate(0);
+            const start = getLastDate(6);
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = getLastDate(0);
+            const start = getLastMonth(1);
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = getLastDate(0);
+            const start = getLastMonth(3);
+            picker.$emit('pick', [start, end]);
+          }
+        }]
+      },
+    }
+  },
+  computed: {
+    dateRange: {
+      get() {
+        return this.value
+      },
+      set(val) {
+        this.$emit('input', val);
+      }
+    }
+  },
+}
+</script>
diff --git a/src/components/FormCol/index.vue b/src/components/FormCol/index.vue
index 9b5f8c8..9fc42ed 100644
--- a/src/components/FormCol/index.vue
+++ b/src/components/FormCol/index.vue
@@ -40,6 +40,9 @@ export default {
 
 <style scoped lang="scss">
 .table-form-item {
-  margin: 0 0 12px;
+  margin: 0;
+}
+.is-error {
+  margin-bottom: 18px;
 }
 </style>
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 466cd98..b8aa44d 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -8,20 +8,11 @@
     <div class="right-menu">
       <template v-if="device!=='mobile'">
         <search id="header-search" class="right-menu-item" />
+<!--        <screenfull id="screenfull" class="right-menu-item hover-effect" />-->
 
-        <el-tooltip content="源码地址" effect="dark" placement="bottom">
-          <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
-        </el-tooltip>
-
-        <el-tooltip content="文档地址" effect="dark" placement="bottom">
-          <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
-        </el-tooltip>
-
-        <screenfull id="screenfull" class="right-menu-item hover-effect" />
-
-        <el-tooltip content="布局大小" effect="dark" placement="bottom">
-          <size-select id="size-select" class="right-menu-item hover-effect" />
-        </el-tooltip>
+<!--        <el-tooltip content="布局大小" effect="dark" placement="bottom">-->
+<!--          <size-select id="size-select" class="right-menu-item hover-effect" />-->
+<!--        </el-tooltip>-->
 
       </template>
 
diff --git a/src/main.js b/src/main.js
index dfae22d..ecb0e2a 100644
--- a/src/main.js
+++ b/src/main.js
@@ -88,3 +88,120 @@ new Vue({
   store,
   render: h => h(App)
 })
+
+
+// 全局添加table左右拖动效果的指令
+Vue.directive('tableMove', {
+    bind: function (el, binding, vnode) {
+        var odiv = el // 获取当前表格元素
+
+        // 修改样式小手标志
+        // el.style.cursor = 'pointer'
+        el.querySelector('.el-table .el-table__body-wrapper').style.cursor = 'pointer'
+
+        var mouseDownAndUpTimer = null
+        var mouseOffset = 0
+        var mouseFlag = false
+
+        let bindRef = binding.value[0] //绑定的表格的ref属性
+
+
+        odiv.onmousedown = (e) => {
+            const ePath = composedPath(e)
+            // 拖拽表头不滑动
+            if (ePath.some(res => {
+                return res && res.className && res.className.indexOf('el-table__header') > -1
+            })) return
+
+            if (e.which !== 1) return
+
+            mouseOffset = e.clientX
+            mouseDownAndUpTimer = setTimeout(function () {
+                mouseFlag = true
+            }, 80)
+        }
+
+        odiv.onmouseup = (e) => {
+            setTimeout(() => {
+                // 解决拖动列宽行不对齐问题--渲染表格
+                vnode.context.$refs[bindRef].doLayout()
+            }, 200)
+            if (mouseFlag) {
+                mouseFlag = false
+            } else {
+                clearTimeout(mouseDownAndUpTimer) // 清除延迟时间
+            }
+        }
+
+        odiv.onmouseleave = (e) => {
+            setTimeout(() => {
+                // 解决拖动列宽行不对齐问题--渲染表格
+                vnode.context.$refs[bindRef].doLayout()
+            }, 200)
+            mouseFlag = false
+        }
+
+        odiv.onmousemove = (e) => {
+            if (e.which !== 1) return
+
+            const divData = odiv.querySelector('.el-table .el-table__body-wrapper')
+            if (mouseFlag && divData) {
+                // 设置水平方向的元素的位置
+                divData.scrollLeft -= (-mouseOffset + (mouseOffset = e.clientX))
+            }
+        }
+
+        // 解决有些时候,在鼠标松开的时候,元素仍然可以拖动;
+        odiv.ondragstart = (e) => {
+            e.preventDefault()
+        }
+
+        odiv.ondragend = (e) => {
+            e.preventDefault()
+        }
+
+        // 点击复制文本
+        // odiv.onclick = (e) => {
+        //   setTimeout(() => {
+        //     if (mouseFlag) return
+        //     if (e.target.nodeName === 'SPAN') {
+        //       console.log(mouseFlag, e.target.nodeName, this)
+        //       var aux = document.createElement('input')
+        //       aux.setAttribute('value', e.target.outerText)
+        //       document.body.appendChild(aux)
+        //       aux.select()
+        //       document.execCommand('copy')
+        //       document.body.removeChild(aux)
+        //       if (document.execCommand('copy')) {
+        //         console.log('复制成功')
+        //       } else {
+        //         console.log('复制失败')
+        //       }
+        //     }
+        //   }, 300)
+        // }
+
+        // 是否拖拽可选中文字
+        odiv.onselectstart = () => {
+            return false
+        }
+
+        //浏览器Event.path属性不存在
+        function composedPath(e) {
+            // 存在则直接return
+            if (e.path) {
+                return e.path
+            }
+            // 不存在则遍历target节点
+            let target = e.target
+            e.path = []
+            while (target.parentNode !== null) {
+                e.path.push(target)
+                target = target.parentNode
+            }
+            // 最后补上document和window
+            e.path.push(document, window)
+            return e.path
+        }
+    }
+})
diff --git a/src/plugins/tab.js b/src/plugins/tab.js
index fcde419..8ed9409 100644
--- a/src/plugins/tab.js
+++ b/src/plugins/tab.js
@@ -29,6 +29,11 @@ export default {
       return router.push(obj);
     }
   },
+  // 关闭当前tab页签，并回到上个页签
+  closeBack() {
+    store.dispatch("tagsView/delView", router.currentRoute);
+    return router.back();
+  },
   // 关闭指定tab页签
   closePage(obj) {
     if (obj === undefined) {
diff --git a/src/utils/constants.js b/src/utils/constants.js
index ebf32ae..f511a95 100644
--- a/src/utils/constants.js
+++ b/src/utils/constants.js
@@ -71,3 +71,24 @@ export const ReportStatus = {
     return [this.PASS, this.REJECT].includes(status);
   }
 }
+
+/**
+ * 生产订单ERP业务状态
+ */
+export const ProdOrderErpStatus = {
+  PLAN: "1",  // 计划
+  PLAN_CONFIRM: "2",  // 计划确认
+  ISSUED: "3", // 下达
+  START_WORK: "4",  // 开工
+  END_WORK: "5",  // 完工
+  CLOSED: "6",  // 结案
+  FINISHED: "7",  // 结算
+}
+
+/**
+ * 报表工序类型
+ */
+export const ReportPriceType = {
+  PUBLIC: "1",  // 公共工序
+  BILL: "2",  // 订单工序
+}
diff --git a/src/utils/index.js b/src/utils/index.js
index dc92f7d..c5f1fee 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -442,3 +442,60 @@ export function notNullDecimal(val) {
 export function isEmpty(val) {
   return val == null || val.length === 0;
 }
+
+// 获取前n天的日期
+export function getLastDate(n) {
+  let now = new Date();
+  return new Date(now.getTime() - n * 24 * 3600 * 1000)
+}
+
+// 获取前n月的日期
+export function getLastMonth(n) {
+  const date = new Date();
+  const year = date.getFullYear();
+  const month = date.getMonth();
+  const day = date.getDate();
+
+  // 减去 n 个月
+  date.setMonth(month - n);
+
+  // 确保日期不超过当月的最大天数
+  const maxDay = new Date(date.getFullYear(), date.getMonth() + 1, 0).getDate();
+  date.setDate(Math.min(day, maxDay));
+
+  return date;
+}
+
+// 获取前n月的日期字符串
+export function getLastMonthDateStr(n) {
+  let date = getLastMonth(n);
+  return parseTime(date, "{y}-{m}-{d}")
+}
+
+// 获取前n天的日期字符串
+export function getLastDateStr(n) {
+  let date = getLastDate(n);
+  return parseTime(date, "{y}-{m}-{d}");
+}
+
+// 获取前n天的日期时间字符串00:00:00
+export function getLastDateTimeStartStr(n) {
+  let date = getLastDate(n);
+  return parseTime(date, "{y}-{m}-{d} 00:00:00");
+}
+
+// 获取前n天的日期时间字符串23:59:59
+export function getLastDateTimeEndStr(n) {
+  let date = getLastDate(n);
+  return parseTime(date, "{y}-{m}-{d} 23:59:59");
+}
+
+// 获取前n天的日期时间00:00:00
+export function getLastDateTimeStart(n) {
+  return new Date(getLastDateTimeStartStr(n));
+}
+
+// 获取前n天的日期时间23:59:59
+export function getLastDateTimeEnd(n) {
+  return new Date(getLastDateTimeEndStr(n));
+}
diff --git a/src/views/index.vue b/src/views/index.vue
index 8081a92..41e0d17 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -1,1016 +1,6 @@
 <template>
   <div class="app-container home">
-    <el-row :gutter="20">
-      <el-col :sm="24" :lg="24">
-        <blockquote class="text-warning" style="font-size: 14px">
-          领取阿里云通用云产品1888优惠券
-          <br />
-          <el-link
-            href="https://www.aliyun.com/minisite/goods?userCode=brki8iof"
-            type="primary"
-            target="_blank"
-            >https://www.aliyun.com/minisite/goods?userCode=brki8iof</el-link
-          >
-          <br />
-          领取腾讯云通用云产品2860优惠券
-          <br />
-          <el-link
-            href="https://cloud.tencent.com/redirect.php?redirect=1025&cps_key=198c8df2ed259157187173bc7f4f32fd&from=console"
-            type="primary"
-            target="_blank"
-            >https://cloud.tencent.com/redirect.php?redirect=1025&cps_key=198c8df2ed259157187173bc7f4f32fd&from=console</el-link
-          >
-          <br />
-          阿里云服务器折扣区
-          <el-link href="http://aly.ruoyi.vip" type="primary" target="_blank"
-            >>☛☛点我进入☚☚</el-link
-          >
-          &nbsp;&nbsp;&nbsp; 腾讯云服务器秒杀区
-          <el-link href="http://txy.ruoyi.vip" type="primary" target="_blank"
-            >>☛☛点我进入☚☚</el-link
-          ><br />
-          <h4 class="text-danger">
-            云产品通用红包，可叠加官网常规优惠使用。(仅限新用户)
-          </h4>
-        </blockquote>
-
-        <hr />
-      </el-col>
-    </el-row>
-    <el-row :gutter="20">
-      <el-col :sm="24" :lg="12" style="padding-left: 20px">
-        <h2>若依后台管理框架</h2>
-        <p>
-          一直想做一款后台管理系统，看了很多优秀的开源项目但是发现没有合适自己的。于是利用空闲休息时间开始自己写一套后台系统。如此有了若依管理系统，她可以用于所有的Web应用程序，如网站管理后台，网站会员中心，CMS，CRM，OA等等，当然，您也可以对她进行深度定制，以做出更强系统。所有前端后台代码封装过后十分精简易上手，出错概率低。同时支持移动客户端访问。系统会陆续更新一些实用功能。
-        </p>
-        <p>
-          <b>当前版本:</b> <span>v{{ version }}</span>
-        </p>
-        <p>
-          <el-tag type="danger">&yen;免费开源</el-tag>
-        </p>
-        <p>
-          <el-button
-            type="primary"
-            size="mini"
-            icon="el-icon-cloudy"
-            plain
-            @click="goTarget('https://gitee.com/y_project/RuoYi-Vue')"
-            >访问码云</el-button
-          >
-          <el-button
-            size="mini"
-            icon="el-icon-s-home"
-            plain
-            @click="goTarget('http://ruoyi.vip')"
-            >访问主页</el-button
-          >
-        </p>
-      </el-col>
-
-      <el-col :sm="24" :lg="12" style="padding-left: 50px">
-        <el-row>
-          <el-col :span="12">
-            <h2>技术选型</h2>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="6">
-            <h4>后端技术</h4>
-            <ul>
-              <li>SpringBoot</li>
-              <li>Spring Security</li>
-              <li>JWT</li>
-              <li>MyBatis</li>
-              <li>Druid</li>
-              <li>Fastjson</li>
-              <li>...</li>
-            </ul>
-          </el-col>
-          <el-col :span="6">
-            <h4>前端技术</h4>
-            <ul>
-              <li>Vue</li>
-              <li>Vuex</li>
-              <li>Element-ui</li>
-              <li>Axios</li>
-              <li>Sass</li>
-              <li>Quill</li>
-              <li>...</li>
-            </ul>
-          </el-col>
-        </el-row>
-      </el-col>
-    </el-row>
-    <el-divider />
-    <el-row :gutter="20">
-      <el-col :xs="24" :sm="24" :md="12" :lg="8">
-        <el-card class="update-log">
-          <div slot="header" class="clearfix">
-            <span>联系信息</span>
-          </div>
-          <div class="body">
-            <p>
-              <i class="el-icon-s-promotion"></i> 官网：<el-link
-                href="http://www.ruoyi.vip"
-                target="_blank"
-                >http://www.ruoyi.vip</el-link
-              >
-            </p>
-            <p>
-              <i class="el-icon-user-solid"></i> QQ群：<s> 满937441 </s> <s> 满887144332 </s>
-              <s> 满180251782 </s> <s> 满104180207 </s> <s> 满186866453 </s> <s> 满201396349 </s>
-              <s> 满101456076 </s> <s> 满101539465 </s> <s> 满264312783 </s> <s> 满167385320 </s> 
-              <s> 满104748341 </s> <s> 满160110482 </s> <s> 满170801498 </s> <s> 满108482800 </s> 
-              <s> 满101046199 </s> <s> 满136919097 </s> <s> 满143961921 </s> <s> 满174951577 </s> 
-              <s> 满161281055 </s> <s> 满138988063 </s> <a href="http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=SUc-msaypcqB2UTFif4eqGlBHkKcvMNP&authKey=JdQBouY2PG%2BS%2BCzAfIgbCGNgxyahpfh24IW%2F03rPxGilhqVbisLma%2FFFnt79DHNh&noverify=0&group_code=151450850" target="_blank">151450850</a>
-            </p>
-            <p>
-              <i class="el-icon-chat-dot-round"></i> 微信：<a
-                href="javascript:;"
-                >/ *若依</a
-              >
-            </p>
-            <p>
-              <i class="el-icon-money"></i> 支付宝：<a
-                href="javascript:;"
-                class="支付宝信息"
-                >/ *若依</a
-              >
-            </p>
-          </div>
-        </el-card>
-      </el-col>
-      <el-col :xs="24" :sm="24" :md="12" :lg="8">
-        <el-card class="update-log">
-          <div slot="header" class="clearfix">
-            <span>更新日志</span>
-          </div>
-          <el-collapse accordion>
-            <el-collapse-item title="v3.8.8 - 2024-06-30">
-              <ol>
-                <li>菜单管理新增路由名称</li>
-                <li>新增数据脱敏过滤注解</li>
-                <li>用户密码新增非法字符验证</li>
-                <li>限制用户操作数据权限范围</li>
-                <li>代码生成新增创建表结构功能</li>
-                <li>定时任务白名单配置范围缩小</li>
-                <li>优化代码生成主子表关联查询方式</li>
-                <li>Excel注解新增属性comboReadDict</li>
-                <li>Excel注解ColumnType类型新增文本</li>
-                <li>新增国际化资源文件配置</li>
-                <li>升级oshi到最新版本6.6.1</li>
-                <li>升级druid到最新版本1.2.23</li>
-                <li>升级core-js到最新版本3.37.1</li>
-                <li>更新HttpUtils中的User-Agent</li>
-                <li>更新compressionPlugin到6.1.2以兼容node18+</li>
-                <li>升级spring-security到安全版本，防止漏洞风险</li>
-                <li>升级spring-framework到安全版本，防止漏洞风险</li>
-                <li>优化自定义XSS注解匹配方式</li>
-                <li>优化缓存监控键名列表排序显示</li>
-                <li>优化定时任务日志默认按时间排序</li>
-                <li>优化默认文件大小超过2G无效的问题</li>
-                <li>优化查表特殊字符使用反斜杠进行转义</li>
-                <li>优化定时任务cron表达式小时配置显示错误问题</li>
-                <li>优化多个自定数据权限使用in查询,避免多次拼接</li>
-                <li>优化导入Excel时设置dictType属性重复查缓存问题</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.8.7 - 2023-12-08">
-              <ol>
-                <li>操作日志记录部门名称</li>
-                <li>全局数据存储用户编号</li>
-                <li>新增编程式判断资源访问权限</li>
-                <li>操作日志列表新增IP地址查询</li>
-                <li>定时任务新增页去除状态选项</li>
-                <li>代码生成支持选择前端模板类型</li>
-                <li>显隐列组件支持复选框弹出类型</li>
-                <li>通用排序属性orderBy参数限制长度</li>
-                <li>Excel自定义数据处理器增加单元格/工作簿对象</li>
-                <li>升级oshi到最新版本6.4.8</li>
-                <li>升级druid到最新版本1.2.20</li>
-                <li>升级fastjson到最新版2.0.43</li>
-                <li>升级pagehelper到最新版1.4.7</li>
-                <li>升级commons.io到最新版本2.13.0</li>
-                <li>升级element-ui到最新版本2.15.14</li>
-                <li>修复五级路由缓存无效问题</li>
-                <li>修复外链带端口出现的异常</li>
-                <li>修复树模板父级编码变量错误</li>
-                <li>修复字典表详情页面搜索问题</li>
-                <li>修复内链iframe没有传递参数问题</li>
-                <li>修复自定义字典样式不生效的问题</li>
-                <li>修复字典缓存删除方法参数错误问题</li>
-                <li>修复Excel导入数据临时文件无法删除问题</li>
-                <li>修复未登录带参数访问成功后参数丢失问题</li>
-                <li>修复HeaderSearch组件跳转query参数丢失问题</li>
-                <li>修复代码生成导入后必填项与数据库不匹配问题</li>
-                <li>修复Excels导入时无法获取到dictType字典值问题</li>
-                <li>优化下载zip方法新增遮罩层</li>
-                <li>优化头像上传参数新增文件名称</li>
-                <li>优化字典标签支持自定义分隔符</li>
-                <li>优化菜单管理类型为按钮状态可选</li>
-                <li>优化前端防重复提交数据大小限制</li>
-                <li>优化TopNav菜单没有图标svg不显示</li>
-                <li>优化数字金额大写转换精度丢失问题</li>
-                <li>优化富文本Editor组件检验图片格式</li>
-                <li>优化页签在Firefox浏览器被遮挡的问题</li>
-                <li>优化个人中心/基本资料修改时数据显示问题</li>
-                <li>优化缓存监控图表支持跟随屏幕大小自适应调整</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.8.6 - 2023-06-30">
-              <ol>
-                <li>支持登录IP黑名单限制</li>
-                <li>新增监控页面图标显示</li>
-                <li>操作日志新增消耗时间属性</li>
-                <li>屏蔽定时任务bean违规的字符</li>
-                <li>日志管理使用索引提升查询性能</li>
-                <li>日志注解支持排除指定的请求参数</li>
-                <li>支持自定义隐藏属性列过滤子对象</li>
-                <li>升级oshi到最新版本6.4.3</li>
-                <li>升级druid到最新版本1.2.16</li>
-                <li>升级fastjson到最新版2.0.34</li>
-                <li>升级spring-boot到最新版本2.5.15</li>
-                <li>升级element-ui到最新版本2.15.13</li>
-                <li>移除apache/commons-fileupload依赖</li>
-                <li>修复页面切换时布局错乱的问题</li>
-                <li>修复匿名注解Anonymous空指针问题</li>
-                <li>修复路由跳转被阻止时内部产生报错信息问题</li>
-                <li>修复isMatchedIp的参数判断产生空指针的问题</li>
-                <li>修复用户多角色数据权限可能出现权限抬升的情况</li>
-                <li>修复开启TopNav后一级菜单路由参数设置无效问题</li>
-                <li>修复DictTag组件value没有匹配的值时则展示value</li>
-                <li>优化文件下载出现的异常</li>
-                <li>优化选择图标组件高亮回显</li>
-                <li>优化弹窗后导航栏偏移的问题</li>
-                <li>优化修改密码日志存储明文问题</li>
-                <li>优化页签栏关闭其他出现的异常问题</li>
-                <li>优化页签关闭左侧选项排除首页选项</li>
-                <li>优化关闭当前tab页跳转最右侧tab页</li>
-                <li>优化缓存列表清除操作提示不变的问题</li>
-                <li>优化字符未使用下划线不进行驼峰式处理</li>
-                <li>优化用户导入更新时需获取用户编号问题</li>
-                <li>优化侧边栏的平台标题与VUE_APP_TITLE保持同步</li>
-                <li>优化导出Excel时设置dictType属性重复查缓存问题</li>
-                <li>连接池Druid支持新的配置connectTimeout和socketTimeout</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.8.5 - 2023-01-01">
-              <ol>
-                <li>定时任务违规的字符</li>
-                <li>重置时取消部门选中</li>
-                <li>新增返回警告消息提示</li>
-                <li>忽略不必要的属性数据返回</li>
-                <li>修改参数键名时移除前缓存配置</li>
-                <li>导入更新用户数据前校验数据权限</li>
-                <li>兼容Excel下拉框内容过多无法显示的问题</li>
-                <li>升级echarts到最新版本5.4.0</li>
-                <li>升级core-js到最新版本3.25.3</li>
-                <li>升级oshi到最新版本6.4.0</li>
-                <li>升级kaptcha到最新版2.3.3</li>
-                <li>升级druid到最新版本1.2.15</li>
-                <li>升级fastjson到最新版2.0.20</li>
-                <li>升级pagehelper到最新版1.4.6</li>
-                <li>优化弹窗内容过多展示不全问题</li>
-                <li>优化swagger-ui静态资源使用缓存</li>
-                <li>开启TopNav没有子菜单隐藏侧边栏</li>
-                <li>删除fuse无效选项maxPatternLength</li>
-                <li>优化导出对象的子列表为空会出现[]问题</li>
-                <li>优化编辑头像时透明部分会变成黑色问题</li>
-                <li>优化小屏幕上修改头像界面布局错位的问题</li>
-                <li>修复代码生成勾选属性无效问题</li>
-                <li>修复文件上传组件格式验证问题</li>
-                <li>修复回显数据字典数组异常问题</li>
-                <li>修复sheet超出最大行数异常问题</li>
-                <li>修复Log注解GET请求记录不到参数问题</li>
-                <li>修复调度日志点击多次数据不变化的问题</li>
-                <li>修复主题颜色在Drawer组件不会加载问题</li>
-                <li>修复文件名包含特殊字符的文件无法下载问题</li>
-                <li>修复table中更多按钮切换主题色未生效修复问题</li>
-                <li>修复某些特性的环境生成代码变乱码TXT文件问题</li>
-                <li>修复代码生成图片/文件/单选时选择必填无法校验问题</li>
-                <li>修复某些特性的情况用户编辑对话框中角色和部门无法修改问题</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.8.4 - 2022-09-26">
-              <ol>
-                <li>数据逻辑删除不进行唯一验证</li>
-                <li>Excel注解支持导出对象的子列表方法</li>
-                <li>Excel注解支持自定义隐藏属性列</li>
-                <li>Excel注解支持backgroundColor属性设置背景色</li>
-                <li>支持配置密码最大错误次数/锁定时间</li>
-                <li>登录日志新增解锁账户功能</li>
-                <li>通用下载方法新增config配置选项</li>
-                <li>支持多权限字符匹配角色数据权限</li>
-                <li>页面内嵌iframe切换tab不刷新数据</li>
-                <li>操作日志记录支持排除敏感属性字段</li>
-                <li>修复多文件上传报错出现的异常问题</li>
-                <li>修复图片预览组件src属性为null值控制台报错问题</li>
-                <li>升级oshi到最新版本6.2.2</li>
-                <li>升级fastjson到最新版2.0.14</li>
-                <li>升级pagehelper到最新版1.4.3</li>
-                <li>升级core-js到最新版本3.25.2</li>
-                <li>升级element-ui到最新版本2.15.10</li>
-                <li>优化任务过期不执行调度</li>
-                <li>优化字典数据使用store存取</li>
-                <li>优化修改资料头像被覆盖的问题</li>
-                <li>优化修改用户登录账号重复验证</li>
-                <li>优化代码生成同步后值NULL问题</li>
-                <li>优化定时任务支持执行父类方法</li>
-                <li>优化用户个人信息接口防止修改部门</li>
-                <li>优化布局设置使用el-drawer抽屉显示</li>
-                <li>优化没有权限的用户编辑部门缺少数据</li>
-                <li>优化日志注解记录限制请求地址的长度</li>
-                <li>优化excel/scale属性导出单元格数值类型</li>
-                <li>优化日志操作中重置按钮时重复查询的问题</li>
-                <li>优化多个相同角色数据导致权限SQL重复问题</li>
-                <li>优化表格上右侧工具条（搜索按钮显隐&右侧样式凸出）</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.8.3 - 2022-06-27">
-              <ol>
-                <li>新增缓存列表菜单功能</li>
-                <li>代码生成树表新增(展开/折叠)</li>
-                <li>Excel注解支持color字体颜色</li>
-                <li>新增Anonymous匿名访问不鉴权注解</li>
-                <li>用户头像上传限制只能为图片格式</li>
-                <li>接口使用泛型使其看到响应属性字段</li>
-                <li>检查定时任务bean所在包名是否为白名单配置</li>
-                <li>添加页签openPage支持传递参数</li>
-                <li>用户缓存信息添加部门ancestors祖级列表</li>
-                <li>升级element-ui到最新版本2.15.8</li>
-                <li>升级oshi到最新版本6.1.6</li>
-                <li>升级druid到最新版本1.2.11</li>
-                <li>升级fastjson到最新版2.0.8</li>
-                <li>升级spring-boot到最新版本2.5.14</li>
-                <li>降级jsencrypt版本兼容IE浏览器</li>
-                <li>删除多余的salt字段</li>
-                <li>新增获取不带后缀文件名称方法</li>
-                <li>新增获取配置文件中的属性值方法</li>
-                <li>新增内容编码/解码方便插件集成使用</li>
-                <li>字典类型必须以字母开头，且只能为（小写字母，数字，下滑线）</li>
-                <li>优化设置分页参数默认值</li>
-                <li>优化对空字符串参数处理的过滤</li>
-                <li>优化显示顺序orderNum类型为整型</li>
-                <li>优化表单构建按钮不显示正则校验</li>
-                <li>优化字典数据回显样式下拉框显示值</li>
-                <li>优化R响应成功状态码与全局保持一致</li>
-                <li>优化druid开启wall过滤器出现的异常问题</li>
-                <li>优化用户管理左侧树型组件增加选中高亮保持</li>
-                <li>优化新增用户与角色信息&用户与岗位信息逻辑</li>
-                <li>优化默认不启用压缩文件缓存防止node_modules过大</li>
-                <li>修复字典数据显示不全问题</li>
-                <li>修复操作日志查询类型条件为0时会查到所有数据</li>
-                <li>修复Excel注解prompt/combo同时使用不生效问题</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.8.2 - 2022-04-01">
-              <ol>
-                <li>前端支持设置是否需要防止数据重复提交</li>
-                <li>开启TopNav没有子菜单情况隐藏侧边栏</li>
-                <li>侧边栏菜单名称过长悬停显示标题</li>
-                <li>用户访问控制时校验数据权限，防止越权</li>
-                <li>导出Excel时屏蔽公式，防止CSV注入风险</li>
-                <li>组件ImagePreview支持多图预览显示</li>
-                <li>组件ImageUpload支持多图同时选择上传</li>
-                <li>组件FileUpload支持多文件同时选择上传</li>
-                <li>服务监控新增运行参数信息显示</li>
-                <li>定时任务目标字符串过滤特殊字符</li>
-                <li>定时任务目标字符串验证包名白名单</li>
-                <li>代码生成列表图片支持预览</li>
-                <li>代码生成编辑修改打开新页签</li>
-                <li>代码生成新增Java类型Boolean</li>
-                <li>代码生成子表支持日期/字典配置</li>
-                <li>代码生成同步保留必填/类型选项</li>
-                <li>升级oshi到最新版本6.1.2</li>
-                <li>升级fastjson到最新版1.2.80</li>
-                <li>升级pagehelper到最新版1.4.1</li>
-                <li>升级spring-boot到最新版本2.5.11</li>
-                <li>升级spring-boot-mybatis到最新版2.2.2</li>
-                <li>添加遗漏的分页参数合理化属性</li>
-                <li>修改npm即将过期的注册源地址</li>
-                <li>修复分页组件请求两次问题</li>
-                <li>修复通用文件下载接口跨域问题</li>
-                <li>修复Xss注解字段值为空时的异常问题</li>
-                <li>修复选项卡点击右键刷新丢失参数问题</li>
-                <li>修复表单清除元素位置未垂直居中问题</li>
-                <li>修复服务监控中运行参数显示条件错误</li>
-                <li>修复导入Excel时字典字段类型为Long转义为空问题</li>
-                <li>修复登录超时刷新页面跳转登录页面还提示重新登录问题</li>
-                <li>优化加载字典缓存数据</li>
-                <li>优化IP地址获取到多个的问题</li>
-                <li>优化任务队列满时任务拒绝策略</li>
-                <li>优化文件上传兼容Weblogic环境</li>
-                <li>优化定时任务默认保存到内存中执行</li>
-                <li>优化部门修改缩放后出现的错位问题</li>
-                <li>优化Excel格式化不同类型的日期对象</li>
-                <li>优化菜单表关键字导致的插件报错问题</li>
-                <li>优化Oracle用户头像列为空时不显示问题</li>
-                <li>优化页面若未匹配到字典标签则返回原字典值</li>
-                <li>优化修复登录失效后多次请求提示多次弹窗问题</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.8.1 - 2022-01-01">
-              <ol>
-                <li>新增Vue3前端代码生成模板</li>
-                <li>新增图片预览组件</li>
-                <li>新增压缩插件实现打包Gzip</li>
-                <li>自定义xss校验注解实现</li>
-                <li>自定义文字复制剪贴指令</li>
-                <li>代码生成预览支持复制内容</li>
-                <li>路由支持单独配置菜单或角色权限</li>
-                <li>用户管理部门查询选择节点后分页参数初始</li>
-                <li>修复用户分配角色属性错误</li>
-                <li>修复打包后字体图标偶现的乱码问题</li>
-                <li>修复菜单管理重置表单出现的错误</li>
-                <li>修复版本差异导致的懒加载报错问题</li>
-                <li>修复Cron组件中周回显问题</li>
-                <li>修复定时任务多参数逗号分隔的问题</li>
-                <li>修复根据ID查询列表可能出现的主键溢出问题</li>
-                <li>修复tomcat配置参数已过期问题</li>
-                <li>升级clipboard到最新版本2.0.8</li>
-                <li>升级oshi到最新版本v5.8.6</li>
-                <li>升级fastjson到最新版1.2.79</li>
-                <li>升级spring-boot到最新版本2.5.8</li>
-                <li>升级log4j2到2.17.1，防止漏洞风险</li>
-                <li>优化下载解析blob异常提示</li>
-                <li>优化代码生成字典组重复问题</li>
-                <li>优化查询用户的角色组&岗位组代码</li>
-                <li>优化定时任务cron表达式小时设置24</li>
-                <li>优化用户导入提示溢出则显示滚动条</li>
-                <li>优化防重复提交标识组合为(key+url+header)</li>
-                <li>优化分页方法设置成通用方便灵活调用</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.8.0 - 2021-12-01">
-              <ol>
-                <li>新增配套并同步的Vue3前端版本</li>
-                <li>新增通用方法简化模态/缓存/下载/权限/页签使用</li>
-                <li>优化导出数据/使用通用下载方法</li>
-                <li>Excel注解支持自定义数据处理器</li>
-                <li>Excel注解支持导入导出标题信息</li>
-                <li>Excel导入支持@Excels注解</li>
-                <li>新增组件data-dict，简化数据字典使用</li>
-                <li>新增Jaxb依赖，防止jdk8以上出现的兼容错误</li>
-                <li>生产环境使用路由懒加载提升页面响应速度</li>
-                <li>修复五级以上菜单出现的404问题</li>
-                <li>防重提交注解支持配置间隔时间/提示消息</li>
-                <li>日志注解新增是否保存响应参数</li>
-                <li>任务屏蔽违规字符&参数忽略双引号中的逗号</li>
-                <li>升级SpringBoot到最新版本2.5.6</li>
-                <li>升级pagehelper到最新版1.4.0</li>
-                <li>升级spring-boot-mybatis到最新版2.2.0</li>
-                <li>升级oshi到最新版本v5.8.2</li>
-                <li>升级druid到最新版1.2.8</li>
-                <li>升级velocity到最新版本2.3</li>
-                <li>升级fastjson到最新版1.2.78</li>
-                <li>升级axios到最新版本0.24.0</li>
-                <li>升级dart-sass到版本1.32.13</li>
-                <li>升级core-js到最新版本3.19.1</li>
-                <li>升级jsencrypt到最新版本3.2.1</li>
-                <li>升级js-cookie到最新版本3.0.1</li>
-                <li>升级file-saver到最新版本2.0.5</li>
-                <li>升级sass-loader到最新版本10.1.1</li>
-                <li>升级element-ui到最新版本2.15.6</li>
-                <li>新增sendGet无参请求方法</li>
-                <li>禁用el-tag组件的渐变动画</li>
-                <li>代码生成点击预览重置激活tab</li>
-                <li>AjaxResult重写put方法，以方便链式调用</li>
-                <li>优化登录/验证码请求headers不设置token</li>
-                <li>优化用户个人信息接口防止修改用户名</li>
-                <li>优化Cron表达式生成器关闭时销毁避免缓存</li>
-                <li>优化注册成功提示消息类型success</li>
-                <li>优化aop语法，使用spring自动注入注解</li>
-                <li>优化记录登录信息，移除不必要的修改</li>
-                <li>优化mybatis全局默认的执行器</li>
-                <li>优化Excel导入图片可能出现的异常</li>
-                <li>修复代码生成模板主子表删除缺少事务</li>
-                <li>修复日志记录可能出现的转换异常</li>
-                <li>修复代码生成复选框字典遗漏问题</li>
-                <li>修复关闭xss功能导致可重复读RepeatableFilter失效</li>
-                <li>修复字符串无法被反转义问题</li>
-                <li>修复后端主子表代码模板方法名生成错误问题</li>
-                <li>修复xss过滤后格式出现的异常</li>
-                <li>修复swagger没有指定dataTypeClass导致启动出现warn日志</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.7.0 - 2021-09-13">
-              <ol>
-                <li>参数管理支持配置验证码开关</li>
-                <li>新增是否开启用户注册功能</li>
-                <li>定时任务支持在线生成cron表达式</li>
-                <li>菜单管理支持配置路由参数</li>
-                <li>支持自定义注解实现接口限流</li>
-                <li>Excel注解支持Image图片导入</li>
-                <li>自定义弹层溢出滚动样式</li>
-                <li>自定义可拖动弹窗宽度指令</li>
-                <li>自定义可拖动弹窗高度指令</li>
-                <li>修复任意账户越权问题</li>
-                <li>修改时检查用户数据权限范围</li>
-                <li>修复保存配置主题颜色失效问题</li>
-                <li>新增暗色菜单风格主题</li>
-                <li>菜单&部门新增展开/折叠功能</li>
-                <li>页签新增关闭左侧&添加图标</li>
-                <li>顶部菜单排除隐藏的默认路由</li>
-                <li>顶部菜单同步系统主题样式</li>
-                <li>跳转路由高亮相对应的菜单栏</li>
-                <li>代码生成主子表多选行数据</li>
-                <li>日期范围支持添加多组</li>
-                <li>升级element-ui到最新版本2.15.5</li>
-                <li>升级oshi到最新版本v5.8.0</li>
-                <li>升级commons.io到最新版本v2.11.0</li>
-                <li>定时任务屏蔽ldap远程调用</li>
-                <li>定时任务屏蔽http(s)远程调用</li>
-                <li>补充定时任务表字段注释</li>
-                <li>定时任务对检查异常进行事务回滚</li>
-                <li>启用父部门状态排除顶级节点</li>
-                <li>富文本新增上传文件大小限制</li>
-                <li>默认首页使用keep-alive缓存</li>
-                <li>修改代码生成字典回显样式</li>
-                <li>自定义分页合理化传入参数</li>
-                <li>修复字典组件值为整形不显示问题</li>
-                <li>修复定时任务日志执行状态显示</li>
-                <li>角色&菜单新增字段属性提示信息</li>
-                <li>修复角色分配用户页面参数类型错误提醒</li>
-                <li>优化布局设置动画特效</li>
-                <li>优化异常处理信息</li>
-                <li>优化错误token导致的解析异常</li>
-                <li>密码框新增显示切换密码图标</li>
-                <li>定时任务新增更多操作</li>
-                <li>更多操作按钮添加权限控制</li>
-                <li>导入用户样式优化</li>
-                <li>提取通用方法到基类控制器</li>
-                <li>优化使用权限工具获取用户信息</li>
-                <li>优化用户不能删除自己</li>
-                <li>优化XSS跨站脚本过滤</li>
-                <li>优化代码生成模板</li>
-                <li>验证码默认20s超时</li>
-                <li>BLOB下载时清除URL对象引用</li>
-                <li>代码生成导入表按创建时间排序</li>
-                <li>修复代码生成页面数据编辑保存之后总是跳转第一页的问题</li>
-                <li>修复带safari浏览器无法格式化utc日期格式yyyy-MM-dd'T'HH:mm:ss.SSS问题</li>
-                <li>多图上传组件移除多余的api地址&验证失败导致图片删除问题&无法删除相应图片修复</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.6.0 - 2021-07-12">
-              <ol>
-                <li>角色管理新增分配用户功能</li>
-                <li>用户管理新增分配角色功能</li>
-                <li>日志列表支持排序操作</li>
-                <li>优化参数&字典缓存操作</li>
-                <li>系统布局配置支持动态标题开关</li>
-                <li>菜单路由配置支持内链访问</li>
-                <li>默认访问后端首页新增提示语</li>
-                <li>富文本默认上传返回url类型</li>
-                <li>新增自定义弹窗拖拽指令</li>
-                <li>全局注册常用通用组件</li>
-                <li>全局挂载字典标签组件</li>
-                <li>ImageUpload组件支持多图片上传</li>
-                <li>FileUpload组件支持多文件上传</li>
-                <li>文件上传组件添加数量限制属性</li>
-                <li>富文本编辑组件添加类型属性</li>
-                <li>富文本组件工具栏配置视频</li>
-                <li>封装通用iframe组件</li>
-                <li>限制超级管理员不允许操作</li>
-                <li>用户信息长度校验限制</li>
-                <li>分页组件新增pagerCount属性</li>
-                <li>添加bat脚本执行应用</li>
-                <li>升级oshi到最新版本v5.7.4</li>
-                <li>升级element-ui到最新版本2.15.2</li>
-                <li>升级pagehelper到最新版1.3.1</li>
-                <li>升级commons.io到最新版本v2.10.0</li>
-                <li>升级commons.fileupload到最新版本v1.4</li>
-                <li>升级swagger到最新版本v3.0.0</li>
-                <li>修复关闭confirm提示框控制台报错问题</li>
-                <li>修复存在的SQL注入漏洞问题</li>
-                <li>定时任务屏蔽rmi远程调用</li>
-                <li>修复用户搜索分页变量错误</li>
-                <li>修复导出角色数据范围翻译缺少仅本人</li>
-                <li>修复表单构建选择下拉选择控制台报错问题</li>
-                <li>优化图片工具类读取文件</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.5.0 - 2021-05-25">
-              <ol>
-                <li>新增菜单导航显示风格TopNav（false为左侧导航菜单，true为顶部导航菜单）</li>
-                <li>布局设置支持保存&重置配置</li>
-                <li>修复树表数据显示不全&加载慢问题</li>
-                <li>新增IE浏览器版本过低提示页面</li>
-                <li>用户登录后记录最后登录IP&时间</li>
-                <li>页面导出按钮点击之后添加遮罩</li>
-                <li>富文本编辑器支持自定义上传地址</li>
-                <li>富文本编辑组件新增readOnly属性</li>
-                <li>页签TagsView新增关闭右侧功能</li>
-                <li>显隐列组件加载初始默认隐藏列</li>
-                <li>关闭头像上传窗口还原默认图片</li>
-                <li>个人信息添加手机&邮箱重复验证</li>
-                <li>代码生成模板导出按钮点击后添加遮罩</li>
-                <li>代码生成模板树表操作列添加新增按钮</li>
-                <li>代码生成模板修复主子表字段重名问题</li>
-                <li>升级fastjson到最新版1.2.76</li>
-                <li>升级druid到最新版本v1.2.6</li>
-                <li>升级mybatis到最新版3.5.6 阻止远程代码执行漏洞</li>
-                <li>升级oshi到最新版本v5.6.0</li>
-                <li>velocity剔除commons-collections版本，防止3.2.1版本的反序列化漏洞</li>
-                <li>数据监控页默认账户密码防止越权访问</li>
-                <li>修复firefox下表单构建拖拽会新打卡一个选项卡</li>
-                <li>修正后端导入表权限标识</li>
-                <li>修正前端操作日志&登录日志权限标识</li>
-                <li>设置Redis配置HashKey序列化</li>
-                <li>删除操作日志记录信息</li>
-                <li>上传媒体类型添加视频格式</li>
-                <li>修复请求形参未传值记录日志异常问题</li>
-                <li>优化xss校验json请求条件</li>
-                <li>树级结构更新子节点使用replaceFirst</li>
-                <li>优化ExcelUtil空值处理</li>
-                <li>日志记录过滤BindingResult对象，防止异常</li>
-                <li>修改主题后mini类型按钮无效问题</li>
-                <li>优化通用下载完成后删除节点</li>
-                <li>通用Controller添加响应返回消息</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.4.0 - 2021-02-22">
-              <ol>
-                <li>代码生成模板支持主子表</li>
-                <li>表格右侧工具栏组件支持显隐列</li>
-                <li>图片组件添加预览&移除功能</li>
-                <li>Excel注解支持Image图片导出</li>
-                <li>操作按钮组调整为朴素按钮样式</li>
-                <li>代码生成支持文件上传组件</li>
-                <li>代码生成日期控件区分范围</li>
-                <li>代码生成数据库文本类型生成表单文本域</li>
-                <li>用户手机邮箱&菜单组件修改允许空字符串</li>
-                <li>升级SpringBoot到最新版本2.2.13 提升启动速度</li>
-                <li>升级druid到最新版本v1.2.4</li>
-                <li>升级fastjson到最新版1.2.75</li>
-                <li>升级element-ui到最新版本2.15.0</li>
-                <li>修复IE11浏览器报错问题</li>
-                <li>优化多级菜单之间切换无法缓存的问题</li>
-                <li>修复四级菜单无法显示问题</li>
-                <li>修正侧边栏静态路由丢失问题</li>
-                <li>修复角色管理-编辑角色-功能权限显示异常</li>
-                <li>配置文件新增redis数据库索引属性</li>
-                <li>权限工具类增加admin判断</li>
-                <li>角色非自定义权限范围清空选择值</li>
-                <li>修复导入数据为负浮点数时丢失精度问题</li>
-                <li>移除path-to-regexp正则匹配插件</li>
-                <li>修复生成树表代码异常</li>
-                <li>修改ip字段长度防止ipv6地址长度不够</li>
-                <li>防止get请求参数值为false或0等特殊值会导致无法正确的传参</li>
-                <li>登录后push添加catch防止出现检查错误</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.3.0 - 2020-12-14">
-              <ol>
-                <li>新增缓存监控功能</li>
-                <li>支持主题风格配置</li>
-                <li>修复多级菜单之间切换无法缓存的问题</li>
-                <li>多级菜单自动配置组件</li>
-                <li>代码生成预览支持高亮显示</li>
-                <li>支持Get请求映射Params参数</li>
-                <li>删除用户和角色解绑关联</li>
-                <li>去除用户手机邮箱部门必填验证</li>
-                <li>Excel支持注解align对齐方式</li>
-                <li>Excel支持导入Boolean型数据</li>
-                <li>优化头像样式，鼠标移入悬停遮罩</li>
-                <li>代码生成预览提供滚动机制</li>
-                <li>代码生成删除多余的数字float类型</li>
-                <li>修正转换字符串的目标字符集属性</li>
-                <li>回显数据字典防止空值报错</li>
-                <li>日志记录增加过滤多文件场景</li>
-                <li>修改缓存Set方法可能导致嵌套的问题</li>
-                <li>移除前端一些多余的依赖</li>
-                <li>防止安全扫描YUI出现的风险提示</li>
-                <li>修改node-sass为dart-sass</li>
-                <li>升级SpringBoot到最新版本2.1.18</li>
-                <li>升级poi到最新版本4.1.2</li>
-                <li>升级oshi到最新版本v5.3.6</li>
-                <li>升级bitwalker到最新版本1.21</li>
-                <li>升级axios到最新版本0.21.0</li>
-                <li>升级element-ui到最新版本2.14.1</li>
-                <li>升级vue到最新版本2.6.12</li>
-                <li>升级vuex到最新版本3.6.0</li>
-                <li>升级vue-cli到版本4.5.9</li>
-                <li>升级vue-router到最新版本3.4.9</li>
-                <li>升级vue-cli到最新版本4.4.6</li>
-                <li>升级vue-cropper到最新版本0.5.5</li>
-                <li>升级clipboard到最新版本2.0.6</li>
-                <li>升级core-js到最新版本3.8.1</li>
-                <li>升级echarts到最新版本4.9.0</li>
-                <li>升级file-saver到最新版本2.0.4</li>
-                <li>升级fuse.js到最新版本6.4.3</li>
-                <li>升级js-beautify到最新版本1.13.0</li>
-                <li>升级js-cookie到最新版本2.2.1</li>
-                <li>升级path-to-regexp到最新版本6.2.0</li>
-                <li>升级quill到最新版本1.3.7</li>
-                <li>升级screenfull到最新版本5.0.2</li>
-                <li>升级sortablejs到最新版本1.10.2</li>
-                <li>升级vuedraggable到最新版本2.24.3</li>
-                <li>升级chalk到最新版本4.1.0</li>
-                <li>升级eslint到最新版本7.15.0</li>
-                <li>升级eslint-plugin-vue到最新版本7.2.0</li>
-                <li>升级lint-staged到最新版本10.5.3</li>
-                <li>升级runjs到最新版本4.4.2</li>
-                <li>升级sass-loader到最新版本10.1.0</li>
-                <li>升级script-ext-html-webpack-plugin到最新版本2.1.5</li>
-                <li>升级svg-sprite-loader到最新版本5.1.1</li>
-                <li>升级vue-template-compiler到最新版本2.6.12</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.2.1 - 2020-11-18">
-              <ol>
-                <li>阻止任意文件下载漏洞</li>
-                <li>代码生成支持上传控件</li>
-                <li>新增图片上传组件</li>
-                <li>调整默认首页</li>
-                <li>升级druid到最新版本v1.2.2</li>
-                <li>mapperLocations配置支持分隔符</li>
-                <li>权限信息调整</li>
-                <li>调整sql默认时间</li>
-                <li>解决代码生成没有bit类型的问题</li>
-                <li>升级pagehelper到最新版1.3.0</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.2.0 - 2020-10-10">
-              <ol>
-                <li>升级springboot版本到2.1.17 提升安全性</li>
-                <li>升级oshi到最新版本v5.2.5</li>
-                <li>升级druid到最新版本v1.2.1</li>
-                <li>升级jjwt到版本0.9.1</li>
-                <li>升级fastjson到最新版1.2.74</li>
-                <li>修改sass为node-sass，避免el-icon图标乱码</li>
-                <li>代码生成支持同步数据库</li>
-                <li>代码生成支持富文本控件</li>
-                <li>代码生成页面时不忽略remark属性</li>
-                <li>代码生成添加select必填选项</li>
-                <li>Excel导出类型NUMERIC支持精度浮点类型</li>
-                <li>Excel导出targetAttr优化获取值，防止get方法不规范</li>
-                <li>Excel注解支持自动统计数据总和</li>
-                <li>Excel注解支持设置BigDecimal精度&舍入规则</li>
-                <li>菜单&数据权限新增（展开/折叠 全选/全不选 父子联动）</li>
-                <li>允许用户分配到部门父节点</li>
-                <li>菜单新增是否缓存keep-alive</li>
-                <li>表格操作列间距调整</li>
-                <li>限制系统内置参数不允许删除</li>
-                <li>富文本组件优化，支持自定义高度&图片冲突问题</li>
-                <li>富文本工具栏样式对齐</li>
-                <li>导入excel整形值校验优化</li>
-                <li>修复页签关闭所有时固定标签路由不刷新问题</li>
-                <li>表单构建布局型组件新增按钮</li>
-                <li>左侧菜单文字过长显示省略号</li>
-                <li>修正根节点为子部门时，树状结构显示问题</li>
-                <li>修正调用目标字符串最大长度</li>
-                <li>修正菜单提示信息错误</li>
-                <li>修正定时任务执行一次权限标识</li>
-                <li>修正数据库字符串类型nvarchar</li>
-                <li>优化递归子节点</li>
-                <li>优化数据权限判断</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-
-            <el-collapse-item title="v3.1.0 - 2020-08-13">
-              <ol>
-                <li>表格工具栏右侧添加刷新&显隐查询组件</li>
-                <li>后端支持CORS跨域请求</li>
-                <li>代码生成支持选择上级菜单</li>
-                <li>代码生成支持自定义路径</li>
-                <li>代码生成支持复选框</li>
-                <li>Excel导出导入支持dictType字典类型</li>
-                <li>Excel支持分割字符串组内容</li>
-                <li>验证码类型支持（数组计算、字符验证）</li>
-                <li>升级vue-cli版本到4.4.4</li>
-                <li>修改 node-sass 为 dart-sass</li>
-                <li>表单类型为Integer/Long设置整形默认值</li>
-                <li>代码生成器默认mapper路径与默认mapperScan路径不一致</li>
-                <li>优化防重复提交拦截器</li>
-                <li>优化上级菜单不能选择自己</li>
-                <li>修复角色的权限分配后，未实时生效问题</li>
-                <li>修复在线用户日志记录类型</li>
-                <li>修复富文本空格和缩进保存后不生效问题</li>
-                <li>修复在线用户判断逻辑</li>
-                <li>唯一限制条件只返回单条数据</li>
-                <li>添加获取当前的环境配置方法</li>
-                <li>超时登录后页面跳转到首页</li>
-                <li>全局异常状态汉化拦截处理</li>
-                <li>HTML过滤器改为将html转义</li>
-                <li>检查字符支持小数点&降级改成异常提醒</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-
-            <el-collapse-item title="v3.0.0 - 2020-07-20">
-              <ol>
-                <li>单应用调整为多模块项目</li>
-                <li>升级element-ui版本到2.13.2</li>
-                <li>删除babel，提高编译速度。</li>
-                <li>新增菜单默认主类目</li>
-                <li>编码文件名修改为uuid方式</li>
-                <li>定时任务cron表达式验证</li>
-                <li>角色权限修改时已有权限未自动勾选异常修复</li>
-                <li>防止切换权限用户后登录出现404</li>
-                <li>Excel支持sort导出排序</li>
-                <li>创建用户不允许选择超级管理员角色</li>
-                <li>修复代码生成导入表结构出现异常页面不提醒问题</li>
-                <li>修复代码生成点击多次表修改数据不变化的问题</li>
-                <li>修复头像上传成功二次打开无法改变裁剪框大小和位置问题</li>
-                <li>修复布局为small者mini用户表单显示错位问题</li>
-                <li>修复热部署导致的强换异常问题</li>
-                <li>修改用户管理复选框宽度，防止部分浏览器出现省略号</li>
-                <li>IpUtils工具，清除Xss特殊字符，防止Xff注入攻击</li>
-                <li>生成domain 如果是浮点型 统一用BigDecimal</li>
-                <li>定时任务调整label-width，防止部署出现错位</li>
-                <li>调整表头固定列默认样式</li>
-                <li>代码生成模板调整，字段为String并且必填则加空串条件</li>
-                <li>代码生成字典Integer/Long使用parseInt</li>
-                <li>
-                  修复dict_sort不可update为0的问题&查询返回增加dict_sort升序排序
-                </li>
-                <li>修正岗位导出权限注解</li>
-                <li>禁止加密密文返回前端</li>
-                <li>修复代码生成页面中的查询条件创建时间未生效的问题</li>
-                <li>修复首页搜索菜单外链无法点击跳转问题</li>
-                <li>修复菜单管理选择图标，backspace删除时不过滤数据</li>
-                <li>用户管理部门分支节点不可检查&显示计数</li>
-                <li>数据范围过滤属性调整</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-
-            <el-collapse-item title="v2.3.0 - 2020-06-01">
-              <ol>
-                <li>升级fastjson到最新版1.2.70 修复高危安全漏洞</li>
-                <li>dev启动默认打开浏览器</li>
-                <li>vue-cli使用默认source-map</li>
-                <li>slidebar eslint报错优化</li>
-                <li>当tags-view滚动关闭右键菜单</li>
-                <li>字典管理添加缓存读取</li>
-                <li>参数管理支持缓存操作</li>
-                <li>支持一级菜单（和主页同级）在main区域显示</li>
-                <li>限制外链地址必须以http(s)开头</li>
-                <li>tagview & sidebar 主题颜色与element ui(全局)同步</li>
-                <li>修改数据源类型优先级，先根据方法，再根据类</li>
-                <li>支持是否需要设置token属性，自定义返回码消息。</li>
-                <li>swagger请求前缀加入配置。</li>
-                <li>登录地点设置内容过长则隐藏显示</li>
-                <li>修复定时任务执行一次按钮后不提示消息问题</li>
-                <li>修改上级部门（选择项排除本身和下级）</li>
-                <li>通用http发送方法增加参数 contentType 编码类型</li>
-                <li>更换IP地址查询接口</li>
-                <li>修复页签变量undefined</li>
-                <li>添加校验部门包含未停用的子部门</li>
-                <li>修改定时任务详情下次执行时间日期显示错误</li>
-                <li>角色管理查询设置默认排序字段</li>
-                <li>swagger添加enable参数控制是否启用</li>
-                <li>只对json类型请求构建可重复读取inputStream的request</li>
-                <li>修改代码生成字典字段int类型没有自动选中问题</li>
-                <li>vuex用户名取值修正</li>
-                <li>表格树模板去掉多余的)</li>
-                <li>代码生成序号修正</li>
-                <li>全屏情况下不调整上外边距</li>
-                <li>代码生成Date字段添加默认格式</li>
-                <li>用户管理角色选择权限控制</li>
-                <li>修复路由懒加载报错问题</li>
-                <li>模板sql.vm添加菜单状态</li>
-                <li>设置用户名称不能修改</li>
-                <li>dialog添加append-to-body属性，防止ie遮罩</li>
-                <li>菜单区分状态和显示隐藏功能</li>
-                <li>升级fastjson到最新版1.2.68 修复安全加固</li>
-                <li>修复代码生成如果选择字典类型缺失逗号问题</li>
-                <li>登录请求params更换为data，防止暴露url</li>
-                <li>日志返回时间格式处理</li>
-                <li>添加handle控制允许拖动的元素</li>
-                <li>布局设置点击扩大范围</li>
-                <li>代码生成列属性排序查询</li>
-                <li>代码生成列支持拖动排序</li>
-                <li>修复时间格式不支持ios问题</li>
-                <li>表单构建添加父级class，防止冲突</li>
-                <li>定时任务并发属性修正</li>
-                <li>角色禁用&菜单隐藏不查询权限</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-
-            <el-collapse-item title="v2.2.0 - 2020-03-18">
-              <ol>
-                <li>系统监控新增定时任务功能</li>
-                <li>添加一个打包Web工程bat</li>
-                <li>修复页签鼠标滚轮按下的时候，可以关闭不可关闭的tag</li>
-                <li>修复点击退出登录有时会无提示问题</li>
-                <li>修复防重复提交注解无效问题</li>
-                <li>修复通知公告批量删除异常问题</li>
-                <li>添加菜单时路由地址必填限制</li>
-                <li>代码生成字段描述可编辑</li>
-                <li>修复用户修改个人信息导致缓存不过期问题</li>
-                <li>个人信息创建时间获取正确属性值</li>
-                <li>操作日志详细显示正确类型</li>
-                <li>导入表单击行数据时选中对应的复选框</li>
-                <li>批量替换表前缀逻辑调整</li>
-                <li>固定重定向路径表达式</li>
-                <li>升级element-ui版本到2.13.0</li>
-                <li>操作日志排序调整</li>
-                <li>修复charts切换侧边栏或者缩放窗口显示bug</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-
-            <el-collapse-item title="v2.1.0 - 2020-02-24">
-              <ol>
-                <li>新增表单构建</li>
-                <li>代码生成支持树表结构</li>
-                <li>新增用户导入</li>
-                <li>修复动态加载路由页面刷新问题</li>
-                <li>修复地址开关无效问题</li>
-                <li>汉化错误提示页面</li>
-                <li>代码生成已知问题修改</li>
-                <li>修复多数据源下配置关闭出现异常处理</li>
-                <li>添加HTML过滤器，用于去除XSS漏洞隐患</li>
-                <li>修复上传头像控制台出现异常</li>
-                <li>修改用户管理分页不正确的问题</li>
-                <li>修复验证码记录提示错误</li>
-                <li>修复request.js缺少Message引用</li>
-                <li>修复表格时间为空出现的异常</li>
-                <li>添加Jackson日期反序列化时区配置</li>
-                <li>调整根据用户权限加载菜单数据树形结构</li>
-                <li>调整成功登录不恢复按钮，防止多次点击</li>
-                <li>修改用户个人资料同步缓存信息</li>
-                <li>修复页面同时出现el-upload和Editor不显示处理</li>
-                <li>修复在角色管理页修改菜单权限偶尔未选中问题</li>
-                <li>配置文件新增redis密码属性</li>
-                <li>设置mybatis全局的配置文件</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-
-            <el-collapse-item title="v2.0.0 - 2019-12-02">
-              <ol>
-                <li>新增代码生成</li>
-                <li>新增@RepeatSubmit注解，防止重复提交</li>
-                <li>新增菜单主目录添加/删除操作</li>
-                <li>日志记录过滤特殊对象，防止转换异常</li>
-                <li>修改代码生成路由脚本错误</li>
-                <li>用户上传头像实时同步缓存，无需重新登录</li>
-                <li>调整切换页签后不重新加载数据</li>
-                <li>添加jsencrypt实现参数的前端加密</li>
-                <li>系统退出删除用户缓存记录</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v1.1.0 - 2019-11-11">
-              <ol>
-                <li>新增在线用户管理</li>
-                <li>新增按钮组功能实现（批量删除、导出、清空）</li>
-                <li>新增查询条件重置按钮</li>
-                <li>新增Swagger全局Token配置</li>
-                <li>新增后端参数校验</li>
-                <li>修复字典管理页面的日期查询异常</li>
-                <li>修改时间函数命名防止冲突</li>
-                <li>去除菜单上级校验，默认为顶级</li>
-                <li>修复用户密码无法修改问题</li>
-                <li>修复菜单类型为按钮时不显示权限标识</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v1.0.0 - 2019-10-08">
-              <ol>
-                <li>若依前后端分离系统正式发布</li>
-              </ol>
-            </el-collapse-item>
-          </el-collapse>
-        </el-card>
-      </el-col>
-      <el-col :xs="24" :sm="24" :md="12" :lg="8">
-        <el-card class="update-log">
-          <div slot="header" class="clearfix">
-            <span>捐赠支持</span>
-          </div>
-          <div class="body">
-            <img
-              src="@/assets/images/pay.png"
-              alt="donate"
-              width="100%"
-            />
-            <span style="display: inline-block; height: 30px; line-height: 30px"
-              >你可以请作者喝杯咖啡表示鼓励</span
-            >
-          </div>
-        </el-card>
-      </el-col>
-    </el-row>
+    <h3>欢迎使用盈浩生产管理系统!</h3>
   </div>
 </template>
 
diff --git a/src/views/yh-ipad/report/index.vue b/src/views/yh-ipad/report/index.vue
index 7a5c96b..b787b7a 100644
--- a/src/views/yh-ipad/report/index.vue
+++ b/src/views/yh-ipad/report/index.vue
@@ -1,5 +1,27 @@
 <template>
   <div class="ipad-container" v-loading="loading">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="报表日期" prop="reportDateRange" label-width="80px">
+        <date-range-picker v-model="queryParams.reportDateRange" @change="handleQuery" />
+      </el-form-item>
+      <el-form-item label="状态" prop="statusList">
+        <el-checkbox-group v-model="queryParams.statusList" @change="handleQuery">
+          <el-checkbox-button
+            v-for="dict in dict.type.report_status"
+            :key="dict.value"
+            :label="dict.value"
+          >{{dict.label}}
+          </el-checkbox-button>
+        </el-checkbox-group>
+      </el-form-item>
+<!--      <el-form-item label="部门" prop="deptId">-->
+<!--        <dept-tree-select v-model="form.deptId" class="small-tree-select" @change="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>
 
     <div class="top-bar">
       <el-button
@@ -90,6 +112,8 @@
 import {$showColumns} from "@/utils/mixins";
 import {cancelReport, delReport, listReport, submitReport} from "@/api/yh/report";
 import {ReportStatus} from "@/utils/constants";
+import DeptTreeSelect from "@/components/Business/Dept/DeptTreeSelect.vue";
+import DateRangePicker from "@/components/DateRangePicker/index.vue";
 
 // 默认排序字段
 const defaultSort = {
@@ -98,6 +122,7 @@ const defaultSort = {
 }
 export default {
   name: "IpadReport",
+  components: {DateRangePicker, DeptTreeSelect},
   computed: {
     ReportStatus() {
       return ReportStatus
@@ -110,19 +135,19 @@ export default {
       row: {},
       // 字段列表
       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: '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: 'reportId', visible: true, label: '报表编号', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'deptName', visible: false, label: '部门', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'reportDate', visible: false, 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: 'totalAmount', visible: true, label: '总金额', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'remark', visible: true, label: '备注', minWidth: null, sortable: false, overflow: false, align: 'center', width: "180"},
         {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"},
-        {key: 'remark', visible: true, label: '备注', minWidth: null, sortable: false, overflow: false, align: 'center', width: "180"},
-      ],
+              ],
       // 排序方式
       orderSorts: ['ascending', 'descending', null],
       // 遮罩层
@@ -159,7 +184,9 @@ export default {
         verifyId: null,
         verifyBy: null,
         updateId: null,
-        updateBy: null
+        updateBy: null,
+        statusList: [],
+        reportDateRange: [],
       },
       // 表单参数
       form: {},
@@ -192,11 +219,13 @@ export default {
       }
       this.loading = true;
       this.queryParams.pageNum ++;
-      listReport(this.queryParams).then(response => {
-        this.reportList.push(...response.rows) ;
-        this.total = response.total;
-        if (this.total <= this.reportList.length) {
-          this.noMore = true;
+      listReport(this.queryParams).then(res => {
+        if (res.code === 200) {
+          this.reportList.push(...res.rows) ;
+          this.total = res.total;
+          if (this.total <= this.reportList.length) {
+            this.noMore = true;
+          }
         }
       }).finally(() => {
         this.loading = false;
diff --git a/src/views/yh/prodOrder/index.vue b/src/views/yh/prodOrder/index.vue
index abfc68b..928ca42 100644
--- a/src/views/yh/prodOrder/index.vue
+++ b/src/views/yh/prodOrder/index.vue
@@ -1,14 +1,6 @@
 <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="单据ID" prop="erpId">
-        <el-input
-          v-model="queryParams.erpId"
-          placeholder="请输入单据ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item label="单据编号" prop="erpBillNo">
         <el-input
           v-model="queryParams.erpBillNo"
@@ -128,6 +120,10 @@
             <template v-else-if="column.key === 'erpIsRework'">
               <boolean-tag :value="d.row.erpIsRework"/>
             </template>
+            <template v-else-if="['erpQty', 'erpNoStockInQty'].includes(column.key)">
+              {{d.row[column.key]}}
+              <template v-if="!isEmpty(d.row.unitName)">{{d.row.unitName}}</template>
+            </template>
             <template v-else>
               {{d.row[column.key]}}
             </template>
@@ -244,6 +240,7 @@ import { $showColumns } from '@/utils/mixins';
 import FormCol from "@/components/FormCol/index.vue";
 import DeptTreeSelect from "@/components/Business/Dept/DeptTreeSelect.vue";
 import BooleanTag from "@/components/BooleanTag/index.vue";
+import {isEmpty} from "@/utils";
 
 // 默认排序字段
 const defaultSort = {
@@ -277,10 +274,12 @@ export default {
         {key: 'erpStatus', visible: true, label: '业务状态', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100"},
         {key: 'workShopName', visible: true, label: '生产车间', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100"},
         {key: 'erpReqSrc', visible: true, label: '需求来源', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100"},
+        {key: 'unitName', visible: false, label: '单位', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'erpQty', visible: true, label: '数量', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'erpBaseUnitQty', visible: true, label: '基本', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'unitName', visible: true, label: '单位', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'erpBaseUnitQty', visible: false, label: '基本', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'erpNoStockInQty', visible: true, label: '未入库', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100"},
+        {key: 'erpBaseNoStockInQty', visible: false, label: '基本未入库', minWidth: null, sortable: true, overflow: false, align: 'center', width: "130"},
+        {key: 'baseUnitName', visible: false, label: '基本单位', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
       ],
       // 排序方式
       orderSorts: ['ascending', 'descending', null],
@@ -342,6 +341,7 @@ export default {
     this.getList();
   },
   methods: {
+    isEmpty,
     handleSync() {
       syncProdOrder().then(res => {
         if (res.code === 200) {
diff --git a/src/views/yh/report/edit/components/ReportProductEdit.vue b/src/views/yh/report/edit/components/ReportProductEdit.vue
index 88b748a..3d3a05f 100644
--- a/src/views/yh/report/edit/components/ReportProductEdit.vue
+++ b/src/views/yh/report/edit/components/ReportProductEdit.vue
@@ -104,10 +104,10 @@
       </el-table-column>
       <el-table-column label="明细信息" align="center" width="160">
         <template scope="d">
-          <div class="more-row" v-for="(userProd, index) of d.row.userProdList" @click="handleShowMore(d.row)">
+          <div class="more-row" v-for="(userProd, index) of d.row.userProdList" @click="handleShowMore(d.row, d.$index)">
             {{index + 1}}、{{userProd.userName | dv}} {{userProd.num | dv}} {{d.row.priceUnit}}
           </div>
-          <div class="more-row" v-for="(order, index) of d.row.orderProdList" @click="handleShowMore(d.row)">
+          <div class="more-row" v-for="(order, index) of d.row.orderProdList" @click="handleShowMore(d.row, d.$index)">
             {{index + 1}}、{{order.orderErpBillNo}} {{order.num}} {{d.row.priceUnit}}
           </div>
         </template>
@@ -115,7 +115,7 @@
 
       <el-table-column width="160" align="center" label="操作">
         <template slot-scope="d">
-          <el-button type="text" size="mini" @click="handleShowMore(d.row)" icon="el-icon-edit">编辑</el-button>
+          <el-button type="text" size="mini" @click="handleShowMore(d.row, d.$index)" icon="el-icon-edit">编辑</el-button>
           <el-button
             type="text"
             icon="el-icon-delete"
@@ -128,7 +128,7 @@
     </el-table>
 
     <!--编辑明细-->
-    <report-product-row-edit :row="row" :visible.sync="showMore" :rules="rules"/>
+    <report-product-row-edit :row="row" :visible.sync="showMore" :rules="rules" @submit="onSubmitRow"/>
 
     <!--工序选择-->
     <price-drawer
@@ -232,6 +232,7 @@ export default {
   data() {
     return {
       row: {},  // 当前操作行
+      index: {},  // 当前操作行索引
       selection: [],  // 当前选中的所有行
       showPriceDialog: false,
       showUserProductBatchDialog: false,
@@ -242,8 +243,13 @@ export default {
 
   },
   methods: {
-    handleShowMore(row) {
+    onSubmitRow(data) {
+      console.log("onSubmitRow", data)
+      this.value.splice(this.index, 1, data);
+    },
+    handleShowMore(row, index) {
       this.row = row;
+      this.index = index;
       this.showMore = true;
     },
     // 添加一行
@@ -347,11 +353,8 @@ export default {
               totalNum = notNullDecimal(item.num).add(totalNum);
             })
             if (totalNum.toNumber() !== rowNum.toNumber()) {
-              if (isEmpty(row.userProdList[0].num)) {
-                row.userProdList[0].num = totalNum.toNumber();
-              } else {
-                row.userProdList[0].num = notNullDecimal(row.userProdList[0].num).add(totalNum.sub(rowNum)).toNumber();
-              }
+              let subtract = rowNum.sub(totalNum);  // 差值
+              row.userProdList[0].num = notNullDecimal(row.userProdList[0].num).add(subtract).toNumber();
             }
           }
         })
diff --git a/src/views/yh/report/edit/components/ReportProductOrderListEdit.vue b/src/views/yh/report/edit/components/ReportProductOrderListEdit.vue
index d28b475..bcf4ed6 100644
--- a/src/views/yh/report/edit/components/ReportProductOrderListEdit.vue
+++ b/src/views/yh/report/edit/components/ReportProductOrderListEdit.vue
@@ -1,35 +1,44 @@
 <template>
   <div>
     <el-table :data="value" style="margin-left: 16px; width: calc(100% - 16px)" size="mini">
-      <el-table-column label="订单" align="center" width="180">
+      <el-table-column label="订单" align="center" min-width="180">
         <template slot-scope="d">
-          <form-col table label-width="0">
-            <prod-order-input v-model="d.row.orderId" @change="(val) => onChangeProdOrder(d.row, val)"/>
+          <form-col table label-width="0" :prop="`orderProdList[${d.$index}].orderId`" :rules="rules.orderId">
+            <prod-order-input v-model="d.row.orderId" @change="(val) => onChangeProdOrder(d.row, val)" :query="orderQuery"/>
           </form-col>
         </template>
       </el-table-column>
-      <el-table-column label="生产数量" align="center" width="180">
+      <el-table-column label="产量" align="center" min-width="180" >
         <template slot-scope="d">
-          <form-col table label-width="0">
-            <el-input v-model="d.row.num" type="number" :min="0"/>
+          <form-col table label-width="0" :prop="`orderProdList[${d.$index}].num`" :rules="rules.num">
+            <el-input v-model="d.row.num" type="number" :min="0" placeholder="请输入订单产量">
+              <template #suffix v-if="priceUnit != null">{{priceUnit}}</template>
+            </el-input>
           </form-col>
         </template>
       </el-table-column>
-      <el-table-column label="计划" align="center">
+<!--      <el-table-column label="单位" align="center">-->
+<!--        <template slot-scope="d">-->
+<!--          {{d.row.unitName | dv}}-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+      <el-table-column label="计划数量" align="center">
         <template slot-scope="d">
           {{d.row.orderErpQty | dv}}
+          <template v-if="!isEmpty(d.row.unitName)"> {{d.row.unitName}}</template>
         </template>
       </el-table-column>
-      <el-table-column label="未入库" align="center">
-        <template slot-scope="d">
-          {{d.row.orderErpNoStockInQty | dv}}
-        </template>
-      </el-table-column>
-      <el-table-column label="进度" align="center">
-        <template slot-scope="d">
-          <el-progress text-inside :stroke-width="16" :percentage="percentage(d.row)" :color="customColors" text-color="#fff"/>
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="已审核数量" align="center">-->
+<!--        <template slot-scope="d">-->
+<!--          {{d.row.verifyBaseNum | dv}}-->
+<!--          <template v-if="!isEmpty(d.row.baseUnitName)"> {{d.row.baseUnitName}}</template>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="进度" align="center">-->
+<!--        <template slot-scope="d">-->
+<!--          <el-progress text-inside :stroke-width="16" :percentage="percentage(d.row)" :color="customColors" text-color="#fff"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column align="center" width="100">
         <template #header>
           <el-button
@@ -56,6 +65,7 @@
       :show.sync="showProdOrderDialog"
       multiple
       @select="onSelectProdOrder"
+      :query="orderQuery"
     />
   </div>
 </template>
@@ -64,8 +74,10 @@ import FormCol from "@/components/FormCol/index.vue";
 import ProdOrderInput from "@/components/Business/ProdOrder/ProdOrderInput.vue";
 import ProdOrderDrawer from "@/components/Business/ProdOrder/ProdOrderDrawer.vue";
 import HoverShow from "@/components/HoverShow/index.vue";
-import {notNullDecimal} from "@/utils";
+import {isEmpty, notNullDecimal} from "@/utils";
 import Decimal from "decimal.js";
+import {calcMulDecimal} from "@/utils/money";
+import {ProdOrderErpStatus} from "@/utils/constants";
 
 export default {
   name: "ReportProductOrderListEdit",
@@ -80,6 +92,16 @@ export default {
     rules: {
       type: Object,
       default: () => ({})
+    },
+    // 倍数
+    quantity: {
+      type: Number,
+      default: null
+    },
+    // 工序单位
+    priceUnit: {
+      type: String,
+      default: null
     }
   },
   data() {
@@ -97,32 +119,53 @@ export default {
     // 百分比
     percentage() {
       return (row) => {
-        let plan = notNullDecimal(row.orderErpQty); // 计划数量
-        let noStock = notNullDecimal(row.orderErpNoStockInQty);  // ERP未入库数量
-        let current = notNullDecimal(row.num);  // 当前填入数量
+        let plan = notNullDecimal(row.orderErpBaseUnitQty); // 基本计划数量
+        let noStock = notNullDecimal(row.orderErpBaseNoStockInQty);  // ERP基本未入库数量
+        let current = notNullDecimal(calcMulDecimal(row.num, this.quantity));  // 当前填入数量 * 倍数
+        console.log(`plan ${plan} noStock ${noStock} current ${current}  quantity ${this.quantity}`)
         return new Decimal(
           current.add(plan.sub(noStock)).mul(new Decimal(100)).div(plan).toFixed(2)
         ).toNumber();
       }
+    },
+    /**
+     * 订单查询条件
+     */
+    orderQuery() {
+      return {
+        erpStatusList: [ProdOrderErpStatus.START_WORK],
+
+      }
     }
   },
   methods: {
+    isEmpty,
     handleDel(index) {
       this.value.splice(index, 1)
     },
     onChangeProdOrder(row, item) {
       row.orderErpQty = item.erpQty;
+      row.orderErpBaseUnitQty = item.erpBaseUnitQty;
       row.orderErpNoStockInQty = item.erpNoStockInQty;
       row.orderErpBillNo = item.erpBillNo;
+      row.orderErpBaseNoStockInQty = item.erpBaseNoStockInQty;
+      row.unitName = item.unitName;
+      row.verifiedBaseNum = item.verifiedBaseNum;
+      row.baseUnitName = item.baseUnitName;
     },
     onSelectProdOrder(list) {
       let data = list.map(item => {
         return {
           orderId: item.id,
-          num: 0,
+          num: null,
           orderErpBillNo: item.erpBillNo,
           orderErpQty: item.erpQty,
+          orderErpBaseUnitQty: item.erpBaseUnitQty,
           orderErpNoStockInQty: item.erpNoStockInQty,
+          orderErpBaseNoStockInQty: item.erpBaseNoStockInQty,
+          unitName: item.unitName,
+          verifiedBaseNum: item.verifiedBaseNum,
+          baseUnitName: item.baseUnitName
         }
       })
 
diff --git a/src/views/yh/report/edit/components/ReportProductRowEdit.vue b/src/views/yh/report/edit/components/ReportProductRowEdit.vue
index 9276cbd..f01b1fd 100644
--- a/src/views/yh/report/edit/components/ReportProductRowEdit.vue
+++ b/src/views/yh/report/edit/components/ReportProductRowEdit.vue
@@ -1,46 +1,58 @@
 <template>
-  <el-drawer :visible.sync="showMore" :with-header="false" size="800px" :before-close="beforeClose">
+  <el-drawer :visible.sync="showMore" :with-header="false" size="90%" @open="onOpen" :before-close="beforeClose">
     <div class="drawer-container">
       <div class="drawer-operator-box">
+        <el-button @click="cancel" icon="el-icon-close">取 消</el-button>
         <el-button type="primary" @click="onSubmit" icon="el-icon-check">保 存</el-button>
       </div>
       <div class="drawer-content">
-        <el-form :model="row" :rules="rules" ref="form" label-width="6em">
+        <el-form :model="form" :rules="rules" ref="form" label-width="6em">
           <el-row>
             <form-col :span="span" label="工序" prop="priceId">
-              <price-input v-model="row.priceId" open-type="dialog" @change="onChangePrice" placeholder="点击选择工序" title="选择工序"/>
+              <price-input v-model="form.priceId" open-type="dialog" @change="onChangePrice" placeholder="点击选择工序" title="选择工序"/>
             </form-col>
             <form-col :span="span" label="工序类型" prop="priceType">
-              <el-select v-model="row.priceType" style="width: 100%">
+              <el-select v-model="form.priceType" style="width: 100%">
                 <el-option v-for="(item, index) in dict.type.price_type" :key="index" :label="item.label" :value="item.value"/>
               </el-select>
             </form-col>
             <form-col :span="span" label="良品数" prop="num">
-              <el-input v-model="row.num" type="number" :min="0" placeholder="请输入良品数">
+              <el-input v-model="form.num" type="number" :min="0" placeholder="请输入良品数">
                 <template #suffix>
-                  {{row.priceUnit}}
+                  {{form.priceUnit}}
                 </template>
               </el-input>
             </form-col>
             <form-col :span="span" label="不良品数" prop="defectNum">
-              <el-input v-model="row.defectNum" type="number" :min="0" placeholder="请输入不良品数">
+              <el-input v-model="form.defectNum" type="number" :min="0" placeholder="请输入不良品数">
                 <template #suffix>
-                  {{row.priceUnit}}
+                  {{form.priceUnit}}
                 </template>
               </el-input>
             </form-col>
             <form-col :span="span" label="单价">
-              {{row.pricePrice | dv}} 元
+              {{form.pricePrice | dv}} 元
             </form-col>
             <form-col :span="span" label="总价">
-              {{ calcMulDecimal(row.pricePrice, row.num) | dv }} 元
+              {{ calcMulDecimal(form.pricePrice, form.num) | dv }} 元
             </form-col>
           </el-row>
 
           <div class="edit-title">员工产量</div>
-          <report-product-user-list-edit v-model="row.userProdList" :price="row.pricePrice"/>
+          <report-product-user-list-edit
+            v-model="form.userProdList"
+            :price="form.pricePrice"
+            :price-unit="form.priceUnit"
+            :rules="rules.userProdList"
+          />
+
           <div class="edit-title">关联订单</div>
-          <report-product-order-list-edit v-model="row.orderProdList"/>
+          <report-product-order-list-edit
+            v-model="form.orderProdList"
+            :quantity="form.priceQuantity"
+            :price-unit="form.priceUnit"
+            :rules="rules.orderProdList"
+          />
         </el-form>
       </div>
     </div>
@@ -53,9 +65,12 @@ import ReportProductUserListEdit from "@/views/yh/report/edit/components/ReportP
 import FormCol from "@/components/FormCol/index.vue";
 import PriceInput from "@/components/Business/Price/PriceInput.vue";
 import {calcMulDecimal} from "@/utils/money";
+import {deepClone, isEmpty} from "@/utils";
+import {$reportCheck} from "@/views/yh/report/mixins";
 
 export default {
   name: "ReportProductRowEdit",
+  mixins: [$reportCheck],
   dicts: ['price_type'],
   components: {PriceInput, FormCol, ReportProductUserListEdit, ReportProductOrderListEdit},
   props: {
@@ -83,6 +98,7 @@ export default {
   data() {
     return {
       span: 12,
+      form: {}
     }
   },
   computed: {
@@ -96,8 +112,11 @@ export default {
     }
   },
   methods: {
+    onOpen() {
+      this.form = deepClone(this.row);
+    },
     beforeClose(done) {
-      this.$confirm('确认关闭？', '提示', {
+      this.$confirm('确认取消编辑当前工序？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
@@ -109,23 +128,48 @@ export default {
     onSubmit() {
       this.$refs.form.validate(valid => {
         if (valid) {
-          this.showMore = false;
+          // 校验产量是否一致
+          let error = this.checkNum(this.form);
+          if (!isEmpty(error)) {
+            this.$message.warning(error);
+            return;
+          }
+
+          this.$confirm('确认保存当前工序？', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            this.$emit('submit', this.form);
+            this.showMore = false;
+          })
+        } else {
+          this.$message.warning("表单校验未通过，请检查填写的数据")
         }
       })
     },
+    cancel() {
+      this.$confirm('确认取消编辑当前工序？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.showMore = false;
+      })
+    },
     // 工序修改后操作
     onChangePrice(price) {
-      this.row.priceId = price.priceId;
-      this.row.priceCategory = price.category;
-      this.row.priceSize = price.size;
-      this.row.priceName = price.name;
-      this.row.priceSubName = price.subName;
-      this.row.pricePattern = price.pattern;
-      this.row.priceSpec = price.spec;
-      this.row.pricePrice = price.price;
-      this.row.priceUnit = price.unit;
-      this.row.priceClassify = price.classify;
-      this.row.priceQuantity = price.quantity;
+      this.form.priceId = price.priceId;
+      this.form.priceCategory = price.category;
+      this.form.priceSize = price.size;
+      this.form.priceName = price.name;
+      this.form.priceSubName = price.subName;
+      this.form.pricePattern = price.pattern;
+      this.form.priceSpec = price.spec;
+      this.form.pricePrice = price.price;
+      this.form.priceUnit = price.unit;
+      this.form.priceClassify = price.classify;
+      this.form.priceQuantity = price.quantity;
     },
   },
 }
diff --git a/src/views/yh/report/edit/components/ReportProductUserListEdit.vue b/src/views/yh/report/edit/components/ReportProductUserListEdit.vue
index d76b87a..2c57842 100644
--- a/src/views/yh/report/edit/components/ReportProductUserListEdit.vue
+++ b/src/views/yh/report/edit/components/ReportProductUserListEdit.vue
@@ -1,18 +1,19 @@
 <template>
   <div>
     <el-table :data="value" style="margin-left: 16px; width: calc(100% - 16px)" size="mini">
-      <el-table-column label="序号" align="center" type="index" width="80"/>
       <el-table-column label="员工" align="center">
         <template slot-scope="d">
-          <form-col table label-width="0">
+          <form-col table label-width="0" :prop="`userProdList[${d.$index}].userId`" :rules="rules.userId">
             <user-input v-model="d.row.userId" open-type="dialog"/>
           </form-col>
         </template>
       </el-table-column>
-      <el-table-column label="员工产量" align="center">
+      <el-table-column label="产量" align="center">
         <template slot-scope="d">
-          <form-col table label-width="0">
-            <el-input v-model="d.row.num" type="number" placeholder="请输入员工产量"/>
+          <form-col table label-width="0" :prop="`userProdList[${d.$index}].num`" :rules="rules.num">
+            <el-input v-model="d.row.num" type="number" placeholder="请输入员工产量">
+              <template #suffix v-if="priceUnit != null">{{priceUnit}}</template>
+            </el-input>
           </form-col>
         </template>
       </el-table-column>
@@ -76,6 +77,15 @@ export default {
     price: {
       type: Number,
       default: 0,
+    },
+    // 工序单位
+    priceUnit: {
+      type: String,
+      default: null
+    },
+    rules: {
+      type: Object,
+      default: () => ({})
     }
   },
   data() {
diff --git a/src/views/yh/report/edit/edit.vue b/src/views/yh/report/edit/edit.vue
index a388a90..402f9f5 100644
--- a/src/views/yh/report/edit/edit.vue
+++ b/src/views/yh/report/edit/edit.vue
@@ -53,9 +53,11 @@ import {mapGetters} from "vuex";
 import Decimal from "decimal.js";
 import ReportProductEdit from "@/views/yh/report/edit/components/ReportProductEdit.vue";
 import {parseTime} from "@/utils/ruoyi";
+import {$reportCheck} from "@/views/yh/report/mixins";
 
 export default {
   name: "ReportEdit",
+  mixins: [$reportCheck],
   dicts: ['income_mode'],
   components: {ReportProductEdit, EditHeader, DeptTreeSelect, PriceInput, FormCol},
   data() {
@@ -99,6 +101,14 @@ export default {
           num: [
             { required: true, message: "产量不能为空", trigger: "change" }
           ]
+        },
+        orderProdList: {
+          orderId: [
+            { required: true, message: "订单不允许为空", trigger: "change" }
+          ],
+          num: [
+            { required: true, message: "产量不能为空", trigger: "change" }
+          ]
         }
       },
       headerCellStyle: {
@@ -143,14 +153,33 @@ export default {
       this.form.totalAmount = this.totalPrice;
       this.$refs["form"].validate(valid => {
         if (valid) {
+          // 校验产量是否一致
+          for (let i = 0; i < this.form.productList.length; i++) {
+            let error = this.checkNum(this.form.productList[i]);
+            if (!isEmpty(error)) {
+              return this.$message.warning(`第${i + 1}行工序产量校验未通过：${error}`);
+            }
+          }
+
+          this.loading = true;
           if (this.form.reportId != null) {
-            updateReport(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-            });
+            updateReport(this.form).then(res => {
+              if (res.code === 200) {
+                this.$modal.msgSuccess("修改成功");
+                this.$tab.closeBack();
+              }
+            }).finally(() => {
+              this.loading = false;
+            })
           } else {
-            addReport(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-            });
+            addReport(this.form).then(res => {
+              if (res.code === 200) {
+                this.$modal.msgSuccess("新增成功");
+                this.$tab.closeBack();
+              }
+            }).finally(() => {
+              this.loading = false;
+            })
           }
         } else {
           this.$message.warning("表单校验未通过，请检查")
diff --git a/src/views/yh/report/mixins.js b/src/views/yh/report/mixins.js
new file mode 100644
index 0000000..181d5ff
--- /dev/null
+++ b/src/views/yh/report/mixins.js
@@ -0,0 +1,29 @@
+import {notNullDecimal} from "@/utils";
+import Decimal from "decimal.js";
+
+export const $reportCheck = {
+  methods: {
+    /**
+     * 校验数量是否一致
+     */
+    checkNum(row) {
+      let num = notNullDecimal(row.num);  // 良品数
+      let userNum = new Decimal(0); // 用户良品数
+      row.userProdList.forEach(item => {
+        userNum = userNum.add(notNullDecimal(item.num));
+      })
+      console.log(userNum.toNumber(), num.toNumber())
+      if (userNum.toNumber() > num.toNumber()) {
+        return "员工总产量不允许超过工序总产量，请检查"
+      }
+
+      let orderNum = new Decimal(0); // 订单良品数
+      row.orderProdList.forEach(item => {
+        orderNum = orderNum.add(notNullDecimal(item.num));
+      })
+      if (orderNum.toNumber() > num.toNumber()) {
+        return "订单总产量不允许超过工序总产量，请检查"
+      }
+    },
+  }
+}
diff --git a/src/views/yh/reportProd/components/ReportOrderProdDescriptions.vue b/src/views/yh/reportProd/components/ReportOrderProdDescriptions.vue
index a076b92..4cb4a4c 100644
--- a/src/views/yh/reportProd/components/ReportOrderProdDescriptions.vue
+++ b/src/views/yh/reportProd/components/ReportOrderProdDescriptions.vue
@@ -1,19 +1,28 @@
 <template>
-  <el-descriptions border :column="5">
-      <template v-for="(item, index) of data">
-        <el-descriptions-item :key="item.id" label="订单">{{item.orderErpBillNo | dv}}</el-descriptions-item>
-        <el-descriptions-item :key="item.id" label="产量">{{item.num | dv}}</el-descriptions-item>
-        <el-descriptions-item :key="item.id" label="未入库">{{item.num | dv}}</el-descriptions-item>
-        <el-descriptions-item :key="item.id" label="审核中">{{item.num | dv}}</el-descriptions-item>
-        <el-descriptions-item :key="item.id" label="进度">
-          <el-progress text-inside :stroke-width="16" :percentage="20" :color="customColors" text-color="#fff" style="width: 100px"/>
-        </el-descriptions-item>
-      </template>
-  </el-descriptions>
+  <div>
+    <template  v-for="(item, index) of data">
+      <el-descriptions border :column="4" >
+          <el-descriptions-item :key="item.id" label="订单" :span="2">{{item.orderErpBillNo | dv}}</el-descriptions-item>
+          <el-descriptions-item :key="item.id" label="本次提交产量">{{item.num | dv}} {{priceUnit}}</el-descriptions-item>
+          <el-descriptions-item :key="item.id" label="订单需求数量">{{item.orderErpBaseUnitQty | dv}} {{item.baseUnitName}}</el-descriptions-item>
+          <el-descriptions-item :key="item.id" label="订单未入库数量">{{item.orderErpBaseNoStockInQty | dv}} {{item.baseUnitName}}</el-descriptions-item>
+          <el-descriptions-item :key="item.id" label="审核中产量">{{item.verifyingBaseNum | dv}} {{item.baseUnitName}}</el-descriptions-item>
+          <el-descriptions-item :key="item.id" label="已审核产量">{{item.verifiedBaseNum | dv}} {{item.baseUnitName}}</el-descriptions-item>
+          <el-descriptions-item :key="item.id" label="进度">
+            <el-progress text-inside :stroke-width="16" :percentage="percentage(item)" :color="customColors" text-color="#fff" style="width: 80px"/>
+          </el-descriptions-item>
+      </el-descriptions>
+      <br/>
+    </template>
+  </div>
 </template>
 
 <script>
 
+import {notNullDecimal} from "@/utils";
+import {calcMulDecimal} from "@/utils/money";
+import Decimal from "decimal.js";
+
 export default {
   name: "ReportOrderProdDescriptions",
   props: {
@@ -22,6 +31,14 @@ export default {
       default: () => {
         return []
       }
+    },
+    priceUnit: {
+      type: String,
+      default: null
+    },
+    priceQuantity: {
+      type: Number,
+      default: null,
     }
   },
   data() {
@@ -35,6 +52,22 @@ export default {
     }
   },
   computed: {
+    // 百分比
+    percentage() {
+      return (row) => {
+        let verifiedBaseNum = notNullDecimal(row.verifiedBaseNum);  // 已经审核的量
+        let num = notNullDecimal(row.num).mul(notNullDecimal(this.priceQuantity)); // 提交数量 * 倍数
+        let orderErpBaseUnitQty = notNullDecimal(row.orderErpBaseUnitQty);  // 基础总需求量
+        console.log("percentage", verifiedBaseNum.toNumber(), num.toNumber(), orderErpBaseUnitQty.toNumber());
+
+        // 结果 = (已审核量 + 本次提交量 * 倍数) / 基础总需求量 * 100
+        let result = new Decimal(
+          verifiedBaseNum.add(num).mul(new Decimal(100)).div(orderErpBaseUnitQty).toFixed(2)
+        ).toNumber();
+        console.log('result', result);
+        return result;
+      }
+    }
   },
 }
 </script>
diff --git a/src/views/yh/reportProd/components/ReportUserProdDescriptions.vue b/src/views/yh/reportProd/components/ReportUserProdDescriptions.vue
index 562b443..df325d7 100644
--- a/src/views/yh/reportProd/components/ReportUserProdDescriptions.vue
+++ b/src/views/yh/reportProd/components/ReportUserProdDescriptions.vue
@@ -2,7 +2,7 @@
   <el-descriptions border>
       <template v-for="(item, index) of data">
         <el-descriptions-item :key="item.id" label="员工">{{item.userName | dv}}</el-descriptions-item>
-        <el-descriptions-item :key="item.id" label="产量">{{item.num | dv}}</el-descriptions-item>
+        <el-descriptions-item :key="item.id" label="产量">{{item.num | dv}} {{priceUnit}}</el-descriptions-item>
         <el-descriptions-item :key="item.id" label="工资">{{totalPrice(item) | dv}} 元</el-descriptions-item>
       </template>
   </el-descriptions>
@@ -19,6 +19,10 @@ export default {
       default: () => {
         return []
       }
+    },
+    priceUnit: {
+      type: String,
+      default: null,
     }
   },
   computed: {
diff --git a/src/views/yh/reportProd/index.vue b/src/views/yh/reportProd/index.vue
index 0f05856..bb47e76 100644
--- a/src/views/yh/reportProd/index.vue
+++ b/src/views/yh/reportProd/index.vue
@@ -69,24 +69,25 @@
       @expand-change="onExpandChange"
     >
       <el-table-column type="selection" width="55" align="center" v-if="listConfig.showSelection"/>
-      <el-table-column type="expand" width="55" align="left">
+      <el-table-column type="expand" width="55" align="left" fixed="left">
         <template slot-scope="d">
           <div class="expand-container">
+            <el-descriptions border>
+              <el-descriptions-item label="类别">{{d.row.priceCategory | dv}}</el-descriptions-item>
+              <el-descriptions-item label="大小">{{d.row.priceSize | dv}}</el-descriptions-item>
+              <el-descriptions-item label="图案">{{d.row.pricePattern | dv}}</el-descriptions-item>
+              <el-descriptions-item label="规格">{{d.row.priceSpec | dv}}</el-descriptions-item>
+              <el-descriptions-item label="分类">{{d.row.priceClassify | dv}}</el-descriptions-item>
+              <el-descriptions-item label="倍数">{{d.row.priceQuantity | dv}}</el-descriptions-item>
+            </el-descriptions>
             <template v-if="!isEmpty(d.row.userProdList)">
               <div class="edit-title">员工产量</div>
-  <!--            <report-user-prod-->
-  <!--              v-has-permi="['yh:reportUserProd:list']"-->
-  <!--              :query="{prodId: d.row.id, pageSize: 99999}"-->
-  <!--              :hide-columns="['reportDate', 'reportStatus', 'priceName', 'pricePrice']"-->
-  <!--              :custom-config="expandCustomConfig"-->
-  <!--            />-->
-              <report-user-prod-descriptions  :data="d.row.userProdList"/>
+              <report-user-prod-descriptions  :data="d.row.userProdList"  :price-unit="d.row.priceUnit"/>
             </template>
             <template v-if="!isEmpty(d.row.orderProdList)">
               <div class="edit-title">订单产量</div>
-              <report-order-prod-descriptions  :data="d.row.orderProdList"/>
+              <report-order-prod-descriptions  :data="d.row.orderProdList" :price-unit="d.row.priceUnit" :price-quantity="d.row.priceQuantity"/>
             </template>
-
           </div>
         </template>
       </el-table-column>
@@ -219,7 +220,7 @@ import {$listConfig, $showColumns, $showSearch} from '@/utils/mixins';
 import FormCol from "@/components/FormCol/index.vue";
 import SearchFormItem from "@/components/SearchFormItem/index.vue";
 import ReportUserProd from "@/views/yh/reportUserProd/index.vue";
-import {calcMulDecimal} from "../../../utils/money";
+import {calcMulDecimal} from "@/utils/money";
 import ReportUserProdDescriptions from "@/views/yh/reportProd/components/ReportUserProdDescriptions.vue";
 import {isEmpty} from "@/utils";
 import ReportOrderProdDescriptions from "@/views/yh/reportProd/components/ReportOrderProdDescriptions.vue";
@@ -273,17 +274,17 @@ export default {
         {key: 'priceType', 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: '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: '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: 'priceClassify', visible: true, label: '分类', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'priceQuantity', 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: 'defectNum', visible: true, label: '不良品', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100"},
-        {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: 'pricePrice', 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: 'priceCategory', visible: false, label: '类别', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'priceSize', visible: false, label: '大小', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'pricePattern', visible: false, label: '图案', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'priceSpec', visible: false, label: '规格', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'priceClassify', visible: false, 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},
       ],
       // 排序方式
       orderSorts: ['ascending', 'descending', null],