@@ -653,7 +663,7 @@ const formData = reactive({
qualification: {
business_license: "",
business_licenseB: "",
- qualifications: [],
+ other_qualifications: [],
bank_accountB: [],
bank_account: [],
},
@@ -816,7 +826,8 @@ const handleAvatarSuccess_two: UploadProps["onSuccess"] = (
ElMessage.error(response.msg);
return;
}
- formData.qualification.qualifications.push(response.data.uri);
+ formData.qualification.other_qualifications.push(response.data.uri);
+ // console.log(formData.qualification.other_qualifications);
};
const handleAvatarSuccess_twoB: UploadProps["onSuccess"] = (
response,
@@ -981,23 +992,30 @@ const getDetails = async () => {
];
if (data[key] != null && data[key] != undefined) {
formData[key] = data[key];
- if (key == "qualification" && formData.qualification.qualifications) {
- try {
- if (Array.isArray(JSON.parse(formData.qualification.qualifications))) {
- formData.qualification.qualifications = JSON.parse(
- formData.qualification.qualifications
- );
- } else {
- const str = formData.qualification.qualifications;
- formData.qualification.qualifications = [];
- formData.qualification.qualifications.push(str);
- }
- } catch (error) {
- const str = formData.qualification.qualifications;
- formData.qualification.qualifications = [];
- formData.qualification.qualifications.push(str);
- }
- }
+ // if (
+ // key == "qualification" &&
+ // formData.qualification.other_qualifications
+ // ) {
+ // try {
+ // if (
+ // Array.isArray(
+ // JSON.parse(formData.qualification.other_qualifications)
+ // )
+ // ) {
+ // formData.qualification.other_qualifications = JSON.parse(
+ // formData.qualification.other_qualifications
+ // );
+ // } else {
+ // const str = formData.qualification.other_qualifications;
+ // formData.qualification.other_qualifications = [];
+ // formData.qualification.other_qualifications.push(str);
+ // }
+ // } catch (error) {
+ // const str = formData.qualification.other_qualifications;
+ // formData.qualification.other_qualifications = [];
+ // formData.qualification.other_qualifications.push(str);
+ // }
+ // }
}
if (stringArr.includes(key)) formData[key] = formData[key].toString();
});
@@ -1017,7 +1035,7 @@ const getDetails = async () => {
};
const clickdelete = (index) => {
if (!route.query.read) {
- formData.qualification.qualifications.splice(index, 1);
+ formData.qualification.other_qualifications.splice(index, 1);
}
};
@@ -1037,8 +1055,8 @@ const handleAvatarSuccessAvatar: UploadProps["onSuccess"] = (
const create = async () => {
await formRef.value?.validate();
const data = JSON.parse(JSON.stringify({ ...formData }));
- data.qualification.qualifications = JSON.stringify(
- data.qualification.qualifications
+ data.qualification.other_qualifications = JSON.stringify(
+ data.qualification.other_qualifications
);
if (route.query.id) {
await apiCompanyEdit(data);
@@ -1075,9 +1093,9 @@ defineExpose({
.headimg {
margin-left: 18px;
+ margin-bottom: 18px;
width: 120px;
height: 140px;
- float: left;
overflow: hidden;
}
diff --git a/src/views/company/index.vue b/src/views/company/index.vue
index e757016..e829c11 100644
--- a/src/views/company/index.vue
+++ b/src/views/company/index.vue
@@ -1,7 +1,7 @@
-
+
企业认证
-
+
生成合同
生成合同
+ 发送合同
-
-
- 甲方基本信息
-
-
+
+ 甲方基本信息
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 甲方资质信息
-
-
+
+
+
-
-
-
![]()
-
-
![]()
-
-
![]()
-
-
-
- 乙方基本信息
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 乙方资质信息
-
-
-
-
-
![]()
-
-
![]()
-
-
![]()
-
-
-
- 个人基本信息
-
-
-
![]()
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+ 甲方资质信息
+
+
+
+
+
![]()
-
-
- 个人资质信息
-
-
-
- ![]()
- ![]()
-
-
- ![]()
- ![]()
-
-
- ![]()
- ![]()
-
-
-
-
-
- 电子合同
-
-
+
+
+
![]()
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 上传
-
-
-
-
+
+
+
+
+
+
+ 上传
+
+
+
+ 确定
+
+
+
diff --git a/src/views/permission/admin/edit.vue b/src/views/permission/admin/edit.vue
index e0fff4a..39a8db8 100644
--- a/src/views/permission/admin/edit.vue
+++ b/src/views/permission/admin/edit.vue
@@ -135,7 +135,12 @@
-
+
-
+
-
-
-
-
-
- 资质信息
-
-
-
-
- ![]()
-
-
-
-
-
- ![]()
-
-
-
-
-
-
-
-
-
- ![]()
-
-
-
-
-
- ![]()
-
-
-
-
-
-
-
-
-
- ![]()
-
-
-
-
-
- ![]()
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 查询
- 重置
-
-
-
-
-
-
-
-
-
- 新增
-
-
-
- >
-
-
-
-
-
-
-
-
-
- {{ row.company.company_name || '/' }}
-
-
-
-
-
-
- 已签约
- 未签约
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+
+ 新增
+
+
+
+ >
+
+
+
+
+
+
+
+
+
+ {{ row.company.company_name || "/" }}
+
+
+
+
+
+
+ 已签约
+ 未签约
+
+
+
+
+
+
+
+
+
+
-
-
-
- 查看
- 编辑
- 删除
-
-
+
+
+
+
+
+
+
+
+ 重要提醒
+
+ 请确认信息是否有误,发送合同,请确认信息是否有误,发送电子合同后短时间内将不可再次发送.
+
+
+ 确认签约短信将在60秒后发送,请注意查收,并点击短信链接进行线上合同签约
+
+
+
+
-
+
@@ -48,6 +48,14 @@
@success="loadTask"
@close="showEdit = false"
/>
+
@@ -58,8 +66,11 @@ import { timeFormat } from "@/utils/util";
import feedback from "@/utils/feedback";
// import { getRoutePath } from "router";
import EditPopup from "./edit.vue";
+import EditTowPopup from "./editTow.vue";
import { reactive, watch } from "vue";
import { apiTaskList, apiTaskDetails } from "@/api/task";
+import { apiTaskSchedulingPlanAdd } from "@/api/task_scheduling_plan";
+
const dateValue = ref(new Date());
const detailsdata = reactive({
create_time: "",
@@ -92,16 +103,18 @@ const detailsdata = reactive({
watch(
() => dateValue,
async (newValue, oldValue) => {
- const id = taskList.value.find((item) =>item.start_time.split(" ")[0] == timeFormat(newValue.value.getTime()))?.id;
- if(id){
- const res = await apiTaskDetails({ id });
- Object.keys(detailsdata).forEach((key) => {
- res[key] ? (detailsdata[key] = res[key]) : null;
- });
- editRef.value?.open("add");
- initShowDate(timeFormat(newValue.value.getTime()));
+ const id = taskList.value.find(
+ (item) =>
+ item.start_time.split(" ")[0] == timeFormat(newValue.value.getTime())
+ )?.id;
+ if (id) {
+ const res = await apiTaskDetails({ id });
+ Object.keys(detailsdata).forEach((key) => {
+ res[key] ? (detailsdata[key] = res[key]) : null;
+ });
+ editRef.value?.open("add");
+ initShowDate(timeFormat(newValue.value.getTime()));
}
-
},
{ deep: true }
);
@@ -110,8 +123,10 @@ watch(
const loading = ref(true);
const editRef = shallowRef>();
+const editTowRef = shallowRef>();
// 是否显示编辑框
const showEdit = ref(false);
+const showEditTow = ref(false);
// 查询条件
const queryParams = reactive({
@@ -168,9 +183,9 @@ const dateNow = (day) => {
// 添加
const handleAdd = async () => {
- showEdit.value = true;
+ showEditTow.value = true;
await nextTick();
- editRef.value?.open("add");
+ editTowRef.value?.open("add");
};
// 编辑
diff --git a/src/views/task_scheduling/index.vue b/src/views/task_scheduling/index.vue
index 512e2e9..bce079a 100644
--- a/src/views/task_scheduling/index.vue
+++ b/src/views/task_scheduling/index.vue
@@ -177,6 +177,7 @@ const handleCalendar = async (data: any) => {
editRef.value?.open('edit')
editRef.value?.setFormData(data)
}
+
// 删除
const handleDelete = async (id: number | any[]) => {
await feedback.confirm('确定要删除？')