新分支

src/store/modules/globalConfig.js

         gaimingcheng_unit: '',
         gaijiliang_unit: ''
       },
+      19: {
+        id: 19,
+        name: '低分子量肝素钠',
+        type: 1,
+        shouji: 1,
+        weichi: 1,
+        zongliang: 1,
+        gaimingcheng: -1,
+        gaijiliang: -1,
+        shouji_unit: 'iu',
+        weichi_unit: 'iu/h',
+        zongliang_unit: 'iu',
+        gaimingcheng_unit: '',
+        gaijiliang_unit: ''
+      },
     },
     anticoagulants_set: {
       type: 2

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

                         <span v-if="record.prescription.anticoagulant == 17"
                           >U</span
                         >
+                        <span v-if="record.prescription.anticoagulant == 19"
+                        >iu</span>
                       </div>
                       <div class="inline_block" style="margin-left: 20px">
                         维持：
                         <span v-if="record.prescription.anticoagulant == 17"
                           >U/h</span
                         >
+                        <span v-if="record.prescription.anticoagulant == 19"
+                        >iu/h</span>
                       </div>
                       <div class="inline_block" style="margin-left: 20px">
                         总量：
                         >
                         <span v-if="record.prescription.anticoagulant == 17"
                           >U</span>
+
+                        <span v-if="record.prescription.anticoagulant == 19"
+                          >iu</span>
                       </div>
                       <div class="inline_block" style="margin-left: 20px">
                         透析机号：

src/xt_pages/dialysis/details/consumable/dialysisGather.vue

           <el-table-column align="center" label="葡萄糖酸钙" v-if="gatherSetting.putaosuangai == 1">
              <template slot-scope="scope">
               <span v-if="scope.row.schedule_date <= timenow"> {{ scope.row.advice_spc_three }}</span>
-              <span v-if="scope.row.schedule_date <= timenow">{{ getLongAdviceThree(scope.row.long_doctor_advice,scope.row.schedule_date) }}</span>
+              <span v-if="scope.row.schedule_date > timenow">{{ getLongAdviceThree(scope.row.long_doctor_advice,scope.row.schedule_date) }}</span>
              </template>
           </el-table-column>
 
           <el-table-column align="center" label="肝素钠" v-if="org_id == 0 || org_id == 10683">
              <template slot-scope="scope">
               <span v-if="scope.row.schedule_date <= timenow"> {{ scope.row.advice_spc_four }}</span>
-              <span v-if="scope.row.schedule_date <= timenow">{{ getLongAdviceFour(scope.row.long_doctor_advice,scope.row.schedule_date)  }}</span>
+              <span v-if="scope.row.schedule_date > timenow">{{ getLongAdviceFour(scope.row.long_doctor_advice,scope.row.schedule_date)  }}</span>
              </template>
           </el-table-column>
           
                   list[i].advice_spc_two =""
                   list[i].advice_spc_three = ""
                   list[i].advice_spc_four = ""
+                  list[i].advice_spc_five = 0
                   for(let j=0;j<list[i].advice.length;j++){
                        if((list[i].advice[j].advice_name).indexOf("促红")!=-1){
                           list[i].advice_spc+= (list[i].advice[j].single_dose + list[i].advice[j].single_dose_unit+"/"+ list[i].advice[j].prescribing_number_unit)+","
                        }
 
                        if((list[i].advice[j].advice_name).indexOf("肝素钠")!=-1){
-                          list[i].advice_spc_four+= (list[i].advice[j].single_dose + list[i].advice[j].single_dose_unit+"/"+ list[i].advice[j].prescribing_number_unit)+","
+                          // list[i].advice_spc_four+= (list[i].advice[j].single_dose + list[i].advice[j].single_dose_unit+"/"+ list[i].advice[j].prescribing_number_unit)+","
+                         
+                          if(parseInt(list[i].advice[j].prescribing_number) >0){
+                            list[i].advice_spc_five += parseInt(list[i].advice[j].prescribing_number) 
+                            
+                            list[i].advice_spc_four =  list[i].advice_spc_five + "支"
+                          }else{
+                            list[i].advice_spc_four+= (list[i].advice[j].single_dose + list[i].advice[j].single_dose_unit+"/"+ list[i].advice[j].prescribing_number_unit)+","
+                          }
                        }
 
+
+
                    }
                 }
                 console.log("listwowowowowowo日本",this.list)
         var newArrList = []
         var newArr = []
         var advice_name = ""
