货代付费 2023-12-27

src/views/iosBasicData/PaymentApplication/finstlbillsDetails.vue

@@ -321,6 +321,10 @@
                 <el-button size="small" @click="selectPrintingDialog = false;">取 消</el-button>
             </span>
         </el-dialog>
+
+
+        <!--报表组件-->
+        <reportContainer ref="reportContainer"></reportContainer>
     </div>
 </template>
 
@@ -340,9 +344,10 @@
     import reports from "@/views/iosBasicData/SeafreightExportF/bills/assembly/reports.vue";
     import reportformsList from "@/views/iosBasicData/SeafreightExportF/bills/assembly/reportformsList.vue";
     import {reportsGetReportData} from "@/api/iosBasicData/reports";
+    import reportContainer from "@/views/iosBasicData/report-container/report-container.vue";
 
     export default {
-        components: {reportformsList, reports, SearchQuery,expand,finstlbillsitems},
+        components: {reportContainer, reportformsList, reports, SearchQuery,expand,finstlbillsitems},
         props:{
             // 编辑还是保存
             editSave:{

src/views/iosBasicData/PaymentApplication/index.vue

@@ -102,6 +102,13 @@
           searchIcon:true,
           column: [
             {
+                label: "单据编号",
+                prop: "billNo",
+                search:true,
+                width:"120",
+                overHidden:true
+            },
+            {
                 label: "付费对象",
                 prop: "corpCnName",
                 search:true,
@@ -135,7 +142,6 @@
             {
                 label: "预计收回",
                 prop: "estimatedTime",
-                search:true,
                 type:'date',
                 format: "yyyy-MM-dd HH:mm:ss",
                 valueFormat: 'yyyy-MM-dd HH:mm:ss',
@@ -143,6 +149,19 @@
                 overHidden:true
             },
             {
+                label: "预计收回",
+                prop: "estimatedTimeList",
+                search:true,
+                hide:true,
+                type: "date",
+                overHidden: true,
+                width: 100,
+                searchRange: true,
+                searchDefaultTime: ["00:00:00", "23:59:59"],
+                format: "yyyy-MM-dd",
+                valueFormat: "yyyy-MM-dd HH:mm:ss"
+            },
+            {
                 label: "收款情况",
                 prop: "collectionSituation",
                 search:true,
@@ -150,14 +169,38 @@
                 overHidden:true
             },
             {
-                label: "财务开始日期",
-                prop: "accountDateFrom",
+                label: "应付(CNY)",
+                prop: "amountCr",
+                width: "160",
+                overHidden:true
+            },
+            {
+                label: "合计应付(CNY)",
+                prop: "amountCrLoc",
+                width: "160",
+                overHidden:true
+            },
+            {
+                label: "应收(CNY)",
+                prop: "amountDr",
+                width: "160",
+                overHidden:true
+            },
+            {
+                label: "合计应收(CNY)",
+                prop: "amountDrLoc",
+                width: "160",
+                overHidden:true
+            },
+            {
+                label: "业务开始日期",
+                prop: "billDateFrom",
                 width: "140",
                 overHidden:true
             },
             {
-                label: "财务结束日期",
-                prop: "accountDateTo",
+                label: "业务结束日期",
+                prop: "billDateTo",
                 width: "140",
                 overHidden:true
             },
@@ -197,6 +240,7 @@
                 search:true,
                 type: 'select',
                 dicData:[],
+                dicUrl:'/api/blade-los/bcurrency/page?current=1&size=20',
                 props: {
                     label: "code",
                     value: "id"
@@ -265,30 +309,6 @@
               search:true,
               overHidden:true
             },
-            {
-              label: "本位币应收(CNY)",
-              prop: "amountDr",
-              width: "160",
-              overHidden:true
-            },
-            {
-              label: "本位币应付(CNY)",
-              prop: "amountCr",
-              width: "160",
-              overHidden:true
-            },
-            {
-              label: "合计本位币应收(CNY)",
-              prop: "amountDrLoc",
-              width: "160",
-              overHidden:true
-            },
-            {
-              label: "合计本位币应付(CNY)",
-              prop: "amountCrLoc",
-              width: "160",
-              overHidden:true
-            },
           ]
         },
         data: [],

src/views/iosBasicData/fininvoicesApplyfor/fininvoicesDetails.vue

@@ -71,15 +71,15 @@
                                 </search-query>
                             </el-form-item>
                         </el-col>
-                        <el-col :span="4">
-                            <el-form-item label="打印次数" prop="invCurCode">
-                                <el-input style="width: 100%;" v-model="form.invCurCode"
-                                          size="small" autocomplete="off"
-                                          :disabled="editSave"
-                                          clearable placeholder="请输入打印次数" >
-                                </el-input>
-                            </el-form-item>
-                        </el-col>
+                        <!--<el-col :span="4">-->
+                        <!--    <el-form-item label="打印次数" prop="invCurCode">-->
+                        <!--        <el-input style="width: 100%;" v-model="form.invCurCode"-->
+                        <!--                  size="small" autocomplete="off"-->
+                        <!--                  :disabled="editSave"-->
+                        <!--                  clearable placeholder="请输入打印次数" >-->
+                        <!--        </el-input>-->
+                        <!--    </el-form-item>-->
+                        <!--</el-col>-->
                     </el-row>
                 </el-card>
                 <div class="flexBox" style="margin-top: 10px">
@@ -524,7 +524,6 @@
                                 <el-checkbox v-model="appendType" false-label="检索" true-label="追加">追加</el-checkbox>
                                 <el-button type="primary"
                                            size="small"
-                                           icon="el-icon-service"
                                            plain @click="finstlbillslistAccBillV1fun(appendType)">提取费用
                                 </el-button>
                             </el-col>