diff --git a/src/store/modules/dict.js b/src/store/modules/dict.js
index e32291b..7baa5f9 100644
--- a/src/store/modules/dict.js
+++ b/src/store/modules/dict.js
@@ -32,6 +32,7 @@ const actions = {
newDictSet.push(v.type)
}
})
+ console.log('执行getDictData', commit, state)
commit("setDictSet", latestDict)
newDictSet = Object.keys(dictMap).length === 0 ? latestDictSet : newDictSet
// 存在新增加的字典
@@ -56,10 +57,12 @@ const actions = {
},
// 更新字典分类
async updateDictType({ commit, state }, data) {
+ console.log('执行updateDictType')
commit("setDictSet", data)
},
// 更新字典详情
async updateDictDetail({ commit, state }, { type, data }) {
+ console.log('执行updateDictDetail')
const dictMap = state.dictMap
if (type) {
const list = data.map((item) => {
diff --git a/src/styles/vab.scss b/src/styles/vab.scss
index 58f0ca8..a4ff921 100644
--- a/src/styles/vab.scss
+++ b/src/styles/vab.scss
@@ -213,7 +213,19 @@ html {
text-align: center;
white-space: nowrap;
}
-
+ .is-background{
+ button,.el-pager li{
+ border-radius: 6px !important;
+ }
+ button,.el-pager li:not(.active){
+ border: 1px solid #D9D9D9;
+ background: transparent !important;
+ }
+ .el-input__inner{
+ border-radius: 6px !important;
+ }
+ }
+
/* 分页结束 */
/* 菜单开始 */
diff --git a/src/utils/index.js b/src/utils/index.js
index 8b55a18..c7f7c1c 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -153,7 +153,7 @@ export function getInfoByIdCard(idCard, type = "birthDate") {
d.getFullYear() -
birthdays.getFullYear() -
(d.getMonth() < birthdays.getMonth() ||
- (d.getMonth() == birthdays.getMonth() && d.getDate() < birthdays.getDate())
+ (d.getMonth() == birthdays.getMonth() && d.getDate() < birthdays.getDate())
? 1
: 0)
@@ -182,12 +182,12 @@ export function paramObj(url) {
}
return JSON.parse(
'{"' +
- decodeURIComponent(search)
- .replace(/"/g, '\\"')
- .replace(/&/g, '","')
- .replace(/=/g, '":"')
- .replace(/\+/g, " ") +
- '"}'
+ decodeURIComponent(search)
+ .replace(/"/g, '\\"')
+ .replace(/&/g, '","')
+ .replace(/=/g, '":"')
+ .replace(/\+/g, " ") +
+ '"}'
)
}
@@ -471,7 +471,7 @@ export function formatDicList(list, value, connector = ",") {
if (!list) return ""
if (list.constructor !== Array) return ""
// if (!value && value != 0) return ""
- let result = ""
+ let result = "--"
let multiple = Array.isArray(value) ? true : false
if (multiple) {
const resultList = []
@@ -489,6 +489,7 @@ export function formatDicList(list, value, connector = ",") {
}
})
}
+ console.log('字典', list, value, result)
return result
}
/**
@@ -522,7 +523,7 @@ export function changeTime(time) {
let seconds = Math.floor(time % 60) //秒
return `${day ? day + "天" : ""} ${hours ? hours + "小时" : ""}${
minutes ? minutes + "分" : ""
- }${seconds}秒`
+ }${seconds}秒`
}
export default { formatDicList, excelExport }
diff --git a/src/views/audit-detail/index.vue b/src/views/audit-detail/index.vue
index 08d28a7..2e93ec7 100644
--- a/src/views/audit-detail/index.vue
+++ b/src/views/audit-detail/index.vue
@@ -97,7 +97,7 @@
diff --git a/src/views/audit-qualitycontrol/index.vue b/src/views/audit-qualitycontrol/index.vue
index 9c0624e..8d64d70 100644
--- a/src/views/audit-qualitycontrol/index.vue
+++ b/src/views/audit-qualitycontrol/index.vue
@@ -18,7 +18,7 @@
-
import publicDialog from "./components/publicDialog.vue"
import followReview from "./components/followReview.vue"
+import { getFollowUnCheckDetail } from "@/api/followup"
export default {
components: { publicDialog, followReview },
data() {
@@ -127,7 +128,14 @@ export default {
}
},
watch: {},
- mounted() {},
+ mounted() {
+ this.getDetail()
+ },
+ computed:{
+ unionId(){
+ return this.$route.query.id
+ }
+ },
methods: {
showDialog(val) {
this.curBtn = val
@@ -192,6 +200,17 @@ export default {
nextExample() {
this.onCancel()
},
+ async getDetail(){
+ this.loading = true
+ let res = await getFollowUnCheckDetail(this.unionId)
+ if(res.code==1){
+ //分页内容
+ // const d = res.data
+ // this.total= d.total
+ // this.tableData=d['records']
+ }
+ this.loading = false
+ },
},
}
diff --git a/src/views/followupresearch/index.vue b/src/views/followupresearch/index.vue
index c6dfcd3..45ffb40 100644
--- a/src/views/followupresearch/index.vue
+++ b/src/views/followupresearch/index.vue
@@ -5,7 +5,7 @@
- {
+ return row.unionName ? row.unionName : "--"
+ },
},
{
label: "姓名",
- value: "name",
minWidth: 120,
+ formatter: (row) => {
+ return row.name ? row.name : "--"
+ },
+ value: "name",
},
{
label: "性别",
+ minWidth: 80,
value: "sex",
- minWidth: 120,
formatter: (row) => {
- return this.$handle.formatDicList(
- this.dictMap["d-sex"],
- String(row.sex)
- )
+ return this.$handle.formatDicList(this.dictMap["d-sex"], row.sex + "")
},
},
{
label: "身份证",
- value: "idCard",
minWidth: 120,
+ value: "idCard",
+ formatter: (row) => {
+ return row.idCard ? row.idCard : "--"
+ },
},
{
label: "年龄",
- value:"age",
minWidth: 120,
+ value: "age",
+ formatter: (row) => {
+ return row.age ? row.age : "--"
+ },
},
{
label: "筛查时间",
+ minWidth: 180,
value: "screeningTime",
- minWidth: 120,
+ formatter: (row) => {
+ return row.createTime ? row.createTime : "--"
+ },
},
{
label: "风险评估结果",
+ minWidth: 120,
value: "riskRank",
- trans:'risk_level',
- transList:{
+ formatter: (row) => {
+ return this.$handle.formatDicList(this.dictMap["risk_level"],String(row.riskRank))
},
- minWidth: 120,
},
{
label: "上次随访时间",
value: "followTime",
minWidth: 120,
+ formatter: (row) => {
+ return row.followTime ? row.followTime : "--"
+ },
},
{
label: "随访进度",
value: "followBatch",
- trans:'follow_type',
- transList:{
- },
minWidth: 120,
+ formatter: (row) => {
+ return this.$handle.formatDicList(this.dictMap["follow_type"],String(row.followBatch))
+ },
},
{
label: "计划随访时间",
value: "nextFollowTime",
- trans:'next_follow_time',
+ formatter: (row) => {
+ return this.$handle.formatDicList(this.dictMap["next_follow_time"],String(row.nextFollowTime))
+ },
minWidth: 120,
},
{
@@ -143,7 +160,8 @@ export default {
"formRecordId": "", //表单记录id
"linkPhone": "0556-5556666", //联系方式
"isContinueFollow": 1, //是否继续随访
- "checkStatus": "" //审核状态
+ "checkStatus": "", //审核状态
+ "riskRank":"medium"
},
{
name:'11',
@@ -284,7 +302,7 @@ export default {
}
},
created(){
- this.initColumn()
+ // this.initColumn()
},
mounted() {
this.formEdit = JSON.parse(sessionStorage.getItem('followResearch-form')) ||{}
@@ -333,41 +351,41 @@ export default {
}
this.listLoading = false
},
- initColumn(){
- this.columns.forEach((item,index) => {
- if(item.trans){
- this.initDict(item.trans,index)
- }
- })
- },
- async initDict(type,index){
- let params={
- type:type
- }
- const res = await getDictDetail(params)
- let item = this.formList.find(_ => _.trans == type)
- res.data.forEach((itemD,inx) => {
- // if(!this.columns[index]['transList']){
- // this.columns[index]['transList']={}
- // }
- // else{
- // this.columns[index]['transList'][itemD.code]=itemD.name
- // }
- if(item){
- if(!item['opts']){
- item['opts']=[]
- }
- else {
- item['opts']=res.data.map((_) => {
- return {
- label: _.name,
- value: _.code,
- }
- })
- }
- }
- })
- }
+ // initColumn(){
+ // this.columns.forEach((item,index) => {
+ // if(item.trans){
+ // this.initDict(item.trans,index)
+ // }
+ // })
+ // },
+ // async initDict(type,index){
+ // let params={
+ // type:type
+ // }
+ // const res = await getDictDetail(params)
+ // let item = this.formList.find(_ => _.trans == type)
+ // res.data.forEach((itemD,inx) => {
+ // // if(!this.columns[index]['transList']){
+ // // this.columns[index]['transList']={}
+ // // }
+ // // else{
+ // // this.columns[index]['transList'][itemD.code]=itemD.name
+ // // }
+ // if(item){
+ // if(!item['opts']){
+ // item['opts']=[]
+ // }
+ // else {
+ // item['opts']=res.data.map((_) => {
+ // return {
+ // label: _.name,
+ // value: _.code,
+ // }
+ // })
+ // }
+ // }
+ // })
+ // }
},
}
--
2.22.0