Browse Source

新分支

28169 1 year ago
parent
commit
e77516c5c2

+ 1 - 1
src/xt_pages/data/druguseTemplate.vue View File

2948
 
2948
 
2949
      createFilter(queryString) {
2949
      createFilter(queryString) {
2950
         return (restaurant) => {
2950
         return (restaurant) => {
2951
-          return (restaurant.drug_name.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
2951
+          return (restaurant.drug_name.toLowerCase().indexOf(queryString.toLowerCase()) != -1);
2952
         };
2952
         };
2953
      },
2953
      },
2954
 
2954
 

+ 1 - 1
src/xt_pages/dialysis/details/dialog/DoctorAdviceDialog.vue View File

2590
 
2590
 
2591
      createFilter(queryString) {
2591
      createFilter(queryString) {
2592
         return (restaurant) => {
2592
         return (restaurant) => {
2593
-          return (restaurant.drug_name.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
2593
+          return (restaurant.drug_name.toLowerCase().indexOf(queryString.toLowerCase()) !=-1);
2594
         };
2594
         };
2595
      },
2595
      },
2596
 
2596
 

+ 7 - 7
src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue View File

162
 <!--                  //从1到20-->
162
 <!--                  //从1到20-->
163
                   <span v-if="scope.row.single_dose != 0" @click="lili(scope.row)">
163
                   <span v-if="scope.row.single_dose != 0" @click="lili(scope.row)">
164
                    {{ scope.row.single_dose}}
164
                    {{ scope.row.single_dose}}
165
-                   <span v-if="scope.row.single_dose_unit >0"> {{getUnit(scope.row.single_dose_unit )}}</span> 
166
-                   <span v-else>{{ scope.row.single_dose_unit }}</span> 
165
+                   <span v-if="scope.row.single_dose_unit >0"> {{getUnit(scope.row.single_dose_unit )}}</span>
166
+                   <span v-else>{{ scope.row.single_dose_unit }}</span>
167
                     <!-- <span v-if="scope.row.single_dose_unit == 1" >{{ scope.row.single_dose}}g</span>
167
                     <!-- <span v-if="scope.row.single_dose_unit == 1" >{{ scope.row.single_dose}}g</span>
168
                     <span v-else-if="scope.row.single_dose_unit == 2" >{{ scope.row.single_dose}}mg</span>
168
                     <span v-else-if="scope.row.single_dose_unit == 2" >{{ scope.row.single_dose}}mg</span>
169
                     <span v-else-if="scope.row.single_dose_unit == 3" >{{ scope.row.single_dose}}u</span>
169
                     <span v-else-if="scope.row.single_dose_unit == 3" >{{ scope.row.single_dose}}u</span>
583
             </span>
583
             </span>
584
           </el-row>
584
           </el-row>
585
         </el-form>
585
         </el-form>
586
-      
586
+
587
       </span>
587
       </span>
588
       <span slot="footer" class="dialog-footer">
588
       <span slot="footer" class="dialog-footer">
589
         <el-button @click="infoDialogVisible = false">取 消</el-button>
589
         <el-button @click="infoDialogVisible = false">取 消</el-button>
1599
           this.groupForm.start_time = year + '-' + month + '-' + day + ' ' + hours + ':' + minites
1599
           this.groupForm.start_time = year + '-' + month + '-' + day + ' ' + hours + ':' + minites
1600
         }
1600
         }
1601
       }
1601
       }
1602
-      
1602
+
1603
       if(this.$store.getters.xt_user.org.id == 9671 || this.$store.getters.xt_user.org.id == 9675 || this.$store.getters.xt_user.org.id == 10340 || this.$store.getters.xt_user.org.id == 10517){
1603
       if(this.$store.getters.xt_user.org.id == 9671 || this.$store.getters.xt_user.org.id == 9675 || this.$store.getters.xt_user.org.id == 10340 || this.$store.getters.xt_user.org.id == 10517){
1604
          var date = new Date()
1604
          var date = new Date()
1605
           var year = date.getFullYear()
1605
           var year = date.getFullYear()
1659
           }
1659
           }
1660
       }
1660
       }
1661
 
1661
 
