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

Merge branch 'master' of http://81.70.217.145:3000/shentun/peisweb

master
pengjun 3 years ago
parent
9b57e916f6 f9d318d580
commit
af2d8dc82a
5 changed files with 166 additions and 68 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. 87
      src/components/customerOrg/ContactPerson.vue
  2. 70
      src/components/customerOrg/customerOrgTree.vue
  3. 1
      src/store/index.js
  4. 2
      src/views/Home.vue
  5. 74
      src/views/fee-settings/SysParmType.vue

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

@ -1,10 +1,18 @@
<template> <template>
<div> <div>
<div style="display:flex">
<div style="width: 95%;">
<el-table :data="data.contactPerson" border style="height: 175px" row-key="id" size="small"
class="el-table__body-wrapper tbody" highlight-current-row @row-click="rowickContactPerson"
ref="data.contactPerson">
<div style="display: flex">
<div style="width: 95%">
<el-table
:data="data.contactPerson"
border
style="height: 175px"
row-key="id"
size="small"
class="el-table__body-wrapper tbody"
highlight-current-row
@row-click="rowickContactPerson"
ref="data.contactPerson"
>
<el-table-column prop="display_name" label="姓名" /> <el-table-column prop="display_name" label="姓名" />
<el-table-column prop="title" label="职务" /> <el-table-column prop="title" label="职务" />
<el-table-column prop="remark" label="备注" /> <el-table-column prop="remark" label="备注" />
@ -15,15 +23,27 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="lastModifierName" label="修改者" /> <el-table-column prop="lastModifierName" label="修改者" />
<el-table-column prop="lastModificationTime" label="修改时间" width="200">
<el-table-column
prop="lastModificationTime"
label="修改时间"
width="200"
>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.lastModificationTime | dateFormat }} {{ scope.row.lastModificationTime | dateFormat }}
</template> </template>
</el-table-column> </el-table-column>
</el-table>
<el-table :data="data.contactPerson" border style="height: 175px" row-key="id" size="small"
class="el-table__body-wrapper tbody" highlight-current-row @row-click="rowickContactPerson"
ref="data.contactPerson">
</el-table>
<el-table
:data="data.contactPerson"
border
style="height: 175px"
row-key="id"
size="small"
class="el-table__body-wrapper tbody"
highlight-current-row
@row-click="rowickContactPerson"
ref="data.contactPerson"
>
<el-table-column prop="contact_method_type" label="类型" /> <el-table-column prop="contact_method_type" label="类型" />
<el-table-column prop="contact_method_value" label="联系方式" /> <el-table-column prop="contact_method_value" label="联系方式" />
<el-table-column prop="creatorName" label="创建者" width="" /> <el-table-column prop="creatorName" label="创建者" width="" />
@ -33,7 +53,11 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="lastModifierName" label="修改者" /> <el-table-column prop="lastModifierName" label="修改者" />
<el-table-column prop="lastModificationTime" label="修改时间" width="200">
<el-table-column
prop="lastModificationTime"
label="修改时间"
width="200"
>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.lastModificationTime | dateFormat }} {{ scope.row.lastModificationTime | dateFormat }}
</template> </template>
@ -54,17 +78,17 @@
</div> </div>
<!-- 联系人 --> <!-- 联系人 -->
<el-dialog title="新增" :visible.sync="dialogContactPerson" width="80%"> <el-dialog title="新增" :visible.sync="dialogContactPerson" width="80%">
<el-form :model="formContactPerson" ref="formContactPerson" label-width="100px">
<el-form
:model="formContactPerson"
ref="formContactPerson"
label-width="100px"
>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="结果"> <el-form-item label="结果">
<el-input v-model="formContactPerson.result"></el-input> <el-input v-model="formContactPerson.result"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
@ -72,7 +96,6 @@
<el-button type="primary" @click="">确 定</el-button> <el-button type="primary" @click="">确 定</el-button>
</span> </span>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
@ -91,9 +114,9 @@ import {
import { unitlist } from "@/request/systemapi"; import { unitlist } from "@/request/systemapi";
import Sortable from "sortablejs"; import Sortable from "sortablejs";
import { getapi, postapi, putapi, deletapi } from "@/api/api"; import { getapi, postapi, putapi, deletapi } from "@/api/api";
import CustomerOrgTree from '../../components/customerOrg/customerOrgTree.vue'
import CustomerOrgEdit from '../../components/customerOrg/customerOrgEdit.vue'
import CustomerOrgRegister from '../../components/customerOrg/customerOrgRegister.vue'
import CustomerOrgTree from "../../components/customerOrg/customerOrgTree.vue";
import CustomerOrgEdit from "../../components/customerOrg/customerOrgEdit.vue";
import CustomerOrgRegister from "../../components/customerOrg/customerOrgRegister.vue";
export default { export default {
components: { components: {
CustomerOrgTree, CustomerOrgTree,
@ -102,8 +125,8 @@ export default {
}, },
data() { data() {
return { return {
data:{
contactPerson:[]
data: {
contactPerson: [],
}, },
form: { form: {
displayName: "", displayName: "",
@ -126,18 +149,12 @@ export default {
isActive: "", isActive: "",
}, },
dialogContactPerson: false, //联系人弹窗 显示控制 dialogContactPerson: false, //联系人弹窗 显示控制
dialogContactMethod: false, //联系方式弹窗 显示控制 dialogContactMethod: false, //联系方式弹窗 显示控制
formContactPerson: {
formContactPerson: {}, //联系人form表单数据
}, //联系人form表单数据
formContactMethod: {
}, //联系方式form表单数据
formContactMethod: {}, //联系方式form表单数据
rules: { rules: {
displayName: [ displayName: [
@ -198,16 +215,12 @@ export default {
}; };
}, },
created() {
},
created() {},
//挂载完成 //挂载完成
mounted() {
},
mounted() {},
methods: { methods: {
//联系人 相关操作 //联系人 相关操作
addContactPerson() { addContactPerson() {
this.$message.success("新增 addContactPerson"); this.$message.success("新增 addContactPerson");
@ -219,7 +232,7 @@ export default {
this.$message.success("删除 delContactPerson"); this.$message.success("删除 delContactPerson");
}, },
rowickContactPerson(){
rowickContactPerson() {
this.$message.success("rowickContactPerson"); this.$message.success("rowickContactPerson");
}, },
}, },

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

@ -1,27 +1,35 @@
<template> <template>
<<<<<<< HEAD
<el-tree :data="customerOrg.customerOrgTree" :props="customerOrg.treeprops" @node-click="treeclick"></el-tree> <el-tree :data="customerOrg.customerOrgTree" :props="customerOrg.treeprops" @node-click="treeclick"></el-tree>
=======
<el-tree
:data="$store.state.customerOrg.customerOrgTree"
:props="$store.state.customerOrg.treeprops"
@node-click="treeclick"
>
</el-tree>
>>>>>>> f9d318d580e990df8dcef97694425c64af480c32
</template> </template>
<script> <script>
import { mapState,mapMutations } from 'vuex' import { mapState,mapMutations } from 'vuex'
import { getapi, postapi, putapi, deletapi } from "@/api/api"; import { getapi, postapi, putapi, deletapi } from "@/api/api";
export default { export default {
components: {
},
components: {},
data() { data() {
return {
};
return {};
}, },
<<<<<<< HEAD
//<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']), ...mapState(['customerOrg']),
}, },
=======
>>>>>>> f9d318d580e990df8dcef97694425c64af480c32
//创建组件后 //创建组件后
created() {
},
created() {},
//挂载组件完成 //挂载组件完成
mounted() { mounted() {
@ -30,38 +38,52 @@ export default {
}, },
methods: { methods: {
<<<<<<< HEAD
...mapMutations(['setData']), ...mapMutations(['setData']),
=======
>>>>>>> f9d318d580e990df8dcef97694425c64af480c32
//获取体检单位列表树信息 //获取体检单位列表树信息
getCustomerOrgTree() { getCustomerOrgTree() {
let customerOrgTree = [{
displayName: "个人体检", //
id: "00000000-0000-0000-0000-000000000000", //
//treeChildren: [],
},
{
displayName: "组件式", //
id: "10000000-0000-0000-0000-000000000000", //
//treeChildren: [],
}
]
let customerOrgTree = [
{
displayName: "个人体检", //
id: "00000000-0000-0000-0000-000000000000", //
//treeChildren: [],
},
{
displayName: "组件式", //
id: "10000000-0000-0000-0000-000000000000", //
//treeChildren: [],
},
];
//console.log('this.data.customerOrgTree',this.data.customerOrgTree) //console.log('this.data.customerOrgTree',this.data.customerOrgTree)
<<<<<<< HEAD
this.setData({ key: 'customerOrg.customerOrgTree', value: customerOrgTree}) this.setData({ key: 'customerOrg.customerOrgTree', value: customerOrgTree})
=======
this.$store.commit("setData", {
key: "customerOrg.customerOrgTree",
value: customerOrgTree,
});
>>>>>>> f9d318d580e990df8dcef97694425c64af480c32
}, },
//点击树节点 //点击树节点
treeclick(data) { treeclick(data) {
<<<<<<< HEAD
this.$message.success(data.id + " 查询单位详情、体检次数、联系人等信息 " + data.displayName);// this.$message.success(data.id + " 查询单位详情、体检次数、联系人等信息 " + data.displayName);//
=======
console.log(data);
this.$message.success("查询单位详情、体检次数、联系人等信息"); //
>>>>>>> f9d318d580e990df8dcef97694425c64af480c32
getapi(`/api/app/item/in-item-type/${data.id}`).then((res) => { getapi(`/api/app/item/in-item-type/${data.id}`).then((res) => {
this.tableData = res.data; this.tableData = res.data;
console.log(res.data, "ress"); console.log(res.data, "ress");
// this.getlist(); // this.getlist();
}); });
}, },
}, },
}; };
</script> </script>
<style> <style>
</style> </style>

1
src/store/index.js
View File

@ -16,6 +16,7 @@ export default new Vuex.Store({
customerOrgId:'',//当前单位ID（可根据此值是否为空，判断是新增还是编辑） customerOrgId:'',//当前单位ID（可根据此值是否为空，判断是新增还是编辑）
customerOrgRd:{displayName:'单位名称',englishShortName:'简称'}, //单个体检单位记录值 customerOrgRd:{displayName:'单位名称',englishShortName:'简称'}, //单个体检单位记录值
customerOrgRegister: [], //单位体检次数登记 customerOrgRegister: [], //单位体检次数登记
} }
}, },
getters: {}, getters: {},

2
src/views/Home.vue
View File

@ -181,7 +181,7 @@
><i class="el-icon-menu"></i>套餐</el-menu-item ><i class="el-icon-menu"></i>套餐</el-menu-item
> >
<el-menu-item index="sys-parm-type" <el-menu-item index="sys-parm-type"
><i class="el-icon-menu"></i>系统参数类别</el-menu-item
><i class="el-icon-menu"></i>系统参数</el-menu-item
> >
</el-submenu> </el-submenu>
<el-submenu index="5"> <el-submenu index="5">

74
src/views/fee-settings/SysParmType.vue
View File

@ -29,13 +29,13 @@
style="width: 100%; margin-top: 30px" style="width: 100%; margin-top: 30px"
@row-click="rowclick" @row-click="rowclick"
> >
<el-table-column prop="displayName" label="名称" width="180">
<el-table-column prop="displayName" label="名称" width="">
</el-table-column> </el-table-column>
<el-table-column prop="simpleCode" label="快捷码" width="180">
<el-table-column prop="simpleCode" label="快捷码" width="">
</el-table-column> </el-table-column>
<el-table-column prop="parmValue" label="参数值" width="180">
<el-table-column prop="parmValue" label="参数值" width="">
</el-table-column> </el-table-column>
<el-table-column prop="remark" label="备注" width="180">
<el-table-column prop="remark" label="备注" width="360">
</el-table-column> </el-table-column>
<el-table-column label="创建者" prop="creatorName"></el-table-column> <el-table-column label="创建者" prop="creatorName"></el-table-column>
<el-table-column label="创建时间"> <el-table-column label="创建时间">
@ -47,9 +47,61 @@
label="修改者" label="修改者"
prop="lastModifierName" prop="lastModifierName"
></el-table-column> ></el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<el-button type="primary" @click="paramenterediting(scope.row)"
>编辑</el-button
>
</template>
</el-table-column>
</el-table> </el-table>
</el-card> </el-card>
</div> </div>
<!-- 系统参数编辑弹框-->
<el-dialog title="编辑" :visible.sync="dialogVisible" width="50%">
<div>
<span style="font-size: 20px; line-height: 53px">值:</span>
<el-input
type="textarea"
placeholder="请输入内容"
style="width: 50%; margin-left: 20%"
>
</el-input>
</div>
<div>
<span style="font-size: 20px; line-height: 53px">备注:</span>
<el-input
type="textarea"
placeholder="请输入内容"
v-model="form.remark"
style="width: 50%; margin-left: 17%; margin-top: 20px"
>
</el-input>
</div>
<!-- table区域 -->
<el-table :data="tableData" style="width: 100%;margin-top:50px">
<el-table-column label="创建者" prop="creatorName"></el-table-column>
<el-table-column label="创建时间">
<template slot-scope="scope">
{{ scope.row.creationTime | dateFormat }}
</template>
</el-table-column>
<el-table-column label="修改者" prop="creatorName"></el-table-column>
<el-table-column label="修改时间">
<template slot-scope="scope">
{{ scope.row.creationTime | dateFormat }}
</template>
</el-table-column>
</el-table>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button>
<el-button type="primary" @click="dialogVisible = false"
>确 定</el-button
>
</span>
</el-dialog>
<!-- -->
</div> </div>
</template> </template>
<script> <script>
@ -57,6 +109,7 @@ import { getapi } from "@/api/api";
export default { export default {
data() { data() {
return { return {
dialogVisible: false,
organizationvalue: "", organizationvalue: "",
organizationdata: [], organizationdata: [],
tableData: [], tableData: [],
@ -70,9 +123,18 @@ export default {
this.getoraniztion(); this.getoraniztion();
}, },
methods: { methods: {
//系统参数编辑
paramenterediting(row) {
this.form = row;
this.dialogVisible = true;
console.log(row);
},
//c每一列点击 //c每一列点击
rowclick(row) { rowclick(row) {
console.log(row);
// if(row.id==undefined){
// this.$message.warning('请选择操作的数据')
// }else if(this.)
// console.log(row);
}, },
//获取组织数据 //获取组织数据
getoraniztion() { getoraniztion() {
@ -88,7 +150,7 @@ export default {
this.tableData = res.data; this.tableData = res.data;
console.log(res); console.log(res);
}); });
console.log(v);
console.log(v);
}, },
// getlist() { // getlist() {
// getapi("/api/app/sys-parm-type").then((res) => { // getapi("/api/app/sys-parm-type").then((res) => {

Write Preview
Loading…
Cancel
Save