报表 - 成本分配表 页面接口完善

src/api/reportForms/cost-allocation-table.js

@@ -2,6 +2,7 @@
 
 import { getAction, postAction, deleteAction } from '@/api/manage'
 
-const queryByPlanNum = params => getAction('/cost/syCostAllocation/queryByPlanNum', params)
+// 搜索订单号
+const costList = params => getAction('/cost/syCostAllocation/list', params)
 
-export { queryByPlanNum }
+export { costList }

src/views/reportForms/cost-allocation-table.vue

@@ -1,195 +1,152 @@
 <template>
-  <!-- 成本分配表 （保存后数据到单证的成本分配汇总内）-->
+  <!--报表 成本分配表 （保存后数据到单证的成本分配汇总内）-->
   <div id="costAllocationTable">
     <a-card :bordered="false">
       <!-- 主表信息 点击搜索后 回显--->
       <div class="table-page-search-wrapper">
-        <a-form-model layout="inline" ref="form" :model="costAllocationTable">
+        <!-- ref="form" :model="costAllocationTable" -->
+        <a-form-model layout="inline">
           <a-row :gutter="24">
             <a-col :md="6" :sm="8">
-              <a-form-model-item label="计划单号" prop="planNum">
-                <!-- <a-input placeholder="请输入计划单号" v-model="costAllocationTable.planNum"></a-input> -->
-                <a-input-search
-                  placeholder="请输入计划单号"
-                  enter-button
-                  v-model="costAllocationTable.planNum"
-                  @search="onSearch"
-                />
+              <a-form-model-item label="计划单号" prop="plannum">
+                <a-input-search placeholder="请输入计划单号" enter-button v-model="key" @search="onSearch" />
               </a-form-model-item>
             </a-col>
-            <!-- 输入【计划单号】点击搜索后，回显以下所有信息，【备注】需要输入，后进行保存 disabled -->
+            <!-- 回显以下【备注】需要输入，后进行保存 disabled -->
+
             <a-col :md="6" :sm="8">
               <a-form-model-item label="产品款号" prop="poStyleNum">
-                产品款号AZ2445
-                <!-- <a-input v-model="costAllocationTable.poStyleNum" disabled></a-input> -->
+                {{ detailsPlanNum.poStyleNum }}
               </a-form-model-item>
             </a-col>
-
             <a-col :md="6" :sm="8">
               <a-form-model-item label="外销员" prop="exportSales">
-                <a-input v-model="costAllocationTable.exportSales"></a-input>
+                {{ detailsPlanNum.exportSales }}
               </a-form-model-item>
             </a-col>
-
             <a-col :md="6" :sm="8">
-              <a-form-model-item label="成衣合同号" prop="garmentContractNo">
-                <a-input v-model="costAllocationTable.garmentContractNo"></a-input>
+              <a-form-model-item label="成衣合同号" prop="garmentContractno">
+                {{ detailsPlanNum.garmentContractno }}
               </a-form-model-item>
             </a-col>
-
             <a-col :md="6" :sm="8">
               <a-form-model-item label="部门" prop="department">
-                <a-input v-model="costAllocationTable.department"></a-input>
+                {{ detailsPlanNum.department }}
               </a-form-model-item>
             </a-col>
-
             <a-col :md="6" :sm="8">
-              <a-form-model-item label="客户简称" prop="customerShortName">
-                <a-input v-model="costAllocationTable.customerShortName"></a-input>
+              <a-form-model-item label="客户简称" prop="customerShortame">
+                {{ detailsPlanNum.customerShortame }}
               </a-form-model-item>
             </a-col>
-
             <a-col :md="6" :sm="8">
               <a-form-model-item label="加工单位" prop="processUnit">
-                <a-input v-model="costAllocationTable.processUnit"></a-input>
+                {{ detailsPlanNum.processUnit }}
               </a-form-model-item>
             </a-col>
-
             <a-col :md="6" :sm="8">
