Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/data/components/addInspection.vue

@@ -49,9 +49,9 @@
                     <el-select v-model="form.project_detail" filterable placeholder="请选择" @change="changeProject">
                         <el-option
                                 v-for="item in projectList"
-                                :key="item.id"
+                                :key="item.new_id"
                                 :label="item.project_name"
-                                :value="item.id">
+                                :value="item.new_id">
                         </el-option>
                     </el-select>
                 </el-form-item>
@@ -257,7 +257,8 @@
                 project_name: projectList[i].project_name,
                 unit: projectList[i].unit,
                 price: projectList[i].price,
-                type: 2
+                type: 2,
+                new_id: Math.floor((Math.random() + Math.floor(Math.random() * 9 + 1)) * Math.pow(10, 10 - 1))
               }
               this.projectList.push(obj)
 
@@ -271,7 +272,9 @@
                 project_name: goodInfos[i].good_name,
                 unit: goodInfos[i].good_unit,
                 price: goodInfos[i].retail_price,
-                type: 3
+                type: 3,
+                new_id: Math.floor((Math.random() + Math.floor(Math.random() * 9 + 1)) * Math.pow(10, 10 - 1))
+
               }
               this.projectList.push(obj)
             }
@@ -309,7 +312,7 @@
       addProjectList() {
         console.log(this.projectList)
         for (let i = 0; i < this.projectList.length; i++) {
-          if (this.form.project_detail == this.projectList[i].id) {
+          if (this.form.project_detail == this.projectList[i].new_id) {
             this.projectList[i].number = this.form.number
             this.projectList[i].number = this.projectList[i].number.toString()
             this.tableData.push(this.projectList[i])

src/xt_pages/data/components/editInspection.vue

@@ -50,7 +50,7 @@
                                 v-for="item,index in projectList"
                                 :key="index"
                                 :label="item.project_name"
-                                :value="item.id">
+                                :value="item.new_id">
                         </el-option>
                     </el-select>
 
@@ -209,7 +209,9 @@
                 unit: projectList[i].unit,
                 price: projectList[i].price,
                 type: 2,
-                m_id: 0
+                m_id: 0,
+                new_id: Math.floor((Math.random() + Math.floor(Math.random() * 9 + 1)) * Math.pow(10, 10 - 1))
+
               }
               this.projectList.push(obj)
 
@@ -224,7 +226,9 @@
                 unit: goodInfos[i].good_unit,
                 price: goodInfos[i].retail_price,
                 type: 3,
-                m_id: 0
+                m_id: 0,
+                new_id: Math.floor((Math.random() + Math.floor(Math.random() * 9 + 1)) * Math.pow(10, 10 - 1))
+
 
               }
               this.projectList.push(obj)
@@ -336,7 +340,7 @@
       },
       addProjectList() {
         for (let i = 0; i < this.projectList.length; i++) {
-          if (this.form.project_detail == this.projectList[i].id) {
+          if (this.form.project_detail == this.projectList[i].new_id) {
             this.projectList[i].number = this.form.number
             this.projectList[i].number = this.projectList[i].number.toString()
             this.tableData.push(this.projectList[i])

src/xt_pages/dialysis/template/DialysisPrintOrderFortyOne.vue

@@ -322,14 +322,18 @@
                     </div>
                     L
                   </div>
-                  <div class="inline_block" style="flex:1;">
+                  <div class="inline_block">
                     透析时长：
                     <div class="under_line" style="width: 50px;text-align: center">
-                      {{ prescription.dialysis_duration_hour ? (prescription.dialysis_duration_hour + prescription.dialysis_duration_minute / 60).toFixed(2) : "0" }}
+                      {{ prescription.dialysis_duration_hour ? prescription.dialysis_duration_hour : "0" }}
                     </div>
                     h
+                    <div class="under_line" style="width: 50px;text-align: center">
+                      {{ prescription.dialysis_duration_minute ? prescription.dialysis_duration_minute : "0" }}
+                    </div>
+                    min
                   </div>
-                  <div class="inline_block" style="flex:1;">
+                  <div class="inline_block" style="flex:1;margin-left:5px;">
                     透析方式：
                     <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="!prescription.mode_id">
                       /

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -13,10 +13,10 @@
       </template>
 
       <div class='dialysisPage' style="padding-top:40px;">
-        <div v-if="org_id == 9990 || org_id == 10138 || org_id == 9504">
+        <div v-if="org_id == 9990 || org_id == 10138 || org_id == 9504 || org_id == 10028">
           <printTwo :info="info" v-if="org_id == 9990"></printTwo>
           <printThree :info="info" :paramsObj="paramsObj" :balanceAccounts="balanceAccounts" v-if="org_id == 10138"></printThree>
-          <printFour v-if="org_id == 9504" :info="info"></printFour>
+          <printFour v-if="org_id == 9504 || org_id == 10028" :info="info"></printFour>
         </div>
         <printOne :info="info" v-else></printOne>
       </div>

src/xt_pages/outpatientDoctorStation/checkTemplate/printOne.vue

@@ -1,7 +1,7 @@
 <template>
     <div>
         <div id='prescription-print3' class="prescription-print">
-            <img style="width:100%;height:80px" src="https://kuyi.shengws.com/bailin/bltotle.jpg" alt="">
+            <img style="width:100%;height:80px" v-if="org_id == 10138" src="https://kuyi.shengws.com/bailin/bltotle.jpg" alt="">
             <div class="printTitle">检验申请单</div>
 
             <div style="border:1px solid #000;">
@@ -40,7 +40,7 @@
                     <div>医生签字：{{ doctor ? doctor : '' }}</div>
                 </div>
             </div>   
-            <img style="width:100%;" src="https://kuyi.shengws.com/bailin/blend.jpg" alt="">
+            <img style="width:100%;" v-if="org_id == 10138" src="https://kuyi.shengws.com/bailin/blend.jpg" alt="">
         </div>
     </div>
 
@@ -74,7 +74,8 @@ export default {
         total:0,
         projectPrint:[],
         time:'',
-        doctor:''
+        doctor:'',
+        org_id:''
       }
     },
    methods:{
@@ -393,6 +394,7 @@ export default {
       this.getPatientCaseHistory()
       var xtuser = this.$store.getters.xt_user;
       this.orgname = xtuser.org.org_name;
+      this.org_id = this.$store.getters.xt_user.org_id
      
    },
    watch:{

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -1913,66 +1913,6 @@
           this.order_status = '已退费'
         }
 
-        if (info.id > 0) {
-          this.doctorValue = info.doctor_id
-          this.departmentValue = info.departments
-        } else {
-          if(admin_info.id > 0 && admin_info.user_type == 2){
-            this.doctorValue = admin_info.admin_user_id
-            this.departmentValue = this.department[0].id
-
-          }else{
-
-            this.doctorValue = this.doctors[0].admin_user_id
-            this.departmentValue = this.department[0].id
-
-          }
-
-
-        }
-
-        if (info.register_type == 0) {
-          for (let i = 0; i < this.register.length; i++) {
-            this.register_type = this.register[0].value
-          }
-        } else {
-          this.register_type = info.register_type
-        }
-        this.diagnose = []
-
-        if(info.id == 0){
-          if(last_info.diagnosis.length == 0){
-            this.diagnose = []
-          }else{
-            for(let i = 0; i < last_info.diagnosis.split(",").length;i++){
-              this.diagnose.push(parseInt(last_info.diagnosis.split(",")[i]))
-
-            }
-          }
-
-          if(last_info.sick_history == 0){
-            this.state2 = ''
-          }else{
-            this.state2 = last_info.sick_history
-          }
-
-
-        }else{
-          this.state2 = info.sick_history
-          if (this.state2 == 0) {
-            this.state2 = ''
-          }
-          if(info.diagnosis.length == 0){
-            this.diagnose = []
-          }else{
-            for(let i = 0; i < info.diagnosis.split(",").length;i++){
-              this.diagnose.push(parseInt(info.diagnosis.split(",")[i]))
-
-            }
-
-          }
-
-        }
 
 
 
@@ -1992,110 +1932,110 @@
         }
 
 
-          // getInitData().then(response => {
-          //   if (response.data.state == 0) {
-          //     this.$message.error(response.data.msg)
-          //     return false
-          //   } else {
-          //     this.onceTime = false
-          //     this.drugs = response.data.data.drugs
-          //     this.allDrugs = response.data.data.drugs
-          //     this.advices_template = response.data.data.advices_template
-          //     this.doctors = response.data.data.doctors
-          //     for (let i = 0; i < this.doctors.length; i++) {
-          //       if (this.doctors[i].user_type == 1) {
-          //         this.doctors.splice(i, 1)
-          //       }
-          //     }
-          //     this.department = response.data.data.department
-          //     this.sick = response.data.data.sick
-          //     this.diagnoses = response.data.data.diagnose
-          //     this.additions = response.data.data.additions
+          getInitData().then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.onceTime = false
+              this.drugs = response.data.data.drugs
+              this.allDrugs = response.data.data.drugs
+              this.advices_template = response.data.data.advices_template
+              this.doctors = response.data.data.doctors
+              for (let i = 0; i < this.doctors.length; i++) {
+                if (this.doctors[i].user_type == 1) {
+                  this.doctors.splice(i, 1)
+                }
+              }
+              this.department = response.data.data.department
+              this.sick = response.data.data.sick
+              this.diagnoses = response.data.data.diagnose
+              this.additions = response.data.data.additions
 
 
 
 
 
-          //     if (info.id > 0) {
-          //       this.doctorValue = info.doctor_id
-          //       this.departmentValue = info.departments
-          //     } else {
-          //       if(admin_info.id > 0 && admin_info.user_type == 2){
-          //         this.doctorValue = admin_info.admin_user_id
-          //         this.departmentValue = this.department[0].id
+              if (info.id > 0) {
+                this.doctorValue = info.doctor_id
+                this.departmentValue = info.departments
+              } else {
+                if(admin_info.id > 0 && admin_info.user_type == 2){
+                  this.doctorValue = admin_info.admin_user_id
+                  this.departmentValue = this.department[0].id
 
-          //       }else{
+                }else{
 
-          //         this.doctorValue = this.doctors[0].admin_user_id
-          //         this.departmentValue = this.department[0].id
+                  this.doctorValue = this.doctors[0].admin_user_id
+                  this.departmentValue = this.department[0].id
 
-          //       }
+                }
 
 
-          //     }
+              }
 
-          //     if (info.register_type == 0) {
-          //       for (let i = 0; i < this.register.length; i++) {
-          //         this.register_type = this.register[0].value
-          //       }
-          //     } else {
-          //       this.register_type = info.register_type
-          //     }
-          //     this.diagnose = []
+              if (info.register_type == 0) {
+                for (let i = 0; i < this.register.length; i++) {
+                  this.register_type = this.register[0].value
+                }
+              } else {
+                this.register_type = info.register_type
+              }
+              this.diagnose = []
 
-          //     if(info.id == 0){
-          //       if(last_info.diagnosis.length == 0){
-          //         this.diagnose = []
-          //       }else{
-          //         for(let i = 0; i < last_info.diagnosis.split(",").length;i++){
-          //           this.diagnose.push(parseInt(last_info.diagnosis.split(",")[i]))
+              if(info.id == 0){
+                if(last_info.diagnosis.length == 0){
+                  this.diagnose = []
+                }else{
+                  for(let i = 0; i < last_info.diagnosis.split(",").length;i++){
+                    this.diagnose.push(parseInt(last_info.diagnosis.split(",")[i]))
 
-          //         }
-          //       }
+                  }
+                }
 
-          //       if(last_info.sick_history == 0){
-          //         this.state2 = ''
-          //       }else{
-          //         this.state2 = last_info.sick_history
-          //       }
+                if(last_info.sick_history == 0){
+                  this.state2 = ''
+                }else{
+                  this.state2 = last_info.sick_history
+                }
 
 
-          //     }else{
-          //       this.state2 = info.sick_history
-          //       if (this.state2 == 0) {
-          //         this.state2 = ''
-          //       }
-          //       if(info.diagnosis.length == 0){
-          //         this.diagnose = []
-          //       }else{
-          //         for(let i = 0; i < info.diagnosis.split(",").length;i++){
-          //           this.diagnose.push(parseInt(info.diagnosis.split(",")[i]))
+              }else{
+                this.state2 = info.sick_history
+                if (this.state2 == 0) {
+                  this.state2 = ''
+                }
+                if(info.diagnosis.length == 0){
+                  this.diagnose = []
+                }else{
+                  for(let i = 0; i < info.diagnosis.split(",").length;i++){
+                    this.diagnose.push(parseInt(info.diagnosis.split(",")[i]))
 
-          //         }
+                  }
 
-          //       }
+                }
 
-          //     }
+              }
 
 
 
-          //     this.state1 = info.sick_type
-          //     if (this.state1 == 0 || this.state1 == "") {
-          //       this.state1 = ''
-          //       for (let i = 0; i < this.sick.length; i++) {
-          //         this.state1 = this.sick[0].id
-          //       }
-          //     }
+              this.state1 = info.sick_type
+              if (this.state1 == 0 || this.state1 == "") {
+                this.state1 = ''
+                for (let i = 0; i < this.sick.length; i++) {
+                  this.state1 = this.sick[0].id
+                }
+              }
 
-          //     if(this.departmentValue == "" || this.departmentValue == 0){
-          //       if(this.department.length > 0){
-          //         this.departmentValue = this.department[0].id
+              if(this.departmentValue == "" || this.departmentValue == 0){
+                if(this.department.length > 0){
+                  this.departmentValue = this.department[0].id
 
-          //       }
-          //     }
+                }
+              }
 
-          //   }
-          // })
+            }
+          })
 
       },
       setMonthData(info, admin_info, doctors, department, hisPatientInfo, month_data, last_info) {
@@ -2767,10 +2707,11 @@
 
           return
         }
