From 8596fc324532bf151e3f39c4d3ea18d880dc43c2 Mon Sep 17 00:00:00 2001
From: hailin <1356886193@qq.com>
Date: 星期二, 01 八月 2023 09:24:32 +0800
Subject: [PATCH] 标准库来自锅炉组长的第一次提交
---
src/components/view/raw-ins.vue | 224 +++++++++++++++++++++++++++++++++++++
src/components/view/standard.vue | 10 +
src/components/view/standard-table/technology.vue | 87 -------------
src/view/index.vue | 14 +-
src/assets/api/controller.js | 2
5 files changed, 245 insertions(+), 92 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index a82f0be..495b3c0 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -1,7 +1,7 @@
// 鎶�鏈鐞�-鏍囧噯Bom
const standard = {
selectTreeByMaterial: "material/selectTreeByMaterial", //鏌ヨ鐗╂枡鐨勬爲
-
+ selectRawInspectsList: "rawInspect/selectRawInspectsList",//鏌ヨ鍘熸潗鏂欐楠屽崟鍒楄〃
}
diff --git a/src/components/view/raw-ins.vue b/src/components/view/raw-ins.vue
new file mode 100644
index 0000000..5f3117b
--- /dev/null
+++ b/src/components/view/raw-ins.vue
@@ -0,0 +1,224 @@
+<style scoped>
+ .raw_ins {}
+
+ .raw_ins .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;
+ }
+
+ .raw_ins .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;
+ }
+
+ .thing {
+ width: calc(100% - 44px);
+ height: calc(100% - 42px - 82px - 66px);
+ background-color: #fff;
+ overflow: auto;
+ padding: 33px 22px;
+ }
+
+ .table_do {
+ color: #004ea0;
+ cursor: pointer;
+ }
+</style>
+<style>
+ .raw_ins .thing * {
+ font-size: 14px;
+ }
+
+ .raw_ins .has-gutter .el-table__cell {
+ background-color: #F0F1F5 !important;
+ color: #333;
+ }
+
+ .raw_ins .has-gutter .el-table__cell .cell {
+ font-size: 16px;
+ font-weight: 500;
+ }
+
+ .raw_ins .cell {
+ color: #333;
+ padding-left: 17px !important;
+ }
+
+ .raw_ins .el-table__body-wrapper {
+ height: 100%;
+ }
+
+ .raw_ins .el-table__body {
+ height: 100%;
+ }
+</style>
+
+<template>
+ <div class="raw_ins">
+ <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 type="primary" icon="el-icon-plus" style="background: #004EA2;">鏂板</el-button>
+ <el-button icon="el-icon-download">鍒犻櫎</el-button>
+ </el-col>
+ </el-row>
+ </div>
+ <div class="choose">
+ <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-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>
+ <span>鍚堟牸鐘舵�侊細</span>
+ <el-select v-model="search.judgeState" 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>
+ <div class="thing">
+ <el-table :data="tableData" border style="width: 100%;overflow-y: auto;min-height: calc(100% - 50px)"
+ max-height="calc(100% - 50px)" @selection-change="handleSelectionChange" border default-expand-all
+ :tree-props="{children: 'children', hasChildren: 'hasChildren'}" row-key="id">
+ <el-table-column type="selection" width="50">
+ </el-table-column>
+ <el-table-column type="index" label="搴忓彿" width="70">
+ </el-table-column>
+ <el-table-column prop="formTime" label="鏉ユ枡鏃ユ湡">
+ </el-table-column>
+ <el-table-column prop="code" label="鍘熸潗鏂欑紪鐮�">
+ </el-table-column>
+ <el-table-column prop="name" 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="createTime" label="鎶ユ鏃ユ湡">
+ </el-table-column>
+ <el-table-column prop="userName" label="鎶ユ浜�">
+ </el-table-column>
+ <el-table-column prop="judgeState" label="鍚堟牸鐘舵��" width="100">
+ <template slot-scope="scope">
+ <span style="color: #34BD66;" v-if="scope.row.judgeState==1">鍚堟牸</span>
+ <span style="color: #E84738;" v-else-if="scope.row.judgeState==0">涓嶅悎鏍�</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="insState" label="妫�娴嬬姸鎬�" width="100">
+ <template slot-scope="scope">
+ <span style="color: #34BD66;" v-if="scope.row.insState==1">宸叉娴�</span>
+ <span style="color: #E84738;" v-else-if="scope.row.insState==0">鏈娴�</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="鎿嶄綔" width="100">
+ <template slot-scope="scope">
+ <span class="table_do">鏌ョ湅</span>
+ <span class="table_do">鎵撳嵃</span>
+ </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>
+ </div>
+ </div>
+</template>
+
+<script>
+ export default {
+ data() {
+ return {
+ search: {
+ formTime: null,
+ createTime: null,
+ insState: 2,
+ judgeState: 2
+ },
+ tableData: [],
+ selects: [],
+ currentPage: 1,
+ countSize: 0,
+ pageSize: 10
+ }
+ },
+ mounted() {
+ this.selectRawInspectsList()
+ },
+ methods: {
+ handleSelectionChange(val) {
+ this.selects = val;
+ },
+ handleSizeChange(val) {
+ this.pageSize = val
+ this.selectRawInspectsList()
+ },
+ handleCurrentChange(val) {
+ this.currentPage = val
+ this.selectRawInspectsList()
+ },
+ selectRawInspectsList() {
+ this.axios.post(this.$api.url.selectRawInspectsList, {
+ pageSize: this.currentPage,
+ countSize: this.pageSize,
+ formTime: this.search.formTime,
+ createTime: this.search.createTime,
+ insState: this.search.insState,
+ judgeState: this.search.judgeState
+ }).then(res => {
+ this.tableData = res.data.data
+ this.countSize = res.data.count
+ })
+ },
+ clean() {
+ this.selects = []
+ this.currentPage = 1
+ this.countSize = 0
+ this.pageSize = 10
+ this.search = {
+ formTime: null,
+ createTime: null,
+ insState: 2,
+ judgeState: 2
+ },
+ this.selectRawInspectsList()
+ }
+ }
+ }
+</script>
diff --git a/src/components/view/standard-table/technology.vue b/src/components/view/standard-table/technology.vue
index d6ceb2d..ae2dbf6 100644
--- a/src/components/view/standard-table/technology.vue
+++ b/src/components/view/standard-table/technology.vue
@@ -48,14 +48,11 @@
default-expand-all :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
<el-table-column type="selection" width="50">
</el-table-column>
- <el-table-column type="index" label="搴忓彿" width="78">
+ <el-table-column type="index" label="搴忓彿" width="70">
</el-table-column>
- <el-table-column prop="date" label="椤圭洰" width="350">
- <template slot-scope="scope">
- <span> <el-tag size="mini" :type="scope.row.children? '':'success'" :style="{borderRadius: '40%',marginRight: '12px'}">{{ scope.row.children? '01':'02' }}</el-tag> {{scope.row.date}}</span>
- </template>
+ <el-table-column prop="date" label="椤圭洰">
</el-table-column>
- <el-table-column prop="name" label="鍗曚綅" width="180">
+ <el-table-column prop="name" label="鍗曚綅">
</el-table-column>
<el-table-column prop="address" label="鏍囧噯鍊�">
</el-table-column>
@@ -100,82 +97,6 @@
date: '2016-05-03',
name: '鐜嬪皬铏�',
address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1516 寮�'
- },{
- id: 5,
- date: '2016-05-03',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1516 寮�'
- },
- {
- id: 6,
- date: '2016-05-03',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1516 寮�'
- },
- {
- id: 7,
- date: '2016-05-03',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1516 寮�'
- },
- {
- id: 8,
- date: '2016-05-03',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1516 寮�'
- },
- {
- id: 9,
- date: '2016-05-03',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1516 寮�'
- },
- {
- id: 10,
- date: '2016-05-03',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1516 寮�'
- },
- {
- id: 11,
- date: '2016-05-03',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1516 寮�'
- },
- {
- id: 12,
- date: '2016-05-03',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1516 寮�'
- }
- ,{
- id: 13,
- date: '2016-05-03',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1516 寮�'
- }
- ],
- tableData1: [{
- id: 1,
- date: '2016-05-02',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�'
- }, {
- id: 2,
- date: '2016-05-04',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1517 寮�'
- }, {
- id: 3,
- date: '2016-05-01',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1519 寮�',
- hasChildren: true
- }, {
- id: 4,
- date: '2016-05-03',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1516 寮�'
}],
selects: []
}
@@ -187,4 +108,4 @@
}
}
}
-</script>
\ No newline at end of file
+</script>
diff --git a/src/components/view/standard.vue b/src/components/view/standard.vue
index 1d34855..0ee0fae 100644
--- a/src/components/view/standard.vue
+++ b/src/components/view/standard.vue
@@ -12,6 +12,10 @@
margin-bottom: 10px;
padding: 0 20px;
}
+
+ .standard .title *{
+ font-size: 16px;
+ }
.thing {
width: 100%;
@@ -85,6 +89,10 @@
.standard .title .el-button * {
font-size: 14px;
}
+
+ .standard .title .el-button--default{
+ color: #004EA2;
+ }
.standard .thing .left .el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content {
background: rgba(58, 124, 253, 0.3);
@@ -101,7 +109,7 @@
<div class="standard">
<div class="title">
<el-row>
- <el-col :span="12">鏍囧噯BOM</el-col>
+ <el-col :span="12" style="line-height: 32px;">鏍囧噯BOM</el-col>
<el-col :span="12" style="text-align: right;">
<el-button type="primary" icon="el-icon-plus" style="background: #004EA2;">鏂板</el-button>
<el-button icon="el-icon-edit-outline">淇敼</el-button>
diff --git a/src/view/index.vue b/src/view/index.vue
index 3745280..6cf4f17 100644
--- a/src/view/index.vue
+++ b/src/view/index.vue
@@ -292,7 +292,7 @@
k: 3,
v: "鍘熸潗鏂欐楠�",
i: "font icon-shouye",
- u: ""
+ u: "raw-ins"
}, {
k: 4,
v: "鍘熸潗鏂欎笉鍚堟牸鍝�",
@@ -330,14 +330,14 @@
u: ""
}]
}],
- activeBox: 1,
- activeP: 1,
- tabActive: 1,
+ activeBox: 0,
+ activeP: 0,
+ tabActive: 0,
tabs: [{
- k: 1,
- v: "鏍囧噯BOM",
+ k: 0,
+ v: "棣栭〉",
i: "font icon-shouye",
- u: "standard"
+ u: "index-index"
}],
upIndex: 0
};
--
Gitblit v1.9.3