修改禅道1958和出库工单微信通知的问题

src/api/tradeAgency/oceanFreightImport.js

@@ -352,4 +352,13 @@ export const revokeReturnBox= (data) => {
         method: 'post',
         data: data
     })
-}
+}
+
+//出库确认
+export const storagefeeitems= (data) => {
+    return request({
+        url: '/api/blade-los/storagefeeitems/detail',
+        method: 'get',
+        params: data
+    })
+}

src/views/approveDataH/index.vue

@@ -32,7 +32,10 @@
         <span v-else-if="scope.row.checkType == 'BGSI'">海运进口报关</span>
         <span v-else-if="scope.row.checkType == 'BGAE'">空运出口报关</span>
         <span v-else-if="scope.row.checkType == 'BGAI'">空运进口报关</span>
-
+        <span v-else-if="scope.row.checkType == 'FFSQ-SK'">贸易代理货款付费申请</span>
+        <span v-else-if="scope.row.checkType == 'MYDL'">贸易代理单据审核</span>
+        <span v-else-if="scope.row.checkType == 'YSQR-C'">贸易代理货款付费确认</span>
+        <span v-else-if="scope.row.checkType == 'YSQR-D'">贸易代理货款收费确认</span>
       </template>
         <template slot-scope="scope" slot="billNo">
             <span style="color: #1e9fff;cursor: pointer;" @click="billNoDetails(scope.row)">{{scope.row.billNo}}</span>

src/views/iosBasicData/ComputationCenter/settlementDetails.vue

@@ -323,7 +323,7 @@ import reportformsList from "@/views/iosBasicData/SeafreightExportF/bills/assemb
 import { getList as getreportsList, reportsGetReportData } from "@/api/iosBasicData/reports";
 import reportContainer from "@/views/iosBasicData/report-container/report-container.vue";
 import { generateFinStlBills } from "@/api/iosBasicData/fininvoices";
