diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue new file mode 100644 index 000000000..bc2aba78e --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue @@ -0,0 +1,1456 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index 00b06a111..7bd76fbbd 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -1012,11 +1012,11 @@ export default { _formData.append('createUserName', this.$store.getters.userInfo.userName) _formData.append('prcType', '4') _formData.append('json', JSON.stringify({ - form: this.form, + form: this.listForm, roleForm: this.roleForm, commentText: this.commentText })) - saveTaskFirst(_formData).then(res => { + saveTaskFirst(_formData).then(res => { this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue index 6bb1abe0b..5ae8b512e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue @@ -37,13 +37,15 @@ clearable > - + - diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 27deb03e8..3f8d70f52 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -58,7 +58,7 @@ > - + - + - + - + - + - + - + - + - + - + - + - + - + - + {{'手动查找'}} - + @@ -859,6 +859,7 @@ @@ -984,6 +985,7 @@ @@ -991,7 +993,7 @@ - + - + @@ -459,7 +459,7 @@ label-width="150px" class="add-form-item" > - + @@ -1295,6 +1295,8 @@ export default { children: 'children', label: 'menuName' }, + id: '', // 收藏数据的id + collectId: '', // 收藏id modalShowFlag1: false, // drawer开关 modalShowFlag2: false, // drawer开关 modalShowFlag3: false, // drawer开关 @@ -2262,6 +2264,8 @@ export default { }, // 编辑标准属性 selectStandardPro (item, state) { + this.id = item.id + this.collectId = item.collectId this.addOrUPdateFlag = 2 this.modalshowtitle = '编辑国内标准' this.modalshowflag = true @@ -3116,6 +3120,16 @@ export default { }, res => { this.isSubmit = false if (res.ok) { + this.personCollect.collectType = 'INLAND_STAND' + this.personCollect.id = this.id + this.personCollect.collectResId = this.collectId + this.personCollect.collectTitle = this.sarStandardsInfoEO.standName + this.personCollect.userId = this.$store.getters.userInfo.userId + this.$http.putData('person/personCollect/updatePersonCollect', this.personCollect, { + _this: this, + loading: 'loading' + }, res => { + }, e => {}) this.getDomesticStandardTable(this.tableFlag) this.resetForm() if (this.addOrUPdateFlag === 1) { diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index accef9644..b394854ef 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -510,7 +510,7 @@ label-width="150px" class="add-form-item" > - + @@ -520,7 +520,7 @@ label-width="150px" class="add-form-item" > - + @@ -2048,7 +2048,7 @@ export default { Promise.all([this.queryDisplayLocation()]).then((values) => { const [displayLocation] = values const formFieldList = this.formFieldList - console.log(formFieldList) + console.log(formFieldList, 'AAAAAAAAAAAAAAAAAAAAA') this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item)) this.defaultCheckedKeys = [this.sarStandardsInfoEO.standSystem]; this.sarStandardsInfoEO.standSort = item.standSort diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue b/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue index da111f143..d79752675 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue @@ -25,7 +25,7 @@ :maxlength="100"> - + { @@ -510,7 +521,7 @@ export default { }) window.open(routeUrl.href, '_blank') }, e => { - }) + })*/ }, getOrgTreeSource () { this.$http.get('sys/org/getTree', {}, {_this: this}, @@ -612,8 +623,9 @@ export default { // }) // }, treeClickSearch (treeId, treeNode) { - this.historySearch.responseUnit = treeNode.id + this.historySearch.responsibleUnit = treeNode.id this.historySearch.responseUnitShow = treeNode.name + this.$forceUpdate() }, // 点击清空按钮事件 clearAllSearch () { @@ -621,7 +633,8 @@ export default { standNumOrName: '', quesType: '', productName: '', - responseUnit: '' + responsibleUnit: '', + responseUnitShow:'' } this.getTableBtn() }, diff --git a/src/router/index.js b/src/router/index.js index eac7a7939..99a83b87c 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -249,6 +249,15 @@ const routes = [ title: '标准清单发布/更新流程' } }, + { + path: '/bzqdfbStep1-1', + name: 'bzqdfbStep1-1', + component: () => import('@/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue'), + meta: { + requireAuth: true, + title: '标准清单发布/更新流程' + } + }, { path: '/bzqdfbStep2', name: 'bzqdfbStep2',