Procházet zdrojové kódy

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

csx před 4 roky
rodič
revize
e3b061b6e6

+ 25 - 0
src/utils/tools.js Zobrazit soubor

@@ -175,3 +175,28 @@ export function calculateAnticoagulantZL(type, shouji, shichang, weichi) {
175 175
   // console.log((shouji + (shichang - t) * weichi).toFixed(1))
176 176
   return (shouji + (shichang - t) * weichi).toFixed(1)
177 177
 }
178
+
179
+
180
+export function formatDate (date, format) {
181
+  if (/(y+)/.test(format)) {
182
+      format= format.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length));
183
+  }
184
+  let o = {
185
+      'M+': date.getMonth() + 1,
186
+      'd+': date.getDate(),
187
+      'h+': date.getHours(),
188
+      'm+': date.getMinutes(),
189
+      's+': date.getSeconds()
190
+  };
191
+  for (let k in o) {
192
+      if (new RegExp(`(${k})`).test(format)) {
193
+          let str = o[k] + '';
194
+          format= format.replace(RegExp.$1, (RegExp.$1.length === 1) ? str : padLeftZero(str));
195
+      }
196
+  }
197
+  return format;
198
+};
199
+
200
+function padLeftZero (str) {
201
+  return ('00' + str).substr(str.length);
202
+};

+ 0 - 4
src/xt_pages/data/components/additionDialog.vue Zobrazit soubor

@@ -66,10 +66,6 @@
66 66
           name: [
67 67
             { required: true, message: '请输入费用名称', trigger: 'blur' }
68 68
           ],
69
-          code: [
70
-            { required: true, message: '请输入国家编码', trigger: 'blur' }
71
-          ]
72
-
73 69
         }
74 70
       }
75 71
     },

+ 2 - 2
src/xt_pages/data/components/addtion.vue Zobrazit soubor

@@ -184,9 +184,9 @@
184 184
             this.$message.error(response.data.msg)
185 185
             return false
186 186
           } else {
187
-            this.Dialog.formValue.class_name =
187
+            this.Dialog.formValue.name =
188 188
               response.data.data.addition.name
189
-            this.Dialog.formValue.content_code =
189
+            this.Dialog.formValue.code =
190 190
               response.data.data.addition.code
191 191
             this.Dialog.formValue.price =
192 192
               response.data.data.addition.price

+ 8 - 5
src/xt_pages/data/specialDictionary.vue Zobrazit soubor

@@ -25,12 +25,10 @@
25 25
           <!--<supplier></supplier>-->
26 26
           <dealer></dealer>
27 27
         </el-tab-pane>
28
-
29 28
         <el-tab-pane label="疾病类型" name="7">
30
-          <!--<manufacturer></manufacturer>-->
31
-          <diagnosis></diagnosis>
32
-        </el-tab-pane>
33
-
29
+        <!--<manufacturer></manufacturer>-->
30
+        <diagnosis></diagnosis>
31
+      </el-tab-pane>
34 32
         <!--<el-tab-pane label="医疗类别" name="8">-->
35 33
           <!--&lt;!&ndash;<manufacturer></manufacturer>&ndash;&gt;-->
36 34
           <!--<diagnosis></diagnosis>-->
@@ -42,6 +40,11 @@
42 40
         <el-tab-pane label="配置项字典" name="9">
43 41
           <configure></configure>
44 42
         </el-tab-pane>
43
+
44
+        <el-tab-pane label="诊断信息" name="10">
45
+          <diagnosis></diagnosis>
46
+        </el-tab-pane>
47
+
45 48
       </el-tabs>
46 49
     </div>
47 50
   </div>

+ 1 - 1
src/xt_pages/outpatientCharges/outpatientChargesManagement.vue Zobrazit soubor

@@ -67,7 +67,7 @@
67 67
               <div style="display:flex;height:100%;">
68 68
                 <div class="centerLeft">
69 69
                   <div class="tabsBox">
70
-                    <el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button>
70
+                    <!--<el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button>-->
71 71
                     <el-tabs class="preTabs" v-model="editableTabsValue" type="border-card" @tab-click="tabclickEvent">
72 72
                       <el-tab-pane
73 73
                         v-for="(item, index) in prescriptions"

+ 8 - 1
src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue Zobrazit soubor

@@ -674,10 +674,16 @@
674 674
           this.order_status = '已退费'
675 675
         }
