Browse Source

forPregnantFlag

master
pengjun 2 years ago
parent
commit
7fefee00f9
  1. 55
      src/components/patientRegister/customerOrgTreeAll.vue
  2. 193
      src/components/patientRegister/customerOrgTreeAllBak.vue
  3. 2
      src/components/report/BtnReport.vue
  4. 874
      src/views/fee-settings/Asbitem.vue

55
src/components/patientRegister/customerOrgTreeAll.vue

@ -7,7 +7,7 @@
<el-tree
:style="'overflow: scroll;height:' + (window.pageHeight < 600 ? 465 : window.pageHeight - 135) + 'px;width:200px;'"
:data="customerOrgTreeAll" :props="treeprops" node-key="id" @node-contextmenu="nodeContextmenu"
@node-click="treeclick" highlight-current ref="customerOrgTree">
@node-click="treeclick" highlight-current ref="customerOrgTree" :load="loadNode" lazy>
<span class="custom-tree-node" slot-scope="{ node, data }">
<div>
<span class="treeicons">
@ -40,13 +40,14 @@ export default {
value: "id",
id: "id",
children: "treeChildren",
isLeaf: "isLeaf"
}, //
LocalConfig: {
patientRegister: {
dispCustomerOrgCode: 'N', // -- customerOrgCode
}
},
customerOrgTreeAll:[]
customerOrgTreeAll: []
};
},
//<el-tree :data="$store.state.customerOrg.customerOrgTree" :props="$store.state.customerOrg.treeprops" @node-click="treeclick"></el-tree>
@ -68,10 +69,36 @@ export default {
//
mounted() {
//
this.getCustomerOrgTree();
// this.getCustomerOrgTree();
this.getCustomerOrgChild(null)
.then(res => {
this.customerOrgTreeAll = res
this.patientRegister.customerOrgTreeAll = res
// console.log('this.customerOrgTreeAll', this.customerOrgTreeAll)
})
},
methods: {
getCustomerOrgChild(parentId) {
return new Promise((resolve, reject) => {
postapi('/api/app/CustomerOrg/GetCustomerOrgByParentId', { parentId })
.then(res => {
if (res.code > -1) {
res.data.forEach(e => {
e.isLeaf = e.isChild == 'Y' ? false : true
});
let treeData = reMadeOrgTree(deepCopy(res.data), this.LocalConfig.patientRegister.dispCustomerOrgCode);
resolve(treeData)
}
})
.catch(err => {
reject(err)
})
})
},
//
getCustomerOrgTree() {
getapi("/api/app/customerorg/getbycodeall").then((res) => {
@ -97,10 +124,20 @@ export default {
// }
// });
// },
loadNode(node, resolve) {
// console.log('node', node)
if (node && node.data && node.data.id) {
this.getCustomerOrgChild(node.data.id).then(res => {
resolve(res)
}).catch(err => {
resolve([])
})
}
},
//
nodeContextmenu(event, data, node, ids) {
// console.log('event,data,node,ids', event, data, node, ids)
console.log('event,data,node,ids', event, data, node, ids)
if (data.id == this.dict.personOrgId) return
let items = [
@ -132,6 +169,7 @@ export default {
//
treeSort(data, sortType) {
console.log('data', data)
// if (data.parentId) {
// this.$message.warning({ showClose: true, message: "" })
// return
@ -139,7 +177,14 @@ export default {
// console.log('data,sortType',data,sortType)
putapi(`/api/app/customerorg/updatemanysort?id=${data.id}&SortType=${sortType}`).then(res => {
if (res.code > -1) {
this.getCustomerOrgTree()
// this.getCustomerOrgTree()
this.getCustomerOrgChild(data.parentId).then(res => {
data.treeChildren = res
if(data.parentId == null){
this.customerOrgTreeAll = res
this.patientRegister.customerOrgTreeAll = res
}
})
}
})
},

193
src/components/patientRegister/customerOrgTreeAllBak.vue

@ -0,0 +1,193 @@
<template>
<div style="width:208px">
<div style="margin:2px 2px 2px 2px;">
<el-input placeholder="输入关键字进行过滤" v-model="filterText" size="small" />
</div>
<div>
<el-tree
:style="'overflow: scroll;height:' + (window.pageHeight < 600 ? 465 : window.pageHeight - 135) + 'px;width:200px;'"
:data="customerOrgTreeAll" :props="treeprops" node-key="id" @node-contextmenu="nodeContextmenu"
@node-click="treeclick" highlight-current ref="customerOrgTree">
<span class="custom-tree-node" slot-scope="{ node, data }">
<div>
<span class="treeicons">
<!-- <i
class="el-icon-document-remove"
v-if="data.parentId == null"
></i> -->
<img style="width:20px;height:20px;vertical-align: sub;" src="@/assets/images/order.png"
v-if="!data.parentId" />
</span>
<span :class="!data.parentId ? 'maxtitle' : 'mintitle'">{{ node.label }}
</span>
</div>
</span>
</el-tree>
</div>
</div>
</template>
<script>
import { mapState } from "vuex";
import { getapi, postapi, putapi, deletapi } from "@/api/api";
import { tcdate, deepCopy, reMadeOrgTree } from "../../utlis/proFunc";
export default {
components: {},
data() {
return {
filterText: '',
treeprops: {
label: "label",
value: "id",
id: "id",
children: "treeChildren",
}, //
LocalConfig: {
patientRegister: {
dispCustomerOrgCode: 'N', // -- customerOrgCode
}
},
customerOrgTreeAll:[]
};
},
//<el-tree :data="$store.state.customerOrg.customerOrgTree" :props="$store.state.customerOrg.treeprops" @node-click="treeclick"></el-tree>
computed: {
...mapState(["window", "dict", "dataTransOpts", "customerOrg", "patientRegister"]),
},
//
created() {
try {
let LocalConfig = JSON.parse(window.localStorage.getItem('LocalConfig'))
if (LocalConfig && LocalConfig.patientRegister) {
if (LocalConfig.patientRegister.dispCustomerOrgCode) this.LocalConfig.patientRegister.dispCustomerOrgCode = LocalConfig.patientRegister.dispCustomerOrgCode
}
} catch (error) {
console.log("window.localStorage.getItem('LocalConfig')", error)
}
},
//
mounted() {
//
this.getCustomerOrgTree();
},
methods: {
//
getCustomerOrgTree() {
getapi("/api/app/customerorg/getbycodeall").then((res) => {
// console.log("res.data", res.data);
if (res.code > -1) {
this.patientRegister.customerOrgTreeAll = reMadeOrgTree(deepCopy(res.data), this.LocalConfig.patientRegister.dispCustomerOrgCode);
this.customerOrgTreeAll = deepCopy(this.patientRegister.customerOrgTreeAll)
// tcdate(this.patientRegister.customerOrgTreeAll)
}
});
},
//ID api/app/customer-org/parent/[CustomerOrgld
// getCustomerOrgParentId(customerOrgld) {
// if (customerOrgld == this.dict.personOrgId) {
// this.patientRegister.query.CustomerOrgParentId = this.dict.personOrgId;
// return;
// }
// getapi(`/api/app/customer-org/parent/${customerOrgld}`).then((res) => {
// // console.log("res.data", res.data);
// if (res.code == 1) {
// this.patientRegister.query.CustomerOrgParentId = res.data;
// }
// });
// },
//
nodeContextmenu(event, data, node, ids) {
// console.log('event,data,node,ids', event, data, node, ids)
if (data.id == this.dict.personOrgId) return
let items = [
{
label: "置顶",
onClick: () => {
this.treeSort(data, 1);
},
},
{
label: "置底",
onClick: () => {
this.treeSort(data, 2);
},
}
] //
this.$contextmenu({
items,
event,
//x: event.clientX,
//y: event.clientY,
customClass: "custom-class",
zIndex: 3,
minWidth: 80,
});
return false;
},
//
treeSort(data, sortType) {
// if (data.parentId) {
// this.$message.warning({ showClose: true, message: "" })
// return
// }
// console.log('data,sortType',data,sortType)
putapi(`/api/app/customerorg/updatemanysort?id=${data.id}&SortType=${sortType}`).then(res => {
if (res.code > -1) {
this.getCustomerOrgTree()
}
})
},
//
filterNode(value, data) {
// console.log(value, data)
// if (!value) return true;
// return data['displayName'].indexOf(value) > -1 || data['simpleCode'].indexOf(value.toUpperCase()) > -1 || data['shortName'].indexOf(value) > -1 || data['customerOrgCode'].indexOf(value) > -1;
this.customerOrgTreeAll = this.patientRegister.customerOrgTreeAll.filter(e => {
return e.label.indexOf(value) > -1 || e.simpleCode.indexOf(value.toUpperCase()) > -1 || e.shortName.indexOf(value) > -1
})
},
//
treeclick(data) {
// console.log('data',data)
this.patientRegister.query.customerOrgId = data.id;
this.patientRegister.query.customerOrgName = data.displayName;
this.dataTransOpts.plus.PatientRegisterEditQuery++
//ID
// this.getCustomerOrgParentId(data.id);
// this.patientRegister.query.times++; //
},
},
watch: {
"filterText": {
// immediate: true,
handler(newVal, oldVal) {
// console.log(`watch newVal:${newVal} oldVal:${oldVal} registerCheckId: ${this.dataTransOpts.tableS.patient_register.id}`);
if (newVal != oldVal) this.filterNode(newVal)
}
},
},
};
</script>
<style scoped>
@import "../../assets/css/global_tree.css";
.treeicons {
font-size: 20px;
margin-right: 5px;
}
:deep .el-tree-node>.el-tree-node__children {
overflow: visible;
}
</style>

2
src/components/report/BtnReport.vue

@ -25,7 +25,7 @@
</div>
<div>
<!-- 通用进度条 -->
<el-dialog title="数据处理中……" :visible.sync="elProgress.display" width="600px" height="400" :show-close="false"
<el-dialog title="数据处理中……" :visible.sync="elProgress.display" width="640px" :show-close="false"
:close-on-click-modal="false" :append-to-body="true">
<ElProgressOCX />
</el-dialog>

874
src/views/fee-settings/Asbitem.vue
File diff suppressed because it is too large
View File

Loading…
Cancel
Save