-
+import { dateFormat} from "@/util/date";
 export default {
     components: { reportContainer, reportformsList, reports, SearchQuery, expand, finstlbillsitems },
     props: {
@@ -385,7 +385,8 @@ export default {
             saveLoading: false, // 按钮动画
             // 绑定的数据
             form: {
-                dc: null
+                dc: null,
+                billDate:dateFormat(new Date())
             },
             handleSelectionData: [], // 表格选择的数据
             corpData: [], // 结算单位 数据

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

@@ -36,6 +36,8 @@
                     <span class="textHide">{{ row.accBillNo }}</span>
                 </template>
             </el-table-column>
+            <el-table-column prop="feeCnName" label="费用名称">
+            </el-table-column>
             <el-table-column prop="corpCnName" label="客户名称" width="130px">
                 <template slot-scope="{ row }">
                     <span class="textHide">{{ row.corpCnName }}</span>

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

@@ -61,6 +61,8 @@
                     <span class="textHide">{{ row.bookingNo }}</span>
                 </template>
             </el-table-column>
+            <el-table-column prop="feeCnName" label="费用名称">
+            </el-table-column>
             <el-table-column prop="corpCnName" label="客户中文名称" width="140px">
                 <template slot-scope="{row}">
                     <span class="textHide">{{ row.corpCnName }}</span>

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

@@ -33,6 +33,8 @@
             </el-table-column>
             <el-table-column prop="invoiceNo" label="发票号">
             </el-table-column>
+            <el-table-column prop="feeCnName" label="费用名称">
+            </el-table-column>
             <el-table-column prop="corpCnName" label="结算单位" width="130px">
                 <template slot-scope="{ row }">
                     <span class="textHide">{{ row.corpCnName }}</span>

src/views/tirePartsMall/salesManagement/outboundWorkOrder/detailsPage.vue

@@ -492,7 +492,7 @@ export default {
       this.refresh(this.$route.query.srcId)
     }
     this.$store.commit("DOMIO_IN_DETAIL");
-    getParamservice(1, 10, { paramKey: 'cashier.payment' }).then(res => {
+    getParamservice(1, 10, { paramKey: 'WeChat.shipping.notification' }).then(res => {
       if (res.data.data.records.length > 0) {
         this.paymentType = res.data.data.records[0].paramValue
       }

src/views/tradeAgency/exchangePurchasing/index.vue

@@ -130,6 +130,26 @@ export default {
                         overHidden: true,
                     },
                     {
+                        label: "审核状态",
+                        prop: "firstStatus",
+                        search: true,
+                        type: 'select',
+                        dicData: [{
+                            label: '录入',
+                            value: '录入'
+                        }, {
+                            label: '审核提交',
+                            value: '审核提交'
+                        }, {
+                            label: '审核中',
+                            value: '审核中'
+                        }, {
+                            label: '审核通过',
+                            value: '审核通过'
+                        }],
+                        overHidden: true,
+                    },
+                    {
                         label: "业务日期",
                         prop: "businessDate",
                         type: "date",

src/views/tradeAgency/oceanFreightImport/detailsPage.vue

@@ -7,7 +7,8 @@
                 </el-button>
             </div>
             <div class="add-customer-btn">
-                <el-button size="small" style="margin-right: 8px" :disabled="!form.id" @click="$refs.print.openDialog()">预 览
+                <el-button size="small" style="margin-right: 8px" :disabled="!form.id"
+                    @click="$refs.print.openDialog()">预 览
                 </el-button>
                 <el-button class="el-button--small-yh" style="margin-left: 6px;" type="primary" size="small"
                     v-if="editButton"
@@ -17,8 +18,8 @@
                 <el-button class="el-button--small-yh" v-else style="margin-left: 6px;" type="primary" size="small"
                     :disabled="isSaveBtn || form.status != 0" @click="submit">保 存
                 </el-button>
-                <el-button v-if="form.id" class="el-button--small-yh" style="margin-left: 6px;" type="success" size="small"
-                    :disabled="(form.status != 0 && form.status != 4)" @click="application">单据请核
+                <el-button v-if="form.id" class="el-button--small-yh" style="margin-left: 6px;" type="success"
+                    size="small" :disabled="(form.status != 0 && form.status != 4)" @click="application">单据请核
                 </el-button>
                 <el-button v-if="form.status == 1" class="el-button--small-yh" style="margin-left: 6px;" type="danger"
                     size="small" @click="revokeApplication">撤销单据请核
@@ -99,39 +100,40 @@
                     </tempalte> -->
                     <tempalte slot="srcType" slot-scope="{ row }">
                         <div style="display: flex;">
-                            <dic-select style="margin-right: 4px;" v-model="form.srcType" placeholder="业务来源" key="dictKey"
-                                keyValue="dictKey" label="dictValue"
+                            <dic-select style="margin-right: 4px;" v-model="form.srcType" placeholder="业务来源"
+                                key="dictKey" keyValue="dictKey" label="dictValue"
                                 url="/blade-system/dict-biz/dictionary?code=source_Type" :filterable="true"
                                 :disabled="editDisabled || form.dispatchVehiclesList.findIndex(item => item.whetherDispatchVehicles == '1') !== -1"
                                 @selectChange="dicChange('srcType', $event)"></dic-select>
-                            <el-input v-show="!form.srcType" v-model="form.srcCnName" placeholder="请选择" :disabled="true">
+                            <el-input v-show="!form.srcType" v-model="form.srcCnName" placeholder="请选择"
+                                :disabled="true">
                             </el-input>
-                            <dic-select v-show="form.srcType == 'OWN'" v-model="form.srcCnName" placeholder="所属公司" key="id"
-                                label="deptName" url="/blade-system/dept/lazy-list?parentId=0" :filterable="true"
-                                @selectChange="dicChange('srcCnName', $event)"
+                            <dic-select v-show="form.srcType == 'OWN'" v-model="form.srcCnName" placeholder="所属公司"
+                                key="id" label="deptName" url="/blade-system/dept/lazy-list?parentId=0"
+                                :filterable="true" @selectChange="dicChange('srcCnName', $event)"
                                 :disabled="editDisabled || form.dispatchVehiclesList.findIndex(item => item.whetherDispatchVehicles == '1') !== -1"></dic-select>
-                            <dic-select v-show="form.srcType == 'AGENT'" v-model="form.srcCnName" placeholder="代理" key="id"
-                                label="cnName" res="records" url="/blade-los/bcorps/listByType?corpTypeName=代理客户"
-                                :filterable="true" :remote="true" dataName="cnName"
-                                @selectChange="dicChange('srcCnName', $event)"
+                            <dic-select v-show="form.srcType == 'AGENT'" v-model="form.srcCnName" placeholder="代理"
+                                key="id" label="cnName" res="records"
+                                url="/blade-los/bcorps/listByType?corpTypeName=代理客户" :filterable="true" :remote="true"
+                                dataName="cnName" @selectChange="dicChange('srcCnName', $event)"
                                 :disabled="editDisabled || form.dispatchVehiclesList.findIndex(item => item.whetherDispatchVehicles == '1') !== -1"></dic-select>
-                            <dic-select v-show="form.srcType == 'SALES'" v-model="form.srcCnName" placeholder="业务员" key="id"
-                                label="realName" res="records" url="/blade-user/page" :filterable="true" :remote="true"
-                                dataName="realName" @selectChange="dicChange('srcCnName', $event)"
+                            <dic-select v-show="form.srcType == 'SALES'" v-model="form.srcCnName" placeholder="业务员"
+                                key="id" label="realName" res="records" url="/blade-user/page" :filterable="true"
+                                :remote="true" dataName="realName" @selectChange="dicChange('srcCnName', $event)"
                                 :disabled="editDisabled || form.dispatchVehiclesList.findIndex(item => item.whetherDispatchVehicles == '1') !== -1"></dic-select>
                         </div>
                     </tempalte>
                     <tempalte slot="hshipperCnName">
-                        <dic-select v-model="form.hshipperCnName" placeholder="发货人" key="id" label="cnName" res="records"
-                            url="/blade-los/bcorps/listByType?corpTypeName=国外工厂" :filterable="true" :remote="true"
-                            dataName="cnName" @selectChange="dicChange('hshipperCnName', $event)"
+                        <dic-select v-model="form.hshipperCnName" placeholder="发货人" key="id" label="cnName"
+                            res="records" url="/blade-los/bcorps/listByType?corpTypeName=国外工厂" :filterable="true"
+                            :remote="true" dataName="cnName" @selectChange="dicChange('hshipperCnName', $event)"
                             :disabled="editDisabled || form.dispatchVehiclesList.findIndex(item => item.whetherDispatchVehicles == '1') !== -1"
                             :searchShow="true"></dic-select>
                     </tempalte>
                     <tempalte slot="hconsigneeCnName">
-                        <dic-select v-model="form.hconsigneeCnName" placeholder="收货人" key="id" label="cnName" res="records"
-                            url="/blade-los/bcorps/listByType?corpTypeName=国内贸易商" :filterable="true" :remote="true"
-                            dataName="cnName" @selectChange="dicChange('hconsigneeCnName', $event)"
+                        <dic-select v-model="form.hconsigneeCnName" placeholder="收货人" key="id" label="cnName"
+                            res="records" url="/blade-los/bcorps/listByType?corpTypeName=国内贸易商" :filterable="true"
+                            :remote="true" dataName="cnName" @selectChange="dicChange('hconsigneeCnName', $event)"
                             :disabled="editDisabled || form.dispatchVehiclesList.findIndex(item => item.whetherDispatchVehicles == '1') !== -1"
                             :searchShow="true"></dic-select>
                     </tempalte>
@@ -142,9 +144,9 @@
                             :disabled="editDisabled || form.dispatchVehiclesList.findIndex(item => item.whetherDispatchVehicles == '1') !== -1"></dic-select>
                     </tempalte>
                     <tempalte slot="bookingAgentCnName">
-                        <dic-select v-model="form.bookingAgentCnName" placeholder="船代" key="id" label="cnName" res="records"
-                            url="/blade-los/bcorps/listByType?corpTypeName=船代" :filterable="true" :remote="true"
-                            dataName="cnName" @selectChange="dicChange('bookingAgentCnName', $event)"
+                        <dic-select v-model="form.bookingAgentCnName" placeholder="船代" key="id" label="cnName"
+                            res="records" url="/blade-los/bcorps/listByType?corpTypeName=船代" :filterable="true"
+                            :remote="true" dataName="cnName" @selectChange="dicChange('bookingAgentCnName', $event)"
                             :disabled="editDisabled || form.dispatchVehiclesList.findIndex(item => item.whetherDispatchVehicles == '1') !== -1"
                             :searchShow="true"></dic-select>
                     </tempalte>
@@ -159,8 +161,9 @@
                         </div>
                     </template> -->
                     <tempalte slot="mnotifyCntyCode" slot-scope="{ row }">
-                        <dic-select v-model="form.mnotifyCntyCode" placeholder="原产地" key="id" label="cnName" res="records"
-                            url="/blade-los/bcountrys/list" :filterable="true" :remote="true" dataName="cnName"
+                        <dic-select v-model="form.mnotifyCntyCode" placeholder="原产地" key="id" label="cnName"
+                            res="records" url="/blade-los/bcountrys/list" :filterable="true" :remote="true"
+                            dataName="cnName"
                             :disabled="editDisabled || form.dispatchVehiclesList.findIndex(item => item.whetherDispatchVehicles == '1') !== -1"
                             @selectChange="dicChange('mnotifyCntyCode', $event)" :searchShow="true"></dic-select>
                     </tempalte>
@@ -178,27 +181,27 @@
                     </template>
                     <template slot="cntrTypeCodeHeader" slot-scope="{column}">
                         <span style="color: #1e9fff;cursor: pointer;" @click="inJump('箱型')">{{ (column || {}).label
-                        }}</span>
+                            }}</span>
                     </template>
                     <template slot="goodsNameHeader" slot-scope="{column}">
                         <span style="color: #1e9fff;cursor: pointer;" @click="inJump('HSCODE')">{{ (column || {}).label
-                        }}</span>
+                            }}</span>
                     </template>
                     <template slot="hsCodeHeader" slot-scope="{column}">
                         <span style="color: #1e9fff;cursor: pointer;" @click="inJump('HSCODE')">{{ (column || {}).label
-                        }}</span>
+                            }}</span>
                     </template>
                     <template slot="goodsTypeHeader" slot-scope="{column}">
                         <span style="color: #1e9fff;cursor: pointer;" @click="inJump('类型')">{{ (column || {}).label
-                        }}</span>
+                            }}</span>
                     </template>
                     <template slot="index" slot-scope="{row,index}">
                         <span>{{ index + 1 }}</span>
                     </template>
                     <template slot="cntrTypeCode" slot-scope="{ row }">
