Browse Source

货代付费 2023-12-27

caojunjie 1 year ago
parent
commit
5477e06eb2

+ 6 - 2
src/views/iosBasicData/PaymentApplication/assembly/finstlbillsitems.vue

@@ -108,7 +108,9 @@
                 prop="currentStlAmountRMB"
                 label="本次RMB" width="100px">
                 <template slot-scope="scope">
-                    <el-input style="width: 100%;" v-model="scope.row.currentStlAmountRMB" v-if="brfalse || editSave"
+                    <el-input style="width: 100%;" v-model="scope.row.currentStlAmountRMB"
+                              :disabled="scope.row.curCode != 'CNY'"
+                              v-if="brfalse && !editSave"
                               size="mini" autocomplete="off"
                               clearable placeholder="请输入USD" >
                     </el-input>
@@ -119,7 +121,9 @@
                 prop="currentStlAmountUSD"
                 label="本次USD" width="100px">
                 <template slot-scope="scope">
-                    <el-input style="width: 100%;" v-model="scope.row.currentStlAmountUSD" v-if="brfalse || editSave"
+                    <el-input style="width: 100%;" v-model="scope.row.currentStlAmountUSD"
+                              :disabled="scope.row.curCode != 'USD'"
+                              v-if="brfalse && !editSave"
                               size="mini" autocomplete="off"
                               clearable placeholder="请输入USD" >
                     </el-input>

+ 331 - 140
src/views/iosBasicData/PaymentApplication/finstlbillsDetails.vue

@@ -8,10 +8,10 @@
             </div>
             <div class="add-customer-btn">
                 <el-button size="small" style="margin-right: 8px"
-                           :loading="saveLoading" >预 览
+                           :loading="saveLoading" :disabled="!form.id" @click="previewreportfun" >预 览
                 </el-button>
                 <el-button size="small" style="margin-right: 8px"
-                           :loading="saveLoading" >报表设计
+                           :loading="saveLoading" :disabled="!form.id" @click="DesignreportDialog = true" >报表设计
                 </el-button>
                 <el-button  size="small" type="success" plain  style="margin-right: 8px" :disabled="!form.id" v-if="form.status == '0'"
                             :loading="saveLoading" @click="settlementApprovefun">提交申请
@@ -38,7 +38,7 @@
                                     <search-query :datalist="corpData"
                                                   :selectValue="form.corpCnName"
                                                   :clearable="true"
-                                                  :disabled="editSave"
+                                                  :disabled="editSave || tableData.length != 0"
                                                   :filterable="true"
                                                   :remote="true"
                                                   :buttonIf="false"
@@ -119,6 +119,7 @@
                                                   :clearable="true"
                                                   :remote="true"
                                                   :buttonIf="false"
+                                                  :disabled="editSave"
                                                   placeholder="请选择方向"
                                                   @corpChange="corpChange($event,'dc')">
                                     </search-query>
@@ -237,138 +238,6 @@
                 </el-form>
             </el-card>
 
-            <el-card style="margin-top: 10px">
-                <el-row>
-                    <!--<el-col :span="3">-->
-                    <!--    <div class="bottomFlex" style="justify-content: space-around">-->
-                    <!--        &lt;!&ndash;<div style="text-align: center">&ndash;&gt;-->
-                    <!--        &lt;!&ndash;    <div class="weightfont">¥</div>&ndash;&gt;-->
-                    <!--        &lt;!&ndash;    <div>RMB</div>&ndash;&gt;-->
-                    <!--        &lt;!&ndash;</div>&ndash;&gt;-->
-                    <!--        <div>-->
-                    <!--            <div style="color: #81B337">-->
-                    <!--                <span>税后应收RMB:</span>-->
-                    <!--                <span class="weightnum">¥{{form.amountDrNet || 0}}元</span>-->
-                    <!--            </div>-->
-                    <!--            <div style="color: #6BBCD1">-->
-                    <!--                <span>税后应付RMB:</span>-->
-                    <!--                <span class="weightnum">¥{{form.amountCrNet || 0}}元</span>-->
-                    <!--            </div>-->
-                    <!--        </div>-->
-                    <!--    </div>-->
-                    <!--</el-col>-->
-                    <!--<el-col :span="3">-->
-                    <!--    <div class="bottomFlex" style="justify-content: space-around">-->
-                    <!--        &lt;!&ndash;<div style="text-align: center">&ndash;&gt;-->
-                    <!--        &lt;!&ndash;    <div class="weightfont">$</div>&ndash;&gt;-->
-                    <!--        &lt;!&ndash;    <div>USD</div>&ndash;&gt;-->
-                    <!--        &lt;!&ndash;</div>&ndash;&gt;-->
-                    <!--        <div>-->
-                    <!--            <div style="color: #81B337">-->
-                    <!--                <span>税后应收USD:</span>-->
-                    <!--                <span class="weightnum">${{form.amountDrUsdNet || 0}}元</span>-->
-                    <!--            </div>-->
-                    <!--            <div style="color: #6BBCD1">-->
-                    <!--                <span>税后应付USD:</span>-->
-                    <!--                <span class="weightnum">${{form.amountCrUsdNet || 0}}元</span>-->
-                    <!--            </div>-->
-                    <!--        </div>-->
-                    <!--    </div>-->
-                    <!--</el-col>-->
-                    <!--<el-col :span="3">-->
-                    <!--    <div class="bottomFlex" style="justify-content: space-around">-->
-                    <!--        &lt;!&ndash;<div style="text-align: center">&ndash;&gt;-->
-                    <!--        &lt;!&ndash;    <div class="weightfont">¥</div>&ndash;&gt;-->
-                    <!--        &lt;!&ndash;    <div>税后RMB</div>&ndash;&gt;-->
-                    <!--        &lt;!&ndash;</div>&ndash;&gt;-->
-                    <!--        <div>-->
-                    <!--            <div style="color: #81B337">-->
-                    <!--                <span>税后应收合计:</span>-->
-                    <!--                <span class="weightnum">¥{{form.amountDrLocNet || 0}}元</span>-->
-                    <!--            </div>-->
-                    <!--            <div style="color: #6BBCD1">-->
-                    <!--                <span>税后应付合计:</span>-->
-                    <!--                <span class="weightnum">¥{{form.amountCrLocNet || 0}}元</span>-->
-                    <!--            </div>-->
-                    <!--        </div>-->
-                    <!--    </div>-->
-                    <!--</el-col>-->
-                    <el-col :span="4">
-                        <div class="bottomFlex" style="justify-content: space-around">
-                            <!--<div style="text-align: center">-->
-                            <!--    <div class="weightfont">$</div>-->
-                            <!--    <div>税后USD</div>-->
-                            <!--</div>-->
-                            <div>
-                                <div style="color: #81B337">
-                                    <div style="color: #6BBCD1">
-                                        <span>应付RMB:</span>
-                                        <span class="weightnum">${{form.amountCr || 0}}</span>
-                                    </div>
-                                    <span>应收RMB:</span>
-                                    <span class="weightnum">${{form.amountDr || 0}}</span>
-                                </div>
-
-                            </div>
-                        </div>
-                    </el-col>
-                    <el-col :span="4">
-                        <div class="bottomFlex" style="justify-content: space-around">
-                            <!--<div style="text-align: center">-->
-                            <!--    <div class="weightfont">$</div>-->
-                            <!--    <div>税后USD</div>-->
-                            <!--</div>-->
-                            <div>
-                                <div style="color: #6BBCD1">
-                                    <span>应付USD:</span>
-                                    <span class="weightnum">${{form.amountCrUsd || 0}}</span>
-                                </div>
-                                <div style="color: #81B337">
-                                    <span>应收USD:</span>
-                                    <span class="weightnum">${{form.amountDrUsd || 0}}</span>
-                                </div>
-
-                            </div>
-                        </div>
-                    </el-col>
-                    <el-col :span="4">
-                        <div class="bottomFlex" style="justify-content: space-around">
-                            <!--<div style="text-align: center">-->
-                            <!--    <div class="weightfont">$</div>-->
-                            <!--    <div>税后USD</div>-->
-                            <!--</div>-->
-                            <div>
-                                <div style="color: #6BBCD1">
-                                    <span>应付合计:</span>
-                                    <span class="weightnum">${{form.amountCrLoc || 0}}</span>
-                                </div>
-                                <div style="color: #81B337">
-                                    <span>应收合计:</span>
-                                    <span class="weightnum">${{form.amountDrLoc || 0}}</span>
-                                </div>
-                            </div>
-                        </div>
-                    </el-col>
-                    <!--<el-col :span="3">-->
-                    <!--    <div class="bottomFlex" style="justify-content: space-around">-->
-                    <!--        &lt;!&ndash;<div style="text-align: center">&ndash;&gt;-->
-                    <!--        &lt;!&ndash;    <div class="weightfont">$</div>&ndash;&gt;-->
-                    <!--        &lt;!&ndash;    <div>税后USD</div>&ndash;&gt;-->
-                    <!--        &lt;!&ndash;</div>&ndash;&gt;-->
-                    <!--        <div>-->
-                    <!--            <div style="color: #6BBCD1">-->
-                    <!--                <span>进项税合计:</span>-->
-                    <!--                <span class="weightnum">${{form.amountCrLoc || 0}}</span>-->
-                    <!--            </div>-->
-                    <!--            <div style="color: #81B337">-->
-                    <!--                <span>销项税合计:</span>-->
-                    <!--                <span class="weightnum">${{form.amountDrLoc || 0}}</span>-->
-                    <!--            </div>-->
-                    <!--        </div>-->
-                    <!--    </div>-->
-                    <!--</el-col>-->
-                </el-row>
-            </el-card>
 
             <el-card style="margin-top: 10px">
                 <div style="margin-bottom: 10px">
