货代修改bug,轮胎商城弹窗检索 2023-12-05

src/api/iosBasicData/fininvoices.js

@@ -57,4 +57,29 @@ export const fininvoicesRevokeFinInvoices = (row) => {
     data: row
   })
 }
+// 发票申请 销项
+export const finInvoicesApprove = (row) => {
+  return request({
+    url: '/api/blade-los/fininvoices/finInvoicesApprove',
+    method: 'post',
+    data: row
+  })
+}
+// 发票申请撤销 销项
+export const revokeFinInvoicesApprove = (row) => {
+  return request({
+    url: '/api/blade-los/fininvoices/revokeFinInvoicesApprove',
+    method: 'post',
+    data: row
+  })
+}
+// 业务-发票申请明细
+export const fininvoicesApproveDetail = (data) => {
+  return request({
+    url: '/api/blade-los/fininvoices/approveDetail',
+    method: 'get',
+    params: data
+  })
+}
+
 

src/api/iosBasicData/reports.js

@@ -56,4 +56,11 @@ export const reportsGetReportData = (row) => {
     params: row
   })
 }
-
+// 保存打印记录接口
+export const reportslogSubmit = (row) => {
+  return request({
+    url: '/api/blade-los/reportslog/submit',
+    method: 'post',
+    data: row
+  })
+}

src/enums/column-name.js

@@ -1411,6 +1411,10 @@ const columnName = [{
   },
   {
     code: 316,
+    name: '货运代理-账单管理-付款申请'
+  },
+  {
+    code: 316.1,
     name: '货运代理-账单管理-付费申请'
   },
   {
@@ -1419,7 +1423,15 @@ const columnName = [{
   },
   {
     code: 318,
-    name: '货运代理-账单管理-发票中心'
+    name: '货运代理-账单管理-进项发票'
+  },
+  {
+    code: 319,
+    name: '货运代理-账单管理-销项发票'
+  },
+  {
+    code: 320,
+    name: '货运代理-账单管理-发票申请'
   },
 ]
 export const getColumnName = (key) => {

src/views/approveDataH/index.vue

@@ -17,11 +17,13 @@
       </template>
       <template slot-scope="scope" slot="checkType">
         <span v-if="scope.row.checkType == 'HYCK-FFSQ'">付费申请</span>
+          <span v-if="scope.row.checkType == 'HYCK-FPSQ'">发票申请</span>
         <span v-else-if="scope.row.checkType == 'HYCK-DJ'">海运出口</span>
         <span v-else-if="scope.row.checkType == 'HYCK-FY'">海运出口费用</span>
         <span v-else-if="scope.row.checkType == 'HYJK-DJ'">海运进口</span>
         <span v-else-if="scope.row.checkType == 'HYJK-FY'">海运进口费用</span>
 
+
       </template>
         <template slot-scope="scope" slot="billNo">
             <span style="color: #1e9fff" @click="billNoDetails(scope.row)">{{scope.row.billNo}}</span>
@@ -79,7 +81,7 @@ import {corpsDescListAll} from "../../api/tirePartsMall/salesManagement/saleOrde
 
 import reportContainerlos from "@/views/iosBasicData/report-container/report-container-los.vue"
 import {finstlbillsDetail} from "../../api/iosBasicData/finstlbills";
-import {reportsGetReportData} from "@/api/iosBasicData/reports";
+import {reportsGetReportData, reportslogSubmit} from "@/api/iosBasicData/reports";
 
 let previousRouterName = "";
 let checkRefresh = "";
@@ -91,6 +93,7 @@ export default {
   },
   data() {
     return {
+        reportlist:[], // 报表数据
       corpsList: [],
       loading: false,
       form: {},
@@ -183,6 +186,7 @@ export default {
             })
             return item
         })
+        this.reportlist = data // 存一下数据 打印的时候需要传
         console.log(data,220)
         // 报表取的是最后一项，把第一项的数据赋值给最后一项
         data[data.length - 1].amountDrUsd = data[0].amountDrUsd
@@ -204,25 +208,19 @@ export default {
       // 工具栏
       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.printDestination = Stimulsoft.Viewer.StiPrintDestination.Direct
-
       options.appearance.htmlRenderMode = Stimulsoft.Report.Export.StiHtmlExportMode.Table
-
       let viewer = new Stimulsoft.Viewer.StiViewer(options, 'StiViewer', false)
 
       // 报表
@@ -265,8 +263,14 @@ export default {
         // printButton.events.add('PrintReport', handlePrintReport);
       console.log("加载成功完成!");
     },
-
-
+      // 保存打印记录接口
+      reportslogSubmitfun(){
+          // reportlist
+          reportslogSubmit().then(res=>{
+              console.log(res,267)
+          })
+      },
+      // 报表的按钮
       createViewerButtons (viewer){
           viewer.jsObject.collections.images['myClose.png'] =
               'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAA0ElEQVQ4ja3TO05CQRQG4A8iOwAbtYWETndAaecK7NwCKmETtJZsSBNLobEz8ZFIJQ0UnOGSm3DnYviTybzO/895DQXGWGCVGQuMEqkRcwcfuMOLalziCaf4TIe9UG9nyMJmFRzNGoRK1BU4xxx9G7cfwostciGk+x8MqgySwDXe4tU53hVV+MNtTmAoX84JGv9NYgrHyR6DV8wUSW7hItZLm36ZVoVQxsFJLOMsPOrH/h7dQwR2cdxOTEn8DtUbPGc4V2H7Vb4Yqfedf/GYSGt8VUmxgyfuBAAAAABJRU5ErkJggg=='

src/views/iosBasicData/PaymentApplication/index.vue

@@ -20,8 +20,8 @@
                      @current-change="currentChange"
                      @size-change="sizeChange"
                      @refresh-change="refreshChange"
-                     @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 316)"
-                     @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 316)"
+                     @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 316.1)"
+                     @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 316.1)"
                      @on-load="onLoad" @expand-change="expandChange" >
               <template slot="expand" slot-scope="{row}">
                   <finstlbillsitems :tableData="row.finStlBillsItemsList || []" :brfalse="false" ></finstlbillsitems>
