csx 6 years ago
parent
commit
ffa85f51ab

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

536
       },
536
       },
537
       openDeleteGroupAdvice() {
537
       openDeleteGroupAdvice() {
538
         if (this.groupSelectRow === null) {
538
         if (this.groupSelectRow === null) {
539
-          this.$notify.error({
540
-            title: '错误',
541
-            message: '未选择要删除的医嘱内容'
542
-          })
539
+          this.$message.error("未选择要删除的医嘱内容")
543
           return
540
           return
544
         }
541
         }
545
         this.DeleteGroupAdvice(this.groupSelectRow.groupno)
542
         this.DeleteGroupAdvice(this.groupSelectRow.groupno)
556
       openAdviceName(isEdit) {
553
       openAdviceName(isEdit) {
557
         if (isEdit) {
554
         if (isEdit) {
558
           if (this.groupSelectRow === null) {
555
           if (this.groupSelectRow === null) {
559
-            this.$notify.error({
560
-              title: '错误',
561
-              message: '未选择要修改的医嘱内容'
562
-            })
556
+
557
+            this.$message.error("未选择要修改的医嘱内容")
558
+
563
             return
559
             return
564
           }
560
           }
565
           this.nameForm = {
561
           this.nameForm = {
855
 
851
 
856
       openEditGroupAdvice() {
852
       openEditGroupAdvice() {
857
         if (this.groupSelectRow === null) {
853
         if (this.groupSelectRow === null) {
858
-          this.$notify.error({
859
-            title: '错误',
860
-            message: '未选择要修改的医嘱内容'
861
-          })
854
+          this.$message.error("未选择要修改的医嘱内容")
862
           return
855
           return
863
         }
856
         }
864
 
857
 

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

651
 
651
 
652
       openDeleteGroupAdvice() {
652
       openDeleteGroupAdvice() {
653
         if (this.groupSelectRow === null) {
653
         if (this.groupSelectRow === null) {
654
-          this.$notify.error({
655
-            title: '错误',
656
-            message: '未选择要删除的医嘱内容'
657
-          })
654
+
655
+          this.$message.error("未选择要删除的医嘱内容")
656
+
658
           return
657
           return
659
         }
658
         }
660
         var content = ''
659
         var content = ''
770
 
769
 
771
       openGroupChild() {
770
       openGroupChild() {
772
         if (this.groupSelectRow === null) {
771
         if (this.groupSelectRow === null) {
773
-          this.$notify.error({
774
-            title: '错误',
775
-            message: '未选择医嘱内容,无法添加子药'
776
-          })
772
+
773
+          this.$message.error("未选择医嘱内容,无法添加子药")
774
+
777
           return
775
           return
778
         } else if (this.groupSelectRow.parent_row > 0) {
776
         } else if (this.groupSelectRow.parent_row > 0) {
779
           this.$notify.error({
777
           this.$notify.error({
807
         this.isChild = false
805
         this.isChild = false
808
         if (isEdit) {
806
         if (isEdit) {
809
           if (this.groupSelectRow === null) {
807
           if (this.groupSelectRow === null) {
810
-            this.$notify.error({
811
-              title: '错误',
812
-              message: '未选择要修改的医嘱内容'
813
-            })
808
+
809
+            this.$message.error("未选择要修改的医嘱内容")
810
+
814
             return
811
             return
815
           }
812
           }
816
           if (this.groupSelectRow.parent_row) {
813
           if (this.groupSelectRow.parent_row) {

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

594
       },
594
       },
595
       openDeleteGroupAdvice() {
595
       openDeleteGroupAdvice() {
596
         if (this.groupSelectRow === null) {
596
         if (this.groupSelectRow === null) {
597
-          this.$notify.error({
598
-            title: '错误',
599
-            message: '未选择要删除的医嘱内容'
600
-          })
597
+          this.$message.error("未选择要删除的医嘱内容")
601
           return
598
           return
602
         }
599
         }
603
         console.log(this.groupSelectRow)
600
         console.log(this.groupSelectRow)
997
 
994
 
998
       openGroupChild() {
995
       openGroupChild() {
999
         if (this.groupSelectRow === null) {
996
         if (this.groupSelectRow === null) {
1000
-          this.$notify.error({
1001
-            title: '错误',
1002
-            message: '未选择医嘱内容,无法添加子药'
1003
-          })
997
+
998
+          this.$message.error("未选择医嘱内容,无法添加子药")
999
+
1004
           return
1000
           return
1005
         } else if (this.groupSelectRow.parent_row > 0) {
1001
         } else if (this.groupSelectRow.parent_row > 0) {
1006
           this.$notify.error({
1002
           this.$notify.error({
1034
         this.isChild = false
1030
         this.isChild = false
1035
         if (isEdit) {
1031
         if (isEdit) {
1036
           if (this.groupSelectRow === null) {
1032
           if (this.groupSelectRow === null) {
1037
-            this.$notify.error({
1038
-              title: '错误',
1039
-              message: '未选择要修改的医嘱内容'
1040
-            })
1033
+            this.$message.error("未选择要修改的医嘱内容")
1041
             return
1034
             return
1035
+
1042
           }
1036
           }
1043
           if (this.groupSelectRow.parent_row) {
1037
           if (this.groupSelectRow.parent_row) {
1044
             this.isChild = true
1038
             this.isChild = true

+ 1 - 1
src/xt_pages/stock/stockInOrderDetail.vue View File

84
           </template>
84
           </template>
85
         </el-table-column>
85
         </el-table-column>
86
         <el-table-column label="有效日期" min-width="40" align="center">
86
         <el-table-column label="有效日期" min-width="40" align="center">
87
-          <template v-if="scope.row.product_date != 0" slot-scope="scope">
87
+          <template v-if="scope.row.expiry_date != 0" slot-scope="scope">
88
             {{ scope.row.expiry_date | parseTime('{y}-{m}-{d}')}}
88
             {{ scope.row.expiry_date | parseTime('{y}-{m}-{d}')}}
89
           </template>
89
           </template>
90
         </el-table-column>
90
         </el-table-column>

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

552
 
552
 
553
       openDeleteGroupAdvice() {
553
       openDeleteGroupAdvice() {
554
         if (this.groupSelectRow === null) {
554
         if (this.groupSelectRow === null) {
555
-          this.$notify.error({
556
-            title: "错误",
557
-            message: "未选择要删除的医嘱内容"
558
-          });
555
+          this.$message.error("未选择要删除的医嘱内容")
556
+
559
           return;
557
           return;
558
+
560
         }
559
         }
561
         console.log(this.groupSelectRow)
560
         console.log(this.groupSelectRow)
562
         var content = ""
561
         var content = ""
966
 
965
 
967
       openGroupChild() {
966
       openGroupChild() {
968
         if (this.groupSelectRow === null) {
967
         if (this.groupSelectRow === null) {
969
-          this.$notify.error({
970
-            title: "错误",
971
-            message: "未选择医嘱内容,无法添加子药"
972
-          });
968
+
969
+          this.$message.error("未选择医嘱内容,无法添加子药")
970
+
973
           return;
971
           return;
974
         } else if (this.groupSelectRow.parent_row > 0) {
972
         } else if (this.groupSelectRow.parent_row > 0) {
975
           this.$notify.error({
973
           this.$notify.error({
1003
         this.isChild = false;
1001
         this.isChild = false;
1004
         if (isEdit) {
1002
         if (isEdit) {
1005
           if (this.groupSelectRow === null) {
1003
           if (this.groupSelectRow === null) {
1006
-            this.$notify.error({
1007
-              title: "错误",
1008
-              message: "未选择要修改的医嘱内容"
1009
-            });
1004
+            this.$message.error("未选择要修改的医嘱内容")
1010
             return;
1005
             return;
1011
           }
1006
           }
1012
           if (this.groupSelectRow.parent_row) {
1007
           if (this.groupSelectRow.parent_row) {

+ 4 - 9
src/xt_pages/user/components/PatientForm.vue View File

1
 <template>
1
 <template>
2
 <div class="main-contain">
2
 <div class="main-contain">
3
   <div class="position">
3
   <div class="position">
4
-    <bread-crumb :crumbs="crumbs"></bread-crumb>
5
 
4
 
6
     <div class="" style="float:right;">
5
     <div class="" style="float:right;">
7
        <el-button @click="$router.back(-1)" icon="el-icon-refresh" size="small">取消</el-button>
6
        <el-button @click="$router.back(-1)" icon="el-icon-refresh" size="small">取消</el-button>
37
               </el-col> -->
36
               </el-col> -->
38
               <el-col :span="8" :style="isEdit?'width:360px':''">
37
               <el-col :span="8" :style="isEdit?'width:360px':''">
39
                 <el-form-item label="透析号 : " class="is-required">
38
                 <el-form-item label="透析号 : " class="is-required">
40
-                    <el-input disabled v-model="form.dialysisNo" placeholder="填写或自动生成" style="width:62%;float:left;margin-right: 2%;" ></el-input> 
39
+                    <el-input disabled v-model="form.dialysisNo" placeholder="填写或自动生成" style="width:62%;float:left;margin-right: 2%;" ></el-input>
41
                     <el-button style="width:36%;padding:10px 0;" disabled type="primary">自动生成</el-button>
40
                     <el-button style="width:36%;padding:10px 0;" disabled type="primary">自动生成</el-button>
42
                 </el-form-item>
41
                 </el-form-item>
43
               </el-col>
42
               </el-col>
59
               </el-col>
58
               </el-col>
60
               <el-col :span="8" >
59
               <el-col :span="8" >
61
                 <el-form-item label="透析号 : " class="is-required" prop="dialysisNo" >
60
                 <el-form-item label="透析号 : " class="is-required" prop="dialysisNo" >
62
-                    <el-input v-model="form.dialysisNo" placeholder="填写或自动生成" style="width:62%;float:left;margin-right: 2%;" ></el-input> 
61
+                    <el-input v-model="form.dialysisNo" placeholder="填写或自动生成" style="width:62%;float:left;margin-right: 2%;" ></el-input>
63
                     <el-button style="width:36%;padding:10px 0;" :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" type="primary" @click="generatedialysisno">自动生成</el-button>
62
                     <el-button style="width:36%;padding:10px 0;" :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" type="primary" @click="generatedialysisno">自动生成</el-button>
64
                 </el-form-item>
63
                 </el-form-item>
65
               </el-col>
64
               </el-col>
66
             </template>
65
             </template>
67
-            
66
+
68
             <el-col :span="8" :style="isEdit?'width:360px':''">
67
             <el-col :span="8" :style="isEdit?'width:360px':''">
69
               <el-form-item label="出生日期 : "  class="is-required" prop="birth" >
68
               <el-form-item label="出生日期 : "  class="is-required" prop="birth" >
70
                   <el-date-picker v-model="form.birth" type="date" placeholder="选择日期" :suffix-icon="'el-icon-menu'" @change="hadSelectBirth" format="yyyy-MM-dd" value-format="yyyy-MM-dd"></el-date-picker>
69
                   <el-date-picker v-model="form.birth" type="date" placeholder="选择日期" :suffix-icon="'el-icon-menu'" @change="hadSelectBirth" format="yyyy-MM-dd" value-format="yyyy-MM-dd"></el-date-picker>
300
             </el-checkbox-group>
299
             </el-checkbox-group>
301
           </el-form-item>
300
           </el-form-item>
302
         </el-col>
301
         </el-col>
303
-        
302
+
304
         <el-col :span="24">
303
         <el-col :span="24">
305
           <el-form-item label="诊断 : " prop="diagnose">
304
           <el-form-item label="诊断 : " prop="diagnose">
306
             <el-input type="textarea" :rows="3" v-model="form.diagnose" resize="none" placeholder=""></el-input>
305
             <el-input type="textarea" :rows="3" v-model="form.diagnose" resize="none" placeholder=""></el-input>
489
     }
488
     }
490
 
489
 
491
     return {
490
     return {
492
-      crumbs: [
493
-        { path: false, name: '病人管理' },
494
-        { path: '/patients/create', name: '新增病人' },
495
-      ],
496
       generic_info_fold: true,
491
       generic_info_fold: true,
497
       treat_info_fold: true,
492
       treat_info_fold: true,
498
 
493
 

+ 7 - 10
src/xt_pages/user/courseOfDisease.vue View File

14
                     </span>
14
                     </span>
15
                     <span class="filter_title">日期查询</span>
15
                     <span class="filter_title">日期查询</span>
16
                     <el-date-picker size="small" v-model="date" type="daterange" range-separator="至" start-placeholde="开始日期" end-placeholde="结束日期" value-format="timestamp" :clearable="false" @change="requestCourseRecords()"></el-date-picker>
16
                     <el-date-picker size="small" v-model="date" type="daterange" range-separator="至" start-placeholde="开始日期" end-placeholde="结束日期" value-format="timestamp" :clearable="false" @change="requestCourseRecords()"></el-date-picker>
17
-                    
17
+
18
                 </div>
18
                 </div>
19
                 <div class="record">
19
                 <div class="record">
20
                     <el-row :gutter="15">
20
                     <el-row :gutter="15">
35
                         </el-col>
35
                         </el-col>
36
                         <el-col :span="14">
36
                         <el-col :span="14">
37
                             <div class="record_content_panel">
37
                             <div class="record_content_panel">
38
-                                <div class="title">病程内容</div>
38
+                                <div style="background-color:rgb(245, 247, 250)" class="title">病程内容</div>
39
                                 <div class="content">
39
                                 <div class="content">
40
                                     {{ current_select_record == null ? "" : current_select_record.content }}
40
                                     {{ current_select_record == null ? "" : current_select_record.content }}
41
                                 </div>
41
                                 </div>
45
                 </div>
45
                 </div>
46
             </div>
46
             </div>
47
         <!-- </div> -->
47
         <!-- </div> -->
48
-        <el-dialog title="新增病程记录" width="40%" top="5vh" :visible.sync="show_dialog" :before-close="willCloseDialog">
48
+        <el-dialog title="新增病程记录" width="40%" top="5vh" :visible.sync="show_dialog">
49
             <div>
49
             <div>
50
                 <div class="new_record_form">
50
                 <div class="new_record_form">
51
                     <diV>
51
                     <diV>
60
 
60
 
61
                     <div style="text-align: right; padding-right: 0px; padding-top: 10px; padding-bottom: 10px;">
61
                     <div style="text-align: right; padding-right: 0px; padding-top: 10px; padding-bottom: 10px;">
62
                         <el-button @click="show_dialog = false">取消</el-button>
62
                         <el-button @click="show_dialog = false">取消</el-button>
63
-                        <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary" @click="createAction" :loading="uploading_new_record">确定</el-button>
63
+                        <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary" @click="createAction" :loading="uploading_new_record">保存</el-button>
64
                     </div>
64
                     </div>
65
                 </div>
65
                 </div>
66
             </div>
66
             </div>
77
 
77
 
78
 export default {
78
 export default {
79
     name: "CourseOfDisease",
79
     name: "CourseOfDisease",
80
-    components: { 
80
+    components: {
81
         PatientSidebar,
81
         PatientSidebar,
82
         BreadCrumb
82
         BreadCrumb
83
     },
83
     },
95
             show_dialog: false,
95
             show_dialog: false,
96
             uploading_new_record: false,
96
             uploading_new_record: false,
97
             templates: this.$store.getters.configlist.course_disease,
97
             templates: this.$store.getters.configlist.course_disease,
98
-            select_template: [],
98
+            select_template: '',
99
             new_content: "",
99
             new_content: "",
100
 
100
 
101
             selectingRows: [],
101
             selectingRows: [],
128
                     this.current_select_record = null
128
                     this.current_select_record = null
129
                     this.records = resp.data.records
129
                     this.records = resp.data.records
130
                     this.doctors = resp.data.doctors
130
                     this.doctors = resp.data.doctors
131
-                    
131
+
132
                 } else {
132
                 } else {
133
                     this.$message.error(resp.msg)
133
                     this.$message.error(resp.msg)
134
                 }
134
                 }
155
             return ""
155
             return ""
156
         },
156
         },
157
 
157
 
158
-        willCloseDialog: function() {
159
 
158
 
160
-        },
161
         createAction: function() {
159
         createAction: function() {
162
             if (this.new_content.length == 0) {
160
             if (this.new_content.length == 0) {
163
                 this.$message.error("请填写病程内容")
161
                 this.$message.error("请填写病程内容")
187
         didSelectTemplate: function(templateContent) {
185
         didSelectTemplate: function(templateContent) {
188
             this.new_content = this.new_content.length > 0 ? (this.new_content + templateContent) : templateContent
186
             this.new_content = this.new_content.length > 0 ? (this.new_content + templateContent) : templateContent
189
 
187
 
190
-            this.select_template = ""
191
         },
188
         },
192
 
189
 
193
         didSelectionChange: function(selectRows) {
190
         didSelectionChange: function(selectRows) {

+ 11 - 16
src/xt_pages/user/doctorAdvice.vue View File

1459
     },
1459
     },
1460
     openGroupChild() {
1460
     openGroupChild() {
1461
       if (this.groupSelectRow === null) {
1461
       if (this.groupSelectRow === null) {
1462
-        this.$notify.error({
1463
-          title: "错误",
1464
-          message: "未选择医嘱内容,无法添加子药"
1465
-        });
1462
+
1463
+        this.$message.error("未选择医嘱内容,无法添加子药")
1464
+
1466
         return;
1465
         return;
1467
       } else if (this.groupSelectRow.parent_row > 0) {
1466
       } else if (this.groupSelectRow.parent_row > 0) {
1468
-        this.$notify.error({
1469
-          title: "错误",
1470
-          message: "子药不能添加子药"
1471
-        });
1467
+
1468
+        this.$message.error("子药不能添加子药")
1469
+
1472
         return;
1470
         return;
1473
       }
1471
       }
1474
       this.nameForm = {
1472
       this.nameForm = {
1495
       this.isChild = false;
1493
       this.isChild = false;
1496
       if (isEdit) {
1494
       if (isEdit) {
1497
         if (this.groupSelectRow === null) {
1495
         if (this.groupSelectRow === null) {
1498
-          this.$notify.error({
1499
-            title: "错误",
1500
-            message: "未选择要修改的医嘱内容"
1501
-          });
1496
+
1497
+          this.$message.error("未选择要修改的医嘱内容")
1498
+
1502
           return;
1499
           return;
1500
+
1503
         }
1501
         }
1504
         if (this.groupSelectRow.parent_row) {
1502
         if (this.groupSelectRow.parent_row) {
1505
           this.isChild = true;
1503
           this.isChild = true;
1550
     },
1548
     },
1551
     openDeleteGroupAdvice() {
1549
     openDeleteGroupAdvice() {
1552
       if (this.groupSelectRow === null) {
1550
       if (this.groupSelectRow === null) {
1553
-        this.$notify.error({
1554
-          title: "错误",
1555
-          message: "未选择要删除的医嘱内容"
1556
-        });
1551
+        this.$message.error("未选择要删除的医嘱内容")
1557
         return;
1552
         return;
1558
       }
1553
       }
1559
       var content = "";
1554
       var content = "";