修改bug

src/components/bill/config/mainLists.json

@@ -53,7 +53,6 @@
       "label": "结算单位",
       "prop": "customerName",
       "overHidden": true,
-      "search": true,
       "index": 2
     },
     {
@@ -71,15 +70,30 @@
       "index": 7
     },
     {
-      "label": "日期",
+      "label": "账单日期",
+      "prop": "createTime",
+      "searchProp":"createTimeList",
+      "type": "date",
+      "search":true,
+      "searchRange": true,
+      "searchDefaultTime": ["00:00:00", "23:59:59"],
+      "format": "yyyy-MM-dd",
+      "valueFormat": "yyyy-MM-dd HH:mm:ss",
+      "overHidden": true,
+      "index": 14,
+      "width": 250
+    },
+    {
+      "label": "应结日期",
       "prop": "dueDate",
+      "searchProp":"dueDateList",
       "type": "date",
+      "search":true,
       "searchRange": true,
       "searchDefaultTime": ["00:00:00", "23:59:59"],
       "format": "yyyy-MM-dd",
       "valueFormat": "yyyy-MM-dd HH:mm:ss",
       "overHidden": true,
-      "search": false,
       "index": 14,
       "width": 250
     }

src/views/tirePartsMall/basicData/listingManagement/index.vue

