diff --git a/src/views/Home/index.vue b/src/views/Home/index.vue
index 4ac54a6ad34667c62e9650eb88aece407a75cb25..107dfa932a437494cbff39d38595a13453ecf7ce 100644
--- a/src/views/Home/index.vue
+++ b/src/views/Home/index.vue
@@ -322,6 +322,7 @@ export default {
size: 10,
current: 1,
moduleType: moduleType,
+ status: 1,
}
articleList(params)
.then((res) => {
diff --git a/src/views/audit-qualitycontrol/index.vue b/src/views/audit-qualitycontrol/index.vue
index 214412538767a98c5eee1139b952dead1d32b103..c890677a3566cd3c2bfe43266c28cc88be58dfa7 100644
--- a/src/views/audit-qualitycontrol/index.vue
+++ b/src/views/audit-qualitycontrol/index.vue
@@ -148,7 +148,13 @@ export default {
{
label: "风险评估",
minWidth: 120,
- value: "checkNums",
+ value: "riskRank",
+ formatter: (row) => {
+ return this.$handle.formatDicList(
+ this.dictMap["risk_level"],
+ String(row.riskRank)
+ )
+ },
},
{
label: "审核状态",
@@ -190,6 +196,9 @@ export default {
return this.auditStatus == "1" ? checkColumns : unCkeckColumns
},
},
+ created() {
+ console.log(this.dictMap)
+ },
mounted() {
if (
sessionStorage.getItem("audit-status") ||
@@ -216,8 +225,8 @@ export default {
this.$router.push({
path: "/followaudit",
query: {
- unionId: data['unionId'],
- unionName:data['unionName']
+ unionId: data["unionId"],
+ unionName: data["unionName"],
},
})
} else {
diff --git a/src/views/followupquery/index.vue b/src/views/followupquery/index.vue
index 6976a142cebbeae92df2f766490b0a4bc0a027dd..be7f94465334b8bda9a1561679b67903d37215e2 100644
--- a/src/views/followupquery/index.vue
+++ b/src/views/followupquery/index.vue
@@ -3,6 +3,7 @@
{
- return row.createTime ? row.createTime : "--"
+ return row.screeningTime ? row.screeningTime : "--"
},
},
{
@@ -237,7 +238,7 @@ export default {
},
btnText: "查询",
func: () => {
- this.onSearch()
+ this.onClickSearch()
},
},
// {
@@ -321,16 +322,22 @@ export default {
})
},
onSearch(form) {
+ console.log(form)
sessionStorage.setItem("followQuery-form", JSON.stringify(form))
this.formEdit = form
+ // this.handleSearch()
+ },
+ onClickSearch() {
this.handleSearch()
},
async handleSearch() {
this.listLoading = true
+ console.log(this.$refs.form.form)
let params = {
pageSize: this.pageSize,
pageNum: this.pageIndex,
formId: this.formId,
+ ...this.$refs.form.form,
patientFrom: sessionStorage.getItem("selectedIndex"), //筛查场景
}
if (this.formEdit) {
diff --git a/src/views/followupresearch/index.vue b/src/views/followupresearch/index.vue
index 0240872492ac0e713d2fcdfc67beea0e7eb79449..095d932f5e6c6627f52a7b66afd5d065d1d7bf11 100644
--- a/src/views/followupresearch/index.vue
+++ b/src/views/followupresearch/index.vue
@@ -261,7 +261,7 @@ export default {
},
watch: {},
created() {
- // this.initColumn()
+ this.initSearchForm()
},
mounted() {
this.handleSearch() //调试注释
diff --git a/src/views/screening/components/FormTab.vue b/src/views/screening/components/FormTab.vue
index 72925eba4a92daf782fdc6215bdea589f18e9fd2..34b4e45dbb4a650a55c2766e01f1a12c4ca97410 100644
--- a/src/views/screening/components/FormTab.vue
+++ b/src/views/screening/components/FormTab.vue
@@ -198,9 +198,9 @@ export default {
data[key] = data[key] + ""
}
}
- data.follow_contents = JSON.parse(
- data.follow_contents.replace(/"\"/g, "")
- )
+ // data.follow_contents = JSON.parse(
+ // data.follow_contents.replace(/"\"/g, "")
+ // )
this.formData.formEdit = data
}
this.initForm() //! 随防筛查通用的设置form
@@ -269,7 +269,7 @@ export default {
data,
formId: this.form.formId, // 每个大表单的id
patientId: this.patientId || this.patientStandbyId,
- // formRecordId: this.formData.formRecordId || this.newformRecordId, // 是否为编辑的表单id
+ formRecordId: this.formData.formRecordId || this.newformRecordId, // 是否为编辑的表单id
statusMap: {
patient_from: this.$store.getters["table/selectedIndex"],
is_draft: 1, //是否为草稿
@@ -292,7 +292,7 @@ export default {
data,
formId: this.form.formId, // 每个大表单的id
patientId: this.patientId || this.patientStandbyId,
- // formRecordId: this.formData.formRecordId || this.newformRecordId, // 是否为编辑的表单id
+ formRecordId: this.formData.formRecordId || this.newformRecordId, // 是否为编辑的表单id
statusMap: {
patient_from: this.$store.getters["table/selectedIndex"],
is_draft: this.activeName == "index5" ? 0 : 1, //是否为草稿