货代ps规则判断 2024-2-19

src/api/approval/processConfig.js

@@ -82,4 +82,14 @@ export function userList(params) {
     params
   })
 }
+// 根据角色查询用户
+export function selectListLos(roles) {
+  return request({
+    url: '/api/blade-user/selectListLos',
+    method: 'get',
+    params:{
+      roles:roles
+    }
+  })
+}
 

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

@@ -1741,7 +1741,7 @@
                             if (value == 'PS') {
                                 // 查询当前客户的 ps规则是否等于零和null
                                 const psres = await getBcorpsDetail(this.assemblyForm.corpId)
-                                if (psres.data.data.psRate) {
+                                if (!psres.data.data.psRate || Number(psres.data.data.psRate) == 0) {
                                     this.$confirm('PS规则为零不能添加费用', {
                                         confirmButtonText: "确定",
                                         cancelButtonText: "取消",

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

@@ -1179,6 +1179,8 @@ import {
                         });
                         // 详情
                         this.billsDetailfun(this.form.id)
+                    }).catch(()=>{
+                        this.pageLoading = false
                     })
                 })
             },

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

@@ -1747,7 +1747,7 @@
                             if (value == 'PS') {
                                 // 查询当前客户的 ps规则是否等于零和null
                                 const psres = await getBcorpsDetail(this.assemblyForm.corpId)
-                                if (psres.data.data.psRate) {
+                                if (!psres.data.data.psRate || Number(psres.data.data.psRate) == 0) {
                                     this.$confirm('PS规则为零不能添加费用', {
                                         confirmButtonText: "确定",
                                         cancelButtonText: "取消",

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

@@ -1177,6 +1177,8 @@ import {
                         });
                         // 详情
                         this.billsDetailfun(this.form.id)
+                    }).catch(()=>{
+                        this.pageLoading = false
                     })
                 })
             },

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

@@ -1771,7 +1771,7 @@
                             if (value == 'PS') {
                                 // 查询当前客户的 ps规则是否等于零和null
                                 const psres = await getBcorpsDetail(this.assemblyForm.corpId)
-                                if (psres.data.data.psRate) {
+                                if (!psres.data.data.psRate || Number(psres.data.data.psRate) == 0) {
                                     this.$confirm('PS规则为零不能添加费用', {
                                         confirmButtonText: "确定",
                                         cancelButtonText: "取消",

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

@@ -1229,6 +1229,8 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                         });
                         // 详情
                         this.billsDetailfun(this.form.id)
+                    }).catch(()=>{
+                        this.pageLoading = false
                     })
                 })
             },

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

@@ -1782,7 +1782,7 @@
                             if (value == 'PS') {
                                 // 查询当前客户的 ps规则是否等于零和null
                                 const psres = await getBcorpsDetail(this.assemblyForm.corpId)
-                                if (psres.data.data.psRate) {
+                                if (!psres.data.data.psRate || Number(psres.data.data.psRate) == 0) {
                                     this.$confirm('PS规则为零不能添加费用', {
                                         confirmButtonText: "确定",
                                         cancelButtonText: "取消",
@@ -1812,7 +1812,11 @@
                             // 拿取费用简称下的计量单位
                             this.getBunitsPagefun(true,item,row)
                             // 币别
-                            this.$set(row,'curCode',item.curNo)
+                            if (value == 'PS') {
+                                this.$set(row,'curCode','USD')
+                            }else {
+                                this.$set(row,'curCode',item.curNo)
+                            }
                             // 汇率
                             bcurrencyGetExrate({
                                 date:this.assemblyForm.etd?this.assemblyForm.etd.slice(0,10) + ' 00:00:00':dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00', // 开船日期
@@ -1915,6 +1919,11 @@
                                     return
                                 }
                             }
+                            // if ()
+                            // if (row.feeCnName == 'PS') {
+                            //     this.$message.warning('费用简称是PS只能选择USD')
+                            //     return
+                            // }
                             this.$set(row,'curCode',item.code)
                             this.$set(row,'exrate',item.exrate)
                             this.$set(row,'amount',Number(row.price) * Number(row.quantity?row.quantity:0))

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

@@ -1288,6 +1288,8 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                         });
                         // 详情
                         this.billsDetailfun(this.form.id)
+                    }).catch(()=>{
+                        this.pageLoading = false
                     })
                 })
             },

src/views/iosBasicData/aeamends/assembly/amendsCostdetails.vue

@@ -171,6 +171,9 @@
             append-to-body
             width="70%"
             :close-on-click-modal="false">
+            <span slot="title">
+                <el-button type="primary" size="mini" @click.stop="exportfun" >导出</el-button>
+            </span>
             <div style="padding-bottom: 30px;" >
                 <el-table
                     :data="corpDialog"
@@ -218,6 +221,7 @@ import {getBcorpsDetail, getBcorpsList} from "@/api/iosBasicData/bcorps";
     } from "@/api/iosBasicData/feecenter";
     import {listFeeCountByCorp} from "@/api/iosBasicData/bills";
     import {amendsDetail} from "@/api/iosBasicData/amends";
