shentun
/
peisweb
1
0
Fork 0
Code Issues Pull Requests Projects 1 Releases Wiki Activity
Browse Source

custorg

master
pengjun 2 years ago
parent
c63efe1f08
commit
5770c7b02c
6 changed files with 248 additions and 285 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 45
      src/components/customerOrg/ContactPerson.vue
  2. 150
      src/components/customerOrg/customerOrgEdit.vue
  3. 37
      src/components/customerOrg/customerOrgRegister.vue
  4. 58
      src/components/customerOrg/customerOrgTree.vue
  5. 9
      src/store/index.js
  6. 28
      src/views/customerOrg/customerOrg.vue

45
src/components/customerOrg/ContactPerson.vue
View File

@ -1,8 +1,8 @@
<template> <template>
<div> <div>
<div style="display: flex;"> <div style="display: flex;">
<div :style="'width:' + (window.pageWidth - 200 - 120 - 30) + 'px;'">
<el-table :data="customerOrg.contactPersonList" border :height="(window.pageHeight < 600 ? 84:window.pageHeight - 432)/2"
<div :style="'width:' + (window.pageWidth - 200 - 110 - 25) + 'px;'">
<el-table :data="customerOrg.contactPersonList" border :height="(window.pageHeight < 600 ? 100:window.pageHeight - 400)/2"
size="small" highlight-current-row @row-click="rowClick" ref="customerOrg.contactPersonList"> size="small" highlight-current-row @row-click="rowClick" ref="customerOrg.contactPersonList">
<el-table-column prop="displayName" label="姓名" min-width="70" align="center"/> <el-table-column prop="displayName" label="姓名" min-width="70" align="center"/>
<el-table-column prop="title" label="职务" min-width="70" align="center"/> <el-table-column prop="title" label="职务" min-width="70" align="center"/>
@ -25,7 +25,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-table :data="customerOrg.contactMethodList" border :height="(window.pageHeight < 600 ? 84:window.pageHeight - 432)/2"
<el-table :data="customerOrg.contactMethodList" border :height="(window.pageHeight < 600 ? 100:window.pageHeight - 400)/2"
size="small" highlight-current-row @row-click="rowClickMethod" ref="customerOrg.contactMethodList"> size="small" highlight-current-row @row-click="rowClickMethod" ref="customerOrg.contactMethodList">
<el-table-column prop="contactMethodType" label="类型" width="60" align="center"> <el-table-column prop="contactMethodType" label="类型" width="60" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
@ -179,21 +179,35 @@ export default {
}, },
//挂载完成 //挂载完成
mounted() { },
mounted() {
this.getContactPersonList(this.dataTransOpts.tableS.customer_org.id)
},
computed: { computed: {
...mapState(["window", "customerOrg"]),
...mapState(["window", "customerOrg","dataTransOpts"]),
}, },
methods: { methods: {
moment,checkPagePriv, moment,checkPagePriv,
//获取联系人列表 //获取联系人列表
getContactPersonList(customerOrgId) { getContactPersonList(customerOrgId) {
if(!customerOrgId){
this.customerOrg.contactPersonList = [];
this.customerOrg.contactMethodList = []
return
}
getapi( getapi(
`/api/app/contact-person/in-customer-org-id/${customerOrgId}` `/api/app/contact-person/in-customer-org-id/${customerOrgId}`
).then((res) => { ).then((res) => {
//console.log('res.data',res.data)
if(res.code != -1){
this.customerOrg.contactPersonList = res.data; this.customerOrg.contactPersonList = res.data;
if (res.data.length > 0) {
this.getContactMethodList(res.data[0].id);
} else {
this.customerOrg.contactMethodList = [];
}
}
}); });
}, },
@ -427,13 +441,22 @@ export default {
}, },
watch: { watch: {
'customerOrgId' (newVal,oldVal){
console.log('watch customerOrgId',newVal,oldVal)
if(newVal != oldVal){
this.personId = ''
}
// 单位id未变时，强制刷新
"dataTransOpts.refresh.contact_person.M": {
// immediate: true,
handler(newVal, oldVal) {
console.log(`watch 联系人 newVal:${newVal} oldVal:${oldVal} customerOrgId: ${this.dataTransOpts.tableS.customer_org.id}`);
this.getContactPersonList(this.dataTransOpts.tableS.customer_org.id)
} }
}, },
// 'customerOrgId' (newVal,oldVal){
// console.log('watch customerOrgId',newVal,oldVal)
// if(newVal != oldVal){
// this.personId = ''
// }
// }
},
}; };
</script> </script>
<style scoped> <style scoped>

