Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

src/views/warehouse/warehouseManagementList.vue

@@ -231,7 +231,7 @@
               style="height: 24px"
               v-for="(item, i) in scope.row.warehouseNumViewList"
             >{{ item.goodsName}}
-             ({{ item.inNetWeight - item.outNetWeight }}) 
+             ({{ item.surplus}}) 
 
               {{item.storage }}
             </div>
@@ -623,12 +623,36 @@ export default {
       })
         .toPromise()
         .then((response) => {
+          for (let i = 0; i <response.length; i++) {
+            if(response[i].warehouseNumViewList){
+              for (let q = 0; q < response[i].warehouseNumViewList.length; q++) {
+                console.log(response[i].warehouseNumViewList[q])
+                if(response[i].warehouseNumViewList[q].inNetWeight){
+                  response[i].warehouseNumViewList[q].inNetWeight=Number(response[i].warehouseNumViewList[q].inNetWeight).toFixed(3)
+                }
+                if(response[i].warehouseNumViewList[q].outNetWeight){
+                  response[i].warehouseNumViewList[q].outNetWeight=Number(response[i].warehouseNumViewList[q].outNetWeight).toFixed(3)
+                }
+                if(response[i].warehouseNumViewList[q].storage){
+                  response[i].warehouseNumViewList[q].storage=Number(response[i].warehouseNumViewList[q].storage).toFixed(3)
+                }
+                if(response[i].warehouseNumViewList[q].inNetWeight&&response[i].warehouseNumViewList[q].outNetWeight){
+                  response[i].warehouseNumViewList[q].surplus =(response[i].warehouseNumViewList[q].inNetWeight-response[i].warehouseNumViewList[q].outNetWeight).toFixed(3)
+                }else if(response[i].warehouseNumViewList[q].inNetWeight){
+                  response[i].warehouseNumViewList[q].surplus=response[i].warehouseNumViewList[q].inNetWeight
+                }
+              }
+            }
+           
+            
+          }
           this.warehouseList = response
         })
         getsponsible({
         compId: sessionStorage.getItem('ws-pf_compId')
       }).toPromise()
         .then((response) => {
+          
           this.list=response
           // console.log(response)
         })