1662
-    
1662
+
1663
       if( this.$store.getters.xt_user.org.id == 10469 ){
1663
       if( this.$store.getters.xt_user.org.id == 10469 ){
1664
           var year = date.getFullYear()
1664
           var year = date.getFullYear()
1665
           var month = date.getMonth() + 1
1665
           var month = date.getMonth() + 1
1898
 
1898
 
1899
      createFilter(queryString) {
1899
      createFilter(queryString) {
1900
         return (restaurant) => {
1900
         return (restaurant) => {
1901
-          return (restaurant.drug_name.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
1901
+          return (restaurant.drug_name.toLowerCase().indexOf(queryString.toLowerCase()) != -1);
1902
         };
1902
         };
1903
      },
1903
      },
1904
 
1904
 
1947
          }
1947
          }
1948
          return name
1948
          return name
1949
       },
1949
       },
1950
-    
1950
+
1951
     saveInformation(){
1951
     saveInformation(){
1952
         var params = {
1952
         var params = {
1953
           selected_date:this.selected_date,
1953
           selected_date:this.selected_date,

+ 4 - 4
src/xt_pages/dialysis/details/dialog/adviceDialog/EditGroupAdvice.vue View File

154
                     }}{{ scope.row.single_dose_unit }}</span
154
                     }}{{ scope.row.single_dose_unit }}</span
155
                   > -->
155
                   > -->
156
                  {{ scope.row.single_dose}}
156
                  {{ scope.row.single_dose}}
157
-                <span v-if="scope.row.single_dose_unit >0"> {{getUnit(scope.row.single_dose_unit )}}</span> 
158
-                <span v-else>{{ scope.row.single_dose_unit }}</span> 
157
+                <span v-if="scope.row.single_dose_unit >0"> {{getUnit(scope.row.single_dose_unit )}}</span>
158
+                <span v-else>{{ scope.row.single_dose_unit }}</span>
159
                 </template>
159
                 </template>
160
               </el-table-column>
160
               </el-table-column>
161
               <el-table-column
161
               <el-table-column
279
                   >{{ scope.row.single_dose
279
                   >{{ scope.row.single_dose
280
                   }}{{ scope.row.single_dose_unit }}</span
280
                   }}{{ scope.row.single_dose_unit }}</span
281
                 >
281
                 >
282
-               
282
+
283
               </template>
283
               </template>
284
             </el-table-column>
284
             </el-table-column>
285
             <el-table-column
285
             <el-table-column
2468
 
2468
 
