Browse Source

Merge branch 'dev' of http://git.echepei.com/tubao/Smart_platform_ui into dev

Qukatie 1 year ago
parent
commit
ca8657df36

+ 1 - 1
.editorconfig

@@ -3,7 +3,7 @@ root = true
 
 [*]
 indent_style = space
-indent_size = 2
+indent_size = 4
 end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true

+ 17 - 17
src/views/iosBasicData/OceanFreightImport/bills/billsDetails.vue

@@ -1266,55 +1266,55 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                 this.$refs.form.validate((valid)=>{
                     if (valid) {
                         // 判断必填项
-                        let sum = '请填写'
+                        let msgs=[]
                         if (!this.form.quantity) {
-                            sum += ` 件数`
+                            msgs.push('件数')
                         }
                         if (!this.form.packingUnit) {
-                            sum += ` 包装`
+                            msgs.push('包装')
                         }
                         if (!this.form.grossWeight) {
-                            sum += ` 毛重`
+                            msgs.push('毛重')
                         }
                         if (!this.form.measurement) {
-                            sum += ` 尺码`
+                            msgs.push('尺码')
                         }
                         if (!this.form.eta) {
-                            sum += ` ETA`
+                            msgs.push('ETA')
                         }
                         if (!this.form.teamId) {
-                            sum += ` 所属团队`
+                            msgs.push('所属团队')
                         }
                         for (let item of this.form.feeCenterListD) {
                             if (!item.corpId) {
-                                sum += ` 应收序号${item.$index + 1}往来单位`
+                                msgs.push(`应收序号${item.$index + 1}往来单位`)
                             }
                             if (!item.feeId) {
-                                sum += ` 应收序号${item.$index + 1}费用简称`
+                                msgs.push(`应收序号${item.$index + 1}费用简称`)
                             }
                             if (!item.elementsCode) {
-                                sum += ` 应收序号${item.$index + 1}核算要素`
+                                msgs.push(`应收序号${item.$index + 1}核算要素`)
                             }
                             if (!item.curCode) {
-                                sum += ` 应收序号${item.$index + 1}币种`
+                                msgs.push(`应收序号${item.$index + 1}币种`)
                             }
                         }
                         for (let item of this.form.feeCenterListC) {
                             if (!item.corpId) {
-                                sum += ` 应付序号${item.$index + 1}往来单位`
+                                msgs.push(`应付序号${item.$index + 1}往来单位`)
                             }
                             if (!item.feeId) {
-                                sum += ` 应付序号${item.$index + 1}费用简称`
+                                msgs.push(`应付序号${item.$index + 1}费用简称`)
                             }
                             if (!item.elementsCode) {
-                                sum += ` 应付序号${item.$index + 1}核算要素`
+                                msgs.push(`应付序号${item.$index + 1}核算要素`)
                             }
                             if (!item.curCode) {
-                                sum += ` 应付序号${item.$index + 1}币种`
+                                msgs.push(`应付序号${item.$index + 1}币种`)
                             }
                         }
-                        if(sum != '请填写') {
-                            this.$confirm(sum, {
+                        if(msgs.length>0) {
+                            this.$confirm(`请填写下列信息:${msgs.join(" ,")}!`, {
                                 confirmButtonText: "确定",
                                 cancelButtonText: "取消",
                                 type: "warning"

+ 1 - 1
src/views/iosBasicData/OceanFreightImport/bills/index.vue

@@ -576,7 +576,7 @@ import { getDeptTree } from "@/api/system/dept";
               expand: true,
               expandRowKeys:[],
               rowKey:'id',
-              height:'auto',
+              height:500,
               calcHeight: 30,
               tip: false,
               searchShow: true,

+ 7 - 0
src/views/iosBasicData/SeafreightExportF/bills/assembly/filescenter.vue

@@ -149,6 +149,9 @@
           detailData:{
               type:Boolean
           },
+        pid:{
+            type: Number
+        },
           assemblyForm:{
               type:Object
           },
@@ -508,7 +511,11 @@
         this.onLoad(this.page, this.query);
       },
       onLoad(page, params = {}) {
+        if(!this.assemblyForm.id) return
         this.loading = true;
+        params.pid=this.assemblyForm.id
+        params.businessType=this.assemblyForm.businessType
+        console.log(this.assemblyForm,  "id", this.pid, "assemblyForm.id", this.assemblyForm.id, "billNo", this.assemblyForm.billNo)
         filescenterList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
           const data = res.data.data;
           this.page.total = data.total;

+ 23 - 19
src/views/iosBasicData/SeafreightExportF/bills/billsDetails.vue

@@ -255,7 +255,7 @@
                                     <edicode :assemblyForm="form" :detailData="detailData"></edicode>
                                 </el-tab-pane>
                                 <el-tab-pane label="文件中心" name="seventh">
-                                    <filescenter :assemblyForm="form" :detailData="detailData"></filescenter>
+                                    <filescenter ref="filescenter" :assemblyForm="form" :pid="form.id" :detailData="detailData"></filescenter>
                                 </el-tab-pane>
                             </el-tabs>
                         </basic-container>
@@ -1421,55 +1421,55 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                 this.$refs.form.validate((valid)=>{
                     if (valid) {
                         // 判断必填项
-                        let sum = '请填写'
+                        let msgs=[]
                         if (!this.form.quantity) {
-                            sum += ` 件数`
+                            msgs.push('件数')
                         }
                         if (!this.form.packingUnit) {
-                            sum += ` 包装`
+                            msgs.push('包装')
                         }
                         if (!this.form.grossWeight) {
-                            sum += ` 毛重`
+                            msgs.push('毛重')
                         }
                         if (!this.form.measurement) {
-                            sum += ` 尺码`
+                            msgs.push('尺码')
                         }
                         if (!this.form.etd) {
-                            sum += ` ETD`
+                            msgs.push('ETD')
                         }
                         if (!this.form.teamId) {
-                            sum += ` 所属团队`
+                            msgs.push('所属团队')
                         }
                         for (let item of this.form.feeCenterListD) {
                             if (!item.corpId) {
-                                sum += ` 应收序号${item.$index + 1}往来单位`
+                                msgs.push(`应收序号${item.$index + 1}往来单位`)
                             }
                             if (!item.feeId) {
-                                sum += ` 应收序号${item.$index + 1}费用简称`
+                                msgs.push(`应收序号${item.$index + 1}费用简称`)
                             }
                             if (!item.elementsId) {
-                                sum += ` 应收序号${item.$index + 1}核算要素`
+                                msgs.push(`应收序号${item.$index + 1}核算要素`)
                             }
                             if (!item.curCode) {
-                                sum += ` 应收序号${item.$index + 1}币种`
+                                msgs.push(`应收序号${item.$index + 1}币种`)
                             }
                         }
                         for (let item of this.form.feeCenterListC) {
                             if (!item.corpId) {
-                                sum += ` 应付序号${item.$index + 1}往来单位`
+                                msgs.push(`应付序号${item.$index + 1}往来单位`)
                             }
                             if (!item.feeId) {
-                                sum += ` 应付序号${item.$index + 1}费用简称`
+                                msgs.push(`应付序号${item.$index + 1}费用简称`)
                             }
                             if (!item.elementsId) {
-                                sum += ` 应付序号${item.$index + 1}核算要素`
+                                msgs.push(`应付序号${item.$index + 1}核算要素`)
                             }
                             if (!item.curCode) {
-                                sum += ` 应付序号${item.$index + 1}币种`
+                                msgs.push(`应付序号${item.$index + 1}币种`)
                             }
                         }
-                        if(sum != '请填写') {
-                            this.$confirm(sum, {
+                        if(msgs.length>0) {
+                            this.$confirm(`请填写下列信息:${msgs.join(" ,")}!`, {
                                 confirmButtonText: "确定",
                                 cancelButtonText: "取消",
                                 type: "warning"
@@ -1693,7 +1693,11 @@ import {editypesList} from "@/api/iosBasicData/editypes";
             // 详情接口
             async billsDetailfun(id){
                 const res = await billsDetail(id)
-                this.form = res.data.data;
+                // this.form = res.data.data;
+                this.$set(this, 'form', res.data.data)
+              //   console.log('form', this.form)
+              // console.log(this.$refs)
+              //   this.$refs.filescenter.onload()
                 this.copyFormData = JSON.parse(JSON.stringify(res.data.data))
                 // 如果已经请核就禁用按钮
                 // if (this.form.status == 1 || this.form.status == 2 || this.form.status == 3) {

+ 1 - 1
src/views/iosBasicData/SeafreightExportF/bills/index.vue

@@ -577,7 +577,7 @@ import { getDeptTree } from "@/api/system/dept";
             expand: true,
             expandRowKeys:[],
             rowKey:'id',
-          height:'auto',
+          height:500,
           calcHeight: 30,
           tip: false,
           searchShow: true,

+ 7 - 7
src/views/iosBasicData/accounts/accountsDetails.vue

@@ -43,21 +43,21 @@
         methods:{
             // 大保存
             bigSavefun(){
-                let sum = '请填写'
+                let msgs=[]
                 if (!this.form.code) {
-                    sum += '科目编码 '
+                    msgs.push('科目编码')
                 }
                 if (!this.form.cnName) {
-                    sum += '科目名称 '
+                    msgs.push('科目名称')
                 }
                 if (!this.form.cnName) {
-                    sum += '科目英文 '
+                    msgs.push('科目英文')
                 }
                 if (!this.form.dc) {
-                    sum += '方向 '
+                    msgs.push('方向')
                 }
-                if (sum != '请填写') {
-                    this.$alert(sum, '提示', {
+                if(msgs.length>0) {
+                    this.$alert(`请填写下列信息:${msgs.join(" ,")}!`, '提示', {
                         confirmButtonText: '确定',
                     });
                     return

+ 6 - 6
src/views/iosBasicData/accounts/index.vue

@@ -524,18 +524,18 @@ import {
         },
         // 大保存
         bigSavefun(){
-            let sum = '请填写'
+            let msgs=[]
             if (!this.form.code) {
-                sum += '科目编码 '
+                msgs.push('科目编码')
             }
             if (!this.form.cnName) {
-                sum += '科目名称 '
+                msgs.push('科目名称')
             }
             if (!this.form.dc) {
-                sum += '方向 '
+                msgs.push('方向')
             }
-            if (sum != '请填写') {
-                this.$alert(sum, '提示', {
+            if(msgs.length>0) {
+                this.$alert(`请填写下列信息:${msgs.join(" ,")}!`, '提示', {
                     confirmButtonText: '确定',
                 });
                 return

+ 13 - 4
src/views/iosBasicData/rateManagement/detailsPage.vue

@@ -216,10 +216,10 @@ export default {
                   dictValue: "月汇率",
                   dictKey: 1
                 },
-                // {
-                //   dictValue: "日汇率",
-                //   dictKey: 2
-                // }
+                {
+                  dictValue: "日汇率",
+                  dictKey: 2
+                }
               ],
               span: 6,
             },
@@ -582,6 +582,15 @@ export default {
               };
               this.dataList.push(data);
             }
+              typeSave({
+                  ...this.form,
+                  curExrateList: this.dataList
+              }).then(res => {
+                  this.$message.success("操作成功");
+                  this.getDetail(res.data.data.id);
+              }).finally(() => {
+                  this.loadingBtn = false;
+              });
           }
         }
       });

+ 357 - 350
src/views/tirePartsMall/financialManagement/saleDetail/index.vue

@@ -12,7 +12,7 @@
             :cell-style="cellStyle"
             @search-change="searchChange"
             @resetColumn="resetColumnTwo('crud', 'option', 'optionList', 337)"
-            @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 337)" >
+            @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 337)">
             <template slot="menuLeft">
                 <el-button type="warning" icon="el-icon-download" size="small" @click="outExport">导出</el-button>
             </template>
@@ -27,7 +27,7 @@
                         v-for="(item,index) in commodityLabel" :key="index"
                         :prop="item.prop"
                         show-overflow-tooltip
-                        :label="item.label" />
+                        :label="item.label"/>
                 </el-table>
             </template>
             <template slot="customerNameSearch">
@@ -102,10 +102,10 @@
                 </search-query>
             </template>
             <template slot="isContainSearch">
-                <el-checkbox v-model="query.isContain" :true-label="1" :false-label="0" ></el-checkbox>
+                <el-checkbox v-model="query.isContain" :true-label="1" :false-label="0"></el-checkbox>
             </template>
-            <template slot="status" slot-scope="{ row }" >
-                <span>{{row.status}}</span>
+            <template slot="status" slot-scope="{ row }">
+                <span>{{ row.status }}</span>
             </template>
         </avue-crud>
     </basic-container>
@@ -115,370 +115,377 @@
 
 import {statisticsSaleDetail, statisticsSaleDetailSum} from "@/api/saleDetail";
 import {defaultDate3} from "@/util/date";
-import {getList as KHgetList } from '@/api/tirePartsMall/basicData/customerInformation/index'
+import {getList as KHgetList} from '@/api/tirePartsMall/basicData/customerInformation/index'
 import {getList as SPgetList} from '@/api/tirePartsMall/basicData/commodityInformation/index'
-import {getList as YWYgetList} from "@/api/system/user"
 import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
 import {getWorkDicts} from "@/api/system/dictbiz";
-import { getToken } from "@/util/auth";
+import {getToken} from "@/util/auth";
 import {getSalesman} from "@/api/landTransportation";
-import { listAll } from "@/api/tirePartsMall/basicData/listingManagement";
+import {listAll} from "@/api/tirePartsMall/basicData/listingManagement";
 
 export default {
     components: {SearchQuery},
-        data(){
-            return {
-                key: 0,
-                data: [],
-                total: [],
-                query: {
-                    businesDateStart:defaultDate3()[0],
-                    businesDateEnd:defaultDate3()[1],
-                    isContain:1,
-                },
-                page: {
-                    pageSize: 10,
-                    currentPage: 1,
-                    total: 0,
-                    pageSizes: [10, 50, 100, 200, 300]
-                },
-                option: {},
-                optionList: {
-                    align: 'center',
-                    stripe: true,
-                    index: true,
-                    menu: false,
-                    height: "auto",
-                    searchSpan: 6,
-                    // searchIcon: true,
-                    // searchIndex: 2,
-                    // highlightCurrentRow: true,
-                    border:true,
-                    searchMenuSpan:12,
-                    addBtn: false,
-                    showSummary: true,
-                    summaryText: "合计",
-                    sumColumnList: [
-                        {
-                            name: 'goodsNum',
-                            type: 'sum',
-                            decimals: 0
-                        },
-                        {
-                            name: 'price',
-                            type: 'sum',
-                            decimals: 2
-                        },
-                        {
-                            name: 'subTotalMoney',
-                            type: 'sum',
-                            decimals: 2
-                        },
-                        {
-                            name: 'costprie',
-                            type: 'sum',
-                            decimals: 2
-                        },
-                        {
-                            name: 'profit',
-                            type: 'sum',
-                            decimals: 2
-                        }
-                    ],
-                    column: [{
-                        label: '客户名称',
-                        prop: 'customerName',
-                        overHidden: true,
-                        search:true,
-                        searchslot:true,
-                        searchOrder:3
-                    },{
-                        label: '业务员',
-                        prop: 'salerName',
-                        overHidden: true,
-                        search:true,
-                        searchslot:true,
-                        searchOrder:4
-                    },{
-                        label: '仓库',
-                        prop: 'storageName',
-                        overHidden: true,
-                    },{
-                        label: '销售单号',
-                        prop: 'ordNo',
-                        overHidden: true,
-                        search: true,
-                        searchOrder:5
-                    },{
-                        label: '业务日期',
-                        prop: 'businesDate',
-                        overHidden: true,
-                    },{
-                        label: '结算状态',
-                        prop: 'actualPaymentStatus',
-                        overHidden: true,
-                        search:true,
-                        searchslot:true,
-                        searchOrder:7
-                    },{
-                        label: '品牌',
-                        prop: 'brandName',
-                        overHidden: true,
-                        search:true,
-                        searchslot:true,
-                        searchOrder:6.1,
-                    },{
-                      label: '商品编码',
-                      prop: 'code',
-                      overHidden: true,
-                      search:true,
-                      searchslot:true,
-                      searchOrder:6
-                    },{
-                        label: '商品名称',
-                        prop: 'goodsName',
-                        overHidden: true,
-                        search:true,
-                        searchslot:true,
-                        searchOrder:6
-                    },{
-                        label: '规格型号',
-                        prop: 'propertyName',
-                        overHidden: true,
-                    },{
-                        label: '花纹',
-                        prop: 'pattern',
-                        overHidden: true,
-                    },{
-                        label: '数量',
-                        prop: 'goodsNum',
-                        overHidden: true,
-                    },{
-                        label: '价格',
-                        prop: 'price',
-                        overHidden: true,
-                    },{
-                        label: '金额',
-                        prop: 'subTotalMoney',
-                        overHidden: true,
-                    },{
-                        label: '成本',
-                        prop: 'costprie',
-                        overHidden: true,
-                    },{
-                        label: '毛利',
-                        prop: 'profit',
-                        overHidden: true,
-                    },{
-                        label: '业务开始',
-                        prop: 'businesDateStart',
-                        overHidden: true,
-                        search:true,
-                        hide: true,
-                        searchOrder:1,
-                        type: "date",
-                        format: "yyyy-MM-dd",
-                        valueFormat: "yyyy-MM-dd",
-                    },{
-                        label: '业务结束',
-                        prop: 'businesDateEnd',
-                        overHidden: true,
-                        search:true,
-                        hide: true,
-                        searchOrder:2,
-                        type: "date",
-                        format: "yyyy-MM-dd",
-                        valueFormat: "yyyy-MM-dd",
-                    },{
-                        label: '单据状态',
-                        prop: 'status',
-                        overHidden: true,
-                        search:true,
-                        searchslot:true,
-                        searchOrder:8
-                    },{
-                        label: '包含未发货',
-                        prop: 'isContain',
-                        overHidden: true,
-                        hide:true,
-                        search:true,
-                        searchslot:true,
-                        searchOrder:9
-                    }]
-                },
-                customerData:[], // 客户数据
-                brandData:[], // 品牌数据
-                goodsData:[], // 商品名称
-                salerData:[], // 业务员
-                actualPaymentStatusData:[], // 结算状态
-                statusData:[], // 单据状态
-                commodityData:[], // 合计数据
-                // 合计的配置项
-                commodityLabel:[{
-                    id:1,
-                    label:'销售数量',
-                    prop:'goodsSum'
-                },{
-                    id:2,
-                    label:'销售金额',
-                    prop:'amount'
-                },{
-                    id:3,
-                    label:'销售成本',
-                    prop:'costprie'
-                },{
-                    id:4,
-                    label:'销售毛利',
-                    prop:'profit'
-                },{
-                    id:5,
-                    label:'已取消数量',
-                    prop:'goodsSumCancellation'
-                },{
-                    id:6,
-                    label:'已取消金额',
-                    prop:'amountCancellation'
-                },{
-                    id:7,
-                    label:'已取消成本',
-                    prop:'costprieCancellation'
+    data() {
+        return {
+            key: 0,
+            data: [],
+            total: [],
+            query: {
+                businesDateStart: defaultDate3()[0],
+                businesDateEnd: defaultDate3()[1],
+                isContain: 1,
+            },
+            page: {
+                pageSize: 10,
+                currentPage: 1,
+                total: 0,
+                pageSizes: [10, 50, 100, 200, 300]
+            },
+            option: {},
+            optionList: {
+                align: 'center',
+                stripe: true,
+                index: true,
+                menu: false,
+                height: "auto",
+                searchSpan: 6,
+                // searchIcon: true,
+                // searchIndex: 2,
+                // highlightCurrentRow: true,
+                border: true,
+                searchMenuSpan: 12,
+                addBtn: false,
+                showSummary: true,
+                summaryText: "合计",
+                sumColumnList: [
+                    {
+                        name: 'goodsNum',
+                        type: 'sum',
+                        decimals: 0
+                    },
+                    {
+                        name: 'price',
+                        type: 'sum',
+                        decimals: 2
+                    },
+                    {
+                        name: 'subTotalMoney',
+                        type: 'sum',
+                        decimals: 2
+                    },
+                    {
+                        name: 'costprie',
+                        type: 'sum',
+                        decimals: 2
+                    },
+                    {
+                        name: 'profit',
+                        type: 'sum',
+                        decimals: 2
+                    }
+                ],
+                column: [{
+                    label: '客户名称',
+                    prop: 'customerName',
+                    overHidden: true,
+                    search: true,
+                    searchslot: true,
+                    searchOrder: 3
+                }, {
+                    label: '业务员',
+                    prop: 'salerName',
+                    overHidden: true,
+                    search: true,
+                    searchslot: true,
+                    searchOrder: 4
+                }, {
+                    label: '仓库',
+                    prop: 'storageName',
+                    overHidden: true,
+                }, {
+                    label: '销售单号',
+                    prop: 'ordNo',
+                    overHidden: true,
+                    search: true,
+                    searchOrder: 5
+                }, {
+                    label: '业务日期',
+                    prop: 'businesDate',
+                    overHidden: true,
+                }, {
+                    label: '结算状态',
+                    prop: 'actualPaymentStatus',
+                    overHidden: true,
+                    search: true,
+                    searchslot: true,
+                    searchOrder: 7
+                }, {
+                    label: '品牌',
+                    prop: 'brandName',
+                    overHidden: true,
+                    search: true,
+                    searchslot: true,
+                    searchOrder: 6.1,
+                }, {
+                    label: '商品编码',
+                    prop: 'code',
+                    overHidden: true,
+                    search: true,
+                    searchslot: true,
+                    searchOrder: 6
+                }, {
+                    label: '商品名称',
+                    prop: 'goodsName',
+                    overHidden: true,
+                    search: true,
+                    searchslot: true,
+                    searchOrder: 6
+                }, {
+                    label: '规格型号',
+                    prop: 'propertyName',
+                    overHidden: true,
+                }, {
+                    label: '花纹',
+                    prop: 'pattern',
+                    overHidden: true,
+                }, {
+                    label: '数量',
+                    prop: 'goodsNum',
+                    overHidden: true,
+                }, {
+                    label: '价格',
+                    prop: 'price',
+                    overHidden: true,
+                }, {
+                    label: '运费',
+                    prop: 'freight',
+                    overHidden: true,
+                }, {
+                    label: '金额',
+                    prop: 'subTotalMoney',
+                    overHidden: true,
                 },{
-                    id:8,
-                    label:'已取消毛利',
-                    prop:'profitCancellation'
-                }],
+                    label: '余额',
+                    prop: 'balanceAmount',
+                    overHidden: true,
+                }, {
+                    label: '成本',
+                    prop: 'costprie',
+                    overHidden: true,
+                }, {
+                    label: '毛利',
+                    prop: 'profit',
+                    overHidden: true,
+                }, {
+                    label: '业务开始',
+                    prop: 'businesDateStart',
+                    overHidden: true,
+                    search: true,
+                    hide: true,
+                    searchOrder: 1,
+                    type: "date",
+                    format: "yyyy-MM-dd",
+                    valueFormat: "yyyy-MM-dd",
+                }, {
+                    label: '业务结束',
+                    prop: 'businesDateEnd',
+                    overHidden: true,
+                    search: true,
+                    hide: true,
+                    searchOrder: 2,
+                    type: "date",
+                    format: "yyyy-MM-dd",
+                    valueFormat: "yyyy-MM-dd",
+                }, {
+                    label: '单据状态',
+                    prop: 'status',
+                    overHidden: true,
+                    search: true,
+                    searchslot: true,
+                    searchOrder: 8
+                }, {
+                    label: '包含未发货',
+                    prop: 'isContain',
+                    overHidden: true,
+                    hide: true,
+                    search: true,
+                    searchslot: true,
+                    searchOrder: 9
+                }]
+            },
+            customerData: [], // 客户数据
+            brandData: [], // 品牌数据
+            goodsData: [], // 商品名称
+            salerData: [], // 业务员
+            actualPaymentStatusData: [], // 结算状态
+            statusData: [], // 单据状态
+            commodityData: [], // 合计数据
+            // 合计的配置项
+            commodityLabel: [{
+                id: 1,
+                label: '销售数量',
+                prop: 'goodsSum'
+            }, {
+                id: 2,
+                label: '销售金额',
+                prop: 'amount'
+            }, {
+                id: 3,
+                label: '销售成本',
+                prop: 'costprie'
+            }, {
+                id: 4,
+                label: '销售毛利',
+                prop: 'profit'
+            }, {
+                id: 5,
+                label: '已取消数量',
+                prop: 'goodsSumCancellation'
+            }, {
+                id: 6,
+                label: '已取消金额',
+                prop: 'amountCancellation'
+            }, {
+                id: 7,
+                label: '已取消成本',
+                prop: 'costprieCancellation'
+            }, {
+                id: 8,
+                label: '已取消毛利',
+                prop: 'profitCancellation'
+            }],
+        }
+    },
+    async created() {
+        this.option = await this.getColumnData(this.getColumnName(337), this.optionList);
+    },
+    methods: {
+        cellStyle({row, rowIndex}) {
+            if (row.status == '已取消') {
+                return 'color: red';
             }
+            return
         },
-        async created() {
-            this.option = await this.getColumnData(this.getColumnName(337), this.optionList);
-        },
-        methods:{
-            cellStyle({row,rowIndex}){
-                if (row.status == '已取消') {
-                    return 'color: red';
-                }
-                return
-            },
-            //导出
-            outExport() {
-                let config = { params: { ...this.query } }
-                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]
+        //导出
+        outExport() {
+            let config = {params: {...this.query}}
+            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-sales-part/statistics/saleDetailExport',   //跳转目标窗口的地址
-                    query: {
-                        ...config.params,    //括号内是要传递给新窗口的参数
-                    }
-                })
-                window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);
-            },
-            // 获取品牌数据
-            listAllfun(){
-                listAll().then(res=>{
-                    this.brandData = res.data.data
-                })
-            },
-            // 获取客户数据
-            KHgetListfun(cname){
-                KHgetList({current: 1, size: 20, corpType: 'KH', cname:cname?cname:null}).then(res=>{
-                    this.customerData = res.data.data.records
-                })
-            },
-            // 获取业务员数据
-            YWYgetListfun(realName){
-                // YWYgetList(1,10,{realName:realName?realName:null}).then(res=>{
-                //     this.salerData = res.data.data.records
-                // })
-                getSalesman().then(res=>{
-                    this.salerData = res.data.data
-                })
-            },
-            // 获取商品数据
-            SPgetListfun(cname){
-                SPgetList({current: 1, size: 20, cname:cname?cname:null}).then(res=>{
-                    this.goodsData = res.data.data.records
-                })
-            },
-            // 结算状态
-            actualPaymentWorkDictsfun(){
-                getWorkDicts('settlement_Status').then(res=>{
-                    this.actualPaymentStatusData = res.data.data
-                })
-            },
-            // 单据状态
-            statusWorkDictsfun(){
-                getWorkDicts('sales_Status').then(res=>{
-                    this.statusData = res.data.data
-                })
-            },
-            // 下拉回调
-            corpChange(value,name) {
-                this.$set(this.query,name,value)
-            },
-            //搜索
-            searchChange(params, done) {
-                this.query = params;
-                this.onLoad(this.page, params)
-                done();
-            },
-            // 获取列表数据
-            onLoad(page, params = {}) {
-                let queryParams = {
-                    size: page.pageSize,
-                    current: page.currentPage,
-                    ...Object.assign(params, this.query)
+            }
+            const routeData = this.$router.resolve({
+                path: '/api/blade-sales-part/statistics/saleDetailExport',   //跳转目标窗口的地址
+                query: {
+                    ...config.params,    //括号内是要传递给新窗口的参数
                 }
-                statisticsSaleDetail(queryParams).then(res => {
-                    this.data = res.data.data.records
-                    this.page.total = res.data.data.total
-                    // this.option.height = window.innerHeight - 230;
-                    // generalLedgerTotal(queryParams).then(res=>{
-                    //     this.total = res.data.data
-                    // })
-                    statisticsSaleDetailSum({...Object.assign(params, this.query)}).then(re=>{
-                        this.commodityData = [re.data.data]
+            })
+            window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);
+        },
+        // 获取品牌数据
+        listAllfun() {
+            listAll().then(res => {
+                this.brandData = res.data.data
+            })
+        },
+        // 获取客户数据
+        KHgetListfun(cname) {
+            KHgetList({current: 1, size: 20, corpType: 'KH', cname: cname ? cname : null}).then(res => {
+                this.customerData = res.data.data.records
+            })
+        },
+        // 获取业务员数据
+        YWYgetListfun(realName) {
+            // YWYgetList(1,10,{realName:realName?realName:null}).then(res=>{
+            //     this.salerData = res.data.data.records
+            // })
+            getSalesman().then(res => {
+                this.salerData = res.data.data
+            })
+        },
+        // 获取商品数据
+        SPgetListfun(cname) {
+            SPgetList({current: 1, size: 20, cname: cname ? cname : null}).then(res => {
+                this.goodsData = res.data.data.records
+            })
+        },
+        // 结算状态
+        actualPaymentWorkDictsfun() {
+            getWorkDicts('settlement_Status').then(res => {
+                this.actualPaymentStatusData = res.data.data
+            })
+        },
+        // 单据状态
+        statusWorkDictsfun() {
+            getWorkDicts('sales_Status').then(res => {
+                this.statusData = res.data.data
+            })
+        },
+        // 下拉回调
+        corpChange(value, name) {
+            this.$set(this.query, name, value)
+        },
+        //搜索
+        searchChange(params, done) {
+            this.query = params;
+            this.onLoad(this.page, params)
+            done();
+        },
+        // 获取列表数据
+        onLoad(page, params = {}) {
+            let queryParams = {
+                size: page.pageSize,
+                current: page.currentPage,
+                ...Object.assign(params, this.query)
+            }
+            statisticsSaleDetail(queryParams).then(res => {
+                this.data = res.data.data.records
+                this.page.total = res.data.data.total
+                // this.option.height = window.innerHeight - 230;
+                // generalLedgerTotal(queryParams).then(res=>{
+                //     this.total = res.data.data
+                // })
+                statisticsSaleDetailSum({...Object.assign(params, this.query)}).then(re => {
+                    this.commodityData = [re.data.data]
 
-                    })
                 })
-            },
-            //自定义列保存
-            async saveColumnTwo(ref, option, optionBack, code) {
-                /**
-                 * 已定义全局方法,直接使用,saveColumnData保存列数据方法,参数传值(表格名称,当前表格的option数据)
-                 * 已定义全局方法,直接使用,getColumnName方法用来获取枚举值,参数根据自己定义的code值获取中文名
-                 * 一定要执行异步操作,要等接口成功返回,才能执行下一行代码
-                 */
-                const inSave = await this.saveColumnData(this.getColumnName(code), this[option]);
-                if (inSave) {
-                    this.$message.success("保存成功");
-                    //关闭窗口
-                    this.$refs[ref].$refs.dialogColumn.columnBox = false;
-                }
-            },
-            //自定义列重置
-            async resetColumnTwo(ref, option, optionBack, code) {
-                this[option] = this[optionBack];
-                const inSave = await this.delColumnData(this.getColumnName(code), this[optionBack]);
-                if (inSave) {
-                    this.$message.success("重置成功");
-                    this.$refs[ref].$refs.dialogColumn.columnBox = false;
-                }
-            },
+            })
+        },
+        //自定义列保存
+        async saveColumnTwo(ref, option, optionBack, code) {
+            /**
+             * 已定义全局方法,直接使用,saveColumnData保存列数据方法,参数传值(表格名称,当前表格的option数据)
+             * 已定义全局方法,直接使用,getColumnName方法用来获取枚举值,参数根据自己定义的code值获取中文名
+             * 一定要执行异步操作,要等接口成功返回,才能执行下一行代码
+             */
+            const inSave = await this.saveColumnData(this.getColumnName(code), this[option]);
+            if (inSave) {
+                this.$message.success("保存成功");
+                //关闭窗口
+                this.$refs[ref].$refs.dialogColumn.columnBox = false;
+            }
+        },
+        //自定义列重置
+        async resetColumnTwo(ref, option, optionBack, code) {
+            this[option] = this[optionBack];
+            const inSave = await this.delColumnData(this.getColumnName(code), this[optionBack]);
+            if (inSave) {
+                this.$message.success("重置成功");
+                this.$refs[ref].$refs.dialogColumn.columnBox = false;
+            }
+        },
 
-        }
     }
+}
 </script>
 
 <style scoped>