diff --git a/src/components/CustomFormComponents/InputForStandards.vue b/src/components/CustomFormComponents/InputForStandards.vue
index 3b9d5a974..946f39711 100644
--- a/src/components/CustomFormComponents/InputForStandards.vue
+++ b/src/components/CustomFormComponents/InputForStandards.vue
@@ -186,6 +186,7 @@ export default {
replaceLawsNumRow: [], // 代替政策号 数组内容
replaceTotal: 0,
selectedListRep: [],
+ ids: [],
replaceLoading: true,
replacePage: 1
@@ -297,6 +298,7 @@ export default {
// 代替政策编号确定
replaceLawsNumModelBt () {
let textArr = []
+ this.ids = []
if (typeof this.value === 'string') {
if (this.value) {
@@ -322,12 +324,14 @@ export default {
} else {
texts = item.standSortShow !== null ? item.standSortShow + ' ' + item.standNumber : item.standNumber
}
+ this.ids.push(item.id);
textArr.push(texts)
textArr = [...new Set(textArr)]
this.replaceLawsNumModel = false
})
// this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
this.$emit('input', textArr.join(','))
+ this.$emit('popoverHide', this.ids, this.config.attrField);
this.$refs.selections.clearSelection()
},
// 点击查看
diff --git a/src/pages/config/pages/attributeCustom/components/stand.vue b/src/pages/config/pages/attributeCustom/components/stand.vue
index 364112bcc..6dbb4e219 100644
--- a/src/pages/config/pages/attributeCustom/components/stand.vue
+++ b/src/pages/config/pages/attributeCustom/components/stand.vue
@@ -3,7 +3,7 @@
新增
- 展示区域管理
+ 展示区域管理
数据处理中
@@ -188,8 +188,8 @@
@@ -199,7 +199,7 @@
width="400px"
>
- 新增
+ 新增
-
+
@@ -319,6 +319,7 @@ export default {
},
displayLocationDialogFormData: {
areaName: '',
+ sarType: '',
showIndex: ''
},
displayLocationDialogFormRules: {
@@ -330,8 +331,9 @@ export default {
{required: true, message: '所属模块不能为空', trigger: 'change'}
],
showIndex: [
- { type: 'number', required: true, message: '不能为空且为正整数', trigger: 'blur' },
- { type: 'number', min: 0, max: 999, message: '请输入0-999之间的整数', trigger: 'blur' }
+ { required: true, message: '排序号不能为空且为正整数', trigger: 'blur'},
+ { type: 'string', validator: this.verify.validStandNumInCompile2, trigger: 'blur'},
+ { min: 0, max: 999, message: '请输入0-999之间的整数', trigger: 'blur' }
]
},
attributeDataLoading: false,
diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index b7bc135d9..24f5c3bb9 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -72,7 +72,7 @@
:key="child.id"
class="modular-item"
:class="!(childIndex === item.half.length - 1) || childIndex % 2 === 1 ? 'half' : ''"
- v-if=" child.attrField === 'DTBJH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ' || child.attrField === 'XGLC' || child.attrField === 'BDTBZBH' || child.attrField === 'BFDTBZ' "
+ v-if=" child.attrField === 'DTBJH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ' || child.attrField === 'XGLC' || child.attrField === 'BDTBZBH' || child.attrField === 'BFDTBZ' || child.attrField === 'BBFDTBZ' "
>
@@ -310,7 +310,7 @@
diff --git a/src/pages/localTool/standAutoSplit/index.vue b/src/pages/localTool/standAutoSplit/index.vue
index e4306b6ee..3f07616db 100644
--- a/src/pages/localTool/standAutoSplit/index.vue
+++ b/src/pages/localTool/standAutoSplit/index.vue
@@ -51,20 +51,12 @@
prop="showNumber"
label="标准号/政策号"
align="center">
-
- {{ scope.row.standNumSplit }}
- {{ scope.row.showNumber }}
-
-
- {{ scope.row.standNameSplit }}
- {{ scope.row.standName }}
-
-
-
- {{ scope.row.splitStatus == '0' ? '编辑中' : (scope.row.splitStatus == '1' ? '审核中' : '已完成' +
- '') }}
-
-
+
+ {{ scope.row.creationTime ? $moment(scope.row.creationTime).format('YYYY-MM-DD') : '' }}
+
失败
-
+
查看
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
删除
diff --git a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
index 7c38fa00b..a4035fe21 100644
--- a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
+++ b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
@@ -2245,15 +2245,7 @@ export default {
})
},
jurisdictionCheck() {
- if (this.jurisdiction === '0') {
- this.$message.warning('审核中,不可操作')
- return false
- } else if (this.jurisdiction === '1') {
- this.$message.warning('编辑中,不可操作')
- return false
- } else {
- return true
- }
+ return true
}
},
props: {},
diff --git a/src/pages/localTool/standardRecognition/index.vue b/src/pages/localTool/standardRecognition/index.vue
index f4ece4368..47590915f 100644
--- a/src/pages/localTool/standardRecognition/index.vue
+++ b/src/pages/localTool/standardRecognition/index.vue
@@ -291,158 +291,158 @@ export default {
label: "关联文件",
},
],
- // standRecoColumn: [
- // {
- // type: 'selection',
- // width: 60,
- // align: 'center'
- // },
- // {
- // title: '序号',
- // type: 'index',
- // align: 'center'
- // },
- // {
- // title: '资料类型',
- // key: 'fileType',
- // align: 'center',
- // render: (h, params) => {
- // let texts
- // if (params.row.fileType === '1') {
- // texts = '国内标准法规'
- // } else if (params.row.fileType === '2') {
- // texts = '海外标准法规'
- // } else if (params.row.fileType === '3') {
- // texts = '政策'
- // } else if (params.row.fileType === '4') {
- // texts = '企业标准'
- // } else {
- // texts = '标准'
- // }
- // return h('div', {
- // class: {
- // 'text-overflow-hidden': true
- // },
- // attrs: {
- // title: texts
- // }
- // }, texts)
- // }
- // },
- // {
- // title: '标准号/政策号',
- // key: 'standNumber',
- // align: 'center'
- // },
- // {
- // title: '标准名称/政策名称',
- // key: 'standName',
- // align: 'center'
- // },
- // {
- // title: '文本状态',
- // key: 'fileStatus',
- // align: 'center',
- // render: (h, params) => {
- // let texts
- // if (params.row.fileType === 'STAND_FILE') {
- // texts = '标准文本'
- // } else if (params.row.fileType === 'DRAFT_FILE') {
- // texts = '草案'
- // } else if (params.row.fileType === 'OPINION_FILE') {
- // texts = '征求意见稿'
- // } else if (params.row.fileType === 'SENT_SCREEN_FILE') {
- // texts = '送审稿'
- // } else if (params.row.fileType === 'APPROVAL_FILE') {
- // texts = '报批稿'
- // } else if (params.row.fileType === 'RELEVANCE_FILE') {
- // texts = '关联文件'
- // }
- // return h('div', {
- // class: {
- // 'text-overflow-hidden': true
- // },
- // attrs: {
- // title: texts
- // }
- // }, texts)
- // }
- // },
- // {
- // title: '转换结果',
- // key: 'resultContent',
- // align: 'center'
- // },
- // {
- // title: '消耗时间',
- // key: 'spendTime',
- // align: 'center'
- // },
- // {
- // title: '操作',
- // key: 'action',
- // width: 200,
- // align: 'center',
- // render: (h, params) => {
- // return h('div', [
- // h('Button', {
- // props: {
- // type: 'primary',
- // size: 'small'
- // },
- // style: {
- // marginRight: '5px'
- // },
- // on: {
- // click: () => {
- // this.downloadFile(params.row)
- // }
- // }
- // }, '获取文件'),
- // h('Button', {
- // props: {
- // type: 'warning',
- // size: 'small'
- // },
- // style: {
- // marginRight: '5px'
- // },
- // on: {
- // click: () => {
- // this.editOcrRecord(params.row)
- // }
- // }
- // }, '编辑'),
- // h('Dropdown', {
- // props: {
- // trigger: 'click'
- // },
- // on: {
- // 'on-click': (value) => {}
- // }
- // }, [
- // h('Button', {
- // props: {
- // type: 'primary',
- // size: 'small'
- // }
- // }, '更多'),
- // h('DropdownMenu', {
- // slot: 'list'
- // },
- // this.dropdownItems.map(function (type) {
- // return h('DropdownItem', {
- // props: {
- // name: type.val
- // }
- // }, type.val)
- // })
- // )
- // ])
- // ])
- // }
- // }
- // ],
+/* standRecoColumn: [
+ {
+ type: 'selection',
+ width: 60,
+ align: 'center'
+ },
+ {
+ title: '序号',
+ type: 'index',
+ align: 'center'
+ },
+ {
+ title: '资料类型',
+ key: 'fileType',
+ align: 'center',
+ render: (h, params) => {
+ let texts
+ if (params.row.fileType === '1') {
+ texts = '国内标准法规'
+ } else if (params.row.fileType === '2') {
+ texts = '海外标准法规'
+ } else if (params.row.fileType === '3') {
+ texts = '政策'
+ } else if (params.row.fileType === '4') {
+ texts = '企业标准'
+ } else {
+ texts = '标准'
+ }
+ return h('div', {
+ class: {
+ 'text-overflow-hidden': true
+ },
+ attrs: {
+ title: texts
+ }
+ }, texts)
+ }
+ },
+ {
+ title: '标准号/政策号',
+ key: 'standNumber',
+ align: 'center'
+ },
+ {
+ title: '标准名称/政策名称',
+ key: 'standName',
+ align: 'center'
+ },
+ {
+ title: '文本状态',
+ key: 'fileStatus',
+ align: 'center',
+ render: (h, params) => {
+ let texts
+ if (params.row.fileType === 'STAND_FILE') {
+ texts = '标准文本'
+ } else if (params.row.fileType === 'DRAFT_FILE') {
+ texts = '草案'
+ } else if (params.row.fileType === 'OPINION_FILE') {
+ texts = '征求意见稿'
+ } else if (params.row.fileType === 'SENT_SCREEN_FILE') {
+ texts = '送审稿'
+ } else if (params.row.fileType === 'APPROVAL_FILE') {
+ texts = '报批稿'
+ } else if (params.row.fileType === 'RELEVANCE_FILE') {
+ texts = '关联文件'
+ }
+ return h('div', {
+ class: {
+ 'text-overflow-hidden': true
+ },
+ attrs: {
+ title: texts
+ }
+ }, texts)
+ }
+ },
+ {
+ title: '转换结果',
+ key: 'resultContent',
+ align: 'center'
+ },
+ {
+ title: '消耗时间',
+ key: 'spendTime',
+ align: 'center'
+ },
+ {
+ title: '操作',
+ key: 'action',
+ width: 200,
+ align: 'center',
+ render: (h, params) => {
+ return h('div', [
+ h('Button', {
+ props: {
+ type: 'primary',
+ size: 'small'
+ },
+ style: {
+ marginRight: '5px'
+ },
+ on: {
+ click: () => {
+ this.downloadFile(params.row)
+ }
+ }
+ }, '获取文件'),
+ h('Button', {
+ props: {
+ type: 'warning',
+ size: 'small'
+ },
+ style: {
+ marginRight: '5px'
+ },
+ on: {
+ click: () => {
+ this.editOcrRecord(params.row)
+ }
+ }
+ }, '编辑'),
+ h('Dropdown', {
+ props: {
+ trigger: 'click'
+ },
+ on: {
+ 'on-click': (value) => {}
+ }
+ }, [
+ h('Button', {
+ props: {
+ type: 'primary',
+ size: 'small'
+ }
+ }, '更多'),
+ h('DropdownMenu', {
+ slot: 'list'
+ },
+ this.dropdownItems.map(function (type) {
+ return h('DropdownItem', {
+ props: {
+ name: type.val
+ }
+ }, type.val)
+ })
+ )
+ ])
+ ])
+ }
+ }
+ ],*/
modalType: "",
standRecoList: [],
selectTableData: [],
@@ -759,7 +759,7 @@ export default {
(res) => {
if (res.ok) {
this.standRecoList = res.data.list;
- this.total = res.data.count;
+ this.total = res.data.list.length;
}
},
e => {}
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
index d240a7ac1..1d54e3fdc 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
@@ -320,56 +320,6 @@
@checkedRole="saveUserInfo"
:nodeList="nodeList"
>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
index 40db856ba..41331f01f 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
@@ -93,22 +93,23 @@
-
-
-
-
-
-
-
-
-
-
-
- {{ listForm.dataList[scope.$index].distributePerson == null ? "请选择分发负责人" : listForm.dataList[scope.$index].distributePerson
- }}
-
-
+
+
+ {{ scope.row.distributePerson }}
+
+
+
+
+
+
+
+
@@ -445,6 +446,7 @@ export default {
ListModel: false, //选择拆分标准抽屉状态
treeData: [], // 人员数据
selectList: [], //选择标准的选择框
+ currentIndex: -1, // 当前操作行索引
isSubmit: false,
saveLoading: false,
selectedList: [], //拆分标准的选择框
@@ -520,19 +522,29 @@ export default {
this.listForm.certifiedEngineer = data[0].id;
this.listForm.certifiedEngineerName = data[0].name;
} else if (this.type === "distributePerson") {
- this.dataList.distributePersonId = data[0].id;
- this.dataList.distributePerson = data[0].name;
- this.listForm.dataList[this.dsadadadsada].distributePersonId = data[0].id;
- this.listForm.dataList[this.dsadadadsada].distributePerson = data[0].name;
- console.log(this.dataList)
- this.showColumn = false;
- this.$nextTick(() => {
- this.showColumn = true;
- });
+ // 如果有勾选,则视为批量选择责任人
+ if (this.selectList.length) {
+ this.dataList.forEach((item, index) => {
+ if (this.selectList.includes(item.productLine)) {
+ const newItem = JSON.parse(JSON.stringify(item))
+ newItem.distributePersonId = data[0].id
+ newItem.distributePerson = data[0].name
+ this.$set(this.dataList, index, newItem)
+ }
+ })
+ } else {
+ const newItem = JSON.parse(JSON.stringify(this.dataList[this.currentIndex]))
+ newItem.distributePersonId = data[0].id
+ newItem.distributePerson = data[0].name
+ this.$set(this.dataList, this.currentIndex, newItem)
+ this.listForm.dataList[this.currentIndex].distributePersonId = data[0].id;
+ this.listForm.dataList[this.currentIndex].distributePerson = data[0].name;
+ this.currentIndex = -1
+ }
}
this.modalshowflag = false;
},
- cancleUserInfo() {
+ cancelUserInfo() {
this.modalshowflag = false;
},
//tab发生变化
@@ -561,7 +573,9 @@ export default {
//点击添加事件
addList() {
this.standModel = true;
- this.$refs.projectTable.clearSelection();
+ this.$nextTick(() => {
+ this.$refs.projectTable.clearSelection();
+ })
},
// 点击批量删除事件
deleteList() {
@@ -743,7 +757,7 @@ export default {
},
choiceZRR(scope, type, title, id) {
if (scope != null) {
- this.dsadadadsada = scope.$index;
+ this.currentIndex = scope.$index;
}
this.nodeList = [];
this.nodeList.push(id);
@@ -810,6 +824,14 @@ export default {
}
},
computed: {},
+ watch: {
+ dataList: {
+ deep: true,
+ handler (val) {
+ console.log('dataList update', val)
+ }
+ }
+ },
mounted() {
this.getTree();
this.getProductData();
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
index 2d7414f24..3acb8e4a7 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
@@ -324,8 +324,6 @@ export default {
this.listForm.breakdownList = item.breakdownList
})
},
-
-
//驳回事件
beforeBack () {
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
index f2c52fcc1..c4cfc9b43 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
@@ -267,16 +267,16 @@ export default {
},
pageChange(page) {
this.sarSarAccessEOSearch.page = page;
- this.searchSarAccess();
+ // this.searchSarAccess();
},
pageSizeChange(pageSize) {
this.sarSarAccessEOSearch.pageSize = this.$store.getters.userInfo.configContent;
- this.searchSarAccess();
+ // this.searchSarAccess();
},
clearSearch() {
this.sarSarAccessEOSearch.countryArea = ''
this.sarSarAccessEOSearch.detailedListName = ''
- this.searchSarAccess();
+ // this.searchSarAccess();
},
// 新增相关
openModal(row, optType) {
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
index 1340cb86d..b0af84fa9 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
@@ -283,16 +283,16 @@ export default {
},
pageChange(page) {
this.sarSarAccessEOSearch.page = page;
- this.searchSarAccess();
+ // this.searchSarAccess();
},
pageSizeChange(pageSize) {
this.sarSarAccessEOSearch.pageSize = this.$store.getters.userInfo.configContent;
- this.searchSarAccess();
+ // this.searchSarAccess();
},
clearSearch() {
this.sarSarAccessEOSearch.detailedList = ''
this.sarSarAccessEOSearch.detailedListName = ''
- this.searchSarAccess();
+ // this.searchSarAccess();
},
// 新增相关
openModal(row, optType) {
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
index 9cb9ccc1f..d45f42401 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
@@ -283,17 +283,17 @@ export default {
},
pageChange(page) {
this.sarSarAccessEOSearch.page = page;
- this.searchSarAccess();
+ // this.searchSarAccess();
},
pageSizeChange(pageSize) {
this.sarSarAccessEOSearch.pageSize = this.$store.getters.userInfo.configContent;
- this.searchSarAccess();
+ // this.searchSarAccess();
},
//清空
clearSearch() {
this.sarSarAccessEOSearch.projectName = ''
this.sarSarAccessEOSearch.detailedListName = ''
- this.searchSarAccess()
+ // this.searchSarAccess()
},
// 新增相关
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index 2c860654c..4a89f62c4 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -1176,6 +1176,7 @@ export default {
// this.$refs.accessTypeSelect.clearSelection()
this.$refs.entryTable.clearSelection()
this.$refs.searchTable.clearSelection()
+ this.$message.warning('请勿添加重复数据')
} else{
this.sarAccessInfoList.push(item)
// this.$refs.accessTypeSelect.clearSelection()
@@ -1183,7 +1184,6 @@ export default {
this.$refs.searchTable.clearSelection()
}
})
- this.$message.warning('请勿添加重复数据')
} else {
this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
}
@@ -1295,17 +1295,17 @@ export default {
for (let i = 0; i < this.sarAccessInfoList.length; i++) {
rowlist.push(this.sarAccessInfoList[i].id)
if (this.sarAccessInfoList[i].putTime === null) {
- rowlist1.push(this.sarAccessInfoList[i].putTime = '')
+ rowlist1.push(this.sarAccessInfoList[i].putTime = '-')
}else {
rowlist1.push(this.sarAccessInfoList[i].putTime.toString())
}
if (this.sarAccessInfoList[i].xcxssrqgj === null) {
- rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '')
+ rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
}else {
rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
}
if (this.sarAccessInfoList[i].zccssrqgj === null) {
- rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '')
+ rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '-')
}else {
rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
}
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
index 674ab98bd..a55938830 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
@@ -381,7 +381,7 @@ export default {
heightShow: true,
dataLoading: false,
standardForm: {
-
+ zrbm: '',
standNumber: "",
standName: "",
responseUnit: "",
@@ -389,6 +389,10 @@ export default {
Size: this.$store.getters.userInfo.configContent
},
standardFormList: {
+ zrbm: '',
+ typeApplicable: '',
+ nylx: '',
+ sycpx: '',
standNumber: '',
standName: '',
responseUnit: '',
@@ -493,8 +497,14 @@ export default {
},
// 重置搜索
resetSelect() {
+ this.standardForm.zrbm = ''
this.standardForm.standName = ''
this.standardForm.responseUnit = ''
+ this.standardFormList.standName = ''
+ this.standardFormList.typeApplicable = ''
+ this.standardFormList.nylx = ''
+ this.standardFormList.zrbm = ''
+ this.standardFormList.sycpx = ''
this.selectInfobyAccid()
},
exportStandard() {
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
index 4a1bebbc0..76a9f2f86 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
@@ -1145,6 +1145,7 @@ export default {
// this.$refs.accessTypeSelect.clearSelection()
this.$refs.entryTable.clearSelection()
this.$refs.searchTable.clearSelection()
+ this.$message.warning('请勿添加重复数据')
} else{
this.sarAccessInfoList.push(item)
// this.$refs.accessTypeSelect.clearSelection()
@@ -1152,7 +1153,6 @@ export default {
this.$refs.searchTable.clearSelection()
}
})
- this.$message.warning('请勿添加重复数据')
this.selectedAccInfoSearchList = []
this.$refs.entryTable.clearSelection()
this.$refs.searchTable.clearSelection()
@@ -1264,17 +1264,17 @@ export default {
for (let i = 0; i < this.sarAccessInfoList.length; i++) {
rowlist.push(this.sarAccessInfoList[i].id)
if (this.sarAccessInfoList[i].putTime === null) {
- rowlist1.push(this.sarAccessInfoList[i].putTime = '')
+ rowlist1.push(this.sarAccessInfoList[i].putTime = '-')
}else {
rowlist1.push(this.sarAccessInfoList[i].putTime.toString())
}
if (this.sarAccessInfoList[i].xcxssrqgj === null) {
- rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '')
+ rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
}else {
rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
}
if (this.sarAccessInfoList[i].zccssrqgj === null) {
- rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '')
+ rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '-')
}else {
rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
}
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
index 8adf94499..1d4fe3bc6 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
@@ -1144,6 +1144,7 @@ export default {
// this.$refs.accessTypeSelect.clearSelection()
this.$refs.entryTable.clearSelection()
this.$refs.searchTable.clearSelection()
+ this.$message.warning('请勿添加重复数据')
} else{
this.sarAccessInfoList.push(item)
// this.$refs.accessTypeSelect.clearSelection()
@@ -1151,7 +1152,6 @@ export default {
this.$refs.searchTable.clearSelection()
}
})
- this.$message.warning('请勿添加重复数据')
this.selectedAccInfoSearchList = []
this.$refs.entryTable.clearSelection()
this.$refs.searchTable.clearSelection()
@@ -1263,17 +1263,17 @@ export default {
for (let i = 0; i < this.sarAccessInfoList.length; i++) {
rowlist.push(this.sarAccessInfoList[i].id)
if (this.sarAccessInfoList[i].putTime === null) {
- rowlist1.push(this.sarAccessInfoList[i].putTime = '')
+ rowlist1.push(this.sarAccessInfoList[i].putTime = '-')
}else {
rowlist1.push(this.sarAccessInfoList[i].putTime.toString())
}
if (this.sarAccessInfoList[i].xcxssrqgj === null) {
- rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '')
+ rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
}else {
rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
}
if (this.sarAccessInfoList[i].zccssrqgj === null) {
- rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '')
+ rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '-')
}else {
rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
}
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 5b3add18e..e2efd0482 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -448,6 +448,7 @@
:class="field.attrField === 'BYYBJ' ? 'classDisplay' : ''"
v-model="sarStandardsInfoEO[field.attrField]"
:disabled="formdisableflag"
+ @popoverHide="popoverHideQuery"
>
@@ -1698,6 +1699,8 @@ export default {
svpps: '', // 关联模块-VPPS编码
replaceStandNum: '', // 代替标准号
replacedStandNum: '', // 被代替标准号
+ replacePartStandNum: '', // 代替标准号
+ replacedPartStandNum: '', // 被代替标准号
citeStand: '', // 引用标准
citedStand: '', // 被引用标准
synopsis: '', // 内容摘要
@@ -1744,6 +1747,8 @@ export default {
standNature: '',
replaceStandNum: '',
replacedStandNum: '',
+ replacePartStandNum: '', // 代替标准号
+ replacedPartStandNum: '', // 被代替标准号
interStandNum: '',
adoptExtent: '',
emergyKind: '',
@@ -1814,10 +1819,12 @@ export default {
standState: '',
standNature: '',
replaceStandNum: '',
+ replacePartStandNum: '',
replaceStandNumId: '',
// replaceStandNumCope: '',
replaceStandNumList: [],
replacedStandNum: '',
+ replacedPartStandNum: '',
interStandNum: '',
adoptExtent: '',
emergyKind: '',
@@ -2161,6 +2168,8 @@ export default {
synopsis: '',
// replaceStandNumCope: '',
replacedStandNum: '',
+ replacePartStandNum: '', // 代替标准号
+ replacedPartStandNum: '', // 被代替标准号
orderBy:'',
nowOrder: '',
nowOrderBy: '',
@@ -2223,6 +2232,11 @@ export default {
this.url="sarModelTree/list"
this.urlChild="sarModelTree/childByList"
},
+ popoverHideQuery(ids,attrField){
+ console.log(ids)
+ console.log("-----------------------------")
+ console.log(attrField)
+ },
popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
if(checkedData) {
if(checkedData.length > 0){
@@ -2742,6 +2756,8 @@ export default {
this.sarStandardsSearch.applyArctic = ''
this.sarStandardsSearch.replaceStandNum = ''
this.sarStandardsSearch.replacedStandNum = ''
+ this.sarStandardsSearch.replacePartStandNum = ''
+ this.sarStandardsSearch.replacedPartStandNum = ''
this.sarStandardsSearch.synopsis = ''
this.sarStandardsSearch.category = ''
this.pageChange(1)
@@ -4035,6 +4051,8 @@ export default {
this.sarConfigStandSearch.applyArctic = ''
this.sarConfigStandSearch.replaceStandNum = ''
this.sarConfigStandSearch.replacedStandNum = ''
+ this.sarStandardsSearch.replacePartStandNum = ''
+ this.sarStandardsSearch.replacedPartStandNum = ''
this.selectConfiguraStand()
}
}
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
index 937ad9e75..2e94c804e 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
@@ -94,7 +94,7 @@
width="190px"
label="新车型实施日期">
- {{scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '-' }}
+ {{scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format('YYYY-MM-DD') : '-' }}
- {{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '-' }}
+ {{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format('YYYY-MM-DD') : '-' }}
+
+
+ {{zrbmMap[scope.row.zrbm]}}
+
+
+
+
+ {{scope.row.attrInfoCaseMap.xcxssrq ? $moment(scope.row.attrInfoCaseMap.xcxssrq).format('YYYY-MM-DD') : '-'}}
+
+
+
+
+ {{scope.row.attrInfoCaseMap.zccssrq ? $moment(scope.row.attrInfoCaseMap.zccssrq).format('YYYY-MM-DD') : '-'}}
+
+
+
+
+ {{textStatusMap[scope.row.textStatus]}}
+
+
@@ -312,6 +332,8 @@ export default {
standList1:[],//调取添加的数据
id:'',//批量删除.
saveExportType: '',// 导出文件模态框控制,和文件名称
+ zrbmMap: {},
+ textStatusMap: {} // 文本状态id与name对应
}
},
methods: {
@@ -596,17 +618,21 @@ export default {
} else if (this.saveExportType === 'all') {
console.log(this.selectList);
let ids = ''
- if (this.selectList.length === 0) {
- ids='\''+this.dataList[0].standId+'\''
- for(let i=1;i {
+ this.$set(key, item.value, item.label)
+ })
+ }
},
computed: {
...mapGetters(['getLocalPro'])
@@ -645,6 +677,8 @@ export default {
loading: 'loading'
}, res => {
this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
+ this.setMap(this.zrbmMap,res.data.ZRBMCLASS)
+ this.setMap(this.textStatusMap,res.data.WBZTCLASS)
this.showLocalProductData(this.getLocalPro)
}, e => {
})