-              <a-form-model-item label="出运日期" prop="outData">
-                <a-date-picker
-                  style="width: 100%"
-                  :format="dateFormat"
-                  v-model="costAllocationTable.outData"
-                ></a-date-picker>
+              <a-form-model-item label="出运日期" prop="outdata">
+                {{ detailsPlanNum.outdata }}
               </a-form-model-item>
             </a-col>
-
             <a-col :md="6" :sm="8">
               <a-form-model-item label="计划数量" prop="planQuantity">
-                <a-input v-model="costAllocationTable.planQuantity"></a-input>
+                {{ detailsPlanNum.planQuantity }}
               </a-form-model-item>
             </a-col>
-
             <a-col :md="6" :sm="8">
-              <a-form-model-item label="美元外销总价" prop="USDTotalExportPrice">
-                <a-input v-model="costAllocationTable.USDTotalExportPrice"></a-input>
+              <a-form-model-item label="美元外销总价" prop="usdTotalexportprice">
+                {{ detailsPlanNum.usdTotalexportprice }}
               </a-form-model-item>
             </a-col>
-
             <a-col :md="6" :sm="8">
-              <a-form-model-item label="人民币费用支出" prop="RMBExpense">
-                <a-input
-                  v-model="costAllocationTable.RMBExpense"
-                  style="color:#027db4;"
-                  @click="mainTableExpenseCNY"
-                ></a-input>
+              <a-form-model-item label="人民币费用支出" prop="rmbExpense">
+                {{ detailsPlanNum.rmbExpense }}
               </a-form-model-item>
             </a-col>
-
             <a-col :md="6" :sm="8">
-              <a-form-model-item label="税率%" prop="taxRate">
-                <a-input v-model="costAllocationTable.taxRate"></a-input>
+              <a-form-model-item label="税率%" prop="taxrate">
+                {{ detailsPlanNum.taxrate }}
               </a-form-model-item>
             </a-col>
-
             <a-col :md="6" :sm="8">
-              <a-form-model-item label="实际出货数量" prop="actualShipQuantity">
-                <a-input v-model="costAllocationTable.actualShipQuantity"></a-input>
+              <a-form-model-item label="实际出货数量" prop="actualShipquantity">
+                {{ detailsPlanNum.actualShipquantity }}
               </a-form-model-item>
             </a-col>
-
             <a-col :md="6" :sm="8">
-              <a-form-model-item label="人民币外销金额" prop="RMBExportAmount">
-                <a-input v-model="costAllocationTable.RMBExportAmount"></a-input>
+              <a-form-model-item label="人民币外销金额" prop="rmbExportamount">
+                {{ detailsPlanNum.rmbExportamount }}
               </a-form-model-item>
             </a-col>
-
             <a-col :md="6" :sm="8">
-              <a-form-model-item label="美元费用支出" prop="USDExpense">
-                <a-input
-                  v-model="costAllocationTable.USDExpense"
-                  style="color:#027db4;"
-                  @click="mainTableExpenseUSD"
-                ></a-input>
+              <a-form-model-item label="美元费用支出" prop="usdExpense">
+                {{ detailsPlanNum.usdExpense }}
               </a-form-model-item>
             </a-col>
-
             <a-col :md="6" :sm="8">
-              <a-form-model-item label="加工费" prop="processCost">
-                <a-input v-model="costAllocationTable.processCost"></a-input>
+              <a-form-model-item label="加工费" prop="rmbProcesscost">
+                {{ detailsPlanNum.rmbProcesscost }}
               </a-form-model-item>
             </a-col>
-
             <a-col :md="6" :sm="8">
-              <a-form-model-item label="短出数" prop="shortSeveral">
-                <a-input v-model="costAllocationTable.shortSeveral"></a-input>
+              <a-form-model-item label="短出数" prop="shortseveral">
+                {{ detailsPlanNum.shortseveral }}
               </a-form-model-item>
             </a-col>
