11月14日 库存扣减更新

src/store/modules/globalConfig.js

@@ -644,6 +644,21 @@ const global_config = {
         sodium: 1,
         calcium: 1,
         bicarbonate: 1
+      },
+      30: {
+        id: 30,
+        name: '血浆胆红素吸附+HP',
+        dialysis_duration: 1,
+        replacement_way: 1,
+        hemodialysis_machine: 2,
+        blood_filter: 1,
+        perfusion_apparatus: 2,
+        blood_flow_volume: 1,
+        dialysate_flow: 1,
+        kalium: 1,
+        sodium: 1,
+        calcium: 1,
+        bicarbonate: 1
       }
     },
     anticoagulants_confit: { // 抗凝剂

src/xt_pages/dialysis/batch_print/batch_print_order_fortyOne.vue

@@ -442,6 +442,9 @@
                                 <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="record.prescription.mode_id == 29">
                                   PE
                                 </div>
+                               <div class="under_line" style="width: 150px;text-align: center;font-weight:600;" v-if="record.prescription.mode_id == 30">
+                                血浆胆红素吸附+HP
+                                </div>
                             </div>
                             <div class="inline_block" style="flex:1;">
                                 置换方式：

src/xt_pages/dialysis/batch_print/batch_print_order_fortyThree.vue

@@ -203,7 +203,7 @@
                             <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="record.prescription.mode_id == 22">
                             血浆胆红素吸附+HDF
                             </div>
-                            <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="record.prescription.mode_id == 23">
+                            <div class="under_line" style="width: 150px;text-align: center;font-weight:600;" v-if="record.prescription.mode_id == 23">
                             血浆胆红素吸附
                             </div>
                             <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="record.prescription.mode_id == 24">
@@ -221,6 +221,9 @@
                             <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="record.prescription.mode_id == 28">
                             CVVHDF
                             </div>
+                           <div class="under_line" style="width: 150px;text-align: center;font-weight:600;" v-if="record.prescription.mode_id == 30">
+                            血浆胆红素吸附+HDF
+                            </div>
                         </div>
                     </div>
                     <div class="row">

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -548,6 +548,13 @@
                           >
                             PE
                           </div>
+                          <div
+                            class="under_line"
+                            style="width: 150px;text-align: center;font-weight:600;"
+                            v-if="record.prescription.mode_id == 30"
+                          >
+                            血浆胆红素吸附+HP
+                          </div>
                         </div>
                       </div>
 

src/xt_pages/dialysis/template/DialysisPrintOrderFortySix.vue

@@ -614,6 +614,17 @@
                       >
                         PE
                       </div>
+                      <div
+                        class="under_line"
+                        style="
+                          width: 150px;
+                          text-align: center;
+                          font-weight: 600;
+                        "
+                        v-if="prescription.mode_id == 30"
+                      >
+                       血浆胆红素吸附+HP
+                      </div>
                     </div>
 
                     <div

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -321,6 +321,9 @@
                       <div class="under_line" style="width:100px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 29">
                         PE
                       </div>
+                       <div class="under_line" style="width:150px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 30">
+                        血浆胆红素吸附+HP
+                      </div>
                     </div>
 
                     <div class="inline_block" style="margin-left:10px;flex:1;">

src/xt_pages/qcd/basicInformationAnalysis.vue

@@ -258,6 +258,10 @@
                       <p>未知:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
                       <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
                   </span>
+                 <span v-if="item.mode_id == '血浆胆红素吸附+HP'">
+                      <p>血浆胆红素吸附+HP:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                      <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
+                  </span>
                </div>
               </div>
             </div>

src/xt_pages/qcd/treatmentControlAnalysis/components/TimePersonal.vue

@@ -291,6 +291,9 @@ export default {
             if(modeIdCount[i].mode_id == 29){
                modeIdCount[i].mode_id = "PE"
             }
+            if(modeIdCount[i].mode_id == 30){
+               modeIdCount[i].mode_id = "血浆胆红素吸附+HP"
+            }
           }
           this.modeIdCount = modeIdCount
           let dataInfo = {}

src/xt_pages/supply/components/addGoodOrder.vue

@@ -691,6 +691,7 @@ export default {
       });
     },
     changeGoodName(val) {
+      console.log("val2332232323323",val)
       this.currentIndex = val;
     },
     changeName(val) {
@@ -943,6 +944,7 @@ export default {
           //用来判断是否删除了从采购订单的数据
           this.tableDataList = []
           this.tableDataList = orderInfo
+          console.log("changed23323232233232",this.tableDataList)
          
         }
       });
@@ -991,19 +993,21 @@ export default {
           this.loading = true;
           var warehousing_id = this.$route.query.id;
           //判断是否在采购订单数据中做了删除,如果长度相等则代表没有删除，如果不等则代表做了删除或者新增
-          console.log("长度2332233232",this.tableDataList.length)
-          console.log("产股2333223232323",this.recordInfo.tableList.length)
-          if(this.tableDataList.length != this.recordInfo.tableList.length){
+          console.log("原数据",this.tableDataList)
+          console.log("新数据",this.recordInfo.tableList)
+          if(this.tableDataList.length > this.recordInfo.tableList.length){
              warehousing_id = 0
              for(let i=0;i<this.recordInfo.tableList.length;i++){
               this.recordInfo.tableList[i].id = 0
               this.number = ""
              }
           }
+          
           var params = {
             stockIn: this.recordInfo.tableList,
             return_remake: this.return_remark,
           };
+          // return
           addGoodOrder( params,this.supplier_name,start,this.arrearage,this.payment, warehousing_id,this.number,this.rate_of_concession,this.discount_amount).then((response) => {
             if (response.data.state == 1) {
               this.loading = false;

src/xt_pages/supply/components/editGoodOrder.vue

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

src/xt_pages/supply/components/editGoodReturn.vue

@@ -694,6 +694,7 @@ export default {
       tempObj["min_price"] = "";
       tempObj["good_number"] = ""
       tempObj["deposit_rate"] = ""
+      tempObj["order_number"] = ""
       this.recordInfo.tableList.push(tempObj);
     },
     handleDelete: function (index, row) {
@@ -1108,6 +1109,7 @@ export default {
     tempObj["min_price"] = "";
     tempObj["good_number"] = ""
     tempObj["deposit_rate"] = ""
+    tempObj["order_number"] = ""
     this.recordInfo.tableList.push(tempObj);
     this.getInitOrder();
     //获取购货单列表

src/xt_pages/workforce/scheduleTablePrintOne.vue

@@ -1000,6 +1000,9 @@ export default {
                  if(solution[i].mode_id == 29){
                     solution[i].mode_name = "PE"
                  }
+                if(solution[i].mode_id == 30){
+                    solution[i].mode_name = "血浆胆红素吸附+HP"
+                 }
                  if(solution[i].solution!=undefined){
                     solution[i].dialysis_dialyszers = solution[i].solution.dialysis_dialyszers
                     solution[i].dialysis_irrigation = solution[i].solution.dialysis_irrigation