报表-订单统计

src/api/reportForms/order-statistics.js

@@ -5,9 +5,9 @@ import { getAction, postAction, deleteAction } from '@/api/manage'
 const externalList = params => getAction('/report/soSoDetails/getSO_SOMainReport', params)
 
 // 外部 部门 统计图
-// const depChart = params => getAction('/report/soSoDetails/getSO_SOMainReport', params)
+const depChart = params => getAction('/report/soSoDetails/QuerySO_SOMainReportBycustomer', params)
 
 // 外部 客户 统计图
-// const cusChart= params => getAction('/report/soSoDetails/getSO_SOMainReport', params)
+const cusChart= params => getAction('/report/soSoDetails/QuerySO_SOMainReportBydepartment', params)
 
 export { externalList }

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

@@ -405,7 +405,7 @@ export default {
   methods: {
     tabsCallback(key) {
       this.activeKey = key
-      console.log('点击的是', this.activeKey)
+      // console.log('点击的是', this.activeKey)
       if (key == 0) {
         var oneData = this.tabsAllData[0]
         this.fabData = oneData.syCostAllocationFabricList

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

@@ -203,10 +203,14 @@
         </a-form-model>
       </div>
     </a-card>
+
     <!--tabs 组件引入  -->
     <a-card :bordered="false" style=" marginTop:10px;">
       <tabs />
-      <!-- 事故单 -->
+    </a-card>
+    
+    <!-- 事故单 -->
+    <a-card :bordered="false" style=" marginTop:10px;">
       <div style="margin:40px 0">
         <h6 class="table-title">事故单</h6>
         <a-table
@@ -255,22 +259,6 @@
         </div>
       </div>
 
-      <!-- 备注信息 2 根据角色判断 显示备注 1 或备注 2-->
-      <!-- <div class="note-one" style="marginTop:40px;">
-        <h6 class="table-title">备注信息 2</h6>
-        <div class="noteDetail">
-          <a-form-model ref="form" :model="costAllocationTable" >
-            <a-form-model-item prop="noteOne">
-              <a-input
-                type="textarea"
-                v-model="costAllocationTable.noteTwo"
-                placeholder="请输入备注"
-                style="minHeight:100px;"
-              />
-            </a-form-model-item>
-          </a-form-model>
-        </div>
-      </div> -->
       <!-- 页面底部保存 -->
       <a-row :gutter="24" style="marginTop:40px;float:right">
         <a-col :md="12" :sm="12">
@@ -330,7 +318,8 @@ export default {
         { title: '事故承担方', width: 120, dataIndex: 'accidentUndertaker', className: 'replacecolor' },
         { title: '金额', dataIndex: 'amount', width: 120, className: 'replacecolor' }
       ],
-      accidentListData: [{ accidentNum: '1100011' }, {}],
+      accidentListData: [],
+
       // 费用支出 表头
       costPayColumns: [
         { title: '账套号', width: 120, dataIndex: 'setNo', className: 'replacecolor' },
@@ -341,7 +330,7 @@ export default {
         { title: '发票号', dataIndex: 'invoiceNum', width: 120, className: 'replacecolor' },
         { title: '制单人', dataIndex: 'preparedBy', width: 120, className: 'replacecolor' }
       ],
-      costPayData: [{}],
+      costPayData: [],
       visible: true // 成本分配  新增
     }
   },

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

@@ -1,50 +1,50 @@
 <template>
   <!-- 成本分配统计表  中tabs 部分 -->
   <div id="tabs">
-    <a-tabs default-active-key="1" @change="tabsCallback">
-      <a-tab-pane key="1" tab="加工单位1">
+    <a-tabs @change="tabsCallback" :default-active-key="activeKey">
+      <a-tab-pane v-for="(item, index) in tabNameList" :key="index" :tab="item">
         <!-- tabs 面料 -->
         <div>
           <h6 class="table-title">面料</h6>
           <a-table
             rowKey="(item)=>item.id"
             :loading="loading"
-            :columns="fabricColumns"
-            :data-source="fabricData"
+            :columns="fabColumns"
+            :data-source="fabData"
             bordered
-            :scroll="{ x: 1000 }"
             :pagination="false"
+            :scroll="{ x: 1500, y: 300 }"
           >
             <!-- 面料 -转入数量 弹框-->
-            <span slot="fabricTransferQuantity" slot-scope="text">
+            <span slot="fabInQuaSlot" slot-scope="text">
               <a>{{ text }}</a>
             </span>
 
             <!-- 余下数量-->
-            <span slot="fabricRemainingQuantity" slot-scope="text">
+            <span slot="fabRemaQuaSlot" slot-scope="text">
               <a>{{ text }}</a>
             </span>
           </a-table>
         </div>
 
-        <!-- tabs 辅料   :scroll="{ x: 1500 }"-->
+        <!-- tabs 辅料   -->
         <div style="margin:30px 0">
           <h6 class="table-title">辅料</h6>
           <a-table
             rowKey="id"
             :loading="loading"
-            :columns="ingredientsColumns"
-            :data-source="ingredientsData"
+            :columns="ingColumns"
+            :data-source="ingData"
             bordered
-            :scroll="{ x: 1000 }"
             :pagination="false"
+            :scroll="{ x: 1000, y: 300 }"
           >
             <!--辅料-转入数量 弹框-->
-            <span slot="ingredientsTransferQuantity" slot-scope="text">
+            <span slot="ingInQuaSlot" slot-scope="text">
               <a>{{ text }}</a>
             </span>
             <!--辅料-余下数量 弹框-->
-            <span slot="ingredientsRemainingQuantity" slot-scope="text">
+            <span slot="ingRemQuaSlot" slot-scope="text">
               <a>{{ text }}</a>
             </span>
           </a-table>
@@ -56,11 +56,11 @@
           <a-table
             rowKey="id"
             :loading="loading"
-            :columns="shipDetailsColumns"
-            :data-source="shipDetailsData"
+            :columns="shipColumns"
+            :data-source="shipData"
             bordered
-            :scroll="{ x: 1000 }"
             :pagination="false"
+            :scroll="{ x: 1000, y: 300 }"
           >
           </a-table>
         </div>
@@ -74,194 +74,55 @@
                 <a-form layout="inline">
                   <a-col :md="6" :sm="8">
                     <a-form-item label="出货数量合计">
-                      52940
-                      <!-- <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="辅料金额合计">
-                      106010
-                      <!-- <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="辅料不含税金额合计">
-                      90151.26
-                      <!-- <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="出运美元外销总价">
-                      67541.9
-                      <!-- <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="出运加工费">
-                      79779.88
-                      <!-- <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="面料不含税金额合计">
-                      77470.69
-                      <!-- <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="出运人民币外销金额">
-                      178557.45
-                      <!-- <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="合计金额">
-                      2299583.26
-                      <!-- <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="面料金额合计">
-                      29413.13
-                      <!-- <a-input v-model="totalInfo.fabricAmount"></a-input> -->
-                    </a-form-item>
-                  </a-col>
-                </a-form>
-              </div>
-            </a-row>
-          </div>
-        </div>
-      </a-tab-pane>
-
-      <!-- 加工单位 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="twofabricRemainingQuantity" 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="twoingredientsTransferQuantity" slot-scope="text">
-              <a>{{ text }}</a>
-            </span>
-            <!--辅料-余下数量 弹框-->
-            <span slot="twoingredientsRemainingQuantity" 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-input v-model="sumInfo.fabricAmount"></a-input>
                     </a-form-item>
                   </a-col>
                 </a-form>
@@ -317,18 +178,12 @@ export default {
   data() {
     // let ellipsis = (v, l = 20) => <j-ellipsis value={v} length={l} /> // 省略
     return {
-      description: '成本分配统计表',
       totalInfo: {}, // tabs 中合计信息
-      // one 面料 表头
-      fabricColumns: [
-        /*
-          text     序号一列默认显示的数据
-          record   一行的所有数据
-          index    tbale表格数据的下标，即数组的下标
-        */
+      // 面料
+      fabColumns: [
         {
           title: '序号',
-          width: 50,
+          width: 90,
           dataIndex: 'index',
           key: 'index',
           customRender: (text, record, index) => `${index + 1}`,
@@ -337,11 +192,11 @@ export default {
         { title: '货物名称', width: 160, dataIndex: 'goodsName', className: 'replacecolor' },
         {
           title: '转入数量',
-          dataIndex: 'fabricTransferQuantity',
+          dataIndex: 'fabrictransferQuantity',
           width: 120,
           className: 'replacecolor',
-          customCell: this.fabricTransferQuantityCustomCell,
-          scopedSlots: { customRender: 'fabricTransferQuantity' }
+          customCell: this.fabQuaCustomCell,
+          scopedSlots: { customRender: 'fabInQuaSlot' }
         },
         {
           title: '转入成本',
@@ -361,11 +216,11 @@ export default {
         },
         {
           title: '余下数量',
-          dataIndex: 'fabricRemainingQuantity',
+          dataIndex: 'fabricremainingQuantity',
           width: 100,
           className: 'replacecolor',
-          customCell: this.fabricRemainingQuantityCustomCell,
-          scopedSlots: { customRender: 'fabricRemainingQuantity' }
+          customCell: this.fabRemQuaCustomCell,
+          scopedSlots: { customRender: 'fabRemaQuaSlot' }
         },
         {
           title: '损耗',
@@ -375,17 +230,15 @@ export default {
         },
         {
           title: '余下数量的成本',
-          dataIndex: 'remainingQuantityCost',
+          dataIndex: 'remainingQuantitycost',
           width: 120,
           className: 'replacecolor'
         }
       ],
-      fabricData: [
-        { fabricTransferQuantity: '8987', fabricRemainingQuantity: '67', loss: '1.17%' },
-        { fabricTransferQuantity: '6752', fabricRemainingQuantity: '37', loss: '1.17%' }
-      ],
-      // one 辅料 表头
-      ingredientsColumns: [
+      fabData: [],
+
+      // 辅料
+      ingColumns: [
         {
           title: '序号',
           width: 90,
@@ -401,8 +254,8 @@ export default {
           dataIndex: 'ingredientsTransferQuantity',
           width: 120,
           className: 'replacecolor',
-          customCell: this.ingredientsTransferQuantityCustomCell,
-          scopedSlots: { customRender: 'ingredientsTransferQuantity' }
+          customCell: this.ingInQuaCustomCell,
+          scopedSlots: { customRender: 'ingInQuaSlot' }
         },
         {
           title: '转入成本',
@@ -423,8 +276,8 @@ export default {
           dataIndex: 'ingredientsRemainingQuantity',
           width: 140,
           className: 'replacecolor',
-          customCell: this.ingredientsRemainingQuantityCustomCell,
-          scopedSlots: { customRender: 'ingredientsRemainingQuantity' }
+          customCell: this.ingRemQuaCustomCell,
+          scopedSlots: { customRender: 'ingRemQuaSlot' }
         },
         {
           title: '损耗',
@@ -434,31 +287,31 @@ export default {
         },
         {
           title: '人民币金额',
-          dataIndex: 'RMBAmount',
+          dataIndex: 'rmbAmount',
           width: 160,
           className: 'replacecolor'
         },
         {
           title: '美元金额',
-          dataIndex: 'USDAmount',
+          dataIndex: 'usdAmount',
           width: 160,
           className: 'replacecolor'
         },
         {
           title: '不含税金额',
-          dataIndex: 'priceExcludingTax',
+          dataIndex: 'priceExcludingtax',
           width: 120,
           className: 'replacecolor'
         },
         {
           title: '转出率',
-          dataIndex: 'transferOutRate',
+          dataIndex: 'transferOutrate',
           width: 120,
           className: 'replacecolor'
         },
         {
           title: '进项税转出',
-          dataIndex: 'inputTaxTransferOut',
+          dataIndex: 'inputtaxTransferout',
           width: 160,
           className: 'replacecolor'
         },
@@ -469,258 +322,10 @@ export default {
           className: 'replacecolor'
         }
       ],
-      ingredientsData: [
-        { ingredientsTransferQuantity: '7899', transferCost: '12536', ingredientsRemainingQuantity: '6698' }
-      ],
-      // one 发运明细 表头
-      shipDetailsColumns: [
-        {
-          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: 'ingredientsTransferQuantity' }
-        },
-        {
-          title: '汇率',
-          dataIndex: 'exchangeRate',
-          width: 120,
-          className: 'replacecolor'
-        },
+      ingData: [],
 
-        { 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: 'ingredientsRemainingQuantity' }
-        },
-        {
-          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'
-        }
-      ],
-      shipDetailsData: [{ invoiceNum: '19TW-PRU-138S', outData: '2019-10-16', exchangeRate: '7.1338' }],
-      // 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: 'twofabricTransferQuantity',
-          width: 120,
-          className: 'replacecolor',
-          customCell: this.twoFabricTransferQuantityCustomCell,
-          scopedSlots: { customRender: 'twofabricTransferQuantity' }
-        },
-        { 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: [
-        {
-          fabric: '裤绳',
-          inventoryName: 'XXSS',
-          twofabricTransferQuantity: '8987',
-          twofabricRemainingQuantity: '67',
-          loss: '1.17%'
-        },
-        {
-          fabric: '裤绳',
-          inventoryName: 'XXSS',
-          twofabricTransferQuantity: '6752',
-          twofabricRemainingQuantity: '37',
-          loss: '1.17%'
-        }
-      ],
-      // 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: 'twoingredientsTransferQuantity',
-          width: 120,
-          className: 'replacecolor',
-          customCell: this.twoingredientsTransferQuantityCustomCell,
-          scopedSlots: { customRender: 'twoingredientsTransferQuantity' }
-        },
-        {
-          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: [
-        {
-          twoingredientsTransferQuantity: '7899',
-          transferCost: '12536',
-          twoingredientsRemainingQuantity: '6698'
-        }
-      ],
-      // two 发运明细 表头
-      twoshipDetailsColumns: [
+      // 发运明细
+      shipColumns: [
         {
           title: '序号',
           width: 90,
@@ -735,9 +340,7 @@ export default {
           title: '出运日期',
           dataIndex: 'outData',
           width: 130,
-          className: 'replacecolor',
-          customCell: this.ingredientsTransferQuantityCustomCell,
-          scopedSlots: { customRender: 'ingredientsTransferQuantity' }
+          className: 'replacecolor'
         },
         {
           title: '汇率',
@@ -757,15 +360,13 @@ export default {
           title: '出货数量',
           dataIndex: 'shipQuantity',
           width: 120,
-          className: 'replacecolor',
-          customCell: this.ingredientsRemainingQuantityCustomCell,
-          scopedSlots: { customRender: 'ingredientsRemainingQuantity' }
+          className: 'replacecolor'
         },
         {
           title: '外销单价',
-          dataIndex: 'loss',
+          dataIndex: 'exportUnitPrice',
           width: 120,
-          className: 'exportUnitPrice'
+          className: 'replacecolor'
         },
         {
           title: '外销总价',
@@ -775,19 +376,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'
         },
@@ -797,9 +398,6 @@ export default {
           width: 160,
           className: 'replacecolor'
         }
-      ],
-      twoshipDetailsData: [
-        { invoiceNum: '19TW-PRU-138S', outData: '2019-11-16', exchangeRate: '7.1338', RMBAmount: '160689.83' }
       ]
     }
   },
@@ -953,9 +551,9 @@ export default {
 }
 
 /deep/ .ant-tabs {
-  border: 5px solid rgba(24, 144, 255,.5);
-  padding: 10px;
-  border-radius: 12px;
+  // border: 5px solid rgba(24, 144, 255,.5);
+  // padding: 10px;
+  // border-radius: 12px;
 }
 /deep/ .ant-card-body {
   padding: 0 !important;

src/views/reportForms/dye-loss-table.vue

@@ -68,7 +68,7 @@
       <div>
         <a-table
           bordered
-          rowKey="id"
+          rowKey="index"
           v-if="dyeLossRateData"
           :columns="dyeLossRateColumns"
           :data-source="dyeLossRateData"
@@ -118,6 +118,14 @@ export default {
     return {
       // 表头
       dyeLossRateColumns: [
+        {
+          title: '序号',
+          width: 90,
+          dataIndex: 'index',
+          key: 'index',
+          customRender: (text, record, index) => `${index + 1}`,
+          className: 'replacecolor'
+        },
         {
           title: '物料编码',
           width: 100,
@@ -192,7 +200,6 @@ export default {
     getdyeLossList() {
       this.$nextTick(() => {
         dyeLossList(this.queryParam).then(res => {
-          // if(this.queryParam) {}
           if (res.success) {
             this.dyeLossRateData = res.result.records
             this.pagination = {

src/views/reportForms/dye-loss-table/allLossChart.vue

@@ -39,7 +39,7 @@ export default {
         //2、执行chart
         this.$nextTick(() => {
           this.initEcharts()
-          // console.log('111')
+       
         })
       })
     },

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

@@ -6,43 +6,52 @@
 <script>
 import * as echarts from 'echarts'
 
-// import { depChart } from '@api/reportForms/order-statistics.js'
+import { depChart } from '@api/reportForms/order-statistics.js'
 
 export default {
-  name: 'CustomerChart', // 客户统计图
+  name: 'CustomerChart', // 部门统计图
   data() {
     return {
+      queryParam: {
+        vendorType: '外部',
+        pageNo: '',
+        startYearMonth: '',
+        endYearMonth: '',
+        department: '',
+        customer: ''
+      },
       // newData: {
-      // departmentArr: [],//部门 数组
-      //realQuantityArr: [],//实际金额
-      // localMoneyArr: []//本币金额
-      // }
+      departmentArr: [], //部门 数组
+      realQuantityArr: [], //实际数量
+      localMoneyArr: [] //本币金额
     }
   },
+  // },
 
   mounted() {
-    // this.getDepChartData()
-    this.initEcharts()
+    this.getDepChartData()
+    // this.initEcharts()
   },
   methods: {
     // 1、先获取 chart 数据
     getDepChartData() {
-      // depChart().then(res => {
-      //   if (res.success) {
-      //     if (res.result) {
-      //       res.result.forEach(item => {
-      //         this.departmentArr.push(item.departmentArr)
-      //         this.realQuantityArr.push(item.realQuantityArr)
-      //         this.localMoneyArr.push(item.localMoneyArr)
-      //       })
-      //       console.log('返回的数组', this.departmentArr, this.realQuantityArr, this.localMoneyArr)
-      //     }
-      //   }
-      //   //2、后图
-      //   this.$nextTick(() => {
-      //     this.initEcharts()
-      //   })
-      // })
+      depChart(this.queryParam).then(res => {
+        if (res.result) {
+          console.log('');
+          res.result.records.forEach(item => {
+            this.departmentArr.push(item.departmentArr)
+            this.realQuantityArr.push(item.realQuantityArr)
+            this.localMoneyArr.push(item.localMoneyArr)
+          })
+          console.log('三数组', this.departmentArr, this.realQuantityArr, this.localMoneyArr)
+        }
+
+        //2、后图
+        this.$nextTick(() => {
+          this.initEcharts()
+          console.log('111')
+        })
+      })
     },
 
     initEcharts() {
@@ -82,7 +91,7 @@ export default {
           left: '6%', // 组件离容器左侧的距离。
           right: '6%',
           borderColor: 'none', //网格的边框颜色
-          bottom: '20%' 
+          bottom: '20%'
         },
 
         xAxis: {
@@ -141,7 +150,7 @@ export default {
             },
             barWidth: '30%',
             data: [5635464, 4230466, 7498980, 6546765, 9222342, 1655143, 5055143]
-            // data: this.dyeLossRateArr
+            // data: this.realQuantityArr
           },
           {
             name: '本币金额',
@@ -152,6 +161,7 @@ export default {
               // }
             },
             data: [7237455, 5158676, 7864656, 6744645, 9543645, 4446511, 6564992]
+            // data: this.localMoneyArr
           }
         ]
       }

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

@@ -16,13 +16,14 @@
                   :value="value"
                   @panelChange="handlePanelChange"
                   @change="monthChange"
+                  required
                 />
               </a-form-item>
             </a-col>
 
             <a-col :md="6" :sm="8">
               <a-form-item label="部门">
-                <a-input placeholder="请输入部门" v-model="queryParam.department"></a-input>
+                <a-input placeholder="请输入部门" v-model="queryParam.department" required></a-input>
                 <!-- <a-select placeholder="请选择部门" v-model="queryParam.">
                   <a-select-option :value="''">请选择</a-select-option>
                   <a-select-option :value="0">业务一部</a-select-option>
@@ -74,11 +75,12 @@
       </div>
     </a-card>
 
-    <!-- table rowKey="id" :scroll="{ x: 1500 }"        v-if="data"-->
+    <!-- table :scroll="{ x: 1500 }"        v-if="data"-->
     <a-card :bordered="false" style="marginTop:10px;">
       <a-table
+        v-if="extStadata"
         bordered
-        :row-key="record => record.id"
+        rowKey="index"
         :columns="extStaColumns"
         :data-source="extStadata"
         :loading="loading"
@@ -110,16 +112,24 @@ export default {
     return {
       description: '订单外部统计表',
       extStaColumns: [
+        {
+          title: '序号',
+          width: 90,
+          dataIndex: 'index',
+          key: 'index',
+          customRender: (text, record, index) => `${index + 1}`,
+          className: 'replacecolor'
+        },
         {
           title: '部门',
           width: 140,
-          dataIndex: 'cDepName',
+          dataIndex: 'cdepName',
           className: 'replacecolor'
         },
         {
           title: '供应商分类',
           width: 120,
-          dataIndex: 'cCusCode',
+          dataIndex: 'ccusCode',
           className: 'replacecolor'
           // customRender: function(text) {
           //   if (text == '1') {
@@ -139,7 +149,7 @@ export default {
         {
           title: '供应商',
           width: 140,
-          dataIndex: 'cVenAbbName',
+          dataIndex: 'cvenAbbName',
           className: 'replacecolor'
         },
         {
@@ -151,14 +161,14 @@ export default {
           },
           className: 'replacecolor'
         },
-        { title: '含税单价', width: 120, dataIndex: 'iNatUnitPrice', className: 'replacecolor' },
+        { title: '含税单价', width: 120, dataIndex: 'inatUnitPrice', className: 'replacecolor' },
         {
           title: '实际数量',
           width: 120,
-          dataIndex: 'iQuantity',
+          dataIndex: 'iquantity',
           className: 'replacecolor'
         },
-        { title: '本币金额', width: 150, dataIndex: 'iNatMoney', className: 'replacecolor' }
+        { title: '本币金额', width: 150, dataIndex: 'inatMoney', className: 'replacecolor' }
       ],
       extStadata: [],
       loading: false, // 表格加载
@@ -166,10 +176,11 @@ export default {
       // 查询条件
       queryParam: {
         vendorType: '外部',
-        startYearMonth: '',
-        endYearMonth: '',
-        department: '',
-        customer: ''
+        pageNo: ''
+        // startYearMonth: '',
+        // endYearMonth: '',
+        // department: '',
+        // customer: ''
       },
 
       pagination: {
@@ -182,15 +193,28 @@ export default {
       // dateFormat: 'YYYY-MM-DD'
     }
   },
+
+  // html渲染出来后，操作dom
+  mounted() {
+    this.cancelLoading()
+  },
   created() {
-    this.getExternalData()
+    this.getExternalData() // 查询订单统计
   },
+
   methods: {
+    cancelLoading() {
+      setTimeout(() => {
+        this.loading = false
+      }, 500)
+    },
+
+    // 查询订单统计
     getExternalData() {
       this.$nextTick(() => {
         externalList(this.queryParam).then(res => {
           if (res.success) {
-            console.log('99');
+            console.log('99')
             this.extStadata = res.result.records
             console.log('订单外部列表', this.extStadata)
             this.pagination = {
@@ -202,6 +226,16 @@ export default {
         })
       })
     },
+
+    searchQuery() {
+      this.queryParam.pageNo = ''
+      if (this.queryParam) {
+        console.log('指定查询条件,渲染chart', this.queryParam)
+        this.$refs.departmentChart.queryParam = this.queryParam
+        this.$refs.departmentChart.getDepChartData()
+      }
+      this.getExternalData()
+    },
     // 日期面板变化时的回调
     handlePanelChange(value, mode) {
       this.value = value
@@ -217,10 +251,7 @@ export default {
       this.value = value
       // console.log('what------monthChange')
     },
-    searchQuery() {
-      this.queryParam.pageNo = ''
-      this.getExternalData()
-    },
+
     searchReset() {
       this.queryParam = {}
       this.value = [] //起始年月重置
@@ -228,7 +259,7 @@ export default {
     },
 
     handleTableChange(pagination, filters, sorter) {
-      // console.log('当前页信息>>>>',pagination)
+      console.log('当前页信息>>>>', pagination)
       this.queryParam.pageNo = pagination.current
       this.getExternalData()
     }

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

@@ -111,13 +111,13 @@ export default {
         {
           title: '部门',
           width: 140,
-          dataIndex: 'cDepName',
+          dataIndex: 'cdepName',
           className: 'replacecolor'
         },
         {
           title: '供应商分类',
           width: 120,
-          dataIndex: 'cCusCode',
+          dataIndex: 'ccusCode',
           className: 'replacecolor'
           // customRender: function(text) {
           //   if (text == '1') {
@@ -137,7 +137,7 @@ export default {
         {
           title: '供应商',
           width: 140,
-          dataIndex: 'cVenAbbName',
+          dataIndex: 'cvenAbbName',
           className: 'replacecolor'
         },
         {
@@ -149,16 +149,15 @@ export default {
           },
           className: 'replacecolor'
         },
-        { title: '含税单价', width: 120, dataIndex: 'iNatUnitPrice', className: 'replacecolor' },
+        { title: '含税单价', width: 120, dataIndex: 'inatUnitPrice', className: 'replacecolor' },
         {
           title: '实际数量',
           width: 120,
-          dataIndex: 'iQuantity',
+          dataIndex: 'iquantity',
           className: 'replacecolor'
         },
-        { title: '本币金额', width: 150, dataIndex: 'iNatMoney', className: 'replacecolor' }
+        { title: '本币金额', width: 150, dataIndex: 'inatMoney', className: 'replacecolor' }
       ],
-
       interiorData: [
         {
           department: '业务八部',

src/views/shipment-details/shipmentList.vue

@@ -109,7 +109,7 @@
 
         <!-- 操作 默认按钮  未提交未推送-->
         <span slot="operationSlot" slot-scope="text, record">
-          <a href="javascript:void(0);" @click="declareElements(record)" style="color:green">申报要素</a>
+          <a href="javascript:void(0);" @click="declareElements(record)" style="color:green">报关要素</a>
 
           <a-divider type="vertical" />
 

src/views/user/Login.vue

@@ -6,9 +6,9 @@
           <login-account ref="alogin" @validateFail="validateFail" @success="requestSuccess" @fail="requestFailed"></login-account>
         </a-tab-pane>
 
-        <a-tab-pane key="tab2" tab="手机号登录">
+        <!-- <a-tab-pane key="tab2" tab="手机号登录">
           <login-phone ref="plogin" @validateFail="validateFail" @success="requestSuccess" @fail="requestFailed"></login-phone>
-        </a-tab-pane>
+        </a-tab-pane> -->
       </a-tabs>
 
       <a-form-model-item>
@@ -29,8 +29,9 @@
     </a-form-model>
 
     <two-step-captcha v-if="requiredTwoStepCaptcha" :visible="stepCaptchaVisible" @success="stepCaptchaSuccess" @cancel="stepCaptchaCancel"></two-step-captcha>
-    <login-select-tenant ref="loginSelect" @success="loginSelectOk"></login-select-tenant>
-    <third-login ref="thirdLogin"></third-login>
+    
+    <!-- <login-select-tenant ref="loginSelect" @success="loginSelectOk"></login-select-tenant>
+    <third-login ref="thirdLogin"></third-login> -->
   </div>
 </template>