From 783ea9ce91f352267d7c9f3c0cedf511ab9ad994 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期四, 19 三月 2026 08:59:58 +0800
Subject: [PATCH] Merge branch 'dev_KTHG' of http://114.132.189.42:9002/r/product-inventory-management into dev_KTHG
---
src/views/consumablesLogistics/receiptManagement/index.vue | 5 -
src/views/consumablesLogistics/dispatchLog/index.vue | 5 -
src/views/reportAnalysis/reportManagement/index.vue | 52 ++++++++--------
src/views/consumablesLogistics/stockManagement/index.vue | 4 -
src/views/inventoryManagement/receiptManagement/index.vue | 5 -
src/views/inventoryManagement/stockManagement/index.vue | 4 -
src/views/consumablesLogistics/receiptManagement/Record.vue | 24 ++++----
src/views/qualityManagement/nonconformingManagement/index.vue | 8 +-
src/views/inventoryManagement/dispatchLog/index.vue | 5 -
src/views/consumablesLogistics/dispatchLog/Record.vue | 24 ++++----
10 files changed, 54 insertions(+), 82 deletions(-)
diff --git a/src/views/consumablesLogistics/dispatchLog/Record.vue b/src/views/consumablesLogistics/dispatchLog/Record.vue
index d47db1e..1e78893 100644
--- a/src/views/consumablesLogistics/dispatchLog/Record.vue
+++ b/src/views/consumablesLogistics/dispatchLog/Record.vue
@@ -12,16 +12,16 @@
clearable
@change="handleQuery"
/>
- <span class="search_title ml10">鏉ユ簮锛�</span>
- <el-select v-model="searchForm.recordType"
- style="width: 240px"
- placeholder="璇烽�夋嫨"
- clearable>
- <el-option v-for="item in stockRecordTypeOptions"
- :key="item.value"
- :label="item.label"
- :value="item.value"/>
- </el-select>
+<!-- <span class="search_title ml10">鏉ユ簮锛�</span>-->
+<!-- <el-select v-model="searchForm.recordType"-->
+<!-- style="width: 240px"-->
+<!-- placeholder="璇烽�夋嫨"-->
+<!-- clearable>-->
+<!-- <el-option v-for="item in stockRecordTypeOptions"-->
+<!-- :key="item.value"-->
+<!-- :label="item.label"-->
+<!-- :value="item.value"/>-->
+<!-- </el-select>-->
<el-button type="primary" @click="handleQuery" style="margin-left: 10px"
>鎼滅储</el-button
>
@@ -86,13 +86,13 @@
prop="createBy"
show-overflow-tooltip
/>
- <el-table-column label="鏉ユ簮"
+ <!-- <el-table-column label="鏉ユ簮"
prop="recordType"
show-overflow-tooltip>
<template #default="scope">
{{ getRecordType(scope.row.recordType) }}
</template>
- </el-table-column>
+ </el-table-column> -->
<el-table-column
label="杞︾墝"
prop="licensePlateNo"
diff --git a/src/views/consumablesLogistics/dispatchLog/index.vue b/src/views/consumablesLogistics/dispatchLog/index.vue
index ec24005..5c630d4 100644
--- a/src/views/consumablesLogistics/dispatchLog/index.vue
+++ b/src/views/consumablesLogistics/dispatchLog/index.vue
@@ -22,11 +22,6 @@
label: '鍚堟牸鍑哄簱',
name: 'qualified',
type: '0'
- },
- {
- label: '涓嶅悎鏍煎嚭搴�',
- name: 'unqualified',
- type: '1'
}
]
})
diff --git a/src/views/consumablesLogistics/receiptManagement/Record.vue b/src/views/consumablesLogistics/receiptManagement/Record.vue
index 6108498..6161e67 100644
--- a/src/views/consumablesLogistics/receiptManagement/Record.vue
+++ b/src/views/consumablesLogistics/receiptManagement/Record.vue
@@ -15,16 +15,16 @@
style="width: 240px"
placeholder="璇疯緭鍏�"
clearable/>
- <span class="search_title ml10">鏉ユ簮锛�</span>
- <el-select v-model="searchForm.recordType"
- style="width: 240px"
- placeholder="璇烽�夋嫨"
- clearable>
- <el-option v-for="item in stockRecordTypeOptions"
- :key="item.value"
- :label="item.label"
- :value="item.value"/>
- </el-select>
+<!-- <span class="search_title ml10">鏉ユ簮锛�</span>-->
+<!-- <el-select v-model="searchForm.recordType"-->
+<!-- style="width: 240px"-->
+<!-- placeholder="璇烽�夋嫨"-->
+<!-- clearable>-->
+<!-- <el-option v-for="item in stockRecordTypeOptions"-->
+<!-- :key="item.value"-->
+<!-- :label="item.label"-->
+<!-- :value="item.value"/>-->
+<!-- </el-select>-->
<el-button type="primary"
@click="handleQuery"
style="margin-left: 10px">鎼滅储
@@ -92,13 +92,13 @@
<el-table-column label="鍏ュ簱浜�"
prop="createBy"
show-overflow-tooltip/>
- <el-table-column label="鏉ユ簮"
+ <!-- <el-table-column label="鏉ユ簮"
prop="recordType"
show-overflow-tooltip>
<template #default="scope">
{{ getRecordType(scope.row.recordType) }}
</template>
- </el-table-column>
+ </el-table-column> -->
<el-table-column label="杩囩鏃ユ湡"
prop="weighingDate"
v-if="type === '0'"
diff --git a/src/views/consumablesLogistics/receiptManagement/index.vue b/src/views/consumablesLogistics/receiptManagement/index.vue
index 0277a1d..525a065 100644
--- a/src/views/consumablesLogistics/receiptManagement/index.vue
+++ b/src/views/consumablesLogistics/receiptManagement/index.vue
@@ -21,11 +21,6 @@
label: '鍚堟牸鍏ュ簱',
name: 'qualified',
type: '0'
- },
- {
- label: '涓嶅悎鏍煎叆搴�',
- name: 'unqualified',
- type: '1'
}
])
diff --git a/src/views/consumablesLogistics/stockManagement/index.vue b/src/views/consumablesLogistics/stockManagement/index.vue
index aad9650..43f1d71 100644
--- a/src/views/consumablesLogistics/stockManagement/index.vue
+++ b/src/views/consumablesLogistics/stockManagement/index.vue
@@ -20,10 +20,6 @@
{
label: '鍚堟牸搴撳瓨',
name: 'qualified'
- },
- {
- label: '涓嶅悎鏍煎簱瀛�',
- name: 'unqualified'
}
])
diff --git a/src/views/inventoryManagement/dispatchLog/index.vue b/src/views/inventoryManagement/dispatchLog/index.vue
index 88d9984..1642d99 100644
--- a/src/views/inventoryManagement/dispatchLog/index.vue
+++ b/src/views/inventoryManagement/dispatchLog/index.vue
@@ -22,11 +22,6 @@
label: '鍚堟牸鍑哄簱',
name: 'qualified',
type: '0'
- },
- {
- label: '涓嶅悎鏍煎嚭搴�',
- name: 'unqualified',
- type: '1'
}
]
})
diff --git a/src/views/inventoryManagement/receiptManagement/index.vue b/src/views/inventoryManagement/receiptManagement/index.vue
index 8ca110f..3d4f549 100644
--- a/src/views/inventoryManagement/receiptManagement/index.vue
+++ b/src/views/inventoryManagement/receiptManagement/index.vue
@@ -21,11 +21,6 @@
label: '鍚堟牸鍏ュ簱',
name: 'qualified',
type: '0'
- },
- {
- label: '涓嶅悎鏍煎叆搴�',
- name: 'unqualified',
- type: '1'
}
])
diff --git a/src/views/inventoryManagement/stockManagement/index.vue b/src/views/inventoryManagement/stockManagement/index.vue
index 347de38..a78e9de 100644
--- a/src/views/inventoryManagement/stockManagement/index.vue
+++ b/src/views/inventoryManagement/stockManagement/index.vue
@@ -20,10 +20,6 @@
{
label: '鍚堟牸搴撳瓨',
name: 'qualified'
- },
- {
- label: '涓嶅悎鏍煎簱瀛�',
- name: 'unqualified'
}
])
diff --git a/src/views/qualityManagement/nonconformingManagement/index.vue b/src/views/qualityManagement/nonconformingManagement/index.vue
index a5079a0..ba6c7a1 100644
--- a/src/views/qualityManagement/nonconformingManagement/index.vue
+++ b/src/views/qualityManagement/nonconformingManagement/index.vue
@@ -90,21 +90,21 @@
width: 120
},
{
- label: "绫诲埆",
+ label: "妫�娴嬬被鍨�",
prop: "checkType",
dataType: "tag",
width: 120,
formatData: (params) => {
- if (params == 0) {
+ if (params === 0) {
return "鍏ュ巶妫�";
- } else if (params == 1) {
+ } else if (params === 1) {
return "杞﹂棿妫�";
} else {
return '鍑哄巶妫�';
}
},
formatType: (params) => {
- if (params == '涓嶅悎鏍�') {
+ if (params === '涓嶅悎鏍�') {
return "info";
} else if (params == '鍚堟牸') {
return "success";
diff --git a/src/views/reportAnalysis/reportManagement/index.vue b/src/views/reportAnalysis/reportManagement/index.vue
index dc9d486..3d2cee3 100644
--- a/src/views/reportAnalysis/reportManagement/index.vue
+++ b/src/views/reportAnalysis/reportManagement/index.vue
@@ -17,7 +17,7 @@
<div class="typeNum-left">
<img src="~@/assets/images/chartCard.svg" alt="鍥捐〃"
style="width: 40px; height: 40px; object-fit: contain;">
- <div class="typeNum-left-text">鍘熸潗鏂�</div>
+ <div class="typeNum-left-text">鍏ュ巶妫�</div>
</div>
<div class="typeNum-center">
<div class="typeNum-leftLine">-</div>
@@ -41,7 +41,7 @@
<div class="typeNum-left">
<img src="~@/assets/images/chartCard2.svg" alt="鍥捐〃"
style="width: 40px; height: 40px; object-fit: contain;">
- <div class="typeNum-left-text" style="color: #5EB334;">鍗婃垚鍝�</div>
+ <div class="typeNum-left-text" style="color: #5EB334;">杞﹂棿妫�</div>
</div>
<div class="typeNum-center">
<div class="typeNum-leftLine2">-</div>
@@ -65,7 +65,7 @@
<div class="typeNum-left">
<img src="~@/assets/images/chartCard3.svg" alt="鍥捐〃"
style="width: 40px; height: 40px; object-fit: contain;">
- <div class="typeNum-left-text" style="color: #8000FF;">鎴愬搧</div>
+ <div class="typeNum-left-text" style="color: #8000FF;">鍑哄巶妫�</div>
</div>
<div class="typeNum-center">
<div class="typeNum-leftLine3">-</div>
@@ -100,9 +100,9 @@
<div class="top-container flex-center">
<div class="quality-card blue-card">
<div class="quality-card-title">
- <img src="~@/assets/images/chartCard.svg" alt="鍘熸潗鏂�"
+ <img src="~@/assets/images/chartCard.svg" alt="鍏ュ巶妫�"
style="width: 24px; height: 24px; margin-right: 8px;">
- 鍘熸潗鏂欏悎鏍肩巼
+ 鍏ュ巶妫�鍚堟牸鐜�
</div>
<div class="quality-card-content">
<div class="quality-item">
@@ -125,9 +125,9 @@
</div>
<div class="quality-card green-card">
<div class="quality-card-title">
- <img src="~@/assets/images/chartCard2.svg" alt="鍗婃垚鍝�"
+ <img src="~@/assets/images/chartCard2.svg" alt="杞﹂棿妫�"
style="width: 24px; height: 24px; margin-right: 8px;">
- 鍗婃垚鍝佸悎鏍肩巼
+ 杞﹂棿妫�鍚堟牸鐜�
</div>
<div class="quality-card-content">
<div class="quality-item">
@@ -150,9 +150,9 @@
</div>
<div class="quality-card purple-card">
<div class="quality-card-title">
- <img src="~@/assets/images/chartCard3.svg" alt="鎴愬搧"
+ <img src="~@/assets/images/chartCard3.svg" alt="鍑哄巶妫�"
style="width: 24px; height: 24px; margin-right: 8px;">
- 鎴愬搧鍚堟牸鐜�
+ 鍑哄巶妫�鍚堟牸鐜�
</div>
<div class="quality-card-content">
<div class="quality-item">
@@ -199,15 +199,15 @@
</div>
<div class="container-line-right-bottom">
<div class="inspection-chart-box">
- <div class="chart-box-title">鍘熸潗鏂欐�绘暟</div>
+ <div class="chart-box-title">鍏ュ巶妫�鎬绘暟</div>
<div class="chart-box-num">{{ getYearlyStatValue(0, 'totalCount') }}</div>
</div>
<div class="inspection-chart-box">
- <div class="chart-box-title">鍗婃垚鍝佹�绘暟</div>
+ <div class="chart-box-title">杞﹂棿妫�鎬绘暟</div>
<div class="chart-box-num">{{ getYearlyStatValue(1, 'totalCount') }}</div>
</div>
<div class="inspection-chart-box">
- <div class="chart-box-title">鎴愬搧鎬绘暟</div>
+ <div class="chart-box-title">鍑哄巶妫�鎬绘暟</div>
<div class="chart-box-num">{{ getYearlyStatValue(2, 'totalCount') }}</div>
</div>
</div>
@@ -265,9 +265,9 @@
</div>
<!-- Tab 閫夋嫨鍣� -->
<div class="tab-selector">
- <div class="tab-item" :class="{ active: activeTab === 'raw' }" @click="activeTab = 'raw'">鍘熸潗鏂�</div>
- <div class="tab-item" :class="{ active: activeTab === 'semi' }" @click="activeTab = 'semi'">鍗婃垚鍝�</div>
- <div class="tab-item" :class="{ active: activeTab === 'final' }" @click="activeTab = 'final'">鎴愬搧</div>
+ <div class="tab-item" :class="{ active: activeTab === 'raw' }" @click="activeTab = 'raw'">鍏ュ巶妫�</div>
+ <div class="tab-item" :class="{ active: activeTab === 'semi' }" @click="activeTab = 'semi'">杞﹂棿妫�</div>
+ <div class="tab-item" :class="{ active: activeTab === 'final' }" @click="activeTab = 'final'">鍑哄巶妫�</div>
</div>
</el-card>
</el-col>
@@ -526,7 +526,7 @@
containLabel: true,
},
legend: {
- data: ["鍘熸潗鏂�", "鍗婃垚鍝�", "鎴愬搧"], // 鍥句緥鏁版嵁
+ data: ["鍏ュ巶妫�", "杞﹂棿妫�", "鍑哄巶妫�"], // 鍥句緥鏁版嵁
icon: ["circle", "circle", "circle"],
itemWidth: 10, // 璁剧疆鍥炬爣瀹藉害
itemHeight: 10,
@@ -556,7 +556,7 @@
},
series: [
{
- name: "鍘熸潗鏂�",
+ name: "鍏ュ巶妫�",
type: "bar",
barWidth: "15%",
data: monthlyCompletionDetailsData.value.map(item => item.rawMaterialCount),
@@ -565,7 +565,7 @@
},
},
{
- name: "鍗婃垚鍝�",
+ name: "杞﹂棿妫�",
type: "bar",
barWidth: "15%",
@@ -575,7 +575,7 @@
},
},
{
- name: "鎴愬搧",
+ name: "鍑哄巶妫�",
type: "bar",
barWidth: "15%",
@@ -606,9 +606,9 @@
type: "pie",
radius: "70%",
data: [
- { value: getYearlyStatValue(0, 'totalCount'), name: "鍘熸潗鏂�", itemStyle: { color: "#1890FF" } },
- { value: getYearlyStatValue(1, 'totalCount'), name: "鍗婃垚鍝�", itemStyle: { color: "#F7BA1E" } },
- { value: getYearlyStatValue(2, 'totalCount'), name: "鎴愬搧", itemStyle: { color: "#14C9C9" } },
+ { value: getYearlyStatValue(0, 'totalCount'), name: "鍏ュ巶妫�", itemStyle: { color: "#1890FF" } },
+ { value: getYearlyStatValue(1, 'totalCount'), name: "杞﹂棿妫�", itemStyle: { color: "#F7BA1E" } },
+ { value: getYearlyStatValue(2, 'totalCount'), name: "鍑哄巶妫�", itemStyle: { color: "#14C9C9" } },
],
label: {
show: true,
@@ -655,7 +655,7 @@
},
// 鍥句緥閰嶇疆
legend: {
- data: ["鍘熸潗鏂�", "鍗婃垚鍝�", "鎴愬搧"], // 鍥句緥鏁版嵁
+ data: ["鍏ュ巶妫�", "杞﹂棿妫�", "鍑哄巶妫�"], // 鍥句緥鏁版嵁
icon: ["circle", "circle", "circle"],
itemWidth: 10, // 璁剧疆鍥炬爣瀹藉害
itemHeight: 10,
@@ -688,7 +688,7 @@
// 绯诲垪鏁版嵁
series: [
{
- name: "鍘熸潗鏂�", // 绯诲垪鍚嶇О
+ name: "鍏ュ巶妫�", // 绯诲垪鍚嶇О
type: "line", // 鍥捐〃绫诲瀷涓烘姌绾垮浘
// stack: "Total", // 鍫嗗彔鍚嶇О
symbol: "circle",
@@ -698,7 +698,7 @@
data: monthlyPassRateData.value.map(item => item.rawMaterial.passRate),
},
{
- name: "鍗婃垚鍝�", // 绯诲垪鍚嶇О
+ name: "杞﹂棿妫�", // 绯诲垪鍚嶇О
type: "line", // 鍥捐〃绫诲瀷涓烘姌绾垮浘
// stack: "Total", // 鍫嗗彔鍚嶇О
symbol: "circle",
@@ -708,7 +708,7 @@
data: monthlyPassRateData.value.map(item => item.process.passRate),
},
{
- name: "鎴愬搧", // 绯诲垪鍚嶇О
+ name: "鍑哄巶妫�", // 绯诲垪鍚嶇О
type: "line", // 鍥捐〃绫诲瀷涓烘姌绾垮浘
// stack: "Total", // 鍫嗗彔鍚嶇О
symbol: "circle",
--
Gitblit v1.9.3