海运进出口 审核通过允许操作新加费用明细 客户托书生成订单加保存判断 利润统计新加字段 付费申请新加tabs

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

@@ -56,7 +56,7 @@
                         <span>应收费用</span>
                     </div>
                     <el-button v-if="isFeeEditD" type="danger" plain size="small"
-                        :disabled="!selectionDList.length || disabled || pleasereviewType"
+                        :disabled="!selectionDList.length || showLock"
                         @click="batchDelete('D')">一键删除
                     </el-button>
                     <!-- <el-button v-if="isFeeEditD" type="success" plain size="small"
@@ -71,29 +71,29 @@
                     <el-button v-if="isFeeEditD" type="success" plain size="small"
                         :disabled="!this.assemblyForm.id || disabled || pleasereviewType"
                         @click="templateClick('D')">应收模板</el-button>
-                    <el-button v-if="isFeeEditD" type="info" plain size="small" :disabled="disabled || pleasereviewType"
+                    <el-button v-if="isFeeEditD" type="info" plain size="small" :disabled="showLock"
                         @click="feecenterSubmitListfun">一键保存</el-button>
-                    <el-button v-if="isFeeEditD" type="info" plain size="small" :disabled="disabled || pleasereviewType"
+                    <el-button v-if="isFeeEditD" type="info" plain size="small" :disabled="showLock"
                         @click="feecenterEditfun('D')">一键编辑
                     </el-button>
                     <el-button v-if="isFeeEditC" type="primary" plain size="small"
                         :disabled="disabled || pleasereviewType" @click="copyfun('D')">生成应付</el-button>
                     <el-button v-if="isFeeEditD" type="primary" plain size="small"
                         :disabled="disabled || pleasereviewType" @click="allClick('发票申请', 'D')">发票申请</el-button>
-                    <el-button type="primary" plain size="small" :disabled="disabled || selectionDList.length == 0"
+                    <el-button type="primary" plain size="small" :disabled="showLock || selectionDList.length == 0"
                         @click="allClick('D费用申请')">请核费用</el-button>
                     <el-button type="danger" plain size="small" :disabled="disabled || selectionDList.length == 0"
                         @click="allClick('D撤销请核')">撤销请核</el-button>
-                    <el-button type="primary" plain size="small" :disabled="selectionDList.length != 1"
+                    <el-button type="primary" plain size="small" :disabled="selectionDList.length != 1||showLock"
                         @click="allClick('D申请修改')">申请修改</el-button>
-                    <el-button type="success" plain size="small" :disabled="selectionDList.length != 1"
+                    <el-button type="success" plain size="small" :disabled="selectionDList.length != 1||showLock"
                         @click="allClick('D申请删除')">申请删除</el-button>
-                    <el-button type="danger" plain size="small" :disabled="selectionDList.length != 1"
+                    <el-button type="danger" plain size="small" :disabled="selectionDList.length != 1||showLock"
                         @click="allClick('D取消申请')">取消申请</el-button>
                 </template>
                 <template slot="indexHeader" slot-scope="scope">
                     <el-button v-if="isFeeEditD" type="primary" size="small" icon="el-icon-plus" circle
-                        :disabled="disabled" @click="addDfun"></el-button>
+                        :disabled="showLock" @click="addDfun"></el-button>
                 </template>
                 <template slot="index" slot-scope="scope">
                     <span>{{ scope.index + 1 }}</span>
@@ -208,7 +208,7 @@
                         <span>应付费用</span>
                     </div>
                     <el-button v-if="isFeeEditC" type="danger" plain size="small"
-                        :disabled="!selectionCList.length || disabled || pleasereviewType"
+                        :disabled="!selectionCList.length || showLock"
                         @click="batchDelete('C')">一键删除
                     </el-button>
                     <!-- <el-button v-if="isFeeEditC" type="primary" plain size="small"
@@ -224,10 +224,10 @@
                         :disabled="!this.assemblyForm.id || disabled || pleasereviewType"
                         @click="templateClick('C')">应付模板
                     </el-button>
