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>
@@ -159,6 +155,7 @@
        labelWidth: 120,
        emptyBtn: false,
        searchSpan: 8,
        searchEnter:true,
        column: [
          {
            label: '编号/名称',
@@ -171,6 +168,10 @@
          {
            label: '机床编号',
            prop: 'code'
          },
          {
            label: '设备编号',
            prop: 'equipmentCode'
          },
          {
            label: '机床型号',
@@ -224,6 +225,20 @@
              {
                required: true,
                message: '请输入机床编号',
                trigger: 'blur'
              }
            ]
          },
          {
            label: '设备编号',
            prop: 'equipmentCode',
            type: 'input',
            span: 12,
            dataType: 'string',
            rules: [
              {
                required: true,
                message: '请输入设备编号',
                trigger: 'blur'
              }
            ]
@@ -346,7 +361,7 @@
            prop: 'sendDirExpiryHours',
            placeholder:"(小时)",
            max:24,
            min:1,
            min:0,
            type: 'number',
            span: 12,
          },
@@ -357,16 +372,16 @@
            span: 12,
            dataType: 'string',
          },
          {
          /*{
            label: '回传目录保存时间',
            prop: 'receiveDirExpiryHours',
             max:24,
            min:1,
            max:24,
            min:0,
            placeholder:"(小时)",
            type: 'number',
            span: 12,
          },
            */
          {
            label: '备注',
            prop: 'remark',
@@ -520,6 +535,8 @@
          this.$message({type: 'error',message: res.data.msg});
        }
        done();
      }).catch(e=>{
        done();
      });
    },
    handleView() {