-
             <a-col :md="6" :sm="8">
-              <a-form-model-item label="短出货值" prop="shortValue">
-                <a-input v-model="costAllocationTable.shortValue"></a-input>
+              <a-form-model-item label="短出货值" prop="shortvalue">
+                {{ detailsPlanNum.shortvalue }}
               </a-form-model-item>
             </a-col>
-
             <a-col :md="6" :sm="8">
-              <a-form-model-item label="短出面料成本" prop="fabricShortCost">
-                <a-input v-model="costAllocationTable.fabricShortCost"></a-input>
+              <a-form-model-item label="短出面料成本" prop="fabricshortcost">
+                {{ detailsPlanNum.fabricshortcost }}
               </a-form-model-item>
             </a-col>
-
             <a-col :md="6" :sm="8">
-              <a-form-model-item label="事故单美金金额" prop="accidentUSDAmount">
-                <a-input v-model="costAllocationTable.accidentUSDAmount"></a-input>
+              <a-form-model-item label="事故单美金金额" prop="accidentUsdamount">
+                {{ detailsPlanNum.accidentUsdamount }}
               </a-form-model-item>
             </a-col>
-
             <a-col :md="6" :sm="8">
-              <a-form-model-item label="面料含税成本" prop="fabricCostIncludesTax">
-                <a-input v-model="costAllocationTable.fabricCostIncludesTax"></a-input>
+              <a-form-model-item label="面料含税成本" prop="fabriccostIncludestax">
+                {{ detailsPlanNum.fabriccostIncludestax }}
               </a-form-model-item>
             </a-col>
-
             <a-col :md="6" :sm="8">
-              <a-form-model-item label="辅料含税成本" prop="excipienCostIncludesTax">
-                <a-input v-model="costAllocationTable.excipienCostIncludesTax"></a-input>
+              <a-form-model-item label="辅料含税成本" prop="excipiencostIncludestax">
+                {{ detailsPlanNum.excipiencostIncludestax }}
               </a-form-model-item>
             </a-col>
-
             <a-col :md="6" :sm="8">
-              <a-form-model-item label="销售订单本币总额" prop="salesOrdersLocalTotal">
-                <a-input v-model="costAllocationTable.salesOrdersLocalTotal"></a-input>
+              <a-form-model-item label="销售订单本币总额" prop="salesordersLocaltotal">
+                {{ detailsPlanNum.salesordersLocaltotal }}
               </a-form-model-item>
             </a-col>
-
             <a-col :md="6" :sm="8">
-              <a-form-model-item label="事故单人民币金额" prop="accidentCNYAmount">
-                <a-input v-model="costAllocationTable.accidentCNYAmount"></a-input>
+              <a-form-model-item label="事故单人民币金额" prop="accidentcnyAmount">
+                {{ detailsPlanNum.accidentcnyAmount }}
               </a-form-model-item>
             </a-col>
-
             <a-col :md="6" :sm="8">
-              <a-form-model-item label="面料不含税成本" prop="fabricCostNotIncludesTax">
-                <a-input v-model="costAllocationTable.fabricCostNotIncludesTax"></a-input>
+              <a-form-model-item label="面料不含税成本" prop="fabriccostNotincludestax">
+                {{ detailsPlanNum.fabriccostNotincludestax }}
               </a-form-model-item>
             </a-col>
-
             <a-col :md="6" :sm="8">
-              <a-form-model-item label="辅料不含税成本" prop="excipienCostNotIncludesTax">
-                <a-input v-model="costAllocationTable.excipienCostNotIncludesTax"></a-input>
+              <a-form-model-item label="辅料不含税成本" prop="excipiencostNotincludestax">
+                {{ detailsPlanNum.excipiencostNotincludestax }}
               </a-form-model-item>
             </a-col>
-
             <a-col :md="6" :sm="8">