@@ -387,13 +256,71 @@
                 </finstlbillsitems>
             </el-card>
         </div>
+        <el-card style="margin-top: 10px">
+            <el-row>
+                <el-col :span="3">
+                    <div class="bottomFlex" style="color: #6BBCD1">
+                        <span>应付:</span>
+                        <span class="weightnum">¥{{form.amountCr || 0}}</span>
+                    </div>
+                </el-col>
+                <el-col :span="3">
+                    <div class="bottomFlex" style="color: #6BBCD1">
+                        <span>应付:</span>
+                        <span class="weightnum">${{form.amountCrUsd || 0}}</span>
+                    </div>
+                </el-col>
+                <el-col :span="3">
+                    <div class="bottomFlex" style="color: #6BBCD1">
+                        <span>应付合计:</span>
+                        <span class="weightnum">¥{{form.amountCrLoc || 0}}</span>
+                    </div>
+                </el-col>
+                <el-col :span="3">
+                    <div class="bottomFlex" style="color: #81B337">
+                        <span>应收:</span>
+                        <span class="weightnum">¥{{form.amountDr || 0}}</span>
+                    </div>
+                </el-col>
+                <el-col :span="3">
+                    <div class="bottomFlex" style="color: #81B337">
+                        <span>应收:</span>
+                        <span class="weightnum">${{form.amountDrUsd || 0}}</span>
+                    </div>
+                </el-col>
+                <el-col :span="3">
+                    <div class="bottomFlex" style="color: #81B337">
+                        <span>应收合计:</span>
+                        <span class="weightnum">¥{{form.amountDrLoc || 0}}</span>
+                    </div>
+                </el-col>
+            </el-row>
+        </el-card>
 
 
         <!--设计报表弹窗-->
-        <!--<el-dialog append-to-body title="设计报表" class="el-dialogDeep" :visible.sync="DesignreportDialog" width="60%"-->
-        <!--           :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>-->
+        <el-dialog append-to-body title="设计报表" class="el-dialogDeep" :visible.sync="DesignreportDialog" width="70%"
+                   :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
+            <reports :id="form.id" :disabled="editSave" businessValue="FFSQ"></reports>
+        </el-dialog>
 
-        <!--</el-dialog>-->
+        <!--预览-->
+        <el-dialog
+            title="打印"
+            :visible.sync="selectPrintingDialog"
+            append-to-body
+            width="70%"
+            :close-on-click-modal="false"
+            :destroy-on-close="true"
+            :close-on-press-escape="false"
+            v-dialog-drag>
+            <div>
+                <reportformsList ref="reportformsList" @reportRadio="reportRadio"></reportformsList>
+            </div>
+            <span slot="footer" class="dialog-footer">
+                <el-button size="small" @click="selectPrintingDialog = false;">取 消</el-button>
+            </span>
+        </el-dialog>
     </div>
 </template>
 
@@ -410,9 +337,12 @@
     } from '@/api/iosBasicData/finstlbills'
     import expand from "@/components/basic-container/expand.vue";
     import finstlbillsitems from "@/views/iosBasicData/PaymentApplication/assembly/finstlbillsitems.vue";
