修改bug

src/api/tradeAgency/exchangePurchasing.js

@@ -14,7 +14,7 @@ export const getList = (current, size, params) => {
 //贸易代理明细
 export const getDetail = (data) => {
     return request({
-        url: '/api/blade-los/agent/detail',
+        url: '/api/blade-los/agent/detailStl',
         method: 'get',
         params: data
     })
@@ -71,7 +71,7 @@ export const remove = (data) => {
 //单据请核
 export const checkAgent = (data) => {
     return request({
-        url: '/api/blade-los/agent/checkAgent',
+        url: '/api/blade-los/agent/applyForPayment',
         method: 'post',
         data: data
     })
@@ -79,7 +79,7 @@ export const checkAgent = (data) => {
 //撤销单据请核
 export const revokeCheckAgent = (data) => {
     return request({
-        url: '/api/blade-los/agent/revokeCheckAgent',
+        url: '/api/blade-los/agent/revokeApplyForPayment',
         method: 'post',
         data: data
     })

src/api/tradeAgency/oceanFreightImport.js

@@ -198,3 +198,19 @@ export const detailTradeByMblno= (data) => {
         params: data
     })
 }
+//同步增值税或关税
+export const synchronization = (data) => {
+    return request({
+        url: '/api/blade-los/tradebills/synchronization',
+        method: 'get',
+        params: data
+    })
+}
+//计算仓储单价
+export const calculationWarehouseUnitPrice= (data) => {
+    return request({
+        url: '/api/blade-los/inoutstorage/calculationWarehouseUnitPrice',
+        method: 'post',
+        data: data
+    })
+}

src/api/tradeAgency/tradeAgency.js

@@ -165,4 +165,12 @@ export const generate = (data) => {
         method: 'post',
         data: data
     })
+}
+//同步增值税或关税
+export const synchronization = (data) => {
+    return request({
+        url: '/api/blade-los/tradebills/synchronization',
+        method: 'get',
+        params: data
+    })
 }

src/components/tradeAgency/fee-info.vue

@@ -72,8 +72,8 @@
                 <span v-else>{{ row.exrate }}</span>
             </tempalte>
             <tempalte slot="stlExrate" slot-scope="{ row }">
-                <el-input-number v-if="row.$cellEdit" v-model="row.stlExrate" :controls="false"
-                    placeholder="请输入 结算汇率" size="small" style="width: 100%;"></el-input-number>
+                <el-input-number v-if="row.$cellEdit" v-model="row.stlExrate" :controls="false" placeholder="请输入 结算汇率"
+                    size="small" style="width: 100%;"></el-input-number>
                 <span v-else>{{ row.stlExrate }}</span>
             </tempalte>
         </avue-crud>
@@ -150,8 +150,8 @@
                 <span v-else>{{ row.exrate }}</span>
             </tempalte>
             <tempalte slot="stlExrate" slot-scope="{ row }">
-                <el-input-number v-if="row.$cellEdit" v-model="row.stlExrate" :controls="false"
-                    placeholder="请输入 结算汇率" size="small" style="width: 100%;"></el-input-number>
+                <el-input-number v-if="row.$cellEdit" v-model="row.stlExrate" :controls="false" placeholder="请输入 结算汇率"
+                    size="small" style="width: 100%;"></el-input-number>
                 <span v-else>{{ row.stlExrate }}</span>
             </tempalte>
         </avue-crud>
@@ -393,7 +393,7 @@ export default {
                     pid: this.form.id,
                     dc: type,
                     accStatus: 0,
-                    businessType: 'MYDL',
+                    businessType: this.form.businessType,
                     billNo: this.form.businessNo,
                     billDate: this.form.businessDate
                 })
@@ -404,7 +404,7 @@ export default {
                     pid: this.form.id,
                     dc: type,
                     accStatus: 0,
-                    businessType: 'MYDL',
+                    businessType: this.form.businessType,
                     billNo: this.form.businessNo,
                     billDate: this.form.businessDate
                 })
