From 94c40e717c313d91bde25bff7c6938dfc21d9aaf Mon Sep 17 00:00:00 2001
From: qinxianzhangyao <11053546+qinxianzhangyao@user.noreply.gitee.com>
Date: 星期五, 24 五月 2024 18:14:14 +0800
Subject: [PATCH] qxtj
---
src/views/system/biol/index.vue | 41 ++++++++++++++++++++++++++---------------
1 files changed, 26 insertions(+), 15 deletions(-)
diff --git a/src/views/system/biol/index.vue b/src/views/system/biol/index.vue
index 1bed226..265edb9 100644
--- a/src/views/system/biol/index.vue
+++ b/src/views/system/biol/index.vue
@@ -2,18 +2,18 @@
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="濮撳悕" prop="name">
- <el-input v-model="queryParams.name" placeholder="璇疯緭鍏ュ鍚�" style="width: 100px" @keyup.enter.native="handleQuery" />
+ <el-input v-model="queryParams.name" placeholder="璇疯緭鍏ュ鍚�" style="width: 100px"
+ @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="浣撴鍙�" prop="tjNum">
<el-input style="width: 170px" v-model="queryParams.tjNum" placeholder="璇疯緭鍏ヤ綋妫�鍙�" clearable
@keyup.enter.native="handleQuery" ref="inputName" @blur="hb" />
</el-form-item>
- <el-form-item label="鎶ュ憡鏃堕棿" prop="reportTimeList">
- <el-date-picker clearable v-model="queryParams.reportTimeList" type="daterange" range-separator="-"
- start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡" :picker-options="pickerOptions" :default-time="['00:00:00', '23:00:00']"
- format="yyyy-MM-dd HH:mm:ss"
- value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="璇烽�夋嫨鍑烘姤鍛婃椂闂�" >
+ <el-form-item label="鎶ュ憡鏃堕棿" prop="createTimeList">
+ <el-date-picker clearable v-model="createTimeList" type="daterange" range-separator="-" start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡" :picker-options="pickerOptions" :default-time="['00:00:00', '23:00:00']"
+ format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" placeholder="璇烽�夋嫨鍑烘姤鍛婃椂闂�"
+ @change="dateChangebirthday1">
</el-date-picker>
</el-form-item>
<!-- <el-form-item label="鍗曚綅鍚嶇О" prop="firmId">
@@ -41,6 +41,9 @@
<el-col :span="1.5">
<el-button type="primary" size="mini" :disabled="multiple" @click="jiankangReport">鍋ュ悍妫�鏌ヨ〃鎵撳嵃</el-button>
</el-col>
+ <!-- <el-col :span="1.5">
+ <el-button type="primary" size="mini" :disabled="multiple" @click="jiankangReport">鎵归噺浣撴鎶ュ憡瀵煎嚭</el-button>
+ </el-col> -->
<el-col :span="1.5">
<el-button type="primary" size="mini" :disabled="single" @click="baogaoyulan">鎶ュ憡棰勮</el-button>
</el-col>
@@ -126,8 +129,8 @@
<div class="pag">
<div class="pag1">
- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
- @pagination="getList" />
+ <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+ :limit.sync="queryParams.pageSize" @pagination="getList" />
</div>
</div>
@@ -264,7 +267,7 @@
</div>
</el-dialog>
<!--:before-close="handleClose" -->
- <el-dialog title="鎻愮ず" :visible.sync="dialogVisiblese" width="30%" >
+ <el-dialog title="鎻愮ず" :visible.sync="dialogVisiblese" width="30%">
<el-radio v-model="radios" label="1">椋熷搧浠庝笟浜哄憳鍋ュ悍妫�鏌ヨ〃</el-radio>
<el-radio v-model="radios" label="2">鍏叡鍦烘墍浠庝笟浜哄憳妫�鏌ヨ〃</el-radio>
<span slot="footer" class="dialog-footer">
@@ -465,7 +468,7 @@
},
created() {
// this.getNowTime();
- this.getList();
+
this.Company();
this.getdate();
},
@@ -477,10 +480,11 @@
methods: {
getdate() {
getNewDateList().then((res) => {
- this.queryParams.reportTimeList = [
+ this.createTimeList = [
moment(res.data).format("YYYY-MM-DD 00:00:00"),
moment(res.data).format("YYYY-MM-DD 23:59:00"),
];
+ this.getList();
});
},
// / 澶勭悊榛樿閫変腑褰撳墠鏃ユ湡
@@ -545,7 +549,6 @@
},
baogaoyulan() {
const tjNumber = this.report[0];
- console.log(tjNumber)
isPdfOrJimu(tjNumber).then((response) => {
if (response.data.flag == "0") {
const flag = true;
@@ -566,6 +569,7 @@
type: "warning",
});
} else {
+ console.log(response)
this.dialogVisible = true;
this.url = window.webkitURL.createObjectURL(response); //灏嗗悗绔繑鍥炵殑blob鏂囦欢璇诲彇鍑簎rl
@@ -762,8 +766,14 @@
},
/** 鏌ヨ浣撴璁板綍鍒楄〃 */
getList() {
- this.queryParams.djbeginTime = this.startTime[0];
- this.queryParams.djendTime = this.startTime[1];
+ if (this.createTimeList) {
+ this.queryParams.djbeginTime = this.createTimeList[0];
+ this.queryParams.djendTime = this.createTimeList[1];
+ }else if(this.createTimeList == null){
+ this.queryParams.djbeginTime = null;
+ this.queryParams.djendTime =null;
+ }
+
this.loading = true;
getInfo().then((response) => {
this.userIds = response.user.userId;
@@ -841,6 +851,7 @@
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
+ this.createTimeList = []
this.resetForm("queryForm");
this.handleQuery();
},
--
Gitblit v1.8.0