-                    <el-button v-if="isFeeEditC" type="info" plain size="small" :disabled="disabled || pleasereviewType"
+                    <el-button v-if="isFeeEditC" type="info" plain size="small" :disabled="showLock"
                         @click="feecenterSubmitListfun">一键保存
                     </el-button>
-                    <el-button v-if="isFeeEditC" type="info" plain size="small" :disabled="disabled || pleasereviewType"
+                    <el-button v-if="isFeeEditC" type="info" plain size="small" :disabled="showLock"
                         @click="feecenterEditfun('C')">一键编辑
                     </el-button>
                     <el-button v-if="isFeeEditC" type="primary" plain size="small"
@@ -235,22 +235,22 @@
                     </el-button>
                     <el-button type="info" plain size="small" :disabled="disabled"
                         @click="allClick('付费申请', 'C')">付费申请</el-button>
-                    <el-button type="primary" plain size="small" :disabled="disabled || selectionCList.length == 0"
+                    <el-button type="primary" plain size="small" :disabled="showLock || selectionCList.length == 0"
                         @click="allClick('C费用申请')">请核费用</el-button>
                     <el-button type="danger" plain size="small" :disabled="disabled || selectionCList.length == 0"
                         @click="allClick('C撤销请核')">撤销请核</el-button>
                     <!-- <el-button type="success" plain size="small" :disabled="disabled"
                         @click="allClick('提取成本')">提取成本</el-button> -->
-                    <el-button type="primary" plain size="small" :disabled="selectionCList.length != 1"
+                    <el-button type="primary" plain size="small" :disabled="selectionCList.length != 1||showLock"
                         @click="allClick('C申请修改')">申请修改</el-button>
-                    <el-button type="success" plain size="small" :disabled="selectionCList.length != 1"
+                    <el-button type="success" plain size="small" :disabled="selectionCList.length != 1||showLock"
                         @click="allClick('C申请删除')">申请删除</el-button>
-                    <el-button type="danger" plain size="small" :disabled="selectionCList.length != 1"
+                    <el-button type="danger" plain size="small" :disabled="selectionCList.length != 1||showLock"
                         @click="allClick('C取消申请')">取消申请</el-button>
                 </template>
                 <template slot="indexHeader" slot-scope="scope">
                     <el-button v-if="isFeeEditC" type="primary" size="small" icon="el-icon-plus" circle
-                        :disabled="disabled" @click="addCfun">
+                        :disabled="showLock" @click="addCfun">
                     </el-button>
                 </template>
                 <template slot="index" slot-scope="scope">
@@ -740,6 +740,10 @@ export default {
             type: Boolean,
             default: false,
         },