+    import {getToken} from "@/util/auth";
 
     export default {
         components: {SearchQuery},
@@ -402,12 +406,24 @@ import {getBcorpsDetail, getBcorpsList} from "@/api/iosBasicData/bcorps";
                 handleSelectionData:[], // 多选选择的数据
                 corpVisible:false, // 往来单位弹窗
                 corpDialog:[], // 往来单位弹窗数据
+                corpRow:{}, // 往来单位弹窗数据
             }
         },
         async created() {
             this.option = await this.getColumnData(this.getColumnName(322.1), this.optionBack);
         },
         methods:{
+            // 弹窗导出
+            exportfun(){
+                const routeData = this.$router.resolve({
+                    path: '/api/blade-los/finaccbills/listFeeCountByCorpExport',//跳转目标窗口的地址
+                    query: {
+                        dc: this.corpRow.dc,
+                        corpId:this.corpRow.corpId
+                    }
+                })
+                window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);
+            },
             // 往来单位弹窗开启
             corpClick(row){
                 this.corpVisible = true
@@ -415,6 +431,7 @@ import {getBcorpsDetail, getBcorpsList} from "@/api/iosBasicData/bcorps";
                     corpId:row.corpId,
                     dc:row.dc
                 }).then(res=>{
+                    this.corpRow = row
                     this.corpDialog = res.data.data
                 })
             },
