瀏覽代碼

修改bug

Qukatie 2 年之前
父節點
當前提交
2ff46dfcae

+ 26 - 0
src/api/basicData/rubberStock.js

@@ -0,0 +1,26 @@
+import request from '@/router/axios';
+
+export const getList = (current, size,data) => {
+  return request({
+    url: '/api/trade-purchase/purchase-order/rubberStock',
+    method: 'POST',
+    data: {
+      ...data,
+      current,
+      size,
+    }
+  })
+}
+
+export const getGoods = (current, size, goodsTypeId, params) => {
+    return request({
+      url: '/api/blade-client/goodsdesc/selectGoods',
+      method: 'get',
+      params: {
+        ...params,
+        current,
+        size,
+        goodsTypeId,
+      }
+    })
+  }

+ 2 - 1
src/components/part-library/main.vue

@@ -13,7 +13,7 @@
                 <crop-select v-model="search.corpId" gysType="CK" corpType="GYS"></crop-select>
               </template>
               <template slot="menuLeft">
-                <el-button type="primary" size="small" @click.stop="addRow" :disabled="selectionList.length==0">批量选择
+                <el-button type="primary" size="small" @click.stop="addRow" :disabled="selectionList.length==0">选定配件
                 </el-button>
               </template>
             </avue-crud>
@@ -107,6 +107,7 @@ export default {
         });
       });
       this.$refs.crud.toggleSelection();
