From c2943d4c365e6a4719fbd5fedf89f8c2232cf88e Mon Sep 17 00:00:00 2001
From: qinxianzhangyao <11053546+qinxianzhangyao@user.noreply.gitee.com>
Date: 星期一, 25 三月 2024 18:16:27 +0800
Subject: [PATCH] qxtj
---
src/views/reservation/reservations/index.vue | 4
src/views/system/bill/index.vue | 5
src/views/standard/tijiancom/index.vue | 5
src/views/doctor/examination/index.vue | 269 +++-----------
src/views/system/examcharge/index.vue | 12
src/views/hosp/fuzhen/index.vue | 9
src/views/system/Checkout/index.vue | 6
src/views/mall/checklog/index.vue | 8
src/utils/request.js | 6
src/views/count/disease/index.vue | 5
src/views/hosp/order/index.vue | 626 +++++++++++++++++++++-------------
src/views/count/chart/index.vue | 3
src/views/system/biol/index.vue | 3
src/api/system/tijian.js | 21 +
src/views/standard/renshunum/index.vue | 8
src/views/system/circle/index.vue | 8
src/views/team/reportresults/index.vue | 16
src/views/sampling/sampling/index.vue | 10
src/views/team/teams/index.vue | 27
src/views/system/visit/index.vue | 9
src/views/team/disease/index.vue | 8
21 files changed, 577 insertions(+), 491 deletions(-)
diff --git a/src/api/system/tijian.js b/src/api/system/tijian.js
index 11d9cd4..cfb50a5 100644
--- a/src/api/system/tijian.js
+++ b/src/api/system/tijian.js
@@ -18,7 +18,7 @@
})
}
-// 姣忎釜椤圭洰
+// 閫夋嫨浣撴椤圭洰(鎵�鏈夋湇椤圭洰)閫夊崟椤规椂璋冪敤鐨勬帴鍙�
export function projectGetList() {
return request({
url: '/hosp/project/getDxList',
@@ -26,6 +26,25 @@
})
}
+
+// 閫夋嫨浣撴椤圭洰(鏍规嵁鐖堕」id閫夋嫨瀛愰」)閫夊崟椤规椂璋冪敤鐨勬帴鍙�
+export function getProSonDxList(proId) {
+ return request({
+ url: '/hosp/project/getProSonDxList',
+ method: 'get',
+ params:{
+ proId:proId
+ }
+ })
+}
+
+export function getProParentIdDxList() {
+ return request({
+ url: '/hosp/project/getProParentIdDxList',
+ method: 'get',
+ })
+}
+
// 姣忎釜椤圭洰
export function getOrder(data) {
return request({
diff --git a/src/utils/request.js b/src/utils/request.js
index 616c955..9beb2d4 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -122,9 +122,9 @@
if (message == "Network Error") {
message = "鍚庣鎺ュ彛杩炴帴寮傚父";
}
- else if (message.includes("timeout")) {
- message = "鏁版嵁鍔犺浇澶辫触锛岃鍒锋柊椤甸潰";
- }
+ // else if (message.includes("timeout")) {
+ // message = "鏁版嵁鍔犺浇澶辫触锛岃鍒锋柊椤甸潰";
+ // }
else if (message.includes("Request failed with status code")) {
message = "绯荤粺鎺ュ彛" + message.substr(message.length - 3) + "寮傚父";
}
diff --git a/src/views/count/chart/index.vue b/src/views/count/chart/index.vue
index 0561b51..f4e5bb7 100644
--- a/src/views/count/chart/index.vue
+++ b/src/views/count/chart/index.vue
@@ -95,6 +95,9 @@
if (this.value1) {
this.queryParams.startDate = this.value1[0];
this.queryParams.endDate = this.value1[1];
+ }else if(this.value1 == null) {
+ this.queryParams.startDate = null;
+ this.queryParams.endDate = null;
} else {
this.queryParams.startDate = this.startTime[0];
this.queryParams.endDate = this.startTime[1];
diff --git a/src/views/count/disease/index.vue b/src/views/count/disease/index.vue
index cf361ea..a536159 100644
--- a/src/views/count/disease/index.vue
+++ b/src/views/count/disease/index.vue
@@ -167,7 +167,10 @@
if(this.value1){
this.queryParams.beginTime = this.value1[0];
this.queryParams.endTime = this.value1[1];
- }else{
+ }else if(this.value1 == null){
+ this.queryParams.beginTime = null;
+ this.queryParams.endTime = null;
+ } else {
this.queryParams.beginTime = this.startTime[0];
this.queryParams.endTime = this.startTime[1];
diff --git a/src/views/doctor/examination/index.vue b/src/views/doctor/examination/index.vue
index 4aebd40..fa8c815 100644
--- a/src/views/doctor/examination/index.vue
+++ b/src/views/doctor/examination/index.vue
@@ -1,101 +1,38 @@
<template>
<div class="app-container">
- <el-form
- :model="queryParams"
- ref="queryForm"
- size="small"
- :inline="true"
- label-width="68px"
- >
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
<el-form-item label="浣撴鍙�" prop="tjNumber">
- <el-input
- ref="inputName"
- v-model="queryParams.tjNumber"
- placeholder="璇疯緭鍏ヤ綋妫�鍙�"
- clearable
- @keyup.enter.native="handleQuery"
- @blur="hb"
- style="width: 170px"
- />
+ <el-input ref="inputName" v-model="queryParams.tjNumber" placeholder="璇疯緭鍏ヤ綋妫�鍙�" clearable
+ @keyup.enter.native="handleQuery" @blur="hb" style="width: 170px" />
</el-form-item>
<el-form-item label="濮撳悕" prop="name">
- <el-input
- v-model="queryParams.name"
- placeholder="璇疯緭鍏ュ鍚�"
- clearable
- @keyup.enter.native="handleQuery"
- style="width: 110px"
- />
+ <el-input v-model="queryParams.name" placeholder="璇疯緭鍏ュ鍚�" clearable @keyup.enter.native="handleQuery"
+ style="width: 110px" />
</el-form-item>
<el-form-item label="鐧昏鏃堕棿" prop="createTimeList">
- <el-date-picker
- v-model="createTimeList"
- type="datetimerange"
- align="right"
- :picker-options="pickerOptions"
- style="width: 310px"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- :default-time="['00:00:00', '23:00:00']"
- format="yyyy-MM-dd HH:mm"
- value-format="yyyy-MM-dd HH:mm"
- @change="dateChangebirthday1"
- >
+ <el-date-picker v-model="createTimeList" type="datetimerange" align="right" :picker-options="pickerOptions"
+ style="width: 310px" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡" :default-time="['00:00:00', '23:00:00']"
+ format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm" @change="dateChangebirthday1">
</el-date-picker>
</el-form-item>
<el-form-item>
- <el-button
- type="primary"
- icon="el-icon-search"
- size="mini"
- @click="handleQuery"
- >鏌ヨ</el-button
- >
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
- >閲嶇疆</el-button
- >
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鏌ヨ</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-form>
- <el-radio-group
- v-model="checkStatus"
- @input="radioChange"
- style="margin: 10px 15px"
- >
+ <el-radio-group v-model="checkStatus" @input="radioChange" style="margin: 10px 15px">
<el-radio-button label="0">鏈鏍�</el-radio-button>
<el-radio-button label="1">宸插鏍�</el-radio-button>
</el-radio-group>
<div style="width: 100%; margin-left: 10px; display: flex">
<div style="width: 40.5%; margin-right: 20px">
- <el-table
- id="ta"
- v-loading="loading"
- ref="tb"
- :data="exaList"
- border
- height="520px"
- @selection-change="handleSelectionChange"
- :row-class-name="tableRowClassName"
- >
+ <el-table id="ta" v-loading="loading" ref="tb" :data="exaList" border height="520px"
+ @selection-change="handleSelectionChange" :row-class-name="tableRowClassName">
<el-table-column type="selection" width="40" align="center" />
- <el-table-column
- label="浣撴鍙�"
- align="center"
- prop="tjNumber"
- width="160px"
- />
- <el-table-column
- label="濮撳悕"
- align="center"
- prop="cusName"
- width="80px"
- />
- <el-table-column
- label="鎬у埆"
- align="center"
- prop="cusSex"
- width="50px"
- >
+ <el-table-column label="浣撴鍙�" align="center" prop="tjNumber" width="160px" />
+ <el-table-column label="濮撳悕" align="center" prop="cusName" width="80px" />
+ <el-table-column label="鎬у埆" align="center" prop="cusSex" width="50px">
<template slot-scope="scope">
<span v-if="scope.row.cusSex == '0'">鐢�</span>
<span v-if="scope.row.cusSex == '1'">濂�</span>
@@ -108,107 +45,40 @@
<!-- <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.cusSex " /> -->
<!-- </template> -->
</el-table-column>
- <el-table-column
- label="鎵嬫満鍙�"
- align="center"
- prop="cusPhone"
- width="100px"
- />
- <el-table-column
- label="鐧昏鏃堕棿"
- align="center"
- prop="tjTime"
- width="120px"
- />
- <el-table-column
- v-if="checkStatus == '1'"
- label="瀹℃牳鐘舵��"
- align="center"
- prop="confirmStatus"
- width="80px"
- >
+ <el-table-column label="鎵嬫満鍙�" align="center" prop="cusPhone" width="100px" />
+ <el-table-column label="鐧昏鏃堕棿" align="center" prop="tjTime" width="120px" />
+ <el-table-column v-if="checkStatus == '1'" label="瀹℃牳鐘舵��" align="center" prop="confirmStatus" width="80px">
<template slot-scope="scope">
- <span
- :style="{
- color:
- scope.row.confirmStatus == '301' ? '#0CB618' : '#EA1B29',
- }"
- v-if="scope.row.confirmStatus == '301'"
- >宸查�氳繃</span
- >
- <span
- :style="{
- color:
- scope.row.confirmStatus == '301' ? '#0CB618' : '#EA1B29',
- }"
- v-if="scope.row.confirmStatus == '299'"
- >宸查┏鍥�</span
- >
+ <span :style="{
+ color:
+ scope.row.confirmStatus == '301' ? '#0CB618' : '#EA1B29',
+ }" v-if="scope.row.confirmStatus == '301'">宸查�氳繃</span>
+ <span :style="{
+ color:
+ scope.row.confirmStatus == '301' ? '#0CB618' : '#EA1B29',
+ }" v-if="scope.row.confirmStatus == '299'">宸查┏鍥�</span>
</template>
</el-table-column>
<!-- v-hasPermi="['reservation:reservation:edit']" -->
<el-table-column label="鎿嶄綔" align="center" width="120px">
<template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- @click="tongbu(scope.row)"
- >鍚屾</el-button
- >
- <el-button
- :disabled="dis"
- size="mini"
- type="text"
- v-show="
- scope.row.confirmStatus == '299' ||
- scope.row.confirmStatus == 288
- "
- @click="tongguo(scope.row)"
- >閫氳繃</el-button
- >
- <el-button
- size="mini"
- type="text"
- v-show="
- scope.row.confirmStatus == '301' ||
- scope.row.confirmStatus == 288
- "
- @click="bohui(scope.row)"
- >椹冲洖</el-button
- >
+ <el-button size="mini" type="text" @click="tongbu(scope.row)">鍚屾</el-button>
+ <el-button :disabled="dis" size="mini" type="text" v-show="scope.row.confirmStatus == '299' ||
+ scope.row.confirmStatus == 288
+ " @click="tongguo(scope.row)">閫氳繃</el-button>
+ <el-button size="mini" type="text" v-show="scope.row.confirmStatus == '301' ||
+ scope.row.confirmStatus == 288
+ " @click="bohui(scope.row)">椹冲洖</el-button>
</template>
</el-table-column>
</el-table>
</div>
<div style="width: 50%">
- <el-table
- v-loading="loading"
- border
- height="520px"
- ref="tab1"
- :data="xiangmuList"
- >
+ <el-table v-loading="loading" border height="520px" ref="tab1" :data="xiangmuList">
<!-- <el-table-column type="selection" width="40" align="center" /> -->
- <el-table-column
- label="閮ㄩ棬"
- align="center"
- prop="deptName"
- :show-overflow-tooltip="true"
- />
- <el-table-column
- label="椤圭洰"
- align="center"
- prop="proName"
- width="115"
- :show-overflow-tooltip="true"
- />
- <el-table-column
- label="鐘舵��"
- align="center"
- prop="type"
- :show-overflow-tooltip="true"
- width="60"
- >
+ <el-table-column label="閮ㄩ棬" align="center" prop="deptName" :show-overflow-tooltip="true" />
+ <el-table-column label="椤圭洰" align="center" prop="proName" width="115" :show-overflow-tooltip="true" />
+ <el-table-column label="鐘舵��" align="center" prop="type" :show-overflow-tooltip="true" width="60">
<template slot-scope="scope">
<span v-if="scope.row.type == '0'">鏈</span>
<span v-if="scope.row.type == '1'">宸叉</span>
@@ -217,49 +87,23 @@
</template>
</el-table-column>
- <el-table-column
- label="鏀惰垂鏂瑰紡"
- align="center"
- prop="sffs"
- :show-overflow-tooltip="true"
- width="80"
- />
- <el-table-column
- label="鏄惁鏀惰垂"
- align="center"
- prop="isPay"
- :show-overflow-tooltip="true"
- />
+ <el-table-column label="鏀惰垂鏂瑰紡" align="center" prop="sffs" :show-overflow-tooltip="true" width="80" />
+ <el-table-column label="鏄惁鏀惰垂" align="center" prop="isPay" :show-overflow-tooltip="true" />
<!-- <el-table-column
label="绛惧埌鏃堕棿"
align="center"
prop="qdcreateTime"
width="160"
/> -->
- <el-table-column
- label="妫�鏌ュ尰鐢�"
- align="center"
- prop="doctorName"
- width="100"
- />
- <el-table-column
- label="妫�鏌ユ椂闂�"
- align="center"
- prop="bcupdateTime"
- width="160"
- />
+ <el-table-column label="妫�鏌ュ尰鐢�" align="center" prop="doctorName" width="100" />
+ <el-table-column label="妫�鏌ユ椂闂�" align="center" prop="bcupdateTime" width="160" />
<!-- <el-table-column
label="淇濆瓨鍖荤敓"
align="center"
prop="bcdoctorName"
width="120"
/> -->
- <el-table-column
- label="鏈�鍚庝慨鏀规椂闂�"
- align="center"
- prop="zhupdateTime"
- width="160"
- />
+ <el-table-column label="鏈�鍚庝慨鏀规椂闂�" align="center" prop="zhupdateTime" width="160" />
</el-table>
</div>
</div>
@@ -267,13 +111,8 @@
<!-- <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :pager-count="5" :current-page.sync="currentPage1" :current-page="page"
:page-sizes="pageSize" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="total">
</el-pagination> -->
- <pagination
- v-show="total > 0"
- :total="total"
- :page.sync="queryParams.page"
- :limit.sync="queryParams.pageSize"
- @pagination="getList"
- />
+ <pagination v-show="total > 0" :total="total" :page.sync="queryParams.page" :limit.sync="queryParams.pageSize"
+ @pagination="getList" />
</div>
</div>
</template>
@@ -353,7 +192,7 @@
};
},
created() {
-
+
this.getdate();
// this.getNowTime();
},
@@ -410,8 +249,14 @@
getList() {
this.loading = true;
this.queryParams.checkStatus = this.checkStatus;
- this.queryParams.beginTime = this.createTimeList[0];
- this.queryParams.endTime = this.createTimeList[1];
+ if (this.createTimeList) {
+ this.queryParams.beginTime = this.createTimeList[0];
+ this.queryParams.endTime = this.createTimeList[1];
+ } else if (this.createTimeList == null) {
+ this.queryParams.beginTime = null;
+ this.queryParams.endTime = null;
+ }
+
getCsList(this.queryParams).then((res) => {
if (res.code == 200) {
this.loading = false;
@@ -455,7 +300,7 @@
},
hb() {
- console.log(this.queryParams.tjNumber);
+ // console.log(this.queryParams.tjNumber);
if (this.queryParams.tjNumber != null) {
this.handleQuery();
}
@@ -467,7 +312,7 @@
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
- this.createTimeList =[]
+ this.createTimeList = []
this.resetForm("queryForm");
this.handleQuery();
this.loading = true;
@@ -489,7 +334,7 @@
cSWebGetPro(tjNumber).then((res) => {
this.xiangmuList = res.data;
this.xiangmuList.forEach((item) => {
- console.log(item);
+ // console.log(item);
if (item.type == 0) {
this.dis = true;
} else {
diff --git a/src/views/hosp/fuzhen/index.vue b/src/views/hosp/fuzhen/index.vue
index e97e564..e3bd186 100644
--- a/src/views/hosp/fuzhen/index.vue
+++ b/src/views/hosp/fuzhen/index.vue
@@ -465,13 +465,16 @@
if(this.createTimeList){
this.queryParams.djbeginTime = this.createTimeList[0];
this.queryParams.djendTime = this.createTimeList[1];
- }else{
+ }else if(this.startTime){
this.queryParams.djbeginTime = this.startTime[0];
this.queryParams.djendTime = this.startTime[1];
}
-
- this.queryParams.bgbeginTime = this.startTime1[0];
+ if(this.startTime1){
+ this.queryParams.bgbeginTime = this.startTime1[0];
this.queryParams.bgendTime = this.startTime1[1];
+ }
+
+
this.loading = true;
getReturnOrderList(this.queryParams).then((response) => {
this.orderList = response.data.list;
diff --git a/src/views/hosp/order/index.vue b/src/views/hosp/order/index.vue
index 8aabe19..20ea617 100644
--- a/src/views/hosp/order/index.vue
+++ b/src/views/hosp/order/index.vue
@@ -412,7 +412,7 @@
<el-dialog
:title="title"
:visible.sync="Projectopen"
- width="1200px"
+ width="1500px"
style="height: 860px"
append-to-body
>
@@ -428,12 +428,14 @@
<div class="tab3">
<div class="outside1">
<el-tree
+ class="filter-tree"
v-loading="loading"
:data="Treedata"
+ :props="defaultProps"
show-checkbox
node-key="proId"
- :props="defaultProps"
@check-change="handleCurrentChecked"
+ :default-checked-keys="checkedkey"
:filter-node-method="filterNode"
ref="tree"
>
@@ -441,125 +443,149 @@
</div>
</div>
</el-col>
- <div>
- <el-col :span="18">
- <div class="grid-content bg-purple">
- <template>
- <el-form :model="form">
- <el-form-item label="浣撴绫诲瀷" prop="tjType">
- <el-radio-group v-model="form.tjType">
- <el-radio :label="1">鍥㈤槦</el-radio>
- <el-radio :label="2">涓汉</el-radio>
- </el-radio-group>
- </el-form-item>
- </el-form>
- </template>
-
- <div class="outside">
- <el-form :inline="true" class="outside1">
- <el-form-item label="鍘熶环">
- <el-input
- placeholder="鍘熶环"
- :value="TotalPrice1"
- disabled
- style="width: 90px"
- ></el-input>
- </el-form-item>
- <el-form-item label="鎶樻墸璁惧畾">
- <el-input
- style="width: 90px"
- type="number"
- v-model="discount"
- :value="discount"
- ></el-input>
- </el-form-item>
- <el-form-item label="搴斾粯閲戦">
- <el-input
- placeholder="搴斾粯閲戦"
- :value="TotalPrice1 * (discount / 10)"
- style="width: 90px"
- ></el-input>
- </el-form-item>
- <el-form-item label="浠樻绫诲瀷" prop="payType">
- <el-select
- style="width: 120px"
- v-model="payType"
- placeholder="璇烽�夋嫨浠樻绫诲瀷"
- >
- <el-option
- v-for="dict in dict.type.dict_pay_type"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
- </el-select>
- </el-form-item>
- <el-form-item>
- <el-button
- type="primary"
- @click="submitPrice"
- :disabled="confirm"
- style="margin-top: 34px"
- >鏀惰垂</el-button
- >
- </el-form-item>
- </el-form>
- </div>
- <div style="text-align: center; margin-bottom: 10px">
- 宸查�夐」鐩垪琛�
- </div>
- <div
- style="
- padding: 0px 6px;
- border: 1px solid #e6ebf5;
- max-height: 420px;
- overflow: auto;
- "
+ <el-col :span="4">
+ <div
+ style="text-align: center; margin-bottom: 10px; margin-top: 10px"
+ >
+ 椤圭洰鍒楄〃
+ </div>
+ <div class="tab3">
+ <div class="outside1">
+ <el-tree
+ class="filter-tree"
+ v-loading="loading"
+ :data="TreedataList"
+ node-key="proId"
+ :props="defaultProps"
+ :filter-node-method="filterNode"
+ show-checkbox
+ @check-change="handleCurrentChecked1"
+ :default-checked-keys="checkedListkey"
>
- <el-collapse v-model="activeName" accordion>
- <div v-for="(item, index) in DataList" :key="index">
- <el-collapse-item>
- <template slot="title">
- {{ item.proName + "(" + "鍘熶环" + item.proPrice + ")" }}
- </template>
- <el-table
- :data="item.tjProjectList"
- border
- style="width: 100%"
- height="250"
- >
- <el-table-column
- prop="proName"
- label="椤圭洰"
- width="180"
- >
- </el-table-column>
- <el-table-column prop="proPrice" label="鍘熶环">
- </el-table-column>
- </el-table>
- </el-collapse-item>
- </div>
- </el-collapse>
- <el-collapse v-model="activeName" accordion v-if="list1">
- <div>
- <el-collapse-item title="璇烽�夋嫨椤圭洰">
- <el-table :data="DataList" border style="width: 100%">
- <el-table-column
- prop="proName"
- label="椤圭洰"
- width="180"
- >
- </el-table-column>
- <el-table-column prop="ordPrice" label="鍘熶环">
- </el-table-column>
- </el-table>
- </el-collapse-item>
- </div>
- </el-collapse>
- </div>
+ </el-tree>
</div>
- </el-col>
- </div>
+ </div>
+ </el-col>
+ <el-col :span="12">
+ <div class="grid-content bg-purple">
+ <div style="text-align: center; margin-bottom: 10px">
+ 宸查�夐」鐩垪琛�
+ </div>
+ <div
+ style="
+ padding: 0px 6px;
+ border: 1px solid #e6ebf5;
+ max-height: 420px;
+ overflow: auto;
+ "
+ >
+ <el-table
+ :data="DataList"
+ border
+ style="width: 100%"
+ height="250"
+ >
+ <el-table-column prop="propinName" label="鐖堕」">
+ </el-table-column>
+ <el-table-column prop="proName" label="椤圭洰" width="180">
+ </el-table-column>
+ <el-table-column prop="proPrice" label="鍘熶环">
+ </el-table-column>
+
+ <el-table-column
+ label="鎿嶄綔"
+ align="center"
+ fixed="right"
+ class-name="small-padding fixed-width"
+ width="80px"
+ >
+ <template slot-scope="scope">
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-delete"
+ @click="handleDelete(scope.row)"
+ >鍒犻櫎</el-button
+ >
+ </template>
+ </el-table-column>
+ </el-table>
+ <el-collapse v-model="activeName" accordion v-if="list1">
+ <div>
+ <el-collapse-item title="璇烽�夋嫨椤圭洰">
+ <el-table :data="DataList" border style="width: 100%">
+ <el-table-column prop="proName" label="椤圭洰" width="180">
+ </el-table-column>
+ <el-table-column prop="ordPrice" label="鍘熶环">
+ </el-table-column>
+ </el-table>
+ </el-collapse-item>
+ </div>
+ </el-collapse>
+ </div>
+ <template>
+ <el-form :model="form">
+ <el-form-item label="浣撴绫诲瀷" prop="tjType">
+ <el-radio-group v-model="form.tjType">
+ <el-radio :label="1">鍥㈤槦</el-radio>
+ <el-radio :label="2">涓汉</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ </el-form>
+ </template>
+
+ <div class="outside">
+ <el-form :inline="true" class="outside1">
+ <el-form-item label="鍘熶环">
+ <el-input
+ placeholder="鍘熶环"
+ :value="TotalPrice1"
+ disabled
+ style="width: 90px"
+ ></el-input>
+ </el-form-item>
+ <el-form-item label="鎶樻墸璁惧畾">
+ <el-input
+ style="width: 90px"
+ type="number"
+ v-model="discount"
+ :value="discount"
+ ></el-input>
+ </el-form-item>
+ <el-form-item label="搴斾粯閲戦">
+ <el-input
+ placeholder="搴斾粯閲戦"
+ :value="TotalPrice1 * (discount / 10)"
+ style="width: 90px"
+ ></el-input>
+ </el-form-item>
+ <el-form-item label="浠樻绫诲瀷" prop="payType">
+ <el-select
+ style="width: 120px"
+ v-model="payType"
+ placeholder="璇烽�夋嫨浠樻绫诲瀷"
+ >
+ <el-option
+ v-for="dict in dict.type.dict_pay_type"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item>
+ <el-button
+ type="primary"
+ @click="submitPrice"
+ :disabled="confirm"
+ style="margin-top: 34px"
+ >鏀惰垂</el-button
+ >
+ </el-form-item>
+ </el-form>
+ </div>
+ </div>
+ </el-col>
</el-row>
</el-dialog>
@@ -567,12 +593,12 @@
<el-dialog
:title="title"
:visible.sync="Projectopen1"
- width="1200px"
+ width="1500px"
style="height: 860px"
append-to-body
>
<el-row type="flex" class="row-bg" justify="space-around">
- <el-col :span="8">
+ <el-col :span="6">
<div
style="text-align: center; margin-bottom: 10px; margin-top: 10px"
>
@@ -586,10 +612,11 @@
class="filter-tree"
v-loading="loading"
:data="Treedata"
+ :props="defaultProps"
show-checkbox
node-key="proId"
- :props="defaultProps"
- @check-change="handleCurrentChecked"
+ @check="handleCurrentChecked"
+ :default-checked-keys="checkedkey"
:filter-node-method="filterNode"
ref="tree"
>
@@ -597,9 +624,86 @@
</div>
</div>
</el-col>
-
- <el-col :span="15">
+ <el-col :span="4">
+ <div
+ style="text-align: center; margin-bottom: 10px; margin-top: 10px"
+ >
+ 椤圭洰鍒楄〃
+ </div>
+ <div class="tab3">
+ <div class="outside1">
+ <el-tree
+ class="filter-tree"
+ v-loading="loading"
+ :data="TreedataList"
+ node-key="proId"
+ :props="defaultProps"
+ :filter-node-method="filterNode"
+ show-checkbox
+ @check-change="handleCurrentChecked1"
+ :default-checked-keys="checkedListkey"
+ >
+ </el-tree>
+ </div>
+ </div>
+ </el-col>
+ <el-col :span="12">
<div class="grid-content bg-purple">
+ <div style="text-align: center; margin-bottom: 10px">
+ 宸查�夐」鐩垪琛�
+ </div>
+ <div
+ style="
+ padding: 0px 6px;
+ border: 1px solid #e6ebf5;
+ max-height: 420px;
+ overflow: auto;
+ "
+ >
+ <el-table
+ :data="DataList"
+ border
+ style="width: 100%"
+ height="250"
+ >
+ <el-table-column prop="propinName" label="妫�鏌ラ」鐩�">
+ </el-table-column>
+ <el-table-column prop="proName" label="鏄庣粏椤圭洰" width="180">
+ </el-table-column>
+ <el-table-column prop="proPrice" label="鍘熶环">
+ </el-table-column>
+
+ <el-table-column
+ label="鎿嶄綔"
+ align="center"
+ fixed="right"
+ class-name="small-padding fixed-width"
+ width="80px"
+ >
+ <template slot-scope="scope">
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-delete"
+ @click="handleDelete(scope.row)"
+ title="鍒犻櫎"
+ ></el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <el-collapse v-model="activeName" accordion v-if="list1">
+ <div>
+ <el-collapse-item title="璇烽�夋嫨椤圭洰">
+ <el-table :data="DataList" border style="width: 100%">
+ <el-table-column prop="proName" label="椤圭洰" width="180">
+ </el-table-column>
+ <el-table-column prop="ordPrice" label="鍘熶环">
+ </el-table-column>
+ </el-table>
+ </el-collapse-item>
+ </div>
+ </el-collapse>
+ </div>
<template>
<el-form :model="form">
<el-form-item label="浣撴绫诲瀷" prop="tjType">
@@ -661,50 +765,6 @@
</el-form-item>
</el-form>
</div>
- <div style="text-align: center; margin-bottom: 10px">
- 宸查�夐」鐩垪琛�
- </div>
- <div
- style="
- padding: 0px 6px;
- border: 1px solid #e6ebf5;
- max-height: 420px;
- overflow: auto;
- "
- >
- <el-collapse v-model="activeName" accordion>
- <div v-for="(item, index) in DataList" :key="index">
- <el-collapse-item>
- <template slot="title">
- {{ item.proName + "(" + "鍘熶环" + item.proPrice + ")" }}
- </template>
- <el-table
- :data="item.tjProjectList"
- border
- style="width: 100%"
- height="250"
- >
- <el-table-column prop="proName" label="椤圭洰" width="180">
- </el-table-column>
- <el-table-column prop="proPrice" label="鍘熶环">
- </el-table-column>
- </el-table>
- </el-collapse-item>
- </div>
- </el-collapse>
- <el-collapse v-model="activeName" accordion v-if="list1">
- <div>
- <el-collapse-item title="璇烽�夋嫨椤圭洰">
- <el-table :data="DataList" border style="width: 100%">
- <el-table-column prop="proName" label="椤圭洰" width="180">
- </el-table-column>
- <el-table-column prop="ordPrice" label="鍘熶环">
- </el-table-column>
- </el-table>
- </el-collapse-item>
- </div>
- </el-collapse>
- </div>
</div>
</el-col>
</el-row>
@@ -763,7 +823,12 @@
import moment from "moment";
import { getwater } from "@/api/hosp/customer";
import ViewPdf from "@/components/ViewPdf";
-import { projectGetList, getaddtTransition } from "@/api/system/tijian";
+import {
+ projectGetList,
+ getaddtTransition,
+ getProParentIdDxList,
+ getProSonDxList,
+} from "@/api/system/tijian";
export default {
components: {
ViewPdf,
@@ -794,10 +859,13 @@
flag: true,
bill: null,
Treedata: [],
+ checkedkey: [],
+ checkedListkey: [],
defaultProps: {
- children: "tjProjectList",
+ children: [],
label: "proName",
},
+ TreedataList: [],
discount: 10,
DataList: [],
// 濂楅鎻愪氦鎸夐挳
@@ -888,7 +956,7 @@
},
created() {
// this.getNowTime();
-
+
this.getdate();
},
mounted() {
@@ -899,14 +967,13 @@
methods: {
getdate() {
getNewDateList().then((res) => {
- if(res.data){
+ if (res.data) {
this.createTimeList = [
moment(res.data).format("YYYY-MM-DD 00:00:00"),
- moment(res.data).format("YYYY-MM-DD 23:59:00")
+ moment(res.data).format("YYYY-MM-DD 23:59:00"),
];
this.getList();
}
-
});
},
filterNode(value, data) {
@@ -955,9 +1022,12 @@
if (this.startTime) {
this.queryParams.djbeginTime = this.startTime[0];
this.queryParams.djendTime = this.startTime[1];
- }else{
- this.queryParams.djbeginTime = this.createTimeList[0];
+ } else 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;
}
if (this.startTime1) {
this.queryParams.bgbeginTime = this.startTime1[0];
@@ -1064,7 +1134,6 @@
},
// 琛ㄥ崟閲嶇疆
reset() {
-
this.form = {
orderId: null,
userId: null,
@@ -1102,9 +1171,9 @@
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
- this.startTime = []
- this.startTime1 = []
- this.createTimeList = []
+ this.startTime = [];
+ this.startTime1 = [];
+ this.createTimeList = [];
this.resetForm("queryForm");
this.handleQuery();
},
@@ -1158,6 +1227,7 @@
// 琛ュ綍椤圭洰
handleProject(row) {
this.loading = true;
+ this.DataList = [];
this.orderId = row.orderId;
this.cusId = row.tjCusIdCard;
this.userId = row.userId;
@@ -1173,16 +1243,41 @@
this.form.tjType = 0;
}
/** 鏌ヨ閮ㄩ棬涓嬫媺鏍戠粨鏋� */
- projectGetList().then((response) => {
- this.Treedata = response.data.list;
- this.loading = false;
- });
+ this.getDataList();
this.Projectopen = true;
this.title = "琛ュ綍椤圭洰";
},
+
+ getDataList() {
+ getProParentIdDxList().then((response) => {
+ this.Treedata = response.data.list;
+ this.checkedkey.push(this.Treedata[0].proId);
+ let proId = this.Treedata[0].proId;
+ getProSonDxList(proId).then((res) => {
+ this.TreedataList = res.data.list;
+ this.TreedataList.forEach((item) => {
+ this.checkedListkey.push(item.proId);
+ this.DataList.push(item);
+ this.DataList.forEach((item) => {
+ item.propinName = this.Treedata[0].proName;
+ });
+ });
+ this.TotalPrice1 = 0;
+
+ if (this.DataList.length != 0) {
+ this.list1 = false;
+ this.DataList.forEach((item) => {
+ this.TotalPrice1 = item.proPrice + this.TotalPrice1;
+ });
+ }
+ });
+ this.loading = false;
+ });
+ },
// 琛ュ綍椤圭洰
- handleProject1(row) {
+ handleProject1() {
this.loading = true;
+ this.DataList = [];
this.orderId = this.ids;
this.cusId = this.cusIds;
this.userId = this.userIds;
@@ -1192,59 +1287,119 @@
cusPhone: this.cusPhone,
cusSex: this.cusSex,
};
- if (row.tjType) {
- this.form.tjType = parseInt(row.tjType);
- } else {
- this.form.tjType = 0;
- }
+ // if (row.tjType) {
+ // this.form.tjType = parseInt(row.tjType);
+ // } else {
+ // this.form.tjType = 0;
+ // }
/** 鏌ヨ閮ㄩ棬涓嬫媺鏍戠粨鏋� */
- projectGetList().then((response) => {
- this.Treedata = response.data.list;
- this.loading = false;
- });
+ this.getDataList();
this.Projectopen1 = true;
this.title = "琛ュ綍椤圭洰";
},
// 鐐瑰嚮鑾峰彇姣忎釜鏍戣妭鐐�
handleCurrentChecked(data, checked, checkedNodes) {
- if (!data.tjProjectList) {
- return;
- }
- if (checked === true) {
- this.DataList.push(data);
- } else {
- this.DataList.pop(data);
- this.list1 = true;
- }
- // let DataList = selectedobj.checkedNodes
- // if (DataList.length>0) {
- // DataList.forEach(item => {
- // if (nodeobj.proId === item.proId) {
- // this.DataList = []
- // this.DataList.push(item)
-
- // this.list1 = false;
- // }
- // })
- // }else{
- // this.DataList = []
- // this.list1 = true;
- // }
- this.TotalPrice1 = 0;
- this.proIds = [];
- if (this.DataList.length != 0) {
- this.list1 = false;
- this.DataList.forEach((item) => {
- this.TotalPrice1 = item.proPrice + this.TotalPrice1;
- item.tjProjectList.forEach((item1) => {
- this.proIds.push(item1.proId);
+ console.log(data, checked, checkedNodes);
+ console.log(this.DataList,22222);
+ if (checked.checkedNodes.length != 0) {
+ this.$refs.tree.setCheckedKeys([data.proId]);
+ let proId = data.proId;
+ getProSonDxList(proId).then((res) => {
+ this.TreedataList = res.data.list;
+ this.TreedataList.forEach((item) => {
+ this.checkedListkey.push(item.proId);
+ this.DataList.push(item);
+ this.DataList.forEach((item1) => {
+ if (item1.proParentId == data.proId) {
+ item1.propinName = data.proName;
+ }
+ });
});
+ this.spliceData(this.DataList);
+ this.TotalPrice1 = 0;
+ if (this.DataList.length != 0) {
+ this.list1 = false;
+ this.DataList.forEach((item) => {
+ this.TotalPrice1 = item.proPrice + this.TotalPrice1;
+ });
+ }
+ });
+ } else if (checked.checkedNodes.length == 0) {
+ let proId = data.proId;
+ getProSonDxList(proId).then((res) => {
+ this.TreedataList = res.data.list;
+ this.DataList.forEach((item, index) => {
+ this.TreedataList.forEach((item1) => {
+ if (item.proId == item1.proId) {
+ this.DataList.splice(index, this.TreedataList.length);
+ this.TotalPrice1 = 0;
+ this.DataList.forEach((item1) => {
+ this.TotalPrice1 = item1.proPrice + this.TotalPrice1;
+ });
+ }
+ });
+ });
+ });
+ this.checkedListkey = [];
+ console.log(this.DataList,1111)
+ }
+ },
+
+ spliceData(row) {
+ for (var i = 0; i < row.length; i++) {
+ for (var j = i + 1; j < row.length; j++) {
+ if (row[i].proId == row[j].proId) {
+ //濡傛灉绗竴涓瓑浜庣浜屼釜锛宻plice鏂规硶鍒犻櫎绗簩涓�
+ row.splice(j, 1);
+ j--;
+ }
+ }
+ }
+ return row;
+ },
+
+ // 鐐瑰嚮鑾峰彇姣忎釜鏍戣妭鐐�
+ handleCurrentChecked1(data, checked, checkedNodes) {
+ if (checked == false) {
+ this.DataList.forEach((item, index) => {
+ if (item.proId == data.proId) {
+ this.DataList.splice(index, 1);
+ this.TotalPrice1 = 0;
+ this.DataList.forEach((item1) => {
+ this.TotalPrice1 = item1.proPrice + this.TotalPrice1;
+ });
+ }
+ });
+ } else if (checked == true) {
+ this.DataList.push(data);
+ this.TotalPrice1 = 0;
+ this.DataList.forEach((item1) => {
+ this.TotalPrice1 = item1.proPrice + this.TotalPrice1;
});
}
},
+ /** 鍒犻櫎鎸夐挳鎿嶄綔 */
+ handleDelete(row) {
+ this.DataList.forEach((item, index) => {
+ if (item.proId == row.proId) {
+ this.DataList.splice(index, 1);
+ this.TotalPrice1 = 0;
+ this.DataList.forEach((item1) => {
+ this.TotalPrice1 = item1.proPrice + this.TotalPrice1;
+ });
+ }
+ });
+ },
+
// 鏀惰垂鎸夐挳
submitPrice() {
+ this.proIds = [];
+ if (this.DataList.length != 0) {
+ this.DataList.forEach((item) => {
+ this.proIds.push(item.proId);
+ });
+ }
let data = {
cusId: this.cusId,
proIds: this.proIds,
@@ -1280,6 +1435,12 @@
},
// 鏀惰垂鎸夐挳
submitPrice1() {
+ this.proIds = [];
+ if (this.DataList.length != 0) {
+ this.DataList.forEach((item) => {
+ this.proIds.push(item.proId);
+ });
+ }
let data = {
cusId: this.cusIds,
proIds: this.proIds,
@@ -1334,16 +1495,7 @@
// }
// });
// },
- /** 鍒犻櫎鎸夐挳鎿嶄綔 */
- // handleDelete(row) {
- // const orderIds = row.orderId || this.ids;
- // this.$modal.confirm('鏄惁纭鍒犻櫎浣撴璁板綍缂栧彿涓�"' + orderIds + '"鐨勬暟鎹」锛�').then(function() {
- // return delOrder(orderIds);
- // }).then(() => {
- // this.getList();
- // this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- // }).catch(() => {});
- // },
+
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
this.download(
@@ -1421,7 +1573,7 @@
}
.outside1 {
- width: 700px;
+ width: 500px;
display: flex;
margin-top: 8px;
}
diff --git a/src/views/mall/checklog/index.vue b/src/views/mall/checklog/index.vue
index afb5fb7..04bc396 100644
--- a/src/views/mall/checklog/index.vue
+++ b/src/views/mall/checklog/index.vue
@@ -359,8 +359,14 @@
/** 鏌ヨ鏍搁攢璁板綍鍒楄〃 */
getList() {
this.loading = true;
- this.queryParams.startTime = this.createTimeList[0]
+ if(this.createTimeList){
+ this.queryParams.startTime = this.createTimeList[0]
this.queryParams.endTime = this.createTimeList[1]
+ }else if(this.createTimeList == null){
+ this.queryParams.startTime = null
+ this.queryParams.endTime = null
+ }
+
listChecklog(this.queryParams).then((response) => {
response.rows.forEach((item, index) => {
item.newID =
diff --git a/src/views/reservation/reservations/index.vue b/src/views/reservation/reservations/index.vue
index b1f0b7c..dda05d6 100644
--- a/src/views/reservation/reservations/index.vue
+++ b/src/views/reservation/reservations/index.vue
@@ -523,7 +523,7 @@
<el-form-item label="鍗″彿" prop="indexCard">
<el-input v-model="formIn.indexCard" placeholder="璇疯緭鍏ュ崱鍙�" style="width: 190px" />
</el-form-item>
- <el-button type="primary" @click="Package" size="mini">閫夋嫨濂楅</el-button>
+ <!-- <el-button type="primary" @click="Package" size="mini">閫夋嫨濂楅</el-button> -->
</el-form>
</div>
@@ -628,7 +628,7 @@
</el-form-item>
<el-form-item>
- <el-button type="primary" @click="submitPrice" :disabled="confirm" size="mini">绛惧埌鐧昏</el-button>
+ <el-button type="primary" @click="submitPrice" :disabled="confirm" size="mini">棰勭害淇敼</el-button>
</el-form-item>
<!-- </el-form> -->
<!-- </div> -->
diff --git a/src/views/sampling/sampling/index.vue b/src/views/sampling/sampling/index.vue
index babc5a5..db6e314 100644
--- a/src/views/sampling/sampling/index.vue
+++ b/src/views/sampling/sampling/index.vue
@@ -433,8 +433,14 @@
getList() {
this.loading = true;
this.queryParams.isSignFor = this.tjStatus;
- this.queryParams.beginTime = this.createTimeList[0];
+ if(this.createTimeList){
+ this.queryParams.beginTime = this.createTimeList[0];
this.queryParams.endTime = this.createTimeList[1];
+ }else if(this.createTimeList == null){
+ this.queryParams.beginTime = null;
+ this.queryParams.endTime = null;
+ }
+
getList(this.queryParams).then((response) => {
if (response.data) {
if (response.data.list == null) {
@@ -488,7 +494,7 @@
this.resetForm("form");
},
hb() {
- console.log(this.queryParams.tjNum);
+ // console.log(this.queryParams.tjNum);
if (this.queryParams.tjNum != null) {
this.handleQuery();
}
diff --git a/src/views/standard/renshunum/index.vue b/src/views/standard/renshunum/index.vue
index 91a8092..127c06a 100644
--- a/src/views/standard/renshunum/index.vue
+++ b/src/views/standard/renshunum/index.vue
@@ -108,8 +108,14 @@
});
},
getList() {
- this.queryParams.beginTime = this.startTime[0];
+ if(this.startTime){
+ this.queryParams.beginTime = this.startTime[0];
this.queryParams.endTime = this.startTime[1];
+ }else if(this.startTime == null){
+ this.queryParams.beginTime = null;
+ this.queryParams.endTime = null;
+ }
+
getTiaoNumsByDate(this.queryParams).then((res) => {
let myChart = this.$echarts.init(document.getElementById("main"));
//浣犺繘鍏ラ〉闈㈠厛鎶婂浘琛ㄦ覆鏌撲簡 鐒跺悗鎵嶈幏鍙栫殑鏁版嵁鎶�
diff --git a/src/views/standard/tijiancom/index.vue b/src/views/standard/tijiancom/index.vue
index b3d9b66..94bd810 100644
--- a/src/views/standard/tijiancom/index.vue
+++ b/src/views/standard/tijiancom/index.vue
@@ -93,7 +93,10 @@
if (this.value1) {
this.queryParams.startDate = this.value1[0];
this.queryParams.endDate = this.value1[1];
- } else {
+ }else if (this.value1==null) {
+ this.queryParams.startDate = null;
+ this.queryParams.endDate = null;
+ }else {
this.queryParams.startDate = this.startTime[0];
this.queryParams.endDate = this.startTime[1];
}
diff --git a/src/views/system/Checkout/index.vue b/src/views/system/Checkout/index.vue
index f054490..46b4bf8 100644
--- a/src/views/system/Checkout/index.vue
+++ b/src/views/system/Checkout/index.vue
@@ -568,10 +568,14 @@
if (this.startTime) {
this.queryParams.djbeginTime = this.startTime[0];
this.queryParams.djendTime = this.startTime[1];
- } else {
+ } else 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;
getQianLiList(this.queryParams).then((response) => {
diff --git a/src/views/system/bill/index.vue b/src/views/system/bill/index.vue
index 59ff0d8..0863b96 100644
--- a/src/views/system/bill/index.vue
+++ b/src/views/system/bill/index.vue
@@ -825,6 +825,9 @@
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;
}else{
this.queryParams.djbeginTime = this.startTime[0];
this.queryParams.djendTime = this.startTime[1];
@@ -898,7 +901,7 @@
this.resetForm("form");
},
hb(){
- console.log(this.queryParams.tjNum);
+ // console.log(this.queryParams.tjNum);
if (this.queryParams.tjNum != undefined) {
this.handleQuery();
}
diff --git a/src/views/system/biol/index.vue b/src/views/system/biol/index.vue
index d7f7d3d..8173577 100644
--- a/src/views/system/biol/index.vue
+++ b/src/views/system/biol/index.vue
@@ -765,6 +765,9 @@
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;
diff --git a/src/views/system/circle/index.vue b/src/views/system/circle/index.vue
index 942f3e5..fa8f375 100644
--- a/src/views/system/circle/index.vue
+++ b/src/views/system/circle/index.vue
@@ -491,8 +491,14 @@
},
/** 鏌ヨ浣撴璁板綍鍒楄〃 */
getList() {
- this.queryParams.djbeginTime = this.createTimeList[0];
+ 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;
getWenJuanList(this.queryParams).then((response) => {
this.orderList = response.data.list;
diff --git a/src/views/system/examcharge/index.vue b/src/views/system/examcharge/index.vue
index f3fbfbd..e7d5afb 100644
--- a/src/views/system/examcharge/index.vue
+++ b/src/views/system/examcharge/index.vue
@@ -212,15 +212,17 @@
</el-row>
</el-form>
- <div style="margin-bottom: 10px">
- <el-radio-group
+ <div style="margin-bottom: 10px;margin-left: 25px;">
+ <h3>鏀惰垂璁板綍</h3>
+
+ <!-- <el-radio-group
v-model="queryParams.type"
@input="handleUpdate"
style="margin-left: 30px"
>
<el-radio-button label="1">鏀惰垂璁板綍</el-radio-button>
- <!-- <el-radio-button label="2">閫�璐硅褰�</el-radio-button> -->
- </el-radio-group>
+ <el-radio-button label="2">閫�璐硅褰�</el-radio-button>
+ </el-radio-group> -->
</div>
<el-table
@@ -583,7 +585,7 @@
},
// 鐐瑰嚮鑾峰彇姣忎釜鏍戣妭鐐�
handleCurrentChecked(data, checked, checkedNodes) {
- console.log(data, checked);
+ // console.log(data, checked);
// this.form.tjPro = "",
// this.form.ys = 0
if (checked) {
diff --git a/src/views/system/visit/index.vue b/src/views/system/visit/index.vue
index 0906285..b4cf172 100644
--- a/src/views/system/visit/index.vue
+++ b/src/views/system/visit/index.vue
@@ -517,8 +517,15 @@
},
/** 鏌ヨ浣撴璁板綍鍒楄〃 */
getList() {
- this.queryParams.djbeginTime = this.createTimeList[0];
+ 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;
getOrderList(this.queryParams).then((response) => {
this.orderList = response.data.list;
diff --git a/src/views/team/disease/index.vue b/src/views/team/disease/index.vue
index 6a5466a..0df0442 100644
--- a/src/views/team/disease/index.vue
+++ b/src/views/team/disease/index.vue
@@ -367,8 +367,14 @@
},
// 鍥㈡鐥呯椤甸潰鏌ヨ浜哄憳鍒楄〃
getList() {
- this.queryParams.beginTime = this.createTimeList[0];
+ if(this.createTimeList){
+ this.queryParams.beginTime = this.createTimeList[0];
this.queryParams.endTime = this.createTimeList[1];
+ }else if(this.createTimeList == null){
+ this.queryParams.beginTime = null;
+ this.queryParams.endTime = null;
+ }
+
getPeopleList(this.queryParams).then((res) => {
this.tableData = res.data.voList;
this.total = res.data.total;
diff --git a/src/views/team/reportresults/index.vue b/src/views/team/reportresults/index.vue
index ef10ed9..4fc2186 100644
--- a/src/views/team/reportresults/index.vue
+++ b/src/views/team/reportresults/index.vue
@@ -488,8 +488,14 @@
},
// 鍥㈡鐥呯椤甸潰鏌ヨ浜哄憳鍒楄〃
getList() {
- this.queryParams.beginTime = this.createTimeList[0];
+ if(this.createTimeList){
+ this.queryParams.beginTime = this.createTimeList[0];
this.queryParams.endTime = this.createTimeList[1];
+ }else if(this.createTimeList == null){
+ this.queryParams.beginTime = null;
+ this.queryParams.endTime = null;
+ }
+
getPeopleList(this.queryParams).then((res) => {
this.tableData = res.data.voList;
this.total = res.data.total;
@@ -498,11 +504,11 @@
handleSizeChange(val) {
this.queryParam.pageSize = val;
- this.geticd();
+ // this.geticd();
},
handleCurrentChange(val) {
this.queryParam.page = val;
- this.geticd();
+ // this.geticd();
},
/** 鏌ヨ浣撴鍗曚綅淇℃伅缁存姢鍒楄〃 */
getcomp() {
@@ -538,8 +544,8 @@
handleQuery() {
this.queryParams.page = 1;
this.getList();
- this.queryParam.page = 1;
- this.geticd();
+ // this.queryParam.page = 1;
+ // this.geticd();
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
diff --git a/src/views/team/teams/index.vue b/src/views/team/teams/index.vue
index 30b6629..d2da4c5 100644
--- a/src/views/team/teams/index.vue
+++ b/src/views/team/teams/index.vue
@@ -376,7 +376,7 @@
],
data() {
let checkPhoneNum = (rule, value, callback) => {
- console.log(value);
+ // console.log(value);
let patter = new RegExp(/^1\s*[3456789]\s*(\d\s*){9}$/);
if (value == "" && value == undefined && !value) {
return callback("");
@@ -408,6 +408,7 @@
// 寮瑰嚭灞傛爣棰�
title: "",
bingZhong: "",
+ createTimeList:[],
Listdata: {},
ListdataAll: [],
aidList: [],
@@ -422,6 +423,7 @@
menuIds: [],
proIds: [],
valueList: [],
+ loading:false,
// 鏄惁鏄剧ず寮瑰嚭灞�
open: false,
open1: false,
@@ -497,11 +499,6 @@
},
getList() {
this.loading = true;
- if(this.createTimeList){
- this.objs.beginTime=this.createTimeList[0],
- this.objs.endTime=this.createTimeList[1]
- }
-
getCompany(this.objs).then((response) => {
this.CompanyList = response.data;
this.total = response.total;
@@ -509,15 +506,21 @@
});
},
handlequery() {
- if (this.objs.firmId && this.objs.dwDeptId) {
- this.objs.beginTime = this.createTimeList[0];
- this.objs.endTime = this.createTimeList[1];
+ if(this.createTimeList){
+ this.objs.beginTime=this.createTimeList[0],
+ this.objs.endTime=this.createTimeList[1]
+ }else if(this.createTimeList == null){
+ this.objs.beginTime=null,
+ this.objs.endTime=null
+ }
+ if (this.objs.firmId && this.objs.dwDeptId && this.objs.beginTime) {
+
tuanTiListById(this.objs).then((response) => {
this.Listdata = response.data;
this.userList = response.data.list;
});
} else {
- this.$message.warning("甯︽槦鍙蜂负蹇呭～椤�");
+ this.$message.warning("鏌ヨ椤逛负蹇呭～椤�");
}
},
handleQuery1() {
@@ -660,9 +663,9 @@
firmDeptId: this.data.deptId,
aidList: this.aidList,
};
- console.log(data);
+ // console.log(data);
tuanTiBingChart(data).then((res) => {
- console.log(res);
+ // console.log(res);
this.$nextTick(() => {
var chartDom = document.getElementById("main");
var myChart = echarts.init(chartDom);
--
Gitblit v1.8.0