-                        <dic-select v-if="row.$cellEdit && !row.srcId" v-model="row.cntrTypeCode" placeholder="箱型" key="id"
-                            res="records" label="cnName" url="/blade-los/bcntrtypes/list" :filterable="true" :remote="true"
-                            dataName="cnName"></dic-select>
+                        <dic-select v-if="row.$cellEdit && !row.srcId" v-model="row.cntrTypeCode" placeholder="箱型"
+                            key="id" res="records" label="cnName" url="/blade-los/bcntrtypes/list" :filterable="true"
+                            :remote="true" dataName="cnName"></dic-select>
                         <span v-else>{{ row.cntrTypeCode }}</span>
                     </template>
                     <template slot="boxNo" slot-scope="{ row }">
@@ -207,15 +210,17 @@
                         <span v-else>{{ row.boxNo }}</span>
                     </template>
                     <template slot="hsCodeForm" slot-scope="{ row }">
-                        <dic-select v-if="row.$cellEdit" v-model="row.hsCode" placeholder="HSCODE" key="id" res="records"
-                            label="hsCode" url="/blade-los/bcommodity/list" :filterable="true" :remote="true"
-                            dataName="hsCode" @selectChange="rowDicChange('hsCode', $event, row)"></dic-select>
+                        <dic-select v-if="row.$cellEdit" v-model="row.hsCode" placeholder="HSCODE" key="id"
+                            res="records" label="hsCode" url="/blade-los/bcommodity/list" :filterable="true"
+                            :remote="true" dataName="hsCode"
+                            @selectChange="rowDicChange('hsCode', $event, row)"></dic-select>
                         <span v-else>{{ row.hsCode }}</span>
                     </template>
                     <template slot="goodsName" slot-scope="{ row }">
                         <dic-select v-if="row.$cellEdit && !row.srcId" v-model="row.goodsName" placeholder="品名" key="id"
-                            res="records" label="cnName" url="/blade-los/bcommodity/list" :filterable="true" :remote="true"
-                            dataName="cnName" @selectChange="rowDicChange('goodsName', $event, row)"></dic-select>
+                            res="records" label="cnName" url="/blade-los/bcommodity/list" :filterable="true"
+                            :remote="true" dataName="cnName"
+                            @selectChange="rowDicChange('goodsName', $event, row)"></dic-select>
                         <span v-else>{{ row.goodsName }}</span>
                     </template>
                     <tempalte slot="goodsType" slot-scope="{ row }">
@@ -255,26 +260,30 @@
             </trade-card>
             <trade-card title="派车">
                 <avue-crud :option="option2" :data="form.dispatchVehiclesList" id="out-table" ref="crud2"
-                    @selection-change="selectionChange" @resetColumn="resetColumn('crud2', 'option2', 'optionBack2', 389)"
+                    @selection-change="selectionChange"
+                    @resetColumn="resetColumn('crud2', 'option2', 'optionBack2', 389)"
                     @saveColumn="saveColumn('crud2', 'option2', 'optionBack2', 389)">
                     <tempalte slot="fleetName" slot-scope="{ row, index }">
-                        <dic-select v-if="row.$cellEdit" v-model="row.fleetName" placeholder="承运车队" key="id" label="cnName"
-                            res="records" url="/blade-los/bcorps/listByType?corpTypeName=车队" :filterable="true"
-                            :remote="true" dataName="cnName" @selectChange="rowDicChange('fleetName', $event, row)"
+                        <dic-select v-if="row.$cellEdit" v-model="row.fleetName" placeholder="承运车队" key="id"
+                            label="cnName" res="records" url="/blade-los/bcorps/listByType?corpTypeName=车队"
+                            :filterable="true" :remote="true" dataName="cnName"
+                            @selectChange="rowDicChange('fleetName', $event, row)"
                             :disabled="editDisabled"></dic-select>
                         <span v-else>{{ row.fleetName }}</span>
                     </tempalte>
                     <tempalte slot="pickupAddressName" slot-scope="{ row, index }">
                         <dic-select v-if="row.$cellEdit" v-model="row.pickupAddressName" placeholder="提箱地点" key="id"
-                            label="cnName" res="records" url="/blade-los/blocations/list" :filterable="true" :remote="true"
-                            dataName="cnName" @selectChange="rowDicChange('pickupAddressName', $event, row)"
+                            label="cnName" res="records" url="/blade-los/blocations/list" :filterable="true"
+                            :remote="true" dataName="cnName"
+                            @selectChange="rowDicChange('pickupAddressName', $event, row)"
                             :disabled="editDisabled"></dic-select>
                         <span v-else>{{ row.pickupAddressName }}</span>
                     </tempalte>
                     <tempalte slot="deliveryAddressName" slot-scope="{ row, index }">
                         <dic-select v-if="row.$cellEdit" v-model="row.deliveryAddressName" placeholder="送货地点" key="id"
-                            label="cnName" res="records" url="/blade-los/blocations/list" :filterable="true" :remote="true"
-                            dataName="cnName" @selectChange="rowDicChange('deliveryAddressName', $event, row)"
+                            label="cnName" res="records" url="/blade-los/blocations/list" :filterable="true"
+                            :remote="true" dataName="cnName"
+                            @selectChange="rowDicChange('deliveryAddressName', $event, row)"
                             :disabled="editDisabled"></dic-select>
                         <span v-else>{{ row.deliveryAddressName }}</span>
                     </tempalte>
@@ -292,9 +301,10 @@
                             {{ row.$cellEdit ? '保 存' : '编 辑' }}
                         </el-button>
                         <el-button size="small" type="text" :disabled="editDisabled || row.$cellEdit"
-                            @click="rowCell('还箱', row, index)">{{ row.whetherReturn == 1 ? '撤销还箱' : '确认还箱' }}</el-button>
+                            @click="rowCell('还箱', row, index)">{{ row.whetherReturn == 1 ? '撤销还箱' : '确认还箱'
+                            }}</el-button>
                         <el-button size="small" type="text" :disabled="editDisabled || row.$cellEdit"
