Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/views/warehousenew/warehouseManagementList.vue

@@ -54,8 +54,11 @@
         <div class="position">
         <div class="title"><span class="cangInfo">仓库储量</span></div>
         <div class="weight">
-            <ws-button v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.view` " @click="changeWeight(2)">实际重量</ws-button>
-            <ws-button v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.view` " @click="changeWeight(1)">折算纯重</ws-button>
+          <el-switch style="display: block" v-model="value" active-color="#13ce66" 
+          inactive-color="#409EFF" active-text="折算纯重" inactive-text="实际重量"   
+          active-value="1" inactive-value="0" @change="changeWeight"></el-switch>
+            <!-- <ws-button v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.view` " @click="changeWeight(2)">实际重量</ws-button>
+            <ws-button v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.view` " @click="changeWeight(1)">折算纯重</ws-button> -->
           </div>
         <div class="color">
           <div v-for="(item , i) in totalReserves" :key="i" class="color_for">
@@ -347,6 +350,7 @@
     },
     data() {
       return {
+        value: '0',
         rules:{},
         options:[],
         StartDate:'',
@@ -1184,9 +1188,9 @@
             this.list = response
           })
       },
-      changeWeight(index) {
+      changeWeight(e) {
         //实际重量
-				if(index == 2){
+				if(e == '0'){
           getQualityReal({
             compId: localStorage.getItem('ws-pf_compId'),
             warehouseName: this.warehouseInfo.warehouseName
@@ -1214,7 +1218,6 @@
             for(let i = 0; i < response.warehouseNumViewList.length ; i++){
               let param ={}
               if (response.warehouseNumViewList[i].pureWeight) {
-                debugger
                 param.goodsName =response.warehouseNumViewList[i].goodsName
                 param.stockNum = Number(response.warehouseNumViewList[i].pureWeight).toFixed(3)
                 param.conversionCost = (Number(this.totalMoney) / Number(param.stockNum)).toFixed(3)