From 4e39a9af1b2fe4a0cdd12f16175d3e601063cb58 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 10 七月 2025 11:41:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue | 4 ++
src/api/collaborativeApproval/approvalProcess.js | 8 ++++
src/views/basicData/supplierManage/index.vue | 3 +
src/views/basicData/customerFile/index.vue | 2
src/views/basicData/product/index.vue | 65 +++++++++++++++++++++++++-------
src/views/collaborativeApproval/approvalProcess/index.vue | 14 +++---
src/views/salesManagement/salesLedger/index.vue | 5 +-
src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue | 15 ++++++-
src/views/basicData/product/ImportExcel/index.vue | 1
9 files changed, 90 insertions(+), 27 deletions(-)
diff --git a/src/api/collaborativeApproval/approvalProcess.js b/src/api/collaborativeApproval/approvalProcess.js
index 4f8ca33..2e8f7ca 100644
--- a/src/api/collaborativeApproval/approvalProcess.js
+++ b/src/api/collaborativeApproval/approvalProcess.js
@@ -45,4 +45,12 @@
method: 'delete',
data: query,
})
+}
+// 鍒犻櫎瀹℃壒娴佺▼
+export function approveProcessDetails(query) {
+ return request({
+ url: '/approveNode/details',
+ method: 'get',
+ params: query,
+ })
}
\ No newline at end of file
diff --git a/src/views/basicData/customerFile/index.vue b/src/views/basicData/customerFile/index.vue
index f0c1186..2294dd7 100644
--- a/src/views/basicData/customerFile/index.vue
+++ b/src/views/basicData/customerFile/index.vue
@@ -309,7 +309,7 @@
const tableLoading = ref(false);
const page = reactive({
current: 1,
- size: 10,
+ size: 100,
total: 0,
});
const total = ref(0);
diff --git a/src/views/basicData/product/ImportExcel/index.vue b/src/views/basicData/product/ImportExcel/index.vue
index f1d6213..c25d254 100644
--- a/src/views/basicData/product/ImportExcel/index.vue
+++ b/src/views/basicData/product/ImportExcel/index.vue
@@ -9,6 +9,7 @@
:headers="upload.headers"
:action="upload.url + '?updateSupport=' + upload.updateSupport"
:disabled="upload.isUploading"
+ :showTip="false"
@success="handleFileSuccess"
/>
<template #footer>
diff --git a/src/views/basicData/product/index.vue b/src/views/basicData/product/index.vue
index b17be1f..3aa263e 100644
--- a/src/views/basicData/product/index.vue
+++ b/src/views/basicData/product/index.vue
@@ -55,7 +55,7 @@
>
缂栬緫
</el-button>
- <el-button type="primary" link @click="openProDia('add', data)">
+ <el-button type="primary" link @click="openProDia('add', data)" :disabled="node.level >= 3">
娣诲姞浜у搧
</el-button>
<el-button
@@ -99,7 +99,7 @@
@pagination="pagination"
></PIMTable>
</div>
- <el-dialog v-model="productDia" title="浜у搧" width="400px">
+ <el-dialog v-model="productDia" title="浜у搧" width="400px" @keydown.enter.prevent>
<el-form
:model="form"
label-width="140px"
@@ -114,6 +114,7 @@
v-model="form.productName"
placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�"
clearable
+ @keydown.enter.prevent
/>
</el-form-item>
</el-col>
@@ -131,6 +132,7 @@
title="瑙勬牸鍨嬪彿"
width="400px"
@close="closeModelDia"
+ @keydown.enter.prevent
>
<el-form
:model="modelForm"
@@ -146,6 +148,7 @@
v-model="modelForm.model"
placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�"
clearable
+ @keydown.enter.prevent
/>
</el-form-item>
</el-col>
@@ -157,6 +160,7 @@
v-model="modelForm.unit"
placeholder="璇疯緭鍏ュ崟浣�"
clearable
+ @keydown.enter.prevent
/>
</el-form-item>
</el-col>
@@ -315,16 +319,53 @@
proxy.$refs.formRef.resetFields();
productDia.value = false;
};
+// 灏佽涓�涓畨鍏ㄧ殑纭妗嗭紝褰诲簳闃绘Enter閿Е鍙�
+const safeConfirm = (message, title) => {
+ // 鏍囪鏄惁鏄紶鏍囩偣鍑伙紙鐐瑰嚮鎸夐挳浼氳Е鍙慺ocus浜嬩欢锛�
+ let isMouseClick = false;
+
+ return new Promise((resolve, reject) => {
+ const box = ElMessageBox.confirm(message, title, {
+ confirmButtonText: "纭",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ beforeClose: (action, instance, done) => {
+ if (action === "confirm") {
+ // 鍙湁榧犳爣鐐瑰嚮鏃舵墠鍏佽纭
+ if (isMouseClick) {
+ done();
+ resolve();
+ } else {
+ // Enter閿Е鍙戞椂闃绘
+ done(false);
+ }
+ } else {
+ // 鍙栨秷鎿嶄綔鐩存帴鍏佽
+ done();
+ reject();
+ }
+ }
+ });
+
+ // 鐩戝惉纭鎸夐挳鐨刦ocus浜嬩欢锛堥紶鏍囩偣鍑讳細瑙﹀彂锛孍nter閿笉浼氾級
+ setTimeout(() => {
+ const confirmBtn = document.querySelector('.el-message-box__btns .el-button--primary');
+ if (confirmBtn) {
+ confirmBtn.addEventListener('focus', () => {
+ isMouseClick = true;
+ });
+ }
+ }, 0); // 寤惰繜鑾峰彇锛岀‘淇滵OM宸叉覆鏌�
+ });
+};
+// 鍒犻櫎浜у搧
// 鍒犻櫎浜у搧
const remove = (node, data) => {
- let ids = [];
- ids.push(data.id);
- ElMessageBox.confirm("閫変腑鐨勫唴瀹瑰皢琚垹闄わ紝鏄惁纭鍒犻櫎锛�", "鍒犻櫎鎻愮ず", {
- confirmButtonText: "纭",
- cancelButtonText: "鍙栨秷",
- type: "warning",
- })
+ let ids = [data.id];
+ // 浣跨敤灏佽鐨剆afeConfirm
+ safeConfirm("閫変腑鐨勫唴瀹瑰皢琚垹闄わ紝鏄惁纭鍒犻櫎锛�", "鍒犻櫎鎻愮ず")
.then(() => {
+ // 纭鍒犻櫎閫昏緫
tableLoading.value = true;
delProduct(ids)
.then((res) => {
@@ -400,11 +441,7 @@
proxy.$modal.msgWarning("璇烽�夋嫨鏁版嵁");
return;
}
- ElMessageBox.confirm("閫変腑鐨勫唴瀹瑰皢琚垹闄わ紝鏄惁纭鍒犻櫎锛�", "鍒犻櫎鎻愮ず", {
- confirmButtonText: "纭",
- cancelButtonText: "鍙栨秷",
- type: "warning",
- })
+ safeConfirm("閫変腑鐨勫唴瀹瑰皢琚垹闄わ紝鏄惁纭鍒犻櫎锛�", "鍒犻櫎鎻愮ず")
.then(() => {
tableLoading.value = true;
delProductModel(ids)
diff --git a/src/views/basicData/supplierManage/index.vue b/src/views/basicData/supplierManage/index.vue
index 22216e3..f5eb792 100644
--- a/src/views/basicData/supplierManage/index.vue
+++ b/src/views/basicData/supplierManage/index.vue
@@ -35,6 +35,7 @@
:isSelection="true"
@selection-change="handleSelectionChange"
:tableLoading="tableLoading"
+ @pagination="pagination"
></PIMTable>
</div>
<el-dialog
@@ -297,7 +298,7 @@
const tableLoading = ref(false);
const page = reactive({
current: 1,
- size: 10,
+ size: 100,
total: 0,
});
diff --git a/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue b/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
index 57b5e38..5c1a34f 100644
--- a/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
+++ b/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
@@ -49,6 +49,7 @@
<script setup>
import {getCurrentInstance, ref} from "vue";
+import {approveProcessDetails} from "../../../../api/collaborativeApproval/approvalProcess.js";
const emit = defineEmits(['close'])
const { proxy } = getCurrentInstance()
@@ -79,6 +80,9 @@
const openDialog = (type, row) => {
operationType.value = type;
dialogFormVisible.value = true;
+ approveProcessDetails({id: row.approveId}).then((res) => {
+ console.log(res)
+ })
}
// 鎻愪氦瀹℃壒
const submitForm = () => {
diff --git a/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue b/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue
index 585bc43..291966f 100644
--- a/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue
+++ b/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue
@@ -81,7 +81,17 @@
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="鐢宠浜猴細" prop="approveUser">
- <el-input v-model="form.approveUser" placeholder="璇疯緭鍏�" clearable/>
+ <el-select
+ v-model="form.approveUser"
+ placeholder="閫夋嫨浜哄憳"
+ >
+ <el-option
+ v-for="user in userList"
+ :key="user.userId"
+ :label="user.nickName"
+ :value="user.userId"
+ />
+ </el-select>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -171,7 +181,8 @@
approverNodes.value = [
{ id: 1, userId: null }
]
- form.value.approveUser = userStore.nickName;
+ console.log(userStore)
+ form.value.approveUser = userStore.id;
form.value.approveTime = getCurrentDate();
if (operationType.value === 'edit') {
approveProcessGetInfo({id: row.approveId,approveReason: '1'}).then(res => {
diff --git a/src/views/collaborativeApproval/approvalProcess/index.vue b/src/views/collaborativeApproval/approvalProcess/index.vue
index ab98ab8..7e51ea4 100644
--- a/src/views/collaborativeApproval/approvalProcess/index.vue
+++ b/src/views/collaborativeApproval/approvalProcess/index.vue
@@ -2,11 +2,11 @@
<div class="app-container">
<div class="search_form">
<div>
- <span class="search_title">渚涘簲鍟嗭細</span>
+ <span class="search_title">娴佺▼缂栧彿锛�</span>
<el-input
- v-model="searchForm.supplier"
+ v-model="searchForm.approveId"
style="width: 240px"
- placeholder="璇疯緭鍏ヤ緵搴斿晢鎼滅储"
+ placeholder="璇疯緭鍏ユ祦绋嬬紪鍙锋悳绱�"
@change="handleQuery"
clearable
:prefix-icon="Search"
@@ -43,14 +43,13 @@
import { Search } from "@element-plus/icons-vue";
import {onMounted, ref} from "vue";
import {ElMessageBox} from "element-plus";
-import {qualityInspectDel, qualityInspectListPage} from "@/api/qualityManagement/rawMaterialInspection.js";
import InfoFormDia from "@/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue";
import ApprovalDia from "@/views/collaborativeApproval/approvalProcess/components/approvalDia.vue";
import {approveProcessDelete, approveProcessListPage} from "../../../api/collaborativeApproval/approvalProcess.js";
const data = reactive({
searchForm: {
- supplier: "",
+ approveId: "",
},
});
const { searchForm } = toRefs(data);
@@ -85,7 +84,7 @@
{
label: "娴佺▼缂栧彿",
prop: "approveId",
- width: 230
+ width: 170
},
{
label: "鐢宠閮ㄩ棬",
@@ -94,6 +93,7 @@
{
label: "瀹℃壒浜嬬敱",
prop: "approveReason",
+ width: 200
},
{
label: "鐢宠浜�",
@@ -199,7 +199,7 @@
const handleDelete = () => {
let ids = [];
if (selectedRows.value.length > 0) {
- ids = selectedRows.value.map((item) => item.id);
+ ids = selectedRows.value.map((item) => item.approveId);
} else {
proxy.$modal.msgWarning("璇烽�夋嫨鏁版嵁");
return;
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index 3ec809b..e74ad19 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -153,7 +153,7 @@
<el-row>
<el-form-item label="浜у搧淇℃伅锛�" prop="entryDate">
<el-button type="primary" @click="openProductForm('add')">娣诲姞</el-button>
- <el-button plain type="danger" @click="deleteProduct">鍒犻櫎</el-button>
+ <el-button plain type="danger" @click="deleteProduct" >鍒犻櫎</el-button>
</el-form-item>
</el-row>
<el-table :data="productData" border @selection-change="productSelected" show-summary
@@ -631,7 +631,8 @@
const submitForm = () => {
proxy.$refs["formRef"].validate((valid) => {
if (valid) {
- if (productData.value.length > 0) {
+ console.log('productData.value--', productData.value)
+ if (productData.value !== null && productData.value.length > 0) {
form.value.productData = proxy.HaveJson(productData.value);
} else {
proxy.$modal.msgWarning("璇锋坊鍔犱骇鍝佷俊鎭�");
--
Gitblit v1.9.3