货代更改dept_pid参数 2024-1-26

src/views/approveDataH/index.vue

@@ -41,11 +41,13 @@
 <!--        </el-button>-->
         <el-button type="text" size="small" :disabled="scope.row.operate" @click.stop="jumpPage(scope.row)">查看
         </el-button>
-          <el-button type="text" size="small" v-if="scope.row.checkType == 'HYCK-DJ'"
+          <el-button type="text" size="small"
+                     v-if="scope.row.checkType == 'HYCK-DJ'"
                      :disabled="scope.row.auditStatus != 'S'"
                      @click.stop="printWindowfun(scope.row,'HYCK-DJ')">审批
           </el-button>
-          <el-button type="text" size="small" v-if="scope.row.checkType == 'HYJK-DJ'"
+          <el-button type="text" size="small"
+                     v-else-if="scope.row.checkType == 'HYJK-DJ'"
                      :disabled="scope.row.auditStatus != 'S'"
                      @click.stop="printWindowfun(scope.row,'HYJK-DJ')">审批
           </el-button>
@@ -53,15 +55,24 @@
           <!--           :disabled="scope.row.auditStatus != 'S'"-->
           <!--           @click.stop="printWindowfun(scope.row,'KYCK-DJ')">审批-->
           <!--</el-button>-->
-          <el-button type="text" size="small" v-else-if="scope.row.checkType == 'HYCK-FFSQ'"
+          <el-button type="text" size="small"
+                     v-else-if="scope.row.checkType == 'HYCK-FFSQ'"
                      :disabled="scope.row.auditStatus != 'S'"
                      @click.stop="printWindowfun(scope.row,'HYCK-FFSQ')">审批
           </el-button>
-          <el-button type="text" size="small" v-else-if="scope.row.checkType == 'sea-approve'"
+          <el-button type="text" size="small"
+                     v-else-if="scope.row.checkType == 'sea-approve'"
                      :disabled="scope.row.auditStatus != 'S'"
                      @click.stop="printWindowfun(scope.row,'sea-approve')">审批
           </el-button>
-          <el-button type="text" size="small" v-else :disabled="scope.row.auditStatus != 'S'"
+          <el-button type="text" size="small"
+                     v-else-if="scope.row.checkType == 'sia-approve'"
+                     :disabled="scope.row.auditStatus != 'S'"
+                     @click.stop="printWindowfun(scope.row,'sia-approve')">审批
+          </el-button>
+          <el-button type="text" size="small"
+                     v-else
+                     :disabled="scope.row.auditStatus != 'S'"
                      @click.stop="openCheck(scope.row)">审批
           </el-button>
         <el-button type="text" size="small" @click.stop="openCheckSchedule(scope.row)">审批流程
@@ -248,6 +259,12 @@ export default {
                   classifyCode:'AMEND',
                   groupCode:'SE'
               }