+        var count = 0
          if(val!=null && val.length>0){
             for(let i=0;i<val.length;i++){
               if(val[i].advice_name.indexOf("左卡")!=-1){
          if(newArr!=null && newArr.length>0){
            for(let i=0;i<newArr.length;i++){
              advice_name += (newArr[i].single_dose + newArr[i].single_dose_unit+"/"+ newArr[i].prescribing_number_unit)+","
+             
            }
          }
          return advice_name
         var newArrList = []
         var newArr = []
         var advice_name = ""
+        var count =0
          if(val!=null && val.length>0){
             for(let i=0;i<val.length;i++){
               if(val[i].advice_name.indexOf("肝素钠")!=-1){
        
          if(newArr!=null && newArr.length>0){
            for(let i=0;i<newArr.length;i++){
-             advice_name += (newArr[i].single_dose + newArr[i].single_dose_unit+"/"+ newArr[i].prescribing_number_unit)+","
+            //  
+             count += newArr[i].prescribing_number
            }
          }
-         return advice_name
+         if(count >0){
+          return count +"支"
+         }else{
+          advice_name  += (newArr[i].single_dose + newArr[i].single_dose_unit+"/"+ newArr[i].prescribing_number_unit)+","
+          return  advice_name
+         }
+        
        },
        getweekday(date){
           var weekArray = new Array("周日", "周一", "周二", "周三", "周四", "周五", "周六");

src/xt_pages/dialysis/details/consumable/dialysisGatherPrint.vue

                   list[i].advice_spc_two =""
                   list[i].advice_spc_three = ""
                    list[i].advice_spc_four = ""
+                   list[i].advice_spc_five = 0
                    for(let j=0;j<list[i].advice.length;j++){
                        if((list[i].advice[j].advice_name).indexOf("促红")!=-1){
                           list[i].advice_spc+= (list[i].advice[j].single_dose + list[i].advice[j].single_dose_unit+"/"+ list[i].advice[j].prescribing_number_unit)+","
                        }
 
                        if((list[i].advice[j].advice_name).indexOf("肝素钠")!=-1){
-                          list[i].advice_spc_four+= (list[i].advice[j].single_dose + list[i].advice[j].single_dose_unit+"/"+ list[i].advice[j].prescribing_number_unit)+","
+                          // list[i].advice_spc_four+= (list[i].advice[j].single_dose + list[i].advice[j].single_dose_unit+"/"+ list[i].advice[j].prescribing_number_unit)+","
+                          if(parseInt(list[i].advice[j].prescribing_number) >0){
+                            list[i].advice_spc_five += parseInt(list[i].advice[j].prescribing_number) 
+                            
+                            list[i].advice_spc_four =  list[i].advice_spc_five + "支"
+                          }else{
+                            list[i].advice_spc_four+= (list[i].advice[j].single_dose + list[i].advice[j].single_dose_unit+"/"+ list[i].advice[j].prescribing_number_unit)+","
+                          }
                        }
 
                    }
         var newArrList = []
         var newArr = []
         var advice_name = ""
+        var count = 0
          if(val!=null && val.length>0){
             for(let i=0;i<val.length;i++){
               if(val[i].advice_name.indexOf("肝素钠")!=-1){
        
          if(newArr!=null && newArr.length>0){
            for(let i=0;i<newArr.length;i++){
-              advice_name += (newArr[i].single_dose + newArr[i].single_dose_unit+"/"+ newArr[i].prescribing_number_unit)+","
+            count += newArr[i].prescribing_number
+              // advice_name += (newArr[i].single_dose + newArr[i].single_dose_unit+"/"+ newArr[i].prescribing_number_unit)+","
            }
          }
-         return advice_name
+         if(count >0){
+          return count +"支"
+         }else{
+          return ""
+         }
+        
        },
        getweekday(date){
           var weekArray = new Array("周日", "周一", "周二", "周三", "周四", "周五", "周六");

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

                       <span v-if="org_id!=9538&& prescription.anticoagulant == 2">mg</span>
                       <span v-if="org_id==9538&& prescription.anticoagulant == 2">u</span>
                       <span v-if="prescription.anticoagulant == 1">mg</span>
-                      <span v-if="prescription.anticoagulant == 14">
+                      <span v-if="prescription.anticoagulant == 14 || prescription.anticoagulant == 19">
                        <span v-if="org_id!=10644">mg</span> 
                        <span v-if="org_id==10644">iu</span> 
                       </span>
                      <span v-if="prescription.anticoagulant == 10">iu</span>
                      <span v-if="prescription.anticoagulant == 11">iu</span>
                      <span v-if="prescription.anticoagulant == 13">iu</span>
-                     <span v-if="prescription.anticoagulant == 14">
+                     <span v-if="prescription.anticoagulant == 14 || prescription.anticoagulant == 19">
                       <span v-if="org_id!=10644">mg</span> 
                       <span v-if="org_id==10644">iu</span> 
                      </span>
                         <span v-if="org_id!=9538&& prescription.anticoagulant == 2">mg/h</span>
                         <span v-if="org_id==9538&& prescription.anticoagulant == 2">u</span>
                           <span v-if="prescription.anticoagulant == 1">mg/h</span>
-                          <span v-if="prescription.anticoagulant == 14">
+                          <span v-if="prescription.anticoagulant == 14 || prescription.anticoagulant == 19">
                             <span v-if="org_id!=10644">mg/h</span> 
                             <span v-if="org_id==10644">iu/h</span> 
                           </span>
                           <span v-if="prescription.anticoagulant == 10">iu/h</span>
                           <span v-if="prescription.anticoagulant == 11">iu/h</span>
                           <span v-if="prescription.anticoagulant == 13">iu/h</span>
-                          <span v-if="prescription.anticoagulant == 14">
+                          <span v-if="prescription.anticoagulant == 14 || prescription.anticoagulant == 19">
                             <span v-if="org_id!=10644">mg/h</span> 
                             <span v-if="org_id==10644">iu/h</span> 
                           </span>
                       <span v-if="org_id!=9538&& prescription.anticoagulant == 2">mg</span>
                       <span v-if="org_id==9538&& prescription.anticoagulant == 2">u</span>
                       <span v-if="prescription.anticoagulant == 1">mg</span>
-                      <span v-if="prescription.anticoagulant == 14">
+                      <span v-if="prescription.anticoagulant == 14 || prescription.anticoagulant == 19">
                         <span v-if="org_id!=10644">mg</span> 
                         <span v-if="org_id==10644">iu</span> 
                       </span>
                        <span v-if="prescription.anticoagulant == 10">iu</span>
                       <span v-if="prescription.anticoagulant == 11">iu</span>
                       <span v-if="prescription.anticoagulant == 13">iu</span>
-                      <span v-if="prescription.anticoagulant == 14">
+                      <span v-if="prescription.anticoagulant == 14 || prescription.anticoagulant == 19">
                         <span v-if="org_id!=10644">mg</span> 
                         <span v-if="org_id==10644">iu</span> 
                       </span>

src/xt_pages/stock/stockInOrder.vue

             </span>
           </template>
         </el-table-column>
+        <el-table-column label="耗材追溯码" align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.is_total == 0">
+               {{ scope.row.good_code}}
+            </span>
+          </template>
+        </el-table-column>
         <el-table-column label="备注" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.is_total == 0">

src/xt_pages/stock/stockInOrderAdd.vue

             </template>
           </el-table-column>
 
+          <el-table-column label="耗材追溯码" align="center" width="150">
+           
+              <template slot-scope="scope">
+               <div  @click="changeGoodCode(scope.row,scope.$index)">
+                <el-input v-model="scope.row.good_code"  placeholder="请输入耗材追溯码"></el-input>
+              </div>
+            </template>
+          
+          </el-table-column>
+
           <el-table-column label="备注" align="center" width="150">
             <template slot-scope="scope">
               <el-input placeholder="请输入备注" v-model="scope.row.remark"></el-input>
         <div style="margin-top: 20px;">合计金额: {{getTotalPirce() }} </div>
       </el-form>
 
-
+ 
     </div>
+
+    <el-dialog
+      title="耗材追溯码"
+      :visible.sync="dialogVisible"
+      width="40%">
+      <span>
+        <el-input
+         @keyup.native="changeText"
+          type="textarea"
+          placeholder="请输入内容"
+          v-model="textarea"
+          :rows="10"
+        >
+        </el-input>
+      </span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="saveTextArea()">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 
 </template>
             price: '',
             remark: '',
             dealer: '',
-            manufacturer: ''
-
+            manufacturer: '',
+            good_code:""
           },
           isCreated: 1
 
         showCheck:false,
         showReturnCheck:false,
         warehousing_info_id:0,
-        org_id:0
+        org_id:0,
+        dialogVisible:false,
+        currentRow:{},
+        currentIndex:0,
+        textarea:""
+
       }
     },
     methods: {
         tempObj["packing_price"] = ""
         tempObj["id"] = 0
         tempObj['register_number'] = ''
+        tempObj['good_code'] = ""
         this.recordInfo.recordData.push(tempObj)
       }, handleDelete: function(index, row) {
         if (this.recordInfo.recordData.length <= 1) {
                   list[i].product_date = this.getTimeOne(list[i].product_date)
                   list[i].good_name = list[i].GoodInfo.good_name
                   list[i].name = list[i].GoodInfo.specification_name +"/"+ list[i].GoodInfo.packing_unit
+                  list[i].good_code = list[i].good_code
                 }
                 this.recordInfo.recordData = []
                 this.recordInfo.recordData = list
           return ""
          }
        }
-     }
+     },
+     changeGoodCode(row,index){
+        this.textarea=""
+        this.textarea = row.drug_code
+        this.currentRow = row
+        this.currentIndex =index
+        this.dialogVisible = true
+     },
+     changeText(event){
+      // 检查是否为特定的按键，例如回车键，来确认扫码枪输入完成
+      if (event.key === 'Enter') {
+        var textarea = ""
+        textarea += this.textarea + ","
+        this.textarea = textarea
+
+      }
+     },
+     saveTextArea(){
+        for(let i=0;i<this.recordInfo.recordData.length;i++){
+          if(this.currentIndex == i){
+            this.recordInfo.recordData[i].good_code = this.textarea 
+          }
+        }
+        this.dialogVisible = false
+      },
     }
     ,
     created() {
       tempObj['packing_price']= ''
       tempObj['id']= 0
       tempObj['register_number'] = ''
+      tempObj['good_code'] = ''
       this.recordInfo.recordData.push(tempObj)
       this.GetConfigInfo()
       this.propForm.goodUnit = this.$store.getters.good_unit

src/xt_pages/stock/stockInOrderEdit.vue

                </el-select>
             </template>
           </el-table-column>
+
+          <el-table-column label="耗材追溯码" align="center" width="150">
+           
+           <template slot-scope="scope">
+              <div  @click="changeGoodCode(scope.row,scope.$index)">
+                <el-input v-model="scope.row.good_code"  placeholder="请输入耗材追溯码"></el-input>
+              </div>
+           </template>
+       
+         </el-table-column>
+
+
           <el-table-column label="备注" width="150" align="center">
             <template slot-scope="scope">
               <el-input v-model="scope.row.remark"  :disabled ="disabled"></el-input>
         <div style="margin-top: 20px;">合计金额: {{getTotalPirce() }} </div>
       </el-form>
     </div>
+
+    <el-dialog
+      title="耗材追溯码"
+      :visible.sync="dialogVisible"
+      width="40%">
+      <span>
+        <el-input
+         @keyup.native="changeText"
+          type="textarea"
+          placeholder="请输入内容"
+          v-model="textarea"
+          :rows="10"
+        >
+        </el-input>
+      </span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="saveTextArea()">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
       list:[],
       is_check:0,
       order_id:0,
+      org_id:0,
+      dialogVisible:false,
+      currentRow:{},
+      currentIndex:0,
+      textarea:""
     };
   },
   methods: {
             tempForm["remark"] = "";
             tempForm["dealer"] = "";
             tempForm["manufacturer"] = "";
+            tempForm["good_code"] = ""
             this.recordInfo.recordData.splice(
               this.currentIndex + 1,
               0,
       tempObj["manufacturer"] = "";
       tempObj["license_number"] = ""
       tempObj["packing_price"] = ""
+      tempObj["good_code"] = ""
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {
                 list[i].product_date = this.getTimeOne(list[i].product_date)
                 list[i].good_name = list[i].GoodInfo.good_name
                 list[i].name = list[i].GoodInfo.specification_name
+                list[i].good_code = list[i].good_code
                }
               this.recordInfo.recordData = []
               this.recordInfo.recordData = list
             tempObj["manufacturer"] = "";
             tempObj["license_number"] = ""
             tempObj["register_number"] = ""
+            tempObj["good_code"] = ""
             this.recordInfo.recordData.push(tempObj);
           }
         }
             }else{
                this.recordInfo.recordData[i].price = val.buy_price
             }
