QuKatie пре 3 година
родитељ
комит
6fc0cc8354
2 измењених фајлова са 9 додато и 107 уклоњено
  1. 4 4
      src/components/price-Library/main.vue
  2. 5 103
      src/views/statisticAnalysis/payment/index.vue

+ 4 - 4
src/components/price-Library/main.vue

@@ -13,12 +13,11 @@
     >
       <span>
         <el-row>
-          <el-col :span="4" >
+          <el-col :span="4">
             <avue-tree
               :option="treeOption"
               :data="treeData"
               @node-click="nodeClick"
-              :style="treeStyle"
               style="height:74vh"
             />
           </el-col>
@@ -73,6 +72,7 @@ import _ from "lodash";
 export default {
   data() {
     return {
+      treeForm:{},
       treeOption: {
         addBtn: false,
         menu: false,
@@ -128,8 +128,8 @@ export default {
       return "padding:0;height:40px;";
     },
     nodeClick(data) {
-      this.search.goodsTypeName=data.cname
-      this.getList(this.page,this.search);
+      this.search.goodsTypeName = data.cname;
+      this.getList(this.page, this.search);
     },
     importData() {
       if (this.partreData) {

+ 5 - 103
src/views/statisticAnalysis/payment/index.vue

@@ -18,7 +18,6 @@
         :summary-method="summaryMethod"
         @saveColumn="saveColumn"
         @resetColumn="resetColumn"
-        @expand-change="expandChange"
         @search-criteria-switch="searchCriteriaSwitch"
       >
         <template slot="menuLeft">
@@ -26,19 +25,6 @@
             >导出</el-button
           >
         </template>
-        <template slot-scope="{ row }" slot="expand">
-          <avue-crud
-            :data="row.itemData"
-            :option="itemOption"
-            :table-loading="row.itemLoading"
-            :cell-style="cellStyle"
-            class="itemTable"
-          >
-            <template slot-scope="{ row }" slot="amount">
-              <span>{{ row.amount | decimalFormat }}</span>
-            </template>
-          </avue-crud>
-        </template>
         <template slot="corpIdSearch">
           <crop-select v-model="search.corpId" corpType="KH"></crop-select>
         </template>
@@ -124,14 +110,13 @@ export default {
         showSummary: true,
         searchIcon: true,
         searchIndex: 2,
-        expand: true,
-        expandWidth: 55,
         menu: false,
         column: [
           {
             label: "订单号",
             prop: "billType",
             type: "select",
+            width: 100,
             search: true
           },
           {
@@ -139,6 +124,8 @@ export default {
             prop: "businesDate",
             overHidden: true,
             width: 100,
+            hide: true,
+            showColumn: false,
             search: true
           },
           {
@@ -155,6 +142,8 @@ export default {
             label: "收费类别",
             prop: "orderNo",
             overHidden: true,
+            hide: true,
+            showColumn: false,
             search: true,
             width: 100
           },
@@ -219,79 +208,6 @@ export default {
             width: 100
           }
         ]
-      },
-      itemOption: {
-        align: "center",
-        header: false,
-        menu: false,
-        column: [
-          {
-            label: "产品类别",
-            prop: "priceCategory",
-            width: 100,
-            overHidden: true
-          },
-          {
-            label: "产品名称",
-            prop: "cname",
-            width: 100,
-            overHidden: true
-          },
-          {
-            label: "产品成本",
-            prop: "purchaseAmount",
-            width: 100,
-            overHidden: true
-          },
-          {
-            label: "原始成本",
-            prop: "purchaseCost",
-            width: 100,
-            overHidden: true
-          },
-          {
-            label: "配件成本",
-            prop: "partsPrice",
-            width: 100,
-            overHidden: true
-          },
-          {
-            label: "原始成本",
-            prop: "partsCost",
-            width: 100,
-            overHidden: true
-          },
-          {
-            label: "销售价",
-            prop: "price",
-            width: 100,
-            overHidden: true
-          },
-          {
-            label: "汇率",
-            prop: "exchangeRate",
-            width: 100,
-            overHidden: true
-          },
-          {
-            label: "销售金额",
-            prop: "amount",
-            width: 100,
-            overHidden: true
-          },
-          {
-            label: "产品毛利",
-            prop: "productGrossMargin",
-            width: 100,
-            overHidden: true
-          },
-          {
-            label: "产品毛利率 ",
-            prop: "itemMargin",
-            width: 100,
-            overHidden: true
-          }
-        ]
       }
     };
   },
@@ -304,17 +220,6 @@ export default {
     cellStyle() {
       return "padding:0;height:40px;";
     },
-    // expandChange(row) {
-    //   if (!row.itemData) {
-    //     getProfitItem({ id: row.id })
-    //       .then(res => {
-    //         this.dataList[row.$index].itemData = res.data.data;
-    //       })
-    //       .finally(() => {
-    //         this.dataList[row.$index].itemLoading = false;
-    //       });
-    //   }
-    // },
     searchCriteriaSwitch(type) {
       if (type) {
         this.option.height = this.option.height - 46;
@@ -439,9 +344,6 @@ export default {
 .page-crad ::v-deep .basic-container__card {
   height: 94.2vh;
 }
-::v-deep .el-table__expanded-cell[class*="cell"] {
-  padding: 0px;
-}
 .itemTable ::v-deep .el-table {
   width: 100%;
 }