@@ -443,7 +443,7 @@
       }
     },
     async created() {
-      this.option = await this.getColumnData(this.getColumnName(316), this.optionBack);
+      this.option = await this.getColumnData(this.getColumnName(316.1), this.optionBack);
       this.dictionaryfun() // 获取字典数据
         this.getRateListfun() // 币别数据
     },

src/views/iosBasicData/SeafreightExportF/bills/assembly/DistributionBox/PackingBusiness.vue

@@ -1,165 +1,170 @@
 <template>
     <div>
-        <div class="tbasTop">
-            <el-table
-                :row-style="{height:'20px',padding:'0px',fontSize:'12px'}"
-                :cell-style="{padding:'0px',fontSize:'12px'}"
-                :data="assemblyForm.waitingBoxList"
-                :header-cell-style="tableHeaderCellStyle"
-                border
-                stripe
-                height="300px"
-                style="width: 100%">
-                <el-table-column
-                    prop="billNo"
-                    label="BILLNO">
-                </el-table-column>
-                <el-table-column
-                    prop="hblno"
-                    label="H B/L NO">
-                </el-table-column>
-                <el-table-column
-                    prop="corpCnName"
-                    label="客户">
-                </el-table-column>
-                <el-table-column
-                    prop="polCnName"
-                    label="目的港">
-                </el-table-column>
-                <el-table-column
-                    prop="editQuantity"
-                    label="件数">
-                    <template slot-scope="scope">
-                        <el-input v-if="scope.row.edit"
-                                  type="numbers" size="small"
-                                  v-model="scope.row.editQuantity"
-                                  clearable placeholder="请输入件数" @blur="quantityBlur(scope.row)"
-                        ></el-input>
-                        <span v-else>{{Number(scope.row.editQuantity).toFixed(0)}}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column
-                    prop="editGrossWeight"
-                    label="毛重">
-                    <template slot-scope="scope">
-                        <el-input v-if="scope.row.edit"
-                                  type="numbers" size="small"
-                                  v-model="scope.row.editGrossWeight"
-                                  clearable placeholder="请输入毛重"
-                        ></el-input>
-                        <span v-else>{{Number(scope.row.editGrossWeight).toFixed(2)}}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column
-                    prop="editMeasurement"
-                    label="尺码(体积)">
-                    <template slot-scope="scope">
-                        <el-input v-if="scope.row.edit"
-                                  type="numbers" size="small"
-                                  v-model="scope.row.editMeasurement"
-                                  clearable placeholder="请输入尺码(体积)"
-                        ></el-input>
-                        <span v-else>{{Number(scope.row.editMeasurement).toFixed(2)}}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column
-                    prop="quantity"
-                    label="总件数">
-                    <template slot-scope="scope">
-                        {{Number(scope.row.quantity).toFixed(0)}}
-                    </template>
-                </el-table-column>
-                <el-table-column
-                    prop="grossWeight"
-                    label="总毛重">
-                    <template slot-scope="scope">
-                        {{Number(scope.row.grossWeight).toFixed(2)}}
-                    </template>
-                </el-table-column>
-                <el-table-column
-                    prop="measurement"
-                    label="总尺码(体积)">
-                    <template slot-scope="scope">
-                        {{Number(scope.row.measurement).toFixed(2)}}
-                    </template>
-                </el-table-column>
-                <el-table-column
-                    label="操作"
-                    width="100">
-                    <template slot-scope="scope">
-                        <el-button type="text" size="small" v-if="scope.row.edit"
-                                   :disabled="detailData.seeDisabled" @click="waitingBoxeditfun(scope.row,false)">保存</el-button>
-                        <el-button type="text" size="small" v-else
-                                   :disabled="detailData.seeDisabled" @click="waitingBoxeditfun(scope.row,true)">编辑</el-button>
-                        <el-button type="text" size="small"
-                                   :disabled="detailData.seeDisabled" @click="allocationfun(scope.row)">分配</el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-        </div>
+        <el-tabs v-model="activeName">
+            <el-tab-pane label="装箱" name="first">
+                <div class="tbasTop">
+                    <el-table
+                        :row-style="{height:'20px',padding:'0px',fontSize:'12px'}"
+                        :cell-style="{padding:'0px',fontSize:'12px'}"
+                        :data="assemblyForm.waitingBoxList"
+                        :header-cell-style="tableHeaderCellStyle"
+                        border
+                        stripe
+                        height="300px"
+                        style="width: 100%">
+                        <el-table-column
+                            prop="billNo"
+                            label="BILLNO">
+                        </el-table-column>
+                        <el-table-column
+                            prop="hblno"
+                            label="H B/L NO">
+                        </el-table-column>
+                        <el-table-column
+                            prop="corpCnName"
+                            label="客户">
+                        </el-table-column>
+                        <el-table-column
+                            prop="polCnName"
+                            label="目的港">
+                        </el-table-column>
+                        <el-table-column
+                            prop="editQuantity"
+                            label="件数">
+                            <template slot-scope="scope">
+                                <el-input v-if="scope.row.edit"
+                                          type="numbers" size="small"
+                                          v-model="scope.row.editQuantity"
+                                          clearable placeholder="请输入件数" @blur="quantityBlur(scope.row)"
+                                ></el-input>
+                                <span v-else>{{Number(scope.row.editQuantity).toFixed(0)}}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column
+                            prop="editGrossWeight"
+                            label="毛重">
+                            <template slot-scope="scope">
+                                <el-input v-if="scope.row.edit"
+                                          type="numbers" size="small"
+                                          v-model="scope.row.editGrossWeight"
+                                          clearable placeholder="请输入毛重"
+                                ></el-input>
+                                <span v-else>{{Number(scope.row.editGrossWeight).toFixed(2)}}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column
+                            prop="editMeasurement"
+                            label="尺码(体积)">
+                            <template slot-scope="scope">
+                                <el-input v-if="scope.row.edit"
+                                          type="numbers" size="small"
+                                          v-model="scope.row.editMeasurement"
+                                          clearable placeholder="请输入尺码(体积)"
+                                ></el-input>
+                                <span v-else>{{Number(scope.row.editMeasurement).toFixed(2)}}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column
+                            prop="quantity"
+                            label="总件数">
+                            <template slot-scope="scope">
+                                {{Number(scope.row.quantity).toFixed(0)}}
+                            </template>
+                        </el-table-column>
+                        <el-table-column
+                            prop="grossWeight"
+                            label="总毛重">
+                            <template slot-scope="scope">
+                                {{Number(scope.row.grossWeight).toFixed(2)}}
+                            </template>
+                        </el-table-column>
+                        <el-table-column
+                            prop="measurement"
+                            label="总尺码(体积)">
+                            <template slot-scope="scope">
+                                {{Number(scope.row.measurement).toFixed(2)}}
+                            </template>
+                        </el-table-column>
+                        <el-table-column
+                            label="操作"
+                            width="100">
+                            <template slot-scope="scope">
+                                <el-button type="text" size="small" v-if="scope.row.edit"
+                                           :disabled="detailData.seeDisabled" @click="waitingBoxeditfun(scope.row,false)">保存</el-button>
+                                <el-button type="text" size="small" v-else
+                                           :disabled="detailData.seeDisabled" @click="waitingBoxeditfun(scope.row,true)">编辑</el-button>
+                                <el-button type="text" size="small"
+                                           :disabled="detailData.seeDisabled" @click="allocationfun(scope.row)">分配</el-button>
+                            </template>
+                        </el-table-column>
+                    </el-table>
+                </div>
+            </el-tab-pane>
+            <el-tab-pane label="货物明细" name="second">
+                <div class="tbasTop">
+                    <el-table
+                        :row-style="{height:'20px',padding:'0px',fontSize:'12px'}"
+                        :cell-style="{padding:'0px',fontSize:'12px',textAlign:'center'}"
+                        :data="containersBillsList"
 
