报表-生产进度报表 --- 接口准备

src/api/reportForms/pro-progress-report.js

@@ -5,7 +5,10 @@ import { getAction, postAction, deleteAction, putAction } from '@/api/manage'
 const proProgressList = params => getAction('/productionScheduleReport/productionSchedule/list', params)
 
 // 销售订单详情
-// const salesOrder = params => getAction('', params)
+// const salesOrderAll = params => getAction('', params)
+
+// 出入库详细数据  --- 弹框
+// const outInDetailData = params => getAction('', params)
 
 // 获取图片
 const getImg = params => getAction('/productionScheduleReport/productionSchedule/selectPicture', params)

src/views/order/orderDetailDrawer.vue

@@ -232,15 +232,13 @@ export default {
   },
 
   created() {
-    console.log('详情created0')
     this.getOrderChild()
-    console.log('详情created1')
   },
   methods: {
     // 子表信息获取
     getOrderChild() {
       this.$nextTick(() => {
-        console.log('详情拿到订单号', this.record.orderNumber)
+        // console.log('详情拿到订单号', this.record.orderNumber)
         orderByNum({ orderNumber: this.record.orderNumber, pageNo: this.pagination.pageNo }).then(res => {
           if (res.success) {
             // 子表信息赋值

src/views/order/orderList.vue

@@ -98,7 +98,7 @@ import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import JEllipsis from '@/components/jeecg/JEllipsis'
 import moment from 'moment'
 import OrderDetailDrawer from '@views/order/orderDetailDrawer.vue'
-import { orderList, orderByNum } from '@api/document/order'
+import { orderList } from '@api/document/order'
 
 export default {
   name: 'OrderList', // 【单证】 订单数据
@@ -229,12 +229,10 @@ export default {
       return {
         on: {
           click: event => {
-            // console.log('点击的订单号', record.orderNumber)
             this.$refs.orderDetailDrawer.visible = true
-            this.$refs.orderDetailDrawer.record = record
+            this.$refs.orderDetailDrawer.record = record//接口参数
             this.$refs.orderDetailDrawer.getOrderChild()
-            console.log('---', this.$refs.orderDetailDrawer.record)
-            this.$refs.orderDetailDrawer.orderDetail = record//详情页主表赋值
+            this.$refs.orderDetailDrawer.orderDetail = record //详情页主表赋值
           }
         }
       }

src/views/reportForms/pro-progress-report.vue

@@ -260,9 +260,11 @@ export default {
       return {
         on: {
           click: event => {
-            console.log('点击的【销售订单号】', record)
+            // console.log('【列表页 -- 销售订单号】', record)
             this.$refs.salesOrderDetailsDrawer.visible = true
-            console.log('此处只打开抽屉,方法在抽屉页面')
+            this.$refs.salesOrderDetailsDrawer.record = record //接口参数,获取（主表 + 所有页签信息）
+            this.$refs.salesOrderDetailsDrawer.getDetails()
+            console.log('【列表页 点击的销售订单对象】', this.$refs.salesOrderDetailsDrawer.record)
           }
         }
       }
@@ -298,7 +300,6 @@ export default {
 
     // 分页变化时触发
     handleTableChange(pagination, filters, sorter) {
-      // console.log('分页器信息', pagination)
       this.queryParam.pageNo = pagination.current
       this.getproProgressList()
     },

src/views/reportForms/pro-progress-report/outInDetailDataDrawer.vue

@@ -1,13 +1,7 @@
 <template>
   <!--点击【物料编号】 出入库详细数据 抽屉 -->
   <div id="outInDetailDataDrawer">
-    <a-drawer
-      title="出入库详细数据"
-      width="67%"
-      placement="right"
-      :closable="true"
-      :visible="visible"
-      @close="onClose">
+    <a-drawer title="出入库详细数据" width="67%" placement="right" :closable="true" :visible="visible" @close="onClose">
       <!-- 查询  -->
       <a-card :bordered="true">
         <div class="table-page-search-wrapper">
@@ -44,23 +38,18 @@
         </div>
       </a-card>
 
-      <!-- 子表 入库单 -->
       <a-card :bordered="true" style="margin:10px 0;">
-        <div style="marginTop:30px;">
-          <h6 class="table-title" style="float:left">入库单</h6>
-          <!-- 导出 -->
-          <a-row style="float:right">
-            <a-col :md="24" :sm="12">
-              <span style="float: right;" class="table-operator">
-                <a-button
-                  type="primary"
-                  icon="download"
-                  @click="handleExportXls('出入库详细数据 - 入库单')"
-                >导出</a-button
-                >
-              </span>
-            </a-col>
-          </a-row>
+        <!-- 子表 入库单 -->
+        <div>
+          <h6 class="table-title" style="float:left;">入库单</h6>
+          <a-button
+            type="primary"
+            icon="download"
+            @click="inOrderDataXls('出入库详细数据 - 入库单')"
+            style="marginLeft:960px;"
+            >导出</a-button
+          >
+
           <a-table
             bordered
             rowKey="id"
@@ -74,21 +63,16 @@
         </div>
 
         <!-- 子表 出库单 -->
-        <div style="margin:80px 0;">
+        <div style="margin:50px 0;">
           <h6 class="table-title" style="float:left">出库单</h6>
-          <!-- 导出 -->
-          <a-row style="float:right">
-            <a-col :md="24" :sm="12">
-              <span style="float: right;" class="table-operator">
-                <a-button
-                  type="primary"
-                  icon="download"
-                  @click="handleExportXls('出入库详细数据 - 出库单')"
-                >导出</a-button
-                >
-              </span>
-            </a-col>
-          </a-row>
+          <a-button
+            type="primary"
+            icon="download"
+            @click="outOrderDataXls('出入库详细数据 - 出库单')"
+            style="marginLeft:960px;"
+            >导出</a-button
+          >
+
           <a-table
             bordered
             rowKey="id"
@@ -104,16 +88,15 @@
         <!-- 子表 材料出库单-->
         <div>
           <h6 class="table-title" style="float:left">材料出库单</h6>
-          <!-- 导出 -->
-          <a-row style="float:right">
-            <a-col :md="24" :sm="12">
-              <span style="float: right;" class="table-operator">
-                <a-button type="primary" icon="download" @click="handleExportXls('出入库详细数据 - 材料出库单')">
-                  导出
-                </a-button>
-              </span>
-            </a-col>
-          </a-row>
+          <a-button
+            type="primary"
+            icon="download"
+            @click="materialsOutOrderDataXls('出入库详细数据 - 材料出库单')"
+            style="marginLeft:960px;"
+          >
+            导出
+          </a-button>
+
           <a-table
             bordered
             rowKey="id"
@@ -134,6 +117,9 @@
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import JEllipsis from '@/components/jeecg/JEllipsis'
 import moment from 'moment'
+
+// import { outInDetailData } from '@api/reportForms/pro-progress-report.js'
+
 export default {
   name: 'OutInDetailDataDrawer', // 出入库详细数据 抽屉
   mixins: [JeecgListMixin],
@@ -142,8 +128,8 @@ export default {
     return {
       loading: false, // 表格加载
       visible: false, // 抽屉
-
-      //  查询条件
+      record: {}, //点击的对象
+      //  物料卡查询条件
       queryParam: {
         orderData: '', // 订单日期
         customerShortName: '' // 客户简称
@@ -248,34 +234,113 @@ export default {
       materialsOutOrderData: [{}]
     }
   },
-  created() {},
+  created() {
+    this.getoutInDetailData()
+  },
   methods: {
+    // 查询出入库详细数据
+    getoutInDetailData() {
+      this.$nextTick(() => {
+        console.log('出入库详情', this.record)
+        // outInDetailData({}).then(res => {
+        //   if (res.success) {
+        //     console.log('出入库详细数据', res.result)
+        //     // 需要三个页签的table数据，res返回的数据是怎样的
+        //   }
+        // })
+      })
+    },
+
+    // 入库单 导出
+    inOrderDataXls(fileName) {
+      console.log('需导出文件名', fileName)
+      const params = this.inOrderData
+      console.log('导出参数', params)
+      // downFile('/scas/supplierCapacity/excel1', params).then(data => {
+      //   if (!data) {
+      //     this.$message.warning('文件下载失败')
+      //     return
+      //   }
+      //   if (typeof window.navigator.msSaveBlob !== 'undefined') {
+      //     window.navigator.msSaveBlob(new Blob([data], { type: 'application/vnd.ms-excel' }), fileName + '.xls')
+      //   } else {
+      //     let url = window.URL.createObjectURL(new Blob([data], { type: 'application/vnd.ms-excel' }))
+      //     let link = document.createElement('a')
+      //     link.style.display = 'none'
+      //     link.href = url
+      //     link.setAttribute('download', fileName + '.xls')
+      //     document.body.appendChild(link)
+      //     link.click()
+      //     document.body.removeChild(link) // 下载完成移除元素
+      //     window.URL.revokeObjectURL(url) // 释放掉blob对象
+      //   }
+      // })
+    },
+
+    //  出库单 导出
+    outOrderDataXls(fileName) {
+      console.log('需导出文件名', fileName)
+      const params = this.outOrderData
+      console.log('导出参数', params)
+      // downFile('/scas/supplierCapacity/excel1', params).then(data => {
+      //   if (!data) {
+      //     this.$message.warning('文件下载失败')
+      //     return
+      //   }
+      //   if (typeof window.navigator.msSaveBlob !== 'undefined') {
+      //     window.navigator.msSaveBlob(new Blob([data], { type: 'application/vnd.ms-excel' }), fileName + '.xls')
+      //   } else {
+      //     let url = window.URL.createObjectURL(new Blob([data], { type: 'application/vnd.ms-excel' }))
+      //     let link = document.createElement('a')
+      //     link.style.display = 'none'
+      //     link.href = url
+      //     link.setAttribute('download', fileName + '.xls')
+      //     document.body.appendChild(link)
+      //     link.click()
+      //     document.body.removeChild(link) // 下载完成移除元素
+      //     window.URL.revokeObjectURL(url) // 释放掉blob对象
+      //   }
+      // })
+    },
+
+    //  材料出库单 导出
+    materialsOutOrderDataXls(fileName) {
+      console.log('需导出文件名', fileName)
+      const params = this.materialsOutOrderData
+      console.log('导出参数', params)
+      // downFile('/scas/supplierCapacity/excel1', params).then(data => {
+      //   if (!data) {
+      //     this.$message.warning('文件下载失败')
+      //     return
+      //   }
+      //   if (typeof window.navigator.msSaveBlob !== 'undefined') {
+      //     window.navigator.msSaveBlob(new Blob([data], { type: 'application/vnd.ms-excel' }), fileName + '.xls')
+      //   } else {
+      //     let url = window.URL.createObjectURL(new Blob([data], { type: 'application/vnd.ms-excel' }))
+      //     let link = document.createElement('a')
+      //     link.style.display = 'none'
+      //     link.href = url
+      //     link.setAttribute('download', fileName + '.xls')
+      //     document.body.appendChild(link)
+      //     link.click()
+      //     document.body.removeChild(link) // 下载完成移除元素
+      //     window.URL.revokeObjectURL(url) // 释放掉blob对象
+      //   }
+      // })
+    },
+
     // 查询按钮
     searchQuery() {
-      // 渲染订单销售列表
+      this.getoutInDetailData()
     },
     searchReset() {
-      // console.log('>>>>重置')
       this.queryParam = {}
+      this.getoutInDetailData()
     },
-    // 入库单 导出
-    // inOrderExportXls() {},
-
-    // // 出库单 导出
-    // outOrderExportXls() {
-    //   console.log(' 出入库详细数据-出库单 导出')
-    // },
-
-    // // 材料出库单 导出
-    // materialsOutOrderExportXls() {},
-
     onClose() {
-      // 关闭抽屉
       this.visible = false
     }
-  },
-  computed: {},
-  mounted() {}
+  }
 }
 </script>
 <style lang="less" scoped>

src/views/reportForms/pro-progress-report/salesOrderDetailsDrawer.vue

@@ -1,5 +1,5 @@
 <template>
-  <!-- 销售订单详情-----点击【销售订单号】 -->
+  <!-- 销售订单详情 -->
   <div id="salesOrderDetailsDrawer">
     <a-drawer title="销售订单详情" width="89%" placement="right" :closable="true" :visible="visible" @close="onClose">
       <!-- 主表 展示 -->
@@ -9,105 +9,105 @@
             <a-row :gutter="24">
               <a-col :md="6" :sm="8">
                 <a-form-item label="部门">
-                  {{ salesOrderDetails.cdepName }}
+                  {{ salesOrderMain.cdepName }}
                 </a-form-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
                 <a-form-item label="业务员">
-                  {{ salesOrderDetails.cpersonName }}
+                  {{ salesOrderMain.cpersonName }}
                 </a-form-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
                 <a-form-item label="客户">
-                  {{ salesOrderDetails.cCusName }}
+                  {{ salesOrderMain.cCusName }}
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="8">
                 <a-form-item label="物料编号">
-                  {{ salesOrderDetails.todo }}
+                  {{ salesOrderMain.todo }}
                 </a-form-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
                 <a-form-item label="物料名称">
-                  {{ salesOrderDetails.CInvName }}
+                  {{ salesOrderMain.CInvName }}
                 </a-form-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
                 <a-form-item label="款号">
-                  {{ salesOrderDetails.itemNumber }}
+                  {{ salesOrderMain.itemNumber }}
                 </a-form-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
                 <a-form-item label="颜色">
-                  {{ salesOrderDetails.color }}
+                  {{ salesOrderMain.color }}
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="8">
                 <a-form-item label="交期">
-                  {{ salesOrderDetails.dpreDateBT }}
+                  {{ salesOrderMain.dpreDateBT }}
                 </a-form-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
                 <a-form-item label="订单数量">
-                  {{ salesOrderDetails.iquantity }}
+                  {{ salesOrderMain.iquantity }}
                 </a-form-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
                 <a-form-item label="单价(原币)">
-                  {{ salesOrderDetails.icostsum }}
+                  {{ salesOrderMain.icostsum }}
                 </a-form-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
                 <a-form-item label="总额(原币)">
-                  {{ salesOrderDetails.totalSum }}
+                  {{ salesOrderMain.totalSum }}
                 </a-form-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
                 <a-form-item label="单价(本币)">
-                  {{ salesOrderDetails.bbPrice }}
+                  {{ salesOrderMain.bbPrice }}
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="8">
                 <a-form-item label="总额(本币)">
-                  {{ salesOrderDetails.iNatSum }}
+                  {{ salesOrderMain.iNatSum }}
                 </a-form-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
                 <a-form-item label="单件成本(本币)">
-                  {{ salesOrderDetails.todo2 }}
+                  {{ salesOrderMain.todo2 }}
                 </a-form-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
                 <a-form-item label="已出库数量">
-                  {{ salesOrderDetails.foutquantity }}
+                  {{ salesOrderMain.foutquantity }}
                 </a-form-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
                 <a-form-item label="累计开票数量">
-                  {{ salesOrderDetails.iKPQuantity }}
+                  {{ salesOrderMain.iKPQuantity }}
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="8">
                 <a-form-item label="计划单号">
-                  {{ salesOrderDetails.planCode }}
+                  {{ salesOrderMain.planCode }}
                 </a-form-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
                 <a-form-item label="业务填写">
-                  {{ salesOrderDetails.todo3 }}
+                  {{ salesOrderMain.todo3 }}
                 </a-form-item>
               </a-col>
             </a-row>
@@ -226,7 +226,7 @@ import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import JEllipsis from '@/components/jeecg/JEllipsis'
 import moment from 'moment'
 
-// import { } from '@api/reportForms/pro-progress-report.js'
+// import { salesOrderAll } from '@api/reportForms/pro-progress-report.js'
 
 import outInDetailDataDrawer from '@views/reportForms/pro-progress-report/outInDetailDataDrawer.vue'
 
@@ -238,10 +238,11 @@ export default {
     return {
       loading: false, // 表格加载
       visible: false, // 单个订单报表 抽屉
-      salesOrderDetails: [], // 主表信息
-
+      salesOrderMain: [], // 主表信息
+      record: {}, //点击的销售订单对象（参数）
       // 物料卡 查询条件
       queryParam: {
+        pageNo: '', // 初始页
         data: '', // 日期
         material: '', // 物料
         planOrderNo: '' // 计划单号
@@ -371,15 +372,25 @@ export default {
     this.getDetails()
   },
   methods: {
-    // 获取详情
+    // 销售订单所有详情
     getDetails() {
       this.$nextTick(() => {
-        salesOrder().then(res => {
-          if (res.success) {
-            console.log('详情页获取结果', res.result)
-            this.salesOrderDetails = res.result.record //主表信息
-          }
-        })
+        console.log('销售订单号', this.record.csocode)
+        console.log('计划单号', this.record.planCode)
+        console.log('款号', this.record.itemNumber)
+        // console.log('物料编码', this.record.csocode)
+        // salesOrderAll({
+        //   csocode: this.record.csocode,
+        //   planCode: this.record.planCode,
+        //   itemNumber: this.record.itemNumber,
+        //   todo: this.record.todo
+        // }).then(res => {
+        //   if (res.success) {
+        //     console.log('销售订单详情返回所有数据', res.result)
+        //     this.salesOrderMain = res.result.record //主表信息
+        //     // 采购 委外 物料卡 信息在 res 什么地方？？？
+        //   }
+        // })
       })
     },
 
@@ -388,8 +399,10 @@ export default {
       return {
         on: {
           click: event => {
-            console.log('点击了【物料编号】--【出入库详细数据】', record)
+            console.log('传给出入库的对象', record)
             this.$refs.outInDetailDataDrawer.visible = true
+            this.$refs.outInDetailDataDrawer.record = record
+            this.$refs.outInDetailDataDrawer.getoutInDetailData()
           }
         }
       }
@@ -397,7 +410,7 @@ export default {
 
     // 物料卡----查询按钮
     searchQuery() {
-      // 渲染订单销售列表
+      // 物料卡信息
     },
     searchReset() {
       this.queryParam = {}

src/views/reportForms/supply-capacity-table.vue

@@ -104,7 +104,6 @@
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import JEllipsis from '@/components/jeecg/JEllipsis'
 import moment from 'moment'
-import Dayjs from 'dayjs'
 
 import { supplyCapList } from '@api/reportForms/supply-capacity-table'
 import { downFile } from '@/api/manage'
@@ -186,7 +185,6 @@ export default {
         // pageSize: 0
       },
       dateFormat: 'YYYY-MM-DD'
-      // value3: ref<Dayjs>(),
     }
   },
   created() {
@@ -198,9 +196,7 @@ export default {
     getSupplyCapList() {
       this.$nextTick(() => {
         supplyCapList(this.queryParam).then(res => {
-          // console.log('111')
           if (res.success) {
-            // console.log('222')
             this.supplyCapacityData = res.result.records
             console.log('【供应商产能报表数据】:', this.supplyCapacityData)
             this.pagination = {