diff --git a/src/api/project_attendance_detail.ts b/src/api/project_attendance_detail.ts index 3ca036e..0a7743b 100644 --- a/src/api/project_attendance_detail.ts +++ b/src/api/project_attendance_detail.ts @@ -1,26 +1,41 @@ -import request from '@/utils/request' +import request from "@/utils/request"; // 考勤记录表列表 export function attendancedetailLists(params: any) { - return request.get({ url: '/project.project_attendance_detail/lists', params }) + return request.get({ + url: "/project.project_attendance_detail/lists", + params, + }); } // 添加考勤记录 export function attendancedetailAdd(params: any) { - return request.post({ url: '/project.project_attendance_detail/add', params }) + return request.post({ + url: "/project.project_attendance_detail/add", + params, + }); } // 编辑考勤记录 export function attendancedetailEdit(params: any) { - return request.post({ url: '/project.project_attendance_detail/edit', params }) + return request.post({ + url: "/project.project_attendance_detail/edit", + params, + }); } // 删除考勤记录 export function attendancedetailDelete(params: any) { - return request.post({ url: '/project.project_attendance_detail/delete', params }) + return request.post({ + url: "/project.project_attendance_detail/delete", + params, + }); } // 考勤记录详情 export function attendancedetailDetail(params: any) { - return request.get({ url: '/project.project_attendance_detail/detail', params }) + return request.get({ + url: "/project.project_attendance_detail/detail", + params, + }); } diff --git a/src/api/project_salary_detail.ts b/src/api/project_salary_detail.ts index 2d15184..fcc6cec 100644 --- a/src/api/project_salary_detail.ts +++ b/src/api/project_salary_detail.ts @@ -1,8 +1,11 @@ -import request from '@/utils/request' +import request from "@/utils/request"; // 工资明细列表列表 export function projectsalaryDetailLists(params: any) { - return request.get({ url: '/project.project_salary_detail/lists', params }) + return request.get({ url: "/project.project_salary_detail/lists", params }); } - +// 工资明细列表列表 +export function projectsalaryDetailDelete(params: any) { + return request.post({ url: "/project.project_salary_detail/delete", params }); +} diff --git a/src/components/annexLink/index.vue b/src/components/annexLink/index.vue new file mode 100644 index 0000000..b8e7134 --- /dev/null +++ b/src/components/annexLink/index.vue @@ -0,0 +1,16 @@ + + \ No newline at end of file diff --git a/src/components/detailPage/index.vue b/src/components/detailPage/index.vue index 9e40123..b705cd0 100644 --- a/src/components/detailPage/index.vue +++ b/src/components/detailPage/index.vue @@ -8,9 +8,9 @@ label-class-name="my-label"> {{ formData[item.value] ?? - (item.value.includes('.') ? - (formData[item.value.split('.')[0]])[item.value.split('.')[1]] : - '') + (item.value.includes('.') ? + (formData[item.value.split('.')[0]])[item.value.split('.')[1]] : + '') }} diff --git a/src/components/personnelselector/index.vue b/src/components/personnelselector/index.vue index 801abb6..2b8a994 100644 --- a/src/components/personnelselector/index.vue +++ b/src/components/personnelselector/index.vue @@ -6,15 +6,14 @@ 全部人员 按部门筛选 按岗位筛选 + 返回 - -
- +
@@ -34,6 +33,7 @@
+
{{ i }}
@@ -322,6 +322,7 @@ defineExpose({ .radio-con { display: flex; width: 500px; + align-items: center; .radioa { img { diff --git a/src/components/uploadAnnex/index.vue b/src/components/uploadAnnex/index.vue index 188a1c1..b7fda7c 100644 --- a/src/components/uploadAnnex/index.vue +++ b/src/components/uploadAnnex/index.vue @@ -9,7 +9,7 @@
- {{ item.name }} + {{ item.name }} x
diff --git a/src/views/contract_ticket_difference/index.vue b/src/views/contract_ticket_difference/index.vue index f071934..22ea5db 100644 --- a/src/views/contract_ticket_difference/index.vue +++ b/src/views/contract_ticket_difference/index.vue @@ -22,8 +22,10 @@ - - + +
- + @@ -11,7 +10,8 @@ - + @@ -54,10 +54,9 @@ - - + + @@ -66,10 +65,9 @@ - - + + @@ -98,13 +96,12 @@ - + - + @@ -112,7 +109,7 @@ - + @@ -140,8 +137,7 @@ - + @@ -276,7 +272,8 @@ - + diff --git a/src/views/cost_projects/edit.vue b/src/views/cost_projects/edit.vue index 7af215e..6e5adf3 100644 --- a/src/views/cost_projects/edit.vue +++ b/src/views/cost_projects/edit.vue @@ -198,7 +198,8 @@ - + +
diff --git a/src/views/customer_demand/detail.vue b/src/views/customer_demand/detail.vue index f4720b8..e567ca3 100644 --- a/src/views/customer_demand/detail.vue +++ b/src/views/customer_demand/detail.vue @@ -7,12 +7,11 @@ {{ formData.custom_name }} - {{ formData.project_name }} - {{ formData.project_code }} - + + {{ formData.project_name }} + + {{ formData.project_code }} + {{ formData.theme }} - {{ formData.importance_text }} + + {{ formData.importance_text }} - {{ formData.recording_time + + {{ formData.recording_time }} - {{ formData.demand_content + + {{ formData.demand_content }} - {{ formData.add_user_name + + {{ formData.add_user_name }} - {{ formData.create_time + + {{ formData.create_time }} - {{ formData.update_user_name + + {{ formData.update_user_name }} - {{ formData.update_time + + {{ formData.update_time }} - -
-
- 文件{{ index + 1 }}查看 -
-
-
- 暂无附件 -
+ + 文件{{ index + 1 }} @@ -87,8 +77,7 @@
+ :total="total" @size-change="handleSizeChange1" @current-change="handleCurrentChange1" />
@@ -117,8 +106,7 @@
+ :total="total1" @size-change="handleSizeChange2" @current-change="handleCurrentChange2" />
@@ -148,8 +136,7 @@
+ :total="total2" @size-change="handleSizeChange3" @current-change="handleCurrentChange3" />
diff --git a/src/views/finance_payment_apply/edit.vue b/src/views/finance_payment_apply/edit.vue index 0b636bf..b1faf8a 100644 --- a/src/views/finance_payment_apply/edit.vue +++ b/src/views/finance_payment_apply/edit.vue @@ -135,7 +135,7 @@ - + @@ -386,7 +386,6 @@ const getDetail = async (row: Record) => { // 提交按钮 const handleSubmit = async () => { - await formRef.value?.validate() const data = { ...formData } mode.value == 'edit' diff --git a/src/views/finance_payment_plan/detail.vue b/src/views/finance_payment_plan/detail.vue index d435fee..459c6d7 100644 --- a/src/views/finance_payment_plan/detail.vue +++ b/src/views/finance_payment_plan/detail.vue @@ -74,11 +74,7 @@ -
- {{ item.name }} - x -
+ @@ -119,7 +115,6 @@ defineProps({ const emit = defineEmits(['success', 'close']) const formRef = shallowRef() const popupRef = shallowRef>() -const formDataannex = reactive([]) const datas = reactive({ provinceOptions: [], cityOptions: [], @@ -137,17 +132,6 @@ const formData = reactive({ // 获取详情 const setFormData = async (data: Record) => { Object.assign(formData, data) - if (data.annex && data.annex.length > 0) { - - const arry1 = data.annex.map((item: any, index: any) => { - return { - name: `文件${index + 1}`, - uri: item - }; - }); - Object.assign(formDataannex, arry1) - - } getbidDocumentExaminationFlows() } diff --git a/src/views/finance_payment_plan/edit.vue b/src/views/finance_payment_plan/edit.vue index f197e01..05e6675 100644 --- a/src/views/finance_payment_plan/edit.vue +++ b/src/views/finance_payment_plan/edit.vue @@ -20,7 +20,7 @@ + class="flex-1 "> diff --git a/src/views/project_attendance_record/detail.vue b/src/views/project_attendance_record/detail.vue index 689f882..22e4d87 100644 --- a/src/views/project_attendance_record/detail.vue +++ b/src/views/project_attendance_record/detail.vue @@ -2,9 +2,25 @@
-
{{ formData.attendance_code }}
-
{{ formData.attendance_date }}
- + + + {{ formData.project_name }} + + + {{ formData.project_code }} + + + {{ formData.attendance_date }} + + + {{ formData.attendance_num }} + + + + + + + @@ -63,20 +79,6 @@ const formData = reactive({ // 获取详情 const setFormData = async (data: Record) => { Object.assign(formData, data) - if (data.annex && data.annex.length > 0) { - - const arry1 = data.annex.map((item: any, index: any) => { - return { - name: `文件${index + 1}`, - uri: item - }; - }); - Object.assign(formDataannex, arry1) - - - } - - } const getDetail = async (row: Record) => { @@ -107,9 +109,6 @@ const handleClose = () => { - - - defineExpose({ open, setFormData, @@ -122,8 +121,4 @@ defineExpose({ font-size: 1.2em; margin-bottom: 10px; } - -:deep(.my-label) { - width: 150px; -} diff --git a/src/views/project_attendance_record/edit.vue b/src/views/project_attendance_record/edit.vue index 4e5a3f7..03aae49 100644 --- a/src/views/project_attendance_record/edit.vue +++ b/src/views/project_attendance_record/edit.vue @@ -1,70 +1,56 @@ - - + - - + @@ -141,7 +119,6 @@ - @@ -169,14 +146,16 @@ import type { FormInstance } from 'element-plus' import Popup from '@/components/popup/index.vue' import projectDialog from '@/components/project/index.vue' import { attendanceRecordAdd, attendanceRecordEdit, attendanceRecordDetail } from '@/api/project_attendance_record' +import { attendancedetailDelete, attendancedetailLists } from '@/api/project_attendance_detail' import projectPersonnel from '@/components/project_personnel/index.vue' import type { PropType } from 'vue' import configs from "@/config" import useUserStore from "@/stores/modules/user"; import { watch } from "vue" import { useDictData } from '@/hooks/useDictOptions' -const { dictData } = useDictData('labor_contract_status,labor_contract_type,labor_contract_name') +import { cloneDeep } from 'lodash' +const { dictData } = useDictData('labor_contract_status,labor_contract_type,labor_contract_name') let props = defineProps({ project: Object }) @@ -187,7 +166,7 @@ const formData = reactive({ attendance_date: '', remark: '', file: '', - attendance_detail: [{}], + attendance_detail: [], }) @@ -206,10 +185,13 @@ const formDataannex = reactive([]) const userInfo = userStore.userInfo const handleAdd = (row: any) => { - const index = formData.attendance_detail.indexOf(row); - formData.attendance_detail.splice(index + 1, 0, {}); + // const index = formData.attendance_detail.indexOf(row); + // formData.attendance_detail.splice(index + 1, 0, {}); + formData.attendance_detail.push({}) }; -const handleDelete = (row: any) => { +const handleDelete = async (row: any) => { + console.log(row.id) + if (row.id) await attendancedetailDelete({ id: row.id }); const index = formData.attendance_detail.indexOf(row); formData.attendance_detail.splice(index, 1); }; @@ -244,25 +226,6 @@ const customEvent1 = (e) => { const popupTitle = computed(() => { return mode.value == 'edit' ? '编辑考勤记录' : '新增考勤记录' }) -// 上传文件 -const handleAvatarSuccess_four = ( - response, - uploadFile -) => { - if (response.code == 0) { - ElMessage.error(response.msg); - return; - } - formDataannex.push( - { uri: response.data.uri, name: response.data.name } - - - ); -}; -// 删除上传的文件 -const delFileFn = (index: number) => { - formDataannex.splice(index, 1) -} // 表单验证 @@ -275,18 +238,6 @@ let renshu = computed(() => { // 获取详情 const setFormData = async (data: Record) => { - if (data.annex && data.annex.length > 0) { - - const arry1 = data.annex.map((item: any, index: any) => { - return { - name: `文件${index + 1}`, - uri: item - }; - }); - Object.assign(formDataannex, arry1) - - - } for (const key in formData) { if (data[key] != null && data[key] != undefined) { //@ts-ignore @@ -295,8 +246,10 @@ const setFormData = async (data: Record) => { } project_name.value = data.project_name project_code.value = data.project_code - idcard.value = data.person_idcard - person_name.value = data.person_name + + // let res = await attendancedetailLists({}) + // formData.attendance_detail = res.lists + } @@ -310,15 +263,12 @@ const getDetail = async (row: Record) => { // 提交按钮 const handleSubmit = async () => { - if (formDataannex.length > 0) { - formData.annex = formDataannex.map((item: any) => item.uri) - } await formRef.value?.validate() - formData.attendance_detail.forEach(item => { + const data = cloneDeep({ ...formData, }) + data.attendance_detail.forEach(item => { item.work_start_time = item.work_start_time ? formData.attendance_date + ` ${item.work_start_time}` : "" item.work_end_time = item.work_end_time ? formData.attendance_date + ` ${item.work_end_time}` : "" }) - const data = { ...formData, } mode.value == 'edit' ? await attendanceRecordEdit(data) : await attendanceRecordAdd(data) diff --git a/src/views/project_attendance_record/index.vue b/src/views/project_attendance_record/index.vue index 246a865..2feb1d3 100644 --- a/src/views/project_attendance_record/index.vue +++ b/src/views/project_attendance_record/index.vue @@ -29,17 +29,17 @@ - - - + + + - - - - - + + + + + @@ -52,10 +46,6 @@ const descriptionList = reactive([ lable: "调整金额", value: ['adjust_amount'] }, - { - lable: "附件", - value: ['annex'] - }, { lable: "备注", value: ['remark'] diff --git a/src/views/project_cost_adjustment/edit.vue b/src/views/project_cost_adjustment/edit.vue index c081f06..ced7458 100644 --- a/src/views/project_cost_adjustment/edit.vue +++ b/src/views/project_cost_adjustment/edit.vue @@ -1,16 +1,14 @@