From 8e063a311452a677a4938db9dfba9760472b272e Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 29 十二月 2025 10:13:28 +0800
Subject: [PATCH] 陕西昭德型煤： 1.供应商、客户新增时改成只有名称必填 2.总价相关字段改为四舍五入整数 3.下拉选择框加上筛选
---
src/views/procureMent/components/ProductionDialog.vue | 11 ++++++-----
src/views/equipment/management/mould/equipmentRequisitionDialog.vue | 2 ++
src/views/salesOutbound/components/formDia.vue | 6 +++---
src/views/basicInformation/mould/customer.vue | 18 ++++++++----------
src/views/production/components/ProductionDialog.vue | 2 +-
5 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/src/views/basicInformation/mould/customer.vue b/src/views/basicInformation/mould/customer.vue
index 37db037..9ae524b 100644
--- a/src/views/basicInformation/mould/customer.vue
+++ b/src/views/basicInformation/mould/customer.vue
@@ -197,24 +197,22 @@
{required: true, message: "璇疯緭鍏ヤ緵璐у晢鍚嶇О", trigger: "blur"},
],
taxpayerId: [
- {required: true, message: "璇锋纭緭鍏ョ撼绋庝汉璇嗗埆鍙�", trigger: "blur"},
- {min: 17, max: 20, message: "璇疯緭鍏�17-20浣嶇撼绋庝汉璇嗗埆鍙�", trigger: "blur"},
+ {required: false, message: "璇锋纭緭鍏ョ撼绋庝汉璇嗗埆鍙�", trigger: "blur"},
],
address: [
{
- required: true,
+ required: false,
message: "璇烽�夋嫨缁忚惀鍦板潃",
trigger: "change",
},
],
- bankAccount: [{required: true, message: "璇疯緭鍏ラ摱琛岃处鎴�", trigger: "blur"}],
- bankName: [{required: true, message: "璇疯緭鍏ュ紑鎴疯", trigger: "blur"}],
- contactPerson: [{required: true, message: "璇疯緭鍏ュ紑鎴疯", trigger: "blur"}],
- cids: [{required: true, message: "璇疯緭鍏ュ紑鎴疯", trigger: "blur"}],
- bids: [{required: true, message: "璇疯緭鍏ュ紑鎴疯", trigger: "blur"}],
+ bankAccount: [{required: false, message: "璇疯緭鍏ラ摱琛岃处鎴�", trigger: "blur"}],
+ bankName: [{required: false, message: "璇疯緭鍏ュ紑鎴疯", trigger: "blur"}],
+ contactPerson: [{required: false, message: "璇疯緭鍏ュ紑鎴疯", trigger: "blur"}],
+ cids: [{required: false, message: "璇疯緭鍏ュ紑鎴疯", trigger: "blur"}],
+ bids: [{required: false, message: "璇疯緭鍏ュ紑鎴疯", trigger: "blur"}],
contactPhone: [
- {required: true, message: "璇疯緭鍏ヨ仈绯讳汉", trigger: "blur"},
- {min: 11, max: 11, message: "璇疯緭鍏�11浣嶈仈绯讳汉鐢佃瘽", trigger: "blur"},
+ {required: false, message: "璇疯緭鍏ヨ仈绯讳汉", trigger: "blur"},
],
});
</script>
diff --git a/src/views/equipment/management/mould/equipmentRequisitionDialog.vue b/src/views/equipment/management/mould/equipmentRequisitionDialog.vue
index 9abe870..06186ed 100644
--- a/src/views/equipment/management/mould/equipmentRequisitionDialog.vue
+++ b/src/views/equipment/management/mould/equipmentRequisitionDialog.vue
@@ -14,6 +14,7 @@
placeholder="璇烽�夋嫨"
:disabled="isViewMode || isReturnMode"
@change="getEquipment"
+ filterable
>
<el-option
v-for="item in userList"
@@ -28,6 +29,7 @@
v-model="form.equipmentId"
placeholder="璇烽�夋嫨"
:disabled="isViewMode || isReturnMode"
+ filterable
>
<el-option
v-for="item in equipmentList"
diff --git a/src/views/procureMent/components/ProductionDialog.vue b/src/views/procureMent/components/ProductionDialog.vue
index 859cbea..c6e50b9 100644
--- a/src/views/procureMent/components/ProductionDialog.vue
+++ b/src/views/procureMent/components/ProductionDialog.vue
@@ -21,6 +21,7 @@
v-model="form.supplierId"
placeholder="璇烽�夋嫨渚涘簲鍟�"
:disabled="isViewMode"
+ filterable
>
<el-option
:label="item.label"
@@ -35,6 +36,7 @@
v-model="form.coalId"
placeholder="璇烽�夋嫨鐓ょ"
:disabled="isViewMode"
+ filterable
>
<el-option
:label="item.label"
@@ -50,6 +52,7 @@
placeholder="璇疯緭鍏�"
@blur="handleQuantityBlur"
:disabled="isViewMode"
+ oninput="value=value.replace(/[^0-9]/g,'')"
>
<template v-slot:suffix>
<i style="font-style: normal">鍚�</i>
@@ -324,10 +327,7 @@
form.value.purchaseQuantity !== undefined &&
form.value.purchaseQuantity !== ""
) {
- form.value.purchaseQuantity = toFixed(
- parseFloat(form.value.purchaseQuantity),
- 3
- ); // 鏁伴噺淇濈暀3浣嶅皬鏁�
+ form.value.purchaseQuantity = parseInt(form.value.purchaseQuantity) || 0; // 鏁伴噺杞负鏁存暟
// watch 浼氳嚜鍔ㄨЕ鍙� calculatePrices锛屼笉闇�瑕佹墜鍔ㄨ皟鐢�
}
};
@@ -346,7 +346,8 @@
coal: [{ required: true, message: "璇疯緭鍏ョ叅绉�", trigger: "blur" }],
purchaseQuantity: [
{ required: true, message: "璇疯緭鍏ラ噰璐暟閲�", trigger: "blur" },
- { type: "number", message: "閲囪喘鏁伴噺蹇呴』涓烘暟瀛�", trigger: "blur" },
+ { type: "integer", message: "閲囪喘鏁伴噺蹇呴』涓烘暣鏁�", trigger: "blur" },
+ { pattern: /^\d+$/, message: "閲囪喘鏁伴噺蹇呴』涓烘鏁存暟", trigger: "blur" },
],
priceExcludingTax: [
{ required: true, message: "璇疯緭鍏ュ崟浠�", trigger: "blur" },
diff --git a/src/views/production/components/ProductionDialog.vue b/src/views/production/components/ProductionDialog.vue
index 4a21fa4..83f977b 100644
--- a/src/views/production/components/ProductionDialog.vue
+++ b/src/views/production/components/ProductionDialog.vue
@@ -2,7 +2,7 @@
<el-dialog
v-model="dialogVisible"
:title="dialogType === 'add' ? '鏂板鐢熶骇鍔犲伐' : dialogType === 'viewRow' ? '鏌ョ湅鐢熶骇鍔犲伐' : '缂栬緫鐢熶骇鍔犲伐'"
- width="1200px"
+ width="1400px"
:close-on-click-modal="false"
@close="handleClose"
>
diff --git a/src/views/salesOutbound/components/formDia.vue b/src/views/salesOutbound/components/formDia.vue
index 48a9b44..3faf617 100644
--- a/src/views/salesOutbound/components/formDia.vue
+++ b/src/views/salesOutbound/components/formDia.vue
@@ -20,7 +20,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="瀹㈡埛" prop="customerId">
- <el-select v-model="form.customerId" placeholder="璇烽�夋嫨瀹㈡埛" :disabled="operationType === 'view'">
+ <el-select v-model="form.customerId" placeholder="璇烽�夋嫨瀹㈡埛" :disabled="operationType === 'view'" filterable>
<el-option
v-for="item in customerOptions"
:key="item.value"
@@ -34,7 +34,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="鐓ょ" prop="coalId">
- <el-select v-model="form.coalId" placeholder="璇烽�夋嫨鐓ょ" @change="setInfo" :disabled="operationType === 'view'">
+ <el-select v-model="form.coalId" placeholder="璇烽�夋嫨鐓ょ" @change="setInfo" :disabled="operationType === 'view'" filterable>
<el-option
v-for="item in coalOptions"
:key="item.coalId"
@@ -237,7 +237,7 @@
}
// 璁＄畻
const mathProfit = () => {
- form.value.totalAmount = form.value.saleQuantity * form.value.salePrice
+ form.value.totalAmount = Math.round(form.value.saleQuantity * form.value.salePrice)
// 杈撳叆鏁版嵁
const purchaseTons = form.value.inventoryQuantity; // 搴撳瓨鏁伴噺
const saleTons = form.value.saleQuantity; // 閿�鍞暟閲�
--
Gitblit v1.9.3