修改bug

src/views/iosBasicData/PaymentApplication/assembly/finstlbillsitems.vue

@@ -29,22 +29,22 @@
             </template>
             <template slot="taxInvoiceNumber" slot-scope="{ row }">
                 <el-input style="width: 100%;" v-model="row.taxInvoiceNumber"
-                    v-if="row.feeCnName == '增值税' && (brfalse && !editSave)" size="mini" autocomplete="off"
-                    clearable placeholder="请输入税票号">
+                    v-if="row.feeCnName == '增值税' && (brfalse && !editSave)" size="mini" autocomplete="off" clearable
+                    placeholder="请输入税票号">
                 </el-input>
                 <span v-else>{{ row.taxInvoiceNumber }}</span>
             </template>
             <template slot="taxInvoiceDate" slot-scope="{ row }">
                 <el-date-picker style="width: 100%;" v-model="row.taxInvoiceDate"
-                    v-if="row.feeCnName == '增值税' && (brfalse && !editSave)" size="mini" type="date"
-                    placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd">
+                    v-if="row.feeCnName == '增值税' && (brfalse && !editSave)" size="mini" type="date" placeholder="选择日期"
+                    format="yyyy-MM-dd" value-format="yyyy-MM-dd">
                 </el-date-picker>
                 <span v-else>{{ row.taxInvoiceDate }}</span>
             </template>
             <template slot="deductionTime" slot-scope="{ row }">
                 <el-date-picker style="width: 100%;" v-model="row.deductionTime"
-                    v-if="row.feeCnName == '增值税' && (brfalse && !editSave)" size="mini" type="date"
-                    placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd">
+                    v-if="row.feeCnName == '增值税' && (brfalse && !editSave)" size="mini" type="date" placeholder="选择日期"
+                    format="yyyy-MM-dd" value-format="yyyy-MM-dd">
                 </el-date-picker>
                 <span v-else>{{ row.deductionTime }}</span>
             </template>
