机床增加设备编号

yangys

2025-09-19 ce70bd97c7f2577f0978b39b9da1ccdd8d5b768f

机床增加设备编号

 src/views/basesetting/machine.vue

@@ -29,11 +29,7 @@
          <template #menu-left>
            <div class="menuLeft">
              <el-button type="primary" size="default" icon="el-icon-circle-plus" plain @click="handleExport">导出</el-button>
              <!-- <el-upload :show-file-list="false" class="upload-demo"
                  action="/api/blade-mdm/machine/import"
                        :on-change="handleChange">
                <el-button type="primary" plain size="default">导入</el-button>
              </el-upload> -->
              
              <el-button type="primary" plain @click="importAction">导入</el-button>
               <el-button type="primary" plain @click="downloadTemplate">下载模板
                        </el-button>
@@ -174,6 +170,10 @@
            prop: 'code'
          },
          {
            label: '设备编号',
            prop: 'equipmentCode'
          },
          {
            label: '机床型号',
            prop: 'name',
          },
@@ -225,6 +225,20 @@
              {
                required: true,
                message: '请输入机床编号',
                trigger: 'blur'
              }
            ]
          },
          {
            label: '设备编号',
            prop: 'equipmentCode',
            type: 'input',
            span: 12,
            dataType: 'string',
            rules: [
              {
                required: true,
                message: '请输入设备编号',
                trigger: 'blur'
              }
            ]
@@ -358,7 +372,7 @@
            span: 12,
            dataType: 'string',
          },
          {
          /*{
            label: '回传目录保存时间',
            prop: 'receiveDirExpiryHours',
            max:24,
@@ -367,7 +381,7 @@
            type: 'number',
            span: 12,
          },
		      
              */
          {
            label: '备注',
            prop: 'remark',

 src/views/basesetting/produceplan.vue

@@ -270,6 +270,15 @@
                        span: 24,
                    },
                    {
                        label: '零组件名称',
                        prop: 'ljmc',
                        type: 'input',
                        search: false,
                        display: true,
                        disabled:true,
                        span: 24,
                    },
                    {
                        label: '主管工艺',
                        prop: 'zggy',
                        type: 'input',

 src/views/tasks/machinereturnfileop.vue

@@ -6,7 +6,7 @@
-->
<template>
    <basic-container>
        <avue-crud :option="option" :table-loading="loading" :data="data" v-model:page="page" v-model="form" ref="crud"
        <avue-crud :option="option" :search="query" :table-loading="loading" :data="data" v-model:page="page" v-model="form" ref="crud"
            @search-change="searchChange" @search-reset="searchReset" @current-change="currentChange"
            @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad" @selection-change="selectionChange">
            <template #menu-left>
@@ -40,7 +40,7 @@
                total: 0,
            },
            form: {},
            query: {},
            query: {status:1},
            loading: true,
            data: [],
            option: {
@@ -65,7 +65,24 @@
                    
                    {
                        label: '文件名称',
                        prop: 'name'
                        prop: 'name',
                        search:true,
                    },
                    {
                        label: '导出状态',
                        prop: 'status',
                        search:true,
                        type:'select',
                        dicData:[
                            {
                                label: '未导出',
                                value:1
                            },
                            {
                                label: '已导出',
                                value:2
                            }
                        ]
                    },
                    {
                        label: '回传机床',
@@ -144,6 +161,7 @@
                    }
                ).then(res => {
                    downloadXls(res.data, `工控网回传程序${this.$dayjs().format('YYYY-MM-DD HH:mm:ss')}.zip`);
                    this.onLoad(this.page, {});
                    NProgress.done();
                });
            });
@@ -174,15 +192,12 @@
            console.log('searchChange', params);
            params.confirmTimeBegin = params?.determineTime?.[0] || '';
            params.confirmTimeEnd = params?.determineTime?.[1] || '';
            console.log(params);
            // data = {
            //     createTimeBegin: dayjs(params.createTimeBegin).isValid() ? dayjs(params.createTimeBegin).format('YYYY-MM-DD') : '',
            //     createTimeEnd: dayjs(params.createTimeEnd).isValid() ? dayjs(params.createTimeEnd).format('YYYY-MM-DD') : '',
            //     keyword: params.keyword || ''
            // }
           
            data = {
                confirmTimeBegin: params.confirmTimeBegin,
                confirmTimeEnd: params.confirmTimeEnd,
                name: params.name,
                status: this.query.status,
            }
            this.query = data
            this.onLoad(this.page, data);
@@ -216,7 +231,6 @@
            console.log('onLoad', page, params);
            const query = {
                ...this.query,
                // category: params.category ? flowCategory(params.category) : null,
                mode: this.mode,
            };
            try {