From b24685f76308fd28b1427aa10b28200680fcab47 Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Tue, 28 May 2024 14:20:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=A4=9A=E4=B8=AA=E8=A7=86?=
 =?UTF-8?q?=E5=9B=BE=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=8C=85=E6=8B=AC=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E6=B5=81=E7=A8=8B=E6=98=BE=E7=A4=BA=E6=96=B9=E5=BC=8F?=
 =?UTF-8?q?=E3=80=81oa=5FInitiate=E4=BF=AE=E6=94=B9=E3=80=81oa=5Fflow=5Fty?=
 =?UTF-8?q?pe=E7=BC=96=E8=BE=91=E5=92=8C=E7=B4=A2=E5=BC=95=E9=A1=B5?=
 =?UTF-8?q?=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/index.vue               | 27 ++++++++++-------
 src/views/oa_copy_to_me/index.vue          | 23 +++++++++-----
 src/views/oa_flow/edit.vue                 | 12 ++++----
 src/views/oa_myDeal/index.vue              | 23 +++++++++-----
 src/views/oa_transfe/index.vue             | 35 ++++++++++++----------
 src/views/organization/department/edit.vue |  7 +++++
 src/views/permission/admin/edit.vue        |  4 +--
 7 files changed, 83 insertions(+), 48 deletions(-)

diff --git a/src/views/oa_apply/index.vue b/src/views/oa_apply/index.vue
index cd85ef2..7c92244 100644
--- a/src/views/oa_apply/index.vue
+++ b/src/views/oa_apply/index.vue
@@ -36,24 +36,31 @@
                 </template>
                 新增
             </el-button>
-            <el-button v-perms="['works.rlzy.oa_personal_quit/delete']" :disabled="!selectData.length"
+            <!-- <el-button v-perms="['works.rlzy.oa_personal_quit/delete']" :disabled="!selectData.length"
                 @click="handleDelete(selectData)">
                 删除
-            </el-button>
+            </el-button> -->
             <div class="mt-4">
                 <el-table :data="pager.lists" @selection-change="handleSelectionChange">
-                    <el-table-column type="selection" width="55" />
-                    <el-table-column label="报销总金额" prop="total_amount" show-overflow-tooltip />
+                    <el-table-column label="报销总金额(元)" prop="total_amount" show-overflow-tooltip />
                     <el-table-column label="状态" prop="check_status_text" show-overflow-tooltip />
