From 5cafe90e9e91127889a948ecb44dec61d6185bd4 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期五, 18 八月 2023 09:18:51 +0800
Subject: [PATCH] 8.18
---
src/components/view/rawUnqualified/raw.vue | 390 +++++++++++++++++++++++++++++++------------------------
1 files changed, 217 insertions(+), 173 deletions(-)
diff --git a/src/components/view/rawUnqualified/raw.vue b/src/components/view/rawUnqualified/raw.vue
index 0293cbc..847f696 100644
--- a/src/components/view/rawUnqualified/raw.vue
+++ b/src/components/view/rawUnqualified/raw.vue
@@ -4,7 +4,7 @@
max-height: 100%;
display: flex;
flex-direction: column;
- overflow-y: scroll;
+ /* overflow-y: scroll; */
}
.unqualifiedBox .title .el-button {
height: 32px;
@@ -16,7 +16,7 @@
margin-bottom: 10px;
padding: 0 20px;
}
-/* 鏉′欢鏌ヨ澶撮儴鏍峰紡 */
+<!-- /* 鏉′欢鏌ヨ澶撮儴鏍峰紡 */ -->
.choose {
padding: 21px 24px;
display: flex;
@@ -25,7 +25,7 @@
border-bottom: 3px solid rgb(245, 247, 251);
}
- .choose * {
+ .choose {
font-size: 14px;
}
@@ -35,193 +35,237 @@
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">
- <div class="title">
- <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" @click="()=>{}">瀵煎嚭</el-button>
- </el-col>
- </el-row>
+
+ <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.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>
</div>
- <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 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;">
+ <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>
</div>
- <div class="unqualifiedTable">
- <el-table :data="unqualifiedData" height="620">
- <el-table-column
- type="selection"
- width="55">
- </el-table-column>
- <el-table-column
- type="index"
- label="搴忓彿"
- width="60">
- </el-table-column>
- <el-table-column
- prop="name"
- label="缂洪櫡鍚嶇О"
- width="97">
- </el-table-column>
- <el-table-column
- prop="address"
- label="鏉愭枡缂栫爜"
- width="141">
- </el-table-column>
- <el-table-column
- prop="name"
- label="鏉愭枡鍚嶇О"
- width="214">
- </el-table-column>
- <el-table-column
- prop="address"
- label="瑙勬牸鍨嬪彿">
- </el-table-column>
- <el-table-column
- prop="address"
- label="鍗曚綅"
- width="250">
- </el-table-column>
- <el-table-column
- prop="address"
- label="鏁伴噺"
- width="75">
- </el-table-column>
- <el-table-column
- prop="address"
- label="鎶ユ鏃ユ湡"
- width="128">
- </el-table-column>
- <el-table-column
- prop="address"
- label="鎶ユ浜�"
- width="78">
- </el-table-column>
- <el-table-column
- prop="address"
- label="澶勭悊鏃ユ湡"
- width="120">
- </el-table-column>
- <el-table-column
- prop="address"
- label="澶勭悊鐘舵��"
- width="100">
- </el-table-column>
- <el-table-column
- prop="address"
- label="澶勭悊缁撴灉"
- width="100">
- </el-table-column>
- <el-table-column
- prop="address"
- label="鎿嶄綔"
- width="118">
- </el-table-column>
- </el-table>
- <el-col style="height: 50px;display: flex;align-items: center;justify-content: right;">
- <el-pagination
- :current-page="currentPage"
- :page-sizes="[10, 20, 30, 50]"
- :page-size="pageSize"
- layout="total, sizes, prev, pager, next, jumper"
- :total="countSize">
- </el-pagination>
- </el-col>
- </div>
-</div>
+ </div>
+
</template>
<script>
+
export default {
data() {
+
return {
- // 鎼滅储鏉′欢
- search:{},
- unqualifiedData:[
- {
- date: '2016-05-02',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯�'
- }, {
- date: '2016-05-04',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯�'
- }, {
- date: '2016-05-01',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯�'
- }, {
- date: '2016-05-03',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯�'
- }, {
- date: '2016-05-04',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯�'
- }, {
- date: '2016-05-01',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯�'
- }, {
- date: '2016-05-03',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯�'
- }, {
- date: '2016-05-04',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯�'
- }, {
- date: '2016-05-01',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯�'
- }, {
- date: '2016-05-03',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯�'
- }, {
- date: '2016-05-04',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯�'
- }, {
- date: '2016-05-01',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯�'
- }, {
- date: '2016-05-03',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯�'
- }
- ],
- countSize:1,
- pageSize:10,
- currentPage:1
+ 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()
+ },
+ 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()
+
+ }
+ }
}
-</script>
\ No newline at end of file
+
+</script>
+
+
+
+
--
Gitblit v1.9.3