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

Merge branch 'master' of http://ver.wh613.com:3000/shentun/peisweb

master
pengjun 2 years ago
parent
a8bf849970 e68c42f1a3
commit
7767c5d6d0
4 changed files with 98 additions and 51 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. 1
      src/views/basic-dictionary/ResultStatus.vue
  2. 91
      src/views/common-settings/SampleGroup.vue
  3. 44
      src/views/fee-settings/Asbitem.vue
  4. 13
      src/views/fee-settings/Item.vue

1
src/views/basic-dictionary/ResultStatus.vue
View File

@ -313,6 +313,7 @@ export default {
}, },
dataInputFontColor1(v) { dataInputFontColor1(v) {
this.form.dataInputFontColor16 = "#" + v; this.form.dataInputFontColor16 = "#" + v;
console.log(v);
}, },
//报告单字体色 //报告单字体色
reportFontColor1(v) { reportFontColor1(v) {

91
src/views/common-settings/SampleGroup.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<div class="box"> <div class="box">
<div style="width: 95%"> <div style="width: 95%">
<el-card style="height: ">
<el-card style="height: 800px">
<el-table <el-table
:data="tableData" :data="tableData"
style="width: 100%" style="width: 100%"
@ -54,7 +54,7 @@
:title="title == 1 ? '新增' : '修改'" :title="title == 1 ? '新增' : '修改'"
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
width="53%" width="53%"
:close-on-click-modal="false"
:close-on-click-modal="false"
> >
<el-form ref="form" :model="form" label-width="80px" :rules="rules"> <el-form ref="form" :model="form" label-width="80px" :rules="rules">
<el-row> <el-row>
@ -132,31 +132,36 @@
<el-button type="primary" @click="addoredit">确 定</el-button> <el-button type="primary" @click="addoredit">确 定</el-button>
</span> </span>
</el-dialog> </el-dialog>
<div style="margin-top: 20px">
<span style="margin-top: 10px; padding: 5px; margin-left: 15%"
>项目类别</span
>
<el-select
v-model="values"
placeholder="请选择"
@change="ischangs"
style="margin-top: 5px"
>
<el-option
v-for="item in projectid"
:key="item.id"
:label="item.displayName"
:value="item.id"
<div style="margin-top: 20px" class="intermediatesubject">
<div>
<span style="margin-top: 10px; padding: 5px">项目类别</span>
<el-select
v-model="values"
placeholder="请选择"
@change="ischangs"
style="margin-top: 5px"
> >
</el-option>
</el-select>
<el-option
v-for="item in projectid"
:key="item.id"
:label="item.displayName"
:value="item.id"
>
</el-option>
</el-select>
</div>
<!-- --> <!-- -->
<span style="margin-left: 10%; padding: 5px">搜索选择</span>
<span style="margin-left: 10%; padding: 5px; margin-top: 10px"
>搜索选择</span
>
<el-select <el-select
filterable filterable
v-model="flitvalues" v-model="flitvalues"
placeholder="请选择" placeholder="请选择"
style="margin-top: 5px" style="margin-top: 5px"
value-key="id"
@change="selectchange"
> >
<el-option <el-option
v-for="item in filetelists" v-for="item in filetelists"
@ -208,7 +213,7 @@
</el-button> </el-button>
</div> </div>
</div> </div>
<div class="leftbox" style="margin-left: 7%">
<div class="leftbox" style="margin-left: 5%">
<div class="weixuan">已选项目</div> <div class="weixuan">已选项目</div>
<div <div
v-for="(item, index) in rightdata" v-for="(item, index) in rightdata"
@ -338,7 +343,7 @@ export default {
ary1: [], ary1: [],
ary2: [], ary2: [],
sdate: [], sdate: [],
curRow:{}
curRow: {},
}; };
}, },
created() { created() {
@ -364,6 +369,11 @@ export default {
// }, // },
}, },
methods: { methods: {
selectchange(v) {
console.log(v);
// console.log("111");
// console.log(v);
},
Onsubmit() { Onsubmit() {
let sampleGroupId = this.form.id; let sampleGroupId = this.form.id;
console.log(this.form.id); console.log(this.form.id);
@ -382,7 +392,10 @@ export default {
this.$message.warning("请选择列表"); this.$message.warning("请选择列表");
} else { } else {
batchcreaion(sdate).then((res) => { batchcreaion(sdate).then((res) => {
this.$message.success("操作成功");
if (res.code == 0) {
this.$message.success("操作成功");
}
this.isdislob = true; this.isdislob = true;
}); });
} }
@ -436,7 +449,7 @@ export default {
this.ites.splice(this.num, 1); this.ites.splice(this.num, 1);
this.rightdata.push(this.rightobj); this.rightdata.push(this.rightobj);
// this.sdate.push({ id: this.leftobj.id }); // this.sdate.push({ id: this.leftobj.id });
// this.updatedate();
this.updatedate();
// console.log(this.sdate); // console.log(this.sdate);
// this.rightdata.forEach(item=>{ // this.rightdata.forEach(item=>{
// }) // })
@ -454,12 +467,14 @@ export default {
rightindex(item, index) { rightindex(item, index) {
this.nums = index; this.nums = index;
this.leftobj = item; this.leftobj = item;
this.isdislob = false;
console.log(this.leftobj); console.log(this.leftobj);
}, },
//左侧双击事件 //左侧双击事件
shuanji(item, index) { shuanji(item, index) {
this.ites.splice(index, 1); this.ites.splice(index, 1);
this.rightdata.push(item); this.rightdata.push(item);
this.isdislob = false;
}, },
//右移动 //右移动
removeright() { removeright() {
@ -485,6 +500,7 @@ export default {
console.log(this.allid); console.log(this.allid);
this.ischank = 2; this.ischank = 2;
this.num = index; this.num = index;
this.isdislob = false;
}, },
//科室选择 //科室选择
ischangs(v) { ischangs(v) {
@ -566,7 +582,7 @@ export default {
}, },
//置底 //置底
setlow() { setlow() {
this.form={...this.curRow}
this.form = { ...this.curRow };
if (this.form.id == undefined) { if (this.form.id == undefined) {
this.$message.warning("请选择操作的数据"); this.$message.warning("请选择操作的数据");
} else { } else {
@ -579,7 +595,7 @@ export default {
}, },
//置顶 //置顶
topping() { topping() {
this.form={...this.curRow}
this.form = { ...this.curRow };
if (this.form.id == undefined) { if (this.form.id == undefined) {
this.$message.warning("请选择操作的数据"); this.$message.warning("请选择操作的数据");
} else { } else {
@ -591,7 +607,7 @@ export default {
}, },
//删除 //删除
deleteid() { deleteid() {
this.form={...this.curRow}
this.form = { ...this.curRow };
if (this.form.id == undefined) { if (this.form.id == undefined) {
this.$message.warning("请选择操作的数据"); this.$message.warning("请选择操作的数据");
} else { } else {
@ -604,7 +620,7 @@ export default {
}, },
//编辑弹框 //编辑弹框
editreport() { editreport() {
this.form={...this.curRow}
this.form = { ...this.curRow };
if (this.form.id == undefined) { if (this.form.id == undefined) {
this.$message.warning("请选择操作的数据"); this.$message.warning("请选择操作的数据");
} else { } else {
@ -673,8 +689,8 @@ export default {
}, },
rowick(row) { rowick(row) {
samplegropid(row.id).then((res) => { samplegropid(row.id).then((res) => {
this.curRow={...res.data}
// this.form = res.data;
this.curRow = { ...res.data };
this.form = res.data;
}); });
sampleasbitemid(row.id).then((res) => { sampleasbitemid(row.id).then((res) => {
let dq = res.data; let dq = res.data;
@ -718,8 +734,13 @@ export default {
}; };
</script> </script>
<style scoped> <style scoped>
.intermediatesubject {
/* width: 100%; */
display: flex;
justify-content: center;
}
.confirmcancellation { .confirmcancellation {
margin-left: 40%;
margin-left: 50%;
} }
.Selectbutton { .Selectbutton {
margin-left: 3%; margin-left: 3%;
@ -737,11 +758,17 @@ export default {
height: 240px; height: 240px;
border: 1px solid #ccc; border: 1px solid #ccc;
margin-left: 6%; margin-left: 6%;
overflow-x: hidden;
overflow-y: scroll;
} }
.instrumentcategory { .instrumentcategory {
width: 100%; width: 100%;
display: flex; display: flex;
margin-left: 15%;
justify-content: center;
/* margin-left: 15%; */
}
.el-card__body {
height: 700px;
} }
.box { .box {
display: flex; display: flex;

44
src/views/fee-settings/Asbitem.vue
View File

@ -55,7 +55,7 @@
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
width="50%" width="50%"
@close="bindidclose" @close="bindidclose"
:close-on-click-modal="false"
:close-on-click-modal="false"
> >
<el-form <el-form
:model="form" :model="form"
@ -66,7 +66,10 @@
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="名称" prop="displayName"> <el-form-item label="名称" prop="displayName">
<el-input v-model="form.displayName" ref="refinput"></el-input>
<el-input
v-model="form.displayName"
ref="refinput"
></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
@ -297,6 +300,7 @@
</el-select> </el-select>
<span style="margin-left: 10%; padding: 5px">搜索选择</span> <span style="margin-left: 10%; padding: 5px">搜索选择</span>
<el-select <el-select
value-key="id"
@change="selectitem" @change="selectitem"
filterable filterable
v-model="flitvalues" v-model="flitvalues"
@ -307,7 +311,7 @@
v-for="item in filetelists" v-for="item in filetelists"
:key="item.id" :key="item.id"
:label="item.displayName" :label="item.displayName"
:value="item.id"
:value="item"
> >
</el-option> </el-option>
</el-select> </el-select>
@ -604,7 +608,7 @@ export default {
rightobj: {}, rightobj: {},
nums: 0, nums: 0,
itemid: "", //项目id itemid: "", //项目id
curRow:{}
curRow: {},
}; };
}, },
created() { created() {
@ -624,7 +628,15 @@ export default {
}, },
//搜索选择 //搜索选择
selectitem(v) { selectitem(v) {
this.itemid = v;
this.itemid = v.id;
// this.rightdata.forEach((item) => {
// if (v.id != item.id) {
// } else {
// this.rightdata.push({ displayName: v.displayName });
// }
// });
this.rightdata.push({ displayName: v.displayName });
console.log(v,'sssssssss');
}, },
Onsubmit() { Onsubmit() {
let sampleGroupId = this.form.id; let sampleGroupId = this.form.id;
@ -659,13 +671,14 @@ export default {
this.isdislob = false; this.isdislob = false;
this.rightdata.splice(this.num, 1); this.rightdata.splice(this.num, 1);
this.leftdata.push(item); this.leftdata.push(item);
this.isdislob = true;
this.isdislob = false;
this.updatedate(); this.updatedate();
}, },
//右侧点击选中 //右侧点击选中
rightindex(item, index) { rightindex(item, index) {
this.nums = index; this.nums = index;
this.leftobj = item; this.leftobj = item;
console.log(this.leftobj); console.log(this.leftobj);
}, },
//左侧添加按钮 //左侧添加按钮
@ -681,7 +694,7 @@ export default {
if (this.rightdata.length > 0) { if (this.rightdata.length > 0) {
this.rightdata.splice(this.num, 1); this.rightdata.splice(this.num, 1);
this.leftdata.push(this.leftobj); this.leftdata.push(this.leftobj);
this.isdislob = true;
this.isdislob = false;
// this.isdislob=false // this.isdislob=false
this.updatedate(); this.updatedate();
} }
@ -711,6 +724,7 @@ export default {
console.log(item); console.log(item);
this.leftdata.splice(index, 1); this.leftdata.splice(index, 1);
this.rightdata.push(item); this.rightdata.push(item);
this.isdislob = false;
}, },
clickPaixu(item, index) { clickPaixu(item, index) {
this.rightobj = item; this.rightobj = item;
@ -797,7 +811,7 @@ export default {
}, },
//置底 //置底
setlow() { setlow() {
this.form={...this.curRow}
this.form = { ...this.curRow };
if (this.form.id == undefined) { if (this.form.id == undefined) {
this.$message.warning("请选择操作的数据"); this.$message.warning("请选择操作的数据");
} else { } else {
@ -810,7 +824,7 @@ export default {
}, },
//置顶 //置顶
topping() { topping() {
this.form={...this.curRow}
this.form = { ...this.curRow };
if (this.form.id == undefined) { if (this.form.id == undefined) {
this.$message.warning("请选择操作的数据"); this.$message.warning("请选择操作的数据");
} else { } else {
@ -822,7 +836,7 @@ export default {
}, },
//删除 //删除
deleteid() { deleteid() {
this.form={...this.curRow}
this.form = { ...this.curRow };
if (this.form.id == undefined) { if (this.form.id == undefined) {
this.$message.warning("请选择操作的数据"); this.$message.warning("请选择操作的数据");
} else { } else {
@ -834,7 +848,7 @@ export default {
}, },
//编辑弹框 //编辑弹框
editpopup() { editpopup() {
this.form={...this.curRow}
this.form = { ...this.curRow };
if (this.form.id == undefined) { if (this.form.id == undefined) {
this.$message.warning("请点击选择操作的数据"); this.$message.warning("请点击选择操作的数据");
} else { } else {
@ -931,9 +945,9 @@ export default {
addll() { addll() {
this.dialogVisible = true; this.dialogVisible = true;
this.title = 1; this.title = 1;
this.$nextTick(()=>{
this.$refs.refinput.focus()
})
this.$nextTick(() => {
this.$refs.refinput.focus();
});
//性别 //性别
examinationgender().then((res) => { examinationgender().then((res) => {
@ -956,7 +970,7 @@ this.$nextTick(()=>{
}, },
rowick(row) { rowick(row) {
asbitemgetid(row.id).then((res) => { asbitemgetid(row.id).then((res) => {
this.curRow={...res.data}
this.curRow = { ...res.data };
// this.form = res.data; // this.form = res.data;
}); });
getapi( getapi(

13
src/views/fee-settings/Item.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<div class="box"> <div class="box">
<div style="width: 150%">
<el-card>
<div style="width: 90%">
<el-card style="height:600px;width:100%">
<el-row style="margin-top: 20px; margin-left: 15px"> <el-row style="margin-top: 20px; margin-left: 15px">
<el-col :span="4"> <el-col :span="4">
<el-autocomplete <el-autocomplete
@ -52,8 +52,9 @@
<div style="width: 85%"> <div style="width: 85%">
<el-table <el-table
:data="tableData" :data="tableData"
style="width: 95%; height: 500px"
style="width: 100%; "
row-key="id" row-key="id"
height="500"
class="el-table__body-wrapper tbody" class="el-table__body-wrapper tbody"
highlight-current-row highlight-current-row
@row-click="rowick" @row-click="rowick"
@ -390,12 +391,14 @@
<!-- 按钮区域 --> <!-- 按钮区域 -->
<div style="margin-left: 10px; margin-top: 7%"> <div style="margin-left: 10px; margin-top: 7%">
<el-button type="primary" @click="add">新增</el-button> <el-button type="primary" @click="add">新增</el-button>
<el-button
<div>
<el-button
type="primary" type="primary"
@click="editpopup" @click="editpopup"
style="margin-left: 0; margin-top: 10px" style="margin-left: 0; margin-top: 10px"
>编辑</el-button >编辑</el-button
> >
</div>
<div style="margin-top: 10px"> <div style="margin-top: 10px">
<el-button type="danger" @click="delsrts">删除</el-button> <el-button type="danger" @click="delsrts">删除</el-button>
</div> </div>
@ -1774,5 +1777,7 @@ export default {
<style scoped> <style scoped>
.box { .box {
display: flex; display: flex;
width: 100%;
} }
</style> </style>
Write Preview
Loading…
Cancel
Save