-              <a-form-model-item label="销售订单原币总额" prop="salesOrdersOriginalTotal">
-                <a-input v-model="costAllocationTable.salesOrdersOriginalTotal"></a-input>
+              <a-form-model-item label="销售订单原币总额" prop="salesrrdersOriginaltotal">
+                {{ detailsPlanNum.salesrrdersOriginaltotal }}
               </a-form-model-item>
             </a-col>
-
             <a-col :md="6" :sm="8">
               <a-form-model-item label="制单人" prop="preparedBy">
-                <a-input v-model="costAllocationTable.preparedBy"></a-input>
+                {{ detailsPlanNum.preparedBy }}
               </a-form-model-item>
             </a-col>
 
@@ -206,12 +163,12 @@
 
     <!--tabs 组件引入  -->
     <a-card :bordered="false" style=" marginTop:10px;">
-      <tabs />
+      <div><tabs ref="unitTabs" /></div>
     </a-card>
-    
+
     <!-- 事故单 -->
-    <a-card :bordered="false" style=" marginTop:10px;">
-      <div style="margin:40px 0">
+    <a-card :bordered="true" style="margin:10px 0">
+      <div style="margin:60px 0 40px 0">
         <h6 class="table-title">事故单</h6>
         <a-table
           rowKey="id"
@@ -220,6 +177,7 @@
           :data-source="accidentListData"
           bordered
           :pagination="false"
+          :scroll="{ y: 300 }"
         >
           <!-- 事故单 -->
           <span slot="accidentNum" slot-scope="text">
@@ -242,15 +200,15 @@
         </a-table>
       </div>
 
-      <!-- 备注信息 1 根据角色判断 显示备注 1 或备注 2-->
+      <!-- 备注信息 根据角色权限控制【填写】、【查看】-->
       <div class="note-one" style="marginTop:40px;">
-        <h6 class="table-title">备注信息 1</h6>
+        <h6 class="table-title">备注信息</h6>
         <div class="noteDetail">
-          <a-form-model ref="form" :model="costAllocationTable">
-            <a-form-model-item prop="noteOne">
+          <a-form-model ref="form" :model="detailsPlanNum">
+            <a-form-model-item prop="remarks">
               <a-input
                 type="textarea"
-                v-model="costAllocationTable.noteOne"
+                v-model="detailsPlanNum.remarks"
                 placeholder="请输入备注"
                 style="minHeight:100px;"
               />
@@ -285,12 +243,20 @@
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import JEllipsis from '@/components/jeecg/JEllipsis'
 import moment from 'moment'
+// import tabs from '@views/reportForms/cost-allocation-table/tabs.vue' // tabs组件
+// import mainTableExpenseCNYModal from '@views/reportForms/cost-allocation-table/mainTableExpenseCNYModal.vue'
+// import mainTableExpenseUSDModal from '@views/reportForms/cost-allocation-table/mainTableExpenseUSDModal.vue'
+// import accidentListModal from '@views/reportForms/fabric-loss-table/accidentListModal.vue' // 事故单
+
+// import tabs from '@views/cost-allocation-total/tabs.vue' // tabs组件
 import tabs from '@views/reportForms/cost-allocation-table/tabs.vue' // tabs组件
-import mainTableExpenseCNYModal from '@views/reportForms/cost-allocation-table/mainTableExpenseCNYModal.vue'
-import mainTableExpenseUSDModal from '@views/reportForms/cost-allocation-table/mainTableExpenseUSDModal.vue'
-import accidentListModal from '@views/reportForms/fabric-loss-table/accidentListModal.vue' // 事故单
 