+      this.importData()
     },
     rowDel(row, index) {
       this.$confirm("确定删除数据?", {

+ 1 - 1
src/views/basicData/customerInformation/detailsPageEdit.vue

@@ -1240,7 +1240,7 @@ export default {
           if (typeof this.form.corpsTypeId == "object") {
             this.form.corpsTypeId = this.form.corpsTypeId.join(",");
           }
-          if (typeof this.form.line == "object"){
+          if (this.form.line&&typeof this.form.line == "object"){
             this.form.line = this.form.line.join(",")
           }
           this.disabled = true;

+ 61 - 5
src/views/exportTrade/customerInquiry/detailsPage.vue

@@ -437,6 +437,13 @@ export default {
             prop: "belongToCorpId",
             span: 6,
             offset: 2,
+            rules: [
+              {
+                required: true,
+                message: "",
+                trigger: "blur"
+              }
+            ]
           },
           {
             label: "系统号",
@@ -544,12 +551,26 @@ export default {
               label: "dictValue",
               value: "dictValue"
             },
+            rules: [
+              {
+                required: true,
+                message: "",
+                trigger: "blur"
+              }
+            ],
             row: true
           },
           {
             label: "日期条款",
             prop: "dateClause",
             span: 6,
+            rules: [
+              {
+                required: true,
+                message: "",
+                trigger: "blur"
+              }
+            ]
           },
           {
             label: "日期说明",
@@ -567,12 +588,26 @@ export default {
             props: {
               label: "dictValue",
               value: "dictValue"
-            }
+            },
+            rules: [
+              {
+                required: true,
+                message: "",
+                trigger: "blur"
+              }
+            ]
           },
           {
             label: "价格条款",
             prop: "priceTerms",
-            span: 6
+            span: 6,
+            rules: [
+              {
+                required: true,
+                message: "",
+                trigger: "blur"
+              }
+            ]
             // type: "select",
             // dicData:[],
             // props: {
@@ -602,7 +637,14 @@ export default {
           {
             label: "收款方式",
             prop: "paymentType",
-            span: 6
+            span: 6,
+            rules: [
+              {
+                required: true,
+                message: "",
+                trigger: "blur"
+              }
+            ]
             // type: "select",
             // dicUrl: "/api/blade-system/dict-biz/dictionary?code=payment_term",
             // props: {
@@ -663,12 +705,26 @@ export default {
           {
             label: "箱型",
             prop: "boxPile",
-            span: 6
+            span: 6,
+            rules: [
+              {
+                required: true,
+                message: "",
+                trigger: "blur"
+              }
+            ]
           },
           {
             label: "箱量",
             prop: "boxNumber",
-            span: 6
+            span: 6,
+            rules: [
+              {
+                required: true,
+                message: "",
+                trigger: "blur"
+              }
+            ]
           },
           {
             label: "起订量",

+ 80 - 16
src/views/exportTrade/salesContract/detailsPage.vue

@@ -154,8 +154,8 @@
           </template>
         </avue-form>
       </trade-card>
-      <goods-info ref="goodsInfo" :form="form" :data="data" :detailData="detailData"
-        :orderFeesList.sync="orderFeesList" @formGoodstoFees="formGoodstoFees"></goods-info>
+      <goods-info ref="goodsInfo" :form="form" :data="data" :detailData="detailData" :orderFeesList.sync="orderFeesList"
+        @formGoodstoFees="formGoodstoFees"></goods-info>
       <!--  <trade-card title="商品信息">
         <avue-crud ref="crud" :data="data" :option="tableOption" @row-del="rowDel"
           @selection-change="goodsSelectionChange" @saveColumn="saveColumn" @resetColumn="resetColumn"
@@ -511,7 +511,14 @@ export default {
           label: "公司主体",
           prop: "belongToCorpId",
           offset: 2,
-          span: 6
+          span: 6,
+          rules: [
+            {
+              required: true,
+              message: "",
+              trigger: "blur"
+            }
+          ]
         },
         {
           label: "系统号",
@@ -533,7 +540,7 @@ export default {
           type: "date",
           format: "yyyy-MM-dd",
           valueFormat: "yyyy-MM-dd 00:00:00",
-          offset: 2,
+          offset: 2
         },
         {
           label: "销售订单号",
@@ -558,7 +565,14 @@ export default {
           format: "yyyy-MM-dd",
           valueFormat: "yyyy-MM-dd 00:00:00",
           row: true,
-          offset: 2
+          offset: 2,
+          rules: [
+            {
+              required: true,
+              message: "",
+              trigger: "blur"
+            }
+          ]
         },
         {
           label: "起运港",
@@ -604,17 +618,27 @@ export default {
             label: "dictValue",
             value: "dictValue"
           },
-          row: true
-        },
-        {
-          label: "价格条款",
-          prop: "priceTerms",
-          span: 6
+          row: true,
+          rules: [
+            {
+              required: true,
+              message: "",
+              trigger: "blur"
+            }
+          ]
         },
+
         {
           label: "日期条款",
           prop: "dateClause",
           span: 6,
+          rules: [
+            {
+              required: true,
+              message: "",
+              trigger: "blur"
+            }
+          ]
         },
         {
           label: "日期说明",
@@ -632,7 +656,26 @@ export default {
           props: {
             label: "dictValue",
             value: "dictValue"
-          }
+          },
+          rules: [
+            {
+              required: true,
+              message: "",
+              trigger: "blur"
+            }
+          ]
+        },
+        {
+          label: "价格条款",
+          prop: "priceTerms",
+          span: 6,
+          rules: [
+            {
+              required: true,
+              message: "",
+              trigger: "blur"
+            }
+          ]
         },
         {
           label: "条款说明",
@@ -655,7 +698,14 @@ export default {
         {
           label: "收款方式",
           prop: "paymentType",
-          span: 6
+          span: 6,
+          rules: [
+            {
+              required: true,
+              message: "",
+              trigger: "blur"
+            }
+          ]
           // type: "select",
           // dicUrl: "/api/blade-system/dict-biz/dictionary?code=payment_term",
           // props: {
@@ -720,12 +770,26 @@ export default {
             label: "dictValue",
             value: "dictValue"
           },
-          span: 6
+          span: 6,
+          rules: [
+            {
+              required: true,
+              message: "",
+              trigger: "blur"
+            }
+          ]
         },
         {
           label: "箱量",
           prop: "boxNumber",
-          span: 6
+          span: 6,
+          rules: [
+            {
+              required: true,
+              message: "",
+              trigger: "blur"
+            }
+          ]
         },
         {
           label: "起订量",
@@ -1034,7 +1098,7 @@ export default {
     cellStyle() {
       return "padding:0;height:40px;";
     },
-    formGoodstoFees(row){
+    formGoodstoFees(row) {
       this.$refs.feeInfo.imporData(row)
     },
     khEdit(staus) {

+ 0 - 2
src/views/financialManagement/incomeInvoice/incomeInvoiceDetailsPage.vue

@@ -96,8 +96,6 @@
               <el-option v-for="(item, index) in billingList" :key="index" :label="item.cname" :value="item.cname">
               </el-option>
             </el-select>
-            <crop-select v-model="form.invoiceTitle" :cropIndex="index"
-            @getCorpData="getCorpData" corpType="KG"></crop-select>
           </template>
         </avue-form>
       </basic-container>

+ 160 - 172
src/views/purchase/rubberStock/config/mainList.json

@@ -9,7 +9,7 @@
   "height": "auto",
   "searchMenuPosition": "right",
   "searchSpan": 8,
-  "searchMenuSpan": 8,
+  "searchMenuSpan":16,
   "tree": true,
   "selection": false,
   "addBtn": false,
@@ -33,177 +33,165 @@
   ],
   "column": [
     {
-      "label": "采购明细",
-      "children": [
-        {
-          "label": "供应商",
-          "prop": "contractNumber",
-          "overHidden": true,
-          "index": 1,
-          "width": 150
-        },
-        {
-          "label": "品种",
-          "overHidden": true,
-          "prop": "billNo",
-          "index": 2,
-          "width": 150
-        },
-        {
-          "label": "采购公司",
-          "prop": "surplusRouteQuantity",
-          "overHidden": true,
-          "index": 3,
-          "width": 120
-        },
-        {
-          "label": "交货时间",
-          "prop": "inQuantity",
-          "overHidden": true,
-          "index": 4,
-          "width": 120
-        },
-        {
-          "label": "发货重量",
-          "prop": "inWeight",
-          "overHidden": true,
-          "index": 5,
-          "width": 120
-        },
-        {
-          "label": "单价",
-          "prop": "outQuantity",
-          "overHidden": true,
-          "index": 6,
-          "width": 120
-        },
-        {
-          "label": "合同金额",
-          "prop": "outWeight",
-          "overHidden": true,
-          "index": 7,
-          "width": 120
-        },
-        {
-          "label": "付款情况",
-          "prop": "balanceQuantity",
-          "overHidden": true,
-          "index": 8,
-          "width": 120
-        }
-      ]
-    },
-    {
-      "label": "销售明细",
-      "children": [
-        {
-          "label": "合同号",
-          "prop": "balanceWeight",
-          "overHidden": true,
-          "index": 9,
-          "width": 120
-        },
-        {
-          "label": "销售公司",
-          "overHidden": true,
-          "index": 10,
-          "width": 220,
-          "prop": "cname"
-        },
-        {
-          "label": "客户名称",
-          "prop": "cntrNo",
-          "index": 11,
-          "overHidden": true,
-          "width": 120
-        },
-        {
-          "label": "合同单价",
-          "prop": "stockName",
-          "index": 12,
-          "overHidden": true,
-          "width": 120
-        },
-        {
-          "label": "数量MT",
-          "prop": "createTime",
-          "overHidden": true,
-          "index": 13,
-          "width": 150
-        },
-        {
-          "label": "合同金额",
-          "prop": "isCntrON",
-          "overHidden": true,
-          "index": 14
-        },
-        {
-          "label": "收款情况",
-          "prop": "isCntrON",
-          "overHidden": true,
-          "index": 15,
-          "width": 150
-        },
-        {
-          "label": "业务结束日期",
-          "prop": "isCntrON",
-          "overHidden": true,
-          "index": 16,
-          "width": 150
-        }
-      ]
-    },
-    {
-      "label": "货物明细",
-      "children": [
-        {
-          "label": "提单号",
-          "prop": "isCntrON",
-          "overHidden": true,
-          "index": 17,
-          "width": 150
-        },
-        {
-          "label": "物流费用",
-          "prop": "isCntrON",
-          "overHidden": true,
-          "index": 18,
-          "width": 150
-        },
-        {
-          "label": "交货仓库",
-          "prop": "isCntrON",
-          "overHidden": true,
-          "index": 19,
-          "width": 150
-        }
-      ]
-    },
-    {
-      "label": "财务明细",
-      "children": [
-        {
-          "label": "业务员",
-          "prop": "isCntrON",
-          "overHidden": true,
-          "index": 20,
-          "width": 150
-        },
-        {
-          "label": "含税毛利",
-          "prop": "isCntrON",
-          "overHidden": true,
-          "index": 21,
-          "width": 150
-        },
-        {
-          "label": "不含税毛利",
-          "prop": "isCntrON",
-          "overHidden": true,
-          "index": 22,
-          "width": 150
-        }
-      ]
+      "label": "供应商",
+      "prop": "corpIdC",
+      "overHidden": true,
+      "search": true,
+      "searchSpan": 8,
+      "index": 1,
+      "width": 150
+    },
+    {
+      "label": "品种",
+      "overHidden": true,
+      "prop": "itemIdC",
+      "search": true,
+      "searchSpan": 8,
+      "index": 2,
+      "width": 150
+    },
+    {
+      "label": "采购公司",
+      "prop": "belongToCorpIdC",
+      "overHidden": true,
+      "search": true,
+      "searchSpan": 8,
+      "index": 3,
+      "width": 120
+    },
+    {
+      "label": "交货时间",
+      "prop": "requiredArrivalDateC",
+      "overHidden": true,
+      "search": true,
+      "searchSpan": 8,
+      "index": 4,
+      "format": "yyyy-MM-dd",
+      "width": 120
+    },
+    {
+      "label": "发货重量",
+      "prop": "invoiceWeightC",
+      "overHidden": true,
+      "index": 5,
+      "width": 120
+    },
+    {
+      "label": "单价",
+      "prop": "priceC",
+      "overHidden": true,
+      "index": 6,
+      "width": 120
+    },
+    {
+      "label": "合同金额",
+      "prop": "amountC",
+      "overHidden": true,
+      "index": 7,
+      "width": 120
+    },
+    {
+      "label": "付款情况",
+      "prop": "balanceAmountC",
+      "overHidden": true,
+      "index": 8,
+      "width": 120
+    },
+    {
+      "label": "合同号",
+      "prop": "orderNoX",
+      "overHidden": true,
+      "search": true,
+      "searchSpan": 8,
+      "index": 9,
+      "width": 120
+    },
+    {
+      "label": "销售公司",
+      "overHidden": true,
+      "search": true,
+      "searchSpan": 8,
+      "index": 10,
+      "width": 220,
+      "prop": "belongToCorpIdX"
+    },
+    {
+      "label": "客户名称",
+      "prop": "corpIdX",
+      "search": true,
+      "searchSpan": 8,
+      "index": 11,
+      "overHidden": true,
+      "width": 120
+    },
+    {
+      "label": "合同单价",
+      "prop": "priceX",
+      "index": 12,
+      "overHidden": true,
+      "width": 120
+    },
+    {
+      "label": "数量MT",
+      "prop": "orderQuantityX",
+      "overHidden": true,
+      "index": 13,
+      "width": 150
+    },
+    {
+      "label": "合同金额",
+      "prop": "amountX",
+      "overHidden": true,
+      "index": 14
+    },
+    {
+      "label": "收款情况",
+      "prop": "balanceAmountX",
+      "overHidden": true,
+      "index": 15,
+      "width": 150
+    },
+    {
+      "label": "业务结束日期",
+      "prop": "plannedDeliveryDateX",
+      "overHidden": true,
+      "search": true,
+      "searchSpan": 8,
+      "index": 16,
+      "format": "yyyy-MM-dd",
+      "width": 150
+    },
+    {
+      "label": "提单号",
+      "prop": "billNoX",
+      "overHidden": true,
+      "search": true,
+      "searchSpan": 8,
+      "index": 17,
+      "width": 150
+    },
+    {
+      "label": "业务员",
+      "prop": "salesName",
+      "overHidden": true,
+      "search": true,
+      "searchSpan": 8,
+      "index": 20,
+      "width": 150
+    },
+    {
+      "label": "含税毛利",
+      "prop": "profit",
+      "overHidden": true,
+      "index": 21,
+      "width": 150
+    },
+    {
+      "label": "不含税毛利",
+      "prop": "NoProfit",
+      "overHidden": true,
+      "index": 22,
+      "width": 150
     }
   ]
 }

+ 199 - 161
src/views/purchase/rubberStock/index.vue

@@ -1,184 +1,222 @@
 <template>
   <basic-container>
-    <avue-crud :option="option"
-               :data="dataList"
-               ref="crud"
-               v-model="form"
-               :page.sync="page"
-               :search.sync="search"
-               :table-loading="loading"
-               :cell-style="cellStyle"
-               @search-change="searchChange"
-               @search-reset="searchReset"
-               @selection-change="selectionChange"
-               @current-change="currentChange"
-               @size-change="sizeChange"
-               @refresh-change="refreshChange"
-               @saveColumn="saveColumn"
-               @resetColumn="resetColumn"
-               @search-criteria-switch="searchCriteriaSwitch"
-               @on-load="onLoad">
-      <template slot-scope="scope" slot="surplusRouteQuantity">
-        <span>{{ scope.row.surplusRouteQuantity | roundNumbers}}</span>
+    <avue-crud :option="option" :data="dataList" ref="crud" v-model="form" :page.sync="page" :search.sync="search"
+      :table-loading="loading" :cell-style="cellStyle" @search-change="searchChange" @search-reset="searchReset"
+      @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
+      @refresh-change="refreshChange" @saveColumn="saveColumn" @resetColumn="resetColumn"
+      @search-criteria-switch="searchCriteriaSwitch" @on-load="onLoad">
+      <template slot="corpIdCSearch">
+        <crop-select v-model="search.corpIdC" corpType="GYS"></crop-select>
       </template>
-      <template slot-scope="scope" slot="inQuantity">
-        <span>{{ scope.row.inQuantity | roundNumbers}}</span>
+      <template slot-scope="{ row }"  slot="corpIdC">
+        <span>
+          {{row.corpNameC}}
+        </span>
       </template>
-      <template slot-scope="scope" slot="outQuantity">
-        <span>{{ scope.row.outQuantity | roundNumbers}}</span>
+      <template slot="corpIdXSearch">
+        <crop-select v-model="search.corpIdX" corpType="KH"></crop-select>
       </template>
-      <template slot-scope="scope" slot="balanceQuantity">
-        <span>{{ scope.row.balanceQuantity | roundNumbers}}</span>
+      <template slot-scope="{ row }"  slot="corpIdX">
+        <span>
+          {{row.corpNameX}}
+        </span>
+      </template>
+      <template slot="itemIdCSearch">
+        <el-select v-model="search.itemIdC" placeholder="请选择" size="small">
+          <el-option v-for="item in goodsoptions" :key="item.id" :label="item.cname" :value="item.id">
+          </el-option>
+        </el-select>
+      </template>
+      <template slot-scope="{ row }"  slot="itemIdC">
+        <span>
+          {{row.itemNameC}}
+        </span>
+      </template>
+      <template slot-scope="{ row }"  slot="belongToCorpIdC">
+        <span>
+          {{row.belongToCorpNameC}}
+        </span>
+      </template>
+      <template slot="belongToCorpIdCSearch">
+        <crop-select v-model="search.belongToCorpIdC" corpType="GS"></crop-select>
+      </template>
+      <template slot="requiredArrivalDateCSearch">
+        <el-date-picker v-model="search.requiredArrivalDateC" type="daterange" start-placeholder="开始日期"
+          end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd HH:mm:ss"
+          :default-time="['00:00:00', '23:59:59']">
+        </el-date-picker>
+      </template>
+      <template slot="belongToCorpIdXSearch">
+        <crop-select v-model="search.belongToCorpIdX" corpType="GS"></crop-select>
+      </template>
+      <template slot="plannedDeliveryDateXSearch">
+        <el-date-picker v-model="search.plannedDeliveryDateX" type="daterange" start-placeholder="开始日期"
+          end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd HH:mm:ss"
+          :default-time="['00:00:00', '23:59:59']">
+        </el-date-picker>
+      </template>
+      <template slot="salesNameSearch">
+        <user-com v-model="search.salesName"></user-com>
       </template>
     </avue-crud>
   </basic-container>
 </template>
 
 <script>
-  import option from "./config/mainList.json";
-  import {customerList} from "@/api/basicData/inventoryAccount"
-  import { roundNumbers } from "@/util/validate";
+import option from "./config/mainList.json";
+import { getList, getGoods } from "@/api/basicData/rubberStock"
+import { roundNumbers } from "@/util/validate";
 
-  export default {
-    data() {
-      return {
-        loading : false,
-        form: {},
-        search:{},
-        show:true,
-        detailData:{},
-        option: {},
-        parentId:0,
-        dataList: [],
-        page: {
-          currentPage: 1,
-          total: 0,
-          pageSize: 10,
-          pageSizes: [10, 50, 100, 200, 300, 400, 500,1000]
-        },
-        query:{},
+export default {
+  data() {
+    return {
+      loading: false,
+      form: {},
+      search: {},
+      show: true,
+      detailData: {},
+      option: {},
+      parentId: 0,
+      dataList: [],
+      page: {
+        currentPage: 1,
+        total: 0,
+        pageSize: 10,
+        pageSizes: [10, 50, 100, 200, 300, 400, 500, 1000]
+      },
+      query: {},
+      goodsoptions: [],
+    }
+  },
+  filters: {
+    roundNumbers(val) {
+      return roundNumbers(val);
+    }
+  },
+  async created() {
+    this.option = await this.getColumnData(this.getColumnName(187), option);
+    getGoods(1, 10).then(res => {
+      if (res.data.data.total > 0) {
+        this.goodsoptions = res.data.data.records;
+        if (Math.ceil(res.data.data.total / 10) > 1) {
+          for (let i = 2; i <= Math.ceil(res.data.data.total / 10); i++) {
+            getGoods(i, 10).then(e => {
+              this.goodsoptions = this.goodsoptions.concat(e.data.data.records);
+            });
+          }
+        }
       }
+    });
+  },
+  mounted() {
+  },
+  methods: {
+    //新单打开
+    addReceipt(row) {
+
+    },
+    //编辑打开
+    editOpen(row, status) {
+
     },
-    filters: {
-      roundNumbers(val){
-        return roundNumbers(val);
+    rowDel(row, index, done) {
+      if (row.id) {
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+
+        });
       }
     },
-    async created() {
-      this.option = await this.getColumnData(this.getColumnName(187), option);
+    //点击搜索按钮触发
+    searchChange(params, done) {
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done()
     },
-    mounted() {
+    searchReset() {
     },
-    methods: {
-      //新单打开
-      addReceipt(row){
-
-      },
-      //编辑打开
-      editOpen(row, status){
-
-      },
-      rowDel(row, index, done) {
-        if(row.id){
-          this.$confirm("确定将选择数据删除?", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          }).then(() => {
-
-          });
-        }
-      },
-      //点击搜索按钮触发
-      searchChange(params, done) {
-        this.query = params;
-        this.page.currentPage = 1;
-        this.onLoad(this.page, params);
-        done()
-      },
-      searchReset() {
-        console.log('1')
-      },
-      selectionChange() {
-        console.log('1')
-      },
-      sizeChange(val) {
-        this.page.currentPage = 1;
-        this.page.pageSize = val;
-      },
-      currentChange(val) {
-        this.page.currentPage = val;
-        this.onLoad(this.page);
-      },
-      refreshChange() {
-        this.onLoad(this.page);
-      },
-      paramsAdjustment(params) {
-        params = Object.assign({}, this.search);
-        if (params.createTime &&  params.createTime.length !==0 ) {   //付款
-          params.createStartTime = params.createTime[0]+ " " + "00:00:00";
-          params.createEndTime = params.createTime[1] + " " + "23:59:59";
-          this.$delete(params,'createTime')
-        }
-        if(!params.isCntrON){
-          params.isCntrON = 1
-        }
-        return params
-      },
-
-      onLoad(page, params = {}) {
-        this.loading = true;
-        params =  this.paramsAdjustment(params)
-        params.current = page.currentPage
-        params.size = page.pageSize
-
-        customerList(params).then(res=>{
-          this.dataList = res.data.data.records
-          this.page.total = res.data.data.total
-          if (this.page.total || this.page.total === 0) {
-            this.option.height = window.innerHeight - 240;
-          }
-        }).finally(()=>{
-          this.loading = false;
+    selectionChange() {
+    },
+    currentChange(val) {
+      this.page.currentPage = val;
+    },
+    sizeChange(val) {
+      this.page.currentPage = 1;
+      this.page.pageSize = val;
+    },
+    refreshChange() {
+      this.onLoad(this.page);
+    },
+    onLoad(page, params = {}) {
+      if (this.search.requiredArrivalDateC && this.search.requiredArrivalDateC.length > 0) {
+        params = {
+          ...params,
+          requiredArrivalDateStartC: this.search.requiredArrivalDateC[0],
+          requiredArrivalDateEndC: this.search.requiredArrivalDateC[1]
+        };
+      }
+      if (this.search.plannedDeliveryDateX && this.search.plannedDeliveryDateX.length > 0) {
+        params = {
+          ...params,
+          plannedDeliveryDateStartX: this.search.plannedDeliveryDateX[0],
+          plannedDeliveryDateEndX: this.search.plannedDeliveryDateX[1]
+        };
+      }
+      let data = this.deepClone(Object.assign(params));
+      delete data.requiredArrivalDateC;
+      delete data.plannedDeliveryDateX;
+      // delete data.createTime;
+      this.loading = true;
+      getList(page.currentPage, page.pageSize, data)
+        .then(res => {
+          this.dataList = res.data.data.records ? res.data.data.records : [];
+          this.page.total = res.data.data.total;
         })
-      },
-      searchCriteriaSwitch(type){
-        if (type){
-          this.option.height = this.option.height - 45
-        }else {
-          this.option.height = this.option.height + 45
-        }
-        this.$refs.crud.getTableHeight()
-      },
-      cellStyle() {
-        return "padding:0;height:40px;";
-      },
-      //列保存触发
-      async saveColumn() {
-        const inSave = await this.saveColumnData(
-          this.getColumnName(187),
-          this.option
-        );
-        if (inSave) {
-          this.$message.success("保存成功");
-          //关闭窗口
-          this.$refs.crud.$refs.dialogColumn.columnBox = false;
-        }
-      },
-      async resetColumn() {
-        const inSave = await this.delColumnData(
-          this.getColumnName(187),
-          option
-        );
-        if (inSave) {
-          this.$message.success("重置成功");
-          this.option = option;
-          //关闭窗口
-          this.$refs.crud.$refs.dialogColumn.columnBox = false;
-        }
-      },
-    }
+        .finally(() => {
+          this.loading = false;
+        });
+    },
+    searchCriteriaSwitch(type) {
+      if (type) {
+        this.option.height = this.option.height - 138
+      } else {
+        this.option.height = this.option.height + 138
+      }
+      this.$refs.crud.getTableHeight()
+    },
+    cellStyle() {
+      return "padding:0;height:40px;";
+    },
+    //列保存触发
+    async saveColumn() {
+      const inSave = await this.saveColumnData(
+        this.getColumnName(187),
+        this.option
+      );
+      if (inSave) {
+        this.$message.success("保存成功");
+        //关闭窗口
+        this.$refs.crud.$refs.dialogColumn.columnBox = false;
+      }
+    },
+    async resetColumn() {
+      const inSave = await this.delColumnData(
+        this.getColumnName(187),
+        option
+      );
+      if (inSave) {
+        this.$message.success("重置成功");
+        this.option = option;
+        //关闭窗口
+        this.$refs.crud.$refs.dialogColumn.columnBox = false;
+      }
+    },
   }
+}
 </script>
 
 <style scoped>

+ 28 - 0
src/views/statisticAnalysis/profit/config/mainList.json

@@ -261,6 +261,20 @@
       "label": "经营分析",
       "children": [
         {
+          "label": "是否开票",
+          "prop": "isInvoicing",
+          "overHidden": true,
+          "width": 120,
+          "index": 18
+        },
+        {
+          "label": "开票日期",
+          "prop": "invoicingDate",
+          "overHidden": true,
+          "width": 120,
+          "index": 18
+        },
+        {
           "label": "开票单位",
           "prop": "vbrk",
           "overHidden": true,
@@ -282,6 +296,20 @@
           "overHidden": true
         },
         {
+          "label": "保证金金额",
+          "prop": "bondAmount",
+          "width": 120,
+          "index": 21,
+          "overHidden": true
+        },
+        {
+          "label": "收款日期",
+          "prop": "collectionDate",
+          "width": 120,
+          "index": 21,
+          "overHidden": true
+        },
+        {
           "label": "成本单价",
           "prop": "unitPrice",
           "width": 120,