From b3e843bd9a6524cc5a57961cb41954e85957ff3c Mon Sep 17 00:00:00 2001
From: 祖安之光 <11848914+light-of-zuan@user.noreply.gitee.com>
Date: 星期三, 09 七月 2025 09:28:55 +0800
Subject: [PATCH] 修改新增
---
src/views/build/conpanyFunctionConsult/digitalFileDep/otherIntellFile/index.vue | 4 ++--
src/views/build/conpanyFunctionConsult/orgStructure/departManage/components/departDialog.vue | 36 ++++++++++++++++++++++++------------
2 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/src/views/build/conpanyFunctionConsult/digitalFileDep/otherIntellFile/index.vue b/src/views/build/conpanyFunctionConsult/digitalFileDep/otherIntellFile/index.vue
index d102607..a8eb2a0 100644
--- a/src/views/build/conpanyFunctionConsult/digitalFileDep/otherIntellFile/index.vue
+++ b/src/views/build/conpanyFunctionConsult/digitalFileDep/otherIntellFile/index.vue
@@ -111,9 +111,9 @@
try {
// 1. 获取文件
const response = await fetch(import.meta.env.VITE_APP_BASE_API + '/' + path);
- const arrayBuffer = await response.arrayBuffer();
+ const arrayBuffer = await response.arrayBuffer()
// 2. 创建新窗口
- const win = window.open('', '_blank');
+ const win = window.open('', '_blank')
win.document.write(`
<!DOCTYPE html>
<html>
diff --git a/src/views/build/conpanyFunctionConsult/orgStructure/departManage/components/departDialog.vue b/src/views/build/conpanyFunctionConsult/orgStructure/departManage/components/departDialog.vue
index 581774d..7a53bdf 100644
--- a/src/views/build/conpanyFunctionConsult/orgStructure/departManage/components/departDialog.vue
+++ b/src/views/build/conpanyFunctionConsult/orgStructure/departManage/components/departDialog.vue
@@ -9,16 +9,25 @@
:close-on-click-modal="false"
>
<el-form :model="state.form" size="default" ref="superRef" :rules="state.formRules" label-width="150px">
- <el-form-item v-if="state.isAdmin" label="企业：" prop="companyId">
- <el-select v-model="state.form.companyId" placeholder="请选择" clearable @change="getDeptList()">
- <el-option
- v-for="item in state.companyList"
- :key="item.id"
- :label="item.name"
- :value="item.id">
- </el-option>
- </el-select>
- </el-form-item>
+ <el-row>
+ <el-col :span="12" v-if="state.isAdmin" >
+ <el-form-item label="企业：" prop="companyId">
+ <el-select v-model="state.form.companyId" placeholder="请选择" clearable @change="getDeptList()">
+ <el-option
+ v-for="item in state.companyList"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="排序:" prop="orderNum">
+ <el-input v-model.number.trim="state.form.orderNum" type="number" :disabled="state.title =='查看'" placeholder="排序"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
<el-form-item label="部门名称:" prop="deptName">
<el-input v-model.trim="state.form.deptName" :disabled="state.title =='查看'" placeholder="部门名称"></el-input>
</el-form-item>
@@ -105,7 +114,8 @@
delCaluseIds: [],
companyId: null,
responsType: 1,
- childDeptIds: []
+ childDeptIds: [],
+ orderNum: 0
},
isAdmin: false,
companyList: [],
@@ -116,6 +126,7 @@
formRules:{
companyId: [{ required: true, message: '请选择企业', trigger: 'blur' }],
deptName: [{ required: true, message: '请输入部门名称', trigger: 'blur' }],
+ orderNum: [{ required: true, message: '请输入排序', trigger: 'blur' }]
// leaderUserId: [{ required: true, message: '请选择负责人', trigger: 'blur' }],
// parentId: [{ required: true, message: '请选择负责部门', trigger: 'blur' }],
// caluseVO1List: [{ required: true, message: '请选择涉及条款', trigger: 'blur' }],
@@ -227,7 +238,8 @@
delCaluseIds: [],
companyId: null,
responsType: 1,
- childDeptIds: []
+ childDeptIds: [],
+ orderNum: 0
}
superRef.value.clearValidate();
--
Gitblit v1.9.2