diff --git a/src/views/project-management/implementation/account.vue b/src/views/project-management/implementation/account.vue index 329d91f..486f4d2 100644 --- a/src/views/project-management/implementation/account.vue +++ b/src/views/project-management/implementation/account.vue @@ -94,7 +94,6 @@ const schema = computed(() => { const baseForm = ref() const tableIns = ref() const btns = ref([ - {name: '表格更新', key: 'update', color: '#DED0B2', auth: ''}, {name: '导出', key: 'export', color: '#DED0B2', auth: ''} ]) const searchConfig = reactive([ @@ -221,10 +220,7 @@ const tableConfig = reactive({ }, btns: btns.value }) -if (route.query.state !== '4') { - btns.value.push({name: '上传费用', key: 'add', color: '#DED0B2', auth: ''}) -} -const exportIds=ref([]) + // const exportIds=ref([]) const selectionChange=(data)=>{ console.log('data',data) console.log(' data.forEach(item=>item.id)', data.forEach(item=>item.id)) @@ -248,6 +244,9 @@ const init = async () => { const {code, msg, data} = await searchUpdateLedgerData(route.query.id) if (code===1000) { tableData.value = data + if(!data.view){ + btns.value.push({name: '上传费用', key: 'add', color: '#DED0B2', auth: ''},{name: '表格更新', key: 'update', color: '#DED0B2', auth: ''},) + } baseForm.value.setValues(data) } // if (code !== 1000) { @@ -283,7 +282,7 @@ const handleUploadFee = () => { } const exportExcelHandler = () => { - console.log('exportIds.value',exportIds.value) + // console.log('exportIds.value',exportIds.value) let data = { projectId: route.query.id } diff --git a/src/views/project-management/implementation/index.vue b/src/views/project-management/implementation/index.vue index 6cd8b94..7761882 100644 --- a/src/views/project-management/implementation/index.vue +++ b/src/views/project-management/implementation/index.vue @@ -347,8 +347,7 @@ const handleStandingBook = (row) => { router.push({ name: 'Implementation/account', query: { - id: row.projectId, - state:row.state + id: row.projectId } }) } diff --git a/src/views/tool/dict/index.vue b/src/views/tool/dict/index.vue index 1cd19d2..a2075a2 100644 --- a/src/views/tool/dict/index.vue +++ b/src/views/tool/dict/index.vue @@ -13,10 +13,10 @@ @click.stop="handleDeleteType" :disabled="disabledDelete" plain>删除 - + + clearable @clear="getTreeList" title="请按回车或enter键进行搜索!">
diff --git a/src/views/workflow/process/common/UserPicker.vue b/src/views/workflow/process/common/UserPicker.vue index d168e91..54679e5 100644 --- a/src/views/workflow/process/common/UserPicker.vue +++ b/src/views/workflow/process/common/UserPicker.vue @@ -72,7 +72,7 @@