150
src/components/customerOrg/customerOrgEdit.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div style="display: flex"> <div style="display: flex">
<div :style="'margin-left: 5px;width:' + (window.pageWidth - 200 - 120 - 25) + 'px;'">
<div :style="'margin-left: 5px;width:' + (window.pageWidth - 200 - 110 - 20) + 'px;'">
<!--overflow-y: scroll;height:200px;--> <!--overflow-y: scroll;height:200px;-->
<el-form ref="form" :model="form" label-width="85px" :rules="rules" size="medium"> <el-form ref="form" :model="form" label-width="85px" :rules="rules" size="medium">
<el-row> <el-row>
@ -9,54 +9,39 @@
<el-cascader v-model="form.parentId" :options="customerOrg.customerOrgTree" <el-cascader v-model="form.parentId" :options="customerOrg.customerOrgTree"
:props="{ checkStrictly: true, expandTrigger: 'hover', ...customerOrg.treeprops, }" :props="{ checkStrictly: true, expandTrigger: 'hover', ...customerOrg.treeprops, }"
:show-all-levels="false" clearable filterable disabled :show-all-levels="false" clearable filterable disabled
:style="'width:' + Math.floor((window.pageWidth - 600) / 3) + 'px;'">
:style="'width:' + Math.floor((window.pageWidth - 585) / 3) + 'px;'">
</el-cascader> </el-cascader>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="单位名称" prop="displayName"> <el-form-item label="单位名称" prop="displayName">
<el-input class="enterToTab" v-model="form.displayName" placeholder="请输入单位名称" :disabled="customerOrg.oprStatus ? false:true"/>
<el-input class="enterToTab" v-model="form.displayName" placeholder="请输入单位名称"
:disabled="customerOrg.oprStatus ? false : true" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="单位简称" prop="shortName"> <el-form-item label="单位简称" prop="shortName">
<el-input class="enterToTab" v-model="form.shortName" placeholder="请输入单位简称" :disabled="customerOrg.oprStatus ? false:true"/>
<el-input class="enterToTab" v-model="form.shortName" placeholder="请输入单位简称"
:disabled="customerOrg.oprStatus ? false : true" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="体检中心" prop="organizationUnitId"> <el-form-item label="体检中心" prop="organizationUnitId">
<el-select
v-model="form.organizationUnitId"
placeholder="请选择"
filterable
:disabled="peisid ? true : false"
:style="'width:' + Math.floor((window.pageWidth - 600) / 3) + 'px;'"
>
<el-option
v-for="item in data.organizationdata"
:key="item.id"
:label="item.displayName"
:value="item.id"
/>
<el-select v-model="form.organizationUnitId" placeholder="请选择" filterable :disabled="peisid ? true : false"
:style="'width:' + Math.floor((window.pageWidth - 585) / 3) + 'px;'">
<el-option v-for="item in data.organizationdata" :key="item.id" :label="item.displayName"
:value="item.id" />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="单位性质" prop="orgTypeId"> <el-form-item label="单位性质" prop="orgTypeId">
<el-select class="enterToTab"
v-model="form.orgTypeId"
placeholder="请选择"
filterable
:style="'width:' + Math.floor((window.pageWidth - 600) / 3) + 'px;'"
>
<el-option
v-for="item in data.customerOrgType"
:key="item.id"
:label="item.displayName"
:value="item.id"
/>
<el-select class="enterToTab" v-model="form.orgTypeId" placeholder="请选择" filterable
:style="'width:' + Math.floor((window.pageWidth - 585) / 3) + 'px;'">
<el-option v-for="item in data.customerOrgType" :key="item.id" :label="item.displayName"
:value="item.id" />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -130,12 +115,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="地址" prop="address"> <el-form-item label="地址" prop="address">
<el-input class="enterToTab"
v-model="form.address"
placeholder="请输入地址"
maxlength="50"
show-word-limit
/>
<el-input class="enterToTab" v-model="form.address" placeholder="请输入地址" maxlength="50" show-word-limit />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@ -152,13 +132,7 @@
</el-col> </el-col>
<el-col :span="7"> <el-col :span="7">
<el-form-item label="创建时间"> <el-form-item label="创建时间">
<el-date-picker
v-model="form.creationTime"
type="datetime"
size="small"
style="width: 100%"
disabled
/>
<el-date-picker v-model="form.creationTime" type="datetime" size="small" style="width: 100%" disabled />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
@ -168,13 +142,8 @@
</el-col> </el-col>
<el-col :span="7"> <el-col :span="7">
<el-form-item label="修改时间"> <el-form-item label="修改时间">
<el-date-picker
v-model="form.lastModificationTime"
type="datetime"
size="small"
style="width: 100%"
disabled
/>
<el-date-picker v-model="form.lastModificationTime" type="datetime" size="small" style="width: 100%"
disabled />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -183,19 +152,14 @@
<!-- 按钮区域 --> <!-- 按钮区域 -->
<div style="width: 110px; margin-left: 10px; margin-top: 3%"> <div style="width: 110px; margin-left: 10px; margin-top: 3%">
<div v-show="checkPagePriv(pagePriv.privs, '新增单位')" class="btnList"> <div v-show="checkPagePriv(pagePriv.privs, '新增单位')" class="btnList">
<el-button type="primary" @click="add('form', '')" class="commonbutton"
>新增单位</el-button
>
<el-button type="primary" @click="btnAdd('form', '')" class="commonbutton">新增单位</el-button>
</div> </div>
<div v-show="checkPagePriv(pagePriv.privs, '新增子单位')" class="btnList"> <div v-show="checkPagePriv(pagePriv.privs, '新增子单位')" class="btnList">
<el-button type="primary" @click="add('form', 'child')" class="commonbutton"
>新增子单位</el-button
>
<el-button type="primary" @click="btnAdd('form', 'child')" class="commonbutton">新增子单位</el-button>
</div> </div>
<div v-show="checkPagePriv(pagePriv.privs, '保存')" class="btnList"> <div v-show="checkPagePriv(pagePriv.privs, '保存')" class="btnList">
<el-button type="success" @click="btnSubmit('form')" class="commonbutton"
><i class="el-icon-check"></i>保存</el-button
>
<el-button type="success" @click="btnSubmit('form')" class="commonbutton"><i
class="el-icon-check"></i>保存</el-button>
</div> </div>
<div v-show="checkPagePriv(pagePriv.privs, '删除')" class="btnList"> <div v-show="checkPagePriv(pagePriv.privs, '删除')" class="btnList">
<el-button type="danger" @click="del('form')" class="commonbutton"> <el-button type="danger" @click="del('form')" class="commonbutton">
@ -252,15 +216,15 @@ export default {
lastModifierName: "", lastModifierName: "",
lastModificationTime: null, lastModificationTime: null,
}, //初始化 单位 记录 目前新增与更新是一致 }, //初始化 单位 记录 目前新增与更新是一致
formInit: {},
rules: { rules: {
displayName: [{ required: true, message: "请输入单位名称", trigger: "blur" }], displayName: [{ required: true, message: "请输入单位名称", trigger: "blur" }],
shortName: [{ required: true, message: "请输入单位简写", trigger: "blur" }], shortName: [{ required: true, message: "请输入单位简写", trigger: "blur" }],
orgTypeId: [{ required: true, message: "请输入单位性质", trigger: "blur" }],
organizationUnitId: [ organizationUnitId: [
{ required: true, message: "请输入体检中心", trigger: "blur" }, { required: true, message: "请输入体检中心", trigger: "blur" },
], ],
}, },
isshow: false, isshow: false,
}; };
}, },
@ -274,6 +238,7 @@ export default {
if (!this.form.id) { if (!this.form.id) {
this.form.organizationUnitId = this.peisid; this.form.organizationUnitId = this.peisid;
} }
this.formInit = deepCopy(this.form)
}, },
//挂载完成 //挂载完成
@ -281,19 +246,14 @@ export default {
// 表单中 回车 代替 tab // 表单中 回车 代替 tab
this.enterToTab(); this.enterToTab();
//获取体中心字典数据
this.getoraniztion();
//获取单位类别列表
this.getOrgType();
this.getCustomerOrgRd(this.id);
// 初始化 字典数据
this.dictInit()
this.getCustomerOrgRd(this.dataTransOpts.tableS.customer_org.id);
}, },
computed: { computed: {
...mapState(["customerOrg", "window"]),
...mapState(["customerOrg", "window", "dataTransOpts"]),
}, },
methods: { methods: {
...mapMutations(["setData"]), checkPagePriv, ...mapMutations(["setData"]), checkPagePriv,
@ -309,9 +269,13 @@ export default {
//获取单位信息 //获取单位信息
getCustomerOrgRd(id) { getCustomerOrgRd(id) {
if (!id) return;
if (!id){
this.form = deepCopy(this.formInit)
return;
}
getapi(`/api/app/customer-org/${id}`).then((res) => { getapi(`/api/app/customer-org/${id}`).then((res) => {
if (res.code != -1) { if (res.code != -1) {
this.dataTransOpts.tableS.customer_org.id = res.data.id
objCopy(res.data, this.form); objCopy(res.data, this.form);
if (res.data.isActive == "Y") { if (res.data.isActive == "Y") {
@ -328,15 +292,14 @@ export default {
}); });
}, },
// 初始化 字典数据
dictInit() {
//获取组织体检中心数据 //获取组织体检中心数据
getoraniztion() {
getapi("/api/app/organization-units/organization-unit-by-is-peis").then((res) => { getapi("/api/app/organization-units/organization-unit-by-is-peis").then((res) => {
this.data.organizationdata = res.data; this.data.organizationdata = res.data;
}); });
},
//获取单位类别列表 //获取单位类别列表
getOrgType() {
getapi("/api/app/customer-org-type/in-filter").then((res) => { getapi("/api/app/customer-org-type/in-filter").then((res) => {
this.data.customerOrgType = res.data.items; this.data.customerOrgType = res.data.items;
}); });
@ -486,8 +449,9 @@ export default {
} }
}); });
}, },
//新增弹框 //新增弹框
async add(formName, child) {
async btnAdd(formName, child) {
await this.$refs[formName].resetFields(); await this.$refs[formName].resetFields();
//console.log('this.peisid',this.peisid) //console.log('this.peisid',this.peisid)
if (!this.peisid || this.peisid == 'null') { if (!this.peisid || this.peisid == 'null') {
@ -495,31 +459,27 @@ export default {
return return
} }
this.form = deepCopy(this.formInit)
if (child) { if (child) {
if (!this.customerOrg.customerOrgId) {
if (!this.dataTransOpts.tableS.customer_org.id) {
this.$message.warning("请先选择上级单位"); this.$message.warning("请先选择上级单位");
this.customerOrg.oprStatus = '' this.customerOrg.oprStatus = ''
return; return;
} }
this.customerOrg.customerOrgRd.id = "";
this.customerOrg.customerOrgRd = {
id: "",
isLock: "N",
isActive: "Y",
parentId: this.customerOrg.customerOrgId,
};
this.form.parentId = this.dataTransOpts.tableS.customer_org.id
} else { } else {
this.customerOrg.customerOrgRd = {
id: "",
isLock: "N",
isActive: "Y",
parentId: null,
};
// 新增一级单位时，清除 vuex 一级单位ID
this.dataTransOpts.tableS.customer_org.parent_id = ''
} }
this.customerOrg.oprStatus = 'add' this.customerOrg.oprStatus = 'add'
// this.customerOrg.customerOrgId = "";
this.dataTransOpts.tableS.customer_org.id = ''
setTimeout(() => {
this.dataTransOpts.refresh.customer_org_register.M++
this.dataTransOpts.refresh.contact_person.M++
}, 20);
objCopy(this.customerOrg.customerOrgRd, this.form);
this.customerOrg.customerOrgId = "";
}, },
//删除 //删除
@ -591,10 +551,12 @@ export default {
}, },
watch: { watch: {
id(newVal, oldVal) {
console.log("watch getCustomerOrgRd ", newVal, oldVal);
if (newVal != oldVal && newVal != "") {
this.getCustomerOrgRd(newVal);
// 单位id未变时，强制刷新
"dataTransOpts.refresh.customer_org.S": {
// immediate: true,
handler(newVal, oldVal) {
console.log(`watch 体检单位 newVal:${newVal} oldVal:${oldVal} customerOrgId: ${this.dataTransOpts.tableS.customer_org.id}`);
this.getCustomerOrgRd(this.dataTransOpts.tableS.customer_org.id);
} }
}, },
}, },

37
src/components/customerOrg/customerOrgRegister.vue
View File

@ -1,8 +1,9 @@
<template> <template>
<div style="display: flex;"> <div style="display: flex;">
<div :style="'width:' + (window.pageWidth - 200 - 120 - 30) + 'px;'">
<el-table :data="customerOrg.customerOrgRegisterList" border :height="window.pageHeight < 600 ? 168:window.pageHeight - 432" size="small"
highlight-current-row @row-click="rowClick" ref="customerOrg.customerOrgRegisterList">
<div :style="'width:' + (window.pageWidth - 200 - 110 - 25) + 'px;'">
<el-table :data="customerOrg.customerOrgRegisterList" border
:height="window.pageHeight < 600 ? 200 : window.pageHeight - 400" size="small" highlight-current-row
@row-click="rowClick" ref="customerOrg.customerOrgRegisterList">
<el-table-column prop="medicalTimes" label="体检次数" width="70" align="center" /> <el-table-column prop="medicalTimes" label="体检次数" width="70" align="center" />
<el-table-column prop="beginTime" label="开始日期" min-width="80" align="center"> <el-table-column prop="beginTime" label="开始日期" min-width="80" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
@ -78,10 +79,12 @@ export default {
}, },
//挂载完成 //挂载完成
mounted() { },
mounted() {
this.getCustomerOrgRegisterList(this.dataTransOpts.tableS.customer_org_register.pid);
},
computed: { computed: {
...mapState(["customerOrg", "window"]),
...mapState(["customerOrg", "window", "dataTransOpts"]),
}, },
methods: { methods: {
@ -92,16 +95,21 @@ export default {
}, },
//获取体检次数列表 //获取体检次数列表
getCustomerOrgRegisterList(customerOrgId) {
getCustomerOrgRegisterList(customerOrgPid) {
if (customerOrgPid) {
getapi( getapi(
`/api/app/customerorgregister/getlistincustomerorgid?CustomerOrgId=${customerOrgId}`
`/api/app/customerorgregister/getlistincustomerorgid?CustomerOrgId=${customerOrgPid}`
).then((res) => { ).then((res) => {
//console.log('res.data',res.data)
if (res.code != -1) {
this.customerOrg.customerOrgRegisterList = res.data; this.customerOrg.customerOrgRegisterList = res.data;
}
}); });
this.customerOrgRegisterId = "";
} else {
this.customerOrg.customerOrgRegisterList = []
}
}, },
//设置体检次数状态 //设置体检次数状态
setOrgRegisterState(IsComplete) { setOrgRegisterState(IsComplete) {
if (!this.customerOrg.customerOrgId || !this.customerOrgRegisterId) { if (!this.customerOrg.customerOrgId || !this.customerOrgRegisterId) {
@ -177,6 +185,17 @@ export default {
} }
}, },
//监听事件
watch: {
// 体检次数父ID未切换换时 也可以强制刷新数据
"dataTransOpts.refresh.customer_org_register.M": {
// immediate: true,
handler(newVal, oldVal) {
console.log(`watch 体检次数 newVal:${newVal} oldVal:${oldVal} customerOrgPid: ${this.dataTransOpts.tableS.customer_org.parent_id}`);
this.getCustomerOrgRegisterList(this.dataTransOpts.tableS.customer_org.parent_id);
}
},
},
}; };
</script> </script>
<style scoped> <style scoped>

58
src/components/customerOrg/customerOrgTree.vue
View File

@ -3,9 +3,9 @@
<div style="margin:2px 2px 2px 2px;"> <div style="margin:2px 2px 2px 2px;">
<el-input placeholder="输入关键字进行过滤" v-model="filterText" size="small" /> <el-input placeholder="输入关键字进行过滤" v-model="filterText" size="small" />
</div> </div>
<div :style="'overflow: scroll;height:' +(window.pageHeight < 600 ? 432 : window.pageHeight - 168) + 'px;'">
<div>
<el-tree :data="customerOrg.customerOrgTree" :props="customerOrg.treeprops" <el-tree :data="customerOrg.customerOrgTree" :props="customerOrg.treeprops"
node-key="id" :filter-node-method="filterNode"
node-key="id" :filter-node-method="filterNode" :style="'overflow: scroll;width:200px;height:' +(window.pageHeight < 600 ? 465 : window.pageHeight - 135) + 'px;'"
:default-expanded-keys="customerOrg.defaultExpandedKeys" :default-expanded-keys="customerOrg.defaultExpandedKeys"
@node-click="treeclick" highlight-current ref="customerOrgTree"> @node-click="treeclick" highlight-current ref="customerOrgTree">
<span class="custom-tree-node" slot-scope="{ node, data }"> <span class="custom-tree-node" slot-scope="{ node, data }">
@ -42,7 +42,7 @@ export default {
}, },
//<el-tree :data="$store.state.customerOrg.customerOrgTree" :props="$store.state.customerOrg.treeprops" @node-click="treeclick"></el-tree> //<el-tree :data="$store.state.customerOrg.customerOrgTree" :props="$store.state.customerOrg.treeprops" @node-click="treeclick"></el-tree>
computed: { computed: {
...mapState(["customerOrg", "window"]),
...mapState(["customerOrg", "window", "dataTransOpts"]),
}, },
//创建组件后 //创建组件后
@ -84,41 +84,6 @@ export default {
}); });
}, },
//获取单位基本信息
getCustomerOrgRd(id) {
this.customerOrg.customerOrgRd.id = id;
console.log('this.customerOrg.customerOrgRd.id',this.customerOrg.customerOrgRd.id)
},
//获取体检次数列表
getCustomerOrgRegisterList(customerOrgId) {
//api/app/customerorgregister/getlistincustomerorgid?CustomerOrgId=
getapi(
`/api/app/customerorgregister/getlistincustomerorgid?CustomerOrgId=${customerOrgId}`
).then((res) => {
if(res.code != -1){
this.customerOrg.customerOrgRegisterList = res.data;
}
});
},
//获取联系人列表
getContactPersonList(customerOrgId) {
getapi(
`/api/app/contact-person/in-customer-org-id/${customerOrgId}`
).then((res) => {
if(res.code != -1){
this.customerOrg.contactPersonList = res.data;
if (res.data.length > 0) {
this.getContactMethodList(res.data[0].id);
} else {
this.customerOrg.contactMethodList = [];
}
}
});
},
//获取联系方式列表 //获取联系方式列表
//api/app/contact-method/in-contact-person-id?ContactPersonId=3a0c08ad-4304-138b-d9e6-a7338739dfc4' \ //api/app/contact-method/in-contact-person-id?ContactPersonId=3a0c08ad-4304-138b-d9e6-a7338739dfc4' \
@ -136,21 +101,20 @@ export default {
treeclick(data) { treeclick(data) {
//console.log(data.id + " 查询单位详情、体检次数、联系人等信息 " + data.displayName);// api/app/customer-org/3a0c0439-a5ca-8a63-b2b9-e0eb24cb58b1 //console.log(data.id + " 查询单位详情、体检次数、联系人等信息 " + data.displayName);// api/app/customer-org/3a0c0439-a5ca-8a63-b2b9-e0eb24cb58b1
this.customerOrg.oprStatus = 'edit' this.customerOrg.oprStatus = 'edit'
this.customerOrg.customerOrgId = data.id;
this.getCustomerOrgRd(data.id);
//只有单位才有体检次数登记，部门无 //只有单位才有体检次数登记，部门无
let firstId = data.id //一级单位ID
this.dataTransOpts.tableS.customer_org.id = data.id //单位ID
this.dataTransOpts.tableS.customer_org.parent_id = data.id //一级单位ID
if(data.parentId){ if(data.parentId){
let pids = getTreePids(this.customerOrg.customerOrgTree,"treeChildren", 'parentId', 'id', data.id) let pids = getTreePids(this.customerOrg.customerOrgTree,"treeChildren", 'parentId', 'id', data.id)
console.log('pids',pids)
firstId = pids[pids.length - 2]
this.dataTransOpts.tableS.customer_org.parent_id = pids[pids.length - 2]
} }
this.getCustomerOrgRegisterList(firstId);
setTimeout(() => {
this.dataTransOpts.refresh.customer_org.S++
this.dataTransOpts.refresh.customer_org_register.M++
this.dataTransOpts.refresh.contact_person.M++
}, 20);
//联系人
this.getContactPersonList(data.id);
}, },
//树过滤 //树过滤

9
src/store/index.js
View File

@ -292,6 +292,9 @@ export default new Vuex.Store({
adp_roles: { S: 0, M: 0 }, // 角色 adp_roles: { S: 0, M: 0 }, // 角色
adp_users: { S: 0, M: 0 }, // 用户 adp_users: { S: 0, M: 0 }, // 用户
asbitem: { S: 0, M: 0 }, // 组合项目 asbitem: { S: 0, M: 0 }, // 组合项目
customer_org: { S: 0, M: 0 }, // 体检单位
contact_person: { S: 0, M: 0 }, // 体检单位联系人
customer_org_register: { S: 0, M: 0 }, // 单位体检次数
customer_org_group: { S: 0, M: 0 }, // 单位分组 customer_org_group: { S: 0, M: 0 }, // 单位分组
customer_org_group_detail: { S: 0, M: 0 }, // 单位分组包含的组合项目明细 customer_org_group_detail: { S: 0, M: 0 }, // 单位分组包含的组合项目明细
charge: { S: 0, M: 0 }, // 收费 charge: { S: 0, M: 0 }, // 收费
@ -307,6 +310,9 @@ export default new Vuex.Store({
adp_roles: { id: '' }, // 角色 adp_roles: { id: '' }, // 角色
adp_users: { id: '' }, // 用户 adp_users: { id: '' }, // 用户
asbitem: { id: '' }, // 组合项目 asbitem: { id: '' }, // 组合项目
customer_org: { id: '', parent_id: '' }, // 体检单位
contact_person: { id: '' }, // 体检单位联系人
customer_org_register: { id: '' }, // 单位体检次数 pid/单位一级节点
customer_org_group: { id: '' }, // 单位分组 customer_org_group: { id: '' }, // 单位分组
customer_org_group_detail: { id: '' }, // 单位分组包含的组合项目明细 customer_org_group_detail: { id: '' }, // 单位分组包含的组合项目明细
charge: { id: '' }, // 收费 charge: { id: '' }, // 收费
@ -322,6 +328,9 @@ export default new Vuex.Store({
adp_roles: [], // 角色 adp_roles: [], // 角色
adp_users: [], // 用户 adp_users: [], // 用户
asbitem: [], // 组合项目 asbitem: [], // 组合项目
customer_org: [], // 体检单位
contact_person: [], // 体检单位联系人
customer_org_register: [], // 单位体检次数
customer_org_group: [], // 单位分组 customer_org_group: [], // 单位分组
customer_org_group_detail: [], // 单位分组包含的组合项目明细 customer_org_group_detail: [], // 单位分组包含的组合项目明细
charge: [], // 收费 charge: [], // 收费

28
src/views/customerOrg/customerOrg.vue
View File

@ -1,35 +1,21 @@
<template> <template>
<div> <div>
<el-card class="elcard">
<div slot="header">
<span>体检单位设置</span>
<div>
<div class="contenttitle">
体检登记 /<span class="contenttitleBold">单位分组</span>
</div> </div>
<div style="display: flex;"> <div style="display: flex;">
<!-- 单位树组件 --> <!-- 单位树组件 -->
<div :style="'border: 0px solid #888;width:200px; height:' +
(window.pageHeight < 600 ? 470 : window.pageHeight - 130) +
'px;'
">
<div>
<CustomerOrgTree /> <CustomerOrgTree />
</div> </div>
<div :style="'display:block;width:' +
(window.pageWidth - 200 - 20) +
'px;height:' +
(window.pageHeight < 600 ? 470 : window.pageHeight - 130) +
'px;' +
(window.pageHeight < 600 ? 'overflow-y: scroll;' : '')
">
<div>
<!-- 单位详情 录入与编辑 --> <!-- 单位详情 录入与编辑 -->
<div style="height:270px;"> <div style="height:270px;">
<CustomerOrgEdit :id="customerOrg.customerOrgRd.id" /> <CustomerOrgEdit :id="customerOrg.customerOrgRd.id" />
</div> </div>
<!-- 体检次数 联系人 --> <!-- 体检次数 联系人 -->
<el-tabs :style="'margin-left: 10px;width:' +
(window.pageWidth - 200 - 30) +
'px;height:' +
(window.pageHeight < 600 ? 202 : window.pageHeight - 398) +
'px;'
" v-model="tabChoosed">
<el-tabs style="margin-left: 10px;" v-model="tabChoosed">
<!-- 体检次数 --> <!-- 体检次数 -->
<el-tab-pane label="体检次数" name="1"> <el-tab-pane label="体检次数" name="1">
<CustomerOrgRegister /> <CustomerOrgRegister />
@ -41,7 +27,7 @@
</el-tabs> </el-tabs>
</div> </div>
</div> </div>
</el-card>
</div>
</div> </div>
</template> </template>
<script> <script>

Write Preview
Loading…
Cancel
Save