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/raw-ins.vue | 4
src/main.js | 4
src/components/tool/icon.vue | 3
src/components/view/Processingproducts.vue | 192 +++++++++++++++++
src/components/view/processInspection.vue | 20
src/components/view/rawInsDetail.vue | 18
src/components/view/rawUnqualified/raw.vue | 390 +++++++++++++++++++---------------
src/components/view/unqualifiedManagement.vue | 4
src/view/index.vue | 2
src/assets/api/controller.js | 14 +
10 files changed, 452 insertions(+), 199 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 60376ec..02b344f 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -18,6 +18,10 @@
selectSpBySt: "/rawInspect/selectSpBySt", //鏍规嵁鏉愭枡id鏌ヨ鎵�鏈夊瀷鍙�,
addRawInspects: "/rawInspect/addRawInspects"
}
+//涓嶅悎鏍煎師鏉愭枡
+const unqualifiedaa ={
+ selectUnRawInspectsList: "/inspectUnaccepted/selectUnRawInspectsList"
+}
// 鎴愬搧妫�楠�
const finishedIns = {
@@ -25,6 +29,7 @@
// listMaterial:"/finished-inspect/list_material",//娣诲姞妫�楠屽崟鏃剁殑椤圭洰鍒楄〃
finishedInspectUser: "/finished-inspect/page_user", //鑾峰彇鎵�鏈変富鏈哄伐
projectListByfinishId: "/inspection-item/list_user", //鏍规嵁id鏌ヨ鎵�鏈夐」鐩�
+
}
// QMS瀹為獙瀹ょ鐞�
@@ -39,6 +44,10 @@
deleteDevice: "/device/delete", // 鍒犻櫎瀹為獙瀹よ澶�
deleteIdorFather: "/device/deleteIdorFather" // 鍒犻櫎鏍戞ā鍧楁暟鎹�
}
+//涓嶅悎鏍煎搧澶勭疆
+const dispose = {
+ gettable:"/opinion/list_page"
+}
const url = {
enter: "user/enter", //鐧诲綍
@@ -46,8 +55,11 @@
...raw,
...laboratory,
...finishedIns,
+ ...unqualifiedaa,
+ ...dispose,
+ // ...gettable,
selectSaleList: "sale/selectSaleList", //鏌ヨ閿�鍞崟鍒楄〃
- selectSaleDatilById: "sale/selectSaleDatilById", //鏍规嵁閿�鍞崟id鏌ョ湅璇︽儏,
+ selectSaleDatilById: "sale/selectSaleDatilById", //鏍规嵁閿�鍞崟id
addSale: "sale/addSale", //鏂板閿�鍞崟,
seleRepe: "sale/seleRepe", //鏌ヨ鎴愬搧搴撳瓨
}
diff --git a/src/components/tool/icon.vue b/src/components/tool/icon.vue
index 090df33..1f72418 100644
--- a/src/components/tool/icon.vue
+++ b/src/components/tool/icon.vue
@@ -1,3 +1,6 @@
+
+
+
<style scoped>
::-webkit-scrollbar {
width: 8px;
diff --git a/src/components/view/Processingproducts.vue b/src/components/view/Processingproducts.vue
new file mode 100644
index 0000000..19630f9
--- /dev/null
+++ b/src/components/view/Processingproducts.vue
@@ -0,0 +1,192 @@
+<template>
+ <div>
+ <div class="article-main" style="overflow: hidden;">
+ <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>
+
+ <div style="margin-top: 10px;">
+ <el-card shadow="hover" class="margin-30">
+ <el-form ref="form" :model="searchform" label-width="80px">
+ <el-row :gutter="25">
+ <el-col :span="7" >
+ <el-form-item label="浜у搧鍚嶇О:">
+ <el-input v-model="searchform.name" placeholder="璇疯緭鍏�"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="7" >
+ <el-form-item label="瑙勬牸鍨嬪彿:">
+ <el-input v-model="searchform.stude" placeholder="璇疯緭鍏�"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-button size="default" @click="">閲嶇疆</el-button>
+ <el-button type="primary" size="default" style="background:0, 78, 162 ;" @click="getDetailInfo">鏌ヨ</el-button>
+
+ </el-col>
+ </el-row>
+ </el-form>
+ </el-card>
+ </div>
+
+ <div style="margin-top: 30px;">
+ <el-card shadow="hover" class="margin-30">
+ <el-table
+ ref="multipleTable"
+ :data="tableData"
+ tooltip-effect="dark"
+ style="width: 100%"
+ @selection-change="handleSelectionChange">
+ <el-table-column
+ type="selection"
+ width="55">
+ </el-table-column>
+ <el-table-column
+ label="鏃ユ湡"
+ width="120">
+ <template slot-scope="scope">{{ scope.row.date }}</template>
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="濮撳悕"
+ width="120">
+ </el-table-column>
+ <el-table-column
+ prop="address"
+ label="鍦板潃"
+ show-overflow-tooltip>
+ </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="4"
+ :page-sizes="[1,10, 20, 30, 50]"
+ :page-size="4"
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="countSize">
+ </el-pagination>
+ </el-col>
+ </div>
+ </div>
+ </div>
+ </div>
+</template>
+
+
+
+<script>
+export default {
+ data() {
+ return {
+ searchform:{
+ name:'',
+ stude:''
+ },
+ tableData: [
+ {
+ date: '2016-05-03',
+ name: '鐜嬪皬铏�',
+ address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�'
+ }, {
+ date: '2016-05-02',
+ name: '鐜嬪皬铏�',
+ address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�'
+ }, {
+ date: '2016-05-04',
+ name: '鐜嬪皬铏�',
+ address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�'
+ }, {
+ date: '2016-05-01',
+ name: '鐜嬪皬铏�',
+ address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�'
+ }, {
+ date: '2016-05-08',
+ name: '鐜嬪皬铏�',
+ address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�'
+ }, {
+ date: '2016-05-06',
+ name: '鐜嬪皬铏�',
+ address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�'
+ }, {
+ date: '2016-05-07',
+ name: '鐜嬪皬铏�',
+ address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�'
+ }
+ ],
+ pageSize:3,
+ countSize:1,
+ currentPage:2,
+ multipleSelection:''
+ }
+ },
+ created(){
+ // this.getDetailInfo()
+ },
+ methods:{
+ handleSelectionChange(val) {
+ // console.log(val);
+ // this.multipleSelection = val;
+ },
+ handleSizeChange(val) {
+ console.log(val);
+ // this.pageSize = 1
+ // this.countSize= val
+ // this.getDetailInfo()
+ },
+ handleCurrentChange(val) {
+ // this.pageSize = val
+ // this.getDetailInfo()
+ },
+ getDetailInfo() {
+ let aa = [0,5]
+ aa.map(el =>{
+ console.log(el);
+ })
+ console.log(this.searchform.name);
+ console.log(this.searchform.stude);
+ // this.tableData
+ // this.axios.get(this.$api.url.gettable,{
+ // params:{pageNo:10,
+ // pageSize:1,
+ // productName:this.searchform.name,
+ // specificationsModels:this.searchform.stude
+ // },
+ // }).then(res=>{
+ // console.log(res);
+ // this.tableData = res.data.row
+ // })
+ }
+}}
+ // methods:{
+ // toggleSelection(rows) {
+ // if (rows) {
+ // rows.forEach(row => {
+ // this.$refs.multipleTable.toggleRowSelection(row);
+ // });
+ // } else {
+ // this.$refs.multipleTable.clearSelection();
+ // }
+ // },
+
+ // }
+ // }
+
+
+</script>
+<style scoped>
+.card-2{
+ display: flex;
+ margin-top: 30px;
+}
+
+.ssss{
+ background-color: #fff;
+}
+</style>
diff --git a/src/components/view/processInspection.vue b/src/components/view/processInspection.vue
index 8f116db..1ab23ed 100644
--- a/src/components/view/processInspection.vue
+++ b/src/components/view/processInspection.vue
@@ -123,7 +123,7 @@
>
<template slot-scope="scope">
<el-button type="text" size="small" @click="handleClick(scope.row)">鏌ョ湅</el-button>
- <el-button type="text" size="small">鎵撳嵃</el-button>
+ <el-button type="text" size="small" style="margin-left: 0;">鎵撳嵃</el-button>
</template>
</el-table-column>
</el-table>
@@ -157,7 +157,7 @@
<el-row :gutter="450">
<el-col :span="5">
<el-form-item label="璁㈠崟鍙凤細">
- <el-input style="width: 180px;" v-model="addInspectionform.number" placeholder="璇疯緭鍏ヨ鍗曞彿" autocomplete="off" />
+ <el-input style="width: 180px;" v-model="addInspectionform.number" placeholder="璇疯緭鍏ヨ鍗曞彿" autocomplete="off" />
</el-form-item>
</el-col>
<el-col :span="5">
@@ -278,11 +278,11 @@
</el-table>
</div>
</div>
-
+
</div>
</template>
-
-
+
+
<script>
export default {
data(){
@@ -324,7 +324,7 @@
operation: ''
}],
currentPage: 1, // 褰撳墠椤电爜
- pageSize: 100,
+ pageSize: 100,
showAddPage: false,
addInspectionform: [{
number: '',
@@ -374,14 +374,14 @@
this.showAddPage=true
}
}
-
+
}
</script>
-
+
<style>
.title{
padding: 12px;
-
+
}
.nav{
display: flex;
@@ -432,4 +432,4 @@
background-color: #fff;
padding: 10px 12px;
}
- </style>
\ No newline at end of file
+ </style>
diff --git a/src/components/view/raw-ins.vue b/src/components/view/raw-ins.vue
index ed319c6..b2dfefe 100644
--- a/src/components/view/raw-ins.vue
+++ b/src/components/view/raw-ins.vue
@@ -171,13 +171,13 @@
formTime: null,
createTime: null,
insState: 2,
- judgeState: 2
+ judgeState: 10
},
tableData: [],
selects: [],
currentPage: 1,
countSize: 0,
- pageSize: 10
+ pageSize: 2
}
},
props:['goDetail'],
diff --git a/src/components/view/rawInsDetail.vue b/src/components/view/rawInsDetail.vue
index cfb744d..7676e68 100644
--- a/src/components/view/rawInsDetail.vue
+++ b/src/components/view/rawInsDetail.vue
@@ -89,7 +89,7 @@
<el-option v-for="item in materialOptions" :key="item.id" :label="item.name" :value="item.name"></el-option>
</el-select>
</el-form-item>
-
+
</el-col>
<el-col :span="7">
<el-form-item label="瑙勬牸鍨嬪彿:">
@@ -134,13 +134,13 @@
</el-form-item>
</el-col>
<el-col :span="3">
- <el-form-item v-show="detailId===null" label="" label-width="100px">
+ <el-form-item v-show="detailId===null" label="" label-width="50px">
<el-button @click="addNewRawInspect">淇濆瓨鎻愪氦</el-button>
</el-form-item>
</el-col>
</el-row>
<el-row>
-
+
<el-col :span="7">
<el-form-item v-show="detailId!==null" label="鎶ユ鏃ユ湡:">
<el-input :disabled="detailId!==null" v-model="detailInfo.createTime"></el-input>
@@ -151,7 +151,7 @@
<el-input :disabled="detailId!==null" v-model="detailInfo.userName"></el-input>
</el-form-item>
</el-col>
-
+
</el-row>
</el-form>
<!-- <el-form v-show="detailId ===null" v-model="rawInsParams" label-position="right" label-width="120px" >
@@ -190,7 +190,7 @@
<el-input placeholder="浜у搧缂栫爜" disabled v-model="code"></el-input>
</el-form-item>
</el-col>
-
+
</el-row>
<el-row>
<el-col :span="7">
@@ -345,7 +345,7 @@
this.getDetailInfo()
}else{
this.getOptions()
- }
+ }
},
mounted(){
},
@@ -422,9 +422,9 @@
this.getDetailInfo()
},
async getOptions() {
- // const {data} = await this.$axios.get(this.$api.url.listMaterial)
+ // const {data} = await this.$axios.get(this.$api.url.listMaterial)
// this.materialOptions = data
- const {data} = await this.$axios.get(this.$api.url.selectRawMaterial)
+ const {data} = await this.$axios.get(this.$api.url.selectRawMaterial)
this.materialOptions = data
console.log(this.materialOptions)
},
@@ -436,7 +436,7 @@
this.detailInfo.code = item.code
this.$axios.get(this.$api.url.selectSpBySt,{params:{id:item.id}}).then(res=>{
this.specificationOptions= res.data
- })
+ })
}
})
}
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>
+
+
+
+
diff --git a/src/components/view/unqualifiedManagement.vue b/src/components/view/unqualifiedManagement.vue
index 921963c..ae53842 100644
--- a/src/components/view/unqualifiedManagement.vue
+++ b/src/components/view/unqualifiedManagement.vue
@@ -11,7 +11,9 @@
<script>
import Unqualified from './rawUnqualified/raw.vue'
+// import Unqualified from './rawUnqualified/Subqualified.vue'
+
export default {
components:{Unqualified}
}
-</script>
\ No newline at end of file
+</script>
diff --git a/src/main.js b/src/main.js
index f5b6bda..6cfc935 100644
--- a/src/main.js
+++ b/src/main.js
@@ -23,7 +23,7 @@
Vue.use(qs);
Vue.use(api);
-const javaApi = 'http://localhost:8001/'
+const javaApi = 'http://192.168.110.167:8001/'
axios.defaults.baseURL = javaApi
axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8'
@@ -117,4 +117,4 @@
el: '#app',
router,
render: h => h(App)
-});
\ No newline at end of file
+});
diff --git a/src/view/index.vue b/src/view/index.vue
index 7da206b..efb618f 100644
--- a/src/view/index.vue
+++ b/src/view/index.vue
@@ -469,7 +469,7 @@
k: 10.2,
v: "涓嶅悎鏍煎搧澶勭疆",
i: "font icon-shouye",
- u: ""
+ u: "Processingproducts"
}
]
},
--
Gitblit v1.9.3