518合并代码

src/xt_pages/stock/stockQuery.vue

@@ -181,7 +181,17 @@
 
        <el-table-column label="总库存量" align="center">
          <template slot-scope="scope">
-           {{getOverFlushInfo(scope.row.xt_warehouse_info)}}
+           <span v-if="org_id == 9675 || org_id == 3907 || org_id == 9583">
+              {{
+              getWareInfo(scope.row.xt_warehouse_info) -
+              getAutoCount(scope.row.id) -
+              getOutCount(scope.row.id) +
+              getCancelCount(scope.row.id)
+              }}
+           </span>
+           <span v-if="org_id != 9675 || org_id != 3907 || org_id != 9583">
+               {{getOverFlushInfo(scope.row.xt_warehouse_info)}}
+           </span>
          </template>
        </el-table-column>