ソースを参照

货代报表权限判断 2024-3-21

caojunjie 1 年間 前
コミット
1860254f03

+ 18 - 18
src/views/iosBasicData/AirtransportExport/bills/assembly/feecenter.vue

@@ -1808,14 +1808,14 @@
                             // 计算金额
                             this.$set(row,'amount',Number(row.price) * Number(row.quantity?row.quantity:0))
                             if (row.curCode == 'CNY') {
-                                this.$set(row,'rmbAmount',row.amount)
+                                this.$set(row,'rmbAmount',row.amount.toFixed(2))
                                 this.$set(row,'usdAmount','')
-                                this.$set(row,'rmbAmountNet',row.amount)
+                                this.$set(row,'rmbAmountNet',row.amount.toFixed(2))
                                 this.$set(row,'usdAmountNet','')
                             }else {
-                                this.$set(row,'usdAmount',row.amount)
+                                this.$set(row,'usdAmount',row.amount.toFixed(2))
                                 this.$set(row,'rmbAmount','')
-                                this.$set(row,'usdAmountNet',row.amount)
+                                this.$set(row,'usdAmountNet',row.amount.toFixed(2))
                                 this.$set(row,'rmbAmountNet','')
                             }
                         }
@@ -1856,14 +1856,14 @@
                     }
                     this.$set(row,'amount',Number(row.price?row.price:0) * Number(row.quantity?row.quantity:0))
                     if (row.curCode == 'CNY') {
-                        this.$set(row,'rmbAmount',row.amount)
+                        this.$set(row,'rmbAmount',row.amount.toFixed(2))
                         this.$set(row,'usdAmount','')
-                        this.$set(row,'rmbAmountNet',row.amount)
+                        this.$set(row,'rmbAmountNet',row.amount.toFixed(2))
                         this.$set(row,'usdAmountNet','')
                     }else {
-                        this.$set(row,'usdAmount',row.amount)
+                        this.$set(row,'usdAmount',row.amount.toFixed(2))
                         this.$set(row,'rmbAmount','')
-                        this.$set(row,'usdAmountNet',row.amount)
+                        this.$set(row,'usdAmountNet',row.amount.toFixed(2))
                         this.$set(row,'rmbAmountNet','')
                     }
                 } else if (name == 'elementsCnName') {
@@ -1904,14 +1904,14 @@
                             this.$set(row,'exrate',item.exrate)
                             this.$set(row,'amount',Number(row.price) * Number(row.quantity?row.quantity:0))
                             if (row.curCode == 'CNY') {
-                                this.$set(row,'rmbAmount',row.amount)
+                                this.$set(row,'rmbAmount',row.amount.toFixed(2))
                                 this.$set(row,'usdAmount','')
-                                this.$set(row,'rmbAmountNet',row.amount)
+                                this.$set(row,'rmbAmountNet',row.amount.toFixed(2))
                                 this.$set(row,'usdAmountNet','')
                             }else {
-                                this.$set(row,'usdAmount',row.amount)
+                                this.$set(row,'usdAmount',row.amount.toFixed(2))
                                 this.$set(row,'rmbAmount','')
-                                this.$set(row,'usdAmountNet',row.amount)
+                                this.$set(row,'usdAmountNet',row.amount.toFixed(2))
                                 this.$set(row,'rmbAmountNet','')
                             }
                         }
@@ -1936,14 +1936,14 @@
                     return;
                 }
                 if (row.curCode == 'CNY') {
-                    this.$set(row,'rmbAmount',row.amount)
+                    this.$set(row,'rmbAmount',row.amount.toFixed(2))
                     this.$set(row,'usdAmount','')
-                    this.$set(row,'rmbAmountNet',row.amount)
+                    this.$set(row,'rmbAmountNet',row.amount.toFixed(2))
                     this.$set(row,'usdAmountNet','')
                 }else {
-                    this.$set(row,'usdAmount',row.amount)
+                    this.$set(row,'usdAmount',row.amount.toFixed(2))
                     this.$set(row,'rmbAmount','')
-                    this.$set(row,'usdAmountNet',row.amount)
+                    this.$set(row,'usdAmountNet',row.amount.toFixed(2))
                     this.$set(row,'rmbAmountNet','')
                 }
             },