+    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";
 
     export default {
-        components: {SearchQuery,expand,finstlbillsitems},
+        components: {reportformsList, reports, SearchQuery,expand,finstlbillsitems},
         props:{
             // 编辑还是保存
             editSave:{
@@ -422,6 +352,8 @@
         },
         data(){
             return {
+                DesignreportDialog:false, // 设计报表弹窗
+                selectPrintingDialog:false, // 预览报表
                 // 收/付数据
                 dcData: [{
                     label: '全部',
@@ -478,6 +410,36 @@
         created() {
         },
         methods:{
+            // 打印
+            reportRadio(val){
+                console.log(val,505)
+                // 获取报表数据
+                reportsGetReportData({
+                    billId:this.form.id,
+                    reportCode:val.classifyCode,
+                    groupCode:val.groupCode,
+                }).then(res=>{
+                    this.handleReportPreview(val.url,res.data.data.data)
+                })
+            },
+            // 报表预览
+            previewreportfun(){
+                this.saveLoading = true
+                this.selectPrintingDialog = true
+                this.saveLoading = false
+                let page = {
+                    pageSize: 10,
+                    currentPage: 1,
+                    total: 0
+                }
+                this.$nextTick(()=>{
+                    this.$refs.reportformsList.onLoad(page,{
+                        businessType:'FFSQ',
+                        classifyCode:'付费申请',
+                        groupCode:'付费申请'
+                    })
+                })
+            },
             // 批量删除
             batchDeletefun(){
                 if (this.handleSelectionData.length == 0) {
@@ -596,6 +558,7 @@
                         //     return;
                         // }
                     }
+                    this.saveLoading = true // 打开按钮动画
                     if(this.form.estimatedTime) {
                         this.form.estimatedTime = this.form.estimatedTime + ' 00:00:00'
                     }
@@ -632,6 +595,7 @@
                     finstlbillsSubmit(this.form).then(res=>{
                         this.saveLoading = false
                         this.$message.success('操作成功');
+                        this.saveLoading = false // 关闭按钮动画
                         this.finstlbillsDetailfun(res.data.data.id)
                     })
                 })
@@ -667,6 +631,7 @@
                         return item
                     })
                     this.pageLoading = false
+                    this.bcorpsbankListfun() // 查银行数据
                 }).catch(err=>{
                     this.pageLoading = false
                 })
@@ -833,6 +798,229 @@
                     })
                 })
             },