-        <div class="tbasTop">
-            <el-table
-                :row-style="{height:'20px',padding:'0px',fontSize:'12px'}"
-                :cell-style="{padding:'0px',fontSize:'12px',textAlign:'center'}"
-                :data="containersBillsList"
-
-                :header-cell-style="tableHeaderCellStyle"
-                border
-                stripe
-                height="300px"
-                style="width: 100%">
-                <el-table-column
-                    prop="code"
-                    label="业务编号">
-                </el-table-column>
-                <el-table-column
-                    prop="hblno"
-                    label="HBLNO">
-                </el-table-column>
-                <el-table-column
-                    prop="mblno"
-                    label="MBLNO">
-                </el-table-column>
-                <el-table-column
-                    prop="polCnName"
-                    label="目的港">
-                </el-table-column>
-                <el-table-column
-                    prop="quantity"
-                    label="件数">
-                    <template slot-scope="scope">
-                        {{Number(scope.row.quantity).toFixed(0)}}
-                    </template>
-                </el-table-column>
-                <el-table-column
-                    prop="grossWeight"
-                    label="毛重">
-                    <template slot-scope="scope">
-                        {{Number(scope.row.grossWeight).toFixed(2)}}
-                    </template>
-                </el-table-column>
-                <el-table-column
-                    prop="measurement"
-                    label="尺码">
-                    <template slot-scope="scope">
-                        {{Number(scope.row.measurement).toFixed(2)}}
-                    </template>
-                </el-table-column>
-                <el-table-column
-                    prop="remarks"
-                    label="备注">
-                </el-table-column>
-                <el-table-column
-                    label="操作"
-                    width="100">
-                    <template slot-scope="scope">
-                        <el-button type="text" size="small"
-                                   :disabled="detailData.seeDisabled" @click="withdrawfun(scope.row,scope.$index)">撤回</el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-        </div>
+                        :header-cell-style="tableHeaderCellStyle"
+                        border
+                        stripe
+                        height="300px"
+                        style="width: 100%">
+                        <el-table-column
+                            prop="code"
+                            label="业务编号">
+                        </el-table-column>
+                        <el-table-column
+                            prop="hblno"
+                            label="HBLNO">
+                        </el-table-column>
+                        <el-table-column
+                            prop="mblno"
+                            label="MBLNO">
+                        </el-table-column>
+                        <el-table-column
+                            prop="polCnName"
+                            label="目的港">
+                        </el-table-column>
+                        <el-table-column
+                            prop="quantity"
+                            label="件数">
+                            <template slot-scope="scope">
+                                {{Number(scope.row.quantity).toFixed(0)}}
+                            </template>
+                        </el-table-column>
+                        <el-table-column
+                            prop="grossWeight"
+                            label="毛重">
+                            <template slot-scope="scope">
+                                {{Number(scope.row.grossWeight).toFixed(2)}}
+                            </template>
+                        </el-table-column>
+                        <el-table-column
+                            prop="measurement"
+                            label="尺码">
+                            <template slot-scope="scope">
+                                {{Number(scope.row.measurement).toFixed(2)}}
+                            </template>
+                        </el-table-column>
+                        <el-table-column
+                            prop="remarks"
+                            label="备注">
+                        </el-table-column>
+                        <el-table-column
+                            label="操作"
+                            width="100">
+                            <template slot-scope="scope">
+                                <el-button type="text" size="small"
+                                           :disabled="detailData.seeDisabled" @click="withdrawfun(scope.row,scope.$index)">撤回</el-button>
+                            </template>
+                        </el-table-column>
+                    </el-table>
+                </div>
+            </el-tab-pane>
+        </el-tabs>
     </div>
 </template>
 