@@ -1963,10 +1963,10 @@
                     return;
                 }
                 if (row.curCode == 'CNY') {
-                    this.$set(row,'rmbAmount',row.amount)
+                    this.$set(row,'rmbAmount',row.amount.toFixed(2))
                     this.$set(row,'usdAmount','')
                 }else {
-                    this.$set(row,'usdAmount',row.amount)
+                    this.$set(row,'usdAmount',row.amount.toFixed(2))
                     this.$set(row,'rmbAmount','')
                 }
             },

+ 1 - 1
src/views/iosBasicData/AirtransportExport/bills/assembly/reports.vue

@@ -997,7 +997,7 @@
               this.bbDisabled = false;
             }
           }
-          if (userObj.user_name == 'admin' || userObj.user_name == '报表管理') {
+          if (userObj.role_name.indexOf('admin') != -1 || userObj.role_name.indexOf('报表管理') != -1) {
             this.bbDisabled = false;
           }
           this.$refs.crud.rowEdit(scope.row, scope.$index);

+ 1 - 1
src/views/iosBasicData/AirtransportImport/bills/assembly/reports.vue

@@ -997,7 +997,7 @@
               this.bbDisabled = false;
             }
           }
-          if (userObj.user_name == 'admin' || userObj.user_name == '报表管理') {
+          if (userObj.role_name.indexOf('admin') != -1 || userObj.role_name.indexOf('报表管理') != -1) {
             this.bbDisabled = false;
           }
           this.$refs.crud.rowEdit(scope.row, scope.$index);

+ 16 - 16
src/views/iosBasicData/AirtransportImport/bills/billsDetails.vue

@@ -1495,14 +1495,14 @@ import {
                             this.generateBillsfalse = true
                         }
                         if (item.curCode == 'CNY') {
-                            this.$set(item,'rmbAmount',item.amount)
+                            this.$set(item,'rmbAmount',Number(item.amount).toFixed(2))
                             this.$set(item,'usdAmount','')
-                            this.$set(item,'rmbAmountNet',item.amountNet)
+                            this.$set(item,'rmbAmountNet',Number(item.amountNet).toFixed(2))
                             this.$set(item,'usdAmountNet','')
                         }else {
-                            this.$set(item,'usdAmount',item.amount)
+                            this.$set(item,'usdAmount',Number(item.amount).toFixed(2))
                             this.$set(item,'rmbAmount','')
-                            this.$set(item,'usdAmountNet',item.amountNet)
+                            this.$set(item,'usdAmountNet',Number(item.amountNet).toFixed(2))
                             this.$set(item,'rmbAmountNet','')
                         }
                         item.edit = false
@@ -1519,14 +1519,14 @@ import {
                             this.columnforfun('teamId').disabled = true
                         }
                         if (item.curCode == 'CNY') {
-                            this.$set(item,'rmbAmount',item.amount)
+                            this.$set(item,'rmbAmount',Number(item.amount).toFixed(2))
                             this.$set(item,'usdAmount','')
-                            this.$set(item,'rmbAmountNet',item.amountNet)
+                            this.$set(item,'rmbAmountNet',Number(item.amountNet).toFixed(2))
                             this.$set(item,'usdAmountNet','')
                         }else {
-                            this.$set(item,'usdAmount',item.amount)
+                            this.$set(item,'usdAmount',Number(item.amount).toFixed(2))
                             this.$set(item,'rmbAmount','')
-                            this.$set(item,'usdAmountNet',item.amountNet)
+                            this.$set(item,'usdAmountNet',Number(item.amountNet).toFixed(2))
                             this.$set(item,'rmbAmountNet','')
                         }
                         item.edit = false
@@ -1609,14 +1609,14 @@ import {
                         this.generateBillsfalse = true
                     }
                     if (item.curCode == 'CNY') {
-                        this.$set(item,'rmbAmount',item.amount)
+                        this.$set(item,'rmbAmount',Number(item.amount).toFixed(2))
                         this.$set(item,'usdAmount','')
-                        this.$set(item,'rmbAmountNet',item.amountNet)
+                        this.$set(item,'rmbAmountNet',Number(item.amountNet).toFixed(2))
                         this.$set(item,'usdAmountNet','')
                     }else {
-                        this.$set(item,'usdAmount',item.amount)
+                        this.$set(item,'usdAmount',Number(item.amount).toFixed(2))
                         this.$set(item,'rmbAmount','')
-                        this.$set(item,'usdAmountNet',item.amountNet)
+                        this.$set(item,'usdAmountNet',Number(item.amountNet).toFixed(2))
                         this.$set(item,'rmbAmountNet','')
                     }
                     item.edit = false
@@ -1633,14 +1633,14 @@ import {
                         this.columnforfun('teamId').disabled = true
                     }
                     if (item.curCode == 'CNY') {
-                        this.$set(item,'rmbAmount',item.amount)
+                        this.$set(item,'rmbAmount',Number(item.amount).toFixed(2))
                         this.$set(item,'usdAmount','')
-                        this.$set(item,'rmbAmountNet',item.amountNet)
+                        this.$set(item,'rmbAmountNet',Number(item.amountNet).toFixed(2))
                         this.$set(item,'usdAmountNet','')
                     }else {
-                        this.$set(item,'usdAmount',item.amount)
+                        this.$set(item,'usdAmount',Number(item.amount).toFixed(2))
                         this.$set(item,'rmbAmount','')
-                        this.$set(item,'usdAmountNet',item.amountNet)
+                        this.$set(item,'usdAmountNet',Number(item.amountNet).toFixed(2))
                         this.$set(item,'rmbAmountNet','')
                     }
                     item.edit = false

+ 18 - 18
src/views/iosBasicData/OceanFreightImport/bills/assembly/feecenter.vue

@@ -1838,14 +1838,14 @@
                             // 计算金额
                             this.$set(row,'amount',Number(row.price) * Number(row.quantity?row.quantity:0))
                             if (row.curCode == 'CNY') {
-                                this.$set(row,'rmbAmount',row.amount)
+                                this.$set(row,'rmbAmount',row.amount.toFixed(2))
                                 this.$set(row,'usdAmount','')
-                                this.$set(row,'rmbAmountNet',row.amount)
+                                this.$set(row,'rmbAmountNet',row.amount.toFixed(2))
                                 this.$set(row,'usdAmountNet','')
                             }else {
-                                this.$set(row,'usdAmount',row.amount)
+                                this.$set(row,'usdAmount',row.amount.toFixed(2))
                                 this.$set(row,'rmbAmount','')
-                                this.$set(row,'usdAmountNet',row.amount)
+                                this.$set(row,'usdAmountNet',row.amount.toFixed(2))
                                 this.$set(row,'rmbAmountNet','')
                             }
                         }