-                    <el-table-column label="报销人" prop="check_admin_users" show-overflow-tooltip />
-                    <el-table-column label="报销部门" prop="dept_name" show-overflow-tooltip />
-                    <el-table-column label="报销保证编号" prop="" show-overflow-tooltip />
+                    <el-table-column label="报销人" prop="user_name" show-overflow-tooltip />
+                    <el-table-column label="报销部门" prop="dept_name" show-overflow-tooltip>
+                        <template #default="{ row }">
+                            {{ row.dept_name || '全公司' }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="报销保证编号" prop="code" show-overflow-tooltip />
                     <el-table-column label="原始单据日期" prop="expense_time" show-overflow-tooltip />
                     <el-table-column label="入账月份" prop="income_month" show-overflow-tooltip />
                     <el-table-column label="录入时间" prop="create_time" show-overflow-tooltip />
-                    <el-table-column label="当前审核人" prop="remark" show-overflow-tooltip />
-                    <el-table-column label="打款人" prop="" show-overflow-tooltip />
-                    <el-table-column label="打款确认时间" prop="" show-overflow-tooltip />
+                    <el-table-column label="当前审核人" prop="check_admin_users" show-overflow-tooltip>
+                        <template #default="{ row }">
+                            {{ row.check_admin_users || '审核结束' }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="打款人" prop="pay_admin_name" show-overflow-tooltip />
+                    <el-table-column label="打款确认时间" prop="pay_time" show-overflow-tooltip />
                     <el-table-column label="操作" width="120" fixed="right">
                         <template #default="{ row }">
                             <el-button type="primary" link @click="handDetail(row.id)">
diff --git a/src/views/oa_copy_to_me/index.vue b/src/views/oa_copy_to_me/index.vue
index 6f5f7f6..e09a8b6 100644
--- a/src/views/oa_copy_to_me/index.vue
+++ b/src/views/oa_copy_to_me/index.vue
@@ -21,18 +21,25 @@
         <el-card class="!border-none" v-loading="pager.loading" shadow="never">
             <div class="mt-4">
                 <el-table :data="pager.lists" @selection-change="handleSelectionChange">
-                    <el-table-column type="selection" width="55" />
-                    <el-table-column label="报销总金额" prop="total_amount" show-overflow-tooltip />
+                    <el-table-column label="报销总金额(元)" prop="total_amount" show-overflow-tooltip />
                     <el-table-column label="状态" prop="check_status_text" show-overflow-tooltip />
-                    <el-table-column label="报销人" prop="check_admin_users" show-overflow-tooltip />
-                    <el-table-column label="报销部门" prop="dept_name" show-overflow-tooltip />
-                    <el-table-column label="报销保证编号" prop="" show-overflow-tooltip />
+                    <el-table-column label="报销人" prop="user_name" show-overflow-tooltip />
+                    <el-table-column label="报销部门" prop="dept_name" show-overflow-tooltip>
+                        <template #default="{ row }">
+                            {{ row.dept_name || '全公司' }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="报销保证编号" prop="code" show-overflow-tooltip />
                     <el-table-column label="原始单据日期" prop="expense_time" show-overflow-tooltip />
                     <el-table-column label="入账月份" prop="income_month" show-overflow-tooltip />
                     <el-table-column label="录入时间" prop="create_time" show-overflow-tooltip />
-                    <el-table-column label="当前审核人" prop="remark" show-overflow-tooltip />
-                    <el-table-column label="打款人" prop="" show-overflow-tooltip />
-                    <el-table-column label="打款确认时间" prop="" show-overflow-tooltip />
+                    <el-table-column label="当前审核人" prop="check_admin_users" show-overflow-tooltip>
+                        <template #default="{ row }">
+                            {{ row.check_admin_users || '审核结束' }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="打款人" prop="pay_admin_name" show-overflow-tooltip />
+                    <el-table-column label="打款确认时间" prop="pay_time" show-overflow-tooltip />
                     <el-table-column label="操作" width="120" fixed="right">
                         <template #default="{ row }">
                             <el-button type="primary" link @click="handDetail(row.id)">
diff --git a/src/views/oa_flow/edit.vue b/src/views/oa_flow/edit.vue
index 5b9bf14..e03864a 100644
--- a/src/views/oa_flow/edit.vue
+++ b/src/views/oa_flow/edit.vue
@@ -257,11 +257,13 @@ const handleSubmit = async () => {
     let data = { ...formData }
     data.department_ids = data.department_ids.join(",")
     data.copy_uids = formData.copy_uids.map(item => item.id).join(',')
-    data.flow_list.forEach(item => {
-        if (Array.isArray(item.flow_uids)) {
-            item.flow_uids = item.flow_uids.map(item => item.id).join(',')
-        }
-    })
+    if (data.flow_list) {
+        data.flow_list?.forEach(item => {
+            if (Array.isArray(item.flow_uids)) {
+                item.flow_uids = item.flow_uids.map(item => item.id).join(',')
+            }
+        })
+    }
     mode.value == "edit"
         ? await apiOaFlowEdit(data)
         : await apiOaFlowAdd(data);
diff --git a/src/views/oa_myDeal/index.vue b/src/views/oa_myDeal/index.vue
index e9cf712..e744c41 100644
--- a/src/views/oa_myDeal/index.vue
+++ b/src/views/oa_myDeal/index.vue
@@ -20,17 +20,26 @@
             <div class="mt-4">
                 <el-table :data="pager.lists" @selection-change="handleSelectionChange">
                     <el-table-column type="selection" width="55" />
-                    <el-table-column label="报销总金额" prop="total_amount" show-overflow-tooltip />
+                    <el-table-column label="报销总金额(元)" prop="total_amount" show-overflow-tooltip />
                     <el-table-column label="状态" prop="check_status_text" show-overflow-tooltip />
-                    <el-table-column label="报销人" prop="check_admin_users" show-overflow-tooltip />
-                    <el-table-column label="报销部门" prop="dept_name" show-overflow-tooltip />
-                    <el-table-column label="报销保证编号" prop="" show-overflow-tooltip />
+                    <el-table-column label="报销人" prop="user_name" show-overflow-tooltip />
+                    <el-table-column label="报销部门" prop="dept_name" show-overflow-tooltip>
+                        <template #default="{ row }">
+                            {{ row.dept_name || '全公司' }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="报销保证编号" prop="code" show-overflow-tooltip />
                     <el-table-column label="原始单据日期" prop="expense_time" show-overflow-tooltip />
                     <el-table-column label="入账月份" prop="income_month" show-overflow-tooltip />
                     <el-table-column label="录入时间" prop="create_time" show-overflow-tooltip />
-                    <el-table-column label="当前审核人" prop="remark" show-overflow-tooltip />
-                    <el-table-column label="打款人" prop="" show-overflow-tooltip />
-                    <el-table-column label="打款确认时间" prop="" show-overflow-tooltip />
+                    <el-table-column label="当前审核人" prop="check_admin_users" show-overflow-tooltip>
+                        <template #default="{ row }">
+                            {{ row.check_admin_users || '审核结束' }}
+                        </template>
+                    </el-table-column>
+
+                    <el-table-column label="打款人" prop="pay_admin_name" show-overflow-tooltip />
+                    <el-table-column label="打款确认时间" prop="pay_time" show-overflow-tooltip />
                     <el-table-column label="操作" width="120" fixed="right">
                         <template #default="{ row }">
                             <el-button type="primary" link @click="handDetail(row.id)">
diff --git a/src/views/oa_transfe/index.vue b/src/views/oa_transfe/index.vue
index 3538bf8..b7fae8d 100644
--- a/src/views/oa_transfe/index.vue
+++ b/src/views/oa_transfe/index.vue
@@ -27,24 +27,31 @@
         <el-card class="!border-none" v-loading="pager.loading" shadow="never">
             <div class="mt-4">
                 <el-table :data="pager.lists" @selection-change="handleSelectionChange">
-                    <el-table-column type="selection" width="55" />
-                    <el-table-column label="报销总金额" prop="total_amount" show-overflow-tooltip />
+                    <el-table-column label="报销总金额(元)" prop="total_amount" show-overflow-tooltip />
                     <el-table-column label="状态" prop="check_status_text" show-overflow-tooltip />
-                    <el-table-column label="报销人" prop="check_admin_users" show-overflow-tooltip />
-                    <el-table-column label="报销部门" prop="dept_name" show-overflow-tooltip />
-                    <el-table-column label="报销保证编号" prop="" show-overflow-tooltip />
+                    <el-table-column label="报销人" prop="user_name" show-overflow-tooltip />
+                    <el-table-column label="报销部门" prop="dept_name" show-overflow-tooltip>
+                        <template #default="{ row }">
+                            {{ row.dept_name || '全公司' }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="报销保证编号" prop="code" show-overflow-tooltip />
                     <el-table-column label="原始单据日期" prop="expense_time" show-overflow-tooltip />
                     <el-table-column label="入账月份" prop="income_month" show-overflow-tooltip />
                     <el-table-column label="录入时间" prop="create_time" show-overflow-tooltip />
-                    <el-table-column label="当前审核人" prop="remark" show-overflow-tooltip />
-                    <el-table-column label="打款人" prop="" show-overflow-tooltip />
-                    <el-table-column label="打款确认时间" prop="" show-overflow-tooltip />
-                    <el-table-column label="操作" width="120" fixed="right">
+                    <el-table-column label="当前审核人" prop="check_admin_users" show-overflow-tooltip>
+                        <template #default="{ row }">
+                            {{ row.check_admin_users || '审核结束' }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="打款人" prop="pay_admin_name" show-overflow-tooltip />
+                    <el-table-column label="打款确认时间" prop="pay_time" show-overflow-tooltip />
+                    <el-table-column label="操作" width="170" fixed="right">
                         <template #default="{ row }">
                             <el-button link @click="handDetail(row.id)">
                                 详情
                             </el-button>
-                            <el-button type="primary" link @click="handPayment(row.id)" v-if="row.check_status != 2">
+                            <el-button type="primary" link @click="handPayment(row.id)">
                                 设置打款
                             </el-button>
                         </template>
@@ -100,11 +107,6 @@ const { pager, getLists, resetParams, resetPage } = usePaging({
     params: queryParams
 })
 
-
-
-// 编辑
-
-
 const handDetail = async (id: any) => {
     let res = await apiExpenseDetail({ id })
     showDetail.value = true
@@ -114,7 +116,8 @@ const handDetail = async (id: any) => {
 }
 
 const handPayment = async (id: any) => {
-    let res = await apiExpensePayment({ id })
+    await feedback.confirm('确定设置打款吗？')
+    await apiExpensePayment({ id })
     getLists()
 
 }
diff --git a/src/views/organization/department/edit.vue b/src/views/organization/department/edit.vue
index a722964..76b9bc7 100644
--- a/src/views/organization/department/edit.vue
+++ b/src/views/organization/department/edit.vue
@@ -89,6 +89,13 @@ const checkMobile = (rule: any, value: any, callback: any) => {
     }
 }
 const formRules = {
+    org_id: [
+        {
+            required: true,
+            message: '请选择组织',
+            trigger: ['blur']
+        }
+    ],
     name: [
         {
             required: true,
diff --git a/src/views/permission/admin/edit.vue b/src/views/permission/admin/edit.vue
index 4f74b0c..bfc78f9 100644
--- a/src/views/permission/admin/edit.vue
+++ b/src/views/permission/admin/edit.vue
@@ -53,9 +53,9 @@
                 </el-form-item>
 
                 <!-- 确认密码输入框 -->
-                <!-- <el-form-item label="确认密码" prop="password_confirm">
+                <el-form-item label="确认密码" prop="password_confirm" v-if="mode == 'add'">
                     <el-input v-model="formData.password_confirm" show-password clearable placeholder="请输入确认密码" />
-                </el-form-item> -->
+                </el-form-item>
 
                 <!-- 管理员状态 -->
                 <el-form-item label="管理员状态" v-if="formData.root != 1">