@@ -168,7 +173,7 @@
     export default {
         props:{
             assemblyForm:{},
-            detailData:{}
+            detailData:{},
         },
         data(){
             return {
@@ -178,6 +183,8 @@
                 subtractContainersBillsList:[],
                 // 要选择的数据
                 waitingBoxList:[],
+                // tabs切换
+                activeName:"first",
             }
         },
         created() {

src/views/iosBasicData/SeafreightExportF/bills/assembly/feecenter.vue

@@ -106,7 +106,7 @@
                                       @corpChange="corpChange($event,'corpCnName',row)"
                                       @corpFocus="getBcorpsListfun($event,'corpCnName')" >
                         </search-query>
-                        <span v-else>{{row.corpCnName}}</span>
+                        <span v-else >{{row.corpCnName}}</span>
                     </template>
                     <template slot="feeCnName" slot-scope="{ row }">
                         <search-query v-if="row.edit"
@@ -121,7 +121,7 @@
                                       @corpChange="corpChange($event,'feeCnName',row)"
                                       @corpFocus="bfeesListfun($event,'feeCnName')" >
                         </search-query>
-                        <span v-else>{{row.feeCnName}}</span>
+                        <span v-else >{{row.feeCnName}}</span>
                     </template>
                     <template slot="paymode" slot-scope="{ row }">
                         <el-select v-if="row.edit" v-model="row.paymode" size="small" placeholder="请选择">

src/views/iosBasicData/SeafreightExportF/bills/assembly/reports.vue

@@ -676,11 +676,11 @@
               })
               return item
           })
-          console.log(data,762)
 
               var dataSet = new Stimulsoft.System.Data.DataSet(
                 'reportData'
               )
+
               dataSet.readJson(data)
               report.regData('reportData', 'reportData', dataSet)
               // 从模版和数据加载报表
@@ -711,29 +711,31 @@
           // 工具栏
           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.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();
 
           // 加载文件
@@ -767,7 +769,6 @@
                       return item
                   })
                   console.log(data,762)
-              // console.log('hshipperDetails')
               // console.log(data.hshipperDetails, 'hshipperDetails')
 
               // var aaa = data.hshipperDetails.split('\n')
@@ -872,14 +873,19 @@
               // console.log(data.hshipperDetails, 'hshipperDetails2')
 
 
+              // 创建一个 Stimulsoft 数据集（DataSet）的实例的代码
               var dataSet = new Stimulsoft.System.Data.DataSet(
                 'reportData'
               )
-              dataSet.readJson(data)
+
+              dataSet.readJson(data) // 用于将 JSON 格式的数据加载到数据集中。data 是包含报表数据的 JSON 对象。
+              // 这是一个方法调用，用于在报表中注册数据源。参数 'reportData' 是数据源的名称，
+              // 第二个 'reportData' 是数据源的别名，dataSet 则是之前创建的数据集实例
               report.regData('reportData', 'reportData', dataSet)
             // 从模版和数据加载报表
             // loadReport(report, '', {})
 
+              // 这是将报表对象指定给报表查看器的属性。viewer 是报表查看器的实例，而 report 是之前创建的报表对象。
               viewer.report = report;
             })
           }
@@ -898,6 +904,7 @@
 
           console.log("加载成功完成!");
       },
