From 715ec4ff55b4974e467ca8b726e0affabc780758 Mon Sep 17 00:00:00 2001 From: ruanqi Date: Tue, 12 Sep 2023 18:06:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E8=97=8F=E5=A4=B9+demo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/project/project.js | 1 + src/views/demo/demo.vue | 526 ++++++++++++++++++ .../demoZuJian.vue} | 163 ++++-- src/views/modules/project/comdemo.vue | 245 -------- src/views/modules/project/demo.vue | 311 ----------- ....vue => com_projectInfo-add-or-update.vue} | 104 +++- .../projectInfo/com_project_info_part.vue | 526 ++++++++++++++++++ .../projectInfo/com_project_puotation.vue | 402 +++++++++++++ .../projectInfo/com_project_sample.vue | 400 +++++++++++++ ...d_file.vue => com_project_upload_file.vue} | 19 +- .../project/projectInfo/projectInfo.vue | 117 +++- 11 files changed, 2182 insertions(+), 632 deletions(-) create mode 100644 src/views/demo/demo.vue rename src/views/{modules/project/projectInfo/project_info_part.vue => demo/demoZuJian.vue} (74%) delete mode 100644 src/views/modules/project/comdemo.vue delete mode 100644 src/views/modules/project/demo.vue rename src/views/modules/project/projectInfo/{projectInfo-add-or-update.vue => com_projectInfo-add-or-update.vue} (88%) create mode 100644 src/views/modules/project/projectInfo/com_project_info_part.vue create mode 100644 src/views/modules/project/projectInfo/com_project_puotation.vue create mode 100644 src/views/modules/project/projectInfo/com_project_sample.vue rename src/views/modules/project/projectInfo/{project_upload_file.vue => com_project_upload_file.vue} (92%) diff --git a/src/api/project/project.js b/src/api/project/project.js index 7a5791b..36c68dc 100644 --- a/src/api/project/project.js +++ b/src/api/project/project.js @@ -30,3 +30,4 @@ export const saveProjectContactList= data => createAPI(`/project/saveProjectCont export const deleteProjectInfo= data => createAPI(`/project/deleteProjectInfo`,'post',data) export const getProjectInfoPartList= data => createAPI(`/project/getProjectInfoPartList`,'post',data) export const saveProjectPart= data => createAPI(`/project/saveProjectPart`,'post',data) +export const deleteProjectPartWithId= data => createAPI(`/project/deleteProjectPartWithId`,'post',data) diff --git a/src/views/demo/demo.vue b/src/views/demo/demo.vue new file mode 100644 index 0000000..1c8e35b --- /dev/null +++ b/src/views/demo/demo.vue @@ -0,0 +1,526 @@ + + + + + diff --git a/src/views/modules/project/projectInfo/project_info_part.vue b/src/views/demo/demoZuJian.vue similarity index 74% rename from src/views/modules/project/projectInfo/project_info_part.vue rename to src/views/demo/demoZuJian.vue index c20945c..de00546 100644 --- a/src/views/modules/project/projectInfo/project_info_part.vue +++ b/src/views/demo/demoZuJian.vue @@ -27,24 +27,35 @@ style="width: 100px; height: 80px"/> + + + - + - + 物料类型 - + - - + + @@ -81,6 +92,7 @@ import { getProjectInfoPartList, saveProjectPart, + deleteProjectPartWithId, } from "@/api/project/project.js" import Chooselist from '@/views/modules/common/Chooselist' export default { @@ -102,8 +114,8 @@ { userId: this.$store.state.user.name, functionId: 101002003, - serialNumber: '101002003Table3TestPartNo', - tableId: "101002003Table3", + serialNumber: '101002003Table4TestPartNo', + tableId: "101002003Table4", tableName: "项目物料", columnProp: "testPartNo", headerAlign: "center", @@ -119,8 +131,8 @@ },{ userId: this.$store.state.user.name, functionId: 101002003, - serialNumber: '101002003Table3PartType', - tableId: "101002003Table3", + serialNumber: '101002003Table4PartType', + tableId: "101002003Table4", tableName: "项目物料", columnProp: "partType", headerAlign: "center", @@ -136,8 +148,8 @@ },{ userId: this.$store.state.user.name, functionId: 101002003, - serialNumber: '101002003Table3PartTypeDesc', - tableId: "101002003Table3", + serialNumber: '101002003Table4PartTypeDesc', + tableId: "101002003Table4", tableName: "项目物料", columnProp: "partTypeDesc", headerAlign: "center", @@ -153,8 +165,8 @@ },{ userId: this.$store.state.user.name, functionId: 101002003, - serialNumber: '101002003Table3PartName', - tableId: "101002003Table3", + serialNumber: '101002003Table4PartName', + tableId: "101002003Table4", tableName: "项目物料", columnProp: "partName", headerAlign: "center", @@ -170,8 +182,8 @@ },{ userId: this.$store.state.user.name, functionId: 101002003, - serialNumber: '101002003Table3PartDesc', - tableId: "101002003Table3", + serialNumber: '101002003Table4PartDesc', + tableId: "101002003Table4", tableName: "项目物料", columnProp: "partDesc", headerAlign: "center", @@ -184,28 +196,28 @@ status: true, fixed: '', columnWidth: 120 - },{ - userId: this.$store.state.user.name, - functionId: 101002003, - serialNumber: '101002003Table3PartSpec', - tableId: "101002003Table3", - tableName: "项目物料", - columnProp: "partSpec", - headerAlign: "center", - align: "left", - columnLabel: "规格型号", - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 120 },{ userId: this.$store.state.user.name, functionId: 101002003, - serialNumber: '101002003Table3MaterialNumber', - tableId: "101002003Table3", + serialNumber: '101002003Table4PartSpec', + tableId: "101002003Table4", + tableName: "项目物料", + columnProp: "partSpec", + headerAlign: "center", + align: "left", + columnLabel: "规格型号", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 120 + },{ + userId: this.$store.state.user.name, + functionId: 101002003, + serialNumber: '101002003Table4MaterialNumber', + tableId: "101002003Table4", tableName: "项目物料", columnProp: "materialNumber", headerAlign: "center", @@ -221,8 +233,8 @@ },{ userId: this.$store.state.user.name, functionId: 101002003, - serialNumber: '101002003Table3Remark', - tableId: "101002003Table3", + serialNumber: '101002003Table4Remark', + tableId: "101002003Table4", tableName: "项目物料", columnProp: "remark", headerAlign: "center", @@ -238,8 +250,8 @@ },{ userId: this.$store.state.user.name, functionId: 101002003, - serialNumber: '101002003Table3CreateDate', - tableId: "101002003Table3", + serialNumber: '101002003Table4CreateDate', + tableId: "101002003Table4", tableName: "项目物料", columnProp: "createDate", headerAlign: "center", @@ -255,8 +267,8 @@ },{ userId: this.$store.state.user.name, functionId: 101002003, - serialNumber: '101002003Table3CreateBy', - tableId: "101002003Table3", + serialNumber: '101002003Table4CreateBy', + tableId: "101002003Table4", tableName: "项目物料", columnProp: "createBy", headerAlign: "center", @@ -272,8 +284,8 @@ },{ userId: this.$store.state.user.name, functionId: 101002003, - serialNumber: '101002003Table3UpdateDate', - tableId: "101002003Table3", + serialNumber: '101002003Table4UpdateDate', + tableId: "101002003Table4", tableName: "项目物料", columnProp: "updateDate", headerAlign: "center", @@ -289,8 +301,8 @@ },{ userId: this.$store.state.user.name, functionId: 101002003, - serialNumber: '101002003Table3UpdateBy', - tableId: "101002003Table3", + serialNumber: '101002003Table4UpdateBy', + tableId: "101002003Table4", tableName: "项目物料", columnProp: "updateBy", headerAlign: "center", @@ -319,6 +331,22 @@ materialNumber:'', username:'', }, + dataRole: { + partTypeDesc: [ + { + required: true, + message: ' ', + trigger: 'change' + } + ], + partName: [ + { + required: true, + message: ' ', + trigger: 'change' + } + ], + } } }, methods: { @@ -363,14 +391,13 @@ } }); }, - /*关闭modal*/ - closeDialog(){ - //刷新报工的页面 - this.$emit('refreshPageTables'); - //关闭当前的页面 - this.visible = false; - }, addModal(){ + if(this.searchData.projectId==""||this.searchData.projectId==null){ + this.$alert('请选择项目！', '错误', { + confirmButtonText: '确定' + }) + return false; + } this.dataForm={ id:0, site: this.searchData.site, @@ -387,6 +414,23 @@ } this.visible=true; }, + updateModel(row){ + this.dataForm={ + id:row.id, + site: row.site, + projectId: row.projectId, + testPartNo:row.testPartNo, + partType:row.partType, + partTypeDesc:row.partTypeDesc, + partName:row.partName, + partDesc:row.partDesc, + partSpec:row.partSpec, + remark:row.remark, + materialNumber:row.materialNumber, + username:this.$store.state.user.name, + } + this.visible=true; + }, saveData(){ if(this.dataForm.partType==''||this.dataForm.partType==null){ this.$alert('请选择物料类别！', '错误', { @@ -410,6 +454,23 @@ } }) }, + deleteData(){ + this.$confirm('确定要删除这条数据?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + deleteProjectPartWithId(this.dataForm).then(({data}) => { + if (data && data.code === 0) { + this.$message.success( '操作成功') + this.searchTable(); + } else { + this.$message.error(data.msg) + } + }) + }).catch(() => { + }) + }, }, } diff --git a/src/views/modules/project/comdemo.vue b/src/views/modules/project/comdemo.vue deleted file mode 100644 index 463d08b..0000000 --- a/src/views/modules/project/comdemo.vue +++ /dev/null @@ -1,245 +0,0 @@ - - - - - diff --git a/src/views/modules/project/demo.vue b/src/views/modules/project/demo.vue deleted file mode 100644 index a6319c4..0000000 --- a/src/views/modules/project/demo.vue +++ /dev/null @@ -1,311 +0,0 @@ - - - - - diff --git a/src/views/modules/project/projectInfo/projectInfo-add-or-update.vue b/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue similarity index 88% rename from src/views/modules/project/projectInfo/projectInfo-add-or-update.vue rename to src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue index e4f7397..201e2ac 100644 --- a/src/views/modules/project/projectInfo/projectInfo-add-or-update.vue +++ b/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue @@ -5,8 +5,8 @@ :title="!dataForm.id ? '添加' :'编辑'" :close-on-click-modal="false" :visible.sync="visible"> - - + + @@ -18,36 +18,36 @@ - + 项目类型 - + 所属客户 - - + + - + - - + + 项目来源 - + 优先级 - + - - + + 项目经理 - + 项目负责人 @@ -77,8 +77,8 @@ - - + + 项目权限 @@ -265,6 +265,78 @@ projectManagerList:[], projectOwnerList:[], userRoleList:[], + projectRole: { + projectLevel: [ + { + required: true, + message: ' ', + trigger: 'change' + } + ], + projectType: [ + { + required: true, + message: ' ', + trigger: 'change' + } + ], + customerName: [ + { + required: true, + message: ' ', + trigger: 'change' + } + ], + projectName: [ + { + required: true, + message: ' ', + trigger: 'change' + } + ], + projectSourceDesc: [ + { + required: true, + message: ' ', + trigger: 'change' + } + ], + priorityDesc: [ + { + required: true, + message: ' ', + trigger: 'change' + } + ], + needDate: [ + { + required: true, + message: ' ', + trigger: 'change' + } + ], + projectManagerName: [ + { + required: true, + message: ' ', + trigger: 'change' + } + ], + projectOwnerName: [ + { + required: true, + message: ' ', + trigger: 'change' + } + ], + userRoleName: [ + { + required: true, + message: ' ', + trigger: 'change' + } + ], + } } }, created () { diff --git a/src/views/modules/project/projectInfo/com_project_info_part.vue b/src/views/modules/project/projectInfo/com_project_info_part.vue new file mode 100644 index 0000000..b800510 --- /dev/null +++ b/src/views/modules/project/projectInfo/com_project_info_part.vue @@ -0,0 +1,526 @@ + + + + + diff --git a/src/views/modules/project/projectInfo/com_project_puotation.vue b/src/views/modules/project/projectInfo/com_project_puotation.vue new file mode 100644 index 0000000..6add340 --- /dev/null +++ b/src/views/modules/project/projectInfo/com_project_puotation.vue @@ -0,0 +1,402 @@ + + + + + diff --git a/src/views/modules/project/projectInfo/com_project_sample.vue b/src/views/modules/project/projectInfo/com_project_sample.vue new file mode 100644 index 0000000..b30857c --- /dev/null +++ b/src/views/modules/project/projectInfo/com_project_sample.vue @@ -0,0 +1,400 @@ + + + + + diff --git a/src/views/modules/project/projectInfo/project_upload_file.vue b/src/views/modules/project/projectInfo/com_project_upload_file.vue similarity index 92% rename from src/views/modules/project/projectInfo/project_upload_file.vue rename to src/views/modules/project/projectInfo/com_project_upload_file.vue index 6237c64..78901b4 100644 --- a/src/views/modules/project/projectInfo/project_upload_file.vue +++ b/src/views/modules/project/projectInfo/com_project_upload_file.vue @@ -1,7 +1,7 @@