From d76d191de3919127069c34ce4298f5188d2055fa Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 15 五月 2026 15:02:45 +0800
Subject: [PATCH] 天津宝东 1.代码更新
---
src/views/financialManagement/accounting/index.vue | 2
src/views/customerService/feedbackRegistration/components/formDia.vue | 2
src/views/basicData/product/index.vue | 4
src/views/equipmentManagement/upkeep/Form/PlanModal.vue | 33 +-----
src/views/salesManagement/returnOrder/components/detailDia.vue | 2
src/views/salesManagement/salesLedger/index.vue | 16 +-
src/views/equipmentManagement/ledger/Form.vue | 27 ++--
src/views/productionManagement/productStructure/index.vue | 2
src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue | 6
src/views/productionManagement/productionTraceability/index.vue | 2
src/views/equipmentManagement/calibration/index.vue | 2
src/views/procurementManagement/purchaseReturnOrder/index.vue | 2
src/views/equipmentManagement/ledger/index.vue | 35 ------
src/views/inventoryManagement/stockManagement/Record.vue | 2
src/views/qualityManagement/processInspection/components/formDia.vue | 8
src/views/salesManagement/deliveryLedger/index.vue | 6
src/views/equipmentManagement/repair/Modal/RepairModal.vue | 56 +---------
src/views/productionManagement/productionCosting/index.vue | 2
src/views/equipmentManagement/repair/index.vue | 62 +----------
src/components/AIChatSidebar/index.vue | 4
src/views/financialManagement/assets/fixedAssets.vue | 6
src/views/equipmentManagement/deviceInfo/index.vue | 2
src/views/inventoryManagement/stockManagement/BatchNoQtyDetail.vue | 2
src/views/equipmentManagement/upkeep/Form/formDia.vue | 6
src/views/inventoryManagement/stockReport/index.vue | 2
25 files changed, 79 insertions(+), 214 deletions(-)
diff --git a/src/components/AIChatSidebar/index.vue b/src/components/AIChatSidebar/index.vue
index a2a365a..40f95a7 100644
--- a/src/components/AIChatSidebar/index.vue
+++ b/src/components/AIChatSidebar/index.vue
@@ -686,7 +686,7 @@
unReceiptPaymentAmount: '鏈敹浠樻閲戦',
templateName: '妯℃澘鍚嶇О',
productCategory: '浜у搧绫诲埆',
- specificationModel: '瑙勬牸鍨嬪彿',
+ specificationModel: '灏哄',
unit: '鍗曚綅',
taxRate: '绋庣巼',
taxInclusiveUnitPrice: '鍚◣鍗曚环',
@@ -749,7 +749,7 @@
妯℃澘鍚嶇О: 'templateName',
浜у搧绫诲埆: 'productCategory',
浜у搧鍚嶇О: 'productCategory',
- 瑙勬牸鍨嬪彿: 'specificationModel',
+ 灏哄: 'specificationModel',
鍗曚綅: 'unit',
绋庣巼: 'taxRate',
鍚◣鍗曚环: 'taxInclusiveUnitPrice',
diff --git a/src/views/basicData/product/index.vue b/src/views/basicData/product/index.vue
index 3a0c561..4f2694b 100644
--- a/src/views/basicData/product/index.vue
+++ b/src/views/basicData/product/index.vue
@@ -411,7 +411,7 @@
form.value.productName =
type === "edit" && data ? data.productName : "";
};
- // 鎵撳紑瑙勬牸鍨嬪彿寮规
+ // 鎵撳紑灏哄寮规
const openModelDia = (type, data) => {
modelOperationType.value = type;
modelDia.value = true;
@@ -534,7 +534,7 @@
tableLoading.value = false;
});
};
- // 鍒犻櫎瑙勬牸鍨嬪彿
+ // 鍒犻櫎灏哄
const handleDelete = () => {
let ids = [];
if (selectedRows.value.length > 0) {
diff --git a/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue b/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
index 0605fe5..97f01ae 100644
--- a/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
+++ b/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
@@ -87,7 +87,7 @@
<el-table-column prop="product"
label="浜у搧鍚嶇О" />
<el-table-column prop="specification"
- label="瑙勬牸鍨嬪彿" />
+ label="灏哄" />
<el-table-column prop="unit"
label="鍗曚綅" />
<el-table-column prop="unitPrice"
@@ -147,7 +147,7 @@
<el-table-column prop="productCategory"
label="浜у搧鍚嶇О" />
<el-table-column prop="specificationModel"
- label="瑙勬牸鍨嬪彿" />
+ label="灏哄" />
<el-table-column prop="unit"
label="鍗曚綅" />
<el-table-column prop="quantity"
@@ -210,7 +210,7 @@
label="浜у搧鍚嶇О"
show-overflow-tooltip />
<el-table-column prop="specificationModel"
- label="瑙勬牸鍨嬪彿"
+ label="灏哄"
show-overflow-tooltip />
<el-table-column prop="deliveryQuantity"
label="鍙戣揣鏁伴噺"
diff --git a/src/views/customerService/feedbackRegistration/components/formDia.vue b/src/views/customerService/feedbackRegistration/components/formDia.vue
index 790ddbe..c320d1d 100644
--- a/src/views/customerService/feedbackRegistration/components/formDia.vue
+++ b/src/views/customerService/feedbackRegistration/components/formDia.vue
@@ -214,7 +214,7 @@
const tableColumn = ref([
{ label: "浜у搧澶х被", prop: "productCategory" },
- { label: "瑙勬牸鍨嬪彿", prop: "specificationModel" },
+ { label: "灏哄", prop: "specificationModel" },
{ label: "鍗曚綅", prop: "unit" },
{
label: "浜у搧鐘舵��",
diff --git a/src/views/equipmentManagement/calibration/index.vue b/src/views/equipmentManagement/calibration/index.vue
index ae1da1b..b04da2e 100644
--- a/src/views/equipmentManagement/calibration/index.vue
+++ b/src/views/equipmentManagement/calibration/index.vue
@@ -114,7 +114,7 @@
width: 200,
},
{
- label: "灏哄",
+ label: "瑙勬牸鍨嬪彿",
prop: "model",
width:200
},
diff --git a/src/views/equipmentManagement/deviceInfo/index.vue b/src/views/equipmentManagement/deviceInfo/index.vue
index 5c17e68..de162cc 100644
--- a/src/views/equipmentManagement/deviceInfo/index.vue
+++ b/src/views/equipmentManagement/deviceInfo/index.vue
@@ -15,7 +15,7 @@
<span class="value">{{ deviceInfo.deviceName }}</span>
</div>
<div class="info-row">
- <span class="label">灏哄锛�</span>
+ <span class="label">瑙勬牸鍨嬪彿锛�</span>
<span class="value">{{ deviceInfo.deviceModel }}</span>
</div>
<div class="info-row">
diff --git a/src/views/equipmentManagement/ledger/Form.vue b/src/views/equipmentManagement/ledger/Form.vue
index b2949ce..72d594e 100644
--- a/src/views/equipmentManagement/ledger/Form.vue
+++ b/src/views/equipmentManagement/ledger/Form.vue
@@ -7,8 +7,8 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="灏哄" prop="deviceModel">
- <el-input v-model="form.deviceModel" placeholder="璇疯緭鍏ュ昂瀵�" />
+ <el-form-item label="瑙勬牸鍨嬪彿" prop="deviceModel">
+ <el-input v-model="form.deviceModel" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" />
</el-form-item>
</el-col>
<el-col :span="12">
@@ -100,18 +100,22 @@
</el-col>
<el-col :span="12">
<el-form-item label="绋庣巼(%)" prop="taxRate">
+ <!-- <el-input
+ v-model="form.taxRate"
+ placeholder="璇疯緭鍏ョ◣鐜�"
+ type="number"
+ >
+ <template #append> % </template>
+ </el-input> -->
<el-select
v-model="form.taxRate"
placeholder="璇烽�夋嫨"
clearable
@change="mathNum"
>
- <el-option
- v-for="dict in tax_rate"
- :key="dict.value"
- :label="dict.label"
- :value="Number(dict.value)"
- />
+ <el-option label="1" :value="1" />
+ <el-option label="6" :value="6" />
+ <el-option label="13" :value="13" />
</el-select>
</el-form-item>
</el-col>
@@ -170,10 +174,7 @@
calculateTaxExclusiveTotalPrice,
} from "@/utils/summarizeTable";
import { ElMessage } from "element-plus";
-import {ref, getCurrentInstance} from "vue";
-
-const { proxy } = getCurrentInstance();
-const { tax_rate } = proxy.useDict("tax_rate");
+import {ref} from "vue";
defineOptions({
name: "璁惧鍙拌处琛ㄥ崟",
@@ -214,7 +215,7 @@
const { form, resetForm } = useFormData({
deviceName: undefined, // 璁惧鍚嶇О
- deviceModel: undefined, // 灏哄
+ deviceModel: undefined, // 瑙勬牸鍨嬪彿
deviceBrand: undefined, // 璁惧鍝佺墝
type: undefined, // 璁惧绫诲瀷
supplierName: undefined, // 渚涘簲鍟�
diff --git a/src/views/equipmentManagement/ledger/index.vue b/src/views/equipmentManagement/ledger/index.vue
index 5693935..7ba9401 100644
--- a/src/views/equipmentManagement/ledger/index.vue
+++ b/src/views/equipmentManagement/ledger/index.vue
@@ -10,11 +10,11 @@
@change="getTableData"
/>
</el-form-item>
- <el-form-item label="灏哄">
+ <el-form-item label="瑙勬牸鍨嬪彿">
<el-input
v-model="filters.deviceModel"
style="width: 200px"
- placeholder="璇疯緭鍏ュ昂瀵�"
+ placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�"
clearable
@change="getTableData"
/>
@@ -174,7 +174,7 @@
prop: "deviceName",
},
{
- label: "灏哄",
+ label: "瑙勬牸鍨嬪彿",
prop: "deviceModel",
},
{
@@ -298,34 +298,7 @@
const showQRCode = async (row) => {
// 鐩存帴浣跨敤URL锛屼笉瑕佺敤JSON.stringify鍖呰
const qrContent = proxy.javaApi + '/device-info?deviceId=' + row.id;
- const qrDataUrl = await QRCode.toDataURL(qrContent, { width: 200, margin: 2 });
-
- // 鍒涘缓canvas鍚堟垚甯﹀悕绉扮殑浜岀淮鐮佸浘鐗�
- const canvas = document.createElement('canvas');
- const ctx = canvas.getContext('2d');
- const qrSize = 200;
- const textHeight = 30;
- const padding = 10;
- canvas.width = qrSize + padding * 2;
- canvas.height = qrSize + textHeight + padding * 2;
-
- // 濉厖鐧借壊鑳屾櫙
- ctx.fillStyle = '#ffffff';
- ctx.fillRect(0, 0, canvas.width, canvas.height);
-
- // 缁樺埗浜岀淮鐮�
- const qrImg = new Image();
- qrImg.src = qrDataUrl;
- await new Promise((resolve) => { qrImg.onload = resolve; });
- ctx.drawImage(qrImg, padding, padding, qrSize, qrSize);
-
- // 缁樺埗璁惧鍚嶇О
- ctx.fillStyle = '#333333';
- ctx.font = 'bold 14px Arial';
- ctx.textAlign = 'center';
- ctx.fillText(row.deviceName || '', canvas.width / 2, qrSize + padding + 20);
-
- qrCodeUrl.value = canvas.toDataURL('image/png');
+ qrCodeUrl.value = await QRCode.toDataURL(qrContent);
qrRowData.value = row;
qrDialogVisible.value = true;
};
diff --git a/src/views/equipmentManagement/repair/Modal/RepairModal.vue b/src/views/equipmentManagement/repair/Modal/RepairModal.vue
index 324c8db..1728b37 100644
--- a/src/views/equipmentManagement/repair/Modal/RepairModal.vue
+++ b/src/views/equipmentManagement/repair/Modal/RepairModal.vue
@@ -22,10 +22,10 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="灏哄">
+ <el-form-item label="瑙勬牸鍨嬪彿">
<el-input
v-model="form.deviceModel"
- placeholder="璇疯緭鍏ュ昂瀵�"
+ placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�"
disabled
/>
</el-form-item>
@@ -49,44 +49,19 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鎶ヤ慨鎶ヤ慨椤圭洰">
- <el-input v-model="form.machineryCategory" placeholder="璇疯緭鍏ユ姤淇姤淇」鐩�" />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="12">
- <el-form-item label="缁翠慨浜�">
- <el-input v-model="form.maintenanceName" placeholder="璇疯緭鍏ョ淮淇汉濮撳悕" />
+ <el-form-item label="绫荤洰">
+ <el-input v-model="form.machineryCategory" placeholder="璇疯緭鍏ョ被鐩�" />
</el-form-item>
</el-col>
</el-row>
<el-row v-if="id">
<el-col :span="12">
<el-form-item label="鎶ヤ慨鐘舵��">
- <el-select v-model="form.status" disabled>
+ <el-select v-model="form.status">
<el-option label="寰呯淮淇�" :value="0"></el-option>
- <el-option label="宸查獙鏀�" :value="1"></el-option>
+ <el-option label="瀹岀粨" :value="1"></el-option>
<el-option label="澶辫触" :value="2"></el-option>
</el-select>
- </el-form-item>
- </el-col>
- </el-row>
- <!-- 楠屾敹淇℃伅灞曠ず -->
- <el-row v-if="id && form.status === 1">
- <el-col :span="12">
- <el-form-item label="楠屾敹浜�">
- <el-input v-model="form.acceptanceName" disabled />
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="楠屾敹鏃堕棿">
- <el-input v-model="form.acceptanceTime" disabled />
- </el-form-item>
- </el-col>
- <el-col :span="24">
- <el-form-item label="楠屾敹澶囨敞">
- <el-input v-model="form.acceptanceRemark" type="textarea" :rows="2" disabled />
</el-form-item>
</el-col>
</el-row>
@@ -102,20 +77,12 @@
</el-form-item>
</el-col>
</el-row>
- <el-row :gutter="30">
- <el-col :span="24">
- <el-form-item label="闄勪欢" prop="attachmentIds">
- <FileUpload v-model:file-list="form.storageBlobDTOs" />
- </el-form-item>
- </el-col>
- </el-row>
</el-form>
</FormDialog>
</template>
<script setup>
import FormDialog from "@/components/Dialog/FormDialog.vue";
-import FileUpload from "@/components/AttachmentUpload/file/index.vue";
import {
addRepair,
editRepair,
@@ -139,7 +106,6 @@
const userStore = useUserStore();
const deviceOptions = ref([]);
-const fileList = ref([]);
const loadDeviceName = async () => {
const { data } = await getDeviceLedger();
@@ -149,14 +115,12 @@
const { form, resetForm } = useFormData({
deviceLedgerId: undefined, // 璁惧Id
deviceName: undefined, // 璁惧鍚嶇О
- deviceModel: undefined, // 灏哄
+ deviceModel: undefined, // 瑙勬牸鍨嬪彿
repairTime: dayjs().format("YYYY-MM-DD"), // 鎶ヤ慨鏃ユ湡锛岄粯璁ゅ綋澶�
repairName: userStore.nickName, // 鎶ヤ慨浜�
remark: undefined, // 鏁呴殰鐜拌薄
status: 0, // 鎶ヤ慨鐘舵��
machineryCategory: undefined,
- storageBlobDTOs: [],
- maintenanceName: undefined, // 缁翠慨浜�
});
const setDeviceModel = (deviceId) => {
@@ -173,11 +137,6 @@
form.remark = data.remark;
form.status = data.status;
form.machineryCategory = data.machineryCategory;
- form.storageBlobDTOs = data.storageBlobVOs || [];
- form.maintenanceName = data.maintenanceName;
- form.acceptanceName = data.acceptanceName;
- form.acceptanceTime = data.acceptanceTime;
- form.acceptanceRemark = data.acceptanceRemark;
};
const sendForm = async () => {
@@ -209,7 +168,6 @@
const openAdd = async () => {
id.value = undefined;
visible.value = true;
- fileList.value = [];
await nextTick();
await loadDeviceName();
};
diff --git a/src/views/equipmentManagement/repair/index.vue b/src/views/equipmentManagement/repair/index.vue
index ed7b015..27d0acb 100644
--- a/src/views/equipmentManagement/repair/index.vue
+++ b/src/views/equipmentManagement/repair/index.vue
@@ -11,11 +11,11 @@
@change="getTableData"
/>
</el-form-item>
- <el-form-item label="灏哄">
+ <el-form-item label="瑙勬牸鍨嬪彿">
<el-input
v-model="filters.deviceModel"
style="width: 240px"
- placeholder="璇烽�夋嫨灏哄"
+ placeholder="璇烽�夋嫨瑙勬牸鍨嬪彿"
clearable
:prefix-icon="Search"
@change="getTableData"
@@ -100,14 +100,13 @@
<template #statusRef="{ row }">
<el-tag v-if="row.status === 2" type="danger">澶辫触</el-tag>
<el-tag v-if="row.status === 1" type="success">瀹岀粨</el-tag>
- <el-tag v-if="row.status === 3" type="info">寰呴獙鏀�</el-tag>
<el-tag v-if="row.status === 0" type="warning">寰呯淮淇�</el-tag>
</template>
<template #operation="{ row }">
<el-button
type="primary"
link
- :disabled="row.status === 1 || row.status === 3"
+ :disabled="row.status === 1"
@click="editRepair(row.id)"
>
缂栬緫
@@ -115,54 +114,35 @@
<el-button
type="success"
link
- :disabled="row.status !== 0"
+ :disabled="row.status === 1"
@click="addMaintain(row)"
>
缁翠慨
</el-button>
<el-button
- type="warning"
- link
- :disabled="row.status !== 3"
- @click="openAcceptance(row)"
- >
- 楠屾敹
- </el-button>
- <el-button
type="danger"
link
- :disabled="row.status === 1 || row.status === 3"
+ :disabled="row.status === 1"
@click="delRepairByIds(row.id)"
>
鍒犻櫎
- </el-button>
- <el-button
- type="primary"
- link
- @click="openFileDialog(row)"
- >
- 闄勪欢
</el-button>
</template>
</PIMTable>
</div>
<RepairModal ref="repairModalRef" @ok="getTableData"/>
<MaintainModal ref="maintainModalRef" @ok="getTableData"/>
- <AcceptanceModal ref="acceptanceModalRef" @ok="getTableData"/>
- <FileList v-if="fileDialogVisible" v-model:visible="fileDialogVisible" :record-type="'device_repair'" :record-id="recordId" />
</div>
</template>
<script setup>
-import {onMounted, getCurrentInstance, computed, ref, defineAsyncComponent} from "vue";
+import { onMounted, getCurrentInstance, computed } from "vue";
import {usePaginationApi} from "@/hooks/usePaginationApi";
import {getRepairPage, delRepair} from "@/api/equipmentManagement/repair";
import RepairModal from "./Modal/RepairModal.vue";
import {ElMessageBox, ElMessage} from "element-plus";
import dayjs from "dayjs";
import MaintainModal from "./Modal/MaintainModal.vue";
-import AcceptanceModal from "./Modal/AcceptanceModal.vue";
-const FileList = defineAsyncComponent(() => import("@/components/Dialog/FileList.vue"));
defineOptions({
name: "璁惧鎶ヤ慨",
@@ -173,7 +153,6 @@
// 妯℃�佹瀹炰緥
const repairModalRef = ref();
const maintainModalRef = ref();
-const acceptanceModalRef = ref();
// 琛ㄦ牸澶氶�夋閫変腑椤�
const multipleList = ref([]);
@@ -204,12 +183,12 @@
prop: "deviceName",
},
{
- label: "灏哄",
+ label: "瑙勬牸鍨嬪彿",
align: "center",
prop: "deviceModel",
},
{
- label: "鎶ヤ慨椤圭洰",
+ label: "绫荤洰",
align: "center",
prop: "machineryCategory",
},
@@ -246,17 +225,6 @@
formatData: (cell) => (cell ? dayjs(cell).format("YYYY-MM-DD") : ""),
},
{
- label: "楠屾敹浜�",
- align: "center",
- prop: "acceptanceName",
- },
- {
- label: "楠屾敹鏃堕棿",
- align: "center",
- prop: "acceptanceTime",
- formatData: (cell) => (cell ? dayjs(cell).format("YYYY-MM-DD HH:mm:ss") : ""),
- },
- {
label: "鐘舵��",
align: "center",
prop: "status",
@@ -290,15 +258,6 @@
getTableData();
};
-// 鎵撳紑闄勪欢寮圭獥
-const recordId =ref(0)
-const fileDialogVisible = ref(false)
-
-const openFileDialog = async (row) => {
- recordId.value = row.id
- fileDialogVisible.value = true
-}
-
// 澶氶�夊悗鍋氫粈涔�
const handleSelectionChange = (selectionList) => {
multipleList.value = selectionList;
@@ -322,11 +281,6 @@
// 鏂板缁翠慨
const addMaintain = (row) => {
maintainModalRef.value.open(row.id, row);
-};
-
-// 鎵撳紑楠屾敹寮圭獥
-const openAcceptance = (row) => {
- acceptanceModalRef.value.open(row);
};
const changePage = ({page, limit}) => {
diff --git a/src/views/equipmentManagement/upkeep/Form/PlanModal.vue b/src/views/equipmentManagement/upkeep/Form/PlanModal.vue
index 1ddd952..2efb7a6 100644
--- a/src/views/equipmentManagement/upkeep/Form/PlanModal.vue
+++ b/src/views/equipmentManagement/upkeep/Form/PlanModal.vue
@@ -25,10 +25,10 @@
></el-option>
</el-select>
</el-form-item>
- <el-form-item label="灏哄">
+ <el-form-item label="瑙勬牸鍨嬪彿">
<el-input
v-model="form.deviceModel"
- placeholder="璇疯緭鍏ュ昂瀵�"
+ placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�"
disabled
/>
</el-form-item>
@@ -62,13 +62,6 @@
<el-option label="澶辫触" :value="2"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="淇濆吇浜�">
- <el-input
- v-model="form.maintenancePerson"
- placeholder="璇疯緭鍏ヤ繚鍏讳汉濮撳悕"
- clearable
- />
- </el-form-item>
<el-form-item label="璁″垝淇濆吇鏃ユ湡">
<el-date-picker
style="width: 100%"
@@ -80,13 +73,6 @@
clearable
/>
</el-form-item>
- <el-row :gutter="30">
- <el-col :span="24">
- <el-form-item label="闄勪欢" prop="attachmentIds">
- <FileUpload v-model:file-list="form.storageBlobDTOs" />
- </el-form-item>
- </el-col>
- </el-row>
</el-form>
</FormDialog>
</template>
@@ -104,7 +90,6 @@
import { onMounted } from "vue";
import dayjs from "dayjs";
import { userListNoPage } from "@/api/system/user.js";
-import FileUpload from "@/components/AttachmentUpload/file/index.vue";
defineOptions({
name: "璁惧淇濆吇鏂板璁″垝",
@@ -125,13 +110,11 @@
const { form, resetForm } = useFormData({
deviceLedgerId: undefined, // 璁惧Id
deviceName: undefined, // 璁惧鍚嶇О
- deviceModel: undefined, // 灏哄
+ deviceModel: undefined, // 瑙勬牸鍨嬪彿
maintenancePlanTime: undefined, // 璁″垝淇濆吇鏃ユ湡
createUser: undefined, // 褰曞叆浜�
status: 0, //淇濅慨鐘舵��
machineryCategory: undefined,
- storageBlobDTOs: [],
- maintenancePerson: undefined, // 淇濆吇浜�
});
const setDeviceModel = (deviceId) => {
@@ -150,13 +133,9 @@
form.createUser = Number(data.createUser);
form.status = data.status;
form.machineryCategory = data.machineryCategory;
- form.maintenancePerson = data.maintenancePerson;
- if (data.maintenancePlanTime) {
- form.maintenancePlanTime = dayjs(data.maintenancePlanTime).format(
- "YYYY-MM-DD HH:mm:ss"
- );
- }
- form.storageBlobDTOs = data.storageBlobVOs || [];
+ form.maintenancePlanTime = dayjs(data.maintenancePlanTime).format(
+ "YYYY-MM-DD HH:mm:ss"
+ );
};
// 鐢ㄦ埛鍒楄〃
diff --git a/src/views/equipmentManagement/upkeep/Form/formDia.vue b/src/views/equipmentManagement/upkeep/Form/formDia.vue
index b0eceff..6856ae1 100644
--- a/src/views/equipmentManagement/upkeep/Form/formDia.vue
+++ b/src/views/equipmentManagement/upkeep/Form/formDia.vue
@@ -23,10 +23,10 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="灏哄">
+ <el-form-item label="瑙勬牸鍨嬪彿">
<el-input
v-model="form.deviceModel"
- placeholder="璇疯緭鍏ュ昂瀵�"
+ placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�"
disabled
/>
</el-form-item>
@@ -201,7 +201,7 @@
deviceOptions.value = data;
};
-// 閫夋嫨璁惧鏃讹紝鍥炲～璁惧鍚嶇О(taskName)鍜屽昂瀵�(deviceModel)
+// 閫夋嫨璁惧鏃讹紝鍥炲～璁惧鍚嶇О(taskName)鍜岃鏍煎瀷鍙�(deviceModel)
const setDeviceModel = (id) => {
const option = deviceOptions.value.find((item) => item.id === id);
if (option) {
diff --git a/src/views/financialManagement/accounting/index.vue b/src/views/financialManagement/accounting/index.vue
index b1803c8..ea858e1 100644
--- a/src/views/financialManagement/accounting/index.vue
+++ b/src/views/financialManagement/accounting/index.vue
@@ -157,7 +157,7 @@
>
<el-table-column type="index" label="搴忓彿" width="60" :index="(index) => (pagination.currentPage - 1) * pagination.pageSize + index + 1" />
<el-table-column prop="deviceName" label="璁惧鍚嶇О" width="250" />
- <el-table-column prop="deviceModel" label="灏哄" min-width="150" />
+ <el-table-column prop="deviceModel" label="瑙勬牸鍨嬪彿" min-width="150" />
<el-table-column prop="supplierName" label="渚涘簲鍟�" min-width="120" />
<el-table-column prop="unit" label="鍗曚綅" width="120" />
<el-table-column prop="number" label="鏁伴噺" width="120" />
diff --git a/src/views/financialManagement/assets/fixedAssets.vue b/src/views/financialManagement/assets/fixedAssets.vue
index 24b4cc3..39bd818 100644
--- a/src/views/financialManagement/assets/fixedAssets.vue
+++ b/src/views/financialManagement/assets/fixedAssets.vue
@@ -104,8 +104,8 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="瑙勬牸鍨嬪彿" prop="specification">
- <el-input v-model="form.specification" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" />
+ <el-form-item label="灏哄" prop="specification">
+ <el-input v-model="form.specification" placeholder="璇疯緭鍏ュ昂瀵�" />
</el-form-item>
</el-col>
</el-row>
@@ -220,7 +220,7 @@
{ label: "璧勪骇缂栧彿", prop: "assetCode", width: "130" },
{ label: "璧勪骇鍚嶇О", prop: "assetName", width: "150" },
{ label: "璧勪骇绫诲埆", prop: "category", dataType: "slot", slot: "category" },
- { label: "瑙勬牸鍨嬪彿", prop: "specification", width: "120" },
+ { label: "灏哄", prop: "specification", width: "120" },
{ label: "璧勪骇鍘熷��", prop: "originalValue", dataType: "slot", slot: "originalValue" },
{ label: "绱鎶樻棫", prop: "accumulatedDepreciation", dataType: "slot", slot: "accumulatedDepreciation" },
{ label: "璧勪骇鍑�鍊�", prop: "netValue", dataType: "slot", slot: "netValue" },
diff --git a/src/views/inventoryManagement/stockManagement/BatchNoQtyDetail.vue b/src/views/inventoryManagement/stockManagement/BatchNoQtyDetail.vue
index a835ef4..8c6da93 100644
--- a/src/views/inventoryManagement/stockManagement/BatchNoQtyDetail.vue
+++ b/src/views/inventoryManagement/stockManagement/BatchNoQtyDetail.vue
@@ -21,7 +21,7 @@
prop="productName"
show-overflow-tooltip
/>
- <el-table-column label="瑙勬牸鍨嬪彿" prop="model" show-overflow-tooltip />
+ <el-table-column label="灏哄" prop="model" show-overflow-tooltip />
<el-table-column label="鍗曚綅" prop="unit" show-overflow-tooltip />
<el-table-column label="鎵瑰彿" prop="batchNo" show-overflow-tooltip />
<el-table-column
diff --git a/src/views/inventoryManagement/stockManagement/Record.vue b/src/views/inventoryManagement/stockManagement/Record.vue
index c985ef5..8d18ad7 100644
--- a/src/views/inventoryManagement/stockManagement/Record.vue
+++ b/src/views/inventoryManagement/stockManagement/Record.vue
@@ -251,7 +251,7 @@
// 鐐瑰嚮璇︽儏
const showDetailModal = (row) => {
if (!row?.productId || !row?.productModelId) {
- proxy.$modal.msgError("褰撳墠鏁版嵁缂哄皯浜у搧ID鎴栬鏍煎瀷鍙稩D");
+ proxy.$modal.msgError("褰撳墠鏁版嵁缂哄皯浜у搧ID鎴栧昂瀵窱D");
return;
}
record.value = row;
diff --git a/src/views/inventoryManagement/stockReport/index.vue b/src/views/inventoryManagement/stockReport/index.vue
index 26bc8a0..57e5b92 100644
--- a/src/views/inventoryManagement/stockReport/index.vue
+++ b/src/views/inventoryManagement/stockReport/index.vue
@@ -166,7 +166,7 @@
<el-table-column label="浜у搧澶х被"
prop="productName"
show-overflow-tooltip />
- <el-table-column label="瑙勬牸鍨嬪彿"
+ <el-table-column label="灏哄"
prop="model"
show-overflow-tooltip />
<el-table-column label="鍗曚綅"
diff --git a/src/views/procurementManagement/purchaseReturnOrder/index.vue b/src/views/procurementManagement/purchaseReturnOrder/index.vue
index f8866e1..2ec9e0b 100644
--- a/src/views/procurementManagement/purchaseReturnOrder/index.vue
+++ b/src/views/procurementManagement/purchaseReturnOrder/index.vue
@@ -135,7 +135,7 @@
show-overflow-tooltip
/>
<el-table-column
- label="瑙勬牸鍨嬪彿"
+ label="灏哄"
prop="specificationModel"
min-width="140"
show-overflow-tooltip
diff --git a/src/views/productionManagement/productStructure/index.vue b/src/views/productionManagement/productStructure/index.vue
index e05ed3c..18ccbc1 100644
--- a/src/views/productionManagement/productStructure/index.vue
+++ b/src/views/productionManagement/productStructure/index.vue
@@ -141,7 +141,7 @@
minWidth: 160,
},
{
- label: "瑙勬牸鍨嬪彿",
+ label: "灏哄",
prop: "productModelName",
minWidth: 140,
},
diff --git a/src/views/productionManagement/productionCosting/index.vue b/src/views/productionManagement/productionCosting/index.vue
index 3e79b93..4cf4330 100644
--- a/src/views/productionManagement/productionCosting/index.vue
+++ b/src/views/productionManagement/productionCosting/index.vue
@@ -110,7 +110,7 @@
minWidth: 100,
},
{
- label: "瑙勬牸鍨嬪彿",
+ label: "灏哄",
prop: "productModelName",
minWidth: 100,
},
diff --git a/src/views/productionManagement/productionTraceability/index.vue b/src/views/productionManagement/productionTraceability/index.vue
index ab1c34a..7407ba5 100644
--- a/src/views/productionManagement/productionTraceability/index.vue
+++ b/src/views/productionManagement/productionTraceability/index.vue
@@ -235,7 +235,7 @@
<el-descriptions-item label="鎶ュ伐鍗曞彿">{{ record.reportNo || '-' }}</el-descriptions-item>
<el-descriptions-item label="妫�楠屽憳">{{ record.userName || '-' }}</el-descriptions-item>
<el-descriptions-item label="浜у搧鍚嶇О">{{ record.productName || '-' }}</el-descriptions-item>
- <el-descriptions-item label="瑙勬牸鍨嬪彿">{{ record.model || '-' }}</el-descriptions-item>
+ <el-descriptions-item label="灏哄">{{ record.model || '-' }}</el-descriptions-item>
<el-descriptions-item label="鏁伴噺">{{ record.quantity || 0 }} {{ record.unit || '-' }}</el-descriptions-item>
<el-descriptions-item label="妫�娴嬪崟浣�">{{ record.checkCompany || '-' }}</el-descriptions-item>
<el-descriptions-item label="妫�娴嬬粨鏋�">
diff --git a/src/views/qualityManagement/processInspection/components/formDia.vue b/src/views/qualityManagement/processInspection/components/formDia.vue
index 88c1e20..aef2f16 100644
--- a/src/views/qualityManagement/processInspection/components/formDia.vue
+++ b/src/views/qualityManagement/processInspection/components/formDia.vue
@@ -42,7 +42,7 @@
</el-row>
<el-row :gutter="30">
<el-col :span="12">
- <el-form-item label="瑙勬牸鍨嬪彿锛�"
+ <el-form-item label="灏哄锛�"
prop="productModelId">
<el-select v-model="form.productModelId"
placeholder="璇烽�夋嫨"
@@ -297,7 +297,7 @@
};
testStandardOptions.value = [];
tableData.value = [];
- // 鍏堢‘淇濅骇鍝佹爲宸插姞杞斤紝鍚﹀垯缂栬緫鏃朵骇鍝�/瑙勬牸鍨嬪彿鏃犳硶鍙嶆樉
+ // 鍏堢‘淇濅骇鍝佹爲宸插姞杞斤紝鍚﹀垯缂栬緫鏃朵骇鍝�/灏哄鏃犳硶鍙嶆樉
await getProductOptions();
if (operationType.value === "edit") {
// 鍏堜繚瀛� testStandardId锛岄伩鍏嶈娓呯┖
@@ -305,7 +305,7 @@
// 鍏堣缃〃鍗曟暟鎹紝浣嗘殏鏃舵竻绌� testStandardId锛岀瓑閫夐」鍔犺浇瀹屾垚鍚庡啀璁剧疆
form.value = { ...row, testStandardId: "" };
currentProductId.value = row.productId || 0;
- // 鍏抽敭锛氱紪杈戞椂鍔犺浇瑙勬牸鍨嬪彿涓嬫媺閫夐」锛屾墠鑳藉弽鏄� productModelId
+ // 鍏抽敭锛氱紪杈戞椂鍔犺浇灏哄涓嬫媺閫夐」锛屾墠鑳藉弽鏄� productModelId
if (currentProductId.value) {
try {
const res = await modelList({ id: currentProductId.value });
@@ -315,7 +315,7 @@
handleChangeModel(form.value.productModelId);
}
} catch (e) {
- console.error("鍔犺浇瑙勬牸鍨嬪彿澶辫触", e);
+ console.error("鍔犺浇灏哄澶辫触", e);
modelOptions.value = [];
}
}
diff --git a/src/views/salesManagement/deliveryLedger/index.vue b/src/views/salesManagement/deliveryLedger/index.vue
index c8890cc..998e60e 100644
--- a/src/views/salesManagement/deliveryLedger/index.vue
+++ b/src/views/salesManagement/deliveryLedger/index.vue
@@ -77,7 +77,7 @@
show-overflow-tooltip
/>
<el-table-column
- label="瑙勬牸鍨嬪彿"
+ label="灏哄"
prop="specificationModel"
show-overflow-tooltip
/>
@@ -269,7 +269,7 @@
<el-descriptions-item label="浜у搧鍚嶇О">{{
detailRow.productName || "--"
}}</el-descriptions-item>
- <el-descriptions-item label="瑙勬牸鍨嬪彿">{{
+ <el-descriptions-item label="灏哄">{{
detailRow.specificationModel || "--"
}}</el-descriptions-item>
<el-descriptions-item label="鍙戣揣绫诲瀷">{{
@@ -314,7 +314,7 @@
show-overflow-tooltip
/>
<el-table-column
- label="瑙勬牸鍨嬪彿"
+ label="灏哄"
prop="specificationModel"
min-width="160"
show-overflow-tooltip
diff --git a/src/views/salesManagement/returnOrder/components/detailDia.vue b/src/views/salesManagement/returnOrder/components/detailDia.vue
index ecc663f..ac54b68 100644
--- a/src/views/salesManagement/returnOrder/components/detailDia.vue
+++ b/src/views/salesManagement/returnOrder/components/detailDia.vue
@@ -249,7 +249,7 @@
{align: "center", label: "鍑哄簱鍗曞彿", prop: "outboundBatches"},
{align: "center", label: "鎵规鍙�", prop: "batchNo"},
{align: "center", label: "浜у搧澶х被", prop: "productName"},
- {align: "center", label: "瑙勬牸鍨嬪彿", prop: "model"},
+ {align: "center", label: "灏哄", prop: "model"},
{align: "center", label: "鍗曚綅", prop: "unit", width: 80},
{align: "center", label: "鎬绘暟閲�", prop: "stockOutNum", width: 120},
{align: "center", label: "宸查��璐ф暟閲�", prop: "totalReturnNum", width: 120, dataType: "slot", slot: "totalReturnNum"},
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index 3f2203a..b736633 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -95,7 +95,7 @@
type="index" />
<el-table-column label="浜у搧澶х被"
prop="productCategory" />
- <el-table-column label="瑙勬牸鍨嬪彿"
+ <el-table-column label="灏哄"
prop="specificationModel" />
<el-table-column label="鍗曚綅"
prop="unit" />
@@ -437,7 +437,7 @@
width="60" />
<el-table-column label="浜у搧澶х被"
prop="productCategory" />
- <el-table-column label="瑙勬牸鍨嬪彿"
+ <el-table-column label="灏哄"
prop="specificationModel" />
<el-table-column label="鍗曚綅"
prop="unit" />
@@ -610,7 +610,7 @@
</el-row>
<el-row :gutter="30">
<el-col :span="24">
- <el-form-item label="瑙勬牸鍨嬪彿锛�"
+ <el-form-item label="灏哄锛�"
prop="productModelId">
<el-select v-model="productForm.productModelId"
placeholder="璇烽�夋嫨"
@@ -819,7 +819,7 @@
<thead>
<tr>
<th>浜у搧鍚嶇О</th>
- <th>瑙勬牸鍨嬪彿</th>
+ <th>灏哄</th>
<th>鍗曚綅</th>
<th>鍗曚环</th>
<th>闆跺敭鏁伴噺</th>
@@ -1764,7 +1764,7 @@
if (type === "edit") {
productForm.value = { ...row };
productIndex.value = index;
- // 缂栬緫鏃舵牴鎹骇鍝佸ぇ绫诲悕绉板弽鏌� tree 鑺傜偣 id锛屽苟鍔犺浇瑙勬牸鍨嬪彿鍒楄〃
+ // 缂栬緫鏃舵牴鎹骇鍝佸ぇ绫诲悕绉板弽鏌� tree 鑺傜偣 id锛屽苟鍔犺浇灏哄鍒楄〃
try {
const options =
productOptions.value && productOptions.value.length > 0
@@ -1777,7 +1777,7 @@
if (categoryId) {
const models = await modelList({ id: categoryId });
modelOptions.value = models || [];
- // 鏍规嵁褰撳墠瑙勬牸鍨嬪彿鍚嶇О鍙嶆煡骞惰缃� productModelId锛屼究浜庝笅鎷夋鏄剧ず宸查�夊��
+ // 鏍规嵁褰撳墠灏哄鍚嶇О鍙嶆煡骞惰缃� productModelId锛屼究浜庝笅鎷夋鏄剧ず宸查�夊��
const currentModel = (modelOptions.value || []).find(
m => m.model === productForm.value.specificationModel
);
@@ -1787,7 +1787,7 @@
}
} catch (e) {
// 鍔犺浇澶辫触鏃朵繚鎸佸彲缂栬緫锛屼笉涓柇寮圭獥
- console.error("鍔犺浇浜у搧瑙勬牸鍨嬪彿澶辫触", e);
+ console.error("鍔犺浇浜у搧灏哄澶辫触", e);
}
} else {
getProductOptions();
@@ -2220,7 +2220,7 @@
<thead>
<tr>
<th>浜у搧鍚嶇О</th>
- <th>瑙勬牸鍨嬪彿</th>
+ <th>灏哄</th>
<th>鍗曚綅</th>
<th>鍗曚环</th>
<th>闆跺敭鏁伴噺</th>
--
Gitblit v1.9.3