@@ -1886,14 +1886,14 @@
                     }
                     this.$set(row,'amount',Number(row.price?row.price:0) * Number(row.quantity?row.quantity:0))
                     if (row.curCode == 'CNY') {
-                        this.$set(row,'rmbAmount',row.amount)
+                        this.$set(row,'rmbAmount',row.amount.toFixed(2))
                         this.$set(row,'usdAmount','')
-                        this.$set(row,'rmbAmountNet',row.amount)
+                        this.$set(row,'rmbAmountNet',row.amount.toFixed(2))
                         this.$set(row,'usdAmountNet','')
                     }else {
-                        this.$set(row,'usdAmount',row.amount)
+                        this.$set(row,'usdAmount',row.amount.toFixed(2))
                         this.$set(row,'rmbAmount','')
-                        this.$set(row,'usdAmountNet',row.amount)
+                        this.$set(row,'usdAmountNet',row.amount.toFixed(2))
                         this.$set(row,'rmbAmountNet','')
                     }
                 } else if (name == 'elementsCnName') {
@@ -1934,14 +1934,14 @@
                             this.$set(row,'exrate',item.exrate)
                             this.$set(row,'amount',Number(row.price) * Number(row.quantity?row.quantity:0))
                             if (row.curCode == 'CNY') {
-                                this.$set(row,'rmbAmount',row.amount)
+                                this.$set(row,'rmbAmount',row.amount.toFixed(2))
                                 this.$set(row,'usdAmount','')
-                                this.$set(row,'rmbAmountNet',row.amount)
+                                this.$set(row,'rmbAmountNet',row.amount.toFixed(2))
                                 this.$set(row,'usdAmountNet','')
                             }else {
-                                this.$set(row,'usdAmount',row.amount)
+                                this.$set(row,'usdAmount',row.amount.toFixed(2))
                                 this.$set(row,'rmbAmount','')
-                                this.$set(row,'usdAmountNet',row.amount)
+                                this.$set(row,'usdAmountNet',row.amount.toFixed(2))
                                 this.$set(row,'rmbAmountNet','')
                             }
                         }