@@ -511,7 +528,7 @@ import {getBcorpsDetail, getBcorpsList} from "@/api/iosBasicData/bcorps";
                             if (value == 'PS') {
                                 // 查询当前客户的 ps规则是否等于零和null
                                 const psres = await getBcorpsDetail(this.form.corpId)
-                                if (psres.data.data.psRate) {
+                                if (!psres.data.data.psRate || Number(psres.data.data.psRate) == 0) {
                                     this.$confirm('PS规则为零不能添加费用', {
                                         confirmButtonText: "确定",
                                         cancelButtonText: "取消",

src/views/iosBasicData/aiamends/assembly/amendsCostdetails.vue

@@ -64,7 +64,7 @@
                               @corpChange="corpChange($event,'corpCnName',row)"
                               @corpFocus="getBcorpsListfun($event,'corpCnName')" >
                 </search-query>
-                <span v-else >{{row.corpCnName}}</span>
+                <span v-else style="color: #1e9fff" @click="corpClick(row)" >{{row.corpCnName}}</span>
             </template>
             <template slot="feeCnName" slot-scope="{ row }">
                 <search-query v-if="editType"
@@ -171,6 +171,9 @@
             append-to-body
             width="70%"
             :close-on-click-modal="false">
+            <span slot="title">
+                <el-button type="primary" size="mini" @click.stop="exportfun" >导出</el-button>
+            </span>
             <div style="padding-bottom: 30px;" >
                 <el-table
                     :data="corpDialog"
@@ -218,6 +221,7 @@ import {getBcorpsDetail, getBcorpsList} from "@/api/iosBasicData/bcorps";
     } from "@/api/iosBasicData/feecenter";
     import {listFeeCountByCorp} from "@/api/iosBasicData/bills";
     import {amendsDetail} from "@/api/iosBasicData/amends";
+    import {getToken} from "@/util/auth";
 
     export default {
         components: {SearchQuery},
@@ -402,12 +406,24 @@ import {getBcorpsDetail, getBcorpsList} from "@/api/iosBasicData/bcorps";
                 handleSelectionData:[], // 多选选择的数据
                 corpVisible:false, // 往来单位弹窗
                 corpDialog:[], // 往来单位弹窗数据
+                corpRow:{}, // 往来单位弹窗数据
             }
         },
         async created() {
             this.option = await this.getColumnData(this.getColumnName(322.1), this.optionBack);
         },
         methods:{
+            // 弹窗导出
+            exportfun(){
+                const routeData = this.$router.resolve({
+                    path: '/api/blade-los/finaccbills/listFeeCountByCorpExport',//跳转目标窗口的地址
+                    query: {
+                        dc: this.corpRow.dc,
+                        corpId:this.corpRow.corpId
+                    }
+                })
+                window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);
+            },
             // 往来单位弹窗开启
             corpClick(row){
                 this.corpVisible = true
@@ -415,6 +431,7 @@ import {getBcorpsDetail, getBcorpsList} from "@/api/iosBasicData/bcorps";
                     corpId:row.corpId,
                     dc:row.dc
                 }).then(res=>{
+                    this.corpRow = row
                     this.corpDialog = res.data.data
                 })
             },
@@ -511,7 +528,7 @@ import {getBcorpsDetail, getBcorpsList} from "@/api/iosBasicData/bcorps";
                             if (value == 'PS') {
                                 // 查询当前客户的 ps规则是否等于零和null
                                 const psres = await getBcorpsDetail(this.form.corpId)
-                                if (psres.data.data.psRate) {
+                                if (!psres.data.data.psRate || Number(psres.data.data.psRate) == 0) {
                                     this.$confirm('PS规则为零不能添加费用', {
                                         confirmButtonText: "确定",
                                         cancelButtonText: "取消",

src/views/iosBasicData/bcorps/detailsPage.vue

@@ -232,9 +232,19 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="维护人员" prop="maintenanceStaffName">
-                  <el-input v-model="formData.maintenanceStaffName" size="small" placeholder="请输入维护人员" clearable
-                    :style="{ width: '100%' }">
-                  </el-input>
+                  <!--<el-input v-model="formData.maintenanceStaffName" size="small" placeholder="请输入维护人员" clearable-->
+                  <!--  :style="{ width: '100%' }">-->
+                  <!--</el-input>-->
+                  <search-query :datalist="maintenanceStaffData"
+                                :selectValue="formData.maintenanceStaffName"
+                                :filterable="true"
+                                :clearable="true"
+                                :buttonIf="false"
+                                placeholder="请选择维护人员"
+                                :forParameter="{key:'id',label:'name',value:'name'}"
+                                @corpChange="maintenanceStaffChange($event,'maintenanceStaffName')"
+                                @corpFocus="selectListLosfun">
+                  </search-query>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -242,7 +252,7 @@
                   <!-- <el-input v-model="formData.salesId" placeholder="请输入业务员" clearable :style="{ width: '100%' }"> -->
                   <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"
+                    <el-option v-for="(item, index) in salesData" :key="index" :label="item.realName" :value="item.id"
                       :disabled="item.disabled"></el-option>
                   </el-select>
                 </el-form-item>
@@ -863,6 +873,7 @@ import {getDeptLazyTree} from "@/api/system/dept";
 import {getBcorpslistByType} from "@/api/iosBasicData/bcorps";
 import {blinesList} from "@/api/iosBasicData/blines";
 import blines from "@/views/iosBasicData/blines/index.vue";
+import {selectListLos} from "@/api/approval/processConfig";
 export default {
   components: {
     SearchQuery, bcountrys, user, rateManagement,blines
@@ -897,6 +908,7 @@ export default {
         sourceforParameter:{},
         // 客户来源下级
         srcData:[],
+        maintenanceStaffData:[], // 维护人员
       // tab标签
       activeName: 'kgxq',
       // 远程搜索
@@ -912,6 +924,7 @@ export default {
       rateOptions: [],
       // 用户list
       userOptions: [],
+      salesData:[], // 操作员
       // 客户类别数据
       customTypeData: [],
       // 用户联系人form
@@ -1116,6 +1129,10 @@ export default {
     userList(1, 9999999).then((res) => {
       this.userOptions = res.data.data
     });
+    // 操作员数据
+    selectListLos('操作员').then(res=>{
+        this.salesData = res.data.data
+    })
     // 查询字典
     getWorkDicts('bcorps-credit-level').then((res) => {
       this.creditLevelDict = res.data.data
@@ -1135,7 +1152,7 @@ export default {
       psRateValid(inputContent){
           let reg = /^(0.\d+|0|1)$/;
           if (reg.test(inputContent)) {
-              this.formData.psRate = inputContent;
+              this.formData.psRate = Number(inputContent);
           } else {
               if (inputContent != "0.") {
                   this.formData.psRate = "";
@@ -1144,7 +1161,12 @@ export default {
       },
       // ps 规则失去焦点触发
       psRateBlue(){
-          this.formData.psRate = Number(this.formData.psRate).toFixed(2);
+          if (this.formData.psRate) {
+              this.$set(this.formData,'psRate',Number(this.formData.psRate).toFixed(2))
+          }else {
+              this.$set(this.formData,'psRate','')
+          }
+
       },
       // 详情
       getBcorpsDetailfun(id){
@@ -1158,6 +1180,15 @@ export default {
       psRateChange(value,name){
           this.$set(this.formData,name,value)
       },
+      // 维护人员下拉
+      maintenanceStaffChange(value,name){
+          for (let item of this.maintenanceStaffData) {
+              if (item.name == value) {
+                  this.$set(this.formData,'maintenanceStaffId',item.id)
+                  this.$set(this.formData,'maintenanceStaffName',item.name)
+              }
+          }
+      },
       // 客户来源下拉
       sourceCorp(value,name){
           if (name == 'srcCnName') {
@@ -1246,6 +1277,12 @@ export default {
 
           })
       },
+      // 获取维护人员数据
+      selectListLosfun(){
+          selectListLos('人事').then(res=>{
+              this.maintenanceStaffData = res.data.data
+          })
+      },
 
     corpTypeChange(ids) {
       // console.log(ids);

src/views/iosBasicData/reportClose/AEreportClose/assembly/feecenter.vue

@@ -512,12 +512,15 @@
 
         <!--往来单位弹窗-->
         <el-dialog
-            title="提示"
+            title="导出"
             :visible.sync="corpVisible"
             append-to-body
             width="70%"
             :close-on-click-modal="false"
             :before-close="handleClose">
+            <span slot="title">
+                <el-button type="primary" size="mini" @click.stop="exportfun" >导出</el-button>
+            </span>
             <div style="padding-bottom: 30px;">
                 <el-table
                     :data="corpDialog"
@@ -604,7 +607,7 @@
 
 <script>
     import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
-    import {getBcorpsList} from "@/api/iosBasicData/bcorps";
+    import {getBcorpsDetail, getBcorpsList} from "@/api/iosBasicData/bcorps";
     import {bfeesList} from "@/api/iosBasicData/bfees";
     import {getBunitsPage} from "@/api/iosBasicData/bunits";
     import {bcurrencyGetExrate} from "@/api/iosBasicData/rateManagement";
@@ -629,6 +632,7 @@
     import {getList as reportsList} from "@/api/iosBasicData/reports";
     import {dateFormat} from "@/util/date";
     import {regularBurdenfloating} from "@/util/regularJudgment";
+    import {getToken} from "@/util/auth";
 
     export default {
         components: {reportContainer, SearchQuery,reportformsList},
@@ -1098,6 +1102,7 @@
                     },
                 ],
                 roleName:[], // 当前登录人的角色权限
+                corpRow:{}, // 往来单位弹窗数据
             }
         },
         async created() {
@@ -1110,6 +1115,17 @@
             this.paymodeWorkDictsfun() // 获取预付/到付数据
         },
         methods:{
+            // 弹窗导出
+            exportfun(){
+                const routeData = this.$router.resolve({
+                    path: '/api/blade-los/finaccbills/listFeeCountByCorpExport',//跳转目标窗口的地址
+                    query: {
+                        dc: this.corpRow.dc,
+                        corpId:this.corpRow.corpId
+                    }
+                })
+                window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);
+            },
             // 费用弹窗里的打印
             dialogPreviewfun(row){
                 if (!this.reportformsObj.id){
@@ -1258,6 +1274,7 @@
                     corpId:row.corpId,
                     dc:row.dc
                 }).then(res=>{
+                    this.corpRow = row
                     this.corpDialog = res.data.data
                 })
             },
@@ -1692,7 +1709,7 @@
                 })
             },
             // 客户的回调
-            corpChange(value,name,row,dc) {
+            async corpChange(value,name,row,dc) {
                 if (name == 'corpCnName') {
                     if (!value) {
                         this.$set(row,'corpCnName','')
@@ -1720,6 +1737,27 @@
                     }
                     for(let item of this.feeCnNameData) {
                         if (item.cnName == value){
+                            if (value == 'PS') {
+                                // 查询当前客户的 ps规则是否等于零和null
+                                const psres = await getBcorpsDetail(this.assemblyForm.corpId)
+                                if (!psres.data.data.psRate || Number(psres.data.data.psRate) == 0) {
+                                    this.$confirm('PS规则为零不能添加费用', {
+                                        confirmButtonText: "确定",
+                                        cancelButtonText: "取消",
+                                        type: "warning"
+                                    })
+                                    this.$set(row,'feeCnName','')
+                                    this.$set(row,'feeEnName','')
+                                    this.$set(row,'feeId','')
+                                    this.$set(row,'feeCode','')
+                                    // 核算要素
+                                    this.$set(row,'elementsId','')
+                                    this.$set(row,'elementsCnName','')
+                                    this.$set(row,'elementsCode','')
+                                    this.$set(row,'elementsEnName','')
+                                    return
+                                }
+                            }
                             this.$set(row,'feeCnName',item.cnName)
                             this.$set(row,'feeEnName',item.enName)
                             this.$set(row,'feeId',item.id)
@@ -2531,4 +2569,10 @@
         text-align: center;
         padding: 4px 0;
     }
+    .textoverflow {
+        width: 100%;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+    }
 </style>

src/views/iosBasicData/reportClose/AEreportClose/bgdetails.vue

@@ -1036,6 +1036,7 @@
                             this.$set(item,'usdAmountNet',item.amountNet)
                             this.$set(item,'rmbAmountNet','')
                         }
+                        item.paymode = item.paymode?item.paymode:'PP'
                         item.edit = false
                     }
                     for(let item of this.form.feeCenterListC) {
@@ -1050,6 +1051,7 @@
                             this.$set(item,'usdAmountNet',item.amountNet)
                             this.$set(item,'rmbAmountNet','')
                         }
+                        item.paymode = item.paymode?item.paymode:'PP'
                         item.edit = false
                     }
                     // 处理明细数据

src/views/iosBasicData/reportClose/AIreportClose/assembly/feecenter.vue

@@ -512,12 +512,15 @@
 
         <!--往来单位弹窗-->
         <el-dialog
-            title="提示"
+            title="导出"
             :visible.sync="corpVisible"
             append-to-body
             width="70%"
             :close-on-click-modal="false"
             :before-close="handleClose">
+            <span slot="title">
+                <el-button type="primary" size="mini" @click.stop="exportfun" >导出</el-button>
+            </span>
             <div style="padding-bottom: 30px;">
                 <el-table
                     :data="corpDialog"
@@ -604,7 +607,7 @@
 
 <script>
     import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
-    import {getBcorpsList} from "@/api/iosBasicData/bcorps";
+    import {getBcorpsDetail, getBcorpsList} from "@/api/iosBasicData/bcorps";
     import {bfeesList} from "@/api/iosBasicData/bfees";
     import {getBunitsPage} from "@/api/iosBasicData/bunits";
     import {bcurrencyGetExrate} from "@/api/iosBasicData/rateManagement";
@@ -629,6 +632,7 @@
     import {getList as reportsList} from "@/api/iosBasicData/reports";
     import {dateFormat} from "@/util/date";
     import {regularBurdenfloating} from "@/util/regularJudgment";
+    import {getToken} from "@/util/auth";
 
     export default {
         components: {reportContainer, SearchQuery,reportformsList},
@@ -1098,6 +1102,7 @@
                     },
                 ],
                 roleName:[], // 当前登录人的角色权限
+                corpRow:{}, // 往来单位弹窗数据
             }
         },
         async created() {
@@ -1110,6 +1115,17 @@
             this.paymodeWorkDictsfun() // 获取预付/到付数据
         },
         methods:{
+            // 弹窗导出
+            exportfun(){
+                const routeData = this.$router.resolve({
+                    path: '/api/blade-los/finaccbills/listFeeCountByCorpExport',//跳转目标窗口的地址
+                    query: {
+                        dc: this.corpRow.dc,
+                        corpId:this.corpRow.corpId
+                    }
+                })
+                window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);
+            },
             // 费用弹窗里的打印
             dialogPreviewfun(row){
                 if (!this.reportformsObj.id){
@@ -1258,6 +1274,7 @@
                     corpId:row.corpId,
                     dc:row.dc
                 }).then(res=>{
+                    this.corpRow = row
                     this.corpDialog = res.data.data
                 })
             },
@@ -1692,7 +1709,7 @@
                 })
             },
             // 客户的回调
-            corpChange(value,name,row,dc) {
+            async corpChange(value,name,row,dc) {
                 if (name == 'corpCnName') {
                     if (!value) {
                         this.$set(row,'corpCnName','')
@@ -1720,6 +1737,27 @@
                     }
                     for(let item of this.feeCnNameData) {
                         if (item.cnName == value){
+                            if (value == 'PS') {
+                                // 查询当前客户的 ps规则是否等于零和null
+                                const psres = await getBcorpsDetail(this.assemblyForm.corpId)
+                                if (!psres.data.data.psRate || Number(psres.data.data.psRate) == 0) {
+                                    this.$confirm('PS规则为零不能添加费用', {
+                                        confirmButtonText: "确定",
+                                        cancelButtonText: "取消",
+                                        type: "warning"
+                                    })
+                                    this.$set(row,'feeCnName','')
+                                    this.$set(row,'feeEnName','')
+                                    this.$set(row,'feeId','')
+                                    this.$set(row,'feeCode','')
+                                    // 核算要素
+                                    this.$set(row,'elementsId','')
+                                    this.$set(row,'elementsCnName','')
+                                    this.$set(row,'elementsCode','')
+                                    this.$set(row,'elementsEnName','')
+                                    return
+                                }
+                            }
                             this.$set(row,'feeCnName',item.cnName)
                             this.$set(row,'feeEnName',item.enName)
                             this.$set(row,'feeId',item.id)
@@ -2531,4 +2569,10 @@
         text-align: center;
         padding: 4px 0;
     }
+    .textoverflow {
+        width: 100%;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+    }
 </style>

src/views/iosBasicData/reportClose/AIreportClose/bgdetails.vue

@@ -1036,6 +1036,7 @@
                             this.$set(item,'usdAmountNet',item.amountNet)
                             this.$set(item,'rmbAmountNet','')
                         }
+                        item.paymode = item.paymode?item.paymode:'PP'
                         item.edit = false
                     }
                     for(let item of this.form.feeCenterListC) {
@@ -1050,6 +1051,7 @@
                             this.$set(item,'usdAmountNet',item.amountNet)
                             this.$set(item,'rmbAmountNet','')
                         }
+                        item.paymode = item.paymode?item.paymode:'PP'
                         item.edit = false
                     }
                     // 处理明细数据

src/views/iosBasicData/reportClose/SEreportClose/assembly/feecenter.vue

@@ -512,12 +512,15 @@
 
         <!--往来单位弹窗-->
         <el-dialog
-            title="提示"
+            title="导出"
             :visible.sync="corpVisible"
             append-to-body
             width="70%"
             :close-on-click-modal="false"
             :before-close="handleClose">
+            <span slot="title">
+                <el-button type="primary" size="mini" @click.stop="exportfun" >导出</el-button>
+            </span>
             <div style="padding-bottom: 30px;">
                 <el-table
                     :data="corpDialog"
@@ -604,7 +607,7 @@
 
 <script>
     import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
-    import {getBcorpsList} from "@/api/iosBasicData/bcorps";
+    import {getBcorpsDetail, getBcorpsList} from "@/api/iosBasicData/bcorps";
     import {bfeesList} from "@/api/iosBasicData/bfees";
     import {getBunitsPage} from "@/api/iosBasicData/bunits";
     import {bcurrencyGetExrate} from "@/api/iosBasicData/rateManagement";
@@ -629,6 +632,7 @@
     import {getList as reportsList} from "@/api/iosBasicData/reports";
     import {dateFormat} from "@/util/date";
     import {regularBurdenfloating} from "@/util/regularJudgment";
+    import {getToken} from "@/util/auth";
 
     export default {
         components: {reportContainer, SearchQuery,reportformsList},
@@ -1098,6 +1102,7 @@
                     },
                 ],
                 roleName:[], // 当前登录人的角色权限
+                corpRow:{}, // 往来单位弹窗数据
             }
         },
         async created() {
@@ -1110,6 +1115,17 @@
             this.paymodeWorkDictsfun() // 获取预付/到付数据
         },
         methods:{
+            // 弹窗导出
+            exportfun(){
+                const routeData = this.$router.resolve({
+                    path: '/api/blade-los/finaccbills/listFeeCountByCorpExport',//跳转目标窗口的地址
+                    query: {
+                        dc: this.corpRow.dc,
+                        corpId:this.corpRow.corpId
+                    }
+                })
+                window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);
+            },
             // 费用弹窗里的打印
             dialogPreviewfun(row){
                 if (!this.reportformsObj.id){
@@ -1258,6 +1274,7 @@
                     corpId:row.corpId,
                     dc:row.dc
                 }).then(res=>{
+                    this.corpRow = row
                     this.corpDialog = res.data.data
                 })
             },
@@ -1692,7 +1709,7 @@
                 })
             },
             // 客户的回调
-            corpChange(value,name,row,dc) {
+            async corpChange(value,name,row,dc) {
                 if (name == 'corpCnName') {
                     if (!value) {
                         this.$set(row,'corpCnName','')
@@ -1720,6 +1737,27 @@
                     }
                     for(let item of this.feeCnNameData) {
                         if (item.cnName == value){
+                            if (value == 'PS') {
+                                // 查询当前客户的 ps规则是否等于零和null
+                                const psres = await getBcorpsDetail(this.assemblyForm.corpId)
+                                if (!psres.data.data.psRate || Number(psres.data.data.psRate) == 0) {
+                                    this.$confirm('PS规则为零不能添加费用', {
+                                        confirmButtonText: "确定",
+                                        cancelButtonText: "取消",
+                                        type: "warning"
+                                    })
+                                    this.$set(row,'feeCnName','')
+                                    this.$set(row,'feeEnName','')
+                                    this.$set(row,'feeId','')
+                                    this.$set(row,'feeCode','')
+                                    // 核算要素
+                                    this.$set(row,'elementsId','')
+                                    this.$set(row,'elementsCnName','')
+                                    this.$set(row,'elementsCode','')
+                                    this.$set(row,'elementsEnName','')
+                                    return
+                                }
+                            }
                             this.$set(row,'feeCnName',item.cnName)
                             this.$set(row,'feeEnName',item.enName)
                             this.$set(row,'feeId',item.id)
@@ -2531,4 +2569,10 @@
         text-align: center;
         padding: 4px 0;
     }
+    .textoverflow {
+        width: 100%;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+    }
 </style>

src/views/iosBasicData/reportClose/SEreportClose/bgdetails.vue

@@ -1039,6 +1039,7 @@
                             this.$set(item,'usdAmountNet',item.amountNet)
                             this.$set(item,'rmbAmountNet','')
                         }
+                        item.paymode = item.paymode?item.paymode:'PP'
                         item.edit = false
                     }
                     for(let item of this.form.feeCenterListC) {
@@ -1053,6 +1054,7 @@
                             this.$set(item,'usdAmountNet',item.amountNet)
                             this.$set(item,'rmbAmountNet','')
                         }
+                        item.paymode = item.paymode?item.paymode:'PP'
                         item.edit = false
                     }
                     // 处理明细数据

src/views/iosBasicData/reportClose/SIreportClose/assembly/feecenter.vue

@@ -512,12 +512,15 @@
 
         <!--往来单位弹窗-->
         <el-dialog
-            title="提示"
+            title="导出"
             :visible.sync="corpVisible"
             append-to-body
             width="70%"
             :close-on-click-modal="false"
             :before-close="handleClose">
+            <span slot="title">
+                <el-button type="primary" size="mini" @click.stop="exportfun" >导出</el-button>
+            </span>
             <div style="padding-bottom: 30px;">
                 <el-table
                     :data="corpDialog"
@@ -604,7 +607,7 @@
 
 <script>
     import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
-    import {getBcorpsList} from "@/api/iosBasicData/bcorps";
+    import {getBcorpsDetail, getBcorpsList} from "@/api/iosBasicData/bcorps";
     import {bfeesList} from "@/api/iosBasicData/bfees";
     import {getBunitsPage} from "@/api/iosBasicData/bunits";
     import {bcurrencyGetExrate} from "@/api/iosBasicData/rateManagement";
@@ -629,6 +632,7 @@
     import {getList as reportsList} from "@/api/iosBasicData/reports";
     import {dateFormat} from "@/util/date";
     import {regularBurdenfloating} from "@/util/regularJudgment";
+    import {getToken} from "@/util/auth";
 
     export default {
         components: {reportContainer, SearchQuery,reportformsList},
@@ -1098,6 +1102,7 @@
                     },
                 ],
                 roleName:[], // 当前登录人的角色权限
+                corpRow:{}, // 往来单位弹窗数据
             }
         },
         async created() {
@@ -1110,6 +1115,17 @@
             this.paymodeWorkDictsfun() // 获取预付/到付数据
         },
         methods:{
+            // 弹窗导出
+            exportfun(){
+                const routeData = this.$router.resolve({
+                    path: '/api/blade-los/finaccbills/listFeeCountByCorpExport',//跳转目标窗口的地址
+                    query: {
+                        dc: this.corpRow.dc,
+                        corpId:this.corpRow.corpId
+                    }
+                })
+                window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);
+            },
             // 费用弹窗里的打印
             dialogPreviewfun(row){
                 if (!this.reportformsObj.id){
@@ -1258,6 +1274,7 @@
                     corpId:row.corpId,
                     dc:row.dc
                 }).then(res=>{
+                    this.corpRow = row
                     this.corpDialog = res.data.data
                 })
             },
