Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/stock/stockQuery.vue

@@ -116,14 +116,8 @@
           <span v-else>{{getAutoCount(scope.row.id) + getOutCount(scope.row.id)}} </span>
          </template>
        </el-table-column>
-
-       <el-table-column label="出库数量" align="center" v-if="showTwo">
-         <template slot-scope="scope">
-          <span>{{getAutoCount(scope.row.id) + getOutCount(scope.row.id)}} </span>
-         </template>
-       </el-table-column>
-
-       <el-table-column label="剩余库存量" align="center" v-if="showThree">
+      
+        <el-table-column label="剩余库存量" align="center" v-if="showThree">
          <template slot-scope="scope">
           <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9779 || org_id == 10106 || org_id == 9504 || org_id ==  10215 || org_id == 10088 || org_id == 10191 || org_id == 9919">
             {{getOverFlushInfo(scope.row.xt_warehouse_info)}}
@@ -131,12 +125,21 @@
           <span v-else>{{getWareInfo(scope.row.xt_warehouse_info) - getAutoCount(scope.row.id) - getOutCount(scope.row.id) + getCancelCount(scope.row.id) }}</span>
          </template>
        </el-table-column>
-
+        
+    
       <el-table-column label="剩余库存量" align="center" v-if="showFour">
          <template slot-scope="scope">
           <span>{{getWareInfo(scope.row.xt_warehouse_info) - getAutoCount(scope.row.id) - getOutCount(scope.row.id) + getCancelCount(scope.row.id) }}</span>
          </template>
        </el-table-column>
+
+       <el-table-column label="出库数量" align="center" v-if="showTwo">
+         <template slot-scope="scope">
+          <span>{{getAutoCount(scope.row.id) + getOutCount(scope.row.id)}} </span>
+         </template>
+       </el-table-column>
+
+
        <el-table-column label="操作" align="center" width="260px">
           <template slot-scope="scope">
               <el-button
@@ -447,9 +450,9 @@ export default {
           }
           if(this.end_time !=""){
             this.showThree = false
+            this.showOne = false
             this.showTwo = true
             console.log("hh3223322323",this.showTwo)
-            this.showOne = false
             this.showFour = true
           }
           var list = response.data.data.list