@@ -442,6 +442,10 @@ export default {
                     el.feeCode = row.code
                     el.feeEnName = row.enName
                     el.curCode = row.curNo
+                    el.elementsId = row.accElementId
+                    el.elementsCode = row.elementsCode
+                    el.elementsCnName = row.accElementName
+                    el.elementsEnName = row.elementsEnName
                     bcurrencyGetExrate({ date: this.form.contractDate, dc: el.dc }).then(res => {
                         res.data.data.forEach(e => {
                             if (row.curNo == e.code) {
@@ -454,6 +458,10 @@ export default {
                     el.feeCode = null
                     el.feeEnName = null
                     el.curCode = null
+                    el.elementsId = null
+                    el.elementsCode = null
+                    el.elementsCnName = null
+                    el.elementsEnName = null
                 }
             }
             if (name == 'curCode') {

src/components/tradeAgency/fee-infosimple.vue

@@ -1,17 +1,18 @@
 <template>
     <div>
-        <avue-crud :option="optionD" :table-loading="loading" :data="form.feeCenterListD" id="out-table" ref="crudD"
-            @selection-change="selectionDChange" @resetColumn="resetColumn('crudD', 'optionD', 'optionDBack', 385)"
+        <avue-crud v-if="feeType == 'D' || feeType == 'All'" :option="optionD" :table-loading="loading"
+            :data="form.feeCenterListD" id="out-table" ref="crudD" @selection-change="selectionDChange"
+            @resetColumn="resetColumn('crudD', 'optionD', 'optionDBack', 385)"
             @saveColumn="saveColumn('crudD', 'optionD', 'optionDBack', 385)">
             <template slot="menuLeft">
                 <div style="display: inline-block;margin-right: 20px" class="disabledBox fontSize">
                     <i class="el-icon-coin"></i>
                     <span>应收费用</span>
                 </div>
-                <el-button type="success" plain size="small" :disabled="disabled"
+                <!-- <el-button type="success" plain size="small" :disabled="disabled"
                     @click="allClick('确认首款', 'D')">确认首款</el-button>
                 <el-button type="primary" plain size="small" :disabled="disabled"
-                    @click="allClick('确认尾款', 'D')">确认尾款</el-button>
+                    @click="allClick('确认尾款', 'D')">确认尾款</el-button> -->
             </template>
             <template slot="index" slot-scope="{row,index}">
                 <span>{{ index + 1 }}</span>
@@ -56,14 +57,14 @@
                 <span v-else>{{ row.exrate }}</span>
             </tempalte>
             <tempalte slot="stlExrate" slot-scope="{ row }">
-                <el-input-number v-if="row.$cellEdit" v-model="row.stlExrate" :controls="false"
-                    placeholder="请输入 结算汇率" size="small" style="width: 100%;"></el-input-number>
+                <el-input-number v-if="row.$cellEdit" v-model="row.stlExrate" :controls="false" placeholder="请输入 结算汇率"
+                    size="small" style="width: 100%;"></el-input-number>
                 <span v-else>{{ row.stlExrate }}</span>
             </tempalte>
         </avue-crud>
-        <avue-crud style="margin-top: 10px;" :option="optionC" :table-loading="loading" :data="form.feeCenterListC"
-            id="out-table" ref="crudC" @selection-change="selectionCChange"
-            @resetColumn="resetColumn('crudC', 'optionC', 'optionCBack', 386)"
+        <avue-crud v-if="feeType == 'C' || feeType == 'All'" style="margin-top: 10px;" :option="optionC"
+            :table-loading="loading" :data="form.feeCenterListC" id="out-table" ref="crudC"
+            @selection-change="selectionCChange" @resetColumn="resetColumn('crudC', 'optionC', 'optionCBack', 386)"
             @saveColumn="saveColumn('crudC', 'optionC', 'optionCBack', 386)">
             <template slot="menuLeft">
                 <div style="display: inline-block;margin-right: 20px" class="disabledBox fontSize">
@@ -76,10 +77,10 @@
                     @click="allClick('一键编辑', 'C')">一键编辑</el-button>
                 <el-button type="danger" plain size="small" :disabled="disabled || selectionCList.length == 0"
                     @click="allClick('批量删除', 'C')">批量删除</el-button>
-                <el-button type="success" plain size="small" :disabled="disabled"
+                <!-- <el-button type="success" plain size="small" :disabled="disabled"
                     @click="allClick('确认首款', 'C')">确认首款</el-button>
                 <el-button type="primary" plain size="small" :disabled="disabled"
-                    @click="allClick('确认尾款', 'C')">确认尾款</el-button>
+                    @click="allClick('确认尾款', 'C')">确认尾款</el-button> -->
             </template>
             <template slot="indexHeader" slot-scope="{row,index}">
                 <el-button type="primary" size="mini" icon="el-icon-plus" :disabled="disabled" circle @click="addRow('C')">
@@ -139,7 +140,7 @@
 <script>
 import dicSelect from "@/components/dicSelect/main";
 import { bcurrencyGetExrate } from "@/api/iosBasicData/rateManagement";
-import { submitListTrade, feeRemove, confirmCollectionOfPayments, confirmThePayment, confirmReceived } from "@/api/tradeAgency//exchangePurchasing";
+import { submitListTrade, feeRemove, confirmCollectionOfPayments, confirmThePayment, confirmReceived } from "@/api/tradeAgency/exchangePurchasing";
 import _ from "lodash";
 export default {
     components: {
@@ -151,6 +152,10 @@ export default {
             type: Boolean,
             default: false,
         },
+        feeType: {
+            type: String,
+            default: 'All'
+        },
         form: {
             type: Object,
             default: () => {
@@ -189,6 +194,19 @@ export default {
                         }]
                     },
                     {
+                        label: "收费状态",
+                        prop: "stlStatus",
+                        width: '120',
+                        overHidden: true,
+                        dicData: [{
+                            label: '未确认',
+                            value: 0
+                        }, {
+                            label: '已确认',
+                            value: 1
+                        }]
+                    },
+                    {
                         label: "往来单位",
                         prop: "corpCnName",
                         width: '160',
@@ -248,18 +266,6 @@ export default {
                         width: '200',
                         overHidden: true,
                     },
-                    {
-                        label: "收费",
-                        prop: "stlStatus",
-                        overHidden: true,
-                        dicData: [{
-                            label: '未确认',
-                            value: 0
-                        }, {
-                            label: '已确认',
-                            value: 1
-                        }]
-                    },
                 ]
             },
             optionC: {},
@@ -298,6 +304,19 @@ export default {
                         }]
                     },
                     {
+                        label: "付费状态",
+                        prop: "stlStatus",
+                        width: '120',
+                        overHidden: true,
+                        dicData: [{
+                            label: '未确认',
+                            value: 0
+                        }, {
+                            label: '已确认',
+                            value: 1
+                        }]
+                    },
+                    {
                         label: "往来单位",
                         prop: "corpCnName",
                         width: '160',
@@ -357,18 +376,6 @@ export default {
                         width: '200',
                         overHidden: true,
                     },
-                    {
-                        label: "收费",
-                        prop: "stlStatus",
-                        overHidden: true,
-                        dicData: [{
-                            label: '未确认',
-                            value: 0
-                        }, {
-                            label: '已确认',
-                            value: 1
-                        }]
-                    },
                 ]
             },
             selectionDList: [],
@@ -388,7 +395,7 @@ export default {
                     pid: this.form.id,
                     dc: type,
                     accStatus: 0,
-                    businessType: 'MYDL',
+                    businessType: this.form.businessType,
                     billNo: this.form.businessNo,
                     billDate: this.form.businessDate
                 })
@@ -426,6 +433,10 @@ export default {
                     el.feeCode = row.code
                     el.feeEnName = row.enName
                     el.curCode = row.curNo
+                    el.elementsId = row.accElementId
+                    el.elementsCode = row.elementsCode
+                    el.elementsCnName = row.accElementName
+                    el.elementsEnName = row.elementsEnName
                     bcurrencyGetExrate({ date: this.form.contractDate, dc: el.dc }).then(res => {
                         res.data.data.forEach(e => {
                             if (row.curNo == e.code) {
@@ -438,6 +449,10 @@ export default {
                     el.feeCode = null
                     el.feeEnName = null
                     el.curCode = null
+                    el.elementsId = null
+                    el.elementsCode = null
+                    el.elementsCnName = null
+                    el.elementsEnName = null
                 }
             }
             if (name == 'curCode') {
@@ -460,9 +475,17 @@ export default {
                     this.form.feeCenterListC.forEach(e => {
                         this.$set(e, '$cellEdit', false)
                     })
+                    const loading = this.$loading({
+                        lock: true,
+                        text: '加载中',
+                        spinner: 'el-icon-loading',
+                        background: 'rgba(255,255,255,0.7)'
+                    });
                     submitListTrade(this.form.feeCenterListC).then(res => {
                         this.form.feeCenterListC = res.data.data
                         this.$message.success("保存成功");
+                    }).finally(() => {
+                        loading.close();
                     })
                 }
             }

src/components/tradeAgency/fee-oceanFreight.vue

@@ -18,6 +18,9 @@
                     @click="allClick('生成账单', 'D')">生成账单</el-button>
                 <el-button type="danger" plain size="small" :disabled="disabled || selectionDList.length == 0"
                     @click="allClick('撤销账单', 'D')">撤销账单</el-button>
+                <el-button type="primary" plain size="small" :disabled="disabled"
+                    @click="allClick('增值税', 'D')">增值税</el-button>
+                <el-button type="danger" plain size="small" :disabled="disabled" @click="allClick('关税', 'D')">关税</el-button>
                 <!-- <el-button type="primary" plain size="small" :disabled="disabled"
                     @click="allClick('打印账单', 'D')">打印账单</el-button>
                 <el-button type="success" plain size="small" :disabled="disabled"
@@ -72,8 +75,8 @@
                 <span v-else>{{ row.exrate }}</span>
             </tempalte>
             <tempalte slot="stlExrate" slot-scope="{ row }">
-                <el-input-number v-if="row.$cellEdit" v-model="row.stlExrate" :controls="false"
-                    placeholder="请输入 结算汇率" size="small" style="width: 100%;"></el-input-number>
+                <el-input-number v-if="row.$cellEdit" v-model="row.stlExrate" :controls="false" placeholder="请输入 结算汇率"
+                    size="small" style="width: 100%;"></el-input-number>
                 <span v-else>{{ row.stlExrate }}</span>
             </tempalte>
         </avue-crud>
@@ -150,8 +153,8 @@
                 <span v-else>{{ row.exrate }}</span>
             </tempalte>
             <tempalte slot="stlExrate" slot-scope="{ row }">
-                <el-input-number v-if="row.$cellEdit" v-model="row.stlExrate" :controls="false"
-                    placeholder="请输入 结算汇率" size="small" style="width: 100%;"></el-input-number>
+                <el-input-number v-if="row.$cellEdit" v-model="row.stlExrate" :controls="false" placeholder="请输入 结算汇率"
+                    size="small" style="width: 100%;"></el-input-number>
                 <span v-else>{{ row.stlExrate }}</span>
             </tempalte>
         </avue-crud>
@@ -161,8 +164,8 @@
 <script>
 import dicSelect from "@/components/dicSelect/main";
 import { bcurrencyGetExrate } from "@/api/iosBasicData/rateManagement";
-import { submitListTrade, feeRemove, generateBill, revokeBill } from "@/api/tradeAgency/tradeAgency";
-import { defaultDate} from "@/util/date";
+import { submitListTrade, feeRemove, generateBill, revokeBill, synchronization } from "@/api/tradeAgency/tradeAgency";
+import { defaultDate } from "@/util/date";
 
 import _ from "lodash";
 export default {
@@ -183,7 +186,7 @@ export default {
     },
     data() {
         return {
-            defaultDate:defaultDate(new Date()),
+            defaultDate: defaultDate(new Date()),
             optionD: {},
             optionDBack: {
                 height: 'auto',
@@ -426,7 +429,7 @@ export default {
                     pid: this.form.id,
                     dc: type,
                     accStatus: 0,
-                    businessType: 'MYDL',
+                    businessType: this.form.businessType,
                     billNo: this.form.businessNo,
                     billDate: this.form.businessDate
                 })
@@ -437,7 +440,7 @@ export default {
                     pid: this.form.id,
                     dc: type,
                     accStatus: 0,
-                    businessType: 'MYDL',
+                    businessType: this.form.businessType,
                     billNo: this.form.businessNo,
                     billDate: this.form.businessDate
                 })
@@ -475,6 +478,10 @@ export default {
                     el.feeCode = row.code
                     el.feeEnName = row.enName
                     el.curCode = row.curNo
+                    el.elementsId=row.accElementId
+                    el.elementsCode=row.elementsCode
+                    el.elementsCnName=row.accElementName
+                    el.elementsEnName=row.elementsEnName
                     bcurrencyGetExrate({ date: this.form.contractDate, dc: el.dc }).then(res => {
                         res.data.data.forEach(e => {
                             if (row.curNo == e.code) {
@@ -487,6 +494,10 @@ export default {
                     el.feeCode = null
                     el.feeEnName = null
                     el.curCode = null
+                    el.elementsId=null
+                    el.elementsCode=null
+                    el.elementsCnName=null
+                    el.elementsEnName=null
                 }
             }
             if (name == 'curCode') {
@@ -636,6 +647,12 @@ export default {
                         if (this.selectionDList[index].accStatus != 0) {
                             return this.$message.error("已生成账单");
                         }
+                        if (this.selectionDList[index].whetherSynchronizationZzs == 1) {
+                            return this.$message.error("增值税已同步，不能生成账单");
+                        }
+                        if (this.selectionDList[index].whetherSynchronizationTariff == 1) {
+                            return this.$message.error("关税已同步，不能生成账单");
+                        }
                     }
                     this.$confirm("确定将选择数据生成账单?", {
                         confirmButtonText: "确定",
@@ -735,7 +752,48 @@ export default {
                         })
                     })
                 }
-
+            }
+            if (name == '增值税') {
+                if (type == 'D') {
+                    let obj = {}
+                    obj = {
+                        id: this.form.id,
+                        type: 1
+                    }
+                    const loading = this.$loading({
+                        lock: true,
+                        text: '加载中',
+                        spinner: 'el-icon-loading',
+                        background: 'rgba(255,255,255,0.7)'
+                    });
+                    synchronization(obj).then(res => {
+                        this.$message.success("操作成功");
+                        this.$emit('getDetails', this.form.id)
+                    }).finally(() => {
+                        loading.close();
+                    })
+                }
+            }
+            if (name == '关税') {
+                if (type == 'D') {
+                    let obj = {}
+                    obj = {
+                        id: this.form.id,
+                        type: 2
+                    }
+                    const loading = this.$loading({
+                        lock: true,
+                        text: '加载中',
+                        spinner: 'el-icon-loading',
+                        background: 'rgba(255,255,255,0.7)'
+                    });
+                    synchronization(obj).then(res => {
+                        this.$message.success("操作成功");
+                        this.$emit('getDetails', this.form.id)
+                    }).finally(() => {
+                        loading.close();
+                    })
+                }
             }
         },
         //自定义列保存

src/router/views/index.js

@@ -3619,7 +3619,7 @@ export default [{
   hidden: true,
   children: [{
     path: '/tradeAgency/exchangePurchasing/index',
-    name: '购汇付汇',
+    name: '付费申请(T)',
     meta: {
       i18n: '/tradeAgency/exchangePurchasing/index',
       keepAlive: true,
@@ -3628,6 +3628,20 @@ export default [{
   }]
 },
 {
+  path: '/tradeAgency/firstSettlement/index',
+  component: Layout,
+  hidden: true,
+  children: [{
+    path: '/tradeAgency/firstSettlement/index',
+    name: '收款结算(T)',
+    meta: {
+      i18n: '/tradeAgency/firstSettlement/index',
+      keepAlive: true,
+    },
+    component: () => import( /* webpackChunkName: "views" */ '@/views/tradeAgency/firstSettlement/index')
+  }]
+},
+{
   path: '/tradeAgency/oceanFreightImport/index',
   component: Layout,
   hidden: true,

src/views/tradeAgency/exchangePurchasing/detailsPage.vue

@@ -7,12 +7,31 @@
                 </el-button>
             </div>
             <div class="add-customer-btn">
+                <el-button v-if="!editDisabled" class="el-button--small-yh" type="success" size="small"
+                    :disabled="isSaveBtn || form.firstStatus != '审核通过'||form.orderStatus=='已结算'" @click="submitFee">确认付款
+                </el-button>
+                <el-button v-if="!editDisabled" class="el-button--small-yh" type="danger" size="small"
+                    :disabled="isSaveBtn || form.firstStatus != '审核通过'" @click="revokeApplication">撤销申请付款
+                </el-button>
+                <el-button v-if="!editDisabled" class="el-button--small-yh" type="warning" size="small"
+                    :disabled="isSaveBtn || form.firstStatus == '审核通过'" @click="application">申请付款请核
+                </el-button>
                 <el-button class="el-button--small-yh" style="margin-left: 6px;" type="primary" size="small"
                     v-if="editDisabled" @click="inEdit">编 辑
                 </el-button>
                 <el-button class="el-button--small-yh" v-else style="margin-left: 6px;" type="primary" size="small"
                     :disabled="isSaveBtn" @click="submit">保 存
                 </el-button>
+                <el-dropdown style="line-height: 0">
+                    <el-button class="el-button--small-yh" style="margin-left: 6px;" type="warning" :disabled="!form.id"
+                        size="small">
+                        审 批<i class="el-icon-arrow-down el-icon--right"></i>
+                    </el-button>
+                    <el-dropdown-menu slot="dropdown">
+                        <el-dropdown-item @click.native="checkScheduleDialog = true, checkId = form.id">审核进度
+                        </el-dropdown-item>
+                    </el-dropdown-menu>
+                </el-dropdown>
             </div>
         </div>
         <div style="margin-top: 50px">
@@ -20,34 +39,44 @@
                 <avue-form :option="optionForm" v-model="form" ref="form">
                 </avue-form>
             </trade-card>
-            <trade-card title="货物明细">
+            <!-- <trade-card title="货物明细">
                 <avue-crud :option="option" :data="form.agentItemsList" id="out-table" ref="crud"
                     @selection-change="selectionChange" @resetColumn="resetColumn('crud', 'option', 'optionBack', 384)"
                     @saveColumn="saveColumn('crud', 'option', 'optionBack', 384)">
                     <template slot="menuLeft">
                     </template>
                 </avue-crud>
-            </trade-card>
+            </trade-card> -->
             <trade-card title="费用明细">
-                <fee-infosimple :form="form" :disabled="editDisabled" @getDetails="getDetails"></fee-infosimple>
+                <fee-infosimple feeType="C" :form="form" :disabled="editDisabled || form.firstStatus == '审核通过'"
+                    @getDetails="getDetails"></fee-infosimple>
             </trade-card>
-            <containerTitle title="上传附件"></containerTitle>
+            <!-- <containerTitle title="上传附件"></containerTitle>
             <c-upload :data="form.filesCenterList" :enumerationValue="76"
-                deleteUrl="/blade-purchase-sales/orderfiles/update" display :disabled="editDisabled"></c-upload>
+                deleteUrl="/blade-purchase-sales/orderfiles/update" display :disabled="editDisabled"></c-upload> -->
+            <!--审核弹窗-->
+            <el-dialog append-to-body title="审批进度" class="el-dialogDeep" :visible.sync="checkScheduleDialog" width="40%"
+                :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>
         </div>
     </div>
 </template>
 
 <script>
-import { submit, getDetail} from "@/api/tradeAgency/exchangePurchasing";
+import { submit, getDetail, checkAgent, revokeCheckAgent, confirmThePayment, confirmReceived } from "@/api/tradeAgency/exchangePurchasing";
 import feeInfosimple from "@/components/tradeAgency/fee-infosimple";
 import dicSelect from "@/components/dicSelect/main";
+import checkSchedule from "@/components/checkH/checkSchedule.vue";
 import _ from "lodash";
 export default {
     name: "detailsPage",
 
     data() {
         return {
+            checkId: '', // 审核需要的id
+            batchNo: '',
+            checkScheduleDialog: false, // 审核弹窗
             editDisabled: false,
             form: {},
             optionForm: {
@@ -58,26 +87,16 @@ export default {
                     {
                         label: '客户',
                         prop: "corpName",
-                        disabled: false,
-                        rules: [{
-                            required: true,
-                            message: " ",
-                            trigger: "blur"
-                        }]
+                        disabled: false
                     },
                     {
-                        label: '合同号',
-                        prop: "contractNo",
+                        label: '业务号',
+                        prop: "businessNo",
                         disabled: false,
-                        rules: [{
-                            required: true,
-                            message: " ",
-                            trigger: "blur"
-                        }]
                     },
                     {
-                        label: '合同日期',
-                        prop: "contractDate",
+                        label: '业务日期',
+                        prop: "businessDate",
                         type: "date",
                         format: "yyyy-MM-dd",
                         valueFormat: "yyyy-MM-dd 00:00:00",
@@ -89,127 +108,18 @@ export default {
                         }]
                     },
                     {
-                        label: '原产地',
-                        prop: "countryOfOrigin",
-                        disabled: false,
-                    },
-                    {
-                        label: '运输方式',
-                        prop: "typeOfShipping",
-                        disabled: false,
-                        rules: [{
-                            required: true,
-                            message: " ",
-                            trigger: "blur"
-                        }]
-                    },
-                    {
-                        label: '起运港',
-                        prop: "polCnName",
-                        disabled: false,
-                    },
-                    {
-                        label: '目的港',
-                        prop: "podCnName",
-                        disabled: false,
-                    },
-                    {
-                        label: '币别',
-                        prop: "currency",
-                        disabled: false,
-                        rules: [{
-                            required: true,
-                            message: " ",
-                            trigger: "blur"
-                        }]
-                    },
-                    {
-                        label: '外国发货人',
-                        prop: "abroadConsignorCname",
-                        disabled: false,
-                    },
-                    {
-                        label: '银行助记码',
-                        prop: "abroadBankMnemonicCode",
-                        disabled: false,
-                    },
-                    {
-                        label: '银行',
-                        prop: "abroadBank",
-                        disabled: false,
-                    },
-                    {
-                        label: '币别',
-                        prop: "abroadCurrency",
-                        disabled: false,
-                    },
-                    {
-                        label: '国内收货人',
-                        prop: "domesticConsigneeCname",
-                        disabled: false,
-                    },
-                    {
-                        label: '银行助记码',
-                        prop: "domesticBankMnemonicCode",
-                        disabled: false,
-                    },
-                    {
-                        label: '银行',
-                        prop: "domesticBank",
-                        disabled: false,
-                    },
-                    {
-                        label: '币别',
-                        prop: "domesticCurrency",
-                        disabled: false,
-                    },
-                    {
-                        label: '货值',
+                        label: '金额',
                         prop: "goodsValue",
                         disabled: false,
                     },
                     {
-                        label: '预付比例',
-                        prop: "advanceRatio",
-                        disabled: false,
-                        rules: [{
-                            required: true,
-                            message: " ",
-                            trigger: "blur"
-                        }]
-                    },
-                    {
-                        label: '预付金额',
-                        prop: "prepaidAmount",
-                        disabled: false,
-                        rules: [{
-                            required: true,
-                            message: " ",
-                            trigger: "blur"
-                        }]
-                    },
-                    {
-                        label: '单据类型',
-                        prop: "documentType",
-                        disabled: false,
-                    },
-                    {
-                        label: '所属公司',
-                        prop: "affiliatedCompanyName",
-                        disabled: false,
-                    },
-                    {
-                        label: '业务员',
-                        prop: "srcCnName",
-                        disabled: false,
-                    },
-                    {
                         label: '备注',
                         prop: "remarks",
                         type: 'textarea',
+                        span: 24,
                         disabled: false,
                         minRows: 2,
-                    },
+                    }
                 ]
             },
             option: {},
@@ -223,7 +133,7 @@ export default {
                 viewBtn: false,
                 editBtn: false,
                 delBtn: false,
-                menu:false,
+                menu: false,
                 refreshBtn: false,
                 align: 'center',
                 column: [
@@ -309,7 +219,8 @@ export default {
     },
     components: {
         dicSelect,
-        feeInfosimple
+        feeInfosimple,
+        checkSchedule
     },
     props: {
         detailData: Object
@@ -359,6 +270,88 @@ export default {
                 }
             });
         },
+        submitFee() {
+            confirmReceived(this.form).then(res => {
+                this.$confirm(res.data.data+'?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(() => {
+                    const loading = this.$loading({
+                        lock: true,
+                        text: '加载中',
+                        spinner: 'el-icon-loading',
+                        background: 'rgba(255,255,255,0.7)'
+                    });
+
+                    confirmThePayment(this.form).then(res => {
+                        this.getDetails(res.data.data.id)
+                        this.$message.success("确认成功");
+                    }).finally(() => {
+                        loading.close();
+                    })
+
+                })
+            })
+
+        },
+        application() {
+            this.$confirm("确定请核数据?", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning"
+            }).then(() => {
+                let obj = {}
+                obj = {
+                    id: this.form.id,
+                    url: '/tradeAgency/exchangePurchasing/index',
+                    pageStatus: '',
+                    pageLabel: '付费申请(T)',
+                }
+                const loading = this.$loading({
+                    lock: true,
+                    text: '加载中',
+                    spinner: 'el-icon-loading',
+                    background: 'rgba(255,255,255,0.7)'
+                });
+                checkAgent(obj).then(res => {
+                    this.$message.success("请核成功");
+                    this.getDetails(res.data.data.id)
+                }).finally(() => {
+                    loading.close();
+                })
+            });
+        },
+        revokeApplication() {
+            this.$confirm("确定撤销请核?", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning"
+            }).then(() => {
+                let obj = {}
+                obj = {
+                    id: this.form.id,
+                }
+                const loading = this.$loading({
+                    lock: true,
+                    text: '加载中',
+                    spinner: 'el-icon-loading',
+                    background: 'rgba(255,255,255,0.7)'
+                });
+                revokeCheckAgent(obj).then(res => {
+                    this.$message.success("撤销请核成功");
+                    this.getDetails(res.data.data.id)
+                    this.editDisabled = false
+                    this.optionForm.disabled = false
+                }).finally(() => {
+                    loading.close();
+                })
+            });
+        },
+        //请核关闭
+        choceScheduleFun() {
+            this.checkScheduleDialog = false
+        },
         //自定义列保存
         async saveColumn(ref, option, optionBack, code) {
             const inSave = await this.saveColumnData(this.getColumnName(code), this[option]);

src/views/tradeAgency/exchangePurchasing/index.vue

@@ -1,4 +1,4 @@
-购汇付汇<template>
+<template>
     <div>
         <basic-container v-if="isShow">
             <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" :search.sync="query"
@@ -10,8 +10,8 @@
                 <template slot="menu" slot-scope="{ row, index }">
                     <el-button size="small" icon="el-icon-edit" type="text" @click="rowEdit(row)">编辑</el-button>
                 </template>
-                <template slot="contractNo" slot-scope="{ row }">
-                    <span style="color: #1e9fff" @click="rowEdit(row)">{{ row.contractNo }}</span>
+                <template slot="businessNo" slot-scope="{ row }">
+                    <span style="color: #1e9fff" @click="rowEdit(row)">{{ row.businessNo }}</span>
                 </template>
             </avue-crud>
         </basic-container>
@@ -29,12 +29,15 @@ export default {
             detailData: {},
             isShow: true,
             form: {},
-            query: { },
+            query: {
+                businessType: 'MYDL-STL',
+                dc: 'C'
+            },
             loading: false,
             page: {
                 pageSize: 10,
                 currentPage: 1,
-                total: 0
+                total: 0,
             },
             selectionList: [],
             option: {},
@@ -43,7 +46,7 @@ export default {
                 calcHeight: 30,
                 menuWidth: 80,
                 searchShow: true,
-                searchMenuSpan: 18,
+                searchMenuSpan: 12,
                 border: true,
                 index: true,
                 addBtn: false,
@@ -53,10 +56,9 @@ export default {
                 searchIcon: true,
                 searchIndex: 3,
                 column: [
-                    {
+                {
                         label: "客户名称",
                         prop: "corpName",
-                        width: "120",
                         overHidden: true,
                         search: true,
                         type: 'select',
@@ -71,185 +73,28 @@ export default {
                         searchOrder: 1,
                     },
                     {
-                        label: "合同号",
-                        prop: "contractNo",
-                        width: "80",
+                        label: "业务号",
+                        prop: "businessNo",
                         overHidden: true,
                         search: true,
                         searchOrder: 2,
                     },
                     {
-                        label: "合同日期",
-                        prop: "contractDate",
+                        label: "业务日期",
+                        prop: "businessDate",
                         type: "date",
                         format: "yyyy-MM-dd",
                         valueFormat: "yyyy-MM-dd 00:00:00",
-                        width: "120",
-                        overHidden: true
-                    },
-                    {
-                        label: "订单状态",
-                        prop: "orderStatus",
-                        width: "120",
-                        overHidden: true,
-                    },
-                    {
-                        label: "国家",
-                        prop: "country",
-                        width: "80",
-                        overHidden: true
-                    },
-                    {
-                        label: "运输方式",
-                        prop: "typeOfShipping",
-                        width: "120",
-                        overHidden: true
-                    },
-                    {
-                        label: "起运港",
-                        prop: "polCnName",
-                        width: "80",
                         overHidden: true
                     },
                     {
-                        label: "目的港",
-                        prop: "podCnName",
-                        width: "80",
-                        overHidden: true
-                    },
-                    {
-                        label: "币别",
-                        prop: "currency",
-                        width: "80",
-                        overHidden: true
-                    },
-                    {
-                        label: "总金额(USD)",
-                        prop: "amount",
-                        width: "100",
-                        overHidden: true
-                    },
-                    {
-                        label: "预付比例",
-                        prop: "advanceRatio",
-                        width: "120",
-                        overHidden: true
-                    },
-                    {
-                        label: "预付金额",
-                        prop: "prepaidAmount",
-                        width: "120",
-                        overHidden: true
-                    },
-                    {
-                        label: "提单号",
-                        prop: "billNo",
-                        width: "80",
-                        overHidden: true,
-                        search: true,
-                        searchOrder: 3,
-                    },
-                    {
-                        label: "订单号",
-                        prop: "orderNo",
-                        width: "80",
-                        overHidden: true,
-                        search: true,
-                        searchOrder: 8,
-                        hide: true,
-                        showColumn: false,
-                    },
-                    {
-                        label: "箱号",
-                        prop: "boxNo",
-                        width: "80",
-                        overHidden: true,
-                        search: true,
-                        searchOrder: 4,
-                    },
-                    {
                         label: "金额",
-                        prop: "amount",
-                        width: "100",
-                        overHidden: true
-                    },
-                    {
-                        label: "首付实收",
-                        prop: "downPaymentsNetReceipts",
-                        width: "120",
-                        overHidden: true
-                    },
-                    {
-                        label: "尾款实收",
-                        prop: "mblno",
-                        width: "120",
-                        overHidden: true
-                    },
-                    {
-                        label: "付汇记录",
-                        prop: "paymentRecord",
-                        width: "120",
-                        overHidden: true,
-                        search: true,
-                        searchOrder: 8,
-                        hide: true,
-                        showColumn: false,
-                    },
-                    {
-                        label: "开船日期",
-                        prop: "etd",
-                        width: "120",
+                        prop: "goodsValue",
                         overHidden: true,
-                        search: true,
-                        searchOrder: 5,
-                        searchProp: "etdList",
-                        type: "date",
-                        unlinkPanels: true,
-                        searchRange: true,
-                        format: "yyyy-MM-dd",
-                        valueFormat: "yyyy-MM-dd HH:mm:ss",
-                        searchDefaultTime: ["00:00:00", "23:59:59"],
-                        hide: true,
-                        showColumn: false,
-                    },
-                    {
-                        label: "预计到港",
-                        prop: "estimateReachHarbor",
-                        width: "120",
-                        overHidden: true,
-                        search: true,
-                        searchOrder: 6,
-                        searchProp: "estimateReachHarborList",
-                        type: "date",
-                        unlinkPanels: true,
-                        searchRange: true,
-                        format: "yyyy-MM-dd",
-                        valueFormat: "yyyy-MM-dd HH:mm:ss",
-                        searchDefaultTime: ["00:00:00", "23:59:59"],
-                        hide: true,
-                        showColumn: false,
-                    },
-                    {
-                        label: "实际到港",
-                        prop: "actualReachHarbor",
-                        width: "120",
-                        overHidden: true,
-                        search: true,
-                        searchOrder: 7,
-                        searchProp: "actualReachHarborList",
-                        type: "date",
-                        unlinkPanels: true,
-                        searchRange: true,
-                        format: "yyyy-MM-dd",
-                        valueFormat: "yyyy-MM-dd HH:mm:ss",
-                        searchDefaultTime: ["00:00:00", "23:59:59"],
-                        hide: true,
-                        showColumn: false,
                     },
                     {
                         label: "备注",
                         prop: "remarks",
-                        width: "160",
                         overHidden: true
                     }
                 ]

src/views/tradeAgency/firstSettlement/detailsPage.vue

@@ -0,0 +1,318 @@
+<template>
+    <div>
+        <div class="customer-head">
+            <div class="customer-back">
+                <el-button type="danger" style="border: none;background: none;color: red" icon="el-icon-arrow-left"
+                    @click="goBack(0)">返回列表
+                </el-button>
+            </div>
+            <div class="add-customer-btn">
+                <el-button v-if="!editDisabled" class="el-button--small-yh" type="success" size="small"
+                    :disabled="isSaveBtn||form.orderStatus=='已确认'" @click="submitFee">确认收款
+                </el-button>
+                <el-button class="el-button--small-yh" style="margin-left: 6px;" type="primary" size="small"
+                    v-if="editDisabled" @click="inEdit">编 辑
+                </el-button>
+                <el-button v-if="!editDisabled" class="el-button--small-yh" style="margin-left: 6px;" type="primary"
+                    size="small" :disabled="isSaveBtn||form.orderStatus=='已确认'" @click="submit">保 存
+                </el-button>
+            </div>
+        </div>
+        <div style="margin-top: 50px">
+            <trade-card title="基础信息">
+                <avue-form :option="optionForm" v-model="form" ref="form">
+                </avue-form>
+            </trade-card>
+            <!-- <trade-card title="货物明细">
+                <avue-crud :option="option" :data="form.agentItemsList" id="out-table" ref="crud"
+                    @selection-change="selectionChange" @resetColumn="resetColumn('crud', 'option', 'optionBack', 384)"
+                    @saveColumn="saveColumn('crud', 'option', 'optionBack', 384)">
+                    <template slot="menuLeft">
+                    </template>
+                </avue-crud>
+            </trade-card> -->
+            <trade-card title="费用明细">
+                <fee-infosimple feeType="D" :form="form" :disabled="editDisabled" @getDetails="getDetails"></fee-infosimple>
+            </trade-card>
+            <!-- <containerTitle title="上传附件"></containerTitle>
+            <c-upload :data="form.filesCenterList" :enumerationValue="76"
+                deleteUrl="/blade-purchase-sales/orderfiles/update" display :disabled="editDisabled"></c-upload> -->
+        </div>
+    </div>
+</template>
+
+<script>
+import { submit, getDetail, confirmCollectionOfPayments } from "@/api/tradeAgency/exchangePurchasing";
+import feeInfosimple from "@/components/tradeAgency/fee-infosimple";
+import dicSelect from "@/components/dicSelect/main";
+import _ from "lodash";
+export default {
+    name: "detailsPage",
+
+    data() {
+        return {
+            editDisabled: false,
+            form: {},
+            optionForm: {
+                menuBtn: false,
+                span: 8,
+                disabled: true,
+                column: [
+                    {
+                        label: '客户',
+                        prop: "corpName",
+                        disabled: false
+                    },
+                    {
+                        label: '业务号',
+                        prop: "businessNo",
+                        disabled: false,
+                    },
+                    {
+                        label: '业务日期',
+                        prop: "businessDate",
+                        type: "date",
+                        format: "yyyy-MM-dd",
+                        valueFormat: "yyyy-MM-dd 00:00:00",
+                        disabled: false,
+                        rules: [{
+                            required: true,
+                            message: " ",
+                            trigger: "blur"
+                        }]
+                    },
+                    {
+                        label: '金额',
+                        prop: "goodsValue",
+                        disabled: false,
+                    },
+                    {
+                        label: '备注',
+                        prop: "remarks",
+                        type: 'textarea',
+                        span: 24,
+                        disabled: false,
+                        minRows: 2,
+                    }
+                ]
+            },
+            option: {},
+            optionBack: {
+                height: 'auto',
+                calcHeight: 30,
+                menuWidth: 140,
+                border: true,
+                index: true,
+                addBtn: false,
+                viewBtn: false,
+                editBtn: false,
+                delBtn: false,
+                menu: false,
+                refreshBtn: false,
+                align: 'center',
+                column: [
+                    {
+                        label: "提单号",
+                        prop: "billNo",
+                        overHidden: true
+                    },
+                    {
+                        label: "箱号",
+                        prop: "boxNo",
+                        overHidden: true
+                    },
+                    {
+                        label: "铅封号",
+                        prop: "leadSealNo",
+                        overHidden: true
+                    },
+                    {
+                        label: "开船日期",
+                        prop: "etd",
+                        overHidden: true
+                    },
+                    {
+                        label: "预计到港",
+                        prop: "estimateReachHarbor",
+                        width: "120",
+                        overHidden: true
+                    },
+                    {
+                        label: "HSCODE",
+                        prop: "hsCode",
+                        overHidden: true
+                    },
+                    {
+                        label: "厂号",
+                        prop: "factoryNumber",
+                        overHidden: true
+                    },
+                    {
+                        label: "标签品名",
+                        prop: "labelProductName",
+                        overHidden: true
+                    },
+                    {
+                        label: "商品类别",
+                        prop: "goodsType",
+                        overHidden: true
+                    },
+                    {
+                        label: "件数",
+                        prop: "quantity",
+                        overHidden: true
+                    },
+                    {
+                        label: "净重(kg)",
+                        prop: "netWeight",
+                        overHidden: true
+                    },
+                    {
+                        label: "单价",
+                        prop: "price",
+                        overHidden: true
+                    },
+                    {
+                        label: "毛重(kg)",
+                        prop: "grossWeight",
+                        overHidden: true
+                    },
+                    {
+                        label: "金额",
+                        prop: "amount",
+                        overHidden: true
+                    },
+                    {
+                        label: "备注",
+                        prop: "remarks",
+                        overHidden: true
+                    }
+                ]
+            },
+        }
+    },
+    components: {
+        dicSelect,
+        feeInfosimple
+    },
+    props: {
+        detailData: Object
+    },
+    async created() {
+        this.option = await this.getColumnData(this.getColumnName(384), this.optionBack);
+        if (this.detailData.id) {
+            this.editDisabled = true
+            this.getDetails(this.detailData.id)
+        }
+    },
+    methods: {
+        getDetails(id) {
+            const loading = this.$loading({
+                lock: true,
+                text: '加载中',
+                spinner: 'el-icon-loading',
+                background: 'rgba(255,255,255,0.7)'
+            });
+            getDetail({ id: id }).then(res => {
+                this.form = res.data.data
+            }).finally(() => {
+                loading.close()
+            })
+        },
+        inEdit() {
+            this.editDisabled = false
+        },
+        submit() {
+            this.$refs["form"].validate((valid, done) => {
+                done();
+                if (valid) {
+                    const loading = this.$loading({
+                        lock: true,
+                        text: '加载中',
+                        spinner: 'el-icon-loading',
+                        background: 'rgba(255,255,255,0.7)'
+                    });
+                    submit(this.form).then(res => {
+                        this.$message.success("保存成功");
+                        this.getDetails(res.data.data.id)
+                    }).finally(() => {
+                        loading.close();
+                    })
+                } else {
+                    return false;
+                }
+            });
+        },
+        submitFee() {
+            this.$confirm('确认收费?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                const loading = this.$loading({
+                    lock: true,
+                    text: '加载中',
+                    spinner: 'el-icon-loading',
+                    background: 'rgba(255,255,255,0.7)'
+                });
+                confirmCollectionOfPayments(this.form).then(res => {
+                    this.getDetails(res.data.data.id)
+                    this.$message.success("确认成功");
+                }).finally(() => {
+                    loading.close();
+                })
+            })
+
+        },
+        //自定义列保存
+        async saveColumn(ref, option, optionBack, code) {
+            const inSave = await this.saveColumnData(this.getColumnName(code), this[option]);
+            if (inSave) {
+                this.$message.success("保存成功");
+                //关闭窗口
+                this.$refs[ref].$refs.dialogColumn.columnBox = false;
+            }
+        },
+        //自定义列重置
+        async resetColumn(ref, option, optionBack, code) {
+            this[option] = this[optionBack];
+            const inSave = await this.delColumnData(this.getColumnName(code), this[optionBack]);
+            if (inSave) {
+                this.$message.success("重置成功");
+                this.$refs[ref].$refs.dialogColumn.columnBox = false;
+            }
+        },
+        goBack(type) {
+            this.$emit("goBack", type);
+            this.$emit('updateKey')
+        },
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+::v-deep .el-form-item {
+    margin-bottom: 8px !important;
+}
+
+::v-deep .el-table .cell {
+    padding: 0 2px !important;
+
+    .el-form-item {
+        margin-bottom: 0px !important;
+    }
+
+}
+
+::v-deep .avue-crud .el-table .el-form-item__label {
+    left: -1px;
+}
+
+::v-deep#out-table .back-one {
+    background: #ecf5ff !important;
+}
+
+::v-deep#out-table .back-two {
+    background: #ecf5ff !important;
+}
+</style>

src/views/tradeAgency/firstSettlement/index.vue

@@ -0,0 +1,239 @@
+<template>
+    <div>
+        <basic-container v-if="isShow">
+            <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" :search.sync="query"
+                v-model="form" id="out-table" :header-cell-class-name="headerClassName" ref="crud" @row-del="rowDel"
+                @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
+                @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange"
+                @resetColumn="resetColumn('crud', 'option', 'optionBack', 383)"
+                @saveColumn="saveColumn('crud', 'option', 'optionBack', 383)" @on-load="onLoad">
+                <template slot="menu" slot-scope="{ row, index }">
+                    <el-button size="small" icon="el-icon-edit" type="text" @click="rowEdit(row)">编辑</el-button>
+                </template>
+                <template slot="businessNo" slot-scope="{ row }">
+                    <span style="color: #1e9fff" @click="rowEdit(row)">{{ row.businessNo }}</span>
+                </template>
+            </avue-crud>
+        </basic-container>
+        <detailsPage v-if="!isShow" :detailData="detailData" @goBack="goBack"></detailsPage>
+    </div>
+</template>
+  
+<script>
+import { getList, remove, copyAgent } from "@/api/tradeAgency/exchangePurchasing";
+import detailsPage from "./detailsPage";
+
+export default {
+    data() {
+        return {
+            detailData: {},
+            isShow: true,
+            form: {},
+            query: {
+                businessType: 'MYDL-STL',
+                dc: 'D'
+            },
+            loading: false,
+            page: {
+                pageSize: 10,
+                currentPage: 1,
+                total: 0,
+            },
+            selectionList: [],
+            option: {},
+            optionBack: {
+                height: 'auto',
+                calcHeight: 30,
+                menuWidth: 80,
+                searchShow: true,
+                searchMenuSpan: 12,
+                border: true,
+                index: true,
+                addBtn: false,
+                viewBtn: false,
+                editBtn: false,
+                delBtn: false,
+                searchIcon: true,
+                searchIndex: 3,
+                column: [
+                    {
+                        label: "客户名称",
+                        prop: "corpName",
+                        overHidden: true,
+                        search: true,
+                        type: 'select',
+                        filterable: true,
+                        remote: true,
+                        dicUrl: "/api/blade-los/bcorps/listByType?cnName={{key}}",
+                        props: {
+                            label: 'cnName',
+                            value: 'cnName',
+                            res: 'data.records'
+                        },
+                        searchOrder: 1,
+                    },
+                    {
+                        label: "业务号",
+                        prop: "businessNo",
+                        overHidden: true,
+                        search: true,
+                        searchOrder: 2,
+                    },
+                    {
+                        label: "业务日期",
+                        prop: "businessDate",
+                        type: "date",
+                        format: "yyyy-MM-dd",
+                        valueFormat: "yyyy-MM-dd 00:00:00",
+                        overHidden: true
+                    },
+                    {
+                        label: "金额",
+                        prop: "goodsValue",
+                        overHidden: true,
+                    },
+                    {
+                        label: "备注",
+                        prop: "remarks",
+                        overHidden: true
+                    }
+                ]
+            },
+            data: [],
+        };
+    },
+    components: {
+        detailsPage,
+    },
+    async created() {
+        this.option = await this.getColumnData(this.getColumnName(383), this.optionBack);
+    },
+    methods: {
+        rowEdit(row) {
+            this.detailData = {
+                id: row.id
+            };
+            this.isShow = false
+        },
+        // 编辑
+        inEdit(row) {
+        },
+        searchReset() {
+            this.query = this.$options.data().query;
+            this.onLoad(this.page);
+        },
+        // 搜索按钮点击
+        searchChange(params, done) {
+            this.page.currentPage = 1;
+            this.onLoad(this.page, this.query);
+            done();
+        },
+        selectionChange(list) {
+            this.selectionList = list;
+        },
+        currentChange(currentPage) {
+            this.page.currentPage = currentPage;
+        },
+        sizeChange(pageSize) {
+            this.page.pageSize = pageSize;
+        },
+        refreshChange() {
+            this.onLoad(this.page, this.query);
+        },
+        onLoad(page, params = {}) {
+            let obj = {}
+            obj = {
+                ...Object.assign(params, this.query),
+            }
+            console.log(obj)
+            this.loading = true;
+            getList(page.currentPage, page.pageSize, obj).then(res => {
+                this.data = res.data.data.records;
+                this.page.total = res.data.data.total;
+                this.$nextTick(() => {
+                    this.$refs.crud.doLayout();
+                    this.$refs.crud.dicInit();
+                });
+            }).finally(() => {
+                this.loading = false;
+            })
+
+        },
+        // 详情的返回列表
+        goBack() {
+            // 初始化数据
+            // if (JSON.stringify(this.$route.query) != "{}") {
+            //     this.$router.$avueRouter.closeTag();
+            //     this.$router.push({
+            //         path: "/iosBasicData/accounts/index"
+            //     });
+            // }
+            this.detailData = {}
+            this.isShow = true;
+            this.onLoad(this.page, this.search);
+        },
+        //自定义列保存
+        async saveColumn(ref, option, optionBack, code) {
+            /**
+             * 已定义全局方法，直接使用，saveColumnData保存列数据方法,参数传值(表格名称，当前表格的option数据)
+             * 已定义全局方法，直接使用，getColumnName方法用来获取枚举值，参数根据自己定义的code值获取中文名
+             * 一定要执行异步操作，要等接口成功返回，才能执行下一行代码
+             */
+            const inSave = await this.saveColumnData(this.getColumnName(code), this[option]);
+            if (inSave) {
+                this.$message.success("保存成功");
+                //关闭窗口
+                this.$refs[ref].$refs.dialogColumn.columnBox = false;
+                this.searchReset()
+            }
+        },
+        //自定义列重置
+        async resetColumn(ref, option, optionBack, code) {
+            this[option] = this[optionBack];
+            const inSave = await this.delColumnData(this.getColumnName(code), this[optionBack]);
+            if (inSave) {
+                this.$message.success("重置成功");
+                this.$refs[ref].$refs.dialogColumn.columnBox = false;
+                this.searchReset()
+            }
+        },
+        // 更改表格颜色
+        headerClassName(tab) {
+            //颜色间隔
+            let back = ""
+            if (tab.columnIndex >= 0 && tab.column.level === 1) {
+                if (tab.columnIndex % 2 === 0) {
+                    back = "back-one"
+                } else if (tab.columnIndex % 2 === 1) {
+                    back = "back-two"
+                }
+            }
+            return back;
+        },
+
+    }
+}
+
+</script>
+  
+<style scoped>
+::v-deep#out-table .back-one {
+    background: #ecf5ff !important;
+    text-align: center;
+}
+
+::v-deep#out-table .back-two {
+    background: #ecf5ff !important;
+    text-align: center;
+}
+
+.pointerClick {
+    cursor: pointer;
+    color: #1e9fff;
+}
+
+::v-deep .el-col-md-8 {
+    width: 24.33333%;
+}
+</style>
+  

src/views/tradeAgency/oceanFreightImport/detailsPage.vue

@@ -206,7 +206,7 @@
 </template>
 
 <script>
-import { submit, getDetail, detailTradeByMblno, remove, checkAgent, revokeCheckAgent, copyAgent, generateDispatchVehicles, confirmDispatchVehicles, generateWarehouseEntry, confirmWarehouseEntry, generateOutbound, dispatchvehiclesRemove, inoutstorageRemove } from "@/api/tradeAgency/oceanFreightImport";
+import { submit, getDetail, detailTradeByMblno, remove, checkAgent, revokeCheckAgent, copyAgent, generateDispatchVehicles, confirmDispatchVehicles, generateWarehouseEntry, confirmWarehouseEntry, generateOutbound, dispatchvehiclesRemove, inoutstorageRemove,calculationWarehouseUnitPrice } from "@/api/tradeAgency/oceanFreightImport";
 import feeInfo from "@/components/tradeAgency/fee-oceanFreight";
 import dicSelect from "@/components/dicSelect/main";
 import checkSchedule from "@/components/checkH/checkSchedule.vue";
@@ -1288,24 +1288,34 @@ export default {
                 })
             }
             if (name == '入库确认') {
+                if (!this.form.eta) {
+                    return this.$message.error("实际到港不能为空");
+                }
                 if (!row.warehouseName) {
                     return this.$message.error("仓库不能为空");
                 }
-                if (!row.warehouseUnitPrice) {
-                    return this.$message.error("仓储单价不能为空");
-                }
-                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()
+                calculationWarehouseUnitPrice(row).then(res => {
+                    this.$confirm(res.data.data, '提示', {
+                        confirmButtonText: '确定',
+                        cancelButtonText: '取消',
+                        dangerouslyUseHTMLString:true,
+                    }).then(() => {
+                        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()
+                        })
+                    })
                 })
+
+
             }
             if (name == '生成出库') {
                 if (!row.warehouseName) {

src/views/tradeAgency/tradeAgency/detailsPage.vue

@@ -1363,7 +1363,6 @@ export default {
                     loading.close();
                 })
             });
-
         },
         //请核关闭
         choceScheduleFun() {

src/views/tradeAgency/tradeAgency/index.vue

@@ -110,6 +110,7 @@ export default {
             form: {},
             query: {
                 checkbox: [],
+                businessType: 'MYDL',
             },
             loading: false,
             page: {