+        showLock: {
+            type: Boolean,
+            default: false,
+        },
     },
     data() {
         return {

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

@@ -91,8 +91,8 @@
                     (form.status == 4 && form.billType != 'MH')
                 " @click.stop="DocumentApproval">单据请核
                 </el-button>
-                <el-button size="small" type="primary" style="margin-right: 8px"
-                    :disabled="detailData.seeDisabled || showLock" :loading="saveLoading" @click="editCustomer">保 存
+                <el-button size="small" type="primary" style="margin-right: 8px" :disabled="showLock"
+                    :loading="saveLoading" @click="editCustomer">保 存
                 </el-button>
                 <el-dropdown style="line-height: 0" v-if="form.billType != 'MH'">
                     <el-button type="warning" :loading="saveLoading" :disabled="!form.id" size="small">
@@ -449,8 +449,8 @@
                 <el-tab-pane label="费用信息" name="fy" class="scrollable-container"
                     v-if="(roleName.includes('admin') || roleName.includes('secondaryAdmin') || roleName.includes('应收修改') || roleName.includes('应付修改') || roleName.includes('应收查看') || roleName.includes('应付查看'))">
                     <feecenter :assemblyForm="form" :copyFormData="copyFormData" :detailData="detailData"
-                        :disabled="detailData.seeDisabled || showLock" :pleasereviewType="pleasereviewType"
-                        :pid="form.id" @billsDetailfun="billsDetailfun(form.id)">
+                        :disabled="detailData.seeDisabled || showLock" :showLock="showLock"
+                        :pleasereviewType="pleasereviewType" :pid="form.id" @billsDetailfun="billsDetailfun(form.id)">
                     </feecenter>
                 </el-tab-pane>
                 <el-tab-pane label="单证中心" name="dz" class="scrollable-container">

src/views/iosBasicData/PaymentApplication/index.vue

@@ -17,6 +17,14 @@
             url="/blade-los/bfees/list" :filterable="true" :remote="true" dataName="cnName"></dic-select>
         </tempalte>
         <template slot="menuLeft">
+          <div style="margin-top: 10px">
+            <el-tabs type="card" v-model="query.billStatus" @tab-click="handleClick">
+              <el-tab-pane label="未结算" name="0">
+              </el-tab-pane>
+              <el-tab-pane label="已结算" name="1">
+              </el-tab-pane>
+            </el-tabs>
+          </div>
           <el-button type="success" size="small" icon="el-icon-plus" plain @click="newbillFun">新建付费申请
           </el-button>
           <el-button type="danger" size="small" icon="el-icon-delete" plain @click="handleDelete">一键删除
@@ -62,7 +70,9 @@ export default {
       // 详情页面和列表切换
       isShow: true,
       form: {},
-      query: {},
+      query: {
+        billStatus: '0'
+      },
       loading: true,
       page: {
         pageSize: 10,
@@ -135,7 +145,7 @@ export default {
             searchOrder: 4,
             overHidden: true
           },
-                    {
+          {
             label: "单据编号",
             prop: "billNo",
             search: true,
@@ -347,7 +357,7 @@ export default {
             searchOrder: 5,
             overHidden: true
           },
-          
+
           {
             label: "对账单号",
             prop: "checkNo",
@@ -454,6 +464,10 @@ export default {
     }
   },
   methods: {
+    handleClick() {
+      this.page.currentPage = 1;
+      this.onLoad(this.page, this.query);
+    },
     // 展开行
     expandChange(row, expendList) {
       finstlbillsitemsList(1, 20, { pid: row.id }).then(res => {

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

@@ -358,41 +358,6 @@
                                     </el-col>
                                 </el-row>
                             </el-form-item>
-                            <el-form-item label="目的地" prop="destinationName" label-width="60px">
-                                <span slot="label">
-                                    <el-popover placement="right" width="400" trigger="hover"
-                                        @show="delShow(assemblyForm.destinationId, 1)">
-                                        <avue-crud :data="delData" :option="delOption"
-                                            :table-loading="loading"></avue-crud>
-                                        <!-- <el-button slot="reference">click 激活</el-button> -->
-                                        <span style="color:rgb(76, 158, 68);text-decoration: underline;"
-                                            slot="reference">目的地</span>
-                                    </el-popover>
-                                    <!-- <span style="color: #1e9fff">目的地</span> -->
-                                </span>
-                                <el-row>
-                                    <el-col :span="24">
-                                        <search-query :datalist="destinationData"
-                                            :selectValue="assemblyForm.destinationName" :filterable="true"
-                                            :clearable="true" :remote="true" :joinData="true"
-                                            :disabled="detailData.seeDisabled || generateBillsfalse || (assemblyForm.billType == 'MH' && assemblyForm.masterBillNo > 0)"
-                                            :buttonIf="false" placeholder="请选择目的地"
-                                            :forParameter="{ key: 'id', short: 'enName', label: 'code', value: 'enName' }"
-                                            @remoteMethod="remoteMethod($event, 'destination')"
-                                            @corpChange="corpChange($event, 'destination')"
-                                            @corpFocus="remoteMethod($event, 'destination')">
-                                        </search-query>
-                                    </el-col>
-                                    <el-col :span="24">
-                                        <span style="padding-left: 0px"></span>
-                                        <el-input type="age" style="width: 100%;"
-                                            v-model="assemblyForm.destinationNamePrint" size="small" autocomplete="off"
-                                            :disabled="detailData.seeDisabled || generateBillsfalse || (assemblyForm.billType == 'MH' && assemblyForm.masterBillNo > 0)"
-                                            clearable placeholder="目的地"
-                                            @change="textareaBlur('destinationNamePrint')"></el-input>
-                                    </el-col>
-                                </el-row>
-                            </el-form-item>
                             <el-form-item label="交货地" prop="placeDeliveryName" label-width="60px">
                                 <span slot="label">
                                     <el-popover placement="right" width="400" trigger="hover"
@@ -540,7 +505,7 @@
                                     placeholder="订舱代理"></el-input>
                             </el-col>
                         </el-form-item> -->
-                        <div>
+                        <el-row>
                             <el-col :span="12">
                                 <el-form-item label="件数" prop="quantity" label-width="80px"
                                     :rules="[{ required: true, message: ' ', trigger: 'blur' }]">
@@ -578,8 +543,8 @@
                                     </search-query>
                                 </el-form-item>
                             </el-col>
-                        </div>
-                        <div>
+                        </el-row>
+                        <el-row>
                             <el-col :span="12">
                                 <el-form-item label="毛重(KGS)" prop="grossWeight" label-width="80px"
                                     :rules="[{ required: true, message: ' ', trigger: 'blur' }]">
@@ -604,8 +569,8 @@
                                         @focus="quantityFocus" clearable placeholder="请输入尺码/体积"></el-input>
                                 </el-form-item>
                             </el-col>
-                        </div>
-                        <div>
+                        </el-row>
+                        <el-row>
                             <el-col :span="12">
                                 <el-form-item label="签单方式" prop="issueType" label-width="80px">
                                     <span slot="label">
@@ -628,8 +593,8 @@
                                     </el-date-picker>
                                 </el-form-item>
                             </el-col>
-                        </div>
-                        <div>
+                        </el-row>
+                        <el-row>
                             <el-col>
                                 <el-form-item label="ETA" prop="eta" label-width="80px">
                                     <span slot="label">
@@ -642,8 +607,8 @@
                                     </el-date-picker>
                                 </el-form-item>
                             </el-col>
-                        </div>
-                        <div>
+                        </el-row>
+                        <el-row>
                             <el-col :span="13">
                                 <el-form-item label="ATD" prop="actualEtd" label-width="80px">
                                     <span slot="label">
@@ -667,7 +632,7 @@
                                     </el-date-picker>
                                 </el-form-item>
                             </el-col>
-                        </div>
+                        </el-row>
                         <div>
                             <el-col>
                                 <el-form-item label="所属公司" prop="branchName" label-width="80px">
@@ -731,7 +696,7 @@
                                 </span>
                                 <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.cyRemarks"
                                     size="small" autocomplete="off"
-                                    :disabled="detailData.seeDisabled || generateBillsfalse" rows="3" clearable
+                                    :disabled="detailData.seeDisabled || generateBillsfalse" rows="2" clearable
                                     placeholder="请输入场站备注" @change="textareaBlur('cyRemarks')"></el-input>
                             </el-form-item>
                         </div>

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

@@ -56,7 +56,7 @@
                         <span>应收费用</span>
                     </div>
                     <el-button v-if="isFeeEditD" type="danger" plain size="small"
-                        :disabled="!selectionDList.length || disabled || pleasereviewType"
+                        :disabled="!selectionDList.length || showLock"
                         @click="batchDelete('D')">一键删除
                     </el-button>
                     <!-- <el-button v-if="isFeeEditD" type="success" plain size="small"
@@ -71,29 +71,29 @@
                     <el-button v-if="isFeeEditD" type="success" plain size="small"
                         :disabled="!this.assemblyForm.id || disabled || pleasereviewType"
                         @click="templateClick('D')">应收模板</el-button>
-                    <el-button v-if="isFeeEditD" type="info" plain size="small" :disabled="disabled || pleasereviewType"
+                    <el-button v-if="isFeeEditD" type="info" plain size="small" :disabled="showLock"
                         @click="feecenterSubmitListfun">一键保存</el-button>
-                    <el-button v-if="isFeeEditD" type="info" plain size="small" :disabled="disabled || pleasereviewType"
+                    <el-button v-if="isFeeEditD" type="info" plain size="small" :disabled="showLock"
                         @click="feecenterEditfun('D')">一键编辑
                     </el-button>
                     <el-button v-if="isFeeEditC" type="primary" plain size="small"
                         :disabled="disabled || pleasereviewType" @click="copyfun('D')">生成应付</el-button>
                     <el-button v-if="isFeeEditD" type="primary" plain size="small"
                         :disabled="disabled || pleasereviewType" @click="allClick('发票申请', 'D')">发票申请</el-button>
-                    <el-button type="primary" plain size="small" :disabled="disabled || selectionDList.length == 0"
+                    <el-button type="primary" plain size="small" :disabled="showLock || selectionDList.length == 0"
                         @click="allClick('D费用申请')">请核费用</el-button>
                     <el-button type="danger" plain size="small" :disabled="disabled || selectionDList.length == 0"
                         @click="allClick('D撤销请核')">撤销请核</el-button>
-                    <el-button type="primary" plain size="small" :disabled="selectionDList.length != 1"
+                    <el-button type="primary" plain size="small" :disabled="selectionDList.length != 1||showLock"
                         @click="allClick('D申请修改')">申请修改</el-button>
-                    <el-button type="success" plain size="small" :disabled="selectionDList.length != 1"
+                    <el-button type="success" plain size="small" :disabled="selectionDList.length != 1||showLock"
                         @click="allClick('D申请删除')">申请删除</el-button>
-                    <el-button type="danger" plain size="small" :disabled="selectionDList.length != 1"
+                    <el-button type="danger" plain size="small" :disabled="selectionDList.length != 1||showLock"
                         @click="allClick('D取消申请')">取消申请</el-button>
                 </template>
                 <template slot="indexHeader" slot-scope="scope">
                     <el-button v-if="isFeeEditD" type="primary" size="small" icon="el-icon-plus" circle
-                        :disabled="disabled" @click="addDfun"></el-button>
+                        :disabled="showLock" @click="addDfun"></el-button>
                 </template>
                 <template slot="index" slot-scope="scope">
                     <span>{{ scope.index + 1 }}</span>
@@ -210,7 +210,7 @@
                         <span>应付费用</span>
                     </div>
                     <el-button v-if="isFeeEditC" type="danger" plain size="small"
-                        :disabled="!selectionCList.length || disabled || pleasereviewType"
+                        :disabled="!selectionCList.length || showLock"
                         @click="batchDelete('C')">一键删除
                     </el-button>
                     <!-- <el-button v-if="isFeeEditC" type="primary" plain size="small"
@@ -226,10 +226,10 @@
                         :disabled="!this.assemblyForm.id || disabled || pleasereviewType"
                         @click="templateClick('C')">应付模板
                     </el-button>
-                    <el-button v-if="isFeeEditC" type="info" plain size="small" :disabled="disabled || pleasereviewType"
+                    <el-button v-if="isFeeEditC" type="info" plain size="small" :disabled="showLock"
                         @click="feecenterSubmitListfun">一键保存
                     </el-button>
-                    <el-button v-if="isFeeEditC" type="info" plain size="small" :disabled="disabled || pleasereviewType"
+                    <el-button v-if="isFeeEditC" type="info" plain size="small" :disabled="showLock"
                         @click="feecenterEditfun('C')">一键编辑
                     </el-button>
                     <el-button v-if="isFeeEditC" type="primary" plain size="small"
@@ -237,22 +237,22 @@
                     </el-button>
                     <el-button type="info" plain size="small" :disabled="disabled"
                         @click="allClick('付费申请', 'C')">付费申请</el-button>
-                    <el-button type="primary" plain size="small" :disabled="disabled || selectionCList.length == 0"
+                    <el-button type="primary" plain size="small" :disabled="showLock || selectionCList.length == 0"
                         @click="allClick('C费用申请')">请核费用</el-button>
                     <el-button type="danger" plain size="small" :disabled="disabled || selectionCList.length == 0"
                         @click="allClick('C撤销请核')">撤销请核</el-button>
                     <!-- <el-button type="success" plain size="small" :disabled="disabled"
                         @click="allClick('提取成本')">提取成本</el-button> -->
-                    <el-button type="primary" plain size="small" :disabled="selectionCList.length != 1"
+                    <el-button type="primary" plain size="small" :disabled="selectionCList.length != 1||showLock"
                         @click="allClick('C申请修改')">申请修改</el-button>
-                    <el-button type="success" plain size="small" :disabled="selectionCList.length != 1"
+                    <el-button type="success" plain size="small" :disabled="selectionCList.length != 1||showLock"
                         @click="allClick('C申请删除')">申请删除</el-button>
-                    <el-button type="danger" plain size="small" :disabled="selectionCList.length != 1"
+                    <el-button type="danger" plain size="small" :disabled="selectionCList.length != 1||showLock"
                         @click="allClick('C取消申请')">取消申请</el-button>
                 </template>
                 <template slot="indexHeader" slot-scope="scope">
                     <el-button v-if="isFeeEditC" type="primary" size="small" icon="el-icon-plus" circle
-                        :disabled="disabled" @click="addCfun">
+                        :disabled="showLock" @click="addCfun">
                     </el-button>
                 </template>
                 <template slot="index" slot-scope="scope">
@@ -703,6 +703,10 @@ export default {
             type: Boolean,
             default: false,
         },
+        showLock: {
+            type: Boolean,
+            default: false,
+        },
     },
     data() {
         return {

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

@@ -83,8 +83,8 @@
                     v-if="(form.status == 0 || form.status == 4) && form.billType != 'MH'"
                     @click.stop="DocumentApproval">单据请核
                 </el-button>
-                <el-button size="small" type="primary" style="margin-right: 8px"
-                    :disabled="detailData.seeDisabled || showLock" :loading="saveLoading" @click="editCustomer">保 存
+                <el-button size="small" type="primary" style="margin-right: 8px" :disabled="showLock"
+                    :loading="saveLoading" @click="editCustomer">保 存
                 </el-button>
                 <el-dropdown style="line-height: 0" v-if="form.billType != 'MH'">
                     <el-button type="warning" :loading="saveLoading" :disabled="!form.id" size="small">
@@ -121,7 +121,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"-->
@@ -288,8 +288,8 @@
                 <el-tab-pane label="费用信息" name="fy" class="scrollable-container"
                     v-if="!(form.billType == 'MM' && isHq != 1) && (roleName.includes('admin') || roleName.includes('应收修改') || roleName.includes('应付修改') || roleName.includes('应收查看') || roleName.includes('应付查看'))">
                     <feecenter :assemblyForm="form" :copyFormData="copyFormData" :detailData="detailData"
-                        :disabled="detailData.seeDisabled || showLock" :pleasereviewType="pleasereviewType"
-                        :pid="form.id" @billsDetailfun="billsDetailfun(form.id)">
+                        :disabled="detailData.seeDisabled || showLock" :showLock="showLock"
+                        :pleasereviewType="pleasereviewType" :pid="form.id" @billsDetailfun="billsDetailfun(form.id)">
                     </feecenter>
                 </el-tab-pane>
                 <el-tab-pane label="单证中心" name="dz" class="scrollable-container">
@@ -2507,8 +2507,8 @@ export default {
                 background: 'rgba(255,255,255,0.7)'
             });
             let types = typeof type == "string" ? type.split(",") : []
-            console.log(types.indexOf("复制配箱信息",1))
-            let res = await billsCopyBills({ id, containers: types.indexOf("复制配箱信息")!=-1 ? 1 : null })
+            console.log(types.indexOf("复制配箱信息", 1))
+            let res = await billsCopyBills({ id, containers: types.indexOf("复制配箱信息") != -1 ? 1 : null })
 
             loading.close();
 
@@ -2536,6 +2536,9 @@ export default {
             if (!this.roleName.includes('admin') && (this.roleName.includes('应付修改') || this.roleName.includes('应付查看')) && !(this.roleName.includes('应收修改') || this.roleName.includes('应收查看'))) {
                 res.data.data.feeCenterListD = []
             }
+            if (res.data.data.billType == 'DD' || res.data.data.billType == 'MM') {
+                res.data.data.hblno = null
+            }
             await this.saveLocalCurrency(res.data.data.branchId)
             this.form = res.data.data;
             this.pageLoading = false

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

@@ -172,7 +172,7 @@
                 <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>{{
@@ -762,6 +762,20 @@ export default {
                         prop: "bookingNo",
                         width: "120",
                         overHidden: true,
+                    },
+                    {
+                        label: "OP",
+                        prop: "operatorId",
+                        width: "120",
+                        overHidden: true,
+                        type: "select",
+                        filterable: true,
+                        remote: true,
+                        dicUrl: "/api/blade-user/userListAll?roleAlias=操作员&realName={{key}}",
+                        props: {
+                            label: "realName",
+                            value: "id",
+                        },
                         search: true,
                         span: 6,
                         searchOrder: 7
@@ -1025,21 +1039,6 @@ export default {
                         searchOrder: 18
                     },
                     {
-                        label: "签单方式",
-                        prop: "issueType",
-                        width: "120",
-                        overHidden: true,
-                        type: "select",
-                        dicUrl: "/api/blade-system/dict-biz/dictionary?code=issue_type_F",
-                        props: {
-                            label: "dictValue",
-                            value: "dictKey"
-                        },
-                        search: true,
-                        span: 6,
-                        searchOrder: 19
-                    },
-                    {
                         label: "唛头",
                         prop: "marks",
                         width: "80",
@@ -1250,7 +1249,9 @@ export default {
                             label: "dictValue",
                             value: "dictKey"
                         },
-                        overHidden: true
+                        overHidden: true,
+                        search: true,
+                        searchOrder: 19
                     },
                     {
                         label: "备注",
@@ -2449,7 +2450,7 @@ export default {
                 ...Object.assign(params, this.query),
                 businessType: "SE",
                 seaType: "E",
-                status: this.query.billStatus == 3 ? 3 : undefined
+                // status: this.query.billStatus == 3 ? 3 : undefined
             }).then(res => {
                 const data = res.data.data;
                 this.page.total = data.total;

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

@@ -1500,6 +1500,9 @@ export default {
         }
         if (this.form.status != 3) {
           for (let item of this.form.preContainersList) {
+            if (!item.id) {
+              return this.$message.error("请保存数据");
+            }
             if (Number(item.oceanFreight) < Number(item.salesPrice)) {
               return this.$message.error("集装箱的海运费低于销售价,请点击运费申请");
             }

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

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

src/views/iosBasicData/decisionAnalysis/index.vue

@@ -108,6 +108,12 @@ export default {
                         overHidden: true,
                     },
                     {
+                        label: "客服",
+                        prop: "customerServiceName",
+                        width: "80",
+                        overHidden: true,
+                    },
+                    {
                         label: "业务来源",
                         prop: "srcType",
                         search: true,

src/views/iosBasicData/paymentDetail/index.vue

@@ -110,7 +110,7 @@ export default {
                 calcHeight: 30,
                 tip: false,
                 searchShow: true,
-                searchMenuSpan: 24,
+                searchMenuSpan: 18,
                 border: true,
                 index: false,
                 selection: true,
@@ -410,7 +410,7 @@ export default {
         ).content;
         this.option = await this.getColumnData(this.getColumnName(333), this.optionBack);
         if (this.saberUserInfo.role_name.indexOf('admin') != -1 || this.saberUserInfo.role_name.indexOf('总部') != -1) {
-            this.option.searchMenuSpan = 18
+            this.option.searchMenuSpan = 12
             this.option.column.forEach(item => {
                 if (item.prop == 'branchId') {
                     item.search = true
@@ -682,7 +682,7 @@ export default {
             this[option] = this[optionBack];
             const inSave = await this.delColumnData(this.getColumnName(code), this[optionBack]);
             if (this.saberUserInfo.role_name.indexOf('admin') != -1 || this.saberUserInfo.role_name.indexOf('总部') != -1) {
-                this.option.searchMenuSpan = 18
+                this.option.searchMenuSpan = 12
                 this.option.column.forEach(item => {
                     if (item.prop == 'branchId') {
                         item.search = true