diff --git a/src/config/index.ts b/src/config/index.ts
index 37ccb77..23d412e 100644
--- a/src/config/index.ts
+++ b/src/config/index.ts
@@ -1,12 +1,12 @@
const config = {
- terminal: 1, //终端
- title: '后台管理系统', //网站默认标题
- version: '1.6.0', //版本号
- baseUrl: `${
- import.meta.env.VITE_APP_BASE_URL || "https://worker_task.lihaink.cn"
- }/`, //请求接口域名
- urlPrefix: 'adminapi', //请求默认前缀
- timeout: 10 * 1000 //请求超时时长
-}
+ terminal: 1, //终端
+ title: "后台管理系统", //网站默认标题
+ version: "1.6.0", //版本号
+ baseUrl: `${
+ import.meta.env.VITE_APP_BASE_URL || "https://worker-task.lihaink.cn"
+ }/`, //请求接口域名
+ urlPrefix: "adminapi", //请求默认前缀
+ timeout: 10 * 1000, //请求超时时长
+};
-export default config
+export default config;
diff --git a/src/views/company/edit.vue b/src/views/company/edit.vue
index 48f2265..ccf118f 100644
--- a/src/views/company/edit.vue
+++ b/src/views/company/edit.vue
@@ -674,6 +674,7 @@ function customEventMan(data: any) {
isMan.value = false;
formData.admin_name = data.name;
formData.admin_id = data.id;
+ console.log(formData);
}
//区域管理人员
function EventAreaManager(data: any) {
diff --git a/src/views/contract/contractDetil.vue b/src/views/contract/contractDetil.vue
index 4d17130..28014f0 100644
--- a/src/views/contract/contractDetil.vue
+++ b/src/views/contract/contractDetil.vue
@@ -1,37 +1,87 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
+
-
+
- 取消
- 确定
+ 取消
+ 确定
@@ -41,12 +91,16 @@ import { ref, reactive, defineExpose } from "vue";
const formData = reactive({
id: "",
company_id: "",
+ company_name: "",
contract_type: "",
+ contract_type_name: "",
contract_no: "",
file: "",
status: "",
party_a: "",
+ party_a_name: "",
party_b: "",
+ party_b_name: "",
area_manager: "",
});
const show = ref(false);
@@ -73,4 +127,4 @@ defineExpose({
.btn_men {
text-align: right;
}
-
\ No newline at end of file
+
diff --git a/src/views/permission/admin/edit.vue b/src/views/permission/admin/edit.vue
index ff35bd0..7f142e1 100644
--- a/src/views/permission/admin/edit.vue
+++ b/src/views/permission/admin/edit.vue
@@ -166,8 +166,8 @@
-
-
+
+
-
-
-
+
+
-
-
+
+
@@ -377,7 +376,7 @@
:disabled="true"
clearable
:style="{ width: '100%' }"
- :value="formData.sex == 1 ? '男' : '女'"
+ :value="formData.sex == '1' ? '男' : '女'"
>
@@ -608,7 +607,6 @@ const formRules = reactive({
trigger: ["blur"],
},
],
-
name: [
{
required: true,
diff --git a/src/views/permission/admin/index.vue b/src/views/permission/admin/index.vue
index 4cf2429..18b1573 100644
--- a/src/views/permission/admin/index.vue
+++ b/src/views/permission/admin/index.vue
@@ -164,7 +164,6 @@
@@ -253,25 +252,25 @@ const changeStatus = (data: any) => {
});
};
// 查看
-const isCheck = ref(false);
+// isCheckFn
const handleCheck = async (data: any) => {
- isCheck.value = true;
showEdit.value = true;
await nextTick();
editRef.value?.open("edit");
+ editRef.value?.isCheckFn(true);
editRef.value?.setFormData(data);
};
const handleAdd = async () => {
- isCheck.value = false;
showEdit.value = true;
await nextTick();
+ editRef.value?.isCheckFn(false);
editRef.value?.open("add");
};
const handleEdit = async (data: any) => {
- isCheck.value = false;
showEdit.value = true;
await nextTick();
+ editRef.value?.isCheckFn(false);
editRef.value?.open("edit");
editRef.value?.setFormData(data);
};