陈少旭 9 months ago
parent
commit
17b90678ad

+ 1 - 1
src/xt_pages/outpatientCharges/statementPrint.vue View File

72
             org_id != 9504 &&
72
             org_id != 9504 &&
73
             org_id != 10028 &&
73
             org_id != 10028 &&
74
             org_id != 0 &&   org_id != 10610 && org_id !=10537 &&
74
             org_id != 0 &&   org_id != 10610 && org_id !=10537 &&
75
-            org_id != 10278 && org_id != 10387 && org_id != 10191 &&org_id != 10210 &&org_id != 10485 &&org_id != 10480 &&org_id != 10510 &&org_id != 10088 &&org_id != 10633 &&org_id != 0   && this.paramsObj.balance_accounts_type == 1">
75
+            org_id != 10278 && org_id != 10387 && org_id != 10191 &&org_id != 10210 &&org_id != 10485 &&org_id != 10480 &&org_id != 10510 &&org_id != 10088 &&org_id != 10633 &&org_id != 0  && this.paramsObj.balance_accounts_type == 1">
76
       </printOne>
76
       </printOne>
77
       <privateChargePrint :info="info" v-if="org_id != 9990 &&
77
       <privateChargePrint :info="info" v-if="org_id != 9990 &&
78
             org_id != 10138 &&
78
             org_id != 10138 &&

+ 9 - 8
src/xt_pages/outpatientCharges/summary.vue View File

145
           <!--          </el-button-->
145
           <!--          </el-button-->
146
           <!--          >-->
146
           <!--          >-->
147
 
147
 
148
-          <el-button size="small" type="primary" @click="export_detail_three">报表下载12</el-button>
148
+          <el-button size="small" type="primary" @click="export_detail_three" v-if="$store.getters.xt_user.org_id == 10265">报表下载12</el-button>
149
           <el-button size="small" type="primary" @click="accounts_click()">门诊结账</el-button>
149
           <el-button size="small" type="primary" @click="accounts_click()">门诊结账</el-button>
150
           <!-- <el-button size="small" type="primary" @click="export_detail_four">报表下载3</el-button>-->
150
           <!-- <el-button size="small" type="primary" @click="export_detail_four">报表下载3</el-button>-->
151
           <!-- <el-button size="small" type="primary" @click="export_detail_five">报表下载3</el-button>-->
151
           <!-- <el-button size="small" type="primary" @click="export_detail_five">报表下载3</el-button>-->
152
-<!--                     <el-button size="small" type="primary" @click="export_detail_six">诊疗下载</el-button>-->
152
+                     <el-button size="small" type="primary" @click="export_detail_six">诊疗下载</el-button>
153
           <!-- <el-button size="small" type="primary" @click="export_detail_tenone">报表下载10</el-button>-->
153
           <!-- <el-button size="small" type="primary" @click="export_detail_tenone">报表下载10</el-button>-->
154
           <!--  <el-button size="small" type="primary" @click="export_detail_seven">报表下载4</el-button>-->
154
           <!--  <el-button size="small" type="primary" @click="export_detail_seven">报表下载4</el-button>-->
155
 
155
 
1655
     },
1655
     },
1656
 
1656
 
