修改中电大件禅道问题

src/api/landTransportation/index.js

@@ -302,6 +302,17 @@ export function getSalesman(data) {
         }
     })
 }
+//查询业务员
+export function getSalesman2(data) {
+    return request({
+        url: '/api/blade-user/userList',
+        method: 'get',
+        params:{
+            roleAlias:'业务员',
+            ...data
+        }
+    })
+}
 //批量提交调度
 export function dispatchBatch(data) {
     return request({

src/views/iosBasicData/ComputationCenter/settlementDetails.vue

@@ -839,7 +839,7 @@ export default {
                     finstlbillsSubmit(this.form).then(res => {
                         this.$message.success('操作成功');
                         this.finstlbillsDetailfun(res.data.data.id)
-                    }).finally(() => {
+                    }).catch(() => {
                         this.saveLoading = false
                     })
                 }
@@ -887,6 +887,9 @@ export default {
                 })
                 this.bcorpsbankListfun() // 查银行数据
             }).finally(() => {
+                setTimeout(() => {
+                    this.saveLoading = false
+                }, 500);
                 this.pageLoading = false
             })
         },
@@ -1234,8 +1237,8 @@ export default {
             this.amountSubUsdSum = 0
             if (list.length) {
                 list.forEach(e => {
-                    this.amountSubSum += Number(e.currentStlAmountRMB?e.currentStlAmountRMB:0)
-                    this.amountSubUsdSum += Number(e.currentStlAmountUSD?e.currentStlAmountUSD:0)
+                    this.amountSubSum += Number(e.currentStlAmountRMB ? e.currentStlAmountRMB : 0)
+                    this.amountSubUsdSum += Number(e.currentStlAmountUSD ? e.currentStlAmountUSD : 0)
                 })
             }
             this.handleSelectionData = list

src/views/iosBasicData/OceanFreightImport/bills/billsDetails.vue

@@ -370,7 +370,7 @@ export default {
                 issueType: 'ORI', // 签单方式 默认 正本
                 mpaymode: 'PP', // 主单付费方式 默认PP
                 hpaymode: 'PP', // 分单付费方式 默认 PP
-                loadType: 'FCL', // 装箱方式默认整箱
+                loadType:JSON.parse(localStorage.getItem('saber-tenantId')).content=='409341'?'FCL':'整箱', // 装箱方式默认整箱
                 srcType: 'OWN', // 业务来源默认公司   来源 内容 默认登录人所属公司
                 numberOfObl: 'THREE', // 正本份数 默认 THREE
                 numberOfCopy: 'THREE', // 副本份数 默认 THREE
@@ -404,7 +404,7 @@ export default {
                 issueType: 'ORI', // 签单方式 默认 正本
                 mpaymode: 'PP', // 主单付费方式 默认PP
                 hpaymode: 'PP', // 分单付费方式 默认 PP
-                loadType: 'FCL', // 装箱方式默认整箱
+                loadType: JSON.parse(localStorage.getItem('saber-tenantId')).content=='409341'?'FCL':'整箱', // 装箱方式默认整箱
                 srcType: 'OWN', // 业务来源默认公司   来源 内容 默认登录人所属公司
                 numberOfObl: 'THREE', // 正本份数 默认 THREE
                 numberOfCopy: 'THREE', // 副本份数 默认 THREE

src/views/iosBasicData/SeafreightExportF/bills/billsDetails.vue

@@ -400,7 +400,7 @@ export default {
                 issueType: "ORI", // 签单方式 默认 正本提单
                 mpaymode: 'PP', // 主单付费方式 默认PP
                 hpaymode: 'PP', // 分单付费方式 默认 PP
-                loadType: 'FCL', // 装箱方式默认整箱
+                loadType: JSON.parse(localStorage.getItem('saber-tenantId')).content=='409341'?'FCL':'整箱', // 装箱方式默认整箱
                 srcType: 'OWN', // 业务来源默认公司   来源 内容 默认登录人所属公司
                 numberOfObl: 'THREE', // 正本份数 默认 THREE
                 numberOfCopy: 'THREE', // 副本份数 默认 THREE
@@ -440,7 +440,7 @@ export default {
                 issueType: "ORI", // 签单方式 默认 正本提单
                 mpaymode: 'PP', // 主单付费方式 默认PP
                 hpaymode: 'PP', // 分单付费方式 默认 PP
-                loadType: 'FCL', // 装箱方式默认整箱
+                loadType:JSON.parse(localStorage.getItem('saber-tenantId')).content=='409341'?'FCL':'整箱', // 装箱方式默认整箱
                 srcType: 'OWN', // 业务来源默认公司   来源 内容 默认登录人所属公司
                 numberOfObl: 'THREE', // 正本份数 默认 THREE
                 numberOfCopy: 'THREE', // 副本份数 默认 THREE

src/views/iosBasicData/fininvoicesApplyfor/fininvoicesDetails.vue

@@ -1370,7 +1370,6 @@ export default {
         // 保存接口
         fininvoicesSubmitfun(obj) {
             fininvoicesSubmit(obj).then(res => {
-                this.saveLoading = false
                 this.$message.success('操作成功');
                 this.fininvoicesDetailfun(res.data.data.id)
             }).catch(() => {
@@ -1402,6 +1401,9 @@ export default {
                     return item
                 })
             }).finally(() => {
+                setTimeout(() => {
+                    this.saveLoading = false
+                }, 500);
                 this.pageLoading = false
             })
         },

src/views/iosBasicData/fininvoicesOutput/fininvoicesDetails.vue

@@ -1020,8 +1020,8 @@ export default {
             this.amountSubUsdSum = 0
             if (list.length) {
                 list.forEach(e => {
-                    this.amountSubSum += Number(e.currentAmountCNY?e.currentAmountCNY:0)
-                    this.amountSubUsdSum += Number(e.currentAmountUSD?e.currentAmountUSD:0)
+                    this.amountSubSum += Number(e.currentAmountCNY ? e.currentAmountCNY : 0)
+                    this.amountSubUsdSum += Number(e.currentAmountUSD ? e.currentAmountUSD : 0)
                 })
             }
             this.handleSelectionData = list
@@ -1032,7 +1032,7 @@ export default {
             this.amountSubUsdSum = 0
             if (list.length) {
                 list.forEach(e => {
-                    this.amountSubSum += Number(e.amount?e.amount:0)
+                    this.amountSubSum += Number(e.amount ? e.amount : 0)
                 })
             }
             this.invoicingCheckboxData = list
@@ -1318,7 +1318,6 @@ export default {
         // 保存接口
         fininvoicesSubmitfun(obj) {
             fininvoicesSubmit(obj).then(res => {
-                this.saveLoading = false
                 this.$message.success('操作成功');
                 this.fininvoicesDetailfun(res.data.data.id)
             })
@@ -1348,6 +1347,9 @@ export default {
                     return item
                 })
             }).finally(() => {
+                setTimeout(() => {
+                    this.saveLoading = false
+                }, 1000);
                 this.pageLoading = false
             })
         },

src/views/iosBasicData/revenueInvoicing/detailsPage.vue

@@ -0,0 +1,401 @@
+<template>
+    <div>
+        <div class="customer-head">
+            <div class="customer-back">
+                <el-button type="danger" style="border: none;background: none;color: red" icon="el-icon-arrow-left"
+                    @click="goBack(0)">返回列表
+                </el-button>
+            </div>
+            <div class="add-customer-btn">
+                <el-button class="el-button--small-yh" style="margin-left: 6px;" type="primary" size="small"
+                    @click="submit">保 存
+                </el-button>
+            </div>
+        </div>
+        <div style="margin-top: 50px">
+            <trade-card title="基础信息">
+                <avue-form :option="optionForm" v-model="form" ref="form">
+                    <tempalte slot="corpName" slot-scope="{ row }">
+                        <dic-select v-model="form.corpName" placeholder="客户" key="id" label="cnName" res="records"
+                            url="/blade-los/bcorps/listByType?corpTypeName=客户" :filterable="true" :remote="true"
+                            dataName="cnName" @selectChange="dicChange('corpName', $event)"
+                            :disabled="form.advanceChargeItemList.length > 0"></dic-select>
+                    </tempalte>
+                    <tempalte slot="advancePaymentBalance">
+                        <el-input-number v-model="form.advancePaymentBalance"
+                            @change="dicChange('advancePaymentBalance', form)" :controls="false" placeholder="请输入 预付款余额"
+                            size="small" style="width: 100%;"
+                            :disabled="form.advanceChargeItemList.length > 0"></el-input-number>
+                    </tempalte>
+                    <tempalte slot="inOverpayment">
+                        <el-input-number v-model="form.inOverpayment" @change="dicChange('inOverpayment', form)"
+                            :controls="false" placeholder="请输入 增加金额" size="small" style="width: 100%;"
+                            :disabled="form.advanceChargeItemList.length > 0"></el-input-number>
+                    </tempalte>
+                    <tempalte slot="outOverpaymen">
+                        <el-input-number v-model="form.outOverpaymen" @change="dicChange('outOverpaymen', form)"
+                            :controls="false" placeholder="请输入 消费金额" size="small" style="width: 100%;"
+                            :disabled="form.advanceChargeItemList.length > 0"></el-input-number>
+                    </tempalte>
+                </avue-form>
+            </trade-card>
+            <trade-card title="预付款明细">
+                <avue-crud :option="option" :data="form.advanceChargeItemList" id="out-table" ref="crud"
+                    @selection-change="selectionChange" @resetColumn="resetColumn('crud', 'option', 'optionBack', 400)"
+                    @saveColumn="saveColumn('crud', 'option', 'optionBack', 400)">
+                    <template slot="menuLeft">
+                        <el-button type="primary" size="small" icon="el-icon-plus" @click="addRow">新 增
+                        </el-button>
+                    </template>
+                    <template slot="orderNo" slot-scope="{ row }">
+                        <span style="color: #1e9fff" @click="rowEdit(row)">{{ row.orderNo }}</span>
+                    </template>
+                    <template slot="billNo" slot-scope="{ row }">
+                        <span style="color: #1e9fff" @click="rowEdit(row)">{{ row.billNo }}</span>
+                    </template>
+                    <template slot="menu" slot-scope="{ row, index }">
+                        <el-button v-if="row.identifier == 1" size="small" icon="el-icon-edit" type="text"
+                            @click="inEdit(row)">{{ row.$cellEdit ?
+                                "保存" :
+                                "编辑" }}</el-button>
+                    </template>
+                </avue-crud>
+            </trade-card>
+        </div>
+    </div>
+</template>
+
+<script>
+import { submit, getDetail } from "@/api/iosBasicData/advanceCharge";
+import dicSelect from "@/components/dicSelect/main";
+
+import { bfeesList } from "@/api/iosBasicData/bfees";
+import _ from "lodash";
+export default {
+    name: "detailsPage",
+
+    data() {
+        return {
+            form: {
+                status: '0',
+                advanceChargeItemList: []
+            },
+            optionForm: {
+                menuBtn: false,
+                span: 8,
+                column: [
+                    {
+                        label: '客户',
+                        prop: "corpName",
+                        rules: [{
+                            required: true,
+                            message: " ",
+                            trigger: "blur"
+                        }]
+                    },
+                    {
+                        label: "预付款余额",
+                        prop: "advancePaymentBalance",
+                    },
+                    {
+                        label: "增加金额",
+                        prop: "inOverpayment",
+                    },
+                    {
+                        label: "消费金额",
+                        prop: "outOverpaymen",
+                    },
+                    {
+                        label: '备注',
+                        prop: "remarks",
+                        type: 'textarea',
+                        disabled: false,
+                        span: 24,
+                        minRows: 2,
+                    },
+                ]
+            },
+            option: {},
+            optionBack: {
+                height: 'auto',
+                calcHeight: 30,
+                menuWidth: 60,
+                border: true,
+                index: true,
+                addBtn: false,
+                viewBtn: false,
+                editBtn: false,
+                delBtn: false,
+                menu: true,
+                refreshBtn: false,
+                align: 'center',
+                column: [
+                    {
+                        label: "订单号",
+                        prop: "orderNo",
+                        cell: true,
+                        overHidden: true
+                    },
+                    {
+                        label: "提单号",
+                        prop: "billNo",
+                        cell: true,
+                        overHidden: true
+                    },
+                    {
+                        label: "金额",
+                        prop: "overpayment",
+                        type: 'number',
+                        controls: false,
+                        cell: true,
+                        rules: [{
+                            required: true,
+                            message: " ",
+                            trigger: "blur"
+                        }],
+                        overHidden: true
+                    },
+                    {
+                        label: "收款金额",
+                        prop: "amountD",
+                        overHidden: true
+                    },
+                    {
+                        label: "付款金额",
+                        prop: "amountC",
+                        overHidden: true
+                    },
+                    {
+                        label: "消费类型",
+                        prop: "overpaymentType",
+                        type: 'select',
+                        cell: true,
+                        dicData: [{
+                            label: '增加',
+                            value: 0
+                        }, {
+                            label: '消费',
+                            value: 1
+                        }],
+                        rules: [{
+                            required: true,
+                            message: " ",
+                            trigger: "blur"
+                        }],
+                        overHidden: true
+                    },
+                    {
+                        label: "来源单号",
+                        prop: "srcOrderNo",
+                        overHidden: true
+                    },
+                    {
+                        label: "生成标识",
+                        prop: "identifier",
+                        type: 'select',
+                        dicData: [{
+                            label: '系统生成',
+                            value: 0
+                        }, {
+                            label: '手动添加',
+                            value: 1
+                        }],
+                        overHidden: true
+                    },
+                    {
+                        label: "生成时间",
+                        prop: "createTime",
+                        type: "datetime",
+                        format: "yyyy-MM-dd HH:mm:ss",
+                        valueFormat: "yyyy-MM-dd HH:mm:ss",
+                        cell: true,
+                        overHidden: true
+                    },
+                    {
+                        label: "备注",
+                        prop: "remarks",
+                        overHidden: true
+                    }
+                ]
+            },
+        }
+    },
+    components: {
+        dicSelect,
+    },
+    props: {
+        detailData: Object
+    },
+    async created() {
+        this.option = await this.getColumnData(this.getColumnName(400), this.optionBack);
+        if (this.detailData.id) {
+            this.getDetails(this.detailData.id)
+        }
+    },
+    methods: {
+        addRow() {
+            this.form.advanceChargeItemList.push({
+                $cellEdit: true,
+                identifier: 1
+            })
+        },
+        // 编辑
+        inEdit(row) {
+            if (row.$cellEdit == true) {
+                if (!row.overpayment || row.overpaymentType == null) return this.$message.error("请完善明细信息");
+                this.$set(row, '$cellEdit', false)
+            } else {
+                this.$set(row, '$cellEdit', true)
+            }
+
+        },
+        dicChange(name, row) {
+            if (name == 'corpName') {
+                if (row) {
+                    this.form.corpId = row.id
+                } else {
+                    this.form.corpId = null
+                }
+            }
+            if (name == 'advancePaymentBalance') {
+                row.inOverpayment = _.add(Number(row.advancePaymentBalance ? row.advancePaymentBalance : 0), Number(row.outOverpaymen ? row.outOverpaymen : 0))
+            }
+            if (name == 'inOverpayment') {
+                row.advancePaymentBalance = _.subtract(Number(row.inOverpayment ? row.inOverpayment : 0), Number(row.outOverpaymen ? row.outOverpaymen : 0))
+            }
+            if (name == 'outOverpaymen') {
+                row.inOverpayment = _.add(Number(row.advancePaymentBalance ? row.advancePaymentBalance : 0), Number(row.outOverpaymen ? row.outOverpaymen : 0))
+            }
+        },
+        rowEdit(row) {
+            if (row.overpaymentType == 1) {
+                if (this.$store.getters.firstSetStatus) {
+                    this.$alert("货款收费(T)页面已存在,请关闭货款收费(T)再进行操作", "温馨提示", {
+                        confirmButtonText: "确定",
+                        type: 'warning',
+                        callback: action => {
+                        }
+                    });
+                } else {
+                    this.$router.push({
+                        path: '/tradeAgency/firstSettlement/index',
+                        query: {
+                            billNo: row.srcPid
+                        },
+                    })
+                }
+
+            }
+            if (row.overpaymentType == 0) {
+                if (this.$store.getters.exchangePurStatus) {
+                    this.$alert("货款付费(T)页面已存在,请关闭货款付费(T)再进行操作", "温馨提示", {
+                        confirmButtonText: "确定",
+                        type: 'warning',
+                        callback: action => {
+                        }
+                    });
+                } else {
+                    this.$router.push({
+                        path: '/tradeAgency/exchangePurchasing/index',
+                        query: {
+                            billNo: row.srcPid
+                        },
+                    })
+                }
+            }
+        },
+        getDetails(id) {
+            const loading = this.$loading({
+                lock: true,
+                text: '加载中',
+                spinner: 'el-icon-loading',
+                background: 'rgba(255,255,255,0.7)'
+            });
+            getDetail({ id: id }).then(res => {
+                this.form = res.data.data
+                this.$refs.crud.dicInit();
+            }).finally(() => {
+                loading.close()
+            })
+        },
+        submit() {
+            for (let row of this.form.advanceChargeItemList) {
+                if (row.identifier == 1) {
+                    if (!row.overpayment || row.overpaymentType == null) {
+                        return this.$message.error("请完善明细信息");
+                    }
+                }
+            }
+            this.$refs["form"].validate((valid, done) => {
+                done();
+                if (valid) {
+                    const loading = this.$loading({
+                        lock: true,
+                        text: '加载中',
+                        spinner: 'el-icon-loading',
+                        background: 'rgba(255,255,255,0.7)'
+                    });
+                    submit(this.form).then(res => {
+                        this.$message.success("保存成功");
+                        this.getDetails(res.data.data.id)
+                    }).finally(() => {
+                        loading.close();
+                    })
+
+                } else {
+                    return false;
+                }
+            });
+        },
+        //自定义列保存
+        async saveColumn(ref, option, optionBack, code) {
+            const inSave = await this.saveColumnData(this.getColumnName(code), this[option]);
+            if (inSave) {
+                this.$message.success("保存成功");
+                //关闭窗口
+                this.$refs[ref].$refs.dialogColumn.columnBox = false;
+            }
+        },
+        //自定义列重置
+        async resetColumn(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;
+            }
+        },
+        goBack(type) {
+            this.$emit("goBack", type);
+            this.$emit('updateKey')
+        },
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+::v-deep .el-form-item {
+    margin-bottom: 8px !important;
+}
+
+::v-deep .el-table .cell {
+    padding: 0 2px !important;
+
+    .el-form-item {
+        margin-bottom: 0px !important;
+    }
+
+}
+
+::v-deep .avue-crud .el-table .el-form-item__label {
+    left: -1px;
+}
+
+::v-deep#out-table .back-one {
+    background: #ecf5ff !important;
+}
+
+::v-deep#out-table .back-two {
+    background: #ecf5ff !important;
+}
+</style>

src/views/iosBasicData/revenueInvoicing/index.vue

@@ -0,0 +1,305 @@
+<template>
+    <div>
+        <basic-container v-show="isShow">
+            <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" :search.sync="query"
+                v-model="form" id="out-table" :header-cell-class-name="headerClassName" ref="crud" @row-del="rowDel"
+                @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
+                @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange"
+                @resetColumn="resetColumn('crud', 'option', 'optionBack', 399)"
+                @saveColumn="saveColumn('crud', 'option', 'optionBack', 399)" @on-load="onLoad">
+                <template slot="menuLeft">
+                    <el-button type="primary" size="small" icon="el-icon-plus" @click="addButton">新 增
+                    </el-button>
+                </template>
+                <tempalte slot="advancePaymentBalance" slot-scope="{ row }">
+                    <el-input-number v-if="row.$cellEdit" v-model="row.advancePaymentBalance" @change="countChange(row)"
+                        :controls="false" placeholder="请输入 单价" size="small" style="width: 100%;"></el-input-number>
+                    <span v-else>{{ row.advancePaymentBalance }}</span>
+                </tempalte>
+                <template slot="menu" slot-scope="{ row, index }">
+                    <el-button size="small" icon="el-icon-edit" type="text" @click="inEdit(row)">{{ row.$cellEdit ? "保存" :
+                        "编辑" }}</el-button>
+                </template>
+                <template slot="corpName" slot-scope="{ row }">
+                    <span style="color: #1e9fff" @click="rowEdit(row)">{{ row.corpName }}</span>
+                </template>
+            </avue-crud>
+        </basic-container>
+        <detailsPage v-if="!isShow" :detailData="detailData" @goBack="goBack"></detailsPage>
+    </div>
+</template>
+  
+<script>
+import { getList, remove, submit } from "@/api/iosBasicData/advanceCharge";
+import detailsPage from "./detailsPage";
+import _ from "lodash";
+
+export default {
+    data() {
+        return {
+            detailData: {},
+            isShow: true,
+            form: {},
+            query: {},
+            loading: false,
+            page: {
+                pageSize: 10,
+                currentPage: 1,
+                total: 0
+            },
+            selectionList: [],
+            option: {},
+            optionBack: {
+                height: 'auto',
+                calcHeight: 30,
+                menuWidth: 120,
+                searchShow: true,
+                searchMenuSpan: 18,
+                border: true,
+                index: true,
+                addBtn: false,
+                viewBtn: false,
+                editBtn: false,
+                delBtn: false,
+                searchIcon: true,
+                searchIndex: 3,
+                column: [
+                    {
+                        label: "客户名称",
+                        prop: "corpId",
+                        width: "200",
+                        overHidden: true,
+                        search: true,
+                        type: 'select',
+                        filterable: true,
+                        remote: true,
+                        dicUrl: "/api/blade-los/bcorps/listByType?cnName={{key}}",
+                        props: {
+                            label: 'cnName',
+                            value: 'id',
+                            res: 'data.records'
+                        },
+                        hide: true,
+                        showColumn: false,
+                        searchOrder: 1,
+                    },
+                    {
+                        label: "客户名称",
+                        prop: "corpName",
+                        width: "200",
+                        overHidden: true,
+                    },
+                    {
+                        label: "预付款余额",
+                        prop: "advancePaymentBalance",
+                        overHidden: true,
+                    },
+                    {
+                        label: "增加金额",
+                        prop: "inOverpayment",
+                        overHidden: true
+                    },
+                    {
+                        label: "消费金额",
+                        prop: "outOverpaymen",
+                        overHidden: true
+                    },
+                    {
+                        label: "备注",
+                        prop: "remarks",
+                        overHidden: true
+                    }
+                ]
+            },
+            data: [],
+        };
+    },
+    components: {
+        detailsPage,
+    },
+    async created() {
+        this.option = await this.getColumnData(this.getColumnName(399), this.optionBack);
+    },
+    activated() {
+        this.$nextTick(() => {
+            this.$refs.crud.doLayout();
+            this.$refs.crud.dicInit();
+        });
+    },
+    methods: {
+        addButton() {
+            this.isShow = false
+        },
+        rowEdit(row) {
+            this.detailData = {
+                id: row.id
+            };
+            this.isShow = false
+        },
+        rowDel(row) {
+            if (row.status == 1) {
+                this.$confirm("确定将选择数据删除?", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                })
+                    .then(() => {
+                        return remove({ ids: row.id }).then(() => {
+                            this.onLoad(this.page);
+                            this.$message({
+                                type: "success",
+                                message: "删除成功!"
+                            });
+                        });
+                    })
+
+            } else {
+                this.$message({
+                    message: '非禁用状态无法删除',
+                    type: 'warning'
+                });
+            }
+        },
+        // 编辑
+        inEdit(row) {
+            if (row.$cellEdit == true) {
+                this.loading = true;
+                submit(row).then(res => {
+                    this.$message({
+                        type: "success",
+                        message: "修改成功!"
+                    });
+                    this.onLoad(this.page, this.query);
+                }).finally(() => {
+                    this.loading = false;
+                })
+                this.$set(row, '$cellEdit', false)
+            } else {
+                this.$set(row, '$cellEdit', true)
+            }
+
+        },
+        countChange(row) {
+            row.inOverpayment = _.add(Number(row.advancePaymentBalance ? row.advancePaymentBalance : 0), Number(row.outOverpaymen ? row.outOverpaymen : 0))
+        },
+        searchReset() {
+            this.query = this.$options.data().query;
+            this.onLoad(this.page);
+        },
+        // 搜索按钮点击
+        searchChange(params, done) {
+            this.page.currentPage = 1;
+            this.onLoad(this.page, this.query);
+            done();
+        },
+        selectionChange(list) {
+            this.selectionList = list;
+        },
+        currentChange(currentPage) {
+            this.page.currentPage = currentPage;
+        },
+        sizeChange(pageSize) {
+            this.page.pageSize = pageSize;
+        },
+        refreshChange() {
+            this.onLoad(this.page, this.query);
+        },
+        onLoad(page, params = {}) {
+            let obj = {}
+            obj = {
+                ...Object.assign(params, this.query),
+            }
+            console.log(obj)
+            this.loading = true;
+            getList(page.currentPage, page.pageSize, obj).then(res => {
+                this.data = res.data.data.records;
+                this.page.total = res.data.data.total;
+                this.$nextTick(() => {
+                    this.$refs.crud.doLayout();
+                    this.$refs.crud.dicInit();
+                    this.$refs.crud.refreshTable();
+                    
+                });
+            }).finally(() => {
+                this.loading = false;
+            })
+
+        },
+        // 详情的返回列表
+        goBack() {
+            // 初始化数据
+            // if (JSON.stringify(this.$route.query) != "{}") {
+            //     this.$router.$avueRouter.closeTag();
+            //     this.$router.push({
+            //         path: "/iosBasicData/accounts/index"
+            //     });
+            // }
+            this.detailData = {}
+            this.isShow = true;
+            this.onLoad(this.page, this.search);
+        },
+        //自定义列保存
+        async saveColumn(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;
+                this.searchReset()
+            }
+        },
+        //自定义列重置
+        async resetColumn(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;
+                this.searchReset()
+            }
+        },
+        // 更改表格颜色
+        headerClassName(tab) {
+            //颜色间隔
+            let back = ""
+            if (tab.columnIndex >= 0 && tab.column.level === 1) {
+                if (tab.columnIndex % 2 === 0) {
+                    back = "back-one"
+                } else if (tab.columnIndex % 2 === 1) {
+                    back = "back-two"
+                }
+            }
+            return back;
+        },
+
+    }
+}
+
+</script>
+  
+<style scoped>
+::v-deep#out-table .back-one {
+    background: #ecf5ff !important;
+    text-align: center;
+}
+
+::v-deep#out-table .back-two {
+    background: #ecf5ff !important;
+    text-align: center;
+}
+
+.pointerClick {
+    cursor: pointer;
+    color: #1e9fff;
+}
+
+::v-deep .el-col-md-8 {
+    width: 24.33333%;
+}
+</style>
+  

