Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/api/role/admin.js

   })
 }
 
+
+export function toSign(params){
+  return request({
+    url:"/api/sign/getsign",
+    method:"get",
+    params:params
+  })
+}

src/xt_pages/Dialysisanalysis/calcium/calciumalone.vue

           <div style="padding-left:10px;flex:1;width:0;">
             <div class="tableTitle">指标趋势<span style="font-weight:normal">&nbsp;&nbsp;（当前患者: {{patient_name}}）</span></div>
             <div>
-              <line-chart :options="chart"
-                          v-if="query.statistics_type != 9 && query.statistics_type != 10"></line-chart>
-              <line-chart :options="bar" v-if="query.statistics_type == 9 || query.statistics_type == 10"></line-chart>
+              <line-chart :options="chart"></line-chart>
+              <!--              <line-chart :options="bar" v-if="query.statistics_type == 9 || query.statistics_type == 10"></line-chart>-->
+              <!--              <line-chart></line-chart>-->
 
             </div>
             <div class="tableTitle">统计表</div>
               <el-table ref="table" :data="tableData" v-loading="loading" border :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
                 <el-table-column label="姓名" align="center">
                   <template slot-scope="scope">
+                    {{scope.row.name}}
                   </template>
                 </el-table-column>
 
                 <el-table-column width="100" label="检查日期" align="center">
                   <template slot-scope="scope">
+                    {{getTime(scope.row.inspect_date)}}
+
                   </template>
                 </el-table-column>
 
-                <el-table-column width="100" label="钙" align="center">
+                <el-table-column width="100" label="血磷" align="center">
                   <template slot-scope="scope">
+                    {{scope.row.value}}
                   </template>
                 </el-table-column>
               </el-table>
 
-              <el-pagination
-                align="right"
-                @size-change="handleSizeChange"
-                @current-change="handleCurrentChange"
-                :current-page="query.page"
-                :page-sizes="[10, 20, 50, 100]"
-                :page-size="10"
-                background
-                style="margin-top:20px;"
-                layout="total, sizes, prev, pager, next, jumper"
-                :total="total"
-              ></el-pagination>
+
             </div>
           </div>
         </el-container>
 
 <script>
 import echarts from 'echarts'
