diff --git a/src/components/AttachmentUpload.vue b/src/components/AttachmentUpload.vue index 70bb806..6d4f122 100644 --- a/src/components/AttachmentUpload.vue +++ b/src/components/AttachmentUpload.vue @@ -344,7 +344,7 @@ const deleteSingleFile = (row, type) => { if (type === 1) { singleFile.value = null } else { - props.otherFileList.splice(props.otherFileList.findIndex((item) => item.id === row.fileId), 1); + props.otherFileList.splice(props.otherFileList.findIndex((item) => item.fileId === row.fileId), 1); } } }); diff --git a/src/components/DetailComponent/CompanyPicker.vue b/src/components/DetailComponent/CompanyPicker.vue index 03f8bed..ca11713 100644 --- a/src/components/DetailComponent/CompanyPicker.vue +++ b/src/components/DetailComponent/CompanyPicker.vue @@ -1,7 +1,6 @@ - @@ -68,10 +66,10 @@ const checkOptions = ref([ label: isExpand.value, value: '1' }, - { - label: '父子联动', - value: '2' - }, + // { + // label: '父子联动', + // value: '2' + // }, ]) const props = defineProps({ value: { @@ -107,13 +105,13 @@ const defaultProps = { children: "children", disabled: "disabled", }; -const emit = defineEmits(); +const emit = defineEmits(['update:modelValue']) const _value = computed({ get() { return props.value; }, - set(val) { - emit("input", val); + set(value) { + emit('update:modelValue', value) } }); @@ -157,14 +155,8 @@ const filterNode = (value, data) => { const show = () => { //用于弹开部门选择 visible.value = true; - // console.log('_value.value', _value.value, selectList.value) - // if(selectList.value.length==0){ - // selectList.value=[] - // defaultChecked.value =[] - // }else { selectList.value = _value.value defaultChecked.value = _value.value.map(item => item.value) - // } getList() }; diff --git a/src/components/DetailComponent/FileComponent.vue b/src/components/DetailComponent/FileComponent.vue index cb8d671..04299b3 100644 --- a/src/components/DetailComponent/FileComponent.vue +++ b/src/components/DetailComponent/FileComponent.vue @@ -152,7 +152,7 @@ const handleDelete = (row) => { type: res.code === 1000 ? 'success' : 'error' }) if (res.code === 1000) { - _value.value.splice(_value.value.findIndex((item) => item.id === row.fileId), 1); + _value.value.splice(_value.value.findIndex((item) => item.fileId === row.fileId), 1); } }); } diff --git a/src/components/DetailComponent/SummaryDetail.vue b/src/components/DetailComponent/SummaryDetail.vue index ec1368a..99ba5bc 100644 --- a/src/components/DetailComponent/SummaryDetail.vue +++ b/src/components/DetailComponent/SummaryDetail.vue @@ -181,7 +181,7 @@ -
+
驳回年度计划 通过年度计划
@@ -272,6 +272,9 @@ const handleRejectPlan = async () => { type: res.code === 1000 ? 'success' : 'error' }) tagsViewStore.delVisitedViews(router.currentRoute.value.path) + router.push({ + name: 'Summary' + }) } const handleAgreePlan = async () => { const params = { @@ -287,13 +290,16 @@ const handleAgreePlan = async () => { type: res.code === 1000 ? 'success' : 'error' }) tagsViewStore.delVisitedViews(router.currentRoute.value.path) + router.push({ + name: 'Summary' + }) } const filterDict = (data, value) => { if (data === undefined || value === undefined) return; let label = '' let result = [] - if (JSON.parse(value) instanceof Array) { - JSON.parse(value).forEach(item1 => { + if (value instanceof Array) { + value.forEach(item1 => { data.find(item => { if (item.value == item1) { result.push(item.label) diff --git a/src/components/SearchFilesByTag.vue b/src/components/SearchFilesByTag.vue index f605219..bb8a55a 100644 --- a/src/components/SearchFilesByTag.vue +++ b/src/components/SearchFilesByTag.vue @@ -126,7 +126,7 @@ const handleSearch = () => { } const handleReset=()=>{ attachment.fileName='' - attachment.tag='' + attachment.tag=null emit('search', {}) } const handleUpload = () => { diff --git a/src/components/steps/index.vue b/src/components/steps/index.vue index 5057855..e1c8bae 100644 --- a/src/components/steps/index.vue +++ b/src/components/steps/index.vue @@ -323,9 +323,9 @@ watchEffect(() => { cursor: not-allowed; } .is-active { - color: #BEA266; -} -.is-end { color: #67c23a; } +.is-end { + color: #BEA266; +} diff --git a/src/layout/navbar/Hamburger.vue b/src/layout/navbar/Hamburger.vue index 2b516d7..1cade5c 100644 --- a/src/layout/navbar/Hamburger.vue +++ b/src/layout/navbar/Hamburger.vue @@ -1,4 +1,5 @@