修改tabs 新加参数控制

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

@@ -77,8 +77,8 @@
                                             style="display: flex;align-items: center;justify-content: space-between">
                                             <el-row>
                                                 <el-col :span="item[0].span
-                                                        ? item[0].span
-                                                        : 12
+                                                    ? item[0].span
+                                                    : 12
                                                     ">
                                                     <el-form-item :label="item[0].label" :prop="item[0].prop"
                                                         :rules="item[0].rules" :label-width="item[0].labelWidth
@@ -88,17 +88,16 @@
                                                                 item[0]
                                                                     .label ==
                                                                 'HB/L NO'
-                                                            "
-                                                                style="color: #4c9e44;cursor: pointer;text-decoration: underline;"
+                                                            " style="color: #4c9e44;cursor: pointer;text-decoration: underline;"
                                                                 @click="
                                                                     applyforfun(
                                                                         item[0]
                                                                             .label
                                                                     )
                                                                     ">{{
-                                                                    item[0]
-                                                                        .label
-                                                                }}
+                                                                        item[0]
+                                                                            .label
+                                                                    }}
                                                             </span>
                                                             <span v-else style="color: #1e9fff">{{
                                                                 item[0]
@@ -117,53 +116,53 @@
                                                             item[0].type ==
                                                             'select'
                                                         " :datalist="item[0].dicData
-                                                                " :selectValue="form[
+                                                            " :selectValue="form[
                                                                 item[0].prop
-                                                                ]
+                                                            ]
                                                                 " :filterable="true" :allowCreate="item[0]
-                                                                    .allowCreate ||
-                                                                false
-                                                                " :clearable="false" :remote="true" :disabled="detailData.seeDisabled ||
-                                                                item[0]
-                                                                    .disabled ||
-                                                                showLock
-                                                                " :buttonIf="false" :placeholder="`${item[0]
-                                                                    .text ||
-                                                                ''}`
-                                                                " :forParameter="item[0]
-                                                                    .forParameter
-                                                                " @remoteMethod="
-                                                                remoteMethod(
-                                                                    $event,
-                                                                    item[0].prop
-                                                                )
-                                                                " @corpChange="
-                                                                corpChange(
-                                                                    $event,
-                                                                    item[0].prop
-                                                                )
-                                                                " @corpFocus="
-                                                                remoteMethod(
-                                                                    $event,
-                                                                    item[0].prop
-                                                                )
-                                                                ">
+                                                                        .allowCreate ||
+                                                                        false
+                                                                        " :clearable="false" :remote="true" :disabled="detailData.seeDisabled ||
+                                                                        item[0]
+                                                                            .disabled ||
+                                                                        showLock
+                                                                        " :buttonIf="false" :placeholder="`${item[0]
+                                                                        .text ||
+                                                                        ''}`
+                                                                        " :forParameter="item[0]
+                                                                        .forParameter
+                                                                        " @remoteMethod="
+                                                                        remoteMethod(
+                                                                            $event,
+                                                                            item[0].prop
+                                                                        )
+                                                                        " @corpChange="
+                                                                        corpChange(
+                                                                            $event,
+                                                                            item[0].prop
+                                                                        )
+                                                                        " @corpFocus="
+                                                                        remoteMethod(
+                                                                            $event,
+                                                                            item[0].prop
+                                                                        )
+                                                                        ">
                                                         </search-query>
                                                         <el-input v-else type="age" style="width: 100%;" v-model="form[
                                                             item[0].prop
-                                                            ]
+                                                        ]
                                                             " size="small" autocomplete="off" :disabled="detailData.seeDisabled ||
                                                                 item[0]
                                                                     .disabled ||
                                                                 showLock
                                                                 " :placeholder="item[0].text ||
-                                                                ''
-                                                                "></el-input>
+                                                                    ''
+                                                                    "></el-input>
                                                     </el-form-item>
                                                 </el-col>
                                                 <el-col :span="item[1].span
-                                                        ? item[1].span
-                                                        : 12
+                                                    ? item[1].span
+                                                    : 12
                                                     ">
                                                     <el-form-item :label="item[1].label" :prop="item[1].prop"
                                                         :rules="item[1].rules" :label-width="item[1].labelWidth
