test_user 2 лет назад
Родитель
Сommit
6f9cc75103

+ 18 - 10
src/xt_pages/medicalScheduling/index.vue Просмотреть файл

201
             </el-form>
201
             </el-form>
202
             <div slot="footer" class="dialog-footer">
202
             <div slot="footer" class="dialog-footer">
203
                 <el-button @click="newVisible=false">取 消</el-button>
203
                 <el-button @click="newVisible=false">取 消</el-button>
204
-                <el-button type="primary" @click="submitAction('form')">保 存</el-button>
204
+                <el-button v-loading="copySchLoading" type="primary" @click="submitAction('form')">保 存</el-button>
205
             </div>
205
             </div>
206
             </el-dialog>
206
             </el-dialog>
207
 
207
 
354
     },
354
     },
355
     data(){
355
     data(){
356
         return{
356
         return{
357
+          copySchLoading:false,
357
             crumbs: [
358
             crumbs: [
358
                 { path: false, name: '医护排班' },
359
                 { path: false, name: '医护排班' },
359
                 { path: '/medicalScheduling/index', name: '医护排班' }
360
                 { path: '/medicalScheduling/index', name: '医护排班' }
1862
             }
1863
             }
1863
            this.$refs[formName].validate(valid=>{
1864
            this.$refs[formName].validate(valid=>{
1864
               if(valid){
1865
               if(valid){
1865
-                copyStaffSchedule(params).then(response=>{
1866
-                   if(response.data.state == 1){
1867
-                     var msg = response.data.data.msg
1868
-                     this.$message.success("复制成功")
1869
-                     this.newVisible = false
1870
-                   }else{
1871
-                    this.$message.error("排班已存在")
1872
-                  }
1873
-                })
1866
+                if(!this.copySchLoading){
1867
+                  this.copySchLoading = true
1868
+                  copyStaffSchedule(params).then(response=>{
1869
+                    if(response.data.state == 1){
1870
+                      var msg = response.data.data.msg
1871
+                      this.copySchLoading = false
1872
+
1873
+                      this.$message.success("复制成功")
1874
+                      this.newVisible = false
1875
+                    }else{
1876
+                      this.copySchLoading = false
1877
+                      this.$message.error("排班已存在")
1878
+                    }
1879
+                  })
1880
+                }
1881
+
1874
               }
1882
               }
1875
            })
1883
            })
1876
         },
1884
         },

+ 9 - 4
src/xt_pages/outpatientCharges/listPrint.vue Просмотреть файл

14
     </template>
14
     </template>
15
 
15
 
16
     <div class='dialysisPage' style="padding-top:40px;">
16
     <div class='dialysisPage' style="padding-top:40px;">
17
-      <printOne v-if="org_id != 10106&&org_id != 10215&&org_id != 10265 && org_id != 0 && org_id!=9675" :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
17
+      <printOne v-if="org_id != 10106&&org_id != 10215&&org_id != 10265 && org_id!=9675" :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
18
       <printTwo v-if="org_id == 10106 && this.paramsObj.balance_accounts_type != 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></printTwo>
18
       <printTwo v-if="org_id == 10106 && this.paramsObj.balance_accounts_type != 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></printTwo>
19
-      <print-three v-if="  org_id == 0 || org_id == 10106 && this.paramsObj.balance_accounts_type == 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></print-three>
19
+      <print-three v-if="org_id == 10106 && this.paramsObj.balance_accounts_type == 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></print-three>
20
       <list-print-two v-if="org_id == 10215 || org_id==9675" :list="list" :patient="patient" :order="order" :admin="admin"></list-print-two>
20
       <list-print-two v-if="org_id == 10215 || org_id==9675" :list="list" :patient="patient" :order="order" :admin="admin"></list-print-two>
21
       <print-two10265  v-if="org_id == 10265  " :list="list" :patient="patient" :order="order" :admin="admin" :hospital_record="hospital_record"></print-two10265>
21
       <print-two10265  v-if="org_id == 10265  " :list="list" :patient="patient" :order="order" :admin="admin" :hospital_record="hospital_record"></print-two10265>
22
     </div>
22
     </div>
94
             this.$message.error(response.data.msg)
94
             this.$message.error(response.data.msg)
95
             return false
95
             return false
96
           } else {
96
           } else {
97
-            if(this.org_id == 10265 || this.org_id == 0){
97
+            if(this.org_id == 10265){
98
               this.order = response.data.data.order
98
               this.order = response.data.data.order
99
               this.patient = response.data.data.patient
99
               this.patient = response.data.data.patient
100
               this.admin = response.data.data.admin_info
100
               this.admin = response.data.data.admin_info
172
 
172
 
173
                   if(infos.project.type == 2){
173
                   if(infos.project.type == 2){
174
                     obj['name'] = infos.project.project.project_name
174
                     obj['name'] = infos.project.project.project_name
175
+                    obj['code'] = infos.project.project.medical_code
176
+
175
                     obj['spec'] = ''
177
                     obj['spec'] = ''
176
                     obj['unit'] =  infos.project.project.unit
178
                     obj['unit'] =  infos.project.project.unit
177
                     obj['is_total']= 0
179
                     obj['is_total']= 0
180
                   }else if (infos.project.type == 3){
182
                   }else if (infos.project.type == 3){
181
                     obj['name'] = infos.project.good_info.good_name
183
                     obj['name'] = infos.project.good_info.good_name
182
                     obj['spec'] = ""
184
                     obj['spec'] = ""
185
+                    obj['code'] = infos.project.good_info.medical_insurance_number
183
                     obj['unit'] = infos.project.good_info.packing_unit
186
                     obj['unit'] = infos.project.good_info.packing_unit
184
                     obj['is_total']= 0
187
                     obj['is_total']= 0
185
 
188
 
189
                 if (infos.advice && infos.advice.id > 0 && infos.project && infos.project.id == 0) {
192
                 if (infos.advice && infos.advice.id > 0 && infos.project && infos.project.id == 0) {
190
                   obj['p_time'] = this.getTimes(infos.advice.prescription.ctime)
193
                   obj['p_time'] = this.getTimes(infos.advice.prescription.ctime)
191
                   obj['name'] = infos.advice.drug.drug_name
194
                   obj['name'] = infos.advice.drug.drug_name
195
+                  obj['code'] = infos.advice.drug.medical_insurance_number
192
                   obj['unit'] = infos.advice.prescribing_number_unit
196
                   obj['unit'] = infos.advice.prescribing_number_unit
193
                   obj['feedetl_sn'] =  infos.feedetl_sn
197
                   obj['feedetl_sn'] =  infos.feedetl_sn
194
                   obj['spec'] =  infos.advice.drug.dose +  infos.advice.drug.dose_unit+"*" + infos.advice.drug.min_number +  infos.advice.drug.min_unit+"/"+infos.advice.drug.max_unit
198
                   obj['spec'] =  infos.advice.drug.dose +  infos.advice.drug.dose_unit+"*" + infos.advice.drug.min_number +  infos.advice.drug.min_unit+"/"+infos.advice.drug.max_unit
206
 
210
 
207
               let newObj = {}
211
               let newObj = {}
208
               newObj['name'] = "合计"
212
               newObj['name'] = "合计"
209
-              newObj['price']= this.order.medfee_sumamt
213
+              newObj['count']= 1
214
+              newObj['price']= this.order.medfee_sumamt.toFixed(2)
210
               newObj['is_total']= 1
215
               newObj['is_total']= 1
211
               this.list.push(newObj)
216
               this.list.push(newObj)
212
 
217
 

+ 8 - 6
src/xt_pages/outpatientCharges/listTemplate/printOne.vue Просмотреть файл

15
         </div>
15
         </div>
16
         <table class="listTable" border="1">
16
         <table class="listTable" border="1">
17
             <tr>
17
             <tr>
18
-                <td style="width:19%">开方日期</td>
18
+                <td style="width:15%">开方日期</td>
19
                 <td style="width:10%">类别</td>
19
                 <td style="width:10%">类别</td>
20
-                <td style="width:31%">项目名称</td>
21
-                <td style="width:14%">规格</td>
20
+              <td style="width:10%">医保编码</td>
21
+              <td style="width:30%">项目名称</td>
22
+                <td style="width:10%">规格</td>
22
                 <td style="width:10%">单价(元)</td>
23
                 <td style="width:10%">单价(元)</td>
23
                 <td style="width:6%">数量</td>
24
                 <td style="width:6%">数量</td>
24
                 <td style="width:10%">金额(元)</td>
25
                 <td style="width:10%">金额(元)</td>
25
             </tr>
26
             </tr>
26
             <tr v-for="item in list.slice(index * 13,(index * 13) + pageArr[index])">
27
             <tr v-for="item in list.slice(index * 13,(index * 13) + pageArr[index])">
27
-                <td style="width:19%">{{item.p_time}}</td>
28
+                <td style="width:15%">{{item.p_time}}</td>
28
                 <td style="width:10%">{{item.med_chrgitm_type}}</td>
29
                 <td style="width:10%">{{item.med_chrgitm_type}}</td>
29
-                <td style="width:31%">{{item.name}}</td>
30
-                <td style="width:14%">{{item.spec}}</td>
30
+                <td style="width:10%">{{item.code}}</td>
31
+                <td style="width:30%">{{item.name}}</td>
32
+                <td style="width:10%">{{item.spec}}</td>
31
                 <td style="width:10%">{{item.price}}</td>
33
                 <td style="width:10%">{{item.price}}</td>
32
                 <td style="width:6%">{{item.count}}{{item.unit}}</td>
34
                 <td style="width:6%">{{item.count}}{{item.unit}}</td>
33
                 <td style="width:10%">{{(item.price * item.count).toFixed(2)}}</td>
35
                 <td style="width:10%">{{(item.price * item.count).toFixed(2)}}</td>

+ 4 - 2
src/xt_pages/outpatientCharges/statementPrint.vue Просмотреть файл

768
               for (let i = 0; i < response.data.data.order_infos.length; i++) {
768
               for (let i = 0; i < response.data.data.order_infos.length; i++) {
769
                 let order = response.data.data.order_infos[i]
769
                 let order = response.data.data.order_infos[i]
770
                 let obj = {
770
                 let obj = {
771
+                  code:"",
771
                   name: "",
772
                   name: "",
772
                   spec: "",
773
                   spec: "",
773
                   cnt: "",
774
                   cnt: "",
780
                   obj.spec = spec
781
                   obj.spec = spec
781
                   obj.cnt = order.cnt
782
                   obj.cnt = order.cnt
782
                   obj.det_item_fee_sumamt =order.det_item_fee_sumamt
783
                   obj.det_item_fee_sumamt =order.det_item_fee_sumamt
784
+                  obj.code = order.advice.drug.medical_insurance_number
783
                   list.push(obj)
785
                   list.push(obj)
784
-
785
                 }else if (order.advice_id == 0 && order.project_id > 0) {
786
                 }else if (order.advice_id == 0 && order.project_id > 0) {
786
                   if(order.project.type == 2){
787
                   if(order.project.type == 2){
787
                     obj.name = order.project.project.project_name
788
                     obj.name = order.project.project.project_name
788
                     obj.spec = ""
789
                     obj.spec = ""
789
                     obj.cnt = order.cnt
790
                     obj.cnt = order.cnt
790
                     obj.det_item_fee_sumamt =order.det_item_fee_sumamt
791
                     obj.det_item_fee_sumamt =order.det_item_fee_sumamt
791
-
792
+                    obj.code = order.project.project.medical_code
792
                   }else{
793
                   }else{
793
                     obj.name = order.project.good_info.good_name
794
                     obj.name = order.project.good_info.good_name
794
                     obj.spec = order.project.good_info.specification_name
795
                     obj.spec = order.project.good_info.specification_name
795
                     obj.cnt = order.cnt
796
                     obj.cnt = order.cnt
796
                     obj.det_item_fee_sumamt =order.det_item_fee_sumamt
797
                     obj.det_item_fee_sumamt =order.det_item_fee_sumamt
798
+                    obj.code = order.project.good_info.medical_insurance_number
797
                   }
799
                   }
798
                   list.push(obj)
800
                   list.push(obj)
799
                 }
801
                 }

+ 2 - 0
src/xt_pages/outpatientCharges/statementTemplate/printFive.vue Просмотреть файл

64
                 <td>{{'价格'}}</td>
64
                 <td>{{'价格'}}</td>
65
               </tr>
65
               </tr>
66
               <tr colspan="6" v-for="(v, index) in info.L_list" :key="index">
66
               <tr colspan="6" v-for="(v, index) in info.L_list" :key="index">
67
+                <td colspan="2">{{v.code}}</td>
67
                 <td colspan="2">{{v.name}}</td>
68
                 <td colspan="2">{{v.name}}</td>
68
                 <td>{{v.spec}}</td>
69
                 <td>{{v.spec}}</td>
69
                 <td>{{v.cnt}}</td>
70
                 <td>{{v.cnt}}</td>
80
               <td>{{'价格'}}</td>
81
               <td>{{'价格'}}</td>
81
               <tr colspan="6" v-for="(v, index) in info.R_list" :key="index">
82
               <tr colspan="6" v-for="(v, index) in info.R_list" :key="index">
82
                 <td colspan="2">{{v.name}}</td>
83
                 <td colspan="2">{{v.name}}</td>
84
+                <td colspan="2">{{v.code}}</td>
83
                 <td>{{v.spec}}</td>
85
                 <td>{{v.spec}}</td>
84
                 <td>{{v.cnt}}</td>
86
                 <td>{{v.cnt}}</td>
85
                 <td>{{v.det_item_fee_sumamt}}</td>
87
                 <td>{{v.det_item_fee_sumamt}}</td>

+ 7 - 1
src/xt_pages/outpatientTool/components/settle.vue Просмотреть файл

66
             {{scope.row.id_card_no}}
66
             {{scope.row.id_card_no}}
67
           </template>
67
           </template>
68
         </el-table-column>
68
         </el-table-column>
69
+        <el-table-column align="center" prop="item_name" label="就诊号">
70
+          <template slot-scope="scope">
71
+            {{scope.row.mdtrt_id}}
72
+          </template>
73
+        </el-table-column>
69
         <el-table-column align="center" prop="item_name" label="治疗日期">
74
         <el-table-column align="center" prop="item_name" label="治疗日期">
70
           <template slot-scope="scope">
75
           <template slot-scope="scope">
71
             {{getTimes(scope.row.settle_accounts_date)}}
76
             {{getTimes(scope.row.settle_accounts_date)}}
233
                 let order = data[i].orders[b]
238
                 let order = data[i].orders[b]
234
                 order['other_name'] = data[i].name
239
                 order['other_name'] = data[i].name
235
                 order['id_card_no'] = data[i].id_card_no
240
                 order['id_card_no'] = data[i].id_card_no
241
+                order['mdtrt_id'] =order.mdtrt_id
236
 
242
 
237
                 total = parseFloat((parseFloat(total.toString()) + parseFloat(data[i].orders[b].medfee_sumamt.toString())).toFixed(2).toString())
243
                 total = parseFloat((parseFloat(total.toString()) + parseFloat(data[i].orders[b].medfee_sumamt.toString())).toFixed(2).toString())
238
               }
244
               }
324
         })
330
         })
325
         this.sameRowArr = sameRowArr
331
         this.sameRowArr = sameRowArr
326
       }, merge({ row, column, rowIndex, columnIndex }) {
332
       }, merge({ row, column, rowIndex, columnIndex }) {
327
-        if (columnIndex === 0 || columnIndex === 1 || columnIndex === 15) {
333
+        if (columnIndex === 0 || columnIndex === 1  || columnIndex === 15) {
328
           const _row = this.tempArr[rowIndex]
334
           const _row = this.tempArr[rowIndex]
329
           const _col = _row > 0 ? 1 : 0
335
           const _col = _row > 0 ? 1 : 0
330
           return {
336
           return {

+ 18 - 10
src/xt_pages/workforce/appointment.vue Просмотреть файл

155
         </el-form>
155
         </el-form>
156
         <div slot="footer" class="dialog-footer">
156
         <div slot="footer" class="dialog-footer">
157
           <el-button @click="newVisible=false">取 消</el-button>
157
           <el-button @click="newVisible=false">取 消</el-button>
158
-          <el-button type="primary" @click="submitAction('form')">保 存</el-button>
158
+          <el-button  v-loading="copySchLoading" type="primary" @click="submitAction('form')">保 存</el-button>
159
         </div>
159
         </div>
160
       </el-dialog>
160
       </el-dialog>
161
     </div>
161
     </div>
251
         copyWeek: "",
251
         copyWeek: "",
252
       },
252
       },
253
       newVisible: false,
253
       newVisible: false,
254
+      copySchLoading:false,
254
       typeOptions: [],
255
       typeOptions: [],
255
       timeOptions: [],
256
       timeOptions: [],
256
       copyWeek: '',
257
       copyWeek: '',
2978
 
2979
 
2979
       this.$refs[formName].validate(valid => {
2980
       this.$refs[formName].validate(valid => {
2980
         if (valid) {
2981
         if (valid) {
2981
-          copyPatientSchedule(params).then(response => {
2982
-            if (response.data.state == 1) {
2983
-              var msg = response.data.data.msg
2984
-              this.$message.success("复制成功")
2985
-              this.newVisible = false
2986
-            } else {
2987
-              this.$message.error("复制失败")
2988
-            }
2989
-          })
2982
+          if(!this.copySchLoading){
2983
+            this.copySchLoading = true
2984
+            copyPatientSchedule(params).then(response => {
2985
+              if (response.data.state == 1) {
2986
+                var msg = response.data.data.msg
2987
+                this.$message.success("复制成功")
2988
+                this.copySchLoading = false
2989
+                this.newVisible = false
2990
+              } else {
2991
+                this.copySchLoading = false
2992
+                this.$message.error("复制失败")
2993
+              }
2994
+            })
2995
+
2996
+          }
2997
+
2990
         }
2998
         }
2991
       })
2999
       })
2992
     },
3000
     },

+ 1 - 1
src/xt_pages/workforce/components/editTableData.vue Просмотреть файл

2754
                   } else {
2754
                   } else {
2755
                     let obj = {
2755
                     let obj = {
2756
                       week_type:this.weeks[b].week_type,
2756
                       week_type:this.weeks[b].week_type,
2757
-                      order_id:schedules[i].order.id,
2757
+                      order_id:sch[i].order.id,
2758
                     }
2758
                     }
2759
                     this.first_weeks.push(obj)
2759
                     this.first_weeks.push(obj)
2760
                     this.weeks[b].is_edit = false;
2760
                     this.weeks[b].is_edit = false;

Разница между файлами не показана из-за своего большого размера
+ 743 - 151
src/xt_pages/workforce/components/template_table.vue


+ 0 - 17
src/xt_pages/workforce/components/template_table_item.vue Просмотреть файл

1
 <template>
1
 <template>
2
     <div>
2
     <div>
3
-        <el-tooltip placement="right" :disabled="info.name.length == 0" >
4
-            <div slot="content">
5
-                {{info.name}}
6
-                <br/>
7
-                <span v-if="info.treat_mode.length > 0">({{info.treat_mode}})</span>
8
-            </div>
9
             <div>
3
             <div>
10
                 <span>{{info.name}}</span>
4
                 <span>{{info.name}}</span>
11
                 <br/>
5
                 <br/>
12
                 <span v-if="info.treat_mode.length > 0">({{info.treat_mode}})</span>
6
                 <span v-if="info.treat_mode.length > 0">({{info.treat_mode}})</span>
13
             </div>
7
             </div>
14
-            <!-- <div slot="content">
15
-                {{name}}
16
-                <br/>
17
-                <span v-if="treat_mode.length > 0">({{treat_mode}})</span>
18
-            </div>
19
-            <div>
20
-                <span>{{name}}</span>
21
-                <br/>
22
-                <span v-if="treat_mode.length > 0">({{treat_mode}})</span>
23
-            </div> -->
24
-        </el-tooltip>
25
     </div>
8
     </div>
26
 </template>
9
 </template>
27
 
10
 

+ 1 - 3
src/xt_pages/workforce/template.vue Просмотреть файл

3194
       for(let i = 0; i < val.length; i++){
3194
       for(let i = 0; i < val.length; i++){
3195
           tempDataOne.push(val[i])
3195
           tempDataOne.push(val[i])
3196
       }
3196
       }
3197
-      if(tempDataOne.length > 0){
3198
-        this.$refs.table.SetSmartSch(tempDataOne,del_data)
3199
-      }
3197
+      this.$refs.table.SetSmartSch(tempDataOne,del_data)
3200
     },
3198
     },
3201
     getWeekPanels(val) {
3199
     getWeekPanels(val) {
3202
       getWeekPanels(1,val).then(response => {
3200
       getWeekPanels(1,val).then(response => {