往来单位 客户联系人新加字段 新加创建用户功能 海运出口 分单 新加提单确认功能 客户托书 客户订舱新加箱型不能重复校验 修改客户订舱的删除规则和路由缓存 费用删除新加重新刷新功能

src/api/iosBasicData/bcorps.js

@@ -154,3 +154,11 @@ export const bcorpsbadrecordRemove = (ids) => {
     }
   })
 }
+// 创建用户
+export const createUser = (data) => {
+  return request({
+    url: '/api/blade-los/bcorpsattn/createUser',
+    method: 'post',
+    data:data
+  })
+}

src/api/iosBasicData/bills.js

@@ -340,6 +340,14 @@ export const revokeLockOrder = (data) => {
     data: data
   })
 }
+// 海运分单-提单确认
+export const billLadingConfirm = (data) => {
+  return request({
+    url: '/api/blade-los/bills/billLadingConfirm',
+    method: 'post',
+    data: data
+  })
+}
 // 批量模板导入
 export const templateImportBatch = (data) => {
   return request({

src/views/iosBasicData/OceanFreightImport/bills/assembly/feecenter.vue

@@ -56,8 +56,7 @@
                         <span>应收费用</span>
                     </div>
                     <el-button v-if="isFeeEditD" type="danger" plain size="small"
-                        :disabled="!selectionDList.length || disabled"
-                        @click="batchDelete('D')">一键删除
+                        :disabled="!selectionDList.length || disabled" @click="batchDelete('D')">一键删除
                     </el-button>
                     <!-- <el-button v-if="isFeeEditD" type="success" plain size="small"
                         :disabled="!selectionDList.length || disabled || pleasereviewType"
@@ -84,11 +83,11 @@
                         @click="allClick('D费用申请')">请核费用</el-button>
                     <el-button type="danger" plain size="small" :disabled="disabled || selectionDList.length == 0"
                         @click="allClick('D撤销请核')">撤销请核</el-button>
-                    <el-button type="primary" plain size="small" :disabled="selectionDList.length != 1||disabled"
+                    <el-button type="primary" plain size="small" :disabled="selectionDList.length != 1 || disabled"
                         @click="allClick('D申请修改')">申请修改</el-button>
-                    <el-button type="success" plain size="small" :disabled="selectionDList.length != 1||disabled"
+                    <el-button type="success" plain size="small" :disabled="selectionDList.length != 1 || disabled"
                         @click="allClick('D申请删除')">申请删除</el-button>
-                    <el-button type="danger" plain size="small" :disabled="selectionDList.length != 1||disabled"
+                    <el-button type="danger" plain size="small" :disabled="selectionDList.length != 1 || disabled"
                         @click="allClick('D取消申请')">取消申请</el-button>
                 </template>
                 <template slot="indexHeader" slot-scope="scope">
@@ -208,8 +207,7 @@
                         <span>应付费用</span>
                     </div>
                     <el-button v-if="isFeeEditC" type="danger" plain size="small"
-                        :disabled="!selectionCList.length || disabled"
-                        @click="batchDelete('C')">一键删除
+                        :disabled="!selectionCList.length || disabled" @click="batchDelete('C')">一键删除
                     </el-button>
                     <!-- <el-button v-if="isFeeEditC" type="primary" plain size="small"
                         :disabled="!selectionCList.length || disabled || pleasereviewType"
@@ -241,11 +239,11 @@
                         @click="allClick('C撤销请核')">撤销请核</el-button>
                     <!-- <el-button type="success" plain size="small" :disabled="disabled"
                         @click="allClick('提取成本')">提取成本</el-button> -->
-                    <el-button type="primary" plain size="small" :disabled="selectionCList.length != 1||disabled"
+                    <el-button type="primary" plain size="small" :disabled="selectionCList.length != 1 || disabled"
                         @click="allClick('C申请修改')">申请修改</el-button>
-                    <el-button type="success" plain size="small" :disabled="selectionCList.length != 1||disabled"
+                    <el-button type="success" plain size="small" :disabled="selectionCList.length != 1 || disabled"
                         @click="allClick('C申请删除')">申请删除</el-button>
-                    <el-button type="danger" plain size="small" :disabled="selectionCList.length != 1||disabled"
+                    <el-button type="danger" plain size="small" :disabled="selectionCList.length != 1 || disabled"
                         @click="allClick('C取消申请')">取消申请</el-button>
                 </template>
                 <template slot="indexHeader" slot-scope="scope">
@@ -2426,7 +2424,7 @@ export default {
                 if (itemsWithId.length != 0) {
                     feecenterRemove(arrIds.join(',')).then(res => {
                         this.$message.success('操作成功')
-                        // this.$emit('billsDetailfun')
+                        this.$emit('billsDetailfun')
                     })
                 }
             })
@@ -3146,7 +3144,7 @@ export default {
                     if (!(row.auditStatus == 5 || row.auditStatus == 6)) {
                         return this.$message.error("未申请修改或删除，不允许撤销申请");
                     }
-                    
+
                     if (Number(row.appliedAmount) > 0) {
                         return this.$message.error("请选择未申请付费的费用？");
                     }

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

@@ -92,7 +92,8 @@
                 " @click.stop="DocumentApproval">单据请核
                 </el-button>
                 <el-button size="small" type="danger" :disabled="showLock"
-                    v-if="form.status == 3 && form.billType != 'MH'&& (roleName.includes('admin') || roleName.includes('撤销锁单'))" @click.stop="revokeLockOrder">撤销锁单
+                    v-if="form.status == 3 && form.billType != 'MH' && (roleName.includes('admin') || roleName.includes('撤销锁单'))"
+                    @click.stop="revokeLockOrder">撤销锁单
                 </el-button>
                 <el-button size="small" type="primary" style="margin-right: 8px"
                     :disabled="detailData.seeDisabled || showLock" :loading="saveLoading" @click="editCustomer">保 存
@@ -1357,6 +1358,9 @@ export default {
                     })
                 })
             }
