From 6216744c95c501f93d2c937228867b3cae5ad8cf Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 21 九月 2026 12:09:05 +0800
Subject: [PATCH] 新疆-融邦 1.销售台账根据类别修改展示字段 2.数据四舍五入
---
src/views/basicData/customerFile/index.vue | 79 ++++++++++++---
src/views/inventoryManagement/stockManagement/OilStockInDialog.vue | 36 +++---
src/views/basicData/customerFileOpenSea/index.vue | 79 ++++++++++++---
src/views/inventoryManagement/stockManagement/OilStockOutDialog.vue | 36 +++---
src/views/salesManagement/salesLedger/index.vue | 21 ----
5 files changed, 164 insertions(+), 87 deletions(-)
diff --git a/src/views/basicData/customerFile/index.vue b/src/views/basicData/customerFile/index.vue
index 562720d..2773c55 100644
--- a/src/views/basicData/customerFile/index.vue
+++ b/src/views/basicData/customerFile/index.vue
@@ -9,17 +9,6 @@
@change="handleQuery"
clearable
:prefix-icon="Search" />
- <span class="search_title">瀹㈡埛鍒嗙被锛�</span>
- <el-select v-model="searchForm.customerType"
- placeholder="璇烽�夋嫨"
- style="width: 240px"
- clearable
- @change="handleQuery">
- <el-option v-for="dict in customer_type"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value" />
- </el-select>
<el-button type="primary"
@click="handleQuery"
style="margin-left: 10px">鎼滅储</el-button>
@@ -40,6 +29,17 @@
@click="handleDelete">鍒犻櫎</el-button>
</div>
</div>
+ <!-- 鎸夈�屽鎴峰垎绫汇�嶆媶椤电锛涖�屽叏閮ㄣ�嶄笉甯﹀垎绫绘煡璇紝淇濊瘉杩樻病琛ュ垎绫荤殑鑰佹暟鎹篃鑳界湅鍒� -->
+ <el-tabs v-model="activeTab"
+ @tab-change="handleTabChange"
+ class="customer-tabs">
+ <el-tab-pane label="鍏ㄩ儴"
+ name="鍏ㄩ儴" />
+ <el-tab-pane label="閿�鍞鎴�"
+ name="閿�鍞鎴�" />
+ <el-tab-pane label="浠e偍瀹㈡埛"
+ name="浠e偍瀹㈡埛" />
+ </el-tabs>
<div class="table_list">
<PIMTable rowKey="id"
:column="tableColumn"
@@ -661,7 +661,14 @@
</template>
<script setup>
- import { onMounted, ref, reactive, getCurrentInstance, toRefs } from "vue";
+ import {
+ onMounted,
+ ref,
+ reactive,
+ getCurrentInstance,
+ toRefs,
+ watch,
+ } from "vue";
import { Search, Paperclip, Upload } from "@element-plus/icons-vue";
import {
addCustomerFollow,
@@ -933,7 +940,6 @@
const data = reactive({
searchForm: {
customerName: "",
- customerType: "",
type: 0
},
form: {
@@ -1054,14 +1060,37 @@
page.size = obj.limit;
getList();
};
+ // 鍏ㄩ儴 / 閿�鍞鎴� / 浠e偍瀹㈡埛涓変釜椤电锛屽悇鑷甫瀹㈡埛鍒嗙被鏌ュ悓涓�涓垪琛ㄦ帴鍙�
+ const activeTab = ref("鍏ㄩ儴");
+ // 銆屽叏閮ㄣ�嶄笉浼犲垎绫伙紙undefined 浼氳 axios 涓㈡帀锛夛紝閿�鍞�/浠e偍鎸夊瓧鍏稿�肩瓫锛�
+ // 瀛楀吀鐨� value 鏈繀灏辨槸涓枃鏍囩锛屾寜 label 鍙嶆煡鐪熷疄鍙栧�煎啀浼犳帴鍙�
+ const activeCustomerType = () => {
+ if (activeTab.value === "鍏ㄩ儴") {
+ return undefined;
+ }
+ const list = customer_type.value || [];
+ const hit = list.find(item => item.label === activeTab.value);
+ return hit ? hit.value : activeTab.value;
+ };
+ // 椤电鍒囨崲锛氭崲瀹㈡埛鍒嗙被閲嶆柊鏌ュ垪琛�
+ const handleTabChange = () => {
+ page.current = 1;
+ getList();
+ };
const getList = () => {
tableLoading.value = true;
- listCustomer({ ...searchForm.value, ...page }).then(res => {
+ listCustomer({
+ ...searchForm.value,
+ ...page,
+ customerType: activeCustomerType(),
+ }).then(res => {
tableLoading.value = false;
tableData.value = res.data.records;
page.total = res.data.total;
});
};
+ // 瀛楀吀鏄紓姝ユ媺鐨勶紝鍒拌揪鍚庢寜鐪熷疄瀛楀吀鍊奸噸鏌ヤ竴娆★紝閬垮厤棣栧睆鐢ㄤ腑鏂囨爣绛剧瓫涓嶅埌鏁版嵁
+ watch(customer_type, () => getList());
// 琛ㄦ牸閫夋嫨鏁版嵁
const handleSelectionChange = selection => {
selectedRows.value = selection;
@@ -1096,6 +1125,8 @@
},
];
form.value.type = 0;
+ // 瀹㈡埛鍒嗙被榛樿璺熼殢褰撳墠椤电
+ form.value.customerType = activeCustomerType();
form.value.maintenanceTime = getCurrentDate();
userListNoPage().then(res => {
userList.value = res.data;
@@ -1177,7 +1208,12 @@
type: "warning",
})
.then(() => {
- proxy.download("/basic/customer/export", {type: 0}, "瀹㈡埛妗f.xlsx");
+ // 瀵煎嚭璺熼殢褰撳墠椤电鐨勫鎴峰垎绫�
+ proxy.download(
+ "/basic/customer/export",
+ { type: 0, customerType: activeCustomerType() },
+ "瀹㈡埛妗f.xlsx"
+ );
})
.catch(() => {
proxy.$modal.msg("宸插彇娑�");
@@ -1604,6 +1640,19 @@
</script>
<style scoped lang="scss">
+ /* 閿�鍞鎴� / 浠e偍瀹㈡埛椤电锛氬彧瑕佹爣绛炬爮锛屽唴瀹圭敱涓嬫柟鍒楄〃灞曠ず */
+ .customer-tabs {
+ margin-bottom: 8px;
+
+ :deep(.el-tabs__header) {
+ margin-bottom: 0;
+ }
+
+ :deep(.el-tabs__content) {
+ display: none;
+ }
+ }
+
.detail-section {
margin-bottom: 20px;
padding: 15px;
diff --git a/src/views/basicData/customerFileOpenSea/index.vue b/src/views/basicData/customerFileOpenSea/index.vue
index 23e83dd..e5a7ef4 100644
--- a/src/views/basicData/customerFileOpenSea/index.vue
+++ b/src/views/basicData/customerFileOpenSea/index.vue
@@ -9,17 +9,6 @@
@change="handleQuery"
clearable
:prefix-icon="Search" />
- <span class="search_title">瀹㈡埛鍒嗙被锛�</span>
- <el-select v-model="searchForm.customerType"
- placeholder="璇烽�夋嫨"
- style="width: 240px"
- clearable
- @change="handleQuery">
- <el-option v-for="dict in customer_type"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value" />
- </el-select>
<el-button type="primary"
@click="handleQuery"
style="margin-left: 10px">鎼滅储</el-button>
@@ -37,6 +26,17 @@
@click="handleDelete">鍒犻櫎</el-button>
</div>
</div>
+ <!-- 鎸夈�屽鎴峰垎绫汇�嶆媶椤电锛涖�屽叏閮ㄣ�嶄笉甯﹀垎绫绘煡璇紝淇濊瘉杩樻病琛ュ垎绫荤殑鑰佹暟鎹篃鑳界湅鍒� -->
+ <el-tabs v-model="activeTab"
+ @tab-change="handleTabChange"
+ class="customer-tabs">
+ <el-tab-pane label="鍏ㄩ儴"
+ name="鍏ㄩ儴" />
+ <el-tab-pane label="閿�鍞鎴�"
+ name="閿�鍞鎴�" />
+ <el-tab-pane label="浠e偍瀹㈡埛"
+ name="浠e偍瀹㈡埛" />
+ </el-tabs>
<div class="table_list">
<PIMTable rowKey="id"
:column="tableColumn"
@@ -679,7 +679,14 @@
</template>
<script setup>
- import { onMounted, ref, reactive, getCurrentInstance, toRefs } from "vue";
+ import {
+ onMounted,
+ ref,
+ reactive,
+ getCurrentInstance,
+ toRefs,
+ watch,
+ } from "vue";
import { Search, Paperclip, Upload } from "@element-plus/icons-vue";
import {
addCustomerFollow,
@@ -985,7 +992,6 @@
const data = reactive({
searchForm: {
customerName: "",
- customerType: "",
type: 1
},
form: {
@@ -1104,15 +1110,38 @@
page.size = obj.limit;
getList();
};
+ // 鍏ㄩ儴 / 閿�鍞鎴� / 浠e偍瀹㈡埛涓変釜椤电锛屽悇鑷甫瀹㈡埛鍒嗙被鏌ュ悓涓�涓垪琛ㄦ帴鍙�
+ const activeTab = ref("鍏ㄩ儴");
+ // 銆屽叏閮ㄣ�嶄笉浼犲垎绫伙紙undefined 浼氳 axios 涓㈡帀锛夛紝閿�鍞�/浠e偍鎸夊瓧鍏稿�肩瓫锛�
+ // 瀛楀吀鐨� value 鏈繀灏辨槸涓枃鏍囩锛屾寜 label 鍙嶆煡鐪熷疄鍙栧�煎啀浼犳帴鍙�
+ const activeCustomerType = () => {
+ if (activeTab.value === "鍏ㄩ儴") {
+ return undefined;
+ }
+ const list = customer_type.value || [];
+ const hit = list.find(item => item.label === activeTab.value);
+ return hit ? hit.value : activeTab.value;
+ };
+ // 椤电鍒囨崲锛氭崲瀹㈡埛鍒嗙被閲嶆柊鏌ュ垪琛�
+ const handleTabChange = () => {
+ page.current = 1;
+ getList();
+ };
const getList = () => {
tableLoading.value = true;
const { total, ...queryPage } = page;
- listCustomer({ ...searchForm.value, ...queryPage }).then(res => {
+ listCustomer({
+ ...searchForm.value,
+ ...queryPage,
+ customerType: activeCustomerType(),
+ }).then(res => {
tableLoading.value = false;
tableData.value = res.data.records;
page.total = res.data.total;
});
};
+ // 瀛楀吀鏄紓姝ユ媺鐨勶紝鍒拌揪鍚庢寜鐪熷疄瀛楀吀鍊奸噸鏌ヤ竴娆★紝閬垮厤棣栧睆鐢ㄤ腑鏂囨爣绛剧瓫涓嶅埌鏁版嵁
+ watch(customer_type, () => getList());
// 琛ㄦ牸閫夋嫨鏁版嵁
const handleSelectionChange = selection => {
selectedRows.value = selection;
@@ -1148,6 +1177,8 @@
];
form.value.maintenanceTime = getCurrentDate();
form.value.type = 1;
+ // 瀹㈡埛鍒嗙被榛樿璺熼殢褰撳墠椤电
+ form.value.customerType = activeCustomerType();
userListNoPage().then(res => {
userList.value = res.data;
});
@@ -1313,7 +1344,12 @@
type: "warning",
})
.then(() => {
- proxy.download("/basic/customer/export", {type: 1}, "瀹㈡埛妗f.xlsx");
+ // 瀵煎嚭璺熼殢褰撳墠椤电鐨勫鎴峰垎绫�
+ proxy.download(
+ "/basic/customer/export",
+ { type: 1, customerType: activeCustomerType() },
+ "瀹㈡埛妗f.xlsx"
+ );
})
.catch(() => {
proxy.$modal.msg("宸插彇娑�");
@@ -1739,6 +1775,19 @@
</script>
<style scoped lang="scss">
+ /* 閿�鍞鎴� / 浠e偍瀹㈡埛椤电锛氬彧瑕佹爣绛炬爮锛屽唴瀹圭敱涓嬫柟鍒楄〃灞曠ず */
+ .customer-tabs {
+ margin-bottom: 8px;
+
+ :deep(.el-tabs__header) {
+ margin-bottom: 0;
+ }
+
+ :deep(.el-tabs__content) {
+ display: none;
+ }
+ }
+
.detail-section {
margin-bottom: 20px;
padding: 15px;
diff --git a/src/views/inventoryManagement/stockManagement/OilStockInDialog.vue b/src/views/inventoryManagement/stockManagement/OilStockInDialog.vue
index 0a40459..6759466 100644
--- a/src/views/inventoryManagement/stockManagement/OilStockInDialog.vue
+++ b/src/views/inventoryManagement/stockManagement/OilStockInDialog.vue
@@ -390,25 +390,25 @@
<el-col :span="12">
<el-form-item label="姣涢噸(鍚�)"
prop="grossWeight"
- :rules="[
- { required: true, message: '璇疯緭鍏ユ瘺閲�', trigger: 'blur' },
- { pattern: /^\d+$/, message: '鍙兘杈撳叆鏁存暟鏁板瓧', trigger: 'blur' },
- ]">
- <el-input v-model="formState.grossWeight"
- placeholder="璇疯緭鍏ユ暣鏁版暟瀛�"
- clearable />
+ :rules="[{ required: true, message: '璇疯緭鍏ユ瘺閲�', trigger: 'blur' }]">
+ <el-input-number v-model="formState.grossWeight"
+ :min="0"
+ :precision="2"
+ :controls="false"
+ placeholder="璇疯緭鍏ユ暟瀛楋紝鏈�澶氫繚鐣欎袱浣嶅皬鏁�"
+ style="width: 100%" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="鐨噸(鍚�)"
prop="tareWeight"
- :rules="[
- { required: true, message: '璇疯緭鍏ョ毊閲�', trigger: 'blur' },
- { pattern: /^\d+$/, message: '鍙兘杈撳叆鏁存暟鏁板瓧', trigger: 'blur' },
- ]">
- <el-input v-model="formState.tareWeight"
- placeholder="璇疯緭鍏ユ暣鏁版暟瀛�"
- clearable />
+ :rules="[{ required: true, message: '璇疯緭鍏ョ毊閲�', trigger: 'blur' }]">
+ <el-input-number v-model="formState.tareWeight"
+ :min="0"
+ :precision="2"
+ :controls="false"
+ placeholder="璇疯緭鍏ユ暟瀛楋紝鏈�澶氫繚鐣欎袱浣嶅皬鏁�"
+ style="width: 100%" />
</el-form-item>
</el-col>
</el-row>
@@ -523,22 +523,22 @@
},
});
- // 鍑�閲�(鍚�) = 姣涢噸 - 鐨噸
+ // 鍑�閲�(鍚�) = 姣涢噸 - 鐨噸锛屼繚鐣欎袱浣嶅皬鏁帮紙娴偣鐩稿噺浼氭湁绮惧害灏惧反锛�
const netWeight = computed(() => {
const g = formState.value.grossWeight;
const t = formState.value.tareWeight;
if ([g, t].some(v => v === null || v === undefined || v === "")) {
return null;
}
- return Number(g) - Number(t);
+ return Number((Number(g) - Number(t)).toFixed(2));
});
- // 浜忛噺(鍚�) = 鍑�閲嶇殑璐熸暟
+ // 浜忛噺(鍚�) = 鍑�閲嶇殑璐熸暟锛屼繚鐣欎袱浣嶅皬鏁�
const lossQuantity = computed(() => {
if (netWeight.value === null) {
return null;
}
- return -netWeight.value;
+ return Number((-netWeight.value).toFixed(2));
});
// 瀹為檯鍏ュ簱浣撶Н(鍗�) = 瀹為檯鍑�閲�(kg) 梅 瀵嗗害(kg/L)锛屽噣閲嶅惃 脳 1000 杞� kg
diff --git a/src/views/inventoryManagement/stockManagement/OilStockOutDialog.vue b/src/views/inventoryManagement/stockManagement/OilStockOutDialog.vue
index 587b66e..7b361a9 100644
--- a/src/views/inventoryManagement/stockManagement/OilStockOutDialog.vue
+++ b/src/views/inventoryManagement/stockManagement/OilStockOutDialog.vue
@@ -312,25 +312,25 @@
<el-col :span="12">
<el-form-item label="姣涢噸(鍚�)"
prop="grossWeight"
- :rules="[
- { required: true, message: '璇疯緭鍏ユ瘺閲�', trigger: 'blur' },
- { pattern: /^\d+$/, message: '鍙兘杈撳叆鏁存暟鏁板瓧', trigger: 'blur' },
- ]">
- <el-input v-model="formState.grossWeight"
- placeholder="璇疯緭鍏ユ暣鏁版暟瀛�"
- clearable />
+ :rules="[{ required: true, message: '璇疯緭鍏ユ瘺閲�', trigger: 'blur' }]">
+ <el-input-number v-model="formState.grossWeight"
+ :min="0"
+ :precision="2"
+ :controls="false"
+ placeholder="璇疯緭鍏ユ暟瀛楋紝鏈�澶氫繚鐣欎袱浣嶅皬鏁�"
+ style="width: 100%" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="鐨噸(鍚�)"
prop="tareWeight"
- :rules="[
- { required: true, message: '璇疯緭鍏ョ毊閲�', trigger: 'blur' },
- { pattern: /^\d+$/, message: '鍙兘杈撳叆鏁存暟鏁板瓧', trigger: 'blur' },
- ]">
- <el-input v-model="formState.tareWeight"
- placeholder="璇疯緭鍏ユ暣鏁版暟瀛�"
- clearable />
+ :rules="[{ required: true, message: '璇疯緭鍏ョ毊閲�', trigger: 'blur' }]">
+ <el-input-number v-model="formState.tareWeight"
+ :min="0"
+ :precision="2"
+ :controls="false"
+ placeholder="璇疯緭鍏ユ暟瀛楋紝鏈�澶氫繚鐣欎袱浣嶅皬鏁�"
+ style="width: 100%" />
</el-form-item>
</el-col>
</el-row>
@@ -634,22 +634,22 @@
},
});
- // 鍑�閲�(鍚�) = 姣涢噸 - 鐨噸
+ // 鍑�閲�(鍚�) = 姣涢噸 - 鐨噸锛屼繚鐣欎袱浣嶅皬鏁帮紙娴偣鐩稿噺浼氭湁绮惧害灏惧反锛�
const netWeight = computed(() => {
const g = formState.value.grossWeight;
const t = formState.value.tareWeight;
if ([g, t].some(v => v === null || v === undefined || v === "")) {
return null;
}
- return Number(g) - Number(t);
+ return Number((Number(g) - Number(t)).toFixed(2));
});
- // 浜忛噺(鍚�) = 鍑�閲嶇殑璐熸暟
+ // 浜忛噺(鍚�) = 鍑�閲嶇殑璐熸暟锛屼繚鐣欎袱浣嶅皬鏁�
const lossQuantity = computed(() => {
if (netWeight.value === null) {
return null;
}
- return -netWeight.value;
+ return Number((-netWeight.value).toFixed(2));
});
// 瀹為檯鍏ュ簱浣撶Н(鍗�) = 瀹為檯鍑�閲�(kg) 梅 瀵嗗害(kg/L)锛屽噣閲嶅惃 脳 1000 杞� kg
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index 1d2ca3e..f51d14e 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -691,13 +691,6 @@
prop="taxExclusiveTotalPrice"
:formatter="formattedNumber"
/>
- <el-table-column label="鏄惁鐢熶骇" prop="isProduction" width="150">
- <template #default="scope">
- <el-tag :type="scope.row.isProduction ? 'success' : 'info'">
- {{ scope.row.isProduction ? "鏄�" : "鍚�" }}
- </el-tag>
- </template>
- </el-table-column>
<el-table-column
fixed="right"
label="鎿嶄綔"
@@ -985,14 +978,6 @@
<el-option label="澧炴櫘绁�" value="澧炴櫘绁�" />
<el-option label="澧炰笓绁�" value="澧炰笓绁�" />
</el-select>
- </el-form-item>
- </el-col>
- <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>
</el-form-item>
</el-col>
</el-row>
@@ -1459,7 +1444,6 @@
taxInclusiveTotalPrice: "",
taxExclusiveTotalPrice: "",
invoiceType: "",
- isProduction: false,
},
productRules: {
productCategory: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
@@ -1480,7 +1464,6 @@
{ required: true, message: "璇疯緭鍏�", trigger: "blur" },
],
invoiceType: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
- isProduction: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
},
});
const { productForm, productRules } = toRefs(productFormData);
@@ -2116,7 +2099,6 @@
taxInclusiveTotalPrice: taxInclusiveTotalPrice,
taxExclusiveTotalPrice: taxExclusiveTotalPrice,
invoiceType: "澧炴櫘绁�",
- isProduction: true,
productId: p.productId,
productModelId: p.productModelId,
};
@@ -2192,9 +2174,6 @@
productOperationType.value = type;
productForm.value = {};
- if (type === "add") {
- productForm.value.isProduction = true;
- }
proxy.resetForm("productFormRef");
if (type === "edit") {
productForm.value = { ...row };
--
Gitblit v1.9.3