11

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -72,7 +72,7 @@
             org_id != 9504 &&
             org_id != 10028 &&
             org_id != 0 &&   org_id != 10610 && org_id !=10537 &&
-            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">
+            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">
       </printOne>
       <privateChargePrint :info="info" v-if="org_id != 9990 &&
             org_id != 10138 &&

src/xt_pages/outpatientCharges/summary.vue

@@ -145,11 +145,11 @@
           <!--          </el-button-->
           <!--          >-->
 
-          <el-button size="small" type="primary" @click="export_detail_three">报表下载12</el-button>
+          <el-button size="small" type="primary" @click="export_detail_three" v-if="$store.getters.xt_user.org_id == 10265">报表下载12</el-button>
           <el-button size="small" type="primary" @click="accounts_click()">门诊结账</el-button>
           <!-- <el-button size="small" type="primary" @click="export_detail_four">报表下载3</el-button>-->
           <!-- <el-button size="small" type="primary" @click="export_detail_five">报表下载3</el-button>-->
-<!--                     <el-button size="small" type="primary" @click="export_detail_six">诊疗下载</el-button>-->
+                     <el-button size="small" type="primary" @click="export_detail_six">诊疗下载</el-button>
           <!-- <el-button size="small" type="primary" @click="export_detail_tenone">报表下载10</el-button>-->
           <!--  <el-button size="small" type="primary" @click="export_detail_seven">报表下载4</el-button>-->
 
