mkm/engineering_admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

审批流程显示方式更新，oa_Initiate修改及oa_flow_type编辑，索引页面修改完成。

Browse Source
This commit is contained in:
zmj 2024-05-29 10:55:16 +08:00
parent 08778a4cdb
commit cfaf489e03
3 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/views/oa_Initiate/index.vue
View File

@ -20,11 +20,11 @@
<el-form class="mb-[-16px] mt-5" :model="queryParams" inline> <el-form class="mb-[-16px] mt-5" :model="queryParams" inline>
<el-form-item label="类型" prop="type"> <el-form-item label="类型" prop="type">
<el-select v-model="queryParams.type" clearable placeholder="请选择类型" class="flex-1"> <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="1" /> <el-option label="待审核" :value="2" />
<el-option label="审核通过" :value="2" /> <el-option label="审核中" :value="5" />
<el-option label="审核不通过" :value="3" /> <el-option label="审核通过" :value="3" />
<el-option label="撤销审核" :value="4" /> <el-option label="审核不通过" :value="4" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>

21
src/views/oa_apply/detail.vue
View File

@ -71,7 +71,8 @@
</div> </div>
</div> </div>
</el-descriptions-item> </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-input type="textarea" v-model="form.content"></el-input>
</el-descriptions-item> </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()">
@ -87,8 +88,7 @@
v-if="formData.admin_id != userStore.id && formData.flow_info.check_type == 3"> v-if="formData.admin_id != userStore.id && formData.flow_info.check_type == 3">
回退 回退
</el-button> </el-button>
<el-button type="info" @click="form.check = 3, handCheck()" <el-button type="info" @click=" showBackDialog = true" v-if="formData.admin_id == userStore.id">
v-if="formData.admin_id == userStore.id">
撤回 撤回
</el-button> </el-button>
</el-descriptions-item> </el-descriptions-item>
@ -98,6 +98,15 @@
<personnelselector ref="personnel" @confirm="submituser" type="1"> <personnelselector ref="personnel" @confirm="submituser" type="1">
</personnelselector> </personnelselector>
</div> </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> </popup>
</div> </div>
</template> </template>
@ -116,6 +125,7 @@ const popupRef = shallowRef<InstanceType<typeof Popup>>()
const showPerDialog = ref(false); const showPerDialog = ref(false);
const personnel = ref(null); const personnel = ref(null);
const userStore = useUserStore().userInfo; const userStore = useUserStore().userInfo;
const showBackDialog = ref(false)
// 表单数据 // 表单数据
const formData = reactive({ 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 () => { const userclick = async () => {
showPerDialog.value = true; showPerDialog.value = true;
await nextTick(); await nextTick();

2
src/views/organization/department/edit.vue
View File

@ -13,7 +13,7 @@
<el-form-item label="联系电话" prop="mobile"> <el-form-item label="联系电话" prop="mobile">
<el-input v-model="formData.mobile" placeholder="请输入联系电话" /> <el-input v-model="formData.mobile" placeholder="请输入联系电话" />
</el-form-item> </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-input v-model="formData.leader_name" placeholder="请选择部门负责人" @click="openDialog" />
</el-form-item> </el-form-item>
<el-form-item label="排序" prop="sort"> <el-form-item label="排序" prop="sort">