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

src/api/common/common.js

   })
 }
 
-export function getConfigurationList(params) {
+export function getConfigurationList(limit, page) {
+  const params = {
+    limit: limit,
+    page: page
+  }
   return request({
     url: 'com/api/getconfigurationlist',
     method: 'get',

src/xt_pages/dialysis/template/DialysisPrintOrderThirteen.vue

               </div>kg
           </div>
       </div>
+      <div class="row">
+        透前评估 
+        <div class="inline_block under_line" style="width:93%;text-align: left;">
+          <div class="inline_block" style="margin-right:30px;">
+            体温
+            <div class="inline_block" style="width:50px;text-align:center">
+              {{ predialysis.temperature ? predialysis.temperature : "" }}
+            </div>℃
+          </div>
+          <div class="inline_block" style="margin-right:30px;">
+            血压
+            <div class="inline_block" style="width:100px;text-align:center">
+              {{ predialysis.systolic_blood_pressure ? predialysis.systolic_blood_pressure : "" }}/
+              {{ predialysis.diastolic_blood_pressure ? predialysis.diastolic_blood_pressure : "" }}
+            </div>mmHg
+          </div>
+          <div class="inline_block" style="margin-right:30px;">
+            脉搏
+            <div class="inline_block" style="width:50px;text-align:center">
+              {{ predialysis.pulse_frequency ? predialysis.pulse_frequency : "" }}
+            </div>次/分
+          </div>
+ 
+        </div>
+      </div>
 
       <table class="print-table" border="1">
         <tr>
         </tbody>
       </table>
 
+      <table class="print-table" border="1">
+        <tbody>
+          <tr>
+            <td width="50" style="padding-left:5px;border:none;border-right:1px solid #000;">
+              透后评估
+            </td>
+
+            <td width="30" style="border:none;padding-left:5px;">
+              体温:
+            </td>
+            <td width="50" style="text-align:left;border:none;">
+              <div>
+                <span class="under_line" style="width:50px;display:inline-block;">
+                  {{ afterdialysis.temperature ? afterdialysis.temperature : "" }}
+                </span>℃
+              </div>
+            </td>
+            <!-- <td width="10" style="border:none;"></td> -->
+
+            <td width="30" style="border:none;padding-left:5px;">血压:</td>
+            <td width="100" style="text-align:left;border:none;line-height: 30px;">
+              <div>
+                <span class="under_line" style="width:100px;display:inline-block">
+                  {{ afterdialysis.systolic_blood_pressure ? afterdialysis.systolic_blood_pressure : "" }}/
+                  {{ afterdialysis.diastolic_blood_pressure ? afterdialysis.diastolic_blood_pressure : "" }}
+                </span>mmHg
+              </div>
+            </td>
+            <td width="30" style="border:none;padding-left:5px">脉搏:</td>
+            <td width="50" style="text-align:left;border:none;">
+              <div>
+                <span class="under_line" style="width:50px;display:inline-block">
+                  {{ predialysis.pulse_frequency ? predialysis.pulse_frequency : "" }}
+                </span>次/分
+              </div>
+            </td>
+            <td width="50" style="border:none;padding-left:5px">透析器凝血:</td>
+            <td width="120" style="text-align:left;border:none;">
+              <label-box :isChecked="afterdialysis.cruor.indexOf('透析器-0度') > -1 ? true : false" showValue="0"></label-box>
+              <label-box :isChecked="afterdialysis.cruor.indexOf('透析器-Ⅰ度') > -1 ? true : false" showValue="+"></label-box>
+              <label-box :isChecked="afterdialysis.cruor.indexOf('透析器-Ⅱ度') > -1" showValue="+ +"></label-box>
+              <label-box :isChecked="afterdialysis.cruor.indexOf('透析器-Ⅲ度') > -1 ? true : false" showValue="+ + +"></label-box>
+            </td>
+          </tr>
+        </tbody>
+      </table>
+
       <table class="print-table" border="1">
         <tr style="height:36px;text-align:left;border:none;">
           <td style="padding-left:5px;border:none">

src/xt_pages/qcd/statisticalConfiguration.vue

       <div class="configTable">
         <el-table :data="configuraData" border style="width: 100%">
           <el-table-column prop="date" label="检验检查大项" width="180">
-              <template slot-scope="scope">{{ scope.row.inspection_major }}</template>
+              <template slot-scope="scope">{{ scope.row.project_name }}</template>
           </el-table-column>
           <el-table-column prop="name" label="检查小项" width="180">
-             <template slot-scope="scope">{{ scope.row.inspection_minor }}</template>
+             <template slot-scope="scope">{{ scope.row.item_name }}</template>
           </el-table-column>
           <el-table-column prop="address" label="范围">
              <template slot-scope="scope">{{ scope.row.min_range }} - {{scope.row.large_range}}</template>
           </el-table-column>
            <el-table-column prop="address" label="单位">
-              <template slot-scope="scope">{{ scope.row.min_range }}</template>
+              <template slot-scope="scope">{{ scope.row.unit }}</template>
+            </el-table-column>
+            <el-table-column prop="address" label="排序">
+                <template slot-scope="scope">{{ scope.row.sort }}</template>
             </el-table-column>
-            <el-table-column prop="address" label="排序"></el-table-column>
           <el-table-column label="操作" width="180">
             <template slot-scope="scope">
-              <el-button size="mini" type="primary" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
+              <el-button size="mini" type="primary" @click="handleEdit(scope.row.id)">编辑</el-button>
               <el-button size="mini" type="danger" @click="handleDelete(scope.$index, scope.row)">删除</el-button>
             </template>
           </el-table-column>
         </el-table>
+
+          <el-pagination
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"
+              :page-sizes="[10, 20, 30, 100]"
+              :page-size="10"
+              background
+              style="margin-top:20px;float: right"
+              layout="total, sizes, prev, pager, next, jumper"
+              :total="total">
+          </el-pagination>
       </div>
 
       <el-dialog title="新增" :visible.sync="newDialog">
         inspectionMajor: [{ required: true, message: "检查大项不能为空" }],
         inspectionMinor: [{ required: true, message: "检查小项不能为空" }],
         large_range:[{required:true,message:"指控范围不能为空"}]
-      }
+      },
+      page:1,
+      limit:10,
+      total:0,
     };
   },
   methods: {
         this.$router.push({ path: "/qcd/patientanalysis/checkStatistical" });
       }
     },
-    handleEdit() {
+    handleEdit(id) {
       this.editDialog = true;
+      getConfigurationDetail(id).then(response=>{
+         if(response.data.state == 1){
+         }
+      })
     },
     
     //获取大项数据来源
              this.form.large_range = ""
              this.form.min_range = ""
              this.form.sort = ""
+             this.getConfigurationList()
             }
           })
         }
       })
     },
+   handleSizeChange(limit) {
+      this.limit = limit;
+      this.getConfigurationList();
+    },
+    handleCurrentChange(page) {
+      this.page = page;
+      this.getConfigurationList();
+    },
     getConfigurationList(){
-      getConfigurationList().then(response=>{
+      getConfigurationList(this.limit,this.page).then(response=>{
         if(response.data.state === 1){
           var configurationlist = response.data.data.configurationlist
+          for(let i=0;i<configurationlist.length;i++){
+            if(configurationlist[i].sort === 0){
+              configurationlist[i].sort = ""
+            }
+          }
           console.log("列表",configurationlist)
           this.configuraData = configurationlist
+          var total = response.data.data.total
+          console.log("total",total)
+          this.total = total
         }
       })
     }