diff --git a/src/views/company/edit.vue b/src/views/company/edit.vue
index e0b3aa0..48f2265 100644
--- a/src/views/company/edit.vue
+++ b/src/views/company/edit.vue
@@ -1,762 +1,812 @@
-
diff --git a/src/views/permission/admin/edit.vue b/src/views/permission/admin/edit.vue
index 0ba3a56..e89f16c 100644
--- a/src/views/permission/admin/edit.vue
+++ b/src/views/permission/admin/edit.vue
@@ -15,12 +15,12 @@
:rules="formRules"
>
基本信息创建
-
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
资质信息
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
- 上传
-
-
-
+ >
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 上传
+
+
+
+
@@ -447,12 +474,7 @@
import type { FormInstance, UploadProps } from "element-plus";
import Popup from "@/components/popup/index.vue";
import { useDictOptions } from "@/hooks/useDictOptions";
-import {
- adminAdd,
- adminDetail,
- adminEdit,
- generateGontract,
-} from "@/api/perms/admin";
+import { adminAdd, adminDetail, adminEdit } from "@/api/perms/admin";
import { roleAll } from "@/api/perms/role";
import { jobsAll } from "@/api/org/post";
import { deptAll } from "@/api/org/department";
@@ -465,15 +487,14 @@ import {
import { dictDataLists } from "@/api/setting/dict";
import DialogIndex from "./dialog_index.vue";
import useUserStore from "@/stores/modules/user";
-defineProps({
- isCheck: {},
-});
-
+const isCheck = ref(false);
+const isCheckFn = (flag: boolean) => {
+ isCheck.value = flag;
+};
const emit = defineEmits(["success", "close"]);
const formRef = shallowRef();
const popupRef = shallowRef>();
const mode = ref("add");
-console.log(mode);
const popupTitle = computed(() => {
return mode.value == "edit" ? "编辑管理员" : "新增管理员";
});
@@ -482,7 +503,7 @@ const formData = reactive({
sex: "",
id_card: "",
name: "",
- province: "120000",
+ province: "",
city: "",
area: "",
street: "",
@@ -528,8 +549,7 @@ getcontract_type();
const isCompany = ref(false);
function customEvent(data: any) {
isCompany.value = false;
- // formData.contract.party_a = data.id
- console.log(data);
+ formData.party_a = data.id;
formData.party_a_name = data.company_name;
}
// 表单验证
@@ -650,8 +670,11 @@ const { optionsData } = useDictOptions<{
api: deptAll,
},
});
-
const handleSubmit = async () => {
+ if (isCheck.value) {
+ popupRef.value?.close();
+ return;
+ }
await formRef.value?.validate();
mode.value == "edit"
? await adminEdit(formData)
@@ -659,7 +682,6 @@ const handleSubmit = async () => {
popupRef.value?.close();
emit("success");
};
-
const open = (type = "add") => {
mode.value = type;
popupRef.value?.open();
@@ -776,21 +798,22 @@ const handleClose = () => {
defineExpose({
open,
setFormData,
+ isCheckFn,
});