+            if(name=='提单确认'){
+                // this.$refs.
+            }
         },
         // 获取EDI列表数据
         editypesListfun() {

src/views/iosBasicData/SeafreightExportF/bills/assembly/EntrustmentLnformation.vue

@@ -392,6 +392,28 @@
                                     </el-col>
                                 </el-row>
                             </el-form-item>
+                            <el-form-item label="业务来源" prop="srcType"
+                                :rules="[{ required: true, message: '', trigger: 'blur' }]">
+                                <el-row :gutter="10">
+                                    <el-col :span="10">
+                                        <search-query :datalist="sourceTypeData" :selectValue="assemblyForm.srcType"
+                                            :disabled="detailData.seeDisabled || assemblyForm.feeCenterListD.filter(item => item.auditStatus > 0).length || assemblyForm.feeCenterListC.filter(item => item.auditStatus > 0).length"
+                                            :filterable="true" :clearable="true" :remote="true" :buttonIf="false"
+                                            placeholder="请选择业务来源" @corpChange="sourceCorp($event, 'srcType')">
+                                        </search-query>
+                                    </el-col>
+                                    <el-col :span="13">
+                                        <search-query :datalist="srcData" :selectValue="assemblyForm.srcCnName"
+                                            :filterable="true" :clearable="true" :remote="true"
+                                            :disabled="!assemblyForm.srcType || detailData.seeDisabled || assemblyForm.feeCenterListD.filter(item => item.auditStatus > 0).length || assemblyForm.feeCenterListC.filter(item => item.auditStatus > 0).length"
+                                            :buttonIf="false" :forParameter="sourceforParameter" placeholder="请选择来源明细"
+                                            @remoteMethod="sourceRemote($event, 'srcCnName')"
+                                            @corpChange="sourceCorp($event, 'srcCnName')"
+                                            @corpFocus="sourceRemote($event, 'srcCnName')">
+                                        </search-query>
+                                    </el-col>
+                                </el-row>
+                            </el-form-item>
                         </el-row>
                     </el-col>
                     <el-col :span="12">
@@ -648,8 +670,9 @@
                             </el-col>
                         </el-row>
                         <el-row>
-                            <el-col :span="13">
-                                <el-form-item label="OP" prop="operatorName" label-width="80px">
+                            <el-col :span="12">
+                                <el-form-item label="OP" prop="operatorName" label-width="80px"
+                                    :rules="[{ required: true, message: ' ', trigger: 'blur' }]">
                                     <span slot="label">
                                         <span style="color: #1e9fff">OP</span>
                                     </span>
@@ -661,8 +684,9 @@
                                         :disabled="detailData.seeDisabled || assemblyForm.feeCenterListD.filter(item => item.auditStatus > 0).length || assemblyForm.feeCenterListC.filter(item => item.auditStatus > 0).length"></dic-select>
                                 </el-form-item>
                             </el-col>
-                            <el-col :span="11">
-                                <el-form-item label="客服" prop="customerServiceName" label-width="40px">
+                            <el-col :span="12">
+                                <el-form-item label="客服" prop="customerServiceName" label-width="50px"
+                                    :rules="[{ required: true, message: ' ', trigger: 'blur' }]">
                                     <span slot="label">
                                         <span style="color: #1e9fff">客服</span>
                                     </span>
@@ -1208,6 +1232,7 @@ import { synchronizationExchangeRate } from "@/api/iosBasicData/rateManagement";
 import { isProcurement } from "@/api/basicData/configuration";
 import { getDeptLazyTree, getDeptTree, getLazyList } from "@/api/system/dept";
 import { getBservicetermsList } from "@/api/iosBasicData/bserviceterms";
+import { selectListLos } from "@/api/approval/processConfig";
 import _ from "lodash";
 import dicSelect from "@/components/dicSelect/main";
 import TreeSelect from "@/components/iosbasic-data/TreeSelect.vue";
@@ -1237,7 +1262,21 @@ export default {
     components: { TreeSelect, bcorps, SearchQuery, precontainers, bcorpstypedefine, dicSelect },
     data() {
         return {
-
+            sourceTypeData: [
+                {
+                    label: '公司',
+                    value: 'OWN'
+                },
+                {
+                    label: '代理',
+                    value: 'AGENT'
+                },
+                {
+                    label: '业务员',
+                    value: 'SALES'
+                }
+            ],
+            srcData: [],
             roleName: localStorage.getItem("roleName"),
             dicTree: [],
             textareaNumber: 5,
@@ -1375,6 +1414,94 @@ export default {
         // this.getDicTree()
     },
     methods: {
+        // 业务来源下拉
+        sourceCorp(value, name) {
+            if (name == 'srcCnName') {
+                if (!value) {
+                    this.$set(this.assemblyForm, 'srcId', '')
+                    this.$set(this.assemblyForm, 'srcCnName', '')
+                    this.$set(this.assemblyForm, 'srcEnName', '')
+                }
+                for (let item of this.srcData) {
+                    if (item[this.sourceforParameter.value] == value) {
+                        if (this.assemblyForm.srcType == 'OWN') {
+                            // 国家
+                            this.$set(this.assemblyForm, 'srcId', item.id)
+                            this.$set(this.assemblyForm, 'srcCnName', item.title)
+                            this.$set(this.assemblyForm, 'srcEnName', item.title)
+                        } else if (this.assemblyForm.srcType == 'AGENT') {
+                            // 代理
+                            this.$set(this.assemblyForm, 'srcId', item.id)
+                            this.$set(this.assemblyForm, 'srcCnName', item.cnName)
+                            this.$set(this.assemblyForm, 'srcEnName', item.cnName)
+                        } else if (this.assemblyForm.srcType == 'SALES') {
+                            // 业务员
+                            this.$set(this.assemblyForm, 'srcId', item.id)
+                            this.$set(this.assemblyForm, 'srcCnName', item.name)
+                            this.$set(this.assemblyForm, 'srcEnName', item.name)
+                        }
+                    }
+                }
+            } else if (name == 'srcType') {
+                this.$set(this.assemblyForm, 'srcType', value)
+                this.$set(this.assemblyForm, 'srcId', '')
+                this.$set(this.assemblyForm, 'srcCnName', '')
+                this.$set(this.assemblyForm, 'srcEnName', '')
+                if (this.assemblyForm.srcType == 'OWN') {
+                    this.sourceforParameter = { key: 'id', label: 'title', value: 'title' }
+                    this.ownDeptLazyTreefun()
+                } else if (this.assemblyForm.srcType == 'AGENT') {
+                    this.sourceforParameter = { key: 'id', label: 'cnName', value: 'cnName' }
+                    this.agentBcorpsListfun()
+                } else if (this.assemblyForm.srcType == 'SALES') {
+                    this.sourceforParameter = { key: 'id', label: 'name', value: 'name' }
+                    this.salesUserGetListfun()
+                }
+            }
+        },
+        // 业务来源接口
+        sourceRemote(value, name) {
+            if (name == 'srcCnName') {
+                if (this.assemblyForm.srcType == 'OWN') {
+                    this.sourceforParameter = { key: 'id', label: 'title', value: 'title' }
+                    this.ownDeptLazyTreefun()
+                } else if (this.assemblyForm.srcType == 'AGENT') {
+                    this.sourceforParameter = { key: 'id', label: 'cnName', value: 'cnName' }
+                    this.agentBcorpsListfun(value)
+                } else if (this.assemblyForm.srcType == 'SALES') {
+                    this.sourceforParameter = { key: 'id', label: 'name', value: 'name' }
+                    this.salesUserGetListfun(value)
+                }
+            }
+        },
+        // 获取业务来源代理数据
+        agentBcorpsListfun(cnName) {
+            let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理,代理客户'
+            getBcorpslistByType(1, 10, { cnName, corpTypeName }).then(res => {
+                this.srcData = res.data.data.records
+            })
+        },
+        // 获取业务来源业务员数据
+        salesUserGetListfun(account) {
+            selectListLos('业务员').then(res => {
+                this.srcData = res.data.data
+            })
+        },
+        // 获取公司名称 用户管理左侧
+        ownDeptLazyTreefun() {
+            getDeptLazyTree(0).then(res => {
+                this.srcData = res.data.data
+                // 来源 内容 默认登录人所属公司
+                for (let item of this.srcData) {
+                    if (item.id == JSON.parse(localStorage.getItem('saber-userInfo')).content.dept_id) {
+                        this.$set(this.assemblyForm, 'srcId', item.id)
+                        this.$set(this.assemblyForm, 'srcCnName', item.title)
+                        this.$set(this.assemblyForm, 'srcEnName', item.title)
+                    }
+                }
+
+            })
+        },
         // 获取服务方式数据
         serviceTermsWorkDicts() {
             // getWorkDicts('service_terms').then(res=>{

src/views/iosBasicData/SeafreightExportF/bills/assembly/billLading.vue

@@ -0,0 +1,364 @@
+<template>
+    <div>
+        <el-dialog title="客户订舱" :visible.sync="dialogVisible" append-to-body width="60%" :before-close="handleClose">
+            <span>
+                <trade-card title="基础信息">
+                    <el-form :model="form" ref="form" label-width="90px" class="demo-ruleForm" :disabled="true">
+                        <el-row>
+                            <el-col span="12">
+                                <el-row>
+                                    <el-col span="12">
+                                        <el-row>
+                                            <el-form-item label="发货人" prop="hshipperDetails">
+                                                <el-input type="textarea" style="width: 100%;"
+                                                    v-model="form.detail.hshipperDetails" size="small"
+                                                    autocomplete="off" :disabled="true" :rows="3" clearable></el-input>
+                                            </el-form-item>
+                                        </el-row>
+                                        <el-row>
+                                            <el-form-item label="收货人" prop="hconsigneeDetails">
+                                                <el-input type="textarea" style="width: 100%;"
+                                                    v-model="form.detail.hconsigneeDetails" size="small"
+                                                    autocomplete="off" :disabled="true" :rows="3" clearable></el-input>
+                                            </el-form-item>
+                                        </el-row>
+                                        <el-row>
+                                            <el-form-item label="通知人" prop="hnotifyDetails">
+                                                <el-input type="textarea" style="width: 100%;"
+                                                    v-model="form.detail.hnotifyDetails" size="small" autocomplete="off"
+                                                    :disabled="true" :rows="3" clearable></el-input>
+                                            </el-form-item>
+                                        </el-row>
+                                    </el-col>
+                                    <el-col span="12">
+                                        <el-row>
+                                            <el-form-item label="唛头" prop="marks">
+                                                <el-input type="textarea" style="width: 100%;" v-model="form.marks"
+                                                    size="small" autocomplete="off" :disabled="true" :rows="5"
+                                                    clearable></el-input>
+                                            </el-form-item>
+                                        </el-row>
+                                        <el-row>
+                                            <el-form-item label="货物" prop="commodityDescr">
+                                                <el-input type="textarea" style="width: 100%;"
+                                                    v-model="form.commodityDescr" size="small" autocomplete="off"
+                                                    :disabled="true" :rows="5" clearable></el-input>
+                                            </el-form-item>
+                                        </el-row>
+                                    </el-col>
+                                </el-row>
+                            </el-col>
+                            <el-col span="12">
+                                <el-row>
+                                    <el-col span="12">
+                                        <el-form-item label="装货港" prop="polCnName">
+                                            <el-input style="width: 100%;" v-model="form.polCnName" size="small"
+                                                :disabled="true"></el-input>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col span="12">
+                                        <el-form-item label="卸货港" prop="podCnName">
+                                            <el-input style="width: 100%;" v-model="form.podCnName" size="small"
+                                                :disabled="true"></el-input>
+                                        </el-form-item>
+                                    </el-col>
+                                </el-row>
+                                <el-row>
+                                    <el-col span="12">
+                                        <el-form-item label="ETD" prop="etd">
+                                            <el-date-picker v-model="form.etd" type="date" placeholder="请选择 ETD"
+                                                :disabled="true" size="small" format="yyyy-MM-dd"
+                                                value-format="yyyy-MM-dd" style="width: 100%;">
+                                            </el-date-picker>
+                                        </el-form-item>
+                                    </el-col>
+
+                                </el-row>
+                                <el-row>
+                                    <el-col span="12">
+                                        <el-form-item label="付款方式" prop="mpaymode">
+                                            <el-input style="width: 100%;" v-model="form.mpaymode" size="small"
+                                                :disabled="true"></el-input>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col span="12">
+                                        <el-form-item label="运输条款" prop="serviceTerms">
+                                            <el-input style="width: 100%;" v-model="form.serviceTerms" size="small"
+                                                :disabled="true"></el-input>
+                                        </el-form-item>
+                                    </el-col>
+                                </el-row>
+                                <el-row>
+                                    <el-col span="12">
+                                        <el-form-item label="件数" prop="quantity">
+                                            <el-input style="width: 100%;" v-model="form.quantity" size="small"
+                                                :disabled="true"></el-input>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col span="12">
+                                        <el-form-item label="包装" prop="packingUnit">
+                                            <el-input style="width: 100%;" v-model="form.packingUnit" size="small"
+                                                :disabled="true"></el-input>
+                                        </el-form-item>
+                                    </el-col>
+                                </el-row>
+                                <el-row>
+                                    <el-col span="12">
+                                        <el-form-item label="毛重(KGS)" prop="grossWeight">
+                                            <el-input style="width: 100%;" v-model="form.grossWeight" size="small"
+                                                :disabled="true"></el-input>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col span="12">
+                                        <el-form-item label="尺码(CBM)" prop="measurement">
+                                            <el-input style="width: 100%;" v-model="form.measurement" size="small"
+                                                :disabled="true"></el-input>
+                                        </el-form-item>
+                                    </el-col>
+                                </el-row>
+                            </el-col>
+                        </el-row>
+                    </el-form>
+                </trade-card>
+                <trade-card title="配箱信息">
+                    <avue-crud :option="option" :table-loading="loading" :data="form.containersList" v-model="form"
+                        id="out-table" :header-cell-class-name="headerClassName" ref="crud"
+                        :row-style="{ height: '20px' }" :cell-style="{ padding: '0px' }">
+                    </avue-crud>
+                </trade-card>
+            </span>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="dialogVisible = false" size="mini">取 消</el-button>
+                <el-button type="primary" @click="submit" size="mini">导 入</el-button>
+            </span>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+import { getDetail } from "@/api/iosBasicData/businessCenter/bookingCabin.js";
+import { billLadingConfirm } from '@/api/iosBasicData/bills'
+export default {
+    props: {
+        oldForm: {
+            type: Object,
+            default: () => { }
+        },
+    },
+    data() {
+        return {
+            form: {},
+            dialogVisible: false,
+            option: {
+                height: '200',
+                calcHeight: 30,
+                header: false,
+                menu: false,
+                column: [
+                    {
+                        label: "箱型",
+                        prop: "cntrTypeCode",
+                        width: "100",
+                    },
+                    {
+                        label: "箱号",
+                        prop: "cntrNo",
+                        width: "140",
+                        overHidden: true,
+                    },
+                    {
+                        label: "封号",
+                        prop: "sealNo",
+                        width: "140",
+                        overHidden: true,
+                    },
+
+                    {
+                        label: "件数",
+                        prop: "quantity",
+                        width: "100",
+                    },
+                    {
+                        label: "毛重(KGM)",
+                        prop: "grossWeight",
+                        width: "120",
+                    },
+                    {
+                        label: "尺码/体积(CBM)",
+                        prop: "measurement",
+                        width: "140",
+                    },
+                    {
+                        label: "箱皮重",
+                        prop: "tare",
+                        width: "140",
+                        overHidden: true,
+                    },
+                    {
+                        label: "VGM总重(KGM)",
+                        prop: "vgmWeight",
+                        width: "140",
+                        overHidden: true,
+                    },
+                    {
+                        label: "备注",
+                        prop: "remarks",
+                        type: 'textarea',
+                        width: 180,
+                        slot: true,
+                        minRows: 3,
+                        span: 24,
+                    },
+                    {
+                        label: "POD堆场",
+                        prop: "podStationCname",
+                        width: "140",
+                    },
+                ]
+            },
+        }
+    },
+    async created() {
+        // this.option = await this.getColumnData(this.getColumnName(309.6), this.optionBack);
+    },
+    methods: {
+        openDialog(id) {
+            this.dialogVisible = true
+            const obj = {
+                id: id,
+                confirmStatus: 1
+            }
+            const loading = this.$loading({
+                lock: true,
+                text: '加载中',
+                spinner: 'el-icon-loading',
+                background: 'rgba(255,255,255,0.7)'
+            });
+            getDetail(obj).then(res => {
+                this.form = res.data.data
+            }).finally(() => {
+                loading.close()
+            })
+        },
+        submit() {
+            let text = []
+            if (this.form.polCnName != this.oldForm.polCnName) {
+                text.push('装货港')
+            }
+            if (this.form.podCnName != this.oldForm.podCnName) {
+                text.push('卸货港')
+            }
+            if (this.form.quantity != this.oldForm.quantity) {
+                text.push('件数')
+            }
+            if (this.form.grossWeight != this.oldForm.grossWeight) {
+                text.push('毛重')
+            }
+            if (this.form.measurement != this.oldForm.measurement) {
+                text.push('尺码')
+            }
+            if (text.length) {
+                this.$confirm(`${text.join(",")}是否需要覆盖?`, '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(() => {
+                    const loading = this.$loading({
+                        lock: true,
+                        text: '加载中',
+                        spinner: 'el-icon-loading',
+                        background: 'rgba(255,255,255,0.7)'
+                    });
+                    billLadingConfirm(this.oldForm).then(res => {
+                        this.$message.success("操作成功");
+                        this.dialogVisible = false
+                        this.$emit('upDate')
+                    }).finally(() => {
+                        loading.close()
+                    })
+                })
+            } else {
+                const loading = this.$loading({
+                    lock: true,
+                    text: '加载中',
+                    spinner: 'el-icon-loading',
+                    background: 'rgba(255,255,255,0.7)'
+                });
+                billLadingConfirm(this.oldForm).then(res => {
+                    this.$message.success("操作成功");
+                    this.dialogVisible = false
+                    this.$emit('upDate')
+                }).finally(() => {
+                    loading.close()
+                })
+            }
+
+        },
+        //自定义列保存
+        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;
+            }
+        },
+
+        // 更改表格颜色
+        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 lang="scss" scoped>
+::v-deep#out-table .back-one {
+    background: #ecf5ff !important;
+    text-align: center;
+    padding: 4px 0;
+}
+
+::v-deep#out-table .back-two {
+    background: #ecf5ff !important;
+    text-align: center;
+    padding: 4px 0;
+}
+
+::v-deep .el-form-item__error {
+    display: none !important;
+}
+
+::v-deep .el-form-item {
+    margin-bottom: 8px !important;
+}
+
+::v-deep .el-dialog__body {
+    padding: 0px 20px !important;
+}
+</style>

src/views/iosBasicData/SeafreightExportF/bills/assembly/feecenter.vue

@@ -2413,7 +2413,7 @@ export default {
                 if (itemsWithId.length != 0) {
                     feecenterRemove(arrIds.join(',')).then(res => {
                         this.$message.success('操作成功')
-                        // this.$emit('billsDetailfun')
+                        this.$emit('billsDetailfun')
                     })
                 }
             })

src/views/iosBasicData/SeafreightExportF/bills/assembly/formbottom.vue

@@ -66,30 +66,7 @@
                         </search-query>
                     </el-form-item>
                 </el-col>
-                <el-col :span="6">
-                    <el-form-item label="业务来源" prop="srcType"
-                        :rules="[{ required: true, message: '', trigger: 'blur' }]">
-                        <el-row :gutter="10">
-                            <el-col :span="10">
-                                <search-query :datalist="sourceTypeData" :selectValue="assemblyForm.srcType"
-                                    :disabled="detailData.seeDisabled || assemblyForm.feeCenterListD.filter(item => item.auditStatus > 0).length || assemblyForm.feeCenterListC.filter(item => item.auditStatus > 0).length"
-                                    :filterable="true" :clearable="true" :remote="true" :buttonIf="false"
-                                    placeholder="请选择业务来源" @corpChange="sourceCorp($event, 'srcType')">
-                                </search-query>
-                            </el-col>
-                            <el-col :span="13">
-                                <search-query :datalist="srcData" :selectValue="assemblyForm.srcCnName"
-                                    :filterable="true" :clearable="true" :remote="true"
-                                    :disabled="!assemblyForm.srcType || detailData.seeDisabled || assemblyForm.feeCenterListD.filter(item => item.auditStatus > 0).length || assemblyForm.feeCenterListC.filter(item => item.auditStatus > 0).length"
-                                    :buttonIf="false" :forParameter="sourceforParameter" placeholder="请选择来源明细"
-                                    @remoteMethod="sourceRemote($event, 'srcCnName')"
-                                    @corpChange="sourceCorp($event, 'srcCnName')"
-                                    @corpFocus="sourceRemote($event, 'srcCnName')">
-                                </search-query>
-                            </el-col>
-                        </el-row>
-                    </el-form-item>
-                </el-col>
+               
                 <el-col :span="6">
                     <el-form-item label="退舱日期" prop="bookingWithdrawTime">
                         <span slot="label">

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

@@ -76,6 +76,9 @@
                 <el-button size="small" type="warning" :disabled="!form.id || showLock" v-if="form.billType == 'MM'"
                     @click.stop="allClick('同步分单信息')">同步分单信息
                 </el-button>
+                <el-button v-if="form.id && form.billType == 'MH'" size="small" type="success"
+                    @click.stop="allClick('提单确认')">提单确认
+                </el-button>
                 <el-button size="small" type="warning" :disabled="!form.id || showLock"
                     v-if="form.status == 1 && form.billType != 'MH'" @click.stop="revokeDocumentApproval">撤销单据请核
                 </el-button>
@@ -84,7 +87,8 @@
                     @click.stop="DocumentApproval">单据请核
                 </el-button>
                 <el-button size="small" type="danger" :disabled="showLock"
-                    v-if="form.status == 3 && form.billType != 'MH'&& (roleName.includes('admin') || roleName.includes('撤销锁单'))" @click.stop="revokeLockOrder">撤销锁单
+                    v-if="form.status == 3 && form.billType != 'MH' && (roleName.includes('admin') || roleName.includes('撤销锁单'))"
+                    @click.stop="revokeLockOrder">撤销锁单
                 </el-button>
                 <el-button size="small" type="primary" style="margin-right: 8px"
                     :disabled="detailData.seeDisabled || showLock" :loading="saveLoading" @click="editCustomer">保 存
@@ -371,6 +375,7 @@
                 <el-button type="primary" @click="transferSubmit" size="mini">确 定</el-button>
             </span>
         </el-dialog>
+        <bill-lading ref="billLading" :oldForm="form" @upDate="billsDetailfun(form.id)"></bill-lading>
     </div>
 </template>
 
@@ -423,6 +428,7 @@ import { verifyEnglish, checkFullWidthSymbols } from "@/util/date";
 import { contrastObj, contrastList } from "@/util/contrastData";
 import { selectListLos } from "@/api/approval/processConfig";
 import { isProcurement } from "@/api/basicData/configuration";
+import billLading from "./assembly/billLading.vue";
 import _ from "lodash";
 export default {
     components: {
@@ -443,7 +449,8 @@ export default {
         DocumentCenter,
         businessReports,
         editypes,
-        dicSelect
+        dicSelect,
+        billLading
     },
     props: {
         detailData: {
@@ -791,7 +798,7 @@ export default {
             // 执行方法
             handler(oldValue, newValue) {
 
-                if (oldValue == 'MH'||oldValue == 'MM') {
+                if (oldValue == 'MH' || oldValue == 'MM') {
                     this.basicData.column.forEach(item => {
                         if (item.prop == 'bookingNo') {
                             item.display = false
@@ -1169,6 +1176,20 @@ export default {
                     })
                 })
             }
+            if (name == '提单确认') {
+                if (!this.form.temporaryId) {
+                    return this.$message.error('此单据不能点提单确认');
+                }
+                if (this.form.cyTrailerTime) {
+                    const nowDate = new Date(dateFormat(new Date(), "yyyy-MM-dd"))
+                    const cyTrailerTime = new Date(this.form.cyTrailerTime).getTime()
+                    console.log(nowDate, cyTrailerTime)
+                    if (nowDate > cyTrailerTime) {
+                        return this.$message.error('现在时间超过截单时间不允许提单确认');
+                    }
+                }
+                this.$refs.billLading.openDialog(this.form.temporaryId)
+            }
         },
         dicChange(name, row) {
             if (name == 'shippingCompany') {
@@ -2155,13 +2176,13 @@ export default {
                     // if (!this.form.teamName) {
                     //     msgs.push('所属团队')
                     // }
-                    for (let item of this.form.preContainersList) {
+                   for (let item of this.form.preContainersList) {
                         if (!item.cntrTypeCode) {
-                            this.$message.warning('请选择尺码箱型')
+                            this.$message.warning("请选择尺码箱型");
                             return;
                         }
                         if (!item.quantity) {
-                            this.$message.warning('请输入箱量')
+                            this.$message.warning("请输入箱量");
                             return;
                         }
                     }

src/views/iosBasicData/bcorps/detailsPage.vue

@@ -113,7 +113,7 @@
             <el-form-item label="所属公司" prop="branchName">
               <dic-select v-model="formData.branchName" placeholder="所属公司" key="id" label="deptName"
                 url="/blade-system/dept/top-list" :filterable="true" :remote="true" dataName="deptName" :multiple="true"
-                 dataType="string"  @selectChange="dicChange('branchName', $event)"></dic-select>
+                dataType="string" @selectChange="dicChange('branchName', $event)"></dic-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -712,6 +712,9 @@
                 <el-table-column prop="position" label="岗位" width="180" />
                 <el-table-column prop="addr" label="公司地址" width="180" />
                 <el-table-column prop="sex" label="性别" width="180" />
+                <el-table-column prop="accountNumber" label="登录账号" width="180" />
+                <el-table-column prop="branchName" label="所属公司" width="180" />
+                <el-table-column prop="userId" label="用户ID" width="180" />
                 <el-table-column prop="email" label="邮箱地址" width="180" />
                 <el-table-column prop="status" label="状态" width="180">
                   <template slot-scope="scope">
@@ -723,6 +726,7 @@
                   <template slot-scope="scope">
                     <el-button type="text" size="small" @click="corpsAttnHandle(scope)">编辑</el-button>
                     <el-button type="text" size="small" @click="corpsAttnDelete(scope)">删除</el-button>
+                    <el-button v-if="scope.row.userId == 0" type="text" size="small" @click="createUser(scope)">创建用户</el-button>
                   </template>
                 </el-table-column>
               </el-table>
@@ -906,6 +910,14 @@
           <el-form-item label="公司地址" prop="addr">
             <el-input v-model="corpsAttnForm.addr"></el-input>
           </el-form-item>
+          <el-form-item label="登录账号" prop="accountNumber">
+            <el-input v-model="corpsAttnForm.accountNumber"></el-input>
+          </el-form-item>
+          <el-form-item label="所属公司" prop="branchName">
+            <dic-select v-model="corpsAttnForm.branchName" placeholder="所属公司" key="id" label="deptName"
+              url="/blade-system/dept/top-list" :filterable="true" :remote="true" dataName="deptName"
+              @selectChange="dicChange('branchName2', $event)"></dic-select>
+          </el-form-item>
           <!-- <el-form-item label="用户" prop="userId">
             <search-query ref="SearchQuery" :datalist="userOptions" title="用户" :filterable="true" :clearable="true"
               :remote="true" :forParameter="{ key: 'id', label: 'realName', value: 'id', disabled: 'workingStatus' }"
@@ -1128,7 +1140,7 @@ import {
   getBcorpsDetail,
   bcorpsattnRemove,
   bcorpsbankRemove,
-  bcorpsfilesRemove, bcorpsrenameRemove, corpsinvoiceheaderRemove, bcorpsbadrecordRemove
+  bcorpsfilesRemove, bcorpsrenameRemove, corpsinvoiceheaderRemove, bcorpsbadrecordRemove, createUser
 } from "@/api/iosBasicData/bcorps";
 import { bcountrysList } from "@/api/iosBasicData/bcountrys";
 import { userList } from "@/api/system/user";
@@ -1146,7 +1158,7 @@ import { getDeptLazyTree } from "@/api/system/dept";
 import { getBcorpslistByType } from "@/api/iosBasicData/bcorps";
 import { blinesList } from "@/api/iosBasicData/blines";
 import blines from "@/views/iosBasicData/blines/index.vue";
-import { selectListLos,selectListLos2 } from "@/api/approval/processConfig";
+import { selectListLos, selectListLos2 } from "@/api/approval/processConfig";
 import losaudit from "@/views/wel/components/losAssembly/losaudit.vue";
 import dicSelect from "@/components/dicSelect/main";
 export default {
@@ -1497,6 +1509,14 @@ export default {
           this.formData.branchName = null
         }
       }
+      if (name == 'branchName2') {
+        if (row) {
+          this.corpsAttnForm.branchId = row.id
+        } else {
+          this.corpsAttnForm.branchId = null
+          this.corpsAttnForm.branchName = null
+        }
+      }
     },
     openPreview(row) {
       this.$ImagePreview([{ url: row.url }], 0, {
@@ -1640,9 +1660,9 @@ export default {
     },
     // 获取业务来源业务员数据
     salesUserGetListfun(account) {
-      let obj={
-        roles:'业务员',
-        deptId:this.formData.branchId
+      let obj = {
+        roles: '业务员',
+        deptId: this.formData.branchId
       }
       selectListLos2(obj).then(res => {
         this.srcData = res.data.data
@@ -1974,6 +1994,21 @@ export default {
         // });
       });
     },
+    createUser(scope) {
+      this.$confirm('是否创建用户?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        createUser(scope.row).then(res => {
+          this.$message({
+            type: 'success',
+            message: '操作成功!'
+          });
+          this.getBcorpsDetailfun(this.formData.id)
+        })
+      })
+    },
     // 关闭窗口
     corpsAttnAddClose() {
       this.corpsAttnForm = {

src/views/iosBasicData/businessCenter/customerBooking/detailsPage.vue

@@ -36,9 +36,9 @@
         <!-- <el-button v-if="form.id" class="el-button--small-yh" style="margin-left: 6px;" type="success" size="small"
           :disabled="form.status != 0 || form.issueStatus == 1" @click="application">提单确认
         </el-button> -->
-        <el-button v-if="form.status == 1" class="el-button--small-yh" style="margin-left: 6px;" type="danger"
+        <!-- <el-button v-if="form.status == 1" class="el-button--small-yh" style="margin-left: 6px;" type="danger"
           size="small" @click="revokeApplication">撤销单据请核
-        </el-button>
+        </el-button> -->
         <el-dropdown style="line-height: 0" v-if="importTemplate == 1">
           <el-button size="small" type="warning" style="margin-left: 8px" :disabled="editDisabled || showLock">
             导入模板<i class="el-icon-arrow-down el-icon--right"></i>
@@ -1152,6 +1152,12 @@ export default {
     rowDicChange(name, row, el, index) {
       if (name == 'cntrTypeCode') {
         if (row) {
+          if (this.form.preContainersList.filter(item => item.cntrTypeCode == row.cnName).length > 1) {
+            el.cntrTypeCodeId = null
+            el.cntrTypeCode = null
+            el.teu = null
+            return this.$message.error('箱型不能重复')
+          }
           el.cntrTypeCodeId = row.id
           el.teu = row.teu
         } else {

src/views/iosBasicData/businessCenter/customerBooking/index.vue

@@ -28,7 +28,7 @@
                 <template slot="menu" slot-scope="{ row, index }">
                     <el-button size="small" icon="el-icon-edit" type="text" @click="rowEdit(row)">编辑</el-button>
                     <el-button size="small" icon="el-icon-delete" type="text" @click="rowDel(row, index)"
-                        :disabled="row.confirmStatus != 0 || row.issueStatus != 0">删 除</el-button>
+                        :disabled="row.confirmStatus ==1 || row.issueStatus == 2">删 除</el-button>
                 </template>
                 <!-- <template slot="status" slot-scope="{ row }">
                     <span v-if="row.issueStatus == 0"

src/views/iosBasicData/businessCenter/customerLetter/detailsPage.vue

@@ -1185,6 +1185,12 @@ export default {
     rowDicChange(name, row, el, index) {
       if (name == 'cntrTypeCode') {
         if (row) {
+          if (this.form.preContainersList.filter(item => item.cntrTypeCode == row.cnName).length>1) {
+            el.cntrTypeCodeId = null
+            el.cntrTypeCode = null
+            el.teu = null
+            return this.$message.error('箱型不能重复')
+          }
           el.cntrTypeCodeId = row.id
           el.teu = row.teu
         } else {
@@ -1684,7 +1690,7 @@ export default {
       this.$refs["form"].validate((valid) => {
         console.log(valid, this.form)
         if (valid) {
-          for (let row of this.form.preContainersList) {
+               for (let row of this.form.preContainersList) {
             if (!row.cntrTypeCode || !row.quantity) {
               this.$refs.crud.rowCell(row, row.$index)
               return this.$message.error("请完善明细信息");

src/views/iosBasicData/fininvoices/fininvoicesDetails.vue

@@ -290,8 +290,8 @@
                                                 </el-form-item>
                                             </el-col>
                                             <el-col :span="8">
-                                                <el-form-item label="业务开始日期" prop="accountDateFrom">
-                                                    <el-date-picker v-model="form.accountDateFrom" clearable
+                                                <el-form-item label="业务开始日期" prop="businessDateStart">
+                                                    <el-date-picker v-model="form.businessDateStart" clearable
                                                         style="width: 100%;" type="date" size="small"
                                                         :disabled="editSave || tableData.length"
                                                         value-format="yyyy-MM-dd" placeholder="选择业务日期">
@@ -299,8 +299,8 @@
                                                 </el-form-item>
                                             </el-col>
                                             <el-col :span="8">
-                                                <el-form-item label="业务结束日期" prop="accountDateTo">
-                                                    <el-date-picker v-model="form.accountDateTo" clearable
+                                                <el-form-item label="业务结束日期" prop="businessDateEnd">
+                                                    <el-date-picker v-model="form.businessDateEnd" clearable
                                                         style="width: 100%;" type="date" size="small"
                                                         :disabled="editSave || tableData.length"
                                                         value-format="yyyy-MM-dd" placeholder="选择业务日期">
@@ -766,11 +766,11 @@ export default {
                 obj.invoiceDate = this.form.invoiceDate.slice(0, 10) + ' 00:00:00'
             }
             // 业务日期
-            if (this.form.accountDateFrom) {
-                obj.accountDateFrom = this.form.accountDateFrom.slice(0, 10) + ' 00:00:00'
+            if (this.form.businessDateStart) {
+                obj.businessDateStart = this.form.businessDateStart.slice(0, 10) + ' 00:00:00'
             }
-            if (this.form.accountDateTo) {
-                obj.accountDateTo = this.form.accountDateTo.slice(0, 10) + ' 00:00:00'
+            if (this.form.businessDateEnd) {
+                obj.businessDateEnd = this.form.businessDateEnd.slice(0, 10) + ' 00:00:00'
             }
             for (let item of this.handleSelectionData) {
                 // 拿未开票的数据
@@ -809,11 +809,11 @@ export default {
                 obj.invoiceDate = this.form.invoiceDate.slice(0, 10) + ' 00:00:00'
             }
             // 业务日期
-            if (this.form.accountDateFrom) {
-                obj.accountDateFrom = this.form.accountDateFrom.slice(0, 10) + ' 00:00:00'
+            if (this.form.businessDateStart) {
+                obj.businessDateStart = this.form.businessDateStart.slice(0, 10) + ' 00:00:00'
             }
-            if (this.form.accountDateTo) {
-                obj.accountDateTo = this.form.accountDateTo.slice(0, 10) + ' 00:00:00'
+            if (this.form.businessDateEnd) {
+                obj.businessDateEnd = this.form.businessDateEnd.slice(0, 10) + ' 00:00:00'
             }
             for (let item of this.handleSelectionData) {
                 // 拿未开票的数据
@@ -1118,11 +1118,11 @@ export default {
                     this.form.invoiceDate = this.form.invoiceDate.slice(0, 10) + ' 00:00:00'
                 }
                 // 业务日期
-                if (this.form.accountDateFrom) {
-                    this.form.accountDateFrom = this.form.accountDateFrom.slice(0, 10) + ' 00:00:00'
+                if (this.form.businessDateStart) {
+                    this.form.businessDateStart = this.form.businessDateStart.slice(0, 10) + ' 00:00:00'
                 }
-                if (this.form.accountDateTo) {
-                    this.form.accountDateTo = this.form.accountDateTo.slice(0, 10) + ' 00:00:00'
+                if (this.form.businessDateEnd) {
+                    this.form.businessDateEnd = this.form.businessDateEnd.slice(0, 10) + ' 00:00:00'
                 }
                 if (this.form.id) {
                     this.form.finInvoicesItemsList = this.form.finInvoicesItemsList.map(item => {
@@ -1183,11 +1183,11 @@ export default {
                     obj.invoiceDate = this.form.invoiceDate.slice(0, 10) + ' 00:00:00'
                 }
                 // 业务日期
-                if (this.form.accountDateFrom) {
-                    obj.accountDateFrom = this.form.accountDateFrom.slice(0, 10) + ' 00:00:00'
+                if (this.form.businessDateStart) {
+                    obj.businessDateStart = this.form.businessDateStart.slice(0, 10) + ' 00:00:00'
                 }
-                if (this.form.accountDateTo) {
-                    obj.accountDateTo = this.form.accountDateTo.slice(0, 10) + ' 00:00:00'
+                if (this.form.businessDateEnd) {
+                    obj.businessDateEnd = this.form.businessDateEnd.slice(0, 10) + ' 00:00:00'
                 }
 
                 obj.type = '3'

src/views/iosBasicData/fininvoicesOutput/fininvoicesDetails.vue

@@ -290,8 +290,8 @@
                                                 </el-form-item>
                                             </el-col>
                                             <el-col :span="8">
-                                                <el-form-item label="业务开始日期" prop="accountDateFrom">
-                                                    <el-date-picker v-model="form.accountDateFrom" clearable
+                                                <el-form-item label="业务开始日期" prop="businessDateStart">
+                                                    <el-date-picker v-model="form.businessDateStart" clearable
                                                         style="width: 100%;" type="date" size="small"
                                                         :disabled="editSave || (tableData.length && invoicestype != 1)"
                                                         value-format="yyyy-MM-dd" placeholder="选择业务日期">
@@ -299,8 +299,8 @@
                                                 </el-form-item>
                                             </el-col>
                                             <el-col :span="8">
-                                                <el-form-item label="业务结束日期" prop="accountDateTo">
-                                                    <el-date-picker v-model="form.accountDateTo" clearable
+                                                <el-form-item label="业务结束日期" prop="businessDateEnd">
+                                                    <el-date-picker v-model="form.businessDateEnd" clearable
                                                         style="width: 100%;" type="date" size="small"
                                                         :disabled="editSave || (tableData.length && invoicestype != 1)"
                                                         value-format="yyyy-MM-dd" placeholder="选择业务日期">
@@ -824,11 +824,11 @@ export default {
                 obj.invoiceDate = this.form.invoiceDate.slice(0, 10) + ' 00:00:00'
             }
             // 业务日期
-            if (this.form.accountDateFrom) {
-                obj.accountDateFrom = this.form.accountDateFrom.slice(0, 10) + ' 00:00:00'
+            if (this.form.businessDateStart) {
+                obj.businessDateStart = this.form.businessDateStart.slice(0, 10) + ' 00:00:00'
             }
-            if (this.form.accountDateTo) {
-                obj.accountDateTo = this.form.accountDateTo.slice(0, 10) + ' 00:00:00'
+            if (this.form.businessDateEnd) {
+                obj.businessDateEnd = this.form.businessDateEnd.slice(0, 10) + ' 00:00:00'
             }
             for (let item of this.handleSelectionData) {
                 // 拿未开票的数据
@@ -867,11 +867,11 @@ export default {
                 obj.invoiceDate = this.form.invoiceDate.slice(0, 10) + ' 00:00:00'
             }
             // 业务日期
-            if (this.form.accountDateFrom) {
-                obj.accountDateFrom = this.form.accountDateFrom.slice(0, 10) + ' 00:00:00'
+            if (this.form.businessDateStart) {
+                obj.businessDateStart = this.form.businessDateStart.slice(0, 10) + ' 00:00:00'
             }
-            if (this.form.accountDateTo) {
-                obj.accountDateTo = this.form.accountDateTo.slice(0, 10) + ' 00:00:00'
+            if (this.form.businessDateEnd) {
+                obj.businessDateEnd = this.form.businessDateEnd.slice(0, 10) + ' 00:00:00'
             }
             for (let item of this.handleSelectionData) {
                 // 拿未开票的数据
@@ -1185,11 +1185,11 @@ export default {
                     this.form.invoiceDate = this.form.invoiceDate.slice(0, 10) + ' 00:00:00'
                 }
                 // 业务日期
-                if (this.form.accountDateFrom) {
-                    this.form.accountDateFrom = this.form.accountDateFrom.slice(0, 10) + ' 00:00:00'
+                if (this.form.businessDateStart) {
+                    this.form.businessDateStart = this.form.businessDateStart.slice(0, 10) + ' 00:00:00'
                 }
-                if (this.form.accountDateTo) {
-                    this.form.accountDateTo = this.form.accountDateTo.slice(0, 10) + ' 00:00:00'
+                if (this.form.businessDateEnd) {
+                    this.form.businessDateEnd = this.form.businessDateEnd.slice(0, 10) + ' 00:00:00'
                 }
                 if (this.form.id) {
                     this.form.finInvoicesItemsList = this.form.finInvoicesItemsList.map(item => {
@@ -1263,11 +1263,11 @@ export default {
         },
         finstlbillslistAccBillByCorpfun() {
             let obj = {}
-            if (this.form.accountDateFrom) {
-                obj.accountDateFrom = this.form.accountDateFrom.slice(0, 10) + ' 00:00:00'
+            if (this.form.businessDateStart) {
+                obj.businessDateStart = this.form.businessDateStart.slice(0, 10) + ' 00:00:00'
             }
-            if (this.form.accountDateTo) {
-                obj.accountDateTo = this.form.accountDateTo.slice(0, 10) + ' 00:00:00'
+            if (this.form.businessDateEnd) {
+                obj.businessDateEnd = this.form.businessDateEnd.slice(0, 10) + ' 00:00:00'
             }
             obj.type = '3'
             obj.branchId = this.form.branchId
@@ -1306,11 +1306,11 @@ export default {
                     obj.invoiceDate = this.form.invoiceDate.slice(0, 10) + ' 00:00:00'
                 }
                 // 业务日期
-                if (this.form.accountDateFrom) {
-                    obj.accountDateFrom = this.form.accountDateFrom.slice(0, 10) + ' 00:00:00'
+                if (this.form.businessDateStart) {
+                    obj.businessDateStart = this.form.businessDateStart.slice(0, 10) + ' 00:00:00'
                 }
-                if (this.form.accountDateTo) {
-                    obj.accountDateTo = this.form.accountDateTo.slice(0, 10) + ' 00:00:00'
+                if (this.form.businessDateEnd) {
+                    obj.businessDateEnd = this.form.businessDateEnd.slice(0, 10) + ' 00:00:00'
                 }
 
                 obj.type = '3'