From 7df45d67030c1236f77da27fdcfdd47030769161 Mon Sep 17 00:00:00 2001 From: qsh <> Date: Thu, 21 Aug 2025 11:04:43 +0800 Subject: [PATCH] sc --- .env.base | 4 +- src/components/DictTag/src/DictTag.vue | 4 +- .../Form/src/components/useRenderRadio.tsx | 2 +- src/components/Search/src/Search.vue | 2 +- src/views/Clue/Order/Comp/MallOrderList.vue | 211 +++++++++--------- src/views/Clue/Pool/Comp/DialogSuccess.vue | 12 +- src/views/Clue/Pool/index.vue | 2 +- src/views/OKR/Meeting/index.vue | 1 + 8 files changed, 120 insertions(+), 118 deletions(-) diff --git a/.env.base b/.env.base index 1c695ec..a8c77b2 100644 --- a/.env.base +++ b/.env.base @@ -4,8 +4,8 @@ VITE_NODE_ENV=development VITE_DEV=true # 请求路径 -# VITE_BASE_URL='http://47.98.161.246:48080' -VITE_BASE_URL='http://114.215.207.150:48080' +VITE_BASE_URL='http://47.98.161.246:48080' +# VITE_BASE_URL='http://114.215.207.150:48080' # 高德地图key密钥 # 1寻驾 diff --git a/src/components/DictTag/src/DictTag.vue b/src/components/DictTag/src/DictTag.vue index db37f71..606229f 100644 --- a/src/components/DictTag/src/DictTag.vue +++ b/src/components/DictTag/src/DictTag.vue @@ -8,7 +8,7 @@ export default defineComponent({ name: 'DictTag', props: { type: { - type: String as PropType, + type: String, required: true }, value: { @@ -42,7 +42,7 @@ export default defineComponent({ return ( { return item?.options?.map((option) => { const { ...other } = option return ( - + {option[labelAlias || 'label']} ) diff --git a/src/components/Search/src/Search.vue b/src/components/Search/src/Search.vue index 084982e..aabf5e0 100644 --- a/src/components/Search/src/Search.vue +++ b/src/components/Search/src/Search.vue @@ -183,7 +183,7 @@ initSearch() virtual-triggering > - + {{ item.label }} diff --git a/src/views/Clue/Order/Comp/MallOrderList.vue b/src/views/Clue/Order/Comp/MallOrderList.vue index 85ad1b1..75460d8 100644 --- a/src/views/Clue/Order/Comp/MallOrderList.vue +++ b/src/views/Clue/Order/Comp/MallOrderList.vue @@ -78,20 +78,62 @@ @@ -184,7 +226,7 @@ - + @@ -277,8 +278,8 @@ import DialogAddProduct from './DialogAddProduct.vue' import { removeNullField } from '@/utils' import { formatDate } from '@/utils/formatTime' import { ElMessageBox, ElOption, ElSelect } from 'element-plus' -import { VueDraggable } from 'vue-draggable-plus' -import { checkPermi } from '@/utils/permission' +// import { VueDraggable } from 'vue-draggable-plus' +// import { checkPermi } from '@/utils/permission' const userOptions = ref([]) const allUserOptions = ref([]) @@ -421,14 +422,14 @@ async function getOptions() { getCurdSchemas() } const deliveryDialog = ref() -function handleDelivery(row) { - deliveryDialog.value.open(row) -} +// function handleDelivery(row) { +// deliveryDialog.value.open(row) +// } -const addProductDialog = ref() -function handleAddProduct(row) { - addProductDialog.value.open(row.signId, prodOptions.value) -} +// const addProductDialog = ref() +// function handleAddProduct(row) { +// addProductDialog.value.open(row.signId, prodOptions.value) +// } const batchIds = ref([]) function handleSelectionChange(val) { @@ -486,51 +487,51 @@ function handleBatchUpdateInstall() { } } -async function handleRemoveProduct(row) { - try { - // 修改状态的二次确认 - await message.confirm(`确认要删除${row.productName}吗?`) - // 发起修改状态 - await SignApi.removeOrderProduct(row.id) - message.success('删除成功') - // 刷新列表 - getTableList() - } catch {} -} +// async function handleRemoveProduct(row) { +// try { +// // 修改状态的二次确认 +// await message.confirm(`确认要删除${row.productName}吗?`) +// // 发起修改状态 +// await SignApi.removeOrderProduct(row.id) +// message.success('删除成功') +// // 刷新列表 +// getTableList() +// } catch {} +// } -async function handleChangeProdoce(row) { - try { - // 修改状态的二次确认 - await message.confirm('确认要修改生产状态吗?') - // 发起修改状态 - await SignApi.updateProduceStatus({ - signId: row.signId, - id: row.id, - isProduced: row.isProduced - }) - message.success('修改成功') - // 刷新列表 - // getTableList() - } catch { - // 取消后，进行恢复按钮 - row.isProduced = !row.isProduced - } -} +// async function handleChangeProdoce(row) { +// try { +// // 修改状态的二次确认 +// await message.confirm('确认要修改生产状态吗?') +// // 发起修改状态 +// await SignApi.updateProduceStatus({ +// signId: row.signId, +// id: row.id, +// isProduced: row.isProduced +// }) +// message.success('修改成功') +// // 刷新列表 +// // getTableList() +// } catch { +// // 取消后，进行恢复按钮 +// row.isProduced = !row.isProduced +// } +// } -const expendRows = ref([]) -async function onDragEnd(ev) { - try { - expendRows.value = [ev.data.signId] - const list = tableObject.value.tableList.find((it) => it.signId == ev.data.signId).signProducts - await SignApi.updateProduceSort(list.map((it) => it.id)) - message.success('修改成功') - // 刷新列表 - getTableList() - } catch (error) { - console.log(error) - getTableList() - } -} +// const expendRows = ref([]) +// async function onDragEnd(ev) { +// try { +// expendRows.value = [ev.data.signId] +// const list = tableObject.value.tableList.find((it) => it.signId == ev.data.signId).signProducts +// await SignApi.updateProduceSort(list.map((it) => it.id)) +// message.success('修改成功') +// // 刷新列表 +// getTableList() +// } catch (error) { +// console.log(error) +// getTableList() +// } +// } diff --git a/src/views/Clue/Pool/Comp/DialogSuccess.vue b/src/views/Clue/Pool/Comp/DialogSuccess.vue index cf7acf5..eeffaf7 100644 --- a/src/views/Clue/Pool/Comp/DialogSuccess.vue +++ b/src/views/Clue/Pool/Comp/DialogSuccess.vue @@ -1,5 +1,5 @@