-
-
-
{{ sarStandardsInfoEO.standCode }}
-
{{ sarStandardsInfoEO.standName || '-' }}
-
{{ sarStandardsInfoEO.standEnName || '-' }}
-
- {{ sarStandardsInfoEO.standStatusShow || '-' }}
-
-
{{ sarStandardsInfoEO.issueTime || '-' }}
-
{{ sarStandardsInfoEO.putTime || '-' }}
-
-
-
- {{item}}
-
-
-
- {{'-' }}
-
-
-
-
-
- {{item}}
-
-
-
- {{'-' }}
-
-
-
-
@@ -956,6 +998,9 @@ import CustomInputForStandards from '@/components/CustomFormComponents/InputForS
import customSelectArray from '@/components/CustomFormComponents/SelectArray'
import CustomOrg from '@/components/CustomFormComponents/OrgTree'
import CustomSVPPS from '@/components/CustomFormComponents/SVPPS'
+import TreeSelect from '@/components/treeSelect/treeSelect.vue';
+import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
+
import {mapGetters} from 'vuex'
export default {
name: 'EnterpriseStandardDatabase',
@@ -969,7 +1014,9 @@ export default {
CustomInputForStandards,
customSelectArray,
CustomOrg,
- CustomSVPPS
+ CustomSVPPS,
+ TreeSelect,
+ TreeSelectNew
},
props: {
},
@@ -979,6 +1026,14 @@ export default {
label: 'menuName',
children: 'children'
},
+ defaultProps: {
+ children: 'children',
+ label: 'menuName'
+ },
+ nodeKey: 'id',
+ nodeKeyCode: 'code',
+ nodeKeyModel: 'model',
+ defaultCheckedKeys: [],
productModal: false, // 模态框是否打开
modalType: '',
productTitle: '', // 模态框标题
@@ -1073,7 +1128,6 @@ export default {
formFieldListData: {},
formFieldList: [],
allSelectOptions: {},
- countryOptions: [],
configPage: 1,
configPageNow: 1,
loading: false,
@@ -1110,12 +1164,16 @@ export default {
// 组织机构
bussionessStandNodes: [],
sarBussionessStandEO: {
+ TXLBBUSS:'',
+ VPPSBMBUSS:'',
+ VPPSCNBUSS:'',
regionShow: '亚洲',
region: '2T8PFTSYE7',
issueUnit: '', // 发布部门
assemClass: '',
id: '',
standType: 'INLAND', // 标准分类
+ textStatusBuss:'',
country: 'CN',
standSort: '',
applyArctic: '',
@@ -1344,10 +1402,7 @@ export default {
certPutTimeList: []
}, // 标准新增过程中用到的对象
energyKindOptions: [], // 能源种类下拉框
- applyAuthOptions: [], // 适用认证下拉框
applyCountryOptions: [], // 国家/地区下拉框
- regionOptions: [], // 国家/地区下拉框
- applyArcticOptions: [], // 适用车型下拉框
formdisableflag: false,
defaultAddFormFieldRules: {
// standSort: [
@@ -1446,10 +1501,8 @@ export default {
exportName: '',
countRootId: 0,
parentNode: [],
- searching: false,
deleteMenuModal: false,
goSearch: '',
- tableFlag: '',
SarExportSearchEo: {},
sarBussionessSearch: {
orgName: '', // 部门名称
@@ -1502,13 +1555,53 @@ export default {
standSort: '',
replaceStandNum: ''
}, // 分页查询过程中用到的对象
- standSortOptions: [], // 企标类别下拉框
standGeneraOptions: [], // 企标大类下拉框
standSubclassOptions: [], // 企标细类下拉框-所有数据
standSubclassSelectOptions: [], // 企业细类下拉框-选中大类后 所有数据
- standStateOptions: [], // 标准状态下拉框
- standNatureOptions: [], // 标准性质下拉框
searchNodes: [], // 高级检索中责任部门
+ defaultCheckedKeys1: [],
+ defaultCheckedKeys2: [],
+ defaultCheckedKeys3: [],
+ defaultCodeProps: {
+ children: 'children',
+ label: 'code'
+ },
+ defaultModelProps: {
+ children: 'children',
+ label: 'model'
+ },
+ busVppsOptions: [], // 车系体系架构
+ modelOptions: [], // 模块体系架构
+ searching: false,
+ stahndinfoList: [],
+ tableFlag: '',
+ // sycpxOptions: [], // 适用产品线
+ syzrOptions: [], // 适用认证
+ // zrgcsOptions: [], // 责任工程师
+
+ countryOptions: [],
+ regionOptions: [], // 区域
+ standSortOptions: [], // 标准类别下拉框
+ standSystemOptions: [], // 标准体系下拉框
+ sycpxOptions: [], // 适用产品线下拉框
+ zrbmOptions: [], // 责任部门下拉框
+ zrgcsOptions: [], // 责任工程师下拉框
+ txlbOptions: [], // 体系类别下拉框
+ standSortConfigOptions: [], // 标准类别下拉框
+ applyArcticOptions: [], // 适用车型下拉框
+ standStateOptions: [], // 标准状态下拉框
+ standNatureOptions: [], // 标准性质下拉框
+ adoptExtentOptions: [], // 采标程度下拉框
+ emergyKindOptions: [], // 能源种类下拉框
+ applyAuthOptions: [], // 适用认证下拉框
+ categoryOptions: [], // 所属类别下拉框
+ categoryConfigOptions: [], // 所属类别下拉框
+ assemClassOptions: [], // 总成分类下拉框
+ qcdwOptions:[],//起草单位下拉框
+ cysdOptions:[], //我司参与深度下拉框
+ nylxOptions:[],//能源类型下拉框
+ syrzOptions:[],//适用认证下拉框
+ gkglbmOptions:[],//归口管理部门下拉框
drawerTitle: '',
addOrUPdateFlag: 1, // 新增：1， 修改：2
modalshowflag: false,
@@ -1556,10 +1649,69 @@ export default {
isShow: false,
standStatus: '',
qcbm: '',
- qcbmName: ''
+ qcbmName: '',
+ drawerTitle1:'',
+ modalShowFlag1: false,
+ modalShowFlag2: false, // drawer开关
+ modalShowFlag3: false, // drawer开关
+ modalShowFlag4: false, // drawer开关
+ url:'',
+ urlChild:'',
}
},
methods: {
+ dateFormatter () {
+ //默认返回yyyy-MM-dd HH-mm-ss
+ const d = new Date();
+ const year = d.getFullYear();//得到年
+ const month = (d.getMonth()+1)<10 ? '0'+(d.getMonth()+1) : (d.getMonth()+1);//得到月
+ const day = d.getDate()<10 ? '0'+d.getDate() : d.getDate();//得到日
+ const hour = d.getHours()<10 ? '0'+d.getHours() : d.getHours();//得到时
+ const minute = d.getMinutes()<10 ? '0'+d.getMinutes() : d.getMinutes();//得到分
+ const second = d.getSeconds()<10 ? '0'+d.getSeconds() : d.getSeconds();//得到秒
+ return [year, month, day].join('-') + " " + [hour, minute, second].join(':');//格式为：YY-MM-DD hh:mm:ss（当前时间）
+ },
+ popoverHideQuery(ids,attrField){
+ console.log(ids)
+ console.log("-----------------------------")
+ console.log(attrField)
+ },
+ popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
+ if(checkedData) {
+ if(checkedData.length > 0){
+ this.sarBussionessStandEO.VPPSBMBUSS = checkedData.map(item => item.code).join(",")
+ this.sarBussionessStandEO.VPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
+ }else {
+ this.sarBussionessStandEO.VPPSBMBUSS = checkedData.code
+ this.sarBussionessStandEO.VPPSCNBUSS = checkedData.chineseName
+ }
+ }
+ this.modalShowFlag2 = false
+ this.$forceUpdate()
+ },
+ popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
+ if(checkedData) {
+ if(checkedData.length > 0){
+ this.sarBussionessStandEO.TXLBBUSS = checkedData.map(item => item.menuName).join(",")
+ }else {
+ this.sarBussionessStandEO.TXLBBUSS = checkedData.menuName
+ }
+ }
+ this.modalShowFlag1 = false
+ this.$forceUpdate()
+ },
+ choiceZRR2 (type, title, id) {
+ this.drawerTitle = title
+ this.modalShowFlag2 = true
+ this.url = ''
+ this.urlChild = ''
+ this.url="sarVppsTree/list"
+ this.urlChild="sarVppsTree/childByList"
+ },
+ choiceZRR1 (type, title, id) {
+ this.drawerTitle1 = title
+ this.modalShowFlag1 = true
+ },
closeModal () {
this.productModal = false
this.closeDrawer()
@@ -2153,88 +2305,88 @@ export default {
},
// 点击查看
handlePreview (item) {
- const mj = item.attrInfoMap.QBMJ
- if (mj === 'GXNX7D6H59') {
- // C1所有人都可查看
- let routeUrl = this.$router.resolve({
- name: 'OtherBussStandardDetails',
- params: {
- id: item.id,
- pageType: 'BUSINESS_STAND'
- }
- })
- window.open(routeUrl.href, '_blank')
- } else if (mj === 'JLAPYG7YCT') {
- // C2只能让起草部门人员即填写中的相关部门/涉及会签部门人员可看
- // （起草部门、相关部门、会签部门，部门下所有人员）
- const attrInfoMap = item.attrInfoMap || {}
- const xgbm = attrInfoMap.XGBM || '' // 相关部门
- const qcbm = attrInfoMap.ZRBM || '' // 起草部门
- const xghqbm = attrInfoMap.XHQBM || '' // 相关会签部门
- const bm = [xgbm, qcbm, xghqbm].join(',') // 全部部门 字符串拼接
- const currentUserInfo = this.userInfo
- const currentBm = [currentUserInfo.orgId, currentUserInfo.pOrgId] // 当前用户的部门和科室
- const inBm = currentBm.some(item => {
- return bm.indexOf(item) > -1
- })
- // 如果当前用户的部门和科室不在全部部门里 就不允许查看
- if (!inBm) {
- this.$message.warning('当前用户无权限查看此详情')
- return false
- }
- let routeUrl = this.$router.resolve({
- name: 'OtherBussStandardDetails',
- params: {
- id: item.id,
- pageType: 'BUSINESS_STAND'
- }
- })
- window.open(routeUrl.href, '_blank')
- } else if (mj === 'ACF675Z88W') {
- // C3采取单独授权查看（当前实现只能主起草人、其他起草人看即可，后续的授权4月份开发）
- const attrInfoMap = item.attrInfoMap || {}
- const zyqcr = attrInfoMap.ZYQCR || '' // 主要起草人
- const qtqcr = attrInfoMap.QTQCR || '' // 主要起草人
- const qcr = [zyqcr, qtqcr].join(',') // 全部起草人 字符串拼接
- const userInfo = this.userInfo
- const currentId = userInfo.userId // 当前用户的id
- // 如果当前用户的部门和科室不在全部部门里 就不允许查看
- if (!(qcr.indexOf(currentId) > -1)) {
- // this.$message.warning('当前用户无权限查看此详情')
- this.$http.get('lawss/sarBussionessStand/selectPerson', {
- qbid: item.id
- }, {
- _this: this
- }, res => {
- if (res.data === "1") {
- // 为1有权限
- let routeUrl = this.$router.resolve({
- name: 'OtherBussStandardDetails',
- params: {
- id: item.id,
- pageType: 'BUSINESS_STAND'
- }
- })
- window.open(routeUrl.href, '_blank')
- } else {
- this.$message.warning('当前用户无权限查看此详情')
- return false
- }
- }, e => {
- return false
-
- })
-
- }
- }
- // let routeUrl = this.$router.resolve({
- // name: 'OtherBussStandardDetails',
- // params: {
- // id: item.id,
- // pageType: 'BUSINESS_STAND'
+ // const mj = item.attrInfoMap.QBMJ
+ // if (mj === 'GXNX7D6H59') {
+ // // C1所有人都可查看
+ // let routeUrl = this.$router.resolve({
+ // name: 'OtherBussStandardDetails',
+ // params: {
+ // id: item.id,
+ // pageType: 'BUSINESS_STAND'
+ // }
+ // })
+ // window.open(routeUrl.href, '_blank')
+ // } else if (mj === 'JLAPYG7YCT') {
+ // // C2只能让起草部门人员即填写中的相关部门/涉及会签部门人员可看
+ // // （起草部门、相关部门、会签部门，部门下所有人员）
+ // const attrInfoMap = item.attrInfoMap || {}
+ // const xgbm = attrInfoMap.XGBM || '' // 相关部门
+ // const qcbm = attrInfoMap.ZRBM || '' // 起草部门
+ // const xghqbm = attrInfoMap.XHQBM || '' // 相关会签部门
+ // const bm = [xgbm, qcbm, xghqbm].join(',') // 全部部门 字符串拼接
+ // const currentUserInfo = this.userInfo
+ // const currentBm = [currentUserInfo.orgId, currentUserInfo.pOrgId] // 当前用户的部门和科室
+ // const inBm = currentBm.some(item => {
+ // return bm.indexOf(item) > -1
+ // })
+ // // 如果当前用户的部门和科室不在全部部门里 就不允许查看
+ // if (!inBm) {
+ // this.$message.warning('当前用户无权限查看此详情')
+ // return false
// }
- // })
- // window.open(routeUrl.href, '_blank')
+ // let routeUrl = this.$router.resolve({
+ // name: 'OtherBussStandardDetails',
+ // params: {
+ // id: item.id,
+ // pageType: 'BUSINESS_STAND'
+ // }
+ // })
+ // window.open(routeUrl.href, '_blank')
+ // } else if (mj === 'ACF675Z88W') {
+ // // C3采取单独授权查看（当前实现只能主起草人、其他起草人看即可，后续的授权4月份开发）
+ // const attrInfoMap = item.attrInfoMap || {}
+ // const zyqcr = attrInfoMap.ZYQCR || '' // 主要起草人
+ // const qtqcr = attrInfoMap.QTQCR || '' // 主要起草人
+ // const qcr = [zyqcr, qtqcr].join(',') // 全部起草人 字符串拼接
+ // const userInfo = this.userInfo
+ // const currentId = userInfo.userId // 当前用户的id
+ // // 如果当前用户的部门和科室不在全部部门里 就不允许查看
+ // if (!(qcr.indexOf(currentId) > -1)) {
+ // // this.$message.warning('当前用户无权限查看此详情')
+ // this.$http.get('lawss/sarBussionessStand/selectPerson', {
+ // qbid: item.id
+ // }, {
+ // _this: this
+ // }, res => {
+ // if (res.data === "1") {
+ // // 为1有权限
+ // let routeUrl = this.$router.resolve({
+ // name: 'OtherBussStandardDetails',
+ // params: {
+ // id: item.id,
+ // pageType: 'BUSINESS_STAND'
+ // }
+ // })
+ // window.open(routeUrl.href, '_blank')
+ // } else {
+ // this.$message.warning('当前用户无权限查看此详情')
+ // return false
+ // }
+ // }, e => {
+ // return false
+ //
+ // })
+ //
+ // }
+ // }
+ let routeUrl = this.$router.resolve({
+ name: 'OtherBussStandardDetails',
+ params: {
+ id: item.id,
+ pageType: 'BUSINESS_STAND'
+ }
+ })
+ window.open(routeUrl.href, '_blank')
},
// 编辑
selectStandardPro (item, state) {
@@ -2272,6 +2424,7 @@ export default {
this.loading = false
})
this.sarBussionessStandEO = JSON.parse(JSON.stringify(item))
+ this.sarBussionessStandEO["XCSJBUSS"] = this.dateFormatter()
this.standStatus = JSON.parse(JSON.stringify(this.sarBussionessStandEO.standStatus))
let subClass = item.standSubclass
this.sarBussionessStandEO.standSubclass = subClass
@@ -3445,7 +3598,16 @@ export default {
watch: {
filterText(val) {
this.$refs.tree.filter(val);
- }
+ },
+ 'sarBussionessStandEO.issueTime': {
+ handler: function() {
+ if(this.sarBussionessStandEO.issueTime !== undefined && this.sarBussionessStandEO.issueTime !== null && this.sarBussionessStandEO.issueTime !== ''){
+ let date = new Date(this.$moment(this.sarBussionessStandEO.issueTime).format('YYYY-MM-DD'))
+ const FSRQBUSS = date.getFullYear()+ 5 + '-' + date.getMonth() + '-' + date.getDate()
+ this.sarBussionessStandEO["FSRQBUSS"] = FSRQBUSS
+ }
+ },
+ },
},
computed: {
// 是否拥有拖拽权限
@@ -3475,14 +3637,27 @@ export default {
this.countryOptions = res.data.COUNTRY
this.applyCountryOptions = res.data.COUNTRY
this.regionOptions = res.data.REGION // 区域
- this.applyArcticOptions = res.data.PRODUCTTYPE // 根据需求文档，产品类别对应标准属性中的“适用车型”
this.standStateOptions = res.data.BUSSSTATE
- this.standSortOptions = res.data.BUSSSTANDCLASS
this.energyKindOptions = res.data.ENERGYTYPES
- this.standNatureOptions = res.data.SARPROPERTY // 标准性质
this.standGeneraOptions = res.data.BUSSBIGCLASS
this.standSubclassOptions = res.data.BUSSFINECLASS
- this.applyAuthOptions = res.data.PROVETYPE
+ this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
+ this.standNatureOptions = res.data.SARPROPERTY // 标准性质
+ this.standStateOptions = res.data.TEXTSTATUSBUSS // 文本状态
+ this.standSystemOptions = res.data.TXLBBUSS // 标准体系
+ this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型
+ this.categoryOptions = res.data.NYLXCLASS // 能源类型
+ this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
+ this.cysdOptions = res.data.WSCYSD // 我司参与深度
+ this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
+ this.txlbOptions = res.data.TXLBCLASS // 体系类别
+ this.qcdwOptions = res.data.QCDW // 起草单位
+ this.nylxOptions = res.data.NYLXCLASS // 能源类型
+ this.syrzOptions = res.data.SYRZCLASS // 适用认证
+ this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
+ this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
+ this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
+ this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
// this.classifyCodeOptions = res.data.STANDCLASSIFY
}, e => {
})
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index ff90ae8a6..1acacbe00 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -3126,6 +3126,7 @@ export default {
// 处理动态表单的时间和下拉框格式
const formFieldList = this.formFieldList
const sarStandAttrObj = {}
+
formFieldList.forEach((item) => {
const value = nowstandinfo[item.attrField]
// 时间格式处理
@@ -3140,6 +3141,8 @@ export default {
}
sarStandAttrObj[item.attrField] = nowstandinfo[item.attrField]
})
+
+
nowstandinfo['sarStandAttrEOStr'] = JSON.stringify(sarStandAttrObj).replace(/"/g, "'")
console.log("nowstandinfo");
console.log(nowstandinfo);
@@ -3153,10 +3156,35 @@ export default {
if (this.addOrUPdateFlag === 1) {
sessionStorage.removeItem('STAND_INLAND')
}
+
+ console.log("hello")
+ console.log(formFieldList);
+ let standardToLawsInfo={'countryArea':'','standId':'','ssrq':'','zccssrqgj':'','xcxssrqgj':''}
+ standardToLawsInfo.countryArea=nowstandinfo.country;
+ standardToLawsInfo.standId=nowstandinfo.id;
+ standardToLawsInfo.ssrq=nowstandinfo.SSRQ;
+ standardToLawsInfo.zccssrqgj=nowstandinfo.ZCCSSRQ;
+ standardToLawsInfo.xcxssrqgj=nowstandinfo.XCXSSRQ;
+
+ console.log("country")
+ console.log(standardToLawsInfo);
+ this.$http.post('sarLawsDetailedList/sar-laws-detailed-list/standardToLaws',
+ standardToLawsInfo,
+ {_this:this}
+ )
+
+
+
}
}, e => {
this.isSubmit = false
})
+
+
+
+
+
+
} else {
this.isSubmit = false
}
diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
index 8250bbdc8..c6b2707c8 100644
--- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
@@ -183,6 +183,7 @@
},
standinfoList: [], // 详情列表
form: {
+ ideaId: this.$route.query.item.id,
cid: this.$route.query.item.cid,
page: 1,
size: this.$store.getters.userInfo.configContent,
@@ -309,6 +310,7 @@
if (valid) {
var url = ''
var form = {
+ ideaId: this.$route.query.item.id,
cid: this.$route.query.item.cid,
content: this.opinionContent.content,
oldText: this.opinionContent.oldText,
diff --git a/src/router/index.js b/src/router/index.js
index 010ac773b..c01c0ef07 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1288,7 +1288,7 @@ const routes = [
meta: {
requireAuth: true,
title: '企业标准库',
- menuId: '3YVZP8R4TC',
+ menuId: '7feeb73929c25a6f1fd67952704ec02b',
parentPath: '/enterpriseStandardDatabase'
}
},