-                            @click="rowCell('查验/倒柜派车', row, index)">{{ row.whetherInspection == 1 ? '撤销查验/倒柜派车' : '查验/倒柜派车'
+                            @click="rowCell('送货派车', row, index)">{{ row.whetherInspection == 1 ? '撤销送货派车' : '送货派车'
                             }}</el-button>
                         <el-button size="small" type="text"
                             :disabled="editDisabled || row.whetherWarehouseEntry == 1 || row.$cellEdit"
@@ -312,16 +322,17 @@
             </trade-card>
             <trade-card title="入库">
                 <avue-crud :option="option3" :data="form.inStorageList" id="out-table" ref="crud3"
-                    @selection-change="selectionChange" @resetColumn="resetColumn('crud3', 'option3', 'optionBack3', 390)"
+                    @selection-change="selectionChange"
+                    @resetColumn="resetColumn('crud3', 'option3', 'optionBack3', 390)"
                     @saveColumn="saveColumn('crud3', 'option3', 'optionBack3', 390)">
                     <template slot="storageUnitHeader" slot-scope="{column}">
                         <span style="color: #1e9fff;cursor: pointer;" @click="inJump('入库单位')">{{ (column || {}).label
-                        }}</span>
+                            }}</span>
                     </template>
                     <template slot="warehouseName" slot-scope="{ row }">
-                        <dic-select v-if="row.$cellEdit" v-model="row.warehouseName" placeholder="入库" key="id" label="cname"
-                            url="/blade-los/storage/list" res="records" :filterable="true" :remote="true" dataName="cname"
-                            @selectChange="rowDicChange('warehouseName', $event, row)"></dic-select>
+                        <dic-select v-if="row.$cellEdit" v-model="row.warehouseName" placeholder="入库" key="id"
+                            label="cname" url="/blade-los/storage/list" res="records" :filterable="true" :remote="true"
+                            dataName="cname" @selectChange="rowDicChange('warehouseName', $event, row)"></dic-select>
                         <span v-else>{{ row.warehouseName }}</span>
                     </template>
                     <template slot="menu" slot-scope="{ row, index }">
@@ -352,15 +363,18 @@
             </trade-card>
             <trade-card title="出库">
                 <avue-crud :option="option4" :data="form.outStorageList" id="out-table" ref="crud4"
-                    @selection-change="selectionChange" @resetColumn="resetColumn('crud4', 'option4', 'optionBack4', 391)"
+                    @selection-change="selectionChange"
+                    @resetColumn="resetColumn('crud4', 'option4', 'optionBack4', 391)"
                     @saveColumn="saveColumn('crud4', 'option4', 'optionBack4', 391)">
                     <template slot="menu" slot-scope="{ row, index }">
                         <el-button size="small" type="text" :disabled="editDisabled || row.confirmDispatchVehicles == 1"
                             @click="rowCell('出库编辑', row, index)">{{ row.$cellEdit ? '保 存' : '编 辑' }}</el-button>
-                        <el-button size="small" type="text" :disabled="editDisabled" @click="rowCell('出库确认', row, index)">{{
-                            row.confirmDispatchVehicles ==
-                            1 ? '撤销确认' : '出库确认' }}</el-button>
-                        <el-button size="small" type="text" :disabled="editDisabled" @click="rowCell('开票', row, index)">开
+                        <el-button size="small" type="text" :disabled="editDisabled"
+                            @click="rowCell('出库确认', row, index)">{{
+                                row.confirmDispatchVehicles ==
+                                    1 ? '撤销确认' : '出库确认' }}</el-button>
+                        <el-button size="small" type="text" :disabled="editDisabled"
+                            @click="rowCell('开票', row, index)">开
                             票</el-button>
                         <el-button size="small" type="text" :disabled="editDisabled || row.confirmDispatchVehicles == 1"
                             @click="rowCell('出库删除', row, index)">删 除</el-button>
@@ -371,8 +385,8 @@
                 <fee-info ref="feeInfo" :form="form" :disabled="editDisabled" @getDetails="getDetails"></fee-info>
             </trade-card>
             <containerTitle title="上传附件"></containerTitle>
-            <c-upload :data="form.filesList" :enumerationValue="76" deleteUrl="/api/blade-los/filescenter/remove" display
-                :disabled="editDisabled"></c-upload>
+            <c-upload :data="form.filesList" :enumerationValue="76" deleteUrl="/api/blade-los/filescenter/remove"
+                display :disabled="editDisabled"></c-upload>
         </div>
         <business-reports :id="form.id" ref="print" businessValue="HYJK" classifyCode="业务" groupCode="销售报告"
             :type="1"></business-reports>
@@ -381,7 +395,7 @@
             :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="carVisible" width="40%" :close-on-click-modal="false"
+        <el-dialog append-to-body title="送货派车" :visible.sync="carVisible" width="40%" :close-on-click-modal="false"
             v-dialog-drag @closed="carClosed">
             <span>
                 <avue-form :option="carOption" v-model="carForm">
@@ -403,9 +417,9 @@
             <span>
                 <avue-form :option="boxOption" v-model="boxForm">
                     <template slot="returnCyName">
-                        <dic-select v-model="boxForm.returnCyName" placeholder="返空场站" key="id" label="cnName" res="records"
-                            url="/blade-los/bcorps/listByType?corpTypeName=场站" :filterable="true" :remote="true"
-                            dataName="cnName"></dic-select>
+                        <dic-select v-model="boxForm.returnCyName" placeholder="返空场站" key="id" label="cnName"
+                            res="records" url="/blade-los/bcorps/listByType?corpTypeName=场站" :filterable="true"
+                            :remote="true" dataName="cnName"></dic-select>
                     </template>
                 </avue-form>
             </span>
@@ -414,13 +428,24 @@
                 <el-button type="primary" @click="boxSubmit(boxForm)">确 定</el-button>
             </span>
         </el-dialog>
+        <el-dialog append-to-body title="出库确认" :visible.sync="ckVisible" width="40%" :close-on-click-modal="false"
+            v-dialog-drag @closed="ckClosed()">
+            <span>
+                <avue-form :option="ckOption" v-model="ckForm">
+                </avue-form>
+            </span>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="ckVisible = false">取 消</el-button>
+                <el-button type="primary" @click="ckSubmit(ckForm)">确 定</el-button>
+            </span>
+        </el-dialog>
         <dictbiz-dialog ref="dictbiz" :title="dicTitle" :code="dicCode" :parentId="parentId" @closed="getAllWorkDicts">
         </dictbiz-dialog>
     </div>
 </template>
 
 <script>
