单证 成本分配汇总 tabs 内容补充

src/assets/less/overwriter.css

@@ -12,12 +12,13 @@
 }
 .note-one,
 .note-two {
-  height: 100%;
+  min-height: 100px;
 }
 .note-one .noteDetail,
 .note-two .noteDetail {
-  background-color: #f2f2f2;
+  background-color: #fafafa;
   padding: 10px;
+  border: 1px solid #f2f2f2;
 }
 .note-one /deep/ .ant-btn-primary,
 .note-two /deep/ .ant-btn-primary {

src/assets/less/overwriter.less

@@ -25,10 +25,11 @@
 // 所有备注文本框 
 .note-one,
 .note-two {
-  height: 100%;
+  min-height: 100px;
   .noteDetail {
-    background-color: #f2f2f2;
+    background-color: #fafafa;
     padding: 10px;
+    border: 1px solid #f2f2f2;
   }
   /deep/ .ant-btn-primary {
     margin: 20px 0 10px 0;

src/views/cost-allocation-total/costDetailDrawer.vue

@@ -165,8 +165,10 @@
         <div>
           <tabs ref="unitTabs" />
         </div>
+      </a-card>
 
-        <!-- 事故单 -->
+      <!-- 事故单 -->
+      <a-card :bordered="true" style="margin:10px 0">
         <div style="margin:60px 0 40px 0">
           <h6 class="table-title">事故单</h6>
           <a-table
@@ -203,9 +205,7 @@
         <div class="note-one" style="marginTop:40px;">
           <h6 class="table-title">备注信息</h6>
           <div class="noteDetail">
-            我是备注信息test我是备注信息test我是备注信息test我是备注信息test我是备注信息test我是备注信息test
-            <!-- {{ detailsPlanNum.remarks }} -->
-            <!-- <a-input type="textarea" v-model="noteOne" placeholder="请输入备注 1" style="minHeight:100px;" /> -->
+            {{ detailsPlanNum.remarks }}
           </div>
         </div>
       </a-card>
@@ -281,6 +281,7 @@ export default {
     this.getALLDetail()
   },
   methods: {
+    // 详情所有数据
     getALLDetail() {
       this.$nextTick(() => {
         // console.log('详情拿到planNum', this.record.planNum)
@@ -292,7 +293,7 @@ export default {
             this.$refs.unitTabs.fabData = res.result[0].syCostAllocationFabricList //面料
             this.$refs.unitTabs.ingData = res.result[0].syCostAllocationIngredientList //辅料
             this.$refs.unitTabs.shipData = res.result[0].syCostAllocationShipdetailList //发运明细
-            
+
             this.accidentListData = res.result[0].syCostAllocationAccidentList //事故单
             this.costPayData = res.result[0].syCostAllocationCostpayList //支出费用
 
@@ -305,7 +306,7 @@ export default {
         })
       })
     },
-    // 同步按钮  synchronization() {},
+
     //  主表：人民币费用支出  弹框
     mainTableExpenseCNY() {
       console.log('点击:主表人民币费用支出')
@@ -357,11 +358,7 @@ export default {
 // /deep/ th.replacecolor {
 //   background-color: #ccc;
 // }
-/deep/ .ant-tabs {
-  border: 2px solid rgba(24, 144, 255, 0.3);
-  padding: 10px;
-  border-radius: 10px;
-}
+
 
 // 抽屉里的card样式
 /deep/ .ant-drawer-content {
@@ -374,5 +371,6 @@ export default {
 // 回显label文字
 /deep/.ant-form-item-label > label {
   font-weight: 700;
+  color: #333;
 }
 </style>

src/views/cost-allocation-total/list.vue

@@ -226,7 +226,7 @@ export default {
     detail(record) {
       this.$refs.costDetailDrawer.visible = true
       this.$refs.costDetailDrawer.record = record //接口参数
-      console.log('参数record', this.$refs.costDetailDrawer.record.planNum)
+      // console.log('参数record', this.$refs.costDetailDrawer.record.planNum)
       this.$refs.costDetailDrawer.getALLDetail()
     },
     //  审核

src/views/cost-allocation-total/modal/accidentListModal.vue

@@ -109,8 +109,7 @@ export default {
   components: {},
   data() {
     return {
-      loading: false, // 表格加载
-      // orderDataform: this.$form.createForm(this),
+      loading: false,
       confirmLoading: false,
       accidentListModVis: false,
       accidentList: []
@@ -125,19 +124,37 @@ export default {
   },
   created() {},
   methods: {
-    // 第一行 导出
-    handleExportXls() {},
+    //  导出
+    handleExportXls(fileName) {
+      console.log('需导出的fileName:', fileName)
+      const params = this.dyeLossRateData
+      console.log('导出参数', params)
+      // downFile('/scas/dyeLoss/excel', params).then(data => {
+      //   console.log('888')
+      //   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对象
+      //   }
+      // })
+    },
     // 打印
     print() {},
     // 返回
     backFabricLossTable() {
       console.log('返回到面料损耗表')
-      // this.$router.push('fabricLoss-table')
-      // this.accidentListModVis = false
-      this.close()
-    },
-    close() {
-      this.$emit('close')
       this.accidentListModVis = false
     }
   }

src/views/cost-allocation-total/modal/fabInQuaModal.vue

@@ -1,5 +1,5 @@
 <template>
-  <!-- 成本分配统计表  面料 转入数量 -->
+  <!-- 面料 转入数量 成本分配统计表   -->
   <a-modal
     title="面料 - 转入数量"
     v-model="fabInQuaModVis"

src/views/cost-allocation-total/modal/ingInQuaModal.vue

@@ -15,7 +15,7 @@
       <a-row style="marginTop:20px;">
         <a-col :md="24" :sm="12">
           <span style="float: right;" class="table-operator">
-            <a-button type="primary" icon="download" @click="handleExportXls('转入数量')">导出</a-button>
+            <a-button type="primary" icon="download" @click="handleExportXls('成本分配-辅料-转入数量')">导出</a-button>
             <a-button type="primary" @click="print" icon="printer" style="margin:0 10px;">打印</a-button>
             <a-button type="primary" @click="cancel" icon="rollback">取消</a-button>
           </span>
@@ -85,7 +85,7 @@ export default {
       default: null
     }
   },
-  created() {},
+
   methods: {
     // 导出
     handleExportXls(fileName) {

src/views/cost-allocation-total/tabTest.vue

@@ -1,427 +0,0 @@
-<template>
-  <!-- 加工单位 2 -->
-  <a-tab-pane key="2" tab="加工单位2" force-render>
-    <!-- tabs 面料 -->
-    <div>
-      <h6 class="table-title">面料</h6>
-
-      <a-table
-        rowKey="id"
-        :loading="loading"
-        :columns="twofabricColumns"
-        :data-source="twofabricData"
-        bordered
-        :pagination="false"
-      >
-        <!-- 转入数量 弹框-->
-        <span slot="twofabricTransferQuantity" slot-scope="text">
-          <a>{{ text }}</a>
-        </span>
-
-        <!-- 余下数量 弹框-->
-        <span slot="fabricremainingQuantity" slot-scope="text">
-          <a>{{ text }}</a>
-        </span>
-      </a-table>
-    </div>
-
-    <!-- tabs 辅料 -->
-    <div style="margin:40px 0">
-      <h6 class="table-title">辅料</h6>
-
-      <a-table
-        rowKey="id"
-        :loading="loading"
-        :columns="twoingredientsColumns"
-        :data-source="twoingredientsData"
-        bordered
-        :pagination="false"
-      >
-        <!--辅料-转入数量 弹框-->
-        <span slot="ingredientsTransferQuantity" slot-scope="text">
-          <a>{{ text }}</a>
-        </span>
-        <!--辅料-余下数量 弹框-->
-        <span slot="fabricremainingQuantity" slot-scope="text">
-          <a>{{ text }}</a>
-        </span>
-      </a-table>
-    </div>
-
-    <!-- tabs 发运明细 -->
-    <div>
-      <h6 class="table-title">发运明细</h6>
-      <a-table
-        rowKey="id"
-        :loading="loading"
-        :columns="twoshipDetailsColumns"
-        :data-source="twoshipDetailsData"
-        bordered
-        :pagination="false"
-      >
-      </a-table>
-    </div>
-
-    <!-- tabs 合计 信息 -->
-    <div style="marginTop:30px;">
-      <h6 class="table-title">合计信息</h6>
-      <div style="border: 1px solid #e8e8e8;padding: 20px 20px 0 20px;">
-        <a-row :gutter="24">
-          <div class="table-page-search-wrapper">
-            <a-form layout="inline">
-              <a-col :md="6" :sm="8">
-                <a-form-item label="出货数量合计">
-                  <a-input v-model="totalInfo.shipmentQuantity"></a-input>
-                </a-form-item>
-              </a-col>
-
-              <a-col :md="6" :sm="8">
-                <a-form-item label="辅料金额合计">
-                  <a-input v-model="totalInfo.accessoriesAmount"></a-input>
-                </a-form-item>
-              </a-col>
-
-              <a-col :md="6" :sm="8">
-                <a-form-item label="辅料不含税金额合计">
-                  <a-input v-model="totalInfo.accessoriesExcludTax"></a-input>
-                </a-form-item>
-              </a-col>
-
-              <a-col :md="6" :sm="8">
-                <a-form-item label="出运美元外销总价">
-                  <a-input v-model="totalInfo.exportPriceUSD"></a-input>
-                </a-form-item>
-              </a-col>
-
-              <a-col :md="6" :sm="8">
-                <a-form-item label="出运加工费">
-                  <a-input v-model="totalInfo.shipProcesFees"></a-input>
-                </a-form-item>
-              </a-col>
-
-              <a-col :md="6" :sm="8">
-                <a-form-item label="面料不含税金额合计">
-                  <a-input v-model="totalInfo.fabricExcludTax"></a-input>
-                </a-form-item>
-              </a-col>
-
-              <a-col :md="6" :sm="8">
-                <a-form-item label="出运人民币外销金额">
-                  <a-input v-model="totalInfo.exportedAmountRMB"></a-input>
-                </a-form-item>
-              </a-col>
-
-              <a-col :md="6" :sm="8">
-                <a-form-item label="合计金额">
-                  <a-input v-model="totalInfo.amountTotal"></a-input>
-                </a-form-item>
-              </a-col>
-
-              <a-col :md="6" :sm="8">
-                <a-form-item label="面料金额合计">
-                  <a-input v-model="totalInfo.fabricAmount"></a-input>
-                </a-form-item>
-              </a-col>
-            </a-form>
-          </div>
-        </a-row>
-      </div>
-    </div>
-  </a-tab-pane>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      // two 面料 表头
-      twofabricColumns: [
-        {
-          title: '序号',
-          width: 90,
-          dataIndex: 'index',
-          key: 'index',
-          customRender: (text, record, index) => `${index + 1}`,
-          className: 'replacecolor'
-        },
-        { title: '面料', width: 160, dataIndex: 'fabric', className: 'replacecolor' },
-        {
-          title: '单位成本',
-          dataIndex: 'unitCost',
-          width: 120,
-          className: 'replacecolor'
-        },
-        { title: '存货名称', width: 160, dataIndex: 'inventoryName', className: 'replacecolor' },
-
-        {
-          title: '转入数量',
-          dataIndex: 'fabrictransferQuantity',
-          width: 120,
-          className: 'replacecolor',
-          customCell: this.twoFabricTransferQuantityCustomCell,
-          scopedSlots: { customRender: 'fabrictransferQuantity' }
-        },
-        { title: '转入成本', width: 160, dataIndex: 'transferCost', className: 'replacecolor' },
-
-        { title: '单耗/件', dataIndex: 'unitConsumption', width: 120, className: 'replacecolor' },
-        { title: '使用数量', dataIndex: 'usageQuantity', width: 120, className: 'replacecolor' },
-        { title: '计划数量', dataIndex: 'planQuantity', width: 120, className: 'replacecolor' },
-        {
-          title: '购入数量',
-          dataIndex: 'purchaseQuantity',
-          width: 120,
-          className: 'replacecolor'
-        },
-        {
-          title: '余下数量',
-          dataIndex: 'twofabricRemainingQuantity',
-          width: 100,
-          className: 'replacecolor',
-          customCell: this.twofabricRemainingQuantityCustomCell,
-          scopedSlots: { customRender: 'twofabricRemainingQuantity' }
-        },
-        {
-          title: '损耗',
-          dataIndex: 'loss',
-          width: 120,
-          className: 'replacecolor'
-        },
-        {
-          title: '余下数量的成本',
-          dataIndex: 'remainingQuantitycost',
-          width: 120,
-          className: 'replacecolor'
-        }
-      ],
-      twofabricData: [],
-      // two 辅料 表头
-      twoingredientsColumns: [
-        {
-          title: '序号',
-          width: 90,
-          dataIndex: 'index',
-          key: 'index',
-          fixed: 'left',
-          customRender: (text, record, index) => `${index + 1}`,
-          className: 'replacecolor'
-        },
-        { title: '辅料', width: 170, dataIndex: 'ingredients', fixed: 'left', className: 'replacecolor' },
-        {
-          title: '转入数量',
-          dataIndex: 'ingredientsTransferQuantity',
-          width: 120,
-          className: 'replacecolor',
-          customCell: this.twoingredientsTransferQuantityCustomCell,
-          scopedSlots: { customRender: 'ingredientsTransferQuantity' }
-        },
-        {
-          title: '转入成本',
-          dataIndex: 'transferCost',
-          width: 120,
-          className: 'replacecolor'
-        },
-
-        { title: '使用数量', dataIndex: 'usageQuantity', width: 120, className: 'replacecolor' },
-        {
-          title: '购入数量',
-          dataIndex: 'purchaseQuantity',
-          width: 120,
-          className: 'replacecolor'
-        },
-        {
-          title: '余下数量',
-          dataIndex: 'twoingredientsRemainingQuantity',
-          width: 140,
-          className: 'replacecolor',
-          customCell: this.twoingredientsRemainingQuantityCustomCell,
-          scopedSlots: { customRender: 'twoingredientsRemainingQuantity' }
-        },
-        {
-          title: '损耗',
-          dataIndex: 'loss',
-          width: 120,
-          className: 'replacecolor'
-        },
-        {
-          title: '人民币金额',
-          dataIndex: 'RMBAmount',
-          width: 160,
-          className: 'replacecolor'
-        },
-        {
-          title: '美元金额',
-          dataIndex: 'USDAmount',
-          width: 160,
-          className: 'replacecolor'
-        },
-        {
-          title: '不含税金额',
-          dataIndex: 'priceExcludingTax',
-          width: 120,
-          className: 'replacecolor'
-        },
-        {
-          title: '转出率',
-          dataIndex: 'transferOutRate',
-          width: 120,
-          className: 'replacecolor'
-        },
-        {
-          title: '进项税转出',
-          dataIndex: 'inputTaxTransferOut',
-          width: 160,
-          className: 'replacecolor'
-        },
-        {
-          title: '用量',
-          dataIndex: 'dosage',
-          width: 120,
-          className: 'replacecolor'
-        }
-      ],
-      twoingredientsData: [],
-      // two 发运明细 表头
-      twoshipDetailsColumns: [
-        {
-          title: '序号',
-          width: 90,
-          dataIndex: 'index',
-          key: 'index',
-          fixed: 'left',
-          customRender: (text, record, index) => `${index + 1}`,
-          className: 'replacecolor'
-        },
-        { title: '发票号码', width: 180, dataIndex: 'invoiceNum', fixed: 'left', className: 'replacecolor' },
-        {
-          title: '出运日期',
-          dataIndex: 'outData',
-          width: 130,
-          className: 'replacecolor'
-          // customCell: this.ingredientsTransferQuantityCustomCell,
-          // scopedSlots: { customRender: 'fabrictransferQuantity' }
-        },
-        {
-          title: '汇率',
-          dataIndex: 'exchangeRate',
-          width: 120,
-          className: 'replacecolor'
-        },
-
-        { title: '订单号', dataIndex: 'orderNum', width: 160, className: 'replacecolor' },
-        {
-          title: '产品款号',
-          dataIndex: 'poStyleNum',
-          width: 120,
-          className: 'replacecolor'
-        },
-        {
-          title: '出货数量',
-          dataIndex: 'shipQuantity',
-          width: 120,
-          className: 'replacecolor'
-          // customCell: this.ingredientsRemainingQuantityCustomCell,
-          // scopedSlots: { customRender: 'fabricremainingQuantity' }
-        },
-        {
-          title: '外销单价',
-          dataIndex: 'loss',
-          width: 120,
-          className: 'exportUnitPrice'
-        },
-        {
-          title: '外销总价',
-          dataIndex: 'exportPrice',
-          width: 160,
-          className: 'replacecolor'
-        },
-        {
-          title: '人民币金额',
-          dataIndex: 'RMBAmount',
-          width: 160,
-          className: 'replacecolor'
-        },
-        {
-          title: '加工单价（人民币）',
-          dataIndex: 'procesUnitPriceRMB',
-          width: 160,
-          className: 'replacecolor'
-        },
-        {
-          title: '加工单价（美元）',
-          dataIndex: 'procesUnitPriceUSD',
-          width: 160,
-          className: 'replacecolor'
-        },
-        {
-          title: '加工费',
-          dataIndex: 'processCost',
-          width: 160,
-          className: 'replacecolor'
-        }
-      ],
-      twoshipDetailsData: []
-    }
-  },
-  methods: {
-    //  加工单位2 面料 -转入数量 弹框
-    twoFabricTransferQuantityCustomCell() {
-      return {
-        on: {
-          click: event => {
-            console.log('点击单元格-加工单位2 面料-转入数量')
-            this.$refs.fabricTransferQuantityModal.fabricTransferQuantityModVis = true
-          }
-        }
-      }
-    },
-
-    //  加工单位2 面料 -余下数量 弹框
-    twofabricRemainingQuantityCustomCell() {
-      return {
-        on: {
-          click: event => {
-            console.log('点击单元格-辅料-余下数量')
-            this.$refs.fabricRemainingQuantityModal.fabricRemainingQuantityModVis = true
-          }
-        }
-      }
-    },
-    // 加工单位2 辅料-转入数量 弹框
-    twoingredientsTransferQuantityCustomCell() {
-      return {
-        on: {
-          click: event => {
-            console.log('点击单元格-辅料-转入数量')
-            this.$refs.ingredientsTransferQuantityModal.ingredientsTransferQuantityModVis = true
-          }
-        }
-      }
-    },
-    // 加工单位2 辅料-余下数量 弹框
-    twoingredientsRemainingQuantityCustomCell() {
-      return {
-        on: {
-          click: event => {
-            console.log('点击单元格-辅料-余下数量')
-            this.$refs.ingredientsRemainingQuantityModal.ingredientsRemainingQuantityModVis = true
-          }
-        }
-      }
-    },
-
-    // 事故单 单号 弹框
-    accidentListCustomCell(record) {
-      return {
-        on: {
-          click: event => {
-            console.log('this:', this)
-            this.$refs.accidentListModal.accidentListModVis = true
-          }
-        }
-      }
-    }
-  }
-}
-</script>
-
-<style></style>

src/views/cost-allocation-total/tabs.vue

@@ -74,55 +74,184 @@
                 <a-form layout="inline">
                   <a-col :md="6" :sm="8">
                     <a-form-item label="出货数量合计">
-                      <a-input v-model="totalInfo.shipmentQuantity"></a-input>
+                      <a-input v-model="sumInfo.shipQua"></a-input>
                     </a-form-item>
                   </a-col>
 
                   <a-col :md="6" :sm="8">
                     <a-form-item label="辅料金额合计">
-                      <a-input v-model="totalInfo.accessoriesAmount"></a-input>
+                      <a-input v-model="sumInfo.ingAmount"></a-input>
                     </a-form-item>
                   </a-col>
 
                   <a-col :md="6" :sm="8">
                     <a-form-item label="辅料不含税金额合计">
-                      <a-input v-model="totalInfo.accessoriesExcludTax"></a-input>
+                      <a-input v-model="sumInfo.ingExcludAmount"></a-input>
                     </a-form-item>
                   </a-col>
 
                   <a-col :md="6" :sm="8">
                     <a-form-item label="出运美元外销总价">
-                      <a-input v-model="totalInfo.exportPriceUSD"></a-input>
+                      <a-input v-model="sumInfo.exportPriceUSD"></a-input>
                     </a-form-item>
                   </a-col>
 
                   <a-col :md="6" :sm="8">
                     <a-form-item label="出运加工费">
-                      <a-input v-model="totalInfo.shipProcesFees"></a-input>
+                      <a-input v-model="sumInfo.shipProcesFees"></a-input>
                     </a-form-item>
                   </a-col>
 
                   <a-col :md="6" :sm="8">
                     <a-form-item label="面料不含税金额合计">
-                      <a-input v-model="totalInfo.fabricExcludTax"></a-input>
+                      <a-input v-model="sumInfo.fabricExcludTax"></a-input>
                     </a-form-item>
                   </a-col>
 
                   <a-col :md="6" :sm="8">
                     <a-form-item label="出运人民币外销金额">
-                      <a-input v-model="totalInfo.exportedAmountRMB"></a-input>
+                      <a-input v-model="sumInfo.exportedAmountRMB"></a-input>
                     </a-form-item>
                   </a-col>
 
                   <a-col :md="6" :sm="8">
                     <a-form-item label="合计金额">
-                      <a-input v-model="totalInfo.amountTotal"></a-input>
+                      <a-input v-model="sumInfo.amountTotal"></a-input>
                     </a-form-item>
                   </a-col>
 
                   <a-col :md="6" :sm="8">
                     <a-form-item label="面料金额合计">
-                      <a-input v-model="totalInfo.fabricAmount"></a-input>
+                      <a-input v-model="sumInfo.fabricAmount"></a-input>
+                    </a-form-item>
+                  </a-col>
+                </a-form>
+              </div>
+            </a-row>
+          </div>
+        </div>
+      </a-tab-pane>
+
+      <a-tab-pane key="2" tab="加工单位2">
+        <div>
+          <h6 class="table-title">面料</h6>
+          <a-table
+            rowKey="(item)=>item.id"
+            :loading="loading"
+            :columns="fabColumns"
+            :data-source="fabData"
+            bordered
+            :pagination="false"
+            :scroll="{ x: 1500, y: 300 }"
+          >
+            <!-- 面料 -转入数量 弹框-->
+            <span slot="fabInQuaSlot" slot-scope="text">
+              <a>{{ text }}</a>
+            </span>
+
+            <!-- 余下数量-->
+            <span slot="fabRemaQuaSlot" slot-scope="text">
+              <a>{{ text }}</a>
+            </span>
+          </a-table>
+        </div>
+
+        <!-- tabs 辅料   -->
+        <div style="margin:30px 0">
+          <h6 class="table-title">辅料</h6>
+          <a-table
+            rowKey="id"
+            :loading="loading"
+            :columns="ingColumns"
+            :data-source="ingData"
+            bordered
+            :pagination="false"
+            :scroll="{ x: 1000, y: 300 }"
+          >
+            <!--辅料-转入数量 弹框-->
+            <span slot="ingInQuaSlot" slot-scope="text">
+              <a>{{ text }}</a>
+            </span>
+            <!--辅料-余下数量 弹框-->
+            <span slot="ingRemQuaSlot" slot-scope="text">
+              <a>{{ text }}</a>
+            </span>
+          </a-table>
+        </div>
+
+        <!-- tabs 发运明细   :scroll="{ x: 1500 }"-->
+        <div>
+          <h6 class="table-title">发运明细</h6>
+          <a-table
+            rowKey="id"
+            :loading="loading"
+            :columns="shipColumns"
+            :data-source="shipData"
+            bordered
+            :pagination="false"
+            :scroll="{ x: 1000, y: 300 }"
+          >
+          </a-table>
+        </div>
+
+        <!-- tabs 合计 信息 -->
+        <div style="marginTop:30px;">
+          <h6 class="table-title">合计信息</h6>
+          <div style="border: 1px solid #e8e8e8;padding: 20px 20px 0 20px;">
+            <a-row :gutter="24">
+              <div class="table-page-search-wrapper">
+                <a-form layout="inline">
+                  <a-col :md="6" :sm="8">
+                    <a-form-item label="出货数量合计">
+                      <a-input v-model="sumInfo.shipQua"></a-input>
+                    </a-form-item>
+                  </a-col>
+
+                  <a-col :md="6" :sm="8">
+                    <a-form-item label="辅料金额合计">
+                      <a-input v-model="sumInfo.ingAmount"></a-input>
+                    </a-form-item>
+                  </a-col>
+
+                  <a-col :md="6" :sm="8">
+                    <a-form-item label="辅料不含税金额合计">
+                      <a-input v-model="sumInfo.ingExcludAmount"></a-input>
+                    </a-form-item>
+                  </a-col>
+
+                  <a-col :md="6" :sm="8">
+                    <a-form-item label="出运美元外销总价">
+                      <a-input v-model="sumInfo.exportPriceUSD"></a-input>
+                    </a-form-item>
+                  </a-col>
+
+                  <a-col :md="6" :sm="8">
+                    <a-form-item label="出运加工费">
+                      <a-input v-model="sumInfo.shipProcesFees"></a-input>
+                    </a-form-item>
+                  </a-col>
+
+                  <a-col :md="6" :sm="8">
+                    <a-form-item label="面料不含税金额合计">
+                      <a-input v-model="sumInfo.fabricExcludTax"></a-input>
+                    </a-form-item>
+                  </a-col>
+
+                  <a-col :md="6" :sm="8">
+                    <a-form-item label="出运人民币外销金额">
+                      <a-input v-model="sumInfo.exportedAmountRMB"></a-input>
+                    </a-form-item>
+                  </a-col>
+
+                  <a-col :md="6" :sm="8">
+                    <a-form-item label="合计金额">
+                      <a-input v-model="sumInfo.amountTotal"></a-input>
+                    </a-form-item>
+                  </a-col>
+
+                  <a-col :md="6" :sm="8">
+                    <a-form-item label="面料金额合计">
+                      <a-input v-model="sumInfo.fabricAmount"></a-input>
                     </a-form-item>
                   </a-col>
                 </a-form>
@@ -160,7 +289,7 @@ import ingInQuaModal from '@views/cost-allocation-total/modal/ingInQuaModal.vue'
 import ingRemQuaModal from '@views/cost-allocation-total/modal/ingRemQuaModal.vue'
 
 export default {
-  name: 'UnitTabs', //  成本分配汇总 详情tabs （单证）
+  name: 'UnitTabs', //  Tabs 详情
   mixins: [JeecgListMixin],
   components: {
     JEllipsis,
@@ -171,14 +300,13 @@ export default {
     ingRemQuaModal // 余下数量
   },
   data() {
-    // let ellipsis = (v, l = 20) => <j-ellipsis value={v} length={l} /> // 省略
+    // let ellipsis = (v, l = 20) => <j-ellipsis value={v} length={l} />
     return {
-      totalInfo: {}, // tabs 中合计信息
-      // one 面料 表头
+      // 面料
       fabColumns: [
         {
           title: '序号',
-          width: 50,
+          width: 90,
           dataIndex: 'index',
           key: 'index',
           customRender: (text, record, index) => `${index + 1}`,
@@ -231,7 +359,7 @@ export default {
         }
       ],
       fabData: [],
-      // one 辅料 表头
+      // 辅料
       ingColumns: [
         {
           title: '序号',
@@ -304,7 +432,7 @@ export default {
           className: 'replacecolor'
         },
         {
-          title: '进项税转出', 
+          title: '进项税转出',
           dataIndex: 'inputtaxTransferout',
           width: 160,
           className: 'replacecolor'
@@ -317,7 +445,7 @@ export default {
         }
       ],
       ingData: [],
-      // one 发运明细 表头
+      // 发运明细
       shipColumns: [
         {
           title: '序号',
@@ -354,14 +482,12 @@ export default {
           dataIndex: 'shipQuantity',
           width: 120,
           className: 'replacecolor'
-          // customCell: this.ingredientsRemainingQuantityCustomCell,
-          // scopedSlots: { customRender: 'fabricremainingQuantity' }
         },
         {
           title: '外销单价',
-          dataIndex: 'loss',
+          dataIndex: 'exportUnitPrice',
           width: 120,
-          className: 'exportUnitPrice'
+          className: 'replacecolor'
         },
         {
           title: '外销总价',
@@ -371,19 +497,19 @@ export default {
         },
         {
           title: '人民币金额',
-          dataIndex: 'RMBAmount',
+          dataIndex: 'rmbAmount',
           width: 160,
           className: 'replacecolor'
         },
         {
           title: '加工单价（人民币）',
-          dataIndex: 'procesUnitPriceRMB',
+          dataIndex: 'procesUnitPricermb',
           width: 160,
           className: 'replacecolor'
         },
         {
           title: '加工单价（美元）',
-          dataIndex: 'procesUnitPriceUSD',
+          dataIndex: 'procesUnitPriceusd',
           width: 160,
           className: 'replacecolor'
         },
@@ -394,13 +520,18 @@ export default {
           className: 'replacecolor'
         }
       ],
-      shipData: []
+      shipData: [],
+      sumInfo: {} //合计对象
     }
   },
   created() {
     // 渲染订单销售列表
   },
   methods: {
+      getSum(){
+
+      },
+
     tabsCallback(key) {
       console.log(key)
     },
@@ -455,6 +586,11 @@ export default {
     aa() {},
     bb() {},
     cc() {}
+  },
+
+  computed: {
+    // 合计数据
+    // sumInfoSource() {}
   }
 }
 </script>
@@ -486,4 +622,7 @@ export default {
 /deep/ .ant-tabs-nav .ant-tabs-tab {
   font-size: 18px;
 }
+/deep/ .ant-tabs-nav .ant-tabs-tab {
+  padding: 0 0 10px 0;
+}
 </style>