@@ -172,6 +172,18 @@ export default {
                         overHidden: true
                     },
                     {
+                        label: "业务员",
+                        prop: "srcCnName",
+                        width: 80,
+                        overHidden: true
+                    },
+                    {
+                        label: "操作人",
+                        prop: "operatorName",
+                        width: 80,
+                        overHidden: true
+                    },
+                    {
                         label: "币种",
                         prop: "currentStlCurCode",
                         width: 60,

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

@@ -1204,6 +1204,7 @@ export default {
         },
         // 报表弹窗
         previewDialogfun() {
+            this.getReportTypeByBigHandle('业务')
             this.previewDialog = true
         },
         //请核关闭
@@ -2472,7 +2473,7 @@ export default {
         handleClick(tba, event) {
 
         },
-        // 大tbas切换
+               // 大tbas切换
         bigHandleClick() {
             if (this.bigtabs == 'fd') {
                 if (this.form.id) {
@@ -2483,14 +2484,13 @@ export default {
                 if (this.form.id) {
                     this.$refs.documentCenter.reportslogListfun({ currentPage: 1, pageSize: 10 })
                 }
+                this.getReportTypeByBigHandle('单证')
             }
+            if (this.bigtabs == 'fy') this.getReportTypeByBigHandle('费用')
+
         },
-        getReportTypeByBigHandle() {
-            var rt = "";
-            if (this.bigtabs == 'wt') rt = "业务";
-            if (this.bigtabs == 'fy') rt = "费用";
-            if (this.bigtabs == 'dz') rt = "单证";
-            return rt;
+        getReportTypeByBigHandle(name) {
+            return name;
         },
         // 获取不分页的分单列表
         billsListAllfun(masterId) {

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

@@ -1,33 +1,13 @@
 <template>
     <div>
         <basic-container v-show="isShow">
-            <avue-crud
-                :option="optionBack"
-                :table-loading="loading"
-                :data="data"
-                :page.sync="page"
-                id="out-table"
-                :header-cell-class-name="headerClassName"
-                :permission="permissionList"
-                :before-open="beforeOpen"
-                v-model="form"
-                ref="crud"
-                :search.sync="query"
-                @row-update="rowUpdate"
-                @row-save="rowSave"
-                @row-del="rowDel"
-                @search-change="searchChange"
-                @search-reset="searchReset"
-                @selection-change="selectionChange"
-                @current-change="currentChange"
-                @size-change="sizeChange"
-                @refresh-change="refreshChange"
-                @on-load="onLoad"
-                @expand-change="expandChange"
-                :row-style="rowStyle"
-                @resetColumn="resetColumnTwo('crud', 309)"
-                @saveColumn="saveColumnTwo('crud', optionBack, 309)"
-            >
+            <avue-crud :option="optionBack" :table-loading="loading" :data="data" :page.sync="page" id="out-table"
+                :header-cell-class-name="headerClassName" :permission="permissionList" :before-open="beforeOpen"
+                v-model="form" ref="crud" :search.sync="query" @row-update="rowUpdate" @row-save="rowSave"
+                @row-del="rowDel" @search-change="searchChange" @search-reset="searchReset"
+                @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
+                @refresh-change="refreshChange" @on-load="onLoad" @expand-change="expandChange" :row-style="rowStyle"
+                @resetColumn="resetColumnTwo('crud', 309)" @saveColumn="saveColumnTwo('crud', optionBack, 309)">
                 <template slot-scope="{ disabled, size }" slot="billSortSearch">
                     <el-radio-group v-model="query.billSort">
                         <el-radio label="1">ETD</el-radio>
@@ -330,111 +310,50 @@
                 <!--#endregion-->
 
                 <template slot="menuLeft">
-                    <el-button
-                        type="primary"
-                        size="small"
-                        @click="addbtnfun('DD')"
-                        >新建直单
+                    <el-button type="primary" size="small" @click="addbtnfun('DD')">新建直单
                     </el-button>
-                    <el-button
-                        type="success"
-                        size="small"
-                        @click="addbtnfun('MM')"
-                        >新建主单
+                    <el-button type="success" size="small" @click="addbtnfun('MM')">新建主单
                     </el-button>
-                    <el-button
-                        type="warning"
-                        size="small"
-                        @click="addbtnfun('MH')"
-                        >新建分单
+                    <el-button type="warning" size="small" @click="addbtnfun('MH')">新建分单
                     </el-button>
-                    <el-button
-                        type="primary"
-                        size="small"
-                        plain
-                        @click="CopyDocumentsfun"
-                        >复制单据
+                    <el-button type="primary" size="small" plain @click="CopyDocumentsfun">复制单据
                     </el-button>
-                    <el-button
-                        type="success"
-                        size="small"
-                        plain
-                        @click="increaseMawb"
-                        >分单->主单
+                    <el-button type="success" size="small" plain @click="increaseMawb">分单->主单
                     </el-button>
-                    <el-button
-                        type="warning"
-                        size="small"
-                        plain
-                        v-if="query.billStatus == 0"
-                        @click="Disembarkingfun"
-                        >退 舱
+                    <el-button type="warning" size="small" plain v-if="query.billStatus == 0" @click="Disembarkingfun">退
+                        舱
                     </el-button>
-                    <el-button
-                        type="primary"
-                        size="small"
-                        plain
-                        v-if="query.billStatus == 1"
-                        @click="revokeWithdrawalfun"
-                        >撤销退舱
+                    <el-button type="primary" size="small" plain v-if="query.billStatus == 1"
+                        @click="revokeWithdrawalfun">撤销退舱
                     </el-button>
-                    <el-button
-                        type="danger"
-                        size="small"
-                        plain
-                        v-if="query.billStatus != 3"
-                        @click="handleDelete"
-                        >删 除
+                    <el-button type="danger" size="small" plain v-if="query.billStatus != 3" @click="handleDelete">删 除
                     </el-button>
-                    <el-button type="warning" size="small" @click="outExport"
-                        >导 出
+                    <el-button type="warning" size="small" @click="outExport">导 出
                     </el-button>
                     <el-dropdown style="line-height: 0">
-                        <el-button
-                            size="small"
-                            type="success"
-                            style="margin-right: 8px"
-                            :disabled="selectionList.length == 0"
-                        >
-                            发送 SO EDI<i
-                                class="el-icon-arrow-down el-icon--right"
-                            ></i>
+                        <el-button size="small" type="success" style="margin-right: 8px"
+                            :disabled="selectionList.length == 0">
+                            发送 SO EDI<i class="el-icon-arrow-down el-icon--right"></i>
                         </el-button>
                         <el-dropdown-menu slot="dropdown">
-                            <el-dropdown-item
-                                v-for="item in ediData_SO"
-                                :key="item.id"
-                                @click.native="editypesSendingEdifun(item)"
-                                >{{ item.cnName }}
+                            <el-dropdown-item v-for="item in ediData_SO" :key="item.id"
+                                @click.native="editypesSendingEdifun(item)">{{ item.cnName }}
                             </el-dropdown-item>
                         </el-dropdown-menu>
                     </el-dropdown>
                     <el-dropdown style="line-height: 0">
-                        <el-button
-                            size="small"
-                            type="success"
-                            style="margin-right: 8px"
-                            :disabled="selectionList.length == 0"
-                        >
-                            发送 SI EDI<i
-                                class="el-icon-arrow-down el-icon--right"
-                            ></i>
+                        <el-button size="small" type="success" style="margin-right: 8px"
+                            :disabled="selectionList.length == 0">
+                            发送 SI EDI<i class="el-icon-arrow-down el-icon--right"></i>
                         </el-button>
                         <el-dropdown-menu slot="dropdown">
-                            <el-dropdown-item
-                                v-for="item in ediData_SI"
-                                :key="item.id"
-                                @click.native="editypesSendingEdifun(item)"
-                                >{{ item.cnName }}
+                            <el-dropdown-item v-for="item in ediData_SI" :key="item.id"
+                                @click.native="editypesSendingEdifun(item)">{{ item.cnName }}
                             </el-dropdown-item>
                         </el-dropdown-menu>
                     </el-dropdown>
                     <div style="margin-top: 10px">
-                        <el-tabs
-                            type="card"
-                            v-model="query.billStatus"
-                            @tab-click="handleClick"
-                        >
+                        <el-tabs type="card" v-model="query.billStatus" @tab-click="handleClick">
                             <el-tab-pane label="接单" name="0">
                                 <span slot="label">接单</span>
                             </el-tab-pane>
@@ -469,46 +388,30 @@
                 </template>
                 <template slot-scope="scope" slot="menu">
                     <!--:disabled="saberUserInfo.role_name.indexOf('允许修改他人业务') == -1?saberUserInfo.user_id != scope.row.createUser:false"-->
-                    <el-button
-                        :type="scope.type"
-                        :size="scope.size"
-                        icon="el-icon-edit"
-                        @click.stop="rowCellfun(scope.row.id, scope.row)"
-                        >编辑
+                    <el-button :type="scope.type" :size="scope.size" icon="el-icon-edit"
+                        @click.stop="rowCellfun(scope.row.id, scope.row)">编辑
                     </el-button>
                 </template>
 
                 <template slot="expand" slot-scope="{ row }">
-                    <SplitList
-                        :typeMenu="true"
-                        :data="row.billsListAllData"
-                        :loading="SplitLoading"
-                        @corpfun="rowCellfun"
-                    >
+                    <SplitList :typeMenu="true" :data="row.billsListAllData" :loading="SplitLoading"
+                        @corpfun="rowCellfun">
                     </SplitList>
                 </template>
                 <temolate slot="billStatus" slot-scope="{ row }">
                     <div>
-                        <span
-                            v-if="row.billStatus == item.dictKey"
-                            v-for="(item, index) in billStatusData"
-                            :key="index"
+                        <span v-if="row.billStatus == item.dictKey" v-for="(item, index) in billStatusData" :key="index"
                             :style="{ 'background-color': item.colour }"
-                            style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;"
-                        >
+                            style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;">
                             {{ item.dictValue }}
                         </span>
                     </div>
                 </temolate>
                 <template slot="accountStatus" slot-scope="{ row }">
                     <div>
-                        <span
-                            v-if="row.accountStatus == item.dictKey"
-                            v-for="(item, index) in accountStatusData"
-                            :key="index"
-                            :style="{ 'background-color': item.colour }"
-                            style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;"
-                        >
+                        <span v-if="row.accountStatus == item.dictKey" v-for="(item, index) in accountStatusData"
+                            :key="index" :style="{ 'background-color': item.colour }"
+                            style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;">
                             {{ item.dictValue }}
                         </span>
                     </div>
@@ -525,23 +428,21 @@
                 <template slot="corpCnName" slot-scope="scope">
                     <span
                         style="color: #1e9fff;cursor: pointer;width: 100%;overflow:hidden;white-space: nowrap;text-overflow: ellipsis;"
-                        @click.stop="rowCellfun(scope.row.id, scope.row)"
-                    >
+                        @click.stop="rowCellfun(scope.row.id, scope.row)">
                         {{ scope.row.shortName }}
                     </span>
                 </template>
                 <template slot="billNo" slot-scope="scope">
                     <span
                         style="color: #1e9fff;cursor: pointer;width: 100%;overflow:hidden;white-space: nowrap;text-overflow: ellipsis;"
-                        @click.stop="rowCellfun(scope.row.id, scope.row)"
-                    >
+                        @click.stop="rowCellfun(scope.row.id, scope.row)">
                         {{ scope.row.billNo }}
                     </span>
                 </template>
                 <template slot="eta" slot-scope="scope">
                     <span>{{
                         scope.row.eta ? scope.row.eta.slice(0, 10) : ""
-                    }}</span>
+                        }}</span>
                 </template>
                 <template slot="updateTime" slot-scope="scope">
                     <span>{{
@@ -552,132 +453,96 @@
                 </template>
                 <template slot="checkDrStatusDescr" slot-scope="{ row }">
                     <div>
-                        <span
-                            v-if="row.checkDrStatusDescr == '未对账'"
-                            style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #67C23A;"
-                        >
+                        <span v-if="row.checkDrStatusDescr == '未对账'"
+                            style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #67C23A;">
                             未对账
                         </span>
-                        <span
-                            v-if="row.checkDrStatusDescr == '已对账'"
-                            style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #409EFF;"
-                        >
+                        <span v-if="row.checkDrStatusDescr == '已对账'"
+                            style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #409EFF;">
                             已对账
                         </span>
-                        <span
-                            v-if="row.checkDrStatusDescr == '部分对账'"
-                            style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #F56C6C;"
-                        >
+                        <span v-if="row.checkDrStatusDescr == '部分对账'"
+                            style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #F56C6C;">
                             部分对账
                         </span>
                     </div>
                 </template>
                 <template slot="stlDrStatusDescr" slot-scope="{ row }">
                     <div>
-                        <span
-                            v-if="row.stlDrStatusDescr == '未结'"
-                            style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #67C23A;"
-                        >
+                        <span v-if="row.stlDrStatusDescr == '未结'"
+                            style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #67C23A;">
                             未结
                         </span>
-                        <span
-                            v-if="row.stlDrStatusDescr == '已结'"
-                            style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #409EFF;"
-                        >
+                        <span v-if="row.stlDrStatusDescr == '已结'"
+                            style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #409EFF;">
                             已结
                         </span>
-                        <span
-                            v-if="row.stlDrStatusDescr == '部分结'"
-                            style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #F56C6C;"
-                        >
+                        <span v-if="row.stlDrStatusDescr == '部分结'"
+                            style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #F56C6C;">
                             部分结
                         </span>
                     </div>
                 </template>
                 <template slot="stlCrStatusDescr" slot-scope="{ row }">
                     <div>
-                        <span
-                            v-if="row.stlCrStatusDescr == '未结'"
-                            style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #67C23A;"
-                        >
+                        <span v-if="row.stlCrStatusDescr == '未结'"
+                            style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #67C23A;">
                             未结
                         </span>
-                        <span
-                            v-if="row.stlCrStatusDescr == '结清'"
-                            style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #409EFF;"
-                        >
+                        <span v-if="row.stlCrStatusDescr == '结清'"
+                            style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #409EFF;">
                             结清
                         </span>
-                        <span
-                            v-if="row.stlCrStatusDescr == '部分'"
-                            style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #F56C6C;"
-                        >
+                        <span v-if="row.stlCrStatusDescr == '部分'"
+                            style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #F56C6C;">
                             部分
                         </span>
                     </div>
                 </template>
                 <template slot="stlCrStatusDescr" slot-scope="{ row }">
                     <div>
-                        <span
-                            v-if="row.stlCrStatusDescr == '未结'"
-                            style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #67C23A;"
-                        >
+                        <span v-if="row.stlCrStatusDescr == '未结'"
+                            style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #67C23A;">
                             未结
                         </span>
-                        <span
-                            v-if="row.stlCrStatusDescr == '结清'"
-                            style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #409EFF;"
-                        >
+                        <span v-if="row.stlCrStatusDescr == '结清'"
+                            style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #409EFF;">
                             结清
                         </span>
-                        <span
-                            v-if="row.stlCrStatusDescr == '部分'"
-                            style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #F56C6C;"
-                        >
+                        <span v-if="row.stlCrStatusDescr == '部分'"
+                            style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #F56C6C;">
                             部分
                         </span>
                     </div>
                 </template>
                 <template slot="invoiceDrStatusDescr" slot-scope="{ row }">
                     <div>
-                        <span
-                            v-if="row.invoiceDrStatusDescr == '未开'"
-                            style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #67C23A;"
-                        >
+                        <span v-if="row.invoiceDrStatusDescr == '未开'"
+                            style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #67C23A;">
                             未开
                         </span>
-                        <span
-                            v-if="row.invoiceDrStatusDescr == '部分'"
-                            style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #409EFF;"
-                        >
+                        <span v-if="row.invoiceDrStatusDescr == '部分'"
+                            style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #409EFF;">
                             部分
                         </span>
-                        <span
-                            v-if="row.invoiceDrStatusDescr == '全开'"
-                            style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #F56C6C;"
-                        >
+                        <span v-if="row.invoiceDrStatusDescr == '全开'"
+                            style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #F56C6C;">
                             全开
                         </span>
                     </div>
                 </template>
                 <template slot="checkCrStatusDescr" slot-scope="{ row }">
                     <div>
-                        <span
-                            v-if="row.checkCrStatusDescr == '未申请'"
-                            style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #67C23A;"
-                        >
+                        <span v-if="row.checkCrStatusDescr == '未申请'"
+                            style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #67C23A;">
                             未申请
                         </span>
-                        <span
-                            v-if="row.checkCrStatusDescr == '部分申请'"
-                            style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #409EFF;"
-                        >
+                        <span v-if="row.checkCrStatusDescr == '部分申请'"
+                            style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #409EFF;">
                             部分申请
                         </span>
-                        <span
-                            v-if="row.checkCrStatusDescr == '已申请'"
-                            style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #F56C6C;"
-                        >
+                        <span v-if="row.checkCrStatusDescr == '已申请'"
+                            style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;background-color: #F56C6C;">
                             已申请
                         </span>
                     </div>
@@ -685,58 +550,26 @@
             </avue-crud>
         </basic-container>
 
-        <bills-details
-            ref="billsDetails"
-            v-if="!isShow"
-            :detailData="detailData"
-            @goBack="goBack"
-            @toAddEdit="toAddEdit"
-            :key="datekey"
-        ></bills-details>
+        <bills-details ref="billsDetails" v-if="!isShow" :detailData="detailData" @goBack="goBack"
+            @toAddEdit="toAddEdit" :key="datekey"></bills-details>
 
-        <el-dialog
-            title="主单列表"
-            :visible.sync="dialogVisible"
-            append-to-body
-            width="60%"
-            :before-close="handleClose"
-        >
-            <avue-crud
-                :option="mawbOptionBack"
-                :table-loading="mawbloading"
-                :data="mawbData"
-                :page.sync="mawbPage"
-                :search="mawbQuery"
-                ref="mawbOptionCrud"
-                id="out-table"
-                :header-cell-class-name="headerClassName"
-                @search-change="mawbSearch"
-                @size-change="mawbSizeChange"
-                @current-change="mawbCurrentChange"
-                @resetColumn="resetColumnTwo('mawbOptionCrud', 309.7)"
-                @saveColumn="
+        <el-dialog title="主单列表" :visible.sync="dialogVisible" append-to-body width="60%" :before-close="handleClose">
+            <avue-crud :option="mawbOptionBack" :table-loading="mawbloading" :data="mawbData" :page.sync="mawbPage"
+                :search="mawbQuery" ref="mawbOptionCrud" id="out-table" :header-cell-class-name="headerClassName"
+                @search-change="mawbSearch" @size-change="mawbSizeChange" @current-change="mawbCurrentChange"
+                @resetColumn="resetColumnTwo('mawbOptionCrud', 309.7)" @saveColumn="
                     saveColumnTwo('mawbOptionCrud', mawbOptionBack, 309.7)
-                "
-            >
+                    ">
                 <template slot="radio" slot-scope="{ row }">
-                    <el-radio
-                        v-model="dialogRadio"
-                        :label="row.id"
-                        @input="radioInput(row)"
-                    ></el-radio>
+                    <el-radio v-model="dialogRadio" :label="row.id" @input="radioInput(row)"></el-radio>
                 </template>
             </avue-crud>
             <span slot="footer" class="dialog-footer">
-                <el-button
-                    @click="
-                        dialogVisible = false;
-                        dialogRadio = null;
-                    "
-                    >取 消</el-button
-                >
-                <el-button type="primary" @click="AddToMainOrder"
-                    >确 定</el-button
-                >
+                <el-button @click="
+                    dialogVisible = false;
+                dialogRadio = null;
+                ">取 消</el-button>
+                <el-button type="primary" @click="AddToMainOrder">确 定</el-button>
             </span>
         </el-dialog>
     </div>
@@ -1864,7 +1697,7 @@ export default {
         this.statusWorkDictsfun(); // 业务审核类型
         this.editypesListfun(); // edi 数据获取
     },
-    mounted() {},
+    mounted() { },
     activated() {
         if (this.$route.query.id) {
             if (!this.$store.getters.seaFEStatus) {
@@ -2119,8 +1952,8 @@ export default {
             if (
                 this.saberUserInfo.role_name.indexOf("admin") != -1
                     ? this.saberUserInfo.role_name.indexOf(
-                          "允许修改他人业务"
-                      ) != -1
+                        "允许修改他人业务"
+                    ) != -1
                     : false
             )
                 return false;
@@ -2138,7 +1971,7 @@ export default {
                     confirmButtonText: "确定",
                     cancelButtonText: "取消",
                     type: "warning"
-                }).catch(err => {});
+                }).catch(err => { });
                 return true;
             }
         },
@@ -2308,8 +2141,8 @@ export default {
                 if (
                     this.saberUserInfo.role_name.indexOf("admin") == -1
                         ? this.saberUserInfo.role_name.indexOf(
-                              "允许修改他人业务"
-                          ) == -1
+                            "允许修改他人业务"
+                        ) == -1
                             ? this.saberUserInfo.user_id == row.createUser
                             : true
                         : true

src/views/iosBasicData/bcorps/detailsPage.vue

@@ -342,6 +342,19 @@
                   </el-input>
                 </el-form-item>
               </el-col>
+              <el-col :span="8">
+                <el-form-item label="客户唯一ID" prop="corpOnlyId" v-if="tenantId == 607913" 
+                :rules="{required: true, message: '', trigger: 'blur'}">
+                  <el-input v-model="formData.corpOnlyId" size="small" placeholder="请输入客户唯一ID" clearable
+                    :style="{ width: '100%' }">
+                  </el-input>
+                </el-form-item>
+                     <el-form-item label="客户唯一ID" prop="corpOnlyId" v-if="tenantId != 607913">
+                  <el-input v-model="formData.corpOnlyId" size="small" placeholder="请输入客户唯一ID" clearable
+                    :style="{ width: '100%' }">
+                  </el-input>
+                </el-form-item>
+              </el-col>
               <el-col :span="24">
                 <el-form-item label="详情信息" prop="details">
                   <el-input v-model="formData.details" size="small" type="textarea" placeholder="请输入详情信息"
@@ -1146,6 +1159,7 @@ export default {
   },
   data() {
     return {
+      tenantId: JSON.parse(localStorage.getItem("saber-userInfo")).content.tenant_id,
       options: [{
         value: '票结',
         label: '票结'
@@ -1209,7 +1223,7 @@ export default {
       corpsAttnDialogIndex: null,
       formData: {
         status: 0,
-        accountPeriodType:'票结',
+        accountPeriodType: '票结',
         corpsAttnList: [],
         corpsBankList: [],
         corpsFilesList: [],
@@ -1310,6 +1324,11 @@ export default {
           message: ' ',
           trigger: 'change'
         }],
+        // corpOnlyId: [{
+        //   required: true,
+        //   message: ' ',
+        //   trigger: 'change'
+        // }],
       },
       // 客户联系人表单校验
       // corpsAttnRules: {
@@ -1714,46 +1733,61 @@ export default {
     },
     submitForm() {
       this.$refs['userDataForm'].validate(valid => {
-        if (!valid) return
-        // 判断业务来源是否填写
-        if (!this.formData.sourceType) {
-          this.$message.warning('请填写业务来源')
-          return;
-        }
-        // 判断来源明细是否填写
-        if (!this.formData.srcCnName) {
-          this.$message.warning('请填写来源明细')
-          return;
-        }
-        // 联系人姓名 取 客户联系人里的第一项
-        if (this.formData.corpsAttnList.length > 0) {
-          this.formData.attnName = this.formData.corpsAttnList[0].cname
-          this.formData.attnTel = this.formData.corpsAttnList[0].tel
-        }
-        // 部门 取当前登录人的部门
-        this.formData.deptId = JSON.parse(localStorage.getItem("saber-userInfo")).content.dept_id
+        if (valid) {
+          // 判断业务来源是否填写
+          if (!this.formData.sourceType) {
+            this.$message.warning('请填写业务来源')
+            return;
+          }
+          // 判断来源明细是否填写
+          if (!this.formData.srcCnName) {
+            this.$message.warning('请填写来源明细')
+            return;
+          }
+              // 判断来源明细是否填写
+          if (!this.formData.corpSource) {
+            this.$message.warning('请填写客户来源')
+            return;
+          }
+          if (this.tenantId == 607913) {
+            if (!this.formData.corpOnlyId) {
+              this.$message.warning('请填写客户唯一ID')
+              return;
+            }
+          }
+          // 联系人姓名 取 客户联系人里的第一项
+          if (this.formData.corpsAttnList.length > 0) {
+            this.formData.attnName = this.formData.corpsAttnList[0].cname
+            this.formData.attnTel = this.formData.corpsAttnList[0].tel
+          }
+          // 部门 取当前登录人的部门
+          this.formData.deptId = JSON.parse(localStorage.getItem("saber-userInfo")).content.dept_id
 
-        // TODO 提交表单
-        // 联系电话赋值
-        if (this.formData.id != null) {
-          updateBcorps(this.formData).then(res => {
-            this.$message({
-              type: "success",
-              message: "修改成功!"
+          // TODO 提交表单
+          // 联系电话赋值
+          if (this.formData.id != null) {
+            updateBcorps(this.formData).then(res => {
+              this.$message({
+                type: "success",
+                message: "修改成功!"
+              });
+              this.getBcorpsDetailfun(res.data.data.id)
+            })
+          } else {
+            this.formData.attnTel = this.formData.tel
+            addBcorps(this.formData).then((res) => {
+              this.$message({
+                type: "success",
+                message: "添加成功!"
+              });
+              this.getBcorpsDetailfun(res.data.data.id)
             });
-            this.getBcorpsDetailfun(res.data.data.id)
-          })
+          }
         } else {
-          this.formData.attnTel = this.formData.tel
-          addBcorps(this.formData).then((res) => {
-            this.$message({
-              type: "success",
-              message: "添加成功!"
-            });
-            this.getBcorpsDetailfun(res.data.data.id)
-          });
+          return false;
         }
 
+
       })
     },
     resetForm() {

src/views/iosBasicData/fininvoicesApplyfor/assembly/fininvoicesitems.vue

@@ -89,6 +89,18 @@ export default {
                         overHidden: true
                     },
                     {
+                        label: "业务员",
+                        prop: "srcCnName",
+                        width: 80,
+                        overHidden: true
+                    },
+                    {
+                        label: "操作人",
+                        prop: "operatorName",
+                        width: 80,
+                        overHidden: true
+                    },
+                    {
                         label: "本次CNY",
                         prop: "currentAmountCNY",
                         width: 100,

src/views/iosBasicData/finstlbills/assembly/finstlbillsitems.vue

@@ -151,6 +151,18 @@ export default {
                         overHidden: true
                     },
                     {
+                        label: "业务员",
+                        prop: "srcCnName",
+                        width: 80,
+                        overHidden: true
+                    },
+                    {
+                        label: "操作人",
+                        prop: "operatorName",
+                        width: 80,
+                        overHidden: true
+                    },
+                    {
                         label: "本次对账CNY",
                         prop: "currentStlAmountRMB",
                         width: 100,