From 09418c99b8b026663eeb156dd9292509c4b626cc Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Fri, 29 Mar 2024 10:14:21 +0800
Subject: [PATCH 01/16] =?UTF-8?q?update=20-=20=E7=94=9F=E4=BA=A7=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8C=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/report/productionExecutionReport/index.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/report/productionExecutionReport/index.vue b/src/views/report/productionExecutionReport/index.vue
index 6f30b3d..5017dbd 100644
--- a/src/views/report/productionExecutionReport/index.vue
+++ b/src/views/report/productionExecutionReport/index.vue
@@ -201,10 +201,12 @@ export default {
   watch: {
     'queryParams.productLineCode': function(newVal, oldVal) {
       // 执行方法，可以在这里调用你的方法
+      this.selectedType = null;
       this.getStationList()
     },
     selectedType(newType) {
       // 根据选择的工位类型筛选工位列表
+      this.queryParams.stationCode = null;
       this.findStationList = this.stationList.filter(item => item.stationType == newType);
       // 重置选择的工位
       // this.selectedStation = '';

From 2737ae0abc34dd8589526b2fcf2c2db34ff233a9 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Fri, 29 Mar 2024 11:57:43 +0800
Subject: [PATCH 02/16] =?UTF-8?q?update=20-=20=E7=94=B5=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/base/monitorInfo/index.vue     |  4 +-
 src/views/base/monitorWorkUnit/index.vue | 22 +++---
 src/views/base/orderInfo/index.vue       | 52 +++++++------
 src/views/base/workUnit/index.vue        | 14 ++--
 src/views/report/pointDnb/index.vue      | 96 ++++++++++++------------
 5 files changed, 98 insertions(+), 90 deletions(-)

diff --git a/src/views/base/monitorInfo/index.vue b/src/views/base/monitorInfo/index.vue
index b084d40..ddc6c34 100644
--- a/src/views/base/monitorInfo/index.vue
+++ b/src/views/base/monitorInfo/index.vue
@@ -49,7 +49,7 @@
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
     >
       <el-table-column label="父级编号" prop="parentId" v-if="columns[0].visible"/>
-      <el-table-column label="计量设备编号" align="center" prop="monitorCode" v-if="columns[15].visible"/>
+      <el-table-column label="计量设备编号" align="center" prop="monitorCode" v-if="columns[15].visible" width="160"/>
       <el-table-column label="计量设备名称" align="center" prop="monitorName" v-if="columns[1].visible"/>
       <el-table-column label="计量设备位置" align="center" prop="monitorAddress" v-if="columns[2].visible"/>
       <el-table-column label="计量设备类型" align="center" prop="monitorType" v-if="columns[3].visible">
@@ -92,7 +92,7 @@
           <span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="160">
         <template slot-scope="scope">
           <el-button
             size="mini"
diff --git a/src/views/base/monitorWorkUnit/index.vue b/src/views/base/monitorWorkUnit/index.vue
index d5534ab..d015bb6 100644
--- a/src/views/base/monitorWorkUnit/index.vue
+++ b/src/views/base/monitorWorkUnit/index.vue
@@ -120,10 +120,10 @@
         <el-table v-loading="loading" :data="monitorWorkUnitList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="55" align="center"/>
           <el-table-column label="主键标识" align="center" prop="objId" v-if="columns[0].visible"/>
-          <el-table-column label="计量设备编号" align="center" prop="monitorCode" v-if="columns[1].visible"/>
-          <el-table-column label="计量设备名称" align="center" prop="monitorName" v-if="columns[13].visible"/>
-          <el-table-column label="统计单元编号" align="center" prop="workUnitCode" v-if="columns[2].visible"/>
-          <el-table-column label="统计单元名称" align="center" prop="workUnitName" v-if="columns[14].visible"/>
+          <el-table-column label="统计单元编号" align="center" prop="workUnitCode" v-if="columns[2].visible" width="130"/>
+          <el-table-column label="统计单元名称" align="center" prop="workUnitName" v-if="columns[14].visible" width="130"/>
+          <el-table-column label="计量设备编号" align="center" prop="monitorCode" v-if="columns[1].visible" width="130"/>
+          <el-table-column label="计量设备名称" align="center" prop="monitorName" v-if="columns[13].visible" width="130"/>
           <el-table-column label="计量设备类型" align="center" prop="monitorType" v-if="columns[4].visible">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.monitor_type" :value="scope.row.monitorType"/>
@@ -191,15 +191,15 @@
     </el-row>
     <!-- 添加或修改统计计量信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-form-item label="统计单元" prop="workUnitCode">
+          <treeselect v-model="form.workUnitCode" :options="workUnitOptions" :normalizer="workUnitOptionsNormalizer"
+                      placeholder="请选择统计单元"/>
+        </el-form-item>
         <el-form-item label="计量设备名称" prop="monitorCode">
           <treeselect v-model="form.monitorCode" :options="monitorInfoOptions" :normalizer="normalizer"
                       placeholder="请选择计量设备"/>
         </el-form-item>
-        <el-form-item label="统计单元编号" prop="workUnitCode">
-          <treeselect v-model="form.workUnitCode" :options="workUnitOptions" :normalizer="workUnitOptionsNormalizer"
-                      placeholder="请选择父级编号"/>
-        </el-form-item>
         <!--        <el-form-item label="计量设备编号" prop="monitorCode">-->
         <!--          <el-input v-model="form.monitorCode" placeholder="请输入计量设备编号" />-->
         <!--        </el-form-item>-->
@@ -342,7 +342,7 @@ export default {
         {key: 4, label: `计量设备类型`, visible: true},
         {key: 5, label: `计算方式`, visible: true},
         {key: 6, label: `比率`, visible: true},
-        {key: 7, label: `备注`, visible: true},
+        {key: 7, label: `备注`, visible: false},
         {key: 8, label: `启用标识`, visible: false},
         {key: 9, label: `创建人`, visible: false},
         {key: 10, label: `创建时间`, visible: false},
@@ -436,7 +436,7 @@ export default {
         monitorStatus: 0,
         monitorType: 1,
         formulaMode: 0,
-        proportion: null,
+        proportion: 1,
         remark: null,
         isFlag: 0,
         createdBy: null,
diff --git a/src/views/base/orderInfo/index.vue b/src/views/base/orderInfo/index.vue
index 62b658a..c34d4ce 100644
--- a/src/views/base/orderInfo/index.vue
+++ b/src/views/base/orderInfo/index.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item label="工作中心" prop="workCenterCode">
-        <el-select v-model="queryParams.workCenterCode" placeholder="请选择工作中心" clearable>
+        <el-select v-model="queryParams.workCenterCode" placeholder="请选择工作中心" clearable style="width: 150px;">
           <el-option
             v-for="item in productLineList"
             :key="item.workCenterCode"
@@ -14,9 +14,10 @@
       <el-form-item label="SAP计划编号" prop="orderCode">
         <el-input
           v-model="queryParams.orderCode"
-          placeholder="请输入SAP计划编号"
+          placeholder="请输入计划编号"
           clearable
           @keyup.enter.native="handleQuery"
+          style="width: 150px;"
         />
       </el-form-item>
       <el-form-item label="物料编号" prop="materialCode">
@@ -25,6 +26,7 @@
           placeholder="请输入物料编号"
           clearable
           @keyup.enter.native="handleQuery"
+          style="width: 150px;"
         />
       </el-form-item>
       <el-form-item label="物料名称" prop="materialName">
@@ -33,10 +35,11 @@
           placeholder="请输入物料名称"
           clearable
           @keyup.enter.native="handleQuery"
+          style="width: 150px;"
         />
       </el-form-item>
       <el-form-item label="工单类型" prop="orderType">
-        <el-select v-model="queryParams.orderType" placeholder="请选择工单类型" clearable>
+        <el-select v-model="queryParams.orderType" placeholder="选择工单类型" clearable style="width: 140px;">
           <el-option
             v-for="dict in dict.type.order_type"
             :key="dict.value"
@@ -45,6 +48,27 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="是否已下达" prop="isRelease">
+        <el-select v-model="queryParams.isRelease" placeholder="是否已下达到生产计划" clearable style="width: 150px;">
+          <el-option
+            v-for="dict in dict.type.is_release"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="工单状态" prop="orderStatus">
+        <el-select v-model="queryParams.orderStatus" placeholder="请选择工单状态" clearable style="width: 150px;">
+          <el-option
+            v-for="dict in dict.type.order_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+
       <el-form-item label="计划开始日期">
         <el-date-picker
           v-model="daterangeEndTime"
@@ -56,26 +80,8 @@
           end-placeholder="结束日期"
         ></el-date-picker>
       </el-form-item>
-      <!--      <el-form-item label="工单状态" prop="orderStatus">-->
-      <!--        <el-select v-model="queryParams.orderStatus" placeholder="请选择工单状态" clearable>-->
-      <!--          <el-option-->
-      <!--            v-for="dict in dict.type.order_status"-->
-      <!--            :key="dict.value"-->
-      <!--            :label="dict.label"-->
-      <!--            :value="dict.value"-->
-      <!--          />-->
-      <!--        </el-select>-->
-      <!--      </el-form-item>-->
-      <el-form-item label="是否已下达" prop="isRelease">
-        <el-select v-model="queryParams.isRelease" placeholder="是否已下达到生产计划" clearable>
-          <el-option
-            v-for="dict in dict.type.is_release"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </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>
diff --git a/src/views/base/workUnit/index.vue b/src/views/base/workUnit/index.vue
index 6809fef..37c621e 100644
--- a/src/views/base/workUnit/index.vue
+++ b/src/views/base/workUnit/index.vue
@@ -67,13 +67,13 @@
       v-if="refreshTable"
       v-loading="loading"
       :data="workUnitList"
-      row-key="workUnitCode"
+      row-key="objId"
       :default-expand-all="isExpandAll"
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
     >
 
-      <el-table-column width="90px" label="统计单元编号" prop="workUnitCode" />
-      <el-table-column label="父级编号" align="center" prop="parentId" />
+      <el-table-column label="统计单元编号" prop="workUnitCode" width="180" />
+      <el-table-column label="父级编号" align="center" prop="parentId" v-if="false"/>
       <el-table-column label="统计单元名称" align="center" prop="workUnitName" />
       <el-table-column label="统计区域" align="center" prop="workUnitAddress" />
       <el-table-column label="产线/工位" align="center" prop="productLineName"/>
@@ -259,7 +259,7 @@ export default {
         delete node.children;
       }
       return {
-        id: node.workUnitCode,
+        id: node.objId,
         label: node.workUnitName,
         children: node.children
       };
@@ -269,7 +269,7 @@ export default {
       listWorkUnit().then(response => {
         this.workUnitOptions = [];
         const data = { workUnitCode: 0, workUnitName: '顶级节点', children: [] };
-        data.children = this.handleTree(response.data, "workUnitCode", "parentId");
+        data.children = this.handleTree(response.data, "objId", "parentId");
         this.workUnitOptions.push(data);
       });
     },
@@ -311,8 +311,8 @@ export default {
     handleAdd(row) {
       this.reset();
       this.getTreeselect();
-      if (row != null && row.workUnitCode) {
-        this.form.parentId = row.workUnitCode;
+      if (row != null && row.objId) {
+        this.form.parentId = row.objId;
       } else {
         this.form.parentId = 0;
       }
diff --git a/src/views/report/pointDnb/index.vue b/src/views/report/pointDnb/index.vue
index b773a89..a6daad2 100644
--- a/src/views/report/pointDnb/index.vue
+++ b/src/views/report/pointDnb/index.vue
@@ -28,24 +28,24 @@
       </el-col>
       <el-col :span="19" :xs="24">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="是否标识" prop="isFlag">
-        <el-select v-model="queryParams.isFlag" placeholder="请选择是否标识" clearable>
-          <el-option
-            v-for="dict in dict.type.is_flag"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="创建人" prop="createdBy">
-        <el-input
-          v-model="queryParams.createdBy"
-          placeholder="请输入创建人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+<!--      <el-form-item label="是否标识" prop="isFlag">-->
+<!--        <el-select v-model="queryParams.isFlag" placeholder="请选择是否标识" clearable>-->
+<!--          <el-option-->
+<!--            v-for="dict in dict.type.is_flag"-->
+<!--            :key="dict.value"-->
+<!--            :label="dict.label"-->
+<!--            :value="dict.value"-->
+<!--          />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="创建人" prop="createdBy">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.createdBy"-->
+<!--          placeholder="请输入创建人"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
       <el-form-item label="创建时间" prop="createdTime">
         <el-date-picker clearable
           v-model="queryParams.createdTime"
@@ -110,12 +110,13 @@
     <el-table v-loading="loading" :data="pointDnbList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="主键标识" align="center" prop="objId" v-if="columns[0].visible"/>
-      <el-table-column label="计量设备编号" align="center" prop="monitorCode" v-if="columns[1].visible"/>
-      <el-table-column label="仪表值" align="center" prop="instrumentValue" v-if="columns[2].visible"/>
+      <el-table-column label="计量设备编号" align="center" prop="monitorCode" v-if="columns[1].visible" width="120"/>
+      <el-table-column label="计量设备名称" align="center" prop="monitorName" v-if="columns[12].visible" width="150"/>
       <el-table-column label="耗量" align="center" prop="expend" v-if="columns[3].visible"/>
-      <el-table-column label="记录时间" align="center" prop="recordTime" v-if="columns[4].visible"/>
-      <el-table-column label="开始时间" align="center" prop="beginTime" v-if="columns[5].visible"/>
-      <el-table-column label="结束时间" align="center" prop="endTime" v-if="columns[6].visible"/>
+      <el-table-column label="仪表值" align="center" prop="instrumentValue" v-if="columns[2].visible"/>
+      <el-table-column label="开始时间" align="center" prop="beginTime" v-if="columns[5].visible" width="180"/>
+      <el-table-column label="结束时间" align="center" prop="endTime" v-if="columns[6].visible" width="180"/>
+      <el-table-column label="记录时间" align="center" prop="recordTime" v-if="columns[4].visible" width="180"/>
       <el-table-column label="是否标识" align="center" prop="isFlag" v-if="columns[7].visible">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>
@@ -133,24 +134,24 @@
           <span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['report:pointDnb:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['report:pointDnb:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-edit"-->
+<!--            @click="handleUpdate(scope.row)"-->
+<!--            v-hasPermi="['report:pointDnb:edit']"-->
+<!--          >修改</el-button>-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-delete"-->
+<!--            @click="handleDelete(scope.row)"-->
+<!--            v-hasPermi="['report:pointDnb:remove']"-->
+<!--          >删除</el-button>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
     </el-table>
 
     <pagination
@@ -276,18 +277,19 @@ export default {
         ],
       },
       columns: [
-            { key: 0, label: `主键标识`, visible: true },
+            { key: 0, label: `主键标识`, visible: false },
             { key: 1, label: `计量设备编号`, visible: true },
             { key: 2, label: `仪表值`, visible: true },
             { key: 3, label: `耗量`, visible: true },
             { key: 4, label: `记录时间`, visible: true },
             { key: 5, label: `开始时间`, visible: true },
             { key: 6, label: `结束时间`, visible: true },
-            { key: 7, label: `是否标识`, visible: true },
-            { key: 8, label: `创建人`, visible: true },
-            { key: 9, label: `创建时间`, visible: true },
-            { key: 10, label: `更新人`, visible: true },
-            { key: 11, label: `更新时间`, visible: true },
+            { key: 7, label: `是否标识`, visible: false },
+            { key: 8, label: `创建人`, visible: false },
+            { key: 9, label: `创建时间`, visible: false },
+            { key: 10, label: `更新人`, visible: false },
+            { key: 11, label: `更新时间`, visible: false },
+            { key: 12, label: `计量设备名称`, visible: true },
         ],
 
 

From 434779834309d7531c42a65ec33e09238a7e7dac Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Fri, 29 Mar 2024 17:57:15 +0800
Subject: [PATCH 03/16] =?UTF-8?q?update=20-=20=E7=AE=B1=E4=BD=93=E6=B5=81?=
 =?UTF-8?q?=E8=BD=AC=E8=BF=BD=E6=BA=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../boxTurnoverTraceabilityReport/index.vue   | 344 ++++++++++++++++++
 1 file changed, 344 insertions(+)
 create mode 100644 src/views/report/boxTurnoverTraceabilityReport/index.vue

diff --git a/src/views/report/boxTurnoverTraceabilityReport/index.vue b/src/views/report/boxTurnoverTraceabilityReport/index.vue
new file mode 100644
index 0000000..4e9c71f
--- /dev/null
+++ b/src/views/report/boxTurnoverTraceabilityReport/index.vue
@@ -0,0 +1,344 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="产线" prop="PRODUCT_LINE_NAME">
+        <el-select v-model="queryParams.PRODUCT_LINE_CODE" placeholder="请选择产线">
+          <el-option
+            v-for="item in productLineList"
+            :key="item.productLineCode"
+            :label="item.productLineName"
+            :value="item.productLineCode"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="产品编码" prop="MATERIAL_CODE">
+        <el-input
+          v-model="queryParams.MATERIAL_CODE"
+          placeholder="请输入产品编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="产品名称" prop="MATERIAL_NAME">
+        <el-input
+          v-model="queryParams.MATERIAL_NAME"
+          placeholder="请输入产品名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="SAP订单编号" prop="ORDER_CODE">
+        <el-input
+          v-model="queryParams.ORDER_CODE"
+          placeholder="请输入SAP计划编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="MES条码" prop="BOX_CODE">
+        <el-input
+          v-model="queryParams.BOX_CODE"
+          placeholder="请输入MES条码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="成品条码" prop="PRODUCT_SNCODE">
+        <el-input
+          v-model="queryParams.PRODUCT_SNCODE"
+          placeholder="请输入SAP成品条码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="起止时间">
+        <el-date-picker
+          v-model="daterangeBeginTime"
+          style="width: 340px"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          type="datetimerange"
+          range-separator="-"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+        >导出
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="reportList" @selection-change="handleSelectionChange">
+      <!--      <el-table-column type="selection" width="55" align="center"/>-->
+      <el-table-column label="主键标识" align="center" prop="objId" v-if="columns[0].visible"/>
+      <!--      <el-table-column label="工厂" align="center" prop="PRODUCT_STATION" v-if="columns[1].visible"/>-->
+      <el-table-column label="产线" align="center" prop="PRODUCT_LINE_NAME" v-if="columns[2].visible" width="70"/>
+      <el-table-column label="SAP订单编号" align="center" prop="ORDER_CODE" v-if="columns[3].visible"/>
+      <el-table-column label="销售订单号" align="center" prop="SALEORDER_CODE" v-if="columns[4].visible"/>
+      <el-table-column label="销售订单行号" align="center" prop="SALEORDER_LINENUMBER" v-if="columns[5].visible"/>
+      <el-table-column label="产品编码" align="center" prop="MATERIAL_CODE" v-if="columns[6].visible"/>
+      <el-table-column label="产品名称" align="center" prop="MATERIAL_NAME" v-if="columns[7].visible" width="250"/>
+      <el-table-column label="MES条码" align="center" prop="BOX_CODE" v-if="columns[8].visible" width="200"/>
+      <el-table-column label="成品条码" align="center" prop="PRODUCT_SNCODE" v-if="columns[9].visible" width="200"/>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-search"
+            @click="handleOrderDetails(scope.row)"
+          >流转详情
+          </el-button>
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-d-arrow-right"-->
+<!--            @click="findInspectInfo(scope.row)"-->
+<!--          >质检材料-->
+<!--          </el-button>-->
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 详情信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-row gutter="15">
+          <el-col :span="11">
+            <el-form-item label="SAP订单编号" prop="ORDER_CODE">
+              <el-input v-model="form.ORDER_CODE" placeholder="请输入SAP订单编号" :disabled="true"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item label="MES条码" prop="BOX_CODE">
+              <el-input v-model="form.BOX_CODE" placeholder="请输入MES条码" :disabled="true"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-divider content-position="center">产品检验详情信息</el-divider>
+
+        <el-table :data="reportDetailList" :row-class-name="rowDetailIndex"
+                  ref="reportDetailRef"
+        >
+          <!--          <el-table-column type="selection" width="50" align="center"/>-->
+          <el-table-column label="序号" prop="index" width="150">
+          </el-table-column>
+          <el-table-column label="质检工位" prop="PRODUCT_LINE_NAME" width="150">
+          </el-table-column>
+          <el-table-column label="质检结果" prop="TREATMENT_MEASURE" width="150">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.treatment_measures" :value="scope.row.TREATMENT_MEASURE"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="返修结果" prop="PROCESS_RESULT" width="150">
+          </el-table-column>
+          <el-table-column label="检验时间" prop="INSPECTOR_TIME" width="150">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.INSPECTOR_TIME, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="检验人" prop="USER_NAME" width="150">
+          </el-table-column>
+        </el-table>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancel">关 闭</el-button>
+      </div>
+    </el-dialog>
+
+  </div>
+
+
+</template>
+
+<script>
+import {
+  boxTurnoverTraceabilityReportList,
+  productTraceabilityDetailList,
+  productTraceabilityReportList
+} from '@/api/report/reportAPI'
+import { findProductLineList } from '@//api/base/productLine'
+import { parseTime } from '@//utils/ruoyi'
+
+export default {
+  name: 'BoxTurnoverTraceabilityReport',
+  dicts: ['is_flag', 'treatment_measures'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 报表表格数据
+      reportList: [],
+      // 弹出层标题
+      title: '',
+      // 是否显示弹出层
+      open: false,
+      // 更新时间时间范围
+      daterangeBeginTime: [],
+      // 查询参数
+      queryParams: {
+        // pageNum: 1,
+        // pageSize: 10,
+        beginBeginTime: null,
+        endBeginTime: null,
+        BOX_CODE: null,
+        PRODUCT_LINE_CODE: 'CX_02',
+        ORDER_CODE: null,
+        MATERIAL_CODE: null,
+        MATERIAL_NAME: null,
+        PRODUCT_SNCODE: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {},
+      reportDetailList: [],
+      columns: [
+        { key: 0, label: `主键标识`, visible: false },
+        { key: 1, label: `工位`, visible: true },
+        { key: 2, label: `产线`, visible: true },
+        { key: 3, label: `SAP订单编号`, visible: true },
+        { key: 4, label: `销售订单号`, visible: false },
+        { key: 5, label: `销售订单行号`, visible: false },
+        { key: 6, label: `产品编码`, visible: true },
+        { key: 7, label: `产品名称`, visible: true },
+        { key: 8, label: `MES条码`, visible: true },
+        { key: 9, label: `成品条码`, visible: true }
+      ],
+      // 产线选项
+      productLineList: [],
+      // 工位选项
+      findStationList: []
+    }
+  },
+  created() {
+    findProductLineList({ productLineType: 1 }).then(response => {
+      this.productLineList = response.data
+    })
+    // findProductLineList({productLineType: 2}).then(response => {
+    //   this.findStationList = response.data;
+    // });
+    const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
+    this.daterangeBeginTime[0] = nowDate + ' 00:00:00'
+    this.daterangeBeginTime[1] = nowDate + ' 23:59:59'
+    this.getList()
+  },
+  methods: {
+    /** 查询工单信息列表 */
+    getList() {
+      this.loading = true
+      if (null != this.daterangeBeginTime && '' != this.daterangeBeginTime) {
+        this.queryParams.beginBeginTime = this.daterangeBeginTime[0]
+        this.queryParams.endBeginTime = this.daterangeBeginTime[1]
+      } else {
+        this.queryParams.beginBeginTime = null
+        this.queryParams.endBeginTime = null
+      }
+      boxTurnoverTraceabilityReportList(this.queryParams).then(response => {
+        this.reportList = response.rows
+        this.total = response.total
+        this.loading = false
+      })
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    /** 数据明细序号 */
+    rowDetailIndex({ row, rowIndex }) {
+      row.index = rowIndex + 1
+    },
+    // 表单重置
+    reset() {
+      this.daterangeBeginTime = []
+      this.form = {
+        WORK_CENTER_CODE: null,
+        PRODUCT_LINE_NAME: null,
+        ORDER_CODE: null,
+        BOX_CODE: null,
+        MATERIAL_CODE: null,
+        MATERIAL_NAME: null,
+        BEGIN_DATE: null
+      }
+      this.resetForm('form')
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      // this.queryParams.pageNum = 1;
+      this.getList()
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm('queryForm')
+      this.handleQuery()
+    },
+    /** 查看明细 */
+    handleOrderDetails(row) {
+      // this.$tab.openPage("SAP订单信息","/order/orderInfo" , {ORDER_CODE: row.ORDER_CODE})
+      if (row.BOX_CODE == null) {
+        this.$modal.msgError('该产品无MES条码！')
+        return
+      }
+      this.form.BOX_CODE = row.BOX_CODE
+      this.form.ORDER_CODE = row.ORDER_CODE
+      productTraceabilityDetailList({ BOX_CODE: row.BOX_CODE }).then(response => {
+        this.reportDetailList = response.data
+        this.open = true
+        this.title = '产品检验详情'
+      })
+
+    },
+    /** 查看质检材料 */
+    findInspectInfo: function(row) {
+      const orderCode = row.ORDER_CODE;
+      this.$router.push("/report/quality-material/index/" + orderCode);
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.objId)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('/report/qualityReport/productTraceabilityReportList/export', {
+        ...this.queryParams
+      }, `产品追溯报表_${new Date().getTime()}.xlsx`)
+    }
+
+  }
+}
+</script>

From 8bffe8c86d1986c993f3a9be4c2efa095a57643e Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Sat, 30 Mar 2024 11:09:54 +0800
Subject: [PATCH 04/16] =?UTF-8?q?update=20-=20add=E7=AE=B1=E4=BD=93?=
 =?UTF-8?q?=E6=B5=81=E8=BD=AC=E8=BF=BD=E6=BA=AF=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/report/reportAPI.js                   | 18 ++++++
 src/views/base/orderInfo/index.vue            | 26 +++++---
 .../boxTurnoverTraceabilityReport/index.vue   | 61 +++++++++++--------
 3 files changed, 71 insertions(+), 34 deletions(-)

diff --git a/src/api/report/reportAPI.js b/src/api/report/reportAPI.js
index 3721ddb..4cb718b 100644
--- a/src/api/report/reportAPI.js
+++ b/src/api/report/reportAPI.js
@@ -143,3 +143,21 @@ export function repairRateReportList(query) {
     params: query
   })
 }
+
+// 箱体流转追溯报表
+export function boxTurnoverTraceabilityReportList(query) {
+  return request({
+    url: '/report/productionReport/boxTurnoverTraceabilityReportList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 箱体流转追溯报表明细
+export function boxTurnoverTraceabilityDetailReportList(query) {
+  return request({
+    url: '/report/productionReport/boxTurnoverTraceabilityDetailReportList',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/views/base/orderInfo/index.vue b/src/views/base/orderInfo/index.vue
index c34d4ce..1184a29 100644
--- a/src/views/base/orderInfo/index.vue
+++ b/src/views/base/orderInfo/index.vue
@@ -254,6 +254,16 @@
         <el-form-item label="SAP计划编号" prop="orderCode">
           <el-input v-model="form.orderCode" placeholder="请输入SAP计划编号"/>
         </el-form-item>
+        <el-form-item label="工作中心" prop="workCenterCode">
+          <el-select v-model="form.workCenterCode" placeholder="请选择工作中心">
+            <el-option
+              v-for="item in productLineList"
+              :key="item.workCenterCode"
+              :label="item.workCenterName"
+              :value="item.workCenterCode"
+            ></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="销售订单编号" prop="saleOrderCode">
           <el-input v-model="form.saleOrderCode" placeholder="请输入销售订单编号"/>
         </el-form-item>
@@ -266,15 +276,15 @@
         <el-form-item label="物料名称" prop="materialName">
           <el-input v-model="form.materialName" placeholder="请输入物料名称"/>
         </el-form-item>
-        <el-form-item label="物料组" prop="matkl">
-          <el-input v-model="form.matkl" placeholder="请输入物料组"/>
-        </el-form-item>
+<!--        <el-form-item label="物料组" prop="matkl">-->
+<!--          <el-input v-model="form.matkl" placeholder="请输入物料组"/>-->
+<!--        </el-form-item>-->
         <el-form-item label="订单计划数量" prop="orderAmount">
           <el-input v-model="form.orderAmount" placeholder="请输入订单计划数量"/>
         </el-form-item>
-        <el-form-item label="完成数量" prop="completeAmount">
-          <el-input v-model="form.completeAmount" placeholder="请输入完成数量"/>
-        </el-form-item>
+<!--        <el-form-item label="完成数量" prop="completeAmount">-->
+<!--          <el-input v-model="form.completeAmount" placeholder="请输入完成数量"/>-->
+<!--        </el-form-item>-->
         <el-form-item label="工单类型" prop="orderType">
           <el-select v-model="form.orderType" placeholder="请选择工单类型">
             <el-option
@@ -307,7 +317,7 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="工厂编码" prop="factoryCode">
-          <el-input v-model="form.factoryCode" placeholder="请输入工厂编码"/>
+          <el-input v-model="form.factoryCode" placeholder="请输入工厂编码" :disabled="true"/>
         </el-form-item>
         <el-form-item label="完成日期" prop="completeDate">
           <el-date-picker clearable
@@ -503,7 +513,7 @@ export default {
         orderStatus: null,
         beginDate: null,
         endDate: null,
-        factoryCode: null,
+        factoryCode: '1301',
         isFlag: 0,
         isRelease: null,
         createdBy: null,
diff --git a/src/views/report/boxTurnoverTraceabilityReport/index.vue b/src/views/report/boxTurnoverTraceabilityReport/index.vue
index 4e9c71f..f7380a1 100644
--- a/src/views/report/boxTurnoverTraceabilityReport/index.vue
+++ b/src/views/report/boxTurnoverTraceabilityReport/index.vue
@@ -78,6 +78,14 @@
           @click="handleExport"
         >导出
         </el-button>
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleDetailExport"
+        >流转详情导出
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
     </el-row>
@@ -94,6 +102,7 @@
       <el-table-column label="产品名称" align="center" prop="MATERIAL_NAME" v-if="columns[7].visible" width="250"/>
       <el-table-column label="MES条码" align="center" prop="BOX_CODE" v-if="columns[8].visible" width="200"/>
       <el-table-column label="成品条码" align="center" prop="PRODUCT_SNCODE" v-if="columns[9].visible" width="200"/>
+      <el-table-column label="MES码打印时间" align="center" prop="PRINT_TIME" v-if="columns[10].visible" width="180"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -122,7 +131,7 @@
     />
 
     <!-- 详情信息对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="1100px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row gutter="15">
           <el-col :span="11">
@@ -136,29 +145,23 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-divider content-position="center">产品检验详情信息</el-divider>
+        <el-divider content-position="center">箱体流转追溯详情</el-divider>
 
         <el-table :data="reportDetailList" :row-class-name="rowDetailIndex"
                   ref="reportDetailRef"
         >
           <!--          <el-table-column type="selection" width="50" align="center"/>-->
-          <el-table-column label="序号" prop="index" width="150">
+          <el-table-column label="序号" align="center" prop="index">
           </el-table-column>
-          <el-table-column label="质检工位" prop="PRODUCT_LINE_NAME" width="150">
+          <el-table-column label="物料编号" align="center" prop="MATERIAL_CODE" width="100">
           </el-table-column>
-          <el-table-column label="质检结果" prop="TREATMENT_MEASURE" width="150">
-            <template slot-scope="scope">
-              <dict-tag :options="dict.type.treatment_measures" :value="scope.row.TREATMENT_MEASURE"/>
-            </template>
+          <el-table-column label="物料名称" align="center" prop="MATERIAL_NAME" width="390">
           </el-table-column>
-          <el-table-column label="返修结果" prop="PROCESS_RESULT" width="150">
+          <el-table-column label="过点工位编号" align="center" prop="STATION_CODE" width="100">
           </el-table-column>
-          <el-table-column label="检验时间" prop="INSPECTOR_TIME" width="150">
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.INSPECTOR_TIME, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
-            </template>
+          <el-table-column label="过点工位名称" align="center" prop="STATION_NAME" width="150">
           </el-table-column>
-          <el-table-column label="检验人" prop="USER_NAME" width="150">
+          <el-table-column label="过点时间" align="center" prop="COMPLETE_DATE" width="150">
           </el-table-column>
         </el-table>
       </el-form>
@@ -174,9 +177,8 @@
 
 <script>
 import {
-  boxTurnoverTraceabilityReportList,
-  productTraceabilityDetailList,
-  productTraceabilityReportList
+  boxTurnoverTraceabilityDetailReportList,
+  boxTurnoverTraceabilityReportList
 } from '@/api/report/reportAPI'
 import { findProductLineList } from '@//api/base/productLine'
 import { parseTime } from '@//utils/ruoyi'
@@ -234,7 +236,8 @@ export default {
         { key: 6, label: `产品编码`, visible: true },
         { key: 7, label: `产品名称`, visible: true },
         { key: 8, label: `MES条码`, visible: true },
-        { key: 9, label: `成品条码`, visible: true }
+        { key: 9, label: `成品条码`, visible: true },
+        { key: 10, label: `MES码打印时间`, visible: true },
       ],
       // 产线选项
       productLineList: [],
@@ -249,9 +252,9 @@ export default {
     // findProductLineList({productLineType: 2}).then(response => {
     //   this.findStationList = response.data;
     // });
-    const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
-    this.daterangeBeginTime[0] = nowDate + ' 00:00:00'
-    this.daterangeBeginTime[1] = nowDate + ' 23:59:59'
+    // const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
+    // this.daterangeBeginTime[0] = nowDate + ' 00:00:00'
+    // this.daterangeBeginTime[1] = nowDate + ' 23:59:59'
     this.getList()
   },
   methods: {
@@ -313,12 +316,11 @@ export default {
       }
       this.form.BOX_CODE = row.BOX_CODE
       this.form.ORDER_CODE = row.ORDER_CODE
-      productTraceabilityDetailList({ BOX_CODE: row.BOX_CODE }).then(response => {
+      boxTurnoverTraceabilityDetailReportList({ BOX_CODE: row.BOX_CODE }).then(response => {
         this.reportDetailList = response.data
         this.open = true
-        this.title = '产品检验详情'
+        this.title = '箱体流转追溯详情'
       })
-
     },
     /** 查看质检材料 */
     findInspectInfo: function(row) {
@@ -334,9 +336,16 @@ export default {
 
     /** 导出按钮操作 */
     handleExport() {
-      this.download('/report/qualityReport/productTraceabilityReportList/export', {
+      this.download('/report/productionReport/boxTurnoverTraceabilityReportList/export', {
+        ...this.queryParams
+      }, `箱体流转追溯报表_${new Date().getTime()}.xlsx`)
+    },
+
+    /** 导出按钮操作 */
+    handleDetailExport() {
+      this.download('/report/productionReport/boxTurnoverTraceabilityDetailReportList/export', {
         ...this.queryParams
-      }, `产品追溯报表_${new Date().getTime()}.xlsx`)
+      }, `箱体流转追溯详情报表_${new Date().getTime()}.xlsx`)
     }
 
   }

From b70d22cfff9b7616b360ef5f9fb9228c8eb51282 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Sat, 30 Mar 2024 11:28:45 +0800
Subject: [PATCH 05/16] =?UTF-8?q?update=20-=20=E8=BF=94=E4=BF=AE=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/report/repairMeasures.js | 8 ++++++++
 vue.config.js                    | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/api/report/repairMeasures.js b/src/api/report/repairMeasures.js
index 0233d29..46cf1b0 100644
--- a/src/api/report/repairMeasures.js
+++ b/src/api/report/repairMeasures.js
@@ -42,3 +42,11 @@ export function delRepairMeasures(objId) {
     method: 'delete'
   })
 }
+
+// 查询返修措施维护详细
+export function findRepairMeasuresList(objId) {
+  return request({
+    url: '/report/repairMeasures/getRepairMeasures',
+    method: 'get'
+  })
+}
diff --git a/vue.config.js b/vue.config.js
index 56f82f6..a0be0a0 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -36,9 +36,9 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://10.11.43.2:8080`,
-        target: `http://10.100.72.10:8080`,
+        // target: `http://10.100.72.10:8080`,
         // target: `http://192.168.1.118:6061`,
-        // target: `http://localhost:6061`,
+        target: `http://localhost:6061`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''

From 6b2ed8c30c4093b735b7a940416c2b3ba823c7db Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Sat, 30 Mar 2024 11:29:32 +0800
Subject: [PATCH 06/16] =?UTF-8?q?Revert=20"update=20-=20=E8=BF=94=E4=BF=AE?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=E6=9F=A5=E8=AF=A2"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit b70d22cf
---
 src/api/report/repairMeasures.js | 8 --------
 vue.config.js                    | 4 ++--
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/api/report/repairMeasures.js b/src/api/report/repairMeasures.js
index 46cf1b0..0233d29 100644
--- a/src/api/report/repairMeasures.js
+++ b/src/api/report/repairMeasures.js
@@ -42,11 +42,3 @@ export function delRepairMeasures(objId) {
     method: 'delete'
   })
 }
-
-// 查询返修措施维护详细
-export function findRepairMeasuresList(objId) {
-  return request({
-    url: '/report/repairMeasures/getRepairMeasures',
-    method: 'get'
-  })
-}
diff --git a/vue.config.js b/vue.config.js
index a0be0a0..56f82f6 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -36,9 +36,9 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://10.11.43.2:8080`,
-        // target: `http://10.100.72.10:8080`,
+        target: `http://10.100.72.10:8080`,
         // target: `http://192.168.1.118:6061`,
-        target: `http://localhost:6061`,
+        // target: `http://localhost:6061`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''

From e279f0e18810d2c2f0268b05513837bdc666464d Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Sat, 30 Mar 2024 11:34:21 +0800
Subject: [PATCH 07/16] =?UTF-8?q?update=20-=20=E8=BF=94=E4=BF=AE=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/report/repairMeasures.js             |  8 ++++++
 src/views/report/qualityInspection/index.vue | 27 +++++++++++++++-----
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/src/api/report/repairMeasures.js b/src/api/report/repairMeasures.js
index 0233d29..46cf1b0 100644
--- a/src/api/report/repairMeasures.js
+++ b/src/api/report/repairMeasures.js
@@ -42,3 +42,11 @@ export function delRepairMeasures(objId) {
     method: 'delete'
   })
 }
+
+// 查询返修措施维护详细
+export function findRepairMeasuresList(objId) {
+  return request({
+    url: '/report/repairMeasures/getRepairMeasures',
+    method: 'get'
+  })
+}
diff --git a/src/views/report/qualityInspection/index.vue b/src/views/report/qualityInspection/index.vue
index 0082e87..bcb7631 100644
--- a/src/views/report/qualityInspection/index.vue
+++ b/src/views/report/qualityInspection/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
       <el-form-item label="箱体码" prop="barCode">
         <el-input
           v-model="queryParams.barCode"
@@ -25,16 +25,16 @@
                 @keyup.enter.native="handleQuery"
               />
             </el-form-item>
-      <el-form-item label="质量缺陷名称" prop="qualityDefectName">
+      <el-form-item label="缺陷名称" prop="qualityDefectName">
         <el-input
           v-model="queryParams.qualityDefectName"
-          placeholder="请输入质量缺陷名称"
+          placeholder="请输入缺陷名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
       <el-form-item label="处理措施" prop="treatmentMeasure">
-        <el-select v-model="queryParams.treatmentMeasure" placeholder="请选择处理措施" clearable>
+        <el-select v-model="queryParams.treatmentMeasure" placeholder="请选择处理措施" clearable style="width: 140px;">
           <el-option
             v-for="dict in dict.type.treatment_measures"
             :key="dict.value"
@@ -43,8 +43,18 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="处理结果" prop="processResult">
+        <el-select v-model="queryParams.processResult" placeholder="请选择处理结果" clearable style="width: 140px;">
+          <el-option
+            v-for="item in repairMeasuresList"
+            :key="item.repairName"
+            :label="item.repairName"
+            :value="item.repairName"
+          ></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="质检工位" prop="stationCode">
-        <el-select v-model="queryParams.stationCode" placeholder="请选择质检工位">
+        <el-select v-model="queryParams.stationCode" placeholder="请选择质检工位" clearable style="width: 140px;">
           <el-option
             v-for="item in productLineList"
             :key="item.productLineCode"
@@ -296,6 +306,7 @@ import {
 } from '@/api/report/qualityInspection'
 import { parseTime } from '@//utils/ruoyi'
 import { findProductLineList } from '@//api/base/productLine'
+import { findRepairMeasuresList } from '@//api/report/repairMeasures'
 
 export default {
   name: 'QualityInspection',
@@ -372,13 +383,17 @@ export default {
         { key: 20, label: `检测人员名称`, visible: true },
         { key: 21, label: `工位名称`, visible: true }
       ],
-      productLineList: []
+      productLineList: [],
+      repairMeasuresList: [],
     }
   },
   created() {
     findProductLineList({ productLineType: 2, stationType: 2 }).then(response => {
       this.productLineList = response.data
     })
+    findRepairMeasuresList().then(response => {
+      this.repairMeasuresList = response.data
+    })
     const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
     this.daterangeBeginTime[0] = nowDate + ' 00:00:00'
     this.daterangeBeginTime[1] = nowDate + ' 23:59:59'

From ae9b2f667322312ad09dd83ab1ec59fe578162a7 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Sat, 30 Mar 2024 15:20:22 +0800
Subject: [PATCH 08/16] =?UTF-8?q?update=20-=20=E6=8A=A5=E8=A1=A8=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/report/WIPInquiryReport/index.vue   | 22 +++++++++----------
 .../boxTurnoverTraceabilityReport/index.vue   | 14 ++++++++++--
 .../productionExecutionReport/index.vue       | 22 +++++++++----------
 src/views/report/repairRateReport/index.vue   |  8 ++++++-
 .../report/scanOfflineRecordReport/index.vue  | 10 +++++++++
 5 files changed, 51 insertions(+), 25 deletions(-)

diff --git a/src/views/report/WIPInquiryReport/index.vue b/src/views/report/WIPInquiryReport/index.vue
index 5a5eef0..edac10b 100644
--- a/src/views/report/WIPInquiryReport/index.vue
+++ b/src/views/report/WIPInquiryReport/index.vue
@@ -101,13 +101,13 @@
 <!--        </template>-->
 <!--      </el-table-column>-->
     </el-table>
-    <!--    <pagination-->
-    <!--      v-show="total>0"-->
-    <!--      :total="total"-->
-    <!--      :page.sync="queryParams.pageNum"-->
-    <!--      :limit.sync="queryParams.pageSize"-->
-    <!--      @pagination="getList"-->
-    <!--    />-->
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
 
   </div>
 </template>
@@ -148,8 +148,8 @@ export default {
       daterangeBeginTime: [],
       // 查询参数
       queryParams: {
-        // pageNum: 1,
-        // pageSize: 10,
+        pageNum: 1,
+        pageSize: 10,
         beginBeginTime: null,
         endBeginTime: null,
         productLineCode: 'CX_02',
@@ -207,12 +207,12 @@ export default {
     getList() {
       this.loading = true
       WIPInquiryReportList(this.queryParams).then(response => {
-        this.reportList = response.data
+        this.reportList = response.rows
+        this.total = response.total;
         this.totalSum = 0
         this.reportList.forEach(e => {
           this.totalSum += e.COMP_AMOUNT
         })
-        // this.total = response.total;
         this.loading = false
       })
     },
diff --git a/src/views/report/boxTurnoverTraceabilityReport/index.vue b/src/views/report/boxTurnoverTraceabilityReport/index.vue
index f7380a1..212e01d 100644
--- a/src/views/report/boxTurnoverTraceabilityReport/index.vue
+++ b/src/views/report/boxTurnoverTraceabilityReport/index.vue
@@ -51,7 +51,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="起止时间">
+      <el-form-item label="打印时间">
         <el-date-picker
           v-model="daterangeBeginTime"
           style="width: 340px"
@@ -69,6 +69,14 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          size="mini"
+        >打印数：{{ totalSum }}
+        </el-button>
+      </el-col>
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -99,7 +107,7 @@
       <el-table-column label="销售订单号" align="center" prop="SALEORDER_CODE" v-if="columns[4].visible"/>
       <el-table-column label="销售订单行号" align="center" prop="SALEORDER_LINENUMBER" v-if="columns[5].visible"/>
       <el-table-column label="产品编码" align="center" prop="MATERIAL_CODE" v-if="columns[6].visible"/>
-      <el-table-column label="产品名称" align="center" prop="MATERIAL_NAME" v-if="columns[7].visible" width="250"/>
+      <el-table-column label="产品名称" align="center" prop="MATERIAL_NAME" v-if="columns[7].visible" width="280"/>
       <el-table-column label="MES条码" align="center" prop="BOX_CODE" v-if="columns[8].visible" width="200"/>
       <el-table-column label="成品条码" align="center" prop="PRODUCT_SNCODE" v-if="columns[9].visible" width="200"/>
       <el-table-column label="MES码打印时间" align="center" prop="PRINT_TIME" v-if="columns[10].visible" width="180"/>
@@ -200,6 +208,7 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
+      totalSum: 0,
       // 报表表格数据
       reportList: [],
       // 弹出层标题
@@ -271,6 +280,7 @@ export default {
       boxTurnoverTraceabilityReportList(this.queryParams).then(response => {
         this.reportList = response.rows
         this.total = response.total
+        this.totalSum = response.total
         this.loading = false
       })
     },
diff --git a/src/views/report/productionExecutionReport/index.vue b/src/views/report/productionExecutionReport/index.vue
index 5017dbd..8e821db 100644
--- a/src/views/report/productionExecutionReport/index.vue
+++ b/src/views/report/productionExecutionReport/index.vue
@@ -113,13 +113,13 @@
         </template>
       </el-table-column>
     </el-table>
-    <!--    <pagination-->
-    <!--      v-show="total>0"-->
-    <!--      :total="total"-->
-    <!--      :page.sync="queryParams.pageNum"-->
-    <!--      :limit.sync="queryParams.pageSize"-->
-    <!--      @pagination="getList"-->
-    <!--    />-->
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
 
   </div>
 </template>
@@ -162,8 +162,8 @@ export default {
       daterangeBeginTime: [],
       // 查询参数
       queryParams: {
-        // pageNum: 1,
-        // pageSize: 10,
+        pageNum: 1,
+        pageSize: 10,
         beginBeginTime: null,
         endBeginTime: null,
         productLineCode: 'CX_02',
@@ -238,12 +238,12 @@ export default {
         this.queryParams.endBeginTime = null
       }
       productionExecutionReportList(this.queryParams).then(response => {
-        this.reportList = response.data
+        this.reportList = response.rows
+        this.total = response.total
         this.totalSum = 0;
         this.reportList.forEach(e => {
           this.totalSum += e.COMP_AMOUNT
         })
-        // this.total = response.total
         this.loading = false
       })
     },
diff --git a/src/views/report/repairRateReport/index.vue b/src/views/report/repairRateReport/index.vue
index 239cc8b..d197f8c 100644
--- a/src/views/report/repairRateReport/index.vue
+++ b/src/views/report/repairRateReport/index.vue
@@ -186,6 +186,8 @@ export default {
     const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
     this.daterangeBeginTime[0] = weekDate
     this.daterangeBeginTime[1] = nowDate
+    this.queryParams.beginBeginTime = this.daterangeBeginTime[0]
+    this.queryParams.endBeginTime = this.daterangeBeginTime[1]
     // this.getList()
     this.getChart()
 
@@ -527,7 +529,6 @@ export default {
     },
     /** 查询工单信息列表 */
     getList() {
-      this.isChart = false
       this.loading = true
       if (null != this.daterangeBeginTime && '' != this.daterangeBeginTime) {
         this.queryParams.beginBeginTime = this.daterangeBeginTime[0]
@@ -537,7 +538,12 @@ export default {
         this.queryParams.endBeginTime = null
       }
       if (this.queryParams.STATION_CODE.length > 0) {
+        this.isChart = false
         this.queryParams.stationCodeList = this.queryParams.STATION_CODE.join(',')
+      }else {
+        this.isChart = true
+        this.reportList = [];
+        this.getChart()
       }
       repairRateReportList(this.queryParams).then(response => {
         this.reportList = response.data
diff --git a/src/views/report/scanOfflineRecordReport/index.vue b/src/views/report/scanOfflineRecordReport/index.vue
index 4e16d77..2544ca5 100644
--- a/src/views/report/scanOfflineRecordReport/index.vue
+++ b/src/views/report/scanOfflineRecordReport/index.vue
@@ -61,6 +61,14 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          size="mini"
+        >下线数：{{ totalSum }}
+        </el-button>
+      </el-col>
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -140,6 +148,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      totalSum: 0,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -224,6 +233,7 @@ export default {
       listProductOffLine(this.queryParams).then(response => {
         this.productOffLineList = response.rows;
         this.total = response.total;
+        this.totalSum = response.total;
         this.loading = false;
       });
     },

From 6873009709f20c99061acb843ab7f567b2786731 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Sat, 30 Mar 2024 19:06:41 +0800
Subject: [PATCH 09/16] =?UTF-8?q?update=20-=20=E8=AE=BE=E5=A4=87=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/base/dnbInstant/index.vue         |  66 +--
 src/views/report/DayDnb/index.vue           | 466 ++++++++++----------
 src/views/report/pointDnb/index.vue         |  86 ++--
 src/views/report/repairRateReport/index.vue |  36 ++
 4 files changed, 362 insertions(+), 292 deletions(-)

diff --git a/src/views/base/dnbInstant/index.vue b/src/views/base/dnbInstant/index.vue
index a0afa1b..fa392f9 100644
--- a/src/views/base/dnbInstant/index.vue
+++ b/src/views/base/dnbInstant/index.vue
@@ -28,14 +28,14 @@
       </el-col>
       <el-col :span="20" :xs="24">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item label="计量设备编号" prop="monitorId">
-        <el-input
-          v-model="queryParams.monitorId"
-          placeholder="请输入计量设备编号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+<!--      <el-form-item label="计量设备编号" prop="monitorId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.monitorId"-->
+<!--          placeholder="请输入计量设备编号"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
       <el-form-item label="采集时间">
         <el-date-picker
           v-model="daterangeCollectTime"
@@ -43,8 +43,8 @@
           value-format="yyyy-MM-dd HH:mm:ss"
           type="datetimerange"
           range-separator="-"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
         ></el-date-picker>
       </el-form-item>
       <el-form-item label="采集方式" prop="collectType">
@@ -112,8 +112,8 @@
     <el-table v-loading="loading" :data="dnbInstantList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="主键标识" align="center" prop="objId" v-if="columns[0].visible"/>
-      <el-table-column label="计量设备编号" align="center" prop="monitorId" v-if="columns[1].visible"/>
-      <el-table-column label="计量设备名称" align="center" prop="monitorName" v-if="columns[21].visible"/>
+      <el-table-column label="计量设备编号" align="center" prop="monitorId" v-if="columns[1].visible" width="120"/>
+      <el-table-column label="计量设备名称" align="center" prop="monitorName" v-if="columns[21].visible" width="150"/>
       <el-table-column label="采集时间" align="center" prop="collectTime" width="180" v-if="columns[2].visible">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.collectTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
@@ -157,24 +157,24 @@
         </template>
       </el-table-column>
       <el-table-column label="工厂编号" align="center" prop="factoryCode" v-if="columns[20].visible"/>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['base:dnbInstant:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['base:dnbInstant:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-edit"-->
+<!--            @click="handleUpdate(scope.row)"-->
+<!--            v-hasPermi="['base:dnbInstant:edit']"-->
+<!--          >修改</el-button>-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-delete"-->
+<!--            @click="handleDelete(scope.row)"-->
+<!--            v-hasPermi="['base:dnbInstant:remove']"-->
+<!--          >删除</el-button>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
     </el-table>
 
     <pagination
@@ -271,6 +271,7 @@
 <script>
 import { listDnbInstant, getDnbInstant, delDnbInstant, addDnbInstant, updateDnbInstant } from "@/api/base/dnbInstant";
 import { getMonitorInfoTree } from '@/api/report/pointDnb'
+import { parseTime } from '@//utils/ruoyi'
 
 export default {
   name: "DnbInstant",
@@ -345,7 +346,7 @@ export default {
             { key: 7, label: `B项电流`, visible: true },
             { key: 8, label: `C项电流`, visible: true },
             { key: 9, label: `记录时间`, visible: false },
-            { key: 10, label: `功率因数`, visible: true },
+            { key: 10, label: `功率因数`, visible: false },
             { key: 11, label: `正向有功`, visible: true },
             { key: 12, label: `有功功率`, visible: false },
             { key: 13, label: `无功功率`, visible: false },
@@ -367,6 +368,9 @@ export default {
     }
   },
   created() {
+    const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
+    this.daterangeCollectTime[0] = nowDate + ' 00:00:00'
+    this.daterangeCollectTime[1] = nowDate + ' 23:59:59'
     this.getList();
     this.getDeptTrees();
   },
diff --git a/src/views/report/DayDnb/index.vue b/src/views/report/DayDnb/index.vue
index 4e98c3c..383690d 100644
--- a/src/views/report/DayDnb/index.vue
+++ b/src/views/report/DayDnb/index.vue
@@ -27,166 +27,170 @@
         </div>
       </el-col>
       <el-col :span="20" :xs="24">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+                 label-width="68px"
+        >
+          <el-form-item label="采集日期">
+            <el-date-picker
+              v-model="daterangeCollectTime"
+              style="width: 240px"
+              value-format="yyyy-MM-dd"
+              type="daterange"
+              range-separator="-"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            ></el-date-picker>
+          </el-form-item>
+<!--          <el-form-item label="是否标识" prop="isFlag">-->
+<!--            <el-select v-model="queryParams.isFlag" placeholder="请选择是否标识" clearable>-->
+<!--              <el-option-->
+<!--                v-for="dict in dict.type.is_flag"-->
+<!--                :key="dict.value"-->
+<!--                :label="dict.label"-->
+<!--                :value="dict.value"-->
+<!--              />-->
+<!--            </el-select>-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="创建人" prop="createdBy">-->
+<!--            <el-input-->
+<!--              v-model="queryParams.createdBy"-->
+<!--              placeholder="请输入创建人"-->
+<!--              clearable-->
+<!--              @keyup.enter.native="handleQuery"-->
+<!--            />-->
+<!--          </el-form-item>-->
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
 
+        <el-row :gutter="10" class="mb8">
+          <!--      <el-col :span="1.5">-->
+          <!--        <el-button-->
+          <!--          type="primary"-->
+          <!--          plain-->
+          <!--          icon="el-icon-plus"-->
+          <!--          size="mini"-->
+          <!--          @click="handleAdd"-->
+          <!--          v-hasPermi="['report:DayDnb:add']"-->
+          <!--        >新增</el-button>-->
+          <!--      </el-col>-->
+          <!--      <el-col :span="1.5">-->
+          <!--        <el-button-->
+          <!--          type="success"-->
+          <!--          plain-->
+          <!--          icon="el-icon-edit"-->
+          <!--          size="mini"-->
+          <!--          :disabled="single"-->
+          <!--          @click="handleUpdate"-->
+          <!--          v-hasPermi="['report:DayDnb:edit']"-->
+          <!--        >修改</el-button>-->
+          <!--      </el-col>-->
+<!--          <el-col :span="1.5">-->
+<!--            <el-button-->
+<!--              type="danger"-->
+<!--              plain-->
+<!--              icon="el-icon-delete"-->
+<!--              size="mini"-->
+<!--              :disabled="multiple"-->
+<!--              @click="handleDelete"-->
+<!--              v-hasPermi="['report:DayDnb:remove']"-->
+<!--            >删除-->
+<!--            </el-button>-->
+<!--          </el-col>-->
+          <el-col :span="1.5">
+            <el-button
+              type="warning"
+              plain
+              icon="el-icon-download"
+              size="mini"
+              @click="handleExport"
+              v-hasPermi="['report:DayDnb:export']"
+            >导出
+            </el-button>
+          </el-col>
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+        </el-row>
 
+        <el-table v-loading="loading" :data="DayDnbList" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="55" align="center"/>
+          <el-table-column label="主键标识" align="center" prop="objId" v-if="columns[0].visible"/>
+          <el-table-column label="计量设备编号" align="center" prop="monitorCode" v-if="columns[1].visible" width="140"/>
+          <el-table-column label="计量设备名称" align="center" prop="monitorName" v-if="columns[12].visible" width="320"/>
+          <el-table-column label="耗量" align="center" prop="expend" v-if="columns[3].visible" width="100"/>
+          <el-table-column label="报表日期" align="center" prop="reportDate" v-if="columns[4].visible" width="250"/>
+          <el-table-column label="仪表值(kW·h)" align="center" prop="instrumentValue" v-if="columns[2].visible" width="180"/>
+          <el-table-column label="开始日期" align="center" prop="beginTime" v-if="columns[5].visible"/>
+          <el-table-column label="结束日期" align="center" prop="endTime" v-if="columns[6].visible"/>
+          <el-table-column label="是否标识" align="center" prop="isFlag" v-if="columns[7].visible">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="创建人" align="center" prop="createdBy" v-if="columns[8].visible"/>
+          <el-table-column label="创建时间" align="center" prop="createdTime" width="180" v-if="columns[9].visible">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="更新人" align="center" prop="updatedBy" v-if="columns[10].visible"/>
+          <el-table-column label="更新时间" align="center" prop="updatedTime" width="180" v-if="columns[11].visible">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+            </template>
+          </el-table-column>
+<!--          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+<!--            <template slot-scope="scope">-->
+<!--              <el-button-->
+<!--                size="mini"-->
+<!--                type="text"-->
+<!--                icon="el-icon-edit"-->
+<!--                @click="handleUpdate(scope.row)"-->
+<!--                v-hasPermi="['report:DayDnb:edit']"-->
+<!--              >修改-->
+<!--              </el-button>-->
+<!--              <el-button-->
+<!--                size="mini"-->
+<!--                type="text"-->
+<!--                icon="el-icon-delete"-->
+<!--                @click="handleDelete(scope.row)"-->
+<!--                v-hasPermi="['report:DayDnb:remove']"-->
+<!--              >删除-->
+<!--              </el-button>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+        </el-table>
 
-      <el-form-item label="报表日期" prop="reportDate">
-        <el-input
-          v-model="queryParams.reportDate"
-          placeholder="请输入报表日期"
-          clearable
-          @keyup.enter.native="handleQuery"
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
         />
-      </el-form-item>
-
-
-      <el-form-item label="是否标识" prop="isFlag">
-        <el-select v-model="queryParams.isFlag" placeholder="请选择是否标识" clearable>
-          <el-option
-            v-for="dict in dict.type.is_flag"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="创建人" prop="createdBy">
-        <el-input
-          v-model="queryParams.createdBy"
-          placeholder="请输入创建人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['report:DayDnb:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['report:DayDnb:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['report:DayDnb:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['report:DayDnb:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="DayDnbList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键标识" align="center" prop="objId" v-if="columns[0].visible"/>
-      <el-table-column label="计量设备编号" align="center" prop="monitorCode" v-if="columns[1].visible"/>
-      <el-table-column label="仪表值" align="center" prop="instrumentValue" v-if="columns[2].visible"/>
-      <el-table-column label="耗量" align="center" prop="expend" v-if="columns[3].visible"/>
-      <el-table-column label="报表日期" align="center" prop="reportDate" v-if="columns[4].visible"/>
-      <el-table-column label="开始时间" align="center" prop="beginTime" v-if="columns[5].visible"/>
-      <el-table-column label="结束时间" align="center" prop="endTime" v-if="columns[6].visible"/>
-      <el-table-column label="是否标识" align="center" prop="isFlag" v-if="columns[7].visible">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="创建人" align="center" prop="createdBy" v-if="columns[8].visible"/>
-      <el-table-column label="创建时间" align="center" prop="createdTime" width="180" v-if="columns[9].visible">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="更新人" align="center" prop="updatedBy" v-if="columns[10].visible"/>
-      <el-table-column label="更新时间" align="center" prop="updatedTime" width="180" v-if="columns[11].visible">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['report:DayDnb:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['report:DayDnb:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
       </el-col>
     </el-row>
     <!-- 添加或修改电日耗报对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="计量设备编号" prop="monitorCode">
-          <el-input v-model="form.monitorCode" placeholder="请输入计量设备编号" />
+          <el-input v-model="form.monitorCode" placeholder="请输入计量设备编号"/>
         </el-form-item>
-        <el-form-item label="仪表值" prop="instrumentValue">
-          <el-input v-model="form.instrumentValue" placeholder="请输入仪表值" />
+        <el-form-item label="仪表值(kW·h)" prop="instrumentValue">
+          <el-input v-model="form.instrumentValue" placeholder="请输入仪表值(kW·h)"/>
         </el-form-item>
         <el-form-item label="耗量" prop="expend">
-          <el-input v-model="form.expend" placeholder="请输入耗量" />
+          <el-input v-model="form.expend" placeholder="请输入耗量"/>
         </el-form-item>
         <el-form-item label="报表日期" prop="reportDate">
-          <el-input v-model="form.reportDate" placeholder="请输入报表日期" />
+          <el-input v-model="form.reportDate" placeholder="请输入报表日期"/>
         </el-form-item>
-        <el-form-item label="开始时间" prop="beginTime">
-          <el-input v-model="form.beginTime" placeholder="请输入开始时间" />
+        <el-form-item label="开始日期" prop="beginTime">
+          <el-input v-model="form.beginTime" placeholder="请输入开始日期"/>
         </el-form-item>
-        <el-form-item label="结束时间" prop="endTime">
-          <el-input v-model="form.endTime" placeholder="请输入结束时间" />
+        <el-form-item label="结束日期" prop="endTime">
+          <el-input v-model="form.endTime" placeholder="请输入结束日期"/>
         </el-form-item>
         <el-form-item label="是否标识" prop="isFlag">
           <el-radio-group v-model="form.isFlag">
@@ -194,29 +198,32 @@
               v-for="dict in dict.type.is_flag"
               :key="dict.value"
               :label="parseInt(dict.value)"
-            >{{dict.label}}</el-radio>
+            >{{ dict.label }}
+            </el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="创建人" prop="createdBy">
-          <el-input v-model="form.createdBy" placeholder="请输入创建人" />
+          <el-input v-model="form.createdBy" placeholder="请输入创建人"/>
         </el-form-item>
         <el-form-item label="创建时间" prop="createdTime">
           <el-date-picker clearable
-            v-model="form.createdTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择创建时间">
+                          v-model="form.createdTime"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择创建时间"
+          >
           </el-date-picker>
         </el-form-item>
         <el-form-item label="更新人" prop="updatedBy">
-          <el-input v-model="form.updatedBy" placeholder="请输入更新人" />
+          <el-input v-model="form.updatedBy" placeholder="请输入更新人"/>
         </el-form-item>
         <el-form-item label="更新时间" prop="updatedTime">
           <el-date-picker clearable
-            v-model="form.updatedTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择更新时间">
+                          v-model="form.updatedTime"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择更新时间"
+          >
           </el-date-picker>
         </el-form-item>
       </el-form>
@@ -229,17 +236,18 @@
 </template>
 
 <script>
-import { listDayDnb, getDayDnb, delDayDnb, addDayDnb, updateDayDnb } from "@/api/report/DayDnb";
+import { listDayDnb, getDayDnb, delDayDnb, addDayDnb, updateDayDnb } from '@/api/report/DayDnb'
 import { getMonitorInfoTree } from '@/api/report/pointDnb'
+import { parseTime } from '@//utils/ruoyi'
 
 export default {
-  name: "DayDnb",
+  name: 'DayDnb',
   dicts: ['is_flag'],
   data() {
     return {
       // 部门树选项
       deptOptions: undefined,
-      monitorName:undefined,
+      monitorName: undefined,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -254,8 +262,9 @@ export default {
       total: 0,
       // 电日耗报表格数据
       DayDnbList: [],
+      daterangeCollectTime: [],
       // 弹出层标题
-      title: "",
+      title: '',
       // 是否显示弹出层
       open: false,
       // 查询参数
@@ -277,68 +286,76 @@ export default {
       // 表单参数
       form: {},
       defaultProps: {
-        children: "children",
-        label: "label"
+        children: 'children',
+        label: 'label'
       },
       // 表单校验
-      rules: {
-      },
+      rules: {},
       columns: [
-            { key: 0, label: `主键标识`, visible: true },
-            { key: 1, label: `计量设备编号`, visible: true },
-            { key: 2, label: `仪表值`, visible: true },
-            { key: 3, label: `耗量`, visible: true },
-            { key: 4, label: `报表日期`, visible: true },
-            { key: 5, label: `开始时间`, visible: true },
-            { key: 6, label: `结束时间`, visible: true },
-            { key: 7, label: `是否标识`, visible: true },
-            { key: 8, label: `创建人`, visible: true },
-            { key: 9, label: `创建时间`, visible: true },
-            { key: 10, label: `更新人`, visible: true },
-            { key: 11, label: `更新时间`, visible: true },
-        ]
-    };
+        { key: 0, label: `主键标识`, visible: false },
+        { key: 1, label: `计量设备编号`, visible: true },
+        { key: 2, label: `仪表值(kW·h)`, visible: true },
+        { key: 3, label: `耗量`, visible: true },
+        { key: 4, label: `报表日期`, visible: true },
+        { key: 5, label: `开始日期`, visible: false },
+        { key: 6, label: `结束日期`, visible: false },
+        { key: 7, label: `是否标识`, visible: false },
+        { key: 8, label: `创建人`, visible: false },
+        { key: 9, label: `创建时间`, visible: false },
+        { key: 10, label: `更新人`, visible: false },
+        { key: 11, label: `更新时间`, visible: false },
+        { key: 12, label: `计量设备名称`, visible: true }
+      ]
+    }
   },
   watch: {
     // 根据名称筛选部门树
     monitorName(val) {
-      this.$refs.tree.filter(val);
+      this.$refs.tree.filter(val)
     }
   },
   created() {
-    this.getList();
-    this.getDeptTrees();
+    const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
+    this.daterangeCollectTime[0] = nowDate
+    this.daterangeCollectTime[1] = nowDate
+    this.getList()
+    this.getDeptTrees()
   },
   methods: {
     /** 查询计量设备下拉树结构 */
     getDeptTrees() {
       getMonitorInfoTree().then(response => {
-        this.deptOptions = response.data;
-      });
+        this.deptOptions = response.data
+      })
     },
     // 筛选节点
     filterNode(value, data) {
-      if (!value) return true;
-      return data.label.indexOf(value) !== -1;
+      if (!value) return true
+      return data.label.indexOf(value) !== -1
     },
     // 节点单击事件
     handleNodeClick(data) {
-      this.queryParams.monitorCode = data.code;
-      this.handleQuery();
+      this.queryParams.monitorCode = data.code
+      this.handleQuery()
     },
     /** 查询电日耗报列表 */
     getList() {
-      this.loading = true;
+      this.loading = true
+      this.queryParams.params = {};
+      if (null != this.daterangeCollectTime && '' != this.daterangeCollectTime) {
+        this.queryParams.params["beginCollectTime"] = this.daterangeCollectTime[0];
+        this.queryParams.params["endCollectTime"] = this.daterangeCollectTime[1];
+      }
       listDayDnb(this.queryParams).then(response => {
-        this.DayDnbList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
+        this.DayDnbList = response.rows
+        this.total = response.total
+        this.loading = false
+      })
     },
     // 取消按钮
     cancel() {
-      this.open = false;
-      this.reset();
+      this.open = false
+      this.reset()
     },
     // 表单重置
     reset() {
@@ -355,71 +372,72 @@ export default {
         createdTime: null,
         updatedBy: null,
         updatedTime: null
-      };
-      this.resetForm("form");
+      }
+      this.resetForm('form')
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
+      this.queryParams.pageNum = 1
+      this.getList()
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
-      this.queryParams.monitorCode = null;
-      this.handleQuery();
+      this.resetForm('queryForm')
+      this.queryParams.monitorCode = null
+      this.handleQuery()
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.objId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加电日耗报";
+      this.reset()
+      this.open = true
+      this.title = '添加电日耗报'
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.reset();
+      this.reset()
       const objId = row.objId || this.ids
       getDayDnb(objId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改电日耗报";
-      });
+        this.form = response.data
+        this.open = true
+        this.title = '修改电日耗报'
+      })
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs['form'].validate(valid => {
         if (valid) {
           if (this.form.objId != null) {
             updateDayDnb(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
+              this.$modal.msgSuccess('修改成功')
+              this.open = false
+              this.getList()
+            })
           } else {
             addDayDnb(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
+              this.$modal.msgSuccess('新增成功')
+              this.open = false
+              this.getList()
+            })
           }
         }
-      });
+      })
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const objIds = row.objId || this.ids;
+      const objIds = row.objId || this.ids
       this.$modal.confirm('是否确认删除电日耗报编号为"' + objIds + '"的数据项？').then(function() {
-        return delDayDnb(objIds);
+        return delDayDnb(objIds)
       }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+        this.getList()
+        this.$modal.msgSuccess('删除成功')
+      }).catch(() => {
+      })
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -428,5 +446,5 @@ export default {
       }, `DayDnb_${new Date().getTime()}.xlsx`)
     }
   }
-};
+}
 </script>
diff --git a/src/views/report/pointDnb/index.vue b/src/views/report/pointDnb/index.vue
index a6daad2..56bef72 100644
--- a/src/views/report/pointDnb/index.vue
+++ b/src/views/report/pointDnb/index.vue
@@ -46,13 +46,16 @@
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-      <el-form-item label="创建时间" prop="createdTime">
-        <el-date-picker clearable
-          v-model="queryParams.createdTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择创建时间">
-        </el-date-picker>
+      <el-form-item label="采集时间">
+        <el-date-picker
+          v-model="daterangeCollectTime"
+          style="width: 340px"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          type="datetimerange"
+          range-separator="-"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        ></el-date-picker>
       </el-form-item>
 
       <el-form-item>
@@ -62,27 +65,27 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['report:pointDnb:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['report:pointDnb:edit']"
-        >修改</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="primary"-->
+<!--          plain-->
+<!--          icon="el-icon-plus"-->
+<!--          size="mini"-->
+<!--          @click="handleAdd"-->
+<!--          v-hasPermi="['report:pointDnb:add']"-->
+<!--        >新增</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="success"-->
+<!--          plain-->
+<!--          icon="el-icon-edit"-->
+<!--          size="mini"-->
+<!--          :disabled="single"-->
+<!--          @click="handleUpdate"-->
+<!--          v-hasPermi="['report:pointDnb:edit']"-->
+<!--        >修改</el-button>-->
+<!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -113,10 +116,10 @@
       <el-table-column label="计量设备编号" align="center" prop="monitorCode" v-if="columns[1].visible" width="120"/>
       <el-table-column label="计量设备名称" align="center" prop="monitorName" v-if="columns[12].visible" width="150"/>
       <el-table-column label="耗量" align="center" prop="expend" v-if="columns[3].visible"/>
-      <el-table-column label="仪表值" align="center" prop="instrumentValue" v-if="columns[2].visible"/>
-      <el-table-column label="开始时间" align="center" prop="beginTime" v-if="columns[5].visible" width="180"/>
-      <el-table-column label="结束时间" align="center" prop="endTime" v-if="columns[6].visible" width="180"/>
-      <el-table-column label="记录时间" align="center" prop="recordTime" v-if="columns[4].visible" width="180"/>
+      <el-table-column label="开始时间" align="center" prop="beginTime" v-if="columns[5].visible" width="170"/>
+      <el-table-column label="结束时间" align="center" prop="endTime" v-if="columns[6].visible" width="170"/>
+      <el-table-column label="记录时间" align="center" prop="recordTime" v-if="columns[4].visible" width="170"/>
+      <el-table-column label="仪表值(kW·h)" align="center" prop="instrumentValue" v-if="columns[2].visible" width="100"/>
       <el-table-column label="是否标识" align="center" prop="isFlag" v-if="columns[7].visible">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>
@@ -169,8 +172,8 @@
         <el-form-item label="计量设备编号" prop="monitorCode">
           <el-input v-model="form.monitorCode" placeholder="请输入计量设备编号" />
         </el-form-item>
-        <el-form-item label="仪表值" prop="instrumentValue">
-          <el-input v-model="form.instrumentValue" placeholder="请输入仪表值" />
+        <el-form-item label="仪表值(kW·h)" prop="instrumentValue">
+          <el-input v-model="form.instrumentValue" placeholder="请输入仪表值(kW·h)" />
         </el-form-item>
         <el-form-item label="耗量" prop="expend">
           <el-input v-model="form.expend" placeholder="请输入耗量" />
@@ -212,6 +215,7 @@ import {
   getMonitorInfoTree
 } from '@/api/report/pointDnb'
 import { listMonitorInfo,getMointorListLike} from "@/api/base/monitorInfo";
+import { parseTime } from '@//utils/ruoyi'
 
 
 
@@ -266,6 +270,7 @@ export default {
       },
       // 表单参数
       form: {},
+      daterangeCollectTime: [],
       defaultProps: {
         children: "children",
         label: "label"
@@ -279,7 +284,7 @@ export default {
       columns: [
             { key: 0, label: `主键标识`, visible: false },
             { key: 1, label: `计量设备编号`, visible: true },
-            { key: 2, label: `仪表值`, visible: true },
+            { key: 2, label: `仪表值(kW·h)`, visible: true },
             { key: 3, label: `耗量`, visible: true },
             { key: 4, label: `记录时间`, visible: true },
             { key: 5, label: `开始时间`, visible: true },
@@ -291,8 +296,6 @@ export default {
             { key: 11, label: `更新时间`, visible: false },
             { key: 12, label: `计量设备名称`, visible: true },
         ],
-
-
     };
   },
   watch: {
@@ -303,6 +306,9 @@ export default {
     }
   },
   created() {
+    const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
+    this.daterangeCollectTime[0] = nowDate + ' 00:00:00'
+    this.daterangeCollectTime[1] = nowDate + ' 23:59:59'
     this.getList();
     this.getDeptTrees();
   },
@@ -317,6 +323,11 @@ export default {
     /** 查询电整点耗量报表列表 */
     getList() {
       this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangeCollectTime && '' != this.daterangeCollectTime) {
+        this.queryParams.params["beginCollectTime"] = this.daterangeCollectTime[0];
+        this.queryParams.params["endCollectTime"] = this.daterangeCollectTime[1];
+      }
       listPointDnb(this.queryParams).then(response => {
         this.pointDnbList = response.rows;
         this.total = response.total;
@@ -376,6 +387,7 @@ export default {
 
     /** 重置按钮操作 */
     resetQuery() {
+      this.daterangeCollectTime = [];
       this.resetForm("queryForm");
       this.queryParams.monitorCode = null;
       this.handleQuery();
diff --git a/src/views/report/repairRateReport/index.vue b/src/views/report/repairRateReport/index.vue
index d197f8c..8f73d58 100644
--- a/src/views/report/repairRateReport/index.vue
+++ b/src/views/report/repairRateReport/index.vue
@@ -226,6 +226,15 @@ export default {
               },
             },
           },
+          label: {
+            show: true,
+            position: "top",
+            textStyle: {
+              color: "#fff",
+              fontSize: 16
+            },
+            formatter: '{c}%'
+          },
           legend: {
             itemWidth: 3 * vw,
             data: ['检漏返修率(%)'],
@@ -307,6 +316,15 @@ export default {
               },
             },
           },
+          label: {
+            show: true,
+            position: "top",
+            textStyle: {
+              color: "#fff",
+              fontSize: 16
+            },
+            formatter: '{c}%'
+          },
           legend: {
             itemWidth: 3 * vw,
             data: ['发泡返修率(%)'],
@@ -388,6 +406,15 @@ export default {
               },
             },
           },
+          label: {
+            show: true,
+            position: "top",
+            textStyle: {
+              color: "#fff",
+              fontSize: 16
+            },
+            formatter: '{c}%'
+          },
           legend: {
             itemWidth: 3 * vw,
             data: ['电检返修率(%)'],
@@ -469,6 +496,15 @@ export default {
               },
             },
           },
+          label: {
+            show: true,
+            position: "top",
+            textStyle: {
+              color: "#fff",
+              fontSize: 16
+            },
+            formatter: '{c}%'
+          },
           legend: {
             itemWidth: 3 * vw,
             data: ['总装返修率(%)'],

From c75dab3ba6d4d64b841a01949d26c8810b0a2fa7 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Mon, 1 Apr 2024 15:05:54 +0800
Subject: [PATCH 10/16] =?UTF-8?q?update=20-=20=E6=88=90=E5=93=81=E4=B8=8B?=
 =?UTF-8?q?=E7=BA=BF=E5=BC=82=E5=B8=B8=E8=AE=B0=E5=BD=95=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/report/recordException.js          |  44 +++
 src/views/report/recordException/index.vue | 333 +++++++++++++++++++++
 2 files changed, 377 insertions(+)
 create mode 100644 src/api/report/recordException.js
 create mode 100644 src/views/report/recordException/index.vue

diff --git a/src/api/report/recordException.js b/src/api/report/recordException.js
new file mode 100644
index 0000000..628376a
--- /dev/null
+++ b/src/api/report/recordException.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询成品下线异常记录列表
+export function listRecordException(query) {
+  return request({
+    url: '/report/recordException/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询成品下线异常记录详细
+export function getRecordException(objId) {
+  return request({
+    url: '/report/recordException/' + objId,
+    method: 'get'
+  })
+}
+
+// 新增成品下线异常记录
+export function addRecordException(data) {
+  return request({
+    url: '/report/recordException',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改成品下线异常记录
+export function updateRecordException(data) {
+  return request({
+    url: '/report/recordException',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除成品下线异常记录
+export function delRecordException(objId) {
+  return request({
+    url: '/report/recordException/' + objId,
+    method: 'delete'
+  })
+}
diff --git a/src/views/report/recordException/index.vue b/src/views/report/recordException/index.vue
new file mode 100644
index 0000000..29a9d51
--- /dev/null
+++ b/src/views/report/recordException/index.vue
@@ -0,0 +1,333 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
+      <el-form-item label="产线编号" prop="productLineCode">
+        <el-select v-model="queryParams.productLineCode" placeholder="请选择产线">
+          <el-option
+            v-for="item in productLineList"
+            :key="item.productLineCode"
+            :label="item.productLineName"
+            :value="item.productLineCode"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="异常类型" prop="exceptionType">
+        <el-select v-model="queryParams.exceptionType" placeholder="请选择异常类型" clearable>
+          <el-option
+            v-for="dict in dict.type.exception_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="MES条码" prop="boxCode">
+        <el-input
+          v-model="queryParams.boxCode"
+          placeholder="请输入MES条码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="产品条码" prop="productSncode">
+        <el-input
+          v-model="queryParams.productSncode"
+          placeholder="请输入产品条码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="扫描时间">
+        <el-date-picker
+          v-model="daterangeProductScantime"
+          style="width: 340px"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          type="datetimerange"
+          range-separator="-"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        ></el-date-picker>
+      </el-form-item>
+
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--          type="primary"-->
+      <!--          plain-->
+      <!--          icon="el-icon-plus"-->
+      <!--          size="mini"-->
+      <!--          @click="handleAdd"-->
+      <!--          v-hasPermi="['report:recordException:add']"-->
+      <!--        >新增-->
+      <!--        </el-button>-->
+      <!--      </el-col>-->
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--          type="success"-->
+      <!--          plain-->
+      <!--          icon="el-icon-edit"-->
+      <!--          size="mini"-->
+      <!--          :disabled="single"-->
+      <!--          @click="handleUpdate"-->
+      <!--          v-hasPermi="['report:recordException:edit']"-->
+      <!--        >修改-->
+      <!--        </el-button>-->
+      <!--      </el-col>-->
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--          type="danger"-->
+      <!--          plain-->
+      <!--          icon="el-icon-delete"-->
+      <!--          size="mini"-->
+      <!--          :disabled="multiple"-->
+      <!--          @click="handleDelete"-->
+      <!--          v-hasPermi="['report:recordException:remove']"-->
+      <!--        >删除-->
+      <!--        </el-button>-->
+      <!--      </el-col>-->
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['report:recordException:export']"
+        >导出
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="recordExceptionList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="主键标识" align="center" prop="objId" v-if="columns[0].visible"/>
+      <el-table-column label="MES条码" align="center" prop="boxCode" v-if="columns[6].visible" width="190"/>
+      <el-table-column label="产品条码" align="center" prop="productSncode" v-if="columns[1].visible" width="190"/>
+      <el-table-column label="异常类型" align="center" prop="exceptionType" v-if="columns[5].visible" width="100">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.exception_type" :value="scope.row.exceptionType"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="异常信息" align="center" prop="exceptionMsg" v-if="columns[2].visible"/>
+      <el-table-column label="扫描时间" align="center" prop="productScantime" width="180" v-if="columns[3].visible">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.productScantime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="产线编号" align="center" prop="productLineCode" v-if="columns[4].visible"/>
+      <!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+      <!--        <template slot-scope="scope">-->
+      <!--          <el-button-->
+      <!--            size="mini"-->
+      <!--            type="text"-->
+      <!--            icon="el-icon-edit"-->
+      <!--            @click="handleUpdate(scope.row)"-->
+      <!--            v-hasPermi="['report:recordException:edit']"-->
+      <!--          >修改-->
+      <!--          </el-button>-->
+      <!--          <el-button-->
+      <!--            size="mini"-->
+      <!--            type="text"-->
+      <!--            icon="el-icon-delete"-->
+      <!--            @click="handleDelete(scope.row)"-->
+      <!--            v-hasPermi="['report:recordException:remove']"-->
+      <!--          >删除-->
+      <!--          </el-button>-->
+      <!--        </template>-->
+      <!--      </el-table-column>-->
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+
+  </div>
+</template>
+
+<script>
+import {
+  listRecordException,
+  getRecordException,
+  delRecordException,
+  addRecordException,
+  updateRecordException
+} from '@/api/report/recordException'
+import { findProductLineList } from '@//api/base/productLine'
+
+export default {
+  name: 'RecordException',
+  dicts: ['exception_type'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 成品下线异常记录表格数据
+      recordExceptionList: [],
+      // 弹出层标题
+      title: '',
+      // 是否显示弹出层
+      open: false,
+      // MES条码时间范围
+      daterangeProductScantime: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        productSncode: null,
+        exceptionMsg: null,
+        productScantime: null,
+        productLineCode: 'CX_02',
+        exceptionType: '1',
+        boxCode: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {},
+      columns: [
+        { key: 0, label: `主键标识`, visible: false },
+        { key: 1, label: `产品条码`, visible: true },
+        { key: 2, label: `异常信息`, visible: true },
+        { key: 3, label: `扫描时间`, visible: true },
+        { key: 4, label: `产线编号`, visible: false },
+        { key: 5, label: `异常类型`, visible: true },
+        { key: 6, label: `MES条码`, visible: true }
+      ],
+      // 产线选项
+      productLineList: []
+    }
+  },
+  created() {
+    findProductLineList({ productLineType: 1 }).then(response => {
+      this.productLineList = response.data
+    })
+    this.getList()
+  },
+  methods: {
+    /** 查询成品下线异常记录列表 */
+    getList() {
+      this.loading = true
+      this.queryParams.params = {}
+      if (null != this.daterangeProductScantime && '' != this.daterangeProductScantime) {
+        this.queryParams.params['beginProductScantime'] = this.daterangeProductScantime[0]
+        this.queryParams.params['endProductScantime'] = this.daterangeProductScantime[1]
+      }
+      listRecordException(this.queryParams).then(response => {
+        this.recordExceptionList = response.rows
+        this.total = response.total
+        this.loading = false
+      })
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        objId: null,
+        productSncode: null,
+        exceptionMsg: null,
+        productScantime: null,
+        productLineCode: null,
+        exceptionType: null,
+        boxCode: null
+      }
+      this.resetForm('form')
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterangeProductScantime = []
+      this.resetForm('queryForm')
+      this.handleQuery()
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.objId)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset()
+      this.open = true
+      this.title = '添加成品下线异常记录'
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset()
+      const objId = row.objId || this.ids
+      getRecordException(objId).then(response => {
+        this.form = response.data
+        this.open = true
+        this.title = '修改成品下线异常记录'
+      })
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs['form'].validate(valid => {
+        if (valid) {
+          if (this.form.objId != null) {
+            updateRecordException(this.form).then(response => {
+              this.$modal.msgSuccess('修改成功')
+              this.open = false
+              this.getList()
+            })
+          } else {
+            addRecordException(this.form).then(response => {
+              this.$modal.msgSuccess('新增成功')
+              this.open = false
+              this.getList()
+            })
+          }
+        }
+      })
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const objIds = row.objId || this.ids
+      this.$modal.confirm('是否确认删除成品下线异常记录编号为"' + objIds + '"的数据项？').then(function() {
+        return delRecordException(objIds)
+      }).then(() => {
+        this.getList()
+        this.$modal.msgSuccess('删除成功')
+      }).catch(() => {
+      })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('report/recordException/export', {
+        ...this.queryParams
+      }, `recordException_${new Date().getTime()}.xlsx`)
+    }
+  }
+}
+</script>

From cb28950f4f29a265ca8765cac096c1660d37da9a Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Mon, 1 Apr 2024 17:28:22 +0800
Subject: [PATCH 11/16] =?UTF-8?q?update=20-=20add=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E8=83=BD=E8=80=97=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/report/DayDnb.js                      |   9 +
 .../report/energyStatisticalReport/index.vue  | 335 ++++++++++++++++++
 2 files changed, 344 insertions(+)
 create mode 100644 src/views/report/energyStatisticalReport/index.vue

diff --git a/src/api/report/DayDnb.js b/src/api/report/DayDnb.js
index e2d66e2..4465df0 100644
--- a/src/api/report/DayDnb.js
+++ b/src/api/report/DayDnb.js
@@ -42,3 +42,12 @@ export function delDayDnb(objId) {
     method: 'delete'
   })
 }
+
+// 查询统计能耗报表
+export function energyStatisticalReportList(query) {
+  return request({
+    url: '/report/DayDnb/energyStatisticalReportList',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/views/report/energyStatisticalReport/index.vue b/src/views/report/energyStatisticalReport/index.vue
new file mode 100644
index 0000000..308d8b3
--- /dev/null
+++ b/src/views/report/energyStatisticalReport/index.vue
@@ -0,0 +1,335 @@
+<template>
+
+  <div class="app-container">
+    <el-row :gutter="20">
+      <el-col :span="5" :xs="24">
+        <div class="head-container">
+          <el-input
+            v-model="workUnitName"
+            placeholder="请输入统计单元名称"
+            clearable
+            size="small"
+            prefix-icon="el-icon-search"
+            style="margin-bottom: 20px"
+          />
+        </div>
+        <div class="head-container">
+          <el-tree
+            :data="workUnitOptions"
+            :props="workUnitProps"
+            :expand-on-click-node="false"
+            :filter-node-method="filterNode"
+            ref="tree"
+            node-key="id"
+            default-expand-all
+            highlight-current
+            @node-click="handleNodeClick"
+          />
+        </div>
+      </el-col>
+
+      <el-col :span="19" :xs="24">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+                 label-width="100px">
+          <el-form-item label="日期类型" prop="dateType">
+            <el-select v-model="queryParams.dateType" placeholder="请选择日期类型">
+              <el-option
+                v-for="item in dateTypeList"
+                :key="item.dateTypeCode"
+                :label="item.dateTypeName"
+                :value="item.dateTypeCode"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="采集日期">
+            <el-date-picker
+              v-model="daterangeCollectTime"
+              style="width: 240px"
+              value-format="yyyy-MM-dd"
+              type="daterange"
+              range-separator="-"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            ></el-date-picker>
+          </el-form-item>
+
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button
+              type="warning"
+              plain
+              icon="el-icon-download"
+              size="mini"
+              @click="handleExport"
+            >导出
+            </el-button>
+          </el-col>
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+        </el-row>
+
+        <el-table v-loading="loading" :data="monitorWorkUnitList" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="55" align="center"/>
+          <el-table-column label="主键标识" align="center" prop="objId" v-if="columns[0].visible" />
+          <el-table-column label="统计单元编号" align="center" prop="workUnitCode" v-if="columns[1].visible" />
+          <el-table-column label="统计单元名称" align="center" prop="workUnitName" v-if="columns[2].visible" />
+          <el-table-column label="耗量(kwh)" align="center" prop="expend" v-if="columns[3].visible" />
+          <el-table-column label="开始日期" align="center" prop="beginTime" v-if="columns[4].visible" />
+          <el-table-column label="结束日期" align="center" prop="endTime" v-if="columns[5].visible" />
+          <el-table-column label="仪表值(kwh)" align="center" prop="instrumentValue" v-if="columns[6].visible" />
+        </el-table>
+
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+
+import {getWorkUnitTrees} from '@//api/base/workUnit'
+import {listMonitorInfo} from '@//api/base/monitorInfo'
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import { energyStatisticalReportList } from '@//api/report/DayDnb'
+import { parseTime } from '@//utils/ruoyi'
+
+export default {
+  name: "EnergyStatisticalReport",
+  components: {
+    Treeselect
+  }, data() {
+    return {
+      monitorInfoOptions: [],
+      workUnitOptions: [],
+      workUnitName: undefined,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 统计计量信息表格数据
+      monitorWorkUnitList: [],
+      daterangeCollectTime: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        monitorCode: null,
+        workUnitCode: null,
+        monitorStatus: null,
+        monitorType: null,
+        dateType: 10,
+      },
+      // 表单参数
+      form: {},
+      workUnitProps: {
+        children: "children",
+        label: "label"
+      },
+      dateTypeList: [
+        {dateTypeCode: 19, dateTypeName: '时'},
+        {dateTypeCode: 10, dateTypeName: '日'},
+        {dateTypeCode: 7, dateTypeName: '月'},
+        {dateTypeCode: 4, dateTypeName: '年'},
+      ],
+      columns: [
+        {key: 0, label: `主键标识`, visible: false},
+        {key: 1, label: `统计单元编号`, visible: true},
+        {key: 2, label: `统计单元名称`, visible: true},
+        {key: 3, label: `耗量(kwh)`, visible: true},
+        {key: 4, label: `开始日期`, visible: true},
+        {key: 5, label: `结束日期`, visible: true},
+        {key: 6, label: `仪表值(kwh)`, visible: true}
+      ]
+    };
+  },
+  created() {
+    const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
+    this.daterangeCollectTime[0] = nowDate
+    this.daterangeCollectTime[1] = nowDate
+    this.getList();
+    this.getTreeselect();
+    this.getDeptTrees();
+  },
+  watch: {
+    // 根据名称筛选部门树
+    workUnitName(val) {
+      this.$refs.tree.filter(val);
+    }
+  },
+  methods: {
+    /** 查询计量设备信息下拉树结构 */
+    getTreeselect() {
+      listMonitorInfo().then(response => {
+        this.monitorInfoOptions = [];
+        this.monitorInfoOptions = this.handleTree(response.data, "objId", "parentId");
+      });
+    },
+    /** 转换计量设备信息数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.monitorCode,
+        label: node.monitorName,
+        children: node.children
+      };
+    },
+    /** 转换统计单元信息数据结构 */
+    workUnitOptionsNormalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id2: node.workUnitCode,
+        label2: node.workUnitName,
+        children2: node.children
+      };
+    },
+    /** 查询计量设备下拉树结构 */
+    getDeptTrees() {
+      getWorkUnitTrees().then(response => {
+        this.workUnitOptions = [];
+        this.workUnitOptions = JSON.parse(JSON.stringify(response.data).replaceAll('id','id2').replaceAll('code','id'));
+      });
+    },
+    // 筛选节点
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.label.indexOf(value) !== -1;
+    },
+    // 节点单击事件
+    handleNodeClick(data) {
+      this.queryParams.workUnitCode = data.id;
+      this.handleQuery();
+    },
+    /** 查询统计计量信息列表 */
+    getList() {
+      this.loading = true;
+      // this.queryParams = {};
+      if (null != this.daterangeCollectTime && '' != this.daterangeCollectTime) {
+        this.queryParams.beginCollectTime = this.daterangeCollectTime[0];
+        this.queryParams.endCollectTime = this.daterangeCollectTime[1];
+      }
+      energyStatisticalReportList(this.queryParams).then(response => {
+        this.monitorWorkUnitList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        parentIds: null,
+        parentId: null,
+        objId: null,
+        monitorCode: null,
+        workUnitCode: null,
+        monitorStatus: 0,
+        monitorType: 1,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.queryParams.workUnitCode = null;
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.objId)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.getTreeselect();
+      this.open = true;
+      this.title = "添加统计计量信息";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const objId = row.objId || this.ids
+      getMonitorWorkUnit(objId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改统计计量信息";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.objId != null) {
+            updateMonitorWorkUnit(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addMonitorWorkUnit(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const objIds = row.objId || this.ids;
+      this.$modal.confirm('是否确认删除统计计量信息编号为"' + objIds + '"的数据项？').then(function () {
+        return delMonitorWorkUnit(objIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('report/DayDnb/energyStatisticalReportList/export', {
+        ...this.queryParams
+      }, `统计能耗报表_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

From 8f4deef473d35da71905b5667e4bc2f43265e721 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Mon, 1 Apr 2024 17:39:54 +0800
Subject: [PATCH 12/16] =?UTF-8?q?update=20-=20=E6=88=90=E5=93=81=E4=B8=8B?=
 =?UTF-8?q?=E7=BA=BF=E5=BC=82=E5=B8=B8=E8=AE=B0=E5=BD=95=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/report/recordException/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/report/recordException/index.vue b/src/views/report/recordException/index.vue
index 29a9d51..a941eb6 100644
--- a/src/views/report/recordException/index.vue
+++ b/src/views/report/recordException/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
-      <el-form-item label="产线编号" prop="productLineCode">
+      <el-form-item label="产线" prop="productLineCode">
         <el-select v-model="queryParams.productLineCode" placeholder="请选择产线">
           <el-option
             v-for="item in productLineList"

From 18d31e3f062f51043d15d48dd84513b08513253a Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Tue, 2 Apr 2024 16:24:03 +0800
Subject: [PATCH 13/16] =?UTF-8?q?update=20-=20=E5=9C=A8=E5=88=B6=E5=93=81?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=98=8E=E7=BB=86=E5=8A=9F=E8=83=BD=E3=80=81?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/report/reportAPI.js                 |   9 ++
 src/views/report/WIPInquiryReport/index.vue | 143 ++++++++++++++++----
 2 files changed, 123 insertions(+), 29 deletions(-)

diff --git a/src/api/report/reportAPI.js b/src/api/report/reportAPI.js
index 4cb718b..2c759e4 100644
--- a/src/api/report/reportAPI.js
+++ b/src/api/report/reportAPI.js
@@ -36,6 +36,15 @@ export function WIPInquiryReportList(query) {
   })
 }
 
+// 查询在制品明细报表
+export function WIPInquiryDetailReportList(query) {
+  return request({
+    url: '/report/productionReport/WIPInquiryDetailReportList',
+    method: 'get',
+    params: query
+  })
+}
+
 // 扫描下线记录报表
 export function ScanOfflineRecordReportList(query) {
   return request({
diff --git a/src/views/report/WIPInquiryReport/index.vue b/src/views/report/WIPInquiryReport/index.vue
index edac10b..26b5fb9 100644
--- a/src/views/report/WIPInquiryReport/index.vue
+++ b/src/views/report/WIPInquiryReport/index.vue
@@ -74,6 +74,14 @@
           @click="handleExport"
         >导出
         </el-button>
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleDetailExport"
+        >明细导出
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
     </el-row>
@@ -87,33 +95,69 @@
       <el-table-column label="物料名称" align="center" prop="MATERIAL_NAME" width="430" v-if="columns[5].visible"/>
       <el-table-column label="产品编号" align="center" prop="PRODUCT_CODE" width="130" v-if="columns[6].visible"/>
       <el-table-column label="产品名称" align="center" prop="PRODUCT_NAME" width="230" v-if="columns[7].visible"/>
-      <el-table-column label="数量" align="center" prop="COMP_AMOUNT" width="120" v-if="columns[8].visible"/>
-<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
-<!--        <template slot-scope="scope">-->
-<!--          <el-button-->
-<!--            size="mini"-->
-<!--            type="text"-->
-<!--            icon="el-icon-edit"-->
-<!--            @click="handleOrderDetails(scope.row)"-->
-<!--            v-hasPermi="['report:pointDnb:edit']"-->
-<!--          >查看订单明细-->
-<!--          </el-button>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
+      <el-table-column label="在制数量" align="center" prop="COMP_AMOUNT" width="120" v-if="columns[8].visible">
+        <template slot-scope="scope">
+          <el-button type="text" @click="openDifference(scope.row)">{{ scope.row.COMP_AMOUNT }}</el-button>
+        </template>
+      </el-table-column>
+      <!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+      <!--        <template slot-scope="scope">-->
+      <!--          <el-button-->
+      <!--            size="mini"-->
+      <!--            type="text"-->
+      <!--            icon="el-icon-edit"-->
+      <!--            @click="handleOrderDetails(scope.row)"-->
+      <!--            v-hasPermi="['report:pointDnb:edit']"-->
+      <!--          >查看订单明细-->
+      <!--          </el-button>-->
+      <!--        </template>-->
+      <!--      </el-table-column>-->
     </el-table>
-        <pagination
-          v-show="total>0"
-          :total="total"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
-          @pagination="getList"
-        />
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 详情信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+      <el-table :data="reportDetailList" :row-class-name="rowDetailIndex"
+                ref="reportDetailRef"
+      >
+        <el-table-column label="序号" align="center" prop="index">
+        </el-table-column>
+        <el-table-column label="箱体码" align="center" prop="MATERIAL_BARCODE" width="190">
+        </el-table-column>
+        <el-table-column label="物料编号" align="center" prop="MATERIAL_CODE" width="110">
+        </el-table-column>
+        <el-table-column label="物料名称" align="center" prop="MATERIAL_NAME" width="280">
+        </el-table-column>
+        <el-table-column label="最后扫描工位" align="center" prop="STATION_NAME" width="150">
+        </el-table-column>
+        <el-table-column label="最后扫描时间" align="center" prop="COMPLETE_DATE" width="150">
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="detailTotal>0"
+        :total="detailTotal"
+        :page.sync="queryDetailParams.pageNum"
+        :limit.sync="queryDetailParams.pageSize"
+        @pagination="getDetailList"
+      />
+      <!--      </el-form>-->
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancel">关 闭</el-button>
+      </div>
+    </el-dialog>
 
   </div>
 </template>
 
 <script>
 import {
+  WIPInquiryDetailReportList,
   WIPInquiryReportList
 } from '@/api/report/reportAPI'
 import { findProductLineList } from '@//api/base/productLine'
@@ -136,6 +180,8 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
+      // 总条数
+      detailTotal: 0,
       //合计数量
       totalSum: 0,
       // 报表表格数据
@@ -146,6 +192,10 @@ export default {
       open: false,
       // 更新时间时间范围
       daterangeBeginTime: [],
+      // 详情表格数据
+      reportDetailList: [],
+      // 查询参数
+      queryDetailParams: {},
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -154,7 +204,7 @@ export default {
         endBeginTime: null,
         productLineCode: 'CX_02',
         beginStationCode: '109',
-        endStationCode: '280',
+        endStationCode: '270',
         ORDER_CODE: null,
         MATERIAL_CODE: null,
         MATERIAL_NAME: null,
@@ -175,7 +225,7 @@ export default {
         { key: 5, label: `物料名称`, visible: true },
         { key: 6, label: `产品编号`, visible: true },
         { key: 7, label: `产品名称`, visible: true },
-        { key: 8, label: `数量`, visible: true }
+        { key: 8, label: `在制数量`, visible: true }
       ],
       // 产线选项
       productLineList: [],
@@ -193,9 +243,9 @@ export default {
     findProductLineList({ productLineType: 1 }).then(response => {
       this.productLineList = response.data
     }).then(() => {
-      return findProductLineList({ productLineType: 2, parentId: this.queryParams.productLineCode, executionSort: '1'})
+      return findProductLineList({ productLineType: 2, parentId: this.queryParams.productLineCode, executionSort: '1' })
     }).then(response => {
-      this.findStationList = response.data
+      this.findStationList = response.data.filter(station => station.executionSort != null)
     })
     const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
     this.daterangeBeginTime[0] = nowDate
@@ -208,7 +258,7 @@ export default {
       this.loading = true
       WIPInquiryReportList(this.queryParams).then(response => {
         this.reportList = response.rows
-        this.total = response.total;
+        this.total = response.total
         this.totalSum = 0
         this.reportList.forEach(e => {
           this.totalSum += e.COMP_AMOUNT
@@ -248,17 +298,45 @@ export default {
     },
 
     /** 查看明细 */
-    handleOrderDetails(row) {
-      this.$tab.openPage('生产计划', '/product/planInfo', { orderCode: row.ORDER_CODE })
+    // handleOrderDetails(row) {
+    //   this.$tab.openPage('生产计划', '/product/planInfo', { orderCode: row.ORDER_CODE })
+    // },
+
+    /** 查看明细 */
+    openDifference(row) {
+      if (row.ORDER_CODE == null) {
+        this.$modal.msgError('订单号不为空！')
+        return
+      }
+      this.queryDetailParams = { ...this.queryParams };
+      this.queryDetailParams.ORDER_CODE = row.ORDER_CODE
+
+      WIPInquiryDetailReportList(this.queryDetailParams).then(response => {
+        this.reportDetailList = response.rows
+        this.detailTotal = response.total
+        this.open = true
+        this.title = '在制品明细表'
+      })
     },
 
+    getDetailList() {
+      WIPInquiryDetailReportList(this.queryDetailParams).then(response => {
+        this.reportDetailList = response.rows
+        this.detailTotal = response.total
+        this.loading = false
+      })
+    },
+    /** 数据明细序号 */
+    rowDetailIndex({ row, rowIndex }) {
+      row.index = rowIndex + 1 + (this.queryDetailParams.pageNum - 1) * this.queryDetailParams.pageSize
+    },
     /** 获取工位方法 */
     getStationList() {
       this.queryParams.beginStationCode = null
       this.queryParams.endStationCode = null
-      findProductLineList({ productLineType: 2, parentId: this.queryParams.productLineCode, executionSort: '1'})
+      findProductLineList({ productLineType: 2, parentId: this.queryParams.productLineCode, executionSort: '1' })
         .then(response => {
-          this.findStationList = response.data
+          this.findStationList = response.data.filter(station => station.executionSort != null)
         })
     },
 
@@ -274,6 +352,13 @@ export default {
       this.download('/report/productionReport/WIPInquiryReportList/export', {
         ...this.queryParams
       }, `在制品查询报表_${new Date().getTime()}.xlsx`)
+    },
+
+    /** 导出按钮操作 */
+    handleDetailExport() {
+      this.download('/report/productionReport/WIPInquiryDetailReportList/export', {
+        ...this.queryParams
+      }, `在制品查询明细报表_${new Date().getTime()}.xlsx`)
     }
 
   }

From 87fea08a0c06eeea5d9c7b31a901fc20e0c27f1a Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Tue, 2 Apr 2024 16:49:42 +0800
Subject: [PATCH 14/16] =?UTF-8?q?update=20-=20=E5=9C=A8=E5=88=B6=E5=93=81?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=98=8E=E7=BB=86=E5=8A=9F=E8=83=BD=E3=80=81?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/report/WIPInquiryReport/index.vue | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/views/report/WIPInquiryReport/index.vue b/src/views/report/WIPInquiryReport/index.vue
index 26b5fb9..fd3ea5e 100644
--- a/src/views/report/WIPInquiryReport/index.vue
+++ b/src/views/report/WIPInquiryReport/index.vue
@@ -92,10 +92,12 @@
       <el-table-column label="产线" align="center" prop="PRODUCT_LINE_NAME" width="80" v-if="columns[1].visible"/>
       <el-table-column label="订单编号" align="center" prop="ORDER_CODE" width="100" v-if="columns[3].visible"/>
       <el-table-column label="物料编号" align="center" prop="MATERIAL_CODE" width="130" v-if="columns[4].visible"/>
-      <el-table-column label="物料名称" align="center" prop="MATERIAL_NAME" width="430" v-if="columns[5].visible"/>
+      <el-table-column label="物料名称" align="center" prop="MATERIAL_NAME" width="230" v-if="columns[5].visible"/>
       <el-table-column label="产品编号" align="center" prop="PRODUCT_CODE" width="130" v-if="columns[6].visible"/>
       <el-table-column label="产品名称" align="center" prop="PRODUCT_NAME" width="230" v-if="columns[7].visible"/>
-      <el-table-column label="在制数量" align="center" prop="COMP_AMOUNT" width="120" v-if="columns[8].visible">
+      <el-table-column label="订单数量" align="center" prop="ORDER_AMOUNT"   v-if="columns[9].visible"/>
+      <el-table-column label="完成数量" align="center" prop="COMPLETE_AMOUNT"  v-if="columns[10].visible"/>
+      <el-table-column label="在制数量" align="center" prop="COMP_AMOUNT"   v-if="columns[8].visible">
         <template slot-scope="scope">
           <el-button type="text" @click="openDifference(scope.row)">{{ scope.row.COMP_AMOUNT }}</el-button>
         </template>
@@ -225,7 +227,9 @@ export default {
         { key: 5, label: `物料名称`, visible: true },
         { key: 6, label: `产品编号`, visible: true },
         { key: 7, label: `产品名称`, visible: true },
-        { key: 8, label: `在制数量`, visible: true }
+        { key: 8, label: `在制数量`, visible: true },
+        { key: 9, label: `订单数量`, visible: true },
+        { key: 10, label: `完成数量`, visible: true },
       ],
       // 产线选项
       productLineList: [],

From 948cddf7cbab28b2d0093f6e37dff8880583e7f9 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Tue, 2 Apr 2024 17:48:19 +0800
Subject: [PATCH 15/16] =?UTF-8?q?update=20-=20=E5=9C=A8=E5=88=B6=E5=93=81?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BC=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/report/WIPInquiryReport/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/report/WIPInquiryReport/index.vue b/src/views/report/WIPInquiryReport/index.vue
index fd3ea5e..11612ef 100644
--- a/src/views/report/WIPInquiryReport/index.vue
+++ b/src/views/report/WIPInquiryReport/index.vue
@@ -166,7 +166,7 @@ import { findProductLineList } from '@//api/base/productLine'
 import { parseTime } from '@//utils/ruoyi'
 
 export default {
-  name: 'ReportInfo',
+  name: 'WIPInquiryReport',
   dicts: ['is_flag'],
   data() {
     return {

From 0c9e34e69f8e43915b05c9ee366e48cb5874c2f8 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Tue, 9 Apr 2024 18:09:50 +0800
Subject: [PATCH 16/16] =?UTF-8?q?update=20-=20=E8=B4=A8=E6=A3=80=E6=9D=90?=
 =?UTF-8?q?=E6=96=99=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/report/qualityMaterial/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/report/qualityMaterial/index.vue b/src/views/report/qualityMaterial/index.vue
index 17ce808..8d333af 100644
--- a/src/views/report/qualityMaterial/index.vue
+++ b/src/views/report/qualityMaterial/index.vue
@@ -393,6 +393,7 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       // this.reset();
+      this.form.objId = null;
       this.open = true;
       this.title = "添加质检材料信息";
     },