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

src/api/fapiao.js

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

src/xt_pages/dialysis/template/DialysisPrintOrdereightyone.vue

@@ -1694,27 +1694,27 @@ export default {
         for (let i in this.monitors) {
           if (this.monitors[i].operate_time != null) {
             if (this.monitors[i].blood_flow_volume == 0 ||
-              this.prescription.blood_flow_volume < 180 ||
-              this.prescription.blood_flow_volume > 300
+              this.monitors[i].blood_flow_volume < 180 ||
+              this.monitors[i].blood_flow_volume > 300
             ) {
               const obj55 = '监测第' + ((i * 1) + 1) + '行血流量'
-              monearr.push(obj55)
+              checkDate.push(obj55)
             } if (this.monitors[i].venous_pressure == 0 ||
               this.monitors[i].venous_pressure < 20 ||
               this.monitors[i].venous_pressure > 150
             ) {
               const obj56 = '监测第' + ((i * 1) + 1) + '行静脉压'
-              monearr.push(obj56)
+              checkDate.push(obj56)
             } if (this.monitors[i].ultrafiltration_rate == 0) {
               const obj57 = '监测第' + ((i * 1) + 1) + '行超滤率'
-              monearr.push(obj57)
+              checkDate.push(obj57)
             } if (this.monitors[i].ultrafiltration_volume == 0 && i != 0) {
               const obj53 = '监测第' + ((i * 1) + 1) + '行超滤量'
-              monearr.push(obj53)
+              checkDate.push(obj53)
             } if (this.monitors[i].replacement_rate == 0 && this.prescription.mode == 'HDF'
             ) {
               const obj58 = '监测第' + ((i * 1) + 1) + '行置换率'
-              monearr.push(obj58)
+              checkDate.push(obj58)
             }
             // if(this.monitors[i].displacement_quantity == 0 && this.prescription.mode =='HDF'&& i !=0){
             //   const obj54 = '监测第'+((i*1)+1)+'行置换量'
@@ -1725,19 +1725,19 @@ export default {
             ) {
               // this.monitors[i].temperature == 0
               const obj59 = '监测第' + ((i * 1) + 1) + '行钠浓度'
-              monearr.push(obj59)
+              checkDate.push(obj59)
             } if (this.monitors[i].pulse_frequency == 0 ||
               this.monitors[i].pulse_frequency < 60 ||
               this.monitors[i].pulse_frequency > 100
             ) {
               const obj60 = '监测第' + ((i * 1) + 1) + '行脉搏'
-              monearr.push(obj60)
+              checkDate.push(obj60)
             } if (this.monitors[i].breathing_rate == 0 ||
               this.monitors[i].breathing_rate < 12 ||
               this.monitors[i].breathing_rate > 20
             ) {
               const obj61 = '监测第' + ((i * 1) + 1) + '行呼吸'
-              monearr.push(obj61)
+              checkDate.push(obj61)
             } if (this.monitors[i].systolic_blood_pressure == 0 ||
               this.monitors[i].systolic_blood_pressure < 90 ||
               this.monitors[i].systolic_blood_pressure > 180 ||
@@ -1746,27 +1746,28 @@ export default {
               this.monitors[i].diastolic_blood_pressure > 120
             ) {
               const obj62 = '监测第' + ((i * 1) + 1) + '行血压'
-              monearr.push(obj62)
-            } if (this.monitors[i].temperature == 0||
-                  this.monitors[i].temperature < 36 ||
-                  this.monitors[i].temperature > 37
+              checkDate.push(obj62)
+            } if (this.monitors[i].temperature == 0 ||
+              this.monitors[i].temperature < 36 ||
+              this.monitors[i].temperature > 37
             ) {
               const obj51 = '监测第' + ((i * 1) + 1) + '行温度'
-              monearr.push(obj51)
+              checkDate.push(obj51)
             } if (this.monitors[i].transmembrane_pressure == 0 ||
               this.monitors[i].transmembrane_pressure < 20 ||
               this.monitors[i].transmembrane_pressure > 300
             ) {
               const obj52 = '监测第' + ((i * 1) + 1) + '行跨膜压'
-              monearr.push(obj52)
+              checkDate.push(obj52)
             }
           }
         }
       }
       if (monearr.length > 0) {
         checkDate = checkDate.concat(monearr)
-        console.log('1111', checkDate.concat(monearr));
+        
       }
+      console.log('1111', checkDate);
       this.getcheckData(checkDate)
     },
     getDisplaceLiquiPart: function (val) {

src/xt_pages/eleFaPiao/fapiao.vue

@@ -101,6 +101,18 @@
         </el-table-column>
 
 
+        <el-table-column
+          align="center"
+          width="100"
+          prop="name"
+          label="结算时间"
+        >
+          <template slot-scope="scope">
+            {{scope.row.orders[0].setl_time}}
+          </template>
+        </el-table-column>
+
+
         <el-table-column align="center" width="90" prop="name" label="开票员">
           <template slot-scope="scope">
             {{scope.row.creator}}
@@ -125,7 +137,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column align="center" prop="name" label="操作">
+        <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">
           <template slot-scope="scope">
 
             <el-button v-if="scope.row.id > 0 && scope.row.is_red_washed == 0" size="mini" type="primary"
@@ -141,6 +153,34 @@
 <!--            </el-button>-->
           </template>
         </el-table-column>
+
+
+        <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">
+          <template slot-scope="scope">
+
+            <el-button v-if="scope.row.id > 0 && scope.row.is_red_washed == 0 && scope.row.fapiao_status == '2'" size="mini" type="primary"
+                       @click="BWhongchong(scope.row)" v-loading="red_loading" >
+              红冲
+            </el-button>
+            <el-button size="mini" type="primary" v-if="scope.row.id > 0 && scope.row.is_red_washed == 0 && scope.row.fapiao_status == '2'"
+                       @click="bwyulan(scope.row)">
+              下载
+            </el-button>
+
+<!--            <el-button v-if="scope.row.id > 0 && scope.row.is_red_washed == 0" size="mini" type="primary"-->
+<!--                       @click="hongchong(scope.row)">-->
+<!--              红冲-->
+<!--            </el-button>-->
+<!--            <el-button size="mini" type="primary" v-if="scope.row.id > 0 && scope.row.is_red_washed == 0"-->
+<!--                       @click="yulan(scope.row)">-->
+<!--              下载-->
+<!--            </el-button>-->
+            <!--            <el-button size="mini" type="primary" @click="download(scope.row)"  v-if="scope.row.id > 0 && scope.row.is_red_washed == 0">-->
+            <!--              下载-->
+            <!--            </el-button>-->
+          </template>
+        </el-table-column>
+
       </el-table>
       <el-pagination
         @size-change="handleSizeChange"
@@ -189,6 +229,8 @@ export default {
   },
   data() {
     return {
+      red_loading:false,
+      search_input: '',
       staff:"",
       admins:[],
       orderObj: {},
@@ -255,6 +297,75 @@ export default {
   },
 
   methods: {
+    bwyulan(row){
+      var  id = row.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:9532/api/download',{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)
+          }
+        }
+      }).catch(function(error) {
+
+      })
+    },
+    BWhongchong(row){
+      var  id = row.id
+      this.red_loading = true
+      let params = {
+        "id":id,
+        "admin_user_id":this.$store.getters.xt_user.user.id,
+      }
+
+      var that = this;
+      axios.get('http://127.0.0.1:9532/api/bwfapiao/red',{params:params}).then(function(response) {
+        if (response.data.state == 0) {
+          that.red_loading = false
+
+          that.$message.error(response.data.data.msg);
+          return false
+        } else {
+          that.red_loading = false
+          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) {
+      })
+
+
+    },
+    searchAction(){
+      this.getHisOrderList()
+
+
+    },
     getData(patient_id){
       this.patient_id = patient_id
       this.getHisOrderList()

src/xt_pages/hospitalStation/batchStatementTemplate/hospitalBatchPrint.vue

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