From 585fb0bbd4a7bc7f8f333ecba7c5fecd2ee5cbc2 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 09:46:44 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/eam/modules/equipmentNew/EquipmentPrecisionParametersList.vue | 310 ++++++++++++++++++++++++++-------------------------
1 files changed, 159 insertions(+), 151 deletions(-)
diff --git a/src/views/eam/modules/equipmentNew/EquipmentPrecisionParametersList.vue b/src/views/eam/modules/equipmentNew/EquipmentPrecisionParametersList.vue
index ae5971d..92c48b0 100644
--- a/src/views/eam/modules/equipmentNew/EquipmentPrecisionParametersList.vue
+++ b/src/views/eam/modules/equipmentNew/EquipmentPrecisionParametersList.vue
@@ -1,8 +1,14 @@
<template>
- <a-card :bordered="false" :class="'cust-erp-sub-tab'">
+ <a-card
+ :bordered="false"
+ :class="'cust-erp-sub-tab'"
+ >
<!-- 鏌ヨ鍖哄煙 -->
<div class="table-page-search-wrapper">
- <a-form layout="inline" @keyup.enter.native="searchQuery">
+ <a-form
+ layout="inline"
+ @keyup.enter.native="searchQuery"
+ >
<a-row :gutter="24">
</a-row>
</a-form>
@@ -10,7 +16,10 @@
<!-- 鏌ヨ鍖哄煙-END -->
<!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
- <div class="table-operator" v-if="mainId">
+ <div
+ class="table-operator"
+ v-if="mainId"
+ >
<!-- <a-button @click="handleAdd" type="primary" icon="plus">鏂板</a-button> -->
<!-- <a-button type="primary" icon="download" @click="handleExportXls('璁惧绮惧害')">瀵煎嚭</a-button>
<a-upload
@@ -22,10 +31,16 @@
@change="handleImportExcel">
<a-button type="primary" icon="import">瀵煎叆</a-button>
</a-upload> -->
- <a-dropdown v-if="selectedRowKeys.length > 0" v-has="'accountSons:add&edit&delete&submit'">
+ <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="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>
<a-button style="margin-left: 8px"> 鎵归噺鎿嶄綔 <a-icon type="down" /></a-button>
</a-dropdown>
@@ -33,9 +48,15 @@
<!-- table鍖哄煙-begin -->
<div>
- <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+ <div
+ class="ant-alert ant-alert-info"
+ style="margin-bottom: 16px;"
+ >
<i class="anticon anticon-info-circle ant-alert-icon"></i> 宸查�夋嫨 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>椤�
- <a style="margin-left: 24px" @click="onClearSelected">娓呯┖</a>
+ <a
+ style="margin-left: 24px"
+ @click="onClearSelected"
+ >娓呯┖</a>
</div>
<a-table
@@ -49,14 +70,15 @@
:pagination="ipagination"
:loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
- @change="handleTableChange">
+ @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,28 +90,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>
@@ -102,145 +132,118 @@
</a-table>
</div>
- <equipmentPrecisionParameters-modal ref="modalForm" @ok="modalFormOk" :mainId="mainId"></equipmentPrecisionParameters-modal>
+ <equipmentPrecisionParameters-modal
+ ref="modalForm"
+ @ok="modalFormOk"
+ :mainId="mainId"
+ ></equipmentPrecisionParameters-modal>
</a-card>
</template>
<script>
- import { JeecgListMixin } from '@/mixins/JeecgListMixin'
- import EquipmentPrecisionParametersModal from './EquipmentPrecisionParametersModal'
- import { postAction, putAction } from '../../../../api/manage'
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import EquipmentPrecisionParametersModal from './EquipmentPrecisionParametersModal'
+import { postAction, putAction } from '../../../../api/manage'
- export default {
- name: "EquipmentPrecisionParametersList",
- mixins:[JeecgListMixin],
- components: { EquipmentPrecisionParametersModal },
- props:{
- mainId:{
- type:String,
- default:'',
- required:false
- }
+export default {
+ name: "EquipmentPrecisionParametersList",
+ mixins: [JeecgListMixin],
+ components: { EquipmentPrecisionParametersModal },
+ props: {
+ mainId: {
+ type: String,
+ default: '',
+ required: false
},
- watch:{
- mainId:{
- immediate: true,
- handler(val) {
- if(!this.mainId){
- this.clearList()
- }else{
- this.queryParam['equipmentId'] = val
- this.loadData(1);
- }
+ isOpen: {
+ type: Boolean,
+ default: true,
+ required: false
+ }
+ },
+ watch: {
+ mainId: {
+ immediate: true,
+ handler(val) {
+ if (!this.mainId) {
+ this.clearList()
+ } else {
+ this.queryParam['precisionParametersTemplateId'] = val
+ this.loadData(1);
}
}
- },
- data () {
- return {
- description: '璁惧鍙拌处绠＄悊椤甸潰',
- disableMixinCreated:true,
- // 琛ㄥご
- columns: [
+ }
+ },
+ data() {
+ return {
+ description: '璁惧鍙拌处绠＄悊椤甸潰',
+ disableMixinCreated: true,
+ // 琛ㄥご
+ columns: [
{
title: '#',
dataIndex: '',
key: 'rowIndex',
- width: 60,
+ width: 100,
align: "center",
customRender: function (t, r, index) {
return parseInt(index) + 1;
- },
+ }
},
{
- title: '绮惧害鍙傛暟缂栫爜',
- dataIndex: 'precisionParametersNum',
+ title: '妫�楠岄」鐩悕绉�',
align: "center",
- width:250,
- },
- {
- title: '绮惧害鍙傛暟鍚嶇О',
dataIndex: 'precisionParametersName',
- align: "center",
- width:250,
+ width: 400
},
{
- title: '璁￠噺鍗曚綅',
- dataIndex: 'precisionParametersUnitName',
+ title: '浣嶇疆',
align: "center",
- width:250,
+ dataIndex: 'precisionParametersUda1',
+ width: 400
},
{
- title: '涓婇檺鍊�',
- dataIndex: 'upperLimit',
+ title: '鍏佸樊锛坢m锛�',
align: "center",
- scopedSlots: {
- customRender: 'upperLimit'
- },
- width:250,
+ dataIndex: 'tolerance',
+ width: 400
},
- {
- 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',
- },
- ],
- url: {
- list: "/eam/equipmentPrecisionParameters/list",
- edit: "/eam/equipmentPrecisionParameters/edit",
- submitBatch:"/eam/equipmentPrecisionParameters/submitBatch",
- // delete: "/new/equipment/deleteEquipmentPrecisionParameters",
- // deleteBatch: "/new/equipment/deleteBatchEquipmentPrecisionParameters",
- // exportXlsUrl: "/new/equipment/exportEquipmentPrecisionParameters",
- // importUrl: "/new/equipment/importEquipmentPrecisionParameters",
- },
- dictOptions:{
- }
- }
- },
- created() {
- },
- computed: {
- importExcelUrl(){
- return `${window._CONFIG['domianURL']}/${this.url.importUrl}/${this.mainId}`;
- }
- },
- methods: {
- clearList(){
- this.dataSource=[]
- this.selectedRowKeys=[]
- this.selectionRows = []
- this.ipagination.current = 1
+ // {
+ // title:'瀹炴祴鍊�',
+ // align:"center",
+ // dataIndex: 'actualValue',
+ // width:400
+ // },
+ ],
+ url: {
+ list: '/eam/precisionParametersTemplateDetail/listByPrecisionParametersTemplateId',
+ edit: "/eam/equipmentPrecisionParameters/edit",
+ submitBatch: "/eam/equipmentPrecisionParameters/submitBatch",
+ // delete: "/new/equipment/deleteEquipmentPrecisionParameters",
+ // deleteBatch: "/new/equipment/deleteBatchEquipmentPrecisionParameters",
+ // exportXlsUrl: "/new/equipment/exportEquipmentPrecisionParameters",
+ // importUrl: "/new/equipment/importEquipmentPrecisionParameters",
},
- handleChange(value, key, column, index) {
+ dictOptions: {
+ }
+ }
+ },
+ created() {
+ },
+ computed: {
+ importExcelUrl() {
+ return `${window._CONFIG['domianURL']}/${this.url.importUrl}/${this.mainId}`;
+ }
+ },
+ methods: {
+ clearList() {
+ this.dataSource = []
+ this.selectedRowKeys = []
+ this.selectionRows = []
+ this.ipagination.current = 1
+ },
+ handleChange(value, key, column, index) {
let that = this;
const temp = [...that.dataSource];
const target = temp.filter(item => key === item.key)[index];
@@ -281,33 +284,33 @@
modalFormOk() {
this.loadData(1);
},
- handleSubmitBatch(){
- for(var i=0;i<this.selectionRows.length;i++){
- let upperLimit = this.selectionRows[i].upperLimit;
- let lowerLimit = this.selectionRows[i].lowerLimit;
- let actualValue = this.selectionRows[i].actualValue;
- if(upperLimit==null||upperLimit==undefined||upperLimit==''){
- this.$message.warning("璇峰厛濉啓閫夋嫨椤圭殑涓婇檺鍊煎啀鎻愪氦")
- return false;
- }
- if(lowerLimit==null||lowerLimit==undefined||lowerLimit==''){
- this.$message.warning("璇峰厛濉啓閫夋嫨椤圭殑涓嬮檺鍊煎啀鎻愪氦")
- return false;
- }
- if(actualValue==null||actualValue==undefined||actualValue==''){
- this.$message.warning("璇峰厛濉啓閫夋嫨椤圭殑瀹為檯鍊煎啀鎻愪氦")
- return false;
- }
- }
- let that = this;
- this.$confirm({
+ handleSubmitBatch() {
+ for (var i = 0; i < this.selectionRows.length; i++) {
+ let upperLimit = this.selectionRows[i].upperLimit;
+ let lowerLimit = this.selectionRows[i].lowerLimit;
+ let actualValue = this.selectionRows[i].actualValue;
+ if (upperLimit == null || upperLimit == undefined || upperLimit == '') {
+ this.$message.warning("璇峰厛濉啓閫夋嫨椤圭殑涓婇檺鍊煎啀鎻愪氦")
+ return false;
+ }
+ if (lowerLimit == null || lowerLimit == undefined || lowerLimit == '') {
+ this.$message.warning("璇峰厛濉啓閫夋嫨椤圭殑涓嬮檺鍊煎啀鎻愪氦")
+ return false;
+ }
+ if (actualValue == null || actualValue == undefined || actualValue == '') {
+ this.$message.warning("璇峰厛濉啓閫夋嫨椤圭殑瀹為檯鍊煎啀鎻愪氦")
+ return false;
+ }
+ }
+ let that = this;
+ this.$confirm({
title: '璁惧绮惧害纭鎻愪氦锛�',
content: '纭鎻愪氦鍚楋紒',
okText: '纭',
cancelText: '鍙栨秷',
onOk() {
- that.loading=true;
- putAction(that.url.submitBatch,that.selectionRows).then((res) => {
+ that.loading = true;
+ putAction(that.url.submitBatch, that.selectionRows).then((res) => {
if (res.success) {
that.$message.success("鎻愪氦鎴愬姛锛�")
that.loadData(1)
@@ -322,13 +325,18 @@
})
},
onSelectChange(selectedRowKeys, selectionRows) {
- this.selectedRowKeys = selectedRowKeys;
- this.selectionRows = selectionRows;
+ this.selectedRowKeys = selectedRowKeys;
+ this.selectionRows = selectionRows;
},
- }
+ },
+ mounted() {
+ this.$bus.$on('loadData', (data) => {
+ this.loadData();
+ });
}
+}
</script>
<style scoped>
- @import '~@assets/less/common.less'
+@import '~@assets/less/common.less';
</style>
--
Gitblit v1.9.3