字段调整

yangys

2025-08-04 e5ced3e405d2eb5a8772ff4e01e81ed045306475

 src/views/basesetting/machine.vue

@@ -17,8 +17,8 @@
    >
      <template #menu-left>
        <el-button type="primary" size="default" icon="el-icon-circle-plus" plain @click="handleExport">导出</el-button>
        <el-button type="primary" size="default" icon="el-icon-circle-plus" plain @click="handleView">导入</el-button>
        <!-- <el-button type="primary" size="default" icon="el-icon-circle-plus" plain @click="handleAdd">新增</el-button> -->
        <!-- <el-button type="primary" size="default" icon="el-icon-circle-plus" plain @click="handleView">导入</el-button> -->
        <el-button type="primary" size="default" icon="el-icon-circle-plus" plain @click="handleAdd">新增</el-button>
      </template>
      <template #menu="scope">
        <el-button type="primary" text size="default" icon="el-icon-upload" @click.stop="handleEdit(scope.row, scope.index)">编辑</el-button>
@@ -80,7 +80,8 @@
            type: 'input',
            prop: 'keyword',
            search: true,
            hide: true
            hide: true,
            showColumn: false
          },
          {
            label: '机床编号',
@@ -133,6 +134,13 @@
            type: 'input',
            span: 12,
            dataType: 'string',
            rules: [
              {
                required: true,
                message: '请输入机床编号',
                trigger: 'blur'
              }
            ]
          },
          {
            label: '机床型号',
@@ -140,6 +148,13 @@
            type: 'input',
            span: 12,
            dataType: 'string',
            rules: [
              {
                required: true,
                message: '请输入机床型号',
                trigger: 'blur'
              }
            ]
          },
          {
            label: '机床类型',
@@ -150,7 +165,14 @@
            props: {
              label: 'dictValue',
              value: 'dictKey',
            }
            },
            rules: [
              {
                required: true,
                message: '请选择机床类型',
                trigger: 'change'
              }
            ]
          },
          {
            label: '所属机床组',
@@ -161,7 +183,14 @@
            props: {
              label: 'dictValue',
              value: 'dictKey',
            }
            },
            rules: [
              {
                required: true,
                message: '请选择所属机床组',
                trigger: 'change'
              }
            ]
          },
          {
            label: '操作员',
@@ -173,18 +202,18 @@
          {
            label: '所属组织',
            prop: 'ownerDept',
            span: 12
            span: 12,
            rules: [
              {
                required: true,
                message: '请选择所属组织',
                trigger: 'change'
              }
            ]
          },
          {
            label: '生产商',
            prop: 'manufacturer',
            type: 'input',
            span: 12,
            dataType: 'string',
          },
          {
            label: '轮询时间（小时）',
            prop: 'pollingHours',
            type: 'input',
            span: 12,
            dataType: 'string',
@@ -331,22 +360,17 @@
        var url = '/blade-mdm/machine/update';
      }
      this.loading = true;
      axios({
        url: url,
        method: 'post',
        data: obj,
      }).then(
        res => {
          this.loading = false;
          this.$message({
            type: 'success',
            message: '操作成功!',
          });
      axios({url: url,method: 'post',data: obj}).then(res => {
        this.loading = false;
        if(res,res.data.success) {
          this.editBox = false;
          this.$message({type: 'success',message: '操作成功!'});
          this.onLoad();
          done();
        }else {
          this.$message({type: 'error',message: res.data.msg});
        }
      );
        done();
      });
    },
    handleView() {

@@ -372,14 +396,14 @@
      this.loading = true;
      var obj = {
        keyword: this.search.keyword,
        machineGroupCode: this.search.machineGroupCode,
        machineGroupCode: this.search.machineGroupName,
        current: this.mypage.current,
        size: this.mypage.size,
      }
      axios({
        url: '/blade-mdm/machine/page',
        method: 'get',
        date: obj,
        params: obj,
      }).then(
        res => {
          const data = res.data.data;
@@ -409,7 +433,7 @@
    }
  },
  mounted() {
    //判断版本  0:涉密网，1:工控网；//工控网5个，涉密网4个  
    //判断版本  0:涉密网，1:工控网；//工控网5个，涉密网4个  工控网不做了
    // 工控网是/blade-mdm/system/dept/lazy-list
    // 涉密网是/blade-mdm/dept/lazy-list
    axios({url: '/blade-mdm/system/param/getValue?paramKey=networkType',method: 'get'}).then(res => {
@@ -418,7 +442,7 @@
        // }else {
        //   var aurl = "/blade-mdm/system/dept/lazy-list";
        // }
        var aurl = "/blade-mdm/dept/lazy-list";
        var aurl = "/blade-mdm/system/dept/lazy-list";
        axios({url: aurl,method: 'get'}).then(resp => {
          this.organizationTreeList = this.traversalLabelValueToTree(resp.data.data);
        })