Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyfour.vue

@@ -541,7 +541,7 @@
                           ({{ advice.advice_desc}}{{ advice.drug_spec_unit }})
                         </span>
                         <span v-if="advice.prescribing_number">&nbsp;&nbsp;
-                          {{ advice.prescribing_number}}{{ advice.prescribing_number_unit }}
+                          {{ advice.prescribing_number}} {{ advice.prescribing_number_unit }}
                         </span>
                         <span v-if="advice.single_dose != 0">
                           {{ advice.single_dose}}{{ advice.single_dose_unit }}
@@ -1043,7 +1043,7 @@ export default {
                 this.projects[i].project_team = this.projects[i].team.project_team
                 this.projects[i].project_team_id = this.projects[i].team.id
                 this.projects[i].start_time = this.projects[i].start_time
-                this.projects[i].single_dose = this.projects[i].single_dose
+                this.projects[i].single_dose =  this.getCount(this.projects[i].project_id) 
                 this.projects[i].single_dose_unit = this.projects[i].unit
                 this.projects[i].execution_time = this.projects[i].execution_time
                 this.projects[i].execution_staff= this.projects[i].execution_staff 
@@ -1055,7 +1055,7 @@ export default {
                 this.projects[i].project_team = this.projects[i].project.project_name
                 this.projects[i].advice_name = this.projects[i].project.project_name
                 this.projects[i].start_time = this.projects[i].start_time
-                this.projects[i].single_dose = this.projects[i].single_dose
+                this.projects[i].single_dose =  this.getCount(this.projects[i].project_id) 
                 this.projects[i].single_dose_unit = this.projects[i].unit
                 this.projects[i].execution_time = this.projects[i].execution_time
                 this.projects[i].execution_staff= this.projects[i].execution_staff 
@@ -1221,7 +1221,30 @@ export default {
         }
       });
     },
