From 71930b2b36894216e86d69264ca510cca284546b Mon Sep 17 00:00:00 2001
From: hailin <1356886193@qq.com>
Date: 星期二, 08 八月 2023 13:30:05 +0800
Subject: [PATCH] 最后一舞---去他妈的缪海庆，扣脚大爷都没你扣，没有格局把路走窄了
---
src/views/experiment/passRateStatistics/index.vue | 13
src/views/experiment/reportAuditing/index.vue | 13
src/views/experiment/inspectionApplication/index.vue | 5
src/views/CNAS/nonConformanceManage/index.vue | 5
src/views/inspectionManagement/reportForInspection/index.vue | 302 +++++++++++++
src/api/laboratory/ledger.js | 8
src/views/experiment/nonConformanceReview/index.vue | 13
src/views/experiment/nonConformingFeedback/index.vue | 13
src/router/index.js | 208 ++++++--
src/views/CNAS/reviewAnnualPlan/index.vue | 5
src/components/Breadcrumb/index.vue | 3
src/views/experiment/planAssignments/index.vue | 13
src/views/inspectionManagement/commissionInspection/addCommision.vue | 254 +++++++++++
src/views/CNAS/nonConformanceStatistics/index.vue | 3
src/views/laboratory/ledger/index.vue | 142 +++++
src/views/CNAS/satisfactionSurveys/index.vue | 5
src/views/experiment/checkTheReport/index.vue | 13
src/views/inspectionManagement/commissionInspection/index.vue | 284 ++++++++++++
18 files changed, 1,232 insertions(+), 70 deletions(-)
diff --git a/src/api/laboratory/ledger.js b/src/api/laboratory/ledger.js
index c0d74db..8bd6df7 100644
--- a/src/api/laboratory/ledger.js
+++ b/src/api/laboratory/ledger.js
@@ -80,6 +80,14 @@
})
}
+export function deleteInstrument(params) {
+ return request({
+ url: '/instrument/delete',
+ method: 'delete',
+ params
+ })
+}
+
// 鏍规嵁璁惧id鏌ユ壘瀵瑰簲鐮佺偣
export function getEquipmentPointList(params) {
return request({
diff --git a/src/components/Breadcrumb/index.vue b/src/components/Breadcrumb/index.vue
index c7f6f66..e29b2bc 100644
--- a/src/components/Breadcrumb/index.vue
+++ b/src/components/Breadcrumb/index.vue
@@ -69,7 +69,8 @@
font-size: 14px;
padding: 12px 24px;
height: 38px;
- width: 100%;
+ // width: 100%;
+ margin: 0px 9px;
background: #fff;
// margin-left: px;
.no-redirect {
diff --git a/src/router/index.js b/src/router/index.js
index f95e0a0..cff7490 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -74,101 +74,162 @@
}
]
},
+ // {
+ // path: '/rawMaterials',
+ // component: Layout,
+ // redirect: '/rawMaterials/reportForInspection',
+ // name: 'rawMaterials',
+ // meta: { title: '妫�楠�', icon: 'el-icon-s-help' },
+ // children: [
+ // {
+ // path: 'reportForInspection',
+ // name: 'ReportForInspection',
+ // component: () => import('@/views/rawMaterials/reportForInspection/index'),
+ // meta: { title: '鍘熸潗鏂欐姤妫�', icon: 'table' },
+ // children: [
+ // // {
+ // // path: 'index',
+ // // name: 'ReportForInspectionIndex',
+ // // // hidden: true,
+ // // component: () => import('@/views/rawMaterials/reportForInspection/index'),
+ // // meta: { title: '鍘熸潗鏂欐姤妫�', icon: 'table' }
+ // // },
+ // {
+ // path: 'forInspectionDetail',
+ // name: 'ForInspectionDetail',
+ // hidden: true,
+ // component: () => import('@/views/rawMaterials/reportForInspection/forInspectionDetail'),
+ // meta: { title: '鏂板妫�楠屽崟璇︽儏', icon: 'table' }
+ // }
+ // ]
+ // },
+ // {
+ // path: 'print',
+ // name: 'Print',
+ // component: () => import('@/views/rawMaterials/print/index'),
+ // meta: { title: '鏉＄爜鎵撳嵃', icon: 'tree' }
+ // },
+ // {
+ // path: 'planAssignments',
+ // name: 'PlanAssignments',
+ // component: () => import('@/views/rawMaterials/planAssignments/index'),
+ // meta: { title: '妫�楠岃鍒掑垎閰�', icon: 'tree' }
+ // },
+ // {
+ // path: 'rawMaterialInspection',
+ // name: 'RawMaterialInspection',
+ // component: () => import('@/views/rawMaterials/rawMaterialInspection/index'),
+ // meta: { title: '鍘熸潗鏂欐楠�', icon: 'tree' }
+ // },
+ // {
+ // path: 'checkTheReport',
+ // name: 'CheckTheReport',
+ // component: () => import('@/views/rawMaterials/checkTheReport/index'),
+ // meta: { title: '妫�楠屾姤鍛�', icon: 'tree' }
+ // },
+ // {
+ // path: 'reportAuditing',
+ // name: 'ReportAuditing',
+ // component: () => import('@/views/rawMaterials/reportAuditing/index'),
+ // meta: { title: '鎶ュ憡瀹℃牳', icon: 'tree' }
+ // },
+ // {
+ // path: 'nonConformanceReview',
+ // name: 'NonConformanceReview',
+ // component: () => import('@/views/rawMaterials/nonConformanceReview/index'),
+ // meta: { title: '涓嶅悎鏍煎弽棣�', icon: 'tree' }
+ // },
+ // {
+ // path: 'nonConformingFeedback',
+ // name: 'NonConformingFeedback',
+ // component: () => import('@/views/rawMaterials/nonConformingFeedback/index'),
+ // meta: { title: '涓嶅悎鏍艰瘎瀹�', icon: 'tree' }
+ // },
+ // {
+ // path: 'passRateStatistics',
+ // name: 'PassRateStatistics',
+ // component: () => import('@/views/rawMaterials/passRateStatistics/index'),
+ // meta: { title: '鍚堟牸鐜囩粺璁�', icon: 'tree' }
+ // }
+ // ]
+ // },
{
- path: '/trialManagement',
+ path: '/inspectionManagement',
component: Layout,
- redirect: '/trialManagement/index',
- meta: { title: '璇曢獙绠＄悊', icon: 'el-icon-s-help' },
+ redirect: '/inspectionManagement/commissionInspection',
+ name: 'InspectionManagement',
+ meta: { title: '鎶ユ绠＄悊', icon: 'el-icon-s-help' },
children: [
{
- path: 'index',
- name: 'entrust',
- component: () => import('@/views/trialManagement/entrust'),
- meta: { title: '濮旀墭妫�楠�', icon: 'form' }
- },
- {
- path: 'rawMaterials',
- name: 'RawMaterials',
- component: () => import('@/views/trialManagement/rawMaterials'),
- meta: { title: '鍘熸潗鏂欐姤妫�', icon: 'form' }
- }
- ]
- },
- {
- path: '/rawMaterials',
- component: Layout,
- redirect: '/rawMaterials/reportForInspection',
- name: 'rawMaterials',
- meta: { title: '妫�楠�', icon: 'el-icon-s-help' },
- children: [
- {
- path: 'reportForInspection',
- name: 'ReportForInspection',
- component: () => import('@/views/rawMaterials/reportForInspection/index'),
- meta: { title: '鍘熸潗鏂欐姤妫�', icon: 'table' },
+ path: 'commissionInspection',
+ name: 'CommissionInspection',
+ component: () => import('@/views/inspectionManagement/commissionInspection/index'),
+ meta: { title: '濮旀墭妫�楠�', icon: 'table' },
children: [
- // {
- // path: 'index',
- // name: 'ReportForInspectionIndex',
- // // hidden: true,
- // component: () => import('@/views/rawMaterials/reportForInspection/index'),
- // meta: { title: '鍘熸潗鏂欐姤妫�', icon: 'table' }
- // },
{
- path: 'forInspectionDetail',
- name: 'ForInspectionDetail',
+ path: 'addCommision',
+ name: 'AddCommision',
hidden: true,
- component: () => import('@/views/rawMaterials/reportForInspection/forInspectionDetail'),
- meta: { title: '鏂板妫�楠屽崟璇︽儏', icon: 'table' }
+ component: () => import('@/views/inspectionManagement/commissionInspection/addCommision'),
+ meta: { title: '妫�娴嬩俊鎭�', icon: 'table' }
}
]
},
{
- path: 'print',
- name: 'Print',
- component: () => import('@/views/rawMaterials/print/index'),
- meta: { title: '鏉＄爜鎵撳嵃', icon: 'tree' }
+ path: 'reportForInspection',
+ name: 'ReportForInspection',
+ component: () => import('@/views/inspectionManagement/reportForInspection/index'),
+ meta: { title: '鍘熸潗鏂欐姤妫�', icon: 'tree' }
+ }
+ ]
+ },
+ {
+ path: '/experiment',
+ component: Layout,
+ redirect: '/experiment/inspectionApplication',
+ name: 'Experiment',
+ meta: { title: '璇曢獙绠＄悊', icon: 'el-icon-s-help' },
+ children: [
+ {
+ path: 'inspectionApplication',
+ name: 'InspectionApplication',
+ component: () => import('@/views/experiment/inspectionApplication/index'),
+ meta: { title: '妫�楠岀敵璇�', icon: 'tree' }
},
{
path: 'planAssignments',
name: 'PlanAssignments',
- component: () => import('@/views/rawMaterials/planAssignments/index'),
+ component: () => import('@/views/experiment/planAssignments/index'),
meta: { title: '妫�楠岃鍒掑垎閰�', icon: 'tree' }
- },
- {
- path: 'rawMaterialInspection',
- name: 'RawMaterialInspection',
- component: () => import('@/views/rawMaterials/rawMaterialInspection/index'),
- meta: { title: '鍘熸潗鏂欐楠�', icon: 'tree' }
},
{
path: 'checkTheReport',
name: 'CheckTheReport',
- component: () => import('@/views/rawMaterials/checkTheReport/index'),
+ component: () => import('@/views/experiment/checkTheReport/index'),
meta: { title: '妫�楠屾姤鍛�', icon: 'tree' }
},
{
path: 'reportAuditing',
name: 'ReportAuditing',
- component: () => import('@/views/rawMaterials/reportAuditing/index'),
+ component: () => import('@/views/experiment/reportAuditing/index'),
meta: { title: '鎶ュ憡瀹℃牳', icon: 'tree' }
},
{
path: 'nonConformanceReview',
name: 'NonConformanceReview',
- component: () => import('@/views/rawMaterials/nonConformanceReview/index'),
- meta: { title: '涓嶅悎鏍煎弽棣�', icon: 'tree' }
+ component: () => import('@/views/experiment/nonConformanceReview/index'),
+ meta: { title: '涓嶅悎鏍煎搧鍙嶉', icon: 'tree' }
},
{
path: 'nonConformingFeedback',
name: 'NonConformingFeedback',
- component: () => import('@/views/rawMaterials/nonConformingFeedback/index'),
- meta: { title: '涓嶅悎鏍艰瘎瀹�', icon: 'tree' }
+ component: () => import('@/views/experiment/nonConformingFeedback/index'),
+ meta: { title: '涓嶅悎鏍煎搧璇勫', icon: 'tree' }
},
{
path: 'passRateStatistics',
name: 'PassRateStatistics',
- component: () => import('@/views/rawMaterials/passRateStatistics/index'),
+ component: () => import('@/views/experiment/passRateStatistics/index'),
meta: { title: '鍚堟牸鐜囩粺璁�', icon: 'tree' }
}
]
@@ -270,6 +331,39 @@
]
},
{
+ path: '/CNAS',
+ component: Layout,
+ redirect: '/CNAS/reviewAnnualPlan',
+ name: 'CNAS',
+ meta: { title: 'CNAS绠＄悊', icon: 'el-icon-s-help' },
+ children: [
+ {
+ path: 'reviewAnnualPlan',
+ name: 'ReviewAnnualPlan',
+ component: () => import('@/views/CNAS/reviewAnnualPlan/index'),
+ meta: { title: '瀹℃牳骞村害璁″垝', icon: 'table' }
+ },
+ {
+ path: 'nonConformanceManage',
+ name: 'NonConformanceManage',
+ component: () => import('@/views/CNAS/nonConformanceManage/index'),
+ meta: { title: '涓嶇鍚堥」绠＄悊', icon: 'tree' }
+ },
+ {
+ path: 'nonConformanceStatistics',
+ name: 'NonConformanceStatistics',
+ component: () => import('@/views/CNAS/nonConformanceStatistics/index'),
+ meta: { title: '涓嶇鍚堥」缁熻', icon: 'tree' }
+ },
+ {
+ path: 'satisfactionSurveys',
+ name: 'SatisfactionSurveys',
+ component: () => import('@/views/CNAS/satisfactionSurveys/index'),
+ meta: { title: '婊℃剰搴﹁皟鏌�', icon: 'tree' }
+ }
+ ]
+ },
+ {
path: '/chart',
component: Layout,
redirect: '/chart/center',
diff --git a/src/views/CNAS/nonConformanceManage/index.vue b/src/views/CNAS/nonConformanceManage/index.vue
new file mode 100644
index 0000000..884cce1
--- /dev/null
+++ b/src/views/CNAS/nonConformanceManage/index.vue
@@ -0,0 +1,5 @@
+<template>
+ <div>
+ 涓嶇鍚堥」绠＄悊
+ </div>
+</template>
diff --git a/src/views/CNAS/nonConformanceStatistics/index.vue b/src/views/CNAS/nonConformanceStatistics/index.vue
new file mode 100644
index 0000000..ac6c740
--- /dev/null
+++ b/src/views/CNAS/nonConformanceStatistics/index.vue
@@ -0,0 +1,3 @@
+<template>
+ <div>涓嶇鍚堥」缁熻</div>
+</template>
diff --git a/src/views/CNAS/reviewAnnualPlan/index.vue b/src/views/CNAS/reviewAnnualPlan/index.vue
new file mode 100644
index 0000000..183ba06
--- /dev/null
+++ b/src/views/CNAS/reviewAnnualPlan/index.vue
@@ -0,0 +1,5 @@
+<template>
+ <div>
+ 瀹℃牳骞村害璁″垝
+ </div>
+</template>
diff --git a/src/views/CNAS/satisfactionSurveys/index.vue b/src/views/CNAS/satisfactionSurveys/index.vue
new file mode 100644
index 0000000..0888772
--- /dev/null
+++ b/src/views/CNAS/satisfactionSurveys/index.vue
@@ -0,0 +1,5 @@
+<template>
+ <div>
+ 婊℃剰搴﹁皟鏌�
+ </div>
+</template>
diff --git a/src/views/experiment/checkTheReport/index.vue b/src/views/experiment/checkTheReport/index.vue
new file mode 100644
index 0000000..d08ff60
--- /dev/null
+++ b/src/views/experiment/checkTheReport/index.vue
@@ -0,0 +1,13 @@
+<template>
+ <div>妫�娴嬫姤鍛�</div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>
diff --git a/src/views/experiment/inspectionApplication/index.vue b/src/views/experiment/inspectionApplication/index.vue
new file mode 100644
index 0000000..e3a2d0e
--- /dev/null
+++ b/src/views/experiment/inspectionApplication/index.vue
@@ -0,0 +1,5 @@
+<template>
+ <div>
+ 妫�楠岀敵璇�
+ </div>
+</template>
diff --git a/src/views/experiment/nonConformanceReview/index.vue b/src/views/experiment/nonConformanceReview/index.vue
new file mode 100644
index 0000000..23f8a41
--- /dev/null
+++ b/src/views/experiment/nonConformanceReview/index.vue
@@ -0,0 +1,13 @@
+<template>
+ <div>涓嶅悎鏍艰瘎瀹�</div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>
diff --git a/src/views/experiment/nonConformingFeedback/index.vue b/src/views/experiment/nonConformingFeedback/index.vue
new file mode 100644
index 0000000..6733e19
--- /dev/null
+++ b/src/views/experiment/nonConformingFeedback/index.vue
@@ -0,0 +1,13 @@
+<template>
+ <div>涓嶅悎鏍煎弽棣�</div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>
diff --git a/src/views/experiment/passRateStatistics/index.vue b/src/views/experiment/passRateStatistics/index.vue
new file mode 100644
index 0000000..7107345
--- /dev/null
+++ b/src/views/experiment/passRateStatistics/index.vue
@@ -0,0 +1,13 @@
+<template>
+ <div>鍚堟牸鐜囩粺璁�</div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>
diff --git a/src/views/experiment/planAssignments/index.vue b/src/views/experiment/planAssignments/index.vue
new file mode 100644
index 0000000..5f0f590
--- /dev/null
+++ b/src/views/experiment/planAssignments/index.vue
@@ -0,0 +1,13 @@
+<template>
+ <div>妫�楠岃鍒掑垎閰�</div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>
diff --git a/src/views/experiment/reportAuditing/index.vue b/src/views/experiment/reportAuditing/index.vue
new file mode 100644
index 0000000..f409c24
--- /dev/null
+++ b/src/views/experiment/reportAuditing/index.vue
@@ -0,0 +1,13 @@
+<template>
+ <div>鎶ュ憡瀹℃牳</div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>
diff --git a/src/views/inspectionManagement/commissionInspection/addCommision.vue b/src/views/inspectionManagement/commissionInspection/addCommision.vue
new file mode 100644
index 0000000..e0999c0
--- /dev/null
+++ b/src/views/inspectionManagement/commissionInspection/addCommision.vue
@@ -0,0 +1,254 @@
+<template>
+ <div class="content-main">
+ <div class="firstBox">
+ <span>妫�娴嬩俊鎭�</span>
+ <div tableBox>
+ <el-button type="primary" size="small" style="background-color: rgb(1, 102, 226);">娣诲姞鏍峰搧</el-button>
+ <el-input
+ v-model="searchData"
+ class="input-form"
+ placeholder="鎵弿浜岀淮鐮佸綍鍏ユ牱鍝�..."
+ prefix-icon="el-icon-search"
+ style="width: 200px;"
+ >
+ </el-input>
+ <el-button type="primary" size="small" style="background-color: rgb(1, 102, 226);">閲嶇疆</el-button>
+ <el-table
+ ref="commisionTable"
+ :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="commisionTable"
+ style="width: 100%"
+ >
+ <el-table-column
+ type="index"
+ label="搴忓彿"
+ min-width="10%"
+ />
+ <el-table-column
+ prop="commisioncode"
+ label="濮旀墭缂栧彿"
+ min-width="8%"
+ />
+ <el-table-column
+ prop="department"
+ label="濮旀墭鍗曚綅"
+ min-width="10%"
+ />
+ <el-table-column
+ prop="samplecode"
+ label="鏍峰搧缂栧彿"
+ min-width="8%"
+ />
+ <el-table-column
+ prop="samplename"
+ label="鏍峰搧鍚嶇О"
+ min-width="8%"
+ />
+ <el-table-column
+ prop="modelandspecification"
+ label="瑙勬牸鍨嬪彿"
+ min-width="10%"
+ />
+ <el-table-column
+ prop="arrivetime"
+ label="閫佽揪鏃堕棿"
+ min-width="8%"
+ />
+ <el-table-column
+ prop="deadline"
+ label="瀹屾垚鏈熼檺"
+ min-width="8%"
+ />
+ <el-table-column
+ prop="person"
+ label="濮旀墭缂栧埗浜�"
+ min-width="8%"
+ />
+ <el-table-column
+ prop="checkdate"
+ label="妫�楠屾棩鏈�"
+ min-width="8%"
+ />
+ <el-table-column
+ prop="state"
+ label="鐘舵��"
+ min-width="8%"
+ />
+ <el-table-column
+ label="鎿嶄綔"
+ min-width="8%"
+ >
+ <template slot-scope="scope">
+ <el-button type="text" size="small" @click="handleClick(scope.row)">鍒犻櫎</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <!-- 鍒嗛〉鍣� -->
+ <div>
+ <el-pagination
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
+ :current-page="currentPage"
+ :page-sizes="[100, 200, 300, 400]"
+ :page-size="100"
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="400">
+ </el-pagination>
+ </div>
+ </div>
+ <div class="secondBox">
+ <el-row class="header">
+ <el-col :span="12">鍩烘湰淇℃伅</el-col>
+ <el-col :span="12" style="text-align: right;">
+ <!-- 鐐瑰嚮杩斿洖锛屽綋鍓嶉〉闈㈠�间负false -->
+ <el-button type="primary" size="mini" style="background-color: rgb(1, 102, 226); ">鎵撳嵃濮旀墭鍗�</el-button>
+ </el-col>
+ </el-row>
+ <el-form :model="infoForm" ref="infoForm" class="infoForm" label-position="left" label-width="100px" size="mini" >
+ <div class="formwrapper">
+ <el-row :gutter="50">
+ <el-col :span="12">
+ <el-form-item label="濮旀墭缂栧彿锛�">
+ <el-input style="width: 100px;" v-model="infoForm.commisioncode" placeholder="璇疯緭鍏ヨ鍗曞彿" readonly autocomplete="off" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="濮旀墭鍗曚綅锛�">
+ <el-select style="width: 180px;" v-model="infoForm.department" size="small" placeholder="璇烽�夋嫨浜у搧鍚嶇О">
+ <el-option value="閫夐」1"></el-option>
+ <el-option value="閫夐」2"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鑱旂郴浜猴細">
+ <el-select style="width: 180px;" v-model="infoForm.contacter" size="small" placeholder="璇烽�夋嫨浜у搧鍚嶇О">
+ <el-option value="閫夐」1"></el-option>
+ <el-option value="閫夐」2"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鑱旂郴鐢佃瘽锛�">
+ <el-select style="width: 180px;" v-model="infoForm.tel" size="small" placeholder="璇烽�夋嫨浜у搧鍚嶇О">
+ <el-option value="閫夐」1"></el-option>
+ <el-option value="閫夐」2"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="450">
+ <el-col :span="5">
+ <el-form-item label="鑱旂郴鍦板潃锛�" >
+ <el-select style="width: 180px;" v-model="infoForm.address" size="small" placeholder="璇烽�夋嫨浜у搧鍚嶇О">
+ <el-option value="閫夐」1"></el-option>
+ <el-option value="閫夐」2"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="瀹屾垚鏈熼檺锛�">
+ <el-date-picker
+ v-model="infoForm.deadline"
+ type="date"
+ placeholder="閫夋嫨鏃ユ湡"
+ style="width: 180px;">
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="閫佹牱鏃堕棿锛�">
+ <el-date-picker
+ v-model="infoForm.time"
+ type="date"
+ placeholder="閫夋嫨鏃ユ湡"
+ style="width: 180px;">
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="閫佹牱鏂瑰紡锛�">
+ <el-select style="width: 180px;" v-model="infoForm.way" size="small" placeholder="閫佹牱">
+ <el-option value="閫夐」1"></el-option>
+ <el-option value="閫夐」2"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="450">
+ <el-col :span="5">
+ <el-form-item label="閫佹牱浜猴細" >
+ <el-input style="width: 180px;" v-model="infoForm.sender" placeholder="璇疯緭鍏ラ�佹牱浜�" autocomplete="off" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="閫佹牱浜虹數璇濓細" >
+ <el-input style="width: 180px;" v-model="infoForm.sendertel" placeholder="璇疯緭鍏ラ�佹牱浜虹數璇�" autocomplete="off" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="鎶ュ憡鏁帮細">
+ <el-input style="width: 180px;" v-model="infoForm.num" placeholder="璇疯緭鍏ユ姤鍛婃暟" autocomplete="off" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="濮旀墭澶囨敞锛�">
+ <el-input style="width: 180px;" v-model="infoForm.other" placeholder="澶囨敞" autocomplete="off" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </div>
+ </el-form>
+ </div>
+ </div>
+ </div>
+</template>
+
+<script>
+export default {
+ data() {
+ return {
+ searchData: '',
+ infoForm: [{
+ commisioncode: '',
+ department: '',
+ contacter: '',
+ tel: '',
+ address: '',
+ deadline: '',
+ time: '',
+ way: '',
+ sender: '',
+ sendertel: '',
+ num: '',
+ other: ''
+ }]
+ }
+ },
+ methods: {
+ handleSelectionChange(val) {
+ console.log(val)
+ this.radioSelected = val.number // 閫変腑琛岀殑number
+ this.multipleSelection = val // 閫変腑鐨勪竴琛屾暟鎹�
+ },
+ handleSizeChange(pageSize) {
+ this.pageParams.pageSize = pageSize
+ },
+ handleCurrentChange(pageNo) {
+ this.pageParams.pageNo = pageNo
+ },
+ headerBg({ row, rowIndex }) {
+ console.log('rowIndex', rowIndex)
+ if (rowIndex === 0) {
+ return 'headerBgClass'
+ }
+ }
+ }
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>
diff --git a/src/views/inspectionManagement/commissionInspection/index.vue b/src/views/inspectionManagement/commissionInspection/index.vue
new file mode 100644
index 0000000..f34234e
--- /dev/null
+++ b/src/views/inspectionManagement/commissionInspection/index.vue
@@ -0,0 +1,284 @@
+<template>
+ <div>
+ <div v-if="!showDetail">
+ <div class="content-main">
+ <div class="top-bar">
+ <el-form ref="form" :inline="true" :model="searchData">
+ <el-form-item label="濮旀墭缂栧彿:" class="sermargin">
+ <el-input
+ v-model="searchData.code"
+ class="input-form"
+ placeholder="璇疯緭鍏�"
+ >
+ </el-input>
+ </el-form-item>
+ <el-form-item label="鏍峰搧鍚嶇О:" class="sermargin">
+ <el-input
+ v-model="searchData.name"
+ class="input-form"
+ placeholder="璇疯緭鍏�"
+ >
+ </el-input>
+ </el-form-item>
+ <el-form-item label="濮旀墭鍗曚綅:" style="margin-right: 20px;">
+ <el-select v-model="searchData.department" placeholder="鍏ㄩ儴">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary">鏌ヨ</el-button>
+ <el-button type="primary" plain>閲嶇疆</el-button>
+ </el-form-item>
+ </el-form>
+ <el-form>
+ <el-button class="rightBtn" type="primary" @click="goToaddCommision">鏂板濮旀墭</el-button>
+ </el-form>
+ </div>
+ <div class="library-table">
+ <div class="table-header">
+ <div class="search-bar">
+ <el-radio-group v-model="radioValue">
+ <el-radio-button label="鍏ㄩ儴" />
+ <el-radio-button label="寰呮楠�" />
+ <el-radio-button label="宸叉楠�" />
+ </el-radio-group>
+ </div>
+ <div class="generateInsp">
+ <el-button type="primary" size="mini" icon="el-icon-document" style="background-color: rgb(1, 102, 226);">鐢熸垚鎶ユ鍗�</el-button>
+ </div>
+ </div>
+ <div class="table-box">
+ <el-table
+ ref="commisionTable"
+ :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="commisionTable"
+ style="width: 100%"
+ >
+ <el-table-column
+ type="index"
+ label="搴忓彿"
+ min-width="10%"
+ />
+ <el-table-column
+ prop="commisioncode"
+ label="濮旀墭缂栧彿"
+ min-width="8%"
+ />
+ <el-table-column
+ prop="department"
+ label="濮旀墭鍗曚綅"
+ min-width="10%"
+ />
+ <el-table-column
+ prop="samplecode"
+ label="鏍峰搧缂栧彿"
+ min-width="8%"
+ />
+ <el-table-column
+ prop="samplename"
+ label="鏍峰搧鍚嶇О"
+ min-width="8%"
+ />
+ <el-table-column
+ prop="modelandspecification"
+ label="瑙勬牸鍨嬪彿"
+ min-width="10%"
+ />
+ <el-table-column
+ prop="arrivetime"
+ label="閫佽揪鏃堕棿"
+ min-width="8%"
+ />
+ <el-table-column
+ prop="deadline"
+ label="瀹屾垚鏈熼檺"
+ min-width="8%"
+ />
+ <el-table-column
+ prop="person"
+ label="濮旀墭缂栧埗浜�"
+ min-width="8%"
+ />
+ <el-table-column
+ prop="checkdate"
+ label="妫�楠屾棩鏈�"
+ min-width="8%"
+ />
+ <el-table-column
+ prop="state"
+ label="鐘舵��"
+ min-width="8%"
+ />
+ <el-table-column
+ label="鎿嶄綔"
+ min-width="8%"
+ >
+ <template slot-scope="scope">
+ <el-button type="text" size="small" @click="handleClick(scope.row)">鍒犻櫎</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <!-- 鍒嗛〉鍣� -->
+ <div>
+ <el-pagination
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
+ :current-page="currentPage"
+ :page-sizes="[100, 200, 300, 400]"
+ :page-size="100"
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="400">
+ </el-pagination>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div v-else>
+ <router-view />
+ </div>
+ </div>
+</template>
+
+<script>
+export default {
+ data() {
+ return {
+ form: [],
+ searchData: {
+ code: '',
+ name: '',
+ department: ''
+ },
+ options: [{
+ value: '1',
+ label: '閮ㄩ棬1'
+ }, {
+ value: '2',
+ label: '閮ㄩ棬2'
+ }, {
+ value: '3',
+ label: '閮ㄩ棬3'
+ }],
+ radioValue: '',
+ commisionTable: [{
+ commisioncode: 'GW31478631',
+ department: '鍥界綉灞变笢鐪佺數鍔涙湁闄愬叕鍙�',
+ samplecode: 'BP214274',
+ samplename: '缁濈紭鏉�',
+ modelandspecification: 'JLHA/G1A-185/30-26/7',
+ arrivetime: '2023-08-01',
+ deadline: '2023-08-05',
+ person: '榛勫皬鏄�',
+ checkdate: '2023-08-02',
+ state: '宸叉娴�'
+ }, {
+ commisioncode: 'GW31478631',
+ department: '鍥界綉灞变笢鐪佺數鍔涙湁闄愬叕鍙�',
+ samplecode: 'BP214274',
+ samplename: '缁濈紭鏉�',
+ modelandspecification: 'JLHA/G1A-185/30-26/7',
+ arrivetime: '2023-08-01',
+ deadline: '2023-08-05',
+ person: '榛勫皬鏄�',
+ checkdate: '2023-08-02',
+ state: '宸叉娴�'
+ }, {
+ commisioncode: 'GW31478631',
+ department: '鍥界綉灞变笢鐪佺數鍔涙湁闄愬叕鍙�',
+ samplecode: 'BP214274',
+ samplename: '缁濈紭鏉�',
+ modelandspecification: 'JLHA/G1A-185/30-26/7',
+ arrivetime: '2023-08-01',
+ deadline: '2023-08-05',
+ person: '榛勫皬zhi',
+ checkdate: '2023-08-02',
+ state: '宸叉娴�'
+ }],
+ currentPage: 0,
+ showDetail: false
+ }
+ },
+ updated() {
+ if (this.$router.currentRoute.name === 'AddCommision') {
+ // console.log(this.$router.currentRoute.name)
+ this.showDetail = true
+ }
+ },
+ methods: {
+ // 姣忛〉鏉℃暟鏀瑰彉鏃惰Е鍙� 閫夋嫨涓�椤垫樉绀哄灏戣
+ handleSizeChange(val) {
+ console.log(`姣忛〉 ${val} 鏉)
+ this.currentPage = 1
+ this.pageSize = val
+ },
+ // 褰撳墠椤垫敼鍙樻椂瑙﹀彂 璺宠浆鍏朵粬椤�
+ handleCurrentChange(val) {
+ console.log(`褰撳墠椤�: ${val}`)
+ this.currentPage = val
+ },
+ goToaddCommision() {
+ this.$router.push('/inspectionManagement/commissionInspection/addCommision')
+ this.showDetail = true
+ }
+ }
+}
+</script>
+
+<style scoped>
+
+.top-bar{
+ margin: -25px -15px;
+ background: #fff;
+ display: flex;
+ justify-content: space-between;
+ padding: 5px 24px 0px 24px;
+ .sermargin{
+ margin-right: 60px;
+ }
+ }
+.rightBtn{
+ background-color: rgb(1, 102, 226);
+}
+.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: 0px;
+ flex: 1;
+ background: #fff;
+ /* padding: 20px 20px 10px 20px; */
+ display: flex;
+ flex-direction: column;
+ .el-table {
+ flex: 1;
+ }
+ >div:nth-child(2){
+ display: flex;
+ justify-content: end;
+ margin: 10px 0;
+ }
+ }
+ }
+
+</style>
diff --git a/src/views/inspectionManagement/reportForInspection/index.vue b/src/views/inspectionManagement/reportForInspection/index.vue
new file mode 100644
index 0000000..84cdfb4
--- /dev/null
+++ b/src/views/inspectionManagement/reportForInspection/index.vue
@@ -0,0 +1,302 @@
+<template>
+ <div class="content-main">
+ <div class="top-bar">
+ <el-form ref="form" :inline="true" :model="searchData">
+ <el-form-item label="鏉愭枡缂栫爜:" class="sermargin">
+ <el-input
+ v-model="searchData.code"
+ class="input-form"
+ placeholder="璇疯緭鍏�"
+ >
+ </el-input>
+ </el-form-item>
+ <el-form-item label="鏉愭枡鍚嶇О:" class="sermargin">
+ <el-input
+ v-model="searchData.name"
+ class="input-form"
+ placeholder="璇疯緭鍏�"
+ >
+ </el-input>
+ </el-form-item>
+ <el-form-item label="鐘舵��:" class="sermargin">
+ <el-select v-model="searchData.state" placeholder="鍏ㄩ儴">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鏉ユ枡鏃ユ湡:" style="margin-right: 20px;">
+ <el-input
+ v-model="searchData.date"
+ class="input-form"
+ placeholder="璇疯緭鍏�"
+ >
+ </el-input>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary">鏌ヨ</el-button>
+ <el-button type="primary" plain>閲嶇疆</el-button>
+ </el-form-item>
+ </el-form>
+ </div>
+ <div class="library-table">
+ <div class="table-header">
+ <div class="search-bar">
+ <el-radio-group v-model="radioValue">
+ <el-radio-button label="鍏ㄩ儴" />
+ <el-radio-button label="寰呮楠�" />
+ <el-radio-button label="宸叉楠�" />
+ </el-radio-group>
+ </div>
+ <div class="generateInsp">
+ <el-button type="primary" size="mini" icon="el-icon-document" style="background-color: rgb(1, 102, 226);">鐢熸垚鎶ユ鍗�</el-button>
+ </div>
+ </div>
+ <div class="table-box">
+ <el-table
+ ref="inspectionTable"
+ :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="inspectionTable"
+ style="width: 100%"
+ >
+ <el-table-column
+ type="selection"
+ label=""
+ min-width="10%"
+ />
+ <el-table-column
+ type="index"
+ label="搴忓彿"
+ min-width="8%"
+ />
+ <el-table-column
+ prop="date"
+ label="鏉ユ枡鏃ユ湡"
+ min-width="8%"
+ />
+ <el-table-column
+ prop="providerName"
+ label="渚涘簲鍟嗗悕绉�"
+ min-width="12%"
+ />
+ <el-table-column
+ prop="code"
+ label="鏉愭枡缂栫爜"
+ min-width="8%"
+ />
+ <el-table-column
+ prop="name"
+ label="鏉愭枡鍚嶇О"
+ min-width="8%"
+ />
+ <el-table-column
+ prop="modelandspecification"
+ label="瑙勬牸鍨嬪彿"
+ min-width="12%"
+ />
+ <el-table-column
+ prop="unit"
+ label="鍗曚綅"
+ min-width="5%"
+ />
+ <el-table-column
+ prop="amount"
+ label="鏁伴噺"
+ min-width="5%"
+ />
+ <el-table-column
+ prop="commisiondate"
+ label="鎶ユ鏃ユ湡"
+ min-width="8%"
+ />
+ <el-table-column
+ prop="person"
+ label="妫�楠屼汉"
+ min-width="8%"
+ />
+ <el-table-column
+ prop="checkdate"
+ label="妫�楠屾棩鏈�"
+ min-width="8%"
+ />
+ <el-table-column
+ prop="state"
+ label="鐘舵��"
+ min-width="8%"
+ >
+ <template slot-scope="scope">
+ <span :style="{ color: scope.row.state === '宸叉娴�' ? 'green' : 'red' }">
+ {{ scope.row.state }}
+ </span>
+ </template>
+ </el-table-column>
+ </el-table>
+ <!-- 鍒嗛〉鍣� -->
+ <div>
+ <el-pagination
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
+ :current-page="currentPage"
+ :page-sizes="[100, 200, 300, 400]"
+ :page-size="100"
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="400">
+ </el-pagination>
+ </div>
+ </div>
+ </div>
+ </div>
+</template>
+
+<script>
+export default {
+ data() {
+ return {
+ form: [],
+ searchData: {
+ code: '',
+ name: '',
+ state: '',
+ date: ''
+ },
+ options: [{
+ value: '1',
+ label: '閮ㄩ棬1'
+ }, {
+ value: '2',
+ label: '閮ㄩ棬2'
+ }, {
+ value: '3',
+ label: '閮ㄩ棬3'
+ }],
+ radioValue: '',
+ inspectionTable: [{
+ date: '2023-07-28',
+ providerName: '鍥界綉灞变笢鐪佺數鍔涙湁闄愬叕鍙�',
+ code: 'BP214274',
+ name: '閾濆寘閽㈢粸绾�',
+ modelandspecification: 'JLHA/G1A-185/30-26/7',
+ unit: '鍚�',
+ amount: '21',
+ commisiondate: '2023-08-02',
+ person: '榛勫皬鏄�',
+ checkdate: '2023-12-09',
+ state: '宸叉娴�'
+ }, {
+ date: '2023-07-28',
+ providerName: '鍥界綉灞变笢鐪佺數鍔涙湁闄愬叕鍙�',
+ code: 'BP214274',
+ name: '閾濆寘閽㈢粸绾�',
+ modelandspecification: 'JLHA/G1A-185/30-26/7',
+ unit: '鍚�',
+ amount: '21',
+ commisiondate: '2023-08-02',
+ person: '榛勫皬鏄�',
+ checkdate: '2023-12-09',
+ state: '寰呮娴�'
+ }, {
+ date: '2023-07-28',
+ providerName: '鍥界綉灞变笢鐪佺數鍔涙湁闄愬叕鍙�',
+ code: 'BP214274',
+ name: '閾濆寘閽㈢粸绾�',
+ modelandspecification: 'JLHA/G1A-185/30-26/7',
+ unit: '鍚�',
+ amount: '21',
+ commisiondate: '2023-08-02',
+ person: '榛勫皬鏄�',
+ checkdate: '2023-12-09',
+ state: '宸叉娴�'
+ }, {
+ date: '2023-07-28',
+ providerName: '鍥界綉灞变笢鐪佺數鍔涙湁闄愬叕鍙�',
+ code: 'BP214274',
+ name: '閾濆寘閽㈢粸绾�',
+ modelandspecification: 'JLHA/G1A-185/30-26/7',
+ unit: '鍚�',
+ amount: '21',
+ commisiondate: '2023-08-02',
+ person: '榛勫皬鏄�',
+ checkdate: '2023-12-09',
+ state: '寰呮娴�'
+ }],
+ currentPage: 0
+ }
+ },
+ methods: {
+ // 姣忛〉鏉℃暟鏀瑰彉鏃惰Е鍙� 閫夋嫨涓�椤垫樉绀哄灏戣
+ handleSizeChange(val) {
+ console.log(`姣忛〉 ${val} 鏉)
+ this.currentPage = 1
+ this.pageSize = val
+ },
+ // 褰撳墠椤垫敼鍙樻椂瑙﹀彂 璺宠浆鍏朵粬椤�
+ handleCurrentChange(val) {
+ console.log(`褰撳墠椤�: ${val}`)
+ this.currentPage = val
+ }
+ }
+}
+</script>
+
+<style scoped>
+
+.top-bar{
+ margin: -25px -15px;
+ background: #fff;
+ display: flex;
+ justify-content: space-between;
+ padding: 5px 24px 0px 24px;
+ .sermargin{
+ margin-right: 60px;
+ }
+}
+.rightBtn{
+ background-color: rgb(1, 102, 226);
+}
+.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: 0px;
+ flex: 1;
+ background: #fff;
+ /* padding: 20px 20px 10px 20px; */
+ display: flex;
+ flex-direction: column;
+ .el-table {
+ flex: 1;
+ }
+ >div:nth-child(2){
+ display: flex;
+ justify-content: end;
+ margin: 10px 0;
+ }
+ }
+ }
+.checked {
+ color: green;
+}
+
+.unchecked {
+ color: red;
+}
+
+</style>
diff --git a/src/views/laboratory/ledger/index.vue b/src/views/laboratory/ledger/index.vue
index d8e1d65..f092459 100644
--- a/src/views/laboratory/ledger/index.vue
+++ b/src/views/laboratory/ledger/index.vue
@@ -12,8 +12,8 @@
</el-input>
</el-form-item>
<el-form-item>
- <el-button type="primary">鏌ヨ</el-button>
- <el-button type="primary" plain>閲嶇疆</el-button>
+ <el-button type="primary" @click="filterTableData">鏌ヨ</el-button>
+ <el-button type="primary" plain @click="resetBtn">閲嶇疆</el-button>
<!-- <el-button type="text">楂樼骇鎼滅储<i class="el-icon-arrow-down el-icon--right" /></el-button> -->
</el-form-item>
</el-form>
@@ -28,6 +28,7 @@
<el-row>
<el-col :span="19">
<el-input
+ v-model="filterText"
placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�"
/>
</el-col>
@@ -40,7 +41,7 @@
ref="classTree"
:data="classTree"
:props="defaultProps"
- default-expand-all
+ :default-expand-all="true"
:filter-node-method="filterNode"
@node-click="nodeClickHandler"
/>
@@ -48,13 +49,13 @@
<div class="library-table">
<div class="table-header">
<div class="search-bar">
- <el-radio-group v-model="radioValue">
- <el-radio-button label="0">鍏ㄩ儴</el-radio-button>
+ <el-radio-group v-model="radioValue" @change="getConditionTable">
+ <!-- <el-radio-button label="0">鍏ㄩ儴</el-radio-button> -->
<el-radio-button v-for="item in conditionsOptions" :key="item.value" :label="item.value">
{{ item.label }}
</el-radio-button>
</el-radio-group>
- <el-checkbox v-model="isOut" :style="{'marginLeft':'12px'}">宸茶繃鏈�</el-checkbox>
+ <el-checkbox v-model="isOut" @change="getExpireTable" :style="{'marginLeft':'12px'}">宸茶繃鏈�</el-checkbox>
</div>
<div class="serve-btn">
<!-- <el-button type="primary" icon="el-icon-plus">鏂板浜哄憳</el-button> -->
@@ -124,7 +125,7 @@
>
<template slot-scope="scope">
<el-button type="text" size="small" @click="openDetail(scope.row)">缂栬緫</el-button>
- <el-button type="text" size="small">鍒犻櫎</el-button>
+ <el-button type="text" size="small" @click="clickDelete(scope.row)">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
@@ -650,6 +651,18 @@
<el-button @click="measureFormVisible = false">鍙� 娑�</el-button>
</span>
</el-dialog>
+ <!-- 鍒犻櫎浠櫒寮瑰嚭妗� -->
+ <el-dialog
+ title="鎻愮ず"
+ :visible.sync="deletedialogVisible"
+ width="30%"
+ :before-close="handleClose">
+ <span>纭畾鍒犻櫎璇ヤ华鍣ㄥ悧锛�</span>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="deletedialogVisible = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="deleteInstrument">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
</div>
</template>
@@ -657,7 +670,7 @@
import { getClassifyList, getInstrumentList,
addInstrumentUser, addInstrument, getInstrumentDetail,
getEquipmentPointList, addEquipmentPoint,
- getMetricalInformationList, changeInstrument, addMetricalInformation } from '@/api/laboratory/ledger'
+ getMetricalInformationList, changeInstrument, addMetricalInformation, deleteInstrument } from '@/api/laboratory/ledger'
import { parseTime } from '@/utils/index'
export default {
filters: {
@@ -689,6 +702,10 @@
userOpetions: [],
// 浠櫒鐘舵�侀厤缃」
conditionsOptions: [
+ {
+ label: '鍏ㄩ儴',
+ value: 0
+ },
{
label: '杩愯',
value: 1
@@ -748,6 +765,8 @@
addClassVisible: false,
// 鎺у埗鏂板璁￠噺妯℃�佹鏄剧ず
measureFormVisible: false,
+ // 鎺у埗鍒犻櫎浠櫒妯℃�佹鏄剧ず
+ deletedialogVisible: false,
// 鎺у埗娣诲姞淇敼浠櫒鎶藉眽鐨勬樉绀�
addDrawerVisible: false,
// 娣诲姞淇敼浠櫒鍙傛暟瀵硅薄
@@ -796,7 +815,17 @@
// 鐮佺偣琛ㄦ牸鐨勭姸鎬侊細鏁版嵁灞曠ずfalse/鏂板杈撳叆true
codePointesTableStatus: false,
// 璁惧璇︽儏瀵硅薄
- equipmentDetail: {}
+ equipmentDetail: {},
+ // 杩囨护鍏抽敭瀛�
+ filterText: '',
+ // 杩囨护鍚庣殑浠櫒璁惧琛�
+ filterdequipmentTable: '',
+ oldtableData: '',
+ // 杩囨护涓嶅悓鐘舵�佽澶�
+ conditionTable: '',
+ nodeclicked: '',
+ expireData: '',
+ instrumentId: ''
}
},
watch: {
@@ -844,19 +873,21 @@
},
// 鑺傜偣鐐瑰嚮澶勭悊
nodeClickHandler(data, node, element) {
- console.log(data)
+ this.nodeclicked = data
+ // console.log(data)
// 鍙湁鏁版嵁涓惡甯d鎵嶈兘鍙戦�佹煡璇㈣姹�
if (data.id) {
- this.getEquipmentTable({ classifyId: data.id, pageSize: this.pageSize, pageNo: this.currentPage })
+ this.getEquipmentTable({ classifyId: data.id, pageSize: this.pageSize, pageNo: this.currentPage, whetherWhether: this.isOut })
}
},
// 鑾峰彇浠櫒鍒楄〃鏁版嵁
async getEquipmentTable(ages) {
// console.log('鏉′欢瀵硅薄', ages)
const { data } = await getInstrumentList(ages)
- // console.log(data)
+ console.log(data)
this.equipmentTable = data.row
this.total = data.total
+ this.oldtableData = this.equipmentTable
},
// 杩囨护鑺傜偣
filterNode(value, data) {
@@ -997,6 +1028,93 @@
handleUpload(file, fileList) {
// console.log(file, fileList)
this.measureForm.file = file
+ },
+ // 鏍规嵁杈撳叆鐨勮澶囩紪鍙凤紝璁惧鍚嶇О鎴栬�呭瀷鍙疯鏍煎叧閿瓧杩涜杩囨护鍒楄〃
+ filterTableData() {
+ this.oldtableData = this.equipmentTable
+ const filterdequipmentTable = this.equipmentTable.filter(item => {
+ return item.equipment_code.includes(this.searchData.keyword) || item.equipment_name.includes(this.searchData.keyword) || item.specifications_models.includes(this.searchData.keyword)
+ })
+ this.equipmentTable = filterdequipmentTable
+ },
+ resetBtn() {
+ this.searchData.keyword = ''
+ this.equipmentTable = this.oldtableData
+ },
+ getConditionTable() {
+ // console.log(this.radioValue)
+ let filteredTable = this.oldtableData.filter(item => {
+ return item.conditions === this.radioValue
+ })
+ // 鍏堝垽鏂璱sOut
+ if (this.isOut) {
+ // 濡傛灉鐜板湪鍕鹃�変簡宸茶繃鏈熸寜閽紝閭ｅ氨浠庡綋鍓嶈繃婊ゅソ鐨勫垪琛ㄤ腑绛涢�夊嚭杩囨湡鍒楄〃
+ if (this.expireData.length === 0) {
+ this.equipmentTable = null
+ } else {
+ let expireItem
+ for (expireItem of this.expireData) {
+ filteredTable = filteredTable.filter(item => {
+ return item.equipment_code === expireItem.equipment_code
+ })
+ }
+ this.equipmentTable = filteredTable
+ }
+ if (!this.radioValue) {
+ this.equipmentTable = this.expireData
+ }
+ } else {
+ this.equipmentTable = filteredTable
+ if (!this.radioValue) {
+ this.equipmentTable = this.oldtableData
+ }
+ }
+ },
+ async getExpireTable() {
+ // const filteredTable = this.oldtableData.filter(item => {
+ // return item.conditions === this.radioValue
+ // })
+ if (this.isOut) {
+ // 鎹曡幏鐐瑰嚮浜嗗凡杩囨湡锛岃姹傝繃鏈熸暟鎹苟淇濆瓨
+ const { data } = await getInstrumentList({ classifyId: this.nodeclicked.id, pageSize: this.pageSize, pageNo: this.currentPage, whetherWhether: this.isOut })
+ this.expireData = data.row
+ if (this.expireData.length === 0) {
+ this.equipmentTable = null
+ } else {
+ if (this.radioValue !== 0) {
+ let expireItem
+ for (expireItem of this.expireData) {
+ this.equipmentTable = this.oldtableData.filter(item => {
+ console.log(this.radioValue)
+ console.log('item', item)
+ console.log('expireItem', expireItem)
+ return item.conditions === this.radioValue && item.equipment_code === expireItem.equipment_code
+ })
+ console.log(this.equipmentTable)
+ }
+ } else {
+ this.equipmentTable = this.expireData
+ }
+ }
+ } else {
+ // 鎹曡幏鍙栨秷浜嗗凡杩囨湡锛屽皢杩囨湡鏁版嵁娓呯┖锛岄噸鏂版洿鏂癳quipmentTable
+ this.expireData = ''
+ this.equipmentTable = this.oldtableData.filter(item => {
+ return item.conditions === this.radioValue
+ })
+ if (this.radioValue === 0) {
+ this.equipmentTable = this.oldtableData
+ }
+ }
+ },
+ clickDelete(row) {
+ this.instrumentId = row.id
+ this.deletedialogVisible = true
+ },
+ async deleteInstrument() {
+ // console.log(row.id)
+ await deleteInstrument({ instrumentId: this.instrumentId })
+ this.deletedialogVisible = false
}
}
}
--
Gitblit v1.9.3