1

src/xt_pages/dialysis/components/dialysisParametersDialog.vue

                 <template slot-scope="scope">
                    <span v-if="scope.row.anticoagulant==1">无肝素</span>
                    <span v-if="scope.row.anticoagulant==2">普通肝素</span>
+                   <span v-if="scope.row.anticoagulant==3">低分子肝素</span>
                    <span v-if="scope.row.anticoagulant==4">阿加曲班</span>
                    <span v-if="scope.row.anticoagulant==5">枸橼酸钠</span>
                    <span v-if="scope.row.anticoagulant==6">低分子肝素钙</span>
                    <span v-if="scope.row.anticoagulant==8">依诺肝素</span>
                    <span v-if="scope.row.anticoagulant==9">达肝素</span>
                    <span v-if="scope.row.anticoagulant==10">体外抗凝</span>
+                   <span v-if="scope.row.anticoagulant==11">那曲肝素</span>
                 </template>
             </el-table-column>
             <el-table-column align="center" prop="name"label="数量">

src/xt_pages/dialysis/details/BasicInfor.vue

       </li>
       <li>
         <label>年龄:</label>
-        <span>{{ getAge(patient) }}</span>
+        <span>{{ tranAge(patient)}}</span>
       </li>
       <li>
         <label>透析号 : </label>
   },
   methods: {
     getAge: function(val) {
+      console.log("val323232323223322332323",val)
       if (val.id_card_no) {
         var thisLen = val.id_card_no.length
 
         return age
       }
     },
+   tranAge(val) {
+        if(val.birthday){
+          var birth = uParseTime(val.birthday, '{y}-{m}-{d}');
+          return jsGetAge(birth, '-');
+        }
+    },
 
     stepState: function() {
       return parseInt(Math.random() * 1000 + '') % 2 == 1
     }
   },
   created() {
+    // console.log("hh23323233232332233223",this.$store.getters.xt_user.org.id)
     this.dialysis_time = this.$route.query.date ? parseTime(this.$route.query.date, '{y}-{m}-{d}') : parseTime(new Date(), '{y}-{m}-{d}')
   }
 }

src/xt_pages/dialysis/dialysisDrugs_print.vue

                                     <td>
                                       <span v-if="item.anticoagulant==1">无肝素</span>
                                       <span v-if="item.anticoagulant==2">普通肝素</span>
+                                      <span v-if="item.anticoagulant==3">低分子肝素</span>
                                       <span v-if="item.anticoagulant==4">阿加曲班</span>
                                       <span v-if="item.anticoagulant==5">枸橼酸钠</span>
                                       <span v-if="item.anticoagulant==6">低分子肝素钙</span>
                                       <span v-if="item.anticoagulant==8">依诺肝素</span>
                                       <span v-if="item.anticoagulant==9">达肝素</span>
                                       <span v-if="item.anticoagulant==10">体外抗凝</span> 
+                                      <span v-if="item.anticoagulant==11">那曲肝素</span> 
                                     </td>
                                     <td>
                                       {{item.count}}

src/xt_pages/hospitalStation/components/deskPrescription.vue

                     </el-table-column>
                     <el-table-column label="库存" width="60">
                       <template slot-scope="scope">
-                        {{scope.row.total}}{{scope.row.total?scope.row.min_unit:''}}
-                        <!--/ {{-->
-                        <!--scope.row.total * (scope.row.dose / scope.row.min_number)}}-->
-                        <!--{{(scope.row.total * (scope.row.dose /-->
-                        <!--scope.row.min_number))?scope.row.max_unit:''}}-->
+                         <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919">
+                             <span v-if="scope.row.count/scope.row.min_number>0">{{Math.floor(scope.row.count/scope.row.min_number)}}{{scope.row.max_unit}}</span>
+                             <span v-if="scope.row.count%scope.row.min_number>0"> {{scope.row.count%scope.row.min_number}}{{scope.row.min_unit}}</span>
+                          </span>
+                         <span v-else> {{scope.row.total}}{{scope.row.total?scope.row.min_unit:''}}</span>
                       </template>
                     </el-table-column>
                     <el-table-column label="单价" width="40">
                       <template slot-scope="scope">{{ scope.row.single_dose }}</template>
                     </el-table-column>
                     <el-table-column label="库存" width="40">
-                      <template slot-scope="scope">{{ scope.row.total }}</template>
+                      <template slot-scope="scope">
+                         <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919">
+                            {{scope.row.stock_count}}
+                        </span>
+                       <span v-else> {{ scope.row.total }}</span>
+                      </template>
                     </el-table-column>
                     <el-table-column label="单价" width="40">
                       <template slot-scope="scope">{{ scope.row.price }}</template>
       month_prescriptions: Array,
       isloading: false,
       loading: false,
+      org_id:Number,
       other_sick: {
         type: Array,
         default: function() {
         this.$refs.additionalCharges.show()
       },
       selectDrugs(selection, row) {
-        console.log('selection', selection)
-        console.log('row', row)
-        if (row.total <= 0) {
-          if (selection) {
-            selection.forEach(row => {
-              if (row.total <= 0) {
-                this.$refs.multipleTable.toggleRowSelection(row)
+      if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9919){
+            if (row.count <= 0) {
+              if (selection) {
+                selection.forEach(row => {
+                  if (row.count <= 0) {
+                    this.$refs.multipleTable.toggleRowSelection(row)
+                  }
+                })
+              } else {
+                this.$refs.multipleTable.clearSelection()
               }
-            })
-          } else {
-            this.$refs.multipleTable.clearSelection()
-          }
-          this.$message.error(row.drug_name + '库存不足')
-          return
+              this.$message.error(row.drug_name + '库存不足')
+              return
+            }
+        }else{
+           if (row.total <= 0) {
+              if (selection) {
+                selection.forEach(row => {
+                  if (row.total <= 0) {
+                    this.$refs.multipleTable.toggleRowSelection(row)
+                  }
+                })
+              } else {
+                this.$refs.multipleTable.clearSelection()
+              }
+              this.$message.error(row.drug_name + '库存不足')
+              return
+            }
         }
         this.curDrugs = selection
       },
       },
       selectChange(selection, row) {
         console.log('row', row)
-        if (row.total <= 0) {
-          if (row.type == 3) {
-            if (selection) {
-              selection.forEach(row => {
-                if (row.total <= 0) {
-                  this.$refs.tables.toggleRowSelection(row)
-                }
-              })
-            } else {
-              this.$refs.tables.clearSelection()
+          if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id ==10245 || this.org_id == 9919 ){
+           if (row.stock_count <= 0) {
+            if (row.type == 3) {
+              if (selection) {
+                selection.forEach(row => {
+                  if (row.stock_count <= 0) {
+                    this.$refs.tables.toggleRowSelection(row)
+                  }
+                })
+              } else {
+                this.$refs.tables.clearSelection()
+              }
+              this.$message.error(row.project_name + '库存不足')
+              return
             }
-            this.$message.error(row.project_name + '库存不足')
-            return
           }
+        }else{
+           if (row.total <= 0) {
+            if (row.type == 3) {
+              if (selection) {
+                selection.forEach(row => {
+                  if (row.total <= 0) {
+                    this.$refs.tables.toggleRowSelection(row)
+                  }
+                })
+              } else {
+                this.$refs.tables.clearSelection()
+              }
+              this.$message.error(row.project_name + '库存不足')
+              return
+            }
+          }
+
         }
         this.teamList.push(row)
       },
                 total: project[i].total,
                 is_special_diseases: project[i].disease_directory,
                 project: project[i],
+                stock_count:0,
               }
 
               this.tabProject.push(obj)
             var good_info = response.data.data.good_info
 
             for (let i = 0; i < good_info.length; i++) {
+               good_info[i].stock_count = 0
+              if(good_info[i].good_stock_in.length >0 ){
+                for(let j=0;j<good_info[i].good_stock_in.length;j++){
+                   good_info[i].stock_count += good_info[i].good_stock_in[j].stock_count
+                }
+              }
               let obj = {
                 id: good_info[i].id,
                 project_name: good_info[i].good_name,
                 total: good_info[i].total,
                 is_special_diseases: good_info[i].is_special_diseases,
                 good_info: good_info[i],
+                stock_count:good_info[i].stock_count,
               }
               this.tabProject.push(obj)
             }
       clearSelection() {
         this.$refs.tabProjectTeam.clearSelection()
       }
-    }, mounted() {
+    }, 
+    mounted() {
+     
       this.request_record_date = this.record_date
       // this.getInitData()
       //获取所有项目
           }, 400)
         }
       }