@@ -1692,7 +1709,7 @@
                 })
             },
             // 客户的回调
-            corpChange(value,name,row,dc) {
+            async corpChange(value,name,row,dc) {
                 if (name == 'corpCnName') {
                     if (!value) {
                         this.$set(row,'corpCnName','')
@@ -1720,6 +1737,27 @@
                     }
                     for(let item of this.feeCnNameData) {
                         if (item.cnName == value){
+                            if (value == 'PS') {
+                                // 查询当前客户的 ps规则是否等于零和null
+                                const psres = await getBcorpsDetail(this.assemblyForm.corpId)
+                                if (!psres.data.data.psRate || Number(psres.data.data.psRate) == 0) {
+                                    this.$confirm('PS规则为零不能添加费用', {
+                                        confirmButtonText: "确定",
+                                        cancelButtonText: "取消",
+                                        type: "warning"
+                                    })
+                                    this.$set(row,'feeCnName','')
+                                    this.$set(row,'feeEnName','')
+                                    this.$set(row,'feeId','')
+                                    this.$set(row,'feeCode','')
+                                    // 核算要素
+                                    this.$set(row,'elementsId','')
+                                    this.$set(row,'elementsCnName','')
+                                    this.$set(row,'elementsCode','')
+                                    this.$set(row,'elementsEnName','')
+                                    return
+                                }
+                            }
                             this.$set(row,'feeCnName',item.cnName)
                             this.$set(row,'feeEnName',item.enName)
                             this.$set(row,'feeId',item.id)
@@ -2531,4 +2569,10 @@
         text-align: center;
         padding: 4px 0;
     }
+    .textoverflow {
+        width: 100%;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+    }
 </style>

src/views/iosBasicData/reportClose/SIreportClose/bgdetails.vue

@@ -1035,6 +1035,7 @@
                             this.$set(item,'usdAmountNet',item.amountNet)
                             this.$set(item,'rmbAmountNet','')
                         }
+                        item.paymode = item.paymode?item.paymode:'PP'
                         item.edit = false
                     }
                     for(let item of this.form.feeCenterListC) {
@@ -1049,6 +1050,7 @@
                             this.$set(item,'usdAmountNet',item.amountNet)
                             this.$set(item,'rmbAmountNet','')
                         }
+                        item.paymode = item.paymode?item.paymode:'PP'
                         item.edit = false
                     }
                     // 处理明细数据

src/views/iosBasicData/seamends/assembly/amendsCostdetails.vue

@@ -167,11 +167,14 @@
 
         <!--往来单位弹窗-->
         <el-dialog
-            title="提示"
+            title="导出"
             :visible.sync="corpVisible"
             append-to-body
             width="70%"
             :close-on-click-modal="false">
+            <span slot="title">
+                <el-button type="primary" size="mini" @click.stop="exportfun" >导出</el-button>
+            </span>
             <div style="padding-bottom: 30px;" >
                 <el-table
                     :data="corpDialog"
@@ -219,6 +222,7 @@ import {getBcorpsDetail, getBcorpsList} from "@/api/iosBasicData/bcorps";
     } from "@/api/iosBasicData/feecenter";
     import {listFeeCountByCorp} from "@/api/iosBasicData/bills";
     import {amendsDetail} from "@/api/iosBasicData/amends";
