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

src/store/modules/globalConfig.js

@@ -1991,7 +1991,8 @@ const global_config = {
     }
     ],
 
-    good_unit: [{
+    good_unit: [
+      {
       id: 1,
       name: '支'
     },

src/xt_pages/data/components/drugs.vue

@@ -530,7 +530,7 @@
 
           val.min_number =  parseInt(val.min_number)
           console.log("Val323323232",val)
-          
+
           editBaseDrugLib(val,untit).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg);
@@ -721,7 +721,7 @@
               if(this.formValue.drug_classify == 0){
                  this.formValue.drug_classify = ""
               }
-             
+
 
 
               this.$refs.addDrugs.show(id, this.formValue)
@@ -1451,18 +1451,19 @@
         };
         console.log("params222222222",params)
 
-        postDrugInformation(params).then(response=>{
-           if(response.data.state == 1){
-             var msg =  response.data.data.msg;
-             this.getList();
-             this.getAllManufacturer();
-             this.GetAllConfig();
-             this.$message.success("导入成功!")
 
-           }else{
-             this.$message.error("导入失败,请下载日志查看")
-           }
-        })
+        // postDrugInformation(params).then(response=>{
+        //    if(response.data.state == 1){
+        //      var msg =  response.data.data.msg;
+        //      this.getList();
+        //      this.getAllManufacturer();
+        //      this.GetAllConfig();
+        //      this.$message.success("导入成功!")
+        //
+        //    }else{
+        //      this.$message.error("导入失败,请下载日志查看")
+        //    }
+        // })
       },
       generateTxt: function(log) {
         var content = '';

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -748,12 +748,23 @@
                           class="under_line"
                           style="width: 70px; text-align: center"
                         >
-                          {{
+                         
+
+                          <span v-if="org_id==10223">
+                              {{
+                            record.prescription.replacement_total
+                              ? record.prescription.replacement_total
+                              : "/"
+                           }}
+                          </span>
+                          <span v-if="org_id!=10223">
+                            {{
                             record.prescription &&
                             record.prescription.displace_liqui_value
                               ? record.prescription.displace_liqui_value
                               : "/"
                           }}
+                          </span>
                         </div>
                         L
                       </div>

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -821,8 +821,8 @@
 
                     <el-col :span="8">
                         <el-form-item
-                                label="置换液："
-                                v-if="isShows('置换液')"
+                                label="置换方式："
+                                v-if="isShows('置换液')&&this.$store.getters.xt_user.org.id != 10206"
                                 v-show="huShow"
                                 prop="displace_liqui_part"
                                 :rules="isCheckmust('置换液')"
@@ -840,6 +840,27 @@
                                 ></el-option>
                             </el-select>
                         </el-form-item>
+                      <el-form-item
+                        label="置换方式："
+                        v-if="isShows('置换方式')&&this.$store.getters.xt_user.org.id == 10206"
+                        v-show="huShow"
+                        prop="displace_liqui_part"
+                        :rules="isCheckmust('置换方式')"
+                      >
+                        <el-select
+                          v-model="dialysisPrescription.displace_liqui_part"
+                          placeholder="请选择"
+                        >
+                          <el-option :key="0" label="请选择" :value="0"></el-option>
+                          <el-option
+                            v-for="(option, index) in displace_liqui_part_option"
+                            :key="index + 'u'"
+                            :label="option.name"
+                            :value="option.id"
+                          ></el-option>
+                        </el-select>
+                      </el-form-item>
+
                     </el-col>
 
                     <el-col :span="8"
@@ -2772,7 +2793,7 @@ mu
         if(moment().weekday() == 0){
            total_day ="周日"
         }
-       
+
         if(this.targetAdvices!=null && this.targetAdvices.length >0){
             for (let i = 0; i < this.targetAdvices.length; i++) {
               if(this.targetAdvices[i].week_day.indexOf(total_day)!=-1){
@@ -3449,7 +3470,7 @@ mu
                   ParamsQuery['patient'] = this.patient.id
                   ParamsQuery['record_date'] = this.record_date
                   ParamsQuery['mode'] = '1'
-               
+
                   postSoulution(ParamsQuery).then(response => {
                     if (response.data.state == 0) {
                       this.$message.error(response.data.msg)

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -762,11 +762,18 @@
                         class="under_line"
                         style="width: 70px; text-align: center"
                       >
-                        {{
+                      <span v-if="org_id==10223"> {{
                           prescription.replacement_total
                             ? prescription.replacement_total
                             : "/"
                         }}
+                        </span> 
+                        <span v-if="org_id!=10223"> {{
+                          prescription.displace_liqui_value
+                            ? prescription.displace_liqui_value
+                            : "/"
+                        }}
+                        </span> 
                       </div>
                       L
                     </div>
@@ -4273,14 +4280,17 @@ export default {
         
 
         console.log("RESWOOWOWWOOW",response.data.data.doctorAdevieInfo)
-        if(this.org_id ==10515 || this.org_id == 0){
+        if(this.org_id ==10515 || this.org_id == 0 || this.org_id == 10510){
           if(response.data.data.doctorAdevieInfo!=null && response.data.data.doctorAdevieInfo.length>0){
+            
             for(let i=0;i<response.data.data.doctorAdevieInfo.length;i++){
               this.doctor_advices.push(response.data.data.doctorAdevieInfo[i])
+              console.log("寄哪里 222")
               // this.doctor_advices_2.push(response.data.data.doctorAdevieInfo[i])
             }
          }
 
+        console.log("医护哦我我我哦我我哦",this.doctor_advices)
 
          let projects = [];
         response.data.data.projects.map((item) => {

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyfour.vue

@@ -139,7 +139,7 @@
                   <span v-else-if="prescription.anticoagulant == 14">肝素钙注射液</span>
                   <span v-else-if="prescription.anticoagulant == 15">甲磺酸萘莫司他</span>
                   &nbsp; 
-                  <span style="width:135px;display: inline-block;" 
+                  <span style="width:150px;display: inline-block;" 
                   v-if=" prescription.anticoagulant != 1 && prescription.anticoagulant != 12 && prescription.anticoagulant != 5">
                     首剂： {{ prescription.anticoagulant_shouji }} 
                     <span v-if="prescription.anticoagulant == 4">mg</span>
@@ -1033,7 +1033,7 @@ export default {
         
         if(this.projects!=null && this.projects.length >0){
            for(let i=0;i<this.projects.length;i++){
-             this.projects.sort(this.compare('execution_time'))
+             this.projects.sort(this.compare('id'))
              if(this.projects[i].type== 2){
             
               this.projects[i].project_team_name = ""

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyFour.vue

@@ -991,6 +991,13 @@
                 <span v-if="monitor.monitor_anticoagulant == 7">低分子肝素钠</span>
                 <span v-if="monitor.monitor_anticoagulant == 8">依诺肝素</span>
                 <span v-if="monitor.monitor_anticoagulant == 9">达肝素</span>
+                <span v-if="monitor.monitor_anticoagulant == 10">体外抗凝</span>
+                <span v-if="monitor.monitor_anticoagulant == 11">那屈肝素</span>
+                <span v-if="monitor.monitor_anticoagulant == 12">无抗凝剂</span>
+                <span v-if="monitor.monitor_anticoagulant == 13">那屈肝素钙</span>
+                <span v-if="monitor.monitor_anticoagulant == 14">肝素钙注射液</span>
+                <span v-if="monitor.monitor_anticoagulant == 15">甲磺酸萘莫司他</span>
+                <span v-if="monitor.monitor_anticoagulant == 16">低分子量肝素钙</span>
                 <span v-if="monitor.monitor_anticoagulant_value!=undefined && monitor.monitor_anticoagulant_value!='' ">({{monitor.monitor_anticoagulant_value}})</span>
               </td>
               <td style="text-align:left;line-height:20px;">

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -2948,6 +2948,17 @@ export default {
             org_id: this.$store.getters.xt_user.org_id
 
           }
+          if (this.activeName == 'first') {
+            obj['settle_accounts_type'] = 1
+          } else if (this.activeName == 'second') {
+            obj['start_time'] = this.other_start_time
+            obj['end_time'] = this.other_end_time
+            obj['settle_accounts_type'] = 2
+          } else {
+            obj['start_time'] = this.other_start_time_two
+            obj['end_time'] = this.other_end_time_two
+            obj['settle_accounts_type'] = 2
+          }
           axios.get("http://127.0.0.1:9532" + '/nmg/coordinate/settleAccount', {
             params: obj
           })

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -333,7 +333,7 @@
                                       </el-table-column>
 
 <!--                                    //针对对接坐标系统的，使用坐标的库存数据-->
-                                    <el-table-column label="库存" width="60" v-else>
+                                    <el-table-column label="库存" width="60" v-if="org_id == 10206">
                                       <template slot-scope="scope">
                                         <span>{{scope.row.zuobiao_stock_num}}</span>
                                       </template>

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -654,8 +654,8 @@
         } else {
           let arr = []
           for (let i = 0; i < this.drugs.length; i++) {
-            if (this.drugs[i].drug_name.indexOf(this.search_keyword) != -1 || 
-            this.drugs[i].wubi.indexOf(this.search_keyword) != -1 || 
+            if (this.drugs[i].drug_name.indexOf(this.search_keyword) != -1 ||
+            this.drugs[i].wubi.indexOf(this.search_keyword) != -1 ||
             this.drugs[i].pinyin.indexOf(this.search_keyword) != -1 ||
             this.drugs[i].first_letter.indexOf(this.search_keyword) != -1) {
               arr = arr.concat(this.drugs[i])
@@ -704,12 +704,10 @@
             this.$message.error(response.data.msg)
             return false
           } else {
-            
             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
-            console.log('cccvvvsdsd',this.drugs);
             for (let i = 0; i < this.doctors.length; i++) {
               if (this.doctors[i].user_type == 1) {
                 this.doctors.splice(i, 1)
@@ -1770,7 +1768,6 @@
         getHisProject().then(response => {
           if (response.data.state == 1) {
             var project = response.data.data.project
-            console.log('bbbbb',response.data.data);
             for (let i = 0; i < project.length; i++) {
               let obj = {
                 id: project[i].id,

src/xt_pages/role/admin.vue

@@ -25,6 +25,12 @@
         >医药师登记</el-button>
 
 
+        <el-button
+          type="primary"
+          size="small"
+          icon="el-icon-circle-plus-outline"
+          style="float:left"
+          @click="toJiaBan">加班</el-button>
        
 
          <!-- <el-button
@@ -202,6 +208,8 @@
           style="float:left"
           @click="toCheckPDFInformation">PDF验证</el-button> -->
 
+         
+
         
      </div>
     
@@ -503,7 +511,7 @@
 import { adminMainView, getAdmins, setAdminStatus,toSign,toTestOne,toTestTwo,toTestThree,toTestFour,toTestFive,toTestSeven,toTestEight,toTestNight,toTestTen,toTestElement,toTestThrityMent,saveEnterprise,getEnterPriseById,getMobileCode,savePersionEnterPrise,getPerseEnterPriseById,CreatePersionSeal,CreateNewEnterPrise,toTestThrity,toEndEnterPrise,getEnterPriseDetail
   ,CreateQianshuUserName,CreateSKDSendInformation,toSavePDFInformation,toCheckPDFInformation,getdruginfoInformation} from "@/api/role/admin";
 import { getRoles } from "@/api/role/role";
-
+import { UploadPrintOrder } from "@/api/role/admin"
 import { parseTime } from "@/utils";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import AdminInfoForm from "./components/AdminInfoForm";
@@ -1153,6 +1161,13 @@ export default {
     //      }
     //   })
     // }
+    toJiaBan(){
+      UploadPrintOrder().then(response=>{
+        if(response.data.state ==1){
+           
+        }
+      })
+    }
 
   },
   watch: {