+
       loadReport(report, content, data){
         var mimeString = content
           .split(',')[0]
@@ -932,6 +939,7 @@
 
       },
       createDesignerButtons(e) {
+          console.log(e,936)
         if (!!e) {
           try {
             this.designer.jsObject.options.menus.localizationMenu.addEventListener(
@@ -1003,19 +1011,37 @@
           '关闭',
           '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] // 打印按钮dom位置
+
         userButtonCell.className = 'stiJsViewerClearAllStyles'
-        userButtonCell.appendChild(closeBtn)
+        userButtonCell.appendChild(closeBtn) // 添加关闭节点
+
+        userButtonPrint.prepend(printBtn) // 在 printBtn 节点里最前面增加一个子级节点
 
         let that=this
         closeBtn.action = function() {
-          console.log(that.$refs.ReportContainer)
+          console.log(that.$refs.ReportContainer,'1022')
           if (that.$refs.reportContainer)
-            that.$refs.reportContainer.hideContainer()
+          that.$refs.reportContainer.hideContainer()
         }
+          // 打印按钮监听
+          printBtn.action = (e)=>{
+              console.log(e,1042)
+          }
+
       },
 
 

src/views/iosBasicData/fininvoices/fininvoicesDetails.vue

@@ -730,8 +730,8 @@ export default {
                 }
                 // 进项  销项
                 this.form.type = '进项'
-                this.form.billNoFormat = 'HYFP'
-                this.form.businessTypeCode = 'HYFP'
+                this.form.billNoFormat = 'JXFP'
+                this.form.businessTypeCode = 'JXFP'
                 this.form.businessTypes = this.form.businessTypes?this.form.businessTypes.join(','):''
                 if (!this.form.id) {
                     this.form.finInvoicesItemsList = this.handleSelectionData

src/views/iosBasicData/fininvoices/index.vue

@@ -89,10 +89,9 @@ import {
 } from "@/api/iosBasicData/fininvoices";
 import fininvoicesDetails from "@/views/iosBasicData/fininvoices/fininvoicesDetails.vue";
   import {mapGetters} from "vuex";
-import finstlbillsDetails from "@/views/iosBasicData/finstlbills/finstlbillsDetails.vue";
 
   export default {
-      components:{finstlbillsDetails, fininvoicesDetails},
+      components:{ fininvoicesDetails},
     data() {
       return {
           // 详情页面和列表切换
@@ -133,6 +132,7 @@ import finstlbillsDetails from "@/views/iosBasicData/finstlbills/finstlbillsDeta
             {
               label: "单据日期",
               prop: "billDate",
+              search:true,
               rules: [{
                 required: true,
                 message: "请输入单据日期",
@@ -655,7 +655,8 @@ import finstlbillsDetails from "@/views/iosBasicData/finstlbills/finstlbillsDeta
       },
       onLoad(page, params = {}) {
         this.loading = true;
-        fininvoicesList(page.currentPage, page.pageSize, {...Object.assign(params, this.query),type:"进项"}).then(res => {
+        fininvoicesList(page.currentPage, page.pageSize,
+            {...Object.assign(params, this.query),type:"进项",billNoFormat:'JXFP',businessTypeCode:'JXFP'}).then(res => {
           const data = res.data.data;
           this.page.total = data.total;
           this.data = data.records;

src/views/iosBasicData/fininvoicesApplyfor/fininvoicesDetails.vue

@@ -8,10 +8,10 @@
             </div>
             <div class="add-customer-btn">
                 <el-button  size="small" type="warning" plain  style="margin-right: 8px" :disabled="!form.id" v-if="form.status == 1"
-                            :loading="saveLoading" @click="fininvoicesRevokeFinInvoicesfun">撤销发票
+                            :loading="saveLoading" @click="revokeFinInvoicesApprovefun">撤销申请
                 </el-button>
                 <el-button  size="small" type="success" plain  style="margin-right: 8px" :disabled="!form.id" v-else
-                            :loading="saveLoading" @click="fininvoicesConfirmFinInvoicesfun">确认发票
+                            :loading="saveLoading" @click="finInvoicesApprovefun">确认申请
                 </el-button>
                 <el-button  size="small" type="primary" style="margin-right: 8px" v-if="editSave"
                             :loading="saveLoading" @click="editHandle">编 辑
@@ -577,23 +577,22 @@
 </template>
 
 <script>
-import fininvoicesitems from "@/views/iosBasicData/fininvoices/assembly/fininvoicesitems.vue";
+import fininvoicesitems from "@/views/iosBasicData/fininvoicesApplyfor/assembly/fininvoicesitems.vue";
 import {getRateList} from "@/api/iosBasicData/rateManagement";
 import {finstlbillslistAccBillV1} from "@/api/iosBasicData/finstlbills";
 import {bcorpsbankList, getBcorpsList} from "@/api/iosBasicData/bcorps";
 import {bportsList} from "@/api/iosBasicData/bports";
 import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
 import {
-    fininvoicesConfirmFinInvoices,
+    finInvoicesApprove,
     fininvoicesDetail,
-    fininvoicesRevokeFinInvoices,
+    revokeFinInvoicesApprove,
     fininvoicesSubmit
 } from "@/api/iosBasicData/fininvoices";
-import finstlbillsitems from "@/views/iosBasicData/finstlbills/assembly/finstlbillsitems.vue";
 import {getWorkDicts} from "@/api/system/dictbiz";
 
 export default {
-        components:{finstlbillsitems, SearchQuery, fininvoicesitems},
+        components:{ SearchQuery, fininvoicesitems},
         data() {
             return {
                 pageLoading:false, // 全屏加载
@@ -631,7 +630,6 @@ export default {
             }
         },
         methods:{
-            fininvoicesConfirmFinInvoices,
             // 下拉框的回调
             corpChange(value,name){
                 // 结算单位
@@ -721,9 +719,9 @@ export default {
                     return
                 }
                 // 进项  销项
-                this.form.type = '进项'
-                this.form.billNoFormat = 'HYFP'
-                this.form.businessTypeCode = 'HYFP'
+                this.form.type = '销项'
+                this.form.billNoFormat = 'FPSQ'
+                this.form.businessTypeCode = 'FPSQ'
                 this.form.businessTypes = this.form.businessTypes?this.form.businessTypes.join(','):''
                 if (!this.form.id) {
                     this.form.finInvoicesItemsList = this.handleSelectionData
@@ -782,8 +780,8 @@ export default {
                     this.pageLoading = false
                 })
             },
-            // 确认发票
-            fininvoicesConfirmFinInvoicesfun(){
+            // 确认申请
+            finInvoicesApprovefun(){
                 this.$confirm("确定进行对账操作?", {
                     confirmButtonText: "确定",
                     cancelButtonText: "取消",
@@ -791,7 +789,7 @@ export default {
                 }).then(res=>{
                     this.pageLoading = true
                     this.form.businessTypes = this.form.businessTypes?this.form.businessTypes.join(','):''
-                    fininvoicesConfirmFinInvoices(this.form).then(res=>{
+                    finInvoicesApprove(this.form).then(res=>{
                         this.pageLoading = false
                         this.$message.success('操作成功');
                         this.fininvoicesDetailfun(res.data.data.id)
@@ -800,8 +798,8 @@ export default {
                     })
                 })
             },
-            // 撤销发票
-            fininvoicesRevokeFinInvoicesfun(){
+            // 撤销申请
+            revokeFinInvoicesApprovefun(){
                 this.$confirm("确定进行撤销对账操作?", {
                     confirmButtonText: "确定",
                     cancelButtonText: "取消",
@@ -809,7 +807,7 @@ export default {
                 }).then(res=>{
                     this.pageLoading = true
                     this.form.businessTypes = this.form.businessTypes?this.form.businessTypes.join(','):''
-                    fininvoicesRevokeFinInvoices(this.form).then(res=>{
+                    revokeFinInvoicesApprove(this.form).then(res=>{
                         this.pageLoading = false
                         this.$message.success('操作成功');
                         this.fininvoicesDetailfun(res.data.data.id)

src/views/iosBasicData/fininvoicesApplyfor/index.vue

@@ -20,8 +20,8 @@
                      @current-change="currentChange"
                      @size-change="sizeChange"
                      @refresh-change="refreshChange"
-                     @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 318)"
-                     @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 318)"
+                     @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 320)"
+                     @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 320)"
                      @on-load="onLoad">
               <template slot="menuLeft">
                   <el-button type="success"
@@ -89,10 +89,9 @@ import {
 } from "@/api/iosBasicData/fininvoices";
 import fininvoicesDetails from "@/views/iosBasicData/fininvoicesApplyfor/fininvoicesDetails.vue";
   import {mapGetters} from "vuex";
-import finstlbillsDetails from "@/views/iosBasicData/finstlbills/finstlbillsDetails.vue";
 
   export default {
-      components:{finstlbillsDetails, fininvoicesDetails},
+      components:{ fininvoicesDetails},
     data() {
       return {
           // 详情页面和列表切换
@@ -124,6 +123,7 @@ import finstlbillsDetails from "@/views/iosBasicData/finstlbills/finstlbillsDeta
             {
               label: "单据编号",
               prop: "billNo",
+              search:true,
               rules: [{
                 required: true,
                 message: "请输入单据编号",
@@ -524,7 +524,7 @@ import finstlbillsDetails from "@/views/iosBasicData/finstlbills/finstlbillsDeta
       }
     },
       async created() {
-          this.option = await this.getColumnData(this.getColumnName(318), this.optionBack);
+          this.option = await this.getColumnData(this.getColumnName(320), this.optionBack);
       },
     methods: {
         // 新建发票
@@ -655,7 +655,8 @@ import finstlbillsDetails from "@/views/iosBasicData/finstlbills/finstlbillsDeta
       },
       onLoad(page, params = {}) {
         this.loading = true;
-        fininvoicesList(page.currentPage, page.pageSize, {...Object.assign(params, this.query),type:"进项"}).then(res => {
+        fininvoicesList(page.currentPage, page.pageSize,
+            {...Object.assign(params, this.query),type:"销项",billNoFormat:'FPSQ',businessTypeCode:'FPSQ'}).then(res => {
           const data = res.data.data;
           this.page.total = data.total;
           this.data = data.records;

src/views/iosBasicData/fininvoicesOutput/assembly/fininvoicesitems.vue

@@ -59,7 +59,8 @@
                 prop="currentCurCode"
                 label="本次发票币种" width="120px">
                 <template slot-scope="{row}">
-                    <search-query :datalist="curCodeData"
+                    <span v-if="whetherAuditing == '1'">{{row.currentCurCode}}</span>
+                    <search-query v-else :datalist="curCodeData"
                                   :selectValue="row.currentCurCode"
                                   :filterable="true"
                                   :clearable="true"
@@ -80,7 +81,8 @@
                 prop="currentTaxRate"
                 label="本次发票税率" width="100px">
                 <template slot-scope="{row}">
-                    <el-input style="width: 100%;" v-model="row.currentTaxRate"
+                    <span v-if="whetherAuditing == '1'">{{row.currentTaxRate}}</span>
+                    <el-input v-else style="width: 100%;" v-model="row.currentTaxRate"
                               size="mini" autocomplete="off"
                               clearable placeholder="请输入本次发票税率" @input="currentInput" >
                     </el-input>
@@ -90,7 +92,8 @@
                 prop="currentSurRate"
                 label="本次发票附加税率" width="120px">
                 <template slot-scope="{row}">
-                    <el-input style="width: 100%;" v-model="row.currentSurRate"
+                    <span v-if="whetherAuditing == '1'">{{row.currentSurRate}}</span>
+                    <el-input v-else style="width: 100%;" v-model="row.currentSurRate"
                               size="mini" autocomplete="off"
                               clearable placeholder="请输入本次发票附加税率" @input="currentInput(row)" >
                     </el-input>
@@ -112,7 +115,8 @@
                 prop="currentAmount"
                 label="本次发票金额" width="120px">
                 <template slot-scope="{row}">
-                    <el-input style="width: 100%;" v-model="row.currentAmount"
+                    <span v-if="whetherAuditing == '1'">{{row.currentAmount}}</span>
+                    <el-input v-else style="width: 100%;" v-model="row.currentAmount"
                               size="mini" autocomplete="off"
                               clearable placeholder="请输入本次发票金额" >
                     </el-input>
@@ -199,6 +203,9 @@
             handleSelectionData:{
                 type:Array,
                 default:[],
+            },
+            whetherAuditing:{
+                type:String
             }
         },
         data(){

src/views/iosBasicData/fininvoicesOutput/fininvoicesDetails.vue

@@ -449,11 +449,11 @@
                                 </el-form-item>
                             </el-col>
                             <el-col :span="8">
-                                <el-form-item label="无字段账单号" prop="bookingNo">
-                                    <el-input style="width: 100%;" v-model="form.bookingNo"
+                                <el-form-item label="申请单号" prop="billNo">
+                                    <el-input style="width: 100%;" v-model="form.billNoSS"
                                               size="small" autocomplete="off"
                                               :disabled="editSave"
-                                              clearable placeholder="请输入账单号" >
+                                              clearable placeholder="请输入申请单号" >
                                     </el-input>
                                 </el-form-item>
                             </el-col>
@@ -575,6 +575,7 @@
                     <!--</div>-->
                     <fininvoicesitems :tableData="tableData"
                                       :handleSelectionData="handleSelectionData"
+                                      :whetherAuditing="whetherAuditing"
                                       @handleSelectionChange="handleSelectionChange">
                     </fininvoicesitems>
                 </el-card>
@@ -585,23 +586,24 @@
 </template>
 
 <script>
-import fininvoicesitems from "@/views/iosBasicData/fininvoices/assembly/fininvoicesitems.vue";
+import fininvoicesitems from "@/views/iosBasicData/fininvoicesOutput/assembly/fininvoicesitems.vue";
 import {getRateList} from "@/api/iosBasicData/rateManagement";
 import {finstlbillslistAccBillV1} from "@/api/iosBasicData/finstlbills";
 import {bcorpsbankList, getBcorpsList} from "@/api/iosBasicData/bcorps";
 import {bportsList} from "@/api/iosBasicData/bports";
 import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
 import {
+    fininvoicesApproveDetail,
     fininvoicesConfirmFinInvoices,
     fininvoicesDetail,
     fininvoicesRevokeFinInvoices,
     fininvoicesSubmit
 } from "@/api/iosBasicData/fininvoices";
-import finstlbillsitems from "@/views/iosBasicData/finstlbills/assembly/finstlbillsitems.vue";
 import {getWorkDicts} from "@/api/system/dictbiz";
+import {isProcurement} from "@/api/basicData/configuration";
 
 export default {
-        components:{finstlbillsitems, SearchQuery, fininvoicesitems},
+        components:{ SearchQuery, fininvoicesitems},
         data() {
             return {
                 pageLoading:false, // 全屏加载
@@ -630,6 +632,7 @@ export default {
                 polData:[], // 装货港
                 invCurCodeData:[], // 发票币种
                 invTypeData:[], // 发票类型
+                whetherAuditing:[], // 判断是否检索
             }
         },
         props:{
@@ -638,8 +641,17 @@ export default {
                 default:false
             }
         },
+        created() {
+            this.isProcurementfun()
+        },
         methods:{
-            fininvoicesConfirmFinInvoices,
+            // 判断检索
+            isProcurementfun(){
+                isProcurement({"param":"whether.auditing"}).then(res=>{
+                    // res.data.data === '1'
+                    this.whetherAuditing = res.data.data
+                })
+            },
             // 下拉框的回调
             corpChange(value,name){
                 // 结算单位
@@ -728,22 +740,37 @@ export default {
                     this.$message.warning('请选择开票单位');
                     return
                 }
+                if (this.handleSelectionData.length == 0) {
+                    this.$message.warning('请选择详情数据');
+                    return
+                }
                 // 进项  销项
                 this.form.type = '销项'
-                this.form.billNoFormat = 'HYFP'
-                this.form.businessTypeCode = 'HYFP'
+                this.form.billNoFormat = 'XXFP'
+                this.form.businessTypeCode = 'XXFP'
                 this.form.businessTypes = this.form.businessTypes?this.form.businessTypes.join(','):''
-                if (!this.form.id) {
+                if (this.whetherAuditing == '1') {
                     this.form.finInvoicesItemsList = this.handleSelectionData
+                }else {
+                    if (!this.form.id) {
+                        this.form.finInvoicesItemsList = this.handleSelectionData
+                    }
                 }
                 this.saveLoading = true
                 this.fininvoicesSubmitfun(this.form)
             },
             // 检索
             finstlbillslistAccBillV1fun(){
-                if (!this.form.corpId) {
-                    this.$message.warning('请选择结算单位');
-                    return
+                if (this.whetherAuditing == '1') {
+                    if (!this.form.billNoSS) {
+                        this.$message.warning('请输入申请单号');
+                        return;
+                    }
+                }else {
+                    if (!this.form.corpId) {
+                        this.$message.warning('请选择结算单位');
+                        return
+                    }
                 }
                 delete this.form.id
                 let obj = {}
@@ -758,16 +785,28 @@ export default {
                 obj.bookingNo = this.form.bookingNo // 订舱号(BOOK NO)
                 obj.curCode = this.form.curCode // 币种
                 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.accBillId = item.id
-                        item.accBillNo = item.billNo
-                        item.accDate = item.createTime
-
-                        item.currentAmount = Number(item.amount) - Number(item.uninvoicedAmount) // 本次发票金额
-
-                        delete item.id
+                if (this.whetherAuditing == '1') {
+                    this.fininvoicesApproveDetailfun(this.form.billNoSS)
+                }else {
+                    finstlbillslistAccBillV1(obj).then(res=>{
+                        this.tableData = res.data.data.map((item,index)=>{
+                            item.lineNo = index // 行号
+                            item.accBillId = item.id
+                            item.accBillNo = item.billNo
+                            item.accDate = item.createTime
+                            item.currentAmount = Number(item.amount) - Number(item.uninvoicedAmount) // 本次发票金额
+                            delete item.id
+                            return item
+                        })
+                    })
+                }
+            },
+            // 申请单号
+            fininvoicesApproveDetailfun(billNo){
+                fininvoicesApproveDetail({billNo}).then(res=>{
+                    this.tableData = res.data.data.finInvoicesItemsList.map(item=>{
+                        item.id = ''
+                        item.pid = ''
                         return item
                     })
                 })

src/views/iosBasicData/fininvoicesOutput/index.vue

@@ -20,8 +20,8 @@
                      @current-change="currentChange"
                      @size-change="sizeChange"
                      @refresh-change="refreshChange"
-                     @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 318)"
-                     @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 318)"
+                     @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 319)"
+                     @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 319)"
                      @on-load="onLoad">
               <template slot="menuLeft">
                   <el-button type="success"
@@ -124,6 +124,7 @@ import finstlbillsDetails from "@/views/iosBasicData/finstlbills/finstlbillsDeta
             {
               label: "单据编号",
               prop: "billNo",
+              search:true,
               rules: [{
                 required: true,
                 message: "请输入单据编号",
@@ -524,7 +525,7 @@ import finstlbillsDetails from "@/views/iosBasicData/finstlbills/finstlbillsDeta
       }
     },
       async created() {
-          this.option = await this.getColumnData(this.getColumnName(318), this.optionBack);
+          this.option = await this.getColumnData(this.getColumnName(319), this.optionBack);
       },
     methods: {
         // 新建发票
@@ -655,7 +656,8 @@ import finstlbillsDetails from "@/views/iosBasicData/finstlbills/finstlbillsDeta
       },
       onLoad(page, params = {}) {
         this.loading = true;
-        fininvoicesList(page.currentPage, page.pageSize, {...Object.assign(params, this.query),type:"销项"}).then(res => {
+        fininvoicesList(page.currentPage, page.pageSize,
+            {...Object.assign(params, this.query),type:"销项",billNoFormat:'XXFP',businessTypeCode:'XXFP'}).then(res => {
           const data = res.data.data;
           this.page.total = data.total;
           this.data = data.records;

src/views/tirePartsMall/salesManagement/purchaseOrder/detailsPage.vue

@@ -225,7 +225,7 @@
                 </el-col>
                 <el-col :span="19">
                     <basic-container>
-                        <avue-crud :option="optionTwo" :table-loading="loading" :data="goodsListShow" ref="crud"
+                        <avue-crud :option="optionTwo" :table-loading="loading" :data="goodsListShow" ref="crud" :search.sync="SelectSearch"
                                    @refresh-change="refreshChange" @selection-change="selectionChange" @search-change="goodsSearch"
                                    :page.sync="page" @on-load="onLoadfun"
                                    @resetColumn="resetCrud" @saveColumn="saveCrud" >
@@ -314,6 +314,7 @@ export default {
 
     data() {
         return {
+            SelectSearch:{},
             // 编辑还是保存
             mingxibaocun:true,
             // 批次号请求到的数据
@@ -1203,7 +1204,7 @@ export default {
         nodeClick(data) {
             this.treeDeptId = data.id;
             this.page.currentPage = 1;
-            this.onLoadfun(this.page, {goodsTypeId:this.treeDeptId});
+            this.onLoadfun(this.page, {...this.SelectSearch,goodsTypeId:this.treeDeptId});
         },
         closeGoods() {
             this.treeDataGoods = [];

src/views/tirePartsMall/salesManagement/saleOrder/detailsPage.vue

@@ -208,7 +208,7 @@
                 </el-col>
                 <el-col :span="19">
                     <basic-container>
-                        <avue-crud :option="optionTwo" :table-loading="loading" :data="goodsListShow" ref="crud"
+                        <avue-crud :option="optionTwo" :table-loading="loading" :data="goodsListShow" ref="crud" :search.sync="SelectSearch"
                                    @refresh-change="refreshChange" @selection-change="selectionChange" @search-change="goodsSearch"
                                    :page.sync="page" @on-load="onLoadfun"
                                    @resetColumn="resetCrud" @saveColumn="saveCrud">
@@ -300,6 +300,7 @@ export default {
 
     data() {
         return {
+            SelectSearch:{}, // 添加轮胎检索
             // 编辑还是保存
             mingxibaocun:true,
             // 批次号请求到的数据
@@ -1225,7 +1226,7 @@ export default {
         nodeClick(data) {
             this.treeDeptId = data.id;
             this.page.currentPage = 1;
-            this.onLoadfun(this.page, {goodsTypeId:this.treeDeptId});
+            this.onLoadfun(this.page, {...this.SelectSearch,goodsTypeId:this.treeDeptId});
         },
         closeGoods() {
             this.treeDataGoods = [];