yangys
2025-09-19 ce70bd97c7f2577f0978b39b9da1ccdd8d5b768f
src/views/basesetting/machine.vue
@@ -29,15 +29,12 @@
          <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>
              <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-edit" @click.stop="handleEdit(scope.row, scope.index)">编辑</el-button>
@@ -158,6 +155,7 @@
        labelWidth: 120,
        emptyBtn: false,
        searchSpan: 8,
        searchEnter:true,
        column: [
          {
            label: '编号/名称',
@@ -170,6 +168,10 @@
          {
            label: '机床编号',
            prop: 'code'
          },
          {
            label: '设备编号',
            prop: 'equipmentCode'
          },
          {
            label: '机床型号',
@@ -223,6 +225,20 @@
              {
                required: true,
                message: '请输入机床编号',
                trigger: 'blur'
              }
            ]
          },
          {
            label: '设备编号',
            prop: 'equipmentCode',
            type: 'input',
            span: 12,
            dataType: 'string',
            rules: [
              {
                required: true,
                message: '请输入设备编号',
                trigger: 'blur'
              }
            ]
@@ -345,7 +361,7 @@
            prop: 'sendDirExpiryHours',
            placeholder:"(小时)",
            max:24,
            min:1,
            min:0,
            type: 'number',
            span: 12,
          },
@@ -356,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',
@@ -383,9 +399,9 @@
      this.excelBox = true;
    },
    uploadAfter(res, done, loading, column) {
        //window.console.log(column);
        window.console.log('res',res);
        //console.log('res',res)
        if(res.success>0){
        if(res.failure==0 && res.success>0){
            //有成功的,关闭对话框
            this.excelBox = false;
            this.$message.success(res.message);
@@ -393,7 +409,8 @@
            //done();
        }else{
            //0成功的,仅提示
            this.$message.success(res.message);
            this.$message.info("成功"+res.success+",失败"+res.failure+":"+res.message);
            done();
        }
        
    },
@@ -486,6 +503,15 @@
        });
      });
    },
    downloadTemplate() {
      NProgress.start();
      exportBlob(
          `/blade-mdm/machine/download-template`
      ).then(res => {
          downloadXls(res.data, `机床导入模版.xlsx`);
          NProgress.done();
      });
    },
    formSubmit(params, done) {
      var obj = {...params};
      if(params.status.length == 0) {
@@ -509,6 +535,8 @@
          this.$message({type: 'error',message: res.data.msg});
        }
        done();
      }).catch(e=>{
        done();
      });
    },
    handleView() {