From 9e2144ae9eaed728cc12e75f7ae1b53e5874d5bf Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期五, 08 九月 2023 11:13:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/rawUnqualified/raw.vue | 490 ++++++++++++++++++++++++++----------------------------
1 files changed, 237 insertions(+), 253 deletions(-)
diff --git a/src/components/view/rawUnqualified/raw.vue b/src/components/view/rawUnqualified/raw.vue
index 847f696..ac0b8c4 100644
--- a/src/components/view/rawUnqualified/raw.vue
+++ b/src/components/view/rawUnqualified/raw.vue
@@ -1,271 +1,255 @@
-<style scoped>
-.unqualifiedBox{
- 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;
- }
- .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);
- }
-
- .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;
- }
- <!-- /* 涓嶅悎鏍艰〃鏍兼牱寮� */
- .unqualifiedTable{
- flex: 1;
- background: #fff;
- margin-top: 11px;
- padding: 23px 21px;
- }
- .tableno{
- margin-top: 30px;
- }
-</style>
-
<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>
+ <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.insState" size="small" placeholder="璇烽�夋嫨" style="width: 224px;margin-right: 30px;">
- <el-option label="宸插鐞�" :value="2"></el-option>
- <el-option label="寰呭鐞�" :value="0"></el-option>
- </el-select>
- <span>鏉ユ枡鏃ユ湡锛�</span>
- <el-date-picker v-model="search.createTime" 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.insState" size="small" placeholder="璇烽�夋嫨" style="width: 224px;margin-right: 30px;">
- <el-option label="鍏ㄩ儴" :value="2"></el-option>
- <el-option label="鏈娴�" :value="0"></el-option>
- <el-option label="宸叉娴�" :value="1"></el-option>
- </el-select>
- <el-button size="mini" @click="clean()"><span>閲� 缃�</span></el-button>
- <el-button size="mini" type="primary" style="background: #004EA2;" @click="selectRawInspectsList()"><span>鏌�
- 璇�</span></el-button>
-
- </div>
- </el-card>
+ <el-card shadow="hover" class="margin-30" style="height: 80px;">
+ <div class="choose">
+ <span>浜у搧鍚嶇О锛�</span>
+ <el-input
+ size="small"
+ v-model="search.productName"
+ style="width: 224px;margin-right: 30px;"
+ placeholder="璇疯緭鍏�"
+ clearable
+ ></el-input>
+ <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.processingStatus"
+ 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-input
+ size="small"
+ v-model="search.supplier"
+ style="width: 224px;margin-right: 20px;"
+ placeholder="璇疯緭鍏�"
+ ></el-input>
+ <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>
- <div class="tableno" style="height:300px">
- <!-- <el-table :data=" unqualifiedTable" border style ="width: 100%;overflow-y: auto;min-height: calc(100% - 50px)"
- max-height="calc(100% - 50px)" row-key="id"
- :tree-props="{children: 'children', hasChildren: 'hasChildren'}"> -->
- <el-card shadow="hover" class="margin-30">
-
- <el-table :data=" unqualifiedTable" border ref="multipleTable" tooltip-effect="dark"
- style="width: 100%" @selection-change="handleSelectionChange">
-
- <el-table-column
- type="selection"
- width="50">
- </el-table-column>
- <el-table-column
- type="index"
- label="搴忓彿"
- >
- </el-table-column>
- <el-table-column
- prop="鏉ユ枡鏃ユ湡"
- label="鏉ユ枡鏃ユ湡"
- >
- </el-table-column>
- <el-table-column
- prop="reason"
- label="缂洪櫡鍚嶇О"
- >
- </el-table-column>
- <el-table-column
- prop="material_code"
- label="鏉愭枡缂栫爜"
- >
- </el-table-column>
- <el-table-column
- prop="id"
- label="鏉愭枡鍚嶇О">
- </el-table-column>
- <el-table-column
- prop="specifications_model"
- label="瑙勬牸鍨嬪彿"
- >
- </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="鎶ユ鏃ユ湡"
- label="鎶ユ鏃ユ湡"
- >
- </el-table-column>
- <el-table-column
- prop="name"
- label="鎶ユ浜�"
- >
- </el-table-column>
- <el-table-column
- prop="鎶ユ鏃ユ湡"
- 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:#34BD66;" v-if="scope.row.deal_reasult==1">涓嶉�氳繃</span>
- <span style="color:#E84738;" v-else-if="scope.row.deal_reasult==0">閫氳繃</span>
- </template>
- </el-table-column>
- <el-table-column
- label="鎿嶄綔"
- width="100"
- >
- <template slot-scope="scope">
- <div style="display: flex;">
- <el-button type="text" siae="small" size="mini">璇勫</el-button>
- <el-button type="text" siae="small" size="mini" style=" color:87, 138, 193 ;" @click="">鏌ョ湅</el-button>
- </div>
- </template>
- </el-table-column>
-
-
- </el-table>
- </el-card>
- <el-col style="height: 50px;display: flex;align-items: center;justify-content: right;">
+ <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 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="supplier" label="渚涘簲鍟�"> </el-table-column>
+ <el-table-column
+ prop="reason"
+ label="缂洪櫡鍚嶇О"
+ min-width="120"
+ show-overflow-tooltip
+ >
+ </el-table-column>
+ <el-table-column prop="code" label="鏉愭枡缂栫爜"> </el-table-column>
+ <el-table-column prop="id" label="鏉愭枡鍚嶇О"> </el-table-column>
+ <el-table-column prop="specifications" label="瑙勬牸鍨嬪彿">
+ </el-table-column>
+ <el-table-column prop="unit" label="鍗曚綅"> </el-table-column>
+ <el-table-column prop="number" 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:#34BD66;" v-if="scope.row.deal_reasult == 1"
+ >涓嶉�氳繃</span
+ >
+ <span
+ style="color:#E84738;"
+ v-else-if="scope.row.deal_reasult == 0"
+ >閫氳繃</span
+ >
+ </template>
+ </el-table-column>
+ <el-table-column label="鎿嶄綔" width="100">
+ <template>
+ <div style="display: flex;">
+ <el-button type="text" siae="small" size="mini">璇勫</el-button>
+ <el-button
+ type="text"
+ siae="small"
+ size="mini"
+ style=" color:87, 138, 193 ;"
+ >鏌ョ湅</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="currentPage"
- :page-sizes="[1,10, 20, 30, 50]"
- :page-size="pageSize"
- layout="total, sizes, prev, pager, next, jumper"
- :total="countSize">
- </el-pagination>
- </el-col>
+ @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:{
- formTime: "null",
- deal_state:2,
- deal_reasult:2,
- },
- unqualifiedTable:[],
- // articlelist:[] ,
- selects:[],
- countSize: 0,
- pageSize: 2,
- currentPage: 10
-
-
- }
- },
- props:['godata'],
- created(){
- this.getDetailInfo()
- },
- mounted() {
- this.getDetailInfo()
- },
- methods:{
-
- handleSizeChange(val) {
- this.pageSize = 1
- this.countSize= val
- this.getDetailInfo()
+ data() {
+ return {
+ search: {
+ countSize: 10, // 鏉℃暟/椤�
+ pageSize: 1, // 璧峰椤�
+ formTime: "", // 鏉ユ枡鏃ユ湡
+ processingStatus: "", // 澶勭悊鐘舵��
+ productName: "", // 浜у搧鍚嶇О
+ supplier: "" // 渚涘簲鍟�
},
- handleCurrentChange(val) {
- this.pageSize = val
- this.getDetailInfo()
- },
-
- getDetailInfo() {
- // console.log(this.$api.url.selectUnRawInspectsList);
-
- this.axios.get(this.$api.url.selectUnRawInspectsList, {
- params:{countSize:this.currentPage, pageSize:this.pageSize},
- // pageSize: this.currentPage,
- // countSize: this.pageSize,
- // formTime: this.search.formTime,
- // deal_state: this.search. deal_state,
- // deal_reasult: this.search.deal_reasult,
- }).then(res=>{
- // console.log(res);
- this.unqualifiedTable = res.data.row
- // console.log(this.unqualifiedTable);
- // this.countSize = res.data.count
- // console.log(111);
-
- })
- },
- changeShowDetail({id}){
- this.godata()
-
- }
+ unqualifiedTable: [], // 椤甸潰琛ㄦ牸鏁版嵁
+ total: 0
+ };
+ },
+ mounted() {
+ this.getDetailInfo();
+ },
+ methods: {
+ handleSizeChange(val) {
+ this.search.countSize = val;
+ this.getDetailInfo();
+ },
+ handleCurrentChange(val) {
+ this.search.pageSize = val;
+ this.getDetailInfo();
+ },
+ getDetailInfo() {
+ this.axios
+ .get(this.$api.url.selectUnRawInspectsList, {
+ params: this.search
+ })
+ .then(res => {
+ this.unqualifiedTable = res.data.row;
+ this.total = res.data.total;
+ });
+ },
+ clean() {
+ this.search = {
+ countSize: 10, // 鏉℃暟/椤�
+ pageSize: 1, // 璧峰椤�
+ formTime: "", // 鏉ユ枡鏃ユ湡
+ processingStatus: "", // 澶勭悊鐘舵��
+ productName: "", // 浜у搧鍚嶇О
+ supplier: "" // 渚涘簲鍟�
+ };
+ this.getDetailInfo();
+ }
}
-}
-
+};
</script>
+<style scoped>
+.unqualifiedBox {
+ 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;
+}
+.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);
+}
+.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;
+}
+<!-- /* 涓嶅悎鏍艰〃鏍兼牱寮� */
+ .unqualifiedTable {
+ flex: 1;
+ background: #fff;
+ margin-top: 11px;
+ padding: 23px 21px;
+}
+.tableno {
+ margin-top: 10px;
+}
+</style>
--
Gitblit v1.9.3