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

@@ -46,17 +46,16 @@
                 </el-form-item>
 
                 <el-form-item label="组套明细" style="width:50%;">
-                    <el-autocomplete
-                            class="inline-input"
-                            v-model="form.project_detail"
-                            :fetch-suggestions="querySearch"
-                            placeholder="请输入内容"
-                            @select="handleSelect"
-                    ></el-autocomplete>
-
+                    <el-select v-model="form.project_detail" filterable placeholder="请选择">
+                        <el-option
+                                v-for="item in projectList"
+                                :key="item.id"
+                                :label="item.project_name"
+                                :value="item.id">
+                        </el-option>
+                    </el-select>
                 </el-form-item>
 
-
                 <el-form-item label="数量" style="width:50%;">
                     <div style="display:flex;">
                         <el-input v-model="form.number" style="margin-right:10px;"></el-input>

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -2046,6 +2046,8 @@
               if (response.data.state == 1) {
                 this.$emit('change', this.patientInfo.id)
                 this.$message.success('保存成功')
+              }else{
+                this.$message.error(response.data.msg)
               }
             })
           } else if (index == 2) {

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -111,6 +111,7 @@
 
                             </el-tabs>
                         </div>
+                        <div style="height:100%;" v-show="showTwo">
                         <div style="height:100%;" v-show="showTwo">
                             <el-tabs class="rightTabs" v-model="activeName">
                                 <el-tab-pane label="项目列表" name="1">