修改bug

src/components/tradeAgency/fee-oceanFreight.vue

@@ -18,9 +18,6 @@
                     @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"
@@ -99,6 +96,9 @@
                     @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="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('打印账单', 'C')">打印账单</el-button>
                 <el-button type="success" plain size="small" :disabled="disabled"
@@ -766,7 +766,7 @@ export default {
                 }
             }
             if (name == '增值税') {
-                if (type == 'D') {
+                if (type == 'C') {
                     let obj = {}
                     obj = {
                         id: this.form.id,
@@ -787,7 +787,7 @@ export default {
                 }
             }
             if (name == '关税') {
-                if (type == 'D') {
+                if (type == 'C') {
                     let obj = {}
                     obj = {
                         id: this.form.id,

src/page/index/tags.vue

@@ -445,7 +445,6 @@ export default {
           this.$store.commit("CGTH_OUT_DETAIL")
         }
         if (tag.label == "海运出口(F)") {
-          console.log(1111, this.$store.getters.seaFEStatus)
           this.$store.commit("OUT_SEAFE_DETAIL")
         }
         if (tag.label == "SEAMEND") {
@@ -472,6 +471,12 @@ export default {
         if (tag.label == "海运进口(T)") {
           this.$store.commit("OUT_OCEANFS_DETAIL")
         }
+        if (tag.label == "货款收费(T)") {
+          this.$store.commit("OUT_FIRSTSET_DETAIL")
+        }
+        if (tag.label == "货款付费(T)") {
+          this.$store.commit("OUT_EXPUR_DETAIL")
+        }
         this.$store.commit("DEL_TAG", tag);
         if (tag.value === this.tag.value) {
           tag = this.tagList[key === 0 ? key : key - 1]; //如果关闭本标签让前推一个

src/router/views/index.js

@@ -3619,7 +3619,7 @@ export default [{
   hidden: true,
   children: [{
     path: '/tradeAgency/exchangePurchasing/index',
-    name: '付费申请(T)',
+    name: '货款付费(T)',
     meta: {
       i18n: '/tradeAgency/exchangePurchasing/index',
       keepAlive: true,
@@ -3633,7 +3633,7 @@ export default [{
   hidden: true,
   children: [{
     path: '/tradeAgency/firstSettlement/index',
-    name: '收款结算(T)',
+    name: '货款收费(T)',
     meta: {
       i18n: '/tradeAgency/firstSettlement/index',
       keepAlive: true,

src/store/getters.js

@@ -88,6 +88,8 @@ const getters = {
   finOutStatus:state => state.ifdetail.finOutStatus,//货代海运出口seamend
   voucherStatus:state => state.ifdetail.voucherStatus,//财务凭证
   subLedgerStatus:state => state.ifdetail.subLedgerStatus,//明细账
-  oceanFreightStatus:state => state.ifdetail.oceanFreightStatus//海运进口(T)
+  oceanFreightStatus:state => state.ifdetail.oceanFreightStatus,//海运进口(T)
+  firstSetStatus:state => state.ifdetail.firstSetStatus,//货款收费(T)
+  exchangePurStatus:state => state.ifdetail.exchangePurStatus//货款付费(T)
 }
 export default getters

src/store/modules/ifdetail.js

@@ -66,9 +66,27 @@ const ifdetail = {
     voucherStatus: false,//财务凭证(F)
     subLedgerStatus: false,//明细账(F)
     oceanFreightStatus: false,//海运进口(T)
+    firstSetStatus: false,//货款收费(T)
+    exchangePurStatus: false,//货款付费(T)
   },
   actions: {},
   mutations: {
+    //开启货款收费(T)
+    IN_FIRSTSET_DETAIL(state) {
+      state.firstSetStatus = true
+    },
+    //关闭货款收费(T)
+    OUT_FIRSTSET_DETAIL(state) {
+      state.firstSetStatus = false
+    },
+    //开启货款付费(T)
+    IN_EXPUR_DETAIL(state) {
+      state.exchangePurStatus = true
+    },
+    //关闭货款付费(T)
+    OUT_EXPUR_DETAIL(state) {
+      state.exchangePurStatus = false
+    },
     //开启海运进口(T)
     IN_OCEANFS_DETAIL(state) {
       state.oceanFreightStatus = true
@@ -727,6 +745,12 @@ const ifdetail = {
       if (tag.label == '海运进口(T)') {
         state.oceanFreightStatus = true
       }
+      if (tag.label == '货款收费(T)') {
+        state.firstSetStatus = true
+      }
+      if (tag.label == '货款付费(T)') {
+        state.exchangePurStatus = true
+      }
     }
   }
 

src/views/tradeAgency/exchangePurchasing/detailsPage.vue

@@ -261,6 +261,9 @@ export default {
             this.editDisabled = true
             this.getDetails(this.detailData.id)
         }
+        if (this.$route.query.billNo) {
+            this.getDetails(this.$route.query.billNo)
+        }
     },
     methods: {
         getDetails(id) {

src/views/tradeAgency/exchangePurchasing/index.vue

@@ -56,7 +56,7 @@ export default {
                 searchIcon: true,
                 searchIndex: 3,
                 column: [
-                {
+                    {
                         label: "客户名称",
                         prop: "corpName",
                         overHidden: true,
@@ -108,12 +108,21 @@ export default {
     async created() {
         this.option = await this.getColumnData(this.getColumnName(383), this.optionBack);
     },
+    activated() {
+        setTimeout(() => {
+            if (this.$route.query.billNo) {
+                this.isShow = false
+                this.$store.commit("IN_EXPUR_DETAIL");
+            }
+        }, 100);
+    },
     methods: {
         rowEdit(row) {
             this.detailData = {
                 id: row.id
             };
             this.isShow = false
+            this.$store.commit("IN_EXPUR_DETAIL");
         },
         // 编辑
         inEdit(row) {
@@ -162,12 +171,13 @@ export default {
         // 详情的返回列表
         goBack() {
             // 初始化数据
-            // if (JSON.stringify(this.$route.query) != "{}") {
-            //     this.$router.$avueRouter.closeTag();
-            //     this.$router.push({
-            //         path: "/iosBasicData/accounts/index"
-            //     });
-            // }
+            if (JSON.stringify(this.$route.query) != "{}") {
+                this.$router.$avueRouter.closeTag();
+                this.$router.push({
+                    path: "/tradeAgency/exchangePurchasing/index"
+                });
+            }
+            this.$store.commit("OUT_EXPUR_DETAIL");
             this.detailData = {}
             this.isShow = true;
             this.onLoad(this.page, this.search);

src/views/tradeAgency/firstSettlement/detailsPage.vue

@@ -61,7 +61,7 @@ export default {
                     {
                         label: '客户',
                         prop: "corpName",
-                        disabled:true,
+                        disabled: true,
                     },
                     {
                         label: '业务号',
@@ -234,6 +234,9 @@ export default {
             this.editDisabled = true
             this.getDetails(this.detailData.id)
         }
+        if (this.$route.query.billNo) {
+            this.getDetails(this.$route.query.billNo)
+        }
     },
     methods: {
         getDetails(id) {
@@ -244,7 +247,7 @@ export default {
                 background: 'rgba(255,255,255,0.7)'
             });
             getDetail({ id: id }).then(res => {
-                if (res.data.data.orderStatus == '已确认') this.optionForm.disabled =true
+                if (res.data.data.orderStatus == '已确认') this.optionForm.disabled = true
                 this.form = res.data.data
             }).finally(() => {
                 loading.close()

src/views/tradeAgency/firstSettlement/index.vue

@@ -108,12 +108,21 @@ export default {
     async created() {
         this.option = await this.getColumnData(this.getColumnName(383), this.optionBack);
     },
+    activated() {
+        setTimeout(() => {
+            if (this.$route.query.billNo) {
+                this.isShow = false
+                this.$store.commit("IN_FIRSTSET_DETAIL");
+            }
+        }, 100);
+    },
     methods: {
         rowEdit(row) {
             this.detailData = {
                 id: row.id
             };
             this.isShow = false
+            this.$store.commit("IN_FIRSTSET_DETAIL");
         },
         // 编辑
         inEdit(row) {
@@ -162,15 +171,17 @@ export default {
         // 详情的返回列表
         goBack() {
             // 初始化数据
-            // if (JSON.stringify(this.$route.query) != "{}") {
-            //     this.$router.$avueRouter.closeTag();
-            //     this.$router.push({
-            //         path: "/iosBasicData/accounts/index"
-            //     });
-            // }
+            if (JSON.stringify(this.$route.query) != "{}") {
+                this.$router.$avueRouter.closeTag();
+                this.$router.push({
+                    path: "/tradeAgency/firstSettlement/index"
+                });
+            }
+            this.$store.commit("OUT_FIRSTSET_DETAIL");
             this.detailData = {}
             this.isShow = true;
             this.onLoad(this.page, this.search);
+          
         },
         //自定义列保存
         async saveColumn(ref, option, optionBack, code) {

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,calculationWarehouseUnitPrice } 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";
@@ -1035,6 +1035,9 @@ export default {
         if (this.$route.query.billNo) {
             this.getDetaiByMblno(this.$route.query.billNo)
         }
+        if (this.detailData.copyId) {
+            this.getCopydate(this.detailData.copyId)
+        }
     },
     methods: {
         getDetaiByMblno(billNo) {
@@ -1298,7 +1301,7 @@ export default {
                     this.$confirm(res.data.data, '提示', {
                         confirmButtonText: '确定',
                         cancelButtonText: '取消',
-                        dangerouslyUseHTMLString:true,
+                        dangerouslyUseHTMLString: true,
                     }).then(() => {
                         const loading = this.$loading({
                             lock: true,
@@ -1390,6 +1393,25 @@ export default {
                 loading.close()
             })
         },
+        getCopydate(id) {
+            const loading = this.$loading({
+                lock: true,
+                text: '加载中',
+                spinner: 'el-icon-loading',
+                background: 'rgba(255,255,255,0.7)'
+            });
+            copyAgent({ id: id }).then(res => {
+                this.form = res.data.data
+                if (res.data.data.abroadConsignorId) {
+                    this.$refs.abankCode.IdGetDicData({ id: res.data.data.abroadConsignorId })
+                }
+                if (res.data.data.domesticConsigneeId) {
+                    this.$refs.dbankCode.IdGetDicData({ id: res.data.data.domesticConsigneeId })
+                }
+            }).finally(() => {
+                loading.close()
+            })
+        },
         inEdit() {
             this.editButton = false
             if (this.form.status == 0 || this.form.status == 4) {

src/views/tradeAgency/oceanFreightImport/index.vue

@@ -17,6 +17,10 @@
                 <template slot="menuLeft">
                     <el-button type="primary" size="small" icon="el-icon-plus" @click="addButton">新 增
                     </el-button>
+                    <!-- <el-button type="success" size="small" :disabled="selectionList.length != 1" @click="copyButton">复制订单
+                    </el-button> -->
+                    <!-- <el-button type="warning" size="small" @click="outExport">导 出
+                    </el-button> -->
                 </template>
                 <template slot="menu" slot-scope="{ row, index }">
                     <el-button size="small" icon="el-icon-edit" type="text" @click="rowEdit(row)">编辑</el-button>
@@ -35,7 +39,7 @@
 <script>
 import { getList, remove, copyAgent } from "@/api/tradeAgency/oceanFreightImport";
 import detailsPage from "./detailsPage";
-
+import { getToken } from "@/util/auth";
 export default {
     data() {
         return {
@@ -348,6 +352,13 @@ export default {
             this.isShow = false
             this.$store.commit("IN_OCEANFS_DETAIL");
         },
+        copyButton() {
+            this.isShow = false
+            this.detailData = {
+                copyId: this.selectionList[0].id
+            };
+            this.$store.commit("IN_OCEANFS_DETAIL");
+        },
         rowEdit(row) {
             this.detailData = {
                 id: row.id
@@ -422,7 +433,32 @@ export default {
             this.$store.commit("OUT_OCEANFS_DETAIL");
             this.detailData = {}
             this.isShow = true;
-            this.onLoad(this.page, this.search);
+            this.onLoad(this.page, this.query);
+        },
+        outExport() {
+            let config = { params: { ...this.query } }
+            if (config.params) {
+                for (const propName of Object.keys(config.params)) {
+                    const value = config.params[propName];
+                    if (value !== null && typeof (value) !== "undefined") {
+                        if (value instanceof Array) {
+                            for (const key of Object.keys(value)) {
+                                let params = propName + '[' + key + ']';
+                                config.params[params] = value[key]
+                            }
+                            delete config.params[propName]
+                        }
+                    }
+                }
+            }
+            const routeData = this.$router.resolve({
+                path: '/api/blade-los/agentview/export',      //跳转目标窗口的地址
+                query: {
+                    ...config.params,    //括号内是要传递给新窗口的参数
+                    identification: this.url
+                }
+            })
+            window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);
         },
         //自定义列保存
         async saveColumn(ref, option, optionBack, code) {
@@ -436,7 +472,7 @@ export default {
                 this.$message.success("保存成功");
                 //关闭窗口
                 this.$refs[ref].$refs.dialogColumn.columnBox = false;
-                this.searchReset()
+                this.queryReset()
             }
         },
         //自定义列重置
@@ -446,7 +482,7 @@ export default {
             if (inSave) {
                 this.$message.success("重置成功");
                 this.$refs[ref].$refs.dialogColumn.columnBox = false;
-                this.searchReset()
+                this.queryReset()
             }
         },
         // 更改表格颜色

src/views/tradeAgency/tradeAgency/detailsPage.vue

@@ -212,7 +212,14 @@
             <trade-card title="记录信息">
                 <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
                     <el-tab-pane label="付汇记录" name="1">
-                        <avue-crud :data="form.recordRateList" :option="option3"></avue-crud>
+                        <avue-crud :data="form.recordRateList" :option="option3">
+                            <template slot="billNo" slot-scope="{ row }">
+                                <span style="color: #1e9fff" @click="rowEdit(row)">{{ row.billNo }}</span>
+                            </template>
+                            <template slot="customsDeclarationNo" slot-scope="{ row }">
+                                <span style="color: #1e9fff" @click="rowEdit(row)">{{ row.customsDeclarationNo }}</span>
+                            </template>
+                        </avue-crud>
                     </el-tab-pane>
                     <el-tab-pane label="收款记录" name="2">
                         <avue-crud :data="form.recordListD" :option="option1"></avue-crud>
@@ -972,6 +979,46 @@ export default {
                 }, 200);
             }
         },
+        rowEdit(row) {
+            console.log(row.srcType)
+            if (row.srcType == 'STL-D-FH') {
+                if (this.$store.getters.firstSetStatus) {
+                    this.$alert("货款收费(T)页面已存在,请关闭货款收费(T)再进行操作", "温馨提示", {
+                        confirmButtonText: "确定",
+                        type: 'warning',
+                        callback: action => {
+                        }
+                    });
+                } else {
+                    this.$router.push({
+                        path: '/tradeAgency/firstSettlement/index',
+                        query: {
+                            billNo: row.srcId
+                        },
+                    })
+                }
+
+            }
+            if (row.srcType == 'STL-C-GH') {
+                if (this.$store.getters.exchangePurStatus) {
+                    this.$alert("货款付费(T)页面已存在,请关闭货款付费(T)再进行操作", "温馨提示", {
+                        confirmButtonText: "确定",
+                        type: 'warning',
+                        callback: action => {
+                        }
+                    });
+                } else {
+                    this.$router.push({
+                        path: '/tradeAgency/exchangePurchasing/index',
+                        query: {
+                            billNo: row.srcId
+                        },
+                    })
+                }
+
+            }
+
+        },
         addRow() {
             if (!this.form.corpId) {
                 return this.$message.error("请选择客户名称");

src/views/tradeAgency/tradeAgency/index.vue

@@ -17,8 +17,10 @@
                 <template slot="menuLeft">
                     <el-button type="primary" size="small" icon="el-icon-plus" @click="addButton">新 增
                     </el-button>
-                    <!-- <el-button type="success" size="small" icon="el-icon-plus" :disabled="selectionList.length != 1" @click="copyButton">复制订单
+                    <!-- <el-button type="success" size="small" :disabled="selectionList.length != 1" @click="copyButton">复制订单
                     </el-button> -->
+                    <el-button type="warning" size="small" @click="outExport">导 出
+                    </el-button>
                     <el-button type="info" size="small" :disabled="selectionList.length == 0"
                         @click="allClick('生成申请收款')">生成货款收款
                     </el-button>
@@ -59,6 +61,7 @@
 <script>
 import { getList, remove, copyAgent, applyForPaymentList, generate } from "@/api/tradeAgency/tradeAgency";
 import detailsPage from "./detailsPage";
+import { getToken } from "@/util/auth";
 
 export default {
     data() {
@@ -75,7 +78,7 @@ export default {
                 menu: false,
                 selection: true,
                 align: 'center',
-                height:'450',
+                height: '450',
                 column: [
                     {
                         label: "往来单位",
@@ -542,7 +545,7 @@ export default {
         copyButton() {
             this.isShow = false
             this.detailData = {
-                copyId:this.selectionList[0].id
+                copyId: this.selectionList[0].id
             };
         },
         allClick(name) {
@@ -656,7 +659,32 @@ export default {
             // }
             this.detailData = {}
             this.isShow = true;
-            this.onLoad(this.page, this.search);
+            this.onLoad(this.page, this.query);
+        },
+        outExport() {
+            let config = { params: { ...this.query } }
+            if (config.params) {
+                for (const propName of Object.keys(config.params)) {
+                    const value = config.params[propName];
+                    if (value !== null && typeof (value) !== "undefined") {
+                        if (value instanceof Array) {
+                            for (const key of Object.keys(value)) {
+                                let params = propName + '[' + key + ']';
+                                config.params[params] = value[key]
+                            }
+                            delete config.params[propName]
+                        }
+                    }
+                }
+            }
+            const routeData = this.$router.resolve({
+                path: '/api/blade-los/agentview/export',      //跳转目标窗口的地址
+                query: {
+                    ...config.params,    //括号内是要传递给新窗口的参数
+                    identification: this.url
+                }
+            })
+            window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);
         },
         //自定义列保存
         async saveColumn(ref, option, optionBack, code) {
@@ -670,7 +698,7 @@ export default {
                 this.$message.success("保存成功");
                 //关闭窗口
                 this.$refs[ref].$refs.dialogColumn.columnBox = false;
-                this.searchReset()
+                this.queryReset()
             }
         },
         //自定义列重置
@@ -680,7 +708,7 @@ export default {
             if (inSave) {
                 this.$message.success("重置成功");
                 this.$refs[ref].$refs.dialogColumn.columnBox = false;
-                this.searchReset()
+                this.queryReset()
             }
         },
         // 更改表格颜色