-
+        console.log('this.teamList',this.teamList)
+        console.log('this.curPrescriptions.project',this.curPrescriptions.project)
         for (let i = 0; i < this.teamList.length; i++) {
           for (let a = 0; a < this.curPrescriptions.project.length; a++) {
-            if (this.teamList[i].id == this.curPrescriptions.project[a].project_id) {
+            if (this.teamList[i].id == this.curPrescriptions.project[a].project_id && this.teamList[i].type == this.curPrescriptions.project[a].type) {
               this.$message.error('当前处方存在相同的药品，无法添加相同的项目')
               return
             }

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -1474,23 +1474,7 @@
       }, changeAllGoodInfoTableDataTwo(row) {
         this.teamList = row
       },
-      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();
-            }
-            this.$message.error(row.project_name + '库存不足')
-            return
-          }
-        }
+      selectChange(row) {
         this.teamList = row
       }, getPrescriptionTemplateInfo() {
         let params = {
@@ -1656,7 +1640,6 @@
                 price: good_info[i].retail_price,
                 medical_code: good_info[i].medical_insurance_number,
                 unit: this.getGoodUnit(good_info[i].good_unit),
-                total: good_info[i].total,
                 type: 3
               }
               this.tabProject.push(obj)
@@ -1732,7 +1715,6 @@
         getPojectListById(params).then(response => {
           if (response.data.state == 1) {
             this.teamList = []
-            let num = 0
             var project = response.data.data.project
             for (let i = 0; i < project.length; i++) {
               if (project[i].type == 2) {
@@ -1758,17 +1740,6 @@
 
                 this.teamList.push(obj)
               } else if (project[i].type == 3) {
-                if(project[i].good_info.total <= 0){
-                  num++
-                  this.$refs.tabProjectTeam.toggleRowSelection(row);
-                  setTimeout(() => {
-                    this.$message.error(project[i].good_info.good_name + '库存不足')
-                  },100)
-                }
-                if(num > 0){
-                  this.$refs.tabProjectTeam.clearSelection();
-                }
-
                 let obj = {
                   id: project[i].project_id,
                   project_name: project[i].good_info.good_name,