From 552dac07873963a1b3d07c25f88cb57f66a267ff Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Mon, 6 Sep 2021 09:31:02 +0800 Subject: [PATCH 01/11] commit --- src/pages/login/index.vue | 7 ------- .../standardForComments/pags/consultationDetails.vue | 6 ++++++ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue index d7595304a..6e69bf328 100644 --- a/src/pages/login/index.vue +++ b/src/pages/login/index.vue @@ -289,22 +289,15 @@ }) }, loginNew (res) { - window.sessionStorage.setItem('go1', '开始第一步'); // del if (res.data.orgId === null || res.data.orgId === '') { this.$message.warning('未分配组织机构,请联系管理员分配后重新登录') return } - window.sessionStorage.setItem('go2', '开始第二步'); // del let Base64 = require('js-base64').Base64 - window.sessionStorage.setItem('go3', '开始第3步'); // del let userInfoStr = Base64.decode(res.data) - window.sessionStorage.setItem('go4', '开始第4步'); // del let userInfo2 = decodeURIComponent(userInfoStr) - window.sessionStorage.setItem('go5', '开始第5步'); // del let userInfoObj = JSON.parse(userInfo2) - window.sessionStorage.setItem('go6', '开始第6步'); // del userInfoObj.userId = userInfoObj.usid - window.sessionStorage.setItem('go7', '开始第7步'); // del window.sessionStorage.setItem('userInfoObj', userInfoObj); // del this.setToken(userInfoObj.token) // vuex存储token let userInfo = {} diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue index c6b2707c8..37267af2f 100644 --- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue +++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue @@ -48,6 +48,12 @@ style="width: 100%" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}"> + + Date: Mon, 6 Sep 2021 10:10:29 +0800 Subject: [PATCH 02/11] feat: There is no way the --- .../components/EnterpriseStandardDatabase.vue | 48 +++++++++++++++++-- 1 file changed, 45 insertions(+), 3 deletions(-) diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index be621f770..77f052cef 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -3658,9 +3658,51 @@ export default { const data = this.formFieldListData this.formFieldList = data.map((item) => { if (item.attrType === 'SEL_OPTION' || item.attrType === 'SEL_OPTS') { - return Object.assign({}, item, { - options: this.allSelectOptions[item.selVal] - }) + if(item.attrField === 'WSSMR'){ + return Object.assign({}, item, { + options: this.allSelectOptions["WSSMR"] + }) + }else if(item.attrField === 'QCDW'){ + return Object.assign({}, item, { + options: this.allSelectOptions["QCDW"] + }) + }else if(item.attrField === 'CYSD'){ + return Object.assign({}, item, { + options: this.allSelectOptions["WSCYSD"] + }) + }else if(item.attrField === 'SYCXCLASS'){ + return Object.assign({}, item, { + options: this.allSelectOptions["ENERGYTYPES"] + }) + }else if(item.attrField === 'NYLX'){ + return Object.assign({}, item, { + options: this.allSelectOptions["NYLXCLASS"] + }) + }else if(item.attrField === 'SYCPX'){ + return Object.assign({}, item, { + options: this.allSelectOptions["SYCPXCLASS"] + }) + }else if(item.attrField === 'SYRZ'){ + return Object.assign({}, item, { + options: this.allSelectOptions["SYRZCLASS"] + }) + }else if(item.attrField === 'ZRBM'){ + return Object.assign({}, item, { + options: this.allSelectOptions["ZRBMCLASS"] + }) + }else if(item.attrField === 'ZRGCS'){ + return Object.assign({}, item, { + options: this.allSelectOptions["ZRGCSCLASS"] + }) + }else if(item.attrField === 'TXLB'){ + return Object.assign({}, item, { + options: this.allSelectOptions["TXLBCLASS"] + }) + }else { + return Object.assign({}, item, { + options: this.allSelectOptions[item.selVal] + }) + } } else { return item } From 3d50aac0b61f05eab790a7a92c338fe0ebb1d98a Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Mon, 6 Sep 2021 11:03:33 +0800 Subject: [PATCH 03/11] commit --- .../pages/creatProcess/bzdy/step1-1.vue | 48 ++++++++++---- .../pages/creatProcess/bzdy/step1.vue | 66 ++++++++++--------- .../pages/creatProcess/bzdy/step2.vue | 17 +++-- .../pages/creatProcess/bzdy/step3.vue | 16 ++--- .../pages/creatProcess/bzdy/step4.vue | 12 ++-- 5 files changed, 97 insertions(+), 62 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue index bb093c810..9d1c8d3e1 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue @@ -38,15 +38,17 @@ placeholder="请选择完成时间"> - + -
- {{ form.modelName }} +
+
+ {{ item.name }} +
@@ -212,8 +216,8 @@ form: { title: '', // 调研标题 date: '', // 完成时间 - model: '', // 上传模板 - modelName: '' + modelList: [], + modelNameList: '' }, formRules: { title: [ @@ -222,7 +226,7 @@ date: [ { type: 'date', required: true, message: '请选择完成时间', trigger: 'change' } ], - modelName: [ + modelNameList: [ { required: true, message: '请上传调研结果', trigger: 'change' }, ] }, @@ -344,12 +348,34 @@ } return true }, + importFileRemove (file, fileList) { + let list = '' + this.form.modelList = [] + fileList.forEach(item => { + this.form.modelList.push(item) + if (list.length > 0) { + list += ',' + list += item.name + } else { + list+= item.name + } + }) + this.form.modelNameList = list + }, // 导入标准数据成功后执行 importFileSuccess (response, file) { if (response.ok) { - this.fileMadel = false - this.form.model = response.data.id - this.form.modelName = response.data.name + this.form.modelList.push(response.data) + let list = '' + this.form.modelList.forEach(item => { + if (list.length > 0) { + list += ',' + list += item.name + } else { + list+= item.name + } + }) + this.form.modelNameList = list this.$message({ showClose: true, message: response.message, diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue index 2422224f2..d0324a5ff 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue @@ -38,15 +38,17 @@ placeholder="请选择完成时间"> - + -
- {{ form.modelName }} +
+
+ {{ item.name }} +
点击上传 - - - - -
@@ -174,6 +171,7 @@ >
@@ -190,7 +188,6 @@

点击或拖拽上传文件

 -
@@ -205,9 +202,6 @@ export default { name: "bzdyStep1", data() { return { - // isFileUploadStr:'点击上传', - progressType: false, - loadProgress: 0, commentText: '', nodeList: [], nodeList2: [], @@ -223,8 +217,8 @@ export default { form: { title: '', // 调研标题 date: '', // 完成时间 - model: '', // 上传模板 - modelName: '' + modelList: [], + modelNameList: '' }, formRules: { title: [ @@ -233,7 +227,7 @@ export default { date: [ { type: 'date', required: true, message: '请选择完成时间', trigger: 'change' } ], - modelName: [ + modelNameList: [ { required: true, message: '请上传调研结果', trigger: 'change' }, ] }, @@ -320,10 +314,6 @@ export default { this.drawerTitle = title this.modalshowflag = true }, - progressFile (event, file, fileList) { - let loadProgress = Math.floor(event.percent) - this.loadProgress = loadProgress - }, // 导入按钮 上传之前的钩子 beginImportFile (file) { var filename = file.name @@ -332,13 +322,11 @@ export default { var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - this.progressType = true if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { return true } else { this.spinShow = false this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件') - this.progressType = false return false } // 判断文件上传大小 @@ -347,20 +335,38 @@ export default { return true } else { this.$message.error('文件' + file.name + '大小不超过200M') - this.progressType = false return false } return true }, + importFileRemove (file, fileList) { + let list = '' + this.form.modelList = [] + fileList.forEach(item => { + this.form.modelList.push(item) + if (list.length > 0) { + list += ',' + list += item.name + } else { + list+= item.name + } + }) + this.form.modelNameList = list + }, // 导入标准数据成功后执行 importFileSuccess (response, file) { if (response.ok) { - // this.isFileUploadStr='点击查看已上传文件'; - this.fileMadel = false; - this.loadProgress = 0 - this.progressType = false - this.form.model = response.data.id - this.form.modelName = response.data.name + this.form.modelList.push(response.data) + let list = '' + this.form.modelList.forEach(item => { + if (list.length > 0) { + list += ',' + list += item.name + } else { + list+= item.name + } + }) + this.form.modelNameList = list this.$message({ showClose: true, message: response.message, diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue index 842b3a8d0..b8f2b7825 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue @@ -41,8 +41,10 @@ -
- {{ form.modelName }} +
+
+ {{ item.name }} +
- - @@ -178,7 +180,7 @@ form: { title: '', // 调研标题 date: '', // 完成时间 - model: '', // 上传模板 + modelList: [], responUserList: '', responUserListName: '', }, @@ -203,8 +205,8 @@ this.histortData = res }, e => {}) }, - updateFile () { - window.location.href = '/api/att/attFile/downloadFile?fileId=' + this.form.model + updateFile (item) { + window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id }, checkedRole2 (data) { var idList = '' @@ -276,11 +278,12 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) + this.form.modelList = data.modelList || data.form.modelList this.form.title = data.title || data.form.title this.form.date = data.date || data.form.date this.json = data || data.form - this.form.model = data.model || data.form.model - this.form.modelName = data.modelName || data.form.modelName + // this.form.model = data.model || data.form.model + // this.form.modelName = data.modelName || data.form.modelName this.form.responUserList = data.form.responUserList this.form.responUserListName = data.form.responUserListName }).catch(e => { diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue index e3f635c75..a3183f640 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue @@ -41,8 +41,10 @@ -
- {{ form.modelName }} +
+
+ {{ item.name }} +
- - @@ -197,8 +199,7 @@ form: { title: '', // 调研标题 date: '', // 完成时间 - model: '', // 上传模板 - modelName: '', + modelList: [], fileId: '', fileName: '', responUserList: '', @@ -227,8 +228,8 @@ this.histortData = res }, e => {}) }, - updateFile () { - window.location.href = '/api/att/attFile/downloadFile?fileId=' + this.form.model + updateFile (item) { + window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id }, // 导入按钮 上传之前的钩子 beginImportFile (file) { @@ -323,8 +324,7 @@ this.form.title = data.title || data.form.title this.form.date = data.date || data.form.date this.json = data || data.form - this.form.model = data.model || data.form.model - this.form.modelName = data.modelName || data.form.modelName + this.form.modelList = data.modelList || data.form.modelList this.form.responUserList = data.form.responUserList this.form.responUserListName = data.form.responUserListName this.form.fileName = data.form.fileName || data.fileName || '' diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue index 1ce3a071e..53fde2da7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue @@ -41,8 +41,10 @@ -
- {{ form.modelName }} +
+
+ {{ item.name }} +
- - @@ -169,8 +171,7 @@ form: { title: '', // 调研标题 date: '', // 完成时间 - model: '', // 上传模板 - modelName: '', + modelList: [], fileId: '', fileName: '', responUserList: '', @@ -257,8 +258,7 @@ this.json = data || data.form this.form.file = data.fileId || data.form.fileId this.form.fileName = data.fileName || data.form.fileName - this.form.model = data.model || data.form.model - this.form.modelName = data.modelName || data.form.modelName + this.form.modelList = data.modelList || data.form.modelList }).catch(e => { }) }) From c9e0ae673a70cddbf1d17b48aebca7c1cafa8eb4 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Mon, 6 Sep 2021 11:11:30 +0800 Subject: [PATCH 04/11] commit --- src/router/index.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index a5808bd79..40b714995 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2066,10 +2066,8 @@ router.onError((error) => { }) router.beforeEach((to, from, next) => { - console.log(111); let toName = to.name let token = store.state.token - console.log(toName); // 返回值为登录状态 if ((token === null || token === '') && (toName !== 'Login' && to.meta.requireAuth)) { return next('/Login') From 3d50da740d3df24162a702e69be927cb31207fa2 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Mon, 6 Sep 2021 15:58:41 +0800 Subject: [PATCH 05/11] feat: There is no way the #47603 --- .../components/EnterpriseStandardDatabase.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 77f052cef..e7e861760 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -459,7 +459,7 @@ clearable> + prop="textStatusBuss" label-width="150px" class="add-form-item"> Date: Mon, 6 Sep 2021 16:19:19 +0800 Subject: [PATCH 06/11] feat: There is no way the #47669 --- .../components/EnterpriseStandardDatabase.vue | 38 ++++++------------- 1 file changed, 11 insertions(+), 27 deletions(-) diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index e7e861760..ed4db2f2c 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -529,7 +529,7 @@ class="add-form-item" > - +