From b50e6f93054c4d47ef13e23f47ee647bfc09414d Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Thu, 14 Aug 2025 14:59:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project-manage/lot-project.js | 13 +- src/components/UploadImgFormData/index.vue | 2 + .../lot-project/add-or-edit-form.vue | 73 +++- .../project-manage/lot-project/config.js | 34 +- .../project-manage/lot-project/index.vue | 60 +++- .../contract-witness-upload.vue | 331 ++++++++++++++++++ .../contract-witness/index.vue | 6 +- .../wage-card-witness/config.js | 79 +++++ .../wage-card-witness/index.vue | 262 +++++++++++++- .../wage-card-upload.vue} | 0 10 files changed, 794 insertions(+), 66 deletions(-) create mode 100644 src/views/construction-person/red-green-light-mange/contract-witness/contract-witness-upload.vue create mode 100644 src/views/construction-person/red-green-light-mange/wage-card-witness/config.js rename src/views/construction-person/red-green-light-mange/{contract-witness/add-or-edit-form.vue => wage-card-witness/wage-card-upload.vue} (100%) diff --git a/src/api/basic-manage/project-manage/lot-project.js b/src/api/basic-manage/project-manage/lot-project.js index bc39928..852d343 100644 --- a/src/api/basic-manage/project-manage/lot-project.js +++ b/src/api/basic-manage/project-manage/lot-project.js @@ -3,16 +3,7 @@ import request from '@/utils/request' // 新增和修改标段工程 export const addAndEditLotLotProjectAPI = (data) => { return request({ - url: '/bmw/pmOrg/addOrUpdateProject', - method: 'POST', - data, - }) -} - -// 修改标段工程 -export const editLotLotProjectAPI = (data) => { - return request({ - url: '/project/***', + url: '/bmw/pmProject/addOrUpdateProject', method: 'POST', data, }) @@ -29,7 +20,7 @@ export const deleteLotLotProjectAPI = (id) => { // 获取标段工程列表 export const getLotLotProjectListAPI = (data) => { return request({ - url: '/project/***', + url: '/bmw/pmProject/list', method: 'GET', params: data, }) diff --git a/src/components/UploadImgFormData/index.vue b/src/components/UploadImgFormData/index.vue index fc56306..84bb4b8 100644 --- a/src/components/UploadImgFormData/index.vue +++ b/src/components/UploadImgFormData/index.vue @@ -188,6 +188,8 @@ export default { // 文件发生变化 handleChange(file, fileList) { + console.log(file, fileList, 'file, fileList') + this.$emit('update:fileList', fileList) }, }, diff --git a/src/views/basic-manage/project-manage/lot-project/add-or-edit-form.vue b/src/views/basic-manage/project-manage/lot-project/add-or-edit-form.vue index 6364eb8..80d7f83 100644 --- a/src/views/basic-manage/project-manage/lot-project/add-or-edit-form.vue +++ b/src/views/basic-manage/project-manage/lot-project/add-or-edit-form.vue @@ -197,6 +197,12 @@ import { getMainProjectListCommonFun } from '@/utils/getCommonData' export default { name: 'AddOrEditForm', dicts: ['project_status', 'project_type', 'voltage_level'], + props: { + editFormData: { + type: Object, + default: () => {}, + }, + }, data() { // 自定义校验规则 判断竣工结束时间是否大于开工开始时间 const validatePlanEndTime = (rule, value, callback) => { @@ -226,8 +232,8 @@ export default { proStatus: '0', // 工程状态 默认为0 在建 proAddress: '', // 工程地址 - startTime: '', // 开工时间 - endTime: '', // 竣工时间 + startTime: null, // 开工时间 + endTime: null, // 竣工时间 lon: '', // 项目部经度 lat: '', // 项目部纬度 }, @@ -365,18 +371,24 @@ export default { if (valid) { console.log(this.addOrEditForm) - // const API = - // this.formType === 1 - // ? addLotLotProjectAPI - // : editLotLotProjectAPI + const params = { + ...this.addOrEditForm, + } + + if (this.formType === 1) { + delete params.id + } + const res = await addAndEditLotLotProjectAPI( this.addOrEditForm, ) console.log(res, '新增或修改结果') if (res.code === 200) { resolve() + this.$modal.msgSuccess('新增成功') } else { - reject(new Error(res.message)) + reject(new Error(res.msg)) + this.$modal.msgError(res.msg) } } else { reject(new Error('表单验证失败')) @@ -390,5 +402,52 @@ export default { this.$refs.addOrEditFormRef.resetFields() }, }, + + watch: { + editFormData: { + handler(newVal) { + if (Object.keys(newVal).length > 0) { + // this.addOrEditForm = newVal + console.log(newVal, 'newVal') + + const { + mainProId, + orgId, + proName, + simpleName, + proType, + volLevel, + isShanghai, + proStatus, + proAddress, + startTime, + endTime, + lon, + lat, + id, + } = newVal + + this.addOrEditForm = { + mainProId, + orgId, + proName, + simpleName, + proType, + volLevel, + isShanghai, + proStatus, + proAddress, + startTime, + endTime, + lon, + lat, + id, + } + } + }, + deep: true, + immediate: true, + }, + }, } diff --git a/src/views/basic-manage/project-manage/lot-project/config.js b/src/views/basic-manage/project-manage/lot-project/config.js index 3a192fe..952d537 100644 --- a/src/views/basic-manage/project-manage/lot-project/config.js +++ b/src/views/basic-manage/project-manage/lot-project/config.js @@ -32,8 +32,8 @@ export const formLabel = [ ] export const columnsList = [ - { t_props: 'projectName', t_label: '所属总工程' }, - { t_props: 'xmb', t_label: '所属项目部' }, + { t_props: 'mainProName', t_label: '所属总工程' }, + { t_props: 'orgName', t_label: '所属项目部' }, { t_props: 'proName', t_label: '工程名称' }, { t_props: 'proType', t_label: '工程类型' }, { t_props: 'volLevel', t_label: '电压等级' }, @@ -41,36 +41,6 @@ export const columnsList = [ { t_props: 'proStatus', t_label: '状态' }, ] -export const testTableList = [ - { - projectName: '总工程名称', - level: '等级3', - xmb: 'xxx项目部', - name: '110kv工程', - type: '基建变电', - address: '安徽省合肥市110k工程', - status: '在建', - }, - { - projectName: '总工程名称21', - level: '等级3', - xmb: 'xxx项目部', - name: '110kv工程', - type: '基建变电', - address: '安徽省合肥市110k工程', - status: '在建', - }, - { - projectName: '总工程名称3', - level: '等级3', - xmb: 'xxx项目部', - name: '110kv工程', - type: '基建变电', - address: '安徽省合肥市110k工程', - status: '在建', - }, -] - export const dialogConfig = { outerVisible: false, outerTitle: '', diff --git a/src/views/basic-manage/project-manage/lot-project/index.vue b/src/views/basic-manage/project-manage/lot-project/index.vue index fcfab80..519417c 100644 --- a/src/views/basic-manage/project-manage/lot-project/index.vue +++ b/src/views/basic-manage/project-manage/lot-project/index.vue @@ -5,9 +5,8 @@ :formLabel="formLabel" :showOperation="true" :showRightTools="true" - ref="allProjectTableRef" + ref="lotProjectTableRef" :columnsList="columnsList" - :testTableList="testTableList" :request-api="getLotLotProjectListAPI" >