+    import {getToken} from "@/util/auth";
 
     export default {
         components: {SearchQuery},
@@ -408,12 +412,24 @@ import {getBcorpsDetail, getBcorpsList} from "@/api/iosBasicData/bcorps";
                 // handleSelectionData:[], // 多选选择的数据
                 corpVisible:false, // 往来单位弹窗
                 corpDialog:[], // 往来单位弹窗数据
+                corpRow:{}, // 往来单位弹窗数据
             }
         },
         async created() {
             this.option = await this.getColumnData(this.getColumnName(322.1), this.optionBack);
         },
         methods:{
+            // 弹窗导出
+            exportfun(){
+                const routeData = this.$router.resolve({
+                    path: '/api/blade-los/finaccbills/listFeeCountByCorpExport',//跳转目标窗口的地址
+                    query: {
+                        dc: this.corpRow.dc,
+                        corpId:this.corpRow.corpId
+                    }
+                })
+                window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);
+            },
             // 往来单位弹窗开启
             corpClick(row){
                 this.corpVisible = true
@@ -421,6 +437,7 @@ import {getBcorpsDetail, getBcorpsList} from "@/api/iosBasicData/bcorps";
                     corpId:row.corpId,
                     dc:row.dc
                 }).then(res=>{
+                    this.corpRow = row
                     this.corpDialog = res.data.data
                 })
             },