-// import LineChart from '../../qcd/components/LineChart'
 import {  uParseTime } from '@/utils/tools'
 import { getCurrentOrgPatients } from '@/api/common/common'
 import {
 import { PostSearch } from '@/api/patient'
 import { getDataConfig } from '@/utils/data'
 import { GetPersonQCStatistisData } from '../../../api/qcd'
+import LineChart from '../../qcd/components/LineChart.vue'
 
 export default {
   components: {
+    LineChart
   },
   data() {
     return {
       for (let i = 0; i < this.tableData.length; i++) {
         let order = this.tableData[i]
         let name = order.name
-        let item_name = order.item_name
-        let count = order.count
-        let price = order.price.toFixed(2)
-        let pay_sumamt = (order.price.toFixed(2) * order.count).toFixed(2)
-        let total = order.total.toFixed(2)
+        let value = order.value
+        let inspect_date = order.inspect_date
 
         let obj = {
-          '患者姓名': name,
-          '项目名称': item_name,
-          '数量': count,
-          '单价': price,
-          '费用': pay_sumamt,
-          '费用总额': total
+          '姓名': name,
+          '数值': value,
+          '日期': inspect_date,
         }
         list.push(obj)
       }
       import('@/vendor/Export2Excel').then(excel => {
-        const tHeader = ['患者姓名', '项目名称', '数量', '单价', '费用', '费用总额']
-        const filterVal = ['患者姓名', '项目名称', '数量', '单价', '费用', '费用总额']
+        const tHeader = ['姓名', '数值', '日期']
+        const filterVal = ['姓名', '数值', '日期']
         const data = this.formatJson(filterVal, list)
         excel.export_json_to_excel1({
           header: tHeader,
       if(val == "" || val == undefined){
         return ""
       }else {
-        return uParseTime(val, '{y}-{m}-{d} {h}:{i}')
+        return uParseTime(val, '{y}-{m}-{d}')
       }
     },
     GetInspectionCheckIndexTableData(params) {
             this.loading = false
             this.tableData = []
             for (let i = 0; i < resp.data.inspections.length; i++) {
-              this.tableData.push(resp.data.inspections[i])
+              let obj = {
+                name:resp.data.patient.name,
+                value:resp.data.inspections[i].inspect_value,
+                inspect_date:resp.data.inspections[i].inspect_date
+              }
+              this.tableData.push(obj)
             }
             this.total = resp.data.total
 
         .then(rs => {
           var resp = rs.data
           if (resp.state == 1) {
+            console.log(resp.data.inspections)
             for (let i = 0; i < resp.data.inspections.length; i++) {
               this.chart.xAxis.data.push(this.getTime(resp.data.inspections[i].inspect_date))
               this.chart.series[0].data.push(resp.data.inspections[i].inspect_value)
             }
+            console.log(this.chart.xAxis.data)
+            console.log( this.chart.series[0].data)
+
             this.getArrLength(this.chart.xAxis.data,1)
           } else {
 

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyFive.vue

                             <td style="font-size: 16px" width="10%">医生签名</td>
                             <!--  -->
                             <td style="font-size: 16px" width="10%">
-                              执行护士
+                              执行人签名
                             </td>
                             <td style="font-size: 16px" width="10%">执行时间</td>
                             <td style="font-size: 16px" width="10%">核对人</td>
                               </td>
                             <!-- 执行护士 -->
                               <td height="35px">
-                                <span v-if="setAdminUserES(advice, 'execution_staff') == ''">
-                                {{getAdminUser(advice, 'execution_staff')}}
+                                <span v-if="setAdminUserES(advice[0], 'execution_staff') == ''">
+                                {{getAdminUser(advice[0], 'execution_staff')}}
                                 </span>
                                 <span v-else>
-                                    <img style="height:30px;" :src="setAdminUserES(advice, 'execution_staff')" alt srcset />
+                                    <img style="height:30px;" :src="setAdminUserES(advice[0], 'execution_staff')" alt srcset />
                                 </span>
                               </td>
                               <td height="35px">

src/xt_pages/dialysis/details/dialog/monitor_dialog.vue

                 template_id == 54 ||
                 template_id == 56 ||
                 template_id == 60 ||
+                template_id == 65 ||
                 org_id == 10210 ||
                 org_id == 9555
                 || org_id == 10432
               template_id != 54 &&
               template_id != 56 &&
               template_id != 60 &&
+              template_id != 65 &&
               org_id!= 10210 &&
               org_id != 9555
               && org_id!=10432 && org_id!=10445
                 template_id == 56 ||
                 template_id == 47 ||
                 template_id == 60 ||
+                template_id == 65 ||
                 org_id == 10432 ||
                 org_id == 10445 ||
                 org_id == 10410 ||
               template_id != 48 &&
               template_id != 47 &&
               template_id != 60 &&
+              template_id != 65 &&
               org_id!=10432 &&
               org_id!=10445 &&
               org_id!=10410 && org_id!=10495
                 template_id == 56 ||
                 template_id == 47 ||
                 template_id == 60 ||
+                template_id == 65 ||
                 org_id== 10432 ||
                 org_id== 10445 ||
                 org_id== 10410 ||
               template_id != 56 &&
               template_id != 47 &&
               template_id != 60 &&
+              template_id != 65 &&
               org_id!=10432 &&
               org_id!=10445 &&
               org_id!=10410 &&
                 template_id == 54 ||
                 template_id == 56 ||
                 template_id == 60 ||
+                template_id == 65 ||
                 org_id == 10210 ||
                 org_id == 9555 ||
                 org_id == 10340 ||
               template_id == 54 &&
               template_id == 56 &&
               template_id == 60 &&
+              template_id == 65 &&
               org_id !=  10210 &&
               org_id !=  10340 &&
               org_id != 9555 &&

src/xt_pages/dialysis/details/dialysisMonitoring.vue

           <th width="76px">静脉压/动脉压({{monitores[0]&&monitores[0]['venous_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
           <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
           <th v-if="isShow('跨膜压')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
-          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10340  || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485) &&this.$store.getters.xt_user.template_info.org_id!=10387 " width="76px" > 超滤量(ml)</th>
-          <th v-if=" isShow('超滤量') && (template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56  && template_id != 60 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 && this.$store.getters.xt_user.template_info.org_id!=10485) || this.$store.getters.xt_user.template_info.org_id == 10387"  width="76px"> 超滤量(L) </th>
-          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56  || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485) && this.$store.getters.xt_user.template_info.org_id!=10387" width="50px"> 超滤率 <br />(ml/h) </th>
-          <th v-if="isShow('超滤率') && (template_id !=6 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56 &&  template_id !=60 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 &&this.$store.getters.xt_user.template_info.org_id!=10485 ) || this.$store.getters.xt_user.template_info.org_id==10387" width="50px"> 超滤率 <br />(L/h) </th>
+          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || template_id == 65 || this.$store.getters.xt_user.template_info.org_id == 10340  || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485) &&this.$store.getters.xt_user.template_info.org_id!=10387 " width="76px" > 超滤量(ml)</th>
+          <th v-if=" isShow('超滤量') && (template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56  && template_id != 60 && template_id != 65 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 && this.$store.getters.xt_user.template_info.org_id!=10485) || this.$store.getters.xt_user.template_info.org_id == 10387"  width="76px"> 超滤量(L) </th>
+          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 65 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56  || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485) && this.$store.getters.xt_user.template_info.org_id!=10387" width="50px"> 超滤率 <br />(ml/h) </th>
+          <th v-if="isShow('超滤率') && (template_id !=6 && template_id !=65 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56 &&  template_id !=60 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 &&this.$store.getters.xt_user.template_info.org_id!=10485 ) || this.$store.getters.xt_user.template_info.org_id==10387" width="50px"> 超滤率 <br />(L/h) </th>
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
           <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
           <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46  || template_id == 48 || template_id == 53  || template_id == 54 || template_id == 56 || org_id == 10432 || org_id == 10445 || org_id == 10410) " width="92px" > 置换率(ml/min) </th>

src/xt_pages/dialysis/dialysisPrintOrder.vue

         });
         
       }else if (this.org_template_info.template_id == 65 || this.org_template_info.template_id == 6) {
-        console.log("进来")
         printJS({
           printable: "dialysis-print-box-1",
           type: "html",
-          style: style12,
+          style: style2,
           scanStyles: false,
         });
         

src/xt_pages/role/admin.vue

         size="small"
         @click="BatchDelete"
         >医药师登记</el-button>
+
+         <!-- <el-button
+          type="primary"
+          size="small"
+          icon="el-icon-circle-plus-outline"
+          style="float:left"
+          @click="toTest">测试</el-button> -->
      </div>
     
       
 </template>
 
 <script>
-import { adminMainView, getAdmins, setAdminStatus } from "@/api/role/admin";
+import { adminMainView, getAdmins, setAdminStatus,toSign } from "@/api/role/admin";
 import { getRoles } from "@/api/role/role";
 
 import { parseTime } from "@/utils";
    handleSelectionChange(val) {
       this.selectDrug = val;
     },
+    toTest(){
+      toSign().then(response=>{
+        if(response.data.state ==1){
+          var sign = response.data.data.sign
+          console.log("sign",sign)
+        }
+      })
+    }
   },
   watch: {
     should_update_admins(should_change) {