From cfaf489e038b314e57c67dcfd68ef1cc550a4243 Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Wed, 29 May 2024 10:55:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=B5=81=E7=A8=8B=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=96=B9=E5=BC=8F=E6=9B=B4=E6=96=B0=EF=BC=8Coa=5FInit?=
 =?UTF-8?q?iate=E4=BF=AE=E6=94=B9=E5=8F=8Aoa=5Fflow=5Ftype=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=EF=BC=8C=E7=B4=A2=E5=BC=95=E9=A1=B5=E9=9D=A2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=AE=8C=E6=88=90=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/oa_Initiate/index.vue            | 10 +++++-----
 src/views/oa_apply/detail.vue              | 21 ++++++++++++++++++---
 src/views/organization/department/edit.vue |  2 +-
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/src/views/oa_Initiate/index.vue b/src/views/oa_Initiate/index.vue
index 0943667..eaf109c 100644
--- a/src/views/oa_Initiate/index.vue
+++ b/src/views/oa_Initiate/index.vue
@@ -20,11 +20,11 @@
             <el-form class="mb-[-16px] mt-5" :model="queryParams" inline>
                 <el-form-item label="类型" prop="type">
                     <el-select v-model="queryParams.type" clearable placeholder="请选择类型" class="flex-1">
-                        <el-option label="待审核" :value="0" />
-                        <el-option label="审核中" :value="1" />
-                        <el-option label="审核通过" :value="2" />
-                        <el-option label="审核不通过" :value="3" />
-                        <el-option label="撤销审核" :value="4" />
+                        <el-option label="全部" :value="1" />
+                        <el-option label="待审核" :value="2" />
+                        <el-option label="审核中" :value="5" />
+                        <el-option label="审核通过" :value="3" />
+                        <el-option label="审核不通过" :value="4" />
                     </el-select>
                 </el-form-item>
                 <el-form-item>
diff --git a/src/views/oa_apply/detail.vue b/src/views/oa_apply/detail.vue
index 4afaafe..e130ac9 100644
--- a/src/views/oa_apply/detail.vue
+++ b/src/views/oa_apply/detail.vue
@@ -71,7 +71,8 @@
                             </div>
                         </div>
                     </el-descriptions-item>
-                    <el-descriptions-item label="审批意见" label-align="left" align="left" v-if="showTextarea()">
+                    <el-descriptions-item label="审批意见" label-align="left" align="left"
+                        v-if="showTextarea() && formData.admin_id != userStore.id">
                         <el-input type="textarea" v-model="form.content"></el-input>
                     </el-descriptions-item>
                     <el-descriptions-item label="操作" label-align="left" align="left" v-if="showTextarea()">
@@ -87,8 +88,7 @@
                             v-if="formData.admin_id != userStore.id && formData.flow_info.check_type == 3">
                             回退
                         </el-button>
-                        <el-button type="info" @click="form.check = 3, handCheck()"
-                            v-if="formData.admin_id == userStore.id">
+                        <el-button type="info" @click=" showBackDialog = true" v-if="formData.admin_id == userStore.id">
                             撤回
                         </el-button>
                     </el-descriptions-item>
@@ -98,6 +98,15 @@
                 <personnelselector ref="personnel" @confirm="submituser" type="1">
                 </personnelselector>
             </div>
+            <el-dialog v-model="showBackDialog" title="撤回审批" width="550px">
+                <el-form-item label="撤回原因">
+                    <el-input v-model="form.content" type="textarea"> </el-input>
+                </el-form-item>
+                <el-form-item label="">
+                    <el-button type="primary" @click="backFn">撤回</el-button>
+                    <el-button @click="showBackDialog = false">取消</el-button>
+                </el-form-item>
+            </el-dialog>
         </popup>
     </div>
 </template>
@@ -116,6 +125,7 @@ const popupRef = shallowRef<InstanceType<typeof Popup>>()
 const showPerDialog = ref(false);
 const personnel = ref(null);
 const userStore = useUserStore().userInfo;
+const showBackDialog = ref(false)
 
 // 表单数据
 const formData = reactive({
@@ -145,6 +155,11 @@ const form = reactive({
 })
 
 
+const backFn = () => {
+    if (!form.content) return feedback.msgError("请填写撤回原因");
+    form.check = 3
+    handCheck()
+}
 const userclick = async () => {
     showPerDialog.value = true;
     await nextTick();
diff --git a/src/views/organization/department/edit.vue b/src/views/organization/department/edit.vue
index 76b9bc7..4aa6781 100644
--- a/src/views/organization/department/edit.vue
+++ b/src/views/organization/department/edit.vue
@@ -13,7 +13,7 @@
                 <el-form-item label="联系电话" prop="mobile">
                     <el-input v-model="formData.mobile" placeholder="请输入联系电话" />
                 </el-form-item>
-                <el-form-item label="部门负责人" prop="leader_name">
+                <el-form-item label="部门负责人">
                     <el-input v-model="formData.leader_name" placeholder="请选择部门负责人" @click="openDialog" />
                 </el-form-item>
                 <el-form-item label="排序" prop="sort">