+
+            if(this.org_id == 0 || this.org_id == 10633){
+               this.recordInfo.recordData[i].price = val.first_xt_warehouse_info.packing_price
+            }
+
             if(val.packing_price == 0){
               this.recordInfo.recordData[i].packing_price = "0"
             }else{
             }else{
               this.recordInfo.recordData[i].dealer = val.dealer
             }
+
+
+
+            // for(let i=0;i<this.recordInfo.recordData.length;i++){
+            //   this.recordInfo.recordData[i].warehouse_info_str = ""
+            //   for(let j=0;j<this.recordInfo.recordData[i].xt_warehouse_info.length;j++){
+            //     this.recordInfo.recordData[i].warehouse_info_str += "批次:"+this.recordInfo.recordData[i].xt_warehouse_info[j].number+" " + "剩余:"+this.recordInfo.recordData[i].xt_warehouse_info[j].stock_count+this.recordInfo.recordData[i].packing_unit +"\n"
+            //   }
+            // }
           
           }
         }
          return ""
         }
       }
-    }
+    },
+    changeGoodCode(row,index){
+        this.textarea=""
+        this.textarea = row.drug_code
+        this.currentRow = row
+        this.currentIndex =index
+        this.dialogVisible = true
+     },
+     changeText(event){
+      // 检查是否为特定的按键，例如回车键，来确认扫码枪输入完成
+      if (event.key === 'Enter') {
+        var textarea = ""
+        textarea += this.textarea + ","
+        this.textarea = textarea
+
+      }
+     },
+     saveTextArea(){
+        for(let i=0;i<this.recordInfo.recordData.length;i++){
+          if(this.currentIndex == i){
+            this.recordInfo.recordData[i].good_code = this.textarea 
+          }
+        }
+        this.dialogVisible = false
+      },
      
   },
   created() {
+    this.org_id = this.$store.getters.xt_user.org.id
     this.GetConfigInfo();
     this.propForm.goodUnit = this.$store.getters.good_unit;
     const order_id = this.$route.query.id;

src/xt_pages/stock/stockOutOrderAdd.vue

                   type="number"
                   v-model="scope.row.stock_count"
                 ></el-input>
+                
               </el-form-item>
             </template>
           </el-table-column>
 
+          <!-- <el-table-column width="150" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>剩余批次详情</span>
+            </template>
+            <template slot-scope="scope">
+              {{ scope.row.warehouse_info_str }} 
+            </template>
+          </el-table-column> -->
+
 
          <el-table-column  width="150" align="center">
             <template slot="header" slot-scope="scope">
       loading:false,
       patients:[],
       classType:[{id:1,name:"上午"},{id:2,name:"下午"},{id:3,name:"晚上"}],
-
+      tableWarehouseInfoList:[],
+      org_id:0,
     };
   },
   methods: {
                     warehouseOutInfoList[i].expiry_date = this.getTimeOne(warehouseOutInfoList[i].expiry_date)
                     warehouseOutInfoList[i].product_date = this.getTimeOne(warehouseOutInfoList[i].product_date)
                     warehouseOutInfoList[i].patient_id = warehouseOutInfoList[i].patient_id
+                    
 
                  }
                  this.recordInfo.recordData = warehouseOutInfoList
             this.recordInfo.recordData[i].license_number = val.number
             this.recordInfo.recordData[i].register_number = val.register_number
             this.recordInfo.recordData[i].patient_id = 0