676 676
 
677
+        console.log(info)
678
+
679
+
677 680
         if(info.id > 0){
681
+          console.log("!Q!!!!")
682
+
678 683
           this.doctorValue = info.doctor_id
679 684
           this.departmentValue = info.department
680 685
         }else{
686
+          console.log("------")
681 687
           this.doctorValue = ''
682 688
           this.departmentValue = ''
683 689
 
@@ -714,7 +720,7 @@
714 720
           return false
715 721
         }
716 722
       },
717
-      open(index) {
723
+      open(index,isLoading) {
718 724
         if (this.curPrescriptions.order_status == 2) {
719 725
           this.$message.error('当前处方已经结算,无法保存')
720 726
           return
@@ -773,6 +779,7 @@
773 779
           let data = {
774 780
             'prescriptions': this.prescriptions
775 781
           }
782
+          isLoading = true
776 783
           createHisPrescription(data, params).then(response => {
777 784
             if (response.data.state == 1) {
778 785
               this.$emit("change")

+ 9 - 4
src/xt_pages/outpatientDoctorStation/doctorDesk.vue Zobrazit soubor

@@ -45,7 +45,7 @@
45 45
             <el-tab-pane label="电子病历" name="电子病历"></el-tab-pane>
46 46
           </el-tabs>
47 47
           <div class="mainCell fixedCell" style="float:right" v-if="titleType == '电子处方'">
48
-            <el-button size="small" ref="button_one" @click="open(1)" type="primary">保存</el-button>
48
+            <el-button size="small" ref="button_one" @click="open(1)" type="primary" v-loading="saveLoading">保存</el-button>
49 49
             <el-popover
50 50
               placement="bottom"
51 51
               width="200"
@@ -142,6 +142,7 @@
142 142
     data() {
143 143
       return {
144 144
         tableHeight:'',
145
+        saveloading:false,
145 146
         fullHeight: document.documentElement.clientHeight,
146 147
         prescriptions: [
147 148
           {
@@ -182,6 +183,7 @@
182 183
         selecting_schs: [],
183 184
         index:0,
184 185
         admin_info:{},
186
+        saveLoading:false,
185 187
       }
186 188
     },
187 189
     methods: {
@@ -209,6 +211,8 @@
209 211
 
210 212
 
211 213
       },changeTab(){
214
+        this.saveLoading = false
215
+
212 216
         this.radio = 2
213 217
         let params = {
214 218
           'record_date': this.record_date,
@@ -228,9 +232,12 @@
228 232
            for (let i = 0; i< this.patientTableData.length; i++){
229 233
              if(this.patientTableData[i].patients.id == this.patientid){
230 234
                this.$refs.tab.setCurrentRow(this.patientTableData[i])
235
+               this.getPatientInfo(this.patientTableData[i])
236
+
231 237
              }
232 238
            }
233 239
 
240
+
234 241
           }
235 242
         })
236 243
 
@@ -586,14 +593,13 @@
586 593
 
587 594
       },
588 595
       open(index) {
589
-        console.log("index0999999",this.prescriptions)
590 596
          if(this.prescriptions[0].advices.length == 0 && this.prescriptions[0].project.length == 0){
591 597
            this.$message.error("请先开处方")
592 598
            return
593 599
           }
594 600
         this.index = index
595 601
         if (index == 1) {
596
-          this.$refs.prescriptions.open(1)
602
+          this.$refs.prescriptions.open(1,this.saveLoading)
597 603
         } else if (index == 2) {
598 604
 
599 605
           this.getPrescriptionList(this.patientid)
@@ -612,7 +618,6 @@
612 618
       },
613 619
 
614 620
       opentwo(index) {
615
-        console.log("index",index)
616 621
         if (index == 1) {
617 622
           if(this.patientInfo.id == undefined){
618 623
             this.$message.error("请先选择病人")