diff --git a/fe/PC/src/api/wms-api.js b/fe/PC/src/api/wms-api.js
index 75bcddfdd..0890dc550 100644
--- a/fe/PC/src/api/wms-api.js
+++ b/fe/PC/src/api/wms-api.js
@@ -826,6 +826,14 @@ export function getGPYInfo(data) {
   })
 }
 
+// 成品发运-汇总
+export function getDeliverRequestFisByContainer() {
+  return request({
+    url: baseURL + 'wms/store/deliver-request-fis/get-list-by-container',
+    method: 'post',
+  })
+}
+
 // 客户退拆任务-完成 todo
 // export async function productionRecycleJobComplete(id) {
 //   return request({
diff --git a/fe/PC/src/components/tablePagination/index.vue b/fe/PC/src/components/tablePagination/index.vue
index d99699f7b..046abf716 100644
--- a/fe/PC/src/components/tablePagination/index.vue
+++ b/fe/PC/src/components/tablePagination/index.vue
@@ -55,6 +55,7 @@
         :cellStyle = "cellStyle"
         :showOverflowTooltip="showOverflowTooltip"
         :tableRowClassName="tableRowClassName"
+        :selectionIsFixed="selectionIsFixed"
       >
         <!-- 最前方table插槽 -->
         <template v-slot:beforeTableColumn>
@@ -67,6 +68,7 @@
     </div>
     <!-- 页码 -->
     <pagination
+      v-if="showPager"
       :totalCount="totalCount"
       :pagesizeProps="MaxResultCount"
       :currentPageProps="currentPageProps"
@@ -90,6 +92,16 @@ export default {
     rowDrop
   },
   props: {
+    // 是否显示分页
+    showPager:{
+      type: Boolean,
+      default: true,
+    },
+    // 多选框是否左浮动
+    selectionIsFixed:{
+      type: Boolean,
+      default: true,
+    },
     // 已app-main高度为100%  需要减掉的高度
     setUTableHeight: {
       type: Number,
@@ -260,11 +272,13 @@ export default {
         this.closeRowDrop()
       }
     })
