From 9317c2f2874fad41e7a7c825043ed85640e0f445 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Fri, 9 Jul 2021 10:07:15 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzqdfb/step1.vue | 1 + .../pages/creatProcess/xmpg/step1.vue | 54 ++++++++++++++++--- src/sysConfig/index.js | 2 +- 3 files changed, 48 insertions(+), 9 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index aaf834d54..ac4673fd0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -845,6 +845,7 @@ export default { let json = this.listForm; json.zrUserId = this.$store.getters.userInfo.userId; json.jlUserId = this.$store.getters.userInfo.userId; + // (如果是业务经理应该这样写 后续需要更改 例:json.jlUserId = this.roleForm.directorUser;) json.applyUpdUserId = this.$store.getters.userInfo.userId; json.approvalOpinion = ""; json.prcCreateUser = this.$store.getters.userInfo.userId; diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index a69694b6d..6fe9f020e 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -113,8 +113,8 @@

标准法法规业务经理

- +
@@ -126,20 +126,56 @@

分发责任人

- +
- + -

业务经理

+

责任人

- + +
+
+
+
+ + + +

分发责任人

+
+ + +
+
+
+
+ + + +

产品线责任人

+
+ + + +
+
+
+
+ + + +

标准法规部领导

+
+ +
@@ -573,6 +609,8 @@ export default { _this: this }, res => { this.productData = res.data + //分发责任人 + // this.roleForm.directorUser = res.data. // this.totalNo = res.data }, e => { diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index 0b7476a89..6bd16fca3 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -6,8 +6,8 @@ // 服务器地址 // const devIp = '39.98.140.126' // const devInterfacePORT = '10005' +// const devIp = '192.168.10.248' const devIp = '192.168.10.248' -const devIp = '192.168.10.30' const devInterfacePORT = '9999' // 云端端口号 const DEV_CLOUD_RES_INTERFACE_PORT = '7777' From 537bc1c7fe675b2490da844f6aeb96773fb0ecb1 Mon Sep 17 00:00:00 2001 From: Jaunty <15613469426@163.com> Date: Fri, 9 Jul 2021 11:33:17 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../localProductsOrProjectLibrary/index.vue | 318 ++++++++++-------- 1 file changed, 179 insertions(+), 139 deletions(-) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue index 66ef06951..f7c56627e 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue @@ -14,10 +14,10 @@ @@ -66,21 +66,128 @@ v-btn-permission="'e5ca15122f554414e6365eb09efac5c4'" @click="selectMoreBtn" >高级查询 - - - - - - - - - - - - - - - +
+ + + + + + + + + + + + + + + + + + + + {{ opt.label}} + + + + + + + + + + + + - + + + + + + - + + + + + + + + + + + + + + 查询 + 清空 + + + + + +
@@ -88,9 +195,6 @@ - - -
@@ -212,7 +316,6 @@ 查看 - 删除
@@ -272,8 +375,11 @@ export default { deptUser: [], //查询3类 projectLibrarySearch: { + // 项目名称 projectName: '', + // 项目分类 projectClassification: '', + // 项目状态 projectStatus: '', }, //查询3类 @@ -287,22 +393,68 @@ export default { page: 1, pageSize: this.$store.getters.userInfo.configContent, validFlag: 0, + // 项目编号 projectNumber:'', productSet: '', productName: '', productBrand: '', - advanceSearchVOStr: '' + advanceSearchVOStr: '', + // 产品平台 + projectPlatfor:'', + // 产品线 + productLine:'', + // 项目名称 + projectName: '', + // 项目分类 + projectClassification: '', + // 项目状态 + projectStatus: '', + // 项目群 + projectGroup: '', + // 项目开始日期 + projectStartDate: '', + // 项目完成日期 + projectEndDate: '', + // 当前节点 + currentNode: '', + // 项目级别 + projectLevel: '', + // 项目经理 + projectManager: '', }, // 查询条件 localProTableSearchDefault: { page: 1, pageSize: this.$store.getters.userInfo.configContent, validFlag: 0, + // 项目编号 projectNumber:'', productSet: '', productName: '', productBrand: '', - advanceSearchVOStr: '' + advanceSearchVOStr: '', + // 产品平台 + projectPlatfor:'', + // 产品线 + productLine:'', + // 项目名称 + projectName: '', + // 项目分类 + projectClassification: '', + // 项目状态 + projectStatus: '', + // 项目群 + projectGroup: '', + // 项目开始日期 + projectStartDate: '', + // 项目完成日期 + projectEndDate: '', + // 当前节点 + currentNode: '', + // 项目级别 + projectLevel: '', + // 项目经理 + projectManager: '', }, total: 0, // 列表数据 @@ -339,94 +491,6 @@ export default { value: '2' } ], - //9宫格列表 - localProLib:{ - // 产品平台 - projectPlatfor: '', - // 项目编号 - projectNumber: '', - // 项目名称 - projectName: '', - // 项目分类 - projectClassification: '', - // 项目状态 - projectStatus: '', - // 项目群 - projectGroup: '', - // 项目开始日期 - projectStartDate: '', - // 项目完成日期 - projectEndDate: '', - // 当前节点 - currentNode: '', - // 项目级别 - projectLevel: '', - // 项目经理 - projectManager: '', - }, - localProEO: { - // 项目相关人员 - userEOList: [], - // 产品代码 - produceCode: '', - // 项目阶段 - productStage: '', - // 整车项目编号 - zhengcarNo: '', - // 整车SOP时间 - zhengcarSopTime: '', - // 项目编号 - productNo: '', - // 项目类型 - productTypeCode: '', - // 生产基地 - producePlace: '', - // 基础车型 - baseCartype: '', - // 左驾右驾 - leftRight: '', - // 项目经理 - productManager: '', - productManagerShow: '', - // 是否纳入开发 - isDevelop: '', - energyKind: '', - // 平台 - flatform: '', - // 项目名称 - productName: '', - // 车型系列 - productSet: '', - // 项目类别 - productType: '', - // 项目状态 - productBrand: '', - // SOP时间 - sopTime: '', - // 阀点 - pointTime: [], - // 计划通过时间 - planPassTime: '', - // 实际通过时间 - actualPassTime: '', - // 目标市场 - targetMarket: '', - // 公告车型号 - carModel: '', - // 项目相关人员id - relatePerson: '', - // eop信息 - eopTime: '', - // 项目相关信息 - saleMarket: '', - // 判断是国内还是海外 - prodectCode: '', - // carModeFile: '' - // carModeFileList: '' - // 相关人员信息 - relatePersonShow: '' - // 相关人员姓名 - }, // 项目类型 protypeOptions: [], // 生产基地 @@ -716,31 +780,6 @@ export default { this.isAdvancedSearch = true this.threeOptions = [] }, - twoSelectChange (val, obj) { - console.log('twoSelectChange') - if (val === 'product_type') { - this.threeOptions = this.productTypeOptions - } else if (val === 'product_brand') { - this.threeOptions = this.xmztOptions - } else if (val === 'target_market') { - this.threeOptions = this.targetMarketOptions - } else if (val === 'left_right') { - this.threeOptions = [{ - label: '左驾', - value: '1' - },{ - label: '右驾', - value: '2' - }] - } - }, - // 编辑项目相关人员回显选中人员数据 - relatePersonTreeShow () { - let checkedArr = this.localProEO.relatePerson ? this.localProEO.relatePerson.split(',') : [] - if (checkedArr.length > 0) { - this.$refs.relatePersonRoleTree.checkedNode(this.localProEO.relatePerson.split(',')) - } - }, // 获取标准类别List数据 getAllInforList () { this.$http.get('sys/dictype/getDicTypeListCode', {}, {_this: this}, res => { @@ -954,6 +993,7 @@ export default { this.localProTableSearch = {...this.localProTableSearchDefault} this.projectLibrarySearch = {...this.projectLibrarySearchDefault} this.localProTableSearch.page = 1 + this.isAdvancedSearch=false this.getLocalProductTable() }, resolveTime (data) { @@ -1146,7 +1186,7 @@ export default { // 条件分页查询 getLocalProductTableBtn () { this.projectLibrarySearch.page = 1 - + this.isAdvancedSearch=false this.getLocalProductTable() }, // 查询本地产品 From ac9b608d16f84b77d7c88c75e77f48b18feb1104 Mon Sep 17 00:00:00 2001 From: Jaunty <15613469426@163.com> Date: Fri, 9 Jul 2021 15:23:31 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2=E6=A0=B7=E5=BC=8F=E6=9B=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../localProductsOrProjectLibrary/index.vue | 226 ++++++++---------- 1 file changed, 94 insertions(+), 132 deletions(-) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue index f7c56627e..6cf1e22a7 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue @@ -66,133 +66,9 @@ v-btn-permission="'e5ca15122f554414e6365eb09efac5c4'" @click="selectMoreBtn" >高级查询 -
- - - - - - - - - - - - - - - - - - - - {{ opt.label}} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 查询 - 清空 - - - - - -
-
-
@@ -328,6 +204,76 @@ @pageChange="pageChange" @pageSizeChange="pageSizeChange"> 数据获取中 + + +
+ + + + + + + + + + + + + + + + + {{ opt.label}} + + + + + + {{ opt.label}} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
@@ -384,8 +330,11 @@ export default { }, //查询3类 projectLibrarySearchDefault: { + // 项目名称 projectName: '', + // 项目分类 projectClassification: '', + // 项目状态 projectStatus: '', }, // 查询条件 @@ -405,10 +354,6 @@ export default { productLine:'', // 项目名称 projectName: '', - // 项目分类 - projectClassification: '', - // 项目状态 - projectStatus: '', // 项目群 projectGroup: '', // 项目开始日期 @@ -439,10 +384,6 @@ export default { productLine:'', // 项目名称 projectName: '', - // 项目分类 - projectClassification: '', - // 项目状态 - projectStatus: '', // 项目群 projectGroup: '', // 项目开始日期 @@ -1591,6 +1532,8 @@ export default { From 14af9d5f5cfca81f08ade8e70ada485cfb8c0f8b Mon Sep 17 00:00:00 2001 From: Jaunty <15613469426@163.com> Date: Fri, 9 Jul 2021 15:39:35 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2=E6=A0=B7=E5=BC=8F=E6=9B=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../localProductsOrProjectLibrary/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue index 6cf1e22a7..4817d13dc 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue @@ -1572,13 +1572,14 @@ export default { border-right: none; line-height:30px; text-align: center; - margin-top: 6px; + margin-top: 7px; background: #F9F9F9; } /deep/.el-input__inner { height: 30px; line-height: 30px; border-radius: 0 !important; + width: 200px; } } } From 47da77630bfef54b69f87805b3888a7bc743b107 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Fri, 9 Jul 2021 16:21:45 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmpg/step1.vue | 82 +++- .../pages/creatProcess/xmpg/step2.vue | 449 ++++++++++++++++++ .../pages/creatProcess/xmpg/step3.vue | 449 ++++++++++++++++++ .../pages/creatProcess/xmpg/step4.vue | 13 + .../pages/creatProcess/xmpg/step5.vue | 13 + .../pages/creatProcess/xmpg/step6.vue | 13 + .../pages/creatProcess/xmpg/step7.vue | 13 + src/router/index.js | 54 +++ 8 files changed, 1067 insertions(+), 19 deletions(-) create mode 100644 src/pages/processCenter/pages/creatProcess/xmpg/step2.vue create mode 100644 src/pages/processCenter/pages/creatProcess/xmpg/step3.vue create mode 100644 src/pages/processCenter/pages/creatProcess/xmpg/step4.vue create mode 100644 src/pages/processCenter/pages/creatProcess/xmpg/step5.vue create mode 100644 src/pages/processCenter/pages/creatProcess/xmpg/step6.vue create mode 100644 src/pages/processCenter/pages/creatProcess/xmpg/step7.vue diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index e0bc6558e..a4d847af7 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -39,6 +39,22 @@ clearable > + + + + + + @@ -70,19 +86,17 @@ label="产品线"> + -