-import { queryByPlanNum } from '@api/reportForms/cost-allocation-table.js'
+import mainTableExpenseCNYModal from '@views/cost-allocation-total/modal/mainTableExpenseCNYModal.vue'
+import mainTableExpenseUSDModal from '@views/cost-allocation-total/modal/mainTableExpenseUSDModal.vue'
+import accidentListModal from '@views/cost-allocation-total/modal/accidentListModal.vue' // 事故单
+
+import { costByPlanNum } from '@api/document/cost-allocation-total.js'
+//接口同 单证-成本汇总报表
 
 export default {
   name: 'CostAllocationTable', // 成本分配 (新增)
@@ -299,11 +265,10 @@ export default {
 
   data() {
     return {
+      key: '', //客户输入的订单号
       loading: false, // 表格加载
-      costAllocationTable: {}, // 成本分配统计
-      dateFormat: 'YYYY-MM-DD',
-      noteOne: '', // 备注 1
-      noteTwo: '', // 备注 2
+      detailsPlanNum: {}, // 详情所有数据
+      remarks: '', // 备注
 
       // 事故单 表头
       accidentListColumns: [
@@ -325,32 +290,50 @@ export default {
         { title: '账套号', width: 120, dataIndex: 'setNo', className: 'replacecolor' },
         { title: '支出单号', width: 120, dataIndex: 'disbursementSlipNo', className: 'replacecolor' },
         { title: '费用项目', dataIndex: 'expenseItem', width: 120, className: 'replacecolor' },
-        { title: ' 支出本币金额', dataIndex: 'disbursedLocalMoney', width: 120, className: 'replacecolor' },
-        { title: '支出原币金额', dataIndex: 'disbursedOriginalMoney', width: 120, className: 'replacecolor' },
-        { title: '发票号', dataIndex: 'invoiceNum', width: 120, className: 'replacecolor' },
+        { title: ' 支出本币金额', dataIndex: 'disbursedLocalmoney', width: 120, className: 'replacecolor' },
+        { title: '支出原币金额', dataIndex: 'disbursedOriginalmoney', width: 120, className: 'replacecolor' },
+        { title: '发票号', dataIndex: 'invoicenum', width: 120, className: 'replacecolor' },
         { title: '制单人', dataIndex: 'preparedBy', width: 120, className: 'replacecolor' }
       ],
       costPayData: [],
       visible: true // 成本分配  新增
+      // dateFormat: 'YYYY-MM-DD',
     }
   },
   created() {},
   methods: {
     // 【计划单号】 搜索
-    onSearch(value) {
-      console.log('【计划单号】 ', value)
+    onSearch() {
       this.$nextTick(() => {
-        console.log('0')
-        queryByPlanNum().then(res => {
-          console.log('11')
+        // console.log('客户输入的planNum', plannum, this.detailsPlanNum.planNum)
+        costByPlanNum({ plannum: this.key, type: 'query' }).then(res => {
           if (res.success) {
-            // this.shipmentListData = res.result.records
-            // console.log('发运明细列表', this.shipmentListData)
+            this.detailsPlanNum = res.result //所有详情
+            this.accidentListData = res.result.syCostAllocationAccidentList //事故单
+            this.costPayData = res.result.syCostAllocationCostpayList //支出费用
+
+            // tabs 名称集合
+            this.$refs.unitTabs.tabNameList = res.result.processUnit.split(',')
+
+            //所有tabs数据
+            this.$refs.unitTabs.tabsAllData = res.result.processUnitList
+
+            // 页面打开加载的数据
+            var oneData = this.$refs.unitTabs.tabsAllData[0]
+            this.$refs.unitTabs.fabData = oneData.syCostAllocationFabricList
+            this.$refs.unitTabs.ingData = oneData.syCostAllocationIngredientList
+            this.$refs.unitTabs.shipData = oneData.syCostAllocationShipdetailList
+
+            this.pagination = {
+              total: res.result.total,
+              current: res.result.current,
+              pageSize: res.result.size
+            }
           }
-          console.log('22')
         })
       })
     },
+
     //  主表：人民币费用支出  弹框
     mainTableExpenseCNY() {
       console.log('点击:主表人民币费用支出')
@@ -375,21 +358,22 @@ export default {
       }
     },
 
-    // --------------------------------------
+    onClose() {
+      this.visible = false
+    },
     // 页面 保存
     save() {
       console.log('保存该计划单号的备注、数据保存到单证【成本分配汇总】，覆盖该计划单号之前的信息')
-      const that = this
-      this.$refs.form.validate(valid => {
-        if (valid) {
-          //  alert('保存!')
-          console.log('备注信息:', this.costAllocationTable.noteOne, '计划单号:', this.costAllocationTable.planNum)
-          // that.$message.success(res.message)
-          that.$message.success('保存成功，数据添加到成本分配汇总')
-        } else {
-          this.$message.info('请选择计划单号、输入备注信息')
-        }
-      })
+      // const that = this
+
+      if (aaa) {
+        //  alert('保存!')
+        console.log('备注信息:', this.costAllocationTable.noteOne, '计划单号:', this.costAllocationTable.planNum)
+        // that.$message.success(res.message)
+        that.$message.success('保存成功，数据添加到成本分配汇总')
+      } else {
+        this.$message.info('请选择计划单号、输入备注信息')
+      }
     },
     // father 方法
     aa() {},

src/views/reportForms/cost-allocation-table/tabs.vue

@@ -1,6 +1,7 @@
 <template>
-  <!-- 成本分配统计表  中tabs 部分 -->
-  <div id="tabs">
+  <!-- 报表 - tabs  -->
+  <!--   default-active-key="1"-->
+  <div id="unitTabs">
     <a-tabs @change="tabsCallback" :default-active-key="activeKey">
       <a-tab-pane v-for="(item, index) in tabNameList" :key="index" :tab="item">
         <!-- tabs 面料 -->
@@ -133,23 +134,18 @@
       </a-tab-pane>
     </a-tabs>
 
-    <!-- tabs 弹框 -->
+    <!-- tabs内弹框 -->
     <div>
       <!-- 面料 转入数量 -->
-      <fabricTransferQuantity-modal ref="fabricTransferQuantityModal" :father="aa"></fabricTransferQuantity-modal>
-      <!-- 面料 余下数量 -->
-      <fabricRemainingQuantity-modal ref="fabricRemainingQuantityModal" :father="bb"></fabricRemainingQuantity-modal>
+      <fabInQua-modal ref="fabInQuaModal" :father="aa"></fabInQua-modal>
+
+      <!-- 余下数量 -->
+      <fabRemQua-modal ref="fabRemQuaModal" :father="bb"></fabRemQua-modal>
 
       <!-- 辅料 转入数量 -->
-      <ingredientsTransferQuantity-modal
-        ref="ingredientsTransferQuantityModal"
-        :father="cc"
-      ></ingredientsTransferQuantity-modal>
-      <!-- 辅料 余下数量 -->
-      <ingredientsRemainingQuantity-modal
-        ref="ingredientsRemainingQuantityModal"
-        :father="bb"
-      ></ingredientsRemainingQuantity-modal>
+      <ingInQua-modal ref="ingInQuaModal" :father="cc"></ingInQua-modal>
+      <!-- 余下数量 -->
+      <ingRemQua-modal ref="ingRemQuaModal" :father="bb"></ingRemQua-modal>
     </div>
   </div>
 </template>
@@ -159,26 +155,25 @@ import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import JEllipsis from '@/components/jeecg/JEllipsis'
 import moment from 'moment'
 
-import fabricTransferQuantityModal from '@views/reportForms/cost-allocation-table/fabricTransferQuantityModal.vue'
-import fabricRemainingQuantityModal from '@views/reportForms/cost-allocation-table/fabricRemainingQuantityModal.vue'
-import ingredientsTransferQuantityModal from '@views/reportForms/cost-allocation-table/ingredientsTransferQuantityModal.vue'
-import ingredientsRemainingQuantityModal from '@views/reportForms/cost-allocation-table/ingredientsRemainingQuantityModal.vue'
+import fabInQuaModal from '@views/cost-allocation-total/modal/fabInQuaModal.vue'
+import fabRemQuaModal from '@views/cost-allocation-total/modal/fabRemQuaModal.vue'
+import ingInQuaModal from '@views/cost-allocation-total/modal/ingInQuaModal.vue'
+import ingRemQuaModal from '@views/cost-allocation-total/modal/ingRemQuaModal.vue'
 
 export default {
-  name: 'Tabs', //  成本分配详情 中tabs 部分
+  name: 'UnitTabs', //  Tabs 详情
   mixins: [JeecgListMixin],
   components: {
     JEllipsis,
     moment,
-    fabricTransferQuantityModal, // 面料 转入数量
-    fabricRemainingQuantityModal, //  余下数量
-    ingredientsTransferQuantityModal, // 辅料 转入数量
-    ingredientsRemainingQuantityModal // 余下数量
+    fabInQuaModal, // 面料 转入数量
+    fabRemQuaModal, //  余下数量
+    ingInQuaModal, // 辅料 转入数量
+    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 中合计信息
       // 面料
       fabColumns: [
         {
@@ -398,126 +393,88 @@ export default {
           width: 160,
           className: 'replacecolor'
         }
-      ]
+      ],
+      shipData: [],
+      tabsAllData: [], //tabs所有数据集合
+      tabNameList: [], //tabs数组集合
+      activeKey: '0',
+      sumInfo: {} //合计对象
     }
   },
-  created() {
-    // 渲染订单销售列表
-  },
+  created() {},
   methods: {
-    // tbas
     tabsCallback(key) {
-      console.log(key)
+      this.activeKey = key
+      // console.log('点击的是', this.activeKey)
+      if (key == 0) {
+        var oneData = this.tabsAllData[0]
+        this.fabData = oneData.syCostAllocationFabricList
+        this.ingData = oneData.syCostAllocationIngredientList
+        this.shipData = oneData.syCostAllocationShipdetailList
+      }
+      if (key == 1) {
+        var twoData = this.tabsAllData[1]
+        this.fabData = twoData.syCostAllocationFabricList
+        this.ingData = twoData.syCostAllocationIngredientList
+        this.shipData = twoData.syCostAllocationShipdetailList
+      }
     },
-    // --------------------------------------------------------
+
     // 面料 -转入数量 弹框
-    fabricTransferQuantityCustomCell(record) {
+    fabQuaCustomCell(record) {
       return {
         on: {
           click: event => {
-            console.log('点击单元格-面料-转入数量')
-            this.$refs.fabricTransferQuantityModal.fabricTransferQuantityModVis = true
+            console.log('面料 - 转入数量')
+            this.$refs.fabInQuaModal.fabInQuaModVis = true
           }
         }
       }
     },
+
     // 面料 -余下数量 弹框
-    fabricRemainingQuantityCustomCell() {
+    fabRemQuaCustomCell(record) {
       return {
         on: {
           click: event => {
-            console.log('点击单元格-面料-余下数量')
-            this.$refs.fabricRemainingQuantityModal.fabricRemainingQuantityModVis = true
+            console.log('面料 - 余下数量')
+            this.$refs.fabRemQuaModal.fabRemQuaModVis = true
           }
         }
       }
     },
 
     // 辅料-转入数量 弹框
-    ingredientsTransferQuantityCustomCell() {
+    ingInQuaCustomCell(record) {
       return {
         on: {
           click: event => {
-            console.log('点击单元格-辅料-转入数量')
-            this.$refs.ingredientsTransferQuantityModal.ingredientsTransferQuantityModVis = true
+            console.log('辅料 - 转入数量')
+            this.$refs.ingInQuaModal.ingInQuaModVis = true
           }
         }
       }
     },
     // 辅料-余下数量 弹框
-    ingredientsRemainingQuantityCustomCell() {
+    ingRemQuaCustomCell(record) {
       return {
         on: {
           click: event => {
-            console.log('点击单元格-辅料-余下数量')
-            this.$refs.ingredientsRemainingQuantityModal.ingredientsRemainingQuantityModVis = true
-          }
-        }
-      }
-    },
-    // ---------------------------
-    //  加工单位2 面料 -转入数量 弹框
-    twoFabricTransferQuantityCustomCell() {
-      return {
-        on: {
-          click: event => {
-            console.log('点击单元格-加工单位2 面料-转入数量')
-            this.$refs.fabricTransferQuantityModal.fabricTransferQuantityModVis = true
+            console.log('辅料 - 余下数量')
+            this.$refs.ingRemQuaModal.ingRemQuaModVis = 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
-          }
-        }
-      }
-    },
-
-    // -弹框接收父组件方法---------------------------------------
     aa() {},
     bb() {},
     cc() {}
+  },
+
+  computed: {
+    // 合计数据
+    // sumInfoSource() {}
   }
 }
 </script>
@@ -538,7 +495,7 @@ export default {
 //   background-color: #ccc;
 // }
 
-//tabs内 小标签
+//tbas内 小标签
 .table-title {
   font-weight: 700;
 }
@@ -549,13 +506,7 @@ export default {
 /deep/ .ant-tabs-nav .ant-tabs-tab {
   font-size: 18px;
 }
-
-/deep/ .ant-tabs {
-  // border: 5px solid rgba(24, 144, 255,.5);
-  // padding: 10px;
-  // border-radius: 12px;
-}
-/deep/ .ant-card-body {
-  padding: 0 !important;
+/deep/ .ant-tabs-nav .ant-tabs-tab {
+  padding: 0 0 10px 0;
 }
 </style>

src/views/reportForms/order-statistics/external-statistics.vue

@@ -247,7 +247,7 @@ export default {
 
         //查询条件 传给 部门chart + 渲染
         this.$refs.departmentChart.prop = this.queryParam
-        console.log('prop', this.$refs.departmentChart.prop)
+        // console.log('prop', this.$refs.departmentChart.prop)
         // this.$refs.departmentChart.prop.vendorType = ''
         this.$refs.departmentChart.getDepChartData()
 
@@ -312,9 +312,7 @@ export default {
       this.queryParam.pageNo = pagination.current
       this.getExternalData()
     }
-  },
-  computed: {},
-  mounted() {}
+  }
 }
 </script>
 <style lang="less" scoped>

src/views/reportForms/order-statistics/interior-statistics.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 订单内部统计表-->
-  <div id="externalStatistics">
+  <div id="interiorStatistics">
     <!-- 查询区域 -->
     <a-card :bordered="false">
       <div class="table-page-search-wrapper">
@@ -104,7 +104,7 @@ import customerChart from '@views/reportForms/order-statistics/chart/external/cu
 import { externalList } from '@api/reportForms/order-statistics.js'
 
 export default {
-  name: 'ExternalStatistics', // 订单内部统计表
+  name: 'InteriorStatistics', // 订单内部统计表
   mixins: [JeecgListMixin],
   components: { JEllipsis, moment, departmentChart, customerChart },
 
@@ -249,7 +249,7 @@ export default {
         // this.$refs.departmentChart.queryParam.vendorType = ''
         this.$refs.departmentChart.getDepChartData()
 
-        console.log('部门chart是否外部', this.$refs.departmentChart.queryParam.vendorType)
+        // console.log('部门chart是否外部', this.$refs.departmentChart.queryParam.vendorType)
 
         //查询条件 传给 客户chart + 渲染
         this.$refs.customerChart.queryParam = this.queryParam
@@ -313,9 +313,7 @@ export default {
       this.queryParam.pageNo = pagination.current
       this.getExternalData()
     }
-  },
-  computed: {},
-  mounted() {}
+  }
 }
 </script>
 <style lang="less" scoped>