update - add箱体流转追溯报表

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
+  })
+}

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,

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`)
     }
 
   }