src/layout/components/Settings/index.vue
@@ -1,66 +1,66 @@ <template> <el-drawer v-model="showSettings" direction="rtl" size="300px"> <div class="setting-drawer-title"> <h3 class="drawer-title">主题风格设置</h3> </div> <div class="setting-drawer-block-checbox"> <div class="setting-drawer-block-checbox-item" @click="handleTheme('theme-dark')" > <img src="@/assets/images/dark.svg" alt="dark" /> <div v-if="sideTheme === 'theme-dark'" class="setting-drawer-block-checbox-selectIcon" style="display: block" > <i aria-label="图标: check" class="anticon anticon-check"> <svg viewBox="64 64 896 896" data-icon="check" width="1em" height="1em" :fill="theme" aria-hidden="true" focusable="false" class > <path d="M912 190h-69.9c-9.8 0-19.1 4.5-25.1 12.2L404.7 724.5 207 474a32 32 0 0 0-25.1-12.2H112c-6.7 0-10.4 7.7-6.3 12.9l273.9 347c12.8 16.2 37.4 16.2 50.3 0l488.4-618.9c4.1-5.1.4-12.8-6.3-12.8z" /> </svg> </i> </div> </div> <div class="setting-drawer-block-checbox-item" @click="handleTheme('theme-light')" > <img src="@/assets/images/light.svg" alt="light" /> <div v-if="sideTheme === 'theme-light'" class="setting-drawer-block-checbox-selectIcon" style="display: block" > <i aria-label="图标: check" class="anticon anticon-check"> <svg viewBox="64 64 896 896" data-icon="check" width="1em" height="1em" :fill="theme" aria-hidden="true" focusable="false" class > <path d="M912 190h-69.9c-9.8 0-19.1 4.5-25.1 12.2L404.7 724.5 207 474a32 32 0 0 0-25.1-12.2H112c-6.7 0-10.4 7.7-6.3 12.9l273.9 347c12.8 16.2 37.4 16.2 50.3 0l488.4-618.9c4.1-5.1.4-12.8-6.3-12.8z" /> </svg> </i> </div> </div> </div> <!-- <div class="setting-drawer-title">--> <!-- <h3 class="drawer-title">主题风格设置</h3>--> <!-- </div>--> <!-- <div class="setting-drawer-block-checbox">--> <!-- <div--> <!-- class="setting-drawer-block-checbox-item"--> <!-- @click="handleTheme('theme-dark')"--> <!-- >--> <!-- <img src="@/assets/images/dark.svg" alt="dark" />--> <!-- <div--> <!-- v-if="sideTheme === 'theme-dark'"--> <!-- class="setting-drawer-block-checbox-selectIcon"--> <!-- style="display: block"--> <!-- >--> <!-- <i aria-label="图标: check" class="anticon anticon-check">--> <!-- <svg--> <!-- viewBox="64 64 896 896"--> <!-- data-icon="check"--> <!-- width="1em"--> <!-- height="1em"--> <!-- :fill="theme"--> <!-- aria-hidden="true"--> <!-- focusable="false"--> <!-- class--> <!-- >--> <!-- <path--> <!-- d="M912 190h-69.9c-9.8 0-19.1 4.5-25.1 12.2L404.7 724.5 207 474a32 32 0 0 0-25.1-12.2H112c-6.7 0-10.4 7.7-6.3 12.9l273.9 347c12.8 16.2 37.4 16.2 50.3 0l488.4-618.9c4.1-5.1.4-12.8-6.3-12.8z"--> <!-- />--> <!-- </svg>--> <!-- </i>--> <!-- </div>--> <!-- </div>--> <!-- <div--> <!-- class="setting-drawer-block-checbox-item"--> <!-- @click="handleTheme('theme-light')"--> <!-- >--> <!-- <img src="@/assets/images/light.svg" alt="light" />--> <!-- <div--> <!-- v-if="sideTheme === 'theme-light'"--> <!-- class="setting-drawer-block-checbox-selectIcon"--> <!-- style="display: block"--> <!-- >--> <!-- <i aria-label="图标: check" class="anticon anticon-check">--> <!-- <svg--> <!-- viewBox="64 64 896 896"--> <!-- data-icon="check"--> <!-- width="1em"--> <!-- height="1em"--> <!-- :fill="theme"--> <!-- aria-hidden="true"--> <!-- focusable="false"--> <!-- class--> <!-- >--> <!-- <path--> <!-- d="M912 190h-69.9c-9.8 0-19.1 4.5-25.1 12.2L404.7 724.5 207 474a32 32 0 0 0-25.1-12.2H112c-6.7 0-10.4 7.7-6.3 12.9l273.9 347c12.8 16.2 37.4 16.2 50.3 0l488.4-618.9c4.1-5.1.4-12.8-6.3-12.8z"--> <!-- />--> <!-- </svg>--> <!-- </i>--> <!-- </div>--> <!-- </div>--> <!-- </div>--> <div class="drawer-item"> <span>主题颜色</span> <span class="comp-style"> @@ -146,7 +146,6 @@ "#81D8D0", "#E85827", "#008C8C", "#002FA7", "#F9DC24", "#B05923", "#003153", src/layout/components/Sidebar/index.vue
@@ -37,7 +37,8 @@ if (settingsStore.isDark) { return 'var(--sidebar-bg)' } return sideTheme.value === 'theme-dark' ? variables.menuBg : variables.menuLightBg // 浅色主题时，直接用主题色 return sideTheme.value === 'theme-dark' ? variables.menuBg : settingsStore.theme }) // 获取菜单文字颜色 src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
@@ -158,7 +158,6 @@ const { form } = toRefs(data); // 节点标题 const getNodeTitle = (index, len) => { if (index === 0) return '发起'; if (index === len - 1) return '结束'; return '审批'; }; src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue
@@ -54,8 +54,7 @@ style="margin-right: 30px; text-align: center; margin-bottom: 10px;" > <div> <span v-if="index === 0">发起</span> <span v-else>审批</span> <span>审批人</span> → </div> <el-select @@ -179,7 +178,6 @@ const openDialog = (type, row) => { operationType.value = type; dialogFormVisible.value = true; currentApproveStatus.value = row.approveStatus userListNoPageByTenantId().then((res) => { userList.value = res.data; }); @@ -194,6 +192,7 @@ // 获取当前用户信息并设置部门ID form.value.approveDeptId = userStore.currentDeptId if (operationType.value === 'edit') { currentApproveStatus.value = row.approveStatus approveProcessGetInfo({id: row.approveId,approveReason: '1'}).then(res => { form.value = {...res.data} // 反显审批人 src/views/collaborativeApproval/approvalProcess/index.vue
@@ -69,6 +69,8 @@ return "审核中"; } else if (params == 2) { return "审核完成"; } else if (params == 4) { return "已重新提交"; } else { return '不通过'; } @@ -78,8 +80,10 @@ return "warning"; } else if (params == 1) { return "primary"; } else if (params == 2) { } else if (params == 2) { return "success"; } else if (params == 4) { return ""; } else { return 'danger'; } @@ -132,7 +136,7 @@ clickFun: (row) => { openForm("edit", row); }, disabled: (row) => row.approveStatus == 2 || row.approveStatus == 1 disabled: (row) => row.approveStatus == 2 || row.approveStatus == 1 || row.approveStatus == 4 }, { name: "审核", @@ -140,7 +144,7 @@ clickFun: (row) => { openApprovalDia("approval", row); }, disabled: (row) => row.approveUserCurrentId == null || row.approveStatus == 2 || row.approveStatus == 3 || row.approveUserCurrentId !== userStore.id disabled: (row) => row.approveUserCurrentId == null || row.approveStatus == 2 || row.approveStatus == 3 || row.approveStatus == 4 || row.approveUsercurrentId !== userStore.id }, { name: "详情", src/views/inventoryManagement/dispatchLog/index.vue
@@ -205,7 +205,7 @@ tableData.value.map((item) => { item.children = []; }); total.value = res.total; total.value = res.data.total; }) .catch(() => { tableLoading.value = false; src/views/inventoryManagement/issueManagement/index.vue
@@ -131,6 +131,7 @@ getStockInPage({ ...searchForm.value, ...page }).then(res => { tableLoading.value = false tableData.value = res.data.records total.value = res.data.total console.log('res', res.data.records) }).catch(() => { tableLoading.value = false src/views/inventoryManagement/stockManagement/index.vue
@@ -232,7 +232,7 @@ // tableData.value.map(item => { // item.children = [] // }) // total.value = res.total total.value = res.data.total }).catch(() => { tableLoading.value = false }) src/views/procurementManagement/procurementInvoiceLedger/Form/EditForm.vue
@@ -23,7 +23,7 @@ </el-col> <el-col :span="12"> <el-form-item label="发票号："> <el-input v-model="form.invoiceNumber" /> <el-input disabled v-model="form.invoiceNumber" /> </el-form-item> </el-col> <el-col :span="12"> @@ -95,6 +95,8 @@ // 确保所有数值都转换为数字类型进行计算 const ticketsAmount = Number(val) * Number(form.taxInclusiveUnitPrice); const futureTickets = Number(form.futureTickets) - Number(val); form.futureTickets = Number(futureTickets.toFixed(2)); form.ticketsAmount = Number(ticketsAmount.toFixed(2)); }; const inputTicketsAmount = (val) => { src/views/procurementManagement/procurementInvoiceLedger/Modal/EditModal.vue
@@ -21,6 +21,7 @@ }); const emits = defineEmits(["success"]); const saleLedgerProjectId = ref('') const editFormRef = ref(); const { id, @@ -32,10 +33,11 @@ closeModal, } = useModal({ title: "来票台账" }); const open = async (id) => { openModal(id); const open = async (row) => { openModal(row.id); saleLedgerProjectId.value = row.saleLedgerProjectId; await nextTick(); editFormRef.value.load(id); editFormRef.value.load(row.id); }; const close = () => { @@ -45,6 +47,7 @@ const sendForm = async () => { const form = editFormRef.value.form; form.saleLedgerProjectId = saleLedgerProjectId.value; const { code } = await updateRegistration(form); if (code === 200) { emits("success"); src/views/procurementManagement/procurementInvoiceLedger/index.vue
@@ -81,7 +81,7 @@ <el-button type="primary" text @click="openEdit(row.id)" @click="openEdit(row)" :disabled="row.issUerId !== userStore.id" > 编辑 @@ -310,8 +310,8 @@ modalRef.value.handleImport(id); }; const openEdit = (id) => { editmodalRef.value.open(id); const openEdit = (row) => { editmodalRef.value.open(row); }; // 上传成功后做什么 src/views/salesManagement/receiptPayment/index.vue
@@ -49,7 +49,7 @@ <div class="actions"> <div></div> <div> <el-button type="primary" icon="Plus" @click="openForm('add')"> <el-button type="primary" @click="openForm('add')"> 新增回款 </el-button> <el-button icon="Download" @click="handleOut"> 导出 </el-button> @@ -438,13 +438,20 @@ getList(); }; const getList = () => { expandedRowKeys.value = []; tableLoading.value = true; bindInvoiceNoRegPage({ ...searchForm, ...page }) .then((res) => { tableLoading.value = false; tableData.value = res.data.records; total.value = res.data.total; if (expandedRowKeys.value.length > 0) { const arr = [] const index = tableData.value.findIndex(item => item.id === expandedRowKeys.value[0]); if (index > -1) { arr.push(tableData.value[index]); expandChange(tableData.value[index], arr) } } }) .catch(() => { tableLoading.value = false; @@ -506,10 +513,8 @@ proxy.$modal.msgError("请选择一条数据"); return; } // console.log("(selectedRows.value", selectedRows.value); if (selectedRows.value[0].noReceiptAmount === 0) { proxy.$modal.msgError("待回款金额为0元"); if (selectedRows.value[0].noReceiptAmount == 0) { proxy.$modal.warning("无需再回款"); return; } invoiceInfo({ id: selectedRows.value[0].id }).then((res) => { @@ -577,6 +582,8 @@ }; receiptPaymentSaveOrUpdate(updateData).then((res) => { row.editType = !row.editType; getList(); proxy.$modal.msgSuccess("提交成功"); }); };
