报表-成产进度报表-物料卡弹框-->装箱单-面料（列表、详情）

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

@@ -10,10 +10,10 @@ const salesOrderDetails = params => getAction('/productionScheduleReport/product
 // 出入库详细数据  --- 弹框
 // const outInDetailData = params => getAction('', params)
 
-// 物料卡  装箱单-面料列表
+// 物料卡  装箱单-面料 - 列表
 // const packinglistFabricsList = params => getAction('', params)
 
-//  订单号   装箱单-面料
+//  物料卡   装箱单-面料 -详情
 // const detailsFabric = params => getAction('', params)
 
 // 获取图片

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

@@ -1,7 +1,7 @@
 <template>
   <!-- 详情 装箱单-面料 from【生产进度报表】  -->
   <div id="detailsFabricDrawer">
-    <a-drawer title="详情" width="89%" placement="right" :closable="true" :visible="visible" @close="handleCancel">
+    <a-drawer title="详情" width="67%" placement="right" :closable="true" :visible="visible" @close="onClose">
       <!-- 主表信息 回显-->
       <a-card :bordered="true">
         <div class="table-page-search-wrapper">
@@ -87,7 +87,7 @@
         </div>
       </a-card>
 
-      <!-- 子表   -->
+      <!-- 子表  -->
       <a-card :bordered="true" style="margin:10px 0 60px 0;">
         <a-spin :spinning="confirmLoading">
           <a-form-model ref="formRef">
@@ -112,11 +112,11 @@
 <script>
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import JEllipsis from '@/components/jeecg/JEllipsis'
-
+import moment from 'moment'
 // import { detailsFabric } from '@api/reportForms/pro-progress-report.js'
 
 export default {
-  name: 'DetailsFabricDrawer', //  详情 装箱单 -面料
+  name: 'DetailsFabricDrawer', //  详情 装箱单 - 面料
   mixins: [JeecgListMixin],
   computed: {},
   components: { JEllipsis },
@@ -391,14 +391,8 @@ export default {
       this.getDetailsFabric()
     },
     // 抽屉 取消
-    handleCancel() {
-      this.close()
-    },
-
-    close() {
-      this.$emit('close')
+    onClose() {
       this.visible = false
-      this.$refs.form.resetFields()
     }
   }
 }

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

@@ -1,7 +1,13 @@
 <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">
@@ -333,6 +339,7 @@ export default {
     searchQuery() {
       this.getoutInDetailData()
     },
+
     searchReset() {
       this.queryParam = {}
       this.getoutInDetailData()

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

@@ -1,25 +1,34 @@
 <template>
   <!-- 列表页  装箱单-面料  from【生产进度报表】 -->
   <div id="packinglistFabricsDrawer">
-    <a-card :bordered="false" style="marginTop:10px;">
-      <!-- 列表-->
-      <a-table
-        bordered
-        :columns="packinglistFabricsColumns"
-        :data-source="packinglistFabricsData"
-        :loading="loading"
-        :pagination="pagination"
-        :row-key="record => record.id"
-      >
-        <!-- 订单号  链接-->
-        <span slot="orderNum" slot-scope="text">
-          <a>{{ text }}</a>
-        </span>
-      </a-table>
-    </a-card>
+    <a-drawer
+      title="装箱单-面料"
+      width="78%"
+      placement="right"
+      :closable="true"
+      :visible="visible"
+      @close="handleCancel"
+    >
+      <a-card :bordered="true">
+        <!-- 列表-->
+        <a-table
+          bordered
+          :columns="packinglistFabricsColumns"
+          :data-source="packinglistFabricsData"
+          :loading="loading"
+          :pagination="pagination"
+          :row-key="record => record.id"
+        >
+          <!-- 订单号  链接-->
+          <span slot="orderNum" slot-scope="text">
+            <a>{{ text }}</a>
+          </span>
+        </a-table>
+      </a-card>
 
-    <!-- 【订单号】 装箱单-面料 抽屉 -->
-    <detailsFabricDrawer-drawer ref="detailsFabricDrawer" @ok="modalFormOk"></detailsFabricDrawer-drawer>
+      <!-- 【订单号】 装箱单-面料 抽屉 -->
+      <detailsFabric-drawer ref="detailsFabricDrawer" @ok="modalFormOk"></detailsFabric-drawer>
+    </a-drawer>
   </div>
 </template>
 
@@ -33,7 +42,7 @@ import detailsFabricDrawer from '@views/reportForms/pro-progress-report/detailsF
 // import { packinglistFabricsList } from '@api/reportForms/pro-progress-report.js'
 
 export default {
-  name: 'packinglistFabricsDrawer', // 装箱单-面料 （查看详情）
+  name: 'PackinglistFabricsDrawer', // 装箱单-面料列表
   mixins: [JeecgListMixin],
   components: { JEllipsis, moment, detailsFabricDrawer },
 
@@ -115,7 +124,7 @@ export default {
         }
       ],
 
-      packinglistFabricsData: [{}, {}, {}],
+      packinglistFabricsData: [{ orderNum: 'AAAA' }, {}, {}],
       loading: false, // 表格加载
       // 分页
       pagination: {
@@ -123,6 +132,7 @@ export default {
         // current: 0,
         // pageSize: 0
       },
+      visible: false,
       dateFormat: 'YYYY-MM-DD'
     }
   },
@@ -130,7 +140,7 @@ export default {
     this.getpackinglistFabricsList()
   },
   methods: {
-    // 列表页查询
+    // 物料卡  装箱单-面料 - 列表
     getpackinglistFabricsList() {
       this.$nextTick(() => {
         // packinglistFabricsList({}).then(res => {
@@ -152,14 +162,27 @@ export default {
       return {
         on: {
           click: event => {
-            // console.log('【装箱单列表 -- 订单号】', record)
+            console.log('【装箱单列表 -- 订单号】', record)
             this.$refs.detailsFabricDrawer.visible = true
             this.$refs.detailsFabricDrawer.record = record //接口参数,获取（主表 + 所有页签信息）
             this.$refs.detailsFabricDrawer.getDetailsFabric()
-            console.log('【列表页 点击的销售订单对象】', this.$refs.detailsFabricDrawer.record)
           }
         }
       }
+    },
+    handleTableChange(pagination, filters, sorter) {
+      // console.log('当前页信息>>>>',pagination)
+      this.queryParam.pageNo = pagination.current
+      this.getpackinglistFabricsList()
+    },
+    // 抽屉 取消
+    handleCancel() {
+      this.close()
+    },
+    close() {
+      this.$emit('close')
+      this.visible = false
+      this.$refs.form.resetFields()
     }
   }
 }

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

@@ -2,7 +2,7 @@
   <!-- 销售订单详情 -->
   <div id="salesOrderDetailsDrawer">
     <a-drawer title="销售订单详情" width="89%" placement="right" :closable="true" :visible="visible" @close="onClose">
-      <!-- 主表 展示 -->
+      <!-- 主表 回显 -->
       <a-card :bordered="true">
         <div class="table-page-search-wrapper">
           <a-form layout="inline">
@@ -49,7 +49,6 @@
               </a-col>
               <a-col :md="6" :sm="8">
                 <a-form-item label="交期">
-                  <!-- TODO:日期 -->
                   {{ salesOrderMain.dpreDateBT }}
                 </a-form-item>
               </a-col>
@@ -207,8 +206,8 @@
             :pagination="false"
             :scroll="{ x: 1500 }"
           >
-            <!-- ？？？？ 弹框-->
-            <span slot="???" slot-scope="text">
+            <!-- test 差异 弹框-->
+            <span slot="diff" slot-scope="text">
               <a>{{ text }}</a>
             </span>
           </a-table>
@@ -273,10 +272,9 @@ export default {
           customCell: this.cinvCodeCustomCell,
           scopedSlots: { customRender: 'cinvCode' }
         },
-        { title: '供应商', width: 220, dataIndex: 'cvenName', className: 'replacecolor' },
-
+        { title: '供应商', width: 240, dataIndex: 'cvenName', align: 'left', className: 'replacecolor' },
         { title: '单价(本币)', width: 140, dataIndex: 'inatUnitPrice', className: 'replacecolor' },
-        { title: '物料名称', width: 210, dataIndex: 'cinvName', className: 'replacecolor' },
+        { title: '物料名称', width: 260, dataIndex: 'cinvName', align: 'left', className: 'replacecolor' },
         { title: '计划数量(LRP)', width: 160, dataIndex: 'iquantityLrp', className: 'replacecolor' },
         { title: '订单数量', width: 180, dataIndex: 'iquantity', className: 'replacecolor' },
         { title: '累计入库数量', width: 140, dataIndex: 'ireceivedQTY', className: 'replacecolor' },
@@ -292,12 +290,12 @@ export default {
       weiwaiColumns: [
         {
           title: '委外订单号',
-          width: 120,
+          width: 140,
           dataIndex: 'ccode',
           fixed: 'left',
           className: 'replacecolor'
         },
-        { title: '供应商', width: 220, dataIndex: 'cvenName', fixed: 'left', className: 'replacecolor' },
+        { title: '供应商', width: 220, dataIndex: 'cvenName', fixed: 'left', align: 'left', className: 'replacecolor' },
         {
           title: '物料编码',
           width: 120,
@@ -307,7 +305,7 @@ export default {
           customCell: this.cinvCodeCustomCell,
           scopedSlots: { customRender: 'cinvCode' }
         },
-        { title: '物料名称', width: 320, dataIndex: 'cinvName', className: 'replacecolor' },
+        { title: '物料名称', width: 320, dataIndex: 'cinvName', align: 'left', className: 'replacecolor' },
         { title: '颜色', width: 180, dataIndex: 'color', className: 'replacecolor' },
         { title: '门幅', width: 120, dataIndex: 'cfree4', className: 'replacecolor' },
         { title: '单价(本币)', width: 140, dataIndex: 'inatUnitPrice', className: 'replacecolor' },
@@ -322,7 +320,7 @@ export default {
 
         { title: '余下库存(余料)', width: 140, dataIndex: 'surplusQty', className: 'replacecolor' },
         { title: '子件编号', width: 140, dataIndex: 'cinvCodeZi', className: 'replacecolor' },
-        { title: '子件名称', width: 320, dataIndex: 'cinvNameZi', className: 'replacecolor' },
+        { title: '子件名称', width: 320, dataIndex: 'cinvNameZi', align: 'left', className: 'replacecolor' },
         { title: '子件应领数量', width: 140, dataIndex: 'iquantityZi', className: 'replacecolor' },
         { title: '子件已领数量', width: 140, dataIndex: 'isendQTY', className: 'replacecolor' },
         { title: '子件总成本', width: 140, dataIndex: 'costZi', className: 'replacecolor' },
@@ -351,7 +349,14 @@ export default {
         { title: '用量', width: 120, dataIndex: 'dosage', className: 'replacecolor' },
         { title: '总数量', width: 140, dataIndex: 'totalQuantity', className: 'replacecolor' },
         { title: '合计', width: 160, dataIndex: 'total', className: 'replacecolor' },
-        { title: '差异', width: 120, dataIndex: 'diff', className: 'replacecolor' },
+        {
+          title: '差异',
+          width: 120,
+          dataIndex: 'diff',
+          customCell: this.getPackinglistFabrics,
+          className: 'replacecolor',
+          scopedSlots: { customRender: 'diff' }
+        },
         { title: 'what', width: 140, dataIndex: 'what', className: 'replacecolor' },
         { title: 'what1', width: 140, dataIndex: 'what1', className: 'replacecolor' },
         { title: 'what2', width: 140, dataIndex: 'what2', className: 'replacecolor' },
@@ -360,7 +365,7 @@ export default {
         { title: 'what5', width: 140, dataIndex: 'what5', className: 'replacecolor' },
         { title: '备注', width: 210, dataIndex: 'note', fixed: 'right', className: 'replacecolor' }
       ],
-      cardData: []
+      cardData: [{ diff: '打开装箱单-面料' }]
     }
   },
   created() {
@@ -382,7 +387,7 @@ export default {
             this.salesOrderMain = res.result //主表信息
             this.CaiGouData = res.result.productionScheduleCaiGou //采购
             this.weiwaiData = res.result.productionScheduleWeiWai //委外
-            this.cardData = res.result.productionScheduleWeiWai //物料卡
+            // this.cardData = res.result.productionScheduleWeiWai //物料卡
           }
         })
       })