2469
      createFilter(queryString) {
2469
      createFilter(queryString) {
2470
         return (restaurant) => {
2470
         return (restaurant) => {
2471
-          return (restaurant.drug_name.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
2471
+          return (restaurant.drug_name.toLowerCase().indexOf(queryString.toLowerCase()) != -1);
2472
         };
2472
         };
2473
      },
2473
      },
2474
 
2474
 

+ 2 - 2
src/xt_pages/role/admin.vue View File

25
         >医药师登记</el-button>
25
         >医药师登记</el-button>
26
 
26
 
27
 
27
 
28
-        <!-- <el-button
28
+        <el-button
29
           type="primary"
29
           type="primary"
30
           size="small"
30
           size="small"
31
           icon="el-icon-circle-plus-outline"
31
           icon="el-icon-circle-plus-outline"
32
           style="float:left"
32
           style="float:left"
33
           @click="toJiaBan">加班</el-button>
33
           @click="toJiaBan">加班</el-button>
34
-        -->
34
+       
35
 
35
 
36
          <!-- <el-button
36
          <!-- <el-button
37
           type="primary"
37
           type="primary"

+ 1 - 1
src/xt_pages/user/components/EditGroupAdvice.vue View File

2533
 
2533
 
2534
      createFilter(queryString) {
2534
      createFilter(queryString) {
2535
         return (restaurant) => {
2535
         return (restaurant) => {
2536
-          return (restaurant.drug_name.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
2536
+          return (restaurant.drug_name.toLowerCase().indexOf(queryString.toLowerCase()) != -1);
2537
         };
2537
         };
2538
      },
2538
      },
2539
 
2539
 

+ 21 - 21
src/xt_pages/user/doctorAdvice.vue View File

81
             <span v-if="item.value != 1">
81
             <span v-if="item.value != 1">
82
               {{ item.label }}
82
               {{ item.label }}
83
             </span>
83
             </span>
84
-            
85
-            
84
+
85
+
86
             </li>
86
             </li>
87
           </ul>
87
           </ul>
88
         </div>
88
         </div>
167
         >
167
         >
168
           <template slot-scope="scope">
168
           <template slot-scope="scope">
169
             <span v-if="scope.row.advice_type == 1">
169
             <span v-if="scope.row.advice_type == 1">
170
-              <span v-if="org_id != 9671 && org_id != 10440">长嘱</span> 
171
-              <span v-if="org_id == 9671 || org_id == 10440">长期医嘱模版</span> 
170
+              <span v-if="org_id != 9671 && org_id != 10440">长嘱</span>
171
+              <span v-if="org_id == 9671 || org_id == 10440">长期医嘱模版</span>
172
             </span>
172
             </span>
173
             <span v-else-if="scope.row.advice_type == 3 || scope.row.advice_type == 2">临嘱</span>
173
             <span v-else-if="scope.row.advice_type == 3 || scope.row.advice_type == 2">临嘱</span>
174
             <span v-else-if="scope.row.advice_type == 4">普通医嘱</span>
174
             <span v-else-if="scope.row.advice_type == 4">普通医嘱</span>
586
                     v-for="item in adviceTypeOptions"
586
                     v-for="item in adviceTypeOptions"
587
                   ></el-option>
587
                   ></el-option>
588
                 </el-select>
588
                 </el-select>
589
-               
589
+
590
               </el-form-item>
590
               </el-form-item>
591
             </el-col>
591
             </el-col>
592
 
592
 
797
                     >
797
                     >
798
                   </template>
798
                   </template>
799
                 </el-table-column>
799
                 </el-table-column>
800
-                <el-table-column 
800
+                <el-table-column
801
                  label="推送截止日期"
801
                  label="推送截止日期"
802
                   min-width="80"
802
                   min-width="80"
803
                   align="center"
803
                   align="center"
805
                 <template slot-scope="scope">
805
                 <template slot-scope="scope">
806
                    {{scope.row.push_start_time}}
806
                    {{scope.row.push_start_time}}
807
                 </template>
807
                 </template>
808
-                
808
+
809
                 </el-table-column>
809
                 </el-table-column>
810
 
810
 
811
-                <el-table-column 
811
+                <el-table-column
812
                  label="医嘱嘱托"
812
                  label="医嘱嘱托"
813
                   min-width="80"
813
                   min-width="80"
814
                   align="center"
814
                   align="center"
816
                 <template slot-scope="scope">
816
                 <template slot-scope="scope">
817
                    {{scope.row.remark}}
817
                    {{scope.row.remark}}
818
                 </template>
818
                 </template>
819
-                
819
+
820
                 </el-table-column>
820
                 </el-table-column>
821
               </el-table>
821
               </el-table>
822
             </el-col>
822
             </el-col>
1188
               </el-form-item>
1188
               </el-form-item>
1189
             </el-col>
1189
             </el-col>
1190
 
1190
 
1191
-           
1191
+
1192
 
1192
 
1193
             <el-col :span="12" v-if="nameForm.frequency_type == 2">
1193
             <el-col :span="12" v-if="nameForm.frequency_type == 2">
1194
               <el-form-item prop="day_count">
1194
               <el-form-item prop="day_count">
1490
             </el-col>
1490
             </el-col>
1491
           </el-row>
1491
           </el-row>
1492
 
1492
 
1493
-          
1493
+
1494
           <el-form-item label="备注 :">
1494
           <el-form-item label="备注 :">
1495
             <el-input type="textarea" v-model="adviceForm.remark"></el-input>
1495
             <el-input type="textarea" v-model="adviceForm.remark"></el-input>
1496
           </el-form-item>
1496
           </el-form-item>
1499
             <span>{{ adminusername }} </span>
1499
             <span>{{ adminusername }} </span>
1500
           </el-form-item>
1500
           </el-form-item>
1501
 
1501
 
1502
-        
1502
+
1503
         </el-form>
1503
         </el-form>
1504
         <div slot="footer" class="dialog-footer">
1504
         <div slot="footer" class="dialog-footer">
1505
           <template v-if="isEdit">
1505
           <template v-if="isEdit">
2300
       drug_id: 0,
2300
       drug_id: 0,
2301
       src_type:"",
2301
       src_type:"",
2302
       org_id:0,
2302
       org_id:0,
2303
-     
2303
+
2304
     };
2304
     };
