From 59eb5746394c73b4eb7396fe695d0cdb1f0c071e Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期三, 25 十月 2023 17:04:27 +0800
Subject: [PATCH] 已经处理的问题
---
src/views/eam/modules/equipmentNew/EquipmentPrecisionParametersList.vue | 129 ++++++++++++++++++------------------------
1 files changed, 56 insertions(+), 73 deletions(-)
diff --git a/src/views/eam/modules/equipmentNew/EquipmentPrecisionParametersList.vue b/src/views/eam/modules/equipmentNew/EquipmentPrecisionParametersList.vue
index ade384d..935def3 100644
--- a/src/views/eam/modules/equipmentNew/EquipmentPrecisionParametersList.vue
+++ b/src/views/eam/modules/equipmentNew/EquipmentPrecisionParametersList.vue
@@ -22,10 +22,10 @@
@change="handleImportExcel">
<a-button type="primary" icon="import">瀵煎叆</a-button>
</a-upload> -->
- <a-dropdown v-if="selectedRowKeys.length > 0">
+ <a-dropdown v-if="selectedRowKeys.length > 0" v-has="'accountSons:add&edit&delete&submit'">
<a-menu slot="overlay">
<a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>鍒犻櫎</a-menu-item>
- <a-menu-item key="1" @click="handleSubmitBatch"><a-icon type="to-top" />鎻愪氦</a-menu-item>
+ <!-- <a-menu-item key="1" @click="handleSubmitBatch"><a-icon type="to-top" />鎻愪氦</a-menu-item> -->
</a-menu>
<a-button style="margin-left: 8px"> 鎵归噺鎿嶄綔 <a-icon type="down" /></a-button>
</a-dropdown>
@@ -51,12 +51,12 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
- <template
+ <!-- <template
v-for="col in columns"
:slot="col.dataIndex"
slot-scope='text, record, index'
- >
- <div :key="col.dataIndex">
+ > -->
+ <!-- <div :key="col.dataIndex">
<span v-if="col.dataIndex == 'remark'">
<j-ellipsis
:value="text"
@@ -68,27 +68,36 @@
v-if="col.dataIndex == 'upperLimit'"
@change="(e)=>handleChange(e, record.key, col, index)"
style="width: 100%"
+ :disabled="!isOpen"
+ title="寮�鍚簿搴﹀弬鏁扮鐞嗗悗鍙～鍐�"
/>
<a-input-number
:value="text"
v-if="col.dataIndex == 'lowerLimit'"
@change="(e)=>handleChange(e, record.key, col, index)"
style="width: 100%"
+ :disabled="!isOpen"
+ title="寮�鍚簿搴﹀弬鏁扮鐞嗗悗鍙～鍐�"
/>
<a-input-number
:value="text"
v-if="col.dataIndex == 'actualValue'"
@change="(e)=>handleChange(e, record.key, col, index)"
+ :disabled="!isOpen"
style="width: 100%"
+ title="寮�鍚簿搴﹀弬鏁扮鐞嗗悗鍙～鍐�"
/>
<span v-if="col.dataIndex == 'action'">
<a-button
type="primary"
@click="handleEdit(record)"
+ v-has="'accountSons:add&edit&delete&submit'"
+ :disabled="!isOpen"
+ title="寮�鍚簿搴﹀弬鏁扮鐞嗗悗鍙偣鍑�"
>鎻愪氦</a-button>
</span>
- </div>
- </template>
+ </div> -->
+ <!-- </template> -->
<!-- <span slot="action" slot-scope="text, record">
<a @click="handleEdit(record)">缂栬緫</a>
@@ -120,6 +129,11 @@
type:String,
default:'',
required:false
+ },
+ isOpen:{
+ type:Boolean,
+ default:true,
+ required:false
}
},
watch:{
@@ -129,7 +143,7 @@
if(!this.mainId){
this.clearList()
}else{
- this.queryParam['equipmentId'] = val
+ this.queryParam['precisionParametersTemplateId'] = val
this.loadData(1);
}
}
@@ -142,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'
+ {
+ title:'妫�楠岄」鐩悕绉�',
+ align:"center",
+ dataIndex: 'precisionParametersName',
+ width:400
},
- width:250,
- },
- {
- title: '涓嬮檺鍊�',
- dataIndex: 'lowerLimit',
- align: "center",
- scopedSlots: {
- customRender: 'lowerLimit'
+ {
+ title:'浣嶇疆',
+ align:"center",
+ dataIndex: 'precisionParametersUda1',
+ width:400
},
- width:250,
- },
- {
- title: '瀹為檯绮惧害鍊�',
- dataIndex: 'actualValue',
- align: "center",
- scopedSlots: {
- customRender: 'actualValue'
+ {
+ title:'鍏佸樊锛坢m锛�',
+ align:"center",
+ dataIndex: 'tolerance',
+ width:400
},
- width:250,
- },
- {
- title: '澶囨敞',
- dataIndex: 'remark',
- align: "center",
- },
- {
- title: '鎿嶄綔',
- dataIndex: 'action',
- width: 160,
- align: "center",
- scopedSlots: {
- customRender: 'action'
+ {
+ title:'瀹炴祴鍊�',
+ align:"center",
+ dataIndex: 'actualValue',
+ width:400
},
- fixed: 'right',
- },
],
url: {
- list: "/eam/equipmentPrecisionParameters/list",
+ list: '/eam/precisionParametersTemplateDetail/listByPrecisionParametersTemplateId',
edit: "/eam/equipmentPrecisionParameters/edit",
submitBatch:"/eam/equipmentPrecisionParameters/submitBatch",
// delete: "/new/equipment/deleteEquipmentPrecisionParameters",
@@ -325,6 +303,11 @@
this.selectionRows = selectionRows;
},
+ },
+ mounted(){
+ this.$bus.$on('loadData', (data) => {
+ this.loadData();
+ });
}
}
</script>
--
Gitblit v1.9.3