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

src/api/his/his.js

@@ -844,7 +844,6 @@ export function getfapiaonumber(){
 }
 
 
-
 export function getHisOrderListtwo(params){
   return request({
     url:"/api/hisorder/listtwo",
@@ -855,8 +854,6 @@ export function getHisOrderListtwo(params){
 }
 
 
-
-
 export function modifyFapiaoCodetwo(params) {
   return request({
     url: '/api/fapiao/modifytwo',
@@ -866,17 +863,38 @@ export function modifyFapiaoCodetwo(params) {
 }
 
 
+export function GetPSummaryDetail(params) {
+  return request({
+    url: '/api/his/prescription/detail',
+    method: 'get',
+    params: params
+  })
+}
 
 
+export function exportdetail(params) {
+  return request({
+    url: '/api/export/10726/detail',
+    method: 'get',
+    params: params
+  })
+}
 
-export function GetPSummaryDetail(params) {
+export function exportsummary(params) {
   return request({
-    url: '/api/his/prescription/detail',
+    url: '/api/export/10726/summary',
     method: 'get',
     params: params
   })
 }
 
+export function summary2(params) {
+  return request({
+    url: '/api/export/10697/summary',
+    method: 'get',
+    params: params
+  })
+}
 
 
 

src/xt_pages/eleFaPiao/settleDetail.vue

@@ -13,6 +13,15 @@
 
       </div>
       <div style="margin-bottom: 10px;">
+        <el-input
+          size="small"
+          style="width: 196px;"
+          placeholder="请输入姓名"
+          v-model="keywords"
+          @input="searchAction"
+          @keyup.enter.native="searchAction"
+        />
+
         <el-date-picker
           size="small"
           v-model="start_time"
@@ -42,13 +51,14 @@
           value-format="yyyy-MM-dd"
           align="right"
         ></el-date-picker>
+
         <el-button size="small" type="primary"
                    @click="query">查询
         </el-button>
-        <el-button size="small" type="primary"
+        <el-button v-if="$store.getters.xt_user.org_id != 10318" size="small" type="primary"
                    @click="login">短信登录税局
         </el-button>
-        <el-button size="small" type="primary"
+        <el-button v-if="$store.getters.xt_user.org_id != 10318"  size="small" type="primary"
                    @click="auth">认证
         </el-button>
       </div>
@@ -158,7 +168,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column align="center" prop="name" label="操作">
+        <el-table-column align="center" prop="name" label="操作" v-if="$store.getters.xt_user.org_id != 10318">
           <template slot-scope="scope">
             <el-button v-if="scope.row.result.id == 0" size="mini" type="primary"
                         @click="blue(scope.row)">
@@ -187,6 +197,28 @@
             </el-button>
           </template>
         </el-table-column>
+
+        <el-table-column align="center" prop="name" label="操作" v-else>
+          <template slot-scope="scope">
+            <el-button v-if="scope.row.result.id == 0" size="mini" type="primary"
+                       @click="BWblue(scope.row)">
+              开票
+            </el-button>
+            <el-button v-if="scope.row.result.id > 0 && scope.row.result.is_red_washed == 0 && scope.row.result.fapiao_status == '2'" size="mini" type="primary"
+                       @click="BWhongchong(scope.row)">
+              红冲
+            </el-button>
+            <el-button size="mini" type="primary" v-if="scope.row.result.id > 0 && scope.row.result.is_red_washed == 0 && scope.row.result.fapiao_status == '2'"
+                       @click="yulan(scope.row)">
+              下载
+            </el-button>
+            <el-button size="mini" type="primary" v-if="scope.row.result.id > 0 && scope.row.result.fapiao_status > 0"
+                       @click="BWchaxun(scope.row)">
+              查询并同步发票号码
+            </el-button>
+          </template>
+        </el-table-column>
+
       </el-table>
       <el-pagination
         @size-change="handleSizeChange"
@@ -259,7 +291,9 @@
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="settlementVisible = false">取 消</el-button>
-        <el-button type="primary" @click="blueRequest">开票</el-button>
+        <el-button type="primary" @click="blueRequest" v-if="this.$store.getters.xt_user.org_id != 10318 &&  this.$store.getters.xt_user.org_id != 0">开票</el-button>
+        <el-button type="primary" @click="bwblueRequest" v-if="this.$store.getters.xt_user.org_id == 10318 || this.$store.getters.xt_user.org_id == 0">开票</el-button>
+
       </span>
     </el-dialog>
 
@@ -396,6 +430,11 @@ export default {
   },
 
   methods: {
+    searchAction(){
+
+      this.getHisOrderList()
+
+    },
     chaxun(row){
       let params = {
         "id": row.result.id,
@@ -695,6 +734,36 @@ export default {
     },download(){
 
 
+    },bwblueRequest(){
+      let params = {
+        "order_ids": this.cur_ids,
+        "admin_user_id":this.$store.getters.xt_user.user.id,
+      }
+      var that = this;
+      axios.get('http://127.0.0.1:9531/api/bwfapiao/blue',{params:params}).then(function(response) {
+        if (response.data.state == 0) {
+          that.$message.error(response.data.data.msg);
+          return false
+        } else {
+          if(response.data.data.failed_code == -10){
+            that.settlementVisible = false
+
+            that.$confirm(response.data.data.msg, '错误信息', {
+              confirmButtonText: '确 定',
+              type: 'warning'
+            }).then(() => {
+
+            }).catch(() => {
+            })
+          }else{
+            that.settlementVisible = false
+            that.$message.success(response.data.data.msg)
+            that.getHisOrderList()
+          }
+
+        }
+      }).catch(function(error) {
+      })
     },blueRequest(){
       let params = {
         "order_ids": this.cur_ids,
@@ -725,6 +794,51 @@ export default {
         }
       }).catch(function(error) {
       })
+    },BWblue(row){
+      var  ids = row.id
+      this.cur_ids =ids
+      this.patient_id = row.patient_id
+      console.log(row)
+      let paramsObj = {
+        order_ids: ids,
+        patient_id: row.patient_id,
+      }
+      this.settlementVisible = true
+      this.paramsObj = paramsObj
+
+
+    },BWhongchong(row){
+      var  id = row.result.id
+
+      let params = {
+        "id":id,
+        "admin_user_id":this.$store.getters.xt_user.user.id,
+      }
+
+      var that = this;
+      axios.get('http://127.0.0.1:9531/api/bwfapiao/red',{params:params}).then(function(response) {
+        if (response.data.state == 0) {
+          that.$message.error(response.data.data.msg);
+          return false
+        } else {
+          if(response.data.data.failed_code == -10){
+            that.$confirm(response.data.data.msg, '错误信息', {
+              confirmButtonText: '确 定',
+              type: 'warning'
+            }).then(() => {
+
+            }).catch(() => {
+            })
+          }else{
+            that.$message.success(response.data.data.msg)
+            that.getHisOrderList()
+          }
+
+        }
+      }).catch(function(error) {
+      })
+
+
     },
     blue(row){
       var  ids = row.id
@@ -752,7 +866,12 @@ export default {
       // })
 
 
-    }, yulan(row){
+    }, BWchaxun(row){
+
+
+
+
+    },yulan(row){
       window.open( row.result.pdf_url, "_blank");
       // this.settlementVisibletwo = true
       // this.pdfSrc = row.result.pdf_url

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -1195,7 +1195,7 @@ export default {
         { value: 14, label: '门诊特殊病' },
         { value: '992102', label: '单病种(992102)' },
         { value: '140104', label: '城乡门诊特殊病(140104)' },
-        { value: '1104', label: '省外异地门诊慢特病'},
+        { value: '1104', label: '异地门特'},
         { value: '9922', label: '家庭通道' },
         { value: '1111', label: '精一' },
         { value: '1112', label: '精二' },
@@ -5873,6 +5873,9 @@ export default {
       }else{
         if(this.org_id != 10721  && this.org_id != 0 && this.org_id != 10726) {
           switch (med_type) {
+            case 1104:
+              return '异地门特(1104)' + '处方' + index
+              break
             case 11:
               return '普通门诊' + '处方' + index
 
@@ -5932,6 +5935,9 @@ export default {
             case 992102:
               return '单病种(992102)' + '处方' + index
               break
+            case 1104:
+              return '异地门特(1104)' + '处方' + index
+              break
 
             case 140104:
               return '门诊特殊病(140104)' + '处方' + index