新分支

src/xt_pages/data/druguseTemplate.vue

@@ -2948,7 +2948,7 @@
 
      createFilter(queryString) {
         return (restaurant) => {
-          return (restaurant.drug_name.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
+          return (restaurant.drug_name.toLowerCase().indexOf(queryString.toLowerCase()) != -1);
         };
      },
 

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

@@ -2590,7 +2590,7 @@
 
      createFilter(queryString) {
         return (restaurant) => {
-          return (restaurant.drug_name.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
+          return (restaurant.drug_name.toLowerCase().indexOf(queryString.toLowerCase()) !=-1);
         };
      },
 

src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue

@@ -162,8 +162,8 @@
 <!--                  //从1到20-->
                   <span v-if="scope.row.single_dose != 0" @click="lili(scope.row)">
                    {{ scope.row.single_dose}}
-                   <span v-if="scope.row.single_dose_unit >0"> {{getUnit(scope.row.single_dose_unit )}}</span> 
-                   <span v-else>{{ scope.row.single_dose_unit }}</span> 
+                   <span v-if="scope.row.single_dose_unit >0"> {{getUnit(scope.row.single_dose_unit )}}</span>
+                   <span v-else>{{ scope.row.single_dose_unit }}</span>
                     <!-- <span v-if="scope.row.single_dose_unit == 1" >{{ scope.row.single_dose}}g</span>
                     <span v-else-if="scope.row.single_dose_unit == 2" >{{ scope.row.single_dose}}mg</span>
                     <span v-else-if="scope.row.single_dose_unit == 3" >{{ scope.row.single_dose}}u</span>
@@ -583,7 +583,7 @@
             </span>
           </el-row>
         </el-form>
-      
+
       </span>
       <span slot="footer" class="dialog-footer">
         <el-button @click="infoDialogVisible = false">取 消</el-button>
@@ -1599,7 +1599,7 @@ export default {
           this.groupForm.start_time = year + '-' + month + '-' + day + ' ' + hours + ':' + minites
         }
       }
-      
+
       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){
          var date = new Date()
           var year = date.getFullYear()
@@ -1659,7 +1659,7 @@ export default {
           }
       }
 
