From 93dc072c15fca34c6247830cd62210a70c898165 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期三, 09 八月 2023 17:54:37 +0800
Subject: [PATCH] new file: src/api/urlEnum/nonConformanceReview.js new file: src/api/urlEnum/nonConformingFeedback.js new file: src/api/util/requestUtil.js modified: src/views/experiment/nonConformanceReview/index.vue modified: src/views/experiment/nonConformingFeedback/index.vue
---
src/api/urlEnum/nonConformanceReview.js | 8 +
src/api/util/requestUtil.js | 18 ++
src/api/urlEnum/nonConformingFeedback.js | 8 +
src/views/experiment/nonConformanceReview/index.vue | 212 ++++++++++++++++++++++++-
src/views/experiment/nonConformingFeedback/index.vue | 197 ++++++++++++++++++++++++
5 files changed, 425 insertions(+), 18 deletions(-)
diff --git a/src/api/urlEnum/nonConformanceReview.js b/src/api/urlEnum/nonConformanceReview.js
new file mode 100644
index 0000000..1b61727
--- /dev/null
+++ b/src/api/urlEnum/nonConformanceReview.js
@@ -0,0 +1,8 @@
+const baseurl='/nonConformanceReview'
+
+const url={
+ "getNonConformanceReview": baseurl+"/getNonConformanceReview",//鑾峰彇涓嶅悎鏍煎搧璇勫
+}
+export default{
+ url
+}
\ No newline at end of file
diff --git a/src/api/urlEnum/nonConformingFeedback.js b/src/api/urlEnum/nonConformingFeedback.js
new file mode 100644
index 0000000..736e5d4
--- /dev/null
+++ b/src/api/urlEnum/nonConformingFeedback.js
@@ -0,0 +1,8 @@
+const baseurl='/non-conforming-feedback'
+
+const url={
+ "getNonConformingFeedback": baseurl+"/getNonConformingFeedback",//鑾峰彇涓嶅悎鏍煎搧鍙嶉
+}
+export default{
+ url
+}
\ No newline at end of file
diff --git a/src/api/util/requestUtil.js b/src/api/util/requestUtil.js
new file mode 100644
index 0000000..263da29
--- /dev/null
+++ b/src/api/util/requestUtil.js
@@ -0,0 +1,18 @@
+ import request from '@/utils/request'
+
+export function get(path, params) {
+ return request({
+ url: path,
+ method: 'get',
+ params
+ })
+}
+
+export function post(path, data) {
+ return request({
+ url: path,
+ method: 'post',
+ data
+ })
+}
+
diff --git a/src/views/experiment/nonConformanceReview/index.vue b/src/views/experiment/nonConformanceReview/index.vue
index f00b327..4c1bd5f 100644
--- a/src/views/experiment/nonConformanceReview/index.vue
+++ b/src/views/experiment/nonConformanceReview/index.vue
@@ -1,25 +1,207 @@
<template>
- <div>
- <el-row span="22">
- <el-col span="5">
- <el-input placeholder="璇疯緭鍏ュ唴瀹�">
- </el-input>
- </el-col>
- <el-col span=""></el-col>
- <el-col></el-col>
- <el-col></el-col>
- <el-col></el-col>
- </el-row>
- <el-row span="22">
-
- </el-row>
+ <div class="content-main">
+ <div class="top-bar">
+ <el-form ref="form" style="width: 1000px;" :inline="true">
+ <!-- <el-input v-model="input" class="input-form" placeholder="璇风洿鎺ヨ緭鍏ユ牱寮忕紪鍙�/鏍峰搧鍚嶇О/鍨嬪彿瑙勬牸/杩涜鎼滅储鎴栦笅鎷夐�夋嫨杩涜缁勫悎鏌ヨ"
+ @keyup.enter.native="getData" /> -->
+ <el-form-item style="width: 800px;">
+ <el-col style="display: flex; justify-content: space-around;" :span="8">
+ <el-row>鏍峰紡缂栧彿:</el-row>
+ <el-row><el-input size="small" v-model="materialCode" placeholder="璇疯緭鍏ユ牱寮忕紪鍙�"></el-input></el-row>
+ </el-col>
+ <el-col style="display: flex; justify-content: space-around;" :span="8">
+ <el-row>鏍峰紡鍚嶇О:</el-row>
+ <el-row><el-input size="small" v-model="materialName" placeholder="璇疯緭鍏ユ牱寮忓悕绉�"></el-input></el-row>
+ </el-col>
+ <el-col style="display: flex; justify-content: space-around;" :span="8">
+ <el-row>鐢宠鍗曞彿:</el-row>
+ <el-row><el-input size="small" v-model="inspectionCode" placeholder="璇疯緭鍏ョ敵璇峰崟鍙�"></el-input></el-row>
+ </el-col>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" size="small" @click="getData()">鏌ヨ</el-button>
+ <el-button type="primary" size="small" plain @click="resetData()">閲嶇疆</el-button>
+ <el-dropdown style="margin-left: 7px;">
+ <span class="el-dropdown-link">
+ 楂樼骇鎼滅储<i class="el-icon-arrow-down el-icon--right"></i>
+ </span>
+ <el-dropdown-menu slot="dropdown">
+ <el-dropdown-item>榛勯噾绯�</el-dropdown-item>
+ <el-dropdown-item>鐙瓙澶�</el-dropdown-item>
+ <el-dropdown-item>铻鸿洺绮�</el-dropdown-item>
+ <el-dropdown-item disabled>鍙岀毊濂�</el-dropdown-item>
+ <el-dropdown-item divided>铓典粩鐓�</el-dropdown-item>
+ </el-dropdown-menu>
+ </el-dropdown>
+ </el-form-item>
+ </el-form>
+ <el-form>
+ <el-button size="40" type="primary">鎵归噺鎻愪氦</el-button>
+ </el-form>
+ </div>
+ <div class="library-table">
+ <div class="table-box">
+ <el-table ref="tableData" :max-height="800" :cell-style="{ textAlign: 'center' }"
+ :header-cell-style="{ border: '0px', background: '#f5f7fa', color: '#606266', boxShadow: 'inset 0 1px 0 #ebeef5', textAlign: 'center' }"
+ :data="tableData" style="width: 100%">
+ <el-table-column type="selection" label="" min-width="5%" />
+ <el-table-column label="鏍峰搧缂栧彿" min-width="10%">
+ <template slot-scope="scope">
+ <a style="color: #3894d1;">{{ scope.row.materialCode }}</a>
+ </template>
+ </el-table-column>
+ <el-table-column prop="materialName" label="鏍峰搧鍚嶇О" min-width="10%" />
+ <el-table-column label="鐢宠鍗曞彿" min-width="10%" >
+ <template slot-scope="scope">
+ <a style="color: #3894d1;">{{ scope.row.inspectionCode }}</a>
+ </template>
+ </el-table-column>
+ <el-table-column prop="createTime" label="鐧昏鏃ユ湡" min-width="10%" />
+ <el-table-column prop="testManager" label="妫�楠岃礋璐ｄ汉" min-width="10%" />
+ <el-table-column prop="specifications" label="瑙勬牸鍨嬪彿" min-width="10%" />
+ <el-table-column prop="inspectionStatus" label="缁撹" min-width="10%">
+ <template slot-scope="scope">
+ <el-tag type="danger">涓嶅悎鏍�</el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column label="鎿嶄綔" min-width="8%">
+ <template slot-scope="scope">
+ <el-button type="text" size="small">鎻愪氦</el-button>
+ <el-button type="text" size="small">浣滃簾</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <!-- 鍒嗛〉鍣� -->
+ <div>
+ <el-pagination :current-page="page" :page-sizes="[10, 20, 30, 40]" :page-size="pageSize"
+ layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="handleSizeChange"
+ @current-change="handleCurrentChange" />
+ </div>
+ </div>
+ </div>
</div>
</template>
<script>
+import { get, post } from '@/api/util/requestUtil';
+import urlInfo from '../../../api/urlEnum/nonConformingFeedback.js'
export default {
+ data() {
+ return {
+ input: '',
+ tableData: [],
+ page: 1,
+ total: 0,
+ pageSize: 10,
+ materialCode: null,
+ materialName: null,
+ inspectionCode: null
+ }
+ },
+ created() {
+ },
+ mounted() {
+ this.getData()
+ },
+ methods: {
+ handleCurrentChange() {
+
+ },
+ handleSizeChange() {
+
+ },
+ exportData() {
+
+ },
+ // 閲嶇疆鎸夐挳
+ resetData() {
+ this.page = 1
+ this.pageSize = 10
+ this.materialCode=null
+ this.materialName=null
+ this.inspectionCode=null
+ this.getData()
+ },
+ async getData() {
+ let param = {
+ "currentPage": this.page,
+ 'pageNum': this.pageSize,
+ "inspectionCode": this.inspectionCode,
+ "materialCode": this.materialCode,
+ "materialName": this.materialName
+ }
+ let res = await get(urlInfo.url.getNonConformingFeedback, param)
+ this.tableData = res.data.nonConformingFeedbackList
+ this.total = res.data.total
+ }
+ }
}
</script>
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.top-bar {
+ margin: -25px -15px;
+ background: #fff;
+ display: flex;
+ justify-content: space-between;
+ padding: 5px 24px 0px 24px;
+
+ .input-form {
+ width: 800px;
+ }
+
+ .el-dropdown-link {
+ cursor: pointer;
+ color: #409EFF !important;
+ }
+
+ .el-icon-arrow-down {
+ font-size: 12px !important;
+ }
+
+
+}
+
+.library-table {
+ background-color: #fff;
+ flex: 1;
+ margin: 0px -15px;
+ margin-top: 40px;
+ display: flex;
+ flex-direction: column;
+
+ .table-header {
+ padding: 20px;
+ display: flex;
+ justify-content: space-between;
+
+ .el-form-item {
+ margin-bottom: 30px !important;
+ }
+ }
+
+ .table-box {
+ padding: 0px 20px;
+ margin-top: 20px;
+ flex: 1;
+ background: #fff;
+ display: flex;
+ flex-direction: column;
+
+ >div:nth-child(2) {
+ display: flex;
+ justify-content: end;
+ margin: 10px 0;
+ }
+
+ }
+}
+</style>
+<style >
+.content-main {
+ .el-form .el-form-item .el-form-item__content {
+ width: 100% !important;
+ }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/experiment/nonConformingFeedback/index.vue b/src/views/experiment/nonConformingFeedback/index.vue
index 90dfebc..46921fa 100644
--- a/src/views/experiment/nonConformingFeedback/index.vue
+++ b/src/views/experiment/nonConformingFeedback/index.vue
@@ -1,16 +1,207 @@
<template>
- <div>
-
- 涓嶇鍚堝搧璇勫
+ <div class="content-main">
+ <div class="top-bar">
+ <el-form ref="form" style="width: 1000px;" :inline="true">
+ <!-- <el-input v-model="input" class="input-form" placeholder="璇风洿鎺ヨ緭鍏ユ牱寮忕紪鍙�/鏍峰搧鍚嶇О/鍨嬪彿瑙勬牸/杩涜鎼滅储鎴栦笅鎷夐�夋嫨杩涜缁勫悎鏌ヨ"
+ @keyup.enter.native="getData" /> -->
+ <el-form-item style="width: 800px;">
+ <el-col style="display: flex; justify-content: space-around;" :span="8">
+ <el-row>鏍峰紡缂栧彿:</el-row>
+ <el-row><el-input size="small" v-model="materialCode" placeholder="璇疯緭鍏ユ牱寮忕紪鍙�"></el-input></el-row>
+ </el-col>
+ <el-col style="display: flex; justify-content: space-around;" :span="8">
+ <el-row>鏍峰紡鍚嶇О:</el-row>
+ <el-row><el-input size="small" v-model="materialName" placeholder="璇疯緭鍏ユ牱寮忓悕绉�"></el-input></el-row>
+ </el-col>
+ <el-col style="display: flex; justify-content: space-around;" :span="8">
+ <el-row>鐢宠鍗曞彿:</el-row>
+ <el-row><el-input size="small" v-model="inspectionCode" placeholder="璇疯緭鍏ョ敵璇峰崟鍙�"></el-input></el-row>
+ </el-col>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" size="small" @click="getData()">鏌ヨ</el-button>
+ <el-button type="primary" size="small" plain @click="resetData()">閲嶇疆</el-button>
+ <el-dropdown style="margin-left: 7px;">
+ <span class="el-dropdown-link">
+ 楂樼骇鎼滅储<i class="el-icon-arrow-down el-icon--right"></i>
+ </span>
+ <el-dropdown-menu slot="dropdown">
+ <el-dropdown-item>榛勯噾绯�</el-dropdown-item>
+ <el-dropdown-item>鐙瓙澶�</el-dropdown-item>
+ <el-dropdown-item>铻鸿洺绮�</el-dropdown-item>
+ <el-dropdown-item disabled>鍙岀毊濂�</el-dropdown-item>
+ <el-dropdown-item divided>铓典粩鐓�</el-dropdown-item>
+ </el-dropdown-menu>
+ </el-dropdown>
+ </el-form-item>
+ </el-form>
+ <el-form>
+ <el-button size="40" type="primary">鎵归噺鎻愪氦</el-button>
+ </el-form>
+ </div>
+ <div class="library-table">
+ <div class="table-box">
+ <el-table ref="tableData" :max-height="800" :cell-style="{ textAlign: 'center' }"
+ :header-cell-style="{ border: '0px', background: '#f5f7fa', color: '#606266', boxShadow: 'inset 0 1px 0 #ebeef5', textAlign: 'center' }"
+ :data="tableData" style="width: 100%">
+ <el-table-column type="selection" label="" min-width="5%" />
+ <el-table-column label="鏍峰搧缂栧彿" min-width="10%">
+ <template slot-scope="scope">
+ <a style="color: #3894d1;">{{ scope.row.materialCode }}</a>
+ </template>
+ </el-table-column>
+ <el-table-column prop="materialName" label="鏍峰搧鍚嶇О" min-width="10%" />
+ <el-table-column label="鐢宠鍗曞彿" min-width="10%" >
+ <template slot-scope="scope">
+ <a style="color: #3894d1;">{{ scope.row.inspectionCode }}</a>
+ </template>
+ </el-table-column>
+ <el-table-column prop="createTime" label="鐧昏鏃ユ湡" min-width="10%" />
+ <el-table-column prop="testManager" label="妫�楠岃礋璐ｄ汉" min-width="10%" />
+ <el-table-column prop="specifications" label="瑙勬牸鍨嬪彿" min-width="10%" />
+ <el-table-column prop="inspectionStatus" label="缁撹" min-width="10%">
+ <template slot-scope="scope">
+ <el-tag type="danger">涓嶅悎鏍�</el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column label="鎿嶄綔" min-width="8%">
+ <template slot-scope="scope">
+ <el-button type="text" size="small">鎿嶄綔</el-button>
+ <el-button type="text" size="small">浣滃簾</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <!-- 鍒嗛〉鍣� -->
+ <div>
+ <el-pagination :current-page="page" :page-sizes="[10, 20, 30, 40]" :page-size="pageSize"
+ layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="handleSizeChange"
+ @current-change="handleCurrentChange" />
+ </div>
+ </div>
+ </div>
</div>
</template>
<script>
+import { get, post } from '@/api/util/requestUtil';
+import urlInfo from '../../../api/urlEnum/nonConformanceReview.js'
export default {
+ data() {
+ return {
+ input: '',
+ tableData: [],
+ page: 1,
+ total: 0,
+ pageSize: 10,
+ materialCode: null,
+ materialName: null,
+ inspectionCode: null
+ }
+ },
+ created() {
+ },
+ mounted() {
+ this.getData()
+ },
+ methods: {
+ handleCurrentChange() {
+
+ },
+ handleSizeChange() {
+
+ },
+ exportData() {
+
+ },
+ // 閲嶇疆鎸夐挳
+ resetData() {
+ this.page = 1
+ this.pageSize = 10
+ this.materialCode=null
+ this.materialName=null
+ this.inspectionCode=null
+ this.getData()
+ },
+ async getData() {
+ let param = {
+ "currentPage": this.page,
+ 'pageNum': this.pageSize,
+ "inspectionCode": this.inspectionCode,
+ "materialCode": this.materialCode,
+ "materialName": this.materialName
+ }
+ let res = await get(urlInfo.url.getNonConformanceReview, param)
+ this.tableData = res.data.nonConformanceReviewList
+ this.total = res.data.total
+ }
+ }
}
</script>
<style lang="scss" scoped>
+.top-bar {
+ margin: -25px -15px;
+ background: #fff;
+ display: flex;
+ justify-content: space-between;
+ padding: 5px 24px 0px 24px;
+ .input-form {
+ width: 800px;
+ }
+
+ .el-dropdown-link {
+ cursor: pointer;
+ color: #409EFF !important;
+ }
+
+ .el-icon-arrow-down {
+ font-size: 12px !important;
+ }
+
+
+}
+
+.library-table {
+ background-color: #fff;
+ flex: 1;
+ margin: 0px -15px;
+ margin-top: 40px;
+ display: flex;
+ flex-direction: column;
+
+ .table-header {
+ padding: 20px;
+ display: flex;
+ justify-content: space-between;
+
+ .el-form-item {
+ margin-bottom: 30px !important;
+ }
+ }
+
+ .table-box {
+ padding: 0px 20px;
+ margin-top: 20px;
+ flex: 1;
+ background: #fff;
+ display: flex;
+ flex-direction: column;
+
+ >div:nth-child(2) {
+ display: flex;
+ justify-content: end;
+ margin: 10px 0;
+ }
+
+ }
+}
</style>
+<style >
+.content-main {
+ .el-form .el-form-item .el-form-item__content {
+ width: 100% !important;
+ }
+}
+</style>
\ No newline at end of file
--
Gitblit v1.9.3