diff --git a/src/views/distribution/artery/abnormalList.vue b/src/views/distribution/artery/abnormalList.vue index 13dc46a8..50141e1a 100644 --- a/src/views/distribution/artery/abnormalList.vue +++ b/src/views/distribution/artery/abnormalList.vue @@ -136,7 +136,6 @@ { if (code !== 200) return; details.data = data.records; - const valueArr = details.columnList.filter(val => val.type === 3); - - for (let i = 0; i < details.data.length; i++) { - const value = details.data[i]; - - for (let index = 0; index < valueArr.length; index++) { - const item = valueArr[index]; - const label = item.prop.replace('Name', ''); - value[item.prop] = - (item.checkarr.find(val => Number(val.value) === Number(value[label])) || {}).label || - value[label]; - } - } + handleTranslationDataSeclect(details.data, details.columnList); details.page.total = data.total; } catch (error) { @@ -349,7 +339,7 @@ const searchHide = () => { /** 表格表头输入框搜索 */ const inputsc = (index, row) => { - details.query[row.prop] = index; + handleInputQuery(index, row, details.query); onLoad(details.page); }; @@ -368,12 +358,7 @@ const timesc = (index, row) => { /** 表格表头下拉框选择 */ const selectsc = (index, row) => { - details.query[row.prop] = index; - if (!index && index !== 0) delete details.query[row.prop]; - if (row.prop === 'certificateTypeName') { - details.query['certificateType'] = index; - if (!index) delete details.query['certificateType']; - } + handleSelectQuery(index, row, details.query); onLoad(details.page); }; @@ -394,24 +379,6 @@ const currentChange = current => { onLoad(); }; -/** - * 设置列表 -- 固定函数 - * 弹窗的勾选回调,用于更改头部数组 - * 固定搭配,只需要更换 columnList - * */ -const setnewcolum = (newarr, headarr, type) => { - if (type == 1) { - details.columnList = newarr; - functions.setStorage(window.location.pathname + 'checkList', headarr); - } else if (type == 2) { - details.columnList = newarr; - functions.setStorage(window.location.pathname + 'flexList', headarr); - } else if (type == 3) { - details.columnList = newarr; - functions.setStorage(window.location.pathname + 'sortlist', headarr); - } -}; - /** 弹出层开启前清除数据 */ const beforeClose = done => { done(); diff --git a/src/views/wel/index1.vue b/src/views/wel/index1.vue index ab6bd1e0..50ecea74 100644 --- a/src/views/wel/index1.vue +++ b/src/views/wel/index1.vue @@ -769,11 +769,7 @@
- {{ - signforData.clerkOverTimeScale - ? Number(signforData.clerkOverTimeScale * 100).toFixed(2) - : 0 - }} + {{ signforData.clerkOverTimeScale || 0 }}
%
@@ -906,9 +902,7 @@
- {{ - billSignforData.signScale ? Number(billSignforData.signScale * 100).toFixed(2) : 0 - }} + {{ billSignforData.signScale || 0 }}
%
@@ -930,11 +924,7 @@
- {{ - billSignforData.clerkSignforScale - ? Number(billSignforData.clerkSignforScale * 100).toFixed(2) - : 0 - }} + {{ billSignforData.clerkSignforScale || 0 }}
%
@@ -956,11 +946,7 @@
- {{ - billSignforData.clerkOverTimeScale - ? Number(billSignforData.clerkOverTimeScale * 100).toFixed(2) - : 0 - }} + {{ billSignforData.clerkOverTimeScale || 0 }}
%
@@ -1349,6 +1335,8 @@ const billSignforData = computed(() => { 2 ); + console.log('_obj :>> ', _obj); + return _obj; });