From 6495c73e01ac2a4fc2243a6254aa309bcf4ce5fe Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期四, 10 七月 2025 11:13:46 +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/collaborativeApproval/approvalProcess/index.vue | 14 +++++++-------
src/views/salesManagement/salesLedger/index.vue | 5 +++--
src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue | 15 +++++++++++++--
7 files changed, 38 insertions(+), 13 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/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