1.海运进出口 OP和客服需要和主表所属公司联动

2.海运进出口 查看放箱号 新加ETD参数
3.箱管 OW 所有业务 修改 费用明细一键保存不能正常保存的bug
4.箱管 OW 所有业务 修改 费用明细一键保存后区分本币金额和外币金额
5.箱管 租箱 起租不需要二次弹窗
6.财务管理 通过发票申请生成的开票，不允许编辑
7.箱管 买箱 租箱 代理箱 导入接口和下载接口新加参数
8.财务管理 发票申请 单据日期改为制单日期
9.财务管理 所有业务 检索条件都可以收缩
10.箱管 放箱号 联调导出接口
1.海运出口 费用新功能新加参数控制

src/views/boxManagement/agentBox/detailsPage.vue

@@ -1412,7 +1412,7 @@ export default {
     handleGet() {
       window.open(
         `/api/blade-los/tradingBoxItem/boxItemTemplate?${this.website.tokenHeader
-        }=${getToken()}`
+        }=${getToken()}&type=3`
       );
     },
     dicChange(name, row) {
@@ -2002,7 +2002,7 @@ export default {
       if (name == '导入') {
         this.excelOption.column.forEach(item => {
           if (item.prop == 'excelFile') {
-            item.action = "/api/blade-los/tradingBoxItem/importBoxItem?id=" + this.form.id
+            item.action = "/api/blade-los/tradingBoxItem/importBoxItem?type=3&id=" + this.form.id
           }
         })
         this.excelBox = true

src/views/boxManagement/boxPoolDynamics/index.vue

@@ -1,14 +1,16 @@
 <template>
     <div>
         <basic-container v-if="isShow">
+            <el-button type="warning" plain size="small"
+                @click="allClick('POL空箱提箱进场(EXCEL)')">POL空箱提箱进场(EXCEL)</el-button>
+
             <el-button type="success" plain size="small" @click="allClick('POL空箱出场(EXCEL)')">POL空箱出场(EXCEL)</el-button>
+            <el-button type="info" plain size="small" @click="allClick('POD空箱进场(EXCEL)')">POD空箱进场(EXCEL)</el-button>
             <!-- <el-button type="primary" plain size="small"
                                 @click="allClick('POL返场(EXCEL)')">POL返场(EXCEL)</el-button> -->
-            <el-button type="info" plain size="small" @click="allClick('POD空箱进场(EXCEL)')">POD空箱进场(EXCEL)</el-button>
 
             <el-button type="danger" plain size="small" @click="allClick('POL无货返空(EXCEL)')">POL无货返空(EXCEL)</el-button>
-            <el-button type="warning" plain size="small"
-                @click="allClick('POL空箱提箱进场(EXCEL)')">POL空箱提箱进场(EXCEL)</el-button>
+
             <el-tabs v-model="activeName" type="card" style="margin-top: 8px;">
                 <el-tab-pane label="按港口" name="1">
                     <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page"

src/views/boxManagement/buyContainer/detailsPage.vue

@@ -1238,7 +1238,7 @@ export default {
     handleGet() {
       window.open(
         `/api/blade-los/tradingBoxItem/boxItemTemplate?${this.website.tokenHeader
-        }=${getToken()}`
+        }=${getToken()}&type=1`
       );
     },
     dicChange(name, row) {
@@ -1666,7 +1666,7 @@ export default {
       if (name == '导入') {
         this.excelOption.column.forEach(item => {
           if (item.prop == 'excelFile') {
-            item.action = "/api/blade-los/tradingBoxItem/importBoxItem?id=" + this.form.id
+            item.action = "/api/blade-los/tradingBoxItem/importBoxItem?type=1&id=" + this.form.id
           }
         })
         this.excelBox = true

src/views/boxManagement/containerNumber/detailsPage.vue

@@ -42,8 +42,7 @@
             </dic-select>
           </tempalte> -->
           <tempalte slot="agentName">
-            <dic-select v-model="form.agentName" placeholder="代理名称" key="id" label="shortName"
-              :disabled="editDisabled"
+            <dic-select v-model="form.agentName" placeholder="代理名称" key="id" label="shortName" :disabled="editDisabled"
               url="/blade-los/bcorps/listAll?status=0&corpTypeName=国内同行及代理,国外同行及代理" :filterable="true" :remote="true"
               dataName="shortName" @selectChange="dicChange('agentName', $event)" :slotRight="true" rightLabel="code">
             </dic-select>
@@ -52,7 +51,7 @@
             <dic-select v-model="form.polStationCname" placeholder="起运港提/送箱场站" key="id" label="cnName" res="records"
               url="/blade-los/bcorps/selectList?current=1&size=5&corpTypeName=场站&status=0" :filterable="true"
               :remote="true" dataName="cnName" @selectChange="dicChange('polStationCname', $event)"
-              :disabled="editDisabled|| form.putBoxItemsList.length" :slotRight="true" rightLabel="code"></dic-select>
+              :disabled="editDisabled || form.putBoxItemsList.length" :slotRight="true" rightLabel="code"></dic-select>
           </tempalte>
           <tempalte slot="podStationCname">
             <dic-select v-model="form.podStationCname" placeholder="目的港提/还箱场站" key="id" label="cnName" res="records"
@@ -62,7 +61,7 @@
           </tempalte>
           <tempalte slot="polCname">
             <dic-select v-model="form.polCname" placeholder="港口" key="id" label="cnName" res="records"
-              :disabled="editDisabled|| form.putBoxItemsList.length" url="/blade-los/bports/list?status=0"
+              :disabled="editDisabled || form.putBoxItemsList.length" url="/blade-los/bports/list?status=0"
               :filterable="true" :remote="true" dataName="cnName" @selectChange="dicChange('polCname', $event)"
               :slotRight="true" rightLabel="code"></dic-select>
           </tempalte>
@@ -70,19 +69,17 @@
             <dic-select v-model="form.podCname" placeholder="港口" key="id" label="cnName"
               url="/blade-los/bports/listAll?status=0" :filterable="true" dataName="cnName" :multiple="true"
               :collapseTags="true" dataType="string" :slotRight="true" rightLabel="code"
-              @selectChange="dicChange('podCname', $event)"
-              :disabled="editDisabled"></dic-select>
+              @selectChange="dicChange('podCname', $event)" :disabled="editDisabled"></dic-select>
           </tempalte>
           <template slot="boxType">
             <dic-select v-model="form.boxType" key="id" label="cnName" res="records"
-              :disabled="editDisabled|| form.putBoxItemsList.length"
+              :disabled="editDisabled || form.putBoxItemsList.length"
               url="/blade-los/bcntrtypes/list?status=0&current=1&size=20" :filterable="true" :remote="true"
               dataName="cnName"></dic-select>
           </template>
           <tempalte slot="cabinType">
             <dic-select v-model="form.cabinType" placeholder="舱位类型" key="id" label="dictValue"
-              url="/blade-system/dict-biz/dictionary?code=cabinType"
-              :disabled="editDisabled"
+              url="/blade-system/dict-biz/dictionary?code=cabinType" :disabled="editDisabled"
               @selectChange="dicChange('cabinType', $event)"></dic-select>
           </tempalte>
           <tempalte slot="cabinTypeData">
@@ -98,19 +95,18 @@
           <tempalte slot="airlineCname">
             <dic-select v-model="form.airlineCname" placeholder="航线" key="id" label="cnName" res="records"
               url="/blade-los/blines/list?status=0" :filterable="true" :remote="true" dataName="cnName"
-              @selectChange="dicChange('airlineCname', $event)"
-              :disabled="editDisabled"></dic-select>
+              @selectChange="dicChange('airlineCname', $event)" :disabled="editDisabled"></dic-select>
           </tempalte>
           <tempalte slot="remainingNum">
             <el-input-number v-model="form.remainingNum" :controls="false" placeholder="请输入 可用" style="width: 100%;"
               :disabled="editDisabled || form.putBoxItemsList.length || !(form.srcType == 'OW(拿)' || form.srcType == 'OW(放)')"></el-input-number>
           </tempalte>
           <tempalte slot="occupyNum">
-            <el-input-number v-model="form.occupyNum" :controls="false" placeholder="请输入 占用"  style="width: 100%;"
+            <el-input-number v-model="form.occupyNum" :controls="false" placeholder="请输入 占用" style="width: 100%;"
               :disabled="editDisabled || form.putBoxItemsList.length"></el-input-number>
           </tempalte>
           <tempalte slot="totalNum">
-            <el-input-number v-model="form.totalNum" :controls="false" placeholder="请输入 场地盘存"  style="width: 100%;"
+            <el-input-number v-model="form.totalNum" :controls="false" placeholder="请输入 场地盘存" style="width: 100%;"
               :disabled="editDisabled || form.putBoxItemsList.length"></el-input-number>
           </tempalte>
         </avue-form>
@@ -128,7 +124,7 @@
               @click="allClick('一键编辑')">一键编辑</el-button>
             <el-button type="danger" plain size="small" :disabled="editDisabled || selectionList.length == 0"
               @click="allClick('批量删除')">批量删除</el-button>
-            <el-button type="success" size="small">导出</el-button>
+            <el-button type="success" size="small" :disabled="!form.id" @click="allClick('导出')">导出</el-button>
             <el-button type="info" size="small" @click="allClick('选定更改箱东')"
               :disabled="editDisabled || selectionList.length == 0">选定更改箱东</el-button>
             <el-button type="success" size="small" @click="allClick('选定更改放箱号')"
@@ -204,7 +200,8 @@
       :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
       <check-schedule :checkId="checkId" :batchNo="batchNo" @choceScheduleFun="choceScheduleFun"></check-schedule>
     </el-dialog>
-    <el-dialog append-to-body title="更改箱东" :visible.sync="activationDialog" width="30%" :before-close="activationClose" v-dialog-drag>
+    <el-dialog append-to-body title="更改箱东" :visible.sync="activationDialog" width="30%" :before-close="activationClose"
+      v-dialog-drag>
       <span>
         <avue-form ref="form2" v-model="activationForm" :option="activationOption">
           <tempalte slot="boxEastName">
@@ -1196,6 +1193,16 @@ export default {
       });
     },
     allClick(name) {
+      if (name == '导出') {
+        const routeData = this.$router.resolve({
+          path: '/api/blade-los/putboxitems/exportBoxItem',      //跳转目标窗口的地址
+          query: {
+            'Blade-Auth': getToken(),
+            pid: this.form.id    //括号内是要传递给新窗口的参数
+          }
+        })
+        window.open(routeData.href.slice(1, routeData.href.length));
+      }
       if (name == '一键保存') {
         if (!this.form.putBoxItemsList.length) {
           return this.$message.error("请添加数据");
@@ -1475,13 +1482,13 @@ export default {
       handler(oldValue, newValue) {
         if (this.form.putBoxItemsList.length > 0) {
           this.optionForm.column.forEach(item => {
-            if (item.prop == 'containerNumber'   || item.prop == 'boxCondition' ) {
+            if (item.prop == 'containerNumber' || item.prop == 'boxCondition') {
               item.disabled = true
             }
           })
         } else {
           this.optionForm.column.forEach(item => {
-            if (item.prop == 'containerNumber'    || item.prop == 'boxCondition'  ) {
+            if (item.prop == 'containerNumber' || item.prop == 'boxCondition') {
               item.disabled = false
             }
           })

src/views/boxManagement/rentalBox/detailsPage.vue

@@ -1459,7 +1459,7 @@ export default {
     handleGet() {
       window.open(
         `/api/blade-los/tradingBoxItem/boxItemTemplate?${this.website.tokenHeader
-        }=${getToken()}`
+        }=${getToken()}&type=2`
       );
     },
     dicChange(name, row) {
@@ -2245,7 +2245,7 @@ export default {
       if (name == '导入') {
         this.excelOption.column.forEach(item => {
           if (item.prop == 'excelFile') {
-            item.action = "/api/blade-los/tradingBoxItem/importBoxItem?id=" + this.form.id
+            item.action = "/api/blade-los/tradingBoxItem/importBoxItem?type=2&id=" + this.form.id
           }
         })
         this.excelBox = true

src/views/iosBasicData/CollectionSettlement/index.vue

@@ -63,6 +63,8 @@ export default {
         tip: false,
         searchShow: true,
         searchMenuSpan: 6,
+        searchIcon: true,
+        searchIndex: 3,
         border: true,
         index: true,
         viewBtn: true,

src/views/iosBasicData/PaymentApplication/index.vue

@@ -77,6 +77,8 @@ export default {
         tip: false,
         searchShow: true,
         searchMenuSpan: 6,
+        searchIcon: true,
+        searchIndex: 3,
         border: true,
         index: true,
         viewBtn: true,

src/views/iosBasicData/fininvoices/fininvoicesDetails.vue

@@ -487,8 +487,8 @@
                             </el-form-item>
                         </el-col>
                         <el-col :span="5">
-                            <el-form-item label="单据日期" prop="billDate">
-                                <el-date-picker v-model="form.billDate" clearable style="width: 100%;" type="date"
+                            <el-form-item label="制单日期" prop="createTime">
+                                <el-date-picker v-model="form.createTime" clearable style="width: 100%;" type="date"
                                     size="small" :disabled="true" value-format="yyyy-MM-dd HH:mm" placeholder="选择单据日期">
                                 </el-date-picker>
                             </el-form-item>

src/views/iosBasicData/fininvoices/index.vue

@@ -80,6 +80,8 @@ export default {
         tip: false,
         searchShow: true,
         searchMenuSpan: 24,
+        searchIcon: true,
+        searchIndex: 3,
         border: true,
         index: true,
         viewBtn: true,
@@ -910,4 +912,7 @@ export default {
   cursor: pointer;
   color: #1e9fff;
 }
+/deep/ .el-col-md-8 {
+    width: 24.33333%;
+}
 </style>

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

@@ -36,11 +36,11 @@
             <!--    prop="feeCnName"-->
             <!--    label="费用名称">-->
             <!--</el-table-column>-->
-            <el-table-column prop="currentAmountCNY" label="本次本次" width="120px">
+            <el-table-column prop="currentAmountCNY" label="本次本币" width="120px">
                 <template slot-scope="scope">
                     <el-input style="width: 100%;" v-model="scope.row.currentAmountCNY" v-if="!editSave"
                         size="mini" autocomplete="off" :controls="false"
-                        :disabled="scope.row.curCode != getLocalCurrency() || settlementdistar || !(form.status == '0' || form.status == '4' || form.status == null)"
+                        :disabled="scope.row.curCode != getLocalCurrency() || settlementdistar || !(form.status == '0' || form.status == '4' || form.status == null)||scope.row.applySrcId"
                         clearable placeholder="请输入本次发票金额" @change="armbChange(scope.row)">
                     </el-input>
                     <span v-else>{{ scope.row.currentAmountCNY }}</span>
@@ -49,7 +49,7 @@
             <el-table-column prop="currentAmountUSD" label="本次外币" width="120px">
                 <template slot-scope="{row}">
                     <el-input style="width: 100%;" v-model="row.currentAmountUSD" v-if="!editSave" size="mini"
-                        autocomplete="off" :disabled="row.currentCurCode == getLocalCurrency()" clearable placeholder="请输入本次发票金额"
+                        autocomplete="off" :disabled="row.currentCurCode == getLocalCurrency()||row.applySrcId" clearable placeholder="请输入本次发票金额"
                         @change="ausdChange(row)">
                     </el-input>
                     <span v-else>{{ row.currentAmountUSD }}</span>

src/views/iosBasicData/fininvoicesApplyfor/index.vue

@@ -79,6 +79,8 @@ export default {
         tip: false,
         searchShow: true,
         searchMenuSpan: 18,
+        searchIcon: true,
+        searchIndex: 3,
         border: true,
         index: true,
         viewBtn: true,
@@ -925,4 +927,7 @@ export default {
   cursor: pointer;
   color: #1e9fff;
 }
+/deep/ .el-col-md-8 {
+    width: 24.33333%;
+}
 </style>

src/views/iosBasicData/fininvoicesOutput/index.vue

@@ -143,6 +143,8 @@ export default {
                 tip: false,
                 searchShow: true,
                 searchMenuSpan: 18,
+                searchIcon: true,
+                searchIndex: 3,
                 border: true,
                 index: true,
                 selection: true,
@@ -342,6 +344,8 @@ export default {
                 tip: false,
                 searchShow: true,
                 searchMenuSpan: 18,
+                searchIcon: true,
+                searchIndex: 3,
                 border: true,
                 index: true,
                 selection: true,

src/views/iosBasicData/finstlbills/index.vue

@@ -80,6 +80,8 @@ export default {
         tip: false,
         searchShow: true,
         searchMenuSpan: 6,
+        searchIcon: true,
+        searchIndex: 3,
         border: true,
         index: true,
         viewBtn: true,
@@ -895,4 +897,7 @@ export default {
   cursor: pointer;
   color: #1e9fff;
 }
+/deep/ .el-col-md-8 {
+    width: 24.33333%;
+}
 </style>