@@ -1966,14 +1966,14 @@
                     return;
                 }
                 if (row.curCode == 'CNY') {
-                    this.$set(row,'rmbAmount',row.amount)
+                    this.$set(row,'rmbAmount',row.amount.toFixed(2))
                     this.$set(row,'usdAmount','')
-                    this.$set(row,'rmbAmountNet',row.amount)
+                    this.$set(row,'rmbAmountNet',row.amount.toFixed(2))
                     this.$set(row,'usdAmountNet','')
                 }else {
-                    this.$set(row,'usdAmount',row.amount)
+                    this.$set(row,'usdAmount',row.amount.toFixed(2))
                     this.$set(row,'rmbAmount','')
-                    this.$set(row,'usdAmountNet',row.amount)
+                    this.$set(row,'usdAmountNet',row.amount.toFixed(2))
                     this.$set(row,'rmbAmountNet','')
                 }
             },
@@ -1993,10 +1993,10 @@
                     return;
                 }
                 if (row.curCode == 'CNY') {
-                    this.$set(row,'rmbAmount',row.amount)
+                    this.$set(row,'rmbAmount',row.amount.toFixed(2))
                     this.$set(row,'usdAmount','')
                 }else {
-                    this.$set(row,'usdAmount',row.amount)
+                    this.$set(row,'usdAmount',row.amount.toFixed(2))
                     this.$set(row,'rmbAmount','')
                 }
             },

+ 1 - 1
src/views/iosBasicData/OceanFreightImport/bills/assembly/reports.vue

@@ -997,7 +997,7 @@
               this.bbDisabled = false;
             }
           }
-          if (userObj.user_name == 'admin' || userObj.user_name == '报表管理') {
+          if (userObj.role_name.indexOf('admin') != -1 || userObj.role_name.indexOf('报表管理') != -1) {
             this.bbDisabled = false;
           }
           this.$refs.crud.rowEdit(scope.row, scope.$index);

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

@@ -1849,14 +1849,14 @@
                             // 计算金额
                             this.$set(row,'amount',Number(row.price) * Number(row.quantity?row.quantity:0))
                             if (row.curCode == 'CNY') {
-                                this.$set(row,'rmbAmount',row.amount)
+                                this.$set(row,'rmbAmount',row.amount.toFixed(2))
                                 this.$set(row,'usdAmount','')
-                                this.$set(row,'rmbAmountNet',row.amount)
+                                this.$set(row,'rmbAmountNet',row.amount.toFixed(2))
                                 this.$set(row,'usdAmountNet','')
                             }else {
-                                this.$set(row,'usdAmount',row.amount)
+                                this.$set(row,'usdAmount',row.amount.toFixed(2))
                                 this.$set(row,'rmbAmount','')
-                                this.$set(row,'usdAmountNet',row.amount)
+                                this.$set(row,'usdAmountNet',row.amount.toFixed(2))
                                 this.$set(row,'rmbAmountNet','')
                             }
                         }