-import { submit, getDetail, detailTradeByMblno, remove, checkAgent, revokeCheckAgent, copyAgent, generateDispatchVehicles, confirmDispatchVehicles, generateWarehouseEntry, confirmWarehouseEntry, generateOutbound, dispatchvehiclesRemove, inoutstorageRemove, calculationWarehouseUnitPrice, billsCopyBills, submitList1, submitList2, revokePrecontainers, revokeDispatchVehicles, revokeWarehouseEntry, revokeInoutstorage, revokeOutbound, confirmInspection, revokeInspection, confirmReturnBox, revokeReturnBox } from "@/api/tradeAgency/oceanFreightImport";
+import { storagefeeitems, submit, getDetail, detailTradeByMblno, remove, checkAgent, revokeCheckAgent, copyAgent, generateDispatchVehicles, confirmDispatchVehicles, generateWarehouseEntry, confirmWarehouseEntry, generateOutbound, dispatchvehiclesRemove, inoutstorageRemove, calculationWarehouseUnitPrice, billsCopyBills, submitList1, submitList2, revokePrecontainers, revokeDispatchVehicles, revokeWarehouseEntry, revokeInoutstorage, revokeOutbound, confirmInspection, revokeInspection, confirmReturnBox, revokeReturnBox } from "@/api/tradeAgency/oceanFreightImport";
 import { contrastObj, contrastList } from "@/util/contrastData";
 import feeInfo from "@/components/tradeAgency/fee-oceanFreight";
 import dicSelect from "@/components/dicSelect/main";
