From 9e789c498c17f0a6cd211d9d446d89f246438ac2 Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Tue, 28 May 2024 11:54:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=86=E5=A4=9A=E4=B8=AA?=
 =?UTF-8?q?=E8=A7=86=E5=9B=BE=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=8C=85=E6=8B=AC?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=B5=81=E7=A8=8B=E6=98=BE=E7=A4=BA=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F=E3=80=81oa=5FInitiate=E4=BF=AE=E6=94=B9=E3=80=81oa=5F?=
 =?UTF-8?q?flow=5Ftype=E7=BC=96=E8=BE=91=E5=92=8C=E7=B4=A2=E5=BC=95?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/oa_apply/edit.vue                 | 15 ++++++++-------
 src/views/oa_invoice_apply/detail.vue       |  2 +-
 src/views/organization/department/index.vue |  4 ++--
 src/views/permission/admin/index.vue        |  5 ++++-
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/views/oa_apply/edit.vue b/src/views/oa_apply/edit.vue
index 5a93a22..08b3335 100644
--- a/src/views/oa_apply/edit.vue
+++ b/src/views/oa_apply/edit.vue
@@ -26,6 +26,11 @@
                                 </el-date-picker>
                             </el-form-item>
                         </el-col>
+                        <el-col :span="24" class="mt-4">
+                            <el-form-item label="附件" prop="income_month">
+                                <uploadAnnex :form-data="formData"></uploadAnnex>
+                            </el-form-item>
+                        </el-col>
                     </el-row>
 
                     <el-col>
@@ -57,11 +62,7 @@
                             </el-table-column>
                         </el-table>
                     </el-col>
-                    <el-col :span="24" class="mt-4">
-                        <el-form-item label="附件" prop="income_month">
-                            <uploadAnnex :form-data="formData"></uploadAnnex>
-                        </el-form-item>
-                    </el-col>
+
                 </el-form>
             </el-card>
             <oaFlow :form-data="formData" type="5"></oaFlow>
@@ -96,7 +97,7 @@ const popupTitle = computed(() => {
 
 // 表单数据
 const formData = reactive({
-    "code": "xxx",
+    "code": "",
     "income_month": "",
     "expense_time": "",
     "detail": [
@@ -107,7 +108,7 @@ const formData = reactive({
         }
     ],
     "annex": [],
-    "flow_id": 1
+    "flow_id": ''
 });
 
 
diff --git a/src/views/oa_invoice_apply/detail.vue b/src/views/oa_invoice_apply/detail.vue
index 9aebc40..2f34612 100644
--- a/src/views/oa_invoice_apply/detail.vue
+++ b/src/views/oa_invoice_apply/detail.vue
@@ -210,7 +210,7 @@ const handCheck = async () => {
 }
 
 // 显示
-const showActionList = reactive([4, 3, 2])
+const showActionList = reactive([4, 3, 2, 10])
 
 const showTextarea = () => {
     if (showActionList.includes(formData.check_status)) return false;
diff --git a/src/views/organization/department/index.vue b/src/views/organization/department/index.vue
index 8bc8a48..2f797b7 100644
--- a/src/views/organization/department/index.vue
+++ b/src/views/organization/department/index.vue
@@ -44,9 +44,9 @@
                 <el-table-column label="更新时间" prop="create_time" min-width="180" />
                 <el-table-column label="操作" width="160" fixed="right">
                     <template #default="{ row }">
-                        <el-button v-perms="['dept.dept/add']" type="primary" link @click="handleAdd(row.id)">
+                        <!-- <el-button v-perms="['dept.dept/add']" type="primary" link @click="handleAdd(row.id)">
                             新增
-                        </el-button>
+                        </el-button> -->
                         <el-button v-perms="['dept.dept/edit']" type="primary" link @click="handleEdit(row)">
                             编辑
                         </el-button>
diff --git a/src/views/permission/admin/index.vue b/src/views/permission/admin/index.vue
index 231e531..553a620 100644
--- a/src/views/permission/admin/index.vue
+++ b/src/views/permission/admin/index.vue
@@ -56,7 +56,7 @@
                                 编辑
                             </el-button>
                             <el-button v-perms="['auth.admin/edit']" type="primary" link
-                                @click="showDialog = true, form.id = row.id">
+                                @click="showDialog = true, form.id = row.id, form.account = row.account">
                                 修改密码
                             </el-button>
                             <el-button v-if="row.root != 1" v-perms="['auth.admin/delete']" type="danger" link
@@ -76,6 +76,9 @@
         <!-- 修改密码 -->
         <el-dialog v-model="showDialog" v-if="showDialog" width="550px" title="修改密码">
             <el-form class="mb-[-16px]" :model="form" label-width="100px">
+                <el-form-item label="账号">
+                    <el-input v-model="form.account" readonly class="w-[280px]" />
+                </el-form-item>
                 <el-form-item label="密码">
                     <el-input v-model="form.password" class="w-[280px]" clearable type="password" />
                 </el-form-item>