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

src/xt_pages/dialysis/template/DialysisPrintOrderTen.vue

@@ -35,7 +35,7 @@
             <check-box :checked="receiverTreatmentAccess.condition == 2 ? true : false"></check-box>
           </div>
         </div>
-        
+
         <div class="inline_block" v-if="receiverTreatmentAccess.condition == 1">
           住院：
           <div class="under_line" style="width: 30px;text-align: center;">
@@ -1657,7 +1657,7 @@ export default {
           this.doctor_advices = doctor_advices_1;
           this.doctor_advices_2 = doctor_advices_2;
         }
-        console.log(this.advice_groups);
+         console.log(this.advice_groups);
       } else {
         this.loading = false;
         this.$message.error("请求数据失败");

src/xt_pages/stock/drugs/cancelDrugStockOrderAdd.vue

@@ -303,6 +303,7 @@ export default {
   },
   methods: {
     comfirm: function(val) {
+     
       this.propForm.goodType = []
       this.propForm.goods = []
 

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -421,7 +421,7 @@
         this.isVisibility = true
       }, 
       comfirm: function(val) {
-        console.log("Val2222222",val)
+        console.log("Val2222222",this.currentIndex)
         this.$refs.dialog.hide()
         if (val.selectedGoodInfo.length > 0) {
           for (let i = val.selectedGoodInfo.length - 1; i >= 0; i--) {

src/xt_pages/stock/drugs/drugStockInOrderEdit.vue

@@ -375,6 +375,7 @@ export default {
     comfirm: function(val) {
       this.$refs.dialog.hide();
       console.log(val)
+      console.log("下摆哦2222222",this.currentIndex)
       if (val.selectedGoodInfo.length > 0) {
         for (let i = val.selectedGoodInfo.length - 1; i >= 0 ; i--) {
           if (i == 0) {

src/xt_pages/stock/stockQuery.vue

@@ -150,9 +150,7 @@
 
         <el-table-column label="剩余库存" align="center">
           <template slot-scope="scope">
-            <span>{{
-              stockInCount(scope.row)- stockOutCount(scope.row) + cancelStockCount(scope.row)
-            }}</span>
+            <span>{{stockInCount(scope.row)  - stockOutCount(scope.row) }}</span>
           </template>
         </el-table-column>
       </el-table>