pengjun 2 years ago
parent
commit
0c8efe960e
  1. 4
      src/api/request.js
  2. 100
      src/components/unitGrouping/unitGroupCategory.vue
  3. 15
      src/components/unitGrouping/unitGroupingTable.vue
  4. 21
      src/views/basic-dictionary/BirthPlace.vue
  5. 6
      src/views/basic-dictionary/DiagnosisPostfix.vue
  6. 4
      src/views/basic-dictionary/GuideType.vue
  7. 54
      src/views/basic-dictionary/MedicalConclusion.vue
  8. 13
      src/views/basic-dictionary/MedicalConclusionType.vue
  9. 5
      src/views/basic-dictionary/MedicalReportType.vue
  10. 5
      src/views/basic-dictionary/MedicalType.vue
  11. 95
      src/views/basic-dictionary/Nation.vue
  12. 33
      src/views/basic-dictionary/PersonnelType.vue
  13. 5
      src/views/basic-dictionary/SampleType.vue
  14. 7
      src/views/basic-dictionary/Unit.vue

4
src/api/request.js

@ -14,8 +14,8 @@ const instance = axios.create({
//请求拦截
instance.interceptors.request.use(
async function (config) {
//console.log('old token:',localStorage.getItem("token"))
//console.log('old expires_in',localStorage.getItem("expires_in"))
console.log('old token:',localStorage.getItem("token"))
console.log('old expires_in',localStorage.getItem("expires_in"))
await yztoken();
let token = localStorage.getItem("token");

100
src/components/unitGrouping/unitGroupCategory.vue

@ -69,10 +69,28 @@
width="110"
prop="displayName"
></el-table-column>
<el-table-column label="标准价格" prop="price">
<template slot-scope="scope">
<el-input
disabled
type="text"
v-model="personnelUnit.nogroupselected[scope.$index].price"
/>
</template>
</el-table-column>
<el-table-column label="折扣" prop="price">
<template slot-scope="scope">
<el-input
@change="discount(scope.$index)"
type="text"
v-model="personnelUnit.nogroupselected[scope.$index].discount"
/>
</template>
</el-table-column>
<el-table-column label="价格" prop="price">
<template slot-scope="scope">
<el-input
@input="changingprices(scope.row.price)"
type="text"
v-model="personnelUnit.nogroupselected[scope.$index].price"
/>
@ -163,6 +181,7 @@ export default {
copegroupdata: [], //
addrulst: [], //Id
price: "", //
title: 1,
};
},
computed: {
@ -173,6 +192,17 @@ export default {
this.getportfolioitems();
},
methods: {
changingprices(price) {
this.price = price;
},
discount(index) {
console.log(index); //100
this.personnelUnit.nogroupselected[index].price = Math.round(
(100 * Number(this.personnelUnit.nogroupselected[index].queueTime)) /
100,
2
);
},
inputchang(row, newVal) {
this.price = row.price;
console.log(this.price);
@ -191,6 +221,21 @@ export default {
}
);
}
// if (this.title == 2) {
// if (!this.personnelUnit.customerOrgGroupId) {
// alert("");
// return;
// } else {
// console.log(this.personnelUnit.nogroupselected);
// postapi(
// "/api/app/customer-org-group-detail/many",
// this.addrulst
// ).then((res) => {
// this.$message.success("");
// console.log(this.addrulst);
// });
// }
// }
// console.log(this.addrulst);
// // console.log(this.personnelUnit.form.id);
@ -217,14 +262,12 @@ export default {
if (this.rightselctedata.length == 0) {
this.$message.warning("已选数据为空无法移动");
} else {
// this.title = 2;
let count = this.rightselctedata.length - 1;
for (var i = count; i >= 0; i--) {
// this.personnelUnit.nogroupselected.splice(i, 1);
// !this.rightselctedata.includes(this.rightselctedata[i].displayName)
[...new Set(this.rightselctedata)];
this.tabledata.push(this.rightselctedata[i]);
this.personnelUnit.nogroupselected.splice(i, 1);
// this.tabledata.push(this.rightselctedata[i]);
}
console.log(this.personnelUnit.customerOrgGroupId);
@ -232,7 +275,7 @@ export default {
this.rightselctedata.forEach((item) => {
this.addrulst.push({
asbitemId: item.id,
price: price,
price: item.price,
// price: this.price,
customerOrgGroupId: this.personnelUnit.customerOrgGroupId,
});
@ -261,7 +304,7 @@ export default {
if ([...new Set(this.unselecteddata)]) {
// this.unselecteddata.push(this.unselecteddata[i]);
this.personnelUnit.nogroupselected.push(this.unselecteddata[i]);
this.tabledata.splice(i, 1);
this.tabledata.splice(this.tabledata[i], 1);
}
// this.personnelUnit.nogroupselected.push(this.unselecteddata[i]);
}
@ -280,11 +323,11 @@ export default {
// prices = items.price;
// this.price = item.price;
console.log(items, "items");
// console.log(items, "items");
this.addrulst.push({
asbitemId:items.id, // "3a0b2f0c-f884-bec4-a350-79b46b455a2d"
// price: prices,
asbitemId: items.id, // "3a0b2f0c-f884-bec4-a350-79b46b455a2d"
price: items.price,
// price: this.price == "" ? items.price : this.price,
customerOrgGroupId: this.personnelUnit.customerOrgGroupId,
});
});
@ -347,19 +390,22 @@ export default {
},
//
listeninglist() {
listeninglist(customerOrgGroupId) {
getapi(`/api/app/customer-org-group/${customerOrgGroupId}`).then(
(res) => {
this.personnelUnit.form = res.data;
console.log(res);
}
);
getapi(
`/api/app/customer-org-group/${this.personnelUnit.customerOrgGroupId}`
`/api/app/customer-org-group-detail/customer-org-group-detail-in-asbitem/${customerOrgGroupId}`
).then((res) => {
this.personnelUnit.form = res.data;
console.log(res);
console.log(
`/api/app/customer-org-group-detail/customer-org-group-detail-in-asbitem/${customerOrgGroupId}`,
res
);
this.personnelUnit.nogroupselected = res.data;
});
// getapi(
// `/api/app/customer-org-group-detail/customer-org-group-detail-in-asbitem/${this.personnelUnit.form.id}`
// ).then((res) => {
// console.log(res, "res");
// this.personnelUnit.nogroupselected = res.data;
// });
},
// getapi(`/api/app/customer-org-group/${row.id}`).then((res)
},
@ -367,10 +413,14 @@ export default {
watch: {
//
"personnelUnit.customerOrgGroupId"(newVal, oldVal) {
//console.log('patientRegister.addTimes newVal',newVal,' oldVal',oldVal)
console.log(
"watch patientRegister.addTimes newVal:",
newVal,
" oldVal:",
oldVal
);
if (newVal != oldVal) {
console.log("newVal", newVal);
this.listeninglist();
this.listeninglist(newVal);
//
}
},
@ -382,10 +432,11 @@ export default {
margin-left: 5%;
}
.mainarearightbox {
width: 30%;
width: 35%;
border: 1px solid #000;
height: 300px;
margin-left: 7%;
overflow: auto;
}
.mainbutton {
margin-left: 5%;
@ -401,7 +452,8 @@ export default {
border: 1px solid #000;
height: 300px;
overflow: hidden;
overflow: auto;
margin-left: 7%;
}
.examinationcategory {

15
src/components/unitGrouping/unitGroupingTable.vue

@ -279,13 +279,13 @@ export default {
});
// //
console.log(this.personnelUnit.form.id);
getapi(
`/api/app/customer-org-group-detail/customer-org-group-detail-in-asbitem/${this.personnelUnit.form.id}`
).then((res) => {
console.log(res.data, "当前列");
this.personnelUnit.nogroupselected = res.data;
console.log(this.personnelUnit.nogroupselected, "我是分组");
});
// getapi(
// `/api/app/customer-org-group-detail/customer-org-group-detail-in-asbitem/${this.personnelUnit.form.id}`
// ).then((res) => {
// console.log(res.data, "");
// this.personnelUnit.nogroupselected = res.data;
// console.log(this.personnelUnit.nogroupselected, "");
// });
},
//
editgroup() {
@ -352,6 +352,7 @@ export default {
} else {
this.dialogVisible = true;
this.title = 1;
this.form={}
this.obtainsuperior();
}
},

21
src/views/basic-dictionary/BirthPlace.vue

@ -81,7 +81,7 @@
:visible.sync="dialogVisible"
width="75%"
>
<el-form ref="form" :model="form" label-width="100px">
<el-form ref="form" :model="form" label-width="100px" :rules="rules">
<el-row>
<el-col :span="9">
<el-form-item label="编号">
@ -92,14 +92,14 @@
></el-input> </el-form-item
></el-col>
<el-col :span="7">
<el-form-item label="名称">
<el-form-item label="名称" prop="displayName">
<el-input
v-model="form.displayName"
style="width: 100%"
></el-input> </el-form-item
></el-col>
<el-col :span="8">
<el-form-item label="国家标准码">
<el-form-item label="国家标准码" prop="countryCode">
<el-input
v-model="form.countryCode"
style="width: 90%"
@ -192,6 +192,14 @@ import {
export default {
data() {
return {
rules: {
displayName: [
{ required: true, message: "请输入名称", trigger: "blur" },
],
countryCode: [
{ required: true, message: "请输入国家标准码", trigger: "blur" },
],
},
tableHeight: window.innerHeight - 240, //
screenHeight: window.innerHeight, //
totalCount: 0,
@ -360,6 +368,9 @@ export default {
},
//
addoredit() {
this.$refs.form.validate(v=>{
if(v){
if (this.title == 1) {
if (this.form.displayName != "" && this.form.countryCode != "") {
newplaceofrigin({
@ -393,11 +404,15 @@ export default {
this.$message.warning("请输入国家标准码");
}
}
}
})
},
//
add() {
this.dialogVisible = true;
this.title = 1;
this.form={}
},
//
getlist() {

6
src/views/basic-dictionary/DiagnosisPostfix.vue

@ -335,6 +335,11 @@ export default {
},
//
addoredit() {
if(this.form.displayName==undefined){
this.$message.warning('请输入名称')
}else{
if (this.title == 1) {
addDiagnostics({ displayName: this.form.displayName }).then((res) => {
this.$message.success("新增成功");
@ -350,6 +355,7 @@ export default {
}
);
}
}
},
//
add() {

4
src/views/basic-dictionary/GuideType.vue

@ -666,11 +666,11 @@ export default {
addoredit() {
if (this.title == 1) {
this.form={}
if (this.form.displayName == "") {
if (this.form.displayName ==undefined) {
this.$message.warning("请输入名称");
} else {
newlyadded({ displayName: this.form.displayName }).then((res) => {
console.log(res);
console.log(this.form.displayName);
this.$message.success("新增成功");
this.form = {};
this.getlists();

54
src/views/basic-dictionary/MedicalConclusion.vue

@ -219,8 +219,8 @@ export default {
dialogVisible: false,
form: {
displayName: "",
medicalConclusionTypeId:'',
ars:'',
medicalConclusionTypeId: "",
ars: "",
},
Selectacategory: [],
Selectvalue: "",
@ -290,7 +290,7 @@ export default {
},
isselctvalue(v) {
this.form.medicalConclusionTypeId=v
this.form.medicalConclusionTypeId = v;
console.log(v);
this.pages.TypeId = v;
console.log(v);
@ -432,31 +432,39 @@ export default {
},
change(v) {
this.selars = v;
this.form.medicalConclusionTypeId=v
this.form.medicalConclusionTypeId = v;
console.log(this.form.ids);
},
//
addoredit() {
if (this.title == 1) {
addconclusion({
displayName: this.form.displayName,
// medicalConclusionTypeId: this.form.ars,
console.log(this.form.displayName);
console.log(this.selars);
if (this.form.displayName == "") {
this.$message.warning("请输入名称");
} else if (this.selars == "") {
this.$message.warning("请选择类别");
} else {
if (this.title == 1) {
addconclusion({
displayName: this.form.displayName,
// medicalConclusionTypeId: this.form.ars,
medicalConclusionTypeId: this.form.medicalConclusionTypeId,
}).then((res) => {
this.$message.success("新增成功");
this.getlist();
this.dialogVisible = false;
});
} else if (this.title == 2) {
//diagnosticediting updateconlus
xiugaijielun(this.form.id, {
displayName: this.form.displayName,
medicalConclusionTypeId: this.selars,
}).then((res) => {
this.$message.success("修改成功");
this.getlist();
this.dialogVisible = false;
});
}).then((res) => {
this.$message.success("新增成功");
this.getlist();
this.dialogVisible = false;
});
} else if (this.title == 2) {
//diagnosticediting updateconlus
xiugaijielun(this.form.id, {
displayName: this.form.displayName,
medicalConclusionTypeId: this.selars,
}).then((res) => {
this.$message.success("修改成功");
this.getlist();
this.dialogVisible = false;
});
}
}
},
//

13
src/views/basic-dictionary/MedicalConclusionType.vue

@ -333,13 +333,25 @@ export default {
},
//
addoredit() {
console.log(this.form.displayName);
if(this.form.displayName==''){
this.$message.warning('请输入名称')
}else{
if (this.title == 1) {
if(this.form.displayName==undefined){
this.$message.warning('请输入名称1')
}
physicalnew({ displayName: this.form.displayName }).then((res) => {
this.$message.success("新增成功");
this.getlist();
this.dialogVisible = false;
});
} else if (this.title == 2) {
if(this.form.displayName==undefined){
this.$message.warning('名称不能为空')
}
tijianleibiexiugai(this.form.id, {
displayName: this.form.displayName,
}).then((res) => {
@ -348,6 +360,7 @@ export default {
this.dialogVisible = false;
});
}
}
},
//
add() {

5
src/views/basic-dictionary/MedicalReportType.vue

@ -414,8 +414,8 @@ export default {
//
if (this.title == 1) {
// this.form = {};
if (this.form.displayName == "") {
this.$message.error("请输入名称");
if (this.form.displayName == undefined) {
this.$message.warning("请输入名称");
} else {
newreport({ displayName: this.form.displayName }).then((res) => {
if (res.code == 1) {
@ -448,6 +448,7 @@ export default {
addll() {
this.dialogVisible = true;
this.title = 1;
this.form={}
},
//
getlist() {

5
src/views/basic-dictionary/MedicalType.vue

@ -331,7 +331,7 @@ export default {
//
addoredit() {
if (this.title == 1) {
if (this.form.displayName != "") {
if (this.form.displayName != undefined) {
newphysical({ displayName: this.form.displayName }).then((res) => {
console.log(res);
this.$message.success("新增成功");
@ -339,7 +339,7 @@ export default {
this.getlist();
this.dialogVisible = false;
});
} else if (this.form.displayName == "") {
} else if (this.form.displayName == undefined) {
this.$message.warning("请输入名称");
}
} else if (this.title == 2) {
@ -361,6 +361,7 @@ export default {
add() {
this.dialogVisible = true;
this.title = 1;
this.form={}
},
//
getlist() {

95
src/views/basic-dictionary/Nation.vue

@ -84,7 +84,7 @@
:visible.sync="dialogVisible"
width="75%"
>
<el-form ref="form" :model="form" label-width="80px">
<el-form ref="form" :model="form" label-width="80px" :rules="rules">
<el-row>
<el-col :span="9">
<el-form-item label="编号">
@ -96,7 +96,7 @@
</el-form-item>
</el-col>
<el-col :span="7">
<el-form-item label="名称">
<el-form-item label="名称" prop="displayName">
<el-input
v-model="form.displayName"
style="width: 60%"
@ -104,7 +104,11 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="国家标准码" label-width="100px">
<el-form-item
label="国家标准码"
label-width="100px"
prop="countryCode"
>
<el-input
style="width: 60%"
v-model="form.countryCode"
@ -193,6 +197,14 @@ import {
export default {
data() {
return {
rules: {
displayName: [
{ required: true, message: "请输入名称", trigger: "blur" },
],
countryCode: [
{ required: true, message: "请输入国家标准码", trigger: "blur" },
],
},
tableHeight: window.innerHeight - 255, //
screenHeight: window.innerHeight, //
totalCount: 0,
@ -240,9 +252,8 @@ export default {
// console.log(res);
// });
this.form = row;
this.form = row;
console.log(row);
},
@ -375,47 +386,51 @@ export default {
},
//
addoredit() {
if (this.title == 1) {
newethnicgroups({
displayName: this.form.displayName,
countryCode: this.form.countryCode,
}).then((res) => {
if (res.code == 1) {
this.$message.success("新增成功");
this.getlist();
this.form = {};
this.dialogVisible = false;
}
});
} else if (this.title == 2) {
if (this.form.displayName != "" && this.form.countryCode != "") {
ethnicmodification(this.form.id, {
displayName: this.form.displayName,
countryCode: this.form.countryCode,
}).then((res) => {
console.log(res);
if (res == undefined) {
this.$message.warning("请重新输入");
this.getlist();
this.form = {};
} else {
this.$message.success("修改成功");
this.getlist();
this.dialogVisible = false;
this.$refs.form.validate((v) => {
if (v) {
if (this.title == 1) {
newethnicgroups({
displayName: this.form.displayName,
countryCode: this.form.countryCode,
}).then((res) => {
if (res.code == 1) {
this.$message.success("新增成功");
this.getlist();
this.form = {};
this.dialogVisible = false;
}
});
} else if (this.title == 2) {
if (this.form.displayName != "" && this.form.countryCode != "") {
ethnicmodification(this.form.id, {
displayName: this.form.displayName,
countryCode: this.form.countryCode,
}).then((res) => {
console.log(res);
if (res == undefined) {
this.$message.warning("请重新输入");
this.getlist();
this.form = {};
} else {
this.$message.success("修改成功");
this.getlist();
this.dialogVisible = false;
}
});
} else if (this.form.displayName == "") {
this.$message.success("请输入名称");
} else if (this.form.countryCode == "") {
this.$message.success("国家标准码");
}
});
} else if (this.form.displayName == "") {
this.$message.success("请输入名称");
} else if (this.form.countryCode == "") {
this.$message.success("国家标准码");
}
}
}
});
},
//
addll() {
this.dialogVisible = true;
this.title = 1;
this.form={}
this.form = {};
},
//
getlist() {

33
src/views/basic-dictionary/PersonnelType.vue

@ -330,26 +330,31 @@ export default {
},
//
addoredit() {
if (this.title == 1) {
newpersonnel({ displayName: this.form.displayName }).then((res) => {
this.$message.success("新增成功");
this.getlist();
this.dialogVisible = false;
});
} else if (this.title == 2) {
personnelmodif(this.form.id, {
displayName: this.form.displayName,
}).then((res) => {
this.$message.success("修改成功");
this.getlist();
this.dialogVisible = false;
});
if (this.form.displayName == undefined) {
this.$message.warning("请输入名称");
} else {
if (this.title == 1) {
newpersonnel({ displayName: this.form.displayName }).then((res) => {
this.$message.success("新增成功");
this.getlist();
this.dialogVisible = false;
});
} else if (this.title == 2) {
personnelmodif(this.form.id, {
displayName: this.form.displayName,
}).then((res) => {
this.$message.success("修改成功");
this.getlist();
this.dialogVisible = false;
});
}
}
},
//
add() {
this.dialogVisible = true;
this.title = 1;
this.form = {};
},
getlist() {
personnelcategory(this.pages).then((res) => {

5
src/views/basic-dictionary/SampleType.vue

@ -328,15 +328,14 @@ export default {
addoredit() {
if (this.title == 1) {
console.log(this.form);
if (this.form.displayName != "") {
if (this.form.displayName != undefined) {
addedspecimen({ displayName: this.form.displayName }).then((res) => {
this.$message.success("新增成功");
this.getlist();
this.dialogVisible = false;
this.form = {};
});
} else {
this.$message.success("请输入名称");
this.$message.warning("请输入名称");
}
} else if (this.title == 2) {
editingspecimens(this.form.id, {

7
src/views/basic-dictionary/Unit.vue

@ -356,6 +356,11 @@ export default {
},
//
addoredit() {
if(this.form.displayName==undefined){
this.$message.warning('请输入名称')
}else{
if (this.title == 1) {
addunit({ displayName: this.form.displayName }).then((res) => {
this.$message.success("新增成功");
@ -370,7 +375,9 @@ export default {
this.dialogVisible = false;
}
);
}
}
},
//
add() {

Loading…
Cancel
Save