From 6cd23d79545071411d3fd63c357262aec5cc59f4 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 19 三月 2025 13:53:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/base/EamPrecisionParametersList.vue | 154 +++++++++++++++++++++++++--------------------------
1 files changed, 76 insertions(+), 78 deletions(-)
diff --git a/src/views/eam/base/EamPrecisionParametersList.vue b/src/views/eam/base/EamPrecisionParametersList.vue
index b5df8ab..b1967a2 100644
--- a/src/views/eam/base/EamPrecisionParametersList.vue
+++ b/src/views/eam/base/EamPrecisionParametersList.vue
@@ -5,32 +5,25 @@
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
-
- <a-col :xl="6" :lg="7" :md="8" :sm="24">
- <a-form-item label="鍒犻櫎鏍囪">
- <a-input placeholder="璇疯緭鍏ュ垹闄ゆ爣璁�" v-model="queryParam.delFlag"></a-input>
- </a-form-item>
- </a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="鍙傛暟缂栫爜">
- <a-input placeholder="璇疯緭鍏ュ弬鏁扮紪鐮�" v-model="queryParam.parameterCode"></a-input>
+ <j-input placeholder="璇疯緭鍏ュ弬鏁扮紪鐮�" v-model="queryParam.parameterCode"></j-input>
</a-form-item>
</a-col>
- <template v-if="toggleSearchStatus">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="妫�娴嬮」鐩�">
- <a-input placeholder="璇疯緭鍏ユ娴嬮」鐩�" v-model="queryParam.parameterName"></a-input>
+ <j-input placeholder="璇疯緭鍏ユ娴嬮」鐩�" v-model="queryParam.parameterName"></j-input>
</a-form-item>
</a-col>
- </template>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="鍙傛暟鍒嗙被">
+ <j-dict-select-tag dict-code="precision_parameters_category" placeholder="璇烽�夋嫨鍙傛暟鍒嗙被" v-model="queryParam.parameterCategory"></j-dict-select-tag>
+ </a-form-item>
+ </a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
- <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">閲嶇疆</a-button>
- <a @click="handleToggleSearch" style="margin-left: 8px">
- {{ toggleSearchStatus ? '鏀惰捣' : '灞曞紑' }}
- <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
- </a>
+ <a-button type="info" @click="searchReset" icon="reload" style="margin-left: 8px">閲嶇疆</a-button>
</span>
</a-col>
@@ -42,21 +35,28 @@
<div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">鏂板</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('绮惧害鍙傛暟缁存姢')">瀵煎嚭</a-button>
- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+ <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
+ @change="handleImportExcel">
<a-button type="primary" icon="import">瀵煎叆</a-button>
</a-upload>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay">
- <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>鍒犻櫎</a-menu-item>
+ <a-menu-item key="1" @click="batchDel">
+ <a-icon type="delete" />
+ 鍒犻櫎
+ </a-menu-item>
</a-menu>
- <a-button style="margin-left: 8px"> 鎵归噺鎿嶄綔 <a-icon type="down" /></a-button>
+ <a-button style="margin-left: 8px"> 鎵归噺鎿嶄綔
+ <a-icon type="down" />
+ </a-button>
</a-dropdown>
</div>
<!-- table鍖哄煙-begin -->
<div>
<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>椤�
+ <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>
</div>
@@ -99,72 +99,70 @@
</template>
<script>
- import '@/assets/less/TableExpand.less'
- import EamPrecisionParametersModal from './modules/EamPrecisionParametersModal'
- import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import '@/assets/less/TableExpand.less'
+import EamPrecisionParametersModal from './modules/EamPrecisionParametersModal'
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
- export default {
- name: "EamPrecisionParametersList",
- mixins:[JeecgListMixin],
- components: {
- EamPrecisionParametersModal
- },
- data () {
- return {
- description: '绮惧害鍙傛暟缁存姢绠＄悊椤甸潰',
- // 琛ㄥご
- columns: [
- {
- title: '#',
- dataIndex: '',
- key:'rowIndex',
- width:60,
- align:"center",
- customRender:function (t,r,index) {
- return parseInt(index)+1;
- }
- },
- {
- title: '鍒犻櫎鏍囪',
- align:"center",
- dataIndex: 'delFlag'
- },
- {
- title: '鍙傛暟缂栫爜',
- align:"center",
- dataIndex: 'parameterCode'
- },
- {
- title: '妫�娴嬮」鐩�',
- align:"center",
- dataIndex: 'parameterName'
- },
- {
- title: '鎿嶄綔',
- dataIndex: 'action',
- align:"center",
- scopedSlots: { customRender: 'action' },
+export default {
+ name: 'EamPrecisionParametersList',
+ mixins: [JeecgListMixin],
+ components: {
+ EamPrecisionParametersModal
+ },
+ data() {
+ return {
+ description: '绮惧害鍙傛暟缁存姢绠＄悊椤甸潰',
+ // 琛ㄥご
+ columns: [
+ {
+ title: '#',
+ dataIndex: '',
+ key: 'rowIndex',
+ width: 60,
+ align: 'center',
+ customRender: function(t, r, index) {
+ return parseInt(index) + 1
}
- ],
- url: {
- list: "/eam/eamPrecisionParameters/list",
- delete: "/eam/eamPrecisionParameters/delete",
- deleteBatch: "/eam/eamPrecisionParameters/deleteBatch",
- exportXlsUrl: "eam/eamPrecisionParameters/exportXls",
- importExcelUrl: "eam/eamPrecisionParameters/importExcel",
- },
+ },
+ {
+ title: '鍙傛暟缂栫爜',
+ align: 'center',
+ dataIndex: 'parameterCode'
+ },
+ {
+ title: '妫�娴嬮」鐩�',
+ align: 'center',
+ dataIndex: 'parameterName'
+ },
+ {
+ title: '鍙傛暟鍒嗙被',
+ align: 'center',
+ dataIndex: 'parameterCategory_dictText'
+ },
+ {
+ title: '鎿嶄綔',
+ dataIndex: 'action',
+ align: 'center',
+ scopedSlots: { customRender: 'action' }
+ }
+ ],
+ url: {
+ list: '/eam/precisionParameters/list',
+ delete: '/eam/precisionParameters/delete',
+ deleteBatch: '/eam/precisionParameters/deleteBatch',
+ exportXlsUrl: 'eam/precisionParameters/exportXls',
+ importExcelUrl: 'eam/precisionParameters/importExcel'
+ }
}
},
computed: {
- importExcelUrl: function(){
- return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+ importExcelUrl: function() {
+ return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
}
},
- methods: {
-
- }
- }
+ methods: {}
+}
</script>
<style scoped>
- @import '~@assets/less/common.less';
+@import '~@assets/less/common.less';
</style>
\ No newline at end of file
--
Gitblit v1.9.3