Browse Source

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

csx 4 years ago
parent
commit
0ff53a694f

+ 8 - 9
src/xt_pages/data/components/addInspection.vue View File

46
                 </el-form-item>
46
                 </el-form-item>
47
 
47
 
48
                 <el-form-item label="组套明细" style="width:50%;">
48
                 <el-form-item label="组套明细" style="width:50%;">
49
-                    <el-autocomplete
50
-                            class="inline-input"
51
-                            v-model="form.project_detail"
52
-                            :fetch-suggestions="querySearch"
53
-                            placeholder="请输入内容"
54
-                            @select="handleSelect"
55
-                    ></el-autocomplete>
56
-
49
+                    <el-select v-model="form.project_detail" filterable placeholder="请选择">
50
+                        <el-option
51
+                                v-for="item in projectList"
52
+                                :key="item.id"
53
+                                :label="item.project_name"
54
+                                :value="item.id">
55
+                        </el-option>
56
+                    </el-select>
57
                 </el-form-item>
57
                 </el-form-item>
58
 
58
 
59
-
60
                 <el-form-item label="数量" style="width:50%;">
59
                 <el-form-item label="数量" style="width:50%;">
61
                     <div style="display:flex;">
60
                     <div style="display:flex;">
62
                         <el-input v-model="form.number" style="margin-right:10px;"></el-input>
61
                         <el-input v-model="form.number" style="margin-right:10px;"></el-input>

+ 2 - 0
src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue View File

2046
               if (response.data.state == 1) {
2046
               if (response.data.state == 1) {
2047
                 this.$emit('change', this.patientInfo.id)
2047
                 this.$emit('change', this.patientInfo.id)
2048
                 this.$message.success('保存成功')
2048
                 this.$message.success('保存成功')
2049
+              }else{
2050
+                this.$message.error(response.data.msg)
2049
               }
2051
               }
2050
             })
2052
             })
2051
           } else if (index == 2) {
2053
           } else if (index == 2) {

+ 1 - 0
src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue View File

111
 
111
 
112
                             </el-tabs>
112
                             </el-tabs>
113
                         </div>
113
                         </div>
114
+                        <div style="height:100%;" v-show="showTwo">
114
                         <div style="height:100%;" v-show="showTwo">
115
                         <div style="height:100%;" v-show="showTwo">
115
                             <el-tabs class="rightTabs" v-model="activeName">
116
                             <el-tabs class="rightTabs" v-model="activeName">
116
                                 <el-tab-pane label="项目列表" name="1">
117
                                 <el-tab-pane label="项目列表" name="1">