diff --git a/src/components/FormComponents/CustomForm/FormItemSelf.vue b/src/components/FormComponents/CustomForm/FormItemSelf.vue index b6aa44cd090d61792f028f3b5c740cdabfc9da41..5890a5805c2ed81f1532c4565a42bce142b530c1 100644 --- a/src/components/FormComponents/CustomForm/FormItemSelf.vue +++ b/src/components/FormComponents/CustomForm/FormItemSelf.vue @@ -182,7 +182,7 @@ <!-- å•选框 --> <el-radio-group - v-if="item.type === 'radio' && !item.disabled" + v-if="item.type === 'radio'" v-model="form[item.prop]" :disabled="item.disabled" @change="handleChange" @@ -195,7 +195,7 @@ > </el-radio-group> <!-- å•选框åªè¯» --> - <div + <!-- <div v-for="(opt, optIndex) in item.dicData" v-else-if="item.type === 'radio' && item.disabled" :key="optIndex" @@ -203,14 +203,12 @@ <el-radio v-show="opt.value == form[item.prop]" v-model="form[item.prop]" - :class=" - item.class ? item.class : item.disabled ? 'read-radio' : '' - " + :class="item.class ? item.class : item.disabled ? '' : ''" :label="opt.value" @change="item.func ? item.func($event) : {}" >{{ opt.label }}</el-radio > - </div> + </div> --> <!-- 多选框 --> <template v-if="item.type === 'checkbox'"> diff --git a/src/views/qualitycontrol-report/index.vue b/src/views/qualitycontrol-report/index.vue index 66af533177a2d055ac7f6c05b09f32febd8a96a0..b61e88ef0d65cedcfd0147f8e07f3ce4cebc0e18 100644 --- a/src/views/qualitycontrol-report/index.vue +++ b/src/views/qualitycontrol-report/index.vue @@ -40,6 +40,7 @@ :data="tableData" border :show-summary="showSummary" + v-loading="listLoading" class="mt-20" > <el-table-column @@ -106,6 +107,7 @@ export default { ], year: [], showSummary: false, + listLoading: false, } }, computed: { @@ -136,16 +138,18 @@ export default { getNow() { const nowDate = new Date() this.yearBtn = nowDate.getFullYear() - for (let i = 2023; i <= this.yearBtn; i++) { + for (let i = 2018; i <= this.yearBtn; i++) { this.yearList.push(i) } }, async getQuality() { + this.listLoading = true let res // console.log(this.curRole) switch (this.curRole) { case "admin": res = await adminQuality({ year: this.yearBtn }) + this.listLoading = false let { overall } = res.data this.allData = res.data this.totalData = overall @@ -155,12 +159,14 @@ export default { case "auditer": res = await checkerQuality({ year: this.yearBtn }) + this.listLoading = false this.allData = res.data this.totalData = res.data.overall this.showSummary = false this.handleClick() break default: + this.listLoading = false break } }, diff --git a/src/views/screening/ScreeningAdd.vue b/src/views/screening/ScreeningAdd.vue index cd68700963caeafb3795d6140b4818798dd47c1d..f51aebb848ef7729766dfac2b62083bc3873ba92 100644 --- a/src/views/screening/ScreeningAdd.vue +++ b/src/views/screening/ScreeningAdd.vue @@ -26,6 +26,7 @@ export default { if (v.activeName == "index0") { let data = { birthday: v.form.birthday, + sex: v.form.sex, } sessionStorage.setItem("index1Data", JSON.stringify(data)) } diff --git a/src/views/screening/components/ConfigForms.vue b/src/views/screening/components/ConfigForms.vue index 5fb86cbf4a041a25948265f65ba4cf6e6d3368cc..240c6f77ede3fabee7314f9530cc5ffcc0179dc5 100644 --- a/src/views/screening/components/ConfigForms.vue +++ b/src/views/screening/components/ConfigForms.vue @@ -242,7 +242,7 @@ export default { this.$nextTick(() => { let index1Data = sessionStorage.getItem("index1Data") if (index1Data) { - let { birthday } = JSON.parse(index1Data) + let { birthday, sex } = JSON.parse(index1Data) let date = new Date(String(birthday).replace(/-/g, "/")) let d = new Date() let age = @@ -256,6 +256,7 @@ export default { this.formInitial = { birthday, age, + sex, } } }) diff --git a/src/views/screening/index.vue b/src/views/screening/index.vue index e1adce8b69765e31c9400b782e1d74e27fcbb670..81f32bbf75a070806980498fb762ca4ebaf4227e 100644 --- a/src/views/screening/index.vue +++ b/src/views/screening/index.vue @@ -43,7 +43,7 @@ <script> import paginationMixin from "@/components/TabComponents/mixin" -import { getPatientPage } from "@/api/patient.js" +import { getPatientPage, deletePatient } from "@/api/patient.js" import ConfigForms from "./components/ConfigForms.vue" import { mapGetters } from "vuex" export default { @@ -270,6 +270,18 @@ export default { } }, }, + { + func: this.deletePatient, + formatter(row) { + return { + label: "åˆ é™¤", + type: "text", + } + }, + style: { + color: "#FA6400", + }, + }, ], }, ], @@ -302,7 +314,28 @@ export default { checkStatus === 2 ? "驳回修改" : checkStatus === 4 ? "ä¸åˆæ ¼" : "" this.note = status ? status + ":" + checkNote : "" }, - + deletePatient(row) { + this.$confirm(`是å¦åˆ 除ã€${row.name}】?`, "æç¤º", { + confirmButtonText: "确定", + cancelButtonText: "å–æ¶ˆ", + type: "warning", + }) + .then(() => { + deletePatient(row.patientId).then((res) => { + if (res.code === 1) { + this.$message({ + type: "success", + message: "åˆ é™¤æˆåŠŸ!", + }) + if (this.tableData.length == 1 && this.pageIndex != 1) { + this.pageIndex-- + } + this.handleSearch() + } + }) + }) + .catch(() => {}) + }, sortChange({ prop, order }) { const sort = order ? (order === "ascending" ? "asc" : "desc") : "" const sortField = order ? prop : ""