diff --git a/src/pages/config/pages/attributeCustom/components/stand.vue b/src/pages/config/pages/attributeCustom/components/stand.vue index af18030c8..64706c03e 100644 --- a/src/pages/config/pages/attributeCustom/components/stand.vue +++ b/src/pages/config/pages/attributeCustom/components/stand.vue @@ -135,7 +135,7 @@ - + 属性 - 编辑 + 编辑 编辑 复制 删除 diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue new file mode 100644 index 000000000..3fef3de73 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue @@ -0,0 +1,432 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue index c38825090..3de6d38dd 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue @@ -556,8 +556,8 @@ export default { }) } else { this.$message.warning('流程启动失败') + this.isSubmit = false } - this.isSubmit = false }) } else { return this.$message.warning('请完善人员信息') diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue index e0d16c839..1d19fe428 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue @@ -357,7 +357,6 @@ json.commentText = this.commentText json.info = this.data json.department = this.$store.getters.userInfo.orgName - json.introduce = true this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), taskId: this.taskIds, @@ -383,17 +382,7 @@ this.form.endTime = data.endTime this.form.cname = data.cname this.json = data - if (data.introduce) { - this.data = data.info || [] - } else { - this.$http.get('slrs/sar-public-idea-all/getPublicIdea', { - unique: data.uniques - }, {}, res => { - res.data.forEach(item => { - this.data.push(item) - }) - }) - } + this.data = data.info || [] }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue index 0d73dd9a0..1320b9156 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue @@ -330,6 +330,7 @@ var json = this.json json.oldinfo = this.oldData json.commentText = this.commentText + json.introduce = true this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), taskId: this.taskIds, @@ -364,6 +365,18 @@ }) this.json = data this.data = data.summaryList + if (data.introduce) { + } else { + this.$http.get('slrs/sar-public-idea-all/getPublicIdea', { + unique: data.uniques + }, {}, res => { + res.data.forEach(item => { + item.chapterNumber = item.partCode + item.responUserName= item.userName + this.data.push(item) + }) + }) + } }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index f7be9ed8a..2f8411f01 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -219,6 +219,8 @@ export default { }else{ this.toProcessDetail('xmpg2Step1-2',row) } + }else if(prcType === '9'){ + this.toProcessDetail('bzjdStep1-6',row) } } else { this.$message.warning('当前流程未全部办理完成，无法查看') diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 2d783eefe..d2758415a 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -1066,7 +1066,7 @@ class="common-button-primary" icon="el-icon-check" type="primary" - @click="getDomesticStandardTableBtn(sarBussionessSearch)">搜索 + @click="getBussionStandTableBtn(sarBussionessSearch,'','sel')">搜索 { + const value = this.sarBussionessSearch[item.attrField] + // 时间格式处理 + if (value !== undefined && value !== null && value !== '') { + advanceSearchVOList.push({ + connect: advanceSearchVOList.length > 0 ? "and" : "", + field: item.attrField || '', + type: 'like', + value: value + }) + } + }) + } + this.sarBussionessSearch.advanceSearchVOStr = JSON.stringify(advanceSearchVOList); + } this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', !item ? this.sarBussionessSearch : item, { _this: this, loading: 'loading' }, res => { @@ -3409,6 +3428,7 @@ export default { if ((this.standinfoList.length === 0 || this.standinfoList === []) && this.sarBussionessSearch.page !== 1) { this.pageChange(1) } + this.isAdvancedSearch = false }, e => { }) // this.$refs.selection.selectAll(false) @@ -3685,22 +3705,7 @@ export default { const attrSearchMap = { applyArctic: formData.applyArctic } - formData['attrSearchStr'] = JSON.stringify(attrSearchMap) - - const advanceSearchVOList = []; - const formFieldList = this.formFieldList - formFieldList.forEach((item) => { - const value = formData[item.attrField] - // 时间格式处理 - if (value !== null && value !== '') { - advanceSearchVOList.push({ - field: item.attrField || '', - type: 'like', - value: value - }) - } - }) - formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList); + formData['attrSearchStr'] = JSON.stringify(attrSearchMap) this.SarExportSearchEo = item || this.sarBussionessSearch this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, { _this: this, loading: 'loading' @@ -3914,10 +3919,10 @@ export default { // this.classifyCodeOptions = res.data.STANDCLASSIFY }, e => { }) - this.getBussionStandTable(this.tableFlag) - // this.getOrgTreeSource() // 加载动态表单数据 this.getAddFormFieldList() + this.getBussionStandTable(this.tableFlag) + // this.getOrgTreeSource() this.tableHeight = $('.content').height() - 44 - 20 window.onresize = () => { this.tableHeight = $('.content').height() - 44 - 20 diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue index 04b1c3912..dda9cc87c 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue @@ -734,7 +734,8 @@ export default { }, res => { if (res.ok) { // this.$message.success(res.message) - this.getDataList() + // this.getDataList() + this.showLocalProductData(this.getLocalPro) } }, e => { }); @@ -838,7 +839,8 @@ export default { this.proId = this.localProEO.id // 查询详情表格数据 this.$http.get('sarStandProjectLibrary/queryStandInfo', { - id: this.localProEO.id + id: this.localProEO.id, + cars: "1" }, { _this: this, loading: 'loading' diff --git a/src/router/index.js b/src/router/index.js index c01c0ef07..cb6fc9cd6 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -862,6 +862,15 @@ const routes = [ title: '标准解读流程' } }, + { + path: '/bzjdStep1-6', + name: 'bzjdStep1-6', + component: () => import('@/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue'), + meta: { + requireAuth: true, + title: '标准解读流程' + } + }, ] }, // 本地工具