Commit 2921a9bf authored by miaojiale's avatar miaojiale

1.筛查跳转

2.提交和草稿状态传参
parent ca416b44
...@@ -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;
......
...@@ -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"),
......
...@@ -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">
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
:form="form" :form="form"
:disabled="disabled" :disabled="disabled"
:operation="operation" :operation="operation"
:active-name="activeName"
contrast contrast
:form-initial="formInitial" :form-initial="formInitial"
:survival-flag="survivalFlag" :survival-flag="survivalFlag"
...@@ -59,7 +60,7 @@ ...@@ -59,7 +60,7 @@
<el-empty v-else description="暂无数据"></el-empty> <el-empty v-else description="暂无数据"></el-empty>
<public-dialog <public-dialog
ref="showDialog" ref="showDialog"
:showClose="dialogType == 'draft' ? true : false" :show-close="dialogType == 'draft' ? true : false"
> >
<!-- 保存草稿 --> <!-- 保存草稿 -->
<template v-if="dialogType == 'draft'" slot="content"> <template v-if="dialogType == 'draft'" slot="content">
...@@ -114,6 +115,7 @@ export default { ...@@ -114,6 +115,7 @@ 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,
...@@ -269,8 +271,8 @@ export default { ...@@ -269,8 +271,8 @@ export default {
} }
}, },
viewJump() { viewJump() {
// this.$router.push('/') this.$router.push("/screening/index")
alert("跳转") // 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, //同屏对照
...@@ -205,7 +212,7 @@ export default { ...@@ -205,7 +212,7 @@ export default {
// formRecordId: this.formData.formRecordId || this.newformRecordId, // 是否为编辑的表单id // formRecordId: this.formData.formRecordId || this.newformRecordId, // 是否为编辑的表单id
statusMap: { statusMap: {
patient_from: this.$store.getters["table/selectedIndex"], patient_from: this.$store.getters["table/selectedIndex"],
is_draft: 0, //是否为草稿 is_draft: this.activeName == "index5" ? 0 : 1, //是否为草稿
check_status: 1, // 审核状态 check_status: 1, // 审核状态
}, },
} }
...@@ -437,10 +444,10 @@ export default { ...@@ -437,10 +444,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;
} }
......
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
form-type="1" form-type="1"
:patient-id="patientId" :patient-id="patientId"
:disabled="disabled" :disabled="disabled"
:tabDisabled="tabDisabled"
></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",
...@@ -247,10 +249,16 @@ export default { ...@@ -247,10 +249,16 @@ export default {
}, },
methods: { methods: {
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
) {
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
...@@ -302,6 +310,9 @@ export default { ...@@ -302,6 +310,9 @@ export default {
}, },
created() { created() {
this.handleFormSearch() this.handleFormSearch()
// if (this.$route.path == "/screening/index") {
// this.tabDisabled = false
// }
}, },
watch: { watch: {
selectedIndex(v) { selectedIndex(v) {
......
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