+    },
+    created(){
+      console.log("中华任命工商过多水分我333323232",this.org_id)
+      console.log("jjjjjjjjjjjjjjjjjjjjjjjjjjjj",this.drugs)
     }
 
   }

src/xt_pages/hospitalStation/doctorDesk.vue

                                    :month_prescriptions="month_prescriptions"
                                    ref="prescriptions" :prescriptions="prescriptions" :patientInfo="patientInfo"
                                    :hisPatientInfo="hisPatientInfo" @event1="changetwo($event)"
+                                   :org_id="org_id"
                                    v-if="titleType == '电子处方'" style="flex:1;"></desk-prescription>
 
 
             this.$message.error(response.data.msg)
             return false
           } else {
-            this.drugs = response.data.data.drugs
+            var drugs = response.data.data.drugs
+            for(let i=0;i<drugs.length;i++){
+                drugs[i].count = 0
+              if(drugs[i].stock_in.length > 0){
+                 for(let j=0;j<drugs[i].stock_in.length;j++){
+                    drugs[i].count += (drugs[i].stock_in[j].stock_max_number * drugs[i].min_number + drugs[i].stock_in[j].stock_min_number)
+                 }
+              }
+            }
+            this.drugs = drugs
             console.log("所有药品信息",this.drugs)
             this.allDrugs = response.data.data.drugs
             this.advices_template = response.data.data.advices_template
       // this.other_sick = this.getDictionaryDataConfig('system', 'other_sick_history')
       let tableHeight = document.body.clientHeight - 323
       this.tableHeight = tableHeight
-
+      this.org_id = this.$store.getters.xt_user.template_info.org_id
+     
     },
 
     mounted() {

src/xt_pages/stock/drugs/drugStockInOrderEdit.vue

             stockIn: this.recordInfo.recordData
           };
           console.log("params22222222222",params)