@@ -521,7 +538,7 @@ import {getBcorpsDetail, getBcorpsList} from "@/api/iosBasicData/bcorps";
                             if (value == 'PS') {
                                 // 查询当前客户的 ps规则是否等于零和null
                                 const psres = await getBcorpsDetail(this.form.corpId)
-                                if (psres.data.data.psRate) {
+                                if (!psres.data.data.psRate || Number(psres.data.data.psRate) == 0) {
                                     this.$confirm('PS规则为零不能添加费用', {
                                         confirmButtonText: "确定",
                                         cancelButtonText: "取消",

src/views/iosBasicData/siamends/assembly/amendsCostdetails.vue

@@ -166,11 +166,14 @@
         </avue-crud>
         <!--往来单位弹窗-->
         <el-dialog
-            title="提示"
+            title="导出"
             :visible.sync="corpVisible"
             append-to-body
             width="70%"
             :close-on-click-modal="false">
+            <span slot="title">
+                <el-button type="primary" size="mini" @click.stop="exportfun" >导出</el-button>
+            </span>
             <div style="padding-bottom: 30px;" >
                 <el-table
                     :data="corpDialog"
@@ -218,6 +221,7 @@ import {getBcorpsDetail, getBcorpsList} from "@/api/iosBasicData/bcorps";
     } from "@/api/iosBasicData/feecenter";
     import {listFeeCountByCorp} from "@/api/iosBasicData/bills";
     import {amendsDetail} from "@/api/iosBasicData/amends";
+    import {getToken} from "@/util/auth";
 
     export default {
         components: {SearchQuery},
@@ -402,12 +406,24 @@ import {getBcorpsDetail, getBcorpsList} from "@/api/iosBasicData/bcorps";
                 handleSelectionData:[], // 多选选择的数据
                 corpVisible:false, // 往来单位弹窗
                 corpDialog:[], // 往来单位弹窗数据
+                corpRow:{}, // 往来单位弹窗数据
             }
         },
         async created() {
             this.option = await this.getColumnData(this.getColumnName(322.1), this.optionBack);
         },
         methods:{
+            // 弹窗导出
+            exportfun(){
+                const routeData = this.$router.resolve({
+                    path: '/api/blade-los/finaccbills/listFeeCountByCorpExport',//跳转目标窗口的地址
+                    query: {
+                        dc: this.corpRow.dc,
+                        corpId:this.corpRow.corpId
+                    }
+                })
+                window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);
+            },
             // 往来单位弹窗开启
             corpClick(row){
                 this.corpVisible = true
@@ -415,6 +431,7 @@ import {getBcorpsDetail, getBcorpsList} from "@/api/iosBasicData/bcorps";
                     corpId:row.corpId,
                     dc:row.dc
                 }).then(res=>{
+                    this.corpRow = row
                     this.corpDialog = res.data.data
                 })
             },
@@ -515,7 +532,7 @@ import {getBcorpsDetail, getBcorpsList} from "@/api/iosBasicData/bcorps";
                             if (value == 'PS') {
                                 // 查询当前客户的 ps规则是否等于零和null
                                 const psres = await getBcorpsDetail(this.form.corpId)
-                                if (psres.data.data.psRate) {
+                                if (!psres.data.data.psRate || Number(psres.data.data.psRate) == 0) {
                                     this.$confirm('PS规则为零不能添加费用', {
                                         confirmButtonText: "确定",
                                         cancelButtonText: "取消",