2305
   },
2305
   },
2306
   methods: {
2306
   methods: {
2373
               this.dialogFormVisible = false;
2373
               this.dialogFormVisible = false;
2374
               this.resetForm(formName);
2374
               this.resetForm(formName);
2375
               var advice = response.data.data.advice;
2375
               var advice = response.data.data.advice;
2376
-              
2376
+
2377
               this.adviceTableData[this.currentIndex].drug_spec =
2377
               this.adviceTableData[this.currentIndex].drug_spec =
2378
                 advice.drug_spec;
2378
                 advice.drug_spec;
2379
               this.adviceTableData[this.currentIndex].drug_spec_unit =
2379
               this.adviceTableData[this.currentIndex].drug_spec_unit =
2455
               }
2455
               }
2456
           }
2456
           }
2457
           console.log("模板数据",submitForm)
2457
           console.log("模板数据",submitForm)
2458
-          
2458
+
2459
           CreateNewGroupAdvice(this.patientID, 0, submitForm, mode).then(
2459
           CreateNewGroupAdvice(this.patientID, 0, submitForm, mode).then(
2460
             response => {
2460
             response => {
2461
               if (response.data.state == 0) {
2461
               if (response.data.state == 0) {
2549
               this.adviceForm.advice_name = arr[0]
2549
               this.adviceForm.advice_name = arr[0]
2550
           }
2550
           }
2551
           console.log("222222???????this.adviceForm",this.adviceForm)
2551
           console.log("222222???????this.adviceForm",this.adviceForm)
2552
-          
2552
+
2553
           CreateNewDoctorAdvice(this.patientID, this.adviceForm, mode).then(
2553
           CreateNewDoctorAdvice(this.patientID, this.adviceForm, mode).then(
2554
             response => {
2554
             response => {
2555
               if (response.data.state == 0) {
2555
               if (response.data.state == 0) {
3117
 
3117
 
3118
         remark: groups[0].remark,
3118
         remark: groups[0].remark,
3119
         groupno: groupno,
3119
         groupno: groupno,
3120
-        
3120
+
3121
       };
3121
       };
3122
       console.log("到了",groups[0]);
3122
       console.log("到了",groups[0]);
3123
 
3123
 
3530
               }
3530
               }
3531
             }
3531
             }
3532
           }
3532
           }
3533
-         
3533
+
3534
           var one = response.data.data.advicetwo;
3534
           var one = response.data.data.advicetwo;
3535
           let dataInfo = {};
3535
           let dataInfo = {};
3536
           one.forEach((item, index) => {
3536
           one.forEach((item, index) => {
4427
       // this.sameRowArr = sameRowArr;
4427
       // this.sameRowArr = sameRowArr;
4428
     },
4428
     },
4429
     mergeSpan({ row, column, rowIndex, columnIndex }) {
4429
     mergeSpan({ row, column, rowIndex, columnIndex }) {
4430
-     
4430
+
4431
       if (columnIndex === 0 || columnIndex === 1 || columnIndex === 2) {
4431
       if (columnIndex === 0 || columnIndex === 1 || columnIndex === 2) {
4432
         const _row = this.tempArr[rowIndex];
4432
         const _row = this.tempArr[rowIndex];
4433
         const _col = _row > 0 ? 1 : 0;
4433
         const _col = _row > 0 ? 1 : 0;
4740
 
4740
 
4741
      createFilter(queryString) {
4741
      createFilter(queryString) {
4742
         return (restaurant) => {
4742
         return (restaurant) => {
4743
-          return (restaurant.drug_name.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
4743
+          return (restaurant.drug_name.toLowerCase().indexOf(queryString.toLowerCase()) !=-1);
4744
         };
4744
         };
4745
      },
4745
      },
4746
 
4746
 
4810
       for (const i in this.multipleSelection) {
4810
       for (const i in this.multipleSelection) {
4811
         arr.push(this.multipleSelection[i]);
4811
         arr.push(this.multipleSelection[i]);
4812
         group.push(this.multipleSelection[i].groupno);
4812
         group.push(this.multipleSelection[i].groupno);
4813
-       
4813
+
4814
       }
4814
       }
4815
       grouptwo.push(this.getdata(group));
4815
       grouptwo.push(this.getdata(group));
4816
       // console.log('组号', group)
4816
       // console.log('组号', group)