From ae5cdfbb2fc7d8581b18360658f5837d690222e8 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期日, 21 六月 2026 13:28:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_河南鹤壁_泽淇实业' into dev_pro_河南鹤壁_泽淇实业
---
src/views/inventoryManagement/stockManagement/New.vue | 4
src/views/salesManagement/deliveryLedger/index.vue | 14 +-
src/views/customerService/feedbackRegistration/components/formDia.vue | 4
src/views/basicData/product/index.vue | 24 ++--
src/views/equipmentManagement/upkeep/Form/PlanModal.vue | 1
src/views/basicData/parameterMaintenance/index.vue | 5 +
src/views/salesManagement/receiptPaymentLedger/index.vue | 4
src/views/basicData/customerFileOpenSea/index.vue | 64 ++++++------
src/views/customerService/components/viewDia.vue | 4
src/views/salesManagement/salesLedger/index.vue | 66 +++++++++++-
src/views/salesManagement/paymentShipping/index.vue | 4
src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue | 4
src/views/energyManagement/meterArchive/index.vue | 6 +
src/views/inventoryManagement/dispatchLog/Record.vue | 8 +
src/views/procurementManagement/procurementLedger/index.vue | 7 -
src/views/basicData/customerFile/index.vue | 16 +-
src/main.js | 17 +++
src/views/inventoryManagement/stockManagement/BatchNoQtyDetail.vue | 14 +-
src/views/equipmentManagement/upkeep/Form/formDia.vue | 2
src/views/inventoryManagement/stockManagement/Record.vue | 10 +-
src/views/inventoryManagement/receiptManagement/Record.vue | 4
21 files changed, 179 insertions(+), 103 deletions(-)
diff --git a/src/main.js b/src/main.js
index 025ff14..4282195 100644
--- a/src/main.js
+++ b/src/main.js
@@ -115,5 +115,22 @@
size: Cookies.get("size") || "default",
});
app._context.components.ElDialog.props.closeOnClickModal.default = false;
+const ElTable = app._context.components.ElTable;
+if (ElTable?.props?.tooltipOptions) {
+ if (ElTable.props.tooltipOptions === Object) {
+ ElTable.props.tooltipOptions = {
+ type: Object,
+ default: () => ({
+ appendTo: "body",
+ }),
+ };
+ } else if (typeof ElTable.props.tooltipOptions === "object") {
+ ElTable.props.tooltipOptions.default =
+ ElTable.props.tooltipOptions.default ||
+ (() => ({
+ appendTo: "body",
+ }));
+ }
+}
app.mount("#app");
diff --git a/src/views/basicData/customerFile/index.vue b/src/views/basicData/customerFile/index.vue
index 237b6ce..f0f7c4d 100644
--- a/src/views/basicData/customerFile/index.vue
+++ b/src/views/basicData/customerFile/index.vue
@@ -18,8 +18,8 @@
@change="handleQuery">
<el-option label="闆跺敭瀹㈡埛"
value="闆跺敭瀹㈡埛" />
- <el-option label="杩涢攢鍟嗗鎴�"
- value="杩涢攢鍟嗗鎴�" />
+ <el-option label="缁忛攢鍟嗗鎴�"
+ value="缁忛攢鍟嗗鎴�" />
</el-select>
<el-button type="primary"
@click="handleQuery"
@@ -131,8 +131,8 @@
clearable>
<el-option label="闆跺敭瀹㈡埛"
value="闆跺敭瀹㈡埛" />
- <el-option label="杩涢攢鍟嗗鎴�"
- value="杩涢攢鍟嗗鎴�" />
+ <el-option label="缁忛攢鍟嗗鎴�"
+ value="缁忛攢鍟嗗鎴�" />
</el-select>
</el-form-item>
</el-col>
@@ -415,14 +415,14 @@
<span class="info-value">{{ detailForm.companyAddress }}</span>
</div>
</el-col>
- <el-col :span="12">
+ <!-- <el-col :span="12">
<div class="info-item">
<span class="info-label">閾惰鍩烘湰鎴凤細</span>
<span class="info-value">{{ detailForm.basicBankAccount }}</span>
</div>
- </el-col>
+ </el-col> -->
</el-row>
- <el-row :gutter="20">
+ <!-- <el-row :gutter="20">
<el-col :span="12">
<div class="info-item">
<span class="info-label">閾惰璐﹀彿锛�</span>
@@ -435,7 +435,7 @@
<span class="info-value">{{ detailForm.bankCode }}</span>
</div>
</el-col>
- </el-row>
+ </el-row> -->
<el-row :gutter="20">
<el-col :span="12">
<div class="info-item">
diff --git a/src/views/basicData/customerFileOpenSea/index.vue b/src/views/basicData/customerFileOpenSea/index.vue
index 4dadb96..23d192b 100644
--- a/src/views/basicData/customerFileOpenSea/index.vue
+++ b/src/views/basicData/customerFileOpenSea/index.vue
@@ -18,8 +18,8 @@
@change="handleQuery">
<el-option label="闆跺敭瀹㈡埛"
value="闆跺敭瀹㈡埛" />
- <el-option label="杩涢攢鍟嗗鎴�"
- value="杩涢攢鍟嗗鎴�" />
+ <el-option label="缁忛攢鍟嗗鎴�"
+ value="缁忛攢鍟嗗鎴�" />
</el-select>
<el-button type="primary"
@click="handleQuery"
@@ -93,7 +93,7 @@
</el-form-item>
</el-col>
</el-row>
- <el-row :gutter="30">
+ <!-- <el-row :gutter="30">
<el-col :span="12">
<el-form-item label="閾惰鍩烘湰鎴凤細"
prop="basicBankAccount">
@@ -110,16 +110,16 @@
clearable />
</el-form-item>
</el-col>
- </el-row>
+ </el-row> -->
<el-row :gutter="30">
- <el-col :span="12">
+ <!-- <el-col :span="12">
<el-form-item label="寮�鎴疯鍙凤細"
prop="bankCode">
<el-input v-model="form.bankCode"
placeholder="璇疯緭鍏�"
clearable />
</el-form-item>
- </el-col>
+ </el-col> -->
<el-col :span="12">
<el-form-item label="瀹㈡埛鍒嗙被锛�"
prop="customerType">
@@ -128,8 +128,8 @@
clearable>
<el-option label="闆跺敭瀹㈡埛"
value="闆跺敭瀹㈡埛" />
- <el-option label="杩涢攢鍟嗗鎴�"
- value="杩涢攢鍟嗗鎴�" />
+ <el-option label="缁忛攢鍟嗗鎴�"
+ value="缁忛攢鍟嗗鎴�" />
</el-select>
</el-form-item>
</el-col>
@@ -412,14 +412,14 @@
<span class="info-value">{{ detailForm.companyAddress }}</span>
</div>
</el-col>
- <el-col :span="12">
+ <!-- <el-col :span="12">
<div class="info-item">
<span class="info-label">閾惰鍩烘湰鎴凤細</span>
<span class="info-value">{{ detailForm.basicBankAccount }}</span>
</div>
- </el-col>
+ </el-col> -->
</el-row>
- <el-row :gutter="20">
+ <!-- <el-row :gutter="20">
<el-col :span="12">
<div class="info-item">
<span class="info-label">閾惰璐﹀彿锛�</span>
@@ -432,7 +432,7 @@
<span class="info-value">{{ detailForm.bankCode }}</span>
</div>
</el-col>
- </el-row>
+ </el-row> -->
<el-row :gutter="20">
<el-col :span="12">
<div class="info-item">
@@ -748,21 +748,21 @@
// prop: "followUpTime",
// width: 120,
// },
- {
- label: "閾惰鍩烘湰鎴�",
- prop: "basicBankAccount",
- width: 220,
- },
- {
- label: "閾惰璐﹀彿",
- prop: "bankAccount",
- width: 220,
- },
- {
- label: "寮�鎴疯鍙�",
- prop: "bankCode",
- width: 220,
- },
+ // {
+ // label: "閾惰鍩烘湰鎴�",
+ // prop: "basicBankAccount",
+ // width: 220,
+ // },
+ // {
+ // label: "閾惰璐﹀彿",
+ // prop: "bankAccount",
+ // width: 220,
+ // },
+ // {
+ // label: "寮�鎴疯鍙�",
+ // prop: "bankCode",
+ // width: 220,
+ // },
{
label: "缁存姢浜�",
prop: "maintainer",
@@ -854,11 +854,11 @@
},
rules: {
customerName: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- taxpayerIdentificationNumber: [
- { required: true, message: "璇疯緭鍏�", trigger: "blur" },
- ],
- companyAddress: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- companyPhone: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ // taxpayerIdentificationNumber: [
+ // { required: true, message: "璇疯緭鍏�", trigger: "blur" },
+ // ],
+ // companyAddress: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ // companyPhone: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
// contactPerson: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
// contactPhone: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
maintainer: [{ required: false, message: "璇烽�夋嫨", trigger: "change" }],
diff --git a/src/views/basicData/parameterMaintenance/index.vue b/src/views/basicData/parameterMaintenance/index.vue
index 2dbf5df..7f9bfb0 100644
--- a/src/views/basicData/parameterMaintenance/index.vue
+++ b/src/views/basicData/parameterMaintenance/index.vue
@@ -223,6 +223,7 @@
import { deptTreeSelect } from "@/api/system/user.js";
import PIMTable from "@/components/PIMTable/PIMTable.vue";
import { ElMessage, ElMessageBox } from "element-plus";
+ import { parseTime } from "@/utils/ruoyi";
const tableColumn = ref([
{
@@ -293,6 +294,10 @@
{
label: "鍒涘缓鏃堕棿",
prop: "createTime",
+ formatData: val => {
+ if (!val) return "";
+ return parseTime(val, "{y}-{m}-{d} {h}:{i}:{s}");
+ },
},
{
label: "鎿嶄綔",
diff --git a/src/views/basicData/product/index.vue b/src/views/basicData/product/index.vue
index b05b215..cdc8265 100644
--- a/src/views/basicData/product/index.vue
+++ b/src/views/basicData/product/index.vue
@@ -104,8 +104,10 @@
<el-form-item label="浜у搧鍚嶇О锛�"
prop="productName">
<el-input v-model="form.productName"
+ type="textarea"
+ resize="vertical"
placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�"
- maxlength="20"
+ maxlength="50"
show-word-limit
clearable
@keydown.enter.prevent />
@@ -132,17 +134,15 @@
:rules="modelRules"
ref="modelFormRef">
<el-row>
- <el-row>
- <el-col :span="24">
- <el-form-item label="浜у搧缂栧彿锛�"
- prop="productCode">
- <el-input v-model="modelForm.productCode"
- placeholder="璇疯緭鍏ヤ骇鍝佺紪鍙�"
- clearable
- @keydown.enter.prevent />
- </el-form-item>
- </el-col>
- </el-row>
+ <el-col :span="24">
+ <el-form-item label="浜у搧缂栧彿锛�"
+ prop="productCode">
+ <el-input v-model="modelForm.productCode"
+ placeholder="璇疯緭鍏ヤ骇鍝佺紪鍙�"
+ clearable
+ @keydown.enter.prevent />
+ </el-form-item>
+ </el-col>
<el-col :span="24">
<el-form-item label="瑙勬牸鍨嬪彿锛�"
prop="model">
diff --git a/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue b/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
index 2a45701..7c7524f 100644
--- a/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
+++ b/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
@@ -193,9 +193,9 @@
<el-descriptions-item label="鍙戣揣鏃ユ湡">{{ currentDelivery.shippingInfo.shippingDate || '--' }}</el-descriptions-item>
<el-descriptions-item label="瀹℃牳鐘舵��">{{ currentDelivery.shippingInfo.status || '--' }}</el-descriptions-item>
<el-descriptions-item label="鍙戣揣杞︾墝鍙�">{{ currentDelivery.shippingInfo.shippingCarNumber || '--' }}</el-descriptions-item>
- <el-descriptions-item label="蹇�掑叕鍙�">{{ currentDelivery.shippingInfo.expressCompany || '--' }}</el-descriptions-item>
+ <el-descriptions-item label="蹇�掑叕鍙�" v-if="false">{{ currentDelivery.shippingInfo.expressCompany || '--' }}</el-descriptions-item>
<el-descriptions-item label="蹇�掑崟鍙�"
- :span="2">{{ currentDelivery.shippingInfo.expressNumber || '--' }}</el-descriptions-item>
+ :span="2" v-if="false">{{ currentDelivery.shippingInfo.expressNumber || '--' }}</el-descriptions-item>
</el-descriptions>
<div style="margin-top: 20px;">
<h4>浜у搧鏄庣粏</h4>
diff --git a/src/views/customerService/components/viewDia.vue b/src/views/customerService/components/viewDia.vue
index 96452b4..29fe7c3 100644
--- a/src/views/customerService/components/viewDia.vue
+++ b/src/views/customerService/components/viewDia.vue
@@ -34,8 +34,8 @@
<el-table-column prop="productCategory" label="浜у搧澶х被" align="center" />
<el-table-column prop="specificationModel" label="瑙勬牸鍨嬪彿" align="center" />
<el-table-column prop="unit" label="鍗曚綅" align="center" />
- <el-table-column prop="expressCompany" label="蹇�掑叕鍙�" align="center" />
- <el-table-column prop="expressNumber" label="蹇�掑崟鍙�" align="center" />
+ <el-table-column prop="expressCompany" label="蹇�掑叕鍙�" align="center" v-if="false" />
+ <el-table-column prop="expressNumber" label="蹇�掑崟鍙�" align="center" v-if="false" />
<el-table-column prop="shippingCarNumber" label="鍙戣揣杞︾墝" align="center" />
<el-table-column prop="shippingDate" label="鍙戣揣鏃ユ湡" align="center" />
<el-table-column prop="quantity" label="鍞悗鏁伴噺" align="center" />
diff --git a/src/views/customerService/feedbackRegistration/components/formDia.vue b/src/views/customerService/feedbackRegistration/components/formDia.vue
index e606107..fcbc94c 100644
--- a/src/views/customerService/feedbackRegistration/components/formDia.vue
+++ b/src/views/customerService/feedbackRegistration/components/formDia.vue
@@ -235,8 +235,8 @@
dataType: "slot",
slot: "shippingStatus",
},
- { label: "蹇�掑叕鍙�", prop: "expressCompany", width: 140 },
- { label: "蹇�掑崟鍙�", prop: "expressNumber", width: 160 },
+ // { label: "蹇�掑叕鍙�", prop: "expressCompany", width: 140 },
+ // { label: "蹇�掑崟鍙�", prop: "expressNumber", width: 160 },
{
label: "鍙戣揣杞︾墝",
prop: "shippingCarNumber",
diff --git a/src/views/energyManagement/meterArchive/index.vue b/src/views/energyManagement/meterArchive/index.vue
index d22b847..121ecaa 100644
--- a/src/views/energyManagement/meterArchive/index.vue
+++ b/src/views/energyManagement/meterArchive/index.vue
@@ -36,6 +36,9 @@
{{ row.relayState === "1" ? "鍚堥椄" : row.relayState === "0" ? "鎷夐椄" : "鏈煡" }}
</el-tag>
</template>
+ <template #syncTime="{ row }">
+ {{ row.syncTime ? dayjs(row.syncTime).format('YYYY-MM-DD HH:mm:ss') : '-' }}
+ </template>
<template #operate="{ row }">
<el-button link type="primary" @click="openForm('edit', row)">缂栬緫</el-button>
<el-button v-if="row.source === 'manual'" link type="danger" @click="handleDelete(row)">鍒犻櫎</el-button>
@@ -49,6 +52,7 @@
<script setup>
import { onMounted, reactive, ref, toRefs } from "vue";
import { ElMessage, ElMessageBox } from "element-plus";
+import dayjs from "dayjs";
import FormDia from "./components/formDia.vue";
import { meterListPage, meterSync, meterDelete } from "@/api/energyManagement/tqdianbiao.js";
@@ -69,7 +73,7 @@
{ label: "鏉ユ簮", prop: "source", dataType: "slot", slot: "source", width: 80 },
{ label: "缁х數鍣�", prop: "relayState", dataType: "slot", slot: "relayState", width: 90 },
{ label: "澶囨敞", prop: "description", minWidth: 100 },
- { label: "鍚屾鏃堕棿", prop: "syncTime", minWidth: 160 },
+ { label: "鍚屾鏃堕棿", prop: "syncTime", dataType: "slot", slot: "syncTime", minWidth: 160 },
{ label: "鎿嶄綔", prop: "operate", dataType: "slot", slot: "operate", width: 120, fixed: "right" },
]);
diff --git a/src/views/equipmentManagement/upkeep/Form/PlanModal.vue b/src/views/equipmentManagement/upkeep/Form/PlanModal.vue
index 8a9cd98..29e218a 100644
--- a/src/views/equipmentManagement/upkeep/Form/PlanModal.vue
+++ b/src/views/equipmentManagement/upkeep/Form/PlanModal.vue
@@ -35,6 +35,7 @@
<el-form-item label="淇濆吇椤圭洰">
<el-input
v-model="form.machineryCategory"
+ type="textarea"
placeholder="璇疯緭鍏ヤ繚鍏婚」鐩�"
/>
</el-form-item>
diff --git a/src/views/equipmentManagement/upkeep/Form/formDia.vue b/src/views/equipmentManagement/upkeep/Form/formDia.vue
index 4b60954..60dda54 100644
--- a/src/views/equipmentManagement/upkeep/Form/formDia.vue
+++ b/src/views/equipmentManagement/upkeep/Form/formDia.vue
@@ -70,8 +70,8 @@
<el-form-item label="淇濆吇椤圭洰" prop="machineryCategory">
<el-input
v-model.trim="form.machineryCategory"
+ type="textarea"
placeholder="璇疯緭鍏ヤ繚鍏婚」鐩�"
- maxlength="100"
clearable
/>
</el-form-item>
diff --git a/src/views/inventoryManagement/dispatchLog/Record.vue b/src/views/inventoryManagement/dispatchLog/Record.vue
index 479a379..bb5c5c1 100644
--- a/src/views/inventoryManagement/dispatchLog/Record.vue
+++ b/src/views/inventoryManagement/dispatchLog/Record.vue
@@ -102,6 +102,7 @@
<el-table-column
label="鍑哄簱鏃ユ湡"
prop="createTime"
+ width="180"
show-overflow-tooltip
/>
<el-table-column
@@ -110,14 +111,15 @@
show-overflow-tooltip
/>
<el-table-column label="瑙勬牸鍨嬪彿" prop="model" show-overflow-tooltip />
- <el-table-column label="鎵瑰彿" prop="batchNo" show-overflow-tooltip />
- <el-table-column label="鍗曚綅" prop="unit" show-overflow-tooltip />
+ <el-table-column label="鎵瑰彿" prop="batchNo" width="150" show-overflow-tooltip />
+ <el-table-column label="鍗曚綅" prop="unit" width="80" show-overflow-tooltip />
<el-table-column
label="鍑哄簱鏁伴噺"
prop="stockOutNum"
+ width="80"
show-overflow-tooltip
/>
- <el-table-column label="鍑哄簱浜�" prop="createBy" show-overflow-tooltip />
+ <el-table-column label="鍑哄簱浜�" prop="createBy" width="100" show-overflow-tooltip />
<el-table-column label="鏉ユ簮" prop="recordType" show-overflow-tooltip>
<template #default="scope">
{{ getRecordType(scope.row.recordType) }}
diff --git a/src/views/inventoryManagement/receiptManagement/Record.vue b/src/views/inventoryManagement/receiptManagement/Record.vue
index 4c06227..f66d970 100644
--- a/src/views/inventoryManagement/receiptManagement/Record.vue
+++ b/src/views/inventoryManagement/receiptManagement/Record.vue
@@ -102,10 +102,11 @@
width="60"/>
<el-table-column label="鍏ュ簱鎵规"
prop="inboundBatches"
- width="200"
+ width="150"
show-overflow-tooltip/>
<el-table-column label="鍏ュ簱鏃堕棿"
prop="createTime"
+ width="160"
show-overflow-tooltip/>
<el-table-column label="浜у搧澶х被"
prop="productName"
@@ -115,6 +116,7 @@
show-overflow-tooltip/>
<el-table-column label="鎵瑰彿"
prop="batchNo"
+ width="180"
show-overflow-tooltip/>
<el-table-column label="鍗曚綅"
prop="unit"
diff --git a/src/views/inventoryManagement/stockManagement/BatchNoQtyDetail.vue b/src/views/inventoryManagement/stockManagement/BatchNoQtyDetail.vue
index a835ef4..639b7bd 100644
--- a/src/views/inventoryManagement/stockManagement/BatchNoQtyDetail.vue
+++ b/src/views/inventoryManagement/stockManagement/BatchNoQtyDetail.vue
@@ -29,12 +29,12 @@
prop="qualifiedQuantity"
show-overflow-tooltip
/>
- <el-table-column
+ <!-- <el-table-column
label="涓嶅悎鏍煎簱瀛樻暟閲�"
prop="unQualifiedQuantity"
show-overflow-tooltip
- />
- <el-table-column
+ /> -->
+ <!-- <el-table-column
label="鍚堟牸鍐荤粨鏁伴噺"
prop="qualifiedLockedQuantity"
show-overflow-tooltip
@@ -43,7 +43,7 @@
label="涓嶅悎鏍煎喕缁撴暟閲�"
prop="unQualifiedLockedQuantity"
show-overflow-tooltip
- />
+ /> -->
<el-table-column
label="搴撳瓨棰勮鏁伴噺"
prop="warnNum"
@@ -55,7 +55,7 @@
prop="updateTime"
show-overflow-tooltip
/>
- <el-table-column fixed="right" label="鎿嶄綔" min-width="180" align="center">
+ <el-table-column fixed="right" label="鎿嶄綔" min-width="100" align="center">
<template #default="scope">
<el-button
link
@@ -71,7 +71,7 @@
"
>棰嗙敤</el-button
>
- <el-button
+ <!-- <el-button
link
type="primary"
v-if="
@@ -80,7 +80,7 @@
"
@click="handleFrozen(scope.row)"
>鍐荤粨</el-button
- >
+ > -->
<el-button
link
type="primary"
diff --git a/src/views/inventoryManagement/stockManagement/New.vue b/src/views/inventoryManagement/stockManagement/New.vue
index 2addb95..3d4b398 100644
--- a/src/views/inventoryManagement/stockManagement/New.vue
+++ b/src/views/inventoryManagement/stockManagement/New.vue
@@ -45,8 +45,8 @@
placeholder="璇烽�夋嫨搴撳瓨绫诲瀷">
<el-option label="鍚堟牸搴撳瓨"
value="qualified" />
- <el-option label="涓嶅悎鏍煎簱瀛�"
- value="unqualified" />
+ <!-- <el-option label="涓嶅悎鏍煎簱瀛�"
+ value="unqualified" /> -->
</el-select>
</el-form-item>
<el-form-item label="搴撳瓨鏁伴噺"
diff --git a/src/views/inventoryManagement/stockManagement/Record.vue b/src/views/inventoryManagement/stockManagement/Record.vue
index d898a37..d871952 100644
--- a/src/views/inventoryManagement/stockManagement/Record.vue
+++ b/src/views/inventoryManagement/stockManagement/Record.vue
@@ -83,18 +83,18 @@
/>
<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 label="鎵瑰彿" prop="batchNo" show-overflow-tooltip /> -->
<el-table-column
label="鍚堟牸搴撳瓨鏁伴噺"
prop="qualifiedQuantity"
show-overflow-tooltip
/>
- <el-table-column
+ <!-- <el-table-column
label="涓嶅悎鏍煎簱瀛樻暟閲�"
prop="unQualifiedQuantity"
show-overflow-tooltip
- />
- <el-table-column
+ /> -->
+ <!-- <el-table-column
label="鍚堟牸鍐荤粨鏁伴噺"
prop="qualifiedLockedQuantity"
show-overflow-tooltip
@@ -103,7 +103,7 @@
label="涓嶅悎鏍煎喕缁撴暟閲�"
prop="unQualifiedLockedQuantity"
show-overflow-tooltip
- />
+ /> -->
<el-table-column
label="搴撳瓨棰勮鏁伴噺"
prop="warnNum"
diff --git a/src/views/procurementManagement/procurementLedger/index.vue b/src/views/procurementManagement/procurementLedger/index.vue
index 9bbe87e..e512edb 100644
--- a/src/views/procurementManagement/procurementLedger/index.vue
+++ b/src/views/procurementManagement/procurementLedger/index.vue
@@ -632,13 +632,6 @@
const { form, rules } = toRefs(data);
const { form: searchForm } = useFormData({
...data.searchForm,
- // 璁剧疆褰曞叆鏃ユ湡鑼冨洿涓哄綋澶�
- entryDate: [
- dayjs().startOf("day").format("YYYY-MM-DD"),
- dayjs().endOf("day").format("YYYY-MM-DD"),
- ],
- entryDateStart: dayjs().startOf("day").format("YYYY-MM-DD"),
- entryDateEnd: dayjs().endOf("day").format("YYYY-MM-DD"),
});
// 浜у搧琛ㄥ崟寮规鏁版嵁
diff --git a/src/views/salesManagement/deliveryLedger/index.vue b/src/views/salesManagement/deliveryLedger/index.vue
index c8890cc..9907cf6 100644
--- a/src/views/salesManagement/deliveryLedger/index.vue
+++ b/src/views/salesManagement/deliveryLedger/index.vue
@@ -22,7 +22,7 @@
@change="handleQuery"
/>
</el-form-item>
- <el-form-item label="蹇�掑崟鍙凤細">
+ <el-form-item label="蹇�掑崟鍙凤細" v-if="false">
<el-input
v-model="searchForm.expressNumber"
placeholder="璇疯緭鍏�"
@@ -99,11 +99,13 @@
<el-table-column
label="蹇�掑叕鍙�"
prop="expressCompany"
+ v-if="false"
show-overflow-tooltip
/>
<el-table-column
label="蹇�掑崟鍙�"
prop="expressNumber"
+ v-if="false"
show-overflow-tooltip
/>
<el-table-column
@@ -181,7 +183,7 @@
@change="handleShippingTypeChange"
>
<el-option label="璐ц溅" value="璐ц溅" />
- <el-option label="蹇��" value="蹇��" />
+ <el-option label="蹇��" value="蹇��" v-if="false" />
</el-select>
</el-form-item>
</el-col>
@@ -211,7 +213,7 @@
/>
</el-form-item>
</el-col>
- <el-col :span="24" v-else>
+ <el-col :span="24" v-else-if="false">
<el-form-item label="蹇�掑叕鍙革細" prop="expressCompany">
<el-input
v-model="form.expressCompany"
@@ -221,7 +223,7 @@
</el-form-item>
</el-col>
</el-row>
- <el-row :gutter="30" v-if="form.type === '蹇��'">
+ <el-row :gutter="30" v-if="false">
<el-col :span="24">
<el-form-item label="蹇�掑崟鍙凤細" prop="expressNumber">
<el-input
@@ -284,10 +286,10 @@
<el-descriptions-item label="鍙戣揣杞︾墝鍙�">{{
detailRow.shippingCarNumber || "--"
}}</el-descriptions-item>
- <el-descriptions-item label="蹇�掑叕鍙�">{{
+ <el-descriptions-item label="蹇�掑叕鍙�" v-if="false">{{
detailRow.expressCompany || "--"
}}</el-descriptions-item>
- <el-descriptions-item label="蹇�掑崟鍙�" :span="2">{{
+ <el-descriptions-item label="蹇�掑崟鍙�" :span="2" v-if="false">{{
detailRow.expressNumber || "--"
}}</el-descriptions-item>
<el-descriptions-item label="鍑哄簱鍗曞彿" :span="2">{{
diff --git a/src/views/salesManagement/paymentShipping/index.vue b/src/views/salesManagement/paymentShipping/index.vue
index 56caf3b..854ae6e 100644
--- a/src/views/salesManagement/paymentShipping/index.vue
+++ b/src/views/salesManagement/paymentShipping/index.vue
@@ -239,8 +239,8 @@
<el-select v-model="logisticsCompany" placeholder="璇烽�夋嫨鐗╂祦鍏徃" style="width: 100%">
<el-option label="椤轰赴閫熻繍" value="椤轰赴閫熻繍"></el-option>
<el-option label="鍦嗛�氶�熼��" value="鍦嗛�氶�熼��"></el-option>
- <el-option label="涓�氬揩閫�" value="涓�氬揩閫�"></el-option>
- <el-option label="鐢抽�氬揩閫�" value="鐢抽�氬揩閫�"></el-option>
+ <el-option label="涓�氬揩閫�" value="涓�氬揩閫�" v-if="false"></el-option>
+ <el-option label="鐢抽�氬揩閫�" value="鐢抽�氬揩閫�" v-if="false"></el-option>
<el-option label="闊佃揪閫熼��" value="闊佃揪閫熼��"></el-option>
</el-select>
</el-form-item>
diff --git a/src/views/salesManagement/receiptPaymentLedger/index.vue b/src/views/salesManagement/receiptPaymentLedger/index.vue
index 8852a32..715cb9e 100644
--- a/src/views/salesManagement/receiptPaymentLedger/index.vue
+++ b/src/views/salesManagement/receiptPaymentLedger/index.vue
@@ -4,7 +4,7 @@
style="margin-bottom: 20px;">
<div>
<span class="search_title">瀹㈡埛鍚嶇О锛�</span>
- <el-input v-model="searchForm.searchText"
+ <el-input v-model="searchForm.customerName"
style="width: 240px"
placeholder="杈撳叆瀹㈡埛鍚嶇О鎼滅储"
@change="handleQuery"
@@ -142,7 +142,7 @@
const recordTotal = ref(0);
const data = reactive({
searchForm: {
- searchText: "",
+ customerName: "",
invoiceDate: "",
},
});
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index be61035..ff5d53f 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -123,9 +123,11 @@
</el-table-column>
<el-table-column label="蹇�掑叕鍙�"
prop="expressCompany"
+ v-if="false"
show-overflow-tooltip />
<el-table-column label="蹇�掑崟鍙�"
prop="expressNumber"
+ v-if="false"
show-overflow-tooltip />
<el-table-column label="鍙戣揣杞︾墝"
minWidth="100px"
@@ -725,12 +727,33 @@
<el-col :span="12">
<el-form-item label="鏄惁鐢熶骇锛�"
prop="isProduction">
- <el-radio-group v-model="productForm.isProduction">
- <el-radio label="鏄�"
- :value="true" />
- <el-radio label="鍚�"
- :value="false" />
- </el-radio-group>
+ <div style="display: flex; align-items: center; width: 100%;">
+ <el-radio-group v-model="productForm.isProduction">
+ <el-radio label="鏄�"
+ :value="true" />
+ <el-radio label="鍚�"
+ :value="false" />
+ </el-radio-group>
+ <div
+ v-if="currentStock !== null"
+ :style="{
+ marginLeft: '20px',
+ padding: '0 12px',
+ height: '28px',
+ lineHeight: '28px',
+ borderRadius: '4px',
+ fontSize: '13px',
+ fontWeight: '500',
+ display: 'inline-block',
+ whiteSpace: 'nowrap',
+ backgroundColor: (productForm.quantity || 0) > currentStock ? '#fff0f0' : '#f0f9eb',
+ border: (productForm.quantity || 0) > currentStock ? '1px solid #ffcccc' : '1px solid #e1f3d8',
+ color: (productForm.quantity || 0) > currentStock ? '#f56c6c' : '#67c23a'
+ }"
+ >
+ <span>褰撳墠搴撳瓨锛歿{ currentStock }} {{ productForm.unit || '' }}</span>
+ </div>
+ </div>
</el-form-item>
</el-col>
</el-row>
@@ -917,6 +940,7 @@
<el-option label="璐ц溅"
value="璐ц溅" />
<el-option label="蹇��"
+ v-if="false"
value="蹇��" />
</el-select>
</el-form-item>
@@ -939,7 +963,7 @@
</el-form-item>
</el-col>
<el-col :span="24"
- v-else>
+ v-else-if="false">
<el-form-item label="蹇�掑叕鍙革細"
prop="expressCompany">
<el-input v-model="deliveryForm.expressCompany"
@@ -949,7 +973,7 @@
</el-col>
</el-row>
<el-row :gutter="30"
- v-if="deliveryForm.type === '蹇��'">
+ v-if="false">
<el-col :span="24">
<el-form-item label="蹇�掑崟鍙凤細"
prop="expressNumber">
@@ -1194,6 +1218,27 @@
item?.qualifiedQuantity ??
item?.stockQuantity;
return quantity ?? 0;
+ };
+ const currentStock = ref(null);
+ const fetchCurrentStock = async (productModelId) => {
+ if (!productModelId) {
+ currentStock.value = null;
+ return;
+ }
+ try {
+ const res = await getStockInventoryByModelId(productModelId);
+ const rawList = Array.isArray(res?.data)
+ ? res.data
+ : res?.data?.records || res?.data?.rows || [];
+ let total = 0;
+ rawList.forEach(item => {
+ total += Number(getDeliveryBatchQuantity(item) || 0);
+ });
+ currentStock.value = total;
+ } catch (e) {
+ console.error(e);
+ currentStock.value = 0;
+ }
};
const getCurrentDeliveryRowQuantity = () => {
return Number(currentDeliveryRow.value?.noQuantity || 0);
@@ -1460,6 +1505,7 @@
// 鑾峰彇tree瀛愭暟鎹�
const getModels = value => {
productForm.value.productCategory = findNodeById(productOptions.value, value);
+ currentStock.value = null;
modelList({ id: value }).then(res => {
modelOptions.value = res;
});
@@ -1469,9 +1515,11 @@
if (index !== -1) {
productForm.value.specificationModel = modelOptions.value[index].model;
productForm.value.unit = modelOptions.value[index].unit;
+ fetchCurrentStock(value);
} else {
productForm.value.specificationModel = null;
productForm.value.unit = null;
+ currentStock.value = null;
}
};
const findNodeById = (nodes, productId) => {
@@ -1795,6 +1843,7 @@
productOperationType.value = type;
productForm.value = {};
+ currentStock.value = null;
if (type === "add") {
productForm.value.isProduction = false;
}
@@ -1821,6 +1870,7 @@
);
if (currentModel) {
productForm.value.productModelId = currentModel.id;
+ fetchCurrentStock(currentModel.id);
}
}
} catch (e) {
--
Gitblit v1.9.3