+          }else if (type == 'sia-approve') {
+              obj = {
+                  businessType:'AMEND',
+                  classifyCode:'AMEND',
+                  groupCode:'SI'
+              }
           }else {}
           getreportsList(1, 10, obj).then(res=>{
               this.reportRadio(res.data.data.records[0])

src/views/iosBasicData/AirtransportExport/bills/billsDetails.vue

@@ -706,7 +706,7 @@ import {
             },
             // 收货地 起运港 当前登录人的默认
             deptGetDetailPolfun(){
-                deptGetDetailPol(this.saberUserInfo.dept_id).then(res=>{
+                deptGetDetailPol(this.saberUserInfo.dept_pid.split(',')[0]).then(res=>{
                     // 起运地
                     this.form.departureAddrCnName = res.data.data.polCnName
                     this.form.departureAddrEnName = res.data.data.polEnName
@@ -737,15 +737,13 @@ import {
             },
             // 获取用户管理数据
             userGetListfun(account = undefined,type = false,){
-                userGetList(1,10,{account}).then(res=>{
+                userGetList(1,10,{account},this.saberUserInfo.dept_pid.split(',')[0]).then(res=>{
                     // this.columnforfun('operatorName').dicData = res.data.data.records
                 })
             },
             // 获取付款方式字典数据
             mpaymodeWorkDictsfun(){
-                console.log(787)
                 getWorkDicts('payment_method_los').then((res) => {
-                    console.log(res,789)
                     this.columnforfun('mpaymode').dicData = res.data.data
                     this.columnforfun('hpaymode').dicData = res.data.data
                     console.log(this.columnforfun('hpaymode'),792)
@@ -818,6 +816,11 @@ import {
             postSelectByUserfun(){
                 postSelectByUser(JSON.parse(localStorage.getItem("saber-userInfo")).content.user_id).then(res=>{
                     this.columnforfun('teamId').dicData = res.data.data
+                    // 判断是否有值，没有的话默认第一个
+                    if (!this.form.teamId) {
+                        this.$set(this.form,'teamId',res.data.data[0].id)
+                        this.$set(this.form,'teamName',res.data.data[0].postName)
+                    }
                 })
             },
             // 获取公司名称 用户管理左侧

src/views/iosBasicData/AirtransportImport/bills/billsDetails.vue

@@ -706,7 +706,7 @@ import {
             },
             // 收货地 起运港 当前登录人的默认
             deptGetDetailPolfun(){
-                deptGetDetailPol(this.saberUserInfo.dept_id).then(res=>{
+                deptGetDetailPol(this.saberUserInfo.dept_pid.split(',')[0]).then(res=>{
                     // 目的地
                     this.form.destinationName = res.data.data.polEnName
                     this.form.destinationId = res.data.data.polId
@@ -802,7 +802,7 @@ import {
             },
             // 获取业务来源业务员数据
             salesUserGetListfun(account){
-                userGetList(1,10,{account}).then(res=>{
+                userGetList(1,10,{account},this.saberUserInfo.dept_pid.split(',')[0]).then(res=>{
                     this.columnforfun('srcCnName').dicData = res.data.data.records
                 })
             },
@@ -816,6 +816,11 @@ import {
             postSelectByUserfun(){
                 postSelectByUser(JSON.parse(localStorage.getItem("saber-userInfo")).content.user_id).then(res=>{
                     this.columnforfun('teamId').dicData = res.data.data
+                    // 判断是否有值，没有的话默认第一个
+                    if (!this.form.teamId) {
+                        this.$set(this.form,'teamId',res.data.data[0].id)
+                        this.$set(this.form,'teamName',res.data.data[0].postName)
+                    }
                 })
             },
             // 获取公司名称 用户管理左侧
@@ -824,7 +829,7 @@ import {
                     this.columnforfun('srcCnName').dicData = res.data.data
                     // 来源 内容 默认登录人所属公司
                     for(let item of this.columnforfun('srcCnName').dicData) {
-                        if (item.id == JSON.parse(localStorage.getItem('saber-userInfo')).content.dept_id) {
+                        if (item.id == JSON.parse(localStorage.getItem('saber-userInfo')).content.dept_pid.split(',')[0]) {
                             this.$set(this.form,'srcId',item.id)
                             this.$set(this.form,'srcCnName',item.title)
                             this.$set(this.form,'srcEnName',item.title)
@@ -1298,7 +1303,9 @@ import {
                 // 把拼接的数据拆开 开始 🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒🐒
                 this.searchSplit()
                 // 把拼接的数据拆开 结束 💩💩💩💩💩💩💩💩💩💩💩💩💩💩
+                console.log(this.comprehensiveForm,1306)
                 console.log(Object.values(this.comprehensiveForm).join(','),1257)
+                return
                 // 多选集合转换成字符串赋值
                 this.form.comprehensive = Object.values(this.comprehensiveForm).join(',')
                 // 费用 收 赋值数据
@@ -1484,23 +1491,23 @@ import {
                 // }
                 // 把字符串集合转换一下
                 // 是否随机
-                this.comprehensiveForm.random = this.form.comprehensive.split(',').indexOf('随机') != -1?'随机':null
+                this.$set(this.comprehensiveForm,'random',this.form.comprehensive.split(',').indexOf('随机') != -1?'随机':null)
                 // 合同
-                this.comprehensiveForm.contract = this.form.comprehensive.split(',').indexOf('合同') != -1?'合同':null
+                this.$set(this.comprehensiveForm,'contract',this.form.comprehensive.split(',').indexOf('合同') != -1?'合同':null)
                 // 发票
-                this.comprehensiveForm.invoice = this.form.comprehensive.split(',').indexOf('发票') != -1?'发票':null
+                this.$set(this.comprehensiveForm,'invoice',this.form.comprehensive.split(',').indexOf('发票') != -1?'发票':null)
                 // 装箱单
-                this.comprehensiveForm.Packing = this.form.comprehensive.split(',').indexOf('装箱单') != -1?'装箱单':null
+                this.$set(this.comprehensiveForm,'Packing',this.form.comprehensive.split(',').indexOf('装箱单') != -1?'装箱单':null)
                 // 配额证
-                this.comprehensiveForm.quota = this.form.comprehensive.split(',').indexOf('配额证') != -1?'配额证':null
+                this.$set(this.comprehensiveForm,'quota',this.form.comprehensive.split(',').indexOf('配额证') != -1?'配额证':null)
                 // 许可证
-                this.comprehensiveForm.license = this.form.comprehensive.split(',').indexOf('许可证') != -1?'许可证':null
+                this.$set(this.comprehensiveForm,'license',this.form.comprehensive.split(',').indexOf('许可证') != -1?'许可证':null)
                 // 产地证
-                this.comprehensiveForm.producer = this.form.comprehensive.split(',').indexOf('产地证') != -1?'产地证':null
+                this.$set(this.comprehensiveForm,'producer',this.form.comprehensive.split(',').indexOf('产地证') != -1?'产地证':null)
                 // 手册
-                this.comprehensiveForm.manual = this.form.comprehensive.split(',').indexOf('手册') != -1?'手册':null
+                this.$set(this.comprehensiveForm,'manual',this.form.comprehensive.split(',').indexOf('手册') != -1?'手册':null)
                 // 核销单
-                this.comprehensiveForm.writeoffDoc = this.form.comprehensive.split(',').indexOf('核销单') != -1?'核销单':null
+                this.$set(this.comprehensiveForm,'writeoffDoc',this.form.comprehensive.split(',').indexOf('核销单') != -1?'核销单':null)
                 if (this.form.status == 1 || this.form.status == 2 || this.form.status == 3) {
                     this.columnforfun('corpCnName').disabled = true
                     this.columnforfun('srcType').disabled = true

src/views/iosBasicData/OceanFreightImport/bills/billsDetails.vue

@@ -743,7 +743,7 @@ import {editypesList} from "@/api/iosBasicData/editypes";
             },
             // 目的地 卸货港 当前登录人的默认
             deptGetDetailPolfun(){
-                deptGetDetailPol(this.saberUserInfo.dept_id).then(res=>{
+                deptGetDetailPol(this.saberUserInfo.dept_pid.split(',')[0]).then(res=>{
                     // 目的地
                     this.form.destinationName = res.data.data.polEnName
                     this.form.destinationId = res.data.data.polId
@@ -757,7 +757,7 @@ import {editypesList} from "@/api/iosBasicData/editypes";
             },
             // 获取用户管理数据
             userGetListfun(account = undefined,type = false,){
-                userGetList(1,10,{account}).then(res=>{
+                userGetList(1,10,{account},this.saberUserInfo.dept_pid.split(',')[0]).then(res=>{
                     this.columnforfun('operatorName').dicData = res.data.data.records
                     if (type) {
                         // 核算部门 默认登录人的部门
@@ -775,6 +775,11 @@ import {editypesList} from "@/api/iosBasicData/editypes";
             postSelectByUserfun(){
                 postSelectByUser(JSON.parse(localStorage.getItem("saber-userInfo")).content.user_id).then(res=>{
                     this.columnforfun('teamId').dicData = res.data.data
+                    // 判断是否有值，没有的话默认第一个
+                    if (!this.form.teamId) {
+                        this.$set(this.form,'teamId',res.data.data[0].id)
+                        this.$set(this.form,'teamName',res.data.data[0].postName)
+                    }
                 })
             },
             // 获取付款方式字典数据
@@ -841,7 +846,7 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                     this.columnforfun('srcCnName').dicData = res.data.data
                     // 来源 内容 默认登录人所属公司
                     for(let item of this.columnforfun('srcCnName').dicData) {
-                        if (item.id == JSON.parse(localStorage.getItem('saber-userInfo')).content.dept_id) {
+                        if (item.id == JSON.parse(localStorage.getItem('saber-userInfo')).content.dept_pid) {
                             this.$set(this.form,'srcId',item.id)
                             this.$set(this.form,'srcCnName',item.title)
                             this.$set(this.form,'srcEnName',item.title)

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

@@ -88,10 +88,16 @@
         type:Boolean,
         default:false,
       },
+        // 业务类型
       businessValue:{
         type:String,
         default:''
       },
+      // 类别
+      classifyCode:{
+          type:String,
+          default:null
+      },
       queryCode:{
         type:String,
           default:''
@@ -1117,6 +1123,7 @@
       onLoad(page, params = {}) {
         this.loading = true;
         params.businessType = this.businessValue
+        params.classifyCode = this.classifyCode
         getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
           const data = res.data.data;
           this.page.total = data.total;

src/views/iosBasicData/SeafreightExportF/bills/billsDetails.vue

@@ -762,7 +762,7 @@ import {editypesList} from "@/api/iosBasicData/editypes";
             },
             // 收货地 装货港 当前登录人的默认
             deptGetDetailPolfun(){
-                deptGetDetailPol(this.saberUserInfo.dept_id).then(res=>{
+                deptGetDetailPol(this.saberUserInfo.dept_pid.split(',')[0]).then(res=>{
                     // 收货地
                     this.form.placeReceiptName = res.data.data.polEnName
                     this.form.placeReceiptId = res.data.data.polId
@@ -786,7 +786,7 @@ import {editypesList} from "@/api/iosBasicData/editypes";
             },
             // 获取用户管理数据
             userGetListfun(account = undefined,type = false,){
-                userGetList(1,10,{account}).then(res=>{
+                userGetList(1,10,{account},this.saberUserInfo.dept_pid.split(',')[0]).then(res=>{
                     this.columnforfun('operatorName').dicData = res.data.data.records
                     if (type) {
                         // 核算部门 默认登录人的部门
@@ -804,6 +804,11 @@ import {editypesList} from "@/api/iosBasicData/editypes";
             postSelectByUserfun(){
                 postSelectByUser(JSON.parse(localStorage.getItem("saber-userInfo")).content.user_id).then(res=>{
                     this.columnforfun('teamId').dicData = res.data.data
+                    // 判断是否有值，没有的话默认第一个
+                    if (!this.form.teamId) {
+                        this.$set(this.form,'teamId',res.data.data[0].id)
+                        this.$set(this.form,'teamName',res.data.data[0].postName)
+                    }
                 })
             },
             // 获取付款方式字典数据
@@ -876,7 +881,7 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                     this.columnforfun('srcCnName').dicData = res.data.data
                     // 来源 内容 默认登录人所属公司
                     for(let item of this.columnforfun('srcCnName').dicData) {
-                        if (item.id == JSON.parse(localStorage.getItem('saber-userInfo')).content.dept_id) {
+                        if (item.id == JSON.parse(localStorage.getItem('saber-userInfo')).content.dept_pid.split(',')[0]) {
                             this.$set(this.form,'srcId',item.id)
                             this.$set(this.form,'srcCnName',item.title)
                             this.$set(this.form,'srcEnName',item.title)

src/views/iosBasicData/aeamends/amendsDetails.vue

@@ -8,6 +8,9 @@
             </div>
             <div class="add-customer-btn">
                 <el-button size="small" style="margin-right: 8px"
+                           :loading="saveLoading" :disabled="!form.id" @click="previewreportfun" >预 览
+                </el-button>
+                <el-button size="small" style="margin-right: 8px"
                            :loading="saveLoading" :disabled="!form.id" @click="DesignreportDialog = true" >报表设计
                 </el-button>
                 <el-button size="small" type="success" style="margin-right: 8px" v-if="form.status == 0 || form.status == 4" :disabled="!form.id"
@@ -249,7 +252,7 @@
                         <span>应收费用</span>
                     </div>
                     <el-button type="primary" plain size="small" :disabled="buttonDisable"
-                               @click="upwardAddfun('D')">添加编辑数据
+                               @click="upwardAddfun('D')">生成amend费用
                     </el-button>
                 </div>
                 <billgenerated :tableData="this.form.feeCenterListD" :handleSelectionData="multipleChoiceDArr"
@@ -260,7 +263,7 @@
                         <span>应付费用</span>
                     </div>
                     <el-button type="primary" plain size="small" :disabled="buttonDisable"
-                               @click="upwardAddfun('C')">添加编辑数据
+                               @click="upwardAddfun('C')">生成amend费用
                     </el-button>
                 </div>
                 <billgenerated :tableData="this.form.feeCenterListC" :handleSelectionData="multipleChoiceCArr"
@@ -299,7 +302,7 @@
         <!--设计报表弹窗-->
         <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" :assemblyForm="form" businessValue="AMEND"></reports>
+            <reports :id="form.id" :assemblyForm="form" businessValue="AMEND" classifyCode="AMENDAE" ></reports>
         </el-dialog>
 
 
@@ -336,6 +339,24 @@
             </span>
         </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>
+
         <!--费用打印-->
         <reportContainer ref="reportContainer"></reportContainer>
     </div>
@@ -358,9 +379,11 @@ import TreeSelect from "@/components/iosbasic-data/TreeSelect.vue";
 import {reportsGetReportData} from "@/api/iosBasicData/reports";
 import reportContainer from "@/views/iosBasicData/report-container/report-container.vue";
 import {aeabillsGetDetail} from "@/api/iosBasicData/aeabills";
+import reportformsList from "@/views/iosBasicData/SeafreightExportF/bills/assembly/reportformsList.vue";
+import {getList as getreportsList} from "@/api/iosBasicData/reports";
 
 export default {
-    components: {reportContainer, TreeSelect, reports, SearchQuery, amendsCostdetails, billgenerated},
+    components: {reportformsList, reportContainer, TreeSelect, reports, SearchQuery, amendsCostdetails, billgenerated},
     data() {
         return {
             retrievePopupsType: false, // 检索完的弹窗
@@ -443,6 +466,7 @@ export default {
                     },
                 ]
             },
+            selectPrintingDialog:false, // 预览弹窗开启和关闭
             pageLoading: false, // 全屏加载动画
             saveLoading: false, // 按钮加载动画
             // 选择的数据
@@ -535,6 +559,46 @@ export default {
         },
     },
     methods: {
+        // 报表预览
+        previewreportfun(){
+            getreportsList(1,10,{
+                businessType:'AMEND',
+                classifyCode:'AMENDAE',
+                groupCode:'AE'
+            }).then(res=>{
+                if (res.data.data.records.length == 1) {
+                    this.reportRadio(res.data.data.records[0])
+                }else {
+                    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:'AMEND',
+                            classifyCode:'AMENDAE',
+                            groupCode:'AE'
+                        })
+                    })
+                }
+            })
+        },
+        // 预览里的打印
+        reportRadio(val){
+            // 获取报表数据
+            reportsGetReportData({
+                billId:this.form.id,
+                reportCode:val.classifyCode,
+                groupCode:val.groupCode,
+                type:'AMEND'
+            }).then(res=>{
+                this.handleReportPreview(val.url,res.data.data.data)
+            })
+        },
         // 打印表格选择
         reportNodeClick(data){
             this.reportformsObj = data
@@ -599,7 +663,9 @@ export default {
         },
         // 添加一条
         addTablefun() {
-            this.form.feeCenterList.push({})
+            this.form.feeCenterList.push({
+                paymode:'PP'
+            })
             this.editType = true
         },
         // 一键编辑
@@ -636,19 +702,8 @@ export default {
             let arr = []
             if (dc == 'D') {
                 arr = this.multipleChoiceDArr
-                // for (let item of this.multipleChoiceDArr) {
-                //     item.amendSrcItemId = item.id
-                //     delete item.id
-                //     this.form.feeCenterList.unshift(item)
-                // }
             } else {
                 arr = this.multipleChoiceCArr
-                // for (let item of this.multipleChoiceCArr) {
-                //     item.amendSrcItemId = item.id
-                //     delete item.id
-                //     this.form.feeCenterList.unshift(item)
-                // }
-                // this.form.feeCenterList.unshift(...this.multipleChoiceCArr)
             }
             for(let item of arr) {
                 item.accStatus = 0

src/views/iosBasicData/aiamends/amendsDetails.vue

@@ -8,6 +8,9 @@
             </div>
             <div class="add-customer-btn">
                 <el-button size="small" style="margin-right: 8px"
+                           :loading="saveLoading" :disabled="!form.id" @click="previewreportfun" >预 览
+                </el-button>
+                <el-button size="small" style="margin-right: 8px"
                            :loading="saveLoading" :disabled="!form.id" @click="DesignreportDialog = true" >报表设计
                 </el-button>
                 <el-button size="small" type="success" style="margin-right: 8px" v-if="form.status == 0 || form.status == 4" :disabled="!form.id"
@@ -257,7 +260,7 @@
                         <span>应收费用</span>
                     </div>
                     <el-button type="primary" plain size="small" :disabled="buttonDisable"
-                               @click="upwardAddfun('D')">添加编辑数据
+                               @click="upwardAddfun('D')">生成amend费用
                     </el-button>
                 </div>
                 <billgenerated :tableData="this.form.feeCenterListD" :handleSelectionData="multipleChoiceDArr"
@@ -268,7 +271,7 @@
                         <span>应付费用</span>
                     </div>
                     <el-button type="primary" plain size="small" :disabled="buttonDisable"
-                               @click="upwardAddfun('C')">添加编辑数据
+                               @click="upwardAddfun('C')">生成amend费用
                     </el-button>
                 </div>
                 <billgenerated :tableData="this.form.feeCenterListC" :handleSelectionData="multipleChoiceCArr"
@@ -307,7 +310,7 @@
         <!--设计报表弹窗-->
         <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" :assemblyForm="form" businessValue="AMEND"></reports>
+            <reports :id="form.id" :assemblyForm="form" businessValue="AMEND" classifyCode="AMENDAI" ></reports>
         </el-dialog>
 
 
@@ -344,6 +347,24 @@
             </span>
         </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>
+
         <!--费用打印-->
         <reportContainer ref="reportContainer"></reportContainer>
     </div>
@@ -365,9 +386,10 @@ import {
 import TreeSelect from "@/components/iosbasic-data/TreeSelect.vue";
 import {reportsGetReportData} from "@/api/iosBasicData/reports";
 import reportContainer from "@/views/iosBasicData/report-container/report-container.vue";
+import reportformsList from "@/views/iosBasicData/SeafreightExportF/bills/assembly/reportformsList.vue";
 
 export default {
-    components: {reportContainer, TreeSelect, reports, SearchQuery, amendsCostdetails, billgenerated},
+    components: {reportformsList, reportContainer, TreeSelect, reports, SearchQuery, amendsCostdetails, billgenerated},
     data() {
         return {
             retrievePopupsType: false, // 检索完的弹窗
@@ -456,6 +478,7 @@ export default {
                     },
                 ]
             },
+            selectPrintingDialog:false, // 预览弹窗的开启和关闭
             pageLoading: false, // 全屏加载动画
             saveLoading: false, // 按钮加载动画
             // 选择的数据
@@ -548,6 +571,46 @@ export default {
         },
     },
     methods: {
+        // 报表预览
+        previewreportfun(){
+            getreportsList(1,10,{
+                businessType:'AMEND',
+                classifyCode:'AMENDAI',
+                groupCode:'AI'
+            }).then(res=>{
+                if (res.data.data.records.length == 1) {
+                    this.reportRadio(res.data.data.records[0])
+                }else {
+                    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:'AMEND',
+                            classifyCode:'AMENDAI',
+                            groupCode:'AI'
+                        })
+                    })
+                }
+            })
+        },
+        // 预览里的打印
+        reportRadio(val){
+            // 获取报表数据
+            reportsGetReportData({
+                billId:this.form.id,
+                reportCode:val.classifyCode,
+                groupCode:val.groupCode,
+                type:'AMEND'
+            }).then(res=>{
+                this.handleReportPreview(val.url,res.data.data.data)
+            })
+        },
         // 打印表格选择
         reportNodeClick(data){
             this.reportformsObj = data
@@ -612,7 +675,9 @@ export default {
         },
         // 添加一条
         addTablefun() {
-            this.form.feeCenterList.push({})
+            this.form.feeCenterList.push({
+                paymode:'PP'
+            })
             this.editType = true
         },
         // 一键编辑
@@ -649,19 +714,8 @@ export default {
             let arr = []
             if (dc == 'D') {
                 arr = this.multipleChoiceDArr
-                // for (let item of this.multipleChoiceDArr) {
-                //     item.amendSrcItemId = item.id
-                //     delete item.id
-                //     this.form.feeCenterList.unshift(item)
-                // }
             } else {
                 arr = this.multipleChoiceCArr
-                // for (let item of this.multipleChoiceCArr) {
-                //     item.amendSrcItemId = item.id
-                //     delete item.id
-                //     this.form.feeCenterList.unshift(item)
-                // }
-                // this.form.feeCenterList.unshift(...this.multipleChoiceCArr)
             }
             for(let item of arr) {
                 item.accStatus = 0

src/views/iosBasicData/aiamends/index.vue

@@ -384,7 +384,7 @@
       },
       onLoad(page, params = {}) {
         this.loading = true;
-        amendsList(page.currentPage, page.pageSize, {...Object.assign(params, this.query),businessType: 'SIA'}).then(res => {
+        amendsList(page.currentPage, page.pageSize, {...Object.assign(params, this.query),businessType: 'AIA'}).then(res => {
           const data = res.data.data;
           this.page.total = data.total;
           this.data = data.records.map(item=>{

src/views/iosBasicData/seamends/amendsDetails.vue

@@ -313,7 +313,7 @@
         <!--设计报表弹窗-->
         <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" :assemblyForm="form" businessValue="AMEND"></reports>
+            <reports :id="form.id" :assemblyForm="form" businessValue="AMEND" classifyCode="AMENDSE" ></reports>
         </el-dialog>
 
 
@@ -579,7 +579,7 @@ export default {
         previewreportfun(){
             getreportsList(1,10,{
                 businessType:'AMEND',
-                classifyCode:'AMEND',
+                classifyCode:'AMENDSE',
                 groupCode:'SE'
             }).then(res=>{
                 if (res.data.data.records.length == 1) {
@@ -596,7 +596,7 @@ export default {
                     this.$nextTick(()=>{
                         this.$refs.reportformsList.onLoad(page,{
                             businessType:'AMEND',
-                            classifyCode:'AMEND',
+                            classifyCode:'AMENDSE',
                             groupCode:'SE'
                         })
                     })

src/views/iosBasicData/siamends/amendsDetails.vue

@@ -296,7 +296,7 @@
         <!--设计报表弹窗-->
         <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" :assemblyForm="form" businessValue="AMEND"></reports>
+            <reports :id="form.id" :assemblyForm="form" businessValue="AMEND" classifyCode="AMENDSI" ></reports>
         </el-dialog>
 
 
@@ -333,6 +333,24 @@
             </span>
         </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>
+
         <!--费用打印-->
         <reportContainer ref="reportContainer"></reportContainer>
     </div>
@@ -355,9 +373,10 @@ import TreeSelect from "@/components/iosbasic-data/TreeSelect.vue";
 import {reportsGetReportData} from "@/api/iosBasicData/reports";
 import reportContainer from "@/views/iosBasicData/report-container/report-container.vue";
 import {getList as getreportsList} from "@/api/iosBasicData/reports";
+import reportformsList from "@/views/iosBasicData/SeafreightExportF/bills/assembly/reportformsList.vue";
 
 export default {
-    components: {reportContainer, TreeSelect, reports, SearchQuery, amendsCostdetails, billgenerated},
+    components: {reportformsList, reportContainer, TreeSelect, reports, SearchQuery, amendsCostdetails, billgenerated},
     data() {
         return {
             retrievePopupsType: false, // 检索完的弹窗
@@ -440,6 +459,7 @@ export default {
                     },
                 ]
             },
+            selectPrintingDialog:false, // 预览弹窗的打开和关闭
             pageLoading: false, // 全屏加载动画
             saveLoading: false, // 按钮加载动画
             // 选择的数据
@@ -536,7 +556,7 @@ export default {
         previewreportfun(){
             getreportsList(1,10,{
                 businessType:'AMEND',
-                classifyCode:'AMEND',
+                classifyCode:'AMENDSI',
                 groupCode:'SI'
             }).then(res=>{
                 if (res.data.data.records.length == 1) {
@@ -553,7 +573,7 @@ export default {
                     this.$nextTick(()=>{
                         this.$refs.reportformsList.onLoad(page,{
                             businessType:'AMEND',
-                            classifyCode:'AMEND',
+                            classifyCode:'AMENDSI',
                             groupCode:'SI'
                         })
                     })