2 Ревизии 1fb6160047 ... b228a4be48

Автор SHA1 Съобщение Дата
  陈少旭 b228a4be48 Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch преди 2 седмици
  陈少旭 8748b01a24 1111 преди 2 седмици
променени са 3 файла, в които са добавени 115 реда и са изтрити 4 реда
  1. 1 1
      src/api/fapiao.js
  2. 112 1
      src/xt_pages/eleFaPiao/fapiao.vue
  3. 2 2
      src/xt_pages/hospitalStation/batchStatementTemplate/hospitalBatchPrint.vue

+ 1 - 1
src/api/fapiao.js Целия файл

@@ -11,7 +11,7 @@ export function getOrderFapiaoList(params){
11 11
 
12 12
 export function getFapiaoList(params){
13 13
   return request({
14
-    url:"/api/gdfapiao/list",
14
+    url:"/api/fapiao/list",
15 15
     methods:"get",
16 16
     params:params
17 17
   })

+ 112 - 1
src/xt_pages/eleFaPiao/fapiao.vue Целия файл

@@ -101,6 +101,18 @@
101 101
         </el-table-column>
102 102
 
103 103
 
104
+        <el-table-column
105
+          align="center"
106
+          width="100"
107
+          prop="name"
108
+          label="结算时间"
109
+        >
110
+          <template slot-scope="scope">
111
+            {{scope.row.orders[0].setl_time}}
112
+          </template>
113
+        </el-table-column>
114
+
115
+
104 116
         <el-table-column align="center" width="90" prop="name" label="开票员">
105 117
           <template slot-scope="scope">
106 118
             {{scope.row.creator}}
@@ -125,7 +137,7 @@
125 137
           </template>
126 138
         </el-table-column>
127 139
 
128
-        <el-table-column align="center" prop="name" label="操作">
140
+        <el-table-column align="center" prop="name" label="操作" v-if="this.$store.getters.xt_user.org_id != 10318 &&  this.$store.getters.xt_user.org_id != 0">
129 141
           <template slot-scope="scope">
130 142
 
131 143
             <el-button v-if="scope.row.id > 0 && scope.row.is_red_washed == 0" size="mini" type="primary"
@@ -141,6 +153,34 @@
141 153
 <!--            </el-button>-->
142 154
           </template>
143 155
         </el-table-column>
156
+
157
+
158
+        <el-table-column align="center" prop="name" label="操作" v-if="this.$store.getters.xt_user.org_id == 10318 ||  this.$store.getters.xt_user.org_id == 0">
159
+          <template slot-scope="scope">
160
+
161
+            <el-button v-if="scope.row.id > 0 && scope.row.is_red_washed == 0 && scope.row.fapiao_status == '2'" size="mini" type="primary"
162
+                       @click="BWhongchong(scope.row)" v-loading="red_loading" >
163
+              红冲
164
+            </el-button>
165
+            <el-button size="mini" type="primary" v-if="scope.row.id > 0 && scope.row.is_red_washed == 0 && scope.row.fapiao_status == '2'"
166
+                       @click="bwyulan(scope.row)">
167
+              下载
168
+            </el-button>
169
+
170
+<!--            <el-button v-if="scope.row.id > 0 && scope.row.is_red_washed == 0" size="mini" type="primary"-->
171
+<!--                       @click="hongchong(scope.row)">-->
172
+<!--              红冲-->
173
+<!--            </el-button>-->
174
+<!--            <el-button size="mini" type="primary" v-if="scope.row.id > 0 && scope.row.is_red_washed == 0"-->
175
+<!--                       @click="yulan(scope.row)">-->
176
+<!--              下载-->
177
+<!--            </el-button>-->
178
+            <!--            <el-button size="mini" type="primary" @click="download(scope.row)"  v-if="scope.row.id > 0 && scope.row.is_red_washed == 0">-->
179
+            <!--              下载-->
180
+            <!--            </el-button>-->
181
+          </template>
182
+        </el-table-column>
183
+
144 184
       </el-table>
145 185
       <el-pagination
146 186
         @size-change="handleSizeChange"
@@ -189,6 +229,8 @@ export default {
189 229
   },
190 230
   data() {
191 231
     return {
232
+      red_loading:false,
233
+      search_input: '',
192 234
       staff:"",
193 235
       admins:[],
194 236
       orderObj: {},
@@ -255,6 +297,75 @@ export default {
255 297
   },
256 298
 
257 299
   methods: {
300
+    bwyulan(row){
301
+      var  id = row.id
302
+      let params = {
303
+        "id":id,
304
+        "admin_user_id":this.$store.getters.xt_user.user.id,
305
+      }
306
+      var that = this;
307
+      axios.get('http://127.0.0.1:9532/api/download',{params:params}).then(function(response) {
308
+        if (response.data.state == 0) {
309
+          that.$message.error(response.data.data.msg);
310
+          return false
311
+        } else {
312
+          if(response.data.data.failed_code == -10){
313
+            that.$confirm(response.data.data.msg, '错误信息', {
314
+              confirmButtonText: '确 定',
315
+              type: 'warning'
316
+            }).then(() => {
317
+
318
+            }).catch(() => {
319
+            })
320
+          }else{
321
+            that.$message.success(response.data.data.msg)
322
+          }
323
+        }
324
+      }).catch(function(error) {
325
+
326
+      })
327
+    },
328
+    BWhongchong(row){
329
+      var  id = row.id
330
+      this.red_loading = true
331
+      let params = {
332
+        "id":id,
333
+        "admin_user_id":this.$store.getters.xt_user.user.id,
334
+      }
335
+
336
+      var that = this;
337
+      axios.get('http://127.0.0.1:9532/api/bwfapiao/red',{params:params}).then(function(response) {
338
+        if (response.data.state == 0) {
339
+          that.red_loading = false
340
+
341
+          that.$message.error(response.data.data.msg);
342
+          return false
343
+        } else {
344
+          that.red_loading = false
345
+          if(response.data.data.failed_code == -10){
346
+            that.$confirm(response.data.data.msg, '错误信息', {
347
+              confirmButtonText: '确 定',
348
+              type: 'warning'
349
+            }).then(() => {
350
+
351
+            }).catch(() => {
352
+            })
353
+          }else{
354
+            that.$message.success(response.data.data.msg)
355
+            that.getHisOrderList()
356
+          }
357
+
358
+        }
359
+      }).catch(function(error) {
360
+      })
361
+
362
+
363
+    },
364
+    searchAction(){
365
+      this.getHisOrderList()
366
+
367
+
368
+    },
258 369
     getData(patient_id){
259 370
       this.patient_id = patient_id
260 371
       this.getHisOrderList()

+ 2 - 2
src/xt_pages/hospitalStation/batchStatementTemplate/hospitalBatchPrint.vue Целия файл

@@ -108,9 +108,9 @@
108 108
         <td colspan="2" v-if="info.order.insutype == '392'">城乡居民大病医疗保险</td>
109 109
         <td colspan="2" v-if="info.order.insutype == '510'">生育保险</td>
110 110
         <td>入院第一诊断</td>
111
-        <td colspan="3">{{info.diagnosis}}</td>
111
+        <td colspan="3">{{"慢性肾功能不全(血透治疗)"}}</td>
112 112
         <td>出院第一诊断</td>
113
-        <td colspan="4">{{info.diagnosis}}</td>
113
+        <td colspan="4">{{"慢性肾功能不全(血透治疗)"}}</td>
114 114
 
115 115
 
116 116
       </tr>