Commit cae50c59 authored by 刘予佳's avatar 刘予佳

Merge remote-tracking branch 'remotes/origin/dev' into dev_lyj

# Conflicts:
#	src/utils/index.js
parents a58b404d 11ce260f
...@@ -24,6 +24,15 @@ export function medicalunionList(params = {}) { ...@@ -24,6 +24,15 @@ export function medicalunionList(params = {}) {
params, params,
}) })
} }
// 添加标准获取医联体
export function getMedicalunionList(params = {}) {
return request({
url: "/cloud-upms/sys/union/select",
method: "get",
params,
})
}
export function deleteUnion(id) { export function deleteUnion(id) {
return request({ return request({
url: `/cloud-upms/sys/union/${id}`, url: `/cloud-upms/sys/union/${id}`,
......
...@@ -50,7 +50,11 @@ ...@@ -50,7 +50,11 @@
></el-upload-self> ></el-upload-self>
<!-- 表单改文本 --> <!-- 表单改文本 -->
<template v-else-if="getVwForm.detail"> <template v-else-if="getVwForm.detail">
<form-item-text :item="item" :form="form"></form-item-text> <form-item-text
:item="item"
:form="form"
:unionList="unionList"
></form-item-text>
</template> </template>
<!-- 可输入 --> <!-- 可输入 -->
<template v-else> <template v-else>
...@@ -218,8 +222,8 @@ ...@@ -218,8 +222,8 @@
<el-option <el-option
v-for="(opt, optIndex) in unionList" v-for="(opt, optIndex) in unionList"
:key="optIndex" :key="optIndex"
:label="opt.label" :label="opt.unionName"
:value="opt.value" :value="opt.unionNo"
></el-option> ></el-option>
</template> </template>
<template v-else> <template v-else>
...@@ -400,7 +404,7 @@ ...@@ -400,7 +404,7 @@
/** /**
* @description 自定义单组件 * @description 自定义单组件
*/ */
import { getMedicalunionList } from "@/api/medicalunion-management"
import ElUploadSelf from "@/components/Upload" import ElUploadSelf from "@/components/Upload"
import FormItemText from "./FormItemText" import FormItemText from "./FormItemText"
import DialogToothBit from "./DialogToothBit" import DialogToothBit from "./DialogToothBit"
...@@ -483,13 +487,24 @@ export default { ...@@ -483,13 +487,24 @@ export default {
this.numberReset() this.numberReset()
this.checkboxReset() this.checkboxReset()
if (this.item.prop == "union_id") { if (this.item.prop == "union_id") {
this.unionList = [{ label: "嗡嗡嗡", value: 1 }] this.getMedicalunionList()
} }
}, },
mounted() { mounted() {
this.showFormItem() this.showFormItem()
}, },
methods: { methods: {
// 获取医联体列表
getMedicalunionList() {
getMedicalunionList().then((res) => {
console.log(res)
if (res.code == 1) {
this.unionList = res.data
} else {
this.unionList = []
}
})
},
scrollToView() { scrollToView() {
if (this.$refs["JY_LCYY"]) { if (this.$refs["JY_LCYY"]) {
this.$refs["JY_LCYY"].$el.scrollIntoView({ behavior: "smooth" }) this.$refs["JY_LCYY"].$el.scrollIntoView({ behavior: "smooth" })
......
...@@ -24,6 +24,9 @@ ...@@ -24,6 +24,9 @@
> >
{{ screeningAdvise[form[item.prop]] }} {{ screeningAdvise[form[item.prop]] }}
</span> </span>
<span v-else-if="item.prop == 'union_id'">
{{ unionName }}
</span>
<span v-else style="margin: 0 5px">{{ <span v-else style="margin: 0 5px">{{
String(form[item.prop]) | getItemText(item.dicData, item.type) String(form[item.prop]) | getItemText(item.dicData, item.type)
}}</span> }}</span>
...@@ -43,6 +46,7 @@ export default { ...@@ -43,6 +46,7 @@ export default {
props: { props: {
item: Object, item: Object,
form: Object | Array, form: Object | Array,
unionList: Array,
}, },
data() { data() {
return { return {
...@@ -51,6 +55,7 @@ export default { ...@@ -51,6 +55,7 @@ export default {
medium: "中危", medium: "中危",
high: "高危", high: "高危",
}, },
unionName: "",
screeningAdvise: { screeningAdvise: {
1: "可定期随访", 1: "可定期随访",
2: "推荐胶囊内镜或胃镜检查", 2: "推荐胶囊内镜或胃镜检查",
...@@ -70,6 +75,16 @@ export default { ...@@ -70,6 +75,16 @@ export default {
return val return val
}, },
}, },
watch: {
unionList(v) {
if (v.length > 0 && this.form[this.item.prop]) {
console.log()
this.unionName = v.filter(
(e) => e.unionNo == this.form[this.item.prop]
)[0].unionName
}
},
},
} }
</script> </script>
<style scoped> <style scoped>
......
...@@ -154,7 +154,7 @@ export default { ...@@ -154,7 +154,7 @@ export default {
} }
return vwForm return vwForm
}, },
formId: "", // formId: "",
} }
}, },
data() { data() {
...@@ -193,7 +193,7 @@ export default { ...@@ -193,7 +193,7 @@ export default {
for (let i = 0; i < domArr.length; i++) { for (let i = 0; i < domArr.length; i++) {
domArr[i].style.height = "54px" domArr[i].style.height = "54px"
domArr[i].innerHTML = "" domArr[i].innerHTML = ""
if (domArr.length / i == 2) { if ((domArr.length - 1) / i == 2) {
domArr[i].innerHTML = "6" domArr[i].innerHTML = "6"
} }
if (i == domArr.length - 1) { if (i == domArr.length - 1) {
...@@ -461,6 +461,10 @@ export default { ...@@ -461,6 +461,10 @@ export default {
} }
} }
.form-footer { .form-footer {
// position: absolute;
// left: 50%;
// transform: translateX(-50%);
// bottom: -50px;
margin-top: 20px; margin-top: 20px;
margin-bottom: 20px; margin-bottom: 20px;
text-align: center; text-align: center;
......
let formJson = {
column: [],
labelPosition: "right",
labelSuffix: "",
labelWidth: 180,
gutter: 0,
menuBtn: true,
submitBtn: true,
submitText: "下一步",
emptyBtn: false,
emptyText: "清空",
nextTabBtn: true,
nextTabText: "下一页",
menuPosition: "center",
prevBtn: true,
group: [
{
label: "实验室检查",
prop: "1669789802778_28648",
arrow: true,
collapse: true,
display: true,
labelWidth: 8,
column: [
{
type: "input",
display: true,
importantField: false,
styles: {},
prop: "G_17",
label: "胃泌素17",
fieldType: "varchar",
fieldLength: "255",
tableName: "实验室检查",
tableCode: "gas_exam",
tableId: "1597466741234040833",
notFilter: false,
cType: "",
subfield: false,
autoRequired: 0,
personalRequired: 0,
required: true,
rules: [{ required: true, message: "胃泌素17必须填写" }],
},
{
type: "input",
display: true,
importantField: false,
styles: {},
prop: "PG_I",
label: "胃蛋白酶原I(PG I)",
fieldType: "varchar",
fieldLength: "255",
tableName: "实验室检查",
tableCode: "gas_exam",
tableId: "1597466741234040833",
notFilter: false,
cType: "",
subfield: false,
rules: [{ required: true, message: "胃蛋白酶原I(PG I)必须填写" }],
required: true,
},
{
type: "input",
display: true,
importantField: false,
styles: {},
prop: "PG_II",
label: "胃蛋白酶原II(PG II)",
fieldType: "varchar",
fieldLength: "255",
tableName: "实验室检查",
tableCode: "gas_exam",
tableId: "1597466741234040833",
notFilter: false,
cType: "",
subfield: false,
rules: [{ required: true, message: "胃蛋白酶原II(PG II)必须填写" }],
required: true,
},
{
type: "radio",
display: true,
importantField: false,
styles: {},
prop: "IgG",
label: "Hp抗体(IgG)检测",
fieldType: "varchar",
fieldLength: "255",
tableName: "实验室检查",
tableCode: "gas_exam",
tableId: "1597466741234040833",
notFilter: false,
cType: "",
subfield: false,
dicData: [
{
label: "阳性",
value: "2",
id: "1598150992287858689",
parentId: "",
},
{
label: "阴性",
value: "1",
id: "1598150963816923138",
parentId: "",
},
],
dynamicshSet: [],
dicType: "hp_antibody",
props: { label: "label", value: "value" },
disabled: false,
required: true,
rules: [{ required: true, message: "请选择Hp抗体(IgG)检测" }],
},
{
type: "upload",
display: true,
importantField: false,
styles: {},
prop: "patient_avatar",
label: "血检报告单",
fieldType: "varchar",
fieldLength: "10",
showFileList: true,
multiple: true,
bucketName: "pacs",
limit: 5,
dicType: "",
tableName: "附件",
tableCode: "gas_attachment",
tableId: "1595978031963398145",
notFilter: false,
cType: "",
subfield: false,
autoRequired: 0,
personalRequired: 0,
listType: "picture-card",
required: true,
rules: [{ required: true, message: "血检报告单必须填写" }],
lg: 24,
width: 24,
xs: 24,
sm: 24,
span: 24,
md: 24,
},
{
type: "upload",
display: true,
importantField: true,
styles: {},
autoRequired: 0,
personalRequired: 0,
prop: "exam_img",
label: "实验室报告",
required: true,
rules: [{ required: true, message: "实验室报告必须填写" }],
showFileList: true,
multiple: true,
bucketName: "exam",
limit: 5,
dicType: "",
listType: "picture-card",
fieldType: "varchar",
fieldLength: "255",
tableName: "附件",
tableCode: "gas_attachment",
tableId: "1595978031963398145",
notFilter: false,
cType: "",
subfield: false,
},
],
},
],
}
let formJson = {
column: [],
labelPosition: "right",
labelSuffix: "",
labelWidth: 180,
gutter: 0,
menuBtn: true,
submitBtn: true,
submitText: "下一步",
emptyBtn: false,
emptyText: "清空",
nextTabBtn: true,
nextTabText: "下一页",
menuPosition: "center",
prevBtn: true,
group: [
{
label: "是否接受胃镜检查",
prop: "1669874329243_67285",
arrow: true,
collapse: true,
display: true,
labelWidth: 8,
column: [
{
type: "radio",
display: true,
importantField: false,
styles: {},
label: "是否接受检查",
prop: "is_accept",
dicData: [
{
label: "",
value: "1",
id: "1595347527757000705",
parentId: "",
},
{
label: "",
value: "0",
id: "1595347502595371010",
parentId: "",
},
],
dynamicshSet: [
{ value: "1", target: "1669874397313_56690" },
{ value: "1", target: "check_time" },
{ value: "1", target: "check_type" },
{ value: "1", target: "check_result" },
],
dicType: "d-sf",
props: { label: "label", value: "value" },
fieldType: "tinyint",
fieldLength: "2",
tableName: "胃镜检查",
tableCode: "gas_troscope",
tableId: "1597468524048121858",
notFilter: false,
cType: "",
subfield: false,
autoRequired: 0,
personalRequired: 0,
span: 24,
disabled: false,
required: true,
rules: [{ required: true, message: "请选择是否接受检查" }],
},
],
},
{
label: "胃镜检查结果",
prop: "1669874397313_56690",
arrow: true,
collapse: true,
display: true,
labelWidth: 8,
column: [
{
type: "date",
display: true,
importantField: true,
styles: {},
label: "检查时间",
prop: "check_time",
dicData: [
{
label: "",
value: "1",
id: "1595347527757000705",
parentId: "",
},
{
label: "",
value: "0",
id: "1595347502595371010",
parentId: "",
},
],
dynamicshSet: [],
dicOption: "static",
dicType: "",
props: { label: "label", value: "value" },
fieldType: "datetime",
fieldLength: "",
format: "yyyy-MM-dd",
valueFormat: "yyyy-MM-dd",
tableName: "胃镜检查",
tableCode: "gas_troscope",
tableId: "1597468524048121858",
notFilter: false,
cType: "",
subfield: false,
autoRequired: 0,
personalRequired: 0,
noImmediate: false,
span: 24,
required: true,
rules: [{ required: true, message: "检查时间必须填写" }],
},
{
type: "radio",
display: true,
importantField: false,
styles: {},
prop: "check_type",
label: "检查方式",
fieldType: "int",
fieldLength: "11",
autoRequired: 0,
personalRequired: 0,
dicData: [
{
label: "磁控胶囊胃镜检查",
value: "3",
id: "1597475763517489154",
parentId: "",
},
{
label: "胃镜普通白光检查+LCI检查",
value: "2",
id: "1597475677853024258",
parentId: "",
},
{
label: "胃镜普通白光检查",
value: "1",
id: "1597475602204557314",
parentId: "",
},
],
dynamicshSet: [
{ value: "1", target: "inner_check_path" },
{ value: "2", target: "inner_check_path" },
{ value: "3", target: "inner_check_path" },
],
dicType: "gas_check_type",
props: { label: "label", value: "value" },
tableName: "胃镜检查",
tableCode: "gas_troscope",
tableId: "1597468524048121858",
notFilter: false,
cType: "",
subfield: false,
span: 24,
required: true,
rules: [{ required: true, message: "请选择检查方式" }],
},
{
type: "radio",
display: true,
importantField: false,
styles: {},
autoRequired: 0,
personalRequired: 0,
dicData: [
{
label: "异常",
value: "2",
id: "1597476229722767361",
parentId: "",
},
{
label: "未见异常",
value: "1",
id: "1597476184780800001",
parentId: "",
},
],
dynamicshSet: [
{ value: "2", target: "detail_check_type" },
{ value: "2", target: "diagnosis" },
],
dicType: "check_result",
props: { label: "label", value: "value" },
prop: "check_result",
label: "检查结果",
fieldType: "tinyint",
fieldLength: "2",
tableName: "胃镜检查",
tableCode: "gas_troscope",
tableId: "1597468524048121858",
notFilter: false,
cType: "",
subfield: false,
span: 24,
rules: [{ required: true, message: "请选择检查结果" }],
required: true,
},
{
type: "checkbox",
display: true,
importantField: false,
styles: {},
autoRequired: 0,
personalRequired: 0,
dicData: [
{
label: "化学染色",
value: "8",
id: "1597477133691748353",
parentId: "",
},
{
label: "荧光内镜",
value: "7",
id: "1597477097977249793",
parentId: "",
},
{
label: "激光共聚焦显微内镜",
value: "6",
id: "1597477062287917057",
parentId: "",
},
{
label: "放大内镜",
value: "5",
id: "1597477029488459778",
parentId: "",
},
{
label: "BLI",
value: "4",
id: "1597476996303126529",
parentId: "",
},
{
label: "I-SC",
value: "3",
id: "1597476961561706498",
parentId: "",
},
{
label: "FICE",
value: "2",
id: "1597476919312482306",
parentId: "",
},
{
label: "NBI",
value: "1",
id: "1597476883899973634",
parentId: "",
},
],
dynamicshSet: [],
dicType: "gas_detail_check_type",
props: { label: "label", value: "value" },
prop: "detail_check_type",
label: "胃镜精查方式",
fieldType: "varchar",
fieldLength: "255",
tableName: "胃镜检查",
tableCode: "gas_troscope",
tableId: "1597468524048121858",
notFilter: false,
cType: "",
subfield: false,
span: 24,
required: true,
rules: [{ required: true, message: "请选择胃镜精查方式" }],
},
{
type: "radio",
display: true,
importantField: false,
styles: {},
autoRequired: 0,
personalRequired: 0,
dicData: [
{
label: "异常",
value: "2",
id: "1597476229722767361",
parentId: "",
},
{
label: "未见异常",
value: "1",
id: "1597476184780800001",
parentId: "",
},
],
dynamicshSet: [
{ value: "2", target: "esophagus_level" },
{ value: "2", target: "esophagus_position" },
{ value: "2", target: "early_esophagus_cancer" },
{ value: "2", target: "period_esophagus_cancer" },
{ value: "2", target: "is_barret_esophagus" },
{ value: "2", target: "is_back_esophagus" },
{ value: "2", target: "inogm_level" },
{ value: "2", target: "inogm_position" },
{ value: "2", target: "early_gastric_cancer" },
{ value: "2", target: "period_gastric_cancer" },
{ value: "2", target: "atrophic_gastriti" },
{ value: "2", target: "gastric_ulcer" },
{ value: "2", target: "gastric_polyp_type" },
{ value: "2", target: "gastric_polyp" },
{ value: "2", target: "non_atrophic_gastriti" },
{ value: "2", target: "is_duodenal_ulcer" },
{ value: "2", target: "other_pathology" },
{ value: "2", target: "1675147677493_64987" },
],
dicType: "check_result",
props: { label: "label", value: "value" },
prop: "diagnosis",
label: "最后诊断",
fieldType: "tinyint",
fieldLength: "4",
tableName: "胃镜检查",
tableCode: "gas_troscope",
tableId: "1597468524048121858",
notFilter: false,
cType: "",
subfield: false,
span: 24,
labelSuffix: "",
rules: [{ required: true, message: "请选择最后诊断" }],
required: true,
},
{
type: "radio",
display: true,
importantField: false,
styles: {},
autoRequired: 0,
personalRequired: 0,
label: "食管粘膜上皮内瘤变级别",
prop: "esophagus_level",
dicData: [
{
label: "低级别",
value: "low",
id: "1597478564247207938",
parentId: "",
},
{
label: "高级别",
value: "high",
id: "1597478502163120130",
parentId: "",
},
],
dynamicshSet: [],
dicType: "risk_level",
props: { label: "label", value: "value" },
fieldType: "tinyint",
fieldLength: "4",
tableName: "胃镜检查",
tableCode: "gas_troscope",
tableId: "1597468524048121858",
notFilter: false,
cType: "",
subfield: false,
span: 24,
labelSuffix: "5",
rules: [],
},
{
type: "checkbox",
display: true,
importantField: false,
styles: {},
autoRequired: 0,
personalRequired: 0,
dicData: [
{
label: "食管下段",
value: "3",
id: "1597480132849795074",
parentId: "",
},
{
label: "食管中段",
value: "2",
id: "1597480056861589506",
parentId: "",
},
{
label: "食管上段",
value: "1",
id: "1597480026914258945",
parentId: "",
},
],
dynamicshSet: [],
dicType: "gas_position",
props: { label: "label", value: "value" },
prop: "early_esophagus_cancer",
label: "早期食管癌",
fieldType: "varchar",
fieldLength: "255",
tableName: "胃镜检查",
tableCode: "gas_troscope",
tableId: "1597468524048121858",
notFilter: false,
cType: "",
subfield: false,
span: 24,
labelSuffix: "5",
rules: [],
required: false,
},
{
type: "checkbox",
display: true,
importantField: false,
styles: {},
autoRequired: 0,
personalRequired: 0,
dicData: [
{
label: "食管下段",
value: "3",
id: "1597480132849795074",
parentId: "",
},
{
label: "食管中段",
value: "2",
id: "1597480056861589506",
parentId: "",
},
{
label: "食管上段",
value: "1",
id: "1597480026914258945",
parentId: "",
},
],
dynamicshSet: [],
dicType: "gas_position",
props: { label: "label", value: "value" },
prop: "period_esophagus_cancer",
label: "进展期食管癌",
fieldType: "varchar",
fieldLength: "255",
tableName: "胃镜检查",
tableCode: "gas_troscope",
tableId: "1597468524048121858",
notFilter: false,
cType: "",
subfield: false,
span: 24,
labelSuffix: "5",
rules: [],
},
{
type: "radio",
display: true,
importantField: false,
styles: {},
autoRequired: 0,
personalRequired: 0,
dicData: [
{
label: "",
value: "1",
id: "1595347527757000705",
parentId: "",
},
{
label: "",
value: "0",
id: "1595347502595371010",
parentId: "",
},
],
dynamicshSet: [],
dicType: "d-sf",
props: { label: "label", value: "value" },
prop: "is_barret_esophagus",
label: "Barret食管",
fieldType: "tinyint",
fieldLength: "4",
tableName: "胃镜检查",
tableCode: "gas_troscope",
tableId: "1597468524048121858",
notFilter: false,
cType: "",
subfield: false,
span: 24,
labelSuffix: "5",
},
{
type: "radio",
display: true,
importantField: false,
styles: {},
autoRequired: 0,
personalRequired: 0,
dicData: [
{
label: "",
value: "1",
id: "1595347527757000705",
parentId: "",
},
{
label: "",
value: "0",
id: "1595347502595371010",
parentId: "",
},
],
dynamicshSet: [],
dicType: "d-sf",
props: { label: "label", value: "value" },
prop: "is_back_esophagus",
label: "反流性食管炎",
fieldType: "tinyint",
fieldLength: "4",
labelSuffix: "5",
tableName: "胃镜检查",
tableCode: "gas_troscope",
tableId: "1597468524048121858",
notFilter: false,
cType: "",
subfield: false,
span: 24,
},
{
type: "radio",
display: true,
importantField: false,
styles: {},
autoRequired: 0,
personalRequired: 0,
prop: "inogm_level",
label: "胃粘膜上皮内瘤变级别",
dicData: [
{
label: "低级别",
value: "low",
id: "1597478564247207938",
parentId: "",
},
{
label: "高级别",
value: "high",
id: "1597478502163120130",
parentId: "",
},
],
dynamicshSet: [{ value: "high", target: "pathology_path" }],
dicType: "risk_level",
props: { label: "label", value: "value" },
fieldType: "varchar",
fieldLength: "10",
tableName: "胃镜检查",
tableCode: "gas_troscope",
tableId: "1597468524048121858",
notFilter: false,
cType: "",
subfield: false,
labelWidth: 180,
span: 24,
labelSuffix: "5",
},
{
type: "radio",
display: true,
importantField: false,
styles: {},
prop: "inogm_position",
label: "胃粘膜上皮内瘤变部位",
dicData: [
{
label: "胃窦",
value: "5",
id: "1597481813276721153",
parentId: "",
},
{
label: "胃角",
value: "4",
id: "1597481781530034178",
parentId: "",
},
{
label: "胃体",
value: "3",
id: "1597481745282859010",
parentId: "",
},
{
label: "胃底",
value: "2",
id: "1597481706678484993",
parentId: "",
},
{
label: "贲门",
value: "1",
id: "1597481677293191169",
parentId: "",
},
],
dynamicshSet: [],
dicType: "gas_area",
props: { label: "label", value: "value" },
fieldType: "varchar",
fieldLength: "10",
tableName: "胃镜检查",
tableCode: "gas_troscope",
tableId: "1597468524048121858",
notFilter: false,
cType: "",
subfield: false,
autoRequired: 0,
personalRequired: 0,
span: 24,
labelSuffix: "5",
},
{
type: "checkbox",
display: true,
importantField: false,
styles: {},
autoRequired: 0,
personalRequired: 0,
dicData: [
{
label: "胃窦",
value: "5",
id: "1597481813276721153",
parentId: "",
},
{
label: "胃角",
value: "4",
id: "1597481781530034178",
parentId: "",
},
{
label: "胃体",
value: "3",
id: "1597481745282859010",
parentId: "",
},
{
label: "胃底",
value: "2",
id: "1597481706678484993",
parentId: "",
},
{
label: "贲门",
value: "1",
id: "1597481677293191169",
parentId: "",
},
],
dynamicshSet: [
{ value: "1", target: "pathology_path" },
{ value: "2", target: "pathology_path" },
{ value: "3", target: "pathology_path" },
{ value: "4", target: "pathology_path" },
{ value: "5", target: "pathology_path" },
],
dicType: "gas_area",
props: { label: "label", value: "value" },
prop: "early_gastric_cancer",
label: "早期胃癌",
fieldType: "varchar",
fieldLength: "255",
tableName: "胃镜检查",
tableCode: "gas_troscope",
tableId: "1597468524048121858",
notFilter: false,
cType: "",
subfield: false,
span: 24,
labelSuffix: "5",
rules: [],
required: false,
},
{
type: "checkbox",
display: true,
importantField: false,
styles: {},
dicData: [
{
label: "胃窦",
value: "5",
id: "1597481813276721153",
parentId: "",
},
{
label: "胃角",
value: "4",
id: "1597481781530034178",
parentId: "",
},
{
label: "胃体",
value: "3",
id: "1597481745282859010",
parentId: "",
},
{
label: "胃底",
value: "2",
id: "1597481706678484993",
parentId: "",
},
{
label: "贲门",
value: "1",
id: "1597481677293191169",
parentId: "",
},
],
dicType: "gas_area",
props: { label: "label", value: "value" },
prop: "period_gastric_cancer",
label: "进展期胃癌",
fieldType: "varchar",
fieldLength: "255",
tableName: "胃镜检查",
tableCode: "gas_troscope",
tableId: "1597468524048121858",
notFilter: false,
cType: "",
subfield: false,
autoRequired: 0,
personalRequired: 0,
span: 24,
dynamicshSet: [
{ value: "1", target: "pathology_path" },
{ value: "2", target: "pathology_path" },
{ value: "3", target: "pathology_path" },
{ value: "4", target: "pathology_path" },
{ value: "5", target: "pathology_path" },
],
labelSuffix: "5",
},
{
type: "checkbox",
display: true,
importantField: false,
styles: {},
dicData: [
{
label: "胃窦",
value: "5",
id: "1597481813276721153",
parentId: "",
},
{
label: "胃角",
value: "4",
id: "1597481781530034178",
parentId: "",
},
{
label: "胃体",
value: "3",
id: "1597481745282859010",
parentId: "",
},
{
label: "胃底",
value: "2",
id: "1597481706678484993",
parentId: "",
},
{
label: "贲门",
value: "1",
id: "1597481677293191169",
parentId: "",
},
],
dicType: "gas_area",
props: { label: "label", value: "value" },
prop: "atrophic_gastriti",
label: "萎缩性胃炎",
fieldType: "varchar",
fieldLength: "255",
tableName: "胃镜检查",
tableCode: "gas_troscope",
tableId: "1597468524048121858",
notFilter: false,
cType: "",
subfield: false,
autoRequired: 0,
personalRequired: 0,
span: 24,
labelSuffix: "5",
},
{
type: "checkbox",
display: true,
importantField: false,
styles: {},
dicData: [
{
label: "胃窦",
value: "5",
id: "1597481813276721153",
parentId: "",
},
{
label: "胃角",
value: "4",
id: "1597481781530034178",
parentId: "",
},
{
label: "胃体",
value: "3",
id: "1597481745282859010",
parentId: "",
},
{
label: "胃底",
value: "2",
id: "1597481706678484993",
parentId: "",
},
{
label: "贲门",
value: "1",
id: "1597481677293191169",
parentId: "",
},
],
dicType: "gas_area",
props: { label: "label", value: "value" },
prop: "gastric_ulcer",
label: "胃溃疡",
fieldType: "varchar",
fieldLength: "255",
tableName: "胃镜检查",
tableCode: "gas_troscope",
tableId: "1597468524048121858",
notFilter: false,
cType: "",
subfield: false,
span: 24,
labelSuffix: "5",
autoRequired: 0,
personalRequired: 0,
},
{
type: "checkbox",
display: true,
importantField: false,
styles: {},
dicData: [
{
label: "胃窦",
value: "5",
id: "1597481813276721153",
parentId: "",
},
{
label: "胃角",
value: "4",
id: "1597481781530034178",
parentId: "",
},
{
label: "胃体",
value: "3",
id: "1597481745282859010",
parentId: "",
},
{
label: "胃底",
value: "2",
id: "1597481706678484993",
parentId: "",
},
{
label: "贲门",
value: "1",
id: "1597481677293191169",
parentId: "",
},
],
dicType: "gas_area",
props: { label: "label", value: "value" },
prop: "gastric_polyp",
label: "胃息肉",
fieldType: "varchar",
fieldLength: "255",
tableName: "胃镜检查",
tableCode: "gas_troscope",
tableId: "1597468524048121858",
notFilter: false,
cType: "",
subfield: false,
span: 24,
labelSuffix: "5",
},
{
type: "checkbox",
display: true,
importantField: false,
styles: {},
dicData: [
{
label: "胃窦",
value: "5",
id: "1597481813276721153",
parentId: "",
},
{
label: "胃角",
value: "4",
id: "1597481781530034178",
parentId: "",
},
{
label: "胃体",
value: "3",
id: "1597481745282859010",
parentId: "",
},
{
label: "胃底",
value: "2",
id: "1597481706678484993",
parentId: "",
},
{
label: "贲门",
value: "1",
id: "1597481677293191169",
parentId: "",
},
],
dicType: "gas_area",
props: { label: "label", value: "value" },
prop: "non_atrophic_gastriti",
label: "非萎缩性胃炎",
fieldType: "varchar",
fieldLength: "255",
tableName: "胃镜检查",
tableCode: "gas_troscope",
tableId: "1597468524048121858",
notFilter: false,
cType: "",
subfield: false,
autoRequired: 0,
personalRequired: 0,
span: 24,
labelSuffix: "5",
},
{
type: "checkbox",
display: true,
importantField: false,
styles: {},
dicData: [
{
label: "",
value: "1",
id: "1595347527757000705",
parentId: "",
},
{
label: "",
value: "0",
id: "1595347502595371010",
parentId: "",
},
],
dicType: "d-sf",
props: { label: "label", value: "value" },
prop: "is_duodenal_ulcer",
label: "十二指肠球部溃疡",
fieldType: "tinyint",
fieldLength: "2",
autoRequired: 0,
personalRequired: 0,
tableName: "胃镜检查",
tableCode: "gas_troscope",
tableId: "1597468524048121858",
notFilter: false,
cType: "",
subfield: false,
span: 24,
labelSuffix: "5",
},
{
type: "input",
display: true,
importantField: false,
styles: {},
fieldType: "varchar",
prop: "other_pathology",
label: "其他病变",
fieldLength: "255",
tableName: "胃镜检查",
tableCode: "gas_troscope",
tableId: "1597468524048121858",
notFilter: false,
cType: "",
subfield: false,
span: 24,
autoRequired: 0,
personalRequired: 0,
labelSuffix: "5",
},
{
type: "upload",
display: true,
importantField: false,
styles: {},
autoRequired: 0,
personalRequired: 0,
prop: "pathology_path",
label: "病理报告",
required: true,
rules: [{ required: true, message: "实验室报告必须填写" }],
showFileList: true,
multiple: true,
bucketName: "pathology",
limit: 5,
dicType: "",
listType: "picture-card",
fieldType: "varchar",
fieldLength: "255",
tableName: "附件",
tableCode: "gas_attachment",
tableId: "1595978031963398145",
notFilter: false,
cType: "",
subfield: false,
span: 24,
},
{
type: "upload",
display: true,
importantField: false,
styles: {},
autoRequired: 0,
personalRequired: 0,
prop: "inner_check_path",
label: "内镜报告",
required: true,
rules: [{ required: true, message: "实验室报告必须填写" }],
showFileList: true,
multiple: true,
bucketName: "endoscop",
limit: 5,
dicType: "",
listType: "picture-card",
fieldType: "varchar",
fieldLength: "255",
tableName: "附件",
tableCode: "gas_attachment",
tableId: "1595978031963398145",
notFilter: false,
cType: "",
subfield: false,
span: 24,
},
{
type: "upload",
display: true,
importantField: false,
styles: {},
autoRequired: 0,
personalRequired: 0,
prop: "esd_path",
label: "ESD手术报告",
required: false,
rules: [],
showFileList: true,
multiple: true,
bucketName: "esd",
limit: 5,
dicType: "",
listType: "picture-card",
fieldType: "varchar",
fieldLength: "255",
tableName: "附件",
tableCode: "gas_attachment",
tableId: "1595978031963398145",
notFilter: false,
cType: "",
subfield: false,
span: 24,
},
],
},
],
}
<template> <template>
<el-row class="el-upload-self"> <el-row class="el-upload-self">
<el-upload <el-upload
ref="upload"
:multiple="multiple" :multiple="multiple"
class="avatar-uploader" class="avatar-uploader"
ref="upload"
:action="action" :action="action"
:headers="headers" :headers="headers"
:list-type="listType" :list-type="listType"
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
:drag="drag" :drag="drag"
:disabled="disabled" :disabled="disabled"
> >
<!-- :http-request="handleUpload" -->
<template v-if="drag"> <template v-if="drag">
<i class="el-icon-upload"></i> <i class="el-icon-upload"></i>
<div class="el-upload__text">将文件拖到此处,或<em>点击上传</em></div> <div class="el-upload__text">将文件拖到此处,或<em>点击上传</em></div>
...@@ -37,10 +38,10 @@ ...@@ -37,10 +38,10 @@
</el-upload> </el-upload>
<el-image <el-image
ref="image"
style="display: none" style="display: none"
:src="imgUrl" :src="imgUrl"
:preview-src-list="previewList" :preview-src-list="previewList"
ref="image"
> >
</el-image> </el-image>
</el-row> </el-row>
...@@ -50,7 +51,7 @@ ...@@ -50,7 +51,7 @@
import { getAccessToken } from "@/utils/accessToken" import { getAccessToken } from "@/utils/accessToken"
import { delFile } from "@/api/file" import { delFile } from "@/api/file"
export default { export default {
name: "el-upload-self", name: "ElUploadSelf",
props: { props: {
accept: { type: String, default: "image/*" }, accept: { type: String, default: "image/*" },
disabled: { disabled: {
...@@ -97,20 +98,6 @@ export default { ...@@ -97,20 +98,6 @@ export default {
fileList: [], fileList: [],
} }
}, },
watch: {
value: {
handler(newValue, oldValue) {
if (newValue === oldValue) return
this.fileList = newValue.map((_) => {
return {
name: _.file_name,
url: `https://ds.cixincloud.com/geca-api/disease-data/file/info/${_.bucketName}/${_.uuidName}`,
}
})
},
immediate: true,
},
},
computed: { computed: {
headers() { headers() {
return { return {
...@@ -118,7 +105,10 @@ export default { ...@@ -118,7 +105,10 @@ export default {
} }
}, },
action() { action() {
return this.httpPrefix + `/cloud-upms/file/upload` return (
this.httpPrefix +
`/disease-data/file/upload?formId=${this.uploadQuery.formId}&patientId=${this.uploadQuery.patientId}&prefix=${this.uploadQuery.prefix}`
)
}, },
// 预览list // 预览list
previewList() { previewList() {
...@@ -126,12 +116,40 @@ export default { ...@@ -126,12 +116,40 @@ export default {
return this.value.map((_) => { return this.value.map((_) => {
return ( return (
_.url || _.url ||
`https://ds.cixincloud.com/geca-api/disease-data/file/info/${_.bucketName}/${_.uuidName}` `https://ds.cixincloud.com/geca-api/disease-data/file/info/${_.bucket_name}/${_.prefix}-${_.uuid_name}`
) )
}) })
}, },
}, },
watch: {
value: {
handler(newValue, oldValue) {
console.log(this.value)
if (newValue === oldValue) return
this.fileList = newValue.map((_) => {
return {
name: _.file_name,
url: `https://ds.cixincloud.com/geca-api/disease-data/file/info/${_.bucket_name}/${_.prefix}-${_.uuid_name}`,
}
})
},
immediate: true,
},
},
methods: { methods: {
// 自定义上传方法
// handleUpload(param) {
// let formData = new FormData()
// fd.append("file", param.file) //传文件
// fd.append("formld", this.formld) //传formld
// // ajax.axiosPost(
// // url, //接口地址
// // fd, //formdata对象参数
// // (res) => {
// // console.log(res)
// // }
// // )
// },
// 上传前回调 // 上传前回调
beforeUpload(file) { beforeUpload(file) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
...@@ -153,7 +171,7 @@ export default { ...@@ -153,7 +171,7 @@ export default {
handleSuccess(res, file, fileList) { handleSuccess(res, file, fileList) {
const { data } = res const { data } = res
if (data) { if (data) {
this.value.push({ ...data, url: file.url }) this.value.push({ ...data })
} else { } else {
this.$message.warning(res.msg) this.$message.warning(res.msg)
this.$refs.upload.clearFiles() this.$refs.upload.clearFiles()
...@@ -162,23 +180,27 @@ export default { ...@@ -162,23 +180,27 @@ export default {
// 移除提醒 // 移除提醒
beforeRemove(file, fileList) { beforeRemove(file, fileList) {
return this.$confirm(`确定移除 ${file.file_name || file.name}?`) // console.log(file, fileList)
return this.$confirm(
`确定移除 ${file.file_name || file.name || "该照片"}?`
)
}, },
// 移除 // 移除
handleRemove({ url }, fileList) { handleRemove({ uuid_name }, fileList) {
const i = this.value.findIndex((_) => url.endsWith(_.uuid_name)) const i = this.value.findIndex((_) => uuid_name == _.uuidName)
if (i > -1) this.value.splice(i, 1) // 静态移除 if (i > -1) this.value.splice(i, 1)
console.log("删了", this.value)
}, },
// 查看 // 查看/下载
handlePreview(file) { handlePreview(file) {
const name = file.fileName || file.name const name = file.fileName || file.name
this.title = name this.title = name
let responseUrl let responseUrl
if (file.response) { if (file.response) {
const _ = file.response.data const _ = file.response.data
responseUrl = `https://ds.cixincloud.com/geca-api/disease-data/file/info/${_.bucketName}/${_.uuidName}` responseUrl = `https://ds.cixincloud.com/geca-api/disease-data/file/info/${_.bucket_name}/${_.prefix}-${_.uuid_name}`
} }
try { try {
if (name.match(/\.(png|jpg|jpeg)/)) { if (name.match(/\.(png|jpg|jpeg)/)) {
......
...@@ -290,5 +290,8 @@ export function resetRouter() { ...@@ -290,5 +290,8 @@ export function resetRouter() {
routes: constantRoutes, routes: constantRoutes,
}).matcher }).matcher
} }
const originalPush = VueRouter.prototype.push
VueRouter.prototype.push = function push(location) {
return originalPush.call(this, location).catch((err) => err)
}
export default router export default router
const state = { const state = {
fontSize: localStorage.getItem("fontSize") || 1, fontSize: localStorage.getItem("fontSize") || 1,
selectedIndex: sessionStorage.getItem("selectedIndex") || "", selectedIndex: sessionStorage.getItem("selectedIndex") || "",
refreshFlag: 0,
} }
const getters = { const getters = {
fontSize: (state) => state.fontSize, fontSize: (state) => state.fontSize,
selectedIndex: (state) => state.selectedIndex, selectedIndex: (state) => state.selectedIndex,
refreshFlag: (state) => state.refreshFlag,
} }
const mutations = { const mutations = {
setFontSize(state, fontSize) { setFontSize(state, fontSize) {
...@@ -18,6 +20,9 @@ const mutations = { ...@@ -18,6 +20,9 @@ const mutations = {
state.selectedIndex = "" state.selectedIndex = ""
sessionStorage.removeItem("selectedIndex") sessionStorage.removeItem("selectedIndex")
}, },
setRefreshFlag(state, refreshFlag) {
state.refreshFlag = refreshFlag
},
} }
const actions = {} const actions = {}
export default { export default {
......
...@@ -350,12 +350,12 @@ export default { ...@@ -350,12 +350,12 @@ export default {
}, },
], ],
rigBarList: [ rigBarList: [
// { {
// src1: require("@/assets/img/Home/kefu.png"), src1: require("@/assets/img/Home/kefu.png"),
// src2: require("@/assets/img/Home/kefuwhite.png"), src2: require("@/assets/img/Home/kefuwhite.png"),
// content: "", content: "021-31161236",
// name: "客服", name: "客服",
// }, },
{ {
src1: require("@/assets/img/Home/youxiang.png"), src1: require("@/assets/img/Home/youxiang.png"),
src2: require("@/assets/img/Home/youxiangwhite.png"), src2: require("@/assets/img/Home/youxiangwhite.png"),
......
...@@ -109,7 +109,9 @@ export default { ...@@ -109,7 +109,9 @@ export default {
}, },
getPatientPage() { getPatientPage() {
this.listLoading = true this.listLoading = true
let data = { patientFrom: this.selectedIndex } let data = {
patientFrom: this.selectedIndex == "0" ? null : this.selectedIndex,
}
getPatientPage(data).then((res) => { getPatientPage(data).then((res) => {
this.listLoading = false this.listLoading = false
if (res.code === 1) { if (res.code === 1) {
......
...@@ -311,7 +311,6 @@ export default { ...@@ -311,7 +311,6 @@ export default {
this.pageSize = Number(sessionStorage.getItem('followResearch-pageSize')) || 1 this.pageSize = Number(sessionStorage.getItem('followResearch-pageSize')) || 1
this.pageIndex = Number(sessionStorage.getItem('followResearch-pageIndex')) || 10 this.pageIndex = Number(sessionStorage.getItem('followResearch-pageIndex')) || 10
this.getCurrentFormByType(2) this.getCurrentFormByType(2)
// this.handleSearch() //调试注释
}, },
methods: { methods: {
changeModified() { changeModified() {
...@@ -400,6 +399,7 @@ export default { ...@@ -400,6 +399,7 @@ export default {
.then((res) => { .then((res) => {
if (res.code === 1) { if (res.code === 1) {
this.formId = res.data[0].id this.formId = res.data[0].id
this.handleSearch() //调试注释
} }
}) })
}, },
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
form-type="1" form-type="1"
:patient-id="patientId" :patient-id="patientId"
:disabled="disabled" :disabled="disabled"
:operation="'edit'"
></ConfigForms> ></ConfigForms>
</div> </div>
</div> </div>
...@@ -56,7 +57,7 @@ export default { ...@@ -56,7 +57,7 @@ export default {
{ {
label: "医联体", label: "医联体",
minWidth: 120, minWidth: 120,
value: "groupName", value: "unionId",
}, },
{ {
label: "姓名", label: "姓名",
...@@ -144,6 +145,7 @@ export default { ...@@ -144,6 +145,7 @@ export default {
mounted() {}, mounted() {},
methods: { methods: {
handleAdd({ patientId, name }, index, disabled = false) { handleAdd({ patientId, name }, index, disabled = false) {
sessionStorage.removeItem("index1Data")
this.disabled = disabled this.disabled = disabled
this.patientId = patientId || null this.patientId = patientId || null
this.name = name this.name = name
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
:key="form.id" :key="form.id"
:label="form.label" :label="form.label"
:name="'index' + index" :name="'index' + index"
disabled :disabled="tabDisabled"
> >
<!-- disabled --> <!-- disabled -->
<transition mode="out-in" name="fade-transform"> <transition mode="out-in" name="fade-transform">
...@@ -41,6 +41,9 @@ ...@@ -41,6 +41,9 @@
:newform-record-id="newformRecordId" :newform-record-id="newformRecordId"
:form="form" :form="form"
:disabled="disabled" :disabled="disabled"
:operation="operation"
:isDraft="isDraft"
:active-name="activeName"
contrast contrast
:form-initial="formInitial" :form-initial="formInitial"
:survival-flag="survivalFlag" :survival-flag="survivalFlag"
...@@ -56,10 +59,7 @@ ...@@ -56,10 +59,7 @@
</el-tabs> </el-tabs>
</div> </div>
<el-empty v-else description="暂无数据"></el-empty> <el-empty v-else description="暂无数据"></el-empty>
<public-dialog <public-dialog ref="showDialog" :show-close="true">
ref="showDialog"
:showClose="dialogType == 'draft' ? true : false"
>
<!-- 保存草稿 --> <!-- 保存草稿 -->
<template v-if="dialogType == 'draft'" slot="content"> <template v-if="dialogType == 'draft'" slot="content">
<div class="title center">已保存至草稿箱!</div> <div class="title center">已保存至草稿箱!</div>
...@@ -113,9 +113,12 @@ export default { ...@@ -113,9 +113,12 @@ export default {
mixins: [mixin], mixins: [mixin],
props: { props: {
disabled: Boolean, disabled: Boolean,
tabDisabled: { type: Boolean, default: true },
formType: String, formType: String,
patientId: String, patientId: String,
formClass: String, formClass: String,
operation: String,
isDraft: String,
}, },
data() { data() {
return { return {
...@@ -155,20 +158,23 @@ export default { ...@@ -155,20 +158,23 @@ export default {
if (val == "index1") { if (val == "index1") {
// 第二步问卷调查 // 第二步问卷调查
this.$nextTick(() => { this.$nextTick(() => {
let { birthday } = JSON.parse(sessionStorage.getItem("index1Data")) let index1Data = sessionStorage.getItem("index1Data")
let date = new Date(String(birthday).replace(/-/g, "/")) if (index1Data) {
let d = new Date() let { birthday } = JSON.parse(index1Data)
let age = let date = new Date(String(birthday).replace(/-/g, "/"))
d.getFullYear() - let d = new Date()
date.getFullYear() - let age =
(d.getMonth() < date.getMonth() || d.getFullYear() -
(d.getMonth() == date.getMonth() && d.getDate() < date.getDate()) date.getFullYear() -
? 1 (d.getMonth() < date.getMonth() ||
: 0) (d.getMonth() == date.getMonth() && d.getDate() < date.getDate())
//! ? 1
this.formInitial = { : 0)
birthday, //!
age, this.formInitial = {
birthday,
age,
}
} }
}) })
} else { } else {
...@@ -218,7 +224,7 @@ export default { ...@@ -218,7 +224,7 @@ export default {
}, },
temporaryConfirm(data, done, cb) { temporaryConfirm(data, done, cb) {
this.addPatient(data, done, cb, () => { this.addPatient(data, done, cb, () => {
console.log("倒了") console.log("临时保存")
this.$refs.showDialog.dialogVisible = true this.$refs.showDialog.dialogVisible = true
this.loading = false this.loading = false
}) })
...@@ -258,10 +264,26 @@ export default { ...@@ -258,10 +264,26 @@ export default {
} }
// 清空红字:不符合筛查条件 // 清空红字:不符合筛查条件
this.$refs.showDialog.dialogVisible = false this.$refs.showDialog.dialogVisible = false
//判断路径
if (this.$route.path != "/screening/add") {
this.$router.push("/screening/add")
}
}, },
// 去查看跳转
viewJump() { viewJump() {
// this.$router.push('/') console.log(this.patientId)
alert("跳转") if (this.$route.path == "/screening/index") {
this.$store.commit("table/setRefreshFlag", 1)
} else {
this.$router.push({
path: "/screening/index",
query: {
patientId: this.patientId || this.patientStandbyId,
},
})
}
this.$refs.showDialog.dialogVisible = false
// alert("跳转")
}, },
}, },
provide() { provide() {
......
...@@ -45,6 +45,12 @@ ...@@ -45,6 +45,12 @@
<div <div
ref="my-form" ref="my-form"
class="my-form" class="my-form"
:style="{
height:
$route.path == '/screening/index'
? 'calc(100vh - 310px)'
: 'calc(100vh - 270px)',
}"
:class="externalScroll ? 'no-scroll' : ''" :class="externalScroll ? 'no-scroll' : ''"
> >
<!-- <read-form <!-- <read-form
...@@ -84,6 +90,7 @@ export default { ...@@ -84,6 +90,7 @@ export default {
name: "FormTab", name: "FormTab",
components: { CustomForm, TagsScrollBar, ReadForm }, components: { CustomForm, TagsScrollBar, ReadForm },
props: { props: {
activeName: String,
externalScroll: Boolean, //外部滚动 externalScroll: Boolean, //外部滚动
disabled: Boolean, disabled: Boolean,
contrast: Boolean, //同屏对照 contrast: Boolean, //同屏对照
...@@ -95,6 +102,11 @@ export default { ...@@ -95,6 +102,11 @@ export default {
survivalFlag: Boolean, //存活的显示 survivalFlag: Boolean, //存活的显示
formEdit: {}, formEdit: {},
formInitial: {}, formInitial: {},
operation: String, // !默认新增,传入为edit为编辑需要传formRecordId
isDraft: {
type: String,
default: "",
},
}, },
provide() { provide() {
return { return {
...@@ -174,52 +186,53 @@ export default { ...@@ -174,52 +186,53 @@ export default {
}, },
// 临时保存确定 // 临时保存确定
temporaryConfirm(data, done) { temporaryConfirm(data, done) {
this.$emit( let params = {
"temporaryConfirm", data,
{ formId: this.form.formId, // 每个大表单的id
data, patientId: this.patientId || this.patientStandbyId,
formId: this.form.formId, // 每个大表单的id // formRecordId: this.formData.formRecordId || this.newformRecordId, // 是否为编辑的表单id
patientId: this.patientId || this.patientStandbyId, statusMap: {
// formRecordId: this.formData.formRecordId || this.newformRecordId, // 是否为编辑的表单id patient_from: this.$store.getters["table/selectedIndex"],
statusMap: { is_draft: 1, //是否为草稿
patient_from: this.$store.getters["table/selectedIndex"], check_status: 1, // 审核状态
is_draft: 1, //是否为草稿
check_status: 1, // 审核状态
},
}, },
done, }
(res) => { if (this.operation && this.operation == "edit") {
// 多次填写的表单新增时,获取最新数据 params.formRecordId = this.formData.formRecordId || this.newformRecordId // 是否为编辑的表单id
if (this.form.fillType === 1 && !this.formData.formRecordId) { }
this.getRecordList(res.data.formRecordId) this.$emit("temporaryConfirm", params, done, (res) => {
} // 多次填写的表单新增时,获取最新数据
this.formatData(res, this.form.fillType !== 1) if (this.form.fillType === 1 && !this.formData.formRecordId) {
this.getRecordList(res.data.formRecordId)
} }
) this.formatData(res, this.form.fillType !== 1)
})
}, },
handleConfirm(data, done) { handleConfirm(data, done) {
this.$emit( let params = {
"handleConfirm", data,
{ formId: this.form.formId, // 每个大表单的id
data, patientId: this.patientId || this.patientStandbyId,
formId: this.form.formId, // 每个大表单的id // formRecordId: this.formData.formRecordId || this.newformRecordId, // 是否为编辑的表单id
patientId: this.patientId || this.patientStandbyId, statusMap: {
// formRecordId: this.formData.formRecordId || this.newformRecordId, // 是否为编辑的表单id patient_from: this.$store.getters["table/selectedIndex"],
statusMap: { is_draft: this.activeName == "index5" ? 0 : 1, //是否为草稿
patient_from: this.$store.getters["table/selectedIndex"], check_status: 1, // 审核状态
is_draft: 0, //是否为草稿
check_status: 1, // 审核状态
},
}, },
done, }
(res) => { if (this.operation && this.operation == "edit") {
// 多次填写的表单新增时,获取最新数据 params.formRecordId = this.formData.formRecordId || this.newformRecordId // 是否为编辑的表单id
if (this.form.fillType === 1 && !this.formData.formRecordId) { }
this.getRecordList(res.data.formRecordId) if (this.isDraft) {
} params.statusMap.is_draft = this.isDraft
this.formatData(res, this.form.fillType !== 1) }
this.$emit("handleConfirm", params, done, (res) => {
// 多次填写的表单新增时,获取最新数据
if (this.form.fillType === 1 && !this.formData.formRecordId) {
this.getRecordList(res.data.formRecordId)
} }
) this.formatData(res, this.form.fillType !== 1)
})
}, },
onPrev(done) { onPrev(done) {
this.$emit("onPrev", done) this.$emit("onPrev", done)
...@@ -438,10 +451,10 @@ export default { ...@@ -438,10 +451,10 @@ export default {
} }
} }
.my-form { .my-form {
height: calc(100vh - #{"270px"}); // height: calc(100vh - #{"310px"});
overflow-y: auto; overflow-y: auto;
padding-top: 20px; padding-top: 20px;
position: relative; // position: relative;
&::-webkit-scrollbar-thumb { &::-webkit-scrollbar-thumb {
background-color: #fff; background-color: #fff;
} }
......
...@@ -25,14 +25,15 @@ ...@@ -25,14 +25,15 @@
<div v-if="isDetail"> <div v-if="isDetail">
<div> <div>
<el-button icon="el-icon-back" @click="isDetail = false" <el-button icon="el-icon-back" @click="backInfoce">返 回</el-button>
>返 回</el-button
>
</div> </div>
<ConfigForms <ConfigForms
form-type="1" form-type="1"
:patient-id="patientId" :patient-id="patientId"
:disabled="disabled" :disabled="disabled"
:tabDisabled="tabDisabled"
:isDraft="'0'"
:operation="'edit'"
></ConfigForms> ></ConfigForms>
</div> </div>
</div> </div>
...@@ -54,6 +55,7 @@ export default { ...@@ -54,6 +55,7 @@ export default {
disabled: false, disabled: false,
tableData: [], tableData: [],
cacheForm: {}, cacheForm: {},
tabDisabled: true,
searchList: [ searchList: [
{ {
type: "date", type: "date",
...@@ -246,11 +248,22 @@ export default { ...@@ -246,11 +248,22 @@ export default {
} }
}, },
methods: { methods: {
backInfoce() {
this.$router.push({ query: {} })
this.isDetail = false
},
handleView(row) { handleView(row) {
this.handleAdd(row, null, true) this.handleAdd(row, null, true, false)
}, },
handleAdd({ patientId, name }, index, disabled = false) { handleAdd(
{ patientId, name },
index,
disabled = false,
tabDisabled = true
) {
sessionStorage.removeItem("index1Data")
this.disabled = disabled this.disabled = disabled
this.tabDisabled = tabDisabled
this.patientId = patientId || null this.patientId = patientId || null
this.name = name this.name = name
this.isDetail = true this.isDetail = true
...@@ -298,15 +311,40 @@ export default { ...@@ -298,15 +311,40 @@ export default {
computed: { computed: {
...mapGetters({ ...mapGetters({
selectedIndex: "table/selectedIndex", selectedIndex: "table/selectedIndex",
refreshFlag: "table/refreshFlag",
}), }),
}, },
created() { created() {
this.handleFormSearch() this.handleFormSearch()
// if (this.$route.path == "/screening/index") {
// this.tabDisabled = false
// }
if (this.$route.query.patientId) {
let patientId = this.$route.query.patientId
// this.$nextTick(() => {
this.disabled = true
this.tabDisabled = false
this.patientId = patientId || null
this.isDetail = true
// })
}
}, },
watch: { watch: {
selectedIndex(v) { selectedIndex(v) {
this.handleFormSearch(this.searchForm) this.handleFormSearch(this.searchForm)
}, },
refreshFlag(v) {
if (v) {
this.$store.commit("table/setRefreshFlag", 0)
this.isDetail = false
this.$nextTick(() => {
this.handleView({
patientId: this.patientId,
name: "",
})
})
}
},
}, },
} }
</script> </script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment