Bladeren bron

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

csx 4 jaren geleden
bovenliggende
commit
b0764dc9af

+ 5 - 1
src/api/common/common.js Bestand weergeven

@@ -34,7 +34,11 @@ export function saveConfiguration(data) {
34 34
   })
35 35
 }
36 36
 
37
-export function getConfigurationList(params) {
37
+export function getConfigurationList(limit, page) {
38
+  const params = {
39
+    limit: limit,
40
+    page: page
41
+  }
38 42
   return request({
39 43
     url: 'com/api/getconfigurationlist',
40 44
     method: 'get',

+ 72 - 0
src/xt_pages/dialysis/template/DialysisPrintOrderThirteen.vue Bestand weergeven

@@ -187,6 +187,31 @@
187 187
               </div>kg
188 188
           </div>
189 189
       </div>
190
+      <div class="row">
191
+        透前评估 
192
+        <div class="inline_block under_line" style="width:93%;text-align: left;">
193
+          <div class="inline_block" style="margin-right:30px;">
194
+            体温
195
+            <div class="inline_block" style="width:50px;text-align:center">
196
+              {{ predialysis.temperature ? predialysis.temperature : "" }}
197
+            </div>℃
198
+          </div>
199
+          <div class="inline_block" style="margin-right:30px;">
200
+            血压
201
+            <div class="inline_block" style="width:100px;text-align:center">
202
+              {{ predialysis.systolic_blood_pressure ? predialysis.systolic_blood_pressure : "" }}/
203
+              {{ predialysis.diastolic_blood_pressure ? predialysis.diastolic_blood_pressure : "" }}
204
+            </div>mmHg
205
+          </div>
206
+          <div class="inline_block" style="margin-right:30px;">
207
+            脉搏
208
+            <div class="inline_block" style="width:50px;text-align:center">
209
+              {{ predialysis.pulse_frequency ? predialysis.pulse_frequency : "" }}
210
+            </div>次/分
211
+          </div>
212
+ 
213
+        </div>
214
+      </div>
190 215
 
191 216
       <table class="print-table" border="1">
192 217
         <tr>
@@ -283,6 +308,53 @@
283 308
         </tbody>
284 309
       </table>
285 310
 
311
+      <table class="print-table" border="1">
312
+        <tbody>
313
+          <tr>
314
+            <td width="50" style="padding-left:5px;border:none;border-right:1px solid #000;">
315
+              透后评估
316
+            </td>
317
+
318
+            <td width="30" style="border:none;padding-left:5px;">
319
+              体温:
320
+            </td>
321
+            <td width="50" style="text-align:left;border:none;">
322
+              <div>
323
+                <span class="under_line" style="width:50px;display:inline-block;">
324
+                  {{ afterdialysis.temperature ? afterdialysis.temperature : "" }}
325
+                </span>℃
326
+              </div>
327
+            </td>
328
+            <!-- <td width="10" style="border:none;"></td> -->
329
+
330
+            <td width="30" style="border:none;padding-left:5px;">血压:</td>
331
+            <td width="100" style="text-align:left;border:none;line-height: 30px;">
332
+              <div>
333
+                <span class="under_line" style="width:100px;display:inline-block">
334
+                  {{ afterdialysis.systolic_blood_pressure ? afterdialysis.systolic_blood_pressure : "" }}/
335
+                  {{ afterdialysis.diastolic_blood_pressure ? afterdialysis.diastolic_blood_pressure : "" }}
336
+                </span>mmHg
337
+              </div>
338
+            </td>
339
+            <td width="30" style="border:none;padding-left:5px">脉搏:</td>
340
+            <td width="50" style="text-align:left;border:none;">
341
+              <div>
342
+                <span class="under_line" style="width:50px;display:inline-block">
343
+                  {{ predialysis.pulse_frequency ? predialysis.pulse_frequency : "" }}
344
+                </span>次/分
345
+              </div>
346
+            </td>
347
+            <td width="50" style="border:none;padding-left:5px">透析器凝血:</td>
348
+            <td width="120" style="text-align:left;border:none;">
349
+              <label-box :isChecked="afterdialysis.cruor.indexOf('透析器-0度') > -1 ? true : false" showValue="0"></label-box>
350
+              <label-box :isChecked="afterdialysis.cruor.indexOf('透析器-Ⅰ度') > -1 ? true : false" showValue="+"></label-box>
351
+              <label-box :isChecked="afterdialysis.cruor.indexOf('透析器-Ⅱ度') > -1" showValue="+ +"></label-box>
352
+              <label-box :isChecked="afterdialysis.cruor.indexOf('透析器-Ⅲ度') > -1 ? true : false" showValue="+ + +"></label-box>
353
+            </td>
354
+          </tr>
355
+        </tbody>
356
+      </table>
357
+
286 358
       <table class="print-table" border="1">
287 359
         <tr style="height:36px;text-align:left;border:none;">
288 360
           <td style="padding-left:5px;border:none">

+ 45 - 8
src/xt_pages/qcd/statisticalConfiguration.vue Bestand weergeven

@@ -16,25 +16,38 @@
16 16
       <div class="configTable">
17 17
         <el-table :data="configuraData" border style="width: 100%">
18 18
           <el-table-column prop="date" label="检验检查大项" width="180">
19
-              <template slot-scope="scope">{{ scope.row.inspection_major }}</template>
19
+              <template slot-scope="scope">{{ scope.row.project_name }}</template>
20 20
           </el-table-column>
21 21
           <el-table-column prop="name" label="检查小项" width="180">
22
-             <template slot-scope="scope">{{ scope.row.inspection_minor }}</template>
22
+             <template slot-scope="scope">{{ scope.row.item_name }}</template>
23 23
           </el-table-column>
24 24
           <el-table-column prop="address" label="范围">
25 25
              <template slot-scope="scope">{{ scope.row.min_range }} - {{scope.row.large_range}}</template>
26 26
           </el-table-column>
27 27
            <el-table-column prop="address" label="单位">
28
-              <template slot-scope="scope">{{ scope.row.min_range }}</template>
28
+              <template slot-scope="scope">{{ scope.row.unit }}</template>
29
+            </el-table-column>
30
+            <el-table-column prop="address" label="排序">
31
+                <template slot-scope="scope">{{ scope.row.sort }}</template>
29 32
             </el-table-column>
30
-            <el-table-column prop="address" label="排序"></el-table-column>
31 33
           <el-table-column label="操作" width="180">
32 34
             <template slot-scope="scope">
33
-              <el-button size="mini" type="primary" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
35
+              <el-button size="mini" type="primary" @click="handleEdit(scope.row.id)">编辑</el-button>
34 36
               <el-button size="mini" type="danger" @click="handleDelete(scope.$index, scope.row)">删除</el-button>
35 37
             </template>
36 38
           </el-table-column>
37 39
         </el-table>
40
+
41
+          <el-pagination
42
+              @size-change="handleSizeChange"
43
+              @current-change="handleCurrentChange"
44
+              :page-sizes="[10, 20, 30, 100]"
45
+              :page-size="10"
46
+              background
47
+              style="margin-top:20px;float: right"
48
+              layout="total, sizes, prev, pager, next, jumper"
49
+              :total="total">
50
+          </el-pagination>
38 51
       </div>
39 52
 
40 53
       <el-dialog title="新增" :visible.sync="newDialog">
@@ -152,7 +165,10 @@ export default {
152 165
         inspectionMajor: [{ required: true, message: "检查大项不能为空" }],
153 166
         inspectionMinor: [{ required: true, message: "检查小项不能为空" }],
154 167
         large_range:[{required:true,message:"指控范围不能为空"}]
155
-      }
168
+      },
169
+      page:1,
170
+      limit:10,
171
+      total:0,
156 172
     };
157 173
   },
158 174
   methods: {
@@ -161,8 +177,12 @@ export default {
161 177
         this.$router.push({ path: "/qcd/patientanalysis/checkStatistical" });
162 178
       }
163 179
     },
164
-    handleEdit() {
180
+    handleEdit(id) {
165 181
       this.editDialog = true;
182
+      getConfigurationDetail(id).then(response=>{
183
+         if(response.data.state == 1){
184
+         }
185
+      })
166 186
     },
167 187
     
168 188
     //获取大项数据来源
@@ -211,17 +231,34 @@ export default {
211 231
              this.form.large_range = ""
212 232
              this.form.min_range = ""
213 233
              this.form.sort = ""
234
+             this.getConfigurationList()
214 235
             }
215 236
           })
216 237
         }
217 238
       })
218 239
     },
240
+   handleSizeChange(limit) {
241
+      this.limit = limit;
242
+      this.getConfigurationList();
243
+    },
244
+    handleCurrentChange(page) {
245
+      this.page = page;
246
+      this.getConfigurationList();
247
+    },
219 248
     getConfigurationList(){
220
-      getConfigurationList().then(response=>{
249
+      getConfigurationList(this.limit,this.page).then(response=>{
221 250
         if(response.data.state === 1){
222 251
           var configurationlist = response.data.data.configurationlist
252
+          for(let i=0;i<configurationlist.length;i++){
253
+            if(configurationlist[i].sort === 0){
254
+              configurationlist[i].sort = ""
255
+            }
256
+          }
223 257
           console.log("列表",configurationlist)
224 258
           this.configuraData = configurationlist
259
+          var total = response.data.data.total
260
+          console.log("total",total)
261
+          this.total = total
225 262
         }
226 263
       })
227 264
     }