From 0c2c35139886532e938ea304254a339bd22cbd41 Mon Sep 17 00:00:00 2001
From: su1124 <1583764726@qq.com>
Date: 星期一, 24 六月 2024 19:26:11 +0800
Subject: [PATCH] su
---
src/views/system/tijian/index.vue | 26 ++++++++++---
dist.zip | 0
src/views/hosp/order/index.vue | 11 +++--
vue.config.js | 2
src/api/system/tijian.js | 3 +
src/views/system/package/index.vue | 21 +++++-----
src/views/system/tijianall/index.vue | 47 +++++++++++++++++++++++
7 files changed, 87 insertions(+), 23 deletions(-)
diff --git a/dist.zip b/dist.zip
new file mode 100644
index 0000000..916420b
--- /dev/null
+++ b/dist.zip
Binary files differ
diff --git a/src/api/system/tijian.js b/src/api/system/tijian.js
index 7dbb90c..5e5a940 100644
--- a/src/api/system/tijian.js
+++ b/src/api/system/tijian.js
@@ -41,6 +41,9 @@
return request({
url: "/hosp/project/getProParentIdDxList",
method: "get",
+ // params: {
+ // pname: pname,
+ // },
});
}
diff --git a/src/views/hosp/order/index.vue b/src/views/hosp/order/index.vue
index db35bc7..c1f5c39 100644
--- a/src/views/hosp/order/index.vue
+++ b/src/views/hosp/order/index.vue
@@ -1023,11 +1023,12 @@
},
filterNode(value, data) {
if (!value) return true;
- if (value == data.proName) {
- return data.proName.indexOf(value) !== -1;
- } else {
- return data.proEngName.indexOf(value) !== -1;
- }
+ return data.proName.indexOf(value) !== -1;
+ // if (value == data.proName) {
+ // return data.proName.indexOf(value) !== -1;
+ // } else {
+ // return data.proEngName.indexOf(value) !== -1;
+ // }
},
// / 澶勭悊榛樿閫変腑褰撳墠鏃ユ湡
// getNowTime() {
diff --git a/src/views/system/package/index.vue b/src/views/system/package/index.vue
index a503853..fe7702d 100644
--- a/src/views/system/package/index.vue
+++ b/src/views/system/package/index.vue
@@ -432,8 +432,8 @@
style="width: 150px"
/>
</el-form-item>
- <el-form-item label="浣撴绫诲埆" prop="tjCategory">
- <el-select
+ <el-form-item label="浣撴绫诲埆" prop="tjCategory">
+ <el-select
v-model="form.tjCategory"
placeholder="璇烽�夋嫨鏄惁涓婃灦"
style="width: 150px"
@@ -448,7 +448,6 @@
></el-option>
</el-select>
</el-form-item>
-
<div v-if="!isCollapsed" style="display: flex">
<div>
@@ -604,7 +603,7 @@
</template>
</el-table-column>-->
</el-table>
- <h3 style="font-weight: 600;">鍚堣锛歿{ pics }}鍏�</h3>
+ <h3 style="font-weight: 600">鍚堣锛歿{ pics }}鍏�</h3>
</div>
</el-col>
</el-row>
@@ -657,7 +656,7 @@
import { Message } from "element-ui";
export default {
name: "Package",
- dicts: ["sys_normal_disable", "sys_yes_no","dict_tjtype"],
+ dicts: ["sys_normal_disable", "sys_yes_no", "dict_tjtype"],
components: { Packages },
data() {
let checkPhoneNum = (rule, value, callback) => {
@@ -782,11 +781,12 @@
},
filterNode(value, data) {
if (!value) return true;
- if(value == data.proName){
- return data.proName.indexOf(value) !== -1;
- }else{
- return data.proEngName.indexOf(value) !== -1;
- }
+ return data.proName.indexOf(value) !== -1;
+ // if(value == data.proName){
+ // return data.proName.indexOf(value) !== -1;
+ // }else{
+ // return data.proEngName.indexOf(value) !== -1;
+ // }
},
/** 鏌ヨ浣撴濂楅鍒楄〃 */
getList() {
@@ -1446,7 +1446,6 @@
max-height: 400px;
overflow-y: auto;
border: 1px solid #d9d9d9;
-
}
/* .custom-tree-node {
flex: 1;
diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index 28416de..cc2786b 100644
--- a/src/views/system/tijian/index.vue
+++ b/src/views/system/tijian/index.vue
@@ -550,7 +550,9 @@
>
椤圭洰鍒楄〃
</div>
- <el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterText">
+ <!-- @input="gaibian" -->
+ <el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�"
+ v-model="filterText">
</el-input>
<div class="tab3">
<el-tree
@@ -1311,6 +1313,7 @@
},
data() {
return {
+ pname:"",
filterText: "",
proIdList: [],
tableDatas: [],
@@ -1556,11 +1559,12 @@
},
filterNode(value, data) {
if (!value) return true;
- if(value == data.proName){
- return data.proName.indexOf(value) !== -1;
- }else{
- return data.proEngName.indexOf(value) !== -1;
- }
+ return data.proName.indexOf(value) !== -1;
+ // if(value == data.proName){
+ // return data.proName.indexOf(value) !== -1;
+ // }else{
+ // return data.proEngName.indexOf(value) !== -1;
+ // }
},
beforeDestroy() {
clearInterval(this.timer);
@@ -2451,8 +2455,18 @@
this.getDataList();
}
},
+ // gaibian(val){
+ // console.log(val);
+ // let pname = val;
+ // console.log(pname);
+ // getProParentIdDxList(pname).then(response=>{
+ // this.Treedata = response.data.list;
+ // })
+ // },
getDataList() {
+ console.log(111);
this.loading = true;
+ // this.pname = "null";
getProParentIdDxList().then((response) => {
this.Treedata = response.data.list;
if (this.tableData[0]) {
diff --git a/src/views/system/tijianall/index.vue b/src/views/system/tijianall/index.vue
index a85cbf4..63be90b 100644
--- a/src/views/system/tijianall/index.vue
+++ b/src/views/system/tijianall/index.vue
@@ -679,6 +679,12 @@
".00鍏�)"
}}
</template>
+ <el-button
+ type="primary"
+ @click="candelete(item)"
+ style="margin: 5px"
+ >鍒� 闄�</el-button
+ >
<el-table
:data="item.list"
border
@@ -842,6 +848,7 @@
getaddTj,
getHistryTjOrderByCusIdCard,
getHistryTjOrderProByCusIdCard,
+ delTbBycusCardIdAndProId,
} from "@/api/system/tijian";
import { MessageBox } from "element-ui";
import VTreeTransfer from "../tijian/TreeTransfer.vue";
@@ -1156,7 +1163,47 @@
inputChanges() {
this.$refs.historyTj.getlist();
},
+ candelete(item) {
+ let data = {
+ cusCardId: this.form.cusIdcard,
+ proId: item.proPrantId,
+ };
+ delTbBycusCardIdAndProId(data).then((res) => {
+ getTransitionList(this.form.cusIdcard).then((response) => {
+ this.tableData1 = response.data;
+ this.TotalPrice1 = 0;
+ if (this.tableData1) {
+ this.tableData1.forEach((item) => {
+ this.TotalPrice1 += item.nowPrice;
+ if (item.pacName === null) {
+ item.pacName = "鍗曢」";
+ }
+ if (item.pacName == "鍗曢」") {
+ item.list.forEach((item9) => {
+ this.treeList.push(item9.proId);
+ });
+ }
+ this.pacName = item.pacName;
+ });
+ const r = /^\+?[0-9][0-9]*$/; //姝ｆ暣鏁帮紙鍙互0鎵撳ご锛�
+ let TotalPrice = this.TotalPrice1 * (this.discount / 10);
+ if (r.test(TotalPrice)) {
+ this.TotalPrice = TotalPrice + ".00";
+ } else {
+ this.TotalPrice = TotalPrice;
+ }
+
+ this.list1 = false;
+ this.list3 = true;
+ } else {
+ this.list1 = true;
+
+ this.TotalPrice = "0.00";
+ }
+ });
+ });
+ },
filterNode(value, data) {
if (!value) return true;
// return data.proName.indexOf(value) !== -1;
diff --git a/vue.config.js b/vue.config.js
index e6d5c1c..a9af51d 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -53,7 +53,7 @@
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
// target: `https://ltpeis.xaltjdkj.cn:5801/`,
- target: `http://192.168.1.3:5011`,
+ target: `http://192.168.1.113:5011`,
// // target: `http://192.168.0.99:8080/ltkj-admin`,
// target: `https://ltpeis.xaltjdkj.cn:5011/ltkj-admin`,
// target: `http://10.168.0.9:5011`,
--
Gitblit v1.8.0