From 30565c28ef92fbafc0247424d1d741e5d4df8c00 Mon Sep 17 00:00:00 2001
From: qinxianzhangyao <11053546+qinxianzhangyao@user.noreply.gitee.com>
Date: 星期三, 20 十二月 2023 17:41:45 +0800
Subject: [PATCH] qxtj
---
src/views/index.vue | 41 ++++++++-----
src/views/system/tijian/index.vue | 110 +++++++++++++++++++++---------------
src/views/hosp/order/index.vue | 2
src/views/hosp/project/index.vue | 8 +-
4 files changed, 94 insertions(+), 67 deletions(-)
diff --git a/src/views/hosp/order/index.vue b/src/views/hosp/order/index.vue
index 6746f97..12baa41 100644
--- a/src/views/hosp/order/index.vue
+++ b/src/views/hosp/order/index.vue
@@ -198,7 +198,7 @@
</el-dialog>
<!-- 娣诲姞琛ュ綍椤圭洰 -->
- <el-dialog :title="title" :visible.sync="Projectopen" width="980px" style="height: 860px" append-to-body>
+ <el-dialog :title="title" :visible.sync="Projectopen" width="1200px" style="height: 860px" append-to-body>
<el-row type="flex" class="row-bg" justify="space-around">
<el-col :span="6">
<div style="text-align: center; margin-bottom: 10px;margin-top:10px">椤圭洰鍒楄〃</div>
diff --git a/src/views/hosp/project/index.vue b/src/views/hosp/project/index.vue
index 41f5838..bb9506f 100644
--- a/src/views/hosp/project/index.vue
+++ b/src/views/hosp/project/index.vue
@@ -471,7 +471,9 @@
id: null,
},
// 琛ㄥ崟鍙傛暟
- form: {},
+ form: {
+ needReport :"Y"
+ },
// 琛ㄥ崟鏍￠獙
rules: {
createTime: [
@@ -568,7 +570,7 @@
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd(row) {
- this.reset();
+ // this.reset();
this.loading = true;
ProjectTree().then((response) => {
if (response.code == 200) {
@@ -591,7 +593,7 @@
this.form.deptId = this.queryParams.deptId;
this.form.proCheckMethod = "N";
- this.form.needReport ="Y"
+
if ((this.key = "Y")) {
gettreeList().then((response) => {
this.deptOptionstree = response.data;
diff --git a/src/views/index.vue b/src/views/index.vue
index 9c81bc0..dcbe83a 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -72,10 +72,18 @@
created() {
this.getList();
+
},
+ watch: {
+ $route(to, from) {
+ window.location.reload(); //鐩戞祴鍒拌矾鐢卞彂鐢熻烦杞椂鍒锋柊涓�娆￠〉闈�
+ // this.$router.go(0);
+ },
+ },
+
methods: {
-
+
getList() {
this.loading = true;
// 鏌ヨ浠婃棩鐧昏
@@ -180,17 +188,17 @@
// 楗肩姸鍥�
getPieChart().then((response) => {
if (response.data) {
-
+
if (response.data.tjdj.length === 0) {
this.PieChart = []
this.PieChart = [
- {
- "name": "浣撴鐧昏浜烘暟鍒嗗竷",
- "count": 1,
- "value": 10
- },
-
- ]
+ {
+ "name": "浣撴鐧昏浜烘暟鍒嗗竷",
+ "count": 1,
+ "value": 10
+ },
+
+ ]
} else {
this.PieChart = response.data.tjdj
this.PieChart.forEach(item => {
@@ -237,13 +245,13 @@
if (response.data.tjyc.length === 0) {
this.PieChart2 = []
this.PieChart2 = [
- {
- "name": "浣撴缁撴灉寮傚父浜烘暟鍒嗗竷",
- "count": 1,
- "value": 10
- },
-
- ]
+ {
+ "name": "浣撴缁撴灉寮傚父浜烘暟鍒嗗竷",
+ "count": 1,
+ "value": 10
+ },
+
+ ]
} else {
this.PieChart2 = response.data.tjyc
this.PieChart2.reverse()
@@ -358,6 +366,7 @@
.data-view {
margin: 0 15px;
+ height: 323px !important
}
#main {
diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index 04bc27f..ce4ede2 100644
--- a/src/views/system/tijian/index.vue
+++ b/src/views/system/tijian/index.vue
@@ -14,12 +14,12 @@
</el-form-item>
</el-col>
<el-col :span="7">
- <el-form-item label="濮撳悕" prop="cusName" style="display: flex" :rules="[
+ <el-form-item label="濮撳悕" prop="cusName" style="display: flex" :rules="[
{
required: true, validator: (rule, value, callback) => {
if (!form.cusName) {
callback('')
- } else if(form.cusName){
+ } else if (form.cusName) {
callback()
}
@@ -50,15 +50,14 @@
</el-form-item>
</el-col>
<el-col :span="7">
- <el-form-item label="鎬у埆" prop="cusSex"
- :rules="[
+ <el-form-item label="鎬у埆" prop="cusSex" :rules="[
{
required: true, validator: (rule, value, callback) => {
if (!form.cusSex && showHidden.has_sex === 'Y') {
callback('')
- } else if (showHidden.has_sex === 'N'){
+ } else if (showHidden.has_sex === 'N') {
callback()
- }else if(form.cusSex && showHidden.has_sex === 'Y'){
+ } else if (form.cusSex && showHidden.has_sex === 'Y') {
callback()
}
@@ -72,21 +71,19 @@
</el-col>
<el-col :span="9">
- <el-form-item label="璇佷欢鍙�" prop="cusIdcard"
- :rules="[
+ <el-form-item label="璇佷欢鍙�" prop="cusIdcard" :rules="[
{
required: true, validator: (rule, value, callback) => {
if (!form.cusIdcard && showHidden.has_idcard === 'Y') {
callback('')
- } else if (showHidden.has_idcard === 'N'){
+ } else if (showHidden.has_idcard === 'N') {
callback()
- }else if(form.cusIdcard && showHidden.has_idcard === 'Y'){
+ } else if (form.cusIdcard && showHidden.has_idcard === 'Y') {
callback()
}
}, trigger: 'blur'
- }]"
- style="display: flex">
+ }]" style="display: flex">
<span slot="label" style="display:inline-block;border-bottom: 2px solid blue;" @click="handleQuery">
璇佷欢鍙�
</span>
@@ -119,9 +116,9 @@
required: true, validator: (rule, value, callback) => {
if (!form.cusPhone && showHidden.is_phone === 'Y') {
callback('')
- } else if (showHidden.is_phone === 'N'){
+ } else if (showHidden.is_phone === 'N') {
callback()
- }else if(form.cusPhone && showHidden.is_phone === 'Y'){
+ } else if (form.cusPhone && showHidden.is_phone === 'Y') {
callback()
}
@@ -1619,33 +1616,37 @@
// this.tableData.forEach((item) => {
// this.fData = item.tjProjectList;
// });
+ console.log(this.treedataList)
+ console.log(selection)
if (selection[0]) {
this.DataList = [];
// this.data = JSON.parse(JSON.stringify(this.dXData));
- selection[0].tjProjectList.forEach((selectionitem) => {
- this.treedataList.forEach((item) => {
- if (selectionitem.proName == item.proName) {
- item.disabled = true;
- item.tjProjectList = [];
- }
- if (item.tjProjectList) {
- item.tjProjectList.forEach((item1) => {
- if (selectionitem.proName == item1.proName) {
- item1.disabled = true;
- item1.tjProjectList = [];
- }
- if (item1.tjProjectList) {
- item1.tjProjectList.forEach((item2) => {
- if (selectionitem.proName == item2.proName) {
- item2.disabled = true;
- item2.tjProjectList = [];
- }
- });
- }
- });
- }
+ if (selection[0].tjProjectList) {
+ selection[0].tjProjectList.forEach((selectionitem) => {
+ this.treedataList.forEach((item) => {
+ if (selectionitem.proName == item.proName) {
+ item.disabled = true;
+ item.tjProjectList = [];
+ }
+ if (item.tjProjectList) {
+ item.tjProjectList.forEach((item1) => {
+ if (selectionitem.proName == item1.proName) {
+ item1.disabled = true;
+ item1.tjProjectList = [];
+ }
+ if (item1.tjProjectList) {
+ item1.tjProjectList.forEach((item2) => {
+ if (selectionitem.proName == item2.proName) {
+ item2.disabled = true;
+ item2.tjProjectList = [];
+ }
+ });
+ }
+ });
+ }
+ });
});
- });
+ }
} else {
this.treedataList = JSON.parse(JSON.stringify(this.dXData));
return;
@@ -1659,19 +1660,24 @@
//鍏ㄩ儴濂楅
deptTreeSelect(cusSex).then((response) => {
this.newpacName = response.rows;
+ console.log(this.newpacName)
+ console.log(this.tableData1)
try {
- this.newpacName.forEach((item3) => {
- this.tableData1.forEach((item4) => {
- item4.list.forEach((item6) => {
- if (item6.pacName === item3.pacName) {
- this.$nextTick(() => {
- this.$refs.tb.toggleRowSelection(item3, true);
- });
- throw Error();
- }
+ if (this.tableData1.length >= 1) {
+ this.newpacName.forEach((item3) => {
+ this.tableData1.forEach((item4) => {
+ item4.list.forEach((item6) => {
+ if (item6.pacName === item3.pacName) {
+ this.$nextTick(() => {
+ this.$refs.tb.toggleRowSelection(item3, true);
+ });
+ throw Error();
+ }
+ });
});
});
- });
+ }
+
} catch (error) { }
this.loading = false;
});
@@ -1869,6 +1875,16 @@
getfindTj(data).then((response) => {
if (response.data) {
this.feeitems = response.data;
+ if (this.feeitems.length != 0) {
+ this.$nextTick(() => {
+ this.$refs.multipleTable.toggleRowSelection(
+ this.feeitems[0],
+ true
+ );
+ });
+ } else {
+ this.$refs.multipleTable.clearSelection();
+ }
this.loading = false;
} else {
this.feeitems = [];
--
Gitblit v1.8.0