-         
+        
           EditDrugWarehouse(
             params,
             this.warehousing_time,

src/xt_pages/stock/stockPrint.vue

                                       <span v-if="getWareInfo(item.xt_warehouse_info)>0">{{getWareInfo(item.xt_warehouse_info)}}{{item.packing_unit}}</span>
                                    </td>
                                    <td>
-                                      <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id== 10245">
+                                      <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id== 10245 || org_id == 9779">
                                         <span>
                                           {{getWareInfo(item.xt_warehouse_info) - getOverFlushInfo(item.xt_warehouse_info) + getCancelSotckInfo(item.cancel_stock_info) }}
                                           </span>
                                    </td>
                                   
                                    <td>
-                                     <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id == 10245">{{getOverFlushInfo(item.xt_warehouse_info)}}</span>
+                                     <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9779">{{getOverFlushInfo(item.xt_warehouse_info)}}</span>
                                      <span v-else>{{getWareInfo(item.xt_warehouse_info) - getAutoCount(item.id) - getOutCount(item.id) + getCancelCount(item.id) }}</span>
                                     
                                    </td>

src/xt_pages/stock/stockQuery.vue

            <span v-if="getWareInfo(scope.row.xt_warehouse_info)>0">{{getWareInfo(scope.row.xt_warehouse_info)}}{{scope.row.packing_unit}}</span>
          </template>
        </el-table-column>
-       <el-table-column label="出库数量" align="center">
+       <el-table-column label="出库数量" align="center" v-if="showOne">
          <template slot-scope="scope">
-          <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id== 10245">
+          <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id== 10245 || org_id == 9779">
             <span>
               {{getWareInfo(scope.row.xt_warehouse_info) - getOverFlushInfo(scope.row.xt_warehouse_info) + getCancelSotckInfo(scope.row.cancel_stock_info) }}
             </span>
          </template>
        </el-table-column>
 
-       <el-table-column label="剩余库存量" align="center">
+       <el-table-column label="出库数量" align="center" v-if="showTwo">
          <template slot-scope="scope">
-          <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id == 10245">{{getOverFlushInfo(scope.row.xt_warehouse_info)}}</span>
+          <span>{{getAutoCount(scope.row.id) + getOutCount(scope.row.id)}} </span>
+         </template>
+       </el-table-column>
+
+       <el-table-column label="剩余库存量" align="center" v-if="showThree">
+         <template slot-scope="scope">
+          <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9779">{{getOverFlushInfo(scope.row.xt_warehouse_info)}}</span>
           <span v-else>{{getWareInfo(scope.row.xt_warehouse_info) - getAutoCount(scope.row.id) - getOutCount(scope.row.id) + getCancelCount(scope.row.id) }}</span>
          </template>
        </el-table-column>
+
+      <el-table-column label="剩余库存量" align="center" v-if="showFour">
+         <template slot-scope="scope">
+          <span>{{getWareInfo(scope.row.xt_warehouse_info) - getAutoCount(scope.row.id) - getOutCount(scope.row.id) + getCancelCount(scope.row.id) }}</span>
+         </template>
+       </el-table-column>
        <el-table-column label="操作" align="center" width="260px">
           <template slot-scope="scope">
               <el-button
       autoCountList:[],
       cancelCountList:[],
       org_id:0,
+      showOne:true,
+      showTwo:false,
+      showThree:true,
+      showFour:false
     };
   },
   methods: {
            this.tableList[i].inCount =  this.getWareInfo(this.tableList[i].xt_warehouse_info)
 
         
-          if(this.org_id == 9671 || this.org_id == 10138 || this.org_id == 10028 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245){
+          if(this.org_id == 9671 || this.org_id == 10138 || this.org_id == 10028 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9779){
              this.tableList[i].outCount  = this.getWareInfo(this.tableList[i].xt_warehouse_info) - this.getOverFlushInfo(this.tableList[i].xt_warehouse_info) + this.getCancelSotckInfo(this.tableList[i].cancel_stock_info) 
           }else{
             this.tableList[i].outCount =  this.getAutoCount(this.tableList[i].id) + this.getOutCount(this.tableList[i].id)
           }
           
-           if(this.org_id == 9671 || this.org_id == 10138 || this.org_id == 10028 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245){
+           if(this.org_id == 9671 || this.org_id == 10138 || this.org_id == 10028 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9779){
               this.tableList[i].overplus = this.getOverFlushInfo(this.tableList[i].xt_warehouse_info)
            }else{
              this.tableList[i].overplus = this.getWareInfo(this.tableList[i].xt_warehouse_info) - this.getAutoCount(this.tableList[i].id) - this.getOutCount(this.tableList[i].id) + this.getCancelCount(this.tableList[i].id)
       };
     getAllStockList(params).then(response=>{
          if(response.data.state == 1){
+         
+          if(this.end_time == ""){
+             this.showOne = true
+             this.showTwo = false
+             this.showThree = true
+             this.showFour = false
+          }
+          if(this.end_time !=""){
+            this.showOne = false
+            this.showTwo = true
+            this.showThree = false
+            this.showFour = true
+          }
           var list = response.data.data.list
-          // console.log("总库存数量",list)
+
           this.tableList = list
           var total = response.data.data.total
           this.total = total
       getStockDrugCount(params).then(response=>{
          if(response.data.state == 1){
            var outlist = response.data.data.outList
-          //  console.log("出库数量",outlist)
+        
            this.outCountList = outlist
            var autoCount = response.data.data.autoCount
-          //  console.log("autoCount",autoCount)
+        
            this.autoCountList = autoCount
            var totalCount = response.data.data.totalCount
-          //  console.log("totalcount",totalCount)
+         
            this.cancelCountList = totalCount
          }
       })
      return total
    },
    getCancelSotckInfo(arr){
-     console.log("2332323232322332",arr)
+    
      var cancle_toal = 0
      if(arr.length >0){
       for(let z=0;z<arr.length;z++){
         cancle_toal += arr[z].count
       }
      }
-     console.log("total",cancle_toal)
      return cancle_toal
    }
   }

src/xt_pages/workforce/remind_print_setting.vue

                 <div v-if="printObj.anticoagulant == 1">抗凝剂:
                   <span v-if="org_id == 10138 ">{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name + ' 5000iu/瓶' : ''}}</span>
                   <span v-else >
-                   <span>{{getAnticoagulant(main_collection.solution ? main_collection.solution : [],main_collection.mode_id)}}</span>
+                   <span>{{getAnticoagulant(main_collection.dialysissolution.mode_id)}}</span>
                   </span>
                 </div>
                <div v-if="org_id == 10188">首剂:{{main_collection.dialysissolution.anticoagulant_shouji}}</div>
                 <div v-if="printObj.anticoagulant_zongliang == 1">
                   用量:
                   <span v-if="main_collection.dialysissolution.anticoagulant == 1">
-                  {{getAnticoagulantZonliang(main_collection.solution ? main_collection.solution : [],main_collection.mode_id)+'mg'}}
+                   {{main_collection.dialysissolution.anticoagulant_zongliang}}mg
                   </span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 2">
-                    {{getAnticoagulantZonliang(main_collection.solution ? main_collection.solution : [],main_collection.mode_id)+'mg'}}
+                    {{main_collection.dialysissolution.anticoagulant_zongliang}}mg
                   </span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 3">
-                    {{getAnticoagulantZonliang(main_collection.solution ? main_collection.solution : [],main_collection.mode_id)+'iu'}}
+                    {{main_collection.dialysissolution.anticoagulant_zongliang}}iu
                   </span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 4">
-                    {{getAnticoagulantZonliang(main_collection.solution ? main_collection.solution : [],main_collection.mode_id)+'mg'}}
+                    {{main_collection.dialysissolution.anticoagulant_zongliang}}mg
                   </span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 5">
-                     {{getAnticoagulantZonliang(main_collection.solution ? main_collection.solution : [],main_collection.mode_id)+'mg'}}
+                     {{main_collection.dialysissolution.anticoagulant_zongliang}}mg
                    </span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 6">
-                   {{getAnticoagulantZonliang(main_collection.solution ? main_collection.solution : [],main_collection.mode_id)+'iu'}}
+                   {{main_collection.dialysissolution.anticoagulant_zongliang}}iu
                   </span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 7">
-                    {{getAnticoagulantZonliang(main_collection.solution ? main_collection.solution : [],main_collection.mode_id)+'iu'}}
+                    {main_collection.dialysissolution.anticoagulant_zongliang}}iu
                    </span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 8">
-                     {{getAnticoagulantZonliang(main_collection.solution ? main_collection.solution : [],main_collection.mode_id)+'iu'}}
+                     {{main_collection.dialysissolution.anticoagulant_zongliang}}iu
                   </span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 9">
-                     {{getAnticoagulantZonliang(main_collection.solution ? main_collection.solution : [],main_collection.mode_id)+'iu'}}
+                     {{main_collection.dialysissolution.anticoagulant_zongliang}}iu
                   </span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 10">
-                     {{getAnticoagulantZonliang(main_collection.solution ? main_collection.solution : [],main_collection.mode_id)+'iu'}}
+                     {{main_collection.dialysissolution.anticoagulant_zongliang}}iu
                     </span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 11">
-                    {{getAnticoagulantZonliang(main_collection.solution ? main_collection.solution : [],main_collection.mode_id)+'iu'}}
+                    {{main_collection.dialysissolution.anticoagulant_zongliang}}iu
                    </span>
                 </div>
                 <div v-if="org_id == 10188">干体重:{{main_collection.assessmentbefor.dry_weight}}</div>
         }
       });
      },
-      getAnticoagulant(arr,mode_id){
-       var name = ""
-       if(arr.length > 0){
-           for(let i=0;i<arr.length;i++){
-          if(mode_id == arr[i].mode_id){
-            name = arr[i].anticoagulant
-          }
-       } 
+    getAnticoagulant(name){
+     
       if(name == 0){
          name = ""
        }
        }
 
        return name
-      }
      },
      getAnticoagulantZonliang(arr,mode_id){
        var name = 0