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

lis import

master
pengjun 2 years ago
parent
099659958d
commit
540210dc76
6 changed files with 168 additions and 497 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 142
      src/components/commonTable/CommonTable.vue
  2. 102
      src/components/commonTable/CommonTableEdit.vue
  3. 202
      src/components/commonTable/CommonTableTypeEdit.vue
  4. 203
      src/components/commonTable/commonTableType.vue
  5. 1
      src/store/index.js
  6. 15
      src/views/doctorCheck/lisResultImport.vue

142
src/components/commonTable/CommonTable.vue
View File

@ -7,12 +7,12 @@
<!--公共表分类信息-->
<div style="display: flex; font-size: 14px">
<div :style="'display: block;width:' + (window.pageWidth - window.pageMarginWidth - 110 - 5) + 'px;'">
<el-table :data="commonTables" ref="commonTable" row-key="id" border :height="`${tableHeight }px`" size="small"
highlight-current-row :row-class-name="handleRowClassName" @row-click="rowClick">
<el-table id="commonTables" :data="commonTables" ref="commonTables" row-key="id" border :height="`${tableHeight}px`"
size="small" highlight-current-row :row-class-name="handleRowClassName" @row-click="rowClick">
<el-table-column type="index" label="序号" width="50" align="center" />
<el-table-column label="编号" prop="id" min-width="200" align="center" />
<el-table-column prop="dataCode" label="dataCode" min-width="100" />
<el-table-column prop="displayName" label="名称" min-width="150" />
<el-table-column prop="displayName" label="项目名称" min-width="150" />
<el-table-column prop="commonTableTypeId" label="分类" min-width="150" />
<el-table-column prop="simpleCode" label="简码" min-width="60" />
<el-table-column prop="creatorName" label="创建者" min-width="80" align="center" />
@ -21,11 +21,11 @@
{{ scope.row.creationTime ? moment(scope.row.creationTime).format("yyyy-MM-DD HH:mm:ss") : "" }}
</template>
</el-table-column>
<el-table-column prop="lastModificationName" label="修改者" min-width="80" align="center" />
<el-table-column prop="lastModifierName" label="修改者" min-width="80" align="center" />
<el-table-column label="修改时间" min-width="150" align="center">
<template slot-scope="scope">
{{ scope.row.lastModificationTime ? moment(scope.row.lastModificationTime).format("yyyy-MM-DD HH:mm:ss")
: "" }}
: "" }}
</template>
</el-table-column>
<el-table-column label="操作" align="center">
@ -53,10 +53,10 @@
<el-button class="deleteButton" @click="btnDel">删除</el-button>
</div>
<div style="margin-top: 5px">
<el-button class="commonbutton" @click="btnSetTop">置顶</el-button>
<el-button class="commonbutton" @click="btnSetTopOrBottom(1)">置顶</el-button>
</div>
<div style="margin-top: 5px">
<el-button class="commonbutton" @click="btnSetBottom">置底</el-button>
<el-button class="commonbutton" @click="btnSetTopOrBottom(2)">置底</el-button>
</div>
<div style="margin-top: 5px">
<el-button class="commonbutton" @click="btnSort" :disabled="!isDrag">保存排序</el-button>
@ -111,8 +111,8 @@ export default {
computed: {
...mapState(["personnelUnit", "window", "dict", "dialogWin", "dataTransOpts"]),
tableHeight(){
let h = this.window.pageHeight < 600 ? 600:this.window.pageHeight
tableHeight() {
let h = this.window.pageHeight < 600 ? 600 : this.window.pageHeight
return h - this.window.pageHeaderHeight - this.window.cardHeaderHeight - this.window.pageMarginHeight - 260
},
},
@ -127,7 +127,7 @@ export default {
this.dataTransOpts.tableS.common_table.id = ''
this.rowDrop();
},
mounted() {
@ -140,13 +140,29 @@ export default {
dddw,
deepCopy,
getList(body) {
// body = {
// "commonTableTypeId": "string",
// "keyWord": "string"
// }
this.commonTables = []
if(!body.commonTableTypeId) return
postapi('/api/app/CommonTable/GetList', body).then(res => {
if (res.code > -1) {
this.commonTables = res.data
this.rowDrop()
}
})
},
// 确定排序
btnSort() {
const result = [];
let result = [];
this.commonTables.forEach((item, index) => {
result.push({ id: item.id, displayOrder: index });
});
putapi("/api/app/customerorggroup/updatesortmany", {
postapi("/api/app/CommonTable/UpdateSortMany", {
itemList: result,
}).then((res) => {
console.log("操作成功");
@ -156,47 +172,27 @@ export default {
//初始化Sortable组件
rowDrop() {
// this.$nextTick(() => {
// const tbody = document.querySelector(".el-table__body-wrapper tbody");
// const _this = this;
// Sortable.create(tbody, {
// handle: ".move",
// animation: 300,
// onEnd({ newIndex, oldIndex }) {
// _this.isDrag = false;
// const currRow = _this.commonTables.splice(oldIndex, 1)[0];
// _this.commonTables.splice(newIndex, 0, currRow);
// _this.commonTables.map((item, index) => {
// if (index == newIndex && index == oldIndex) {
// } else if (index == oldIndex) {
// } else if (index == newIndex) {
// }
// });
// console.log(_this.commonTables.map((item) => item.displayOrder));
// },
// });
// });
// console.log('rowDrop detail')
this.$nextTick(() => {
const el = document.querySelector(".el-table__body-wrapper tbody");
//console.log('el0',el)
const that = this;
let el = document.querySelector("#commonTables tbody");
// console.log('el0',el)
let that = this;
Sortable.create(el, {
handle: ".move",
animation: 300,
//拖拽结束
onEnd({ newIndex, oldIndex }) {
that.isDrag = true;
const currRow = that.commonTables.splice(oldIndex, 1)[0];
let currRow = that.commonTables.splice(oldIndex, 1)[0];
that.commonTables.splice(newIndex, 0, currRow);
console.log("el", el);
// console.log("el", el);
},
});
});
},
//置底
btnSetBottom() {
// 置顶 置底
btnSetTopOrBottom(sortType) {
if (!this.dataTransOpts.tableS.common_table.id) {
this.$message.warning("请选择操作的数据");
return;
@ -204,32 +200,16 @@ export default {
let lfind = arrayExistObj(this.commonTables, "id", this.dataTransOpts.tableS.common_table.id);
let currentRow = {};
putapi(
`/api/app/customerorggroup/updatemanysort?id=${this.dataTransOpts.tableS.common_table.id}&SortType=2`
postapi('/api/app/CommonTable/UpdateManySort', { commonTableId: this.dataTransOpts.tableS.common_table.id, sortType }
).then((res) => {
console.log("操作成功");
currentRow = this.commonTables.splice(lfind, 1)[0]; //删除并赋值
this.commonTables.push(currentRow);
this.$refs["commonTables"].setCurrentRow(currentRow);
});
},
//置顶
btnSetTop() {
if (!this.dataTransOpts.tableS.common_table.id) {
this.$message.warning("请选择操作的数据");
return;
}
let lfind = arrayExistObj(this.commonTables, "id", this.dataTransOpts.tableS.common_table.id);
let currentRow = {};
if (sortType == 2) {
this.commonTables.push(currentRow);
} else {
this.commonTables.unshift(currentRow);
}
putapi(
`/api/app/customerorggroup/updatemanysort?id=${this.dataTransOpts.tableS.common_table.id}&SortType=1`
).then((res) => {
console.log("操作成功");
currentRow = this.commonTables.splice(lfind, 1)[0];
this.commonTables.unshift(currentRow);
this.$refs["commonTables"].setCurrentRow(currentRow);
});
},
@ -248,15 +228,6 @@ export default {
//获取初始数据
dictInit() {
//获取单位列表
getapi("/api/app/customer-org/parent-all").then((res) => {
if (res.code != -1) {
this.customerOrgAll = res.data;
let lfind = arrayExistObj(this.customerOrgAll, "id", this.dict.personOrgId);
if (lfind > -1) this.customerOrgAll.splice(lfind, 1);
this.customerOrg = deepCopy(this.customerOrgAll);
}
});
},
@ -269,15 +240,15 @@ export default {
// 新增(编辑调用时，传入id值) 弹框
btnAdd(id) {
if (!id) this.dataTransOpts.tableS.common_table.id = ''
if (!id) this.dataTransOpts.tableS.common_table.id = ''
this.CommonTableEditParams = {
id,
commonTableTypeId: this.dataTransOpts.tableS.common_table_type.id,
}
this.dataTransOpts.refresh.common_table.S++
this.dialogWin.CommonTableEdit = true;
},
//编辑弹框
@ -295,10 +266,6 @@ export default {
this.$message.warning("请选择需要操作的数据");
return;
}
if (this.customerOrgRegister.isComplete.toUpperCase() == "Y") {
this.$message.warning("该单位体检次数已完成，不允许删除分组");
return;
}
this.$confirm("此操作将永久删除该记录, 是否继续?", "提示", {
confirmButtonText: "是",
@ -306,17 +273,13 @@ export default {
type: "warning",
})
.then(() => {
return deletapi(`/api/app/customer-org-group/${this.dataTransOpts.tableS.common_table.id}`);
return postapi('/api/app/CommonTable/Delete', {commonTableId:this.dataTransOpts.tableS.common_table.id});
})
.then((res) => {
if (res.code != -1) {
console.log("删除成功");
let lfind = arrayExistObj(this.commonTables, "id", this.dataTransOpts.tableS.common_table.id);
if (lfind > -1) this.commonTables.splice(lfind, 1);
this.dataTransOpts.tableS.common_table.id = ''
setTimeout(() => {
this.dataTransOpts.refresh.common_table_detail.M++
}, 20);
if (lfind > -1) this.commonTables.splice(lfind, 1);
}
})
.catch((err) => {
@ -332,7 +295,7 @@ export default {
let id = this.dataTransOpts.tableS.common_table.id
if (id) {
// 点编辑 或 新增有提交
getapi(`/api/app/customer-org-group/${id}`)
postapi('/api/app/CommonTable/Get', { commonTableId: id })
.then(res => {
if (res.code != -1) {
let lfind = -1
@ -350,24 +313,23 @@ export default {
// 更新 common_table_detail 参数
this.curCommonTable = deepCopy(res.data);
this.curCommonTable.isComplete = this.customerOrgRegister.isComplete;
}
})
} else {
// 点 新增 但未提交
this.dataTransOpts.tableS.common_table.id = this.curCommonTable.id || ''
}
}
},
},
//监听事件
watch: {
// 刷新公共表数据
"dataTransOpts.refresh.common_table.M":{
"dataTransOpts.refresh.common_table.M": {
// immediate:true,
handler(newVal, oldVal) {
console.log(`watch 公共表分类 newVal:${newVal} oldVal:${oldVal} commonTableTypeId: ${this.dataTransOpts.tableS.common_table_type.id}`);
if(newVal != oldVal) this.close_dialogWinCommonTableEdit();
console.log(`watch 公共表分类 newVal:${newVal} oldVal:${oldVal} commonTableTypeId: ${this.dataTransOpts.tableS.common_table_type.id}`);
if (newVal != oldVal) this.getList({ commonTableTypeId: this.dataTransOpts.tableS.common_table_type.id });
}
},
},

102
src/components/commonTable/CommonTableEdit.vue
View File

@ -1,11 +1,11 @@
<template>
<div>
<el-form :model="form" label-width="80px" :rules="rules" ref="form">
<el-row>
<el-row>
<el-col :span="24">
<el-form-item prop="commonTableTypeId" label="分类">
<el-select v-model="form.commonTableTypeId" placeholder="请选择" size="small">
<el-option v-for="item in dict.commonTableType" :key="item.id" :label="item.displayName" :value="item.id">
<el-option v-for="item in commonTableTypes" :key="item.id" :label="item.displayName" :value="item.id">
</el-option>
</el-select>
</el-form-item>
@ -20,10 +20,10 @@
</el-row>
<el-row>
<el-col :span="24">
<el-form-item prop="displayName" label="分组名称">
<el-form-item prop="displayName" label="项目名称">
<el-input v-model="form.displayName" size="small" />
</el-form-item>
</el-col>
</el-col>
</el-row>
</el-form>
<div style="display: flex;margin-top: 15px;justify-content:space-between;">
@ -50,11 +50,10 @@ import {
arrayExistObj,
} from "../../utlis/proFunc";
import CustomerOrgGroupAsbitem from "../../components/customerOrg/customerOrgGroupAsbitem.vue";
export default {
components: {
CustomerOrgGroupAsbitem,
},
props: ["params"],
data() {
@ -64,7 +63,9 @@ export default {
commonTableTypeId: null, //所属体检次数
displayName: "",
dataCode: ""
},
},
editType: 'insert',
commonTableTypes: [], //
formInit: {}, //表单初始值
rules: {
commonTableTypeId: [{ required: true, message: "请填写分类名称", trigger: "blur" }],
@ -83,27 +84,17 @@ export default {
mounted() {
// 获取初始数据（单位、适用性别）
this.dictInit();
this.getFormData(this.dataTransOpts.tableS.customer_org_group.id);
this.getFormData(this.params.id);
},
methods: {
moment, dddw, deepCopy,
// 获取初始数据
dictInit() {
//获取单位列表
getapi("/api/app/customer-org/parent-all").then((res) => {
if (res.code != -1) {
this.customerOrgAll = res.data;
let lfind = arrayExistObj(this.customerOrgAll, "id", this.dict.personOrgId);
if (lfind > -1) this.customerOrgAll.splice(lfind, 1);
this.customerOrg = deepCopy(this.customerOrgAll);
}
});
//获取适用性别
getapi("/api/app/for-sex").then((res) => {
postapi("/api/app/CommonTableType/GetList").then((res) => {
if (res.code != -1) {
this.dict.forSex = res.data;
this.commonTableTypes = res.data;
}
});
},
@ -111,17 +102,17 @@ export default {
// 生成表单数据
getFormData(id) {
if (id) {
getapi(`/api/app/customer-org-group/${id}`)
postapi('/api/app/CommonTable/Get', { commonTableId: id })
.then(res => {
if (res.code != -1) {
this.form = deepCopy(res.data)
}
})
this.editType = 'update'
} else {
console.log('this.formInit',this.formInit)
this.form = deepCopy(this.formInit)
this.form.id = this.params.id
this.form.commonTableTypeId = this.params.commonTableTypeId
console.log('this.formInit', this.formInit)
this.form = Object.assign({}, this.formInit, { commonTableTypeId: this.params.commonTableTypeId })
this.editType = 'insert'
}
},
@ -133,41 +124,24 @@ export default {
return false;
}
if (!this.form.id && !this.form.customerOrgRegisterId) {
this.$message.warning("请选择单位体检次数！");
return false;
}
let url = '/api/app/CommonTable/Create'
let body = deepCopy(this.form);
delete body.id;
delete body.customerOrgId;
delete body.isComplete;
body.commonTableId = body.id
if (this.form.id) {
let customerOrgGroupId = this.form.id;
// 合并事务更新明细金额
putapi(`/api/app/customer-org-group/${this.form.id}`, body)
.then((res) => {
// console.log(res)
if (res.code != -1) {
console.log("保存分组成功！");
this.dataTransOpts.refresh.customer_org_group_detail.M
}
})
} else {
//新增
postapi("/api/customerorggroup/createcustomerorggroupincustomerorgregister", body)
.then(res => {
if (res.code != -1) {
console.log("操作成功！");
this.dataTransOpts.tableS.customer_org_group.id = res.data.id
this.dialogWin.CommonTableEdit = false;
}
});
if (this.editType == 'update') {
url = '/api/app/CommonTable/Update'
}
//新增 编辑
postapi(url, body)
.then(res => {
if (res.code != -1) {
console.log("操作成功！");
if(this.editType == 'insert') this.dataTransOpts.tableS.common_table.id = res.data.id
this.dialogWin.CommonTableEdit = false;
}
});
});
},
@ -270,20 +244,12 @@ export default {
},
//监听事件
watch: {
//
// "customerOrgGroup.id"(newVal, oldVal) {
// console.log("customerOrgGroup.id ",newVal,oldVal);
// if (newVal != oldVal) {
// this.getCustomerOrgGroupAsbitems(newVal);
// }
// },
// 体检分组ID未切换换时 也可以强制刷新数据
"dataTransOpts.refresh.customer_org_group.S": {
"dataTransOpts.refresh.common_table.S": {
// immediate: true,
handler(newVal, oldVal) {
console.log(`watch 体检分组 newVal:${newVal} oldVal:${oldVal} customerOrgGroupId: ${this.dataTransOpts.tableS.customer_org_group.id}`);
this.getFormData(this.dataTransOpts.tableS.customer_org_group.id);
console.log(`watch 体检分组 newVal:${newVal} oldVal:${oldVal} common_table.id: ${this.params.id}`);
if (newVal != oldVal) this.getFormData(this.params.id);
}
},
},

202
src/components/commonTable/CommonTableTypeEdit.vue
View File

@ -4,7 +4,7 @@
<el-row>
<el-col :span="24">
<el-form-item prop="id" label="编号">
<el-input v-model="form.id" size="small" />
<el-input v-model="form.id" size="small" :disabled="editType == 'update'" />
</el-form-item>
</el-col>
</el-row>
@ -13,8 +13,8 @@
<el-form-item prop="displayName" label="分类名称">
<el-input v-model="form.displayName" size="small" />
</el-form-item>
</el-col>
</el-row>
</el-col>
</el-row>
</el-form>
<div style="display: flex;margin-top: 15px;justify-content:space-between;">
<div></div>
@ -40,19 +40,20 @@ import {
arrayExistObj,
} from "../../utlis/proFunc";
import CustomerOrgGroupAsbitem from "../../components/customerOrg/customerOrgGroupAsbitem.vue";
export default {
components: {
CustomerOrgGroupAsbitem,
},
props: ["params"],
data() {
return {
form: {
id: "",
displayName: "",
form: {
id: "",
displayName: "",
},
editType: 'insert', // update
formOri: {}, //用于对比分析哪些信息更改了（主要是价格）
formInit: {}, //表单初始值
rules: {
@ -65,53 +66,41 @@ export default {
...mapState(["dict", "dialogWin", "dataTransOpts"]),
},
created() {
this.formInit = deepCopy(this.form);
this.form.customerOrgId = this.params.customerOrgId
this.form.customerOrgRegisterId = this.params.customerOrgRegisterId
this.formInit = deepCopy(this.form);
},
mounted() {
// 获取初始数据（单位、适用性别）
this.dictInit();
this.getFormData(this.dataTransOpts.tableS.customer_org_group.id);
this.getFormData(this.params.id);
},
methods: {
moment, dddw, deepCopy,
// 获取初始数据
dictInit() {
//获取单位列表
getapi("/api/app/customer-org/parent-all").then((res) => {
if (res.code != -1) {
this.customerOrgAll = res.data;
let lfind = arrayExistObj(this.customerOrgAll, "id", this.dict.personOrgId);
if (lfind > -1) this.customerOrgAll.splice(lfind, 1);
this.customerOrg = deepCopy(this.customerOrgAll);
}
});
//获取适用性别
getapi("/api/app/for-sex").then((res) => {
if (res.code != -1) {
this.dict.forSex = res.data;
}
});
// getapi("/api/app/for-sex").then((res) => {
// if (res.code != -1) {
// this.dict.forSex = res.data;
// }
// });
},
// 生成表单数据
getFormData(id) {
if (id) {
getapi(`/api/app/customer-org-group/${id}`)
postapi('/api/app/CommonTableType/Get', { commonTableTypeId: id })
.then(res => {
if (res.code != -1) {
this.formOri = deepCopy(res.data)
this.form = deepCopy(res.data)
}
})
this.editType = 'update'
} else {
console.log('this.formInit',this.formInit)
console.log('this.formInit', this.formInit)
this.form = deepCopy(this.formInit)
this.form.customerOrgId = this.params.customerOrgId
this.form.customerOrgRegisterId = this.params.customerOrgRegisterId
this.editType = 'insert'
}
},
@ -123,157 +112,38 @@ export default {
return false;
}
if (!this.form.id && !this.form.customerOrgRegisterId) {
this.$message.warning("请选择单位体检次数！");
return false;
}
let url = '/api/app/CommonTableType/Create'
let body = deepCopy(this.form);
delete body.id;
delete body.customerOrgId;
delete body.isComplete;
if (this.form.id) {
let customerOrgGroupId = this.form.id;
let customerOrgGroupAsbitems = []; //分组包含的套餐
body.commonTableTypeId = body.id
// 合并事务更新明细金额
putapi(`/api/app/customer-org-group/${this.form.id}`, body)
.then((res) => {
// console.log(res)
if (res.code != -1) {
console.log("保存分组成功！");
this.dataTransOpts.refresh.customer_org_group_detail.M
}
})
} else {
//新增
postapi("/api/customerorggroup/createcustomerorggroupincustomerorgregister", body)
.then(res => {
if (res.code != -1) {
console.log("操作成功！");
this.dataTransOpts.tableS.customer_org_group.id = res.data.id
this.dialogWin.CommonTableTypeEdit = false;
}
});
if (this.editType == 'update') {
url = '/api/app/CommonTableType/Update'
}
});
},
//
computePrice() {
if (!this.form.id) {
this.$message.warning("尚未保存信息，不可执行此操作！");
return;
}
let customerOrgGroupId = this.form.id;
let customerOrgGroupAsbitems = []; //分组包含的套餐
getapi(`/api/app/customerorggroupdetail/getcustomerorggroupdetailinasbitem?CustomerOrgGroupId=${customerOrgGroupId}`)
.then((res) => {
if (res.code != -1) {
customerOrgGroupAsbitems = res.data;
if (customerOrgGroupAsbitems.length < 1) {
this.$message.warning("当前分组尚未设置组合项目，不可执行此操作！");
} else {
let body = {
customerOrgGroupId,
details: this.madeNewGroupAsbitems(
customerOrgGroupAsbitems,
this.form.price
),
};
console.log("body", body);
return postapi("/api/app/customerorggroupdetail/createcustomerorggroupdetailmany", body);
//新增 编辑
postapi(url, body)
.then(res => {
if (res.code != -1) {
console.log("操作成功！");
this.dataTransOpts.tableS.common_table_type.id = body.id
this.dialogWin.CommonTableTypeEdit = false;
}
}
})
.then((res) => {
if (res.code != -1) {
//console.log("操作成功");
//触发分组明细刷新
this.form.id = "";
//要做延时处理，否则不会触发监听
setTimeout(() => {
this.form.id = customerOrgGroupId;
this.onSubmit("form");
}, 100);
}
});
},
madeNewGroupAsbitems(oldGroupAsbitems, newTotal) {
newTotal = Math.round(Number(newTotal) * 100) / 100;
let newGroupAsbitems = [];
let oldTotal = Number(0);
oldGroupAsbitems.forEach((e) => {
oldTotal += Number(e.asbitemMoney); //customerOrgGroupDetailMoney
});
oldTotal = Math.round(Number(oldTotal) * 100) / 100;
let discount = 0;
if (oldTotal != 0) discount = Math.round((newTotal * 10000) / oldTotal) / 100;
oldTotal = Number(0);
oldGroupAsbitems.forEach((e) => {
e.customerOrgGroupDetailPrice = Math.round(e.price * discount) / 100;
e.customerOrgGroupDetailMoney =
Math.round(
e.customerOrgGroupDetailPrice * e.customerOrgGroupDetailAmount * 100
) / 100;
oldTotal += Number(e.customerOrgGroupDetailMoney);
});
oldTotal = Math.round(Number(oldTotal) * 100) / 100;
//console.log('discount,oldTotal',discount,oldTotal)
let didTotal = Math.round(Number(newTotal - oldTotal) * 100) / 100;
if (didTotal != 0) {
for (let i = 0; i < oldGroupAsbitems.length; i++) {
if (oldGroupAsbitems[i].customerOrgGroupDetailAmount == 1) {
oldGroupAsbitems[i].customerOrgGroupDetailPrice =
Math.round(
(Number(oldGroupAsbitems[i].customerOrgGroupDetailPrice) +
Number(didTotal)) *
100
) / 100;
break;
}
}
}
});
oldGroupAsbitems.forEach((e) => {
newGroupAsbitems.push({
customerOrgGroupId: e.customerOrgGroupId,
asbitemId: e.asbitemId,
price: e.customerOrgGroupDetailPrice,
amount: e.customerOrgGroupDetailAmount,
});
});
return newGroupAsbitems;
},
},
//监听事件
watch: {
//
// "customerOrgGroup.id"(newVal, oldVal) {
// console.log("customerOrgGroup.id ",newVal,oldVal);
// if (newVal != oldVal) {
// this.getCustomerOrgGroupAsbitems(newVal);
// }
// },
// 体检分组ID未切换换时 也可以强制刷新数据
"dataTransOpts.refresh.customer_org_group.S": {
"dataTransOpts.refresh.common_table_type.S": {
// immediate: true,
handler(newVal, oldVal) {
console.log(`watch 体检分组 newVal:${newVal} oldVal:${oldVal} customerOrgGroupId: ${this.dataTransOpts.tableS.customer_org_group.id}`);
this.getFormData(this.dataTransOpts.tableS.customer_org_group.id);
console.log(`watch 体检分组 newVal:${newVal} oldVal:${oldVal} this.params.id: ${this.params.id}`);
if(newVal != oldVal) this.getFormData(this.params.id);
}
},
},

203
src/components/commonTable/commonTableType.vue
View File

@ -7,22 +7,22 @@
<!--公共表分类信息-->
<div style="display: flex; font-size: 14px">
<div :style="'display: block;width:' + (window.pageWidth - window.pageMarginWidth - 110 - 5) + 'px;'">
<el-table :data="commonTableTypes" ref="commonTableType" row-key="id" border
height="240px" size="small" highlight-current-row :row-class-name="handleRowClassName"
@row-click="rowClick">
<el-table :data="commonTableTypes" ref="commonTableTypes" row-key="id" border height="240px" size="small"
highlight-current-row :row-class-name="handleRowClassName" @row-click="rowClick">
<el-table-column type="index" label="序号" width="50" align="center" />
<el-table-column label="编号" prop="id" min-width="200" align="center" />
<el-table-column prop="displayName" label="分类名称" min-width="150" />
<el-table-column prop="displayName" label="分类名称" min-width="150" />
<el-table-column prop="creatorName" label="创建者" min-width="80" align="center" />
<el-table-column label="创建时间" min-width="150" align="center">
<template slot-scope="scope">
{{ scope.row.creationTime ? moment(scope.row.creationTime).format("yyyy-MM-DD HH:mm:ss") : "" }}
</template>
</el-table-column>
<el-table-column prop="lastModificationName" label="修改者" min-width="80" align="center" />
<el-table-column prop="lastModifierName" label="修改者" min-width="80" align="center" />
<el-table-column label="修改时间" min-width="150" align="center">
<template slot-scope="scope">
{{ scope.row.lastModificationTime ? moment(scope.row.lastModificationTime).format("yyyy-MM-DD HH:mm:ss") : "" }}
{{ scope.row.lastModificationTime ? moment(scope.row.lastModificationTime).format("yyyy-MM-DD HH:mm:ss")
: "" }}
</template>
</el-table-column>
<el-table-column label="操作" align="center">
@ -39,7 +39,7 @@
</el-table>
</div>
<!--按钮-->
<div style="display: block; margin-left: 5px">
<div style="display: block; margin-left: 5px">
<div style="margin-top: 5px">
<el-button class="commonbutton" @click="btnAdd('')">新增</el-button>
</div>
@ -50,10 +50,10 @@
<el-button class="deleteButton" @click="btnDel">删除</el-button>
</div>
<div style="margin-top: 5px">
<el-button class="commonbutton" @click="btnSetTop">置顶</el-button>
<el-button class="commonbutton" @click="btnSetTopOrBottom(1)">置顶</el-button>
</div>
<div style="margin-top: 5px">
<el-button class="commonbutton" @click="btnSetBottom">置底</el-button>
<el-button class="commonbutton" @click="btnSetTopOrBottom(2)">置底</el-button>
</div>
<div style="margin-top: 5px">
<el-button class="commonbutton" @click="btnSort" :disabled="!isDrag">保存排序</el-button>
@ -101,15 +101,15 @@ export default {
pagePriv: {
routeUrlorPageName: "commonTable", //当前页面归属路由或归属页面权限名称
privs: [], // 页面权限
},
},
commonTableTypes: [], //公共表分类
curCommonTableType: {}, // 当前选中分组
CommonTableTypeEditParams: {}, //分组 新增时 用到参数
isDrag: false,
@ -139,30 +139,13 @@ export default {
dddw,
deepCopy,
// 复制上一次分组
btnCopyPreGroup() {
if (!this.customerOrgRegister.id) {
this.$message.warning("请选择体检次数");
return;
}
postapi('/api/app/CustomerOrgGroup/CopyLastGrouping', { customerOrgRegisterId: this.customerOrgRegister.id })
.then(res => {
if (res.code > -1) {
// 刷新体检次数的分组
this.getCustomerOrgGroup(this.customerOrgRegister.id);
}
})
},
//确定排序
btnSort() {
const result = [];
let result = [];
this.commonTableTypes.forEach((item, index) => {
result.push({ id: item.id, displayOrder: index });
});
putapi("/api/app/customerorggroup/updatesortmany", {
postapi("/api/app/CommonTableType/UpdateSortMany", {
itemList: result,
}).then((res) => {
console.log("操作成功");
@ -172,27 +155,6 @@ export default {
//初始化Sortable组件
rowDrop() {
// this.$nextTick(() => {
// const tbody = document.querySelector(".el-table__body-wrapper tbody");
// const _this = this;
// Sortable.create(tbody, {
// handle: ".move",
// animation: 300,
// onEnd({ newIndex, oldIndex }) {
// _this.isDrag = false;
// const currRow = _this.commonTableTypes.splice(oldIndex, 1)[0];
// _this.commonTableTypes.splice(newIndex, 0, currRow);
// _this.commonTableTypes.map((item, index) => {
// if (index == newIndex && index == oldIndex) {
// } else if (index == oldIndex) {
// } else if (index == newIndex) {
// }
// });
// console.log(_this.commonTableTypes.map((item) => item.displayOrder));
// },
// });
// });
this.$nextTick(() => {
const el = document.querySelector(".el-table__body-wrapper tbody");
//console.log('el0',el)
@ -211,8 +173,8 @@ export default {
});
},
//置底
btnSetBottom() {
// 置顶 置底
btnSetTopOrBottom(sortType) {
if (!this.dataTransOpts.tableS.common_table_type.id) {
this.$message.warning("请选择操作的数据");
return;
@ -220,32 +182,18 @@ export default {
let lfind = arrayExistObj(this.commonTableTypes, "id", this.dataTransOpts.tableS.common_table_type.id);
let currentRow = {};
putapi(
`/api/app/customerorggroup/updatemanysort?id=${this.dataTransOpts.tableS.common_table_type.id}&SortType=2`
// ?id=${this.dataTransOpts.tableS.common_table_type.id}&SortType=2`
postapi('/api/app/CommonTableType/UpdateManySort', { commonTableTypeId: this.dataTransOpts.tableS.common_table_type.id, sortType }
).then((res) => {
console.log("操作成功");
currentRow = this.commonTableTypes.splice(lfind, 1)[0]; //删除并赋值
this.commonTableTypes.push(currentRow);
this.$refs["commonTableTypes"].setCurrentRow(currentRow);
});
},
//置顶
btnSetTop() {
if (!this.dataTransOpts.tableS.common_table_type.id) {
this.$message.warning("请选择操作的数据");
return;
}
let lfind = arrayExistObj(this.commonTableTypes, "id", this.dataTransOpts.tableS.common_table_type.id);
let currentRow = {};
if (sortType == 2) {
this.commonTableTypes.push(currentRow);
} else {
this.commonTableTypes.unshift(currentRow);
}
putapi(
`/api/app/customerorggroup/updatemanysort?id=${this.dataTransOpts.tableS.common_table_type.id}&SortType=1`
).then((res) => {
console.log("操作成功");
currentRow = this.commonTableTypes.splice(lfind, 1)[0];
this.commonTableTypes.unshift(currentRow);
this.$refs["commonTableTypes"].setCurrentRow(currentRow);
});
},
@ -264,27 +212,11 @@ export default {
//获取初始数据
dictInit() {
//获取单位列表
getapi("/api/app/customer-org/parent-all").then((res) => {
if (res.code != -1) {
this.customerOrgAll = res.data;
let lfind = arrayExistObj(this.customerOrgAll, "id", this.dict.personOrgId);
if (lfind > -1) this.customerOrgAll.splice(lfind, 1);
this.customerOrg = deepCopy(this.customerOrgAll);
}
});
//获取适用性别
getapi("/api/app/for-sex").then((res) => {
if (res.code != -1) {
this.dict.forSex = res.data;
}
});
//获取适用婚姻
postapi("/api/app/MaritalStatus/GetForMaritalStatusList").then((res) => {
postapi("/api/app/CommonTableType/GetList").then((res) => {
if (res.code != -1) {
this.dict.forMaritalStatus = res.data;
this.commonTableTypes = res.data;
}
});
},
@ -293,29 +225,25 @@ export default {
//点击分组
rowClick(row) {
this.dataTransOpts.tableS.common_table_type.id = row.id
this.curCommonTableType = deepCopy(row);
this.curCommonTableType.isComplete = this.customerOrgRegister.isComplete;
setTimeout(() => {
this.dataTransOpts.refresh.common_table.M++;
}, 20);
this.curCommonTableType = row;
this.dataTransOpts.refresh.common_table.M++;
},
// 新增(编辑调用时，传入id值) 弹框
btnAdd(id) {
if (!id) this.dataTransOpts.tableS.common_table_type.id = ''
if (!id) this.dataTransOpts.refresh.common_table.M++; //新增则清掉已选组合项目
this.CommonTableTypeEditParams = {
id
}
this.dataTransOpts.refresh.common_table_type.S++
this.dialogWin.CommonTableTypeEdit = true;
},
//编辑弹框
btnEdit() {
if (!this.dataTransOpts.tableS.common_table_type.id) {
this.$message.warning("请先选择体检分组");
this.$message.warning("请先选择分类记录");
return;
}
this.btnAdd(this.dataTransOpts.tableS.common_table_type.id)
@ -327,10 +255,6 @@ export default {
this.$message.warning("请选择需要操作的数据");
return;
}
if (this.customerOrgRegister.isComplete.toUpperCase() == "Y") {
this.$message.warning("该单位体检次数已完成，不允许删除分组");
return;
}
this.$confirm("此操作将永久删除该记录, 是否继续?", "提示", {
confirmButtonText: "是",
@ -338,7 +262,7 @@ export default {
type: "warning",
})
.then(() => {
return deletapi(`/api/app/customer-org-group/${this.dataTransOpts.tableS.common_table_type.id}`);
return postapi('/api/app/CommonTableType/Delete', { commonTableTypeId: this.dataTransOpts.tableS.common_table_type.id });
})
.then((res) => {
if (res.code != -1) {
@ -346,9 +270,7 @@ export default {
let lfind = arrayExistObj(this.commonTableTypes, "id", this.dataTransOpts.tableS.common_table_type.id);
if (lfind > -1) this.commonTableTypes.splice(lfind, 1);
this.dataTransOpts.tableS.common_table_type.id = ''
setTimeout(() => {
this.dataTransOpts.refresh.common_table.M++
}, 20);
this.dataTransOpts.refresh.common_table.M++
}
})
.catch((err) => {
@ -360,69 +282,15 @@ export default {
},
madeNewGroupAsbitems(oldGroupAsbitems, newTotal) {
newTotal = Math.round(Number(newTotal) * 100) / 100;
let newGroupAsbitems = [];
let oldTotal = Number(0);
oldGroupAsbitems.forEach((e) => {
oldTotal += Number(e.asbitemMoney); //commonTableTypeDetailMoney
});
oldTotal = Math.round(Number(oldTotal) * 100) / 100;
let discount = 0;
if (oldTotal != 0) discount = Math.round((newTotal * 10000) / oldTotal) / 100;
oldTotal = Number(0);
oldGroupAsbitems.forEach((e) => {
e.commonTableTypeDetailPrice = Math.round(e.price * discount) / 100;
e.commonTableTypeDetailMoney =
Math.round(
e.commonTableTypeDetailPrice * e.commonTableTypeDetailAmount * 100
) / 100;
oldTotal += Number(e.commonTableTypeDetailMoney);
});
oldTotal = Math.round(Number(oldTotal) * 100) / 100;
//console.log('discount,oldTotal',discount,oldTotal)
let didTotal = Math.round(Number(newTotal - oldTotal) * 100) / 100;
if (didTotal != 0) {
for (let i = 0; i < oldGroupAsbitems.length; i++) {
if (oldGroupAsbitems[i].commonTableTypeDetailAmount == 1) {
oldGroupAsbitems[i].commonTableTypeDetailPrice =
Math.round(
(Number(oldGroupAsbitems[i].commonTableTypeDetailPrice) +
Number(didTotal)) *
100
) / 100;
break;
}
}
}
oldGroupAsbitems.forEach((e) => {
newGroupAsbitems.push({
commonTableTypeId: e.commonTableTypeId,
asbitemId: e.asbitemId,
price: e.commonTableTypeDetailPrice,
amount: e.commonTableTypeDetailAmount,
});
});
return newGroupAsbitems;
},
// 关闭 分组 新增/编辑
close_dialogWinCommonTableTypeEdit() {
let id = this.dataTransOpts.tableS.common_table_type.id
if (id) {
// 点编辑 或 新增有提交
getapi(`/api/app/customer-org-group/${id}`)
postapi('/api/app/CommonTableType/Get', { commonTableTypeId: id })
.then(res => {
if (res.code != -1) {
let lfind = -1
lfind = arrayExistObj(this.commonTableTypes, 'id', id)
if (res.code > -1) {
let lfind = arrayExistObj(this.commonTableTypes, 'id', id)
if (lfind > -1) {
objCopy(res.data, this.commonTableTypes[lfind])
} else {
@ -436,7 +304,6 @@ export default {
// 更新 common_table 参数
this.curCommonTableType = deepCopy(res.data);
this.curCommonTableType.isComplete = this.customerOrgRegister.isComplete;
}
})
} else {

1
src/store/index.js
View File

@ -358,6 +358,7 @@ export default new Vuex.Store({
room: { S: 0, M: 0 }, // 房间
room_detail: { S: 0, M: 0 }, // 房间关联的组合项目
common_table: { S: 0, M: 0 }, // 公共表
common_table_type: { S: 0, M: 0 }, // 公共表
},
//表当前数据（单条记录 S--single）

15
src/views/doctorCheck/lisResultImport.vue
View File

@ -196,6 +196,7 @@ export default {
{ dispLabel: '标本号', val: 'sampleNo' },
{ dispLabel: '仪器通道', val: 'deviceChannel' },
{ dispLabel: '检查时间', val: 'checkDate' },
{ dispLabel: '检查医生', val: 'checkDoctorName' },
{ dispLabel: '项目', val: 'itemName' },
{ dispLabel: '结果', val: 'itemResult' }
],
@ -747,13 +748,12 @@ export default {
((i + 1) * 100) / this.choosedData.length
);
let res = await postapi('/api/app/patientregister/CreatePatientRegisterFromExcel', this.toApiBodys[i])
let res = await postapi('/api/app/ImportLisResult/ImportResultExcelByLisRequestNo', this.toApiBodys[i])
if (res.code >= 0) {
this.tableData.push(Object.assign({ importState: '导入成功' }, this.toApiBodys[i]))
} else {
this.tableData.push(Object.assign({ importState: '导入失败', importDes: res.message }, this.toApiBodys[i]))
}
}
// 结束导入
@ -816,10 +816,12 @@ export default {
if (body.sampleNo == undefined) delete body.sampleNo
let lfind = arrayExistObj(this.toApiBodys,'barcode',body.barcode)
let detail = { itemName: body.itemName, itemResult: body.itemResult, checkDate: body.checkDate }
if(body.checkDoctorName) detail.checkDoctorName = body.checkDoctorName
if(lfind == -1){
this.toApiBodys.push(Object.assign({},body,{details:[{ itemName: body.itemName, itemResult: body.itemResult, checkDate: body.checkDate }]}))
this.toApiBodys.push(Object.assign({},body,{details:[detail]}))
}else{
this.toApiBodys[this.toApiBodys.length - 1].details.push({ itemName: body.itemName, itemResult: body.itemResult, checkDate: body.checkDate })
this.toApiBodys[this.toApiBodys.length - 1].details.push(detail)
}
} else {
// 横向数据
@ -831,6 +833,7 @@ export default {
sampleNo: ExcelData['标本号'],
deviceChannel: ExcelData['仪器通道'],
checkDate: ExcelData['检查时间'],
checkDoctorName: ExcelData['检查医生'],
details: []
}
@ -862,7 +865,9 @@ export default {
// ]
this.excelCols.forEach(e => {
if (!e.dataLabel && !e.val) {
body.details.push({ itemName: e.dispLabel, itemResult: ExcelData[e.dispLabel], checkDate: body.checkDate })
let detail = { itemName: e.dispLabel, itemResult: ExcelData[e.dispLabel], checkDate: body.checkDate }
if(body.checkDoctorName) detail.checkDoctorName = body.checkDoctorName
body.details.push(detail)
}
})
this.toApiBodys.push(body)

Write Preview
Loading…
Cancel
Save