修改bug

src/api/iosBasicData/storageFee.js

@@ -19,7 +19,14 @@ export const getDetail = (data) => {
         params: data
     })
 }
-
+//贸易代理明细
+export const copyAgent = (data) => {
+    return request({
+        url: '/api/blade-los/storagefee/copy',
+        method: 'get',
+        params: data
+    })
+}
 //贸易代理保存
 export const submit = (data) => {
     return request({

src/components/tradeAgency/fee-info.vue

@@ -156,7 +156,7 @@
         <business-reports :id="form.id" :itemIds="itemIds" ref="printD" businessValue="MYDL" classifyCode="费用"
             groupCode="应收" :selecList="selectionDList"></business-reports>
         <business-reports :id="form.id" :itemIds="itemIds" ref="printC" businessValue="MYDL" classifyCode="费用"
-            groupCode="应付"></business-reports>
+            groupCode="应付" :selecList="selectionCList"></business-reports>
         <!--模板弹窗-->
         <el-dialog title="提示" :visible.sync="templateVisible" append-to-body width="70%" :close-on-click-modal="false"
             :before-close="handleClose">
@@ -277,7 +277,7 @@ export default {
             templateVisible: false,
             optionD: {},
             optionDBack: {
-                height: 'auto',
+                maxHeight: 300,
                 calcHeight: 30,
                 menuWidth: 140,
                 tip: false,
@@ -440,7 +440,7 @@ export default {
             },
             optionC: {},
             optionCBack: {
-                height: 'auto',
+                maxHeight: 300,
                 calcHeight: 30,
                 menuWidth: 140,
                 tip: false,
@@ -683,28 +683,65 @@ export default {
         addRow(type) {
             if (!this.form.id) return this.$message.error('请保存数据');
             if (type == 'D') {
-                this.form.feeCenterListD.push({
-                    $cellEdit: true,
-                    pid: this.form.id,
-                    dc: type,
-                    accStatus: 0,
-                    businessType: this.form.businessType,
-                    billNo: this.form.businessNo,
-                    billDate: this.form.businessDate,
-                    discountExrate: 0,
-                })
+                if (this.form.feeCenterListD.length == 0) {
+                    this.form.feeCenterListD.push({
+                        $cellEdit: true,
+                        pid: this.form.id,
+                        dc: type,
+                        accStatus: 0,
+                        businessType: this.form.businessType,
+                        billNo: this.form.businessNo,
+                        billDate: this.form.businessDate,
+                        discountExrate: 0,
+                    })
+                } else {
+                    this.form.feeCenterListD.push({
+                        $cellEdit: true,
+                        pid: this.form.id,
+                        dc: type,
+                        accStatus: 0,
+                        businessType: this.form.businessType,
+                        billNo: this.form.businessNo,
+                        billDate: this.form.businessDate,
+                        discountExrate: 0,
+                        corpCnName: this.form.feeCenterListD[this.form.feeCenterListD.length - 1].corpCnName,
+                        corpId: this.form.feeCenterListD[this.form.feeCenterListD.length - 1].corpId,
+                        corpEnName: this.form.feeCenterListD[this.form.feeCenterListD.length - 1].corpEnName,
+                        billCorpId: this.form.feeCenterListD[this.form.feeCenterListD.length - 1].billCorpId,
+                        billCorpCnName: this.form.feeCenterListD[this.form.feeCenterListD.length - 1].billCorpCnName,
+                    })
+                }
+
             }
             if (type == 'C') {
-                this.form.feeCenterListC.push({
-                    $cellEdit: true,
-                    pid: this.form.id,
-                    dc: type,
-                    accStatus: 0,
-                    businessType: this.form.businessType,
-                    billNo: this.form.businessNo,
-                    billDate: this.form.businessDate,
-                    discountExrate: 0,
-                })
+                if (this.form.feeCenterListC.length == 0) {
+                    this.form.feeCenterListC.push({
+                        $cellEdit: true,
+                        pid: this.form.id,
+                        dc: type,
+                        accStatus: 0,
+                        businessType: this.form.businessType,
+                        billNo: this.form.businessNo,
+                        billDate: this.form.businessDate,
+                        discountExrate: 0,
+                    })
+                } else {
+                    this.form.feeCenterListC.push({
+                        $cellEdit: true,
+                        pid: this.form.id,
+                        dc: type,
+                        accStatus: 0,
+                        businessType: this.form.businessType,
+                        billNo: this.form.businessNo,
+                        billDate: this.form.businessDate,
+                        discountExrate: 0,
+                        corpCnName: this.form.feeCenterListC[this.form.feeCenterListC.length - 1].corpCnName,
+                        corpId: this.form.feeCenterListC[this.form.feeCenterListC.length - 1].corpId,
+                        corpEnName: this.form.feeCenterListC[this.form.feeCenterListC.length - 1].corpEnName,
+                        billCorpId: this.form.feeCenterListC[this.form.feeCenterListC.length - 1].billCorpId,
+                        billCorpCnName: this.form.feeCenterListC[this.form.feeCenterListC.length - 1].billCorpCnName,
+                    })
+                }
             }
         },
         countChange(row) {
@@ -1154,4 +1191,9 @@ export default {
     text-align: center;
     padding: 4px 0;
 }
+
+::v-deep .el-table--small td,
+.el-table--small th {
+    padding: 2px !important;
+}
 </style>

src/components/tradeAgency/fee-infosimple.vue

@@ -292,7 +292,7 @@ export default {
             },
             optionC: {},
             optionCBack: {
-                height: 'auto',
+                maxHeight:400,
                 calcHeight: 30,
                 menuWidth: 140,
                 tip: false,
@@ -509,16 +509,34 @@ export default {
     methods: {
         addRow(type) {
             if (type == 'C') {
-                this.form.feeCenterListC.push({
-                    $cellEdit: true,
-                    pid: this.form.id,
-                    dc: type,
-                    accStatus: 0,
-                    businessType: this.form.businessType,
-                    billNo: this.form.businessNo,
-                    billDate: this.form.businessDate,
-                    discountExrate: 0,
-                })
+                if (this.form.feeCenterListC.length == 0) {
+                    this.form.feeCenterListC.push({
+                        $cellEdit: true,
+                        pid: this.form.id,
+                        dc: type,
+                        accStatus: 0,
+                        businessType: this.form.businessType,
+                        billNo: this.form.businessNo,
+                        billDate: this.form.businessDate,
+                        discountExrate: 0,
+                    })
+                } else {
+                    this.form.feeCenterListC.push({
+                        $cellEdit: true,
+                        pid: this.form.id,
+                        dc: type,
+                        accStatus: 0,
+                        businessType: this.form.businessType,
+                        billNo: this.form.businessNo,
+                        billDate: this.form.businessDate,
+                        discountExrate: 0,
+                        corpCnName: this.form.feeCenterListC[this.form.feeCenterListC.length - 1].corpCnName,
+                        corpId: this.form.feeCenterListC[this.form.feeCenterListC.length - 1].corpId,
+                        corpEnName: this.form.feeCenterListC[this.form.feeCenterListC.length - 1].corpEnName,
+                        billCorpId: this.form.feeCenterListC[this.form.feeCenterListC.length - 1].billCorpId,
+                        billCorpCnName: this.form.feeCenterListC[this.form.feeCenterListC.length - 1].billCorpCnName,
+                    })
+                }
             }
         },
         countChange(row, type) {
@@ -836,4 +854,7 @@ export default {
     text-align: center;
     padding: 4px 0;
 }
+::v-deep .el-table--small td, .el-table--small th {
+    padding: 2px !important;
+}
 </style>

src/components/tradeAgency/fee-oceanFreight.vue

@@ -459,7 +459,7 @@ export default {
             },
             optionC: {},
             optionCBack: {
-                height: 'auto',
+                maxHeight:400,
                 calcHeight: 30,
                 menuWidth: 140,
                 tip: false,
@@ -703,26 +703,60 @@ export default {
         addRow(type) {
             if (!this.form.id) return this.$message.error('请保存数据');
             if (type == 'D') {
-                this.form.feeCenterListD.push({
-                    $cellEdit: true,
-                    pid: this.form.id,
-                    dc: type,
-                    accStatus: 0,
-                    businessType: this.form.businessType,
-                    billNo: this.form.businessNo,
-                    billDate: this.form.businessDate
-                })
+                if (this.form.feeCenterListD.length == 0) {
+                    this.form.feeCenterListD.push({
+                        $cellEdit: true,
+                        pid: this.form.id,
+                        dc: type,
+                        accStatus: 0,
+                        businessType: this.form.businessType,
+                        billNo: this.form.businessNo,
+                        billDate: this.form.businessDate,
+                    })
+                } else {
+                    this.form.feeCenterListD.push({
+                        $cellEdit: true,
+                        pid: this.form.id,
+                        dc: type,
+                        accStatus: 0,
+                        businessType: this.form.businessType,
+                        billNo: this.form.businessNo,
+                        billDate: this.form.businessDate,
+                        corpCnName: this.form.feeCenterListD[this.form.feeCenterListD.length - 1].corpCnName,
+                        corpId: this.form.feeCenterListD[this.form.feeCenterListD.length - 1].corpId,
+                        corpEnName: this.form.feeCenterListD[this.form.feeCenterListD.length - 1].corpEnName,
+                        billCorpId: this.form.feeCenterListD[this.form.feeCenterListD.length - 1].billCorpId,
+                        billCorpCnName: this.form.feeCenterListD[this.form.feeCenterListD.length - 1].billCorpCnName,
+                    })
+                }
             }
             if (type == 'C') {
-                this.form.feeCenterListC.push({
-                    $cellEdit: true,
-                    pid: this.form.id,
-                    dc: type,
-                    accStatus: 0,
-                    businessType: this.form.businessType,
-                    billNo: this.form.businessNo,
-                    billDate: this.form.businessDate
-                })
+                if (this.form.feeCenterListC.length == 0) {
+                    this.form.feeCenterListC.push({
+                        $cellEdit: true,
+                        pid: this.form.id,
+                        dc: type,
+                        accStatus: 0,
+                        businessType: this.form.businessType,
+                        billNo: this.form.businessNo,
+                        billDate: this.form.businessDate,
+                    })
+                } else {
+                    this.form.feeCenterListC.push({
+                        $cellEdit: true,
+                        pid: this.form.id,
+                        dc: type,
+                        accStatus: 0,
+                        businessType: this.form.businessType,
+                        billNo: this.form.businessNo,
+                        billDate: this.form.businessDate,
+                        corpCnName: this.form.feeCenterListC[this.form.feeCenterListC.length - 1].corpCnName,
+                        corpId: this.form.feeCenterListC[this.form.feeCenterListC.length - 1].corpId,
+                        corpEnName: this.form.feeCenterListC[this.form.feeCenterListC.length - 1].corpEnName,
+                        billCorpId: this.form.feeCenterListC[this.form.feeCenterListC.length - 1].billCorpId,
+                        billCorpCnName: this.form.feeCenterListC[this.form.feeCenterListC.length - 1].billCorpCnName,
+                    })
+                }
             }
         },
         countChange(row) {
@@ -1231,4 +1265,7 @@ export default {
     text-align: center;
     padding: 4px 0;
 }
+::v-deep .el-table--small td, .el-table--small th {
+    padding: 2px !important;
+}
 </style>

src/views/iosBasicData/storageFee/detailsPage.vue

@@ -47,12 +47,15 @@
                     </template>
                 </avue-crud>
             </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 } from "@/api/iosBasicData/storageFee";
+import { submit, getDetail,copyAgent } from "@/api/iosBasicData/storageFee";
 import dicSelect from "@/components/dicSelect/main";
 import { bfeesList } from "@/api/iosBasicData/bfees";
 import _ from "lodash";
@@ -202,6 +205,9 @@ export default {
         if (this.detailData.id) {
             this.getDetails(this.detailData.id)
         }
+        if (this.detailData.copyId) {
+            this.getCopydate(this.detailData.copyId)
+        }
     },
     methods: {
         dicChange(name, row) {
@@ -243,6 +249,19 @@ 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
+            }).finally(() => {
+                loading.close()
+            })
+        },
         addRow() {
             if (!this.form.corpId) {
                 return this.$message.error("请选择客户名称");

src/views/iosBasicData/storageFee/index.vue

@@ -10,6 +10,8 @@
                 <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>
                 </template>
                 <template slot="menu" slot-scope="{ row, index }">
                     <el-button size="small" icon="el-icon-edit" type="text" @click="rowEdit(row)">编辑</el-button>
@@ -55,6 +57,8 @@ export default {
                 viewBtn: false,
                 editBtn: false,
                 delBtn: false,
+                tip: false,
+                selection: true,
                 searchIcon: true,
                 searchIndex: 3,
                 column: [
@@ -150,6 +154,12 @@ export default {
         addButton() {
             this.isShow = false
         },
+        copyButton() {
+            this.isShow = false
+            this.detailData = {
+                copyId: this.selectionList[0].id
+            };
+        },
         rowEdit(row) {
             this.detailData = {
                 id: row.id

src/views/tradeAgency/exchangePurchasing/detailsPage.vue

@@ -469,4 +469,7 @@ export default {
 ::v-deep#out-table .back-two {
     background: #ecf5ff !important;
 }
+::v-deep .el-table--small td, .el-table--small th {
+    padding: 2px !important;
+}
 </style>

src/views/tradeAgency/firstSettlement/detailsPage.vue

@@ -386,4 +386,7 @@ export default {
 ::v-deep#out-table .back-two {
     background: #ecf5ff !important;
 }
+::v-deep .el-table--small td, .el-table--small th {
+    padding: 2px !important;
+}
 </style>

src/views/tradeAgency/oceanFreightImport/index.vue

@@ -464,7 +464,7 @@ export default {
                 this.$message.success("保存成功");
                 //关闭窗口
                 this.$refs[ref].$refs.dialogColumn.columnBox = false;
-                this.queryReset()
+                this.searchReset()
             }
         },
         //自定义列重置
@@ -474,7 +474,7 @@ export default {
             if (inSave) {
                 this.$message.success("重置成功");
                 this.$refs[ref].$refs.dialogColumn.columnBox = false;
-                this.queryReset()
+                this.searchReset()
             }
         },
         // 更改表格颜色

src/views/tradeAgency/tradeAgency/detailsPage.vue

@@ -1724,4 +1724,7 @@ export default {
 ::v-deep#out-table .back-two {
     background: #ecf5ff !important;
 }
+::v-deep .el-table--small td, .el-table--small th {
+    padding: 2px !important;
+}
 </style>

src/views/tradeAgency/tradeAgency/index.vue

@@ -764,7 +764,7 @@ export default {
                 this.$message.success("保存成功");
                 //关闭窗口
                 this.$refs[ref].$refs.dialogColumn.columnBox = false;
-                this.queryReset()
+                this.searchReset()
             }
         },
         //自定义列重置
@@ -774,7 +774,7 @@ export default {
             if (inSave) {
                 this.$message.success("重置成功");
                 this.$refs[ref].$refs.dialogColumn.columnBox = false;
-                this.queryReset()
+                this.searchReset()
             }
         },
         // 更改表格颜色