1.箱管 箱管费用 导入新加参数

2.海运进出口 费用信息 发票申请修改判断规则
3.海运出口 新加箱号规则校验
4.财务管理 结算中心 保存快速点结算时一直loading
5.财务管理 销项发票 重复点开票时一直loading
6.财务管理 销项发票 列表页去掉没用的字段
7.海运进出口 列表页 tabs修改位置和默认值
8.海运进出口 修改ETA ATA时间格式

src/enums/column-name.js

@@ -1491,6 +1491,10 @@ const columnName = [{
   name: '货运代理-空运入口-报表管理-预览报表'
 },
 {
+  code: 312.8,
+  name: '货运代理-海运进口-报表管理'
+},
+{
   code: 313,
   name: '货运代理-账单管理-账单中心'
 },

src/views/boxManagement/boxAdjustment/detailsPage.vue

@@ -14,8 +14,8 @@
         <el-button class="el-button--small-yh" v-else style="margin-left: 6px;" type="primary" size="small"
           :disabled="isSaveBtn" @click="submit">保 存
         </el-button>
-        <el-button type="success" size="small" v-if="form.buxStaus == '录入'" @click.stop="confirm">调箱确认</el-button>
-        <el-button type="danger" size="small" v-if="form.buxStaus == '已确认'" @click.stop="revoke">调箱撤销</el-button>
+        <!-- <el-button type="success" size="small" v-if="form.buxStaus == '录入'" @click.stop="confirm">调箱确认</el-button> -->
+        <!-- <el-button type="danger" size="small" v-if="form.buxStaus == '已确认'" @click.stop="revoke">调箱撤销</el-button> -->
         <!-- <el-button v-if="form.status == '审核提交'" class="el-button--small-yh" style="margin-left: 6px;" type="danger"
           size="small" @click="revokeApplication">撤销单据请核
         </el-button> -->

src/views/boxManagement/boxCost/detailsPage.vue

@@ -14,8 +14,8 @@
         <el-button class="el-button--small-yh" v-else style="margin-left: 6px;" type="primary" size="small"
           :disabled="isSaveBtn || form.buxStaus == '已确认'" @click="submit">保 存
         </el-button>
-        <el-button type="success" size="small" v-if="form.buxStaus == '录入'" @click.stop="confirm">确认费用</el-button>
-        <el-button type="danger" size="small" v-if="form.buxStaus == '已确认'" @click.stop="revoke">撤销费用</el-button>
+        <!-- <el-button type="success" size="small" v-if="form.buxStaus == '录入'" @click.stop="confirm">确认费用</el-button> -->
+        <!-- <el-button type="danger" size="small" v-if="form.buxStaus == '已确认'" @click.stop="revoke">撤销费用</el-button> -->
         <!-- <el-button v-if="form.status == '审核提交'" class="el-button--small-yh" style="margin-left: 6px;" type="danger"
           size="small" @click="revokeApplication">撤销单据请核
         </el-button> -->
@@ -1733,7 +1733,7 @@ export default {
     handleGet() {
       window.open(
         `/api/blade-los/tradingBoxItem/boxItemTemplate?${this.website.tokenHeader
-        }=${getToken()}&type=1`
+        }=${getToken()}&type=4`
       );
     },
     dicChange(name, row) {
@@ -2248,7 +2248,7 @@ export default {
       if (name == '导入') {
         this.excelOption.column.forEach(item => {
           if (item.prop == 'excelFile') {
-            item.action = "/api/blade-los/tradingBoxItem/importBoxItem?type=1&id=" + this.form.id
+            item.action = "/api/blade-los/tradingBoxItem/importBoxItem?type=4&id=" + this.form.id
           }
         })
         this.excelBox = true

src/views/iosBasicData/ComputationCenter/settlementDetails.vue

@@ -144,59 +144,61 @@
                                 </el-col>
                             </el-row>
                             <el-row>
-<el-col :span="5">
-                                <el-form-item label="来源单号" prop="requestNo">
-                                    <el-input style="width: 100%;" v-model="form.requestNo" size="small"
-                                        autocomplete="off" :disabled="true" clearable placeholder="请输入来源单号">
-                                    </el-input>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="5">
-                                <el-form-item label="ACCT NO" prop="accountNo">
-                                    <el-input style="width: 100%;" v-model="form.accountNo" size="small"
-                                        autocomplete="off" :disabled="editSave || tableData.length > 0" clearable
-                                        placeholder="请输入ACCT NO">
-                                    </el-input>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="5">
-                                <el-form-item label="MBL NO" prop="mblno">
-                                    <el-input style="width: 100%;" v-model="form.mblno" size="small" autocomplete="off"
-                                        :disabled="editSave || tableData.length > 0" clearable placeholder="请输入MBL NO">
-                                    </el-input>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="5">
-                                <el-form-item label="HBL NO" prop="hblno">
-                                    <el-input style="width: 100%;" v-model="form.hblno" size="small" autocomplete="off"
-                                        :disabled="editSave || tableData.length > 0" clearable placeholder="请输入HBL NO">
-                                    </el-input>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="4">
-                                <el-form-item label="对账单号" prop="checkNo">
-                                    <el-input style="width: 100%;" v-model="form.checkNo" size="small"
-                                        autocomplete="off" :disabled="editSave || tableData.length > 0" clearable
-                                        placeholder="请输入对账单号">
-                                    </el-input>
-                                </el-form-item>
-                            </el-col>
+                                <el-col :span="5">
+                                    <el-form-item label="来源单号" prop="requestNo">
+                                        <el-input style="width: 100%;" v-model="form.requestNo" size="small"
+                                            autocomplete="off" :disabled="true" clearable placeholder="请输入来源单号">
+                                        </el-input>
+                                    </el-form-item>
+                                </el-col>
+                                <el-col :span="5">
+                                    <el-form-item label="ACCT NO" prop="accountNo">
+                                        <el-input style="width: 100%;" v-model="form.accountNo" size="small"
+                                            autocomplete="off" :disabled="editSave || tableData.length > 0" clearable
+                                            placeholder="请输入ACCT NO">
+                                        </el-input>
+                                    </el-form-item>
+                                </el-col>
+                                <el-col :span="5">
+                                    <el-form-item label="MBL NO" prop="mblno">
+                                        <el-input style="width: 100%;" v-model="form.mblno" size="small"
+                                            autocomplete="off" :disabled="editSave || tableData.length > 0" clearable
+                                            placeholder="请输入MBL NO">
+                                        </el-input>
+                                    </el-form-item>
+                                </el-col>
+                                <el-col :span="5">
+                                    <el-form-item label="HBL NO" prop="hblno">
+                                        <el-input style="width: 100%;" v-model="form.hblno" size="small"
+                                            autocomplete="off" :disabled="editSave || tableData.length > 0" clearable
+                                            placeholder="请输入HBL NO">
+                                        </el-input>
+                                    </el-form-item>
+                                </el-col>
+                                <el-col :span="4">
+                                    <el-form-item label="对账单号" prop="checkNo">
+                                        <el-input style="width: 100%;" v-model="form.checkNo" size="small"
+                                            autocomplete="off" :disabled="editSave || tableData.length > 0" clearable
+                                            placeholder="请输入对账单号">
+                                        </el-input>
+                                    </el-form-item>
+                                </el-col>
                             </el-row>
-                            
-                            
+
+
                         </el-row>
 
                         <expand :showBtn="true" :showSpan="true">
                             <el-row>
                                 <el-col :span="5">
-                                <el-form-item label="业务类型" prop="businessTypes">
-                                    <search-query :datalist="businessTypesData" :selectValue="form.businessTypes"
-                                        :clearable="true" :disabled="editSave || tableData.length > 0" :buttonIf="false"
-                                        :multiple="true" placeholder="请选择业务类型"
-                                        @corpChange="corpChange($event, 'businessTypes')">
-                                    </search-query>
-                                </el-form-item>
-                            </el-col>
+                                    <el-form-item label="业务类型" prop="businessTypes">
+                                        <search-query :datalist="businessTypesData" :selectValue="form.businessTypes"
+                                            :clearable="true" :disabled="editSave || tableData.length > 0"
+                                            :buttonIf="false" :multiple="true" placeholder="请选择业务类型"
+                                            @corpChange="corpChange($event, 'businessTypes')">
+                                        </search-query>
+                                    </el-form-item>
+                                </el-col>
                                 <el-col :span="5">
                                     <el-form-item label="船 名" prop="vesselCnName">
                                         <el-input style="width: 100%;" v-model="form.vesselCnName" size="small"
@@ -867,12 +869,14 @@ export default {
                             return item
                         })
                         this.finstlbillsConfirmSettlementfun()
+                    }).catch(() => {
+                        this.saveLoading = false
                     })
 
                 } else if (type == 'toAddEdit') {
                     finstlbillsSubmit(this.form).then(res => {
                         this.$message.success('操作成功');
-                        this.saveLoading = false // 关闭按钮动画
+                        // this.saveLoading = false // 关闭按钮动画
                         this.$emit(type)
                     }).finally(() => {
                         this.saveLoading = false
@@ -1231,6 +1235,8 @@ export default {
             }).finally(() => {
                 this.pageLoading = false
                 this.saveLoading = false
+            }).catch()(() => {
+                this.finstlbillsDetailfun(this.form.id)
             })
         },
         // 生成凭证

src/views/iosBasicData/OceanFreightImport/bills/assembly/DistributionBox/containers.vue

@@ -69,7 +69,7 @@
         <!--</template>-->
         <template slot-scope="scope" slot="cntrNo">
           <el-input v-if="scope.row.edit" v-model="scope.row.cntrNo" maxlength='11' size="small" clearable
-            placeholder="请输入箱号" @input="cntrNoInput(scope.row, 'cntrNo')"></el-input>
+            placeholder="请输入箱号" @input="cntrNoInput(scope.row, 'cntrNo')" @change="verifyChange(scope.row, 'cntrNo')"></el-input>
           <span v-else>{{ scope.row.cntrNo }}</span>
         </template>
         <template slot-scope="scope" slot="sealNo">
@@ -310,6 +310,31 @@ export default {
     cntrNoInput(row, name) {
       this.$set(row, name, row[name].toLocaleUpperCase().replace(/[\W]/g, ''))
     },
+    verifyChange(row, name) {
+      if (name == 'cntrNo') {
+        const regex = /^([a-zA-Z]{4})([0-9]{7})$/;
+        if (regex.test(row[name])) {
+          if (this.calculateCheckDigit(row[name]) == row[name][10]) {
+            this.$message.success('集装箱校验正确!')
+          } else {
+            this.$message.error('集装箱校验不正确!')
+          }
+        } else {
+          this.$set(row, [name], null)
+          this.$message.error('请正确输入4个字母+7个数字!')
+        }
+      }
+    },
+    calculateCheckDigit(containerNo) {
+      let charCode = "0123456789A?BCDEFGHIJK?LMNOPQRSTU?VWXYZ";
+      let num = 0;
+      for (let i = 0; i < 10; i++) {
+        let idx = charCode.indexOf(containerNo[i]);
+        idx = idx * Math.pow(2, i);
+        num += idx;
+      }
+      return num = (num % 11) % 10;
+    },
     uploadBefore(file, done, loading) {
       done();
       loading = true;

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

@@ -451,7 +451,7 @@
                                     </span>
                                     <el-date-picker v-model="assemblyForm.eta" style="width: 100%" clearable type="date" size="small"
                                         :disabled="detailData.seeDisabled || assemblyForm.feeCenterListD.filter(item => item.auditStatus > 0).length || assemblyForm.feeCenterListC.filter(item => item.auditStatus > 0).length"
-                                        value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期">
+                                        value-format="yyyy-MM-dd" placeholder="选择日期">
                                     </el-date-picker>
                                 </el-form-item>
                             </el-col>

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

@@ -79,7 +79,7 @@
                     <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="assemblyForm.status!=3" @click="allClick('发票申请', 'D')">发票申请</el-button>
+                        :disabled="disabled || pleasereviewType" @click="allClick('发票申请', 'D')">发票申请</el-button>
                     <el-button type="primary" plain size="small" :disabled="disabled || selectionDList.length == 0"
                         @click="allClick('D费用申请')">请核费用</el-button>
                 </template>
@@ -1918,7 +1918,7 @@ export default {
                 shippingCompanyId: this.assemblyForm.carrierId
             }).then(res => {
                 this.templateData = res.data.data.records
-                this.lefttemplate=res.data.data.records[0]
+                this.lefttemplate = res.data.data.records[0]
                 // 查第一条的明细
                 losbfeestemplateDetail(this.templateData[0].id).then(res => {
                     this.templateRightData = res.data.data.feesTemplateItemsList
@@ -3035,8 +3035,8 @@ export default {
             }
             if (name == '发票申请') {
                 if (this.selectionDList.length == 0) return this.$message.error("请选择费用");
-                if (this.selectionDList.length != this.selectionDList.filter(e => e.corpCnName == this
-                    .selectionDList[0].corpCnName).length) return this.$message.error("请选择相同的结算单位");
+                if (this.selectionDList.length != this.selectionDList.filter(e => e.corpCnName == this.selectionDList[0].corpCnName).length) return this.$message.error("请选择相同的结算单位");
+                if (this.selectionDList.filter(e => e.auditStatus != 4).length) return this.$message.error("请选择审核通过的费用");
                 if (this.$store.getters.finappStatus) {
                     this.$alert("发票申请(F)页面已存在,请关闭发票申请(F)再进行操作", "温馨提示", {
                         confirmButtonText: "确定",

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

@@ -3,8 +3,8 @@
     <!--<el-checkbox v-model="isPrintTheBoxNumber">打印箱号</el-checkbox>-->
     <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" :search.sync="query"
       :permission="permissionList" :before-open="beforeOpen" v-model="form" ref="crud" id="out-table"
-      :header-cell-class-name="headerClassName" @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 312)"
-      @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 312)" @row-update="rowUpdate" @row-save="rowSave"
+      :header-cell-class-name="headerClassName" @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 312.8)"
+      @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 312.8)" @row-update="rowUpdate" @row-save="rowSave"
       @row-del="rowDel" @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
       @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
       <template slot-scope="{type,disabled}" slot="urlForm">
@@ -17,13 +17,25 @@
           @click="handleDelete">删 除
         </el-button>
       </template>
-      <template slot-scope="{disabled,size}" slot="authorizedUsersForm">
-        <div>
-          <el-select v-model="form.authorizedUsersId" placeholder="请选择">
-            <el-option v-for="item in userList" :key="item.value" :label="item.label" :value="item.value">
-            </el-option>
-          </el-select>
-        </div>
+      <template slot="authorizedUsersIdForm">
+        <dic-select v-model="form.authorizedUsersId" placeholder="授权用户" key="id" keyValue="id" label="realName"
+          url="/blade-user/userListAll" :filterable="true" :multiple="true" dataName="realName" dataType="string"
+          @selectChange="dicChange('authorizedUsersId', $event,form)"></dic-select>
+      </template>
+      <template slot="authorizedRoleIdForm">
+        <dic-select v-model="form.authorizedRoleId" placeholder="授权角色" key="id" keyValue="id" label="roleName"
+          url="/blade-system/role/list" :filterable="true" :multiple="true" dataName="roleName" dataType="string"
+          @selectChange="dicChange('authorizedRoleId', $event,form)"></dic-select>
+      </template>
+      <template slot="authorizedTeamIdForm">
+        <dic-select v-model="form.authorizedTeamId" placeholder="授权团队" key="id" keyValue="id" label="postName"
+          url="/blade-system/post/listAll" :filterable="true" :multiple="true" dataName="postName" dataType="string"
+          @selectChange="dicChange('authorizedTeamId', $event,form)"></dic-select>
+      </template>
+      <template slot="excludeUsersIdForm">
+        <dic-select v-model="form.excludeUsersId" placeholder="排除用户" key="id" keyValue="id" label="realName"
+          url="/blade-user/userListAll" :filterable="true" :multiple="true" dataName="realName" dataType="string"
+          @selectChange="dicChange('excludeUsersId', $event,form)"></dic-select>
       </template>
       <template slot-scope="scope" slot="menu">
         <el-link type="primary" style="font-size: 12px" icon="el-icon-view" :underline="false"
@@ -48,9 +60,11 @@ import { billsDetail } from '@/api/iosBasicData/bills'
 import { bbusinesstypeList } from "@/api/iosBasicData/bbusinesstype";
 import reportContainer from "@/views/iosBasicData/report-container/report-container.vue"
 import { isProcurement } from "@/api/basicData/configuration";
+import dicSelect from "@/components/dicSelect/main";
 export default {
   components: {
-    reportContainer
+    reportContainer,
+    dicSelect
   },
   props: {
     assemblyForm: {
@@ -67,6 +81,10 @@ export default {
     businessValue: {
       type: String,
       default: ''
+    },
+    groupCode: {
+      type: String,
+      default: ''
     }
   },
   data() {
@@ -75,7 +93,9 @@ export default {
       userList: [],
       isPrintTheBoxNumber: false,
       bbDisabled: false,
-      form: {},
+      form: {
+        authorizedUsers:null,
+      },
       formReport: {},
       query: {},
       loading: true,
@@ -168,32 +188,59 @@ export default {
           {
             label: "授权用户",
             prop: "authorizedUsersId",
-            // hide: true,
+            hide: true,
+            showColumn:false,
             formslot: true,
-            type: 'tree',
-            dicUrl: "/api/blade-user/userListAll",
-            multiple: true,
             overHidden: true,
-            props: {
-              label: "realName",
-              value: "id"
-            },
-            dicData: [],
-            rules: [{
-              required: true,
-              message: "请选择授权用户",
-              trigger: "blur"
-            }]
           },
-          // {
-          //   label: "版本",
-          //   prop: "version",
-          //   rules: [{
-          //     required: true,
-          //     message: "请输入版本",
-          //     trigger: "blur"
-          //   }]
-          // },
+          {
+            label: "授权用户",
+            prop: "authorizedUsers",
+            display:false,
+            overHidden: true,
+          },
+          {
+            label: "授权角色",
+            prop: "authorizedRoleId",
+            hide: true,
+            showColumn:false,
+            formslot: true,
+            overHidden: true,
+          },
+          {
+            label: "授权角色",
+            prop: "authorizedRole",
+            display:false,
+            overHidden: true,
+          },
+          {
+            label: "授权团队",
+            prop: "authorizedTeamId",
+            hide: true,
+            showColumn:false,
+            formslot: true,
+            overHidden: true,
+          },
+          {
+            label: "授权团队",
+            prop: "authorizedTeam",
+            display:false,
+            overHidden: true,
+          },
+          {
+            label: "排除用户",
+            prop: "excludeUsersId",
+            hide: true,
+            showColumn:false,
+            formslot: true,
+            overHidden: true,
+          },
+          {
+            label: "排除用户",
+            prop: "excludeUsers",
+            display:false,
+            overHidden: true,
+          },
           {
             label: "状态",
             prop: "status",
@@ -232,15 +279,15 @@ export default {
     };
   },
   async created() {
-    this.option = await this.getColumnData(this.getColumnName(312), this.optionBack);
+    this.option = await this.getColumnData(this.getColumnName(312.8), this.optionBack);
     isProcurement({ "param": "textarea.number" }).then(res => {
       if (res.data.data) {
         this.textareaNumber = res.data.data
       }
     })
-    getUserApprovalList().then(res => {
-      this.findObject(this.option.column, "authorizedUsersId").dicData = res.data.data
-    })
+    // getUserApprovalList().then(res => {
+    //   this.findObject(this.option.column, "authorizedUsersId").dicData = res.data.data
+    // })
     // 获取业务类型
     bbusinesstypeList(1, 20).then(res => {
       this.findObject(this.option.column, "businessType").dicData = res.data.data.records
@@ -265,6 +312,40 @@ export default {
     }
   },
   methods: {
+    dicChange(name, row) {
+      if (name == 'authorizedUsersId') {
+        if(row){
+          this.form.authorizedUsers = row
+        }else{
+          this.form.authorizedUsersId = null
+          this.form.authorizedUsers = null
+        }
+      }
+      if (name == 'authorizedRoleId') {
+        if(row){
+          this.form.authorizedRole = row
+        }else{
+          this.form.authorizedRoleId = null
+          this.form.authorizedRole = null
+        }
+      }
+      if (name == 'authorizedTeamId') {
+        if(row){
+          this.form.authorizedTeam = row
+        }else{
+          this.form.authorizedTeamId = null
+          this.form.authorizedTeam = null
+        }
+      }
+      if (name == 'excludeUsersId') {
+        if(row){
+          this.form.excludeUsers = row
+        }else{
+          this.form.excludeUsersId = null
+          this.form.excludeUsers = null
+        }
+      }
+    },
     // 设计报表
     async reportDesignButton(url) {
       Stimulsoft.Base.StiLicense.key = '6vJhGtLLLz2GNviWmUTrhSqnOItdDwjBylQzQcAOiHn0s4gy0Fr5YoUZ9V00Y0igCSFQzwEqYBh/N77k4f0fWXTHW5rqeBNLkaurJDenJ9o97TyqHs9HfvINK18Uwzsc/bG01Rq+x3H3Rf+g7AY92gvWmp7VA2Uxa30Q97f61siWz2dE5kdBVcCnSFzC6awE74JzDcJMj8OuxplqB1CYcpoPcOjKy1PiATlC3UsBaLEXsok1xxtRMQ283r282tkh8XQitsxtTczAJBxijuJNfziYhci2jResWXK51ygOOEbVAxmpflujkJ8oEVHkOA/CjX6bGx05pNZ6oSIu9H8deF94MyqIwcdeirCe60GbIQByQtLimfxbIZnO35X3fs/94av0ODfELqrQEpLrpU6FNeHttvlMc5UVrT4K+8lPbqR8Hq0PFWmFrbVIYSi7tAVFMMe2D1C59NWyLu3AkrD3No7YhLVh7LV0Tttr/8FrcZ8xirBPcMZCIGrRIesrHxOsZH2V8t/t0GXCnLLAWX+TNvdNXkB8cF2y9ZXf1enI064yE5dwMs2fQ0yOUG/xornE'
@@ -574,6 +655,7 @@ export default {
         groupCode: this.form.groupCode,
         type: this.businessValue
       })
+      console.log('获取的数据赋值', res.data.data.data)
       // 获取的数据赋值
       var data = res.data.data.data
 
@@ -674,13 +756,14 @@ export default {
           // })
           var data = res.data.data.data
 
-          // console.log(data.hshipperDetails, 'hshipperDetails')
+          console.log(data, 'hshipperDetails')
 
           // var aaa = data.hshipperDetails.split('\n')
           // console.log(aaa)
 
           data.pageOne = 'Page : 1 of 1'
           // 处理超长数据
+          console.log(data.commodityDescr)
           if (data.hshipperDetails) {
             let arrDeteil = []
             arrDeteil = data.hshipperDetails.split('\n')
@@ -713,7 +796,7 @@ export default {
               data.hnotifyDetails = data.hnotifyDetails
             }
           }
-
+          console.log(data.commodityDescr)
           // 处理箱号
           if (this.isPrintTheBoxNumber) {
             data.commodityDescr += '\n.\n.\n'
@@ -753,9 +836,9 @@ export default {
           }
 
           // Number of original B/Ls
-          if (data.numberOfObl) {
-            data.numberOfObl += ' (' + data.numberOfOblDigit + ')'
-          }
+          // if (data.numberOfObl) {
+          //   data.numberOfObl += ' (' + data.numberOfOblDigit + ')'
+          // }
 
           if (data.commodityDescr) {
             var descriptionIndex2 = data.commodityDescr.indexOf('\n')
@@ -766,12 +849,16 @@ export default {
               data.pageOne = 'Page : 1 of 2'
               data.pageTwo = 'Page : 2 of 2'
               var extraLongText = data.commodityDescr.substring(descriptionIndex2 + 2, data.commodityDescr.length)
-              data.commodityDescr = data.commodityDescr.substring(0, descriptionIndex2)
+              // data.commodityDescr = data.commodityDescr.substring(0, descriptionIndex2)
               data.extraLongTips = '** TO BE CONTINUED ON ATTACHED LIST **'
               data.extraLongText = extraLongText
             }
+            // let arrDeteil = []
+            // arrDeteil = data.commodityDescr.split('\n')
+            // if (arrDeteil.length > 18) {
+            //   data.commodityDescr = arrDeteil.slice(0, 18).join('\n')
+            // }
           }
-
           // console.log(data.hshipperDetails, 'hshipperDetails2')
 
 
@@ -1093,6 +1180,9 @@ export default {
     onLoad(page, params = {}) {
       this.loading = true;
       params.businessType = this.businessValue
+      if (this.groupCode) {
+        params.groupCode = this.groupCode
+      }
       getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
         const data = res.data.data;
         this.page.total = data.total;

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

@@ -54,6 +54,8 @@
                     </el-button>
                     <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>
@@ -69,7 +71,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>
                     </div>
                 </template>
@@ -391,7 +392,7 @@ export default {
             ],
             // 表格的检索条件
             query: {
-                billStatus: "0",
+                billStatus: "7",
                 billSort: "1"
             },
             // 弹窗的搜索项

src/views/iosBasicData/SeafreightExportF/bills/assembly/DistributionBox/containers.vue

@@ -77,7 +77,8 @@
                 </template>
                 <template slot-scope="scope" slot="cntrNo">
                     <el-input v-if="scope.row.edit" v-model="scope.row.cntrNo" maxlength='11' size="small" clearable
-                        placeholder="请输入箱号" @input="cntrNoInput(scope.row, 'cntrNo')"></el-input>
+                        placeholder="请输入箱号" @input="cntrNoInput(scope.row, 'cntrNo')"
+                        @change="verifyChange(scope.row, 'cntrNo')"></el-input>
                     <span v-else>{{ scope.row.cntrNo }}</span>
                 </template>
                 <template slot-scope="scope" slot="sealNo">
@@ -491,7 +492,32 @@ export default {
         cntrNoInput(row, name) {
             this.$set(row, name, row[name].toLocaleUpperCase().replace(/[\W]/g, ''))
         },
-        oepnexcelBox(){
+        verifyChange(row, name) {
+            if (name == 'cntrNo') {
+                const regex = /^([a-zA-Z]{4})([0-9]{7})$/;
+                if (regex.test(row[name])) {
+                    if (this.calculateCheckDigit(row[name]) == row[name][10]) {
+                        this.$message.success('集装箱校验正确!')
+                    } else {
+                        this.$message.error('集装箱校验不正确!')
+                    }
+                } else {
+                    this.$set(row, [name], null)
+                    this.$message.error('请正确输入4个字母+7个数字!')
+                }
+            }
+        },
+        calculateCheckDigit(containerNo) {
+            let charCode = "0123456789A?BCDEFGHIJK?LMNOPQRSTU?VWXYZ";
+            let num = 0;
+            for (let i = 0; i < 10; i++) {
+                let idx = charCode.indexOf(containerNo[i]);
+                idx = idx * Math.pow(2, i);
+                num += idx;
+            }
+            return num = (num % 11) % 10;
+        },
+        oepnexcelBox() {
             if (!this.assemblyForm.id) {
                 this.$message({
                     message: '请先点击右上角保存按钮，保存数据之后才能添加！',
@@ -499,10 +525,11 @@ export default {
                 });
                 return
             }
-            this.findObject(this.excelOption.column, "excelFile").action = "/api/blade-los/containers/importBoxNo?billId="+this.assemblyForm.id
+            this.findObject(this.excelOption.column, "excelFile").action = "/api/blade-los/containers/importBoxNo?billId=" + this.assemblyForm.id
             this.excelBox = true
         },
-        uploadBefore(file, done, loading) {681169
+        uploadBefore(file, done, loading) {
+            681169
             done();
             loading = true;
         },

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

@@ -636,7 +636,7 @@
                                         <span style="color: #1e9fff">ETA</span>
                                     </span>
                                     <el-date-picker v-model="assemblyForm.eta" type="date" style="width: 100%;"
-                                        value-format="yyyy-MM-dd HH:mm" size="small"
+                                        value-format="yyyy-MM-dd" size="small"
                                         :disabled="detailData.seeDisabled || (assemblyForm.billType == 'MH' && assemblyForm.masterBillNo > 0) || assemblyForm.feeCenterListD.filter(item => item.auditStatus > 0).length || assemblyForm.feeCenterListC.filter(item => item.auditStatus > 0).length"
                                         placeholder="请选择时间">
                                     </el-date-picker>
@@ -662,7 +662,7 @@
                                         <span style="color: #1e9fff">ATA</span>
                                     </span>
                                     <el-date-picker v-model="assemblyForm.actualEta" type="date" style="width: 100%;"
-                                        value-format="yyyy-MM-dd HH:mm" size="small" :disabled="detailData.seeDisabled"
+                                        value-format="yyyy-MM-dd" size="small" :disabled="detailData.seeDisabled"
                                         placeholder="请选择时间">
                                     </el-date-picker>
                                 </el-form-item>

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

@@ -78,8 +78,8 @@
                     </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="assemblyForm.status != 3"
-                        @click="allClick('发票申请', '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"
                         @click="allClick('D费用申请')">请核费用</el-button>
                 </template>
@@ -2969,6 +2969,7 @@ export default {
             if (name == '发票申请') {
                 if (this.selectionDList.length == 0) return this.$message.error("请选择费用");
                 if (this.selectionDList.length != this.selectionDList.filter(e => e.corpCnName == this.selectionDList[0].corpCnName).length) return this.$message.error("请选择相同的结算单位");
+                if (this.selectionDList.filter(e => e.auditStatus != 4).length) return this.$message.error("请选择审核通过的费用");
                 if (this.$store.getters.finappStatus) {
                     this.$alert("发票申请(F)页面已存在,请关闭发票申请(F)再进行操作", "温馨提示", {
                         confirmButtonText: "确定",

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

@@ -74,6 +74,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>
@@ -90,7 +92,6 @@
                                 <span slot="label" style="color: #d86363">退舱</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>
@@ -502,7 +503,7 @@ export default {
             ],
             // 表格的检索条件
             query: {
-                billStatus: "0",
+                billStatus: "7",
                 billSort: "1"
             },
             // 弹窗的搜索项

src/views/iosBasicData/fininvoicesApplyfor/index.vue

@@ -382,11 +382,11 @@ export default {
             width: "100",
             overHidden: true,
           },
-          {
-            label: "币种",
-            prop: "curCode",
-            overHidden: true,
-          },
+          // {
+          //   label: "币种",
+          //   prop: "curCode",
+          //   overHidden: true,
+          // },
           {
             label: "原汇率",
             prop: "exrate",

src/views/iosBasicData/fininvoicesOutput/fininvoicesDetails.vue

@@ -49,7 +49,8 @@
                                     <el-col :span="12">
                                         <el-form-item label="开票日期" prop="invoiceDate">
                                             <el-date-picker v-model="form.invoiceDate" clearable style="width: 100%;"
-                                                type="date" size="small" :disabled="editSave|| (tableData.length && this.invoicestype != 1)"
+                                                type="date" size="small"
+                                                :disabled="editSave || (tableData.length && this.invoicestype != 1)"
                                                 value-format="yyyy-MM-dd" placeholder="请选择开票日期">
                                             </el-date-picker>
                                         </el-form-item>
@@ -71,7 +72,8 @@
                                     <el-col :span="12">
                                         <el-form-item label="收/付" prop="dc">
                                             <el-select v-model="form.dc" placeholder="请选择"
-                                                :disabled="editSave || (tableData.length && this.invoicestype != 1)" size="small">
+                                                :disabled="editSave || (tableData.length && this.invoicestype != 1)"
+                                                size="small">
                                                 <el-option v-for="item in options" :key="item.value" :label="item.label"
                                                     :value="item.value">
                                                 </el-option>
@@ -104,8 +106,8 @@
                                         <el-form-item label="发票币种" prop="invCurCode">
                                             <search-query :datalist="invCurCodeData" :selectValue="form.invCurCode"
                                                 :filterable="true" :clearable="true"
-                                                :disabled="editSave || (tableData.length && this.invoicestype != 1)" :buttonIf="false"
-                                                placeholder="请选择发票币种"
+                                                :disabled="editSave || (tableData.length && this.invoicestype != 1)"
+                                                :buttonIf="false" placeholder="请选择发票币种"
                                                 :forParameter="{ key: 'id', label: 'code', value: 'code' }"
                                                 @corpChange="corpChange($event, 'invCurCode')"
                                                 @corpFocus="invCurCodeRateListfun">
@@ -133,15 +135,17 @@
                                     <el-col :span="12">
                                         <el-form-item label="船名/航次" prop="vesselVoyno">
                                             <el-input style="width: 100%;" v-model="form.vesselVoyno" size="small"
-                                                autocomplete="off" :disabled="editSave || (tableData.length && this.invoicestype != 1)" clearable
-                                                placeholder="请输入船名/航次">
+                                                autocomplete="off"
+                                                :disabled="editSave || (tableData.length && this.invoicestype != 1)"
+                                                clearable placeholder="请输入船名/航次">
                                             </el-input>
                                         </el-form-item>
                                     </el-col>
                                     <el-col :span="12">
                                         <el-form-item label="开航日期" prop="etd">
                                             <el-date-picker v-model="form.etd" clearable style="width: 100%;"
-                                                type="date" size="small" :disabled="editSave || (tableData.length && this.invoicestype != 1)"
+                                                type="date" size="small"
+                                                :disabled="editSave || (tableData.length && this.invoicestype != 1)"
                                                 value-format="yyyy-MM-dd HH:mm:ss" placeholder="请输入开航日期">
                                             </el-date-picker>
                                         </el-form-item>
@@ -150,8 +154,8 @@
                                         <el-form-item label="装货港" prop="pol">
                                             <search-query :datalist="polData" :selectValue="form.pol" :filterable="true"
                                                 :clearable="true" :remote="true"
-                                                :disabled="editSave || (tableData.length && this.invoicestype != 1)" :buttonIf="false"
-                                                placeholder="请选择装货港"
+                                                :disabled="editSave || (tableData.length && this.invoicestype != 1)"
+                                                :buttonIf="false" placeholder="请选择装货港"
                                                 :forParameter="{ key: 'id', label: 'enName', value: 'enName' }"
                                                 @corpChange="corpChange($event, 'pol')" @remoteMethod="polBportsListfun"
                                                 @corpFocus="polBportsListfun">
@@ -162,8 +166,8 @@
                                         <el-form-item label="卸货港" prop="pod">
                                             <search-query :datalist="podData" :selectValue="form.pod" :filterable="true"
                                                 :clearable="true" :remote="true"
-                                                :disabled="editSave || (tableData.length && this.invoicestype != 1)" :buttonIf="false"
-                                                placeholder="请选择卸货港"
+                                                :disabled="editSave || (tableData.length && this.invoicestype != 1)"
+                                                :buttonIf="false" placeholder="请选择卸货港"
                                                 :forParameter="{ key: 'id', label: 'enName', value: 'enName' }"
                                                 @corpChange="corpChange($event, 'pod')" @remoteMethod="podBportsListfun"
                                                 @corpFocus="podBportsListfun">
@@ -174,8 +178,8 @@
                                         <el-form-item label="目的地" prop="destination">
                                             <search-query :datalist="destinationData" :selectValue="form.destination"
                                                 :filterable="true" :clearable="true" :remote="true"
-                                                :disabled="editSave || (tableData.length && this.invoicestype != 1)" :buttonIf="false"
-                                                placeholder="请选择目的地"
+                                                :disabled="editSave || (tableData.length && this.invoicestype != 1)"
+                                                :buttonIf="false" placeholder="请选择目的地"
                                                 :forParameter="{ key: 'id', label: 'enName', value: 'enName' }"
                                                 @corpChange="corpChange($event, 'destination')"
                                                 @remoteMethod="destinationBportsListfun"
@@ -186,8 +190,9 @@
                                     <el-col :span="12">
                                         <el-form-item label="箱型箱量" prop="containers">
                                             <el-input style="width: 100%;" v-model="form.containers" size="small"
-                                                autocomplete="off" :disabled="editSave || (tableData.length && this.invoicestype != 1)" clearable
-                                                placeholder="请输入箱型箱量">
+                                                autocomplete="off"
+                                                :disabled="editSave || (tableData.length && this.invoicestype != 1)"
+                                                clearable placeholder="请输入箱型箱量">
                                             </el-input>
                                         </el-form-item>
                                     </el-col>
@@ -243,7 +248,7 @@
                                     <el-col :span="8">
                                         <el-form-item label="结算单位" prop="corpCnName">
                                             <search-query :datalist="corpData" :selectValue="form.corpCnName"
-                                                :clearable="true" :disabled="editSave ||tableData.length"
+                                                :clearable="true" :disabled="editSave || tableData.length"
                                                 :buttonIf="false" :remote="true" :filterable="true"
                                                 placeholder="请输入结算单位"
                                                 :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
@@ -263,8 +268,9 @@
                                     <el-col :span="8">
                                         <el-form-item label="税控发票号" prop="taxInvoiceNo">
                                             <el-input style="width: 100%;" v-model="form.taxInvoiceNo" size="small"
-                                                autocomplete="off" :disabled="editSave || (tableData.length && this.invoicestype != 1)" clearable
-                                                placeholder="请输入税控发票号">
+                                                autocomplete="off"
+                                                :disabled="editSave || (tableData.length && this.invoicestype != 1)"
+                                                clearable placeholder="请输入税控发票号">
                                             </el-input>
                                         </el-form-item>
                                     </el-col>
@@ -272,15 +278,16 @@
                                         <el-form-item label="业务开始日期" prop="accountDateFrom">
                                             <el-date-picker v-model="form.accountDateFrom" clearable
                                                 style="width: 100%;" type="date" size="small"
-                                                :disabled="editSave || (tableData.length && this.invoicestype != 1)" value-format="yyyy-MM-dd"
-                                                placeholder="选择业务日期">
+                                                :disabled="editSave || (tableData.length && this.invoicestype != 1)"
+                                                value-format="yyyy-MM-dd" placeholder="选择业务日期">
                                             </el-date-picker>
                                         </el-form-item>
                                     </el-col>
                                     <el-col :span="8">
                                         <el-form-item label="业务结束日期" prop="accountDateTo">
                                             <el-date-picker v-model="form.accountDateTo" clearable style="width: 100%;"
-                                                type="date" size="small" :disabled="editSave || (tableData.length && this.invoicestype != 1)"
+                                                type="date" size="small"
+                                                :disabled="editSave || (tableData.length && this.invoicestype != 1)"
                                                 value-format="yyyy-MM-dd" placeholder="选择业务日期">
                                             </el-date-picker>
                                         </el-form-item>
@@ -288,15 +295,16 @@
                                     <el-col :span="8">
                                         <el-form-item label="发票汇率" prop="exrate">
                                             <el-input style="width: 100%;" v-model="form.exrate" size="small"
-                                                autocomplete="off" :disabled="editSave || (tableData.length && this.invoicestype != 1)" clearable
-                                                placeholder="请输入发票汇率">
+                                                autocomplete="off"
+                                                :disabled="editSave || (tableData.length && this.invoicestype != 1)"
+                                                clearable placeholder="请输入发票汇率">
                                             </el-input>
                                         </el-form-item>
                                     </el-col>
                                     <el-col :span="16">
                                         <el-form-item label="业务编号" prop="businessNo">
                                             <el-input style="width: 100%;" v-model="form.businessNo" size="small"
-                                                autocomplete="off" :disabled="editSave||tableData.length" clearable
+                                                autocomplete="off" :disabled="editSave || tableData.length" clearable
                                                 placeholder="请输入业务编号">
                                             </el-input>
                                         </el-form-item>
@@ -304,7 +312,8 @@
                                     <el-col :span="8">
                                         <el-form-item label="发票类型" prop="invType">
                                             <search-query :datalist="invTypeData" :selectValue="form.invType"
-                                                :clearable="true" :disabled="editSave || (tableData.length && this.invoicestype != 1)"
+                                                :clearable="true"
+                                                :disabled="editSave || (tableData.length && this.invoicestype != 1)"
                                                 :buttonIf="false" placeholder="请输入发票类型"
                                                 :forParameter="{ key: 'dictKey', label: 'dictValue', value: 'dictKey' }"
                                                 @corpChange="corpChange($event, 'invType')"
@@ -323,8 +332,9 @@
                                     <el-col :span="8">
                                         <el-form-item label="对账单号" prop="checkNo">
                                             <el-input style="width: 100%;" v-model="form.checkNo" size="small"
-                                                autocomplete="off" :disabled="editSave || (tableData.length && this.invoicestype != 1)" clearable
-                                                placeholder="请输入对账单号">
+                                                autocomplete="off"
+                                                :disabled="editSave || (tableData.length && this.invoicestype != 1)"
+                                                clearable placeholder="请输入对账单号">
                                             </el-input>
                                         </el-form-item>
                                     </el-col>
@@ -333,24 +343,27 @@
                                     <el-col :span="16">
                                         <el-form-item label="分单编号" prop="hblno">
                                             <el-input style="width: 100%;" v-model="form.hblno" size="small"
-                                                autocomplete="off" :disabled="editSave || (tableData.length && this.invoicestype != 1)" clearable
-                                                placeholder="请输入分单编号">
+                                                autocomplete="off"
+                                                :disabled="editSave || (tableData.length && this.invoicestype != 1)"
+                                                clearable placeholder="请输入分单编号">
                                             </el-input>
                                         </el-form-item>
                                     </el-col>
                                     <el-col :span="8">
                                         <el-form-item label="申请单号" prop="applyNo">
                                             <el-input style="width: 100%;" v-model="form.applyNo" size="small"
-                                                autocomplete="off" :disabled="editSave || (tableData.length && this.invoicestype != 1)" clearable
-                                                placeholder="请输入申请单号">
+                                                autocomplete="off"
+                                                :disabled="editSave || (tableData.length && this.invoicestype != 1)"
+                                                clearable placeholder="请输入申请单号">
                                             </el-input>
                                         </el-form-item>
                                     </el-col>
                                     <el-col :span="8">
                                         <el-form-item label="BOOK NO" prop="bookingNo">
                                             <el-input style="width: 100%;" v-model="form.bookingNo" size="small"
-                                                autocomplete="off" :disabled="editSave || (tableData.length && this.invoicestype != 1)" clearable
-                                                placeholder="请输入BOOK NO">
+                                                autocomplete="off"
+                                                :disabled="editSave || (tableData.length && this.invoicestype != 1)"
+                                                clearable placeholder="请输入BOOK NO">
                                             </el-input>
                                         </el-form-item>
                                     </el-col>
@@ -358,17 +371,18 @@
                                         <el-form-item label="业务类型" prop="businessTypes">
                                             <search-query :datalist="businessTypesData"
                                                 :selectValue="form.businessTypes" :clearable="true"
-                                                :disabled="editSave || (tableData.length && this.invoicestype != 1)" :buttonIf="false"
-                                                :multiple="true" :collapseTags="true" placeholder="请输入业务类型"
-                                                @corpChange="corpChange($event, 'businessTypes')">
+                                                :disabled="editSave || (tableData.length && this.invoicestype != 1)"
+                                                :buttonIf="false" :multiple="true" :collapseTags="true"
+                                                placeholder="请输入业务类型" @corpChange="corpChange($event, 'businessTypes')">
                                             </search-query>
                                         </el-form-item>
                                     </el-col>
                                     <el-col :span="8">
                                         <el-form-item label="税率(%)" prop="taxRate">
                                             <el-input style="width: 100%;" v-model="form.taxRate" size="small"
-                                                autocomplete="off" :disabled="editSave || (tableData.length && this.invoicestype != 1)" clearable
-                                                placeholder="请输入税率">
+                                                autocomplete="off"
+                                                :disabled="editSave || (tableData.length && this.invoicestype != 1)"
+                                                clearable placeholder="请输入税率">
                                             </el-input>
                                         </el-form-item>
                                     </el-col>
@@ -376,8 +390,8 @@
                                         <el-form-item label="选择币种" prop="curCode">
                                             <search-query :datalist="curData" :selectValue="form.curCode"
                                                 :filterable="true" :clearable="true"
-                                                :disabled="editSave || (tableData.length && this.invoicestype != 1)" :remote="true"
-                                                :buttonIf="false" placeholder="请输入选择币种"
+                                                :disabled="editSave || (tableData.length && this.invoicestype != 1)"
+                                                :remote="true" :buttonIf="false" placeholder="请输入选择币种"
                                                 :forParameter="{ key: 'id', label: 'code', value: 'code' }"
                                                 @remoteMethod="getRateListfun"
                                                 @corpChange="corpChange($event, 'curCode')" @corpFocus="getRateListfun">
@@ -387,16 +401,17 @@
                                     <el-col :span="16">
                                         <el-form-item label="邮箱" prop="yx">
                                             <el-input style="width: 100%;" v-model="form.yx" size="small"
-                                                autocomplete="off" :disabled="editSave || (tableData.length && this.invoicestype != 1)" clearable
-                                                placeholder="请输入邮箱">
+                                                autocomplete="off"
+                                                :disabled="editSave || (tableData.length && this.invoicestype != 1)"
+                                                clearable placeholder="请输入邮箱">
                                             </el-input>
                                         </el-form-item>
                                     </el-col>
                                     <el-col :span="24">
                                         <el-form-item label="全电发票:" prop="elecRemarks">
                                             <el-input style="width: 100%;" v-model="form.elecRemarks" size="small"
-                                                :disabled="editSave || (tableData.length && this.invoicestype != 1)" autocomplete="off"
-                                                type="textarea" clearable placeholder="请输入全电发票备注">
+                                                :disabled="editSave || (tableData.length && this.invoicestype != 1)"
+                                                autocomplete="off" type="textarea" clearable placeholder="请输入全电发票备注">
                                             </el-input>
                                         </el-form-item>
                                     </el-col>
@@ -1384,6 +1399,8 @@ export default {
                 this.saveLoading = false
                 this.$message.success('操作成功');
                 this.fininvoicesDetailfun(res.data.data.id)
+            }).catch(() => {
+                this.saveLoading = false
             })
         },
         // 详情接口

src/views/iosBasicData/losbfeestemplate/feesTemplateItems.vue

@@ -85,6 +85,8 @@
                     <template slot="menu" slot-scope="{ row, index }">
                         <!-- <el-button type="text" size="small" :disabled="basicData.disabled"
                             @click="feestemplateCompanyEdit(index, row)">详情</el-button> -->
+                        <el-button v-if="row.quantityRule == '按箱型'" type="text" size="small"
+                            :disabled="basicData.disabled" @click="feestemplateCompanyEdit(index, row)">集装箱</el-button>
                         <el-button size="small" type="text" :disabled="basicData.disabled" @click="rowCell(row, index)">
                             {{ row.$cellEdit ? '保存' : '编辑' }}
                         </el-button>
@@ -203,21 +205,29 @@ export default {
                         headerslot: true,
                     },
                     {
-                        label: '类别',
-                        prop: 'type',
+                        label: '计量单位',
+                        prop: 'unitNo',
                         overHidden: true,
                         cell: true,
                         slot: true,
                         formslot: true,
                     },
                     {
-                        label: '费用名称',
-                        prop: 'feeCnName',
-                        overHidden: true,
+                        label: '单价',
+                        prop: 'salesPrice',
                         cell: true,
-                        slot: true,
-                        formslot: true,
+                        type: 'number',
+                        controls: false,
+                        overHidden: true,
                     },
+                    //{
+                    //  label: '成本价',
+                    //  prop: 'costPrice',
+                    //  cell: true,
+                    //  type: 'number',
+                    //  controls: false,
+                    // overHidden: true,
+                    //},
                     {
                         label: '币种',
                         prop: 'curCode',
@@ -232,30 +242,7 @@ export default {
                             value: 'USD'
                         }],
                     },
-                    {
-                        label: '计量单位',
-                        prop: 'unitNo',
-                        overHidden: true,
-                        cell: true,
-                        slot: true,
-                        formslot: true,
-                    },
-                    {
-                        label: '销售价',
-                        prop: 'salesPrice',
-                        cell: true,
-                        type: 'number',
-                        controls: false,
-                        overHidden: true,
-                    },
-                    {
-                        label: '成本价',
-                        prop: 'costPrice',
-                        cell: true,
-                        type: 'number',
-                        controls: false,
-                        overHidden: true,
-                    }
+
                 ]
             },
             pageLoading: false,
@@ -654,7 +641,7 @@ export default {
     created() {
         if (this.detailData.businessTypeId) {
             this.form = {
-                status:0,
+                status: 0,
                 businessTypeId: this.detailData.businessTypeId,
                 businessTypeCnName: this.detailData.businessTypeCnName,
                 businessTypeEnName: this.detailData.businessTypeEnName,