From 96216b0a214ef9bb3c3ef763fdb2ad6bfeabc33c Mon Sep 17 00:00:00 2001 From: taoge1020 Date: Fri, 4 Jul 2025 19:56:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=90=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- src/api/materials/materialIssue/index.ts | 63 +++ src/api/materials/materialIssue/types.ts | 226 ++++++++ src/api/materials/materialReceive/index.ts | 63 +++ src/api/materials/materialReceive/types.ts | 211 ++++++++ src/components/wordDetial/index.vue | 3 - src/views/design/designChange/index.vue | 2 +- .../partyA/materialIssue/index.vue | 484 +++++++++++++++++ .../partyA/materialIssue/word/icon/down.png | Bin 0 -> 922 bytes .../partyA/materialIssue/word/index.vue | 301 +++++++++++ .../partyA/materialReceive/index.vue | 496 ++++++++++++++++++ .../partyA/materialReceive/word/icon/down.png | Bin 0 -> 922 bytes .../partyA/materialReceive/word/index.vue | 290 ++++++++++ .../partyB/materialIssue/index.vue | 484 +++++++++++++++++ .../partyB/materialIssue/word/icon/down.png | Bin 0 -> 922 bytes .../partyB/materialIssue/word/index.vue | 301 +++++++++++ .../partyB/materialReceive/index.vue | 486 +++++++++++++++++ .../partyB/materialReceive/word/icon/down.png | Bin 0 -> 922 bytes .../partyB/materialReceive/word/index.vue | 290 ++++++++++ .../component/contractorMaterialRecord.vue | 4 - 20 files changed, 3697 insertions(+), 9 deletions(-) create mode 100644 src/api/materials/materialIssue/index.ts create mode 100644 src/api/materials/materialIssue/types.ts create mode 100644 src/api/materials/materialReceive/index.ts create mode 100644 src/api/materials/materialReceive/types.ts create mode 100644 src/views/materials/materialsEquipment/partyA/materialIssue/index.vue create mode 100644 src/views/materials/materialsEquipment/partyA/materialIssue/word/icon/down.png create mode 100644 src/views/materials/materialsEquipment/partyA/materialIssue/word/index.vue create mode 100644 src/views/materials/materialsEquipment/partyA/materialReceive/index.vue create mode 100644 src/views/materials/materialsEquipment/partyA/materialReceive/word/icon/down.png create mode 100644 src/views/materials/materialsEquipment/partyA/materialReceive/word/index.vue create mode 100644 src/views/materials/materialsEquipment/partyB/materialIssue/index.vue create mode 100644 src/views/materials/materialsEquipment/partyB/materialIssue/word/icon/down.png create mode 100644 src/views/materials/materialsEquipment/partyB/materialIssue/word/index.vue create mode 100644 src/views/materials/materialsEquipment/partyB/materialReceive/index.vue create mode 100644 src/views/materials/materialsEquipment/partyB/materialReceive/word/icon/down.png create mode 100644 src/views/materials/materialsEquipment/partyB/materialReceive/word/index.vue diff --git a/.env.development b/.env.development index 2b091ca..8c542b5 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ VITE_APP_TITLE = 新能源项目管理平台 VITE_APP_ENV = 'development' # 开发环境 -VITE_APP_BASE_API = 'http://192.168.110.148:8899' +VITE_APP_BASE_API = 'http://192.168.110.119:8899' # 无人机接口地址 diff --git a/src/api/materials/materialIssue/index.ts b/src/api/materials/materialIssue/index.ts new file mode 100644 index 0000000..31e8076 --- /dev/null +++ b/src/api/materials/materialIssue/index.ts @@ -0,0 +1,63 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { MaterialIssueVO, MaterialIssueForm, MaterialIssueQuery } from '@/api/materials/materialIssue/types'; + +/** + * 查询物料领料单列表 + * @param query + * @returns {*} + */ + +export const listMaterialIssue = (query?: MaterialIssueQuery): AxiosPromise => { + return request({ + url: '/materials/materialIssue/list', + method: 'get', + params: query + }); +}; + +/** + * 查询物料领料单详细 + * @param id + */ +export const getMaterialIssue = (id: string | number): AxiosPromise => { + return request({ + url: '/materials/materialIssue/' + id, + method: 'get' + }); +}; + +/** + * 新增物料领料单 + * @param data + */ +export const addMaterialIssue = (data: MaterialIssueForm) => { + return request({ + url: '/materials/materialIssue', + method: 'post', + data: data + }); +}; + +/** + * 修改物料领料单 + * @param data + */ +export const updateMaterialIssue = (data: MaterialIssueForm) => { + return request({ + url: '/materials/materialIssue', + method: 'put', + data: data + }); +}; + +/** + * 删除物料领料单 + * @param id + */ +export const delMaterialIssue = (id: string | number | Array) => { + return request({ + url: '/materials/materialIssue/' + id, + method: 'delete' + }); +}; diff --git a/src/api/materials/materialIssue/types.ts b/src/api/materials/materialIssue/types.ts new file mode 100644 index 0000000..b350fcb --- /dev/null +++ b/src/api/materials/materialIssue/types.ts @@ -0,0 +1,226 @@ +export interface MaterialIssueVO { + /** + * 主键id + */ + id: string | number; + + /** + * 项目id + */ + projectId: string | number; + + /** + * 材料来源(1甲供 2乙供) + */ + materialSource: string; + + /** + * 表单编号 + */ + formCode: string; + + /** + * 工程名称 + */ + projectName: string; + + /** + * 设备材料名称 + */ + materialName: string; + + /** + * 订货单位 + */ + orderingUnit: string; + + /** + * 供货单位 + */ + supplierUnit: string; + + /** + * 领料单位 + */ + issueUnit: string; + + /** + * 保管单位 + */ + storageUnit: string; + + /** + * 缺陷情况(承包单位填写) + */ + defectDescription: string; + + /** + * 备注 + */ + remark: string; + +} + +export interface MaterialIssueForm extends BaseEntity { + /** + * 主键id + */ + id?: string | number; + + /** + * 项目id + */ + projectId?: string | number; + + /** + * 材料来源(1甲供 2乙供) + */ + materialSource?: string; + + /** + * 表单编号 + */ + formCode?: string; + + /** + * 工程名称 + */ + projectName?: string; + + /** + * 设备材料名称 + */ + materialName?: string; + + /** + * 订货单位 + */ + orderingUnit?: string; + + /** + * 供货单位 + */ + supplierUnit?: string; + + /** + * 领料单位 + */ + issueUnit?: string; + + /** + * 保管单位 + */ + storageUnit?: string; + + /** + * 缺陷情况(承包单位填写) + */ + defectDescription?: string; + + /** + * 合格证份数 + */ + certCount?: number; + + /** + * 合格证文件 + */ + certCountFileId?: string | number; + + /** + * 出厂报告份数 + */ + reportCount?: number; + + /** + * 出厂报告文件 + */ + reportCountFileId?: string | number; + + /** + * 技术资料份数 + */ + techDocCount?: number; + + /** + * 技术资料文件 + */ + techDocCountFileId?: string | number; + + /** + * 厂家资质文件份数 + */ + licenseCount?: number; + + /** + * 厂家资质文件 + */ + licenseCountFileId?: string | number; + + /** + * 备注 + */ + remark?: string; + +} + +export interface MaterialIssueQuery extends PageQuery { + + /** + * 项目id + */ + projectId?: string | number; + + /** + * 材料来源(1甲供 2乙供) + */ + materialSource?: string; + + /** + * 表单编号 + */ + formCode?: string; + + /** + * 工程名称 + */ + projectName?: string; + + /** + * 设备材料名称 + */ + materialName?: string; + + /** + * 订货单位 + */ + orderingUnit?: string; + + /** + * 供货单位 + */ + supplierUnit?: string; + + /** + * 领料单位 + */ + issueUnit?: string; + + /** + * 保管单位 + */ + storageUnit?: string; + + /** + * 缺陷情况(承包单位填写) + */ + defectDescription?: string; + + /** + * 日期范围参数 + */ + params?: any; +} + + + diff --git a/src/api/materials/materialReceive/index.ts b/src/api/materials/materialReceive/index.ts new file mode 100644 index 0000000..0e9f582 --- /dev/null +++ b/src/api/materials/materialReceive/index.ts @@ -0,0 +1,63 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { MaterialReceiveVO, MaterialReceiveForm, MaterialReceiveQuery } from '@/api/materials/materialReceive/types'; + +/** + * 查询物料接收单列表 + * @param query + * @returns {*} + */ + +export const listMaterialReceive = (query?: MaterialReceiveQuery): AxiosPromise => { + return request({ + url: '/materials/materialReceive/list', + method: 'get', + params: query + }); +}; + +/** + * 查询物料接收单详细 + * @param id + */ +export const getMaterialReceive = (id: string | number): AxiosPromise => { + return request({ + url: '/materials/materialReceive/' + id, + method: 'get' + }); +}; + +/** + * 新增物料接收单 + * @param data + */ +export const addMaterialReceive = (data: MaterialReceiveForm) => { + return request({ + url: '/materials/materialReceive', + method: 'post', + data: data + }); +}; + +/** + * 修改物料接收单 + * @param data + */ +export const updateMaterialReceive = (data: MaterialReceiveForm) => { + return request({ + url: '/materials/materialReceive', + method: 'put', + data: data + }); +}; + +/** + * 删除物料接收单 + * @param id + */ +export const delMaterialReceive = (id: string | number | Array) => { + return request({ + url: '/materials/materialReceive/' + id, + method: 'delete' + }); +}; diff --git a/src/api/materials/materialReceive/types.ts b/src/api/materials/materialReceive/types.ts new file mode 100644 index 0000000..bcd7850 --- /dev/null +++ b/src/api/materials/materialReceive/types.ts @@ -0,0 +1,211 @@ +export interface MaterialReceiveVO { + /** + * 主键id + */ + id: string | number; + + /** + * 项目id + */ + projectId: string | number; + + /** + * 材料来源(1甲供 2乙供) + */ + materialSource: string; + + /** + * 表单编号 + */ + formCode: string; + + /** + * 工程名称 + */ + projectName: string; + + /** + * 设备材料名称 + */ + materialName: string; + + /** + * 合同名称 + */ + contractName: string; + + /** + * 订货单位 + */ + orderingUnit: string; + + /** + * 供货单位 + */ + supplierUnit: string; + + /** + * 设备材料入库/移交 + */ + storageType: string; + + /** + * 备注 + */ + remark: string; + +} + +export interface MaterialReceiveForm extends BaseEntity { + /** + * 主键id + */ + id?: string | number; + + /** + * 项目id + */ + projectId?: string | number; + + /** + * 材料来源(1甲供 2乙供) + */ + materialSource?: string; + + /** + * 表单编号 + */ + formCode?: string; + + /** + * 工程名称 + */ + projectName?: string; + + /** + * 设备材料名称 + */ + materialName?: string; + + /** + * 合同名称 + */ + contractName?: string; + + /** + * 订货单位 + */ + orderingUnit?: string; + + /** + * 供货单位 + */ + supplierUnit?: string; + + /** + * 缺陷情况(承包单位填写) + */ + defectDescription?: string; + + /** + * 合格证份数 + */ + certCount?: number; + + /** + * 合格证文件 + */ + certCountFileId?: string | number; + + /** + * 出厂报告份数 + */ + reportCount?: number; + + /** + * 出厂报告文件 + */ + reportCountFileId?: string | number; + + /** + * 技术资料份数 + */ + techDocCount?: number; + + /** + * 技术资料文件 + */ + techDocCountFileId?: string | number; + + /** + * 厂家资质文件份数 + */ + licenseCount?: number; + + /** + * 厂家资质文件 + */ + licenseCountFileId?: string | number; + + /** + * 设备材料入库/移交 + */ + storageType?: string; + + /** + * 备注 + */ + remark?: string; + +} + +export interface MaterialReceiveQuery extends PageQuery { + + /** + * 项目id + */ + projectId?: string | number; + + /** + * 材料来源(1甲供 2乙供) + */ + materialSource?: string; + + /** + * 表单编号 + */ + formCode?: string; + + /** + * 工程名称 + */ + projectName?: string; + + /** + * 设备材料名称 + */ + materialName?: string; + + /** + * 合同名称 + */ + contractName?: string; + + /** + * 订货单位 + */ + orderingUnit?: string; + + /** + * 供货单位 + */ + supplierUnit?: string; + + /** + * 日期范围参数 + */ + params?: any; +} + + + diff --git a/src/components/wordDetial/index.vue b/src/components/wordDetial/index.vue index e2e8513..8608224 100644 --- a/src/components/wordDetial/index.vue +++ b/src/components/wordDetial/index.vue @@ -1,6 +1,3 @@ - -import { click } from 'ol/events/condition'; -import { includes } from 'lodash'; import { map } from 'lodash';