点击或拖拽上传文件
@@ -514,10 +514,10 @@
@@ -564,20 +564,20 @@
+ title="更新LOG"
+ :visible.sync="relateDialog"
+ width="60%"
+ class="relateClass"
+ :before-close="relateDialogClose">
+ title="更多发布稿"
+ :visible.sync="relateDialog1"
+ class="relateClass"
+ width="40%"
+ :before-close="relateDialogClose1">
{{index+1}}. {{item.creationUserName}} {{item.creationTime}} {{item.content}}
-
{{ index + 1 }}.
{{ file.oldFileName }}
style="width: 100%">
{
@@ -232,6 +242,7 @@ export default {
$(this.oldRightId).find('#itemsRightText_' + this.saveItemIdRight).html(this.oldRightContent)
}
this.saveItemId = item.itemsId
+ this.saveLeftId = item.id
this.itemLeftIndex = index
@@ -250,25 +261,26 @@ export default {
this.leftName = item.itemsNum + ' ' + item.itemsName
this.saveItemIdRight = this.resRightMapList[item.targetStand].itemsId
-
+ this.saveRightId = this.resRightMapList[item.targetStand].id
let scrollToContainer = mainContainer.find(`.children:eq(${item.targetStand})`)
this.rightName = scrollToContainer.children(':first').html()
scrollToContainer.css('border', '2px solid red')
// 非动画效果
- // mainContainer.scrollTop(
- // scrollToContainer.offset().top - mainContainer.offset().top + mainContainer.scrollTop()
- // );
+ mainContainer.scrollTop(
+ scrollToContainer.offset().top - mainContainer.offset().top + mainContainer.scrollTop()
+ );
// 动画效果
- mainContainer.animate({
- scrollTop: scrollToContainer.offset().top - mainContainer.offset().top + mainContainer.scrollTop()
- })// 2秒滑动到指定位置
+ // mainContainer.animate({
+ // scrollTop: scrollToContainer.offset().top - mainContainer.offset().top + mainContainer.scrollTop()
+ // })// 2秒滑动到指定位置
} else {
if (this.oldLeftId !== '') {
$(this.oldLeftId).find('#itemsLeftText_' + this.saveItemId).html(this.oldLeftContent)
$(this.oldRightId).find('#itemsRightText_' + this.saveItemIdRight).html(this.oldRightContent)
}
this.saveItemIdRight = item.itemsId
+ this.saveRightId = item.id
this.itemRightIndex = index
@@ -287,6 +299,7 @@ export default {
this.rightName = item.itemsNum + ' ' + item.itemsName
this.saveItemId = this.resLeftMapList[item.targetStand].itemsId
+ this.saveLeftId = this.resLeftMapList[item.targetStand].id
let scrollToContainer = mainContainer.find(`.children:eq(${item.targetStand})`)// 滚动到
中类名为son-panel的第六个处
this.leftName = scrollToContainer.children('div:nth-child(2)').html()
@@ -507,6 +520,7 @@ export default {
},
handleLeftTreeClick(treeId, treeNode) {
+ console.log(treeNode.id)
const domId = `left_${treeNode.id}`
function getElementTop(element) {
var el = (typeof element == "string") ? document.getElementById(element) : element;
@@ -520,7 +534,8 @@ export default {
},
handleRightTreeClick(treeId, treeNode) {
- const domId = `right_${treeNode.id}`
+ console.log(treeNode.id)
+ const domId = `right_${treeNode.id}`
function getElementTop(element) {
var el = (typeof element == "string") ? document.getElementById(element) : element;
if (el.parentNode === null || el.style.display == 'none') {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue
index c42bee374..c8efc8d8c 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue
@@ -63,7 +63,6 @@
@@ -77,7 +76,6 @@
prop="standName"
align="center"
label="中文名称"
- width="180px"
>
{{ scope.row.standName }}
@@ -87,12 +85,33 @@
prop="standEnName"
label="英文名称"
align="center"
- width="180px"
>
{{ scope.row.standEnName }}
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
@@ -369,6 +362,8 @@ export default {
isSubmit: false,
saveLoading: false,
commentText: "",
+ fileType: '',
+ decomposeOptions: [], //分解单数据
//表单的数据
listForm: {
projectNumber: "", //项目编号
@@ -432,6 +427,22 @@ export default {
};
},
methods: {
+ fileTypeChange(type){
+ this.fileType = type
+ let ids = [];
+ let fileTypes = []
+ this.dataList.forEach(item => {
+ ids.push(item.standId);
+ fileTypes.push(item.fileType)
+ });
+ this.standId = ids.join(",");
+ this.fileType = fileTypes.join(",")
+ if(fileTypes.includes('')){
+ return
+ }else{
+ this.getClauseData()
+ }
+ },
// 表格勾选
handleSelectionChange(selection, val) {
if (selection.length > 1) {
@@ -527,14 +538,13 @@ export default {
ids.push(item.standId);
});
this.standId = ids.join(",");
- this.getClauseData();
});
},
//查询标准下的条款
getClauseData() {
- this.$http.get("SarStandItems/sar-stand-items/findAllItems", {
+ this.$http.get("SarStandItems/sar-stand-items/workflowFindItems", {
ids: this.standId,
- type: "FBGBJBD"
+ type: this.fileType
},
{
_this: this
@@ -591,6 +601,15 @@ export default {
},
//流程提交事件
handleSubmit() {
+ let fileFlag
+ this.dataList.forEach(item => {
+ if(!item.fileType){
+ fileFlag = false
+ }
+ })
+ if(!fileFlag){
+ this.$message.warning('请选择分解单来源')
+ }
if (this.listForm.dataList.length < 1) {
this.$message.warning("请选择带标准的项目");
} else {
@@ -654,6 +673,22 @@ export default {
}
},
mounted() {
+ //查找分解单来源数据
+ this.$http.get('lawss/sarStandAttrDetails/getListData',{},{
+ _this: this
+ }, res => {
+ this.decomposeOptions.push(
+ {
+ attrField: 'BDR',
+ attrName: '不带入'
+ }
+ )
+ res.data.forEach(item => {
+ if(item.sarType === 'STAND' || item.sarType === 'INLAND_STAND' || item.sarType === 'FOREIGN_STAND'){
+ this.decomposeOptions.push(item)
+ }
+ })
+ })
this.getData();
this.getProjectData();
}
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-2.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-2.vue
index a43df1bec..34c8987e3 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-2.vue
@@ -57,7 +57,6 @@
@@ -69,7 +68,6 @@
prop="standName"
align="center"
label="中文名称"
- width="180px"
>
{{ scope.row.standName }}
@@ -79,7 +77,6 @@
prop="standEnName"
label="英文名称"
align="center"
- width="180px"
>
{{ scope.row.standEnName }}
@@ -121,32 +118,6 @@
width="180px"
>
-
-
-
-
-
-
-
-
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
index fbf732ac1..3c0aa652a 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
@@ -73,7 +73,6 @@
@@ -87,7 +86,6 @@
prop="standName"
align="center"
label="中文名称"
- width="180px"
>
{{ scope.row.standName }}
@@ -97,12 +95,33 @@
prop="standEnName"
label="英文名称"
align="center"
- width="180px"
>
{{ scope.row.standEnName }}
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
@@ -365,6 +358,7 @@ import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import { saveTaskFirst } from "api/process";
+import file from "@/pages/knowledgeGraph/components/file";
export default {
name: "xmpg2Step1",
@@ -378,6 +372,8 @@ export default {
active: "1", //当前选中的type
isSubmit: false,
saveLoading: false,
+ fileType: '',
+ decomposeOptions: [], //分解单来源数据
//表单的数据
listForm: {
projectNumber: "", //项目编号
@@ -447,6 +443,22 @@ export default {
};
},
methods: {
+ fileTypeChange(type){
+ this.fileType = type
+ let ids = [];
+ let fileTypes = []
+ this.dataList.forEach(item => {
+ ids.push(item.standId);
+ fileTypes.push(item.fileType)
+ });
+ this.standId = ids.join(",");
+ this.fileType = fileTypes.join(",")
+ if(fileTypes.includes('')){
+ return
+ }else{
+ this.getClauseData()
+ }
+ },
// 表格勾选
handleSelectionChange(selection, val) {
if (selection.length > 1) {
@@ -532,6 +544,9 @@ export default {
})
this.listForm.dataList = res.data.records;
this.dataList = res.data.records;
+ this.dataList.forEach(item => {
+ this.$set(item,'fileType', '')
+ })
this.listForm.dataList.forEach(item => {
// 责任部门转换
if (item.zrbm !== null || item.zrbm !== "") {
@@ -551,14 +566,13 @@ export default {
ids.push(item.standId);
});
this.standId = ids.join(",");
- this.getClauseData();
});
},
//查询标准下的条款
getClauseData() {
- this.$http.get("SarStandItems/sar-stand-items/findAllItems", {
+ this.$http.get("SarStandItems/sar-stand-items/workflowFindItems", {
ids: this.standId,
- type: "FBGBJBD"
+ types: this.fileType
},
{
_this: this
@@ -604,6 +618,15 @@ export default {
},
//流程提交事件
handleSubmit() {
+ let fileFlag
+ this.dataList.forEach(item => {
+ if(!item.fileType){
+ fileFlag = false
+ }
+ })
+ if(!fileFlag){
+ this.$message.warning('请选择分解单来源')
+ }
if (this.listForm.dataList.length < 1) {
this.$message.warning("请选择带标准的项目");
} else {
@@ -687,6 +710,22 @@ export default {
this.zrbmOptions = res.data.ZRBMCLASS; // 责任部门
}, e => {
});
+ //查找分解单来源数据
+ this.$http.get('lawss/sarStandAttrDetails/getListData',{},{
+ _this: this
+ }, res => {
+ this.decomposeOptions.push(
+ {
+ attrField: 'BDR',
+ attrName: '不带入'
+ }
+ )
+ res.data.forEach(item => {
+ if(item.sarType === 'STAND' || item.sarType === 'INLAND_STAND' || item.sarType === 'FOREIGN_STAND'){
+ this.decomposeOptions.push(item)
+ }
+ })
+ })
}
};
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue
index 6c6b69df3..d3ac9ac8d 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue
@@ -57,7 +57,6 @@
@@ -69,7 +68,6 @@
prop="standName"
align="center"
label="中文名称"
- width="180px"
>
{{ scope.row.standName }}
@@ -79,7 +77,6 @@
prop="standEnName"
label="英文名称"
align="center"
- width="180px"
>
{{ scope.row.standEnName }}
@@ -121,32 +118,6 @@
width="180px"
>
-
-
-
-
-
-
-
-
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
index 9a38ead1b..a66f721c1 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
@@ -5,36 +5,22 @@
选择分发责任人
-
- 基础信息
- 审批历史
+ 基础信息
+ 审批历史
+
基础信息
-
+
-
-
+
-
-
+
@@ -42,75 +28,53 @@
填写信息
-
-
-
-
-
-
-
-
+
+
-
+
{{ scope.row.standSort }} {{ scope.row.standNumber
}}-{{ scope.row.standYear }}
- {{ scope.row.standSort }}
+ {{ scope.row.standSort }}
{{ scope.row.standNumber }}
-
+
- {{ scope.row.standName }}
+ {{ scope.row.standName }}
-
+
-
+
-
-
+
+
{{ "批量分发该标准下的责任人" }}
+
@@ -124,77 +88,41 @@
- {
- //
- // childrenItem.workPeople = data[0].name;
- // childrenItem.workPeopleId = data[0].id;
- // })
+ // items.children.map(childrenItem => {
+ //
+ // childrenItem.workPeople = data[0].name;
+ // childrenItem.workPeopleId = data[0].id;
+ // })
}
this.modalshowflag = false;
@@ -704,4 +703,3 @@ export default {
}
}
-
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index 33fc75d13..708dc7532 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -188,7 +188,7 @@
width="180px"
label="标准号">
- {{ scope.row.standNumber }}
+ {{ scope.row.standNumber || scope.row.lawsNumber || scope.row.standCode }}
- {{ scope.row.standName }}
+ {{ scope.row.standName || scope.row.lawsName}}
- {{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}
+ {{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}
+ {{ scope.row.putTime ? $moment(scope.row.putTime).format('YYYY-MM-DD') : '' }}
- {{ textStatusMap[scope.row.textStatus] }}
+ {{ textStatusMap[scope.row.textStatus] || scope.row.standStatusShow}}
@@ -684,8 +685,8 @@ export default {
dataSourceOptions: [
{value: 'INLAND_STAND', label: '国内标准法规'},
{value: 'FOREIGN_STAND', label: '海外标准法规'},
- //{value: 'FOREIGN_LAWS', label: '国内外政策'},
- // {value: 'BUSINESS', label: '企业标准 '},
+ {value: 'FOREIGN_LAWS', label: '国内外政策'},
+ {value: 'BUSINESS', label: '企业标准 '},
// {value: 'TEMP', label: '标准法规清单 '}
],
// 新增、编辑 数据搜索字段
@@ -1163,6 +1164,66 @@ export default {
}
]
// 国内外政策可查字段
+ }else if (val === 'FOREIGN_LAWS'){
+ this.twoOptions=[
+ {
+ label: '适用车辆类型',
+ value: 'SYCLLX',
+ type: 'SEL_OPTION',
+ disabled: false
+ }, {
+ label: '政策编号',
+ value: 'LAWS_NUMBER',
+ type: 'INPUT',
+ disabled: false
+ }, {
+ label: '中文名称',
+ value: 'LAWS_NAME',
+ type: 'INPUT',
+ disabled: false
+ }, {
+ label: '英文名称',
+ value: 'LAWS_EN_NAME',
+ type: 'INPUT',
+ disabled: false
+ }, {
+ label: '个性化标签',
+ value: 'GXHBQXX',
+ type: 'SEL_OPTION',
+ disabled: false
+ }, {
+ label: '新车型实施日期(文本)',
+ value: 'XCXSSRQ',
+ type: 'DATE_PIC_OPTS',
+ disabled: false
+ }, {
+ label: '在产车实施日期(文本)',
+ value: 'ZCCSSRQ',
+ type: 'DATE_PIC_OPTS',
+ disabled: false
+ }, {
+ label: '维护工程师',
+ value: 'ZCGCS',
+ type: 'SEL_OPTION',
+ selVal: "USERLIST",
+ disabled: false
+ }
+ ]
+ // 标准法规清单可查字段
+ }else {
+ this.twoOptions=[
+ {
+ label: '清单名称',
+ value: 'ACCESS_CONTENT',
+ type: 'INPUT',
+ disabled: false
+ }, {
+ label: '国家地区',
+ value: 'COUNTRY',
+ type: 'SEL_OPTION',
+ disabled: false
+ }
+ ]
}
},
/**
@@ -1534,52 +1595,77 @@ export default {
// })
// },
pageInfo() {
- StandardsInfoPage(this.sarAccessInfoSearch).then(res => {
- this.sarAccessInfoSearchList = res.data.list
- this.sarAccessInfoSearchList.forEach(item => {
- if (item.standYear === null) {
- item.standNumber = item.standSortShow + ' ' + item.standNumber
- } else {
- item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
- }
- if (item.attrInfoMap === null) {
- this.$set(item, 'zccssrqgj', '')
- this.$set(item, 'xcxssrqgj', '')
- this.$set(item, 'sycpx', '')
- this.$set(item, 'ssrq', '')
- this.$set(item, 'typeApplicable', '')
- this.$set(item, 'nylx', '')
- this.$set(item, 'zrbm', '')
- this.$set(item, 'cycvppsbm', '')
- this.$set(item, 'cycvppscn', '')
- this.$set(item, 'kccvppsbm', '')
- this.$set(item, 'kccvppscn', '')
- } else {
- this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
- this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
- this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
- this.$set(item, 'ssrq', item.attrInfoMap.SSRQ)
- this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
- this.$set(item, 'nylx', item.attrInfoMap.NYLX)
- this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
- this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
- this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
- this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
- this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
- }
+ console.log('1598',this.sarAccessInfoSearch)
+ if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND' || this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND'){
+ StandardsInfoPage(this.sarAccessInfoSearch).then(res => {
+ this.sarAccessInfoSearchList = res.data.list
+ this.sarAccessInfoSearchList.forEach(item => {
+ if (item.standYear === null) {
+ item.standNumber = item.standSortShow + ' ' + item.standNumber
+ } else {
+ item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
+ }
+ if (item.attrInfoMap === null) {
+ this.$set(item, 'zccssrqgj', '')
+ this.$set(item, 'xcxssrqgj', '')
+ this.$set(item, 'sycpx', '')
+ this.$set(item, 'ssrq', '')
+ this.$set(item, 'typeApplicable', '')
+ this.$set(item, 'nylx', '')
+ this.$set(item, 'zrbm', '')
+ this.$set(item, 'cycvppsbm', '')
+ this.$set(item, 'cycvppscn', '')
+ this.$set(item, 'kccvppsbm', '')
+ this.$set(item, 'kccvppscn', '')
+ } else {
+ this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
+ this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
+ this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
+ this.$set(item, 'ssrq', item.attrInfoMap.SSRQ)
+ this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
+ this.$set(item, 'nylx', item.attrInfoMap.NYLX)
+ this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
+ this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
+ this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
+ this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
+ this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
+ }
+ })
+ this.drawerTotal = res.data.count
+ }, e => {
})
- this.drawerTotal = res.data.count
- }, e => {
- })
+ }else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_LAWS'){
+ this.$http.get('lawss/sarLawsInfo/page', this.sarAccessInfoSearch, {
+ _this: this,
+ }, res => {
+ console.log('1640',res)
+ this.sarAccessInfoSearchList = res.data.list
+ }, e => {
+ })
+ }else if (this.sarAccessInfoSearch.dataSource === 'BUSINESS'){
+ this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.sarAccessInfoSearch, {
+ _this: this,
+ }, res => {
+ console.log('1648',res)
+ this.sarAccessInfoSearchList = res.data.list
+ }, e => {
+ })
+ }
},
// 查询数据搜索 table 数据
selectLawsStands() {
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
this.sarAccessInfoSearch.standType = 'INLAND'
this.pageInfo()
- } else {
+ } else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND') {
this.sarAccessInfoSearch.standType = 'FOREIGN'
this.pageInfo()
+ }else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_LAWS') {
+ this.sarAccessInfoSearch.standType = 'LAWS'
+ this.pageInfo()
+ }else if (this.sarAccessInfoSearch.dataSource === 'BUSINESS') {
+ this.sarAccessInfoSearch.standType = 'BUSINESS'
+ this.pageInfo()
}
},
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 443e2d0d4..23c1e6870 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -308,7 +308,7 @@
+
+
+ 批量分发责任人
+
+
+
-
+
-
+
-
-
+
+
-
+
-
@@ -238,7 +148,7 @@
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
-import { inboundLiaisonDetail, saveTaskForPub ,changeAssigneeNew } from "api/process";
+import { changeAssigneeNew, inboundLiaisonDetail, saveTaskForPub } from "api/process";
export default {
name: "xmpg2Step5",
@@ -252,7 +162,7 @@ export default {
isTransfer: false,
// 调整处理人抽屉状态
drawerModal: false,
- workPeopleList:[],
+ workPeopleList: [],
//防止按钮点击过快的按钮loading
buttonLoading: false,
//刷新表格
@@ -282,8 +192,8 @@ export default {
},
//表单的数据
listForm: {
- projectNumber: "", //项目编号
- projectName: "", //项目名称
+ projectNumber: "", //项目编号
+ projectName: "", //项目名称
dataList: [], //项目下的标准数据
children: [] //标准下的分解单数据
},
@@ -298,45 +208,45 @@ export default {
},
methods: {
//确认转办
- checkedTransferRole (data) {
- this.assigneeNewLoading = true
+ checkedTransferRole(data) {
+ this.assigneeNewLoading = true;
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人
pId: this.$route.query.prcId // 流程实例
}).then(res => {
- this.isTransfer = false
+ this.isTransfer = false;
if (res.success) {
- this.drawerModal = false
- this.$message.success('调整成功')
+ this.drawerModal = false;
+ this.$message.success("调整成功");
this.$router.push("/processCenter");
- this.processNum()
+ this.processNum();
} else {
- this.$message.warning(res.message)
+ this.$message.warning(res.message);
}
- })
+ });
},
// 请求转换流程图
- processNum (row) {
+ processNum(row) {
axios.request({
- url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
- responseType: 'blob',
- method: 'get',
+ url: "/api/lawss/activiti/getImg?_t=" + new Date().getTime(),
+ responseType: "blob",
+ method: "get",
params: {
prcNum: this.$route.query.prcNum
}
}).then(res => {
// let blob = new Blob([res.data], {type: 'image/jpg'})
// let url = window.URL.createObjectURL(res.data)
- this.processStep = window.URL.createObjectURL(res.data)
- })
+ this.processStep = window.URL.createObjectURL(res.data);
+ });
},
//转办事件
- handleTransfer(){
- this.drawerModal = true
- this.drawerTitle = '转办处理人'
- this.selectPeople = row
+ handleTransfer() {
+ this.drawerModal = true;
+ this.drawerTitle = "转办处理人";
+ this.selectPeople = row;
},
// 点击查看
handlePreview(item) {
@@ -407,6 +317,7 @@ export default {
},
//动态表单读取
getFormFieldList(item) {
+ console.log(item);
this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item));
if (item.form === undefined) {
@@ -444,9 +355,18 @@ export default {
}
});
this.listForm.children = children;
+ this.dataList.forEach(item => {
+ this.$set(item, "workPeople", "请选择责任人");
+ });
+ console.log(this.dataList);
} else {
this.listForm = item.form;
this.dataList = item.form.dataList;
+ this.dataList.forEach(item => {
+ this.$set(item, "workPeople", "请选择责任人");
+ this.$set(item, "workPeopleId", "");
+ });
+ console.log(this.dataList);
}
});
},
@@ -471,19 +391,21 @@ export default {
},
//提交事件
handleSubmit() {
- let dataChildren = []
- let dataListChildren = []
+ let dataChildren = [];
+ let dataListChildren = [];
this.dataList.forEach(item => {
- dataChildren.push(item.children)
- })
- dataChildren.forEach((item,index) => {
- dataListChildren = dataListChildren.concat(item)
- })
+ dataChildren.push(item.children);
+ });
+ dataChildren.forEach((item, index) => {
+ dataListChildren = dataListChildren.concat(item);
+ });
this.isSubmit = true;
this.listForm.commentText = this.commentText;
- this.listForm.children = dataListChildren
- this.listForm.dataList = this.dataList
+ this.listForm.children = dataListChildren;
+ this.listForm.dataList = this.dataList;
const json = JSON.stringify(this.listForm);
+ console.log(json);
+ return;
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
@@ -501,7 +423,8 @@ export default {
},
//批量分发按钮
choiceZRRS(row, type, index) {
- this.selectedId = row.id;
+ console.log(row);
+ this.selectedId = row.id || row.standId;
this.type = type;
if (type === 1) {
this.drawerTitle = "选择责任人";
@@ -522,24 +445,86 @@ export default {
}
}
//批量分发某标准下的责任人
- else if (type === 3){
+ else if (type === 3) {
//弹出选人框
// if (this.tableExpand === false){
- this.modalshowflag = true;
- this.drawerTitle = "批量选择责任人";
+ this.modalshowflag = true;
+ this.drawerTitle = "批量选择责任人";
// }
//展开表格
- this.workPeopleList = row
+ this.workPeopleList = row;
// console.log('279',row.children)
- this.refreshTable = false
+ this.refreshTable = false;
// this.tableExpand = !this.tableExpand
this.$nextTick(() => {
- this.refreshTable = true
+ this.refreshTable = true;
});
}
},
+ setChildren(children, type) {
+ // 编辑多个子层级
+ children.map(j => {
+ this.toggleSelection(j, type);
+ if (j.children) {
+ this.setChildren(j.children, type);
+ }
+ });
+ },
+ // 选中父节点时，子节点一起选中取消
+ select(selection, row) {
+ const hasSelect = selection.some(el => {
+ return row.id === el.id;
+ });
+ if (hasSelect) {
+ if (row.children) {
+ // 解决子组件没有被勾选到
+ this.setChildren(row.children, true);
+ }
+ } else {
+ if (row.children) {
+ this.setChildren(row.children, false);
+ }
+ }
+ },
+ toggleSelection(row, select) {
+ if (row) {
+ this.$nextTick(() => {
+ this.$refs.myTable &&
+ this.$refs.myTable.toggleRowSelection(row, select);
+ });
+ }
+ },
+ // 选择全部
+ selectAll(selection) {
+ // dataList第一层只要有在selection里面就是全选
+ const isSelect = selection.some(el => {
+ const dataListIds = this.dataList.map(j => j.id);
+ return dataListIds.includes(el.id);
+ });
+ // dataList第一层只要有不在selection里面就是全不选
+ const isCancel = !this.dataList.every(el => {
+ const selectIds = selection.map(j => j.id);
+ return selectIds.includes(el.id);
+ });
+ if (isSelect) {
+ selection.map(el => {
+ if (el.children) {
+ // 解决子组件没有被勾选到
+ this.setChildren(el.children, true);
+ }
+ });
+ }
+ if (isCancel) {
+ this.dataList.map(el => {
+ if (el.children) {
+ // 解决子组件没有被勾选到
+ this.setChildren(el.children, false);
+ }
+ });
+ }
+ },
//标准表格选择框改变
selectStandChange(data) {
this.selectList = data;
@@ -559,14 +544,28 @@ export default {
}
},
checkedRole(data) {
+ var idList = "";
+ var nameList = "";
+ data.forEach(item => {
+ if (nameList.length > 0) {
+ nameList += ",";
+ idList += ",";
+ }
+ idList += item.id;
+ nameList += item.name;
+ });
//单选操作
if (this.type === 1) {
this.dataList.forEach(item => {
+ if(item.standId === this.selectedId){
+ item.workPeople = nameList;
+ item.workPeopleId = idList;
+ }
if (item.children) {
item.children.forEach(items => {
if (items.id === this.selectedId) {
- items.workPeople = data[0].name;
- items.workPeopleId = data[0].id;
+ items.workPeople = nameList;
+ items.workPeopleId = idList;
// this.$set(items,'workPeople',data[0].name)
//this.$set(items,'workPeopleId',data[0].id)
}
@@ -577,37 +576,37 @@ export default {
} else if (this.type === 2) {
this.selectList.forEach(item => {
this.dataList.map(items => {
- if (item.id === items.id) {
- items.workPeople = "";
- items.workPeopleId = "";
- this.$message.warning('您只能针对条款进行分发')
+ if (item.standId === items.standId) {
+ items.workPeople = nameList;
+ items.workPeopleId = idList;
+ // this.$message.warning('您只能针对条款进行分发')
}
- if (items.children.length) {
+ if (items.children) {
items.children.map(childrenItem => {
if (childrenItem.id === item.id) {
- childrenItem.workPeople = data[0].name;
- childrenItem.workPeopleId = data[0].id;
+ childrenItem.workPeople = nameList;
+ childrenItem.workPeopleId = idList;
}
});
}
});
});
this.dataList = JSON.parse(JSON.stringify(this.dataList));
- }else if (this.type === 3){
+ } else if (this.type === 3) {
// console.log("529",this.workPeopleList)
- for (let i=0;i
-
-
+
+
-
+
-
+
-
+
{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}
-
+
{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}
-
+
{{ scope.row.commentText }}
-
+
{{ scope.row.endTime ? "已完成" : "未完成" }}
@@ -203,34 +131,16 @@
流程列表加载中
-
+ v-if="isPermission('d9730d984627af948053df56a2db7997,dd4ea796dab7a01b105ba657b1968a84,a7a38a95ea374695fc3128037f6feccf')>0" label="收藏" align="center" width="50">
-
@@ -4460,7 +4460,7 @@ export default {
.collection-btn {
padding: 0;
border: none;
- color: #4788c0;
+ color: #F2CB51;
font-size: 18px;
width: 18px;
height: 18px;
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index 1985cb69a..b6a04f46e 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -317,7 +317,7 @@
{{ textStatusMap[scope.row.textStatus] }}
-
+
-
- 数据获取中
-
-
@@ -872,7 +661,10 @@ export default {
},
//数据查看
historySee: false,
- historySeeForm: {}
+ historySeeForm: {},
+ // 新增编辑框的disabled
+ serialNumber: true,
+ addFormEdit: {}
};
},
methods: {
@@ -1032,11 +824,6 @@ export default {
}
},
- //项目查询按钮
- getProjectDataBtn() {
- this.page = 1;
- this.getProjectData();
- },
//获取项目数据
getProjectData() {
this.$http.get("sarStandProjectLibrary/queryProjectWorkFlow", {
@@ -1116,7 +903,7 @@ export default {
editUn(closeState, standSerialNumber, standName, itemsNum, itemsName, productType,
productLine, productName, reason, responsibleUnit, dutyEngineer, authEngineer, qaEngineer, planCloseTime, id).then(res => {
if (res.ok) {
- this.$message.success("新增成功");
+ this.$message.success("编辑成功");
this.drawerTable = false;
this.getTableByPage();
}
@@ -1204,8 +991,8 @@ export default {
}
},
//查询项目下的标准
- getStandData() {
- this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: this.projectId }, {
+ getStandData(val) {
+ this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: val.id }, {
_this: this
}, res => {
res.data.records.forEach(item => {
@@ -1230,61 +1017,21 @@ export default {
});
});
},
- //条款的多选框改变
- selectReplaceStandNumRowChange(data) {
- this.selectItems = data;
- },
- //标准的多选框改变
- selectStandChange(data) {
- this.standList = data;
- },
- //项目的多选框改变
- selectListChange(data) {
- this.selectList = data;
- },
- //单选逻辑
- handleSelectionChanges(selection, val) {
- if (selection.length > 1) {
- let del_row = selection.shift();
- this.$refs.listSelection.toggleRowSelection(del_row, false);
- }
- },
- standPageChange(page) {
- this.standPage = page;
- this.getStandData();
- },
- standPageSizeChange(pageSize) {
- this.standPageSize = pageSize;
- this.getStandData();
- },
- //条款分页
- pageChangeReplace(page) {
- this.replacePage = page;
- this.getItem();
- },
- pageSizeChangeReplace(pageSize) {
- this.replacePageSize = pageSize;
- this.getItem();
- },
- pageChange(page) {
- this.page = page;
- this.getProjectData();
- },
- pageSizeChange(pageSize) {
- this.pageSize = pageSize;
- this.getProjectData();
- },
//新增事件
addModel() {
- this.addForm = {};
- this.projectModel = true;
+ this.dataList = []
+ this.serialNumber = true
+ this.drawerTitle = "新增";
+ this.getProjectData()
+ this.drawerTable = true
},
//编辑事件
projectEdit(row) {
this.drawerTitle = "编辑";
this.addForm = row;
+ this.addFormEdit = row
+ this.getProjectData()
this.drawerTable = true;
- console.log(row);
},
//点击查看按钮事件
showUser(row) {
@@ -1307,10 +1054,6 @@ export default {
}
});
},
- //点击编辑按钮事件
- openEditModal(item) {
- console.log(item);
- },
// 点击查看
handlePreview(item) {
let routeUrl = this.$router.resolve({
@@ -1361,7 +1104,29 @@ export default {
pageSizeChangeNo(pageSize) {
this.pageSizeNo = pageSize;
this.getTableByPage();
+ },
+
+ /** 项目名称change事件 */
+ handleChange(val) {
+ if (this.drawerTitle === '编辑') {
+ this.addForm.standName = ''
+ this.addForm.standSerialNumber = ''
+ this.addForm.responsibleUnit = ''
+ }
+ this.addForm.productLine = val.productLine
+ this.addForm.productName = val.projectName
+ this.addForm.productType = val.projectPlatfor
+ this.serialNumber = false
+ this.getStandData(val)
+
+ },
+ /** 标准号change事件 */
+ standChange(item) {
+ this.addForm.standName = item.standName
+ this.addForm.standSerialNumber = item.standSort + '-' + item.standNumber + '-' + item.standYear
+ this.addForm.responsibleUnit = item.zrbm || "--";
}
+
},
mounted() {
//查询已维护的项目
@@ -1382,13 +1147,6 @@ export default {
-
@@ -5191,7 +5191,7 @@ export default {
.collection-btn {
padding: 0;
border: none;
- color: #4788c0;
+ color: #F2CB51;
font-size: 18px;
width: 18px;
height: 18px;
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
index 2a852402a..9c475ba22 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
@@ -157,7 +157,14 @@
show-overflow-tooltip
prop=""
width="180px"
- label="合规评估结果">
+ label="合规性情况">
+
+
+
-
-
-
-
-
-
-
-
- 符合性状态
-
-
-
-
-
+
+
@@ -269,14 +242,11 @@ export default {
},
methods: {
changeState (row) {
- console.log(row);
let routeUrl = this.$router.resolve({
name: 'ComplianceDetails',
query: {
- sarId: this.saveSarId,
productId: row.productId,
- sarType: row.standType,
- fromPage: 'product'
+ standId: row.standId,
}
})
window.open(routeUrl.href, '_blank')
@@ -325,23 +295,20 @@ export default {
this.queryStandAndLaws();
}, // 外层清空条件查询
handleProjectCompliance(row) {
- this.sarProStateEO.type = row.type
+ this.sarProStateEO.standId = row.standId
this.productId = row.productId;
this.querySarProStateZero();
}, // 查看项目符合性
querySarProStateZero(page) {
- console.log(page)
if (page) {
this.sarProStateTotalPage = page
} else {
this.sarProStateTotalPage = 1;
}
var form = this.sarProStateEO;
- console.log('395',form)
- // form.standId = this.standId
form.current = this.sarProStateTotalPage;
form.size = this.sarProStatePageSize;
- this.$http.get("sarStandardComplianceAssessResult/product", form, {
+ this.$http.get("sarStandardComplianceAssessResult/productNew", form, {
_this: this
}, res => {
if (res.ok) {
diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
index a307c746f..a2096a542 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
@@ -108,10 +108,6 @@
fixed="left"
width="180"
label="标准号">
-
-
-
-
{{ scope.row.standSerialNumber }}
@@ -403,178 +399,6 @@
@click="exportTestItem">提交
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
符合
+ 不符合
+
+
符合
+ 不符合
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 查询
-
-
-
- 清空
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.standSort
- }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}
- {{ scope.row.standSort }}
- {{ scope.row.standNumber }}
-
-
-
-
- {{ scope.row.standName }}
-
-
-
-
- {{ scope.row.ssrq ? $moment(scope.row.ssrq).format("YYYY-MM-DD") : "" }}
-
-
-
-
-
-
-