-
     // 如果有普通筛选，默认展开
     if(this.primarySearchOption && this.primarySearchOption.length > 0){this.headerFilterClick()}
   },
   methods: {
+    getUMyTable(){
+      return this.$refs.tablePaginationTableRef.getUMyTable()
+    },
     // 清除已选
     clearSelection(){
       this.$refs.tablePaginationTableRef.clearSelection();
diff --git a/fe/PC/src/components/umyTable/index.vue b/fe/PC/src/components/umyTable/index.vue
index 1bf094e8e..5a8021f1e 100644
--- a/fe/PC/src/components/umyTable/index.vue
+++ b/fe/PC/src/components/umyTable/index.vue
@@ -20,11 +20,12 @@
     use-virtual
     :cell-class-name="cellClassName"
     @expand-change="handleExpandChange"
+    :reserve-selection="true"
   >
     <!-- 最前端列插槽 -->
     <slot name="beforeTableColumn"></slot>
     <!-- :tree-props="treeProps" 与 “height”  不能共存， 此组件暂不支持tree的格式-->
-    <u-table-column v-if="selectionTable" fixed="left" type="selection" :reserve-selection="true" :selectable='selectEnable'/>
+    <u-table-column v-if="selectionTable" :fixed="selectionIsFixed" type="selection" :reserve-selection="true" :selectable='selectEnable'/>
     <u-table-column v-if="isShowIndex" type="index" fixed="left" label="序号" width="50" />
     <template v-for="(item, index) in TableSize">
       <u-table-column
@@ -417,6 +418,11 @@ export default {
     },
   },
   props: {
+    // 多选框是否左浮动
+    selectionIsFixed:{
+      type: Boolean,
+      default: true,
+    },
     // 超出内容是否提示
     showOverflowTooltip:{
       type: Boolean,
@@ -587,6 +593,9 @@ export default {
     this.setTableHeightHandle()
   },
   methods: {
+    getUMyTable(){
+      return this.$refs.multipleTable
+    },
     // 展开重新渲染高度
     handleExpandChange(row, expandedRows) {
       if (expandedRows.length) {
diff --git a/fe/PC/src/views/finishedProductManage/deliver/FISDeliverRequest.vue b/fe/PC/src/views/finishedProductManage/deliver/FISDeliverRequest.vue
index 36b3a368c..2ad407e80 100644
--- a/fe/PC/src/views/finishedProductManage/deliver/FISDeliverRequest.vue
+++ b/fe/PC/src/views/finishedProductManage/deliver/FISDeliverRequest.vue
@@ -1,6 +1,7 @@
 <template>
-  <div class="page-box" v-loading="Loading.appMainLoading">
+  <div class="page-box FISDeliverRequestPage" v-loading="Loading.appMainLoading">
     <tablePagination
+      v-if="!isUnfoldMode"
       ref="FISDeliverRequestTable_Ref"
       :currenButtonData="currenButtonData"
       :tableData="tableData"
@@ -24,50 +25,7 @@
       @overallSearchFormClick="(options)=>{overallSearchFormClick(options,overallSearchFormCallback)}"
       :httpOverallSearchData="httpOverallSearchData"
       :tableSelection="true"
-    >
-    <!-- <template v-slot:beforeTableColumn>
-        <u-table-column type="expand" fixed="left">
-          <template slot-scope="props">
-            <el-table
-              max-height="250"
-              :data="tableData2"
-              :border="true"
-              >
-              <el-table-column
-                prop="code"
-                label="ERP料号"
-                width="180">
-              </el-table-column>
-              <el-table-column
-                prop="date"
-                label="日期"
-                width="230">
-              </el-table-column>
-              <el-table-column
-                prop="qty"
-                width="260"
-                label="数量">
-              </el-table-column>
-              <el-table-column
-                prop="number"
-                width="260"
-                label="底盘号">
-              </el-table-column>
-              <el-table-column
-                prop="chkw"
-                width="260"
-                label="出货库位">
-              </el-table-column>
-              <el-table-column
-                prop="chkw2"
-                width="260"
-                label="出货ERP储位">
-              </el-table-column>
-            </el-table>
-          </template>
-        </u-table-column>
-      </template> -->
-    </tablePagination>
+    ></tablePagination>
     <!--抽屉-->
     <curren-Drawer
       :title="tableColumns"
@@ -124,6 +82,13 @@
         <el-button type="primary" @click="creatDeliverTipSure()">继 续</el-button>
       </div>
     </el-dialog>
+    <!-- 汇总模式 -->
+    <div class="unfoldModePageOuter" v-if="isUnfoldMode">
+      <unfoldModePage 
+        ref="unfoldModePage"
+        @closeUnfoldMode="closeUnfoldMode"
+      ></unfoldModePage>
+    </div>
   </div>
 </template>
 <script>
@@ -142,8 +107,11 @@ import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
 import { mixins } from "@/mixins/mixins"
 import { requestData } from "@/utils/processButtonData"
 import { initPrintAllData } from '@/mixins/printMixin'
+import unfoldModePage from "@/views/finishedProductManage/deliver/FISDeliverRequest_unfold"; //第一视图集成
+
 export default {
-  name: "FISDeliverRequest",
+  name: "FISDeliverRequest_unfold",
+  components:{ unfoldModePage },
   mixins: [
     tableMixins,
     LoadingMixins,
@@ -173,40 +141,16 @@ export default {
   },
   data () {
     return {
-      tableData2: [{
-        code:'CA130D0A012AA',
-        date: '2016-05-02',
-        qty: '20',
-        number: '111',
-        chkw:'WIP',
-        chkw2:'WIP'
-      },{
-        code:'CA130D0A013AA',
-        date: '2016-05-02',
-        qty: '5',
-        number: '222',
-        chkw:'WIP',
-        chkw2:'WIP'
-      },{
-        code:'CA130D0A013AA',
-        date: '2016-05-02',
-        qty: '15',
-        number: '333',
-        chkw:'WIP',
-        chkw2:'WIP'
-      },{
-        code:'CA130D0A013AA',
-        date: '2016-05-02',
-        qty: '12',
-        number: '444',
-        chkw:'WIP',
-        chkw2:'WIP'
-      },],
       URL: 'wms/store/deliver-request-fis',
       pagingShowDetail:true,
       importUploadURL:'wms/store/deliver-request/import',
       //常用按钮数据
       currenButtonData: [
+        {
+          label: "切换汇总模式",
+          name: "toUnfold",
+          size: "mini",
+        },
         this.defaultImportBtn(),//导入
         {
           type: "success",
@@ -268,7 +212,8 @@ export default {
       },
       creatDeliverRules:{
         truckNumber: [{ required: true, trigger: "blur", message: "不可为空" }]
-      }
+      },
+      isUnfoldMode:false,//显示汇总模式
     };
   },
   mounted () {
@@ -280,12 +225,17 @@ export default {
       this.showFilterSta_fis = false
     },
     // 查看普通发货、fis发货
-    fasterSearchHandle(type){
+    fasterSearchHandle(type,requestStatus){
       this.PageListParams.condition.filters = [{
         logic: "And",
         column: "deliverRequestType",
         action: "==",
         value: String(type)
+      },{
+        logic: "And",
+        column: "requestStatus",
+        action: "!=",
+        value: String(requestStatus)
       }]
       this.paging()
       this.httpOverallSearchData = null
@@ -321,18 +271,36 @@ export default {
       else if(val == 'normalSta'){
         this.showFilterSta_normal = true
         this.showFilterSta_fis = false
-        this.fasterSearchHandle('1')
+        this.fasterSearchHandle('1','6')
       }
       // 查看fis发货
       else if(val == 'FISSta'){
         this.showFilterSta_fis = true
         this.showFilterSta_normal = false
-        this.fasterSearchHandle('2')
+        this.fasterSearchHandle('2','6')
       } 
       // 重置状态
       else if(val == 'normalSta-reset' || val == 'FISSta-reset'){
         this.resetSearchHandle()
       } 
+      // 切换模式
+      else if(val == 'toUnfold'){
+        if(this.multipleSelection && this.multipleSelection.length > 0){
+          this.$confirm('切换模式后，已选数据将清空，是否继续？', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            this.$refs.FISDeliverRequestTable_Ref.clearSelection()
+            this.isUnfoldMode = true
+          }).catch(() => {
+
+          });
+        }else{
+          this.$refs.FISDeliverRequestTable_Ref.clearSelection()
+          this.isUnfoldMode = true
+        }
+      } 
       else{
         this.topbutton(val,item)
       }
@@ -459,6 +427,7 @@ export default {
               this.creatDeliverTipSure()
             }
           }).catch(err => {
+            this.Loading.appMainLoading = false
           })
         } else {
           console.log('error submit!!');
@@ -482,6 +451,10 @@ export default {
       }).catch(err => {
         this.Loading.appMainLoading = false
       })
+    },
+    closeUnfoldMode(){
+      this.isUnfoldMode = false
+      this.resetSearchHandle()
     }
   }
 }
@@ -494,4 +467,12 @@ export default {
 // ::v-deep .el-table__fixed{
 //   height:100% !important
 // }
+.unfoldModePageOuter{
+  position: absolute;
+  left:0;
+  top:0;
+  right:0;
+  bottom:0;
+  background:#fff
+}
 </style>
\ No newline at end of file
diff --git a/fe/PC/src/views/finishedProductManage/deliver/FISDeliverRequest_unfold.vue b/fe/PC/src/views/finishedProductManage/deliver/FISDeliverRequest_unfold.vue
new file mode 100644
index 000000000..978480625
--- /dev/null
+++ b/fe/PC/src/views/finishedProductManage/deliver/FISDeliverRequest_unfold.vue
@@ -0,0 +1,548 @@
+<template>
+  <div class="page-box" v-loading="Loading.appMainLoading">
+    <tablePagination
+      ref="FISDeliverRequestTable_unfoldRef"
+      :currenButtonData="currenButtonData"
+      :tableData="tableData"
+      :tableLoading="Loading.tableLoading"
+      :tableColumns="tableColumns"
+      @rowDrop="rowDrop"
+      :totalCount="totalCount"
+      :multipleSelection="multipleSelection"
+      :MaxResultCount="PageListParams.MaxResultCount"
+      @topbutton="topbuttonHandle"
+      @inlineDialog="inlineDialog"
+      @sortChange="sortChange"
+      @alertoldSkipCount="alertoldSkipCount"
+      @alterResultCount="alterResultCount"
+      @handleSelectionChange="handleSelectionChange"
+      :currentPageProps="oldSkipCount"
+      :quicklySearchOption="quicklySearchOption"
+      @quicklySearchClick="quicklySearchClick"
+      @quicklySearchClear="quicklySearchClear"
+      :primarySearchOption="primarySearchOption"
+      @overallSearchFormClick="(options)=>{overallSearchFormClick(options,overallSearchFormCallback)}"
+      :httpOverallSearchData="httpOverallSearchData"
+      :tableSelection="true"
+      :selectionIsFixed="false"
+      :showPager="false"
+      :setUTableHeight="120"
+    >
+    <template v-slot:beforeTableColumn>
+        <u-table-column type="expand">
+          <template slot-scope="props">
+            <u-table
+              max-height="280"
+              :data="props.row.requestDetailDtos"
+              :border="true"
+              row-key="id"
+            >
+              <u-table-column
+                v-for="(item, index) in detailTableColumns"
+                :prop="item.prop"
+                :label="item.label">
+              </u-table-column>
+            </u-table>
+          </template>
+        </u-table-column>
+      </template>
+    </tablePagination>
+    <!--抽屉-->
+    <curren-Drawer
+      :title="tableColumns"
+      :DrawerLoading="Loading.DrawerLoading"
+      :drawer="displayDialog.detailsDialog"
+      :propsData="propsData"
+      :tabsDesTions="tabsDesTions"
+      :Butttondata="DrawerButtonData"
+      @drawerShut="(val) => (displayDialog.detailsDialog = val)"
+      @drawerbutton="drawerbuttonHandle"
+      @handleCommand="drawerHandle"
+      @close-value="closeValue"
+      :tableColumns="detailsTableColumns"
+      :totalCount="totalCountDetails"
+      :MaxResultCount="MaxResultCountDetails"
+      @alterResultCountDetails="alterResultCountDetails"
+      @alertoldSkipCountDetails="alertoldSkipCountDetails"
+    ></curren-Drawer>
+    <!-- 新导入 disabledMethod 导入方式禁用 disabledIsAllowPartImport 是否局部导入禁用-->
+    <!-- methodValue 导入方式默认选项  是否局部导入 默认选项  -->
+    <importFile
+      :loading="Loading.importLoading"
+      :show="displayDialog.importDialog"
+      :URL="URL"
+      :disabledMethod = {method1:false,method2:false,method3:false}
+      :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false}
+      isAllowPartImportValue="1"
+      @importClick="postImportMergeClick(arguments)"
+      @postImportDown="importDown('wms/store/deliver-request')"
+    ></importFile>
+    <!-- 批量生成发货单弹窗 -->
+    <el-dialog 
+      title="批量生成发货单" 
+      :visible="creatDeliverShow"
+      :append-to-body="true"
+    >
+      <el-form :model="creatDeliverForm" :rules="creatDeliverRules" ref="creatDeliverRef">
+        <el-form-item label="车牌号" prop="truckNumber">
+          <el-input v-model="creatDeliverForm.truckNumber"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer">
+        <el-button @click="creatDeliverClose()">取 消</el-button>
+        <el-button type="primary" @click="creatDeliverSure()">确 定</el-button>
+      </div>
+    </el-dialog>
+    <!-- 批量生成发货单提示-弹窗 -->
+    <el-dialog 
+      :visible="creatDeliverTipShow"
+      :append-to-body="true"
+    >
+      <div v-html="creatDeliverTipper"></div>
+      <div slot="footer">
+        <el-button type="primary" @click="creatDeliverTipSure()">继 续</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import {  
+  processRequest,
+  getDetailed, 
+  getPageListWip,
+  deliverRequestHandleList,
+  deliverRequestHandleTip,
+  deliverRequestDelete,
+  getDeliverRequestFisByContainer
+} from "@/api/wms-api";
+import { tableMixins } from "@/mixins/TableMixins"
+import { LoadingMixins } from "@/mixins/LoadingMixins"
+import { drawerMixins } from "@/mixins/drawerMixins"
+import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
+import { mixins } from "@/mixins/mixins"
+import { requestData } from "@/utils/processButtonData"
+import { initPrintAllData } from '@/mixins/printMixin'
+export default {
+  name: "FISDeliverRequest_unfold",
+  mixins: [
+    tableMixins,
+    LoadingMixins,
+    drawerMixins,
+    TableHeaderMixins,
+    mixins,
+  ],
+  computed: {
+    // 头部按钮显隐控制(普通发货)
+    hideButton_normalSta: function () {
+      return function (val) {
+        return this.showFilterSta_normal == val
+      }
+    },
+    // 头部按钮显隐控制(FIS发货)
+    hideButton_FISSta: function () {
+      return function (val) {
+        return this.showFilterSta_fis == val
+      }
+    },
+    // 按钮显示
+    hideDelButton: function () {
+      return function () {
+        return this.propsData.deliverRequestType != 1
+      }
+    },
+  },
+  data () {
+    return {
+      URL: 'wms/store/deliver-request-fis/get-list-by-container',
+      pagingShowDetail:true,
+      importUploadURL:'wms/store/deliver-request/import',
+      //常用按钮数据
+      currenButtonData: [
+        {
+          label: "返回普通模式",
+          name: "toNormal",
+          size: "mini",
+        },
+        // this.defaultImportBtn(),//导入
+        {
+          type: "success",
+          icon: "el-icon-d-arrow-right",
+          label: "批量生成发货单",
+          name: "creatDeliver",
+          size: "mini",
+        },
+        {
+          label: "全部折叠",
+          name: "toggleAllExpansion",
+          size: "mini",
+          type: "primary",
+        },
+        // {
+        //   type: "primary",
+        //   label: "筛选[普通发货]",
+        //   name: "normalSta",
+        //   size: "mini",
+        //   hide: () => { return this.hideButton_normalSta(true) },
+        // },
+        // {
+        //   type: "danger",
+        //   label: "重置[普通发货]",
+        //   name: "normalSta-reset",
+        //   size: "mini",
+        //   hide: () => { return this.hideButton_normalSta(false) },
+        // },
+        // {
+        //   type: "warning",
+        //   label: "筛选[FIS发货]",
+        //   name: "FISSta",
+        //   size: "mini",
+        //   hide: () => { return this.hideButton_FISSta(true) },
+        // },
+        // {
+        //   type: "danger",
+        //   label: "重置[FIS发货]",
+        //   name: "normalSta-reset",
+        //   size: "mini",
+        //   hide: () => { return this.hideButton_FISSta(false) },
+        // },
+        this.defaultFieldSettingBtn(),//字段设置
+        this.defaultFreshBtn(),//刷新
+        // this.defaultFilterBtn(),//筛选
+      ],
+      tableColumns:[
+        { label: "器具编号", prop: 'mesDeliveryContainer'},
+        { label: "最大时间", prop: "maxDateTime", type: "dateTime" },
+        { label: "最小时间", prop: 'minDateTime', type: "dateTime"},
+        { label: "客户代码", prop: 'customerCode'},
+        { label: "客户名称", prop: 'customerName'},
+        { label: "客户简称", prop: 'customerShortName'},
+        { label: "客户地址", prop: 'customerAddress'},
+        { label: "创建时间", prop: "creationTime",type: "dateTime"},
+      ],
+      // 子表表头
+      detailTableColumns:[
+        { label: "ERP料号", prop: 'itemCode' },
+        { label: "料号描述", prop: 'itemDesc1' },
+        { label: "底盘号", prop: 'identityNo' },
+        { label: "Mes发货计划号", prop: 'mesDeliveryPlan' },
+        { label: "Mes器具号", prop: 'mesDeliveryContainer' },
+        { label: "数量", prop: 'qty' },
+        { label: "单位", prop: 'uom' },
+        { label: "标包数量", prop: 'stdPackQty' },
+      ],
+      DrawerButtonData: [
+        {
+          type: "danger",
+          label: "删除",
+          name: "delete",
+          size: "mini",
+          hide: () => { return this.hideDelButton() },
+        },
+        // ...requestData(this)
+      ],
+      showFilterSta_normal:false,//查看普通发货
+      showFilterSta_fis:false,//查看fis发货
+      // 批量生成发货单弹窗
+      creatDeliverShow:false,
+      creatDeliverTipShow:false,
+      creatDeliverTipper:"",
+      creatDeliverForm:{
+        truckNumber:""
+      },
+      creatDeliverRules:{
+        truckNumber: [{ required: true, trigger: "blur", message: "不可为空" }]
+      },
+      // 已选去重masterID后明细
+      selectedDetailsArr:[]
+    };
+  },
+  mounted () {
+    this.paging(()=>{
+      this.$nextTick(()=>{
+        this.$refs.FISDeliverRequestTable_unfoldRef.clearSelection()
+      })
+    });
+  },
+  methods:{
+    paging(callback) {
+      this.initPagingHeaderBtn()
+      this.Loading.tableLoading = true;
+      getDeliverRequestFisByContainer().then(res => {
+        res.forEach((item,key)=>{ item.id = key + 1 })
+        this.tableData = res
+        this.totalCount = res.length
+        this.pagingCallback(callback)
+      }).catch(err => {
+        this.Loading.tableLoading = false
+      })
+      // this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount,
+        // getPageList(this.PageListParams, this.URL,this.pagingShowDetail,this.listURL).then(res => {
+        //   this.tableData = res.items
+        //   this.totalCount = res.totalCount
+        //   this.pagingCallback(callback)
+        // }).catch(err => {
+        //   this.Loading.tableLoading = false
+        // })
+    },
+    overallSearchFormCallback(){
+      this.showFilterSta_normal = false
+      this.showFilterSta_fis = false
+    },
+    // 查看普通发货、fis发货
+    fasterSearchHandle(type){
+      this.PageListParams.condition.filters = [{
+        logic: "And",
+        column: "deliverRequestType",
+        action: "==",
+        value: String(type)
+      }]
+      this.paging()
+      this.httpOverallSearchData = null
+    },
+    // 重置普通发货、fis发货
+    resetSearchHandle(){
+      this.showFilterSta_normal = false
+      this.showFilterSta_fis = false
+      this.PageListParams.condition.filters = []
+      this.paging()
+      this.httpOverallSearchData = null
+    },
+    topbuttonHandle(val,item){
+      // 批量生成发货单
+      if(val == "creatDeliver"){
+        if(!this.multipleSelection || this.multipleSelection.length <= 0){
+          this.$warningMsg("至少选择一条数据")
+          return
+        }
+        let _hasNoSame = 0
+        for(let i = 0;i<this.multipleSelection.length;i++){
+          if(this.multipleSelection[i].customerCode != this.multipleSelection[0].customerCode){
+            _hasNoSame ++
+          }
+        }
+        if(_hasNoSame != 0){
+          this.$errorMsg("所选数据的客户代码必须一致！")
+          return
+        }
+        this.creatDeliverShow = true
+      }
+      // 查看普通发货
+      else if(val == 'normalSta'){
+        this.showFilterSta_normal = true
+        this.showFilterSta_fis = false
+        this.fasterSearchHandle('1')
+      }
+      // 查看fis发货
+      else if(val == 'FISSta'){
+        this.showFilterSta_fis = true
+        this.showFilterSta_normal = false
+        this.fasterSearchHandle('2')
+      } 
+      // 重置状态
+      else if(val == 'normalSta-reset' || val == 'FISSta-reset'){
+        this.resetSearchHandle()
+      } 
+      // 切换模式
+      else if(val == 'toNormal'){
+        if(this.multipleSelection && this.multipleSelection.length > 0){
+          this.$confirm('切换模式后，已选数据将清空，是否继续？', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            this.$refs.FISDeliverRequestTable_unfoldRef.clearSelection()
+            this.$emit("closeUnfoldMode")
+          }).catch(() => {
+
+          });
+        }else{
+          this.$refs.FISDeliverRequestTable_unfoldRef.clearSelection()
+          this.$emit("closeUnfoldMode")
+        }
+      } 
+      // 全部折叠
+      else if(val == 'toggleAllExpansion'){
+        this.toggleAllExpansion()
+      }
+      else{
+        this.topbutton(val,item)
+      }
+    },
+    printHandle(){
+      this.Loading.appMainLoading = true
+      let param = {
+        maxResultCount: 1000,
+        condition: {
+          filters: [{
+            logic: "And",
+            column: "deliverRequestNumber",
+            action: "==",
+            value: this.propsData.number
+          }]
+        },
+        sorting: "",
+        skipCount: 0
+      }
+      // 获取记录
+      this.Loading.appMainLoading = true
+      getPageListWip(param, 'wms/store/deliver-note/list-for-fis',true)
+        .then(async res => {
+          let _option = {
+            details:{
+              packingCode:"toPackingCode",
+            }
+          }
+          let data = await initPrintAllData(res.items[0],'chdmxb.rdlx',false,_option);
+          this.Print(data)
+          this.Loading.appMainLoading = false
+        })
+        .catch(err=>{
+          console.log(err)
+        })
+    },
+    drawerbuttonHandle(val){
+      // 审批
+      // if (val == 'agreeRequest') {
+      //   this.Loading.appMainLoading = true
+      //   processRequest(this.propsData.id, this.URL + '/agree/').then(res => {
+      //     getDetailed(this.propsData.id, this.URL).then(res => {
+      //       this.propsData = res
+      //     })
+      //     this.paging()
+      //     this.$confirm('审批成功，是否需要打印发货单', '提示', {
+      //       confirmButtonText: '确定',
+      //       cancelButtonText: '取消',
+      //       type: 'warning'
+      //     }).then(() => {
+      //       // 打印发货单
+      //       this.printHandle()
+      //     }).catch(() => {
+
+      //     });
+      //     this.Loading.appMainLoading = false
+      //   }).catch(err => {
+      //     this.Loading.appMainLoading = false
+      //   })
+      // }
+      if(val == 'delete'){
+        this.$confirm('您确定删除吗, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.Loading.appMainLoading = true;
+          deliverRequestDelete(this.propsData.id)
+            .then(res=>{
+              this.$successMsg("删除成功！")
+              this.paging()
+              this.displayDialog.detailsDialog = false
+              this.Loading.appMainLoading = false;
+            }).catch(() => {
+              this.Loading.appMainLoading = false;
+            });
+        }).catch(() => {
+
+        });
+      }
+      else{
+        this.drawerbutton(val)
+      }
+    },
+    // 批量操作弹窗-关闭
+    creatDeliverClose(){
+      this.creatDeliverForm.truckNumber = ""
+      this.creatDeliverShow = false
+    },
+    // 批量操作弹窗-确定
+    creatDeliverSure(){
+      this.$refs.creatDeliverRef.validate((valid) => {
+        if (valid) {
+          this.Loading.appMainLoading = true
+          // 子表汇总
+          let _allDetails = []
+          this.multipleSelection.forEach(item=>{
+            item.requestDetailDtos.forEach(dItem=>{
+              dItem.customerCode = item.customerCode
+            })
+            _allDetails=[...item.requestDetailDtos,..._allDetails]
+          })
+          // 去重masterID
+          let _masters = []
+          this.selectedDetailsArr = []
+          _allDetails.forEach(item=>{
+            if(!(_masters.includes(item.masterID))){
+              _masters.push(item.masterID)
+              this.selectedDetailsArr.push(item)
+            }
+          })
+          // 格式化数据
+          let _details = {}
+          this.selectedDetailsArr.forEach(deItem=>{
+            let _name = deItem.customerCode + '_' + deItem.itemCode
+            if(!_details[_name])_details[_name] = deItem
+          })
+          // 重组传参
+          let _dtos = []
+          for(let i in _details){
+            let _item = {
+              customerCode:_details[i].customerCode,
+              itemCode:_details[i].itemCode
+            }
+            _dtos.push(_item)
+          }
+          deliverRequestHandleTip(_dtos)
+          .then(res => {
+            this.Loading.appMainLoading = false
+            // 如果有字符串，弹出提示
+            if(res && res.length > 0){
+              this.creatDeliverTipper = res
+              this.creatDeliverTipShow = true
+            }
+            // 如果没有字符串，直接走提交流程
+            else{
+              this.creatDeliverTipSure()
+            }
+          }).catch(err => {
+            this.Loading.appMainLoading = false
+          })
+        } else {
+          console.log('error submit!!');
+          return false;
+        }
+      });
+    },
+    creatDeliverTipSure(){
+      this.Loading.appMainLoading = true
+      let _params = {truckNumber:String(this.creatDeliverForm.truckNumber)}
+      let _ids = []
+      this.selectedDetailsArr.forEach(select=>{ _ids.push(select.masterID) })
+      this.creatDeliverClose()
+      this.creatDeliverTipShow = false
+      deliverRequestHandleList(_ids,_params)
+      .then(res => {
+        this.Loading.appMainLoading = false
+        this.$refs.FISDeliverRequestTable_unfoldRef.clearSelection()
+        this.paging()
+        this.$successMsg('操作成功！')
+      }).catch(err => {
+        this.Loading.appMainLoading = false
+      })
+    },
+    // 全部折叠
+    toggleAllExpansion() {
+      this.tableData.forEach(row => {
+        this.$refs.FISDeliverRequestTable_unfoldRef.getUMyTable().toggleRowExpansion(row, false);
+      });
+    },
+  }
+}
+</script>
+<style lang="scss" scoped>
+@import "../../../styles/mainbasicData.scss";
+::v-deep .el-table__expanded-cell{
+  padding:20px 20px 20px 120px !important
+}
+// ::v-deep .el-table__fixed{
+//   height:100% !important
+// }
+</style>
\ No newline at end of file