1

李喆(开发组)

2025-08-04 e4ffdc74b58bcca7de4b1b05f589444c493d9b01

1

 src/views/basesetting/machine.vue

@@ -34,7 +34,7 @@
    <el-dialog :title="machineTitle" append-to-body v-model="editBox" width="60%">
      <avue-form ref="editFormModal1" :option="editFormModal" v-model="editForm" @submit="formSubmit" @resetForm="resetForm">
        <template #ownerDept="{}">
          <el-tree-select v-model="editForm.ownerDept" :data="organizationTreeList"/>
          <el-tree-select v-model="editForm.ownerDept" :data="organizationTreeList" :props="treePropsConfig"/>
        </template>
      </avue-form>
    </el-dialog>
@@ -51,6 +51,11 @@
  data() {
    var that = this;
    return {
      treePropsConfig: {
        value:  'id',
        label: 'title',
        children: 'children'
      },
      organizationTreeList: [],
      machineTitle: "新增",
      isAdd: true,
@@ -202,12 +207,13 @@
          {
            label: '所属组织',
            prop: 'ownerDept',
            type: 'tree',
            span: 12,
            rules: [
              {
                required: true,
                message: '请选择所属组织',
                trigger: 'change'
                trigger: 'click'
              }
            ]
          },
@@ -266,6 +272,17 @@
    };
  },
  methods: {
    initData(tenantId) {
      axios({
        url: 'blade-system/dept/tree',
        method: 'get'
      }).then(
        res => {
          //const column = this.findObject(this.option.column, 'parentId');
          //column.dicData = res.data.data;
        }
      );
    },
    handleAdd() {
      this.machineTitle = "新增";
      this.isAdd = true;
@@ -432,22 +449,11 @@
      });
    }
  },
  mounted() {
    //判断版本  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 => {
        // if(res.data.data === "0") {
        //   var aurl = "/blade-mdm/dept/lazy-list";
        // }else {
        //   var aurl = "/blade-mdm/system/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);
        })
      }
    );
  mounted() { 
    //所属组织 /api/blade-system/dept/tree
    axios({url: '/blade-system/dept/tree',method: 'get'}).then(resp => {
      this.organizationTreeList = this.traversalLabelValueToTree(resp.data.data);
    })
  }
};
</script>

 src/views/flow/todolist.vue

@@ -9,8 +9,7 @@
                </el-button>
            </template>
            <template #menu="scope">
                <el-button type="primary" text size="default" v-if="permission.flow_model_update"
                    @click.stop="handleAction(scope.row, scope.index)">审批
                <el-button type="primary" text size="default" @click.stop="handleAction(scope.row, scope.index)">审批
                </el-button>
            </template>
        </avue-crud>
@@ -44,6 +43,7 @@
    },
    data() {
        return {
            
            applist: [],
            assigneeData: [],
            row: {},