@@ -672,6 +672,7 @@ export default {
     console.log(this.search);
     console.log(params);
     this.search.cname = params.cname
+    // params.sharedCompany = params.$sharedCompany
     params = {
       ...params,
       current: page.currentPage,

src/views/tirePartsMall/financialManagement/collectionSettlement/detailsPage.vue

@@ -7,12 +7,13 @@
         </el-button>
       </div>
       <div class="add-customer-btn">
-        <!--        <el-button class="el-button&#45;&#45;small-yh" style="margin-right: 10px" type="primary" size="small" v-if="!editButton"-->
-        <!--                   @click="confirmEditing">编辑-->
-        <!--        </el-button>-->
-        <el-button class="el-button--small-yh" type="primary" size="small" :disabled="form.financeStatus == '已收款' " @click="editCustomer">保存数据
+               <el-button class="el-button&#45;&#45;small-yh" style="margin-right: 10px" type="primary" size="small" v-if="!editButton"
+                          @click="confirmEditing">编辑
+               </el-button>
+        <el-button class="el-button--small-yh" type="primary" size="small" :disabled="form.financeStatus == '已收款' || isSaveBtn"
+          @click="editCustomer">保存数据
         </el-button>
-        <el-button class="el-button--small-yh" type="warning" size="small" @click="collection">{{ form.financeStatus ==
+        <el-button class="el-button--small-yh" type="warning" :disabled="isFinanceBtn"  size="small" @click="collection">{{ form.financeStatus ==
           '已收款' ? '撤销收款' : '收款' }}
         </el-button>
         <!-- <el-button class="el-button--small-yh" type="primary" size="small" v-if="form.id">启用
@@ -29,21 +30,22 @@
           @resetColumn="resetColumnTwo('formContacts', 'optionContacts', 'optionContactsBack', 267.1)"
           @saveColumn="saveColumnTwo('formContacts', 'optionContacts', 'optionContactsBack', 267.1)">
           <template slot-scope="scope" slot="menuLeft">
-            <el-button type="primary" icon="el-icon-plus" :disabled="form.financeStatus == '已收款' " size="small" @click="rowAdd()">选择订单</el-button>
+            <el-button type="primary" icon="el-icon-plus" :disabled="form.financeStatus == '已收款' || isMenu" size="small"
+              @click="rowAdd()">选择订单</el-button>
           </template>
           <template slot-scope="{type,size,row,index,disabled}" slot="menu">
-            <el-button :size="size" :disabled="form.financeStatus == '已收款' " :type="type" 
-              :icon="row.$cellEdit ? 'el-icon-plus' : 'el-icon-edit'"   @click="$refs.formContacts.rowCell(row, index)">{{
+            <el-button :size="size" :disabled="form.financeStatus == '已收款' || isMenu" :type="type"
+              :icon="row.$cellEdit ? 'el-icon-plus' : 'el-icon-edit'" @click="$refs.formContacts.rowCell(row, index)">{{
                 row.$cellEdit ? '确认' : '修改' }}
             </el-button>
-            <el-button icon="el-icon-delete" :size="size" :disabled="form.financeStatus == '已收款' " :type="type"
+            <el-button icon="el-icon-delete" :size="size" :disabled="form.financeStatus == '已收款' || isMenu" :type="type"
               @click="rowDelBox(row, index)">删除
             </el-button>
           </template>
         </avue-crud>
       </trade-card>
     </div>
-    <el-dialog title="导入销售" append-to-body class="el-dialogDeep" :visible.sync="billDetailDialog" width="80%"
+    <el-dialog title="导入订单" append-to-body class="el-dialogDeep" :visible.sync="billDetailDialog" width="80%"
       :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" top="10vh" v-dialog-drag>
       <bill-detail :params="params" :billType="billType" :flag="1" @closeFun="closeBillDetail"
         @importProMent="importProMent">
@@ -54,7 +56,7 @@
 
 <script>
 import billDetail from "@/components/bill/selectOrderDetailList";
-import { saveSubmit, collectionAndPayment, revokeCollectionAndPayment, detail,removeItems,remove } from '@/api/accountingManagement/index.js';
+import { saveSubmit, collectionAndPayment, revokeCollectionAndPayment, detail, removeItems, remove } from '@/api/accountingManagement/index.js';
 import { getList } from "@/api/collectionSettlement/index.js";
 
 
@@ -66,13 +68,17 @@ export default {
   data() {
     return {
       disabled: false,
+      editButton:false,
+      isSaveBtn: false,
+      isFinanceBtn: false,
+      isMenu:false,
       billDetailDialog: false,
       params: {},
       form: {
         settlementItemsList: []
       },
       optionForm: {
-        disabled:false,
+        disabled: false,
         menuBtn: false,
         span: 8,
         column: [{
@@ -137,7 +143,8 @@ export default {
             required: true,
             message: " ",
             trigger: "blur"
-          }]
+          }],
+          value:'青岛'
         }, {
           label: '收款日期',
           prop: "settlementDate",
@@ -147,7 +154,8 @@ export default {
           searchRange: true,
           searchDefaultTime: ["00:00:00", "23:59:59"],
           format: "yyyy-MM-dd",
-          valueFormat: "yyyy-MM-dd HH:mm:ss"
+          valueFormat: "yyyy-MM-dd HH:mm:ss",
+          value: ''
         }, {
           label: '单据编号',
           prop: "sysNo",
@@ -163,7 +171,7 @@ export default {
       formContacts: {},
       optionContacts: {},
       optionContactsBack: {
-        disabled:false,
+        disabled: false,
         align: 'center',
         index: true,
         // addBtnText: "录入明细",
@@ -195,7 +203,8 @@ export default {
           }, {
             label: '结算金额',
             prop: 'settlmentAmount',
-            cell: false
+            cell: false,
+            decimals: 2
           }, {
             label: '本次金额',
             prop: 'thisAmount',
@@ -246,9 +255,28 @@ export default {
       }
       this.form.amount = Number(thisAmountSum)
     }
-    console.log(this.onLoad.id);
+    //  获取今天的日期
+    var today = new Date();
+    var year = today.getFullYear();
+    var month = String(today.getMonth() + 1).padStart(2, '0');
+    var day = String(today.getDate()).padStart(2, '0');
+    var hours = String(today.getHours()).padStart(2, '0');
+    var minutes = String(today.getMinutes()).padStart(2, '0');
+    var seconds = String(today.getSeconds()).padStart(2, '0');
+
+    // 构建今天的日期时间字符串
+    var todayDateTime = year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds;
     if (this.onLoad.id) {
       this.refresh(this.onLoad.id)
+      this.$set(this.optionForm, 'disabled', true)
+      this.$set(this.optionContactsBack, 'disabled', true)
+      this.isSaveBtn = true
+      this.isFinanceBtn = true
+      this.isMenu = true
+    } else {
+      this.findObject(this.optionForm.column, 'settlementDate').value = todayDateTime
+      this.editButton = true
+      // console.log(this.form.settlementDate = '2023-07-03');
     }
   },
   methods: {
@@ -260,7 +288,7 @@ export default {
       }).then(() => {
         if (row.id) {
           console.log(this.form);
-          removeItems({ids:row.id}).then(res => {
+          removeItems({ ids: row.id }).then(res => {
             this.form.settlementItemsList.splice(index, 1);
             this.$message.success("操作成功!");
           });
@@ -287,12 +315,12 @@ export default {
       })
       detail({ id: id }).then(res => {
         this.form = res.data.data
-        if(res.data.data.financeStatus == '已收款'){
+        if (res.data.data.financeStatus == '已收款') {
           console.log('已收款');
-          this.$set(this.optionForm,'disabled',true)
-          this.$set(this.optionContactsBack,'disabled',true)
-        }else{
-          this.$set(this.optionForm,'disabled',false)
+          this.$set(this.optionForm, 'disabled', true)
+          this.$set(this.optionContactsBack, 'disabled', true)
+        } else {
+          this.$set(this.optionForm, 'disabled', false)
 
         }
         loading.close();
@@ -353,7 +381,8 @@ export default {
           let data = {
             ...this.form,
             dc: 'd',
-            billType: 'SK'
+            billType: 'SK',
+            corpName:this.form.$corpId
           }
           const loading = this.$loading({
             lock: true,
@@ -378,7 +407,7 @@ export default {
         done()
         if (valid) {
           if (this.form.financeStatus !== '已收款') {
-            console.log('this.form.financeStatus',this.form.financeStatus );
+            console.log('this.form.financeStatus', this.form.financeStatus);
             this.$confirm("确认收款?", {
               confirmButtonText: "确定",
               cancelButtonText: "取消",
@@ -401,7 +430,7 @@ export default {
                 loading.close()
               }))
             })
-          }else{
+          } else {
             this.$confirm("确认撤销退款?", {
               confirmButtonText: "确定",
               cancelButtonText: "取消",
@@ -429,6 +458,20 @@ export default {
       })
 
     },
+    confirmEditing() {
+      this.editButton = true
+      if (this.form.financeStatus == '已收款') {
+        this.$set(this.optionForm, 'disabled', true)
+        this.$set(this.optionContactsBack, 'disabled', true)
+        this.isFinanceBtn = false
+      } else {
+        this.$set(this.optionForm, 'disabled', false)
+        this.$set(this.optionContactsBack, 'disabled', false)
+        this.isFinanceBtn = false
+        this.isSaveBtn = false
+        this.isMenu = false
+      }
+    },
     //关闭
     closeBillDetail() {
       this.billDetailDialog = false;

src/views/tirePartsMall/financialManagement/collectionSettlement/index.vue

@@ -5,8 +5,16 @@
         ref="crud" :key="key" @on-load="onLoad" @search-change="searchChange" @row-del="rowDel"
         @refresh-change="refreshChange" @resetColumn="resetColumnTwo('crud', 'option', 'optionList', 267)"
         @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 267)" :page.sync="page">
+        <template slot-scope="{ row, index }" slot="sysNo">
+          <span style="color: #409EFF;cursor: pointer" @click.stop="check(row)">{{ row.sysNo }}
+          </span>
+        </template>
+        <template slot-scope="{ row, index }" slot="corpId">
+          <span style="color: #409EFF;cursor: pointer" @click.stop="check(row)">{{ row.corpName }}
+          </span>
+        </template>
         <template slot-scope="{type,size,row,index}" slot="menu">
-          <el-button :size="size" :type="type" @click="check(row)">查看</el-button>
+          <!-- <el-button :size="size" :type="type" @click="check(row)">查看</el-button> -->
           <el-button :size="size" :type="type" :disabled="row.financeStatus == '已收款' || item >= 1"
             @click="$refs.crud.rowDel(row, index)">删除</el-button>
         </template>
@@ -61,7 +69,7 @@ export default {
         searchMenuPosition: "right",
         align: "center",
         size: "small",
-        menuWidth: 100,
+        menuWidth: 50,
         searchSpan: 8,
         searchIcon: true,
         searchIndex: 2,
@@ -70,17 +78,20 @@ export default {
         column: [{
           label: '单据编号',
           prop: "sysNo",
+          searchOrder:1,
           search: true,
           overHidden: true,
         }, {
           label: '合同号',
           prop: "contractNumber",
+          searchOrder:2,
           search: true,
           overHidden: true,
         }, {
           label: "客户",
           prop: "corpId",
           search: true,
+          searchOrder:3,
           type: 'select',
           props: {
             label: 'cname',
@@ -92,6 +103,7 @@ export default {
           prop: "salesCompanyId",
           search: true,
           type: 'select',
+          searchOrder:6,
           props: {
             label: 'fullName',
             value: 'id'
@@ -101,6 +113,7 @@ export default {
           label: '收付款状态',
           prop: "financeStatus",
           search: true,
+          searchOrder:5,
           overHidden: true,
           type: 'select',
           dicUrl: "/api/blade-system/dict-biz/dictionary?code=payment_Status",
@@ -111,9 +124,11 @@ export default {
         }, {
           label: '收款账户',
           prop: "accountName",
+          searchOrder:4,
           search: true,
           overHidden: true,
           type: 'select',
+          type:'select',
           props: {
             label: 'cname',
             value: 'id',
@@ -141,8 +156,10 @@ export default {
         }, {
           label: "结算日期",
           prop: "settlementDate",
-          searchProp: "createTimeList",
+          searchProp: "settlementDateList",
+          searchOrder:5,
           type: "date",
+          search:true,
           overHidden: true,
           width: 100,
           searchRange: true,
@@ -214,6 +231,9 @@ export default {
         this.detailData = {}
       }
       this.onLoad(this.page, this.search)
+      this.$nextTick(() => {
+        this.$refs.crud.doLayout()
+      })
     },
     //刷新
     refreshChange() {

src/views/tirePartsMall/financialManagement/paymentSettlement/detailsPage.vue

@@ -7,12 +7,14 @@
         </el-button>
       </div>
       <div class="add-customer-btn">
-        <!--        <el-button class="el-button&#45;&#45;small-yh" style="margin-right: 10px" type="primary" size="small" v-if="!editButton"-->
-        <!--                   @click="confirmEditing">编辑-->
-        <!--        </el-button>-->
-        <el-button class="el-button--small-yh" type="primary" size="small" @click="editCustomer">保存数据
+        <el-button class="el-button&#45;&#45;small-yh" style="margin-right: 10px" type="primary" size="small"
+          v-if="!editButton" @click="confirmEditing">编辑
         </el-button>
-        <el-button class="el-button--small-yh" type="warning" size="small" @click="collection">{{ form.financeStatus ==
+        <el-button class="el-button--small-yh" type="primary" :disabled="isSaveBtn" size="small"
+          @click="editCustomer">保存数据
+        </el-button>
+        <el-button class="el-button--small-yh" type="warning" size="small" :disabled="isFinanceBtn" @click="collection">{{
+          form.financeStatus ==
           '已付款' ? '撤销付款' : '付款' }}
         </el-button>
         <!-- <el-button class="el-button--small-yh" type="primary" size="small" v-if="form.id">启用
@@ -29,15 +31,15 @@
           @resetColumn="resetColumnTwo('formContacts', 'optionContacts', 'optionContactsBack', 266.1)"
           @saveColumn="saveColumnTwo('formContacts', 'optionContacts', 'optionContactsBack', 266.1)">
           <template slot-scope="scope" slot="menuLeft">
-            <el-button type="primary" icon="el-icon-plus" :disabled="form.financeStatus == '已付款'" size="small"
+            <el-button type="primary" icon="el-icon-plus" :disabled="form.financeStatus == '已付款' || isMenu" size="small"
               @click="rowAdd()">选择订单</el-button>
           </template>
           <template slot-scope="{type,size,row,index,disabled}" slot="menu">
-            <el-button :size="size" :type="type" :disabled="form.financeStatus == '已付款'" 
+            <el-button :size="size" :type="type" :disabled="form.financeStatus == '已付款' || isMenu"
               :icon="row.$cellEdit ? 'el-icon-plus' : 'el-icon-edit'" @click="$refs.formContacts.rowCell(row, index)">{{
                 row.$cellEdit ? '确认' : '修改' }}
             </el-button>
-            <el-button icon="el-icon-delete" :size="size" :disabled="form.financeStatus == '已付款'"  :type="type"
+            <el-button icon="el-icon-delete" :size="size" :disabled="form.financeStatus == '已付款' || isMenu" :type="type"
               @click="rowDelBox(row, index)">删除
             </el-button>
           </template>
@@ -55,7 +57,7 @@
 
 <script>
 import billDetail from "@/components/bill/selectOrderDetailList";
-import { saveSubmit, collectionAndPayment, revokeCollectionAndPayment, detail,removeItems,remove } from '@/api/accountingManagement/index.js';
+import { saveSubmit, collectionAndPayment, revokeCollectionAndPayment, detail, removeItems, remove } from '@/api/accountingManagement/index.js';
 import { number } from "echarts";
 
 export default {
@@ -66,7 +68,11 @@ export default {
   data() {
     return {
       billDetailDialog: false,
-      isSave:0,
+      isSave: 0,
+      isMenu:false,
+      isSaveBtn: false,
+      isFinanceBtn: false,
+      editButton: false,
       disabled: false,
       form: {
         settlementItemsList: []
@@ -221,6 +227,13 @@ export default {
     console.log(this.onLoad.id);
     if (this.onLoad.id) {
       this.refresh(this.onLoad.id)
+      this.$set(this.optionForm, 'disabled', true)
+      this.$set(this.optionContactsBack, 'disabled', true)
+      this.isSaveBtn = true
+      this.isFinanceBtn = true
+      this.isMenu = true
+    }else{
+      this.editButton = true
     }
   },
   methods: {
@@ -232,7 +245,7 @@ export default {
       }).then(() => {
         if (row.id) {
           console.log(this.form);
-          removeItems({ids:row.id}).then(res => {
+          removeItems({ ids: row.id }).then(res => {
             this.form.settlementItemsList.splice(index, 1);
             this.$message.success("操作成功!");
           });
@@ -253,12 +266,6 @@ export default {
       })
       detail({ id: id }).then(res => {
         this.form = res.data.data
-        if(res.data.data.financeStatus == '已付款'){
-          this.$set(this.optionForm,'disabled',true)
-          this.$set(this.optionContactsBack,'disabled',true)
-        }else{
-          this.$set(this.optionForm,'disabled',false)
-        }
         loading.close();
       }).catch(() => {
         loading.close();
@@ -278,6 +285,20 @@ export default {
       this.billDetailDialog = true;
 
     },
+    confirmEditing() {
+      this.editButton = false
+      if (this.form.financeStatus == '已付款') {
+        this.$set(this.optionForm, 'disabled', true)
+        this.$set(this.optionContactsBack, 'disabled', true)
+        this.isFinanceBtn = false
+      } else {
+        this.$set(this.optionForm, 'disabled', false)
+        this.$set(this.optionContactsBack, 'disabled', false)
+        this.isFinanceBtn = false
+        this.isSaveBtn = false
+        this.isMenu = false
+      }
+    },
     //关闭
     closeBillDetail() {
       this.billDetailDialog = false;
@@ -290,7 +311,8 @@ export default {
           let data = {
             ...this.form,
             dc: 'c',
-            billType: 'FK'
+            billType: 'FK',
+            corpName: this.form.$corpId
           }
           const loading = this.$loading({
             lock: true,
@@ -337,13 +359,13 @@ export default {
 
       this.billDetailDialog = false;
     },
-     //收款
-     collection() {
+    //收款
+    collection() {
       this.$refs["form"].validate((valid, done) => {
         done()
         if (valid) {
           if (this.form.financeStatus !== '已付款') {
-            console.log('this.form.financeStatus',this.form.financeStatus );
+            console.log('this.form.financeStatus', this.form.financeStatus);
             this.$confirm("确认付款?", {
               confirmButtonText: "确定",
               cancelButtonText: "取消",
@@ -360,13 +382,19 @@ export default {
                 dc: 'c',
                 billType: 'FK'
               }
-              collectionAndPayment(data).then((res => {
-                this.refresh(res.data.data.id)
-                this.$message.success('付款成功')
-                loading.close()
-              })).catch((err)=>{loading.close()})
+              collectionAndPayment(data)
+                .then((res) => {
+                  console.log(res);
+                  this.refresh(res.data.data.id);
+                  this.$message.success('付款成功');
+                  loading.close();
+                })
+                .catch((error) => {
+                  console.error(error);
+                  loading.close();
+                });
             })
-          }else{
+          } else {
             this.$confirm("确认撤销付款?", {
               confirmButtonText: "确定",
               cancelButtonText: "取消",

src/views/tirePartsMall/financialManagement/paymentSettlement/index.vue

@@ -16,8 +16,16 @@
           @resetColumn="resetColumnTwo('crud','option','optionList',266)"
           @saveColumn="saveColumnTwo('crud','option','optionList',266)"
           :page.sync="page">
+        <template slot-scope="{ row, index }" slot="sysNo">
+          <span style="color: #409EFF;cursor: pointer" @click.stop="check(row)">{{ row.sysNo }}
+          </span>
+        </template>
+        <template slot-scope="{ row, index }" slot="corpId">
+          <span style="color: #409EFF;cursor: pointer" @click.stop="check(row)">{{ row.corpName }}
+          </span>
+        </template>
         <template slot-scope="{type,size,row,index}" slot="menu">
-          <el-button  :size="size" :type="type" @click="check(row)">查看</el-button>
+          <!-- <el-button  :size="size" :type="type" @click="check(row)">查看</el-button> -->
           <el-button :size="size" :disabled="row.financeStatus == '已付款' || item>=1" :type="type" @click="$refs.crud.rowDel(row,index)">删除</el-button>
         </template>
         <template slot="corpNameSearch">
@@ -70,7 +78,7 @@ export default {
         searchMenuPosition: "right",
         align: "center",
         size: "small",
-        menuWidth: 100,
+        menuWidth: 50,
         searchSpan: 8,
         searchIcon: true,
         searchIndex: 2,

src/views/tirePartsMall/salesManagement/purchaseOrder/detailsPage.vue

@@ -413,32 +413,19 @@ export default {
                 showSummary: true,
                 sumColumnList:[{
                   name: "goodsNum",
-                  type: "sum",
-                  decimals: 2
+                  type: "sum"
                 },{
-                  name: "sendNum",
+                  name: "price",
                   type: "sum",
                   decimals: 2
                 },{
-                  name: "profit",
+                  name: "sendNum",
                   type: "sum",
                   decimals: 2
                 },{
                   name: "subTotalMoney",
                   type: "sum",
                   decimals: 2
-                },{
-                  name: "thisAmount",
-                  type: "sum",
-                  decimals: 2
-                },{
-                  name: "costprie",
-                  type: "sum",
-                  decimals: 2
-                },{
-                  name: "grossProfit",
-                  type: "sum",
-                  decimals: 2
                 }],
                 column: [{
                     label: '轮胎名称',

src/views/tirePartsMall/salesManagement/purchaseOrder/index.vue

@@ -76,7 +76,15 @@ export default {
         dialogWidth: "70%",
         summaryText: "合计",
         showSummary: true,
-        sumColumnList: [],
+        sumColumnList: [ {
+              name: 'goodsTotalNum',
+              type: 'sum',
+              decimals:1
+            }, {
+              name: 'totalMoney',
+              type: 'sum',
+              decimals:1
+            },],
         column: [{
           label: '采购单号',
           prop: "ordNo",

src/views/tirePartsMall/salesManagement/saleOrder/detailsPage.vue

@@ -232,7 +232,6 @@ export default {
                                 this.form.phone = res.data.data.corpsAttnList[0].tel
                                 this.contactsOption = res.data.data.corpsAddrList
                                 this.form.recAddress = res.data.data.corpsAddrList[0].belongtoarea + res.data.data.corpsAddrList[0].detailedAddress
-
                             })
                         }
 
@@ -389,32 +388,25 @@ export default {
                 showSummary: true,
                 sumColumnList:[{
                   name: "goodsNum",
-                  type: "sum",
-                  decimals: 2
+                  type: "sum"
                 },{
                   name: "sendNum",
-                  type: "sum",
-                  decimals: 2
+                  type: "sum"
                 },{
                   name: "profit",
-                  type: "sum",
-                  decimals: 2
+                  type: "sum"
                 },{
                   name: "subTotalMoney",
-                  type: "sum",
-                  decimals: 2
+                  type: "sum"
                 },{
                   name: "thisAmount",
-                  type: "sum",
-                  decimals: 2
+                  type: "sum"
                 },{
                   name: "costprie",
-                  type: "sum",
-                  decimals: 2
+                  type: "sum"
                 },{
                   name: "grossProfit",
-                  type: "sum",
-                  decimals: 2
+                  type: "sum"
                 }],
                 column: [{
                     label: '轮胎名称',
@@ -833,6 +825,8 @@ export default {
         },
         'form.storageId'(newStorageId, oldStorageId) {
             goodsListXs(this.dicUrlWithCustomId, this.form.storageId ? this.form.storageId : '').then(res => {
+                console.log(res.data.data,'2');
+
                 this.findObject(this.optionContactsBack.column, "goodsId").dicData = res.data.data
             })
         },

src/views/tirePartsMall/salesManagement/saleOrder/index.vue

@@ -76,7 +76,13 @@ export default {
         dialogWidth: "70%",
         summaryText: "合计",
         showSummary: true,
-        sumColumnList: [],
+        sumColumnList: [ {
+              name: 'goodsTotalNum',
+              type: 'sum',
+            },{
+              name: 'totalMoney',
+              type: 'sum',
+            },],
         column: [{
           label: '销售单号',
           prop: "ordNo",

src/views/tirePartsMall/statisticAnalysis/supplierTransactions/detailsInfo.vue

@@ -133,15 +133,15 @@
                     <el-row class="client_info">
                         <el-col :span="4">客户名称</el-col>
                         <el-col :span="4">{{ form.cname | nameFileter }}</el-col>
-                        <el-col :span="4">期初欠款</el-col>
+                        <el-col :span="4">信用额度</el-col>
                         <el-col :span="4">{{ form.arrears | nameFileter }}</el-col>
                         <el-col :span="4">电话</el-col>
                         <el-col :span="4">{{ form.tel | nameFileter }}</el-col>
                     </el-row>
                     <el-row class="client_info">
-                        <el-col :span="4">备用电话</el-col>
+                        <el-col :span="4">商城价格</el-col>
                         <el-col :span="4">{{ form.telephone | nameFileter }}</el-col>
-                        <el-col :span="4">传真</el-col>
+                        <el-col :span="4">账期</el-col>
                         <el-col :span="4">{{ form.fax | nameFileter }}</el-col>
                         <el-col :span="4">邮箱</el-col>
                         <el-col :span="4">{{ form.mailbox | nameFileter }}</el-col>

src/views/tirePartsMall/statisticAnalysis/supplierTransactions/index.vue

@@ -1,19 +1,19 @@
 <template>
-    <div>
-      <basic-container v-show="show && showInfo" class="page-crad">
-        <table border="0" width="100%" style="margin-bottom:20px;" v-loading="loading" :option="option">
-          <tr>
-            <td class="stat-td">
-              <img src="@/assets/img/contractAmountBg.png" class="stat-img">
-              <div class="stat-tip">
-                <div class="money">
-                  <span style="font-size:20px;">￥</span>
-                  <avue-count-up :end="form.totalAmount"></avue-count-up>
-                </div>
-                <div class="title">合同金额</div>
+  <div>
+    <basic-container v-show="show && showInfo" class="page-crad">
+      <table border="0" width="100%" style="margin-bottom:20px;" v-loading="loading" :option="option">
+        <tr>
+          <td class="stat-td">
+            <img src="@/assets/img/contractAmountBg.png" class="stat-img">
+            <div class="stat-tip">
+              <div class="money">
+                <span style="font-size:20px;">￥</span>
+                <avue-count-up :end="form.totalAmount"></avue-count-up>
               </div>
-            </td>
-            <!-- <td class="stat-td">
+              <div class="title">合同金额</div>
+            </div>
+          </td>
+          <!-- <td class="stat-td">
               <img src="@/assets/img/deliveredBg.png" class="stat-img">
               <div class="stat-tip">
                 <div class="money">
@@ -34,574 +34,577 @@
                 <div class="title">(积累预收:)</div>
               </div>
             </td> -->
-            <td class="stat-td">
-              <img src="@/assets/img/uncollectedBg.png" class="stat-img">
-              <div class="stat-tip">
-                <div class="money">
-                  <span style="font-size:20px;">￥</span>
-                  <avue-count-up :end="form.paidAmount"></avue-count-up>
-                </div>
-                <div class="title">未收款</div>
-                <!-- <div class="title">(积累欠款:)</div> -->
+          <td class="stat-td">
+            <img src="@/assets/img/uncollectedBg.png" class="stat-img">
+            <div class="stat-tip">
+              <div class="money">
+                <span style="font-size:20px;">￥</span>
+                <avue-count-up :end="form.paidAmount"></avue-count-up>
               </div>
-            </td>
-            <td class="stat-td">
-              <img src="@/assets/img/receivableBg.png" class="stat-img">
-              <div class="stat-tip">
-                <div class="money">
-                  <span style="font-size:20px;">￥</span>
-                  <avue-count-up :end="form.unpaidAmount"></avue-count-up>
-                </div>
-                <div class="title">已收款</div>
+              <div class="title">未收款</div>
+              <!-- <div class="title">(积累欠款:)</div> -->
+            </div>
+          </td>
+          <td class="stat-td">
+            <img src="@/assets/img/receivableBg.png" class="stat-img">
+            <div class="stat-tip">
+              <div class="money">
+                <span style="font-size:20px;">￥</span>
+                <avue-count-up :end="form.unpaidAmount"></avue-count-up>
               </div>
-            </td>
-          </tr>
-        </table>
-        <el-row>
-          <el-col :span="4">
-            <avue-tree :option="treeOption" :data="treeData" @node-click="nodeClick" style="height:73vh;"
-              @save="corpTypeVisible = true">
-              <template slot="addBtn">
-                <i class="el-icon-setting" style="font-size:18px;line-height: 30px;width: 20px;padding: 0 10px;"
-                  @click="corpTypeVisible = true"></i>
-              </template>
-            </avue-tree>
-          </el-col>
-          <el-col :span="20">
-            <avue-crud ref="crud" :option="option" :data="dataList" :page.sync="page" :search.sync="search"
-              @search-change="searchChange" @current-change="currentChange" @size-change="sizeChange"
-              @refresh-change="refreshChange" @on-load="onLoad" :table-loading="loading" @saveColumn="saveColumn"
-              @resetColumn="resetColumn" :cell-style="cellStyle" @search-criteria-switch="searchCriteriaSwitch">
-              <template slot="menuLeft">
-                <!-- <el-button type="primary" size="mini" @click.stop="newAdd()">新建客户
+              <div class="title">已收款</div>
+            </div>
+          </td>
+        </tr>
+      </table>
+      <el-row>
+        <el-col :span="4">
+          <avue-tree :option="treeOption" :data="treeData" @node-click="nodeClick" style="height:73vh;"
+            @save="corpTypeVisible = true">
+            <template slot="addBtn">
+              <i class="el-icon-setting" style="font-size:18px;line-height: 30px;width: 20px;padding: 0 10px;"
+                @click="corpTypeVisible = true"></i>
+            </template>
+          </avue-tree>
+        </el-col>
+        <el-col :span="20">
+          <avue-crud ref="crud" :option="option" :data="dataList" :page.sync="page" :search.sync="search"
+            @search-change="searchChange" @current-change="currentChange" @size-change="sizeChange"
+            @refresh-change="refreshChange" @on-load="onLoad" :table-loading="loading" @saveColumn="saveColumn"
+            @resetColumn="resetColumn" :cell-style="cellStyle" @search-criteria-switch="searchCriteriaSwitch">
+            <template slot="menuLeft">
+              <!-- <el-button type="primary" size="mini" @click.stop="newAdd()">新建客户
                 </el-button>
                 <el-button type="primary" size="mini" icon="el-icon-bottom" @click="excelBox = true">导入
                 </el-button> -->
-                <el-button type="primary" size="mini" icon="el-icon-bottom" @click="outExport">导出
-                </el-button>
-              </template>
-              <template slot-scope="{ row, index }" slot="cname">
-                <span style="color: #409EFF;cursor: pointer" @click.stop="viewInfo(row)">{{ row.cname }}
-                </span>
-              </template>
-              <template slot="idsSearch">
-                <crop-select v-model="search.ids" corpType="KH"></crop-select>
-              </template>
-              <template slot="dateSearch">
-                <el-date-picker v-model="search.date" 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']"
-                  :picker-options="pickerOptions">
-                </el-date-picker>
-              </template>
-              <template slot-scope="{ row, index }" slot="menu">
-                <el-tooltip class="item" effect="dark" content="编辑" placement="top">
-                  <i class="tradingIcon icon-edit" @click.stop="editOpen(row, 2)" />
-                </el-tooltip>
-                <el-tooltip class="item" effect="dark" content="收款" placement="top">
-                  <i class="tradingIcon icon-proceeds" />
-                </el-tooltip>
-                <el-tooltip class="item" effect="dark" content="发货" placement="top">
-                  <i class="tradingIcon icon-deliver" />
-                </el-tooltip>
-                <el-tooltip class="item" effect="dark" content="对账" placement="top">
-                  <i class="tradingIcon icon-reconciliation" />
-                </el-tooltip>
-                <el-tooltip class="item" effect="dark" content="删除" placement="top">
-                  <i class="tradingIcon icon-del" style="color: #FF0000" @click.stop="rowDel(row)" />
-                </el-tooltip>
-                <!-- <el-button type="text" size="small" @click.stop="editOpen(row, 2)">
+              <el-button type="primary" size="mini" icon="el-icon-bottom" @click="outExport">导出
+              </el-button>
+            </template>
+            <template slot-scope="{ row, index }" slot="cname">
+              <span style="color: #409EFF;cursor: pointer" @click.stop="viewInfo(row)">{{ row.cname }}
+              </span>
+            </template>
+            <template slot="idsSearch">
+              <crop-select v-model="search.ids" corpType="KH"></crop-select>
+            </template>
+            <template slot="dateSearch">
+              <el-date-picker v-model="search.date" 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']"
+                :picker-options="pickerOptions">
+              </el-date-picker>
+            </template>
+            <template slot-scope="{ row, index }" slot="menu">
+              <el-tooltip class="item" effect="dark" content="编辑" placement="top">
+                <i class="tradingIcon icon-edit" @click.stop="editOpen(row, 2)" />
+              </el-tooltip>
+              <el-tooltip class="item" effect="dark" content="收款" placement="top">
+                <i class="tradingIcon icon-proceeds" />
+              </el-tooltip>
+              <el-tooltip class="item" effect="dark" content="发货" placement="top">
+                <i class="tradingIcon icon-deliver" />
+              </el-tooltip>
+              <el-tooltip class="item" effect="dark" content="对账" placement="top">
+                <i class="tradingIcon icon-reconciliation" />
+              </el-tooltip>
+              <el-tooltip class="item" effect="dark" content="删除" placement="top">
+                <i class="tradingIcon icon-del" style="color: #FF0000" @click.stop="rowDel(row)" />
+              </el-tooltip>
+              <!-- <el-button type="text" size="small" @click.stop="editOpen(row, 2)">
               查看
             </el-button>
             <el-button type="text" size="small" @click.stop="rowDel(row, index)">
               删除
             </el-button> -->
-              </template>
-            </avue-crud>
-          </el-col>
-        </el-row>
-  
-      </basic-container>
-      <details-page v-if="!show" @goBack="goBack()" :detailData="detailData" />
-      <details-info v-if="!showInfo" @goBack="goBack()" @editOpen="editOpen" :detailData="detailData" />
-      <el-dialog title="设置客户分类" v-dialogDrag :visible.sync="corpTypeVisible" class="avue-dialog" width="80%"
-        append-to-body @closed="corpTypeClosed">
-        <span>
-          <corp-type></corp-type>
-          <!-- <avue-form :key="reload" ref="corpType" v-model="form4" :option="option4" style="margin-top:20px">
+            </template>
+          </avue-crud>
+        </el-col>
+      </el-row>
+
+    </basic-container>
+    <details-page v-if="!show" @goBack="goBack()" :detailData="detailData" />
+    <details-info v-if="!showInfo" @goBack="goBack()" @editOpen="editOpen" :detailData="detailData" />
+    <el-dialog title="设置客户分类" v-dialogDrag :visible.sync="corpTypeVisible" class="avue-dialog" width="80%" append-to-body
+      @closed="corpTypeClosed">
+      <span>
+        <corp-type></corp-type>
+        <!-- <avue-form :key="reload" ref="corpType" v-model="form4" :option="option4" style="margin-top:20px">
           </avue-form> -->
-        </span>
-        <div class="avue-dialog__footer">
-          <el-button @click="corpTypeVisible = false" size="mini">取 消</el-button>
-          <el-button @click="addCorpType" type="primary" size="mini">确 定</el-button>
-        </div>
-      </el-dialog>
-      <el-dialog title="导入客户" append-to-body :visible.sync="excelBox" width="555px" :close-on-click-modal="false"
-                 v-dialog-drag>
-        <avue-form :option="excelOption" v-model="excelForm" table-loading="excelLoading"
-                   :upload-before="uploadBefore" :upload-after="uploadAfter">
-          <template slot="excelTemplate">
-            <el-button type="primary" @click="derivation">
-              点击下载<i class="el-icon-download el-icon--right"></i>
-            </el-button>
-          </template>
-        </avue-form>
-        <p style="text-align: center;color: #DC0505">
-          温馨提示 第一次导入时请先下载模板
-        </p>
-      </el-dialog>
-    </div>
-  </template>
+      </span>
+      <div class="avue-dialog__footer">
+        <el-button @click="corpTypeVisible = false" size="mini">取 消</el-button>
+        <el-button @click="addCorpType" type="primary" size="mini">确 定</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog title="导入客户" append-to-body :visible.sync="excelBox" width="555px" :close-on-click-modal="false"
+      v-dialog-drag>
+      <avue-form :option="excelOption" v-model="excelForm" table-loading="excelLoading" :upload-before="uploadBefore"
+        :upload-after="uploadAfter">
+        <template slot="excelTemplate">
+          <el-button type="primary" @click="derivation">
+            点击下载<i class="el-icon-download el-icon--right"></i>
+          </el-button>
+        </template>
+      </avue-form>
+      <p style="text-align: center;color: #DC0505">
+        温馨提示 第一次导入时请先下载模板
+      </p>
+    </el-dialog>
+  </div>
+</template>
   
-  <script>
-  import detailsInfo from "./detailsInfo";
-  import detailsPage from "./detailsPage";
-  import { option } from "./js/optionList";
-  import {
+<script>
+import detailsInfo from "./detailsInfo";
+import detailsPage from "./detailsPage";
+import { option } from "./js/optionList";
+import {
   getCorpType,
 } from "@/api/tirePartsMall/basicData/customerInformation";
-  import { getList, pageStatistics, remove, addCorpType, customerList } from "@/api/basicData/customerTransactions";
-  import corpType from '@/components/corpType/index'
-  import {getToken} from "@/util/auth";
-  export default {
-    name: "index",
-    data() {
-      return {
-        corpTypeVisible: false,
-        excelForm:{},
-        excelOption: {
-          submitBtn: false,
-          emptyBtn: false,
-          column: [
-            {
-              label: "模板下载",
-              prop: "excelTemplate",
-              formslot: true,
-              span: 24
+import { getList, pageStatistics, remove, addCorpType, customerList } from "@/api/basicData/customerTransactions";
+import corpType from '@/components/corpType/index'
+import { getToken } from "@/util/auth";
+export default {
+  name: "index",
+  data() {
+    return {
+      corpTypeVisible: false,
+      excelForm: {},
+      excelOption: {
+        submitBtn: false,
+        emptyBtn: false,
+        column: [
+          {
+            label: "模板下载",
+            prop: "excelTemplate",
+            formslot: true,
+            span: 24
+          },
+          {
+            label: "导入客户",
+            prop: "excelFile",
+            type: "upload",
+            drag: true,
+            loadText: "客户上传中，请稍等",
+            accept: '.xls,.xlsx',
+            span: 24,
+            propsHttp: {
+              res: "data"
             },
-            {
-              label: "导入客户",
-              prop: "excelFile",
-              type: "upload",
-              drag: true,
-              loadText: "客户上传中，请稍等",
-              accept:'.xls,.xlsx',
-              span: 24,
-              propsHttp: {
-                res: "data"
-              },
-              tip: "请上传 .xls,.xlsx 标准格式文件",
-              action: "/api/blade-client/partsCorps/import-desc"
+            tip: "请上传 .xls,.xlsx 标准格式文件",
+            action: "/api/blade-client/partsCorps/import-desc"
+          }
+        ]
+      },
+      src: '',
+      show: true,
+      excelBox: false,
+      showInfo: true,
+      loading: false,
+      search: {},
+      detailData: {},
+      dataList: [],
+      selectionList: [],
+      page: {
+        pageSize: 20,
+        currentPage: 1,
+        total: 0,
+        pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500]
+      },
+      form: {
+        totalAmount: 0,
+        paidAmount: 0,
+        unpaidAmount: 0
+      },
+      formSerach: {},
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: '当天',
+            onClick(picker) {
+              const date = new Date();
+              const start = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 0, 0, 0);
+              const end = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 23, 59, 59);
+              picker.$emit('pick', [start, end]);
+            }
+          },
+          {
+            text: '昨天',
+            onClick(picker) {
+              const date = new Date();
+              const start = new Date(date.getFullYear(), date.getMonth(), date.getDate() - 1, 0, 0, 0);
+              const end = new Date(date.getFullYear(), date.getMonth(), date.getDate() - 1, 23, 59, 59);
+              picker.$emit('pick', [start, end]);
+            }
+          }, {
+            text: '当月',
+            onClick(picker) {
+              const date = new Date();
+              const start = new Date(date.getFullYear(), date.getMonth(), 1, 0, 0, 0);
+              const end = new Date(date.getFullYear(), date.getMonth() + 1, 0, 23, 59, 59);
+              picker.$emit('pick', [start, end]);
+            }
+          }, {
+            text: '当季',
+            onClick(picker) {
+              const date = new Date();
+              const start = new Date(date.getFullYear(), parseInt(date.getMonth() / 3) * 3, 1, 0, 0, 0);
+              const end = new Date(date.getFullYear(), parseInt(date.getMonth() / 3) * 3 + 3, 0, 23, 59, 59);
+              picker.$emit('pick', [start, end]);
+            }
+          }, {
+            text: '当年',
+            onClick(picker) {
+              const date = new Date();
+              const start = new Date(date.getFullYear(), date.getMonth(), 1, 0, 0, 0);
+              const end = new Date(date.getFullYear() + 1, 0, 0, 23, 59, 59);
+              picker.$emit('pick', [start, end]);
+            }
+          }, {
+            text: '最近一周',
+            onClick(picker) {
+              const date = new Date();
+              const start = new Date(date.getFullYear(), date.getMonth(), date.getDate() - 7, 0, 0, 0);
+              const end = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 23, 59, 59);
+              picker.$emit('pick', [start, end]);
+            }
+          }, {
+            text: '最近二周',
+            onClick(picker) {
+              const date = new Date();
+              const start = new Date(date.getFullYear(), date.getMonth(), date.getDate() - 7 * 2, 0, 0, 0);
+              const end = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 23, 59, 59);
+              picker.$emit('pick', [start, end]);
             }
-          ]
-        },
-        src: '',
-        show: true,
-        excelBox: false,
-        showInfo: true,
-        loading: false,
-        search: {},
-        detailData: {},
-        dataList: [],
-        selectionList: [],
-        page: {
-          pageSize: 20,
-          currentPage: 1,
-          total: 0,
-          pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500]
-        },
-        form: {
-         totalAmount: 0,
-          paidAmount: 0,
-          unpaidAmount: 0
-        },
-        formSerach: {},
-        pickerOptions: {
-          shortcuts: [
-            {
-              text: '当天',
-              onClick(picker) {
-                const date = new Date();
-                const start = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 0, 0, 0);
-                const end = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 23, 59, 59);
-                picker.$emit('pick', [start, end]);
+          }, {
+            text: '最近三周',
+            onClick(picker) {
+              const date = new Date();
+              const start = new Date(date.getFullYear(), date.getMonth(), date.getDate() - 7 * 3, 0, 0, 0);
+              const end = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 23, 59, 59);
+              picker.$emit('pick', [start, end]);
+            }
+          }]
+      },
+      treeOption: {
+        addBtn: false,
+        menu: false,
+        size: "small",
+        props: {
+          labelText: "标题",
+          label: "title",
+          value: "value",
+        }
+      },
+      treeData: [],
+      form4: {},
+      option4: {
+        menuBtn: false,
+        labelWidth: 80,
+        column: [
+          {
+            label: "分类名称",
+            prop: "cname",
+            rules: [
+              {
+                required: true,
+                message: "",
+                trigger: "blur"
               }
+            ],
+            span: 24,
+          },
+          {
+            label: "上级类型",
+            prop: "parentId",
+            dicData: [],
+            type: "tree",
+            props: {
+              label: "cname",
+              value: "id"
             },
-            {
-              text: '昨天',
-              onClick(picker) {
-                const date = new Date();
-                const start = new Date(date.getFullYear(), date.getMonth(), date.getDate() - 1, 0, 0, 0);
-                const end = new Date(date.getFullYear(), date.getMonth(), date.getDate() - 1, 23, 59, 59);
-                picker.$emit('pick', [start, end]);
-              }
-            }, {
-              text: '当月',
-              onClick(picker) {
-                const date = new Date();
-                const start = new Date(date.getFullYear(), date.getMonth(), 1, 0, 0, 0);
-                const end = new Date(date.getFullYear(), date.getMonth() + 1, 0, 23, 59, 59);
-                picker.$emit('pick', [start, end]);
-              }
-            }, {
-              text: '当季',
-              onClick(picker) {
-                const date = new Date();
-                const start = new Date(date.getFullYear(), parseInt(date.getMonth() / 3) * 3, 1, 0, 0, 0);
-                const end = new Date(date.getFullYear(), parseInt(date.getMonth() / 3) * 3 + 3, 0, 23, 59, 59);
-                picker.$emit('pick', [start, end]);
-              }
-            }, {
-              text: '当年',
-              onClick(picker) {
-                const date = new Date();
-                const start = new Date(date.getFullYear(), date.getMonth(), 1, 0, 0, 0);
-                const end = new Date(date.getFullYear() + 1, 0, 0, 23, 59, 59);
-                picker.$emit('pick', [start, end]);
-              }
-            }, {
-              text: '最近一周',
-              onClick(picker) {
-                const date = new Date();
-                const start = new Date(date.getFullYear(), date.getMonth(), date.getDate() - 7, 0, 0, 0);
-                const end = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 23, 59, 59);
-                picker.$emit('pick', [start, end]);
-              }
-            }, {
-              text: '最近二周',
-              onClick(picker) {
-                const date = new Date();
-                const start = new Date(date.getFullYear(), date.getMonth(), date.getDate() - 7 * 2, 0, 0, 0);
-                const end = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 23, 59, 59);
-                picker.$emit('pick', [start, end]);
-              }
-            }, {
-              text: '最近三周',
-              onClick(picker) {
-                const date = new Date();
-                const start = new Date(date.getFullYear(), date.getMonth(), date.getDate() - 7 * 3, 0, 0, 0);
-                const end = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 23, 59, 59);
-                picker.$emit('pick', [start, end]);
-              }
-            }]
-        },
-        treeOption: {
-          addBtn: false,
-          menu: false,
-          size: "small",
-          props: {
-            labelText: "标题",
-            label: "title",
-            value: "value",
+            span: 24,
           }
-        },
-        treeData: [],
-        form4: {},
-        option4: {
-          menuBtn: false,
-          labelWidth: 80,
-          column: [
-            {
-              label: "分类名称",
-              prop: "cname",
-              rules: [
-                {
-                  required: true,
-                  message: "",
-                  trigger: "blur"
-                }
-              ],
-              span: 24,
-            },
-            {
-              label: "上级类型",
-              prop: "parentId",
-              dicData: [],
-              type: "tree",
-              props: {
-                label: "cname",
-                value: "id"
-              },
-              span: 24,
+        ]
+      },
+      hostUrl: '',
+      option: {}
+    };
+  },
+  components: {
+    detailsPage,
+    detailsInfo,
+    corpType
+  },
+  async created() {
+    this.option = await this.getColumnData(this.getColumnName(277.2), option);
+    this.option.height = window.innerHeight - 330;
+    this.getAllWorkDicts()
+  },
+  activated() {
+    this.$refs.crud.refreshTable();
+  },
+  methods: {
+    derivation() {
+      window.open(
+        `/api/blade-client/partsCorps/export-template?${this.website.tokenHeader
+        }=${getToken()}`
+      );
+    },
+    //导出
+    outExport() {
+      let config = { params: { ...this.search } }
+      if (config.params) {
+        for (const propName of Object.keys(config.params)) {
+          const value = config.params[propName];
+          if (value !== null && typeof (value) !== "undefined") {
+            if (value instanceof Array) {
+              for (const key of Object.keys(value)) {
+                let params = propName + '[' + key + ']';
+                config.params[params] = value[key]
+              }
+              delete config.params[propName]
             }
-          ]
-        },
-        hostUrl: '',
-        option:{}
-      };
+          }
+        }
+      }
+      const routeData = this.$router.resolve({
+        path: '/api/blade-client/partsCorps/export-desc',      //跳转目标窗口的地址
+        query: {
+          ...config.params,    //括号内是要传递给新窗口的参数
+          identification: this.url
+        }
+      })
+      window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);
+    },
+    uploadBefore(file, done, loading) {
+      done();
+      loading = true;
+    },
+    uploadAfter(res, done, loading, column) {
+      this.excelBox = false;
+      let myError = res.toString();//转字符串
+      myError = myError.replace("Error: ", "") // 去掉前面的" Error: "
+      this.$message.success(myError);
+      this.refreshChange();
+      loading = false;
+      done();
+    },
+    filterNode(value, data) {
+      console.log(value, data)
+      if (!value) return true;
+      return data.label.indexOf(value) !== -1;
+    },
+    nodeClick(data) {
+      this.search.corpsTypeId = data.value
+      this.page.currentPage = 1;
+      this.onLoad(this.page, this.search);
+    },
+    getAllWorkDicts() {
+      //状态
+      // this.getWorkDicts("client_status").then(res => {
+      //   this.findObject(this.option.column, "status").dicData = res.data.data;
+      // });
+      getCorpType({ corpType: 'KH' }).then(res => {
+        this.treeData = res.data.data
+      });
+      // customerList({ corpType: "KH" }).then(res => {
+      //   this.findObject(this.option4.column, "parentId").dicData = res.data.data.records
+      // });
+      this.$refs.crud.init();
     },
-    components: {
-      detailsPage,
-      detailsInfo,
-      corpType
+    searchCriteriaSwitch(type) {
+      if (type) {
+        this.option.height = this.option.height - 46;
+      } else {
+        this.option.height = this.option.height + 46;
+      }
+      this.$refs.crud.getTableHeight();
     },
-    async created() {
-      this.option = await this.getColumnData(this.getColumnName(277.2), option);
-      this.option.height = window.innerHeight - 330;
+    cellStyle() {
+      return "padding:0;height:40px;";
+    },
+    //点击搜索按钮触发
+    searchChange(params, done) {
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.search);
+    },
+    newAdd() {
+      this.show = false;
+    },
+    onLoad(page, params = {}) {
+      let data = this.deepClone(Object.assign(params, this.search));
+      if (data.date && data.date.length > 0) {
+        data.startTime = data.date[0]
+        data.endTime = data.date[1]
+      }
+      delete data.date
+      data.corpType = "KH"
+      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;
+        })
+        .finally(() => {
+          pageStatistics(data).then(res => {
+            this.form = res.data.data
+          })
+          this.loading = false;
+        });
+    },
+    addCorpType() {
+      // this.$refs["corpType"].validate((valid, done) => {
+      //   done();
+      //   if (valid) {
+      //     addCorpType({ ...this.form4, corpType: 'KH', status: 0 })
+      //       .then(res => {
+      //         this.$message.success("保存成功");
+      //         this.getAllWorkDicts()
+      //         this.corpTypeVisible = false
+      //       })
+      //   } else {
+      //     return false;
+      //   }
+      // });
       this.getAllWorkDicts()
+      this.corpTypeVisible = false
     },
-    activated() {
-      this.$refs.crud.refreshTable();
+    corpTypeClosed() {
+      // this.reload = Math.random();
+      // this.form4 = this.$options.data().form4
     },
-    methods: {
-      derivation() {
-        window.open(
-            `/api/blade-client/partsCorps/export-template?${this.website.tokenHeader
-            }=${getToken()}`
-        );
-      },
-      //导出
-      outExport() {
-        let config = {params: {...this.search}}
-        if (config.params) {
-          for (const propName of Object.keys(config.params)) {
-            const value = config.params[propName];
-            if (value !== null && typeof (value) !== "undefined") {
-              if (value instanceof Array) {
-                for (const key of Object.keys(value)) {
-                  let params = propName + '[' + key + ']';
-                  config.params[params] = value[key]
-                }
-                delete config.params[propName]
-              }
-            }
-          }
-        }
-        const routeData = this.$router.resolve({
-          path: '/api/blade-client/partsCorps/export-desc',      //跳转目标窗口的地址
-          query: {
-            ...config.params,    //括号内是要传递给新窗口的参数
-            identification:this.url
+    viewInfo(row) {
+      this.show = true;
+      this.detailData = {
+        id: row.id,
+      };
+      this.showInfo = false;
+    },
+    editOpen(row, status) {
+      this.showInfo = true;
+      this.detailData = {
+        id: row.id,
+        status: status
+      };
+      this.show = false;
+    },
+    currentChange(val) {
+      this.page.currentPage = val;
+    },
+    sizeChange(val) {
+      this.page.currentPage = 1;
+      this.page.pageSize = val;
+    },
+    rowDel(row, index, done) {
+      this.$confirm("确定删除数据?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        remove({ id: row.id, corpType: "KH" }).then(res => {
+          if (res.data.code == 200) {
+            this.$message({
+              type: "success",
+              message: "删除成功!"
+            });
+            this.onLoad(this.page, this.search);
           }
-        })
-        window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);
-      },
-      uploadBefore(file, done, loading) {
-        done();
-        loading = true;
-      },
-      uploadAfter(res, done, loading, column) {
-        this.excelBox = false;
-        let myError=res.toString();//转字符串
-        myError=myError.replace("Error: ","") // 去掉前面的" Error: "
-        this.$message.success(myError);
-        this.refreshChange();
-        loading = false;
-        done();
-      },
-      filterNode(value, data) {
-        console.log(value, data)
-        if (!value) return true;
-        return data.label.indexOf(value) !== -1;
-      },
-      nodeClick(data) {
-        this.search.corpsTypeId = data.value
-        this.page.currentPage = 1;
-        this.onLoad(this.page, this.search);
-      },
-      getAllWorkDicts() {
-        //状态
-        // this.getWorkDicts("client_status").then(res => {
-        //   this.findObject(this.option.column, "status").dicData = res.data.data;
-        // });
-        getCorpType({ corpType: 'KH' }).then(res => {
-          this.treeData = res.data.data
         });
-        // customerList({ corpType: "KH" }).then(res => {
-        //   this.findObject(this.option4.column, "parentId").dicData = res.data.data.records
-        // });
-        this.$refs.crud.init();
-      },
-      searchCriteriaSwitch(type) {
-        if (type) {
-          this.option.height = this.option.height - 46;
-        } else {
-          this.option.height = this.option.height + 46;
-        }
-        this.$refs.crud.getTableHeight();
-      },
-      cellStyle() {
-        return "padding:0;height:40px;";
-      },
-      //点击搜索按钮触发
-      searchChange(params, done) {
-        this.page.currentPage = 1;
-        this.onLoad(this.page, params);
-        done();
-      },
-      refreshChange() {
-        this.onLoad(this.page, this.search);
-      },
-      newAdd() {
-        this.show = false;
-      },
-      onLoad(page, params = {}) {
-        let data = this.deepClone(Object.assign(params, this.search));
-        if (data.date && data.date.length > 0) {
-          data.startTime = data.date[0]
-          data.endTime = data.date[1]
-        }
-        delete data.date
-        data.corpType = "KH"
-        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;
-          })
-          .finally(() => {
-            pageStatistics(data).then(res => {
-              this.form = res.data.data
-            })
-            this.loading = false;
-          });
-      },
-      addCorpType() {
-        // this.$refs["corpType"].validate((valid, done) => {
-        //   done();
-        //   if (valid) {
-        //     addCorpType({ ...this.form4, corpType: 'KH', status: 0 })
-        //       .then(res => {
-        //         this.$message.success("保存成功");
-        //         this.getAllWorkDicts()
-        //         this.corpTypeVisible = false
-        //       })
-        //   } else {
-        //     return false;
-        //   }
-        // });
-        this.getAllWorkDicts()
-        this.corpTypeVisible = false
-      },
-      corpTypeClosed() {
-        // this.reload = Math.random();
-        // this.form4 = this.$options.data().form4
-      },
-      viewInfo(row) {
-        this.show = true;
-        this.detailData = {
-          id: row.id,
-        };
-        this.showInfo = false;
-      },
-      editOpen(row, status) {
-        this.showInfo = true;
-        this.detailData = {
-          id: row.id,
-          status: status
-        };
-        this.show = false;
-      },
-      currentChange(val) {
-        this.page.currentPage = val;
-      },
-      sizeChange(val) {
-        this.page.currentPage = 1;
-        this.page.pageSize = val;
-      },
-      rowDel(row, index, done) {
-        this.$confirm("确定删除数据?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-          remove({ id: row.id, corpType: "KH" }).then(res => {
-            if (res.data.code == 200) {
-              this.$message({
-                type: "success",
-                message: "删除成功!"
-              });
-              this.onLoad(this.page, this.search);
-            }
-          });
+      });
+    },
+    async saveColumn() {
+      const inSave = await this.saveColumnData(
+        this.getColumnName(277.2),
+        this.option
+      );
+      if (inSave) {
+        this.$nextTick(() => {
+          this.$refs.crud.doLayout();
         });
-      },
-      async saveColumn() {
-        const inSave = await this.saveColumnData(
-          this.getColumnName(277.2),
-          this.option
-        );
-        if (inSave) {
-          this.$nextTick(() => {
-            this.$refs.crud.doLayout();
-          });
-          this.$message.success("保存成功");
-          //关闭窗口
-          this.$refs.crud.$refs.dialogColumn.columnBox = false;
-        }
-      },
-      async resetColumn() {
-        this.option = option;
-        const inSave = await this.delColumnData(this.getColumnName(277.2), option);
-        if (inSave) {
-          this.$nextTick(() => {
-            this.$refs.crud.doLayout();
-          });
-          this.getAllWorkDicts()
-          this.$message.success("重置成功");
-          this.$refs.crud.$refs.dialogColumn.columnBox = false;
-        }
-      },
-      //返回列表
-      goBack() {
-        this.detailData = this.$options.data().detailData;
-        this.show = true;
-        this.showInfo = true;
-        this.onLoad(this.page, this.search);
-      },
-    }
-  }
-  </script>
-  
-  <style  lang="scss"  scoped>
-  .page-crad ::v-deep .basic-container__card {
-    height: 94.2vh;
-  }
-  
-  ::v-deep .el-form-item__error {
-    display: none !important;
-  }
-  
-  ::v-deep .el-input-group__append {
-    padding: 0 0px !important;
-  }
-  
-  .el-dialog ::v-deep .el-form-item__error {
-    display: none !important;
-  }
-  
-  .stat-td {
-    text-align: center;
-    position: relative;
+        this.$message.success("保存成功");
+        //关闭窗口
+        this.$refs.crud.$refs.dialogColumn.columnBox = false;
+      }
+    },
+    async resetColumn() {
+      this.option = option;
+      const inSave = await this.delColumnData(this.getColumnName(277.2), option);
+      if (inSave) {
+        this.$nextTick(() => {
+          this.$refs.crud.doLayout();
+        });
+        this.getAllWorkDicts()
+        this.$message.success("重置成功");
+        this.$refs.crud.$refs.dialogColumn.columnBox = false;
+      }
+    },
+    //返回列表
+    goBack() {
+      this.detailData = this.$options.data().detailData;
+      this.show = true;
+      this.showInfo = true;
+      this.onLoad(this.page, this.search);
+      this.$nextTick(() => {
+        this.$refs.crud.doLayout();
+      });
+    },
   }
+}
+</script>
   
-  .stat-img {
-    width: 95%;
-    height: 100px;
+<style  lang="scss"  scoped>
+.page-crad ::v-deep .basic-container__card {
+  height: 94.2vh;
+}
+
+::v-deep .el-form-item__error {
+  display: none !important;
+}
+
+::v-deep .el-input-group__append {
+  padding: 0 0px !important;
+}
+
+.el-dialog ::v-deep .el-form-item__error {
+  display: none !important;
+}
+
+.stat-td {
+  text-align: center;
+  position: relative;
+}
+
+.stat-img {
+  width: 95%;
+  height: 100px;
+}
+
+.stat-tip {
+  position: absolute;
+  left: 15px;
+  top: 5px;
+
+  .money {
+    color: #fff;
+    font-size: 28px;
+    text-align: left;
+    font-weight: 600;
   }
-  
-  .stat-tip {
-    position: absolute;
-    left: 15px;
-    top: 5px;
-  
-    .money {
-      color: #fff;
-      font-size: 28px;
-      text-align: left;
-      font-weight: 600;
-    }
-  
-    .title {
-      color: #fff;
-      font-size: 14px;
-      text-align: left;
-      margin-top: 5px;
-      margin-bottom: 0px;
-    }
+
+  .title {
+    color: #fff;
+    font-size: 14px;
+    text-align: left;
+    margin-top: 5px;
+    margin-bottom: 0px;
   }
-  </style>
+}
+</style>
   

src/views/tirePartsMall/statisticAnalysis/supplierTransactions/js/optionList.js

@@ -427,13 +427,13 @@ export const sellOption = {
       overHidden: true,
       index: 5
     },
-    {
-      label: "已送货",
-      prop: "deliveringAmount",
-      overHidden: true,
-      search: true,
-      index: 6
-    },
+    // {
+    //   label: "已送货",
+    //   prop: "deliveringAmount",
+    //   overHidden: true,
+    //   search: true,
+    //   index: 6
+    // },
     {
       label: "未付款",
       prop: "balanceAmount",