-
-
-
![]()
-
-
+
+
+
+
+
+
![]()
+
+
-
-
-
-
-
-
-
-
![]()
-
-
-
-
-
-
-
-
-
-
![]()
-
-
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
![]()
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
![]()
-
-
-
-
-
-
-
-
-
-
![]()
-
-
-
-
-
-
-
-
-
-
![]()
-
-
-
-
-
-
-
-
-
-
![]()
-
-
-
-
-
-
-
-
-
-
![]()
-
-
-
-
-
-
-
-
-
-
![]()
-
-
-
-
-
-
-
-
-
-
![]()
-
-
-
-
-
-
-
-
-
-
-
-
-
![]()
-
-
-
-
-
-
-
-
-
+
+
+
标准化活动相关流程
+
+
+
+
+
+
+
![]()
+
+
+
+
+
+
+
+
+
+
+
![]()
+
+
+
+
+
+
+
+
+
+
+
![]()
+
+
+
+
+
+
+
+
+
+
+
![]()
+
+
+
+
+
+
+
+
+
+
+
![]()
+
+
+
+
+
+
+
+
+
+
+
![]()
+
+
+
+
+
+
+
+
+
+
+
![]()
+
+
+
+
+
+
+
+
+
+
+
![]()
+
+
+
+
+
+
+
+
+
+
+
![]()
+
+
+
+
+
+
+
@@ -769,10 +775,10 @@ export default {
addOrEdit: '',
attributeEOFormRules: {
lawCode: [
- { required: true, message: '标准编号/政策编号不能为空', trigger: 'blur' },
+ { required: true, message: '标准编号/政策编号不能为空', trigger: 'change' },
],
lawName: [
- { required: true, message: '标准名称/政策名称不能为空', trigger: 'blur' },
+ { required: true, message: '标准名称/政策名称不能为空', trigger: 'change' },
],
productType: [
{ required: true, message: '产品类型不能为空', trigger: 'change' }
@@ -891,7 +897,6 @@ export default {
},
// 点击查看
handlePreview(item) {
- console.log('539',item)
if (item.standType === "INLAND"){
let routeUrlINLAND = this.$router.resolve({
name: 'OtherStandardDetails',
@@ -962,14 +967,12 @@ export default {
this.$message.warning('请选择一条数据')
}
else {
- console.log('619',this.handleSelectForm.dataSource)
this.attributeEO.dataSource = this.handleSelectForm.dataSource
this.attributeEO.lawId = this.handleSelectTableList[0].id
this.attributeEO.lawCode =this.handleSelectTableList[0].standCode || this.handleSelectTableList[0].lawsNumber || this.handleSelectTableList[0].standSort+" "+this.handleSelectTableList[0].standNumber+"-"+this.handleSelectTableList[0].standYear
this.attributeEO.lawName = this.handleSelectTableList[0].standName || this.handleSelectTableList[0].lawsName
this.selectModal = false
}
- console.log('确定',this.handleSelectTableList)
},
//手动查找的清空按钮
clearLawBtn(){
@@ -990,12 +993,10 @@ export default {
//手动查找的查询按钮
searchLawBtn(){
this.lawInfoTableLoading = true
- console.log('533',this.handleSelectForm.dataSource)
if (this.handleSelectForm.dataSource === 'INLAND'){
this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',this.handleSelectForm,{
_this: this
},res=>{
- console.log('国内标准库数据',res)
if (res.ok){
this.lawInfoTable = res.data.list
this.handleSelectForm.total = res.data.count
@@ -1013,12 +1014,10 @@ export default {
this.lawInfoTable = []
this.handleSelectForm.total = 0
})
- console.log('国内标准库')
}else if(this.handleSelectForm.dataSource === 'FOREIGN'){
this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',this.handleSelectForm,{
_this: this
},res=>{
- console.log('海外标准库数据',res)
if (res.ok){
this.lawInfoTable = res.data.list
this.handleSelectForm.total = res.data.count
@@ -1036,12 +1035,10 @@ export default {
this.lawInfoTable = []
this.handleSelectForm.total = 0
})
- console.log('海外标准库')
}else if(this.handleSelectForm.dataSource === 'FOREIGN_LAWS'){
this.$http.get('lawss/sarLawsInfo/page',this.handleSelectForm,{
_this: this
},res=>{
- console.log('国内外政策库数据',res)
if (res.ok){
this.lawInfoTable = res.data.list
this.handleSelectForm.total = res.data.count
@@ -1059,12 +1056,10 @@ export default {
this.lawInfoTable = []
this.handleSelectForm.total = 0
})
- console.log('国内外政策库')
}else if(this.handleSelectForm.dataSource === 'BUSINESS_STAND'){
this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage',this.handleSelectForm,{
_this: this
},res=>{
- console.log('企业标准库数据',res)
if (res.ok){
this.lawInfoTable = res.data.list
this.handleSelectForm.total = res.data.count
@@ -1082,7 +1077,6 @@ export default {
this.lawInfoTable = []
this.handleSelectForm.total = 0
})
- console.log('企业标准库')
}else {
this.$message.warning('请先选择标准/政策来源')
}
@@ -1090,19 +1084,16 @@ export default {
handleSelectPageChange(page){
this.lawInfoTableLoading = true
this.handleSelectForm.page = page
- console.log(this.handleSelectForm.page)
this.searchLawBtn()
},
handleSelectPageSizeChange(pageSize){
this.lawInfoTableLoading = true
this.handleSelectForm.pageSize = pageSize
- console.log(this.handleSelectForm.pageSize)
this.searchLawBtn()
},
// 手动查找 table选择事件
handleSelectTableChange (row) {
this.handleSelectTableList = row
- console.log('我选的',this.handleSelectTableList)
},
//点击手动查找按钮
handleSelect() {
@@ -1116,6 +1107,7 @@ export default {
this.$refs['attributeEO'].validate((valid) => {
if (valid) {
if (this.addOrEdit === 'add') {
+ this.attributeEO.implTime = this.attributeEO.implTime.join(',')
this.submitLoading = true
this.$http.putData(
'sarIssueTrack/issueTrack',
@@ -1138,6 +1130,9 @@ export default {
}
)
} else {
+ if (typeof (this.attributeEO.implTime) === 'object'){
+ this.attributeEO.implTime = this.attributeEO.implTime.join(',')
+ }
this.$http.postData(
'sarIssueTrack/issueTrack',
this.attributeEO,
@@ -1213,6 +1208,7 @@ export default {
this.attributeTitle = '编辑'
this.getDictionarySelList(null)
this.attributeEO = JSON.parse(JSON.stringify(row))
+ this.attributeEO.implTime = row.implTime.split(',')
this.showInfoModal = true
}
},
@@ -1263,14 +1259,12 @@ export default {
});
}).catch(() => {
// 取消删除，清空选择
- // console.log(this.selectedList)
// this.selectedList = [];
})
}
},
// 更多
handleCommand (command) {
- console.log('536',command)
switch (command[1]) {
case '编辑':
this.showAddModel(2, command[0])
@@ -1287,7 +1281,6 @@ export default {
},
//分页查询
searchSarAccess (advanceSearch) {
- console.log('准备开始分页查询')
this.tableLoading = true
this.$http.get("sarIssueTrack/issueTrack", {
current: this.sarSarAccessEOSearch.page,
@@ -1298,13 +1291,11 @@ export default {
_this: this
}, res => {
let arr = res.data;
- console.log('分页查询中',arr)
this.sarAccessListDatas = arr.records
this.sarAccessListTotal = res.data.total
this.tableLoading = false
}, e => {
});
- console.log('分页查询完毕')
},
pageChange (page) {
this.sarSarAccessEOSearch.page = page
@@ -1362,7 +1353,6 @@ export default {
this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this
}, res => {
- console.log(res.data.WBZTCLASS)
this.setMap(res.data.WBZTCLASS)
}, e => {
})
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
index 57b044f8d..afb29ac50 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
@@ -418,7 +418,8 @@ export default {
dialogColor: false,
dialogType: "",
color: "",
- isShow: false
+ isShow: false,
+ countryAreaShow: ''
};
},
methods: {
@@ -654,11 +655,18 @@ export default {
},
// 点击查看
handlePreview(data) {
+ let item = {
+ country: this.countryAreaShow,
+ ssrq: data.ssrq,
+ xcxssrqgj: data.xcxssrqgj,
+ zccssrqgj: data.zccssrqgj
+ }
+ sessionStorage.setItem("accessCountry", JSON.stringify(item));
let routeUrl = this.$router.resolve({
name: "OtherStandardDetails",
params: {
id: data.id,
- pageType: data.standType
+ pageType: data.standType,
}
});
window.open(routeUrl.href, "_blank");
@@ -773,6 +781,7 @@ export default {
let accessRow = JSON.parse(sessionStorage.getItem("accessRow"));
this.pageId = accessRow.id;
this.sarAccessEO = accessRow;
+ this.countryAreaShow = accessRow.countryAreaShow
this.selectInfobyAccid();
this.getOrgTreeSource();
this.getFileInfo();
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index dbd4ae948..1cf1bbf63 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -782,6 +782,7 @@
+
{
displayLocation.forEach((location) => {
+ console.log(location)
let value = this.sarStandardsInfoEO[field.attrField]
let valueName = ''
if (value && field.attrType === 'DATE_PICKER') {
diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
index 884424ec9..76eb6ce52 100644
--- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
@@ -90,6 +90,9 @@
align="center"
label="修改前"
>
+
+ 查看修改前内容
+
@@ -155,10 +158,16 @@
-
+
+
+
-
+
@@ -177,6 +186,15 @@
数据加载中……
+
+
+
+ 关闭
+
+
@@ -185,6 +203,9 @@ export default {
name: 'consultationDetails',
data() {
return {
+ itermsConditionsFlag: false,
+ itermsConditionsTitle: '',
+ options: [],
fileInfoList: [],
itemData: this.$route.query.item,
id: '', // 选中id
@@ -228,6 +249,20 @@ export default {
}
},
methods: {
+ itermsConditionsClose () {
+ this.itermsConditionsFlag = false
+ },
+ itermsConditionsOpen (row) {
+ this.itermsConditionsFlag = true
+ this.itermsConditionsTitle = row
+ },
+ optionsChange (data) {
+ for (let a = 0; a < this.options.length; a++) {
+ if (data === this.options[a].itemsNum) {
+ this.opinionContent.oldText = this.options[a].termsConditions
+ }
+ }
+ },
downloadFile (attId) {
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
},
@@ -396,6 +431,18 @@ export default {
}
},
mounted() {
+ let json = JSON.parse(this.$route.query.item.files)[0]
+ this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', {
+ standId: json.standId,
+ fileType: json.standFileClassify,
+ pageSize: 9999,
+ page: 1
+ }, {}, res => {
+ if (res.ok) {
+ this.options = res.data.list
+ }
+ }, e => {
+ })
this.getList()
this.getIdeaKey()
this.getFileInfo()
@@ -535,7 +582,8 @@ export default {
.add-demo {
.search-area {
- height: 100%;
+ height: calc(~'100% - 55px');
+ overflow: auto;
}
::v-deep .el-textarea__inner {
diff --git a/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue b/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue
index 3d2e79b8e..69b40fafe 100644
--- a/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue
+++ b/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue
@@ -1047,7 +1047,7 @@
if (this.pType === '选择联络人') {
this.addForm.wgNetInfos[this.pIndex].name = data[0].name
this.addForm.wgNetInfos[this.pIndex].netId = data[0].id
- this.addForm.wgNetInfos[this.pIndex].unit = data[0].positionName
+ this.addForm.wgNetInfos[this.pIndex].unit = data[0].unit
this.addForm.wgNetInfos[this.pIndex].phone = data[0].phone
this.addForm.wgNetInfos[this.pIndex].email = data[0].email
} else if (this.pType === '选择我司人员') {
@@ -1057,7 +1057,7 @@
this.addForm.wgDepts[this.pIndex].email = data[0].email
this.addForm.wgDepts[this.pIndex].deptId = data[0].institutionId
this.addForm.wgDepts[this.pIndex].deptName = data[0].institutionName
- this.addForm.wgDepts[this.pIndex].unit = data[0].positionId
+ this.addForm.wgDepts[this.pIndex].unit = data[0].unit
this.addForm.wgDepts[this.pIndex].unitName = data[0].positionName
}
},
diff --git a/src/router/index.js b/src/router/index.js
index 3d1818917..81a29c1ec 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1129,6 +1129,24 @@ const routes = [
title: '标准征求意见流程'
}
},
+ {
+ path: '/bzzqyjStep4-1',
+ name: 'bzzqyjStep4-1',
+ component: () => import('@/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue'),
+ meta: {
+ requireAuth: true,
+ title: '标准征求意见流程'
+ }
+ },
+ {
+ path: '/bzzqyjStep4-2',
+ name: 'bzzqyjStep4-2',
+ component: () => import('@/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue'),
+ meta: {
+ requireAuth: true,
+ title: '标准征求意见流程'
+ }
+ },
{
path: '/bzzqyjStep5',
name: 'bzzqyjStep5',
@@ -1493,6 +1511,15 @@ const routes = [
title: '外部署名推荐审批流程'
}
},
+ {
+ path: '/wbsmStep1-5',
+ name: 'wbsmStep1-5',
+ component: () => import('@/pages/processCenter/pages/creatProcess/wbsm/step1-5.vue'),
+ meta: {
+ requireAuth: true,
+ title: '外部署名推荐审批流程'
+ }
+ },
{
path: '/cywbbzzxdStep1',
name: 'cywbbzzxdStep1',
@@ -2104,6 +2131,36 @@ const routes = [
title: '加入标准化协会信息提报流程'
}
},
+ {
+ path: '/phoneWbsmStep3',
+ name: 'phoneWbsmStep3',
+ component: () => import('@/pages/processCenter/pages/phone/wbsm/step3.vue'),
+ meta: {
+ isBoolean: true,
+ requireAuth: true,
+ title: '外部署名推荐审批流程'
+ }
+ },
+ {
+ path: '/phoneWbsmStep4',
+ name: 'phoneWbsmStep4',
+ component: () => import('@/pages/processCenter/pages/phone/wbsm/step4.vue'),
+ meta: {
+ isBoolean: true,
+ requireAuth: true,
+ title: '外部署名推荐审批流程'
+ }
+ },
+ {
+ path: '/phoneWbsmStep5',
+ name: 'phoneWbsmStep5',
+ component: () => import('@/pages/processCenter/pages/phone/wbsm/step5.vue'),
+ meta: {
+ isBoolean: true,
+ requireAuth: true,
+ title: '外部署名推荐审批流程'
+ }
+ },
{
path: '/phoneWfhxStep5',
name: 'phoneWfhxStep5',