diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index affcc92df..b7bc135d9 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -139,7 +139,6 @@ {{ child.value ? child.value.substring(0,10) : '-' }} @@ -199,103 +198,9 @@ - +
{{ item.showAll ? '收起' : '更多' }} diff --git a/src/pages/personal/pages/my-collection/components/CollectionStandard.vue b/src/pages/personal/pages/my-collection/components/CollectionStandard.vue index 2c38af157..1724579a5 100644 --- a/src/pages/personal/pages/my-collection/components/CollectionStandard.vue +++ b/src/pages/personal/pages/my-collection/components/CollectionStandard.vue @@ -62,7 +62,7 @@ 创建时间:{{getDate(item.creationTime)}}
- 取消收藏 + 取消收藏
@@ -150,7 +150,7 @@ export default { }, e => {}) }, // 取消收藏 - cancelStandard (id) { + cancelStandard (item) { this.$confirm('确定取消收藏此数据?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', @@ -158,16 +158,18 @@ export default { confirmButtonClass: 'common-button-primary', roundButton: true }).then(() => { - var json = {} - json.userId = this.$store.getters.userInfo.userId - json.id = id - this.$http.postData('/sarPersonalCenter/sar-user-star/delete',json, { + // var json = { + // id: item.collectId + // } + // json.userId = this.$store.getters.userInfo.userId + this.$http.put('person/personCollect/updateByUserId',{'id': item.id}, { _this: this }, res => { if (res.ok) { this.$message.success('已取消收藏') this.contentOpen = false this.pageChange(1) + this.selectStandard() } }, e => { }) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index a752a4237..394dfb9b2 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -512,7 +512,7 @@ :key="key1" :lazy=true :multiple=true - :check-Strictly="false" + :check-strictly= true :modalShowFlag="modalShowFlag2" :drawerTitle="drawerTitle" :show-checkBox="showCheckBox" @@ -528,7 +528,7 @@ :key="key2" :lazy=true :multiple=true - :check-Strictly="false" + :check-strictly= true :modalShowFlag="modalShowFlag3" :drawerTitle="drawerTitle" :show-checkBox="showCheckBox" @@ -544,7 +544,7 @@ :key="key3" :lazy=true :multiple=true - :check-Strictly="false" + :check-strictly= true :modalShowFlag="modalShowFlag4" :drawerTitle="drawerTitle" :url="url" @@ -678,8 +678,8 @@ - - + + @@ -1400,6 +1400,7 @@ categoryOptions: [], // 能源类型 applyAuthOptions: [], // 适用认证 cysdOptions: [], // 我司参与深度 + cbcdOptions: [], // 采标程度 wssmrOptions: [], // 我司署名人 sycpxOptions: [], // 适用产品线 zrbmOptions: [], // 责任部门 @@ -1583,6 +1584,7 @@ console.log(bringData) const json = Object.assign(bringData, bringData.attrInfoCaseMap); this.form = JSON.parse(JSON.stringify(json)) + console.log(json,'AAAAAAA') this.form.qcdw = JSON.parse(JSON.stringify(json)).qcdw ? JSON.parse(JSON.stringify(json)).qcdw.split(',') : [] this.form.wssmr = JSON.parse(JSON.stringify(json)).wssmr ? JSON.parse(JSON.stringify(json)).wssmr.split(',') : [] this.form.zrgcs = JSON.parse(JSON.stringify(json)).zrgcs ? JSON.parse(JSON.stringify(json)).zrgcs.split(',') : [] @@ -2190,6 +2192,7 @@ this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 this.qcdwOption = res.data.QCDW // 体系类别 this.gkglbmOptions = res.data.GKGLBM // 归口管理部门 + this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度 this.setMap(this.standStateOptions) }) this.busVsFunc() diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index 8119b4907..7abdff57a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -452,8 +452,7 @@ - - + @@ -819,6 +818,7 @@ standSystemOptions: [], // 标准体系 applyArcticOptions: [], // 适用车型 gkglbmOptions: [], // 归口管理部门 + cbcdOptions: [], // 采标程度 categoryOptions: [], // 能源类型 applyAuthOptions: [], // 适用认证 cysdOptions: [], // 我司参与深度 @@ -1069,6 +1069,7 @@ this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 this.txlbOptions = res.data.TXLBCLASS // 体系类别 this.gkglbmOptions = res.data.GKGLBM // 归口管理部门 + this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度 this.key++ }) this.busVsFunc() diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue index 195c686e1..3e9ed0aff 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue @@ -445,8 +445,7 @@ - - + @@ -793,6 +792,7 @@ export default { standSystemOptions: [], // 标准体系 applyArcticOptions: [], // 适用车型 gkglbmOptions: [], // 归口管理部门 + cbcdOptions: [], // 采标程度 categoryOptions: [], // 能源类型 applyAuthOptions: [], // 适用认证 cysdOptions: [], // 我司参与深度 @@ -1053,6 +1053,7 @@ export default { this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 this.txlbOptions = res.data.TXLBCLASS // 体系类别 this.gkglbmOptions = res.data.GKGLBM // 归口管理部门 + this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度 this.key++ }) this.busVsFunc() diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index 72d26af15..8863bb43e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -663,8 +663,7 @@ - - + @@ -1224,6 +1223,7 @@ export default { applyArcticOptions: [], // 适用车型 categoryOptions: [], // 能源类型 gkglbmOptions: [], // 归口管理部门 + cbcdOptions: [], // 采标程度 applyAuthOptions: [], // 适用认证 cysdOptions: [], // 我司参与深度 wssmrOptions: [], // 我司署名人 @@ -1750,6 +1750,7 @@ export default { this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 this.txlbOptions = res.data.TXLBCLASS // 体系类别 this.gkglbmOptions = res.data.GKGLBM // 归口管理部门 + this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度 this.treeStatus = true this.key++ }) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue index cd985bbda..2d414fb44 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue @@ -463,8 +463,7 @@ - - + @@ -782,6 +781,7 @@ applyArcticOptions: [], // 适用车型 categoryOptions: [], // 能源类型 gkglbmOptions: [], // 归口管理部门 + cbcdOptions: [], // 采标程度 applyAuthOptions: [], // 适用认证 cysdOptions: [], // 我司参与深度 sycpxOptions: [], // 适用产品线 @@ -977,6 +977,7 @@ this.txlbOptions = res.data.TXLBCLASS // 体系类别 this.qcdwOption = res.data.QCDW // 体系类别 this.gkglbmOptions = res.data.GKGLBM // 归口管理部门 + this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度 }) } } diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index a4a42d0cf..22d775b54 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -995,7 +995,8 @@