diff --git a/src/components/FormComponents/CustomForm/index.vue b/src/components/FormComponents/CustomForm/index.vue index d3cff3b53bcc4473492adbde85294ad83b7bb618..1e692d4d2be8ba45365252a04e134b6181d7ab56 100644 --- a/src/components/FormComponents/CustomForm/index.vue +++ b/src/components/FormComponents/CustomForm/index.vue @@ -49,9 +49,11 @@ > {{ g.label }} - {{ + + {{ errorText - }} + }} + - 上一步 - + >上一步 {{ options.submitText || "提交" }} + >{{ options.submitText || "提交" }} {{ options.emptyText || "清空" }} + >{{ options.emptyText || "清空" }} @@ -107,8 +105,7 @@ icon="el-icon-caret-right" size="large" @click="nextTab" - >{{ options.nextTabText || "下一页" }} + >{{ options.nextTabText || "下一页" }} @@ -373,7 +370,7 @@ export default { border: none; .el-collapse-item { &:nth-child(1) { - border-top: 1px solid #e5e5e5; + border-top: 1px solid #cccccc; } } .el-collapse-item__content { @@ -383,7 +380,7 @@ export default { border-radius: 4px; background: #fafafa; padding-left: 20px; - border: 1px solid #e5e5e5; + border: 1px solid #cccccc; border-bottom-color: #ccc; border-top: 0px; font-size: 14px; @@ -393,9 +390,9 @@ export default { .el-collapse-item__wrap { border: none; padding: 10px; - border-left: 1px solid #e5e5e5; - border-right: 1px solid #e5e5e5; - // border-bottom: 1px solid #e5e5e5 !important; + border-left: 1px solid #cccccc; + border-right: 1px solid #cccccc; + // border-bottom: 1px solid #cccccc !important; padding: 0px; // &:hover { // background-color: #ecf8ff; diff --git a/src/components/FormComponents/ReadForm/FormContent2.vue b/src/components/FormComponents/ReadForm/FormContent2.vue index 01f110fe8e16f703d7574393a4c40e8b8ff2b771..c74257b9e036addac68c39b4ba9574c91e3aae3e 100644 --- a/src/components/FormComponents/ReadForm/FormContent2.vue +++ b/src/components/FormComponents/ReadForm/FormContent2.vue @@ -33,6 +33,7 @@ :columns="columns.column || columns.children.column" :group="options.group" @formChange="formChange" + :showIndex="showIndex" > @@ -75,11 +76,18 @@ export default { type: Boolean, default: false, }, + showIndex: { + type: Boolean, + }, }, data() { return {} }, - + provide(){ + return{ + showIndex: this.showIndex + } + }, computed: { isShowIm() { return function (val) { diff --git a/src/components/FormComponents/ReadForm/FormItemSelf2.vue b/src/components/FormComponents/ReadForm/FormItemSelf2.vue index 7fe0fecee66781b048bace797085af0197fbf546..fd04528f860f6dd5ef1793c75e8993a60f78e5de 100644 --- a/src/components/FormComponents/ReadForm/FormItemSelf2.vue +++ b/src/components/FormComponents/ReadForm/FormItemSelf2.vue @@ -18,9 +18,9 @@ " :label-width="item.labelWidth ? `${item.labelWidth}px` : ''" :prop="item.prop" - :rules="item.rules" :class="isEmpty" > + - {{ item.importantFieldDesc || "*" }} + >{{ item.importantFieldDesc || "*" }}--> diff --git a/src/components/FormComponents/ReadForm/index.vue b/src/components/FormComponents/ReadForm/index.vue index 5cb1e9d3394df839d461ec143670d273de017be6..7a0234f392deb0d7481a7ef30936f3442e1cf3f1 100644 --- a/src/components/FormComponents/ReadForm/index.vue +++ b/src/components/FormComponents/ReadForm/index.vue @@ -49,7 +49,11 @@ > {{ g.label }} - {{errorText}} + {{g.showIndex}} + {{errorText}} @@ -155,7 +161,7 @@ export default { }, }, watch: { - formEdit: { + formEdit:{ handler() { this.initfields(this.formEdit) }, @@ -307,20 +313,21 @@ export default { this.loading = false this.$nextTick(() => { // 子组件数据初始化完成后 - setTimeout(() => { + // setTimeout(() => { this.initfields(this.formEdit) - }, 0) + // }, 0) if (this.$refs.form && this.$refs.form.clearValidate) { this.$refs.form.clearValidate() } + this.$forceUpdate(); }) }, // 绑定部分值(此时表单已渲染) initfields(obj) { for (let k in obj) { - if (this.form.hasOwnProperty(k)) { + // if (this.form.hasOwnProperty(k)) { this.form[k] = obj[k] - } + // } } }, }, @@ -334,7 +341,7 @@ export default { border: none; .el-collapse-item { &:nth-child(1) { - border-top: 1px solid #e5e5e5; + border-top: 1px solid #cccccc; } } .el-collapse-item__content { @@ -343,7 +350,7 @@ export default { .el-collapse-item__header { background: #fafafa; padding-left: 20px; - border: 1px solid #e5e5e5; + border: 1px solid #cccccc; border-bottom-color: #ccc; border-top: 0px; font-size: 14px; @@ -353,9 +360,9 @@ export default { .el-collapse-item__wrap { border: none; padding: 10px; - border-left: 1px solid #e5e5e5; - border-right: 1px solid #e5e5e5; - // border-bottom: 1px solid #e5e5e5 !important; + // border-left: 1px solid #cccccc; + // border-right: 1px solid #cccccc; + // border-bottom: 1px solid #cccccc !important; padding: 0px; &:hover { // background-color: #ecf8ff; @@ -396,4 +403,21 @@ export default { } } } +.index-form { + ::v-deep { + // .el-form-item { + .el-form-item__label { + text-align: left; + background: #fafafa; + font-size: 14px; + color: #333333; + border-right: 1px solid #cccccc; + width: 80px !important; + padding: 18px 10px; + margin-right: 20px; + text-align: center; + } + } + // } +} diff --git a/src/router/index.js b/src/router/index.js index 4ae101ef91f8eeaa2a8772b565e5f26c2fa3e94d..5e1f6d177e0d19d6b92d5fea23c24071bec8e16d 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -66,14 +66,14 @@ export const constantRoutes = [ ], }, { - path: "/followaduit", + path: "/followaudit", component: Layout, children: [ { - path: "/followaduit", - component: () => import("@/views/followupentry/followaduit"), + path: "/followaudit", + component: () => import("@/views/followupentry/followaudit"), hidden: true, - name: "followaduit", + name: "followaudit", }, ], }, diff --git a/src/views/audit-qualitycontrol/hospital.vue b/src/views/audit-qualitycontrol/hospital.vue index c1ae7268ea8595239681e5c4a88e02125864ae7a..5c5f42a1b157f67cb2490b7068293778b37f4f6e 100644 --- a/src/views/audit-qualitycontrol/hospital.vue +++ b/src/views/audit-qualitycontrol/hospital.vue @@ -104,9 +104,9 @@ export default { } }, auditHandle(data, i) { - console.log(data,i) + console.log(data,i,"表单") if(this.type=="1"){ - this.$router.push("/followaduit") + this.$router.push("/followaudit") } }, }, diff --git a/src/views/followupentry/followaduit.vue b/src/views/followupentry/components/followReview.vue similarity index 81% rename from src/views/followupentry/followaduit.vue rename to src/views/followupentry/components/followReview.vue index e24c5d9398a6a80196a62367aec60db02f899e28..86bfbc830a4e38bc7e5796b8ae6948f54c9c07b3 100644 --- a/src/views/followupentry/followaduit.vue +++ b/src/views/followupentry/components/followReview.vue @@ -1,20 +1,23 @@ - - + + + - diff --git a/src/views/followupentry/components/publicDialog.vue b/src/views/followupentry/components/publicDialog.vue new file mode 100644 index 0000000000000000000000000000000000000000..b0ea9dc149d661d050529750dd91a2927f4e0118 --- /dev/null +++ b/src/views/followupentry/components/publicDialog.vue @@ -0,0 +1,33 @@ + + + + + + + + + + diff --git a/src/views/followupentry/followaudit.vue b/src/views/followupentry/followaudit.vue new file mode 100644 index 0000000000000000000000000000000000000000..7a52d9bf6310ae031afdd22b81b83d28af207e1e --- /dev/null +++ b/src/views/followupentry/followaudit.vue @@ -0,0 +1,289 @@ + + + + + 当前审核 + 【无锡市人民医院医联体】【剩余7】 + + + 返回 + + + + 请选择审核结果: + + {{ item.text }} + 驳回修改建议:胃镜图片不合规 + + + + + + + + + 温馨提示 + + + 该病例已经审核【驳回修改】,需要改为{{ + btnGroup[curBtn - 1] ? btnGroup[curBtn - 1].text : "" + }}吗 + + + + 否 + 是 + + + + + + + {{ btnGroup[curBtn - 1] ? btnGroup[curBtn - 1].text : "" }} + + + + + + + + + + + 确 定 + + + + + {{ btnGroup[curBtn - 1].text }} + + 该病例审核合格成功! + + + {{ curBtn == 2 ? "不合格原因" : "驳回修改建议" }} + {{ form.reson }} + + + 该病例审核{{ curBtn == 2 ? "不合格原因" : "驳回修改建议" }}提交成功! + + 下一例 + + + + + + + diff --git a/src/views/screening/components/ConfigForms.vue b/src/views/screening/components/ConfigForms.vue index 2c4215610d2c4eae63d8762f62af7302f34c84f4..d97bc62f5faf15fe1998b984af9a51569b5c20e1 100644 --- a/src/views/screening/components/ConfigForms.vue +++ b/src/views/screening/components/ConfigForms.vue @@ -1,12 +1,11 @@ - + - {{ + + {{ formType == 1 ? "临时保存" : "返回" - }} + }} +