+            // 预览报表
+            handleReportPreview(url,data){
+                console.log(url,1670)
+                console.log(data,1671)
+                Stimulsoft.Base.StiLicense.key = '6vJhGtLLLz2GNviWmUTrhSqnOItdDwjBylQzQcAOiHn0s4gy0Fr5YoUZ9V00Y0igCSFQzwEqYBh/N77k4f0fWXTHW5rqeBNLkaurJDenJ9o97TyqHs9HfvINK18Uwzsc/bG01Rq+x3H3Rf+g7AY92gvWmp7VA2Uxa30Q97f61siWz2dE5kdBVcCnSFzC6awE74JzDcJMj8OuxplqB1CYcpoPcOjKy1PiATlC3UsBaLEXsok1xxtRMQ283r282tkh8XQitsxtTczAJBxijuJNfziYhci2jResWXK51ygOOEbVAxmpflujkJ8oEVHkOA/CjX6bGx05pNZ6oSIu9H8deF94MyqIwcdeirCe60GbIQByQtLimfxbIZnO35X3fs/94av0ODfELqrQEpLrpU6FNeHttvlMc5UVrT4K+8lPbqR8Hq0PFWmFrbVIYSi7tAVFMMe2D1C59NWyLu3AkrD3No7YhLVh7LV0Tttr/8FrcZ8xirBPcMZCIGrRIesrHxOsZH2V8t/t0GXCnLLAWX+TNvdNXkB8cF2y9ZXf1enI064yE5dwMs2fQ0yOUG/xornE'
+                // Stimulsoft.Base.StiLicense.Key = '6vJhGtLLLz2GNviWmUTrhSqnOItdDwjBylQzQcAOiHkcgIvwL0jnpsDqRpWg5FI5kt2G7A0tYIcUygBh1sPs7plofUOqPB1a4HBIXJB621mau2oiAIj+ysU7gKUXfjn/D5BocmduNB+ZMiDGPxFrAp3PoD0nYNkkWh8r7gBZ1v/JZSXGE3bQDrCQCNSy6mgby+iFAMV8/PuZ1z77U+Xz3fkpbm6MYQXYp3cQooLGLUti7k1TFWrnawT0iEEDJ2iRcU9wLqn2g9UiWesEZtKwI/UmEI2T7nv5NbgV+CHguu6QU4WWzFpIgW+3LUnKCT/vCDY+ymzgycw9A9+HFSzARiPzgOaAuQYrFDpzhXV+ZeX31AxWlnzjDWqpfluygSNPtGul5gyNt2CEoJD1Yom0VN9fvRonYsMsimkFFx2AwyVpPcs+JfVBtpPbTcZscnzUdmiIvxv8Gcin6sNSibM6in/uUKFt3bVgW/XeMYa7MLGF53kvBSwi78poUDigA2n12SmghLR0AHxyEDIgZGOTbNI33GWu7ZsPBeUdGu55R8w='
+                Stimulsoft.Base.Localization.StiLocalization.addLocalizationFile( '/reports/stimulsoft/Localization/zh-CHS.xml', true, 'zh-CHS')
+                Stimulsoft.Base.Localization.StiLocalization.setLocalizationFile('/reports/stimulsoft/Localization/zh-CHS.xml' )
+                // 工具栏
+                var options = new Stimulsoft.Viewer.StiViewerOptions()
+                options.height = '100%'
+                options.appearance.scrollbarsMode = true // 滚动条模式
+                options.toolbar.showDesignButton = false // 显示设计按钮
+                options.toolbar.showAboutButton = false // 显示关于按钮
+                options.toolbar.showResourcesButton = false // 显示资源按钮
+                options.toolbar.showFullScreenButton = false // 显示全屏按钮
+                options.toolbar.showOpenButton = false // 显示打开按钮
+                options.appearance.showTooltips = false // 显示工具提示
+                options.appearance.showDialogsHelp = false // 显示对话框帮助
+                options.exports.showExportToDocument = false // 显示导出到文档
+                options.toolbar.showParametersButton = true // 显示参数按钮
+                options.appearance.bookmarksPrint = true // 书签打印
+                // options.toolbar.showPrintButton = false // 打印按钮是否显示   下面直接自定义控制打印弹窗是否开启
+
+                // printDestination 参数:用于指定报表打印的目标位置,可以是打印机、PDF 文件或者直接打印到浏览器等。
+                // Stimulsoft.Viewer.StiPrintDestination.Direct:表示直接打印到打印机,即将报表内容直接发送至打印机进行打印。
+                // 通过设置不同的 printDestination 参数,你可以控制报表打印的行为,例如是直接打印到打印机,还是生成 PDF 文件,或者直接在浏览器中预览打印内容等。
+                options.toolbar.printDestination = Stimulsoft.Viewer.StiPrintDestination.Direct
+                // htmlRenderMode html渲染模式
+                options.appearance.htmlRenderMode = Stimulsoft.Report.Export.StiHtmlExportMode.Table
+                // 是创建一个 Stimulsoft 报表查看器的实例的代码
+                let viewer = new Stimulsoft.Viewer.StiViewer(options, 'StiViewer', false)
+
+                // 报表
+                console.log("创建一个报表实例");
+                console.log()
+                let report = new window.Stimulsoft.Report.StiReport();
+
+                // 加载文件
+                console.log("从url加载报表");
+                // report.loadFile("/reports/stimulsoft/demos/SimpleList.mrt");
+                report.load(url)
+
+                data.pageOne = 'Page : 1 of 1'
+                // 处理超长数据
+                if (data.hshipperDetails) {
+                    var consignerIndex2 = data.hshipperDetails.indexOf( '\n' )
+                    for (let i = 0; i < 4; i++) {
+                        consignerIndex2 = data.hshipperDetails.indexOf( '\n', consignerIndex2 + 1 );
+                    }
+                    if (consignerIndex2 != -1) {
+                        var hshipperDetails = data.hshipperDetails.substring(consignerIndex2 + 2, data.hshipperDetails.length)
+                        data.hshipperDetails = data.hshipperDetails.substring(0, consignerIndex2) + ' *'
+                        data.commodityDescr += '\n*' + hshipperDetails
+                    }
+                }
+
+                if (data.hconsigneeDetails) {
+                    var consigneeIndex2 = data.hconsigneeDetails.indexOf( '\n' )
+                    for (let i = 0; i < 3; i++) {
+                        consigneeIndex2 = data.hconsigneeDetails.indexOf( '\n', consigneeIndex2 + 1 );
+                    }
+                    if (consigneeIndex2 != -1) {
+                        var hconsigneeDetails = data.hconsigneeDetails.substring(consigneeIndex2 + 2, data.hconsigneeDetails.length)
+                        data.hconsigneeDetails = data.hconsigneeDetails.substring(0, consigneeIndex2) + ' **'
+                        data.commodityDescr += '\n**' + hconsigneeDetails
+                    }
+                }
+
+                if (data.hnotifyDetails) {
+                    var notifierIndex2 = data.hnotifyDetails.indexOf( '\n' )
+                    for (let i = 0; i < 3; i++) {
+                        notifierIndex2 = data.hnotifyDetails.indexOf( '\n', notifierIndex2 + 1 );
+                    }
+                    if (notifierIndex2 != -1) {
+                        var hnotifyDetails = data.hnotifyDetails.substring(notifierIndex2 + 2, data.hnotifyDetails.length)
+                        data.hnotifyDetails = data.hnotifyDetails.substring(0, notifierIndex2) + ' ***'
+                        data.commodityDescr += '\n***' + hnotifyDetails
+                    }
+                }
+
+                // 处理箱号
+                if (this.isPrintTheBoxNumber) {
+                    data.commodityDescr += '\n.\n.\n'
+                }
+
+                // PLACE & DATE OF ISSUE
+                data.placeAndDateOfIssue = ''
+                if (data.issueAt) {
+                    data.placeAndDateOfIssue += data.issueAt
+                }
+                if (data.issueDate) {
+                    let date = new Date(data.issueDate.replace(/-/g,'/'));
+                    let yyyy = date.getFullYear();
+                    let mmmm = date.toDateString().split(" ")[1]
+                    let dd = date.getDate()
+                    data.placeAndDateOfIssue += ', ' + dd + '-' + mmmm + '-' + yyyy
+                }
+
+                // Total number of containers or packages received by the Carriers
+                if (data.preContainersList) {
+                    let boxMap = new Map();
+                    for (let boxQuantity of data.preContainersList) {
+                        if (boxMap.get(boxQuantity.cntrTypeCode)) {
+                            let v = boxMap.get(boxQuantity.cntrTypeCode)
+                            boxMap.set(boxQuantity.cntrTypeCode, v + boxQuantity.quantity)
+                        } else {
+                            boxMap.set(boxQuantity.cntrTypeCode, boxQuantity.quantity)
+                        }
+                    }
+                    let boxs = ''
+                    boxMap.forEach(function (value, key, map) {
+                        boxs += value + 'x' + key + ', '
+                    })
+                    boxs = boxs.substring(0, boxs.length - 2)
+
+                    data.boxQuantity = boxs + ' CONTAINER(S) ONLY'
+                }
+
+                // Number of original B/Ls
+                if (data.numberOfObl) {
+                    data.numberOfObl += ' (' + data.numberOfOblDigit + ')'
+                }
+
+                if (data.commodityDescr) {
+                    var descriptionIndex2 = data.commodityDescr.indexOf( '\n' )
+                    for (let i = 0; i < 19; i++) {
+                        descriptionIndex2 = data.commodityDescr.indexOf( '\n', descriptionIndex2 + 1 );
+                    }
+                    if (descriptionIndex2 != -1) {
+                        data.pageOne = 'Page : 1 of 2'
+                        data.pageTwo = 'Page : 2 of 2'
+                        var extraLongText = data.commodityDescr.substring(descriptionIndex2 + 2, data.commodityDescr.length)
+                        data.commodityDescr = data.commodityDescr.substring(0, descriptionIndex2)
+                        data.extraLongTips = '** TO BE CONTINUED ON ATTACHED LIST **'
+                        data.extraLongText = extraLongText
+                    }
+                }
+
+                // console.log(data.hshipperDetails, 'hshipperDetails2')
+
+                // 创建一个 Stimulsoft 数据集(DataSet)的实例的代码
+                var dataSet = new Stimulsoft.System.Data.DataSet(
+                    'reportData'
+                )
+
+                dataSet.readJson(data) // 用于将 JSON 格式的数据加载到数据集中。data 是包含报表数据的 JSON 对象。
+                // 这是一个方法调用,用于在报表中注册数据源。参数 'reportData' 是数据源的名称,
+                // 第二个 'reportData' 是数据源的别名,dataSet 则是之前创建的数据集实例
+                report.regData('reportData', 'reportData', dataSet)
+                // 从模版和数据加载报表
+                // loadReport(report, '', {})
+
+                // 这是将报表对象指定给报表查看器的属性。viewer 是报表查看器的实例,而 report 是之前创建的报表对象。
+                viewer.report = report;
+
+                this.$refs.reportContainer.showContainer(
+                    ()=> {
+                        setTimeout(() => {
+                            viewer.renderHtml('reportContainer')
+                            this.createViewerButtons(viewer)
+                        }, 50)
+                    },
+                    ()=>{
+                    },
+                )
+                console.log("加载成功完成!");
+            },
+            createViewerButtons (viewer){
+                viewer.jsObject.collections.images['myClose.png'] =
+                    'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAA0ElEQVQ4ja3TO05CQRQG4A8iOwAbtYWETndAaecK7NwCKmETtJZsSBNLobEz8ZFIJQ0UnOGSm3DnYviTybzO/895DQXGWGCVGQuMEqkRcwcfuMOLalziCaf4TIe9UG9nyMJmFRzNGoRK1BU4xxx9G7cfwostciGk+x8MqgySwDXe4tU53hVV+MNtTmAoX84JGv9NYgrHyR6DV8wUSW7hItZLm36ZVoVQxsFJLOMsPOrH/h7dQwR2cdxOTEn8DtUbPGc4V2H7Vb4Yqfedf/GYSGt8VUmxgyfuBAAAAABJRU5ErkJggg=='
+                const closeBtn = viewer.jsObject.SmallButton(
+                    'closeBtn',
+                    '关闭',
+                    'myClose.png'
+                )
+                // 增加打印弹窗配置
+                const printBtn = viewer.jsObject.SmallButton(
+                    'printBtn',
+                    '打印报表',
+                    'myClose.png'
+                )
+                // console.log(viewer.jsObject.print(),'1013')
+                // 获取 关闭按钮的dom元素位置
+                const toolbarTable = viewer.jsObject.controls.toolbar.firstChild.firstChild
+                const buttonsTable = toolbarTable.rows[0].lastChild.lastChild
+                const userButtonCell = buttonsTable.rows[0].insertCell(0)
+                // 获取打印按钮的位置
+                const buttonsTablePrint = toolbarTable.rows[0].childNodes[0].lastChild // 打印按钮
+                const userButtonPrint = buttonsTablePrint.rows[0].childNodes[0] // 打印按钮dom位置
+
+
+                userButtonPrint.addEventListener("click", (event)=>{
+                    console.log("打印点击");
+                    // event.preventDefault()
+                });
+                userButtonPrint.addEventListener("mouseover", (event) => {
+                    console.log("移入打印按钮");
+                    console.log(event,1035)
+
+                });
+
+                userButtonCell.className = 'stiJsViewerClearAllStyles'
+                userButtonCell.appendChild(closeBtn) // 添加关闭节点
+
+                // userButtonPrint.prepend(printBtn) // 在 printBtn 节点里最前面增加一个子级节点
+
+
+                let that=this
+                // 关闭按钮的监听点击
+                closeBtn.action = function() {
+                    console.log(that.$refs.ReportContainer,'1022')
+                    if (that.$refs.reportContainer)
+                        that.$refs.reportContainer.hideContainer()
+                }
+
+                // // // 打印按钮监听
+                // printBtn.action = (e)=>{
+                //     console.log('打印')
+                //     window.print()
+                // }
+
+            },
 
         }
     }