1657
     export_detail_three() {
1657
     export_detail_three() {
1658
-      let params = {}
1658
+      let params = {
1659
+        start_time: this.start_time,
1660
+        end_time: this.end_time,
1661
+        org_id: this.$store.getters.xt_user.org_id,
1662
+      }
1659
       getHisDataThree(params).then((response) => {
1663
       getHisDataThree(params).then((response) => {
1660
         if (response.data.state == 0) {
1664
         if (response.data.state == 0) {
1661
           this.$message.error(response.data.msg)
1665
           this.$message.error(response.data.msg)
1671
               let obj = {
1675
               let obj = {
1672
                 name: order.patient.name,
1676
                 name: order.patient.name,
1673
                 id_card_no: order.patient.id_card_no,
1677
                 id_card_no: order.patient.id_card_no,
1674
-                year: '2024',
1678
+                year:  order.setl_time.split(' ')[0].split('-')[0],
1675
                 month: order.setl_time.split(' ')[0].split('-')[1],
1679
                 month: order.setl_time.split(' ')[0].split('-')[1],
1676
                 ddd: this.getTimes(order.settle_accounts_date),
1680
                 ddd: this.getTimes(order.settle_accounts_date),
1677
                 code: data[b].code,
1681
                 code: data[b].code,
1709
                 '单位': list[i].unit,
1713
                 '单位': list[i].unit,
1710
                 '数量': list[i].count,
1714
                 '数量': list[i].count,
1711
                 '金额': list[i].pric,
1715
                 '金额': list[i].pric,
1712
-                'dan': list[i].pric_two
1713
               }
1716
               }
1714
               tarList.push(obj)
1717
               tarList.push(obj)
1715
             }
1718
             }
1729
               '单位',
1732
               '单位',
1730
               '数量',
1733
               '数量',
1731
               '金额',
1734
               '金额',
1732
-              'dan'
1733
 
1735
 
1734
             ]
1736
             ]
1735
             const filterVal = [
1737
             const filterVal = [
1745
               '单位',
1747
               '单位',
1746
               '数量',
1748
               '数量',
1747
               '金额',
1749
               '金额',
1748
-              'dan'
1749
 
1750
 
1750
             ]
1751
             ]
1751
             const data = this.formatJson(filterVal, tarList)
1752
             const data = this.formatJson(filterVal, tarList)
2065
           var tarList = []
2066
           var tarList = []
2066
           for (let i = 0; i < list.length; i++) {
2067
           for (let i = 0; i < list.length; i++) {
2067
             let obj = {
2068
             let obj = {
2068
-              '周期': '2024年第季度',
2069
+              '周期': '2024年第季度',
2069
               '类别': '门诊',
2070
               '类别': '门诊',
2070
               '医保目录编码': list[i].code,
2071
               '医保目录编码': list[i].code,
2071
               '医保目录名称': list[i].name,
2072
               '医保目录名称': list[i].name,

+ 42 - 1
src/xt_pages/outpatientTool/components/gather.vue View File

119
       item_time_type:'0',
119
       item_time_type:'0',
120
       items: [
120
       items: [
121
         { id: 1, name: '药品' },
121
         { id: 1, name: '药品' },
122
-        { id: 2, name: '项目' },
122
+        { id: 2, name: '所有项目' },
123
+        { id: 4, name: '检验费' },
124
+        { id: 5, name: '治疗费' },
125
+        { id: 6, name: '护理费' },
126
+        { id: 7, name: '其他' },
127
+
123
         { id: 3, name: '耗材' },
128
         { id: 3, name: '耗材' },
124
 
129
 
125
       ]
130
       ]
326
                 obj3['patient_id'] = tempPatientsTwo[d].patient_id
331
                 obj3['patient_id'] = tempPatientsTwo[d].patient_id
327
                 this.tableData.push(obj3)
332
                 this.tableData.push(obj3)
328
                 break
333
                 break
334
+              case 4:
335
+
336
+                obj['sum'] = price
337
+                obj['price'] = price
338
+                obj['item_name'] = '检验'
339
+                obj['name'] = tempPatientsTwo[d].name
340
+                obj['patient_id'] = tempPatientsTwo[d].patient_id
341
+                this.tableData.push(obj)
342
+                break
343
+              case 5:
344
+
345
+                obj['sum'] = price
346
+                obj['price'] = price
347
+                obj['item_name'] = '治疗'
348
+                obj['name'] = tempPatientsTwo[d].name
349
+                obj['patient_id'] = tempPatientsTwo[d].patient_id
350
+                this.tableData.push(obj)
351
+                break
352
+              case 6:
353
+
354
+                obj['sum'] = price
355
+                obj['price'] = price
356
+                obj['item_name'] = '护理'
357
+                obj['name'] = tempPatientsTwo[d].name
358
+                obj['patient_id'] = tempPatientsTwo[d].patient_id
359
+                this.tableData.push(obj)
360
+                break
361
+              case 7:
362
+
363
+                obj['sum'] = price
364
+                obj['price'] = price
365
+                obj['item_name'] = '其他'
366
+                obj['name'] = tempPatientsTwo[d].name
367
+                obj['patient_id'] = tempPatientsTwo[d].patient_id
368
+                this.tableData.push(obj)
369
+                break
329
 
370
 
330
             }
371
             }
331
 
372
 

+ 3 - 2
src/xt_pages/outpatientTool/drugChange.vue View File

252
       value:0,
252
       value:0,
253
       is_sale:"0",
253
       is_sale:"0",
254
       items: [
254
       items: [
255
-        { id: 1, name: '已盘存' },
256
-        { id: 2, name: '未盘存' },
255
+        { id: 1, name: '已销售' },
256
+        { id: 2, name: '已销售退货' },
257
+
257
       ],
258
       ],
258
       changes: [
259
       changes: [
259
         { id: 1, name: '已变更' },
260
         { id: 1, name: '已变更' },

+ 17 - 7
src/xt_pages/outpatientTool/drugStock.vue View File

66
         </el-select>
66
         </el-select>
67
       </div>
67
       </div>
68
       <div>
68
       <div>
69
-        <el-button type="primary" @click="query()">查询</el-button>
70
-        <el-button type="primary" @click="stock()">盘存</el-button>
69
+        <el-button type="primary" @click="query()" >查询</el-button>
70
+        <el-button type="primary" v-loading="isloading" @click="stock()">盘存</el-button>
71
         <el-button type="primary" @click="exportdata()">导出</el-button>
71
         <el-button type="primary" @click="exportdata()">导出</el-button>
72
 
72
 
73
         <!--        <el-button type="primary" @click="change()">变更</el-button>-->
73
         <!--        <el-button type="primary" @click="change()">变更</el-button>-->
106
         </template>
106
         </template>
107
       </el-table-column>
107
       </el-table-column>
108
 
108
 
109
-      <el-table-column align="center" prop="total" label="开方日期">
109
+      <el-table-column align="center" prop="total" label="生产日期">
110
         <template slot-scope="scope">
110
         <template slot-scope="scope">
111
           <div>{{scope.row.p_date}}</div>
111
           <div>{{scope.row.p_date}}</div>
112
         </template>
112
         </template>
113
       </el-table-column>
113
       </el-table-column>
114
 
114
 
115
 
115
 
116
-      <el-table-column align="center" prop="total" label="结算日期">
116
+      <el-table-column align="center" prop="total" label="有效日期">
117
         <template slot-scope="scope">
117
         <template slot-scope="scope">
118
           <div>{{scope.row.e_date}}</div>
118
           <div>{{scope.row.e_date}}</div>
119
         </template>
119
         </template>
141
       <el-table-column label="操作" width="200">
141
       <el-table-column label="操作" width="200">
142
         <template slot-scope="scope">
142
         <template slot-scope="scope">
143
           <el-button v-if="!scope.row.is_pc || scope.row.is_pc == 0" type="primary" @click="sigle_stock(scope.row)">盘存</el-button>
143
           <el-button v-if="!scope.row.is_pc || scope.row.is_pc == 0" type="primary" @click="sigle_stock(scope.row)">盘存</el-button>
144
-          <el-button type="primary" @click="deleteStock(scope.row)">删除</el-button>
144
+          <el-button  type="primary" @click="deleteStock(scope.row)">删除</el-button>
145
         </template>
145
         </template>
146
       </el-table-column>
146
       </el-table-column>
147
     </el-table>
147
     </el-table>
241
       stock_type:"0",
241
       stock_type:"0",
242
       change_type:"0",
242
       change_type:"0",
243
       selection:[],
243
       selection:[],
244
+      isloading:false,
244
       items: [
245
       items: [
246
+
245
         { id: 1, name: '已盘存' },
247
         { id: 1, name: '已盘存' },
246
         { id: 2, name: '未盘存' },
248
         { id: 2, name: '未盘存' },
247
       ],
249
       ],
269
               confirmButtonText: '确 定',
271
               confirmButtonText: '确 定',
270
               type: 'warning'
272
               type: 'warning'
271
             }).then(() => {
273
             }).then(() => {
274
+
272
             }).catch(() => {
275
             }).catch(() => {
273
             })
276
             })
274
           }else{
277
           }else{
278
+            that.GetDrugStock()
275
 
279
 
276
           }
280
           }
277
         }
281
         }
