From 4ef09716dc93b7259751034fdd42f380225e6730 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 11 九月 2023 11:25:27 +0800
Subject: [PATCH] Crunchy-09/11
---
src/components/view/rawInsDetail.vue | 10 +++-
src/components/view/rawUnqualified/raw.vue | 62 +++++++++++++++++++++++++++---
src/components/view/unqualifiedManagement.vue | 6 +-
src/assets/api/controller.js | 3 +
4 files changed, 67 insertions(+), 14 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 495713d..791c5ed 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -27,7 +27,8 @@
}
//涓嶅悎鏍煎師鏉愭枡
const unqualifiedaa ={
- selectUnRawInspectsList: "/inspectUnaccepted/selectURawMaterials"
+ selectUnRawInspectsList: "/inspectUnaccepted/selectURawMaterials", // 鏌ヨ鍘熸潗鏂欎笉鍚堟牸鍝佹楠屽崟鍒楄〃
+ evaluatePassOrNo: "/inspectUnaccepted/evaluatePassOrNo" // 璇勫
}
// 鏌ヨ鎴愬搧涓嶅悎鏍煎搧绠＄悊
const unRawInspects ={
diff --git a/src/components/view/rawInsDetail.vue b/src/components/view/rawInsDetail.vue
index 9f5a5d6..2ab34d0 100644
--- a/src/components/view/rawInsDetail.vue
+++ b/src/components/view/rawInsDetail.vue
@@ -118,7 +118,7 @@
<el-col :span="7">
<el-form-item label="渚涘簲鍟嗗悕绉�:">
<el-input
- :placeholder="detailId !== null ? '' : '璇疯緭鍏ユ楠屾暟閲�'"
+ :placeholder="detailId !== null ? '' : '璇疯緭鍏ヤ緵搴斿晢鍚嶇О'"
:disabled="detailId !== null"
v-model="detailInfo.supplier"
></el-input>
@@ -274,7 +274,7 @@
<el-table :data="conclusionTable" style="100%">
<el-table-column prop="code" label="鐗╂枡缂栧彿"> </el-table-column>
<el-table-column prop="name" label="鐗╂枡鍚嶇О"> </el-table-column>
- <el-table-column prop="uName" label="妫�楠屽憳">
+ <el-table-column v-if="detailId != null" prop="uName" label="妫�楠屽憳">
<template slot-scope="scope">
<span
v-for="item in scope.row.uName"
@@ -439,7 +439,11 @@
this.projectTable = res.data.children;
this.projectTable.forEach(i => {
// 瑙ｅ喅閲嶆柊璧嬪�兼棤娉曠紪杈戞搷浣�
- this.$set(i, "testValueList", i.testValue.split(","));
+ if (i.testValue == null) {
+ this.$set(i, "testValueList", []);
+ } else {
+ this.$set(i, "testValueList", i.testValue.split(","));
+ }
// 鍙栨渶闀跨殑鍒楄〃鏁�
if (i.testValueList.length > this.empiricalValueAdd) {
this.empiricalValueAdd = i.testValueList.length;
diff --git a/src/components/view/rawUnqualified/raw.vue b/src/components/view/rawUnqualified/raw.vue
index a92a38f..527f21c 100644
--- a/src/components/view/rawUnqualified/raw.vue
+++ b/src/components/view/rawUnqualified/raw.vue
@@ -108,25 +108,61 @@
</el-table-column>
<el-table-column prop="deal_reasult" label="澶勭悊缁撴灉" width="100">
<template slot-scope="scope">
- <span style="color:#34BD66;" v-if="scope.row.deal_reasult == 1"
+ <span style="color:#E84738;" v-if="scope.row.deal_reasult == 0"
>涓嶉�氳繃</span
>
<span
- style="color:#E84738;"
- v-else-if="scope.row.deal_reasult == 0"
+ style="color:#34BD66;"
+ v-else-if="scope.row.deal_reasult == 1"
>閫氳繃</span
>
</template>
</el-table-column>
<el-table-column label="鎿嶄綔" width="100">
- <template>
+ <template slot-scope="scope">
<div style="display: flex;">
- <el-button type="text" siae="small" size="mini">璇勫</el-button>
+ <el-popover
+ placement="left"
+ width="160"
+ :ref="`popover-${scope.$index}`"
+ >
+ <div style="padding: 6px">璇勫鏄惁閫氳繃锛�</div>
+ <div style="text-align: right; margin: 6px;">
+ <el-button
+ size="mini"
+ type="text"
+ style="color: #E84738;"
+ @click="
+ scope._self.$refs[`popover-${scope.$index}`].doClose();
+ rawEvaluate(scope.row, 0);
+ "
+ >涓嶉�氳繃</el-button
+ >
+ <el-button
+ type="text"
+ style="color: #34bd66;"
+ size="mini"
+ @click="
+ scope._self.$refs[`popover-${scope.$index}`].doClose();
+ rawEvaluate(scope.row, 1);
+ "
+ >閫氳繃</el-button
+ >
+ </div>
+ <el-button
+ slot="reference"
+ type="text"
+ siae="small"
+ size="mini"
+ >璇勫</el-button
+ >
+ </el-popover>
+
<el-button
type="text"
siae="small"
size="mini"
- style=" color:87, 138, 193 ;"
+ style=" color:87, 138, 193 ; margin-left: 10px;"
>鏌ョ湅</el-button
>
</div>
@@ -165,7 +201,8 @@
supplier: "" // 渚涘簲鍟�
},
unqualifiedTable: [], // 椤甸潰琛ㄦ牸鏁版嵁
- total: 0
+ total: 0,
+ visible: false
};
},
mounted() {
@@ -200,6 +237,17 @@
supplier: "" // 渚涘簲鍟�
};
this.getDetailInfo();
+ },
+ rawEvaluate(row, passOrNo) {
+ this.$axios
+ .post(this.$api.url.evaluatePassOrNo, {
+ rawId: row.id,
+ passOrNo: passOrNo
+ })
+ .then(res => {
+ this.unqualifiedTable = [];
+ this.getDetailInfo();
+ });
}
}
};
diff --git a/src/components/view/unqualifiedManagement.vue b/src/components/view/unqualifiedManagement.vue
index 17e01c2..56a816c 100644
--- a/src/components/view/unqualifiedManagement.vue
+++ b/src/components/view/unqualifiedManagement.vue
@@ -97,12 +97,12 @@
</el-table-column>
<el-table-column prop="deal_reasult" label="澶勭悊缁撴灉" width="100">
<template slot-scope="scope">
- <span style="color:#34BD66;" v-if="scope.row.deal_reasult == 1"
+ <span style="color:#E84738;" v-if="scope.row.deal_reasult == 0"
>涓嶉�氳繃</span
>
<span
- style="color:#E84738;"
- v-else-if="scope.row.deal_reasult == 0"
+ style="color:#34BD66;"
+ v-else-if="scope.row.deal_reasult == 1"
>閫氳繃</span
>
</template>
--
Gitblit v1.9.3