@@ -851,7 +1039,10 @@
     font-weight: bold;
 }
 .weightnum {
-    font-size: 15px;
+    font-size: 18px;
     font-weight: 500;
 }
+/deep/.el-dialog .el-dialog__body {
+    padding: 0px 20px;
+}
 </style>

+ 134 - 281
src/views/iosBasicData/PaymentApplication/index.vue

@@ -66,9 +66,10 @@
   import {getWorkDicts} from "@/api/system/dictbiz";
   import finstlbillsitems from "@/views/iosBasicData/PaymentApplication/assembly/finstlbillsitems.vue";
   import {getRateList} from "@/api/iosBasicData/rateManagement";
+  import reports from "@/views/iosBasicData/SeafreightExportF/bills/assembly/reports.vue";
 
   export default {
-      components:{finstlbillsitems, finstlbillsDetails},
+      components:{finstlbillsitems, finstlbillsDetails,reports},
     data() {
       return {
           // 详情页面和列表切换
@@ -88,356 +89,205 @@
           calcHeight: 30,
           tip: false,
           searchShow: true,
-          searchMenuSpan: 6,
+          searchMenuSpan: 4,
           border: true,
           index: true,
           viewBtn: true,
           selection: true,
           dialogClickModal: false,
-            menuWidth:100,
-            expand: true,
-            rowKey:'id',
+          menuWidth:100,
+          expand: true,
+          rowKey:'id',
+          searchIndex:3,
+          searchIcon:true,
           column: [
             {
-              label: "业务类型",
-              prop: "businessType",
-            },
-            {
-                label: "MB/L NO",
-                prop: "mblno",
+                label: "付费对象",
+                prop: "corpCnName",
                 search:true,
+                width:"120",
                 overHidden:true
             },
             {
-              label: "单据编号",
-              prop: "billNo",
-              search:true,
-              overHidden:true
-            },
-            {
-              label: "对账/结算日期",
-              prop: "billDate",
-              width:"150",
-              overHidden:true
-            },
-            {
-              label: "客户名称",
-              prop: "corpCnName",
-              search:true,
-              width:"120",
-              overHidden:true
-            },
-            {
-              label: "客户英文名称",
-              prop: "corpEnName",
-              width:"120",
-              overHidden:true
-            },
-            {
-              label: "客户是否已签约",
-              prop: "corpIsSigned",
-              width:"120",
-              dicData:[],
-              props: {
-                  label: "dictValue",
-                  value: "dictKey"
-              },
-              overHidden:true
-            },
-            {
-              label: "客户约号",
-              prop: "corpArgreementNo",
-              overHidden:true
-            },
-            {
-              label: "客户账期备注",
-              prop: "corpAccRemarks",
-              width:"120",
-              overHidden:true
-            },
-            {
-              label: "业务类型",
-              prop: "businessTypes",
-              width:"120",
-              overHidden:true,
-              type:'select',
-              multiple:true,
-              dicData:[
-                  {
-                      label:'海运出口',
-                      value:'SE'
-                  },{
-                      label:'海运进口',
-                      value:'SI'
-                  }
-              ],
-            },
-            {
-              label: "业务单据编号",
-              prop: "businessNo",
-              width:"120",
-              overHidden:true
-            },
-            {
-              label: "账单编号",
-              prop: "accountNo",
-              width:"100",
-              overHidden:true
-            },
-            {
-              label: "对账单编号",
-              prop: "checkNo",
-              width:"100",
-              overHidden:true
-            },
-            {
-              label: "业务所在部门",
-              prop: "deptName",
-              width:"120",
-              overHidden:true
-            },
-            {
-              label: "业务操作",
-              prop: "operatorName",
-              width:"100",
-              overHidden:true
-            },
-            {
-              label: "业务员",
-              prop: "salesName",
-              overHidden:true
-            },
-            {
-              label: "费用收付",
-              prop: "dc",
-              search:true,
-              type: 'select',
-              dicData:[
-                  {
-                      label:'收',
-                      value: 'D'
-                  },{
-                      label:'付',
-                      value: 'C'
-                  }
-              ],
-              overHidden:true
-            },
-            {
-              label: "币种",
-              prop: "curCode",
-              search:true,
-              type: 'select',
-              dicData:[],
-              props: {
-                  label: "code",
-                  value: "id"
-              },
-              overHidden:true
-            },
-            {
-              label: "中文船名",
-              prop: "vesselCnName",
-              overHidden:true
-            },
-            {
-              label: "英文船名",
-              prop: "vesselEnName",
-              overHidden:true
-            },
-            {
-              label: "航次",
-              prop: "voyageNo",
-              overHidden:true
-            },
-            {
-              label: "HB/L NO",
-              prop: "hblno",
-              overHidden:true
-            },
-            {
-              label: "财务开始日期",
-              prop: "accountDateFrom",
-              width: "140",
-              overHidden:true
+                label: "银行账号",
+                prop: "bankAccountNo",
+                width:"120",
+                overHidden:true
             },
             {
-              label: "财务结束日期",
-              prop: "accountDateTo",
-              width: "140",
-              overHidden:true
+                label: "账户名称",
+                prop: "bankAccountName",
+                width:"120",
+                overHidden:true
             },
             {
-              label: "审核开始日期",
-              prop: "auditDateFrom",
-              width: "140",
-              overHidden:true
+                label: "账户银行",
+                prop: "bankAccountBank",
+                width:"120",
+                overHidden:true
             },
             {
-              label: "审核结束日期",
-              prop: "auditDateTo",
-              width: "140",
-              overHidden:true
+                label: "付费事由",
+                prop: "remarks",
+                overHidden:true,
+                search:true,
             },
             {
-              label: "发票号",
-              prop: "invoiceNo",
-              overHidden:true
+                label: "预计收回",
+                prop: "estimatedTime",
+                search:true,
+                type:'date',
+                format: "yyyy-MM-dd HH:mm:ss",
+                valueFormat: 'yyyy-MM-dd HH:mm:ss',
+                width:"120",
+                overHidden:true
             },
             {
-              label: "检验检疫 NO",
-              prop: "iqNo",
-              width: "140",
-              overHidden:true
+                label: "收款情况",
+                prop: "collectionSituation",
+                search:true,
+                width:"120",
+                overHidden:true
             },
             {
-              label: "费用中文名称",
-              prop: "feeCode",
-              width: "140",
-              overHidden:true
+                label: "财务开始日期",
+                prop: "accountDateFrom",
+                width: "140",
+                overHidden:true
             },
             {
-              label: "费用中文名称",
-              prop: "feeCnName",
-              width: "140",
-              overHidden:true
+                label: "财务结束日期",
+                prop: "accountDateTo",
+                width: "140",
+                overHidden:true
             },
             {
-              label: "费用英文名称",
-              prop: "feeEnName",
-              width: "140",
-              overHidden:true
+                label: "业务日期",
+                prop: "billDateList",
+                search:true,
+                hide:true,
+                searchProp: "billDateList",
+                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: "dc",
+                search:true,
+                type: 'select',
+                dicData:[
+                    {
+                        label:'收',
+                        value: 'D'
+                    },{
+                        label:'付',
+                        value: 'C'
+                    }
+                ],
+                overHidden:true
             },
             {
-              label: "是否审核",
-              prop: "isApproved",
+                label: "币种",
+                prop: "curCode",
+                search:true,
+                type: 'select',
                 dicData:[],
                 props: {
-                    label: "dictValue",
-                    value: "dictKey"
+                    label: "code",
+                    value: "id"
                 },
                 overHidden:true
             },
             {
-              label: "是否签收",
-              prop: "isSignfor",
-              dicData:[],
-              props: {
-                label: "dictValue",
-                value: "dictKey"
-              },
+                label: "JOB NO",
+                prop: "businessNo",
+                width:"120",
+                search:true,
                 overHidden:true
             },
             {
-              label: "是否对账",
-              prop: "isChecked",
-                dicData:[],
-                props: {
-                    label: "dictValue",
-                    value: "dictKey"
-                },
+                label: "ACCT NO",
+                prop: "accountNo",
+                width:"100",
+                search:true,
                 overHidden:true
             },
             {
-              label: "是否销账",
-              prop: "isCleared",
-                dicData:[],
-                props: {
-                    label: "dictValue",
-                    value: "dictKey"
-                },
+                label: "MB/L NO",
+                prop: "mblno",
+                search:true,
                 overHidden:true
             },
             {
-              label: "是否开发票",
-              prop: "isInvoice",
-                dicData:[],
-                props: {
-                    label: "dictValue",
-                    value: "dictKey"
-                },
-                width: "140",
+                label: "HB/L NO",
+                prop: "hblno",
+                search:true,
                 overHidden:true
             },
             {
-              label: "是否含税价计算",
-              prop: "isTax",
-                dicData:[],
-                props: {
-                    label: "dictValue",
-                    value: "dictKey"
-                },
-                width: "140",
+                label: "对账单号",
+                prop: "checkNo",
+                search:true,
+                width:"100",
                 overHidden:true
             },
             {
-              label: "凭证类型",
-              prop: "voucherType",
-                overHidden:true
+              label: "业务类型",
+              prop: "businessTypes",
+              width:"120",
+              overHidden:true,
+              type:'select',
+              multiple:true,
+              dicData:[
+                  {
+                      label:'海运出口',
+                      value:'SE'
+                  },{
+                      label:'海运进口',
+                      value:'SI'
+                  }
+              ],
             },
             {
-              label: "凭证号",
-              prop: "voucherNo",
-                overHidden:true
+              label: "船名",
+              prop: "vesselCnName",
+              search:true,
+              overHidden:true
             },
             {
-              label: "凭证日期",
-              prop: "voucherDate",
-                overHidden:true
+              label: "航次",
+              prop: "voyageNo",
+              search:true,
+              overHidden:true
             },
             {
               label: "本位币应收(CNY)",
               prop: "amountDr",
-                width: "160",
-                overHidden:true
+              width: "160",
+              overHidden:true
             },
             {
               label: "本位币应付(CNY)",
               prop: "amountCr",
-                width: "160",
-                overHidden:true
+              width: "160",
+              overHidden:true
             },
             {
               label: "合计本位币应收(CNY)",
               prop: "amountDrLoc",
-                width: "160",
-                overHidden:true
+              width: "160",
+              overHidden:true
             },
             {
               label: "合计本位币应付(CNY)",
               prop: "amountCrLoc",
-                width: "160",
-                overHidden:true
-            },
-            {
-              label: "本位币税后应收(CNY)",
-              prop: "amountDrNet",
-                width: "160",
-                overHidden:true
-            },
-            {
-              label: "本位币税后应付(CNY)",
-              prop: "amountCrNet",
-                width: "160",
-                overHidden:true
-            },
-            {
-              label: "合计本位币税后应收(CNY)",
-              prop: "amountDrLocNet",
-                width: "160",
-                overHidden:true
-            },
-            {
-              label: "合计本位币税后应付(CNY)",
-              prop: "amountCrLocNet",
-                width: "160",
-                overHidden:true
-            },
-            {
-              label: "备注",
-              prop: "remarks",
-                overHidden:true
-
+              width: "160",
+              overHidden:true
             },
           ]
         },
@@ -711,4 +561,7 @@
     background: #ecf5ff !important;
     text-align: center;
 }
+/deep/ .el-col-md-8 {
+    width: 24.33333%;
+}
 </style>

+ 0 - 1
src/views/iosBasicData/SeafreightExportF/bills/assembly/feecenter.vue

@@ -1063,7 +1063,6 @@
             },
             // 打印弹窗里回调
             reportRadio(val){
-                console.log(val,1058)
                 // 多选打印
                 let idArr = this.selectionDList.map(item=>{
                     return item.id

+ 9 - 7
src/views/iosBasicData/SeafreightExportF/bills/assembly/reports.vue

@@ -83,6 +83,10 @@
       disabled:{
         type:Boolean,
         default:false,
+      },
+      businessValue:{
+        type:String,
+        default:''
       }
     },
     data() {
@@ -90,13 +94,9 @@
         userList: [],
         isPrintTheBoxNumber: false,
         bbDisabled: false,
-        form: {
-            businessType:'HYCK'
-        },
+        form: {},
         formReport: {},
-        query: {
-            businessType:'HYCK'
-        },
+        query: {},
         loading: true,
         page: {
           pageSize: 10,
@@ -996,9 +996,10 @@
           this.$refs.crud.rowAdd();
         }
       },
+        // 添加
       rowSave(row, done, loading) {
         row.authorizedUsersId = row.authorizedUsersId.join()
-          row.businessType = 'HYCK'
+          row.businessType = this.businessValue
         add(row).then(() => {
           this.onLoad(this.page);
           this.$message({
@@ -1101,6 +1102,7 @@
       },
       onLoad(page, params = {}) {
         this.loading = true;
+        params.businessType = this.businessValue
         getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
           const data = res.data.data;
           this.page.total = data.total;

+ 1 - 1
src/views/iosBasicData/SeafreightExportF/bills/billsDetails.vue

@@ -225,7 +225,7 @@
                                     <mbinformation :assemblyForm="form" :detailData="detailData"></mbinformation>
                                 </el-tab-pane>
                                 <el-tab-pane label="报表管理" name="fourth">
-                                    <reports :id="form.id" :disabled="detailData.seeDisabled"></reports>
+                                    <reports :id="form.id" :disabled="detailData.seeDisabled" businessValue="HYCK"></reports>
                                 </el-tab-pane>
                                 <el-tab-pane label="EDI CODE" name="sixth">
                                     <edicode :assemblyForm="form" :detailData="detailData"></edicode>

+ 37 - 17
src/views/iosBasicData/bcorps/detailsPage.vue

@@ -123,7 +123,7 @@
             <el-tab-pane label="客户详情" name="kgxq">
               <el-col :span="8">
                 <el-form-item label="企业类型" prop="enterpriseType">
-                  <el-select v-model="formData.enterpriseType" placeholder="请选择信用等级" clearable :style="{ width: '100%' }">
+                  <el-select v-model="formData.enterpriseType" size="small" placeholder="请选择信用等级" clearable :style="{ width: '100%' }">
                     <el-option v-for="(item, index) in enterpriseTypeDict" :key="index" :label="item.dictValue"
                       :value="item.dictKey" :disabled="item.disabled"></el-option>
                   </el-select>
@@ -202,37 +202,37 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="海关号" prop="customsCode">
-                  <el-input v-model="formData.customsCode" placeholder="请输入海关号" clearable :style="{ width: '100%' }">
+                  <el-input v-model="formData.customsCode" size="small" placeholder="请输入海关号" clearable :style="{ width: '100%' }">
                   </el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="负责人" prop="mgrName">
-                  <el-input v-model="formData.mgrName" placeholder="请输入负责人" clearable :style="{ width: '100%' }">
+                  <el-input v-model="formData.mgrName" size="small" placeholder="请输入负责人" clearable :style="{ width: '100%' }">
                   </el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="联系人电话" prop="tel">
-                  <el-input v-model="formData.tel" placeholder="请输入联系人电话" clearable :style="{ width: '100%' }">
+                  <el-input v-model="formData.tel" size="small" placeholder="请输入联系人电话" clearable :style="{ width: '100%' }">
                   </el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="传真" prop="fax">
-                  <el-input v-model="formData.fax" placeholder="请输入传真" clearable :style="{ width: '100%' }">
+                  <el-input v-model="formData.fax" size="small" placeholder="请输入传真" clearable :style="{ width: '100%' }">
                   </el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="SCAC码" prop="scacCode">
-                  <el-input v-model="formData.scacCode" placeholder="请输入SCAC码" clearable :style="{ width: '100%' }">
+                  <el-input v-model="formData.scacCode" size="small" placeholder="请输入SCAC码" clearable :style="{ width: '100%' }">
                   </el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="维护人员" prop="maintenanceStaffName">
-                  <el-input v-model="formData.maintenanceStaffName" placeholder="请输入维护人员" clearable
+                  <el-input v-model="formData.maintenanceStaffName" size="small" placeholder="请输入维护人员" clearable
                     :style="{ width: '100%' }">
                   </el-input>
                 </el-form-item>
@@ -240,7 +240,7 @@
               <el-col :span="8">
                 <el-form-item label="操作员" prop="salesId">
                   <!-- <el-input v-model="formData.salesId" placeholder="请输入业务员" clearable :style="{ width: '100%' }"> -->
-                  <el-select v-model="formData.salesId" filterable @change="salesChange" placeholder="请选择操作员" clearable
+                  <el-select v-model="formData.salesId" size="small" filterable @change="salesChange" placeholder="请选择操作员" clearable
                     :style="{ width: '100%' }">
                     <el-option v-for="(item, index) in userOptions" :key="index" :label="item.realName" :value="item.id"
                       :disabled="item.disabled"></el-option>
@@ -255,13 +255,13 @@
             </el-col> -->
               <el-col :span="8">
                 <el-form-item label="所属单位名称" prop="corpName">
-                  <el-input v-model="formData.corpName" placeholder="请输入名称" clearable :style="{ width: '100%' }">
+                  <el-input v-model="formData.corpName" size="small" placeholder="请输入名称" clearable :style="{ width: '100%' }">
                   </el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="信用等级" prop="creditLevel">
-                  <el-select v-model="formData.creditLevel" placeholder="请输入信用等级" clearable :style="{ width: '100%' }">
+                  <el-select v-model="formData.creditLevel" size="small" placeholder="请输入信用等级" clearable :style="{ width: '100%' }">
                     <el-option v-for="(item, index) in creditLevelDict" :key="index" :label="item.dictValue"
                       :value="item.dictKey" :disabled="item.disabled"></el-option>
                   </el-select>
@@ -270,15 +270,24 @@
               <el-col :span="8">
                 <el-form-item label="PS规则" prop="psRate">
                   <!-- <el-input v-model="formData.psRate" placeholder="请输入PS规则" clearable :style="{ width: '100%' }"> -->
-                  <el-input-number v-model="formData.psRate" controls-position="right" @change="handleChange" :min="0"
-                    :precision="2" :step="1" :style="{ width: '100%' }"></el-input-number>
+                  <!--<el-input-number v-model="formData.psRate" controls-position="right" @change="handleChange" :min="0"-->
+                  <!--  :precision="2" :step="1" :style="{ width: '100%' }"></el-input-number>-->
+                    <search-query :datalist="psRateData"
+                                  :selectValue="formData.psRate"
+                                  :filterable="true"
+                                  :clearable="true"
+                                  :buttonIf="false"
+                                  :forParameter="{key:'dictKey',label:'dictValue',value:'dictKey'}"
+                                  @corpChange="psRateChange($event,'psRate')"
+                                  @corpFocus="psRateWorkDictsfun">
+                    </search-query>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="分管员" prop="adminProfiles">
-                  <el-select v-model="formData.adminProfilesList" multiple @change="adminProfilesChange" filterable
+                  <el-select v-model="formData.adminProfilesList" size="small" multiple @change="adminProfilesChange" filterable
                     placeholder="请选择分管员" :style="{ width: '100%' }">
-                    <el-option v-for="item in userOptions" :key="index" :label="item.realName" :value="item.id"
+                    <el-option v-for="(item,index) in userOptions" :key="index" :label="item.realName" :value="item.id"
                       :disabled="item.disabled">
                     </el-option>
                   </el-select>
@@ -286,19 +295,19 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="存在HP/S" prop="isPs">
-                  <el-switch v-model="formData.isPs" :active-value="1" :inactive-value="0" active-text="开启"
+                  <el-switch v-model="formData.isPs" size="small" :active-value="1" :inactive-value="0" active-text="开启"
                     inactive-text="关闭"></el-switch>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="允许负大于收" prop="psAllowLargeCredit">
-                  <el-switch v-model="formData.psAllowLargeCredit" :active-value="1" :inactive-value="0" active-text="开启"
+                  <el-switch v-model="formData.psAllowLargeCredit" size="small" :active-value="1" :inactive-value="0" active-text="开启"
                     inactive-text="关闭"></el-switch>
                 </el-form-item>
               </el-col>
               <el-col :span="24">
                 <el-form-item label="详情信息" prop="details">
-                  <el-input v-model="formData.details" type="textarea" placeholder="请输入详情信息"
+                  <el-input v-model="formData.details" size="small" type="textarea" placeholder="请输入详情信息"
                     :autosize="{ minRows: 4, maxRows: 4 }" :style="{ width: '100%' }"></el-input>
                 </el-form-item>
               </el-col>
@@ -867,6 +876,7 @@ export default {
   },
   data() {
     return {
+        psRateData:[], // ps 规则数据
         // 客户来源
         sourceTypeData:[
             {
@@ -1124,6 +1134,10 @@ export default {
   },
   mounted() { },
   methods: {
+      // ps 规则下拉
+      psRateChange(value,name){
+          this.$set(this.formData,name,value)
+      },
       // 客户来源下拉
       sourceCorp(value,name){
           if (name == 'srcCnName') {
@@ -1246,6 +1260,12 @@ export default {
         this.rateOptions = res.data.data.records
       })
     },
+      // ps 规则字典数据获取
+      psRateWorkDictsfun(){
+          getWorkDicts('share_ratio-los').then((res) => {
+              this.psRateData = res.data.data
+          });
+      },
       // 国家的下拉赋值
     bcountrysChange(value) {
       this.formData.cntyCode = value

+ 2 - 3
src/views/iosBasicData/fininvoicesApplyfor/assembly/fininvoicesitems.vue

@@ -113,7 +113,7 @@
                 label="本次发票金额" width="120px">
                 <template slot-scope="{row}">
                     <el-input style="width: 100%;" v-model="row.currentAmount"
-                              size="mini" autocomplete="off"
+                              size="mini" autocomplete="off" @input=""
                               clearable placeholder="请输入本次发票金额" >
                     </el-input>
                 </template>
@@ -225,8 +225,7 @@
                 for (let item of this.curCodeData) {
                     if (item.code == value) {
                         this.$set(row,'currentCurCode',item.code)
-                        this.$set(row,'currentExrate',item.exrate) // 本次发票税率
-
+                        this.$set(row,'currentExrate',item.exrate) // 本次发票汇率
                         if (value == 'USD') {
                             this.$set(row,'currentAmountLoc',(Number(row.amount) * Number(row.currentExrate)).toFixed(2))
                         }else {

+ 3 - 3
src/views/iosBasicData/fininvoicesApplyfor/fininvoicesDetails.vue

@@ -557,7 +557,7 @@
 
                 <el-card style="margin-top: 10px">
                     <div style="margin-bottom: 10px;display: flex;justify-content: space-between">
-                        <el-button size="small" type="danger">删 除</el-button>
+                        <el-button size="small" type="danger" >删 除</el-button>
                         <!--<div>-->
                         <!--    <el-button size="small" type="primary">新 建</el-button>-->
                         <!--    <el-button size="small" type="danger">删 除</el-button>-->
@@ -634,7 +634,7 @@ export default {
             }
         },
         methods:{
-            // 删除
+            // 单个删除
             detailsdeletionfun(id){
                 this.$confirm("确定将选择数据删除?", {
                     confirmButtonText: "确定",
@@ -769,7 +769,7 @@ export default {
                 obj.businessType = this.form.businessTypes?this.form.businessTypes.join(','):'' // 业务类型
                 finstlbillslistAccBillV1(obj).then(res=>{
                     this.tableData = res.data.data.map((item,index)=>{
-                        item.lineNo = index // 行号
+                        item.lineNo = Number(index) + 1 // 行号
                         item.accBillId = item.id
                         item.accBillNo = item.billNo
                         item.accDate = item.createTime