diff --git a/src/components/FormComponents/ReadForm/index.vue b/src/components/FormComponents/ReadForm/index.vue index 8a784294b5a5af60bed992179ee23f4b4c379a09..9bbc4d318130ba0c3996be762116d01d18fc7c40 100644 --- a/src/components/FormComponents/ReadForm/index.vue +++ b/src/components/FormComponents/ReadForm/index.vue @@ -313,8 +313,8 @@ export default { }, // 绑定部分值(此时表单已渲染) initfields(obj) { + console.log("通用表单",obj) for (let k in obj) { - console.log("通用表单",k,obj) // if (this.form.hasOwnProperty(k)) { this.form[k] = obj[k] // } diff --git a/src/store/modules/dict.js b/src/store/modules/dict.js index 7baa5f9d5d3ff9894b3bd5301312574c459d13a3..3360959e3c73f97a04131570f182675c07e2dc64 100644 --- a/src/store/modules/dict.js +++ b/src/store/modules/dict.js @@ -32,7 +32,6 @@ const actions = { newDictSet.push(v.type) } }) - console.log('执行getDictData', commit, state) commit("setDictSet", latestDict) newDictSet = Object.keys(dictMap).length === 0 ? latestDictSet : newDictSet // 存在新增加的字典 diff --git a/src/views/audit-qualitycontrol/index.vue b/src/views/audit-qualitycontrol/index.vue index 8d64d706e369574fbd56de0085696b3088f40d6b..ce49f447bceddc84d1a96961f554b93416492e99 100644 --- a/src/views/audit-qualitycontrol/index.vue +++ b/src/views/audit-qualitycontrol/index.vue @@ -51,17 +51,17 @@ export default { listLoading: false, tableData: [ { - "unionId": "2", + "unionName": "111", - "unionName": "合肥高新附院", + "unionId": "1", - "unCheckNums": 2, + "reportTime": "2023-02-01 16:47:23", - "checkNums": 0, + "unCheckNums": 1, - "reportTime": "2022-12-09 09:12:35" - - } + "checkNums": 0 + + } ], } }, @@ -192,7 +192,6 @@ export default { }, methods: { handleClick() { - console.log("type:" + this.type, "auditStatus" + this.auditStatus) if (this.auditStatus == 1) { this.columns[this.columns.length - 1].operations[0].label = "修改审核意见" @@ -201,7 +200,6 @@ export default { } }, auditHandle(data, i) { - console.log(data, i) if (this.type == "1") { this.$router.push({ path: "/followaudit", @@ -232,7 +230,7 @@ export default { res = await getFollowCheck(params) //已审核 break; } - this.tableData = res.data.records + // this.tableData = res.data.records //调试注释 this.total= res.data.total }, }, diff --git a/src/views/followupentry/components/followReview.vue b/src/views/followupentry/components/followReview.vue index 83f51435d00ce469de4b08f6588a21b0b6ebc9b2..7482e9981120fa4f23c06b2b162233bb164632c8 100644 --- a/src/views/followupentry/components/followReview.vue +++ b/src/views/followupentry/components/followReview.vue @@ -2,7 +2,35 @@
- + + + + + + + + + + +
@@ -16,8 +44,8 @@ export default { ReadForm }, props: { - form: { - type: Object, + formDataList: { + type: Array, }, }, data() { @@ -689,19 +717,38 @@ export default { }, ] }, - formEdit:{ - } + // formEdit:{ + // }, + activeTab:0, + screenList: [ + { + time: "2020-12-12 11:11:11", + code: "UK102", + name: "修改第一次随访计划", + }, + ], } }, - watch:{ - form(val){ - this.formEdit = val - console.log("form",val) + // watch:{ + // form(val){ + // this.formEdit = val[this.activeTab] + // console.log("formReview",val) + // } + // }, + computed:{ + formEdit:{ + get(){ + return this.formDataList[this.activeTab] + }, + set(){ + + } } }, created() { }, mounted(){ + this.formEdit = this.formDataList[this.activeTab] }, methods: {}, } @@ -727,6 +774,70 @@ export default { background: #4e68ff; color: #fff; } + .el-main { + padding: 0px 20px; + } + .el-aside { + padding-bottom: 20px; + } +} +.follow-tab { + ::v-deep { + border-radius: 4px; + border: 1px solid #cccccc; + height: 100%; + .el-tabs__header { + margin-left: 0px; + } + .el-tabs__nav-wrap.is-right::after { + width: 0px; + } + .el-tabs__active-bar.is-right { + width: 3px; + height: 52px !important; + } + .el-tabs--right { + height: auto !important; + } + .tab-title { + padding: 16px; + background: #fafafa; + color: #333333; + border-bottom: 1px solid #cccccc; + } + .el-tabs__item { + padding: 16px; + width: 180px; + background: #fafafa; + height: auto; + line-height: inherit; + border-bottom: 1px solid #cccccc; + transition: all 1s; + } + .el-tabs__item.is-active { + background: transparent; + } + } +} +.follow-list { + border-radius: 4px; + border: 1px solid #cccccc; + height: 100%; + background: #fafafa; + li { + padding: 20px 30px; + border-bottom: 1px solid #ccc; + cursor: pointer; + .time { + font-size: 14px; + margin-bottom: 8px; + font-family: AlibabaPuHuiTiR; + text-align: left; + &:first-child { + color: #4e68ff; + } + } + } } .follow-form { ::v-deep { @@ -746,6 +857,8 @@ export default { overflow: hidden; border: 1px solid #cccccc; } + .el-collapse-item:not(:last-child) { + } .el-collapse-item__wrap { border: none; } diff --git a/src/views/followupentry/followaudit.vue b/src/views/followupentry/followaudit.vue index a447826e0b07170f3ad5aac1bfb7c6c23ae220bd..a82abc50948e2b43eea21f68db7077c085e4fb57 100644 --- a/src/views/followupentry/followaudit.vue +++ b/src/views/followupentry/followaudit.vue @@ -11,8 +11,7 @@
- - +
请选择审核结果: @@ -105,13 +104,22 @@ export default { medicalCombination:'无锡市人民医院医联体', mcCount:7, editStatus: false, //进入的状态是第一次审核还是修改审核,false为第一次,true为修改 - formEdit:{ - name:"djksh", - contact_phone:"12345678", - is_accept:"0", - gas_exam:"15", - G_17:"5" - },//填报数据 + formEdit:[ + { + name:"djksh", + contact_phone:"12345678", + is_accept:"0", + gas_exam:"15", + G_17:"5" + }, + { + name:"djksh", + contact_phone:"12345678", + is_accept:"0", + gas_exam:"15", + G_17:"6" + }, + ],//填报数据 form: {}, rules: { reson: [{ required: true, message: "请填写", trigger: "blur" }], @@ -213,7 +221,7 @@ export default { this.loading = true let res = await getFollowUnCheckDetail(this.unionId) if(res.code==1){ - this.formEdit=res.data[0] + // this.formEdit=res.data[0] //调试注释 } this.loading = false },