11月14日 库存扣减更新

src/views/layout/Layout.vue

@@ -17,10 +17,10 @@
           <p>透析管理</p>
         </div>
 
-        <!-- <div v-if="caigouShow" :class="index == 5 ? 'navOne navActive' : 'navOne'" @click="clickActive(5,'采购管理')">
+        <div v-if="caigouShow" :class="index == 5 ? 'navOne navActive' : 'navOne'" @click="clickActive(5,'采购管理')">
           <i class="iconfont icon-kccx navIcon"></i>
           <p>采购管理</p>
-        </div> -->
+        </div>
         
         <div v-if="kucunShow" :class="index == 3 ? 'navOne navActive' : 'navOne'" @click="clickActive(3,'库房管理')">
           <i class="iconfont icon-kccx navIcon"></i>

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -783,11 +783,11 @@
           >
           </DialysisPrintOrderFive>
 
-          <DialysisPrintOrderFortySix
+          <DialysisPrintOrderSix
             v-bind:childResponse="childResponse"
             v-if="org_template_info.template_id == 6"
           >
-          </DialysisPrintOrderFortySix>
+          </DialysisPrintOrderSix>
 
           <DialysisPrintOrderSeven
             v-bind:childResponse="childResponse"

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -76,7 +76,7 @@
             </div>
           </div>
         </div>
-        <div class="row" v-if="org_id != 10307">
+        <div class="row">
           <div class="inline_block">
             入科方式：
             <div v-for="(item, index) in way_arr" class="under_line" v-if="receiverTreatmentAccess.way == item.id" style="width: 180px;text-align: left">
@@ -357,7 +357,7 @@
                   </div>
                   <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
                     <div class="inline_block" style="flex:1;">
-                      <span>透析(滤)器：</span> 
+                      透析(滤)器：
                       <div class="under_line" style="width: 100px;text-align: center">
                         {{ prescription.dialyzer_perfusion_apparatus ? prescription.dialyzer_perfusion_apparatus : "" }}
                         {{prescription.dialysis_dialyszers?prescription.dialysis_dialyszers:"/"}}
@@ -407,7 +407,7 @@
                       <div class="under_line" style="width: 100px;text-align: center">
                         {{ prescription.target_ultrafiltration ? prescription.target_ultrafiltration : "/" }}
                       </div>
-                     L
+                      L
                     </div>
                     <div class="inline_block" style="flex:1;">
                       干体重：
@@ -776,7 +776,7 @@
               </div>
             </div>
           </div>
-          <div class="row" style="margin-bottom:10px;" v-if="org_id != 10307" >
+          <div class="row" style="margin-bottom:10px;">
             <div class="inline_block">
               入科方式：
               <!--<check-box v-for="item, index in nutrition_arr" :key="index" :text="item.name" :checked="receiverTreatmentAccess.nutrition == item.id?true:false"></check-box>-->
@@ -817,7 +817,7 @@
               <!--平车-->
               <!--</div>-->
             </div>
-            <div class="inline_block" style="margin-left: 10px;" >
+            <div class="inline_block" style="margin-left: 10px;">
               诊断：
               <div class="under_line" style="width: 640px;text-align: left;word-break: break-all;word-wrap: break-word;display: inline-block;">
                 {{ patientInfo.diagnose }}
@@ -888,12 +888,12 @@
                 </tr>
               </template>
 
-              <tr v-if="org_id != 10307">
+              <tr>
                 <td colspan="7" style="letter-spacing:5px;text-align:center;font-weight:520;font-size:16px;padding: 6px 8px;line-height: 30px;">
                   透析后情况
                 </td>
               </tr>
-              <tr v-if="org_id != 10307">
+              <tr>
                 <td colspan="7">
                   <div class="row" style="padding: 2px 0;line-height:23px; display:flex;">
                     <div class="inline_block" style="flex:1;">
@@ -2020,7 +2020,6 @@ export default {
     }
   },
   created() {
-    console.log(this.org_id,'opop')
     this.way_arr = getDataConfig('hemodialysis', 'way')
     this.consciousness_arr = getDataConfig('hemodialysis', 'consciousness')
     this.appetite_arr = getDataConfig('hemodialysis', 'appetite')

src/xt_pages/supply/components/addGoodReturn.vue

@@ -863,7 +863,7 @@ export default {
             return_marke:this.return_remark,
            }
            console.log("2323323232",params)
-           return 
+          
            saveGoodReturnOrder(params,warehouse_out_id,this.start_time,this.rate_of_concession,this.discount_amount,this.arrearage,this.payment,this.supplier_name).then(response=>{
              if(response.data.state == 1){
                 this.loading = false

src/xt_pages/supply/components/addPurchaseOrder.vue

@@ -953,6 +953,7 @@ export default {
           this.disabled = false;
           this.showOne = true;
           this.is_check = 2;
+          this.Reviewed = false
           this.$message.success("反审核成功!");
         }
       });

src/xt_pages/supply/components/editGoodOrder.vue

@@ -1090,7 +1090,8 @@ export default {
             return_remake: this.return_remark,
           };
           //判断是否在采购订单数据中做了删除,如果长度相等则代表没有删除，如果不等则代表做了删除或者新增
-
+          console.log("changed111111",this.tableDataList.length)
+           console.log("changed111111",this.recordInfo.tableList.length)
           if(this.tableDataList.length != this.recordInfo.tableList.length){
             
              for(let i=0;i<this.recordInfo.tableList.length;i++){

src/xt_pages/supply/goodreturn.vue

@@ -118,9 +118,9 @@
          
          </template>
        </el-table-column> -->
-       <el-table-column label="源数量" align="center" width="200">
+       <el-table-column label="数量" align="center" width="200">
          <template slot-scope="scope">
-           {{scope.row.source_count}}
+           {{getCount(scope.row.cancelOrder)}}
          </template>
        </el-table-column>
 
@@ -257,9 +257,6 @@ export default {
             }
          }
        })
-     },
-     changeTypeName(){
-
      },
      getTimes(time) {
       if (time === '') {
@@ -276,6 +273,7 @@ export default {
           page:this.page,
           limit:this.limit,
         }
+       console.log("param23232323",params)
        getAllGoodReturnOrderList(params).then(response=>{
           if(response.data.state == 1){
             var list = response.data.data.list 
@@ -363,6 +361,18 @@ export default {
           })
         }).catch(() => {
        }) 
+     },
+     getCount(val){
+       var total = 0
+       for(let i=0;i<val.length;i++){
+         total += val[i].count
+       }
+       if(total >0){
+         return total
+       }else{
+         return ""
+       }
+      
      }
   },
   created() {