-    
+
       if( this.$store.getters.xt_user.org.id == 10469 ){
           var year = date.getFullYear()
           var month = date.getMonth() + 1
@@ -1898,7 +1898,7 @@ export default {
 
      createFilter(queryString) {
         return (restaurant) => {
-          return (restaurant.drug_name.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
+          return (restaurant.drug_name.toLowerCase().indexOf(queryString.toLowerCase()) != -1);
         };
      },
 
@@ -1947,7 +1947,7 @@ export default {
          }
          return name
       },
-    
+
     saveInformation(){
         var params = {
           selected_date:this.selected_date,

src/xt_pages/dialysis/details/dialog/adviceDialog/EditGroupAdvice.vue

@@ -154,8 +154,8 @@
                     }}{{ scope.row.single_dose_unit }}</span
                   > -->
                  {{ scope.row.single_dose}}
-                <span v-if="scope.row.single_dose_unit >0"> {{getUnit(scope.row.single_dose_unit )}}</span> 
-                <span v-else>{{ scope.row.single_dose_unit }}</span> 
+                <span v-if="scope.row.single_dose_unit >0"> {{getUnit(scope.row.single_dose_unit )}}</span>
+                <span v-else>{{ scope.row.single_dose_unit }}</span>
                 </template>
               </el-table-column>
               <el-table-column
@@ -279,7 +279,7 @@
                   >{{ scope.row.single_dose
                   }}{{ scope.row.single_dose_unit }}</span
                 >
-               
+
               </template>
             </el-table-column>
             <el-table-column
@@ -2468,7 +2468,7 @@ export default {
 
      createFilter(queryString) {
         return (restaurant) => {
-          return (restaurant.drug_name.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
+          return (restaurant.drug_name.toLowerCase().indexOf(queryString.toLowerCase()) != -1);
         };
      },
 

src/xt_pages/role/admin.vue

@@ -25,13 +25,13 @@
         >医药师登记</el-button>
 
 
-        <!-- <el-button
+        <el-button
           type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
           @click="toJiaBan">加班</el-button>
-        -->
+       
 
          <!-- <el-button
           type="primary"

src/xt_pages/user/components/EditGroupAdvice.vue

@@ -2533,7 +2533,7 @@ export default {
 
      createFilter(queryString) {
         return (restaurant) => {
-          return (restaurant.drug_name.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
+          return (restaurant.drug_name.toLowerCase().indexOf(queryString.toLowerCase()) != -1);
         };
      },
 

src/xt_pages/user/doctorAdvice.vue

@@ -81,8 +81,8 @@
             <span v-if="item.value != 1">
               {{ item.label }}
             </span>
-            
-            
+
+
             </li>
           </ul>
         </div>
@@ -167,8 +167,8 @@
         >
           <template slot-scope="scope">
             <span v-if="scope.row.advice_type == 1">
-              <span v-if="org_id != 9671 && org_id != 10440">长嘱</span> 
-              <span v-if="org_id == 9671 || org_id == 10440">长期医嘱模版</span> 
+              <span v-if="org_id != 9671 && org_id != 10440">长嘱</span>
+              <span v-if="org_id == 9671 || org_id == 10440">长期医嘱模版</span>
             </span>
             <span v-else-if="scope.row.advice_type == 3 || scope.row.advice_type == 2">临嘱</span>
             <span v-else-if="scope.row.advice_type == 4">普通医嘱</span>
@@ -586,7 +586,7 @@
                     v-for="item in adviceTypeOptions"
                   ></el-option>
                 </el-select>
-               
+
               </el-form-item>
             </el-col>
 
@@ -797,7 +797,7 @@
                     >
                   </template>
                 </el-table-column>
-                <el-table-column 
+                <el-table-column
                  label="推送截止日期"
                   min-width="80"
                   align="center"
@@ -805,10 +805,10 @@
                 <template slot-scope="scope">
                    {{scope.row.push_start_time}}
                 </template>
-                
+
                 </el-table-column>
 
-                <el-table-column 
+                <el-table-column
                  label="医嘱嘱托"
                   min-width="80"
                   align="center"
@@ -816,7 +816,7 @@
                 <template slot-scope="scope">
                    {{scope.row.remark}}
                 </template>
-                
+
                 </el-table-column>
               </el-table>
             </el-col>
@@ -1188,7 +1188,7 @@
               </el-form-item>
             </el-col>
 
-           
+
 
             <el-col :span="12" v-if="nameForm.frequency_type == 2">
               <el-form-item prop="day_count">
@@ -1490,7 +1490,7 @@
             </el-col>
           </el-row>
 
-          
+
           <el-form-item label="备注 :">
             <el-input type="textarea" v-model="adviceForm.remark"></el-input>
           </el-form-item>
@@ -1499,7 +1499,7 @@
             <span>{{ adminusername }} </span>
           </el-form-item>
 
-        
+
         </el-form>
         <div slot="footer" class="dialog-footer">
           <template v-if="isEdit">
@@ -2300,7 +2300,7 @@ export default {
       drug_id: 0,
       src_type:"",
       org_id:0,
-     
+
     };
   },
   methods: {
@@ -2373,7 +2373,7 @@ export default {
               this.dialogFormVisible = false;
               this.resetForm(formName);
               var advice = response.data.data.advice;
-              
+
               this.adviceTableData[this.currentIndex].drug_spec =
                 advice.drug_spec;
               this.adviceTableData[this.currentIndex].drug_spec_unit =
@@ -2455,7 +2455,7 @@ export default {
               }
           }
           console.log("模板数据",submitForm)
-          
+
           CreateNewGroupAdvice(this.patientID, 0, submitForm, mode).then(
             response => {
               if (response.data.state == 0) {
@@ -2549,7 +2549,7 @@ export default {
               this.adviceForm.advice_name = arr[0]
           }
           console.log("222222???????this.adviceForm",this.adviceForm)
-          
+
           CreateNewDoctorAdvice(this.patientID, this.adviceForm, mode).then(
             response => {
               if (response.data.state == 0) {
@@ -3117,7 +3117,7 @@ export default {
 
         remark: groups[0].remark,
         groupno: groupno,
-        
+
       };
       console.log("到了",groups[0]);
 
@@ -3530,7 +3530,7 @@ export default {
               }
             }
           }
-         
+
           var one = response.data.data.advicetwo;
           let dataInfo = {};
           one.forEach((item, index) => {
@@ -4427,7 +4427,7 @@ export default {
       // this.sameRowArr = sameRowArr;
     },
     mergeSpan({ row, column, rowIndex, columnIndex }) {
-     
+
       if (columnIndex === 0 || columnIndex === 1 || columnIndex === 2) {
         const _row = this.tempArr[rowIndex];
         const _col = _row > 0 ? 1 : 0;
@@ -4740,7 +4740,7 @@ export default {
 
      createFilter(queryString) {
         return (restaurant) => {
-          return (restaurant.drug_name.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
+          return (restaurant.drug_name.toLowerCase().indexOf(queryString.toLowerCase()) !=-1);
         };
      },
 
@@ -4810,7 +4810,7 @@ export default {
       for (const i in this.multipleSelection) {
         arr.push(this.multipleSelection[i]);
         group.push(this.multipleSelection[i].groupno);
-       
+
       }
       grouptwo.push(this.getdata(group));
       // console.log('组号', group)