@@ -1897,14 +1897,14 @@
                     }
                     this.$set(row,'amount',Number(row.price?row.price:0) * Number(row.quantity?row.quantity:0))
                     if (row.curCode == 'CNY') {
-                        this.$set(row,'rmbAmount',row.amount)
+                        this.$set(row,'rmbAmount',row.amount.toFixed(2))
                         this.$set(row,'usdAmount','')
-                        this.$set(row,'rmbAmountNet',row.amount)
+                        this.$set(row,'rmbAmountNet',row.amount.toFixed(2))
                         this.$set(row,'usdAmountNet','')
                     }else {
-                        this.$set(row,'usdAmount',row.amount)
+                        this.$set(row,'usdAmount',row.amount.toFixed(2))
                         this.$set(row,'rmbAmount','')
-                        this.$set(row,'usdAmountNet',row.amount)
+                        this.$set(row,'usdAmountNet',row.amount.toFixed(2))
                         this.$set(row,'rmbAmountNet','')
                     }
                 } else if (name == 'elementsCnName') {
@@ -1945,14 +1945,14 @@
                             this.$set(row,'exrate',item.exrate)
                             this.$set(row,'amount',Number(row.price) * Number(row.quantity?row.quantity:0))
                             if (row.curCode == 'CNY') {
-                                this.$set(row,'rmbAmount',row.amount)
+                                this.$set(row,'rmbAmount',row.amount.toFixed(2))
                                 this.$set(row,'usdAmount','')
-                                this.$set(row,'rmbAmountNet',row.amount)
+                                this.$set(row,'rmbAmountNet',row.amount.toFixed(2))
                                 this.$set(row,'usdAmountNet','')
                             }else {
-                                this.$set(row,'usdAmount',row.amount)
+                                this.$set(row,'usdAmount',row.amount.toFixed(2))
                                 this.$set(row,'rmbAmount','')
-                                this.$set(row,'usdAmountNet',row.amount)
+                                this.$set(row,'usdAmountNet',row.amount.toFixed(2))
                                 this.$set(row,'rmbAmountNet','')
                             }
                         }
@@ -1977,14 +1977,14 @@
                     return;
                 }
                 if (row.curCode == 'CNY') {
-                    this.$set(row,'rmbAmount',row.amount)
+                    this.$set(row,'rmbAmount',row.amount.toFixed(2))
                     this.$set(row,'usdAmount','')
-                    this.$set(row,'rmbAmountNet',row.amount)
+                    this.$set(row,'rmbAmountNet',row.amount.toFixed(2))
                     this.$set(row,'usdAmountNet','')
                 }else {
-                    this.$set(row,'usdAmount',row.amount)
+                    this.$set(row,'usdAmount',row.amount.toFixed(2))
                     this.$set(row,'rmbAmount','')
-                    this.$set(row,'usdAmountNet',row.amount)
+                    this.$set(row,'usdAmountNet',row.amount.toFixed(2))
                     this.$set(row,'rmbAmountNet','')
                 }
             },
@@ -2004,10 +2004,10 @@
                     return;
                 }
                 if (row.curCode == 'CNY') {
-                    this.$set(row,'rmbAmount',row.amount)
+                    this.$set(row,'rmbAmount',row.amount.toFixed(2))
                     this.$set(row,'usdAmount','')
                 }else {
-                    this.$set(row,'usdAmount',row.amount)
+                    this.$set(row,'usdAmount',row.amount.toFixed(2))
                     this.$set(row,'rmbAmount','')
                 }
             },

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

@@ -1001,7 +1001,7 @@
               this.bbDisabled = false;
             }
           }
