zhangherong
2025-03-19 f633ec85d62df8ea7ee85293df04be2866963e2d
art:设备管理-基础数据-工艺参数维护 功能修改完善
已修改3个文件
198 ■■■■ 文件已修改
src/views/eam/base/EamProcessParametersList.vue 168 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/base/modules/EamProcessParametersModal.vue 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/SysBusinessCodeRuleList.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/base/EamProcessParametersList.vue
@@ -5,18 +5,11 @@
    <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>
            </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>
@@ -24,26 +17,15 @@
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="参数分类">
              <a-input placeholder="请输入参数分类" v-model="queryParam.parameterCategory"></a-input>
              <j-dict-select-tag dict-code="process_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">
            <a-form-item label="计量单位">
              <a-input placeholder="请输入计量单位" v-model="queryParam.parameterUnit"></a-input>
            </a-form-item>
          </a-col>
          </template>
          <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>
        </a-row>
      </a-form>
    </div>
@@ -52,21 +34,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>
@@ -109,82 +98,75 @@
</template>
<script>
  import '@/assets/less/TableExpand.less'
  import EamProcessParametersModal from './modules/EamProcessParametersModal'
  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import '@/assets/less/TableExpand.less'
import EamProcessParametersModal from './modules/EamProcessParametersModal'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
  export default {
    name: "EamProcessParametersList",
    mixins:[JeecgListMixin],
    components: {
      EamProcessParametersModal
    },
    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: '参数分类',
            align:"center",
            dataIndex: 'parameterCategory'
           },
           {
            title: '计量单位',
            align:"center",
            dataIndex: 'parameterUnit'
           },
          {
            title: '操作',
            dataIndex: 'action',
            align:"center",
            scopedSlots: { customRender: 'action' },
export default {
  name: 'EamProcessParametersList',
  mixins: [JeecgListMixin],
  components: {
    EamProcessParametersModal
  },
  data() {
    return {
      description: '工序参数维护管理页面',
      // 表头
      columns: [
        {
          title: '#',
          dataIndex: '',
          key: 'rowIndex',
          width: 60,
          align: 'center',
          customRender: function(t, r, index) {
            return parseInt(index) + 1
          }
        ],
        url: {
          list: "/eam/eamProcessParameters/list",
          delete: "/eam/eamProcessParameters/delete",
          deleteBatch: "/eam/eamProcessParameters/deleteBatch",
          exportXlsUrl: "eam/eamProcessParameters/exportXls",
          importExcelUrl: "eam/eamProcessParameters/importExcel",
       },
        },
        {
          title: '参数编码',
          align: 'center',
          dataIndex: 'parameterCode'
        },
        {
          title: '参数名称',
          align: 'center',
          dataIndex: 'parameterName'
        },
        {
          title: '参数分类',
          align: 'center',
          dataIndex: 'parameterCategory_dictText'
        },
        {
          title: '计量单位',
          align: 'center',
          dataIndex: 'parameterUnit'
        },
        {
          title: '操作',
          dataIndex: 'action',
          align: 'center',
          scopedSlots: { customRender: 'action' }
        }
      ],
      url: {
        list: '/eam/processParameters/list',
        delete: '/eam/processParameters/delete',
        deleteBatch: '/eam/processParameters/deleteBatch',
        exportXlsUrl: 'eam/processParameters/exportXls',
        importExcelUrl: 'eam/processParameters/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>
src/views/eam/base/modules/EamProcessParametersModal.vue
@@ -8,26 +8,22 @@
    @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="true"/>
        </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="参数分类">
          <a-input placeholder="请输入参数分类" v-model="model.parameterCategory" />
          <j-dict-select-tag dict-code="process_parameters_category" placeholder="请选择参数分类" v-model="model.parameterCategory" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="parameterUnit" label="计量单位">
          <a-input placeholder="请输入计量单位" v-model="model.parameterUnit" />
        </a-form-model-item>
      </a-form-model>
    </a-spin>
  </j-modal>
@@ -55,10 +51,19 @@
        confirmLoading: false,
        validatorRules:{
          parameterName:[
            { required: true, message: '请输入参数名称!' }
          ],
          parameterCategory: [
            { required: true, message: '请选择参数分类!' }
          ],
          parameterUnit:[
            { required: true, message: '请输入计量单位!' }
          ]
        },
        url: {
          add: "/eam/eamProcessParameters/add",
          edit: "/eam/eamProcessParameters/edit",
          add: "/eam/processParameters/add",
          edit: "/eam/processParameters/edit",
        },
      }
    },
src/views/system/SysBusinessCodeRuleList.vue
@@ -154,11 +154,6 @@
          dataIndex: 'seqLength'
        },
        {
          title: '当前序号',
          align: 'center',
          dataIndex: 'currentNum'
        },
        {
          title: '操作',
          dataIndex: 'action',
          align: 'center',