机床搜索回车生效

yangys

2025-08-30 498df4ec49c9469d535c494039586ff30c3b23a6

 src/views/basesetting/machine.vue

@@ -27,23 +27,25 @@
          @on-load="onLoad"
        >
          <template #menu-left>
            <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" size="default" icon="el-icon-circle-plus" plain @click="handleAdd">新增</el-button>
            <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>
              <el-button type="primary" size="default" icon="el-icon-circle-plus" plain @click="handleAdd">新增</el-button>
            </div>
          </template>
          <template #menu="scope">
            <el-button type="primary" text size="default" icon="el-icon-upload" @click.stop="handleEdit(scope.row, scope.index)">编辑</el-button>
            <el-button type="primary" text size="default" icon="el-icon-upload" @click.stop="handleDel(scope.row, scope.index)">删除</el-button>
            <el-button type="primary" text size="default" icon="el-icon-edit" @click.stop="handleEdit(scope.row, scope.index)">编辑</el-button>
            <el-button type="primary" text size="default" icon="el-icon-delete" @click.stop="handleDel(scope.row, scope.index)">删除</el-button>
            <!--
            <el-button type="primary" text size="default" icon="el-icon-upload" @click.stop="handleUp(scope.row, scope.index)">产生机床回传机构树</el-button>
            -->
          </template>

          <template #status="{ row }">
@@ -57,6 +59,11 @@
              <el-tree-select v-model="editForm.ownerDept" :data="organizationTreeList" :props="treePropsConfig"/>
            </template>
          </avue-form>
        </el-dialog>

        <el-dialog title="" append-to-body v-model="excelBox" width="555px">
            <avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter">
            </avue-form>
        </el-dialog>
      </basic-container>
    </el-col>
@@ -74,6 +81,29 @@
  data() {
    var that = this;
    return {
      excelBox: false,
      excelOption: {
          submitBtn: false,
          emptyBtn: false,
          column: [
              {
                  label: '文件导入',
                  prop: 'file',
                  type: 'upload',
                  drag: true,
                  loadText: '导入中，请稍后',
                  span: 24,
                  propsHttp: {
                      res: 'data',
                  },
                  data: {
                  },
                  tip: '',
                  action: '/blade-mdm/machine/import',
              },
          ],
      },
      excelForm: {},
      treeOption: {
        nodeKey: 'id',
        lazy: true,
@@ -129,6 +159,7 @@
        labelWidth: 120,
        emptyBtn: false,
        searchSpan: 8,
        searchEnter:true,
        column: [
          {
            label: '编号/名称',
@@ -277,7 +308,7 @@
            dataType: 'string',
          },
          {
            label: '系统控制',
            label: '控制系统',
            prop: 'controlSystem',
            type: 'select',
            span: 12,
@@ -298,11 +329,27 @@
            }]
          },
          {
            label: '程序临时目录',
            prop: 'progTempDir',
            type: 'input',
            span: 12,
            dataType: 'string',
          },
          {
            label: '程序下发目录',
            prop: 'progSendDir',
            type: 'input',
            span: 12,
            dataType: 'string',
          },
          {
            label: '下发目录保存时间',
            prop: 'sendDirExpiryHours',
            placeholder:"(小时)",
            max:24,
            min:0,
            type: 'number',
            span: 12,
          },
          {
            label: '程序回传目录',
@@ -311,13 +358,16 @@
            span: 12,
            dataType: 'string',
          },
        {
            label: '程序临时目录',
            prop: 'progTempDir',
            type: 'input',
          {
            label: '回传目录保存时间',
            prop: 'receiveDirExpiryHours',
            max:24,
            min:0,
            placeholder:"(小时)",
            type: 'number',
            span: 12,
            dataType: 'string',
          },
		      
          {
            label: '备注',
            prop: 'remark',
@@ -331,6 +381,25 @@
    };
  },
  methods: {
    importAction() {
      this.excelBox = true;
    },
    uploadAfter(res, done, loading, column) {
        window.console.log('res',res);
        //console.log('res',res)
        if(res.failure==0 && res.success>0){
            //有成功的，关闭对话框
            this.excelBox = false;
            this.$message.success(res.message);
            this.onLoad(this.page);
            //done();
        }else{
            //0成功的，仅提示
            this.$message.info("成功"+res.success+",失败"+res.failure+":"+res.message);
            done();
        }
        
    },
    handleChange(a,b,c) {
      console.log(a,b,c);
    },
@@ -418,6 +487,15 @@
          downloadXls(res.data, `导出机床${this.$dayjs().format('YYYY-MM-DD HH:mm:ss')}.xlsx`);
          NProgress.done();
        });
      });
    },
    downloadTemplate() {
      NProgress.start();
      exportBlob(
          `/blade-mdm/machine/download-template`
      ).then(res => {
          downloadXls(res.data, `机床导入模版.xlsx`);
          NProgress.done();
      });
    },
    formSubmit(params, done) {
@@ -523,4 +601,8 @@
  margin-left: 6px;
  margin-right: 6px;
}
.menuLeft {
  display: flex;
  align-items: center;
}
</style>