-             
+            this.recordInfo.recordData[i].xt_warehouse_info = val.xt_warehouse_info
+            this.recordInfo.recordData[i].packing_unit = val.packing_unit
             if( val.first_xt_warehouse_info!=null&&val.first_xt_warehouse_info.expiry_date >0){
               this.recordInfo.recordData[i].expiry_date = this.getTimeOne(val.first_xt_warehouse_info.expiry_date)
             }else{
               this.recordInfo.recordData[i].price = val.packing_price
             }
 
+            if(this.org_id == 0 || this.org_id == 10633){
+               this.recordInfo.recordData[i].price = val.first_xt_warehouse_info.packing_price
+            }
+
             this.recordInfo.recordData[i].specification_name = val.specification_name
             this.recordInfo.recordData[i].good_id = val.id
             if(val.dealer == 0){
              this.recordInfo.recordData[i].dealer = val.dealer
             }
 
+            for(let i=0;i<this.recordInfo.recordData.length;i++){
+              this.recordInfo.recordData[i].warehouse_info_str = ""
+              for(let j=0;j<this.recordInfo.recordData[i].xt_warehouse_info.length;j++){
+                this.recordInfo.recordData[i].warehouse_info_str += "批次:"+this.recordInfo.recordData[i].xt_warehouse_info[j].number+" " + "剩余:"+this.recordInfo.recordData[i].xt_warehouse_info[j].stock_count+this.recordInfo.recordData[i].packing_unit +"\n"
+              }
+            }
+
             console.log("日期我我我哦我",  this.recordInfo.recordData)
          }
 
           var list = response.data.data.list
           this.numberList = list
           // var lastWarehouseInfoTwo = response.data.data.lastWarehouseInfoTwo
+          // this.tableWarehouseInfoList = lastWarehouseInfoTwo
         }
      })
     },
 
   },
   created() {
-
+    this.org_id = this.$store.getters.xt_user.org.id
     var nowDate = new Date();
     var nowYear = nowDate.getFullYear();
     var nowMonth = nowDate.getMonth() + 1;