@@ -178,9 +177,9 @@
                                                             item[1].type ==
                                                             'date'
                                                         " v-model="form[
-                                                                item[1].prop
-                                                                ]
-                                                                " clearable style="width: 100%;" type="date" size="small"
+                                                            item[1].prop
+                                                        ]
+                                                            " clearable style="width: 100%;" type="date" size="small"
                                                             :disabled="detailData.seeDisabled ||
                                                                 item[1]
                                                                     .disabled ||
@@ -191,84 +190,85 @@
                                                             item[1].type ==
                                                             'select'
                                                         " :datalist="item[1].dicData
-                                                                " :selectValue="form[
+                                                            " :selectValue="form[
                                                                 item[1].prop
-                                                                ]
-                                                                " :filterable="true" :clearable="false" :remote="true"
-                                                            :disabled="detailData.seeDisabled ||
+                                                            ]
+                                                                " :filterable="true" :clearable="false"
+                                                            :remote="true" :disabled="detailData.seeDisabled ||
                                                                 item[1]
                                                                     .disabled ||
                                                                 showLock
                                                                 " :buttonIf="false" :placeholder="`${item[1]
                                                                     .text ||
-                                                                ''}`
-                                                                " :forParameter="item[1]
-                                                                    .forParameter
-                                                                " @remoteMethod="
-                                                                remoteMethod(
-                                                                    $event,
-                                                                    item[1].prop
-                                                                )
-                                                                " @corpChange="
-                                                                corpChange(
-                                                                    $event,
-                                                                    item[1].prop
-                                                                )
-                                                                " @corpFocus="
-                                                                remoteMethod(
-                                                                    $event,
-                                                                    item[1].prop
-                                                                )
-                                                                ">
+                                                                    ''}`
+                                                                    " :forParameter="item[1]
+                                                                        .forParameter
+                                                                        " @remoteMethod="
+                                                                        remoteMethod(
+                                                                            $event,
+                                                                            item[1].prop
+                                                                        )
+                                                                        " @corpChange="
+                                                                        corpChange(
+                                                                            $event,
+                                                                            item[1].prop
+                                                                        )
+                                                                        " @corpFocus="
+                                                                        remoteMethod(
+                                                                            $event,
+                                                                            item[1].prop
+                                                                        )
+                                                                        ">
                                                         </search-query>
 
                                                         <tree-select v-else-if="
                                                             item[1].type ==
                                                             'tree'
                                                         " v-model="form[
-                                                                item[1].prop
-                                                                ]
-                                                                " filterable :data="item[1].dicData
+                                                            item[1].prop
+                                                        ]
+                                                            " filterable :data="item[1].dicData
                                                                 " :props="item[1]
-                                                                    .forParameter
-                                                                " nodeKey="title" size="small" :disabled="detailData.seeDisabled ||
-                                                                item[1]
-                                                                    .disabled ||
-                                                                showLock
-                                                                " :multiple="false" :clearable="false" :placeholder="`${item[1]
-                                                                    .text ||
+                                                                        .forParameter
+                                                                        " nodeKey="title" size="small" :disabled="detailData.seeDisabled ||
+                                                                        item[1]
+                                                                            .disabled ||
+                                                                        showLock
+                                                                        " :multiple="false" :clearable="false"
+                                                            :placeholder="`${item[1]
+                                                                .text ||
                                                                 ''}`
                                                                 " @input="
-                                                                corpChange(
-                                                                    $event,
-                                                                    item[1].prop
-                                                                )
-                                                                ">
+                                                                        corpChange(
+                                                                            $event,
+                                                                            item[1].prop
+                                                                        )
+                                                                        ">
                                                         </tree-select>
 
                                                         <el-input v-else type="age" style="width: 100%;" v-model="form[
                                                             item[1].prop
-                                                            ]
+                                                        ]
                                                             " size="small" autocomplete="off" :disabled="detailData.seeDisabled ||
                                                                 item[1]
                                                                     .disabled ||
                                                                 showLock
                                                                 " :placeholder="item[1].text ||
-                                                                ''
-                                                                "></el-input>
+                                                                    ''
+                                                                    "></el-input>
                                                     </el-form-item>
                                                 </el-col>
                                                 <el-col v-if="item[2]" :span="item[2].span
-                                                        ? item[2].span
-                                                        : 12
+                                                    ? item[2].span
+                                                    : 12
                                                     ">
                                                     <el-form-item :label="item[2].label" :prop="item[2].prop"
                                                         :rules="item[2].rules" :label-width="item[2].labelWidth
                                                             " :disabled="detailData.seeDisabled ||
-                                                            item[2]
-                                                                .disabled ||
-                                                            showLock
-                                                            ">
+                                                                item[2]
+                                                                    .disabled ||
+                                                                showLock
+                                                                ">
                                                         <span slot="label" v-if="item[2].label">
                                                             <span style="color: #1e9fff">{{
                                                                 item[2]
@@ -279,46 +279,46 @@
                                                             item[2].type ==
                                                             'select'
                                                         " :datalist="item[2].dicData
-                                                                " :selectValue="form[
+                                                            " :selectValue="form[
                                                                 item[2].prop
-                                                                ]
-                                                                " :filterable="true" :clearable="false" :remote="true"
-                                                            :disabled="detailData.seeDisabled ||
+                                                            ]
+                                                                " :filterable="true" :clearable="false"
+                                                            :remote="true" :disabled="detailData.seeDisabled ||
                                                                 item[2]
                                                                     .disabled ||
                                                                 showLock
                                                                 " :buttonIf="false" :forParameter="item[2]
                                                                     .forParameter
-                                                                " :placeholder="`${item[2]
-                                                                    .text ||
-                                                                ''}`
-                                                                " @remoteMethod="
-                                                                remoteMethod(
-                                                                    $event,
-                                                                    item[2].prop
-                                                                )
-                                                                " @corpChange="
-                                                                corpChange(
-                                                                    $event,
-                                                                    item[2].prop
-                                                                )
-                                                                " @corpFocus="
-                                                                remoteMethod(
-                                                                    $event,
-                                                                    item[2].prop
-                                                                )
-                                                                ">
+                                                                    " :placeholder="`${item[2]
+                                                                        .text ||
+                                                                        ''}`
+                                                                        " @remoteMethod="
+                                                                        remoteMethod(
+                                                                            $event,
+                                                                            item[2].prop
+                                                                        )
+                                                                        " @corpChange="
+                                                                        corpChange(
+                                                                            $event,
+                                                                            item[2].prop
+                                                                        )
+                                                                        " @corpFocus="
+                                                                        remoteMethod(
+                                                                            $event,
+                                                                            item[2].prop
+                                                                        )
+                                                                        ">
                                                         </search-query>
                                                         <el-input v-else type="age" style="width: 100%;" v-model="form[
                                                             item[2].prop
-                                                            ]
+                                                        ]
                                                             " size="small" autocomplete="off" :disabled="detailData.seeDisabled ||
                                                                 item[1]
                                                                     .disabled ||
                                                                 showLock
                                                                 " :placeholder="item[2].text ||
-                                                                ''
-                                                                "></el-input>
+                                                                    ''
+                                                                    "></el-input>
                                                     </el-form-item>
                                                 </el-col>
                                             </el-row>
@@ -332,31 +332,32 @@
                                                 </span>
                                                 <search-query v-if="item.type == 'select'" ref="searchQueryRef"
                                                     :datalist="item.dicData" :selectValue="form[item.prop]
-                                                        " :filterable="true" :clearable="false" :remote="true" :disabled="detailData.seeDisabled ||
+                                                        " :filterable="true" :clearable="false" :remote="true"
+                                                    :disabled="detailData.seeDisabled ||
                                                         item.disabled ||
                                                         showLock
                                                         " :buttonIf="item.buttonIf" :forParameter="item.forParameter
-                                                        " :joinData="item.joinData" :placeholder="`${item.text || ''}`
-                                                        " @remoteMethod="
-                                                        remoteMethod(
-                                                            $event,
-                                                            item.prop
-                                                        )
-                                                        " @corpChange="
-                                                        corpChange(
-                                                            $event,
-                                                            item.prop
-                                                        )
-                                                        " @corpFocus="
-                                                        remoteMethod(
-                                                            $event,
-                                                            item.prop
-                                                        )
-                                                        " @eldialogConfirm="
-                                                        eldialogConfirm(
-                                                            item.slot
-                                                        )
-                                                        ">
+                                                            " :joinData="item.joinData" :placeholder="`${item.text || ''}`
+                                                                " @remoteMethod="
+                                                                remoteMethod(
+                                                                    $event,
+                                                                    item.prop
+                                                                )
+                                                                " @corpChange="
+                                                                corpChange(
+                                                                    $event,
+                                                                    item.prop
+                                                                )
+                                                                " @corpFocus="
+                                                                remoteMethod(
+                                                                    $event,
+                                                                    item.prop
+                                                                )
+                                                                " @eldialogConfirm="
+                                                                eldialogConfirm(
+                                                                    item.slot
+                                                                )
+                                                                ">
                                                     <bcorps v-show="item.slot ==
                                                         'bcorps'
                                                         " ref="bcorps" :eldialog="true" @selectionChange="
@@ -376,7 +377,7 @@
                                                         item.disabled ||
                                                         showLock
                                                         " :placeholder="item.text || ''
-                                                        "></el-input>
+                                                            "></el-input>
                                             </el-form-item>
                                         </div>
                                     </el-col>
@@ -517,6 +518,7 @@ import { verifyEnglish } from "@/util/date";
 import { contrastObj, contrastList } from "@/util/contrastData";
 import { selectListLos } from "@/api/approval/processConfig";
 import { similarValues } from "@/util/verifyData";
+import { isProcurement } from "@/api/basicData/configuration";
 import _ from "lodash";
 export default {
     components: {
@@ -974,7 +976,8 @@ export default {
                 }
             },
             deep: true, // 深度监听
-            immediate: true // 第一次改变就执行
+            immediate: true, // 第一次改变就执行
+            business: null,
         }
     },
     created() {
@@ -985,6 +988,9 @@ export default {
         if (this.detailData.billType) {
             this.form.billType = this.detailData.billType;
         }
+        isProcurement({ "param": "business" }).then(res => {
+            this.business = res.data.data
+        })
         // 判断是否员id, 有id 就不显示
         if (!this.form.id) {
             this.deptGetDetailPolfun(); // 目的地 卸货港 当前登录人的默认
@@ -1936,13 +1942,15 @@ export default {
             // this.searchSplit()
             // 把拼接的数据拆开 结束 💩💩💩💩💩💩💩💩💩💩💩💩💩💩
             // 费用 收 赋值数据
-            let similarDataD = similarValues(this.form.feeCenterListD, 'feeCnName', 'curCode')
-            if (similarDataD) {
-                return this.$message.error(`应收费用简称:${similarDataD.feeCnName}的币别不一致,请重新选择`);
-            }
-            let similarDataC = similarValues(this.form.feeCenterListC, 'feeCnName', 'curCode')
-            if (similarDataC) {
-                return this.$message.error(`应付费用简称:${similarDataC.feeCnName}的币别不一致,请重新选择`);
+            if (this.business == 1) {
+                let similarDataD = similarValues(this.form.feeCenterListD, 'feeCnName', 'curCode')
+                if (similarDataD) {
+                    return this.$message.error(`应收费用简称:${similarDataD.feeCnName}的币别不一致,请重新选择`);
+                }
+                let similarDataC = similarValues(this.form.feeCenterListC, 'feeCnName', 'curCode')
+                if (similarDataC) {
+                    return this.$message.error(`应付费用简称:${similarDataC.feeCnName}的币别不一致,请重新选择`);
+                }
             }
             this.form.feeCenterListD.map((row, index) => {
                 row.dc = "D";

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

@@ -1,37 +1,16 @@
 <template>
     <div>
         <basic-container v-show="isShow">
-            <avue-crud
-                :option="option"
-                :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"
-                :row-style="rowStyle"
-                @selection-change="selectionChange"
-                @current-change="currentChange"
-                @size-change="sizeChange"
-                @refresh-change="refreshChange"
-                @on-load="onLoad"
-                @expand-change="expandChange"
-                @resetColumn="
+            <avue-crud :option="option" :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" :row-style="rowStyle"
+                @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
+                @refresh-change="refreshChange" @on-load="onLoad" @expand-change="expandChange" @resetColumn="
                     resetColumnTwo('crud', 'option', 'optionBack', 309.11)
-                "
-                @saveColumn="
+                    " @saveColumn="
                     saveColumnTwo('crud', 'option', 'optionBack', 309.11)
-                "
-            >
+                    ">
                 <template slot-scope="{ disabled, size }" slot="billSortSearch">
                     <el-radio-group v-model="query.billSort">
                         <el-radio label="1">ETD</el-radio>
@@ -334,71 +313,30 @@
                 <!--#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>
                     <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="7"></el-tab-pane>
                             <el-tab-pane label="接单" name="0">
                                 <span slot="label">接单</span>
                             </el-tab-pane>
@@ -412,52 +350,35 @@
                                 </span>
                             </el-tab-pane>
                             <el-tab-pane label="完成" name="3"></el-tab-pane>
-                            <el-tab-pane label="全部" name="7"></el-tab-pane>
                         </el-tabs>
                     </div>
                 </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>
@@ -475,23 +396,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>{{
@@ -503,34 +422,13 @@
             </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="mawbOption"
-                :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"
+        <el-dialog title="主单列表" :visible.sync="dialogVisible" append-to-body width="60%" :before-close="handleClose">
+            <avue-crud :option="mawbOption" :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',
@@ -538,35 +436,24 @@
                         'mawbOptionBack',
                         309.7
                     )
-                "
-                @saveColumn="
+                    " @saveColumn="
                     saveColumnTwo(
                         'mawbOptionCrud',
                         'mawbOption',
                         '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>
@@ -685,7 +572,7 @@ export default {
             ],
             // 表格的检索条件
             query: {
-                billStatus: "0",
+                billStatus: "7",
                 billSort: "1"
             },
             // 弹窗的搜索项
@@ -2074,8 +1961,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
@@ -2199,8 +2086,8 @@ export default {
             if (
                 this.saberUserInfo.role_name.indexOf("admin") != -1
                     ? this.saberUserInfo.role_name.indexOf(
-                          "允许修改他人业务"
-                      ) != -1
+                        "允许修改他人业务"
+                    ) != -1
                     : false
             )
                 return false;
@@ -2218,7 +2105,7 @@ export default {
                     confirmButtonText: "确定",
                     cancelButtonText: "取消",
                     type: "warning"
-                }).catch(err => {});
+                }).catch(err => { });
                 return true;
             }
         },

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

@@ -101,7 +101,7 @@
                                                                 }} {{ item[0].label }}
                                                             </span>
                                                             <span v-else style="color: #1e9fff">{{ item[0].label
-                                                                }}</span>
+                                                            }}</span>
                                                         </span>
                                                         <span v-if="item[0].type == 'button'"></span>
                                                         <!--<el-button v-if="item[0].type == 'button'" :disabled="detailData.seeDisabled || item[0].disabled"-->
@@ -428,7 +428,7 @@ export default {
                 placeDeliveryNamePrint: '',
                 potEnName: '',
                 potNamePrint: '',
-                chargeableWeight:'方',
+                chargeableWeight: '方',
                 detail: {},
                 hmmEdi: {},
             },
@@ -469,7 +469,7 @@ export default {
                 placeDeliveryNamePrint: '',
                 potEnName: '',
                 potNamePrint: '',
-                chargeableWeight:'方',
+                chargeableWeight: '方',
                 detail: {},
                 hmmEdi: {},
             },
@@ -1707,7 +1707,7 @@ export default {
 
                 }
 
-                if(value!=this.form.hpaymode) {
+                if (value != this.form.hpaymode) {
                     this.$alert('主单付费方式和分单的付费方式不一致 ！', '提示', {
                         confirmButtonText: '确定',
                     });
@@ -1731,7 +1731,7 @@ export default {
                         this.$set(this.form, 'hpayplace', this.form.podEnName ? this.form.podEnName : '')
                     }
                 }
-                if(value!=this.form.paymode) {
+                if (value != this.form.paymode) {
                     this.$alert('主单付费方式和分单的付费方式不一致 ！', '提示', {
                         confirmButtonText: '确定',
                     });
@@ -2136,7 +2136,7 @@ export default {
                         // wfg
                         var fldNames = 'placeReceiptNamePrint,polNamePrint,podNamePrint,destinationNamePrint,placeDeliveryNamePrint,potNamePrint,siRemarks,bookingRemarks';
                         var fldDescs = '收货地,装货港,卸货港,目的地,交货地,中转港,SI 备注,订舱备注';
-                        fldNames.split(',').forEach((fld, fi)=>{
+                        fldNames.split(',').forEach((fld, fi) => {
                             if (checkFullWidthSymbols(this.form.forwarding).hasFullWidth) {
                                 this.$message({
                                     dangerouslyUseHTMLString: true,
@@ -2243,13 +2243,15 @@ export default {
             // 把拼接的数据拆开 结束 💩💩💩💩💩💩💩💩💩💩💩💩💩💩
             // 费用 收 赋值数据
             // this.form.shortName=this.form.corpCnName.split('-')[1]
-            let similarDataD = similarValues(this.form.feeCenterListD, 'feeCnName', 'curCode')
-            if (similarDataD) {
-                return this.$message.error(`应收费用简称:${similarDataD.feeCnName}的币别不一致,请重新选择`);
-            }
-            let similarDataC = similarValues(this.form.feeCenterListC, 'feeCnName', 'curCode')
-            if (similarDataC) {
-                return this.$message.error(`应付费用简称:${similarDataC.feeCnName}的币别不一致,请重新选择`);
+            if (this.business == 1) {
+                let similarDataD = similarValues(this.form.feeCenterListD, 'feeCnName', 'curCode')
+                if (similarDataD) {
+                    return this.$message.error(`应收费用简称:${similarDataD.feeCnName}的币别不一致,请重新选择`);
+                }
+                let similarDataC = similarValues(this.form.feeCenterListC, 'feeCnName', 'curCode')
+                if (similarDataC) {
+                    return this.$message.error(`应付费用简称:${similarDataC.feeCnName}的币别不一致,请重新选择`);
+                }
             }
             this.form.feeCenterListD.map((row, index) => {
                 row.dc = 'D'

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

@@ -354,6 +354,8 @@
                     </el-dropdown>
                     <div style="margin-top: 10px">
                         <el-tabs type="card" v-model="query.billStatus" @tab-click="handleClick">
+                            
+                            <el-tab-pane label="全部" name="7"></el-tab-pane>
                             <el-tab-pane label="接单" name="0">
                                 <span slot="label">接单</span>
                             </el-tab-pane>
@@ -372,7 +374,6 @@
                                 </span>
                             </el-tab-pane>
                             <el-tab-pane label="完成" name="3"></el-tab-pane>
-                            <el-tab-pane label="全部" name="7"></el-tab-pane>
                         </el-tabs>
                         <!-- <el-tabs type="card" v-model="query.billStatus" @tab-click="handleClick">
                             <el-tab-pane label="接单" name="0">
@@ -690,7 +691,7 @@ export default {
             ],
             // 表格的检索条件
             query: {
-                billStatus: "0",
+                billStatus: "7",
                 billSort: "1"
             },
             // 弹窗的搜索项

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

@@ -3,8 +3,8 @@
         <avue-crud :option="option" :data="tableData" id="out-table" ref="crud"
             @selection-change="handleSelectionChange" :header-cell-style="tableHeaderCellStyle"
             :row-class-name="rowClassName" :cell-style="cellStyle"
-            @resetColumn="resetColumn('crud', 'option', 'optionBack', 457)"
-            @saveColumn="saveColumn('crud', 'option', 'optionBack', 457)">
+            @resetColumn="resetColumn('crud', 'option', 'optionBack', 494)"
+            @saveColumn="saveColumn('crud', 'option', 'optionBack', 494)">
             <template slot="menuLeft">
                 <slot name="menuLeft"></slot>
             </template>
@@ -195,7 +195,7 @@ export default {
         }
     },
     async created() {
-        this.option = await this.getColumnData(this.getColumnName(457), this.optionBack);
+        this.option = await this.getColumnData(this.getColumnName(494), this.optionBack);
     },
     methods: {
         armbChange(row) {