327
       return jsonData.map(v => filterVal.map(j => v[j]))
331
       return jsonData.map(v => filterVal.map(j => v[j]))
328
     },
332
     },
329
     stock(){
333
     stock(){
330
-      console.log(this.selection)
331
       let ids  = ""
334
       let ids  = ""
332
       for (var i = 0; i < this.selection.length; i++){
335
       for (var i = 0; i < this.selection.length; i++){
333
         if (ids.length == 0){
336
         if (ids.length == 0){
341
         ids:ids,
344
         ids:ids,
342
         admin_user_id:this.$store.getters.xt_user.user.id
345
         admin_user_id:this.$store.getters.xt_user.user.id
343
       };
346
       };
347
+      this.isloading = true
344
       axios.get('http://127.0.0.1:9532/api/pc_bg',{params:params}).then(function(response) {
348
       axios.get('http://127.0.0.1:9532/api/pc_bg',{params:params}).then(function(response) {
345
         if (response.data.state == 0) {
349
         if (response.data.state == 0) {
350
+          this.isloading = false
351
+
346
           that.$message.error(response.data.data.msg);
352
           that.$message.error(response.data.data.msg);
347
           return false
353
           return false
348
         } else {
354
         } else {
355
+          this.isloading = false
349
           if(response.data.data.failed_code == -10){
356
           if(response.data.data.failed_code == -10){
350
             that.$confirm(response.data.data.msg, '医保错误信息', {
357
             that.$confirm(response.data.data.msg, '医保错误信息', {
351
               confirmButtonText: '确 定',
358
               confirmButtonText: '确 定',
352
               type: 'warning'
359
               type: 'warning'
353
             }).then(() => {
360
             }).then(() => {
361
+
354
             }).catch(() => {
362
             }).catch(() => {
355
             })
363
             })
356
           }else{
364
           }else{
365
+            that.GetDrugStock()
366
+
357
 
367
 
358
           }
368
           }
359
         }
369
         }
420
               p_date:this.getTime(response.data.data.info[i].product_date),
430
               p_date:this.getTime(response.data.data.info[i].product_date),
421
               e_date:this.getTime(response.data.data.info[i].expiry_date),
431
               e_date:this.getTime(response.data.data.info[i].expiry_date),
422
               is_pc:response.data.data.info[i].is_pc,
432
               is_pc:response.data.data.info[i].is_pc,
423
-              pc_date:response.data.data.info[i].pc_date,
433
+              pc_date:this.getTime(response.data.data.info[i].pc_date),
424
               is_bg:response.data.data.info[i].is_bg,
434
               is_bg:response.data.data.info[i].is_bg,
425
               unit: response.data.data.info[i].max_unit,
435
               unit: response.data.data.info[i].max_unit,
426
             }
436
             }