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

src/xt_pages/data/druguseTemplate.vue

                   <el-col :span="24">
                     <el-form-item :label="edit_advice_name" required prop="advice_name">
                       <!-- <el-input v-model="templateFormEdit.advice_name"></el-input> -->
-                       <el-select
+                       <!-- <el-select
                             v-model="templateFormEdit.advice_name"
                             filterable
                             clearable
                               :label="item.drug_name"
                               :value="item.drug_name"
                             ></el-option>
-                          </el-select>
+                          </el-select> -->
+                        <el-autocomplete
+                          style="width:100%;"
+                          class="inline-input"
+                          v-model="templateFormEdit.advice_name"
+                          :fetch-suggestions="querySearch"
+                          placeholder="请输入内容"
+                          @select="handleSelect"
+                          @input="changeDrugNameTwo"
+                         ></el-autocomplete>
                     </el-form-item>
                   </el-col>
                   <el-col :span="15">
                     <el-form-item label="药品规格 :" prop="advice_desc">
                       <el-col :span="8">
                         <!-- <el-input v-model="templateFormEdit.advice_desc"></el-input> -->
-                           <el-select
+                           <!-- <el-select
                               v-model="templateFormEdit.advice_desc"
                               filterable
                               clearable
                                 :label="item.drug_spec"
                                 :value="item.drug_spec"
                               ></el-option>
-                           </el-select>
+                           </el-select> -->
+
+                             <el-autocomplete
+                              style="width:100px;"
+                              class="inline-input"
+                              v-model="templateFormEdit.advice_desc"
+                              :fetch-suggestions="querySearch1"
+                              placeholder="请输入内容"
+                              @select="handleSelect1"
+                              @input="changeDrugDescTwo"
+                            ></el-autocomplete>
                       </el-col>
                       <el-col class="line" :span="1">&nbsp;</el-col>
                       <el-col :span="14">
                   <el-col :span="24">
                     <el-form-item label="医嘱内容 :" required prop="advice_name">
                       <!-- <el-input v-model="templateForm.advice_name"></el-input> -->
-                    <el-select
+                    <!-- <el-select
                         v-model="templateForm.advice_name"
                         filterable
                         clearable
                         :label="item.drug_name"
                         :value="item.drug_name"
                       ></el-option>
-                     </el-select>
+                     </el-select> -->
+
+                       <el-autocomplete
+                        style="width:100%;"
+                        class="inline-input"
+                        v-model="templateForm.advice_name"
+                        :fetch-suggestions="querySearch"
+                        placeholder="请输入内容"
+                        @select="handleSelect"
+                        @input="changeDrugName"
+                       ></el-autocomplete>
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
                     <el-form-item label="药品规格 :" prop="advice_desc">
                       <el-col :span="9">
                         <!-- <el-input v-model="templateForm.advice_desc"></el-input> -->
-                      <el-select
+                      <!-- <el-select
                           v-model="templateForm.advice_desc"
                           filterable
                           clearable
                           :label="item.drug_spec"
                           :value="item.drug_spec"
                         ></el-option>
-                        </el-select>
+                        </el-select> -->
+
+                         <el-autocomplete
+                          style="width:100px;"
+                          class="inline-input"
+                          v-model="templateForm.advice_desc"
+                          :fetch-suggestions="querySearch1"
+                          placeholder="请输入内容"
+                          @select="handleSelect1"
+                          @input="changeDrugDesc"
+                         ></el-autocomplete>
                       </el-col>
                       <el-col class="line" :span="1">&nbsp;</el-col>
                       <el-col :span="14">
           delivery_way: '',
           execution_frequency: '',
           id: 0,
-          drug_id:"",
-          way:""
+          drug_id:0,
+          way:0
         },
         dialogConfigVisible:false,
         templateFormEdit: {
          current_drug_spec: "",
          drug_id: 0,
          src_type:"",
-         way:""
+         way:0
       }
     },
     created() {
       
       //编辑医嘱
       submitEditTemplate(formName) {
-         
-         var drug_id = ""
+        
+         var drug_id = 0
          for(let i=0;i<this.all_drug.length;i++){
            if(this.templateFormEdit.advice_name == this.all_drug[i].drug_name){
               drug_id = this.all_drug[i].id
          } 
         this.templateFormEdit.drug_id = drug_id
        
-        
+        console.log("2222",this.templateFormEdit)
         this.$refs[formName].validate(valid => {
+
           this.templateFormEdit.single_dose = parseFloat(this.templateFormEdit.single_dose)
           this.templateFormEdit.prescribing_number = parseFloat(this.templateFormEdit.prescribing_number)
 
           if (isNaN(this.templateFormEdit.single_dose)) {
-            this.templateFormEdit.single_dose = 0
+             this.templateFormEdit.single_dose = 0
           }
           if (isNaN(this.templateFormEdit.prescribing_number)) {
             this.templateFormEdit.prescribing_number = 0
           }
         }
       },
+      
 
+     querySearch(queryString, cb) {
+        console.log('queryString',queryString)
+        var restaurants = this.all_drug;
+        restaurants.map(item => {
+          item.value = item.drug_name
+        })
+        var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
+        // 调用 callback 返回建议列表的数据
+        console.log('results',results)
+        cb(results);
+     },
+
+     createFilter(queryString) {
+        return (restaurant) => {
+          return (restaurant.drug_name.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
+        };
+     },
+
+     querySearch1(queryString, cb) {
+        console.log('queryString',queryString)
+        var restaurants = this.drugSpec;
+         console.log(restaurants)
+        restaurants.map(item => {
+          item.value = item.drug_spec
+        })
+        var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
+        // 调用 callback 返回建议列表的数据
+        console.log('results',results)
+        cb(results);
+      },
     }
   }
 </script>

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

             this.huShow = false
             this.totalShow = false
           }
-          this.dialysisPrescription.mode_id = schedual.mode_id
+          // this.dialysisPrescription.mode_id = schedual.mode_id
 
         }
         var thismode = parseInt(this.dialysisPrescription.anticoagulant)
                       response.data.data.system_prescription[key]
                   }
                 }
+                
               } else {
                 for (const key in this.dialysisPrescription) {
                   // 临时处方为空

src/xt_pages/stock/selfPreparedMedicine/query.vue

          const tHeader = ['序号', '透析号', '姓名','药品名称','规格名称','自备量','已使用','剩余']
          const filterVal = ['index', 'dialysis_no', 'name','drug_name','drug_spec','Total','Count','margin']
          for(let i=0;i<this.tableData.length;i++){
-            this.tableData[i].margin = this.tableData[i].Total - this.tableData[i].Count
+            this.tableData[i].margin = (this.tableData[i].Total?this.tableData[i].Total:0) - this.tableData[i].Count
          }
          const data = this.formatJson(filterVal, this.tableData)
          excel.export_json_to_excel({
              for(let i=0;i<outStockList.length;i++){
                  for(let j=0;j<stocklist.length;j++){
                      if(outStockList[i].patient_id == stocklist[j].patient_id &&outStockList[i].drug_name == stocklist[j].drug_name && outStockList[i].drug_spec == stocklist[j].drug_spec){
+                       if(!stocklist[j].Total){
+                          outStockList[i].Total = 0
+                       }
                       outStockList[i].Total = stocklist[j].Total
                    } 
                  }
               }
 
-
+              console.log("outStockList",outStockList)
               this.tableData = outStockList
             }
         })