src/views/landTransportation/placeAnOrder/detailPage.vue

@@ -98,7 +98,7 @@
           <port-info v-model="goodsForm.station" :disabled="goodsForm.status !== 0" />
         </template>
         <template slot-scope="scope" slot="salesman">
-          <el-select v-model="goodsForm.salesman" placeholder="请选择" :disabled="goodsForm.status !== 0">
+          <el-select v-model="goodsForm.salesman" placeholder="请选择" :disabled="goodsForm.status !== 0" filterable>
             <el-option v-for="item in salesmanList" :key="item.id" :label="item.realName" :value="item.id">
             </el-option>
           </el-select>
@@ -411,7 +411,7 @@ import {
   detailDelegationList,
   removeCollection,
   saveSaveList,
-  addressList, cancelSubmission, getCorp, getSalesman, getFee, changeSubmission, validChange, tRemove, generateBill
+  addressList, cancelSubmission, getCorp, getSalesman2, getFee, changeSubmission, validChange, tRemove, generateBill
 } from "@/api/landTransportation";
 import { getDeptTree } from "@/api/system/dept";
 import website from "@/config/website";
@@ -1614,7 +1614,7 @@ export default {
     },
     //查询业务员
     salesmanQuery(realName, type) {
-      getSalesman({ realName: realName, userExt: this.goodsForm.corpId }).then(res => {
+      getSalesman2({ realName: realName, userExt: this.goodsForm.corpId }).then(res => {
         this.salesmanList = res.data.data
         if (type) {
           this.changeSelect(this.goodsForm.salesman)

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

@@ -511,7 +511,7 @@ export default {
     // getCorpTypes().then(res=>{
     //     this.treeData = res.data.data
     // })
-    listAllP().then(res => {
+    listAllP({ whetherIntegral: "0" }).then(res => {
       this.treeData = res.data.data
     })
     this.onLoad(this.page, this.search)

src/views/tirePartsMall/purchasingManagement/financingProcurement/detailsPage.vue

@@ -7,6 +7,7 @@
                 </el-button>
             </div>
             <div class="add-customer-btn">
+                
                 <el-button class="el-button&#45;&#45;small-yh" style="margin-left: 6px;" type="primary" size="small"
                     v-if="editButton" @click="confirmEditing">编 辑
                 </el-button>
@@ -448,7 +449,7 @@ export default {
             isRevocationRequest: true, // 撤销审核
             isExamineBtn: true,  // 审批
             isAdd: false,
-            editButton: true, // 编辑按钮和保存按钮的显示隐藏
+            editButton: false, // 编辑按钮和保存按钮的显示隐藏
             isSaveBtn: false, // 保存的禁用
             isDisabledTask: false, // 生成，撤销任务按钮是否禁用
             buttonText: '生成任务',
@@ -1335,16 +1336,18 @@ export default {
             this.$set(this.optionForm, 'disabled', true)
             this.$set(this.optionContactsBack, 'disabled', true)
             this.isContacts = true
-
+            this.editButton=true
             this.isDisabled = true
             //添加删除按钮禁用
             this.isAdd = true
             this.refresh(this.onLoad.id, true)
         } else if (this.onLoad.id) {
+            this.editButton=true
             this.refresh(this.onLoad.id, true)
         }
         if (!this.form.id) {
-            this.editButton = false // 第一次录入显示保存按钮
+            console.log(1)
+            // this.editButton = false // 第一次录入显示保存按钮
             this.optionContactsBack.column.forEach(its => {
                 if (its.prop == 'goodsId' || its.prop == 'goodsNum' || its.prop == 'price' || its.prop == 'dot' || its.prop == 'remarks') {
                     its.disabled = false

src/views/wel/home/landTransportation/components/quick-launch.vue

@@ -47,7 +47,7 @@
         </div>
       </div>
 
-      <div class="content" v-if="zhcontent == '119111'">
+      <!-- <div class="content" v-if="zhcontent == '119111'">
         <div class="content-icon" @click="entrust ? dajian('wt') : 'JZ'">
           <i class="tradingIcon icon-purchase" style="color:#75CD28"></i>
           <span>特种委托</span>
@@ -68,7 +68,7 @@
           <i class="tradingIcon icon-sales" style="color:#143056"></i>
           <span>特种台账</span>
         </div>
-      </div>
+      </div> -->
     </el-card>
     <el-dialog title="消息提醒" :visible.sync="enclosure" append-to-body width="70%">
       <avue-crud :data="data" @on-load="onLoad" :option="option" :page.sync="page"></avue-crud>

src/views/wel/home/landTransportation/components/sales-reached.vue

@@ -81,6 +81,7 @@ export default {
       },
     //点击获取图表数据
     handleMousedown(params){
+    
         console.log(this.menuAll,90)
         if (params.data.mold == 1 && this.menuAll.includes('1499196328461225986')) {
             this.$emit('handleMousedown',params.data)