From a17257382b733190906c8d485e9f6d176ffd60a3 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 14 八月 2026 11:48:31 +0800
Subject: [PATCH] Merge branch 'dev_pro2.0' of http://114.132.189.42:9002/r/mom-pro2-before into dev_pro2.0
---
src/views/mes/md/item/data.ts | 19 +++++--------------
src/views/mes/md/item/index.vue | 26 +-------------------------
src/api/mes/md/item/index.ts | 7 -------
src/views/srm/tender/detail.vue | 6 +++---
4 files changed, 9 insertions(+), 49 deletions(-)
diff --git a/src/api/mes/md/item/index.ts b/src/api/mes/md/item/index.ts
index f2a23c0..6ad491e 100644
--- a/src/api/mes/md/item/index.ts
+++ b/src/api/mes/md/item/index.ts
@@ -54,13 +54,6 @@
return requestClient.put('/mes/md/item/update', data);
}
-/** 淇敼鐗╂枡浜у搧鐘舵�� */
-export function updateItemStatus(id: number, status: number) {
- return requestClient.put('/mes/md/item/update-status', undefined, {
- params: { id, status },
- });
-}
-
/** 鍒犻櫎鐗╂枡浜у搧 */
export function deleteItem(id: number) {
return requestClient.delete(`/mes/md/item/delete?id=${id}`);
diff --git a/src/views/mes/md/item/data.ts b/src/views/mes/md/item/data.ts
index 5425bc8..5d74bb2 100644
--- a/src/views/mes/md/item/data.ts
+++ b/src/views/mes/md/item/data.ts
@@ -111,7 +111,7 @@
component: 'RadioGroup',
componentProps: {
buttonStyle: 'solid',
- disabled: false,
+ disabled: true,
optionType: 'button',
options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
},
@@ -257,12 +257,7 @@
}
/** 鍒楄〃鐨勫瓧娈� */
-export function useGridColumns(
- onStatusChange?: (
- newStatus: number,
- row: MesMdItemApi.Item,
- ) => PromiseLike<boolean | undefined>,
-): VxeTableGridOptions<MesMdItemApi.Item>['columns'] {
+export function useGridColumns(): VxeTableGridOptions<MesMdItemApi.Item>['columns'] {
return [
{
field: 'code',
@@ -315,15 +310,11 @@
{
field: 'status',
title: '鐘舵��',
- width: 120,
+ width: 100,
align: 'center',
cellRender: {
- attrs: { beforeChange: onStatusChange },
- name: 'CellSwitch',
- props: {
- checkedValue: CommonStatusEnum.ENABLE,
- unCheckedValue: CommonStatusEnum.DISABLE,
- },
+ name: 'CellDict',
+ props: { type: DICT_TYPE.COMMON_STATUS },
},
},
{
diff --git a/src/views/mes/md/item/index.vue b/src/views/mes/md/item/index.vue
index 36e08fe..55dd8cd 100644
--- a/src/views/mes/md/item/index.vue
+++ b/src/views/mes/md/item/index.vue
@@ -6,12 +6,9 @@
import { ref } from "vue";
import {
- confirm,
Page,
useVbenModal,
} from "@vben/common-ui";
- import { DICT_TYPE } from "@vben/constants";
- import { getDictLabel } from "@vben/hooks";
import { downloadFileFromBlobPart } from "@vben/utils";
import { Button, Card, message } from "ant-design-vue";
@@ -21,7 +18,6 @@
deleteItem,
exportItem,
getItemPage,
- updateItemStatus,
} from "#/api/mes/md/item";
import { $t } from "#/locales";
import { MdItemTypeTree } from "#/views/mes/md/item/type/components";
@@ -95,32 +91,12 @@
handleRefresh();
}
- /** 鏇存柊鐗╂枡鐘舵�� */
- async function handleStatusChange(
- newStatus: number,
- row: MesMdItemApi.Item
- ): Promise<boolean | undefined> {
- try {
- await confirm(
- `纭瑕佸皢"${row.name}"鐗╂枡鍒囨崲涓恒��${getDictLabel(
- DICT_TYPE.COMMON_STATUS,
- newStatus
- )}銆戝悧锛焋
- );
- } catch {
- return false;
- }
- await updateItemStatus(row.id!, newStatus);
- message.success($t("ui.actionMessage.operationSuccess"));
- return true;
- }
-
const [Grid, gridApi] = useVbenVxeGrid({
formOptions: {
schema: useGridFormSchema(),
},
gridOptions: {
- columns: useGridColumns(handleStatusChange),
+ columns: useGridColumns(),
height: "auto",
keepSource: true,
proxyConfig: {
diff --git a/src/views/srm/tender/detail.vue b/src/views/srm/tender/detail.vue
index b7f5e2c..b366f81 100644
--- a/src/views/srm/tender/detail.vue
+++ b/src/views/srm/tender/detail.vue
@@ -439,7 +439,7 @@
const bidColumns = [
{ title: '鎶曟爣缂栧彿', dataIndex: 'bidNo', width: 140 },
{ title: '渚涘簲鍟�', dataIndex: 'supplierName', width: 200 },
- { title: '鎶曟爣閲戦', dataIndex: 'bidTotalAmount', width: 120 },
+ { title: '鎶曟爣鎬婚噾棰�', dataIndex: 'bidTotalAmount', width: 120 },
{ title: '鎶曟爣鏃堕棿', dataIndex: 'bidTime', width: 160 },
{ title: '鐘舵��', dataIndex: 'bidStatus', width: 100, customRender: ({ text }: any) => BID_STATUS_MAP[text] || text },
{ title: '鎿嶄綔', key: 'actions', width: 240 },
@@ -447,7 +447,7 @@
const quoteColumns = [
{ title: '鐗╂枡', dataIndex: 'materialName', width: 120 },
- { title: '鎶ヤ环浠锋牸', dataIndex: 'quotePrice', width: 100 },
+ { title: '鎶ヤ环鍗曚环', dataIndex: 'quotePrice', width: 100 },
{ title: '绋庣巼(%)', dataIndex: 'taxRate', width: 80 },
{ title: '浜ゆ湡(澶�)', dataIndex: 'deliveryCycle', width: 80 },
{ title: '浠樻鏉′欢', dataIndex: 'paymentTerms', width: 120 },
@@ -889,7 +889,7 @@
</a-form-item>
<a-row :gutter="12">
<a-col :span="8">
- <a-form-item label="鎶ヤ环浠锋牸" required><a-input-number v-model:value="quoteForm.quotePrice" :min="0" class="!w-full" placeholder="鎶ヤ环"><template #addonAfter>鍏�</template></a-input-number></a-form-item>
+ <a-form-item label="鎶ヤ环鍗曚环" required><a-input-number v-model:value="quoteForm.quotePrice" :min="0" class="!w-full" placeholder="鎶ヤ环"><template #addonAfter>鍏�</template></a-input-number></a-form-item>
</a-col>
<a-col :span="8">
<a-form-item label="绋庣巼(%)"><a-input-number v-model:value="quoteForm.taxRate" :min="0" :max="100" class="!w-full" placeholder="濡� 13" /></a-form-item>
--
Gitblit v1.9.3