Commit fbd99dc5 authored by miaojiale's avatar miaojiale

修改部分bug

parent 9ebbbe83
......@@ -322,6 +322,7 @@ export default {
size: 10,
current: 1,
moduleType: moduleType,
status: 1,
}
articleList(params)
.then((res) => {
......
......@@ -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 {
......
......@@ -3,6 +3,7 @@
<div class="screeningSearch">
<div class="top">
<form-components
ref="form"
:forms="formList"
:form-edit="formEdit"
@handleSearch="onSearch"
......@@ -93,7 +94,7 @@ export default {
minWidth: 180,
value: "screeningTime",
formatter: (row) => {
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) {
......
......@@ -261,7 +261,7 @@ export default {
},
watch: {},
created() {
// this.initColumn()
this.initSearchForm()
},
mounted() {
this.handleSearch() //调试注释
......
......@@ -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, //是否为草稿
......
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