From c4cfd5c566d137fb60781b8b2e0057d11cf4b051 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 13 三月 2025 17:33:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/CNAS/resourceDemand/device/index.vue | 37 -----
src/views/CNAS/resourceDemand/device/component/inspectionForm.vue | 3
src/views/business/productSamplingInfo/components/addQuarterItem.vue | 3
src/views/CNAS/resourceDemand/device/component/equipmentAcceptance.vue | 1
src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/lightning-protection-detection.vue | 9
src/views/system/user/authRole.vue | 6
src/views/CNAS/personnel/personnelInfo/tabs/reward-punishment-record.vue | 4
src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/power-supply-stability.vue | 6
src/views/monitor/logininfor/index.vue | 4
src/views/CNAS/resourceDemand/device/component/equipmentCheck.vue | 3
src/views/CNAS/resourceDemand/device/component/equipmentMaintenancePlan.vue | 3
src/views/business/inspectionTask/index.vue | 4
src/views/CNAS/process/ensureResults/qualityControlPlan/index.vue | 2
src/views/CNAS/resourceDemand/device/component/equipmentCalibrationPlan.vue | 2
src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/temperature-humidity-record.vue | 4
src/views/business/materialOrder/copperOrder.vue | 2
src/views/system/role/authUser.vue | 3
src/views/CNAS/resourceDemand/device/component/checkRecord.vue | 2
src/views/CNAS/resourceDemand/facilitiesEnvironment/component/three-wastes-dialog.vue | 3
src/views/business/productSamplingInfo/index.vue | 3
src/views/CNAS/resourceDemand/device/component/equipmentFailure.vue | 1
src/views/business/finishedProductSampling/components/addQuarterItem.vue | 3
src/views/business/sample/components/detail.vue | 6
src/views/business/productOrder/components/add.vue | 5
src/views/CNAS/personnel/personnelInfo/tabs/personnel-information.vue | 4
src/views/CNAS/resourceDemand/device/component/addYearPlanDia.vue | 3
src/views/business/inspectionTask/inspection.vue | 1
src/views/business/productOrder/components/cable-config.vue | 1
src/views/business/productOrder/components/addInspectionDia.vue | 5
src/views/performance/manHour/workTimeManagement.vue | 81 ++++++++-----
src/views/CNAS/process/method/standardMethodsChange/component/ViewDeviceDialog.vue | 3
src/views/CNAS/personnel/personnelInfo/tabs/job-responsibilities.vue | 3
src/views/CNAS/process/demand/index.vue | 4
src/views/CNAS/resourceDemand/device/component/equipmentAccident.vue | 1
src/views/CNAS/resourceDemand/device/component/equipmentVerificationPlan.vue | 2
src/views/business/productOrder/components/auxiliaryWireCore.vue | 1
src/views/CNAS/systemManagement/internalAuditManagement/components/auditInspectionDia.vue | 3
src/views/system/config/index.vue | 3
src/views/system/role/index.vue | 3
src/views/CNAS/resourceDemand/device/component/quantityValueTraceabilityPlan.vue | 4
src/views/standard/standardLibrary/index.vue | 7
src/views/CNAS/externalService/serviceAndSupplyPro/component/Store.vue | 2
src/views/CNAS/resourceDemand/device/component/files.vue | 4
src/views/CNAS/resourceDemand/device/component/state.vue | 3
src/views/CNAS/personnel/personnelInfo/tabs/personnel-list.vue | 4
src/views/CNAS/resourceDemand/device/component/usingExternalInstruments.vue | 1
src/views/CNAS/resourceDemand/device/component/calibration.vue | 5
src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/illuminance-recording.vue | 6
src/views/CNAS/process/ensureResults/qualityControlPlan/components/detailFormDialog.vue | 9 +
src/views/CNAS/systemManagement/internalAuditManagement/components/implementPlanDia.vue | 3
src/views/business/materialOrder/customsInspection.vue | 3
src/views/system/dict/data.vue | 3
src/views/system/role/selectUser.vue | 3
src/views/CNAS/resourceDemand/device/component/fault.vue | 3
src/views/CNAS/resourceDemand/device/component/inspectionOfEquipment.vue | 1
src/views/CNAS/resourceDemand/device/component/maintenance.vue | 3
src/views/CNAS/resourceDemand/device/component/equipmentScrap.vue | 1
src/views/CNAS/systemManagement/measuresDealRisks/components/hazardIdentificationRiskAssessment.vue | 3
src/views/system/dept/index.vue | 1
src/views/CNAS/resourceDemand/device/component/check.vue | 3
src/views/business/unpass/components/addUnPass.vue | 4
src/views/CNAS/personnel/personnelInfo/components/Edit.vue | 1
src/views/business/materialOrder/index.vue | 2
src/views/CNAS/resourceDemand/device/component/borrow.vue | 2
src/views/CNAS/resourceDemand/device/component/operationInstruction.vue | 4
src/views/system/user/index.vue | 3
src/views/CNAS/resourceDemand/device/component/addVerificationYearPlanDia.vue | 5
src/views/CNAS/resourceDemand/device/component/record.vue | 3
src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue | 11 -
src/views/CNAS/resourceDemand/device/component/resourceReservation.vue | 3
src/views/CNAS/systemManagement/measuresDealRisks/components/listRiskAnalysisControlPlans.vue | 3
src/views/business/unpass/components/PurchaseVerification.vue | 6
72 files changed, 215 insertions(+), 141 deletions(-)
diff --git a/src/views/CNAS/externalService/serviceAndSupplyPro/component/Store.vue b/src/views/CNAS/externalService/serviceAndSupplyPro/component/Store.vue
index aa5d8c4..32951ec 100644
--- a/src/views/CNAS/externalService/serviceAndSupplyPro/component/Store.vue
+++ b/src/views/CNAS/externalService/serviceAndSupplyPro/component/Store.vue
@@ -100,7 +100,7 @@
<el-button size="mini" type="primary" @click="addTableData">娣诲姞
</el-button>
</div>
- <el-table :data="consumables" style="margin-top: 10px">
+ <el-table :data="consumables" style="margin-top: 10px" :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
<el-table-column label="缂栧彿" type="index" width="120px"></el-table-column>
<el-table-column label="璐у彿" prop="itemNumber"></el-table-column>
<el-table-column label="绫诲埆" prop="type"></el-table-column>
diff --git a/src/views/CNAS/personnel/personnelInfo/components/Edit.vue b/src/views/CNAS/personnel/personnelInfo/components/Edit.vue
index 3992697..639af6b 100644
--- a/src/views/CNAS/personnel/personnelInfo/components/Edit.vue
+++ b/src/views/CNAS/personnel/personnelInfo/components/Edit.vue
@@ -87,6 +87,7 @@
<el-button :disabled="currentRow.state === 1" size="small" @click="batchDelete">鎵归噺鍒犻櫎</el-button>
</div>
<el-table :data="trainingTableData" height="calc(100vh - 30em)" stripe style="width: 100%"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
@selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column label="搴忓彿" type="index" width="60"></el-table-column>
diff --git a/src/views/CNAS/personnel/personnelInfo/tabs/job-responsibilities.vue b/src/views/CNAS/personnel/personnelInfo/tabs/job-responsibilities.vue
index 4cf3cb1..7f835ff 100644
--- a/src/views/CNAS/personnel/personnelInfo/tabs/job-responsibilities.vue
+++ b/src/views/CNAS/personnel/personnelInfo/tabs/job-responsibilities.vue
@@ -16,7 +16,8 @@
</div>
</div>
<div class="table">
- <el-table :data="tableData" v-loading="tableLoading" height="66.5vh" style="width: 100%">
+ <el-table :data="tableData" v-loading="tableLoading" height="66.5vh" style="width: 100%"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
<el-table-column label="搴忓彿" type="index" width="60"></el-table-column>
<el-table-column label="鍛樺伐缂栧彿" min-width="120" prop="account"></el-table-column>
<el-table-column label="宀椾綅鍚嶇О" min-width="180" prop="postName"></el-table-column>
diff --git a/src/views/CNAS/personnel/personnelInfo/tabs/personnel-information.vue b/src/views/CNAS/personnel/personnelInfo/tabs/personnel-information.vue
index eab557f..f88158d 100644
--- a/src/views/CNAS/personnel/personnelInfo/tabs/personnel-information.vue
+++ b/src/views/CNAS/personnel/personnelInfo/tabs/personnel-information.vue
@@ -340,7 +340,9 @@
@click="annexAdd1('add')">鏂板</el-button>
</el-col>
</el-row>
- <el-table :data="tableData1" border height="200" style="width: 96%;float: right;" v-loading="tableLoading1">
+ <el-table :data="tableData1" border height="200" style="width: 96%;float: right;"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
+ v-loading="tableLoading1">
<el-table-column label="搴忓彿" type="index" width="55px" align="center">
</el-table-column>
<el-table-column label="宸ヤ綔缁忓巻" prop="workExperience">
diff --git a/src/views/CNAS/personnel/personnelInfo/tabs/personnel-list.vue b/src/views/CNAS/personnel/personnelInfo/tabs/personnel-list.vue
index 5cb970c..3936a69 100644
--- a/src/views/CNAS/personnel/personnelInfo/tabs/personnel-list.vue
+++ b/src/views/CNAS/personnel/personnelInfo/tabs/personnel-list.vue
@@ -16,7 +16,9 @@
</div>
</div>
<div class="search-table">
- <el-table v-loading="tableLoading" :data="tableData" border height="calc(100vh - 21em)" style="width: 100%;">
+ <el-table v-loading="tableLoading" :data="tableData"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
+ height="calc(100vh - 21em)" style="width: 100%;">
<el-table-column align="center" label="搴忓彿" type="index" width="60"></el-table-column>
<el-table-column label="鍛樺伐缂栧彿" prop="account" width="150"></el-table-column>
<el-table-column label="濮撳悕" prop="name" width="120"></el-table-column>
diff --git a/src/views/CNAS/personnel/personnelInfo/tabs/reward-punishment-record.vue b/src/views/CNAS/personnel/personnelInfo/tabs/reward-punishment-record.vue
index 7b55725..c51ea52 100644
--- a/src/views/CNAS/personnel/personnelInfo/tabs/reward-punishment-record.vue
+++ b/src/views/CNAS/personnel/personnelInfo/tabs/reward-punishment-record.vue
@@ -25,7 +25,9 @@
</div>
</div>
<div class="table">
- <el-table :data="tableData" v-loading="tableLoading" height="66.5vh" style="width: 100%">
+ <el-table :data="tableData" v-loading="tableLoading"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
+ height="66.5vh" style="width: 100%">
<el-table-column label="搴忓彿" type="index" width="120">
<template v-slot="scope">
<span>{{ (search.current - 1) * search.size + scope.$index + 1 }}</span>
diff --git a/src/views/CNAS/process/demand/index.vue b/src/views/CNAS/process/demand/index.vue
index b41d430..60258c5 100644
--- a/src/views/CNAS/process/demand/index.vue
+++ b/src/views/CNAS/process/demand/index.vue
@@ -81,7 +81,9 @@
<el-button size="small" type="primary" @click="searchTableData">鏌ヨ</el-button>
<el-button size="small" @click="refreshTableData">閲� 缃�</el-button>
</div>
- <el-table v-loading="tableLoading" :data="tableData" height="550" style="width: 100%">
+ <el-table v-loading="tableLoading" :data="tableData"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
+ height="550" style="width: 100%">
<el-table-column align="center" label="搴忓彿" type="index" width="60"></el-table-column>
<el-table-column label="濮旀墭缂栧彿" prop="entrustCode"></el-table-column>
<el-table-column label="鏍峰搧鍚嶇О" prop="sample"></el-table-column>
diff --git a/src/views/CNAS/process/ensureResults/qualityControlPlan/components/detailFormDialog.vue b/src/views/CNAS/process/ensureResults/qualityControlPlan/components/detailFormDialog.vue
index fe26f2c..8ce627d 100644
--- a/src/views/CNAS/process/ensureResults/qualityControlPlan/components/detailFormDialog.vue
+++ b/src/views/CNAS/process/ensureResults/qualityControlPlan/components/detailFormDialog.vue
@@ -38,7 +38,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="鐩戠潱鍘熷洜" prop="superviseReason">
- <el-input v-model="form.superviseReason" clearable size="small"></el-input>
+ <el-input v-model="form.superviseReason" clearable disabled size="small"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -94,10 +94,15 @@
},
// 鏂规硶闆嗗悎
methods: {
- openDia(type, row) {
+ openDia(type, row, causeType) {
this.formDia = true
this.operationType = type
this.getUserList()
+ if (causeType == 1) {
+ this.form.superviseReason = '瀹氭湡鐩戠潱'
+ } else {
+ this.form.superviseReason = '鍔ㄦ�佺洃鐫�'
+ }
if (type === 'edit') {
this.searchInfo(row)
}
diff --git a/src/views/CNAS/process/ensureResults/qualityControlPlan/index.vue b/src/views/CNAS/process/ensureResults/qualityControlPlan/index.vue
index 895265f..c58086b 100644
--- a/src/views/CNAS/process/ensureResults/qualityControlPlan/index.vue
+++ b/src/views/CNAS/process/ensureResults/qualityControlPlan/index.vue
@@ -571,7 +571,7 @@
showDialog(type, row) {
this.formDia = true
this.$nextTick(() => {
- this.$refs.formDia.openDia(type, row)
+ this.$refs.formDia.openDia(type, row, this.yearDetailForm.causeType)
})
},
closeDia() {
diff --git a/src/views/CNAS/process/method/standardMethodsChange/component/ViewDeviceDialog.vue b/src/views/CNAS/process/method/standardMethodsChange/component/ViewDeviceDialog.vue
index 797a81c..a058245 100644
--- a/src/views/CNAS/process/method/standardMethodsChange/component/ViewDeviceDialog.vue
+++ b/src/views/CNAS/process/method/standardMethodsChange/component/ViewDeviceDialog.vue
@@ -6,7 +6,8 @@
<el-button size="small" type="danger" @click="clearTable">娓呯┖</el-button>
</div>
<div>
- <el-table :data="machineAttachmentList" border height="500" style="width: 100%">
+ <el-table :data="machineAttachmentList" :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }"
+ border height="500" style="width: 100%">
<el-table-column header-align="center" label="鍚嶇О" prop="machineName" width="200">
<template slot="header" slot-scope="scope">
<p>鍚嶇О</p>
diff --git a/src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue b/src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue
index 99d88ac..6428a10 100644
--- a/src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue
+++ b/src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue
@@ -12,11 +12,9 @@
</el-row>
</div>
<div class="table">
- <el-table :data="tableList.slice(
- (page.current - 1) * page.size,
- page.current * page.size
- )
- " border tooltip-effect="dark" style="width: 74%;" height="100%" :span-method="spanMethod">
+ <el-table :data="tableList.slice((page.current - 1) * page.size,page.current * page.size)"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
+ tooltip-effect="dark" style="width: 74%;" height="100%" :span-method="spanMethod">
<el-table-column type="index" label="搴忓彿" align="center" width="65"></el-table-column>
<el-table-column prop="deviceName" align="center" min-width="100" label="璁惧鍚嶇О"></el-table-column>
<el-table-column prop="fileType" align="center" label="鏂囦欢鍚庣紑"></el-table-column>
@@ -53,7 +51,8 @@
<el-dialog title="鏁伴噰閰嶇疆" :visible.sync="dialogVisible3" width="920px" :before-close="closeForm">
<el-form :model="configForm" label-position="top" size="small" ref="configForm" label-width="100px"
class="demo-ruleForm">
- <el-table :data="domains" style="width: 100%" height="300">
+ <el-table :data="domains" style="width: 100%" height="300"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
<el-table-column label="搴忓彿" type="index" width="80">
<template v-slot="scope">
{{ getIndexWithAlphabet(scope.$index) }}
diff --git a/src/views/CNAS/resourceDemand/device/component/addVerificationYearPlanDia.vue b/src/views/CNAS/resourceDemand/device/component/addVerificationYearPlanDia.vue
index 41fa4da..91d52a4 100644
--- a/src/views/CNAS/resourceDemand/device/component/addVerificationYearPlanDia.vue
+++ b/src/views/CNAS/resourceDemand/device/component/addVerificationYearPlanDia.vue
@@ -12,8 +12,8 @@
</el-date-picker>
</div>
<div style="margin: 10px 0">
- <el-table ref="yearTable" :data="examinePlanDetailsList" id="templateParamTable" row-key="deviceId" border
- height="500px" style="width: 100% ;">
+ <el-table ref="yearTable" :data="examinePlanDetailsList" id="templateParamTable" row-key="deviceId"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border height="500px" style="width: 100% ;">
<el-table-column label="璁惧鍚嶇О" min-width="190" prop="deviceName">
<template slot-scope="scope">
<el-input v-model="scope.row.deviceName" clearable size="small"></el-input>
@@ -75,6 +75,7 @@
<el-dialog :close-on-click-modal="false" :close-on-press-escape="false" :visible.sync="addEquipDia" title="鏂板骞村害璁″垝"
width="50%">
<el-table ref="multipleTable" :data="equipOptions" tooltip-effect="dark" height="500" style="width: 100%"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
@selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column label="璁惧鍚嶇О" prop="label"></el-table-column>
diff --git a/src/views/CNAS/resourceDemand/device/component/addYearPlanDia.vue b/src/views/CNAS/resourceDemand/device/component/addYearPlanDia.vue
index 16734fb..3b8db3d 100644
--- a/src/views/CNAS/resourceDemand/device/component/addYearPlanDia.vue
+++ b/src/views/CNAS/resourceDemand/device/component/addYearPlanDia.vue
@@ -12,7 +12,8 @@
</el-date-picker>
</div>
<div style="margin: 10px 0">
- <el-table id="templateParamTable" ref="yearTable" :data="calibrationPlanDetailList" height="300px" border
+ <el-table id="templateParamTable" ref="yearTable" :data="calibrationPlanDetailList" height="300px"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
row-key="deviceId" style="width: 100% ;">
<el-table-column label="璁惧鍚嶇О鍙婂瀷鍙�" min-width="190" prop="deviceName">
<template slot-scope="scope">
diff --git a/src/views/CNAS/resourceDemand/device/component/borrow.vue b/src/views/CNAS/resourceDemand/device/component/borrow.vue
index 662574d..9b21be1 100644
--- a/src/views/CNAS/resourceDemand/device/component/borrow.vue
+++ b/src/views/CNAS/resourceDemand/device/component/borrow.vue
@@ -182,7 +182,7 @@
</span>
</el-dialog>
<el-dialog title="娴佺▼璺熻釜" top="5vh" :visible.sync="dialogVisible0" width="60%">
- <el-table :data="deviceLogs" style="width: 100%">
+ <el-table :data="deviceLogs" style="width: 100%" :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
<el-table-column type="index" width="50">
</el-table-column>
<el-table-column prop="operator" label="鎿嶄綔浜�" width="180">
diff --git a/src/views/CNAS/resourceDemand/device/component/calibration.vue b/src/views/CNAS/resourceDemand/device/component/calibration.vue
index f11b502..72f9359 100644
--- a/src/views/CNAS/resourceDemand/device/component/calibration.vue
+++ b/src/views/CNAS/resourceDemand/device/component/calibration.vue
@@ -7,7 +7,7 @@
<!-- <el-button size="small" type="primary" @click="handleDown">瀵煎嚭Excel</el-button> -->
</div>
<div class="tables" style="margin-top: 10px;">
- <el-table :data="tableData" height="calc(100vh - 20em)">
+ <el-table :data="tableData" height="calc(100vh - 20em)" :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
<el-table-column label="搴忓彿" type="index" width="120">
<template v-slot="scope">
<span>{{ (search.current - 1) * search.size + scope.$index + 1 }}</span>
@@ -78,6 +78,7 @@
</h4>
<!-- 璁惧鏍″噯鍙傛暟琛ㄦ牸 -->
<el-table ref="calibrateTable" v-loading="calibrateParamsLoading" :data="calibrateParams" max-height="450" stripe
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
style="width: 100%">
<el-table-column label="缂栧彿" type="index" width="80"></el-table-column>
<el-table-column label="璁￠噺鍙傛暟" prop="measurementParameter"></el-table-column>
@@ -204,7 +205,7 @@
<span class="line"></span><span>鏍″噯鏉＄洰纭缁撴灉</span>
</span>
</h4>
- <el-table ref="calibrateTable" :data="calibrateParams" border>
+ <el-table ref="calibrateTable" :data="calibrateParams" :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
<el-table-column label="缂栧彿" type="index" width="60"></el-table-column>
<el-table-column label="璁￠噺鍙傛暟" prop="measurementParameter"></el-table-column>
<el-table-column label="閲忕▼鑼冨洿" prop="rangeOfMeasurement"></el-table-column>
diff --git a/src/views/CNAS/resourceDemand/device/component/check.vue b/src/views/CNAS/resourceDemand/device/component/check.vue
index 5dfe6b9..b65048c 100644
--- a/src/views/CNAS/resourceDemand/device/component/check.vue
+++ b/src/views/CNAS/resourceDemand/device/component/check.vue
@@ -7,7 +7,7 @@
<el-button size="small" type="primary">瀵煎嚭Excel</el-button>
</div>
<div class="tables" style="margin-top: 16px;">
- <el-table :data="tableData" height="calc(100vh - 20em)">
+ <el-table :data="tableData" height="calc(100vh - 20em)" :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
<el-table-column label="搴忓彿" type="index" width="120">
<template v-slot="scope">
<span>{{ (search.current - 1) * search.size + scope.$index + 1 }}</span>
@@ -79,6 +79,7 @@
</h4>
<!-- 璁惧鏍″噯鍙傛暟琛ㄦ牸 -->
<el-table ref="calibrateTable" v-loading="calibrateParamsLoading" :data="calibrateParams" max-height="450" stripe
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
style="width: 100%">
<el-table-column label="缂栧彿" type="index" width="80"></el-table-column>
<el-table-column label="鏍告煡鍙傛暟" prop="measurementParameter"></el-table-column>
diff --git a/src/views/CNAS/resourceDemand/device/component/checkRecord.vue b/src/views/CNAS/resourceDemand/device/component/checkRecord.vue
index a8a2376..34bf99e 100644
--- a/src/views/CNAS/resourceDemand/device/component/checkRecord.vue
+++ b/src/views/CNAS/resourceDemand/device/component/checkRecord.vue
@@ -85,7 +85,7 @@
</el-col>
</el-row>
<el-button size="small" style="margin: 10px 0" type="primary" @click="addRow">娣诲姞</el-button>
- <el-table :data="recordDetailList" height="300" style="width: 100%">
+ <el-table :data="recordDetailList" height="300" style="width: 100%" :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
<el-table-column label="娴嬭瘯鐐�" min-width="130" prop="testPoint">
<template slot-scope="scope">
<el-input v-model="scope.row.testPoint" clearable size="small"></el-input>
diff --git a/src/views/CNAS/resourceDemand/device/component/equipmentAcceptance.vue b/src/views/CNAS/resourceDemand/device/component/equipmentAcceptance.vue
index 1bea84b..f837ef1 100644
--- a/src/views/CNAS/resourceDemand/device/component/equipmentAcceptance.vue
+++ b/src/views/CNAS/resourceDemand/device/component/equipmentAcceptance.vue
@@ -6,6 +6,7 @@
</div>
<div>
<el-table ref="yearTable" v-loading="yearTableDetailDataLoading" :data="yearTableDetailData"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
height="calc(100vh - 18em)" style="width: 100% ;">
<!-- 琛ㄦ牸鍒� -->
<el-table-column align="center" header-align="center" label="搴忓彿" prop="prop" type="index"
diff --git a/src/views/CNAS/resourceDemand/device/component/equipmentAccident.vue b/src/views/CNAS/resourceDemand/device/component/equipmentAccident.vue
index b836c06..675f00f 100644
--- a/src/views/CNAS/resourceDemand/device/component/equipmentAccident.vue
+++ b/src/views/CNAS/resourceDemand/device/component/equipmentAccident.vue
@@ -7,6 +7,7 @@
</div>
<div>
<el-table ref="yearTable" v-loading="yearTableDetailDataLoading" :data="yearTableDetailData"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
height="calc(100vh - 18em)" style="width: 100% ;">
<!-- 琛ㄦ牸鍒� -->
<el-table-column align="center" header-align="center" label="搴忓彿" prop="prop" type="index"
diff --git a/src/views/CNAS/resourceDemand/device/component/equipmentCalibrationPlan.vue b/src/views/CNAS/resourceDemand/device/component/equipmentCalibrationPlan.vue
index 3dc138b..4f2b061 100644
--- a/src/views/CNAS/resourceDemand/device/component/equipmentCalibrationPlan.vue
+++ b/src/views/CNAS/resourceDemand/device/component/equipmentCalibrationPlan.vue
@@ -12,6 +12,7 @@
</div>
<div>
<el-table ref="yearTable" v-loading="yearTableDataLoading" :data="yearTableData" height="calc(60vh - 20em)"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
highlight-current-row style="width: 100% ;" @current-change="currentChange">
<!-- 琛ㄦ牸鍒� -->
<el-table-column align="center" header-align="center" label="搴忓彿" prop="prop" type="index"
@@ -69,6 +70,7 @@
</div>
<div>
<el-table ref="yearTableDetailData" v-loading="yearTableDetailDataLoading" :data="yearTableDetailData"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
height="calc(60vh - 20em)" style="width: 100% ;">
<!-- 琛ㄦ牸鍒� -->
<el-table-column align="center" header-align="center" label="搴忓彿" prop="prop" type="index"
diff --git a/src/views/CNAS/resourceDemand/device/component/equipmentCheck.vue b/src/views/CNAS/resourceDemand/device/component/equipmentCheck.vue
index a43d0c9..a7d2476 100644
--- a/src/views/CNAS/resourceDemand/device/component/equipmentCheck.vue
+++ b/src/views/CNAS/resourceDemand/device/component/equipmentCheck.vue
@@ -73,7 +73,8 @@
<el-button v-if="currentStep === 0" size="small" type="primary" @click="addTableRow">娣诲姞</el-button>
</div>
<div style="margin: 10px 0">
- <el-table ref="yearTable" :data="recordContrastDetailsList" height="300px" style="width: 100% ;">
+ <el-table ref="yearTable" :data="recordContrastDetailsList" height="300px" style="width: 100% ;"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
<el-table-column align="center" header-align="center" label="搴忓彿" type="index" width="60"></el-table-column>
<el-table-column label="鏍告煡椤圭洰" min-width="170" prop="checkItems">
<template slot-scope="scope">
diff --git a/src/views/CNAS/resourceDemand/device/component/equipmentFailure.vue b/src/views/CNAS/resourceDemand/device/component/equipmentFailure.vue
index 8cb1224..8c24324 100644
--- a/src/views/CNAS/resourceDemand/device/component/equipmentFailure.vue
+++ b/src/views/CNAS/resourceDemand/device/component/equipmentFailure.vue
@@ -7,6 +7,7 @@
</div>
<div>
<el-table ref="yearTable" v-loading="yearTableDetailDataLoading" :data="yearTableDetailData"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
height="calc(100vh - 18em)" style="width: 100% ;">
<!-- 琛ㄦ牸鍒� -->
<el-table-column align="center" header-align="center" label="搴忓彿" prop="prop" type="index"
diff --git a/src/views/CNAS/resourceDemand/device/component/equipmentMaintenancePlan.vue b/src/views/CNAS/resourceDemand/device/component/equipmentMaintenancePlan.vue
index 5148d03..7726223 100644
--- a/src/views/CNAS/resourceDemand/device/component/equipmentMaintenancePlan.vue
+++ b/src/views/CNAS/resourceDemand/device/component/equipmentMaintenancePlan.vue
@@ -7,6 +7,7 @@
</div>
<div>
<el-table ref="yearTable" v-loading="yearTableDetailDataLoading" :data="yearTableDetailData"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
height="calc(100vh - 18em)" style="width: 100% ;">
<!-- 琛ㄦ牸鍒� -->
<el-table-column align="center" header-align="center" label="搴忓彿" prop="prop" type="index"
@@ -54,6 +55,7 @@
</div>
<div style="margin: 10px 0">
<el-table ref="yearTable" :data="deviceMaintenancePlanDetails" id="templateParamTable" row-key="deviceId"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
height="300px" border style="width: 100% ;">
<el-table-column align="center" header-align="center" label="搴忓彿" type="index" width="60"></el-table-column>
<el-table-column label="璁惧鍚嶇О" min-width="170" prop="deviceName">
@@ -113,6 +115,7 @@
<el-dialog :close-on-click-modal="false" :close-on-press-escape="false" :visible.sync="addEquipDia" title="娣诲姞璁惧"
width="50%">
<el-table ref="multipleTable" :data="equipOptions" tooltip-effect="dark" height="500" style="width: 100%"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
@selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column label="璁惧鍚嶇О" prop="label" width="190"></el-table-column>
diff --git a/src/views/CNAS/resourceDemand/device/component/equipmentScrap.vue b/src/views/CNAS/resourceDemand/device/component/equipmentScrap.vue
index bb2f783..b407017 100644
--- a/src/views/CNAS/resourceDemand/device/component/equipmentScrap.vue
+++ b/src/views/CNAS/resourceDemand/device/component/equipmentScrap.vue
@@ -7,6 +7,7 @@
</div>
<div>
<el-table ref="yearTable" v-loading="yearTableDetailDataLoading" :data="yearTableDetailData"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
height="calc(100vh - 18em)" style="width: 100% ;">
<!-- 琛ㄦ牸鍒� -->
<el-table-column align="center" header-align="center" label="搴忓彿" prop="prop" type="index"
diff --git a/src/views/CNAS/resourceDemand/device/component/equipmentVerificationPlan.vue b/src/views/CNAS/resourceDemand/device/component/equipmentVerificationPlan.vue
index 6e234a5..1595bd4 100644
--- a/src/views/CNAS/resourceDemand/device/component/equipmentVerificationPlan.vue
+++ b/src/views/CNAS/resourceDemand/device/component/equipmentVerificationPlan.vue
@@ -16,6 +16,7 @@
</div>
<div>
<el-table ref="yearTable" v-loading="yearTableDataLoading" :data="yearTableData" height="calc(60vh - 20em)"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
highlight-current-row style="width: 100% ;" @current-change="currentChange">
<!-- 琛ㄦ牸鍒� -->
<el-table-column align="center" header-align="center" label="搴忓彿" prop="prop" type="index"
@@ -73,6 +74,7 @@
</div>
<div>
<el-table ref="yearTableDetailData" v-loading="yearTableDetailDataLoading" :data="yearTableDetailData"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
height="calc(60vh - 20em)" style="width: 100% ;">
<!-- 琛ㄦ牸鍒� -->
<el-table-column align="center" header-align="center" label="搴忓彿" prop="prop" type="index"
diff --git a/src/views/CNAS/resourceDemand/device/component/fault.vue b/src/views/CNAS/resourceDemand/device/component/fault.vue
index a229fa7..a9eb5d5 100644
--- a/src/views/CNAS/resourceDemand/device/component/fault.vue
+++ b/src/views/CNAS/resourceDemand/device/component/fault.vue
@@ -21,7 +21,8 @@
</div>
<div>
<div class="tables" style="margin-top: 16px;">
- <el-table :data="faultParam" style="width: 100%" height="calc(100vh - 20em)">
+ <el-table :data="faultParam" style="width: 100%" height="calc(100vh - 20em)"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
<!-- 琛ㄦ牸鍒� -->
<el-table-column header-align="center" align="center" width="70" prop="prop" label="搴忓彿"
type="index"></el-table-column>
diff --git a/src/views/CNAS/resourceDemand/device/component/files.vue b/src/views/CNAS/resourceDemand/device/component/files.vue
index bd297c4..de19de7 100644
--- a/src/views/CNAS/resourceDemand/device/component/files.vue
+++ b/src/views/CNAS/resourceDemand/device/component/files.vue
@@ -157,7 +157,7 @@
</el-col>
</el-row>
<h4 style="margin-bottom: 10px;margin-top: 10px;"><span class="line"></span><span>闄勪欢鍜岀浉鍏虫枃妗�</span></h4>
- <el-table height="200px" :data="tableDataA">
+ <el-table height="200px" :data="tableDataA" :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
<el-table-column header-align="center" align="center" prop="prop" label="搴忓彿" type="index" width="60" />
<el-table-column prop="documentType" label="绫诲瀷" min-width="100">
<template v-slot="scope">
@@ -901,7 +901,7 @@
<style scoped>
.main_div {
- height: calc(100vh - 15em);
+ height: calc(100vh - 19em);
overflow-y: auto;
overflow-x: hidden;
}
diff --git a/src/views/CNAS/resourceDemand/device/component/inspectionForm.vue b/src/views/CNAS/resourceDemand/device/component/inspectionForm.vue
index 36da44e..0b66b6b 100644
--- a/src/views/CNAS/resourceDemand/device/component/inspectionForm.vue
+++ b/src/views/CNAS/resourceDemand/device/component/inspectionForm.vue
@@ -59,7 +59,8 @@
</div>
<div style="text-align: center">娴嬭瘯鏁版嵁璁板綍</div>
<div style="margin: 10px 0">
- <el-table ref="yearTable" :data="details" height="300px" style="width: 100% ;">
+ <el-table ref="yearTable" :data="details" height="300px" style="width: 100% ;"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
<el-table-column align="center" header-align="center" label="搴忓彿" type="index" width="60"></el-table-column>
<el-table-column label="娴嬭瘯椤圭洰" min-width="170" prop="testItems">
<template slot-scope="scope">
diff --git a/src/views/CNAS/resourceDemand/device/component/inspectionOfEquipment.vue b/src/views/CNAS/resourceDemand/device/component/inspectionOfEquipment.vue
index 83af6ff..dd0b3e8 100644
--- a/src/views/CNAS/resourceDemand/device/component/inspectionOfEquipment.vue
+++ b/src/views/CNAS/resourceDemand/device/component/inspectionOfEquipment.vue
@@ -7,6 +7,7 @@
</div>
<div>
<el-table ref="yearTable" v-loading="yearTableDetailDataLoading" :data="yearTableDetailData"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
height="calc(100vh - 18em)" style="width: 100% ;">
<!-- 琛ㄦ牸鍒� -->
<el-table-column align="center" header-align="center" label="搴忓彿" prop="prop" type="index"
diff --git a/src/views/CNAS/resourceDemand/device/component/maintenance.vue b/src/views/CNAS/resourceDemand/device/component/maintenance.vue
index 9ea4f5a..87d2588 100644
--- a/src/views/CNAS/resourceDemand/device/component/maintenance.vue
+++ b/src/views/CNAS/resourceDemand/device/component/maintenance.vue
@@ -17,7 +17,8 @@
</div>
</div>
<div class="tables" style="margin-top: 10px;">
- <el-table ref="table" :data="MaintainParam" height="calc(100vh - 20em)">
+ <el-table ref="table" :data="MaintainParam" height="calc(100vh - 20em)"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
<el-table-column label="搴忓彿" type="index" width="120">
<template v-slot="scope">
<span>{{ (search.current - 1) * search.size + scope.$index + 1 }}</span>
diff --git a/src/views/CNAS/resourceDemand/device/component/operationInstruction.vue b/src/views/CNAS/resourceDemand/device/component/operationInstruction.vue
index 8ab8536..fe1ab9a 100644
--- a/src/views/CNAS/resourceDemand/device/component/operationInstruction.vue
+++ b/src/views/CNAS/resourceDemand/device/component/operationInstruction.vue
@@ -5,7 +5,8 @@
<el-button size="small" type="primary" @click="getList">鍒锋柊</el-button>
<el-button size="small" type="primary" @click="dialogVisible = true">鍙楁帶鐢宠</el-button>
</div>
- <el-table :data="tableData" border height="calc(100vh - 18em)">
+ <el-table :data="tableData" border height="calc(100vh - 18em)"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }">
<el-table-column type="index" label="搴忓彿" width="120">
<template v-slot="scope">
<span>{{ (search.current - 1) * search.size + scope.$index + 1 }}</span>
@@ -79,6 +80,7 @@
<el-button size="small" @click="delFile">鍒犻櫎</el-button>
</div>
<el-table :data="documentTableData" border style="width: 100%;" tooltip-effect="dark" :row-key="getRowKey"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }"
@selection-change="handleSelectionChange" height="29em">
<el-table-column type="selection" width="55%">
</el-table-column>
diff --git a/src/views/CNAS/resourceDemand/device/component/quantityValueTraceabilityPlan.vue b/src/views/CNAS/resourceDemand/device/component/quantityValueTraceabilityPlan.vue
index e3775fe..f94c759 100644
--- a/src/views/CNAS/resourceDemand/device/component/quantityValueTraceabilityPlan.vue
+++ b/src/views/CNAS/resourceDemand/device/component/quantityValueTraceabilityPlan.vue
@@ -7,6 +7,7 @@
</div>
<div>
<el-table ref="yearTable" v-loading="yearTableDetailDataLoading" :data="yearTableDetailData"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
height="calc(100vh - 18em)" style="width: 100% ;">
<!-- 琛ㄦ牸鍒� -->
<el-table-column align="center" header-align="center" label="搴忓彿" prop="prop" type="index"
@@ -56,7 +57,8 @@
</div>
<div style="margin: 10px 0">
<el-table ref="yearTable" :data="deviceTraceabilityManagementDetails" height="300px" id="templateParamTable"
- row-key="deviceId" border style="width: 100% ;">
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
+ row-key="deviceId" style="width: 100% ;">
<el-table-column align="center" header-align="center" label="搴忓彿" type="index" width="60"></el-table-column>
<el-table-column label="璁惧鍚嶇О" min-width="170" prop="deviceId">
<template slot-scope="scope">
diff --git a/src/views/CNAS/resourceDemand/device/component/record.vue b/src/views/CNAS/resourceDemand/device/component/record.vue
index 7b61015..a11eb29 100644
--- a/src/views/CNAS/resourceDemand/device/component/record.vue
+++ b/src/views/CNAS/resourceDemand/device/component/record.vue
@@ -20,7 +20,8 @@
</div>
</div>
<div class="tables" style="margin-top: 10px;">
- <el-table ref="Recordtable" :data="formParamList" height="calc(100vh - 20em)">
+ <el-table ref="Recordtable" :data="formParamList" height="calc(100vh - 20em)"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
<!-- 琛ㄦ牸鍒� -->
<el-table-column label="搴忓彿" type="index" width="120">
<template v-slot="scope">
diff --git a/src/views/CNAS/resourceDemand/device/component/resourceReservation.vue b/src/views/CNAS/resourceDemand/device/component/resourceReservation.vue
index 6f61a6f..30acd40 100644
--- a/src/views/CNAS/resourceDemand/device/component/resourceReservation.vue
+++ b/src/views/CNAS/resourceDemand/device/component/resourceReservation.vue
@@ -25,7 +25,8 @@
</el-row>
</div>
<div class="table-container">
- <el-table :data="tableData" border class="scrollable-table" style="width: 100%">
+ <el-table :data="tableData" class="scrollable-table" style="width: 100%"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
<el-table-column label="搴忓彿"
type="index"
width="60">
diff --git a/src/views/CNAS/resourceDemand/device/component/state.vue b/src/views/CNAS/resourceDemand/device/component/state.vue
index 7bbe1e3..6f425f1 100644
--- a/src/views/CNAS/resourceDemand/device/component/state.vue
+++ b/src/views/CNAS/resourceDemand/device/component/state.vue
@@ -25,7 +25,8 @@
</el-row>
</div>
<div>
- <el-table :data="tableDatalist" height="calc(100vh - 20em)" style="width: 100% ;">
+ <el-table :data="tableDatalist" height="calc(100vh - 20em)" style="width: 100% ;"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
<!-- 琛ㄦ牸鍒� -->
<el-table-column align="center" header-align="center" label="搴忓彿" prop="prop" type="index"
width="70"></el-table-column>
diff --git a/src/views/CNAS/resourceDemand/device/component/usingExternalInstruments.vue b/src/views/CNAS/resourceDemand/device/component/usingExternalInstruments.vue
index 24e4f56..93ccea2 100644
--- a/src/views/CNAS/resourceDemand/device/component/usingExternalInstruments.vue
+++ b/src/views/CNAS/resourceDemand/device/component/usingExternalInstruments.vue
@@ -15,6 +15,7 @@
</div>
<div>
<el-table ref="yearTable" v-loading="yearTableDetailDataLoading" :data="yearTableDetailData"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
height="calc(100vh - 18em)" style="width: 100% ;">
<!-- 琛ㄦ牸鍒� -->
<el-table-column align="center" header-align="center" label="搴忓彿" prop="prop" type="index"
diff --git a/src/views/CNAS/resourceDemand/device/index.vue b/src/views/CNAS/resourceDemand/device/index.vue
index 0720819..6dd1e28 100644
--- a/src/views/CNAS/resourceDemand/device/index.vue
+++ b/src/views/CNAS/resourceDemand/device/index.vue
@@ -34,100 +34,67 @@
<div v-if="isShowAll" style="height: 100%;">
<el-tabs v-model="menuListActiveName" class="main_right" type="border-card">
<el-tab-pane label="璁惧鎬昏" name="璁惧鎬昏">
- <!-- 瀹屾垚鎺ュ彛 -->
<overview v-if="menuListActiveName == '璁惧鎬昏'" :clickNodeVal="clickNodeVal" />
</el-tab-pane>
<el-tab-pane label="璁惧宸ュ叿鏄庣粏" name="璁惧宸ュ叿鏄庣粏">
- <!-- 瀹屾垚鎺ュ彛 -->
<management v-if="menuListActiveName == '璁惧宸ュ叿鏄庣粏'" :clickNodeVal="clickNodeVal" />
</el-tab-pane>
- <!-- <el-tab-pane label="璧勬簮棰勫畾" name="璧勬簮棰勫畾">-->
- <!-- <resourceReservation v-if="menuListActiveName == '璧勬簮棰勫畾'" :clickNodeVal="clickNodeVal"/>-->
- <!-- </el-tab-pane>-->
<el-tab-pane label="璁惧鏍″噯璁″垝" name="璁惧鏍″噯璁″垝">
- <!-- 瀹屾垚鎺ュ彛 -->
<equipment-calibration-plan v-if="menuListActiveName == '璁惧鏍″噯璁″垝'"
:clickNodeVal="clickNodeVal"></equipment-calibration-plan>
</el-tab-pane>
<el-tab-pane label="璁惧鏍告煡璁″垝" name="璁惧鏍告煡璁″垝">
- <!-- 瀹屾垚鎺ュ彛 -->
<equipment-verification-plan v-if="menuListActiveName == '璁惧鏍告煡璁″垝'"
:clickNodeVal="clickNodeVal"></equipment-verification-plan>
</el-tab-pane>
<el-tab-pane label="璁惧淇濆吇璁″垝" name="璁惧淇濆吇璁″垝">
- <!-- 瀹屾垚鎺ュ彛 -->
<equipment-maintenance-plan v-if="menuListActiveName == '璁惧淇濆吇璁″垝'"
:clickNodeVal="clickNodeVal"></equipment-maintenance-plan>
</el-tab-pane>
<el-tab-pane label="閲忓�兼函婧愯鍒�" name="閲忓�兼函婧愯鍒�">
- <!-- 瀹屾垚鎺ュ彛 -->
<quantity-value-traceability-plan v-if="menuListActiveName == '閲忓�兼函婧愯鍒�'"
:clickNodeVal="clickNodeVal"></quantity-value-traceability-plan>
</el-tab-pane>
<el-tab-pane label="鍒╃敤澶栭儴浠櫒璁惧" name="鍒╃敤澶栭儴浠櫒璁惧">
- <!-- 瀹屾垚鎺ュ彛 -->
- <using-external-instruments v-if="menuListActiveName == '鍒╃敤澶栭儴浠櫒璁惧'"
- :clickNodeVal="clickNodeVal"></using-external-instruments>
+ <using-external-instruments v-if="menuListActiveName == '鍒╃敤澶栭儴浠櫒璁惧'" :clickNodeVal="clickNodeVal"></using-external-instruments>
</el-tab-pane>
<el-tab-pane label="浣跨敤璁板綍" name="浣跨敤璁板綍">
- <!-- 瀹屾垚鎺ュ彛 -->
<record v-if="menuListActiveName == '浣跨敤璁板綍'" :isMenuList="1" />
</el-tab-pane>
</el-tabs>
</div>
<div v-if="!isShowAll" style="height: 100%;">
<el-tabs v-model="tabListActiveName" class="main_right" type="border-card" @tab-click="handleClick">
- <!-- <el-tab-pane label="璁惧杩愯鎬昏" name="璁惧杩愯鎬昏">-->
- <!-- <operationOverview v-if="tabListActiveName == '璁惧杩愯鎬昏'" :clickNodeVal="clickNodeVal"/>-->
- <!-- </el-tab-pane>-->
<el-tab-pane label="璁惧妗ｆ" name="璁惧妗ｆ">
- <!-- 瀹屾垚鎺ュ彛 -->
<files v-if="tabListActiveName == '璁惧妗ｆ'" :clickNodeVal="clickNodeVal" />
</el-tab-pane>
<el-tab-pane label="璁惧楠屾敹" name="璁惧楠屾敹">
- <!-- 瀹屾垚鎺ュ彛 -->
- <equipment-acceptance v-if="tabListActiveName == '璁惧楠屾敹'"
- :clickNodeVal="clickNodeVal"></equipment-acceptance>
+ <equipment-acceptance v-if="tabListActiveName == '璁惧楠屾敹'" :clickNodeVal="clickNodeVal"></equipment-acceptance>
</el-tab-pane>
<el-tab-pane label="璁惧鏍″噯" name="璁惧鏍″噯">
- <!-- 瀹屾垚鎺ュ彛 -->
<calibration v-if="tabListActiveName == '璁惧鏍″噯'" :clickNodeVal="clickNodeVal" />
</el-tab-pane>
- <!-- <el-tab-pane label="璁惧鏍告煡" name="璁惧鏍告煡">-->
- <!-- <check v-if="tabListActiveName == '璁惧鏍告煡'" :clickNodeVal="clickNodeVal"/>-->
- <!-- </el-tab-pane>-->
<el-tab-pane label="璁惧缁存姢" name="璁惧缁存姢">
- <!-- 瀹屾垚鎺ュ彛 -->
<maintenance v-if="tabListActiveName == '璁惧缁存姢'" :clickNodeVal="clickNodeVal" />
</el-tab-pane>
<el-tab-pane label="璁惧鍊熺敤" name="璁惧鍊熺敤">
- <!-- 瀹屾垚鎺ュ彛 -->
<borrow v-if="tabListActiveName == '璁惧鍊熺敤'" :clickNodeVal="clickNodeVal" />
</el-tab-pane>
- <!-- <el-tab-pane label="璁惧鏁呴殰" name="璁惧鏁呴殰">-->
- <!-- <fault v-if="tabListActiveName == '璁惧鏁呴殰'" :clickNodeVal="clickNodeVal" />-->
- <!-- </el-tab-pane>-->
- <!-- 瀹屾垚鎺ュ彛 -->
<el-tab-pane label="浣跨敤璁板綍" name="浣跨敤璁板綍">
<record v-if="tabListActiveName == '浣跨敤璁板綍'" :clickNodeVal="clickNodeVal" />
</el-tab-pane>
- <!-- 瀹屾垚鎺ュ彛 -->
<el-tab-pane label="璁惧鍋滅敤/鍚敤" name="璁惧鍋滅敤/鍚敤">
<state v-if="tabListActiveName == '璁惧鍋滅敤/鍚敤'" :clickNodeVal="clickNodeVal" />
</el-tab-pane>
- <!-- 瀹屾垚鎺ュ彛 -->
<el-tab-pane label="璁惧鎶ュ簾" name="璁惧鎶ュ簾">
<equipment-scrap v-if="tabListActiveName == '璁惧鎶ュ簾'" :clickNodeVal="clickNodeVal" />
</el-tab-pane>
- <!-- 瀹屾垚鎺ュ彛 -->
<el-tab-pane label="璁惧鏁呴殰涓庣淮淇�" name="璁惧鏁呴殰涓庣淮淇�">
<equipment-failure v-if="tabListActiveName == '璁惧鏁呴殰涓庣淮淇�'" :clickNodeVal="clickNodeVal" />
</el-tab-pane>
- <!-- 瀹屾垚鎺ュ彛 -->
<el-tab-pane label="璁惧鐐规" name="璁惧鐐规">
<inspection-of-equipment v-if="tabListActiveName == '璁惧鐐规'" :clickNodeVal="clickNodeVal" />
</el-tab-pane>
- <!-- 瀹屾垚鎺ュ彛 -->
<el-tab-pane label="璁惧浜嬫晠" name="璁惧浜嬫晠">
<equipment-accident v-if="tabListActiveName == '璁惧浜嬫晠'" :clickNodeVal="clickNodeVal" />
</el-tab-pane>
diff --git a/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/illuminance-recording.vue b/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/illuminance-recording.vue
index 28a7b60..43f5c11 100644
--- a/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/illuminance-recording.vue
+++ b/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/illuminance-recording.vue
@@ -6,7 +6,8 @@
<el-button size="small" type="primary" @click="clickAdd">鏂� 澧�</el-button>
</div>
</div>
- <el-table :data="tableData" height="calc(100vh - 18em)" style="width: 100%">
+ <el-table :data="tableData" height="calc(100vh - 18em)" style="width: 100%"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
<el-table-column label="搴忓彿" type="index" width="120">
<template v-slot="scope">
<span>{{ (search.current - 1) * search.size + scope.$index + 1 }}</span>
@@ -101,7 +102,8 @@
<el-button size="small" type="primary" @click="feMeasuredQuantityListAdd">鏂板</el-button>
</div>
<div>
- <el-table :data="form.illuminationDetectionAreaList" height="40vh" style="width: 100%; margin: auto">
+ <el-table :data="form.illuminationDetectionAreaList" height="40vh" style="width: 100%; margin: auto"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
<el-table-column label="搴忓彿" type="index" width="80"></el-table-column>
<el-table-column align="center" label="妫�娴嬪尯鍩熷悕绉�" min-width="180" prop="detectionAreaLabel">
<template #default="{ row }">
diff --git a/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/lightning-protection-detection.vue b/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/lightning-protection-detection.vue
index c753f94..0940cf3 100644
--- a/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/lightning-protection-detection.vue
+++ b/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/lightning-protection-detection.vue
@@ -128,6 +128,7 @@
} from '@/api/cnas/resourceDemand/facilitiesEnvironment/facilitiesAndEnvironment'
import axios from 'axios';
+import {deleteCNASFile} from "@/api/cnas/personal/personalList";
export default {
data() {
@@ -240,11 +241,11 @@
})
},
handleRemove(file) {
- this.$axios.delete(this.$api.personnel.deleteCNASFile + "?fileName=" + file.name).then(res => {
+ deleteCNASFile({fileName: file.name}).then(res => {
this.$message.success('鍒犻櫎鎴愬姛锛�')
- let index = this.form.fileList.indexOf(fileName)
- if (index != -1) {
- this.successFileList.splice(index, 1)
+ let index = this.form.fileList.indexOf(file.name)
+ if (index !== -1) {
+ this.form.fileList.splice(index, 1)
}
})
},
diff --git a/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/power-supply-stability.vue b/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/power-supply-stability.vue
index 24606ba..4d43c78 100644
--- a/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/power-supply-stability.vue
+++ b/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/power-supply-stability.vue
@@ -6,7 +6,8 @@
<el-button size="small" type="primary" @click="openAddDia">鏂� 澧�</el-button>
</div>
</div>
- <el-table :data="tableData" height="calc(100vh - 18em)" style="width: 100%">
+ <el-table :data="tableData" height="calc(100vh - 18em)" style="width: 100%"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
<el-table-column label="搴忓彿" type="index" width="120">
<template v-slot="scope">
<span>{{ (search.current - 1) * search.size + scope.$index + 1 }}</span>
@@ -108,7 +109,8 @@
<el-button size="small" type="primary" @click="feMeasuredQuantityListAdd">鏂板</el-button>
</div>
<div>
- <el-table :data="form.feMeasuredQuantityList" height="40vh" style="width: 100%; margin: auto">
+ <el-table :data="form.feMeasuredQuantityList" height="40vh" style="width: 100%; margin: auto"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
<el-table-column label="搴忓彿" type="index" width="80"></el-table-column>
<el-table-column align="center" label="娴嬪畾閲忓悕绉�" min-width="180" prop="measuredQuantityLabel">
<template #default="{ row }">
diff --git a/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/temperature-humidity-record.vue b/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/temperature-humidity-record.vue
index 7452234..84aab15 100644
--- a/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/temperature-humidity-record.vue
+++ b/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/temperature-humidity-record.vue
@@ -12,6 +12,7 @@
</div>
</div>
<el-table :data="tableData" height="calc(100vh - 18em)" highlight-current-row style="width: 100%"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
@row-click="clickRow">
<el-table-column label="搴忓彿" type="index" width="60" align="center"></el-table-column>
<el-table-column label="鏈堝害鏃堕棿" min-width="180" prop="monthDate"></el-table-column>
@@ -46,7 +47,8 @@
澧�</el-button>
</div>
</div>
- <el-table :data="tableData1" height="calc(100vh - 18em)" style="width: 100%">
+ <el-table :data="tableData1" height="calc(100vh - 18em)" style="width: 100%"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
<el-table-column label="搴忓彿" type="index" width="60" align="center"></el-table-column>
<el-table-column label="鏃ユ湡" min-width="100" prop="recordDate"></el-table-column>
<el-table-column align="center" label="涓婂崍" min-width="200">
diff --git a/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/three-wastes-dialog.vue b/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/three-wastes-dialog.vue
index 510bbc2..fb07bcc 100644
--- a/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/three-wastes-dialog.vue
+++ b/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/three-wastes-dialog.vue
@@ -16,7 +16,8 @@
<el-button size="small" type="primary" @click="addRow">娣诲姞</el-button>
<el-button size="small" type="danger" @click="clearTable">娓呯┖</el-button>
</div>
- <el-table :data="wastesDetailList" border height="300" style="width: 100%">
+ <el-table :data="wastesDetailList" border height="300" style="width: 100%"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }">
<el-table-column align="center" label="搴忓彿" type="index" width="60" />
<el-table-column header-align="center" label="鎺ユ敹浜�" prop="acceptor">
<template slot-scope="{row}">
diff --git a/src/views/CNAS/systemManagement/internalAuditManagement/components/auditInspectionDia.vue b/src/views/CNAS/systemManagement/internalAuditManagement/components/auditInspectionDia.vue
index 3a03a61..b6c32ff 100644
--- a/src/views/CNAS/systemManagement/internalAuditManagement/components/auditInspectionDia.vue
+++ b/src/views/CNAS/systemManagement/internalAuditManagement/components/auditInspectionDia.vue
@@ -33,7 +33,8 @@
<el-button size="small" type="primary" @click="addRow">娣诲姞</el-button>
<el-button size="small" type="danger" @click="clearTable">娓呯┖</el-button>
</div>
- <el-table :data="checkDetailList" border height="300" style="width: 100%">
+ <el-table :data="checkDetailList" border height="300" style="width: 100%"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }">
<el-table-column align="center" label="搴忓彿" type="index" width="60" />
<el-table-column header-align="center" label="娑夊強瑕佺礌鍜岃川閲忎綋绯绘枃浠舵潯娆�" prop="element">
<template slot-scope="{row}">
diff --git a/src/views/CNAS/systemManagement/internalAuditManagement/components/implementPlanDia.vue b/src/views/CNAS/systemManagement/internalAuditManagement/components/implementPlanDia.vue
index a07f3f5..323f149 100644
--- a/src/views/CNAS/systemManagement/internalAuditManagement/components/implementPlanDia.vue
+++ b/src/views/CNAS/systemManagement/internalAuditManagement/components/implementPlanDia.vue
@@ -84,7 +84,8 @@
<el-button size="small" type="primary" @click="addRow">娣诲姞</el-button>
<el-button size="small" type="danger" @click="clearTable">娓呯┖</el-button>
</div>
- <el-table :data="implementDetailList" border height="300" style="width: 100%">
+ <el-table :data="implementDetailList" height="300" style="width: 100%"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
<el-table-column align="center" label="搴忓彿" type="index" width="60" />
<el-table-column header-align="center" label="鏃堕棿" prop="implement">
<template slot-scope="{row}">
diff --git a/src/views/CNAS/systemManagement/measuresDealRisks/components/hazardIdentificationRiskAssessment.vue b/src/views/CNAS/systemManagement/measuresDealRisks/components/hazardIdentificationRiskAssessment.vue
index b0da2ca..5f69ca3 100644
--- a/src/views/CNAS/systemManagement/measuresDealRisks/components/hazardIdentificationRiskAssessment.vue
+++ b/src/views/CNAS/systemManagement/measuresDealRisks/components/hazardIdentificationRiskAssessment.vue
@@ -13,7 +13,8 @@
<el-button size="small" @click="openDownloadDia">瀵煎嚭</el-button>
</div>
</div>
- <el-table :data="tableData" style="width: 100%" height="calc(100vh - 18em)" key="table1">
+ <el-table :data="tableData" style="width: 100%" height="calc(100vh - 18em)" key="table1"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
<el-table-column type="index" label="搴忓彿" width="120">
<template v-slot="scope">
<span>{{ (page.current - 1) * page.size + scope.$index + 1 }}</span>
diff --git a/src/views/CNAS/systemManagement/measuresDealRisks/components/listRiskAnalysisControlPlans.vue b/src/views/CNAS/systemManagement/measuresDealRisks/components/listRiskAnalysisControlPlans.vue
index 5f3358f..33f189f 100644
--- a/src/views/CNAS/systemManagement/measuresDealRisks/components/listRiskAnalysisControlPlans.vue
+++ b/src/views/CNAS/systemManagement/measuresDealRisks/components/listRiskAnalysisControlPlans.vue
@@ -13,7 +13,8 @@
<el-button size="small" @click="openDownloadDia">瀵煎嚭</el-button>
</div>
</div>
- <el-table :data="tableData" style="width: 100%" height="calc(100vh - 18em)" key="table0">
+ <el-table :data="tableData" style="width: 100%" height="calc(100vh - 18em)" key="table0"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
<el-table-column type="index" label="搴忓彿" width="120">
<template v-slot="scope">
<span>{{ (search.current - 1) * search.size + scope.$index + 1 }}</span>
diff --git a/src/views/business/finishedProductSampling/components/addQuarterItem.vue b/src/views/business/finishedProductSampling/components/addQuarterItem.vue
index 63e6888..bea5678 100644
--- a/src/views/business/finishedProductSampling/components/addQuarterItem.vue
+++ b/src/views/business/finishedProductSampling/components/addQuarterItem.vue
@@ -12,7 +12,8 @@
</div>
</div>
<div>
- <el-table v-loading="tableLoading" :data="quarterItems" border height="420" style="width: 100%">
+ <el-table v-loading="tableLoading" :data="quarterItems" border height="420" style="width: 100%"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }">
<el-table-column label="浜у搧绫诲瀷" prop="productType" width="200">
<template slot-scope="{row}">
<template>
diff --git a/src/views/business/inspectionTask/index.vue b/src/views/business/inspectionTask/index.vue
index 260ae7b..beb146c 100644
--- a/src/views/business/inspectionTask/index.vue
+++ b/src/views/business/inspectionTask/index.vue
@@ -206,7 +206,8 @@
鏂板
</el-button>
</div>
- <el-table :data="bindTableData" style="width: 100%" height="70vh" v-loading="bindTableDataLoading">
+ <el-table :data="bindTableData" style="width: 100%" height="70vh" v-loading="bindTableDataLoading"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
<el-table-column prop="inspectionItemClass" label="妫�楠岄」鍒嗙被" width="150">
</el-table-column>
<el-table-column prop="inspectionItem" label="妫�楠岄」" width="150">
@@ -222,6 +223,7 @@
</el-dialog>
<el-dialog :visible.sync="bindAddDialogVisible" title="閫夋嫨缁戝畾" width="600px">
<el-table :data="bindAddTableData" style="width: 100%" height="60vh"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
@selection-change="handleBindAddSelectionChange">
<el-table-column type="selection" width="55"> </el-table-column>
<el-table-column prop="inspectionItemClass" label="妫�楠岄」鍒嗙被" width="150">
diff --git a/src/views/business/inspectionTask/inspection.vue b/src/views/business/inspectionTask/inspection.vue
index 0894796..be1cfd8 100644
--- a/src/views/business/inspectionTask/inspection.vue
+++ b/src/views/business/inspectionTask/inspection.vue
@@ -344,6 +344,7 @@
</div>
<el-drawer :size="550" :visible.sync="sampleVisible" title="鏍峰搧鍒囨崲">
<el-table v-if="sampleVisible" ref="productTable" :current-row-key="currentKey" :data="sampleProduct"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
:row-class-name="tableRowClassName" :row-key="(record) => record.index" border class="el-table" height="100%"
highlight-current-row tooltip-effect="dark" @row-click="handleChangeSample">
<el-table-column :key="Math.random()" align="center" label="搴忓彿" type="index" width="70px">
diff --git a/src/views/business/materialOrder/copperOrder.vue b/src/views/business/materialOrder/copperOrder.vue
index a78b5cd..8001abe 100644
--- a/src/views/business/materialOrder/copperOrder.vue
+++ b/src/views/business/materialOrder/copperOrder.vue
@@ -134,6 +134,7 @@
</div>
<div style="height: auto;">
<el-table ref="sampleTable" :data="sampleList" class="el-table sampleTable" highlight-current-row
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
max-height="400px" tooltip-effect="dark" @selection-change="selectSample" @row-click="rowClick">
<el-table-column v-if="active==1" :selectable="selectable" type="selection" width="60"></el-table-column>
<el-table-column align="center" label="搴忓彿" type="index" width="65"></el-table-column>
@@ -195,6 +196,7 @@
<el-table-column align="center" label="寰呮椤规暟閲�" prop="proNum" width="105"></el-table-column>
</el-table>
<el-table ref="productTable" v-loading="getProductLoad" :data="productList" :row-class-name="tableRowClassName" class="el-table"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
max-height="400px" style="margin-bottom: 10px;" tooltip-effect="dark"
@select="selectOne" @selection-change="selectProduct" @select-all="handleAll">
<el-table-column v-if="active==1" :selectable="selectable" type="selection" width="65"></el-table-column>
diff --git a/src/views/business/materialOrder/customsInspection.vue b/src/views/business/materialOrder/customsInspection.vue
index de04e8c..07b4342 100644
--- a/src/views/business/materialOrder/customsInspection.vue
+++ b/src/views/business/materialOrder/customsInspection.vue
@@ -172,6 +172,7 @@
<el-table ref="sampleTable" :data="sampleList"
class="el-table sampleTable"
highlight-current-row
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
max-height="400px"
tooltip-effect="dark"
@selection-change="selectSample" @row-click="rowClick">
@@ -247,6 +248,7 @@
class="el-table"
max-height="400px"
style="margin-bottom: 10px;"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
tooltip-effect="dark"
@select="selectOne"
@selection-change="selectProduct"
@@ -354,6 +356,7 @@
</span>
</el-dialog>
<el-dialog :close-on-click-modal="false" :close-on-press-escape="false"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
:show-close="false" :visible.sync="bsm3Dia"
title="鍖洪棿鍊煎～鍐�" width="800px">
<el-table :data="editTable" height="80vh" style="width: 100%">
diff --git a/src/views/business/materialOrder/index.vue b/src/views/business/materialOrder/index.vue
index 5eeca40..b6232e1 100644
--- a/src/views/business/materialOrder/index.vue
+++ b/src/views/business/materialOrder/index.vue
@@ -76,6 +76,7 @@
<!--寰呬笅鍗�-->
<div class="table">
<lims-table :tableData="tableData" :column="column" v-if="tabIndex === 0" @pagination="pagination"
+ ref="tableData"
:rowClassName="changeRowClass" :height="'calc(100vh - 290px)'" key="tableData" :page="page"
:tableLoading="tableLoading"></lims-table>
</div>
@@ -246,7 +247,6 @@
{ label: '鎶ユ鏃堕棿', prop: 'declareDate' },
{
dataType: 'action',
- fixed: 'right',
label: '鎿嶄綔',
operation: [
{
diff --git a/src/views/business/productOrder/components/add.vue b/src/views/business/productOrder/components/add.vue
index 9c8b31e..e2d0238 100644
--- a/src/views/business/productOrder/components/add.vue
+++ b/src/views/business/productOrder/components/add.vue
@@ -232,6 +232,7 @@
</div>
</div>
<el-table ref="sampleTable" :data="sampleList" border class="el-table sampleTable" highlight-current-row
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }"
max-height="400px" tooltip-effect="dark" @selection-change="selectSample" @row-click="rowClick">
<el-table-column v-if="active==1" :selectable="selectable" type="selection" width="60"></el-table-column>
<el-table-column align="center" label="搴忓彿" type="index" width="65"></el-table-column>
@@ -295,7 +296,9 @@
</template>
</el-table-column>
</el-table>
- <el-table ref="productTable" v-loading="getProductLoad" :data="productList" :row-class-name="tableRowClassName" border class="el-table"
+ <el-table ref="productTable" v-loading="getProductLoad" :data="productList"
+ :row-class-name="tableRowClassName" border class="el-table"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
:key="upIndex"
max-height="400px" style="margin-bottom: 10px;" tooltip-effect="dark"
@select="selectOne" @selection-change="selectProduct" @select-all="handleAll">
diff --git a/src/views/business/productOrder/components/addInspectionDia.vue b/src/views/business/productOrder/components/addInspectionDia.vue
index f72ecc4..ae76551 100644
--- a/src/views/business/productOrder/components/addInspectionDia.vue
+++ b/src/views/business/productOrder/components/addInspectionDia.vue
@@ -7,6 +7,7 @@
title="娣诲姞妫�楠岄」"
width="80%">
<el-table ref="sampleTable" :data="sampleList" border class="el-table sampleTable" highlight-current-row
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }"
max-height="400px" tooltip-effect="dark">
<el-table-column align="center" label="搴忓彿" type="index" width="65"></el-table-column>
<el-table-column align="center" label="鏍峰搧鍚嶇О" min-width="100" prop="sample">
@@ -46,8 +47,8 @@
title="娣诲姞妫�楠岄」"
width="90%">
<el-table ref="productTable" v-loading="getProductLoad" :data="productList" :row-class-name="tableRowClassName" border class="el-table"
- max-height="580px" tooltip-effect="dark"
- @selection-change="selectProduct">
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }"
+ max-height="580px" tooltip-effect="dark" @selection-change="selectProduct">
<el-table-column type="selection" width="65"></el-table-column>
<el-table-column label="妫�楠岄」鍒嗙被" min-width="140" prop="inspectionItemClass" show-overflow-tooltip></el-table-column>
<el-table-column label="妫�楠岄」" min-width="140" prop="inspectionItem" show-overflow-tooltip></el-table-column>
diff --git a/src/views/business/productOrder/components/auxiliaryWireCore.vue b/src/views/business/productOrder/components/auxiliaryWireCore.vue
index d8034f5..7545392 100644
--- a/src/views/business/productOrder/components/auxiliaryWireCore.vue
+++ b/src/views/business/productOrder/components/auxiliaryWireCore.vue
@@ -34,6 +34,7 @@
<div class="table">
<el-table ref="productTable" v-loading="getProductLoad" :data="productList"
:row-class-name="tableRowClassName" border class="el-table" :height="'calc(100vh - 200px)'"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }"
tooltip-effect="dark" @select="upProductSelect"
@selection-change="selectProduct" @select-all="handleAll">
<el-table-column :selectable="selectable" type="selection" width="65"></el-table-column>
diff --git a/src/views/business/productOrder/components/cable-config.vue b/src/views/business/productOrder/components/cable-config.vue
index ce68a52..e0f5de1 100644
--- a/src/views/business/productOrder/components/cable-config.vue
+++ b/src/views/business/productOrder/components/cable-config.vue
@@ -34,6 +34,7 @@
<div class="table">
<el-table ref="productTable" :data="productList" :row-class-name="tableRowClassName" border
class="el-table" :height="'calc(100vh - 200px)'" tooltip-effect="dark" @select="upProductSelect"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }"
@selection-change="selectProduct" @select-all="handleAll">
<el-table-column :selectable="selectable" type="selection" width="65"></el-table-column>
<el-table-column label="妫�楠岄」鍒嗙被" min-width="140" prop="inspectionItemClass" show-overflow-tooltip></el-table-column>
diff --git a/src/views/business/productSamplingInfo/components/addQuarterItem.vue b/src/views/business/productSamplingInfo/components/addQuarterItem.vue
index 765ed43..dbfbce5 100644
--- a/src/views/business/productSamplingInfo/components/addQuarterItem.vue
+++ b/src/views/business/productSamplingInfo/components/addQuarterItem.vue
@@ -12,7 +12,8 @@
</div>
</div>
<div>
- <el-table v-loading="tableLoading" :data="quarterItems" border height="400" style="width: 100%">
+ <el-table v-loading="tableLoading" :data="quarterItems" height="400" style="width: 100%"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
<el-table-column label="浜у搧绫诲瀷" prop="productType" width="200">
<template slot-scope="{row}">
<template>
diff --git a/src/views/business/productSamplingInfo/index.vue b/src/views/business/productSamplingInfo/index.vue
index bebf98a..9ba2b67 100644
--- a/src/views/business/productSamplingInfo/index.vue
+++ b/src/views/business/productSamplingInfo/index.vue
@@ -43,7 +43,8 @@
</div>
</div>
<div>
- <el-table :data="yearItems" border height="450" style="width: 100%">
+ <el-table :data="yearItems" border height="450" style="width: 100%"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }">
<el-table-column label="绫诲埆" prop="yearType" width="240">
<template slot-scope="{row}">
<template v-if="operationType !== 'view'">
diff --git a/src/views/business/sample/components/detail.vue b/src/views/business/sample/components/detail.vue
index f76f413..c9f3eaf 100644
--- a/src/views/business/sample/components/detail.vue
+++ b/src/views/business/sample/components/detail.vue
@@ -61,7 +61,8 @@
</div>
<h4>妫�楠岄」鐩�</h4>
<div class="table">
- <el-table class="el-table" ref="productTable" :data="products" height="380px" tooltip-effect="dark" border>
+ <el-table class="el-table" ref="productTable" :data="products" height="380px" tooltip-effect="dark"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
<el-table-column type="index" align="center" label="搴忓彿" width="70" :key="Math.random()">
</el-table-column>
<el-table-column prop="inspectionItem" label="妫�楠岄」" min-width="100"
@@ -87,7 +88,8 @@
</div>
<h4>鍑哄叆搴撳巻鍙�</h4>
<div class="table" style="margin-bottom: 20px;">
- <el-table class="el-table" ref="productTable" :data="histories" height="380px" tooltip-effect="dark" border>
+ <el-table class="el-table" ref="productTable" :data="histories" height="380px" tooltip-effect="dark"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
<el-table-column type="index" align="center" label="搴忓彿" width="70" :key="Math.random()">
</el-table-column>
<el-table-column prop="state" label="绫诲瀷"
diff --git a/src/views/business/unpass/components/PurchaseVerification.vue b/src/views/business/unpass/components/PurchaseVerification.vue
index 1071830..6594480 100644
--- a/src/views/business/unpass/components/PurchaseVerification.vue
+++ b/src/views/business/unpass/components/PurchaseVerification.vue
@@ -124,7 +124,8 @@
</span>
</div>
<div>
- <el-table :data="factoryVerifyItemList" style="width: 98%" v-loading="tableLoading">
+ <el-table :data="factoryVerifyItemList" style="width: 98%" v-loading="tableLoading"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
<el-table-column type="index" label="搴忓彿" width="180" align="center"></el-table-column>
<el-table-column prop="inspectionItem" label="楠岃瘉椤圭洰" width="300"></el-table-column>
<el-table-column prop="result" label="楠岃瘉缁撴灉">
@@ -155,7 +156,8 @@
style="max-height: 96vh; margin-top: 2vh" :show-close="false" :close-on-click-modal="false"
:close-on-press-escape="false">
<el-table :data="tableList" style="width: 100%" v-loading="tableLoading"
- @selection-change="handleSelectionChange">
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
+ @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column type="index" label="搴忓彿" width="60" align="center"></el-table-column>
<el-table-column prop="inspectionItem" label="楠岃瘉椤圭洰"></el-table-column>
diff --git a/src/views/business/unpass/components/addUnPass.vue b/src/views/business/unpass/components/addUnPass.vue
index ed3c3cd..59c1e8e 100644
--- a/src/views/business/unpass/components/addUnPass.vue
+++ b/src/views/business/unpass/components/addUnPass.vue
@@ -4,8 +4,8 @@
:close-on-press-escape="false">
<div class="table">
<el-table class="el-table" ref="productTable" :data="productList" max-height="800px" tooltip-effect="dark"
- border v-loading="tableLoading" @selection-change="selectProduct" style="margin-bottom: 10px;"
- @select-all="handleAll">
+ v-loading="tableLoading" @selection-change="selectProduct" style="margin-bottom: 10px;"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border @select-all="handleAll">
<el-table-column type="selection" width="65"></el-table-column>
<el-table-column prop="inspectionItemClass" label="妫�楠岄」鍒嗙被" min-width="140"
show-overflow-tooltip></el-table-column>
diff --git a/src/views/monitor/logininfor/index.vue b/src/views/monitor/logininfor/index.vue
index 8d28b99..2d42fad 100644
--- a/src/views/monitor/logininfor/index.vue
+++ b/src/views/monitor/logininfor/index.vue
@@ -98,7 +98,9 @@
<!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
<!-- </el-row>-->
- <el-table ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
+ <el-table ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
+ :default-sort="defaultSort" @sort-change="handleSortChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="璁块棶缂栧彿" align="center" prop="infoId" />
<el-table-column label="鐢ㄦ埛鍚嶇О" align="center" prop="userName" :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']" />
diff --git a/src/views/performance/manHour/workTimeManagement.vue b/src/views/performance/manHour/workTimeManagement.vue
index 6d3bc23..152e3a5 100644
--- a/src/views/performance/manHour/workTimeManagement.vue
+++ b/src/views/performance/manHour/workTimeManagement.vue
@@ -47,23 +47,23 @@
<el-radio-button label="ValueTable1"> 浜ч噺宸ユ椂 </el-radio-button>
</el-radio-group>
<div style="display: flex; align-items: center">
- <p style="font-size: 14px; margin-right: 30px">
- 鎬诲伐鏃舵眹鎬伙細<span v-if="totalInfo" style="font-size: 16px; color: #3a7bfa">{{
- totalInfo["浜ч噺宸ユ椂姹囨��"] + totalInfo["杈呭姪宸ユ椂姹囨��"]
- ? Number(
- totalInfo["浜ч噺宸ユ椂姹囨��"] + totalInfo["杈呭姪宸ユ椂姹囨��"]
- ).tofixed(4)
- : 0
- }}</span> 浜ч噺宸ユ椂姹囨�伙細<span v-if="totalInfo" style="font-size: 16px; color: #3a7bfa">{{
- totalInfo["浜ч噺宸ユ椂姹囨��"]
- ? Number(totalInfo["浜ч噺宸ユ椂姹囨��"]).tofixed(4)
- : 0
- }}</span> 杈呭姪宸ユ椂姹囨�伙細<span v-if="totalInfo" style="font-size: 16px; color: #3a7bfa">{{
- totalInfo["杈呭姪宸ユ椂姹囨��"]
- ? Number(totalInfo["杈呭姪宸ユ椂姹囨��"]).tofixed(4)
- : 0
- }}</span>
- </p>
+<!-- <p style="font-size: 14px; margin-right: 30px">-->
+<!-- 鎬诲伐鏃舵眹鎬伙細<span v-if="totalInfo" style="font-size: 16px; color: #3a7bfa">{{-->
+<!-- totalInfo["浜ч噺宸ユ椂姹囨��"] + totalInfo["杈呭姪宸ユ椂姹囨��"]-->
+<!-- ? Number(-->
+<!-- totalInfo["浜ч噺宸ユ椂姹囨��"] + totalInfo["杈呭姪宸ユ椂姹囨��"]-->
+<!-- ).tofixed(4)-->
+<!-- : 0-->
+<!-- }}</span> 浜ч噺宸ユ椂姹囨�伙細<span v-if="totalInfo" style="font-size: 16px; color: #3a7bfa">{{-->
+<!-- totalInfo["浜ч噺宸ユ椂姹囨��"]-->
+<!-- ? Number(totalInfo["浜ч噺宸ユ椂姹囨��"]).tofixed(4)-->
+<!-- : 0-->
+<!-- }}</span> 杈呭姪宸ユ椂姹囨�伙細<span v-if="totalInfo" style="font-size: 16px; color: #3a7bfa">{{-->
+<!-- totalInfo["杈呭姪宸ユ椂姹囨��"]-->
+<!-- ? Number(totalInfo["杈呭姪宸ユ椂姹囨��"]).tofixed(4)-->
+<!-- : 0-->
+<!-- }}</span>-->
+<!-- </p>-->
<el-button v-show="currentTable == 'ValueTable0' &&
checkPermi(['performance:manHour:workTimeManagement:add'])
" size="small" type="primary" @click="openAdd">褰曞叆鏁版嵁</el-button>
@@ -78,9 +78,11 @@
</div>
<div class="table">
<lims-table :tableData="tableData" :column="column" :page="page" :tableLoading="tableLoading"
+ key="tableData"
:height="'calc(100vh - 350px)'" :isSelection="true" v-if="currentTable == 'ValueTable0'"
@pagination="pagination" :handleSelectionChange="handleSelectionChange"></lims-table>
<lims-table :tableData="tableData0" :column="column0" :page="page0" :tableLoading="tableLoading"
+ key="tableData0"
:height="'calc(100vh - 350px)'" v-if="currentTable == 'ValueTable1'" @pagination="pagination0"></lims-table>
</div>
<el-dialog :before-close="handleClose" :title="formData.id ? '缂栬緫' : '褰曞叆鏁版嵁'" :visible.sync="addVisible"
@@ -248,13 +250,13 @@
down: false,
addFileVisible: false,
weekList: [
- { label: "鍛ㄤ竴", value: "鍛ㄤ竴", type: "primary" },
- { label: "鍛ㄤ簩", value: "鍛ㄤ簩", type: "primary" },
- { label: "鍛ㄤ笁", value: "鍛ㄤ笁", type: "primary" },
- { label: "鍛ㄥ洓", value: "鍛ㄥ洓", type: "primary" },
- { label: "鍛ㄤ簲", value: "鍛ㄤ簲", type: "primary" },
- { label: "鍛ㄥ叚", value: "鍛ㄥ叚", type: "primary" },
- { label: "鍛ㄦ棩", value: "鍛ㄦ棩", type: "primary" },
+ { label: "鍛ㄤ竴", value: "1", type: "primary" },
+ { label: "鍛ㄤ簩", value: "2", type: "primary" },
+ { label: "鍛ㄤ笁", value: "3", type: "primary" },
+ { label: "鍛ㄥ洓", value: "4", type: "primary" },
+ { label: "鍛ㄤ簲", value: "5", type: "primary" },
+ { label: "鍛ㄥ叚", value: "6", type: "primary" },
+ { label: "鍛ㄦ棩", value: "0", type: "primary" },
],
currentTable: "ValueTable0",
addVisible: false,
@@ -352,10 +354,23 @@
label: "鐝",
prop: "shift",
dataType: "tag",
- formatData: this.shifList,
+ formatData: (params) => {
+ if (this.shifList.find(m => m.value == params)) {
+ return this.shifList.find(m => m.value == params).label
+ } else {
+ return null
+ }
+ },
},
{ label: "鍛ㄦ", prop: "week" },
- { label: "鏄熸湡", prop: "weekDay" },
+ {
+ label: "鏄熸湡",
+ prop: "weekDay",
+ dataType: "tag",
+ formatData: (params) => {
+ return this.weekList.find(m => m.value == params).label
+ },
+ },
{ label: "鍒涘缓鏃堕棿", prop: "createTime" },
{ label: "鏃ユ湡", prop: "dateTime" },
{
@@ -503,7 +518,7 @@
},
mounted() {
this.getCurrentWeekNumber();
- this.collectWorkingHours();
+ // this.collectWorkingHours();
this.selectshiftByUser();
this.searchList()
},
@@ -549,6 +564,7 @@
param.dateTime = param.dateTime?.length > 0 ? JSON.stringify(param.dateTime) : null
}
delete param.total;
+ delete param.state;
selectAuxiliaryOutputWorkingHours({ ...param })
.then((res) => {
this.tableLoading = false;
@@ -609,7 +625,7 @@
this.page0.current = 1;
this.getList0(entity);
}
- this.collectWorkingHours();
+ // this.collectWorkingHours();
},
refresh() {
this.entity = {};
@@ -674,7 +690,7 @@
this.formData.auxiliaryProject = "";
this.addVisible = false;
this.refreshTable("page");
- this.collectWorkingHours();
+ // this.collectWorkingHours();
});
} else {
updateAuxiliaryWorkingHoursDay(this.formData).then((res) => {
@@ -687,7 +703,7 @@
this.formData.nonproductiveTime = "";
this.formData.auxiliaryProject = "";
this.refreshTable("page");
- this.collectWorkingHours();
+ // this.collectWorkingHours();
});
}
},
@@ -742,7 +758,7 @@
submitBatchCheckDialog() {
this.batchCheckDialog = false;
this.refreshTable("page");
- this.collectWorkingHours();
+ // this.collectWorkingHours();
},
submitCheck(e) {
if (!this.formData0.number) {
@@ -770,7 +786,7 @@
this.$message.success("鎿嶄綔鎴愬姛");
this.checkVisible = false;
this.refreshTable("page");
- this.collectWorkingHours();
+ // this.collectWorkingHours();
});
},
getCurrentWeekNumber(now = new Date()) {
@@ -822,6 +838,7 @@
}
entity.weekDay = this.entity.weekDay;
entity.name = this.entity.name;
+ entity.state = this.entity.state;
collectWorkingHours(entity).then((res) => {
this.totalInfo = res.data;
});
diff --git a/src/views/standard/standardLibrary/index.vue b/src/views/standard/standardLibrary/index.vue
index 36e74a2..d6c8435 100644
--- a/src/views/standard/standardLibrary/index.vue
+++ b/src/views/standard/standardLibrary/index.vue
@@ -255,6 +255,7 @@
</el-row>
<el-row v-loading="tableLoad" class="standard_table">
<el-table ref="standard" :data="standardList" class="el-table" header-row-class-name="header-class" height="220"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
highlight-current-row style="width: 100%; height: 220px !important" tooltip-effect="dark"
@row-click="rowClick">
<el-table-column label="鏍囧噯缂栧彿" prop="code" show-overflow-tooltip width="200">
@@ -270,7 +271,8 @@
</el-row>
<el-row v-loading="tableLoad2" class="product_table">
<el-table id="templateParamTable" ref="productTable" v-loading="productTableLoading" :data="productList"
- :fit="true" :row-class-name="tableRowClassName" border class="productTable"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
+ :fit="true" :row-class-name="tableRowClassName" class="productTable"
header-row-class-name="header-class" height="100%" row-key="id" stripe style="width: 100%"
tooltip-effect="dark" @select="upProductSelect" @selection-change="handleSelectionChange"
@select-all="handleAll">
@@ -411,7 +413,8 @@
</el-dialog>
<el-dialog :close-on-click-modal="false" :visible.sync="sectionUpDia" title="鍖洪棿璁剧疆" width="80%">
<div class="body" style="padding: 5px 0">
- <el-table :data="sectionList" border height="350px" style="width: 100%">
+ <el-table :data="sectionList" border height="350px" style="width: 100%"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }">
<el-table-column align="center" label="搴忓彿" type="index" width="70">
</el-table-column>
<el-table-column align="center" label="鍖洪棿">
diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue
index e65a06d..c4e6cdd 100644
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -102,7 +102,8 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
- <el-table v-loading="loading" :data="configList" @selection-change="handleSelectionChange">
+ <el-table v-loading="loading" :data="configList" @selection-change="handleSelectionChange"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="鍙傛暟涓婚敭" align="center" prop="configId" />
<el-table-column label="鍙傛暟鍚嶇О" align="center" prop="configName" :show-overflow-tooltip="true" />
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index fa71608..b7c3bdc 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -28,6 +28,7 @@
</el-row>
<el-table v-if="refreshTable" v-loading="loading" :data="deptList" row-key="deptId"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
:default-expand-all="isExpandAll" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
<el-table-column prop="deptName" label="閮ㄩ棬鍚嶇О" width="260"></el-table-column>
<el-table-column prop="orderNum" label="鎺掑簭" width="200"></el-table-column>
diff --git a/src/views/system/dict/data.vue b/src/views/system/dict/data.vue
index ba38d3d..836d881 100644
--- a/src/views/system/dict/data.vue
+++ b/src/views/system/dict/data.vue
@@ -90,7 +90,8 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
- <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
+ <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="瀛楀吀缂栫爜" align="center" prop="dictCode" />
<el-table-column label="瀛楀吀鏍囩" align="center" prop="dictLabel">
diff --git a/src/views/system/role/authUser.vue b/src/views/system/role/authUser.vue
index 5e0d18b..27e3120 100644
--- a/src/views/system/role/authUser.vue
+++ b/src/views/system/role/authUser.vue
@@ -59,7 +59,8 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
- <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
+ <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="鐢ㄦ埛鍚嶇О" prop="userName" :show-overflow-tooltip="true" />
<el-table-column label="鐢ㄦ埛鏄电О" prop="nickName" :show-overflow-tooltip="true" />
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 853e45e..36921cb 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -33,7 +33,8 @@
</div>
</div>
- <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
+ <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="瑙掕壊缂栧彿" prop="roleId" width="120" />
<el-table-column label="瑙掕壊鍚嶇О" prop="roleName" :show-overflow-tooltip="true" width="150" />
diff --git a/src/views/system/role/selectUser.vue b/src/views/system/role/selectUser.vue
index 1a51116..0bea730 100644
--- a/src/views/system/role/selectUser.vue
+++ b/src/views/system/role/selectUser.vue
@@ -24,7 +24,8 @@
</el-form-item>
</el-form>
<el-row>
- <el-table @row-click="clickRow" ref="table" :data="userList" @selection-change="handleSelectionChange" height="260px">
+ <el-table @row-click="clickRow" ref="table" :data="userList" @selection-change="handleSelectionChange" height="260px"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column label="鐢ㄦ埛鍚嶇О" prop="userName" :show-overflow-tooltip="true" />
<el-table-column label="鐢ㄦ埛鏄电О" prop="nickName" :show-overflow-tooltip="true" />
diff --git a/src/views/system/user/authRole.vue b/src/views/system/user/authRole.vue
index 943710e..78a586b 100644
--- a/src/views/system/user/authRole.vue
+++ b/src/views/system/user/authRole.vue
@@ -17,7 +17,9 @@
</el-form>
<h4 class="form-header h4">瑙掕壊淇℃伅</h4>
- <el-table v-loading="loading" :row-key="getRowKey" @row-click="clickRow" ref="table" @selection-change="handleSelectionChange" :data="roles.slice((pageNum-1)*pageSize,pageNum*pageSize)">
+ <el-table v-loading="loading" :row-key="getRowKey" @row-click="clickRow" ref="table"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
+ @selection-change="handleSelectionChange" :data="roles.slice((pageNum-1)*pageSize,pageNum*pageSize)">
<el-table-column label="搴忓彿" type="index" align="center">
<template slot-scope="scope">
<span>{{(pageNum - 1) * pageSize + scope.$index + 1}}</span>
@@ -114,4 +116,4 @@
},
},
};
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 9bbfd25..469b8a2 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -47,7 +47,7 @@
</div>
</div>
<el-col>
- <el-table v-loading="loading" :data="userList">
+ <el-table v-loading="loading" :data="userList" :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
<el-table-column label="搴忓彿" align="center" type="index" />
<el-table-column label="濮撳悕" align="center" key="nickName" prop="nickName" :show-overflow-tooltip="true" />
<el-table-column label="璐﹀彿" align="center" key="userName" prop="userName" :show-overflow-tooltip="true" />
@@ -224,6 +224,7 @@
style="width: 50%" @keyup.enter.native="searchPerson()"></el-input>
</div>
<el-table height="67vh" stripe :data="personList" v-loading="personLoad" ref="personTable"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
@selection-change="handleSelectionChange">
<el-table-column type="selection" width="50">
</el-table-column>
--
Gitblit v1.9.3