From c0bc2331e9abb2ae003c8dc0ab4524d6101493a1 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期一, 25 九月 2023 09:12:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/unqualifiedManagement.vue | 458 +++++++++++++++++++++++---------------------------------
1 files changed, 188 insertions(+), 270 deletions(-)
diff --git a/src/components/view/unqualifiedManagement.vue b/src/components/view/unqualifiedManagement.vue
index be696d6..0f3d721 100644
--- a/src/components/view/unqualifiedManagement.vue
+++ b/src/components/view/unqualifiedManagement.vue
@@ -1,300 +1,218 @@
<template>
- <div class="unqualifiedBox">
- <el-row>
- <el-col :span="12" style="line-height: 32px;">涓嶅悎鏍肩鐞�</el-col>
- <el-col :span="12" style="text-align: right;">
- <el-button icon="el-icon-download" size="mini" @click="() => {}"
- >瀵煎嚭</el-button
- >
- </el-col>
- </el-row>
- <div style="margin-top: 10px;">
- <el-card shadow="hover" class="margin-30" style="height: 80px;">
- <div class="choose">
- <span>澶勭悊鐘舵�侊細</span>
- <el-select
- v-model="search.dealState"
- size="small"
- placeholder="璇烽�夋嫨"
- style="width: 224px;margin-right: 30px;"
- >
- <el-option label="宸插鐞�" :value="1"></el-option>
- <el-option label="寰呭鐞�" :value="0"></el-option>
- </el-select>
- <span>鏉ユ枡鏃ユ湡锛�</span>
- <el-date-picker
- v-model="search.formTime"
- size="small"
- placeholder="璇疯緭鍏�"
- style="width: 224px;margin-right: 30px;"
- clearable
- value-format="yyyy-MM-dd"
- ></el-date-picker>
- <span>浜у搧澶х被锛�</span>
- <el-select
- v-model="search.productCategories"
- size="small"
- placeholder="璇烽�夋嫨"
- style="width: 224px;margin-right: 30px;"
- >
- <el-option label="鍏ㄩ儴" :value="''"></el-option>
- <el-option label="鎴愬搧" :value="1"></el-option>
- <el-option label="鍗婃垚鍝�" :value="2"></el-option>
- </el-select>
- <el-button size="mini" @click="clean()"><span>閲� 缃�</span></el-button>
- <el-button
- size="mini"
- type="primary"
- style="background: #004EA2;"
- @click="
- unqualifiedTable = [];
- getDetailInfo();
- "
- ><span>鏌� 璇�</span></el-button
- >
+ <div class="unqualifiedBox">
+ <el-row>
+ <el-col :span="12" style="line-height: 32px;">涓嶅悎鏍肩鐞�</el-col>
+ <el-col :span="12" style="text-align: right;">
+ <el-button icon="el-icon-download" size="mini" @click="() => { }">瀵煎嚭</el-button>
+ </el-col>
+ </el-row>
+ <div style="margin-top: 10px;">
+ <el-card shadow="hover" style="height: 6em;display: flex;align-items: center;">
+ <div class="choose">
+ <span>澶勭悊鐘舵�侊細</span>
+ <el-select v-model="search.dealState" size="small" placeholder="璇烽�夋嫨" style="width: 13vw;margin-right: 30px;">
+ <el-option label="宸插鐞�" :value="1"></el-option>
+ <el-option label="寰呭鐞�" :value="0"></el-option>
+ </el-select>
+ <span>鏉ユ枡鏃ユ湡锛�</span>
+ <el-date-picker v-model="search.formTime" size="small" placeholder="璇疯緭鍏�" style="width: 13vw;margin-right: 30px;" clearable value-format="yyyy-MM-dd"></el-date-picker>
+ <span>浜у搧澶х被锛�</span>
+ <el-select v-model="search.productCategories" size="small" placeholder="璇烽�夋嫨" style="width: 13vw;margin-right: 30px;">
+ <el-option label="鍏ㄩ儴" :value="''"></el-option>
+ <el-option label="鎴愬搧" :value="1"></el-option>
+ <el-option label="鍗婃垚鍝�" :value="2"></el-option>
+ </el-select>
+ <el-button size="mini" @click="clean()"><span>閲� 缃�</span></el-button>
+ <el-button size="mini" type="primary" style="background: #004EA2;" @click="
+ unqualifiedTable = [];
+ getDetailInfo();
+ "><span>鏌� 璇�</span></el-button>
+ </div>
+ </el-card>
</div>
- </el-card>
+ <div class="tableno" style="height:300px">
+ <el-card shadow="hover">
+ <el-table :data="unqualifiedTable" border ref="multipleTable" tooltip-effect="dark" height="calc(100vh - 340px)" style="width: 100%">
+ <el-table-column type="index" label="搴忓彿" width="60">
+ <template slot-scope="scope">
+ {{ (search.pageSize - 1) * search.countSize + scope.$index + 1 }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="dateArrival" label="鏉ユ枡鏃ユ湡" min-width="110">
+ </el-table-column>
+ <el-table-column prop="reason" label="缂洪櫡鍚嶇О" min-width="100" show-overflow-tooltip>
+ </el-table-column>
+ <el-table-column prop="material_code" label="鏉愭枡缂栫爜" min-width="150" show-overflow-tooltip>
+ </el-table-column>
+ <el-table-column prop="project_name" label="鏉愭枡鍚嶇О" min-width="150">
+ </el-table-column>
+ <el-table-column prop="specifications_model" label="瑙勬牸鍨嬪彿" min-width="100">
+ </el-table-column>
+ <el-table-column prop="unit" label="鍗曚綅" min-width="60"> </el-table-column>
+ <el-table-column prop="quantity" label="鏁伴噺" min-width="60"> </el-table-column>
+ <el-table-column prop="inspectionDate" label="鎶ユ鏃ユ湡" min-width="110">
+ </el-table-column>
+ <el-table-column prop="name" label="鎶ユ浜�" min-width="80"> </el-table-column>
+ <el-table-column prop="processingDate" label="妫�楠屾棩鏈�" min-width="110">
+ </el-table-column>
+ <el-table-column prop="deal_state" label="澶勭悊鐘舵��" min-width="100">
+ <template slot-scope="scope">
+ <span style="color:#34BD66;" v-if="scope.row.deal_state == 1">宸插鐞�</span>
+ <span style="color:#E84738;" v-else-if="scope.row.deal_state == 0">寰呭鐞�</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="deal_reasult" label="璇勫缁撴灉" min-width="100">
+ <template slot-scope="scope">
+ <span style="color:#E84738;" v-if="scope.row.deal_reasult == 0">涓嶉�氳繃</span>
+ <span style="color:#34BD66;" v-else-if="scope.row.deal_reasult == 1">閫氳繃</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="鎿嶄綔" min-width="100" fixed="right">
+ <template slot-scope="scope">
+ <div style="display: flex;">
+ <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 ;margin-left: 10px;">鏌ョ湅</el-button>
+ </div>
+ </template>
+ </el-table-column>
+ </el-table>
+ <el-col style="height: 50px;display: flex;align-items: center;justify-content: right;">
+ <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="search.pageSize" :page-sizes="[10, 15, 20, 30, 50]" :page-size="search.countSize" layout="total, sizes, prev, pager, next, jumper" :total="total">
+ </el-pagination>
+ </el-col>
+ </el-card>
+ </div>
</div>
- <div class="tableno" style="height:300px">
- <el-card shadow="hover" class="margin-30">
- <el-table
- :data="unqualifiedTable"
- border
- ref="multipleTable"
- tooltip-effect="dark"
- height="calc(100vh - 340px)"
- style="width: 100%"
- >
- <el-table-column type="selection" width="50"> </el-table-column>
- <el-table-column type="index" label="搴忓彿" width="60">
- <template slot-scope="scope">
- {{ (search.pageSize - 1) * search.countSize + scope.$index + 1 }}
- </template>
- </el-table-column>
- <el-table-column prop="dateArrival" label="鏉ユ枡鏃ユ湡">
- </el-table-column>
- <el-table-column
- prop="reason"
- label="缂洪櫡鍚嶇О"
- min-width="120"
- show-overflow-tooltip
- >
- </el-table-column>
- <el-table-column prop="material_code" label="鏉愭枡缂栫爜">
- </el-table-column>
- <el-table-column prop="project_name" label="鏉愭枡鍚嶇О">
- </el-table-column>
- <el-table-column
- prop="specifications_model"
- label="瑙勬牸鍨嬪彿"
- min-width="120"
- >
- </el-table-column>
- <el-table-column prop="unit" label="鍗曚綅"> </el-table-column>
- <el-table-column prop="quantity" label="鏁伴噺"> </el-table-column>
- <el-table-column prop="inspectionDate" label="鎶ユ鏃ユ湡">
- </el-table-column>
- <el-table-column prop="name" label="鎶ユ浜�"> </el-table-column>
- <el-table-column prop="processingDate" label="妫�楠屾棩鏈�">
- </el-table-column>
- <el-table-column prop="deal_state" label="澶勭悊鐘舵��" width="100">
- <template slot-scope="scope">
- <span style="color:#34BD66;" v-if="scope.row.deal_state == 1"
- >宸插鐞�</span
- >
- <span style="color:#E84738;" v-else-if="scope.row.deal_state == 0"
- >寰呭鐞�</span
- >
- </template>
- </el-table-column>
- <el-table-column prop="deal_reasult" label="璇勫缁撴灉" width="100">
- <template slot-scope="scope">
- <span style="color:#E84738;" v-if="scope.row.deal_reasult == 0"
- >涓嶉�氳繃</span
- >
- <span
- style="color:#34BD66;"
- v-else-if="scope.row.deal_reasult == 1"
- >閫氳繃</span
- >
- </template>
- </el-table-column>
- <el-table-column label="鎿嶄綔" width="100">
- <template slot-scope="scope">
- <div style="display: flex;">
- <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 ;margin-left: 10px;"
- >鏌ョ湅</el-button
- >
- </div>
- </template>
- </el-table-column>
- </el-table>
- <el-col
- style="height: 50px;display: flex;align-items: center;justify-content: right;"
- >
- <el-pagination
- @size-change="handleSizeChange"
- @current-change="handleCurrentChange"
- :current-page="search.pageSize"
- :page-sizes="[10, 15, 20, 30, 50]"
- :page-size="search.countSize"
- layout="total, sizes, prev, pager, next, jumper"
- :total="total"
- >
- </el-pagination>
- </el-col>
- </el-card>
- </div>
- </div>
</template>
<script>
export default {
- data() {
- return {
- search: {
- countSize: 10, // 鏉℃暟/椤�
- pageSize: 1, // 璧峰椤�
- formTime: "", // 鏉ユ枡鏃ユ湡
- productCategories: "", // 浜у搧澶х被
- dealState: "" // 澶勭悊鐘舵��
- },
- unqualifiedTable: [], // 椤甸潰琛ㄦ牸鏁版嵁
- total: 0
- };
- },
- mounted() {
- this.getDetailInfo();
- },
- methods: {
- handleSizeChange(val) {
- this.search.countSize = val;
- this.getDetailInfo();
+ data() {
+ return {
+ search: {
+ countSize: 10, // 鏉℃暟/椤�
+ pageSize: 1, // 璧峰椤�
+ formTime: "", // 鏉ユ枡鏃ユ湡
+ productCategories: "", // 浜у搧澶х被
+ dealState: "", // 澶勭悊鐘舵��
+ },
+ unqualifiedTable: [], // 椤甸潰琛ㄦ牸鏁版嵁
+ total: 0,
+ };
},
- handleCurrentChange(val) {
- this.search.pageSize = val;
- this.getDetailInfo();
+ mounted() {
+ this.getDetailInfo();
},
- getDetailInfo() {
- this.axios
- .get(this.$api.url.inspectUnaccepted, {
- params: this.search
- })
- .then(res => {
- this.unqualifiedTable = res.data.row;
- this.total = res.data.total;
- });
+ methods: {
+ handleSizeChange(val) {
+ this.search.countSize = val;
+ this.getDetailInfo();
+ },
+ handleCurrentChange(val) {
+ this.search.pageSize = val;
+ this.getDetailInfo();
+ },
+ getDetailInfo() {
+ this.axios
+ .get(this.$api.url.inspectUnaccepted, {
+ params: this.search,
+ })
+ .then((res) => {
+ this.unqualifiedTable = res.data.row;
+ this.total = res.data.total;
+ });
+ },
+ clean() {
+ this.search = {
+ countSize: 10, // 鏉℃暟/椤�
+ pageSize: 1, // 璧峰椤�
+ formTime: "", // 鏉ユ枡鏃ユ湡
+ dealState: "", // 澶勭悊鐘舵��
+ };
+ this.getDetailInfo();
+ },
+ rawEvaluate(row, passOrNo) {
+ this.$axios
+ .post(this.$api.url.evaluatePassOrNo, {
+ rawId: row.id,
+ passOrNo: passOrNo,
+ })
+ .then((res) => {
+ this.unqualifiedTable = [];
+ this.getDetailInfo();
+ this.$parent.removeAllTab();
+ });
+ },
},
- clean() {
- this.search = {
- countSize: 10, // 鏉℃暟/椤�
- pageSize: 1, // 璧峰椤�
- formTime: "", // 鏉ユ枡鏃ユ湡
- dealState: "" // 澶勭悊鐘舵��
- };
- this.getDetailInfo();
- },
- rawEvaluate(row, passOrNo) {
- this.$axios
- .post(this.$api.url.evaluatePassOrNo, {
- rawId: row.id,
- passOrNo: passOrNo
- })
- .then(res => {
- this.unqualifiedTable = [];
- this.getDetailInfo();
- this.$parent.removeAllTab()
- });
- }
- }
};
</script>
<style scoped>
.unqualifiedBox {
- width: 100%;
- max-height: 100%;
- display: flex;
- flex-direction: column;
- /* overflow-y: scroll; */
+ width: 100%;
+ max-height: 100%;
+ display: flex;
+ flex-direction: column;
+ /* overflow-y: scroll; */
}
+
.unqualifiedBox .title .el-button {
- height: 32px;
- border: 1px solid rgba(190, 190, 190, 0.44);
- box-shadow: 0px 2px 4px rgba(220, 220, 220, 0.41);
- padding: 0 12px;
+ height: 32px;
+ border: 1px solid rgba(190, 190, 190, 0.44);
+ box-shadow: 0px 2px 4px rgba(220, 220, 220, 0.41);
+ padding: 0 12px;
}
+
.unqualifiedBox .title {
- margin-bottom: 10px;
- padding: 0 20px;
-}
-<!-- /* 鏉′欢鏌ヨ澶撮儴鏍峰紡 */ -->
- .choose {
- padding: 21px 24px;
- display: flex;
- align-items: center;
- background-color: #fff;
- border-bottom: 3px solid rgb(245, 247, 251);
+ margin-bottom: 10px;
+ padding: 0 20px;
}
.choose {
- font-size: 14px;
+ display: flex;
+ align-items: center;
+ background-color: #fff;
+ border-bottom: 3px solid rgb(245, 247, 251);
+}
+
+.choose {
+ font-size: 14px;
}
.choose .el-button {
- height: 32px;
- border: 1px solid rgba(190, 190, 190, 0.44);
- box-shadow: 0px 2px 4px rgba(220, 220, 220, 0.41);
- padding: 0 12px;
+ height: 32px;
+ border: 1px solid rgba(190, 190, 190, 0.44);
+ box-shadow: 0px 2px 4px rgba(220, 220, 220, 0.41);
+ padding: 0 12px;
}
-<!-- /* 涓嶅悎鏍艰〃鏍兼牱寮� */
- .unqualifiedTable {
- flex: 1;
- background: #fff;
- margin-top: 11px;
- padding: 23px 21px;
+
+.choose span {
+ /* span鍐呭寮哄埗涓嶆崲琛� */
+ white-space: nowrap;
}
+
+/* 涓嶅悎鏍艰〃鏍兼牱寮� */
+.unqualifiedTable {
+ flex: 1;
+ background: #fff;
+ margin-top: 11px;
+ padding: 23px 21px;
+}
+
.tableno {
- margin-top: 10px;
+ margin-top: 10px;
}
</style>
--
Gitblit v1.9.3