From caa0dd36329a2c8020c7dae159ee3990da4acbc1 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 19 三月 2025 13:52:54 +0800
Subject: [PATCH] art:设备管理-基础数据-精度参数维护 功能修改完善
---
src/views/eam/base/EamPrecisionParametersList.vue | 154 ++++++++++++-------------
src/views/eam/base/EamProcessParametersList.vue | 4
src/views/eam/base/modules/EamPrecisionParametersModal.vue | 171 ++++++++++++++--------------
3 files changed, 165 insertions(+), 164 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
diff --git a/src/views/eam/base/EamProcessParametersList.vue b/src/views/eam/base/EamProcessParametersList.vue
index 381a9bd..ede4816 100644
--- a/src/views/eam/base/EamProcessParametersList.vue
+++ b/src/views/eam/base/EamProcessParametersList.vue
@@ -7,12 +7,12 @@
<a-row :gutter="24">
<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>
<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>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
diff --git a/src/views/eam/base/modules/EamPrecisionParametersModal.vue b/src/views/eam/base/modules/EamPrecisionParametersModal.vue
index 4ce96f6..1965539 100644
--- a/src/views/eam/base/modules/EamPrecisionParametersModal.vue
+++ b/src/views/eam/base/modules/EamPrecisionParametersModal.vue
@@ -8,108 +8,111 @@
@ok="handleOk"
@cancel="handleCancel"
cancelText="鍏抽棴">
-
+
<a-spin :spinning="confirmLoading">
<a-form-model ref="form" :model="model" :rules="validatorRules">
-
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="delFlag" label="鍒犻櫎鏍囪">
- <a-input-number v-model="model.delFlag"/>
- </a-form-model-item>
<a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="parameterCode" label="鍙傛暟缂栫爜">
- <a-input placeholder="璇疯緭鍏ュ弬鏁扮紪鐮�" v-model="model.parameterCode" />
+ <a-input placeholder="鍙傛暟缂栫爜鑷姩鐢熸垚" v-model="model.parameterCode" disabled />
</a-form-model-item>
<a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="parameterName" label="妫�娴嬮」鐩�">
<a-input placeholder="璇疯緭鍏ユ娴嬮」鐩�" v-model="model.parameterName" />
</a-form-model-item>
-
+ <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="parameterCategory" label="鍙傛暟鍒嗙被">
+ <j-dict-select-tag dict-code="precision_parameters_category" placeholder="璇烽�夋嫨鍙傛暟鍒嗙被"
+ v-model="model.parameterCategory"></j-dict-select-tag>
+ </a-form-model-item>
</a-form-model>
</a-spin>
</j-modal>
</template>
<script>
- import { httpAction } from '@/api/manage'
- import moment from "moment"
+import { httpAction } from '@/api/manage'
- export default {
- name: "EamPrecisionParametersModal",
- data () {
- return {
- title:"鎿嶄綔",
- visible: false,
- model: {},
- labelCol: {
- xs: { span: 24 },
- sm: { span: 5 },
- },
- wrapperCol: {
- xs: { span: 24 },
- sm: { span: 16 },
- },
+export default {
+ name: 'EamPrecisionParametersModal',
+ data() {
+ return {
+ title: '鎿嶄綔',
+ visible: false,
+ model: {},
+ labelCol: {
+ xs: { span: 24 },
+ sm: { span: 5 }
+ },
+ wrapperCol: {
+ xs: { span: 24 },
+ sm: { span: 16 }
+ },
- confirmLoading: false,
- validatorRules:{
- },
- url: {
- add: "/eam/eamPrecisionParameters/add",
- edit: "/eam/eamPrecisionParameters/edit",
- },
+ confirmLoading: false,
+ validatorRules: {
+ parameterName:[
+ { required: true, message: '璇疯緭鍏ュ弬鏁板悕绉�!' }
+ ],
+ parameterCategory: [
+ { required: true, message: '璇烽�夋嫨鍙傛暟鍒嗙被!' }
+ ],
+ },
+ url: {
+ add: '/eam/precisionParameters/add',
+ edit: '/eam/precisionParameters/edit'
}
- },
- created () {
- },
- methods: {
- add () {
- //鍒濆鍖栭粯璁ゅ��
- this.edit({});
- },
- edit (record) {
- this.model = Object.assign({}, record);
- this.visible = true;
- },
- close () {
- this.$emit('close');
- this.visible = false;
- this.$refs.form.clearValidate();
- },
- handleOk () {
- const that = this;
- // 瑙﹀彂琛ㄥ崟楠岃瘉
- this.$refs.form.validate(valid => {
- if (valid) {
- that.confirmLoading = true;
- let httpurl = '';
- let method = '';
- if(!this.model.id){
- httpurl+=this.url.add;
- method = 'post';
- }else{
- httpurl+=this.url.edit;
- method = 'put';
- }
- httpAction(httpurl,this.model,method).then((res)=>{
- if(res.success){
- that.$message.success(res.message);
- that.$emit('ok');
- }else{
- that.$message.warning(res.message);
- }
- }).finally(() => {
- that.confirmLoading = false;
- that.close();
- })
- }else{
- return false;
- }
- })
- },
- handleCancel () {
- this.close()
- },
-
-
}
+ },
+ created() {
+ },
+ methods: {
+ add() {
+ //鍒濆鍖栭粯璁ゅ��
+ this.edit({})
+ },
+ edit(record) {
+ this.model = Object.assign({}, record)
+ this.visible = true
+ },
+ close() {
+ this.$emit('close')
+ this.visible = false
+ this.$refs.form.clearValidate()
+ },
+ handleOk() {
+ const that = this
+ // 瑙﹀彂琛ㄥ崟楠岃瘉
+ this.$refs.form.validate(valid => {
+ if (valid) {
+ that.confirmLoading = true
+ let httpurl = ''
+ let method = ''
+ if (!this.model.id) {
+ httpurl += this.url.add
+ method = 'post'
+ } else {
+ httpurl += this.url.edit
+ method = 'put'
+ }
+ httpAction(httpurl, this.model, method).then((res) => {
+ if (res.success) {
+ that.$message.success(res.message)
+ that.$emit('ok')
+ } else {
+ that.$message.warning(res.message)
+ }
+ }).finally(() => {
+ that.confirmLoading = false
+ that.close()
+ })
+ } else {
+ return false
+ }
+ })
+ },
+ handleCancel() {
+ this.close()
+ }
+
}
+}
</script>
<style lang="less" scoped>
--
Gitblit v1.9.3