-
+    getCount(id){
+      console.log("id2222",id)
+      console.log("this.projects",this.projects)
+      var arr = []
+      var count =0
+      for(let i=0;i<this.projects.length;i++){
+       
+        if(id == this.projects[i].project_id){
+          arr.push(this.projects[i])
+        }
+      }
+      console.log("arroowowow",arr)
+      if(arr!=null && arr.length>0){
+        // for(let i=0;i<arr.length;i++){
+        //   if(parseInt(arr[i].single_dose)>0){
+        //     count += parseInt(arr[i].single_dose)
+        //   }
+        
+        // }
+        count = arr[arr.length -1].count
+      }
+      console.log("coutnwowoowowwo",count)
+      return count
+    },
     getNumber() {
       if (this.dialysisOrder != null) {
         return (

src/xt_pages/hospitalStation/inHospitalHistory.vue

@@ -129,8 +129,8 @@ export default {
   data() {
     return {
       crumbs: [
-        { path: false, name: '门诊挂号' },
-        { path: false, name: '挂号历史' }
+        { path: false, name: '住院登记' },
+        { path: false, name: '住院历史' }
       ],
       register_type: 0,
       search_input: '',

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -79,6 +79,17 @@
       <div class="mainRight">
 
         <div class="mainCell fixedCell" style="margin-bottom:10px;">
+          <div v-if="org_id == 10454">
+            <el-button  size="small"
+                        @click="openZb(1)"
+                        v-if=" this.order.id == 0"
+                        type="primary">记账
+            </el-button>
+            <el-button   size="small"
+                         @click="openZb(2)"
+                         type="primary">撤销记账
+            </el-button>
+          </div>
 
           <div v-if="org_id == 10206">
             <el-button  size="small"
@@ -92,7 +103,7 @@
             </el-button>
           </div>
 
-          <div  v-if="org_id != 10340">
+          <div  v-if="org_id != 10206 && org_id != 10340 && org_id != 10454">
             <!--            <el-button size="small"-->
             <!--                       @click="openZb(1)"-->
             <!--                       type="primary">登记-->
@@ -1098,6 +1109,7 @@ export default {
       // ],
       register: [
         { value: 11, label: '普通门诊' },
+        { value: 12, label: '门诊挂号' },
         { value: 1102, label: '新冠门诊' },
         { value: 14, label: '门诊特殊病' },
         { value: '9922', label: '家庭通道' },
@@ -4754,71 +4766,114 @@ export default {
       if (this.big_month_prescriptions.length > 0) {
         this.editableTabsValue = this.big_month_prescriptions[0].curMonthPrescriptions.name
       }
-    },
-    getPName(med_type, index) {
+    }, getPName(med_type, index) {
       var med_type = parseInt(med_type)
 
-      switch (med_type) {
-        case 11:
-          return '普通门诊' + '处方' + index
+      if(this.org_id == 10206){
+        switch (med_type) {
+          case 1:
+            return '普通' + '处方' + index
 
-          break
-        case 1102:
-          return '新冠门诊' + '处方' + index
+            break
+          case 2:
+            return '急诊' + '处方' + index
 
-          break
-        case 12:
-          return '门诊挂号' + '处方' + index
+            break
+          case 5:
+            return '第一类精神药品' + '处方' + index
 
-          break
-        case 13:
-          return '急诊' + '处方' + index
+            break
+          case 6:
+            return '第二类精神药品' + '处方' + index
 
-          break
+            break
 
-        case 14:
-          return '门诊特殊病' + '处方' + index
-          break
+          case 7:
+            return '放射药品' + '处方' + index
+            break
 
-        case 15:
-          return '门诊统筹' + '处方' + index
+          case 8:
+            return '毒性药品' + '处方' + index
 
-          break
-        case 16:
-          return '门诊慢性病' + '处方' + index
+            break
+          case 9:
+            return '检查' + '处方' + index
 
-          break
-        case 21:
-          return '普通住院' + '处方' + index
-          break
-        case 1111:
-          return '精一' + '处方' + index
-          break
-        case 1112:
-          return '精二' + '处方' + index
-          break
-        case 9933:
-          return '门诊特殊病(9933)' + '处方' + index
-          break
-        case 990602:
-          return '门诊特殊病(990602)' + '处方' + index
-          break
-        case 1402:
-          return '门诊特殊病(1402)' + '处方' + index
-          break
-        case 1401:
-          return '门诊慢性病(1401)' + '处方' + index
-          break
-        case 2302:
-          return '异地就医(2302)' + '处方' + index
-          break
-        case 9922:
-          return '家庭通道' + '处方' + index
-          break
-        case 0:
-          return '自费' + '处方' + index
-          break
+            break
+          case 10:
+            return '检验' + '处方' + index
+            break
+          case 12:
+            return '治疗' + '处方' + index
+            break
+          case 99:
+            return '其他' + '处方' + index
+            break
+        }
+      }else{
+        switch (med_type) {
+          case 11:
+            return '普通门诊' + '处方' + index
+
+            break
+          case 1102:
+            return '新冠门诊' + '处方' + index
+
+            break
+          case 12:
+            return '门诊挂号' + '处方' + index
+
+            break
+          case 13:
+            return '急诊' + '处方' + index
+
+            break
+
+          case 14:
+            return '门诊特殊病' + '处方' + index
+            break
+
+          case 15:
+            return '门诊统筹' + '处方' + index
+
+            break
+          case 16:
+            return '门诊慢性病' + '处方' + index
+
+            break
+          case 21:
+            return '普通住院' + '处方' + index
+            break
+          case 1111:
+            return '精一' + '处方' + index
+            break
+          case 1112:
+            return '精二' + '处方' + index
+            break
+          case 9933:
+            return '门诊特殊病(9933)' + '处方' + index
+            break
+          case 990602:
+            return '门诊特殊病(990602)' + '处方' + index
+            break
+          case 1402:
+            return '门诊特殊病(1402)' + '处方' + index
+            break
+          case 1401:
+            return '门诊慢性病(1401)' + '处方' + index
+            break
+          case 2302:
+            return '异地就医(2302)' + '处方' + index
+            break
+          case 9922:
+            return '家庭通道' + '处方' + index
+            break
+          case 0:
+            return '自费' + '处方' + index
+            break
+        }
       }
+
     }, unique_four(array) {
       // res用来存储结果
       var res = []

src/xt_pages/outpatientCharges/summary.vue

@@ -1334,7 +1334,7 @@ export default {
                 name: order.patient.name,
                 id_card_no: order.patient.id_card_no,
                 year: "2023",
-                month: "09",
+                month: order.setl_time.split(" ")[0].split("-")[1],
                 code: data[b].code,
                 pric: data[b].total ,
                 item_name: data[b].name,

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -143,7 +143,7 @@
                               </el-date-picker>
 
 
-                              <el-select v-if="org_id != 10206" style="width:50%;" v-model="item.med_type" placeholder="医疗类型"
+                              <el-select v-if="org_id != 10206 && org_id != 0" style="width:50%;" v-model="item.med_type" placeholder="医疗类型"
                                          @change="changevalue">
                                   <el-option
                                           v-for="(item,index) in register"
@@ -153,7 +153,7 @@
                                   </el-option>
                               </el-select>
 <!--                            //针对海拉尔普爱肾病医院-->
-                            <el-select v-if="org_id == 10206" style="width:50%;" v-model="item.med_type" placeholder="医疗类型"
+                            <el-select v-if="org_id == 10206 ||  org_id == 0" style="width:50%;" v-model="item.med_type" placeholder="医疗类型"
                                        @change="changevalue">
                               <el-option
                                 v-for="(item,index) in register10206"
@@ -308,11 +308,16 @@
                                       <el-table-column label="名称">
                                           <template slot-scope="scope">{{ scope.row.drug_name }}</template>
                                       </el-table-column>
-                                      <el-table-column label="规格" width="60">
+                                      <el-table-column label="规格" width="60" v-if="org_id == 10206 || org_id == 0">
                                           <template slot-scope="scope">
-                                              <span v-if="scope.row.min_unit != scope.row.dose_unit">{{scope.row.dose}}{{scope.row.dose_unit}}&nbsp;* &nbsp;</span>{{scope.row.min_number}}{{scope.row.min_unit}}/{{scope.row.max_unit}}
+                                              <span>{{scope.row.drug_spec}}</span>
                                           </template>
                                       </el-table-column>
+                                    <el-table-column label="规格" width="60" v-if="org_id != 10206 && org_id != 0">
+                                      <template slot-scope="scope">
+                                        <span v-if="scope.row.min_unit != scope.row.dose_unit">{{scope.row.dose}}{{scope.row.dose_unit}}&nbsp;* &nbsp;</span>{{scope.row.min_number}}{{scope.row.min_unit}}/{{scope.row.max_unit}}
+                                      </template>
+                                    </el-table-column>
 
                                       <el-table-column label="库存" width="60" v-if="org_id != 10206">
                                           <template slot-scope="scope">
@@ -587,6 +592,7 @@ export default {
       register: [
 
         { value: 11, label: '普通门诊' },
+        { value: 12, label: '门诊挂号' },
         { value: 1102, label: '新冠门诊' },
         { value: 14, label: '门诊特殊病' },
         { value: 9922, label: '家庭通道' },
@@ -2391,7 +2397,7 @@ export default {
           if (index == 1) {
             console.log(this.prescriptions)
 
-            if (this.org_id != 10206) {
+            if (this.org_id != 10206 && this.org_id != 0) {
               for (let i = 0; i < this.prescriptions.length; i++) {
                 for (let b = 0; b < this.prescriptions[i].advices.length; b++) {
                   if (this.prescriptions[i].med_type == 14 && this.prescriptions[i].advices[b].drug.is_special_diseases != 1) {
@@ -2622,7 +2628,7 @@ export default {
                       }
                     }
 
-                    if(newArr.length > 0){
+                    if(newArr.length > 0 &&  this.org_id != 10206 && this.org_id != 0){
                       for(let i=0;i<newArr.length;i++){
                         if(newArr[i].is_user!=1){
                           if(newArr[i].out_count > newArr[i].sum_count){
@@ -2635,6 +2641,9 @@ export default {
 
                       }
                     }
+
+
+
                     console.log("newArr",newArr )
                   }
                 }
@@ -2690,7 +2699,7 @@ export default {
                       }
                     }
                     console.log("new233223322323",newArr)
-                    if(newArr.length > 0){
+                    if(newArr.length > 0 &&  this.org_id != 10206 && this.org_id != 0){
                       for(let i=0;i<newArr.length;i++){
                         if(newArr[i].is_user!=1){
                           if(newArr[i].out_count > newArr[i].sum_count){
@@ -2804,7 +2813,7 @@ export default {
                     }
 
                     for(let i=0;i<newProjectArr.length;i++){
-                      if(newProjectArr[i].out_count > newProjectArr[i].sum_count){
+                      if(newProjectArr[i].out_count > newProjectArr[i].sum_count &&  this.org_id != 10206 && this.org_id != 0){
                             this.$message.error(newProjectArr[i].str + "库存不足,保存失败!")
                             isLoading = false
                             this.$emit('editKeepLoad', false)
@@ -2986,7 +2995,11 @@ export default {
 
       }
 
-      obj.med_type = 14
+      if(this.org_id != 10206 && this.org_id != 0) {
+        obj.med_type = 14
+      }else{
+        obj.med_type = 12
+      }
 
       this.prescriptions.push(obj)
 
@@ -3228,7 +3241,7 @@ export default {
       //     }
       // }
 
-      if(row.is_user!=1){
+      if(row.is_user!=1 &&  this.org_id != 10206 && this.org_id != 0){
         if (row.sum_count <= 0) {
         if (selection) {
           selection.forEach(row => {
@@ -3243,14 +3256,35 @@ export default {
         return
        }
       }
+
+      // if(this.org_id == 10206){
+      //   if (row.zuobiao_stock_num <= 0) {
+      //     if (selection) {
+      //       selection.forEach(row => {
+      //         if (row.zuobiao_stock_num <= 0) {
+      //           this.$refs.multipleTable.toggleRowSelection(row)
+      //         }
+      //       })
+      //     } else {
+      //       this.$refs.multipleTable.clearSelection()
+      //     }
+      //     this.$message.error(row.drug_name + '库存不足')
+      //     return
+      //   }
+      // }
+
+
+
+
       this.curDrugs = selection
     },
 
     comfirm() {
 
+
       if (this.curDrugs.length > 0) {
         for (let i = 0; i < this.curDrugs.length; i++) {
-          if(this.org_id != 10206) {
+          if(this.org_id != 10206 && this.org_id != 0) {
             if (this.curPrescriptions.med_type == 14 && this.curDrugs[i].is_special_diseases != 1) {
               this.$message.error('该处方属于特病类型处方，开非特病类型的药')
               return
@@ -3260,7 +3294,7 @@ export default {
         }
       }
       if (this.teamList.length > 0) {
-        if(this.org_id != 10206) {
+        if(this.org_id != 10206 && this.org_id != 0) {
           for (let i = 0; i < this.teamList.length; i++) {
             if (this.curPrescriptions.med_type == 14 && this.teamList[i].is_special_diseases != 1) {
               this.$message.error('该处方属于特病类型处方，请开特病类型的项目')
@@ -3288,7 +3322,7 @@ export default {
 
       if (this.curDrugs.length == 0) {
         for (let i = 0; i < this.curDrugs.length; i++) {
-          if(this.org_id != 10206) {
+          if(this.org_id != 10206 && this.org_id != 0) {
             if (this.curPrescriptions.med_type == 14 && this.curDrugs[i].is_special_diseases != 1) {
               this.$message.error('该处方属于特病类型处方，开非特病类型的药')
               return
@@ -3537,7 +3571,7 @@ export default {
 
       // }
 
-       if (row.stock_count <= 0) {
+       if (row.stock_count <= 0 &&  this.org_id != 10206 && this.org_id != 0) {
           if (row.type == 3) {
             if (selection) {
               selection.forEach(row => {
@@ -3552,6 +3586,22 @@ export default {
             return
         }
        }
+
+      // if ( this.org_id == 10206) {
+      //   if (row.type == 3) {
+      //     if (selection) {
+      //       selection.forEach(row => {
+      //         if (row.zuobiao_stock_num <= 0) {
+      //           this.$refs.tables.toggleRowSelection(row)
+      //         }
+      //       })
+      //     } else {
+      //       this.$refs.tables.clearSelection()
+      //     }
+      //     this.$message.error(row.project_name + '库存不足')
+      //     return
+      //   }
+      // }
       this.teamList = selection
     },
     getlist() {
@@ -3623,7 +3673,7 @@ export default {
             this.tabProject.push(obj)
           }
           //跟坐标数据进行匹配，如果bbx01相等的话则，替换库存数量
-          if(this.org_id == 10206) {
+          if(this.org_id == 10206 ) {
             for (let i = 0; i < this.zuobiao_project.length; i++) {
               for (let b = 0; b < this.tabProject.length; b++) {
                 if (this.zuobiao_project[i].bbx01 == this.tabProject[b].bbx01){
@@ -3682,33 +3732,6 @@ export default {
       }
     },
     selectTeam(row) {
-      console.log(row)
-      // var arr = []
-      // for (let i = 0; i < row.length; i++) {
-      //   arr.push(row[i].item_id)
-      // }
-      // console.log(arr)
-      // var ids = arr.join(',')
-      // console.log(ids)
-      // var strArr = ids.split(',')
-      // console.log(strArr)
-      // var res = []//接收不重复的数据
-      //
-      // for (var i = 0; i < strArr.length; i++) {
-      //   var flag = true
-      //
-      //   for (var j = 0; j < i; j++) {
-      //     if (strArr[i] === strArr[j]) {
-      //       flag = false
-      //       break
-      //     }
-      //   }
-      //   if (flag) {
-      //     res.push(strArr[i])
-      //   }
-      // }
-      // console.log(res)
-      // var idstr = res.join(',')
       this.teamList = []
       let teamList = []
       for (let i = 0; i < row.length; i++) {
@@ -3745,12 +3768,20 @@ export default {
                 }
 
                 teamList.push(obj)
-              } else if (project[i].type == 3 && project[i].status == 1) {
-                if (project[i].good_info.sum_count <= 0) {
+              } else if (project[i].type == 3 && project[i].status == 1 ) {
+
+                if (project[i].good_info.sum_count <= 0 && this.org_id != 10206) {
                   num++
                   this.$refs.tabProjectTeam.toggleRowSelection(row)
                   this.$message.error(project[i].good_info.good_name + '库存不足')
                 }
+
+                // if (project[i].good_info.zuobiao_stock_num <= 0 && this.org_id == 10206) {
+                //   num++
+                //   this.$refs.tabProjectTeam.toggleRowSelection(row)
+                //   this.$message.error(project[i].good_info.good_name + '库存不足')
+                // }
+
                 if (num > 0) {
                   this.$refs.tabProjectTeam.clearSelection()
                 }

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -468,36 +468,38 @@
         //   this.$message.error('该处方已经结算或记账，无法删除')
         //
         // }
-        if (scope.row.drug.min_unit == scope.row.single_dose_unit) {
-          if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
-            console.log(1)
-            scope.row.prescribing_number = scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)
-          } else {
-            console.log(12)
-            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1)) * (scope.row.day ? scope.row.day : 1) / scope.row.drug.min_number)
-          }
-        } else {
-          if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
-            console.log(123)
-            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)) / scope.row.drug.dose)
+        if(this.$store.getters.xt_user.org_id != 10206) {
+          if (scope.row.drug.min_unit == scope.row.single_dose_unit) {
+            if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
+              console.log(1)
+              scope.row.prescribing_number = scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)
+            } else {
+              console.log(12)
+              scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1)) * (scope.row.day ? scope.row.day : 1) / scope.row.drug.min_number)
+            }
           } else {
-            console.log(1234)
-            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)) / scope.row.drug.dose / scope.row.drug.min_number)
+            if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
+              console.log(123)
+              scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)) / scope.row.drug.dose)
+            } else {
+              console.log(1234)
+              scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)) / scope.row.drug.dose / scope.row.drug.min_number)
+            }
           }
-        }
-        if (scope.row.prescribing_number == 0) {
-          scope.row.prescribing_number = 1
-        }
-        if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
-          // scope.row.retail_price = scope.row.drug.min_number / scope.row.retail_price
-          if (scope.row.prescribing_number > scope.row.drug.sum_count) {
-            this.$message.error(scope.row.drug_name + '库存不足')
+          if (scope.row.prescribing_number == 0) {
+            scope.row.prescribing_number = 1
           }
-        } else {
-          if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.sum_count) {
-            this.$message.error(scope.row.drug_name + '库存不足')
+          if (scope.row.prescribing_number_unit == scope.row.drug.min_unit && this.$store.getters.xt_user.org_id != 10206 && this.$store.getters.xt_user.org_id != 0) {
+            // scope.row.retail_price = scope.row.drug.min_number / scope.row.retail_price
+            if (scope.row.prescribing_number > scope.row.drug.sum_count) {
+              this.$message.error(scope.row.drug_name + '库存不足')
+            }
+          } else {
+            if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.sum_count) {
+              this.$message.error(scope.row.drug_name + '库存不足')
+            }
+            // scope.row.retail_price = scope.row.drug.retail_price * scope.row.prescribing_number
           }
-          // scope.row.retail_price = scope.row.drug.retail_price * scope.row.prescribing_number
         }
 
       },
@@ -506,42 +508,44 @@
           this.$message.error('该处方包含已发药的药品，无法修改')
           return
         }
-        if (scope.row.drug.min_unit == scope.row.single_dose_unit) {
-          if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
-            console.log(1)
-            scope.row.prescribing_number = scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)
+        if(this.$store.getters.xt_user.org_id != 10206) {
+          if (scope.row.drug.min_unit == scope.row.single_dose_unit) {
+            if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
+              console.log(1)
+              scope.row.prescribing_number = scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)
+            } else {
+              console.log(12)
+              scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1)) * (scope.row.day ? scope.row.day : 1) / scope.row.drug.min_number)
+            }
           } else {
-            console.log(12)
-            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1)) * (scope.row.day ? scope.row.day : 1) / scope.row.drug.min_number)
+            if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
+              console.log(123)
+              scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)) / scope.row.drug.dose)
+            } else {
+              console.log(1234)
+              scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)) / scope.row.drug.dose / scope.row.drug.min_number)
+            }
+          }
+          if (scope.row.prescribing_number == 0) {
+            scope.row.prescribing_number = 1
           }
-        } else {
           if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
-            console.log(123)
-            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)) / scope.row.drug.dose)
+            // scope.row.retail_price = scope.row.drug.min_number / scope.row.retail_price
+            if (scope.row.drug.is_user != 1) {
+              if (scope.row.prescribing_number > scope.row.drug.sum_count && this.$store.getters.xt_user.org_id != 10206 && this.$store.getters.xt_user.org_id != 0) {
+                this.$message.error(scope.row.drug_name + '库存不足')
+              }
+            }
+
           } else {
-            console.log(1234)
-            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)) / scope.row.drug.dose / scope.row.drug.min_number)
-          }
-        }
-        if (scope.row.prescribing_number == 0) {
-          scope.row.prescribing_number = 1
-        }
-        if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
-          // scope.row.retail_price = scope.row.drug.min_number / scope.row.retail_price
-          if(scope.row.drug.is_user!=1){
-           if (scope.row.prescribing_number > scope.row.drug.sum_count) {
-            this.$message.error(scope.row.drug_name + '库存不足')
-           }
-          }
+            if (scope.row.drug.is_user != 1) {
+              if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.sum_count && this.$store.getters.xt_user.org_id != 10206 && this.$store.getters.xt_user.org_id != 0) {
+                this.$message.error(scope.row.drug_name + '库存不足')
+              }
+            }
 
-        } else {
-          if(scope.row.drug.is_user!=1){
-           if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.sum_count) {
-            this.$message.error(scope.row.drug_name + '库存不足')
-           }
+            // scope.row.retail_price = scope.row.drug.retail_price * scope.row.prescribing_number
           }
-
-          // scope.row.retail_price = scope.row.drug.retail_price * scope.row.prescribing_number
         }
 
       },
@@ -633,22 +637,23 @@
         //     this.$message.error(scope.row.drug_name + '库存不足')
         //    }
         // }
+        if(this.$store.getters.xt_user.org_id != 10206) {
 
-
-        if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
-          if(scope.row.drug.is_user!=1){
-            if (parseInt(scope.row.prescribing_number) > scope.row.drug.sum_count) {
-              this.$message.error(scope.row.drug_name + '库存不足')
+          if (scope.row.prescribing_number_unit == scope.row.drug.min_unit && this.$store.getters.xt_user.org_id != 10206 && this.$store.getters.xt_user.org_id != 0) {
+            if (scope.row.drug.is_user != 1) {
+              if (parseInt(scope.row.prescribing_number) > scope.row.drug.sum_count) {
+                this.$message.error(scope.row.drug_name + '库存不足')
+              }
             }
-          }
 
-        } else {
-          if(scope.row.drug.is_user!=1){
-            if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.sum_count) {
-              this.$message.error(scope.row.drug_name + '库存不足')
+          } else {
+            if (scope.row.drug.is_user != 1 && this.$store.getters.xt_user.org_id != 10206 && this.$store.getters.xt_user.org_id != 0) {
+              if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.sum_count) {
+                this.$message.error(scope.row.drug_name + '库存不足')
+              }
             }
-          }
 
+          }
         }
       },
       getProjectSingleDose(scope) {

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -1521,21 +1521,20 @@ export default {
                   } else {
                     that.zuobiao_drug  = response.data.data.drug
                     that.zuobiao_project  = response.data.data.project
-
                     //跟坐标数据进行匹配，如果bbx01相等的话则，替换库存数量
-                    if(that.org_id == 10206) {
                       for (let i = 0; i < that.zuobiao_drug.length; i++) {
                         for (let b = 0; b < that.drugs.length; b++) {
-                          if (that.zuobiao_project[i].ggid == that.drugs[b].bby01){
-                            that.drugs[b]["zuobiao_stock_num"] = that.zuobiao_project[i].sysl
+                          if (that.zuobiao_drug[i].bby01 == that.drugs[b].bby01){
+                            that.drugs[b]["zuobiao_stock_num"] = that.zuobiao_drug[i].sysl
                           }
                         }
                       }
 
-                    }
+                    console.log("------~~00000-------")
                     console.log(that.drugs)
+                    console.log(that.zuobiao_drug)
                     console.log(that.zuobiao_project)
-
+                    console.log("------~~00000-------")
                   }
                 }
               })
@@ -2053,16 +2052,23 @@ export default {
                   med_type: '',
                   is_medicine_status:false,
                 }
-                if (prescription.med_type == 0 || prescription.med_type == '') {
+                if(this.org_id != 10206) {
+                  if (prescription.med_type == 0 || prescription.med_type == '') {
 
-                  obj.med_type = ''
+                    obj.med_type = ''
 
-                } else {
+                  } else {
 
-                  obj.med_type = parseInt(prescription.med_type)
-                }
-                if (obj.med_type == 0 || obj.med_type == '') {
-                  obj.med_type = 14
+                    obj.med_type = parseInt(prescription.med_type)
+                  }
+                  if (obj.med_type == 0 || obj.med_type == '') {
+                    if (this.org_id != 10206 ) {
+                      obj.med_type = 14
+                    } else {
+
+                      obj.med_type = ""
+                    }
+                  }
                 }
                 this.prescriptions.push(obj)
               }
@@ -2079,7 +2085,9 @@ export default {
                 med_type: '',
                 is_medicine_status:false,
               }
-              obj.med_type = 14
+              if(this.org_id != 10206 ){
+                obj.med_type = 14
+              }
               this.prescriptions.push(obj)
 
             }
@@ -2536,18 +2544,20 @@ export default {
                         med_type: ''
 
                       }
-                      if (prescription.med_type == 0 || prescription.med_type == '') {
+                      if(this.org_id != 10206) {
+                        if (prescription.med_type == 0 || prescription.med_type == '') {
 
-                        obj.med_type = ''
+                          obj.med_type = ''
 
-                      } else {
+                        } else {
 
-                        obj.med_type = parseInt(prescription.med_type)
-                      }
-                      if (obj.med_type == 0 || obj.med_type == '') {
+                          obj.med_type = parseInt(prescription.med_type)
+                        }
+                        if (obj.med_type == 0 || obj.med_type == '') {
 
-                        obj.med_type = 14
+                          obj.med_type = 14
 
+                        }
                       }
                       this.prescriptions.push(obj)
                     }
@@ -2565,7 +2575,9 @@ export default {
 
                     }
 
-                    obj.med_type = 14
+                    if (this.org_id != 10206 ) {
+                      obj.med_type = 14
+                    }
 
                     this.prescriptions.push(obj)
 
@@ -3065,16 +3077,18 @@ export default {
                         med_type: ''
 
                       }
-                      if (prescription.med_type == 0 || prescription.med_type == '') {
+                      if(this.org_id != 10206 ) {
+                        if (prescription.med_type == 0 || prescription.med_type == '') {
 
-                        obj.med_type = ''
+                          obj.med_type = ''
 
-                      } else {
+                        } else {
 
-                        obj.med_type = parseInt(prescription.med_type)
-                      }
-                      if (obj.med_type == 0 || obj.med_type == '') {
-                        obj.med_type = 14
+                          obj.med_type = parseInt(prescription.med_type)
+                        }
+                        if (obj.med_type == 0 || obj.med_type == '') {
+                          obj.med_type = 14
+                        }
                       }
                       this.prescriptions.push(obj)
                     }
@@ -3091,8 +3105,9 @@ export default {
                       med_type: ''
 
                     }
-
-                    obj.med_type = 14
+                    if(this.org_id != 10206 ) {
+                      obj.med_type = 14
+                    }
 
                     this.prescriptions.push(obj)
 
@@ -3581,17 +3596,19 @@ export default {
                       med_type: ''
 
                     }
-                    if (prescription.med_type == 0 || prescription.med_type == '') {
+                    if(this.org_id != 10206 ) {
+                      if (prescription.med_type == 0 || prescription.med_type == '') {
 
-                      obj.med_type = ''
+                        obj.med_type = ''
 
-                    } else {
+                      } else {
 
-                      obj.med_type = parseInt(prescription.med_type)
-                    }
-                    if (obj.med_type == 0 || obj.med_type == '') {
-                      obj.med_type = 14
+                        obj.med_type = parseInt(prescription.med_type)
+                      }
+                      if (obj.med_type == 0 || obj.med_type == '') {
+                        obj.med_type = 14
 
+                      }
                     }
                     this.prescriptions.push(obj)
                   }
@@ -3609,7 +3626,9 @@ export default {
 
                   }
 
-                  obj.med_type = 14
+                  if(this.org_id != 10206 ) {
+                    obj.med_type = 14
+                  }
 
                   this.prescriptions.push(obj)
 
@@ -4216,18 +4235,20 @@ export default {
                         med_type: ''
 
                       }
-                      if (prescription.med_type == 0 || prescription.med_type == '') {
+                      if(this.org_id != 10206 ) {
+                        if (prescription.med_type == 0 || prescription.med_type == '') {
 
-                        obj.med_type = ''
+                          obj.med_type = ''
 
-                      } else {
+                        } else {
 
-                        obj.med_type = parseInt(prescription.med_type)
-                      }
-                      if (obj.med_type == 0 || obj.med_type == '') {
+                          obj.med_type = parseInt(prescription.med_type)
+                        }
+                        if (obj.med_type == 0 || obj.med_type == '') {
 
-                        obj.med_type = 14
+                          obj.med_type = 14
 
+                        }
                       }
                       this.prescriptions.push(obj)
                     }
@@ -4244,8 +4265,9 @@ export default {
                       med_type: ''
 
                     }
-
-                    obj.med_type = 14
+                    if(this.org_id != 10206  ) {
+                      obj.med_type = 14
+                    }
 
                     this.prescriptions.push(obj)
 
@@ -4870,17 +4892,19 @@ export default {
                         med_type: ''
 
                       }
-                      if (prescription.med_type == 0 || prescription.med_type == '') {
+                      if(this.org_id != 10206 ) {
+                        if (prescription.med_type == 0 || prescription.med_type == '') {
 
-                        obj.med_type = ''
+                          obj.med_type = ''
 
-                      } else {
+                        } else {
 
-                        obj.med_type = parseInt(prescription.med_type)
-                      }
-                      if (obj.med_type == 0 || obj.med_type == '') {
-                        obj.med_type = 14
+                          obj.med_type = parseInt(prescription.med_type)
+                        }
+                        if (obj.med_type == 0 || obj.med_type == '') {
+                          obj.med_type = 14
 
+                        }
                       }
                       this.prescriptions.push(obj)
                     }
@@ -4897,8 +4921,10 @@ export default {
                       med_type: ''
 
                     }
+                    if(this.org_id != 10206 ) {
 
-                    obj.med_type = 14
+                      obj.med_type = 14
+                    }
 
                     this.prescriptions.push(obj)
 

src/xt_pages/outpatientDoctorStation/modeTemplateDetail.vue

@@ -47,7 +47,7 @@
                                 </el-option>
                               </el-select>
                               <!--                            //针对海拉尔普爱肾病医院-->
-                              <el-select v-if="org_id == 10206" style="width:50%;" v-model="item.med_type" placeholder="医疗类型"
+                              <el-select v-if="org_id == 10206 || org_id == 0" style="width:50%;" v-model="item.med_type" placeholder="医疗类型"
                                          @change="changevalue">
                                 <el-option
                                   v-for="(item,index) in register10206"
@@ -115,13 +115,18 @@
                                             <el-table-column label="名称">
                                                 <template slot-scope="scope">{{ scope.row.drug_name }}</template>
                                             </el-table-column>
-                                            <el-table-column label="规格" width="60">
+                                            <el-table-column label="规格" width="60" v-if="org_id != 10206 && org_id != 0">
                                                 <template slot-scope="scope">
                                                    <span
                                                        v-if="scope.row.min_unit != scope.row.dose_unit">{{ scope.row.dose }}{{ scope.row.dose_unit }}&nbsp;* &nbsp;</span>
                                                        {{ scope.row.min_number }}{{ scope.row.min_unit }}/{{ scope.row.max_unit }}
                                                   </template>
                                             </el-table-column>
+                                          <el-table-column label="规格" width="60" v-if="org_id == 10206 || org_id == 0">
+                                            <template slot-scope="scope">
+                                                   <span>{{scope.row.drug_spec}}</span>
+                                            </template>
+                                          </el-table-column>
                                             <el-table-column label="单价" width="40">
                                                 <template slot-scope="scope">{{ scope.row.retail_price }}</template>
                                             </el-table-column>
@@ -408,7 +413,7 @@
             return
           }
         }
-        if(this.$store.getters.xt_user.org_id != 10206) {
+        if(this.$store.getters.xt_user.org_id != 10206 && this.$store.getters.xt_user.org_id != 0) {
           for (let i = 0; i < this.prescriptions.length; i++) {
             for (let b = 0; b < this.prescriptions[i].advices.length; b++) {
               if (this.prescriptions[i].med_type == 14 && this.prescriptions[i].advices[b].drug.is_special_diseases != 1) {
@@ -1357,7 +1362,7 @@
         if (this.curDrugs.length > 0 ) {
 
           for (let i = 0; i < this.curDrugs.length; i++) {
-            if(this.$store.getters.xt_user.org.id != 10206) {
+            if(this.$store.getters.xt_user.org.id != 10206 && this.$store.getters.xt_user.org.id != 0 ) {
               if (this.curPrescriptions.med_type == 14 && this.curDrugs[i].is_special_diseases != 1) {
                 this.$message.error('该处方属于特病类型处方，开非特病类型的药')
                 return
@@ -1368,7 +1373,7 @@
         }
         if (this.teamList.length > 0) {
           for (let i = 0; i < this.teamList.length; i++) {
-            if(this.$store.getters.xt_user.org.id != 10206) {
+            if(this.$store.getters.xt_user.org.id != 10206 && this.$store.getters.xt_user.org.id != 0 ) {
 
               if (this.curPrescriptions.med_type == 14 && this.teamList[i].is_special_diseases != 1) {
                 setTimeout(() => {
@@ -1395,7 +1400,7 @@
 
         if (this.curDrugs.length == 0) {
           for (let i = 0; i < this.curDrugs.length; i++) {
-            if(this.$store.getters.xt_user.org.id != 10206) {
+            if(this.$store.getters.xt_user.org.id != 10206 && this.$store.getters.xt_user.org.id != 0) {
               if (this.curPrescriptions.med_type == 14 && this.curDrugs[i].is_special_diseases != 1) {
                 this.$message.error('该处方属于特病类型处方，开非特病类型的药')
                 return

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -140,14 +140,18 @@
                                             <el-table-column label="名称">
                                                 <template slot-scope="scope">{{ scope.row.drug_name }}</template>
                                             </el-table-column>
-                                            <el-table-column label="规格" width="60">
-                                                <template slot-scope="scope">
-                                                  <!-- {{ scope.row.drug_spec }} -->
+                                          <el-table-column label="规格" width="60" v-if="org_id != 10206 && org_id != 0">
+                                            <template slot-scope="scope">
                                                    <span
-                                                       v-if="scope.row.min_unit != scope.row.dose_unit">{{ scope.row.dose }}{{ scope.row.dose_unit }}&nbsp;* &nbsp;</span>
-                                                       {{ scope.row.min_number }}{{ scope.row.min_unit }}/{{ scope.row.max_unit }}
-                                                  </template>
-                                            </el-table-column>
+                                                     v-if="scope.row.min_unit != scope.row.dose_unit">{{ scope.row.dose }}{{ scope.row.dose_unit }}&nbsp;* &nbsp;</span>
+                                              {{ scope.row.min_number }}{{ scope.row.min_unit }}/{{ scope.row.max_unit }}
+                                            </template>
+                                          </el-table-column>
+                                          <el-table-column label="规格" width="60" v-if="org_id == 10206 || org_id == 0">
+                                            <template slot-scope="scope">
+                                              <span>{{scope.row.drug_spec}}</span>
+                                            </template>
+                                          </el-table-column>
                                             <el-table-column label="单价" width="40">
                                                 <template slot-scope="scope">{{ scope.row.retail_price }}</template>
                                             </el-table-column>

src/xt_pages/user/templateSummary.vue

@@ -882,7 +882,7 @@
           other_count:"",
           dialzer_apparatus:"",
           perfusion_apparatus:"",
-          anticoagulant:"",
+          anticoagulant:0,
           kalium:"",
           autunite:"",
           natrium:"",
@@ -1400,30 +1400,30 @@
              this.$message.success("保存成功!");
              this.show_dialog = false
              this.form.title = ""
-             this.form.dry_weight = ""
-             this.form.dialysis_count =""
-             this.form.hd_count= ""
-             this.form.hdf_count = ""
-             this.form.hp_count = ""
-             this.form.other_count =""
-             this.form.dialzer_apparatus = ""
-             this.form.perfusion_apparatus = ""
-             this.form.anticoagulant  = ""
-             this.form.kalium = ""
-             this.form.autunite = ""
-             this.form.natrium = ""
-             this.form.hour =""
-             this.form.minute = ""
-             this.form.befor_weight = ""
-             this.form.after_weight = ""
-             this.form.befor_pressure = ""
-             this.form.template_summary_content = ""
-             this.form.template_plan_content = ""
-             this.form.template_inspection_content = ""
-             this.from.after_pressure = ""
-             this.form.template_summary_id = ""
-             this.form.template_plan_id = ""
-             this.form.template_inspection_id = ""
+            //  this.form.dry_weight = ""
+            //  this.form.dialysis_count =""
+            //  this.form.hd_count= ""
+            //  this.form.hdf_count = ""
+            //  this.form.hp_count = ""
+            //  this.form.other_count =""
+            //  this.form.dialzer_apparatus = ""
+            //  this.form.perfusion_apparatus = ""
+            //  this.form.anticoagulant  = 0
+            //  this.form.kalium = ""
+            //  this.form.autunite = ""
+            //  this.form.natrium = ""
+            //  this.form.hour =""
+            //  this.form.minute = ""
+            //  this.form.befor_weight = ""
+            //  this.form.after_weight = ""
+            //  this.form.befor_pressure = ""
+            //  this.form.template_summary_content = ""
+            //  this.form.template_plan_content = ""
+            //  this.form.template_inspection_content = ""
+            //  this.from.after_pressure = ""
+            //  this.form.template_summary_id = ""
+            //  this.form.template_plan_id = ""
+            //  this.form.template_inspection_id = ""
            }
         })
       },

src/xt_permission.js

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-    store.dispatch('VerifyConfigList', []).then(() => {
-      next()
-    })
-  }
-  if (store.getters.permission_routers === undefined) {
-    store.dispatch('xt_GenerateRoutes', []).then(() => {
-      next()
-    })
-  } else {
-    next()
-  }
-  return
+  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+  //   store.dispatch('VerifyConfigList', []).then(() => {
+  //     next()
+  //   })
+  // }
+  // if (store.getters.permission_routers === undefined) {
+  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
+  //     next()
+  //   })
+  // } else {
+  //   next()
+  // }
+  // return
   // 线上注释
   NProgress.start()
   // console.log(store.getters.current_role_urls.indexOf(to.path))