@@ -1655,7 +1655,11 @@ export default {
     },
 
     export_detail_three() {
-      let params = {}
+      let params = {
+        start_time: this.start_time,
+        end_time: this.end_time,
+        org_id: this.$store.getters.xt_user.org_id,
+      }
       getHisDataThree(params).then((response) => {
         if (response.data.state == 0) {
           this.$message.error(response.data.msg)
@@ -1671,7 +1675,7 @@ export default {
               let obj = {
                 name: order.patient.name,
                 id_card_no: order.patient.id_card_no,
-                year: '2024',
+                year:  order.setl_time.split(' ')[0].split('-')[0],
                 month: order.setl_time.split(' ')[0].split('-')[1],
                 ddd: this.getTimes(order.settle_accounts_date),
                 code: data[b].code,
@@ -1709,7 +1713,6 @@ export default {
                 '单位': list[i].unit,
                 '数量': list[i].count,
                 '金额': list[i].pric,
-                'dan': list[i].pric_two
               }
               tarList.push(obj)
             }
@@ -1729,7 +1732,6 @@ export default {
               '单位',
               '数量',
               '金额',
-              'dan'
 
             ]
             const filterVal = [
@@ -1745,7 +1747,6 @@ export default {
               '单位',
               '数量',
               '金额',
-              'dan'
 
             ]
             const data = this.formatJson(filterVal, tarList)
@@ -2065,7 +2066,7 @@ export default {
           var tarList = []
           for (let i = 0; i < list.length; i++) {
             let obj = {
-              '周期': '2024年第一季度',
+              '周期': '2024年第二季度',
               '类别': '门诊',
               '医保目录编码': list[i].code,
               '医保目录名称': list[i].name,

src/xt_pages/outpatientTool/components/gather.vue

@@ -119,7 +119,12 @@ export default {
       item_time_type:'0',
       items: [
         { id: 1, name: '药品' },
-        { id: 2, name: '项目' },
+        { id: 2, name: '所有项目' },
+        { id: 4, name: '检验费' },
+        { id: 5, name: '治疗费' },
+        { id: 6, name: '护理费' },
+        { id: 7, name: '其他' },
+
         { id: 3, name: '耗材' },
 
       ]
@@ -326,6 +331,42 @@ export default {
                 obj3['patient_id'] = tempPatientsTwo[d].patient_id
                 this.tableData.push(obj3)
                 break
+              case 4:
+
+                obj['sum'] = price
+                obj['price'] = price
+                obj['item_name'] = '检验'
+                obj['name'] = tempPatientsTwo[d].name
+                obj['patient_id'] = tempPatientsTwo[d].patient_id
+                this.tableData.push(obj)
+                break
+              case 5:
+
+                obj['sum'] = price
+                obj['price'] = price
+                obj['item_name'] = '治疗'
+                obj['name'] = tempPatientsTwo[d].name
+                obj['patient_id'] = tempPatientsTwo[d].patient_id
+                this.tableData.push(obj)
+                break
+              case 6:
+
+                obj['sum'] = price
+                obj['price'] = price
+                obj['item_name'] = '护理'
+                obj['name'] = tempPatientsTwo[d].name
+                obj['patient_id'] = tempPatientsTwo[d].patient_id
+                this.tableData.push(obj)
+                break
+              case 7:
+
+                obj['sum'] = price
+                obj['price'] = price
+                obj['item_name'] = '其他'
+                obj['name'] = tempPatientsTwo[d].name
+                obj['patient_id'] = tempPatientsTwo[d].patient_id
+                this.tableData.push(obj)
+                break
 
             }
 

src/xt_pages/outpatientTool/drugChange.vue

@@ -252,8 +252,9 @@ export default {
       value:0,
       is_sale:"0",
       items: [
-        { id: 1, name: '已盘存' },
-        { id: 2, name: '未盘存' },
+        { id: 1, name: '已销售' },
+        { id: 2, name: '已销售退货' },
+
       ],
       changes: [
         { id: 1, name: '已变更' },

src/xt_pages/outpatientTool/drugStock.vue

@@ -66,8 +66,8 @@
         </el-select>
       </div>
       <div>
-        <el-button type="primary" @click="query()">查询</el-button>
-        <el-button type="primary" @click="stock()">盘存</el-button>
+        <el-button type="primary" @click="query()" >查询</el-button>
+        <el-button type="primary" v-loading="isloading" @click="stock()">盘存</el-button>
         <el-button type="primary" @click="exportdata()">导出</el-button>
 
         <!--        <el-button type="primary" @click="change()">变更</el-button>-->
@@ -106,14 +106,14 @@
         </template>
       </el-table-column>
 
-      <el-table-column align="center" prop="total" label="开方日期">
+      <el-table-column align="center" prop="total" label="生产日期">
         <template slot-scope="scope">
           <div>{{scope.row.p_date}}</div>
         </template>
       </el-table-column>
 
 
-      <el-table-column align="center" prop="total" label="结算日期">
+      <el-table-column align="center" prop="total" label="有效日期">
         <template slot-scope="scope">
           <div>{{scope.row.e_date}}</div>
         </template>
@@ -141,7 +141,7 @@
       <el-table-column label="操作" width="200">
         <template slot-scope="scope">
           <el-button v-if="!scope.row.is_pc || scope.row.is_pc == 0" type="primary" @click="sigle_stock(scope.row)">盘存</el-button>
-          <el-button type="primary" @click="deleteStock(scope.row)">删除</el-button>
+          <el-button  type="primary" @click="deleteStock(scope.row)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -241,7 +241,9 @@ export default {
       stock_type:"0",
       change_type:"0",
       selection:[],
+      isloading:false,
       items: [
+
         { id: 1, name: '已盘存' },
         { id: 2, name: '未盘存' },
       ],
@@ -269,9 +271,11 @@ export default {
               confirmButtonText: '确 定',
               type: 'warning'
             }).then(() => {
+
             }).catch(() => {
             })
           }else{
+            that.GetDrugStock()
 
           }
         }
@@ -327,7 +331,6 @@ export default {
       return jsonData.map(v => filterVal.map(j => v[j]))
     },
     stock(){
-      console.log(this.selection)
       let ids  = ""
       for (var i = 0; i < this.selection.length; i++){
         if (ids.length == 0){
@@ -341,19 +344,26 @@ export default {
         ids:ids,
         admin_user_id:this.$store.getters.xt_user.user.id
       };
+      this.isloading = true
       axios.get('http://127.0.0.1:9532/api/pc_bg',{params:params}).then(function(response) {
         if (response.data.state == 0) {
+          this.isloading = false
+
           that.$message.error(response.data.data.msg);
           return false
         } else {
+          this.isloading = false
           if(response.data.data.failed_code == -10){
             that.$confirm(response.data.data.msg, '医保错误信息', {
               confirmButtonText: '确 定',
               type: 'warning'
             }).then(() => {
+
             }).catch(() => {
             })
           }else{
+            that.GetDrugStock()
+
 
           }
         }
@@ -420,7 +430,7 @@ export default {
               p_date:this.getTime(response.data.data.info[i].product_date),
               e_date:this.getTime(response.data.data.info[i].expiry_date),
               is_pc:response.data.data.info[i].is_pc,
-              pc_date:response.data.data.info[i].pc_date,
+              pc_date:this.getTime(response.data.data.info[i].pc_date),
               is_bg:response.data.data.info[i].is_bg,
               unit: response.data.data.info[i].max_unit,
             }