-          if (userObj.user_name == 'admin' || userObj.user_name == '报表管理') {
+          if (userObj.role_name.indexOf('admin') != -1 || userObj.role_name.indexOf('报表管理') != -1) {
             this.bbDisabled = false;
           }
           this.$refs.crud.rowEdit(scope.row, scope.$index);

+ 12 - 12
src/views/iosBasicData/aeamends/amendsDetails.vue

@@ -721,14 +721,14 @@ export default {
                 for(let data of arr) {
                     for (let item of this.form[data]) {
                         if (item.curCode == 'CNY') {
-                            this.$set(item, 'rmbAmount', item.amount)
+                            this.$set(item, 'rmbAmount', Number(item.amount).toFixed(2))
                             this.$set(item, 'usdAmount', '')
-                            this.$set(item, 'rmbAmountNet', item.amountNet)
+                            this.$set(item, 'rmbAmountNet', Number(item.amountNet).toFixed(2))
                             this.$set(item, 'usdAmountNet', '')
                         } else {
-                            this.$set(item, 'usdAmount', item.amount)
+                            this.$set(item, 'usdAmount', Number(item.amount).toFixed(2))
                             this.$set(item, 'rmbAmount', '')
-                            this.$set(item, 'usdAmountNet', item.amountNet)
+                            this.$set(item, 'usdAmountNet', Number(item.amountNet).toFixed(2))
                             this.$set(item, 'rmbAmountNet', '')
                         }
                     }
@@ -1016,28 +1016,28 @@ export default {
             // 应收
             for (let item of this.form.feeCenterListD) {
                 if (item.curCode == 'CNY') {
-                    this.$set(item, 'rmbAmount', item.amount)
+                    this.$set(item, 'rmbAmount', Number(item.amount).toFixed(2))
                     this.$set(item, 'usdAmount', '')
-                    this.$set(item, 'rmbAmountNet', item.amountNet)
+                    this.$set(item, 'rmbAmountNet', Number(item.amountNet).toFixed(2))
                     this.$set(item, 'usdAmountNet', '')
                 } else {
-                    this.$set(item, 'usdAmount', item.amount)
+                    this.$set(item, 'usdAmount', Number(item.amount).toFixed(2))
                     this.$set(item, 'rmbAmount', '')
-                    this.$set(item, 'usdAmountNet', item.amountNet)
+                    this.$set(item, 'usdAmountNet', Number(item.amountNet).toFixed(2))
                     this.$set(item, 'rmbAmountNet', '')
                 }
             }
             // 应付
             for (let item of this.form.feeCenterListC) {
                 if (item.curCode == 'CNY') {
-                    this.$set(item, 'rmbAmount', item.amount)
+                    this.$set(item, 'rmbAmount', Number(item.amount).toFixed(2))
                     this.$set(item, 'usdAmount', '')
-                    this.$set(item, 'rmbAmountNet', item.amountNet)
+                    this.$set(item, 'rmbAmountNet', Number(item.amountNet).toFixed(2))
                     this.$set(item, 'usdAmountNet', '')
                 } else {
-                    this.$set(item, 'usdAmount', item.amount)
+                    this.$set(item, 'usdAmount', Number(item.amount).toFixed(2))
                     this.$set(item, 'rmbAmount', '')
-                    this.$set(item, 'usdAmountNet', item.amountNet)
+                    this.$set(item, 'usdAmountNet', Number(item.amountNet).toFixed(2))
                     this.$set(item, 'rmbAmountNet', '')
                 }
             }

+ 12 - 12
src/views/iosBasicData/aiamends/amendsDetails.vue

@@ -734,14 +734,14 @@ export default {
                 for(let data of arr) {
                     for (let item of this.form[data]) {
                         if (item.curCode == 'CNY') {
-                            this.$set(item, 'rmbAmount', item.amount)
+                            this.$set(item, 'rmbAmount', Number(item.amount).toFixed(2))
                             this.$set(item, 'usdAmount', '')
-                            this.$set(item, 'rmbAmountNet', item.amountNet)
+                            this.$set(item, 'rmbAmountNet', Number(item.amountNet).toFixed(2))
                             this.$set(item, 'usdAmountNet', '')
                         } else {
-                            this.$set(item, 'usdAmount', item.amount)
+                            this.$set(item, 'usdAmount', Number(item.amount).toFixed(2))
                             this.$set(item, 'rmbAmount', '')
-                            this.$set(item, 'usdAmountNet', item.amountNet)
+                            this.$set(item, 'usdAmountNet', Number(item.amountNet).toFixed(2))
                             this.$set(item, 'rmbAmountNet', '')
                         }
                     }
@@ -1029,28 +1029,28 @@ export default {
             // 应收
             for (let item of this.form.feeCenterListD) {
                 if (item.curCode == 'CNY') {
-                    this.$set(item, 'rmbAmount', item.amount)
+                    this.$set(item, 'rmbAmount', Number(item.amount).toFixed(2))
                     this.$set(item, 'usdAmount', '')
-                    this.$set(item, 'rmbAmountNet', item.amountNet)
+                    this.$set(item, 'rmbAmountNet', Number(item.amountNet).toFixed(2))
                     this.$set(item, 'usdAmountNet', '')
                 } else {
-                    this.$set(item, 'usdAmount', item.amount)
+                    this.$set(item, 'usdAmount', Number(item.amount).toFixed(2))
                     this.$set(item, 'rmbAmount', '')
-                    this.$set(item, 'usdAmountNet', item.amountNet)
+                    this.$set(item, 'usdAmountNet', Number(item.amountNet).toFixed(2))
                     this.$set(item, 'rmbAmountNet', '')
                 }
             }
             // 应付
             for (let item of this.form.feeCenterListC) {
                 if (item.curCode == 'CNY') {
-                    this.$set(item, 'rmbAmount', item.amount)
+                    this.$set(item, 'rmbAmount', Number(item.amount).toFixed(2))
                     this.$set(item, 'usdAmount', '')
-                    this.$set(item, 'rmbAmountNet', item.amountNet)
+                    this.$set(item, 'rmbAmountNet', Number(item.amountNet).toFixed(2))
                     this.$set(item, 'usdAmountNet', '')
                 } else {
-                    this.$set(item, 'usdAmount', item.amount)
+                    this.$set(item, 'usdAmount', Number(item.amount).toFixed(2))
                     this.$set(item, 'rmbAmount', '')
-                    this.$set(item, 'usdAmountNet', item.amountNet)
+                    this.$set(item, 'usdAmountNet', Number(item.amountNet).toFixed(2))
                     this.$set(item, 'rmbAmountNet', '')
                 }
             }

+ 12 - 12
src/views/iosBasicData/seamends/amendsDetails.vue

@@ -744,14 +744,14 @@ export default {
                 for(let data of arr) {
                     for (let item of this.form[data]) {
                         if (item.curCode == 'CNY') {
-                            this.$set(item, 'rmbAmount', item.amount)
+                            this.$set(item, 'rmbAmount', Number(item.amount).toFixed(2))
                             this.$set(item, 'usdAmount', '')
-                            this.$set(item, 'rmbAmountNet', item.amountNet)
+                            this.$set(item, 'rmbAmountNet', Number(item.amountNet).toFixed(2))
                             this.$set(item, 'usdAmountNet', '')
                         } else {
-                            this.$set(item, 'usdAmount', item.amount)
+                            this.$set(item, 'usdAmount', Number(item.amount).toFixed(2))
                             this.$set(item, 'rmbAmount', '')
-                            this.$set(item, 'usdAmountNet', item.amountNet)
+                            this.$set(item, 'usdAmountNet', Number(item.amountNet).toFixed(2))
                             this.$set(item, 'rmbAmountNet', '')
                         }
                     }
@@ -1041,28 +1041,28 @@ export default {
             // 应收
             for (let item of this.form.feeCenterListD) {
                 if (item.curCode == 'CNY') {
-                    this.$set(item, 'rmbAmount', item.amount)
+                    this.$set(item, 'rmbAmount', Number(item.amount).toFixed(2))
                     this.$set(item, 'usdAmount', '')
-                    this.$set(item, 'rmbAmountNet', item.amountNet)
+                    this.$set(item, 'rmbAmountNet', Number(item.amountNet).toFixed(2))
                     this.$set(item, 'usdAmountNet', '')
                 } else {
-                    this.$set(item, 'usdAmount', item.amount)
+                    this.$set(item, 'usdAmount', Number(item.amount).toFixed(2))
                     this.$set(item, 'rmbAmount', '')
-                    this.$set(item, 'usdAmountNet', item.amountNet)
+                    this.$set(item, 'usdAmountNet', Number(item.amountNet).toFixed(2))
                     this.$set(item, 'rmbAmountNet', '')
                 }
             }
             // 应付
             for (let item of this.form.feeCenterListC) {
                 if (item.curCode == 'CNY') {
-                    this.$set(item, 'rmbAmount', item.amount)
+                    this.$set(item, 'rmbAmount', Number(item.amount).toFixed(2))
                     this.$set(item, 'usdAmount', '')
-                    this.$set(item, 'rmbAmountNet', item.amountNet)
+                    this.$set(item, 'rmbAmountNet', Number(item.amountNet).toFixed(2))
                     this.$set(item, 'usdAmountNet', '')
                 } else {
-                    this.$set(item, 'usdAmount', item.amount)
+                    this.$set(item, 'usdAmount', Number(item.amount).toFixed(2))
                     this.$set(item, 'rmbAmount', '')
-                    this.$set(item, 'usdAmountNet', item.amountNet)
+                    this.$set(item, 'usdAmountNet', Number(item.amountNet).toFixed(2))
                     this.$set(item, 'rmbAmountNet', '')
                 }
             }

+ 12 - 12
src/views/iosBasicData/siamends/amendsDetails.vue

@@ -717,14 +717,14 @@ export default {
                 for(let data of arr) {
                     for (let item of this.form[data]) {
                         if (item.curCode == 'CNY') {
-                            this.$set(item, 'rmbAmount', item.amount)
+                            this.$set(item, 'rmbAmount', Number(item.amount).toFixed(2))
                             this.$set(item, 'usdAmount', '')
-                            this.$set(item, 'rmbAmountNet', item.amountNet)
+                            this.$set(item, 'rmbAmountNet', Number(item.amountNet).toFixed(2))
                             this.$set(item, 'usdAmountNet', '')
                         } else {
-                            this.$set(item, 'usdAmount', item.amount)
+                            this.$set(item, 'usdAmount', Number(item.amount).toFixed(2))
                             this.$set(item, 'rmbAmount', '')
-                            this.$set(item, 'usdAmountNet', item.amountNet)
+                            this.$set(item, 'usdAmountNet', Number(item.amountNet).toFixed(2))
                             this.$set(item, 'rmbAmountNet', '')
                         }
                     }
@@ -1012,28 +1012,28 @@ export default {
             // 应收
             for (let item of this.form.feeCenterListD) {
                 if (item.curCode == 'CNY') {
-                    this.$set(item, 'rmbAmount', item.amount)
+                    this.$set(item, 'rmbAmount', Number(item.amount).toFixed(2))
                     this.$set(item, 'usdAmount', '')
-                    this.$set(item, 'rmbAmountNet', item.amountNet)
+                    this.$set(item, 'rmbAmountNet', Number(item.amountNet).toFixed(2))
                     this.$set(item, 'usdAmountNet', '')
                 } else {
-                    this.$set(item, 'usdAmount', item.amount)
+                    this.$set(item, 'usdAmount', Number(item.amount).toFixed(2))
                     this.$set(item, 'rmbAmount', '')
-                    this.$set(item, 'usdAmountNet', item.amountNet)
+                    this.$set(item, 'usdAmountNet', Number(item.amountNet).toFixed(2))
                     this.$set(item, 'rmbAmountNet', '')
                 }
             }
             // 应付
             for (let item of this.form.feeCenterListC) {
                 if (item.curCode == 'CNY') {
-                    this.$set(item, 'rmbAmount', item.amount)
+                    this.$set(item, 'rmbAmount', Number(item.amount).toFixed(2))
                     this.$set(item, 'usdAmount', '')
-                    this.$set(item, 'rmbAmountNet', item.amountNet)
+                    this.$set(item, 'rmbAmountNet', Number(item.amountNet).toFixed(2))
                     this.$set(item, 'usdAmountNet', '')
                 } else {
-                    this.$set(item, 'usdAmount', item.amount)
+                    this.$set(item, 'usdAmount', Number(item.amount).toFixed(2))
                     this.$set(item, 'rmbAmount', '')
-                    this.$set(item, 'usdAmountNet', item.amountNet)
+                    this.$set(item, 'usdAmountNet', Number(item.amountNet).toFixed(2))
                     this.$set(item, 'rmbAmountNet', '')
                 }
             }

+ 12 - 1
src/views/tirePartsMall/salesManagement/saleOrder/index.vue

@@ -338,7 +338,6 @@ export default {
         }, {
           label: '业务日期',
           prop: "businesDate",
-          overHidden: true,
           searchProp: "businesDateList",
           type: "date",
           overHidden: true,
@@ -348,6 +347,18 @@ export default {
           searchDefaultTime: ["00:00:00", "23:59:59"],
           format: "yyyy-MM-dd",
           valueFormat: "yyyy-MM-dd HH:mm:ss"
+        },{
+            label: '收费日期',
+            prop: "paymentDate",
+            searchProp: "paymentDateList",
+            type: "date",
+            overHidden: true,
+            search: true,
+            width: 100,
+            searchRange: true,
+            searchDefaultTime: ["00:00:00", "23:59:59"],
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd HH:mm:ss"
         }, {
           label: "制单人",
           prop: "createUserName",