From c120699170354666327cc3c1d7f1cc1eb5f90c4f Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期一, 21 八月 2023 18:06:01 +0800
Subject: [PATCH] qsw 优化
---
src/views/eam/modules/equipment/EquipmentAccount2List.vue | 101 ++++++++++++-------------
src/views/eam/modules/specialtyInspectionOrder/SpecialyInspectionOrderExeDrawer.vue | 6
src/views/eam/modules/maintenanceProject/MaintenanceProjectModel.vue | 1
src/views/eam/modules/specialtyInspectionPlan/SpecialtyInspectionPlanModal.vue | 7 -
src/views/eam/InspectionProjectList.vue | 4
src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue | 6
src/views/eam/MaintenanceProjectList.vue | 4
src/views/eam/SpecialtyMaintenanceOrderList.vue | 26 +++---
src/views/eam/modules/equipment/EquipmentModel.vue | 43 +++++-----
src/views/eam/EquipmentAccountList.vue | 4
10 files changed, 98 insertions(+), 104 deletions(-)
diff --git a/src/views/eam/EquipmentAccountList.vue b/src/views/eam/EquipmentAccountList.vue
index 048605d..4feb1bd 100644
--- a/src/views/eam/EquipmentAccountList.vue
+++ b/src/views/eam/EquipmentAccountList.vue
@@ -4,13 +4,13 @@
:gutter="16"
>
<a-col
- :md="6"
+ :md="4"
:sm="24"
>
<equipment-category-left />
</a-col>
<a-col
- :md="24-6"
+ :md="24-4"
:sm="24"
>
<equipment-right />
diff --git a/src/views/eam/InspectionProjectList.vue b/src/views/eam/InspectionProjectList.vue
index d51c5f9..acbd23c 100644
--- a/src/views/eam/InspectionProjectList.vue
+++ b/src/views/eam/InspectionProjectList.vue
@@ -4,13 +4,13 @@
:gutter="16"
>
<a-col
- :md="6"
+ :md="4"
:sm="24"
>
<inspection-project-category-left @clickTreeNode="getSelectNode" />
</a-col>
<a-col
- :md="24-6"
+ :md="24-4"
:sm="24"
>
<inspection-project-right :recordSelect="currentNodeSelect" />
diff --git a/src/views/eam/MaintenanceProjectList.vue b/src/views/eam/MaintenanceProjectList.vue
index 807f6bc..f1c0c49 100644
--- a/src/views/eam/MaintenanceProjectList.vue
+++ b/src/views/eam/MaintenanceProjectList.vue
@@ -4,13 +4,13 @@
:gutter="16"
>
<a-col
- :md="6"
+ :md="4"
:sm="24"
>
<maintenance-project-category-left @clickTreeNode="getSelectNode" />
</a-col>
<a-col
- :md="24-6"
+ :md="24-4"
:sm="24"
>
<maintenance-project-right :recordSelect="currentNodeSelect" />
diff --git a/src/views/eam/SpecialtyMaintenanceOrderList.vue b/src/views/eam/SpecialtyMaintenanceOrderList.vue
index 68ba0e9..83297d3 100644
--- a/src/views/eam/SpecialtyMaintenanceOrderList.vue
+++ b/src/views/eam/SpecialtyMaintenanceOrderList.vue
@@ -258,8 +258,8 @@
ref="SpecialyMaintenanceOrderExeDrawer"
@ok="modalFormOk"
></specialy-maintenance-order-exe-drawer>
- <specialty-maintenance-order-assign-modal
- ref="SpecialtyMaintenanceOrderAssignModal"
+ <specialty-maintenance-order-assign-modal
+ ref="SpecialtyMaintenanceOrderAssignModal"
@ok="modalFormOk"
>
</specialty-maintenance-order-assign-modal>
@@ -349,35 +349,35 @@
align: "center",
dataIndex: 'teamName',
},
- {
- title: '宸ユ椂瀹氶/姣忓皬鏃�',
- align: "center",
- dataIndex: 'sumOfWorkingHourQuota',
- },
+ // {
+ // title: '宸ユ椂瀹氶/姣忓皬鏃�',
+ // align: "center",
+ // dataIndex: 'sumOfWorkingHourQuota',
+ // },
{
title: '璁″垝寮�濮嬫椂闂�',
align: "center",
dataIndex: 'planStartTime',
- width:170
-
+ width: 170
+
},
{
title: '璁″垝缁撴潫鏃堕棿',
align: "center",
dataIndex: 'planEndTime',
- width:170
+ width: 170
},
{
title: '瀹為檯寮�濮嬫椂闂�',
align: "center",
dataIndex: 'actualStartTime',
- width:170
+ width: 170
},
{
title: '瀹為檯缁撴潫鏃堕棿',
align: "center",
dataIndex: 'actualEndTime',
- width:170
+ width: 170
},
{
title: '瀹為檯鐢ㄦ椂',
@@ -398,7 +398,7 @@
title: '鍒涘缓鏃ユ湡',
align: "center",
dataIndex: 'createTime',
- width:170
+ width: 170
},
{
title: '鎿嶄綔',
diff --git a/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue b/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue
index e63f4fb..1fefdfb 100644
--- a/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue
+++ b/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue
@@ -147,7 +147,7 @@
style="max-width:80px;font-size: 12px;font-style: italic;"
/>
<a-select
- v-if="col.dataIndex == 'inspectionProjectResult' && record.analysisMethod == '2'"
+ v-if="col.dataIndex == 'inspectionProjectResult' && record.testValueType == '2'"
:value="text"
:options="record.inspectionCycles"
@change="(e) => handleChange(e, record.key, col, index)"
@@ -156,7 +156,7 @@
/>
<a-input-number
:value="text"
- v-if="col.dataIndex == 'inspectionProjectResult' && record.analysisMethod == '1'"
+ v-if="col.dataIndex == 'inspectionProjectResult' && record.testValueType == '1'"
:min="0"
:max="20000"
@change="(e)=>handleChange(e, record.key, col, index,record)"
@@ -663,7 +663,7 @@
if (target) {
if (column.dataIndex == 'inspectionProjectResult') {
- if (target.analysisMethod === "1") {
+ if (target.testValueType === "1") {
target[column.dataIndex] = value;
let maxValue = target.maxValue
let minValue = target.minValue
diff --git a/src/views/eam/modules/equipment/EquipmentAccount2List.vue b/src/views/eam/modules/equipment/EquipmentAccount2List.vue
index 325b2f7..f298e74 100644
--- a/src/views/eam/modules/equipment/EquipmentAccount2List.vue
+++ b/src/views/eam/modules/equipment/EquipmentAccount2List.vue
@@ -210,11 +210,11 @@
slot-scope="text, record"
>
<!-- class="table-operation" -->
- <a
+ <!-- <a
href="javascript:;"
@click="equipmentStructuresShow(record)"
>璁惧缁撴瀯</a>
- <a-divider type="vertical" />
+ <a-divider type="vertical" /> -->
<a
href="javascript:;"
@click="handleEdit(record)"
@@ -249,7 +249,7 @@
type="card"
defaultActiveKey="1"
>
- <a-tab-pane key="1">
+ <!-- <a-tab-pane key="1">
<span slot="tab">
<a-badge v-if="showTabsFlag">宸ヨ壓鍙傛暟 </a-badge>
<a-badge
@@ -265,7 +265,7 @@
>
<process-parameters-list ref="ProcessParametersList"></process-parameters-list>
</div>
- </a-tab-pane>
+ </a-tab-pane> -->
<a-tab-pane
key="2"
@@ -402,11 +402,6 @@
dataIndex: 'num',
},
{
- title: '璧勪骇缂栫爜',
- align: "center",
- dataIndex: 'assetNumber',
- },
- {
title: '璁惧鍚嶇О',
align: "center",
dataIndex: 'name',
@@ -422,6 +417,11 @@
dataIndex: 'specification',
},
{
+ title: '璧勪骇缂栫爜',
+ align: "center",
+ dataIndex: 'assetNumber',
+ },
+ {
title: '璁惧鐘舵��',
align: "center",
dataIndex: 'equipmentStatus_dictText',
@@ -434,12 +434,7 @@
{
title: '鐗圭璁惧',
align: "center",
- dataIndex: 'specificEquipment',
- },
- {
- title: '鐗圭璁惧',
- align: "center",
- dataIndex: 'sourceId_dictText',
+ dataIndex: 'specificEquipment_dictText',
},
{
title: '璁惧鍥剧墖',
@@ -512,17 +507,17 @@
align: "center",
dataIndex: 'equipmentImportanceId_dictText',
},
- {
- title: '宸ヨ壓鍙傛暟绠＄悊',
- align: "center",
- dataIndex: 'processParameters',
- scopedSlots: { customRender: 'processParameters' },
- },
- {
- title: '宸ヨ壓鍙傛暟妯℃澘',
- align: "center",
- dataIndex: 'processParametersTemplateName',
- },
+ // {
+ // title: '宸ヨ壓鍙傛暟绠＄悊',
+ // align: "center",
+ // dataIndex: 'processParameters',
+ // scopedSlots: { customRender: 'processParameters' },
+ // },
+ // {
+ // title: '宸ヨ壓鍙傛暟妯℃澘',
+ // align: "center",
+ // dataIndex: 'processParametersTemplateName',
+ // },
{
title: '璁惧绮惧害绠＄悊',
align: "center",
@@ -534,27 +529,27 @@
align: "center",
dataIndex: 'precisionParametersTemplateName',
},
- {
- title: '妫�瀹氱鐞�',
- align: "center",
- dataIndex: 'verification',
- scopedSlots: { customRender: 'verification' },
- },
- {
- title: '妫�瀹氬懆鏈�/鏈�',
- align: "center",
- dataIndex: 'verificationPeriod',
- },
- {
- title: '涓婃妫�瀹氭棩鏈�',
- align: "center",
- dataIndex: 'lastVerificationDate',
- },
- {
- title: '涓嬫妫�瀹氭棩鏈�',
- align: "center",
- dataIndex: 'nextVerificationDate',
- },
+ // {
+ // title: '妫�瀹氱鐞�',
+ // align: "center",
+ // dataIndex: 'verification',
+ // scopedSlots: { customRender: 'verification' },
+ // },
+ // {
+ // title: '妫�瀹氬懆鏈�/鏈�',
+ // align: "center",
+ // dataIndex: 'verificationPeriod',
+ // },
+ // {
+ // title: '涓婃妫�瀹氭棩鏈�',
+ // align: "center",
+ // dataIndex: 'lastVerificationDate',
+ // },
+ // {
+ // title: '涓嬫妫�瀹氭棩鏈�',
+ // align: "center",
+ // dataIndex: 'nextVerificationDate',
+ // },
// {
// title: '鐘舵��',
// align: 'center',
@@ -626,11 +621,11 @@
onSelectChange(selectedRowKeys, selectionRows) {
if (selectedRowKeys.length == 1) {
- this.$refs.ProcessParametersList.equipmentId = selectedRowKeys[0]
+ // this.$refs.ProcessParametersList.equipmentId = selectedRowKeys[0]
this.$refs.EquipmentFileList.equipmentId = selectedRowKeys[0]
this.$refs.PrecisionParametersList.equipmentId = selectedRowKeys[0]
} else {
- this.$refs.ProcessParametersList.equipmentId = '-1'
+ // this.$refs.ProcessParametersList.equipmentId = '-1'
this.$refs.PrecisionParametersList.equipmentId = '-1'
this.$refs.EquipmentFileList.equipmentId = '-1'
}
@@ -746,7 +741,7 @@
}
this.selectedRowKeys = []
this.selectionRows = []
- this.$refs.ProcessParametersList.equipmentId = '-1'
+ // this.$refs.ProcessParametersList.equipmentId = '-1'
this.$refs.PrecisionParametersList.equipmentId = '-1'
this.$refs.EquipmentFileList.equipmentId = '-1'
this.loadData(1);
@@ -755,7 +750,7 @@
searchQuery() {
this.selectedRowKeys = []
this.selectionRows = []
- this.$refs.ProcessParametersList.equipmentId = '-1'
+ // this.$refs.ProcessParametersList.equipmentId = '-1'
this.$refs.PrecisionParametersList.equipmentId = '-1'
this.$refs.EquipmentFileList.equipmentId = '-1'
this.loadData(1);
@@ -767,7 +762,7 @@
//娓呯┖鍒楄〃閫変腑
this.onClearSelected()
- this.$refs.ProcessParametersList.equipmentId = '-1'
+ // this.$refs.ProcessParametersList.equipmentId = '-1'
this.$refs.PrecisionParametersList.equipmentId = '-1'
this.$refs.EquipmentFileList.equipmentId = '-1'
},
@@ -789,7 +784,7 @@
}
this.selectedRowKeys = []
this.selectionRows = []
- this.$refs.ProcessParametersList.equipmentId = '-1'
+ // this.$refs.ProcessParametersList.equipmentId = '-1'
this.$refs.PrecisionParametersList.equipmentId = '-1'
this.$refs.EquipmentFileList.equipmentId = '-1'
this.loadData(1);
diff --git a/src/views/eam/modules/equipment/EquipmentModel.vue b/src/views/eam/modules/equipment/EquipmentModel.vue
index b55f514..50a1c72 100644
--- a/src/views/eam/modules/equipment/EquipmentModel.vue
+++ b/src/views/eam/modules/equipment/EquipmentModel.vue
@@ -366,9 +366,8 @@
/>
</a-form-item>
</a-col>
-
</a-row>
- <a-row style="width: 100%">
+ <!-- <a-row style="width: 100%">
<a-col :span="24 / 3">
<a-form-item
:labelCol="labelCol"
@@ -416,9 +415,9 @@
/>
</a-form-item>
</a-col>
- </a-row>
+ </a-row> -->
<a-row style="width: 100%">
- <a-col :span="24 / 3 ">
+ <!-- <a-col :span="24 / 3 ">
<a-form-item
:labelCol="labelCol"
:wrapperCol="wrapperCol"
@@ -451,7 +450,7 @@
v-decorator="['processParametersTemplateName', validatorRules.processParametersTemplateName]"
/>
</a-form-item>
- </a-col>
+ </a-col> -->
<a-col :span="24 / 3">
<a-form-item
:labelCol="labelCol"
@@ -468,9 +467,6 @@
/>
</a-form-item>
</a-col>
- </a-row>
- <a-row style="width: 100%">
-
<a-col :span="24 / 3">
<a-form-item
:labelCol="labelCol"
@@ -505,6 +501,9 @@
/>
</a-form-item>
</a-col>
+ </a-row>
+ <a-row style="width: 100%">
+
</a-row>
<a-row :gutter="24">
@@ -733,7 +732,7 @@
'remark'));
this.form.setFieldsValue({ leaveFactoryDate: this.model.leaveFactoryDate ? moment(this.model.leaveFactoryDate, 'YYYY-MM-DD') : null });
this.form.setFieldsValue({ acceptanceCheckDate: this.model.acceptanceCheckDate ? moment(this.model.acceptanceCheckDate, 'YYYY-MM-DD') : null });
- this.form.setFieldsValue({ lastVerificationDate: this.model.lastVerificationDate ? moment(this.model.lastVerificationDate, 'YYYY-MM-DD') : null })
+ // this.form.setFieldsValue({ lastVerificationDate: this.model.lastVerificationDate ? moment(this.model.lastVerificationDate, 'YYYY-MM-DD') : null })
});
if (record.id) {
this.codeDisable = true;
@@ -784,17 +783,17 @@
// formData.equipmentPhoto = this.equipmentPhoto
formData.leaveFactoryDate = formData.leaveFactoryDate ? formData.leaveFactoryDate.format('YYYY-MM-DD') : null;
formData.acceptanceCheckDate = formData.acceptanceCheckDate ? formData.acceptanceCheckDate.format('YYYY-MM-DD') : null;
- formData.lastVerificationDate = formData.lastVerificationDate ? formData.lastVerificationDate.format('YYYY-MM-DD') : null;
+ // formData.lastVerificationDate = formData.lastVerificationDate ? formData.lastVerificationDate.format('YYYY-MM-DD') : null;
if (that.model.precisionParameters != "1") {
formData.precisionParametersTemplateId = "";
} else {
formData.precisionParametersTemplateId = this.precisionParametersTemplateId;
}
- if (that.model.processParameters != "1") {
- formData.processParametersTemplateId = "";
- } else {
- formData.processParametersTemplateId = this.processParametersTemplateId;
- }
+ // if (that.model.processParameters != "1") {
+ // formData.processParametersTemplateId = "";
+ // } else {
+ // formData.processParametersTemplateId = this.processParametersTemplateId;
+ // }
let obj;
if (!this.model.id) {
formData.equipmentCategoryId = this.equipmentCategoryId
@@ -874,13 +873,13 @@
this.model.precisionParameters = '1'
}
},
- handle3Switch(verification) {
- if ('1' == verification) {
- this.model.verification = '0'
- } else {
- this.model.verification = '1'
- }
- },
+ // handle3Switch(verification) {
+ // if ('1' == verification) {
+ // this.model.verification = '0'
+ // } else {
+ // this.model.verification = '1'
+ // }
+ // },
getSysDeparts() {
getAction(this.url.getSysDeparts).then((res) => {
diff --git a/src/views/eam/modules/maintenanceProject/MaintenanceProjectModel.vue b/src/views/eam/modules/maintenanceProject/MaintenanceProjectModel.vue
index 6c7186f..a0df89f 100644
--- a/src/views/eam/modules/maintenanceProject/MaintenanceProjectModel.vue
+++ b/src/views/eam/modules/maintenanceProject/MaintenanceProjectModel.vue
@@ -201,6 +201,7 @@
鍏抽棴
</a-button>
<a-button
+ hidden
v-if="!this.model.id"
:disabled="disableSubmit || confirmLoading"
:loading="confirmLoading"
diff --git a/src/views/eam/modules/specialtyInspectionOrder/SpecialyInspectionOrderExeDrawer.vue b/src/views/eam/modules/specialtyInspectionOrder/SpecialyInspectionOrderExeDrawer.vue
index 3ec4a91..a0ed799 100644
--- a/src/views/eam/modules/specialtyInspectionOrder/SpecialyInspectionOrderExeDrawer.vue
+++ b/src/views/eam/modules/specialtyInspectionOrder/SpecialyInspectionOrderExeDrawer.vue
@@ -253,7 +253,7 @@
style="max-width:80px;font-size: 12px;font-style: italic;"
/>
<a-select
- v-if="col.dataIndex == 'inspectionProjectResult' && record.analysisMethod == '2'"
+ v-if="col.dataIndex == 'inspectionProjectResult' && record.testValueType == '2'"
:value="text"
:options="record.inspectionCycles"
@change="(e) => handleChange(e, record.key, col, index)"
@@ -262,7 +262,7 @@
/>
<a-input-number
:value="text"
- v-if="col.dataIndex == 'inspectionProjectResult' && record.analysisMethod == '1'"
+ v-if="col.dataIndex == 'inspectionProjectResult' && record.testValueType == '1'"
:min="0"
:max="200"
@change="(e)=>handleChange(e, record.key, col, index,record)"
@@ -825,7 +825,7 @@
if (target) {
if (column.dataIndex == 'inspectionProjectResult') {
- if (target.analysisMethod === "1") {
+ if (target.testValueType == "1") {
target[column.dataIndex] = value;
let maxValue = target.maxValue
let minValue = target.minValue
diff --git a/src/views/eam/modules/specialtyInspectionPlan/SpecialtyInspectionPlanModal.vue b/src/views/eam/modules/specialtyInspectionPlan/SpecialtyInspectionPlanModal.vue
index d1b4a6a..06f9007 100644
--- a/src/views/eam/modules/specialtyInspectionPlan/SpecialtyInspectionPlanModal.vue
+++ b/src/views/eam/modules/specialtyInspectionPlan/SpecialtyInspectionPlanModal.vue
@@ -15,14 +15,14 @@
<a-row :gutter="24">
<a-col :span="12">
<a-form-item
- label="鐐规璁″垝缂栫爜"
+ label="鐐规鏂规缂栫爜"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
<a-input
allow-clear
:disabled="disableSubmit"
- :placeholder="disableSubmit?'':'璇疯緭鍏ョ偣妫�璁″垝缂栫爜'"
+ :placeholder="disableSubmit?'':'璇疯緭鍏ョ偣妫�鏂规缂栫爜'"
v-decorator="['num', validatorRules.num ]"
/>
</a-form-item>
@@ -148,7 +148,7 @@
<a-input
:disabled=true
placeholder="璇疯緭鍏ュ浘鐗囧悕绉�"
- v-decorator="['name', {} ]"
+ v-decorator="['name', validatorRules.name ]"
/>
</a-form-item>
</a-col>
@@ -431,7 +431,6 @@
for (let i = 0; i < this.dataSource.length; i++) {
ids.push(this.dataSource[i].specialtyInspectionStandardId);
}
- debugger
let departId = dataDepartId.departId;
let inspectionCycleId = data.inspectionCycleId;
this.$refs.specialtyInspectionStandardModalForm.showModals(ids, departId, inspectionCycleId);
--
Gitblit v1.9.3