Merge branch 'master' of http://139.196.39.194:9021/chenc/sen-yu-new-web

src/views/book/book-list.vue

@@ -362,10 +362,11 @@ export default {
   methods: {
     moment,
     //获取表格数据
-    getBookList(){
+    getBookList(data){
       this.$nextTick(() => {
         // this.queryParam.pageSize = 50
         this.loading = true
+        if(data=='await'){this.loading = false}
         bookList(this.queryParam).then(res => {
           this.loading = false
           if (res.success) {
@@ -527,9 +528,9 @@ export default {
     pushU8(record){
       pushU8({ id: record.id}).then(res => {
           if (res.success) {
-           this.$message.success('推送U8成功')
+          //  this.$message.success('推送U8成功')
           //  record.theDocumentsState = '0'
-           this.getBookList()
+           this.getBookList('await')
           }else {
              this.$message.error(res.message);
           }
@@ -538,9 +539,9 @@ export default {
     pushPackLst(record){
       pushPackeList({ id: record.id}).then(res => {
           if (res.success) {
-           this.$message.success('推送装箱单发票成功')
+          //  this.$message.success('推送装箱单发票成功')
           //  record.theDocumentsState = '0'
-           this.getBookList()
+           this.getBookList('await')
           }else {
              this.$message.error(res.message);
           }

src/views/cost-allocation-total/costDetailDrawer.vue

@@ -554,7 +554,7 @@ export default {
                 allYu = 0//面料sheet-余下数量成本总计
             this.$refs.unitTabs.fabData.map(item=>{
               if(item.remainingQuantitycost!=='' && item.remainingQuantitycost){
-                item.remainingQuantitycost = item.remainingQuantitycost.toFixed(2)
+                item.remainingQuantitycost = Number(item.remainingQuantitycost).toFixed(2)
                 allYu +=Number(item.remainingQuantitycost)
               }
               if(item.transferCost&&item.transferCost!==''){
@@ -847,7 +847,7 @@ export default {
               item.usdAmount = ((item.priceExcludingtax?Number(item.priceExcludingtax):0)/Number(this.detailsPlanNum.exchangeRate)).toFixed(2)
             }
             if(item.rmbAmount !== item.usdAmount){  usdAmountAll+=item.usdAmount?Number(item.usdAmount):0   }
-            transferCostAll+=item.transferCostAll?Number(item.transferCost):0
+            transferCostAll+=item.transferCost?Number(item.transferCost):0
             rmbAmountAll+=item.rmbAmount?Number(item.rmbAmount):0
             priceExcludingtaxAll+=item.priceExcludingtax?Number(item.priceExcludingtax):0
           }

src/views/reportForms/cost-allocation-table.vue

@@ -784,7 +784,7 @@ export default {
               item.usdAmount = ((item.priceExcludingtax?Number(item.priceExcludingtax):0)/Number(this.detailsPlanNum.exchangeRate)).toFixed(2)
             }
             if(item.rmbAmount !== item.usdAmount){  usdAmountAll+=item.usdAmount?Number(item.usdAmount):0   }
-            transferCostAll+=item.transferCostAll?Number(item.transferCost):0
+            transferCostAll+=item.transferCost?Number(item.transferCost):0
             rmbAmountAll+=item.rmbAmount?Number(item.rmbAmount):0
             priceExcludingtaxAll+=item.priceExcludingtax?Number(item.priceExcludingtax):0
           }