hah阿凡达

src/xt_pages/dialysis/hisLongSignPrint.vue

@@ -332,7 +332,14 @@ export default {
       
        
         console.log("list-------------",list)
-        this.list = list
+        
+        for(let i=0;i<list.length;i++){
+          list[i].sort = list[i].device_number.sort
+         
+        }
+        var arr = list.sort(this.compare('sort'))
+        console.log("arr--------",arr)
+        this.list = arr
       
         var druglist = response.data.data.drugList
         this.drugList =druglist
@@ -343,6 +350,13 @@ export default {
       }
     })
     },
+    compare(property) {
+       return function (a, b) {
+          var value1 = a[property];
+          var value2 = b[property];
+          return value1 - value2;
+      }
+    },
     getZoneName(patient_id){
       var zone_name = ""
        for(let i=0;i<this.list.length;i++){

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1758,7 +1758,7 @@
                     </table>
                   </td>
                 </tr>
-                <tr v-if="org_id != 10206">
+                <tr v-if="org_id != 10206 && org_id!=0 && org_id!=10744">
                   <td style="padding: 0; position: relative" colspan="2">
                     <table class="inside_table">
                       <tbody>
@@ -1944,7 +1944,7 @@
                   </td>
                 </tr>
 
-                <tr v-if="org_id == 10206">
+                <tr v-if="org_id == 10206 || org_id == 0 || org_id == 10744">
                   <td style="padding: 0; position: relative" colspan="2">
                     <table class="inside_table">
                       <tbody>
@@ -4433,7 +4433,7 @@ export default {
 
 
         //针对内蒙古阿拉善
-        if (this.org_id == 10206) {
+        if (this.org_id == 10206 || this.org_id == 0 || this.org_id == 10744) {
 
           if (this.doctor_advices != null && this.doctor_advices.length > 0) {
 
@@ -4488,6 +4488,7 @@ export default {
               console.log("newArrwowoow", newArr)
 
               this.new_doctor_advice_list = []
+
               this.new_doctor_advice_list.push(...newArr)
 
               console.log("newArrwowoow", this.new_doctor_advice_list)
@@ -4497,11 +4498,25 @@ export default {
 
         console.log("新时间我哦我哦", this.doctor_advices)
 
+          //过滤口服药
+          if (this.org_id == 0 || this.org_id ==10744) {
+          var docArr = []
+          if (this.new_doctor_advice_list != null && this.new_doctor_advice_list.length > 0) {
+            for (let i = 0; i < this.new_doctor_advice_list.length; i++) {
+              if (this.new_doctor_advice_list[i].delivery_way != '口服' && this.new_doctor_advice_list[i].delivery_way != '中药口服') {
+                docArr.push(this.new_doctor_advice_list[i])
+              }
+            }
+          }
+          this.new_doctor_advice_list = []
+          this.new_doctor_advice_list = docArr
+        }
+
        
 
 
         //过滤口服药
-        if (this.org_id == 10265) {
+        if (this.org_id == 10265 || this.org_id == 0 || this.org_id ==10744) {
           var docArr = []
           if (this.doctor_advices != null && this.doctor_advices.length > 0) {
             for (let i = 0; i < this.doctor_advices.length; i++) {

src/xt_pages/outpatientDoctorStation/recordPrint.vue

@@ -62,7 +62,7 @@
       <!-- || org_id == 0-->
       </printThree>
       <printFour
-        v-if="org_id == 10138 || org_id == 10278 || org_id == 10341 || org_id == 10342 || org_id == 0"
+        v-if="org_id == 10138 || org_id == 10278 || org_id == 10341 || org_id == 10342"
         ref="printFour"
         v-bind:childResponse="childResponse"
         :patient="patient"

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -26,7 +26,15 @@
           </div>
           <div class="infoMain">
             <div style="margin-bottom: 10px">
-              门诊号：{{ item.hisPatient.number ? item.hisPatient.number : "" }}
+              门诊号：
+              <span v-if="org_id !=10751 && org_id!=0">
+                {{ item.hisPatient.number ? item.hisPatient.number : "" }}
+              </span> 
+              <span v-if="org_id ==10751 || org_id==0">
+                {{ item.patient.admission_number ? item.patient.admission_number : "" }}
+              </span> 
+              
+
             </div>
             <div style="margin-bottom: 10px">
               科室：{{ item.info ? getDepart(item.info.departments) : "" }}

src/xt_pages/stock/detail/stockInDetail.vue

@@ -143,6 +143,12 @@
             </template>
           </el-table-column>
 
+          <el-table-column label="耗材批次" align="center">
+            <template slot-scope="scope">
+             {{ scope.row.number }}
+            </template>
+          </el-table-column>
+
           <el-table-column label="耗材名称" align="center">
             <template slot-scope="scope">
               {{ typeNameOne(scope.row.good_id) }}

src/xt_pages/stock/drugs/components/drugInOrder.vue

@@ -150,6 +150,12 @@
           </template>
         </el-table-column>
 
+        <el-table-column label="批次" align="center">
+          <template slot-scope="scope">
+            {{scope.row.batch_number}}
+          </template>
+        </el-table-column>
+
         <el-table-column label="药品名称" align="center">
           <template slot-scope="scope">
             {{scope.row.drug_name}}

src/xt_pages/workforce/remind_print_setting.vue

@@ -594,7 +594,7 @@
 
       },
 
-       compare(property) {
+     compare(property) {
        return function (a, b) {
           var value1 = a[property];
           var value2 = b[property];