From 185abfacfe79bd4a9c8e455512e3491aa41fbd88 Mon Sep 17 00:00:00 2001
From: houjie <714924425@qq.com>
Date: 星期一, 21 八月 2023 17:42:25 +0800
Subject: [PATCH] 备品备件：调整/ 基础数据修改（取消 保存并继续添加 ， 左树右表结构 布局调整，异常处理）
---
src/views/spare/modules/sparePartScrapRequirement/SparePartScrapRequirementForm.vue | 8 ++++
src/views/eam/FaultTypeList.vue | 6 +-
src/views/eam/PrecisionParametersList.vue | 4 +-
src/views/spare/modules/sparePartScrap/SparePartScrapForm.vue | 8 ++++
src/views/eam/EquipmentCategoryList.vue | 8 ++--
src/views/eam/PrecisionParametersTemplateList.vue | 8 +++
src/views/eam/modules/precisionParameter/PrecisionParametersRight.vue | 4 +-
src/views/eam/modules/processParameters/ProcessParametersModel.vue | 4 +-
src/views/eam/modules/precisionParameter/PrecisionParametersModel.vue | 4 +-
src/views/spare/modules/sparePartScrapRequirement/SpareSelectList.vue | 1
src/views/eam/modules/transferMethod/TransferMethodModel.vue | 4 +-
src/views/eam/modules/transferMethod/TransferMethodRight.vue | 4 +-
src/views/eam/modules/faultType/FaultType2List.vue | 4 +-
src/views/eam/modules/equipmentCategory/EquipmentCategory2List.vue | 4 +-
src/views/eam/modules/faultType/FaultTypeModel.vue | 8 ++--
src/views/eam/modules/equipmentCategory/EquipmentCategoryModel.vue | 8 ++--
src/views/eam/modules/unitCategory/MomBaseUnitCategoryForm.vue | 4 +-
17 files changed, 56 insertions(+), 35 deletions(-)
diff --git a/src/views/eam/EquipmentCategoryList.vue b/src/views/eam/EquipmentCategoryList.vue
index c3541ef..bd5ae43 100644
--- a/src/views/eam/EquipmentCategoryList.vue
+++ b/src/views/eam/EquipmentCategoryList.vue
@@ -4,16 +4,16 @@
:gutter="16"
>
<a-col
- :md="6"
+ :md="4"
:sm="24"
>
- <equipment-category-left />
+ <equipment-category-left/>
</a-col>
<a-col
- :md="24-6"
+ :md="24-4"
:sm="24"
>
- <equipment-category-right />
+ <equipment-category-right/>
</a-col>
</a-row>
</template>
diff --git a/src/views/eam/FaultTypeList.vue b/src/views/eam/FaultTypeList.vue
index beff744..e371be6 100644
--- a/src/views/eam/FaultTypeList.vue
+++ b/src/views/eam/FaultTypeList.vue
@@ -4,16 +4,16 @@
:gutter="16"
>
<a-col
- :md="6"
+ :md="4"
:sm="24"
>
<fault-type-left />
</a-col>
<a-col
- :md="24-6"
+ :md="24-4"
:sm="24"
>
- <fault-type-right />
+ <fault-type-right/>
</a-col>
</a-row>
</template>
diff --git a/src/views/eam/PrecisionParametersList.vue b/src/views/eam/PrecisionParametersList.vue
index f0e89f0..93a2386 100644
--- a/src/views/eam/PrecisionParametersList.vue
+++ b/src/views/eam/PrecisionParametersList.vue
@@ -4,13 +4,13 @@
:gutter="16"
>
<a-col
- :md="6"
+ :md="4"
:sm="24"
>
<precision-parameters-category-left @clickTreeNode="getSelectNode" />
</a-col>
<a-col
- :md="24-6"
+ :md="24-4"
:sm="24"
>
<precision-parameters-right :recordSelect="currentNodeSelect" />
diff --git a/src/views/eam/PrecisionParametersTemplateList.vue b/src/views/eam/PrecisionParametersTemplateList.vue
index 42bebac..ce8524d 100644
--- a/src/views/eam/PrecisionParametersTemplateList.vue
+++ b/src/views/eam/PrecisionParametersTemplateList.vue
@@ -76,7 +76,13 @@
<a-tabs defaultActiveKey="1">
<a-tab-pane tab="绮惧害鍙傛暟鏄庣粏" key="1" >
- <PrecisionParametersTemplateDetail :precisionParametersTemplateId="precisionParametersTemplateId" />
+ <div
+ class='table-operator'
+ style='margin:-20px'
+ >
+ <PrecisionParametersTemplateDetail :precisionParametersTemplateId="precisionParametersTemplateId" />
+ </div>
+
</a-tab-pane>
</a-tabs>
diff --git a/src/views/eam/modules/equipmentCategory/EquipmentCategory2List.vue b/src/views/eam/modules/equipmentCategory/EquipmentCategory2List.vue
index 9fc6a12..370a5a9 100644
--- a/src/views/eam/modules/equipmentCategory/EquipmentCategory2List.vue
+++ b/src/views/eam/modules/equipmentCategory/EquipmentCategory2List.vue
@@ -221,7 +221,7 @@
},
width: 50,
},
- {
+ /* {
title: '涓婄骇璁惧鍒嗙被缂栫爜',
align: "center",
dataIndex: 'parentNum',
@@ -234,7 +234,7 @@
title: '涓婄骇璁惧鍒嗙被鍚嶇О',
align: "center",
dataIndex: 'parentName',
- },
+ }, */
{
title: '璁惧鍒嗙被缂栫爜',
align: "center",
diff --git a/src/views/eam/modules/equipmentCategory/EquipmentCategoryModel.vue b/src/views/eam/modules/equipmentCategory/EquipmentCategoryModel.vue
index 0eb79cf..b5a207e 100644
--- a/src/views/eam/modules/equipmentCategory/EquipmentCategoryModel.vue
+++ b/src/views/eam/modules/equipmentCategory/EquipmentCategoryModel.vue
@@ -14,7 +14,7 @@
<a-spin :spinning="confirmLoading">
<a-form :form="form">
- <a-row :gutter="24">
+<!-- <a-row :gutter="24">
<a-col :span="12">
<a-form-item
label="涓婄骇璁惧鍒嗙被缂栧彿"
@@ -43,7 +43,7 @@
/>
</a-form-item>
</a-col>
- </a-row>
+ </a-row>-->
<a-row :gutter="24">
<a-col :span="12">
@@ -103,13 +103,13 @@
>
鍏抽棴
</a-button>
- <a-button
+<!-- <a-button
v-if="!this.model.id"
:disabled="disableSubmit || confirmLoading"
:loading="confirmLoading"
@click="handleOkAndAdd"
type="primary"
- >淇濆瓨骞剁户缁柊澧�</a-button>
+ >淇濆瓨骞剁户缁柊澧�</a-button>-->
<a-button
:disabled="disableSubmit || confirmLoading"
:loading="confirmLoading"
diff --git a/src/views/eam/modules/faultType/FaultType2List.vue b/src/views/eam/modules/faultType/FaultType2List.vue
index dd06df6..640be6d 100644
--- a/src/views/eam/modules/faultType/FaultType2List.vue
+++ b/src/views/eam/modules/faultType/FaultType2List.vue
@@ -230,7 +230,7 @@
},
width: 50
},
- {
+ /* {
title: '涓婄骇鏁呴殰绫诲瀷缂栫爜',
align: 'center',
dataIndex: 'parentNum'
@@ -240,7 +240,7 @@
align: 'center',
dataIndex: 'parentName'
- },
+ }, */
{
title: '鏁呴殰绫诲瀷缂栫爜',
align: 'center',
diff --git a/src/views/eam/modules/faultType/FaultTypeModel.vue b/src/views/eam/modules/faultType/FaultTypeModel.vue
index 3d1a287..569988c 100644
--- a/src/views/eam/modules/faultType/FaultTypeModel.vue
+++ b/src/views/eam/modules/faultType/FaultTypeModel.vue
@@ -14,7 +14,7 @@
<a-spin :spinning="confirmLoading">
<a-form :form="form">
- <a-row :gutter="24">
+<!-- <a-row :gutter="24">
<a-col :span="12">
<a-form-item
label="涓婄骇鏁呴殰绫诲瀷缂栧彿锛�"
@@ -43,7 +43,7 @@
/>
</a-form-item>
</a-col>
- </a-row>
+ </a-row>-->
<a-row :gutter="24">
<a-col :span="12">
@@ -103,13 +103,13 @@
>
鍏抽棴
</a-button>
- <a-button
+<!-- <a-button
v-if="!this.model.id"
:disabled="disableSubmit || confirmLoading"
:loading="confirmLoading"
@click="handleOk"
type="primary"
- >淇濆瓨骞剁户缁柊澧�</a-button>
+ >淇濆瓨骞剁户缁柊澧�</a-button>-->
<a-button
:disabled="disableSubmit || confirmLoading"
:loading="confirmLoading"
diff --git a/src/views/eam/modules/precisionParameter/PrecisionParametersModel.vue b/src/views/eam/modules/precisionParameter/PrecisionParametersModel.vue
index 3c07360..ce8c9ad 100644
--- a/src/views/eam/modules/precisionParameter/PrecisionParametersModel.vue
+++ b/src/views/eam/modules/precisionParameter/PrecisionParametersModel.vue
@@ -105,13 +105,13 @@
>
鍏抽棴
</a-button>
- <a-button
+<!-- <a-button
v-if="!this.model.id"
:disabled="disableSubmit || confirmLoading"
:loading="confirmLoading"
@click="handleOk"
type="primary"
- >淇濆瓨骞剁户缁柊澧�</a-button>
+ >淇濆瓨骞剁户缁柊澧�</a-button>-->
<a-button
:disabled="disableSubmit || confirmLoading"
:loading="confirmLoading"
diff --git a/src/views/eam/modules/precisionParameter/PrecisionParametersRight.vue b/src/views/eam/modules/precisionParameter/PrecisionParametersRight.vue
index 59f3d33..80f8c0e 100644
--- a/src/views/eam/modules/precisionParameter/PrecisionParametersRight.vue
+++ b/src/views/eam/modules/precisionParameter/PrecisionParametersRight.vue
@@ -262,7 +262,7 @@
},
// sorter: true,
},
- {
+ /* {
title: '绮惧害鍙傛暟鍒嗙被',
align: 'center',
dataIndex: 'precisionParametersCategoryNumName',
@@ -270,7 +270,7 @@
customRender: 'precisionParametersCategoryNumName'
},
// sorter: true,
- },
+ }, */
{
title: '璁￠噺鍗曚綅',
align: 'center',
diff --git a/src/views/eam/modules/processParameters/ProcessParametersModel.vue b/src/views/eam/modules/processParameters/ProcessParametersModel.vue
index 64afe8a..f3ce475 100644
--- a/src/views/eam/modules/processParameters/ProcessParametersModel.vue
+++ b/src/views/eam/modules/processParameters/ProcessParametersModel.vue
@@ -105,13 +105,13 @@
>
鍏抽棴
</a-button>
- <a-button
+<!-- <a-button
v-if="!this.model.id"
:disabled="disableSubmit || confirmLoading"
:loading="confirmLoading"
@click="handleOk"
type="primary"
- >淇濆瓨骞剁户缁柊澧�</a-button>
+ >淇濆瓨骞剁户缁柊澧�</a-button>-->
<a-button
:disabled="disableSubmit || confirmLoading"
:loading="confirmLoading"
diff --git a/src/views/eam/modules/transferMethod/TransferMethodModel.vue b/src/views/eam/modules/transferMethod/TransferMethodModel.vue
index cd0c0cc..9784691 100644
--- a/src/views/eam/modules/transferMethod/TransferMethodModel.vue
+++ b/src/views/eam/modules/transferMethod/TransferMethodModel.vue
@@ -89,13 +89,13 @@
>
鍏抽棴
</a-button>
- <a-button
+<!-- <a-button
v-if="!this.model.id"
:disabled="disableSubmit || confirmLoading"
:loading="confirmLoading"
@click="handleOk"
type="primary"
- >淇濆瓨骞剁户缁柊澧�</a-button>
+ >淇濆瓨骞剁户缁柊澧�</a-button>-->
<a-button
:disabled="disableSubmit || confirmLoading"
:loading="confirmLoading"
diff --git a/src/views/eam/modules/transferMethod/TransferMethodRight.vue b/src/views/eam/modules/transferMethod/TransferMethodRight.vue
index 2b96ce0..c51fc28 100644
--- a/src/views/eam/modules/transferMethod/TransferMethodRight.vue
+++ b/src/views/eam/modules/transferMethod/TransferMethodRight.vue
@@ -262,7 +262,7 @@
},
// sorter: true,
},
- {
+ /* {
title: '澧炲噺鏂瑰紡鍒嗙被',
align: 'center',
dataIndex: 'transferMethodCategoryNumName',
@@ -270,7 +270,7 @@
customRender: 'transferMethodCategoryNumName'
},
// sorter: true,
- },
+ }, */
{
title: '鍒涘缓浜�',
align: "center",
diff --git a/src/views/eam/modules/unitCategory/MomBaseUnitCategoryForm.vue b/src/views/eam/modules/unitCategory/MomBaseUnitCategoryForm.vue
index 8e6b0de..5a0f95b 100644
--- a/src/views/eam/modules/unitCategory/MomBaseUnitCategoryForm.vue
+++ b/src/views/eam/modules/unitCategory/MomBaseUnitCategoryForm.vue
@@ -32,9 +32,9 @@
<a-button type="primary" @click="submitForm">淇濆瓨</a-button>
</a-col>
- <a-col>
+<!-- <a-col>
<a-button type="primary" @click="submitFormAndAdd">淇濆瓨骞舵柊澧�</a-button>
- </a-col>
+ </a-col>-->
<a-col>
<a-button type="primary" @click="close">鍙栨秷</a-button>
diff --git a/src/views/spare/modules/sparePartScrap/SparePartScrapForm.vue b/src/views/spare/modules/sparePartScrap/SparePartScrapForm.vue
index b4b0363..f422f8c 100644
--- a/src/views/spare/modules/sparePartScrap/SparePartScrapForm.vue
+++ b/src/views/spare/modules/sparePartScrap/SparePartScrapForm.vue
@@ -70,6 +70,7 @@
:columns='sparesScrapDetailTable.columns'
:dataSource='sparesScrapDetailTable.dataSource'
:maxHeight='300'
+ @valueChange="changeAuxiliaryQuantity"
:disabled='formDisabled'
:rowNumber='true'
:rowSelection='true'
@@ -551,6 +552,13 @@
this.visible = false
this.$emit('close')
this.$refs.form.clearValidate()
+ },
+ changeAuxiliaryQuantity(target){
+ console.log(target.columnIndex)
+ let num=target.columnIndex
+ if (target.columnIndex ===num){
+ target.row.scrapAuxiliaryQuantity=Math.abs(target.row.conversionRatio*target.row.scrapMainQuantity)
+ }
}
}
}
diff --git a/src/views/spare/modules/sparePartScrapRequirement/SparePartScrapRequirementForm.vue b/src/views/spare/modules/sparePartScrapRequirement/SparePartScrapRequirementForm.vue
index 4f6ff0a..1cf9ac2 100644
--- a/src/views/spare/modules/sparePartScrapRequirement/SparePartScrapRequirementForm.vue
+++ b/src/views/spare/modules/sparePartScrapRequirement/SparePartScrapRequirementForm.vue
@@ -59,6 +59,7 @@
:dataSource='sparesScrapRequirementDetailTable.dataSource'
:maxHeight='300'
:disabled='formDisabled'
+ @valueChange="changeAuxiliaryQuantity"
:alwaysEdit='true'
:rowNumber='true'
:bordered='bordered'
@@ -458,6 +459,13 @@
this.visible = false
this.$emit('close')
this.$refs.form.clearValidate()
+ },
+ changeAuxiliaryQuantity(target){
+ console.log(target.columnIndex)
+ let num=target.columnIndex
+ if (target.columnIndex ===num){
+ target.row.auxiliaryQuantity=Math.abs(target.row.conversionRatio*target.row.mainQuantity)
+ }
}
}
}
diff --git a/src/views/spare/modules/sparePartScrapRequirement/SpareSelectList.vue b/src/views/spare/modules/sparePartScrapRequirement/SpareSelectList.vue
index a1bcea9..99045bd 100644
--- a/src/views/spare/modules/sparePartScrapRequirement/SpareSelectList.vue
+++ b/src/views/spare/modules/sparePartScrapRequirement/SpareSelectList.vue
@@ -190,7 +190,6 @@
let params = this.getQueryParams()//鏌ヨ鏉′欢
await getAction(this.url.list, params).then((res) => {
if (res.success) {
- debugger
for (let i = 0; i < res.result.records.length; i++) {
if (this.oldSelectRows.indexOf(res.result.records[i].id) > -1) {
res.result.records[i].distable = true
--
Gitblit v1.9.3