From d50a87b08c23d068157878794ed0d5c563eb8135 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期一, 09 十月 2023 18:04:57 +0800
Subject: [PATCH] 设备台账修改
---
src/views/eam/EquipmentListOfFilesCarousel.vue | 5 +
src/views/eam/EquipmentListOfWeldingMachine.vue | 5 +
src/views/eam/EquipmentListOfProduct.vue | 5 +
src/views/eam/PrecisionParametersTemplateList.vue | 11 ++
src/views/eam/modules/equipmentNew/EquipmentModal.vue | 20 +++-
src/views/eam/modules/equipmentNew/serach/PrecisionParametersDetailList.vue | 56 ++++++-------
src/views/eam/modules/equipmentNew/EquipmentPrecisionParametersList.vue | 104 ++++++++-----------------
src/views/eam/modules/equipmentNew/serach/PrecisionParametersTemplateList.vue | 4
8 files changed, 98 insertions(+), 112 deletions(-)
diff --git a/src/views/eam/EquipmentListOfFilesCarousel.vue b/src/views/eam/EquipmentListOfFilesCarousel.vue
index cc047d7..0d38b9c 100644
--- a/src/views/eam/EquipmentListOfFilesCarousel.vue
+++ b/src/views/eam/EquipmentListOfFilesCarousel.vue
@@ -436,7 +436,7 @@
<a-tab-pane tab="璁惧绮惧害" key="2" forceRender>
<EquipmentPrecisionParametersList
:isOpen="isOpenPrecision"
- :mainId="selectedMainId" />
+ :mainId="precisionParametersTemplateId" />
</a-tab-pane>
<a-tab-pane tab="璁惧鏂囨。" key="3" forceRender>
<EquipmentDocumentList :mainId="selectedMainId" />
@@ -742,6 +742,7 @@
equipmentProcessParametersMainId: '',
equipmentDocumentMainId: '',
equipmentPrecisionParametersMainId: '',
+ precisionParametersTemplateId:'',
isOpenPrecision:true,
isOpenProcess:true,
treeData: [],
@@ -790,10 +791,12 @@
onSelectChange(selectedRowKeys, selectionRows) {
if(selectedRowKeys.length==1){
this.selectedMainId=selectedRowKeys[0]
+ this.precisionParametersTemplateId = selectionRows[0].precisionParametersTemplateId;
this.isOpenProcess = selectionRows[0].processParameters==1;
this.isOpenPrecision = selectionRows[0].precisionParameters==1;
}else{
this.selectedMainId=''
+ this.precisionParametersTemplateId = ''
}
this.selectedRowKeys = selectedRowKeys;
this.selectionRows = selectionRows;
diff --git a/src/views/eam/EquipmentListOfProduct.vue b/src/views/eam/EquipmentListOfProduct.vue
index b3fe092..d3d3de5 100644
--- a/src/views/eam/EquipmentListOfProduct.vue
+++ b/src/views/eam/EquipmentListOfProduct.vue
@@ -436,7 +436,7 @@
<a-tab-pane tab="璁惧绮惧害" key="2" forceRender>
<EquipmentPrecisionParametersList
:isOpen="isOpenPrecision"
- :mainId="selectedMainId" />
+ :mainId="precisionParametersTemplateId" />
</a-tab-pane>
<a-tab-pane tab="璁惧鏂囨。" key="3" forceRender>
<EquipmentDocumentList :mainId="selectedMainId" />
@@ -742,6 +742,7 @@
equipmentProcessParametersMainId: '',
equipmentDocumentMainId: '',
equipmentPrecisionParametersMainId: '',
+ precisionParametersTemplateId:'',
isOpenPrecision:true,
isOpenProcess:true,
treeData: [],
@@ -790,10 +791,12 @@
onSelectChange(selectedRowKeys, selectionRows) {
if(selectedRowKeys.length==1){
this.selectedMainId=selectedRowKeys[0]
+ this.precisionParametersTemplateId = selectionRows[0].precisionParametersTemplateId;
this.isOpenProcess = selectionRows[0].processParameters==1;
this.isOpenPrecision = selectionRows[0].precisionParameters==1;
}else{
this.selectedMainId=''
+ this.precisionParametersTemplateId = ''
}
this.selectedRowKeys = selectedRowKeys;
this.selectionRows = selectionRows;
diff --git a/src/views/eam/EquipmentListOfWeldingMachine.vue b/src/views/eam/EquipmentListOfWeldingMachine.vue
index 48de169..98df9f9 100644
--- a/src/views/eam/EquipmentListOfWeldingMachine.vue
+++ b/src/views/eam/EquipmentListOfWeldingMachine.vue
@@ -436,7 +436,7 @@
<a-tab-pane tab="璁惧绮惧害" key="2" forceRender>
<EquipmentPrecisionParametersList
:isOpen="isOpenPrecision"
- :mainId="selectedMainId" />
+ :mainId="precisionParametersTemplateId" />
</a-tab-pane>
<a-tab-pane tab="璁惧鏂囨。" key="3" forceRender>
<EquipmentDocumentList :mainId="selectedMainId" />
@@ -742,6 +742,7 @@
equipmentProcessParametersMainId: '',
equipmentDocumentMainId: '',
equipmentPrecisionParametersMainId: '',
+ precisionParametersTemplateId:'',
isOpenPrecision:true,
isOpenProcess:true,
treeData: [],
@@ -790,10 +791,12 @@
onSelectChange(selectedRowKeys, selectionRows) {
if(selectedRowKeys.length==1){
this.selectedMainId=selectedRowKeys[0]
+ this.precisionParametersTemplateId = selectionRows[0].precisionParametersTemplateId;
this.isOpenProcess = selectionRows[0].processParameters==1;
this.isOpenPrecision = selectionRows[0].precisionParameters==1;
}else{
this.selectedMainId=''
+ this.precisionParametersTemplateId = ''
}
this.selectedRowKeys = selectedRowKeys;
this.selectionRows = selectionRows;
diff --git a/src/views/eam/PrecisionParametersTemplateList.vue b/src/views/eam/PrecisionParametersTemplateList.vue
index 759709a..369d6f7 100644
--- a/src/views/eam/PrecisionParametersTemplateList.vue
+++ b/src/views/eam/PrecisionParametersTemplateList.vue
@@ -32,6 +32,9 @@
<div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">鏂板</a-button>
<a-button @click="handleCopy" type="primary" icon="copy" :disabled="selectedRowKeys.length!=1">澶嶅埗</a-button>
+ <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+ <a-button type="primary" icon="import">瀵煎叆</a-button>
+ </a-upload>
</div>
<!-- table鍖哄煙-begin -->
@@ -177,6 +180,7 @@
list: "/eam/precisionParametersTemplate/list",
delete: "/eam/precisionParametersTemplate/delete",
deleteBatch: "/eam/precisionParametersTemplate/deleteBatch",
+ importExcelUrl: "/eam/precisionParametersTemplate/importExcel",
},
dictOptions:{
},
@@ -274,7 +278,12 @@
record.num = '';
this.handleEdit(record);
}
- }
+ },
+ computed: {
+ importExcelUrl: function(){
+ return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+ }
+ },
}
</script>
<style scoped>
diff --git a/src/views/eam/modules/equipmentNew/EquipmentModal.vue b/src/views/eam/modules/equipmentNew/EquipmentModal.vue
index 6e9a071..45bdcc7 100644
--- a/src/views/eam/modules/equipmentNew/EquipmentModal.vue
+++ b/src/views/eam/modules/equipmentNew/EquipmentModal.vue
@@ -129,7 +129,7 @@
</a-col>
<a-col :span="6">
<a-form-model-item
- label="杞﹂棿"
+ label="宸ュ尯"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
prop="factoryModelId"
@@ -137,7 +137,7 @@
<j-dict-select-tag
allow-clear
:disabled="formDisabled"
- placeholder="璇烽�夋嫨杞﹂棿"
+ placeholder="璇烽�夋嫨宸ュ尯"
:triggerChange="true"
dictCode="mom_base_area,name,id,del_flag!='1'"
v-model="model.factoryModelId"
@@ -305,14 +305,17 @@
:wrapperCol="wrapperCol"
prop="operatingSystem"
>
- <a-input
- v-model="model.operatingSystem"
+ <j-dict-select-tag
+ allow-clear
+ placeholder="鏄惁鏈夋搷浣滅郴缁�"
:disabled="formDisabled"
- placeholder="璇疯緭鍏ユ搷浣滅郴缁�"
- ></a-input>
+ :triggerChange="true"
+ dictCode="operation_flag"
+ v-model="model.operatingSystem"
+ />
</a-form-model-item>
</a-col>
- <a-col :span="6">
+ <a-col :span="6" v-if="model.operatingSystem=='yes'">
<a-form-model-item
label="绯荤粺"
:labelCol="labelCol"
@@ -966,6 +969,9 @@
propertyStatus: [
{ required: true, message: '璇烽�夋嫨璧勪骇鐘舵��!' },
],
+ system:[
+ { required: true, message: '璇疯緭鍏ョ郴缁�!' },
+ ]
},
url: {
add: "/eam/equipment/add",
diff --git a/src/views/eam/modules/equipmentNew/EquipmentPrecisionParametersList.vue b/src/views/eam/modules/equipmentNew/EquipmentPrecisionParametersList.vue
index ae0ecd2..935def3 100644
--- a/src/views/eam/modules/equipmentNew/EquipmentPrecisionParametersList.vue
+++ b/src/views/eam/modules/equipmentNew/EquipmentPrecisionParametersList.vue
@@ -143,7 +143,7 @@
if(!this.mainId){
this.clearList()
}else{
- this.queryParam['equipmentId'] = val
+ this.queryParam['precisionParametersTemplateId'] = val
this.loadData(1);
}
}
@@ -156,78 +156,42 @@
// 琛ㄥご
columns: [
{
- title: '#',
- dataIndex: '',
- key: 'rowIndex',
- width: 60,
- align: "center",
- customRender: function (t, r, index) {
- return parseInt(index) + 1;
+ title: '#',
+ dataIndex: '',
+ key:'rowIndex',
+ width:100,
+ align:"center",
+ customRender:function (t,r,index) {
+ return parseInt(index)+1;
+ }
},
- },
- {
- title: '绮惧害鍙傛暟缂栫爜',
- dataIndex: 'precisionParametersNum',
- align: "center",
- // width:250,
- },
- {
- title: '绮惧害鍙傛暟鍚嶇О',
- dataIndex: 'precisionParametersName',
- align: "center",
- // width:250,
- },
- {
- title: '璁￠噺鍗曚綅',
- dataIndex: 'precisionParametersUnitName',
- align: "center",
- // width:250,
- },
- {
- title: '涓婇檺鍊�',
- dataIndex: 'upperLimit',
- align: "center",
- // scopedSlots: {
- // customRender: 'upperLimit'
- // },
- // width:250,
- },
- {
- title: '涓嬮檺鍊�',
- dataIndex: 'lowerLimit',
- align: "center",
- // scopedSlots: {
- // customRender: 'lowerLimit'
- // },
- // width:250,
- },
- {
- title: '瀹為檯绮惧害鍊�',
- dataIndex: 'actualValue',
- align: "center",
- // scopedSlots: {
- // customRender: 'actualValue'
- // },
- // width:250,
- },
- {
- title: '澶囨敞',
- dataIndex: 'remark',
- align: "center",
- },
- // {
- // title: '鎿嶄綔',
- // dataIndex: 'action',
- // width: 160,
- // align: "center",
- // // scopedSlots: {
- // // customRender: 'action'
- // // },
- // fixed: 'right',
- // },
+ {
+ title:'妫�楠岄」鐩悕绉�',
+ align:"center",
+ dataIndex: 'precisionParametersName',
+ width:400
+ },
+ {
+ title:'浣嶇疆',
+ align:"center",
+ dataIndex: 'precisionParametersUda1',
+ width:400
+ },
+ {
+ title:'鍏佸樊锛坢m锛�',
+ align:"center",
+ dataIndex: 'tolerance',
+ width:400
+ },
+ {
+ title:'瀹炴祴鍊�',
+ align:"center",
+ dataIndex: 'actualValue',
+ width:400
+ },
],
url: {
- list: "/eam/equipmentPrecisionParameters/list",
+ list: '/eam/precisionParametersTemplateDetail/listByPrecisionParametersTemplateId',
edit: "/eam/equipmentPrecisionParameters/edit",
submitBatch:"/eam/equipmentPrecisionParameters/submitBatch",
// delete: "/new/equipment/deleteEquipmentPrecisionParameters",
diff --git a/src/views/eam/modules/equipmentNew/serach/PrecisionParametersDetailList.vue b/src/views/eam/modules/equipmentNew/serach/PrecisionParametersDetailList.vue
index 2144e99..3c2ff31 100644
--- a/src/views/eam/modules/equipmentNew/serach/PrecisionParametersDetailList.vue
+++ b/src/views/eam/modules/equipmentNew/serach/PrecisionParametersDetailList.vue
@@ -51,36 +51,34 @@
total: 0
},
columns: [
- {
- title: '#',
- dataIndex: '',
- key: 'rowIndex',
- align: "center",
- customRender: function (t, r, index) {
- return parseInt(index) + 1;
+ {
+ title: '#',
+ dataIndex: '',
+ key:'rowIndex',
+ width:100,
+ align:"center",
+ customRender:function (t,r,index) {
+ return parseInt(index)+1;
+ }
},
- width: 50,
- },
- {
- title: '璁惧绮惧害缂栫爜',
- align: 'center',
- dataIndex: 'precisionParametersNum',
- },
- {
- title: '璁惧绮惧害鍚嶇О',
- align: 'center',
- dataIndex: 'precisionParametersName',
- },
- {
- title: '璁￠噺鍗曚綅',
- align: 'center',
- dataIndex: 'unit',
- },
- {
- title: '澶囨敞',
- align: 'center',
- dataIndex: 'remark',
- },
+ {
+ title:'妫�楠岄」鐩悕绉�',
+ align:"center",
+ dataIndex: 'precisionParametersName',
+ width:200
+ },
+ {
+ title:'浣嶇疆',
+ align:"center",
+ dataIndex: 'precisionParametersUda1',
+ width:200
+ },
+ {
+ title:'鍏佸樊锛坢m锛�',
+ align:"center",
+ dataIndex: 'tolerance',
+ width:200
+ },
],
url: {
diff --git a/src/views/eam/modules/equipmentNew/serach/PrecisionParametersTemplateList.vue b/src/views/eam/modules/equipmentNew/serach/PrecisionParametersTemplateList.vue
index 693eaef..ee558f0 100644
--- a/src/views/eam/modules/equipmentNew/serach/PrecisionParametersTemplateList.vue
+++ b/src/views/eam/modules/equipmentNew/serach/PrecisionParametersTemplateList.vue
@@ -312,7 +312,7 @@
overflow-y: hidden;
}
-/deep/ .notshow {
+ .notshow {
display: none;
}
@@ -332,7 +332,7 @@
color: #1890ff;
}
-/deep/ .frozenRowClass {
+ .frozenRowClass {
color: #c9c9c9;
}
</style>
\ No newline at end of file
--
Gitblit v1.9.3