From 4a60f506a486bfb1d78ef64ac2bcaaa1c8c9295b Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期二, 18 二月 2025 16:07:34 +0800
Subject: [PATCH] qx
---
src/views/system/tijian/index.vue | 37 ++++++++++++++----
src/views/system/user/index.vue | 2
package.json | 1
src/views/hosp/project/index.vue | 38 +++++++++++++++---
src/views/system/manual/index.vue | 4 +-
5 files changed, 64 insertions(+), 18 deletions(-)
diff --git a/package.json b/package.json
index a33da8d..800eace 100644
--- a/package.json
+++ b/package.json
@@ -41,6 +41,7 @@
"babel-polyfill": "^6.26.0",
"big.js": "^6.2.2",
"clipboard": "2.0.8",
+ "cnchar": "^3.2.6",
"core-js": "3.25.3",
"echarts": "4.9.0",
"element-ui": "2.15.10",
diff --git a/src/views/hosp/project/index.vue b/src/views/hosp/project/index.vue
index c499b82..31609a5 100644
--- a/src/views/hosp/project/index.vue
+++ b/src/views/hosp/project/index.vue
@@ -9,8 +9,8 @@
<div class="scrollable-container">
<div class="content">
<el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false"
- :filter-node-method="filterNode" ref="tree" node-key="id" :default-expanded-keys="treeId"
- highlight-current @node-click="handleNodeClick" :render-content="renderContent" />
+ :filter-node-method="filterNode" ref="tree" node-key="id" :default-expanded-keys="treeId"
+ highlight-current @node-click="handleNodeClick" :render-content="renderContent" v-loading="loadings"/>
</div>
</div>
</el-col>
@@ -418,6 +418,7 @@
import IconSelect from "@/components/IconSelect";
import { listConsumables } from "@/api/hosp/consumables";
import { Message } from "element-ui";
+import cnchar from 'cnchar';
import {
listSfxm,
getSfxm,
@@ -475,6 +476,7 @@
ChangeList: [],
// 閬僵灞�
loading: true,
+ loadings: false,
key: "",
// 閫変腑鏁扮粍
ids: [],
@@ -667,7 +669,7 @@
};
getAllChildListById(data).then((response) => {
this.projectList = response.data.list;
- console.log("杩涙潵浜嗗垪琛ㄥ苟涓旇幏鍙栧埌浜嗗��", this.projectList);
+ // console.log("杩涙潵浜嗗垪琛ㄥ苟涓旇幏鍙栧埌浜嗗��", this.projectList);
this.loading = false;
});
@@ -887,7 +889,6 @@
deptTree111().then((response) => {
this.deptOptions = response.data;
this.treeId.push(this.treeDate.id);
- console.log(this.treeId)
});
},
@@ -922,14 +923,37 @@
return data.xmmc.indexOf(value) !== -1;
},
// 绛涢�夎妭鐐�
+ // filterNode(value, data) {
+ // console.log(value, data)
+ // if (!value) return true;
+ // return data.label.indexOf(value) !== -1;
+ // },
filterNode(value, data) {
- if (!value) return true;
- return data.label.indexOf(value) !== -1;
+ if (!value) return true;
+ if (data.label.indexOf(value) !== -1) return true;
+ // 鍖归厤灏忓啓
+ let arr = data.label.spell('low', 'array');
+ let spell = arr.join('');
+ let lengths = [0];
+ for (var i = 0; i < arr.length - 1; i++) {
+ lengths.push(lengths[i] + arr[i].length);
+ };
+ //鍒ゆ柇label瀹屾暣鎷奸煶 涓� 杈撳叆鍊肩殑 index 鏄笉鏄瓑浜庢煇涓眽瀛楃涓�涓嫾闊冲瓧姣嶇殑index鍊�
+ if(lengths.indexOf(spell.indexOf(value)) !== -1) return true
+ // 澶у啓
+ let arrUp = data.label.spell('up', 'array');
+ let spellUp = arrUp.join('');
+ let lengthsUp = [0];
+ for (var i = 0; i < arrUp.length - 1; i++) {
+ lengthsUp.push(lengthsUp[i] + arrUp[i].length);
+ };
+ return lengthsUp.indexOf(spellUp.indexOf(value)) !== -1;
},
+
// 鑺傜偣鍗曞嚮浜嬩欢
handleNodeClick(date) {
- console.log("璋冪敤浜唄andleNodeClick ", date.id, this.id)
+ // console.log("璋冪敤浜唄andleNodeClick ", date.id, this.id)
this.treeDate = date;
if (date.qf == "0") {
this.xiugais = true;
diff --git a/src/views/system/manual/index.vue b/src/views/system/manual/index.vue
index 2c4016f..a276d31 100644
--- a/src/views/system/manual/index.vue
+++ b/src/views/system/manual/index.vue
@@ -68,7 +68,7 @@
clearable
/>
</el-form-item>
- <el-form-item label="浣撴绫诲瀷" prop="tblx">
+ <!-- <el-form-item label="浣撴绫诲瀷" prop="tblx">
<el-select
v-model="forms.tblx"
:popper-append-to-body="false"
@@ -84,7 +84,7 @@
:value="item.tblxId"
/>
</el-select>
- </el-form-item>
+ </el-form-item> -->
<el-form-item>
<el-button
type="primary"
diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index fc71db1..f079626 100644
--- a/src/views/system/tijian/index.vue
+++ b/src/views/system/tijian/index.vue
@@ -731,6 +731,7 @@
getByTjNum,
} from "@/api/hosp/customer";
import { getPrintSetUp } from "@/api/system/examcharge";
+import cnchar from 'cnchar';
import {
tuantiSelect,
deptTreeSelect,
@@ -1124,7 +1125,7 @@
.catch(() => { });
},
handleManualChange(row) {
- console.log("杩欐槸涓诲姩鍑哄彂鐨�");
+ // console.log("杩欐槸涓诲姩鍑哄彂鐨�");
this.updateProPrice(row);
},
validateDiscount(row) {
@@ -1151,7 +1152,7 @@
(Math.floor((this.TotalPrice / this.TotalPrice1) * 100) / 100) * 10;
},
updateProPrice1(row) {
- console.log("杩涘叆浜�1")
+ // console.log("杩涘叆浜�1")
const ordPrice = new Big(row.ordPrice);
const discount = new Big(row.discount);
const result = ordPrice.times(discount.div(10));
@@ -1272,13 +1273,33 @@
}, 1000); //姣忕閽熸洿鏂颁竴娆�
},
filterNode(value, data) {
- if (!value) return true;
+ // if (!value) return true;
// return data.proName.indexOf(value) !== -1;
- if (data.proName.indexOf(value) !== -1) {
- return data.proName.indexOf(value) !== -1;
- } else {
- return data.proEngName.indexOf(value) !== -1;
- }
+ // if (data.proName.indexOf(value) !== -1) {
+ // return data.proName.indexOf(value) !== -1;
+ // } else {
+ // return data.proEngName.indexOf(value) !== -1;
+ // }
+ if (!value) return true;
+ if (data.proName.indexOf(value) !== -1) return true;
+ if (data.proEngName.indexOf(value) !== -1) return true;
+ // 鍖归厤灏忓啓
+ let arr = data.proName.spell('low', 'array');
+ let spell = arr.join('');
+ let lengths = [0];
+ for (var i = 0; i < arr.length - 1; i++) {
+ lengths.push(lengths[i] + arr[i].length);
+ };
+ //鍒ゆ柇label瀹屾暣鎷奸煶 涓� 杈撳叆鍊肩殑 index 鏄笉鏄瓑浜庢煇涓眽瀛楃涓�涓嫾闊冲瓧姣嶇殑index鍊�
+ if(lengths.indexOf(spell.indexOf(value)) !== -1) return true
+ // 澶у啓
+ let arrUp = data.proName.spell('up', 'array');
+ let spellUp = arrUp.join('');
+ let lengthsUp = [0];
+ for (var i = 0; i < arrUp.length - 1; i++) {
+ lengthsUp.push(lengthsUp[i] + arrUp[i].length);
+ };
+ return lengthsUp.indexOf(spellUp.indexOf(value)) !== -1;
},
filterpackage(value, data) {
if (!value) return true;
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 4a60aca..4b2252f 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -359,7 +359,7 @@
icon="el-icon-d-arrow-right"
title="鏇村"
></el-button>
- <el-dropdown-menu slot="dropdown">
+ <el-dropdown-menu slot="dropdown" :append-to-body="false">
<el-dropdown-item
command="handleResetPwd"
icon="el-icon-key"
--
Gitblit v1.8.0