@@ -432,6 +457,12 @@ export default {
     name: "detailsPage",
     data() {
         return {
+            ckForm: {
+                // id: null,
+                // returnDate: null,
+                // returnCyName: null,
+            },
+            ckVisible: false,
             dicTitle: null,
             parentId: null,
             dicCode: null,
@@ -715,6 +746,11 @@ export default {
                         label: "免箱期",
                         prop: "iqNo",
                         disabled: false,
+                        rules: [{
+                            required: true,
+                            message: " ",
+                            trigger: "blur"
+                        }],
                     },
                     {
                         label: '报关单号',
@@ -801,22 +837,22 @@ export default {
                 disabled: false,
                 column: [
                     {
-                        label: '查验/倒柜承运车队',
+                        label: '送货承运车队',
                         prop: "inspectionFleetName",
                         disabled: false,
                     },
                     {
-                        label: '查验/倒柜车号',
+                        label: '送货车号',
                         prop: "inspectionLicenseNumber",
                         disabled: false,
                     },
                     {
-                        label: '查验/倒柜姓名',
+                        label: '送货姓名',
                         prop: "inspectionFullName",
                         disabled: false,
                     },
                     {
-                        label: '查验/倒柜联系方式',
+                        label: '送货联系方式',
                         prop: "inspectionContactInformation",
                         disabled: false,
                     }
@@ -841,6 +877,22 @@ export default {
                     },
                 ]
             },
+            ckOption: {
+                // labelWidth: 120,
+                menuBtn: false,
+                span: 24,
+                disabled: false,
+                column: [
+                    {
+                        label: "仓储费单价收",
+                        prop: "storageFeePriceD",
+                    },
+                    {
+                        label: "仓储费单价付",
+                        prop: "storageFeePriceC",
+                    },
+                ]
+            },
             option: {},
             optionBack: {
                 height: 'auto',
@@ -1154,6 +1206,15 @@ export default {
                         overHidden: true
                     },
                     {
+                        label: "应还箱日期",
+                        prop: "shouldBeReturnedDate",
+                        // cell: true,
+                        type: "date",
+                        format: "yyyy-MM-dd",
+                        width: "140",
+                        overHidden: true
+                    },
+                    {
                         label: "返空时间",
                         prop: "returnDate",
                         // cell: true,
@@ -1170,25 +1231,25 @@ export default {
                         overHidden: true
                     },
                     {
-                        label: "查验/倒柜承运车队",
+                        label: "送货承运车队",
                         prop: "inspectionFleetName",
                         width: "120",
                         overHidden: true
                     },
                     {
-                        label: "查验/倒柜车号",
+                        label: "送货车号",
                         prop: "inspectionLicenseNumber",
                         width: "120",
                         overHidden: true
                     },
                     {
-                        label: "查验/倒柜姓名",
+                        label: "送货姓名",
                         prop: "inspectionFullName",
                         width: "120",
                         overHidden: true
                     },
                     {
-                        label: "查验/倒柜联系方式",
+                        label: "送货联系方式",
                         prop: "inspectionContactInformation",
                         width: "120",
                         overHidden: true
@@ -1409,7 +1470,7 @@ export default {
                         overHidden: true
                     },
                     {
-                        label: "毛重",
+                        label: "净重",
                         prop: "grossWeight",
                         width: "120",
                         overHidden: true
@@ -1485,6 +1546,13 @@ export default {
             this.showLock = true
             this.getDetaiByMblno(this.$route.query.billNo)
         }
+        if (this.$route.query.id) {
+            this.showLock = true
+            this.editButton = true
+            this.editDisabled = true
+            this.optionForm.disabled = true
+            this.getDetails(this.$route.query.id)
+        }
         if (this.detailData.copyId) {
             this.getCopydate(this.detailData.copyId)
         }
@@ -1620,6 +1688,13 @@ export default {
                 // returnCyName: null,
             }
         },
+        ckClosed() {
+            this.ckForm = {
+                // id: null,
+                // returnDate: null,
+                // returnCyName: null,
+            }
+        },
         carClosed() {
             this.carForm = {
                 // id: null,
@@ -1645,7 +1720,7 @@ export default {
                         background: 'rgba(255,255,255,0.7)'
                     });
                     confirmInspection(row).then(res => {
-                        this.$message.success("查验/倒柜派车成功");
+                        this.$message.success("送货派车成功");
                         this.carVisible = false
                         this.getDetails(this.form.id)
                     }).finally(() => {
@@ -1675,6 +1750,22 @@ export default {
                 }
             })
         },
+        ckSubmit(row) {
+            if(row.storageFeePriceD==0||row.storageFeePriceD==null||row.storageFeePriceC==0||row.storageFeePriceC==null) return this.$message.success("仓储费单价收和仓储费单价付不能为空或0");
+            const loading = this.$loading({
+                lock: true,
+                text: '加载中',
+                spinner: 'el-icon-loading',
+                background: 'rgba(255,255,255,0.7)'
+            });
+            confirmWarehouseEntry(row).then(res => {
+                this.$message.success("出库成功");
+                this.ckVisible = false
+                this.getDetails(this.form.id)
+            }).finally(() => {
+                loading.close()
+            })
+        },
         dicChange(name, row) {
             if (name == 'inspectionFleetName') {
                 if (row) {
@@ -2030,7 +2121,7 @@ export default {
                     this.boxVisible = true
                 }
             }
-            if (name == '查验/倒柜派车') {
+            if (name == '送货派车') {
                 if (row.whetherInspection == 1) {
                     const loading = this.$loading({
                         lock: true,
@@ -2212,18 +2303,26 @@ export default {
                         loading.close()
                     })
                 } else {
-                    const loading = this.$loading({
-                        lock: true,
-                        text: '加载中',
-                        spinner: 'el-icon-loading',
-                        background: 'rgba(255,255,255,0.7)'
-                    });
-                    confirmWarehouseEntry(row).then(res => {
-                        this.$message.success("出库成功");
-                        this.getDetails(this.form.id)
-                    }).finally(() => {
-                        loading.close()
+                    storagefeeitems({ pid: row.warehouseId, goodsType: row.goodsType }).then(res => {
+                        this.ckForm = {
+                            ...row,
+                            storageFeePriceD: res.data.data.price,
+                            storageFeePriceC: res.data.data.priceC
+                        }
+                        this.ckVisible = true
                     })
+                    // const loading = this.$loading({
+                    //     lock: true,
+                    //     text: '加载中',
+                    //     spinner: 'el-icon-loading',
+                    //     background: 'rgba(255,255,255,0.7)'
+                    // });
+                    // confirmWarehouseEntry(row).then(res => {
+                    //     this.$message.success("出库成功");
+                    //     this.getDetails(this.form.id)
+                    // }).finally(() => {
+                    //     loading.close()
+                    // })
                 }
 
             }

src/views/tradeAgency/oceanFreightImport/index.vue

@@ -424,6 +424,10 @@ export default {
                 this.isShow = false
                 this.$store.commit("IN_OCEANFS_DETAIL");
             }
+            if (this.$route.query.id) {
+                this.isShow = false
+                this.$store.commit("IN_OCEANFS_DETAIL");
+            }
             if (this.$route.query.home) {
                 this.isShow = false
             }

src/views/tradeAgency/tradeAgency/detailsPage.vue

@@ -18,8 +18,8 @@
                 <el-button class="el-button--small-yh" v-else style="margin-left: 6px;" type="primary" size="small"
                     :disabled="isSaveBtn || form.businessStatus != '录入'" @click="submit">保 存
                 </el-button>
-                <el-button v-if="form.id" class="el-button--small-yh" style="margin-left: 6px;" type="success" size="small"
-                    :disabled="form.businessStatus != '录入'" @click="application">单据请核
+                <el-button v-if="form.id" class="el-button--small-yh" style="margin-left: 6px;" type="success"
+                    size="small" :disabled="form.businessStatus != '录入'" @click="application">单据请核
                 </el-button>
                 <el-button v-if="form.businessStatus == '提交审核'" class="el-button--small-yh" style="margin-left: 6px;"
                     type="danger" size="small" @click="revokeApplication">撤销单据请核
@@ -71,8 +71,8 @@
                             :disabled="editDisabled || form.feeCenterListD.length || form.feeCenterListC.length"></el-input>
                     </tempalte>
                     <tempalte slot="contractDate" slot-scope="{ row }">
-                        <el-date-picker v-model="form.contractDate" type="date" placeholder="请选择 合同日期" format="yyyy-MM-dd"
-                            valueFormat="yyyy-MM-dd 00:00:00"
+                        <el-date-picker v-model="form.contractDate" type="date" placeholder="请选择 合同日期"
+                            format="yyyy-MM-dd" valueFormat="yyyy-MM-dd 00:00:00"
                             :disabled="editDisabled || form.feeCenterListD.length || form.feeCenterListC.length">
                         </el-date-picker>
                     </tempalte>
@@ -81,10 +81,10 @@
                             :disabled="editDisabled || form.feeCenterListD.length || form.feeCenterListC.length"></el-input>
                     </tempalte>
                     <tempalte slot="countryOfOrigin" slot-scope="{ row }">
-                        <dic-select v-model="form.countryOfOrigin" placeholder="原产地" key="id" label="cnName" res="records"
-                            url="/blade-los/bcountrys/list" :filterable="true" :remote="true" dataName="cnName"
-                            :disabled="editDisabled" @selectChange="dicChange('countryOfOrigin', $event)"
-                            :searchShow="true"></dic-select>
+                        <dic-select v-model="form.countryOfOrigin" placeholder="原产地" key="id" label="cnName"
+                            res="records" url="/blade-los/bcountrys/list" :filterable="true" :remote="true"
+                            dataName="cnName" :disabled="editDisabled"
+                            @selectChange="dicChange('countryOfOrigin', $event)" :searchShow="true"></dic-select>
                     </tempalte>
                     <tempalte slot="typeOfShipping" slot-scope="{ row }">
                         <dic-select v-model="form.typeOfShipping" placeholder="运输方式" key="dictKey" label="dictValue"
@@ -115,8 +115,9 @@
                     </tempalte>
                     <tempalte slot="abroadBankMnemonicCode" slot-scope="{ row }">
                         <dic-select ref="abankCode" v-model="form.abroadBankMnemonicCode" placeholder="银行助记码" key="id"
-                            label="mnemonicCode" res="corpsBankList" url="/blade-los/bcorps/detail" :activateCreated="false"
-                            :filterable="true" @selectChange="dicChange('abroadBankMnemonicCode', $event)"
+                            label="mnemonicCode" res="corpsBankList" url="/blade-los/bcorps/detail"
+                            :activateCreated="false" :filterable="true"
+                            @selectChange="dicChange('abroadBankMnemonicCode', $event)"
                             :disabled="editDisabled"></dic-select>
                     </tempalte>
                     <tempalte slot="abroadCurrency" slot-scope="{ row }">
@@ -131,8 +132,9 @@
                     </tempalte>
                     <tempalte slot="domesticBankMnemonicCode" slot-scope="{ row }">
                         <dic-select ref="dbankCode" v-model="form.domesticBankMnemonicCode" placeholder="银行助记码" key="id"
-                            label="mnemonicCode" res="corpsBankList" url="/blade-los/bcorps/detail" :activateCreated="false"
-                            :filterable="true" @selectChange="dicChange('domesticBankMnemonicCode', $event)"
+                            label="mnemonicCode" res="corpsBankList" url="/blade-los/bcorps/detail"
+                            :activateCreated="false" :filterable="true"
+                            @selectChange="dicChange('domesticBankMnemonicCode', $event)"
                             :disabled="editDisabled"></dic-select>
                     </tempalte>
                     <tempalte slot="domesticCurrency" slot-scope="{ row }">
@@ -172,16 +174,18 @@
                                 :disabled="true">
                             </el-input>
                             <dic-select v-show="form.sourceType == 'OWN'" v-model="form.salesmanName" placeholder="所属公司"
-                                key="id" label="deptName" url="/blade-system/dept/lazy-list?parentId=0" :filterable="true"
-                                @selectChange="dicChange('salesmanName', $event)" :disabled="editDisabled"></dic-select>
+                                key="id" label="deptName" url="/blade-system/dept/lazy-list?parentId=0"
+                                :filterable="true" @selectChange="dicChange('salesmanName', $event)"
+                                :disabled="editDisabled"></dic-select>
                             <dic-select v-show="form.sourceType == 'AGENT'" v-model="form.salesmanName" placeholder="代理"
-                                key="id" label="cnName" res="records" url="/blade-los/bcorps/listByType?corpTypeName=代理客户"
-                                :filterable="true" :remote="true" dataName="cnName"
-                                @selectChange="dicChange('salesmanName', $event)" :disabled="editDisabled"></dic-select>
-                            <dic-select v-show="form.sourceType == 'SALES'" v-model="form.salesmanName" placeholder="业务员"
-                                key="id" label="realName" res="records" url="/blade-user/page" :filterable="true"
-                                :remote="true" dataName="realName" @selectChange="dicChange('salesmanName', $event)"
+                                key="id" label="cnName" res="records"
+                                url="/blade-los/bcorps/listByType?corpTypeName=代理客户" :filterable="true" :remote="true"
+                                dataName="cnName" @selectChange="dicChange('salesmanName', $event)"
                                 :disabled="editDisabled"></dic-select>
+                            <dic-select v-show="form.sourceType == 'SALES'" v-model="form.salesmanName"
+                                placeholder="业务员" key="id" label="realName" res="records" url="/blade-user/page"
+                                :filterable="true" :remote="true" dataName="realName"
+                                @selectChange="dicChange('salesmanName', $event)" :disabled="editDisabled"></dic-select>
                         </div>
                     </tempalte>
                 </avue-form>
@@ -200,7 +204,8 @@
                             @click="allClick('首款账单')">首款账单
                         </el-button>
                         <el-button type="info" size="small"
-                            :disabled="editDisabled || selectionList.length == 0 || !form.id" @click="allClick('尾款账单')">尾款账单
+                            :disabled="editDisabled || selectionList.length == 0 || !form.id"
+                            @click="allClick('尾款账单')">尾款账单
                         </el-button>
                         <el-button type="warning" size="small" :disabled="selectionList.length == 0 || !form.id"
                             @click="allClick('生成货代')">生成货代
@@ -250,15 +255,19 @@
                     </template>
                     <template slot="hsCodeHeader" slot-scope="{column}">
                         <span style="color: #1e9fff;cursor: pointer;" @click="inJump('HSCODE')">{{ (column || {}).label
-                        }}</span>
+                            }}</span>
                     </template>
                     <template slot="labelProductNameHeader" slot-scope="{column}">
                         <span style="color: #1e9fff;cursor: pointer;" @click="inJump('HSCODE')">{{ (column || {}).label
-                        }}</span>
+                            }}</span>
                     </template>
                     <template slot="boxTypeHeader" slot-scope="{column}">
                         <span style="color: #1e9fff;cursor: pointer;" @click="inJump('箱型')">{{ (column || {}).label
-                        }}</span>
+                            }}</span>
+                    </template>
+                    <template slot="goodsTypeHeader" slot-scope="{column}">
+                        <span style="color: #1e9fff;cursor: pointer;" @click="inJump('商品类别')">{{ (column || {}).label
+                            }}</span>
                     </template>
                     <template slot="index" slot-scope="{row,index}">
                         <span>{{ index + 1 }}</span>
@@ -279,15 +288,16 @@
                         <span v-else>{{ row.boxNo }}</span>
                     </template>
                     <tempalte slot="orderReleaseMethodForm" slot-scope="{ row }">
-                        <dic-select v-if="row.$cellEdit" v-model="row.orderReleaseMethod" placeholder="放单方式" key="dictKey"
-                            label="dictValue" url="/blade-system/dict-biz/dictionary?code=release_method"
+                        <dic-select v-if="row.$cellEdit" v-model="row.orderReleaseMethod" placeholder="放单方式"
+                            key="dictKey" label="dictValue" url="/blade-system/dict-biz/dictionary?code=release_method"
                             :filterable="true"></dic-select>
                         <span v-else>{{ row.orderReleaseMethod }}</span>
                     </tempalte>
                     <template slot="hsCodeForm" slot-scope="{ row }">
-                        <dic-select v-if="row.$cellEdit" v-model="row.hsCode" placeholder="HSCODE" key="id" res="records"
-                            label="hsCode" url="/blade-los/bcommodity/list" :filterable="true" :remote="true"
-                            dataName="hsCode" @selectChange="rowDicChange('hsCode', $event, row)"></dic-select>
+                        <dic-select v-if="row.$cellEdit" v-model="row.hsCode" placeholder="HSCODE" key="id"
+                            res="records" label="hsCode" url="/blade-los/bcommodity/list" :filterable="true"
+                            :remote="true" dataName="hsCode"
+                            @selectChange="rowDicChange('hsCode', $event, row)"></dic-select>
                         <span v-else>{{ row.hsCode }}</span>
                     </template>
                     <tempalte slot="goodsTypeForm" slot-scope="{ row }">
@@ -360,10 +370,11 @@
                 </el-tabs>
             </trade-card>
             <containerTitle title="上传附件"></containerTitle>
-            <c-upload :data="form.filesCenterList" :enumerationValue="76"
-                deleteUrl="/api/blade-los/filescenter/remove" display :disabled="editDisabled"></c-upload>
+            <c-upload :data="form.filesCenterList" :enumerationValue="76" deleteUrl="/api/blade-los/filescenter/remove"
+                display :disabled="editDisabled"></c-upload>
         </div>
-        <business-reports :id="form.id" :itemIds="itemIds" ref="print" businessValue="MYDL" :type="true"></business-reports>
+        <business-reports :id="form.id" :itemIds="itemIds" ref="print" businessValue="MYDL"
+            :type="true"></business-reports>
         <reports :id="form.id" :assemblyForm="form" businessValue="MYDL" ref="report"></reports>
         <!--审核弹窗-->
         <el-dialog append-to-body title="审批进度" class="el-dialogDeep" :visible.sync="checkScheduleDialog" width="40%"
@@ -385,6 +396,8 @@
                 <el-button size="mini" type="primary" @click="wkSubmit">提 交</el-button>
             </span>
         </el-dialog>
+        <dictbiz-dialog ref="dictbiz" :title="dicTitle" :code="dicCode" :parentId="parentId" @closed="getAllWorkDicts">
+        </dictbiz-dialog>
     </div>
 </template>
 
@@ -407,6 +420,9 @@ export default {
 
     data() {
         return {
+            dicTitle: null,
+            parentId: null,
+            dicCode: null,
             wkType: null,
             wkForm: {
                 agentItemsRList: []
@@ -1289,6 +1305,12 @@ export default {
                     query: { type: 'new' },
                 })
             }
+            if (name == '商品类别') {
+                this.$refs.dictbiz.open()
+                this.dicTitle = '添加类型'
+                this.parentId = '1813125517193330690'
+                this.dicCode = 'goods-type'
+            }
         },
         dicChange(name, row) {
             if (name == 'corpName') {
@@ -1767,18 +1789,31 @@ export default {
             }
             if (name == '生成首款应付') {
                 // if (this.form.applyForPayment == 1) return this.$message.error("请勿重复生成");
-                let obj = {}
-                obj = {
-                    id: this.form.id,
-                    // url: '/tradeAgency/tradeAgency/index',
-                    // pageStatus: '',
-                    // pageLabel: '贸易代理(T)',
-                    paidApplication: 'FFSQ-SK'
-                }
-                generatePayment(obj).then(res => {
-                    this.$message.success("生成首款应付成功");
-                    this.getDetails(this.form.id)
+                bcurrencyGetExrate({ date: this.form.contractDate, dc: 'D' }).then(res => {
+                    res.data.data.forEach(e => {
+                        if (this.form.currency == e.code) {
+                            this.$prompt('账单金额(' + this.form.currency + ')：' + this.form.prepaidAmount + '<br/>请输入汇率', '生成首款应付', {
+                                confirmButtonText: '确定',
+                                cancelButtonText: '取消',
+                                inputValue: e.exrate,
+                                dangerouslyUseHTMLString: true,
+                                closeOnClickModal: false,
+                            }).then(({ value }) => {
+                                let obj = {}
+                                obj = {
+                                    id: this.form.id,
+                                    exchangeRate: value,
+                                    paidApplication: 'FFSQ-SK'
+                                }
+                                generatePayment(obj).then(res => {
+                                    this.$message.success("生成首款应付成功");
+                                    this.getDetails(this.form.id)
+                                })
+                            })
+                        }
+                    })
                 })
+
             }
             if (name == '生成尾款应付') {
                 // if (this.form.applyForPaymentBalance == 1) return this.$message.error("请勿重复生成");
@@ -2162,7 +2197,8 @@ export default {
 .el-table--small th {
     padding: 2px !important;
 }
-::v-deep .el-card__body{
+
+::v-deep .el-card__body {
     padding: 3px 10px;
 }
 </style>

src/views/wel/components/losAssembly/IosBox.vue

@@ -6,7 +6,11 @@
                 <i class="el-icon-refresh-right" style="cursor: pointer;font-size:20px" @click="refresh"></i>
             </div>
             <div class="content" v-loading="loading">
-                <avue-crud id="out-table" :data="data" :option="option"></avue-crud>
+                <avue-crud id="out-table" :data="data" :option="option">
+                    <template slot="mblno" slot-scope="{ row }">
+                        <span style="color: #1e9fff;cursor: pointer;" @click="rowJump(row)">{{ row.mblno }}</span>
+                    </template>
+                </avue-crud>
             </div>
         </el-card>
     </div>
@@ -27,25 +31,32 @@ export default {
                 header: false,
                 border: true,
                 stripe: true,
-
                 menu: false,
                 align: 'center',
                 column: [
                     {
+                        label: '客户',
+                        prop: 'corpName',
+                        overHidden: true,
+                    },
+                    {
                         label: '提单号',
                         prop: 'mblno',
                         overHidden: true,
-                    }, {
-                        label: '客户',
-                        prop: 'corpName',
+                    },
+                    {
+                        label: '箱号',
+                        prop: 'boxNo',
                         overHidden: true,
-                    }, {
+                    },
+                    {
                         label: '到港日期',
                         prop: 'eta',
                         overHidden: true,
-                    }, {
-                        label: '免箱天数',
-                        prop: 'iqNo',
+                    },
+                    {
+                        label: '应还箱日期',
+                        prop: 'shouldBeReturnedDate',
                         overHidden: true,
                     }
                 ]
@@ -71,7 +82,23 @@ export default {
             })
         },
         // 获取数据
-
+        rowJump(row) {
+            if (this.$store.getters.oceanFreightStatus) {
+                this.$alert("海运进口(T)页面已存在,请关闭海运出口再进行操作", "温馨提示", {
+                    confirmButtonText: "确定",
+                    type: 'warning',
+                    callback: action => {
+                    }
+                });
+            } else {
+                this.$router.push({
+                    path: '/tradeAgency/oceanFreightImport/index',
+                    query: {
+                        id: row.id
+                    },
+                })
+            }
+        },
     }
 }
 </script>
@@ -94,6 +121,7 @@ export default {
 .el-table--small th {
     padding: 2px !important;
 }
+
 .home-container {
     padding: 0px 5px 5px 0px;
     box-sizing: border-box;

src/views/wel/components/losAssembly/IosDeposit.vue

@@ -6,7 +6,11 @@
                 <i class="el-icon-refresh-right" style="cursor: pointer;font-size:20px" @click="refresh"></i>
             </div>
             <div class="content" v-loading="loading">
-                <avue-crud id="out-table" :data="data" :option="option"></avue-crud>
+                <avue-crud id="out-table" :data="data" :option="option">
+                    <template slot="mblno" slot-scope="{ row }">
+                        <span style="color: #1e9fff;cursor: pointer;" @click="rowJump(row)">{{ row.mblno }}</span>
+                    </template>
+                </avue-crud>
             </div>
         </el-card>
     </div>
@@ -32,18 +36,35 @@ export default {
                 align: 'center',
                 column: [
                     {
+                        label: '客户',
+                        prop: 'corpName',
+                        overHidden: true,
+                    },
+                    {
                         label: '提单号',
                         prop: 'mblno',
                         overHidden: true,
-                    }, {
-                        label: '客户',
-                        prop: 'corpName',
+                    },
+                    {
+                        label: '箱号',
+                        prop: 'boxNo',
                         overHidden: true,
-                    }, {
+                    },
+                    {
                         label: '到港日期',
                         prop: 'eta',
                         overHidden: true,
-                    }
+                    },
+                    {
+                        label: '还箱日期',
+                        prop: 'returnDate',
+                        overHidden: true,
+                    },
+                    {
+                        label: '应退押日期',
+                        prop: 'withdrawalReminderDate',
+                        overHidden: true,
+                    },
                 ]
             }
         }
@@ -67,14 +88,29 @@ export default {
             })
         },
         // 获取数据
-
+        rowJump(row) {
+            if (this.$store.getters.oceanFreightStatus) {
+                this.$alert("海运进口(T)页面已存在,请关闭海运出口再进行操作", "温馨提示", {
+                    confirmButtonText: "确定",
+                    type: 'warning',
+                    callback: action => {
+                    }
+                });
+            } else {
+                this.$router.push({
+                    path: '/tradeAgency/oceanFreightImport/index',
+                    query: {
+                        id: row.id
+                    },
+                })
+            }
+        },
     }
 }
 </script>
 
 
 <style lang="scss" scoped>
-
 ::v-deep#out-table .back-one {
     background: #ecf5ff !important;
     text-align: center;
@@ -91,6 +127,7 @@ export default {
 .el-table--small th {
     padding: 2px !important;
 }
+
 .home-container {
     padding: 0px 5px 5px 0px;
     box-sizing: border-box;