- 标准合规评估流程
- 落实人填写评估反馈
+ 项目合规评估流程-项目
+ 产品工程经理审核
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -517,104 +285,48 @@
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
-import Moment from 'moment';
-import { inboundLiaisonDetail, saveTaskForPub ,changeAssigneeNew,execTask } from "api/process";
+import { inboundLiaisonDetail, queryDetail ,changeAssigneeNew } from "api/process";
export default {
name: "xmpgStep4",
components: {
+ ProcessTitle,
ProcessHeader,
- ProcessFooter,
- ProcessTitle
+ ProcessFooter
},
data() {
return {
- //折叠的标志，true为折叠，false为不折叠
- foldFormFlag: false,
- comFlag: 0,
+ total: 0,
+ currentPage: 1,
+ pageSize: 20,
nodeList:[],
drawerTitle:'',
isTransfer: false,
// 调整处理人抽屉状态
drawerModal: false,
- modalShowFlag: false, // 批量编辑开关
- batchEditForm: {
- // 在研产品
- // 合规
- complianceReasons: "",
- // 不合规
- noCompliance: "",
- // 应对措施
- countermeasures: "",
- // 完成时间
- completionTime: "",
- },
- detailData: [],
- sarProStateTableHeight: null, // 项目列表高度
+ active: "1",
+ loading: false,
// 当前流程类型(1待办/2已办)
processType: 1,
- loading: false,
- dataList: [],//清单里的标准数据
- active: "1",
- userId: this.$store.getters.userInfo.userId,
- taskIds: this.$route.query.taskIds,
- pId: this.$route.query.prcId,
- listType: "country", //选择的清单类型
isSubmit: false,
saveLoading: false,
- submitShow: false,
- acceptShow: false,
- todoId: '',
- tabValue: "listOfCountries",
- selectedList: [], //选择清单的选择框
- selectList: [], //选择标准的选择框
- bringData: [],
- commentText: "", //填写会签意见
- page: 1,
- total: 0,
- pageSize: this.$store.getters.userInfo.configContent,
+ //表单的数据
listForm: {
- standNumber: "", //标准编号
- standName: "",//标准名称
- certifiedEngineerName: "", //认证工程师
- qualityEngineerName: "", //质量工程师
- dataList: [{
- projectManager: "",
- itemsName: "",
- uname: "",
- projectNumber: "",
- implementer: "",
- implementerId: "",
- productLine: "",
- itemNum: "",
- distributePerson: "",
- projectName: "",
- distributePersonId: "",
- complianceReasons: "", //在研合规原因
- noCompliance: "", //在研不合规项目
- countermeasures: "", //在研应对措施
- completionTime: "", //在研完成时间
- zcComplianceReasons: "", //在产的合规原因
- zcNoCompliance: "", //在产不合规项目
- zcCountermeasures: "", //在产的应对措施
- zcCompletionTime: "" //在产的完成时间
- }]
+ passFlag: " ", //0审批通过 1为驳回
+ projectNumber: "", //项目编号
+ projectName: "", //项目名称
+ dataList: [], //项目下的标准数据
+ breakdownList: [] //标准下的分解单数据
},
- choiceForm: {}, //选择标准清单列表
- countryOptions: [], //适用区域下拉框数据
- user1: "",
- user2: "",
- user3: "",
- user4: "",
- user5: "",
- standMap: new Map()
+ dataList: [], //展示的标准数据
+ commentText: "", //审批意见
+ detailData: [],//流程历史数据
+ userId: this.$store.getters.userInfo.userId,
+ taskIds: this.$route.query.taskIds,
+ pId: this.$route.query.prcId
};
},
methods: {
- //折叠/展开基础信息方法
- foldForm() {
- this.foldFormFlag = !this.foldFormFlag
- },
//确认转办
checkedTransferRole (data) {
this.assigneeNewLoading = true
@@ -656,6 +368,41 @@ export default {
this.drawerTitle = '转办处理人'
this.selectPeople = row
},
+ // 点击查看
+ handlePreview(item) {
+ let routeUrl = this.$router.resolve({
+ name: "OtherStandardDetails",
+ params: {
+ id: item.standId,
+ pageType: "INLAND_STAND"
+ }
+ });
+ window.open(routeUrl.href, "_blank");
+ },
+ //查询项目下的标准
+ getStandData() {
+ this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
+ standType: this.standardSearch.standType,
+ standNumber: this.standardSearch.standNumber,
+ page: this.pageNo,
+ pageSize: this.pageSizeNo
+ }, {
+ _this: this
+ }, res => {
+ this.standardData = res.data.list;
+ this.standardData.forEach(item => {
+ if (item.attrInfoMap === null) {
+ this.$set(item, "ZCCSSRQ", "");
+ this.$set(item, "XCXSSRQ", "");
+ } else {
+ this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
+ this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
+ }
+ });
+ this.totalNo = res.data.count;
+ }, e => {
+ });
+ },
processTable() {
this.$http.get("lawss/activiti/get_list_by_instance", {
prcNum: this.$route.query.prcNum,
@@ -669,32 +416,11 @@ export default {
}, e => {
});
},
- //tab发生变化
- handleTabs(name) {
- this.active = name;
- },
- //点击查看详情
- handlePreview(item){
- let routeUrl = this.$router.resolve({
- name: "OtherStandardDetails",
- params: {
- id: item.id,
- pageType: "INLAND_STAND"
- }
- });
- window.open(routeUrl.href, "_blank")
- },
- //将时间戳转换为日期格式
- getLocalTime(item) {
- return new Date(parseInt(item) * 1000).toLocaleDateString().replace(/:\d{1,2}$/, " ");
- },
-
-// 时间戳（毫秒）转化为标准时间格式
- getFullTime(item) {
- const stamp = new Date(item);
- const time = Moment(stamp).format('YYYY-MM-DD HH:mm:ss');
- return item = time
+ //tab改变
+ handleTabs(type) {
+ this.active = type;
},
+ //获取数据
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
@@ -703,210 +429,107 @@ export default {
}).then(res => {
if (res) {
const processForm = JSON.parse(res.mesg);
- let commitStatus = res.commitStatus
- if(commitStatus && commitStatus > 0){
- this.acceptShow = true
- this.submitShow = false
- }else {
- this.acceptShow = false
- this.submitShow = true
- }
- this.todoId = res.id
this.getFormFieldList(processForm);
}
}).catch(e => {
});
});
},
- /**
- * @description: 动态表单读取
- */
+ //动态表单读取
getFormFieldList(item) {
console.log(item);
this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item));
- if (item.form === undefined) {
- if (item.fenFlag === undefined) {
- item.step3DTOS.forEach(item => {
- item.implementerId = this.$store.getters.userInfo.userId;
- item.implementer = this.$store.getters.userInfo.userName;
- });
- // this.commentText = ''
- this.dataList = item.step3DTOS;
- this.dataList.forEach(item => {
- this.$set(item,'complianceReasons', '')
- this.$set(item,'noCompliance', '')
- this.$set(item,'countermeasures', '')
- this.$set(item,'completionTime', '')
+ let dataChildren = []
+ let dataListChildren = []
+ this.listForm.prcNum = this.prcNum;
+ this.listForm.prcName = this.prcName;
+ this.listForm["id"] = item.id;
+ this.listForm.dataList = item.dataList;
+ this.dataList = item.dataList;
+ this.dataList.forEach(item =>{
+ if(item.children){
+ item.children.forEach(items =>{
+ dataChildren.push(items)
})
- } else {
- this.dataList = item.dataList;
- // this.commentText = ''
- this.dataList.forEach(item => {
- item.implementerId = this.$store.getters.userInfo.userId;
- item.implementer = this.$store.getters.userInfo.userName;
- });
}
- // this.getLocalTime()
- this.listForm.prcNum = this.prcNum;
- this.listForm.prcName = this.prcName;
- this.listForm["id"] = item.id;
- this.listForm.standName = item.step3DTOS[0].standName;
- this.listForm.standNumber = item.step3DTOS[0].standNumber;
- this.listForm.id = item.step3DTOS[0].id;
- this.listForm.qualityEngineerName = item.step3DTOS[0].qualityEngineerName;
- this.listForm.certifiedEngineerName = item.step3DTOS[0].certifiedEngineerName;
- this.listForm.itemsName = item.step3DTOS[0].itemsName;
- this.listForm.itemNum = item.step3DTOS[0].itemNum;
- this.listForm.responsibleUnit = item.step3DTOS[0].responsibleUnit;
- this.listForm.responsibleEngineer = item.step3DTOS[0].responsibleEngineer;
- } else {
- this.listForm = item.form;
- this.dataList = item.form.dataList;
+ })
+ this.dataList.forEach(item => {
+ dataChildren.forEach(items =>{
+ if (items.key === item.standId) {
+ this.$set(items, "standName", item.standName);
+ this.$set(items, "standEnName", item.standEnName);
+ this.$set(items, "standYear", item.standYear);
+ this.$set(items, "standSort", item.standSort);
+ this.$set(items, "standNumber", item.standNumber);
+ }
+ })
+ })
+ dataChildren.forEach((item, index) => {
+ dataListChildren = dataListChildren.concat(item);
+ });
+ dataListChildren = this.dataList.concat(dataListChildren);
+ let index = dataListChildren.findIndex(item => {
+ return item.people
+ })
+ if(index > -1){
+ dataListChildren.splice(index, 1)
}
-
+ this.dataList = dataListChildren;
+ this.total = this.dataList.length;
});
},
-
-
- //保存事件
- handleSave() {
- this.saveLoading = true;
- let _formData = new FormData();
- this.listForm.dataList = this.dataList;
- _formData.append("id", this.bpnId || "");
- _formData.append("prcType", "5");
- _formData.append("taskIds", this.taskIds);
- _formData.append("json", JSON.stringify({
- form: this.listForm,
- commentText: this.commentText
- }));
- saveTaskForPub(_formData).then(res => {
- this.saveLoading = false;
- this.$message.success("保存成功");
- this.bpnId = res.result;
- }).catch(e => {
- this.saveLoading = false;
- });
- },
- // 接受按钮
- handleAccept(){
- this.isSubmit = true
- execTask({
- todoId: this.todoId // 当前节点ID
- }).then(res => {
- if (res.sign && res.sign === '0') {
- this.$message.success('接收成功')
- this.$router.push('/processCenter')
- }
- this.isSubmit = false
- })
- },
- handlePrice(){
- for (let i = 0; i < this.dataList.length; i++) {
- if (this.dataList[i].complianceReasons !== '' || (this.dataList[i].noCompliance !== '' && this.dataList[i].countermeasures !== '' && this.dataList[i].completionTime !== '') || (this.dataList[i].complianceReasons === '' && this.dataList[i].noCompliance === '' && this.dataList[i].countermeasures === '' && this.dataList[i].completionTime === '')){
- }else {
- this.comFlag ++
- }
+ //驳回事件
+ beforeBack() {
+ if (!this.commentText) {
+ this.$message.warning("请填写审批意见");
+ } else {
+ this.listForm.passFlag = "1";
+ this.listForm.commentText = this.commentText;
+ const json = JSON.stringify(this.listForm);
+ this.$http.post("lawss/activiti/completeTask", {
+ taskIds: this.taskIds,
+ userId: this.userId,
+ json: json
+ }, {
+ _this: this
+ }, res => {
+ if (res.success) {
+ this.$message.success(res.message);
+ this.$router.push("/processCenter");
+ }
+ }, e => {
+ });
}
},
//提交事件
handleSubmit() {
- let submitFlag = 0;
- this.dataList.forEach(item => {
- if(item.complianceReasons || item.noCompliance){
- submitFlag = 1
- }
- return
- })
- if(submitFlag === 0 ){
- this.$message.warning('请至少对一条信息进行评估')
- }else{
- this.handlePrice()
- if(this.comFlag > 0) {
- this.$message.warning('请填写完整的不符合项信息')
- this.comFlag = 0
- }else{
- this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
- this.listForm.commentText = this.commentText;
- this.listForm.approvalOpinion = "";
- this.listForm.signFlag = "";
- this.listForm.dataList = this.dataList;
- const json = JSON.stringify(this.listForm);
- this.isSubmit = true
- this.$http.post("lawss/activiti/completeTask", {
- taskIds: this.taskIds,
- userId: this.userId,
- json: json
- }, {
- _this: this
- }, res => {
- if (res.success) {
- this.$message.success(res.message);
- this.$router.push("/processCenter");
- }
- this.isSubmit = false;
- }, e => {
-
- });
+ this.isSubmit = true;
+ this.listForm.passFlag = "0";
+ this.listForm.commentText = this.commentText;
+ const json = JSON.stringify(this.listForm);
+ this.$http.post("lawss/activiti/completeTask", {
+ taskIds: this.taskIds,
+ userId: this.userId,
+ json: json
+ }, {
+ _this: this
+ }, res => {
+ if (res.success) {
+ this.$message.success(res.message);
+ this.$router.push("/processCenter");
}
- }
- },
- //批量编辑
- batchEdit() {
- if (this.selectList.length > 0) {
- //合规
- this.batchEditForm.complianceReasons = "";
- //不合规
- this.batchEditForm.noCompliance = "";
- //应对措施
- this.batchEditForm.countermeasures = "";
- //完成时间
- this.batchEditForm.completionTime = "";
- this.modalShowFlag = true;
- } else {
- this.$message.warning("请选择要编辑的数据");
- }
- },
- //批量编辑确定按钮事件
- saveBatchEditForm() {
- this.dataList.forEach(item => {
- this.selectList.forEach(items => {
- if (item.itemNum === items.itemNum && item.projectName === items.projectName) {
- item.complianceReasons = this.batchEditForm.complianceReasons;
- //不合规
- item.noCompliance = this.batchEditForm.noCompliance;
- //应对措施
- item.countermeasures = this.batchEditForm.countermeasures;
- //完成时间
- item.completionTime = this.batchEditForm.completionTime;
- }
- });
+ this.isSubmit = false;
+ }, e => {
});
- this.$refs.multipleTable.clearSelection()
- this.modalShowFlag = false;
},
- cancelBatchEditForm() {
- this.modalShowFlag = false;
+ // 分页
+ handleCurrentChange(currentPage) {
+ this.currentPage = currentPage;
},
- //标准表格选择框改变
- selectStandChange(data) {
- this.selectList = data;
- // for (let i = 0; i < data.length; i++) {
- // this.selectList.push(data[i].id);
- // }
+ handleSizeChange(size) {
+ this.pageSize = size;
},
- selectThree() {
-
- },
- pageChange(page) {
- this.page = page;
- this.searchData();
- },
- pageSizeChange(pageSize) {
- this.pageSize = this.$store.getters.userInfo.configContent;
- this.searchData();
- }
},
computed: {
listNoDataText() {
@@ -988,17 +611,8 @@ export default {
height: 100%;
}
}
- .datePickLen {
- /deep/ .el-icon-circle-close:before {
- margin-left: -180px;
- }
- }
- .input-jump {
- /deep/.el-input__inner{
- color: #409EFF;
- }
- }
}
+
.demo-drawer-content {
margin-top: 10px;
}
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
index 365050bf3..fec5e76c9 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
@@ -1,276 +1,195 @@
-
- 标准合规评估流程
- 分发责任人审批
+ 项目合规评估流程-项目
+ 批准
-
- {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}
- {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}
- {{scope.row.commentText}}
+ {{ scope.row.commentText }}
- {{ scope.row.endTime ? '已完成' : '未完成'}}
+ {{ scope.row.endTime ? "已完成" : "未完成" }}
流程列表加载中
-
@@ -372,97 +288,42 @@ import { inboundLiaisonDetail, queryDetail ,changeAssigneeNew } from "api/proces
export default {
name: "xmpgStep5",
components: {
+ ProcessTitle,
ProcessHeader,
- ProcessFooter,
- ProcessTitle
+ ProcessFooter
},
data() {
return {
- //折叠的标志，true为折叠，false为不折叠
- foldFormFlag: false,
+ total: 0,
+ currentPage: 1,
+ pageSize: 20,
nodeList:[],
drawerTitle:'',
isTransfer: false,
// 调整处理人抽屉状态
drawerModal: false,
- detailData: [],
- sarProStateTableHeight: null, // 项目列表高度
+ active: "1",
+ loading: false,
// 当前流程类型(1待办/2已办)
processType: 1,
- loading: false,
- dataList: [],
- active: "1",
- userId:this.$store.getters.userInfo.userId,
- taskIds: this.$route.query.taskIds,
- pId: this.$route.query.prcId,
- listType: "country", //选择的清单类型
isSubmit: false,
saveLoading: false,
- tabValue: "listOfCountries",
- selectedList: [], //选择清单的选择框
- selectList: [], //选择标准的选择框
- bringData: [],
- commentText: "", //填写会签意见
- page: 1,
- total: 0,
- pageSize: this.$store.getters.userInfo.configContent,
+ //表单的数据
listForm: {
- fenFlag: " ", //1为驳回 2为通过
- standNumber: "", //标准编号
- standName: "",//标准名称
- certifiedEngineerName: "", //认证工程师
- qualityEngineerName: "", //质量工程师
- breakdownList: [{ //分解单数据
- implementer: "",
- applyArctic: "",
- busStandCover: "",
- claimType: "",
- id: "",
- itemsName: "",
- itemsNum: "",
- responsibleUnit: "",
- standId: "",
- svpps: ""
- }],
- dataList: [{
- implementer: "",
- projectLine: "", //产品线
- uname: "",//产品线责任人
- distributePerson: "", //分发责任人
- distributePersonId: "", //分发责任人id
- id: "",
- sarStandProjectLibraries: [{
- projectManager: "",
- projectLevel: "",
- projectNumber: "",
- projectEndDate: "",
- currentNode: "",
- projectGroup: "",
- productLine: "",
- projectClassification: "",
- projectStatus: "",
- projectStartDate: "",
- id: "",
- projectName: "",
- projectPlatfor: ""
- }]
- }]
+ projectNumber: "", //项目编号
+ projectName: "", //项目名称
+ dataList: [], //项目下的标准数据
+ breakdownList: [] //标准下的分解单数据
},
- choiceForm: {}, //选择标准清单列表
- countryOptions: [], //适用区域下拉框数据
- user1: "",
- user2: "",
- user3: "",
- user4: "",
- user5: "",
- standMap: new Map()
+ dataList: [], //展示的标准数据
+ commentText: "", //审批意见
+ detailData: [],//流程历史数据
+ userId: this.$store.getters.userInfo.userId,
+ taskIds: this.$route.query.taskIds,
+ pId: this.$route.query.prcId
};
},
methods: {
- //折叠/展开基础信息方法
- foldForm() {
- this.foldFormFlag = !this.foldFormFlag
- },
//确认转办
checkedTransferRole (data) {
this.assigneeNewLoading = true
@@ -504,33 +365,59 @@ export default {
this.drawerTitle = '转办处理人'
this.selectPeople = row
},
- processTable () {
- this.$http.get('lawss/activiti/get_list_by_instance', {
- prcNum: this.$route.query.prcNum,
- sortWord: this.shunxu ? this.paixu : '',
- shunxu: this.shunxu
+ // 点击查看
+ handlePreview(item) {
+ let routeUrl = this.$router.resolve({
+ name: "OtherStandardDetails",
+ params: {
+ id: item.standId,
+ pageType: "INLAND_STAND"
+ }
+ });
+ window.open(routeUrl.href, "_blank");
+ },
+ //查询项目下的标准
+ getStandData() {
+ this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
+ standType: this.standardSearch.standType,
+ standNumber: this.standardSearch.standNumber,
+ page: this.pageNo,
+ pageSize: this.pageSizeNo
}, {
- loading: 'loading',
_this: this
}, res => {
- this.detailData = res
- }, e => {})
+ this.standardData = res.data.list;
+ this.standardData.forEach(item => {
+ if (item.attrInfoMap === null) {
+ this.$set(item, "ZCCSSRQ", "");
+ this.$set(item, "XCXSSRQ", "");
+ } else {
+ this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
+ this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
+ }
+ });
+ this.totalNo = res.data.count;
+ }, e => {
+ });
},
- //tab发生变化
- handleTabs(name) {
- this.active = name;
+ processTable() {
+ this.$http.get("lawss/activiti/get_list_by_instance", {
+ prcNum: this.$route.query.prcNum,
+ sortWord: this.shunxu ? this.paixu : "",
+ shunxu: this.shunxu
+ }, {
+ loading: "loading",
+ _this: this
+ }, res => {
+ this.detailData = res;
+ }, e => {
+ });
},
- //点击查看详情
- handlePreview(item){
- let routeUrl = this.$router.resolve({
- name: "OtherStandardDetails",
- params: {
- id: item.id,
- pageType: "INLAND_STAND"
- }
- });
- window.open(routeUrl.href, "_blank")
+ //tab改变
+ handleTabs(type) {
+ this.active = type;
},
+ //获取数据
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
@@ -538,109 +425,93 @@ export default {
pId: this.pId
}).then(res => {
if (res) {
- const processForm = JSON.parse(res.mesg)
- this.getFormFieldList(processForm)
+ const processForm = JSON.parse(res.mesg);
+ this.getFormFieldList(processForm);
}
}).catch(e => {
- })
- })
- },
- /**
- * @description: 动态表单读取
- */
- getFormFieldList (item) {
- this.$nextTick(() => {
- this.listForm = JSON.parse(JSON.stringify(item))
- this.listForm.prcNum = this.prcNum
- this.listForm.prcName = this.prcName
- this.dataList = item.dataList
- this.listForm.standName = item.standName
- this.listForm.standNumber = item.standNumber
- this.listForm.id = item.id
- this.listForm.qualityEngineerName = item.qualityEngineerName
- this.listForm.certifiedEngineerName = item.certifiedEngineerName
- this.listForm.responsibleUnit = item.responsibleUnit
- this.listForm.responsibleEngineer = item.responsibleEngineer
- })
- },
- //驳回事件
- beforeBack () {
- if(!this.commentText){
- this.$message.warning('请填写审批意见')
- }else{
- this.isSubmit = true
- this.listForm.applyUpdUserId = this.dataList[0].distributePersonId
- this.listForm.commentText = this.commentText;
- this.listForm.dataList = this.dataList
- this.listForm.fenFlag = '1'
- const json = JSON.stringify(this.listForm);
- this.$http.post('lawss/activiti/completeTask', {
- taskIds: this.taskIds,
- userId: this.userId,
- json: json,
- }, {
- _this: this
- }, res => {
- if (res.success) {
- this.$message.success(res.message)
- this.$router.push('/processCenter')
- }
- this.isSubmit = false
- }, e => {
});
- }
+ });
+ },
+ //动态表单读取
+ getFormFieldList(item) {
+ console.log(item);
+ this.$nextTick(() => {
+ this.listForm = JSON.parse(JSON.stringify(item));
+ let dataChildren = []
+ let dataListChildren = []
+ this.listForm.prcNum = this.prcNum;
+ this.listForm.prcName = this.prcName;
+ this.listForm["id"] = item.id;
+ this.dataList = item.dataList;
+ this.dataList.forEach(item =>{
+ if(item.children){
+ item.children.forEach(items =>{
+ dataChildren.push(items)
+ })
+ }
+ })
+ this.dataList.forEach(item => {
+ dataChildren.forEach(items =>{
+ if (items.key === item.standId) {
+ this.$set(items, "standName", item.standName);
+ this.$set(items, "standEnName", item.standEnName);
+ this.$set(items, "standYear", item.standYear);
+ this.$set(items, "standSort", item.standSort);
+ this.$set(items, "standNumber", item.standNumber);
+ }
+ })
+ })
+ dataChildren.forEach((item, index) => {
+ dataListChildren = dataListChildren.concat(item);
+ });
+ dataListChildren = this.dataList.concat(dataListChildren);
+ let index = dataListChildren.findIndex(item => {
+ return item.people
+ })
+ if(index > -1){
+ dataListChildren.splice(index, 1)
+ }
+ this.dataList = dataListChildren;
+ this.total = this.dataList.length;
+ });
},
//提交事件
handleSubmit() {
- this.listForm.applyUpdUserId = this.dataList[0].distributePersonId
- this.listForm.dataList = this.dataList
- this.listForm.fenFlag = '2'
- this.listForm.commentText = this.commentText;
- const json = JSON.stringify(this.listForm);
- this.isSubmit = true
- this.$http.post('lawss/activiti/completeTask', {
- taskIds: this.taskIds,
- userId: this.userId,
- json: json,
- }, {
- _this: this
- }, res => {
- if (res.success) {
- this.$message.success(res.message)
- this.$router.push('/processCenter')
- }
- this.isSubmit = false
- }, e => {
- });
-
+ this.isSubmit = true;
+ this.listForm.dataList = this.dataList
+ this.listForm.commentText = this.commentText;
+ const json = JSON.stringify(this.listForm);
+ this.$http.post("lawss/activiti/completeTask", {
+ taskIds: this.taskIds,
+ userId: this.userId,
+ json: json
+ }, {
+ _this: this
+ }, res => {
+ if (res.success) {
+ this.$message.success(res.message);
+ this.$router.push("/processCenter");
+ }
+ this.isSubmit = false;
+ }, e => {
+ });
},
- //标准表格选择框改变
- selectStandChange(data) {
- this.selectList = [];
- for (let i = 0; i < data.length; i++) {
- this.selectList.push(data[i].id);
- }
+ // 分页
+ handleCurrentChange(currentPage) {
+ this.currentPage = currentPage;
},
- selectThree() {
-
+ handleSizeChange(size) {
+ this.pageSize = size;
},
- pageChange(page) {
- this.page = page;
- this.searchData();
- },
- pageSizeChange(pageSize) {
- this.pageSize = this.$store.getters.userInfo.configContent;
- this.searchData();
- }
},
computed: {
- listNoDataText () {
- return this.processType === 1 ? '暂无待办流程' : '暂无已办流程'
- },
+ listNoDataText() {
+ return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
+ }
},
mounted() {
- this.processTable()
- this.getData()
+ this.processTable();
+ this.getData();
}
};
@@ -713,11 +584,6 @@ export default {
height: 100%;
}
}
- .input-jump {
- /deep/.el-input__inner{
- color: #409EFF;
- }
- }
}
.demo-drawer-content {
@@ -730,4 +596,4 @@ export default {
padding: 0px;
}
}
->
+
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
deleted file mode 100644
index 3452a93fc..000000000
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
+++ /dev/null
@@ -1,717 +0,0 @@
-
-
-
-
- 标准合规评估流程
- 产品线责任人审批
-
-
-
-
-
- 基础信息
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
隐藏基础信息
-
展开基础信息
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 填写信息
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}
-
-
-
-
- {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}
-
-
-
-
- {{scope.row.commentText}}
-
-
-
-
- {{ scope.row.endTime ? '已完成' : '未完成'}}
-
-
-
- 流程列表加载中
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
deleted file mode 100644
index 34161e456..000000000
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
+++ /dev/null
@@ -1,716 +0,0 @@
-
-
-
-
- 标准合规评估流程
- 标准法规部领导审批
-
-
-
-
-
- 基础信息
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
隐藏基础信息
-
展开基础信息
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 填写信息
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}
-
-
-
-
- {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}
-
-
-
-
- {{scope.row.commentText}}
-
-
-
-
- {{ scope.row.endTime ? '已完成' : '未完成'}}
-
-
-
- 流程列表加载中
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/pages/processCenter/pages/processAcceptDetail/index.vue b/src/pages/processCenter/pages/processAcceptDetail/index.vue
index 8029f34f0..3200ed478 100644
--- a/src/pages/processCenter/pages/processAcceptDetail/index.vue
+++ b/src/pages/processCenter/pages/processAcceptDetail/index.vue
@@ -235,11 +235,7 @@ export default {
this.toProcessDetail('bzpgStep8-1',row)
}else if(prcType === '6'){
//标准项目合规评估 项目维度
- if(row.taskInfo === '标准法规部部长审批'){
- this.toProcessDetail('xmpg2Step1-12',row)
- }else{
- this.toProcessDetail('xmpg2Step1-2',row)
- }
+ this.toProcessDetail('xmpgStep1-5',row)
} else if (prcType === '8') {
// 未符合项整改
this.toProcessDetail('wfhxzgStep5-1',row)
diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue
index 0cd0210f2..8ace4e093 100644
--- a/src/pages/processCenter/pages/processDetail/index.vue
+++ b/src/pages/processCenter/pages/processDetail/index.vue
@@ -244,11 +244,7 @@ export default {
this.toProcessDetail('bzpgStep8-1',row)
}else if(prcType === '6'){
//标准项目合规评估 项目维度
- if(row.taskInfo === '标准法规部部长审批'){
- this.toProcessDetail('xmpg2Step1-12',row)
- }else{
- this.toProcessDetail('xmpg2Step1-2',row)
- }
+ this.toProcessDetail('xmpgStep1-5',row)
} else if (prcType === '8') {
// 未符合项整改
this.toProcessDetail('wfhxzgStep5-1',row)
diff --git a/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue
index 055a2f4ae..2f00bbe89 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue
@@ -501,7 +501,7 @@ export default {
case '10':
//项目评估流程- 项目
this.$router.push({
- name: 'xmpg2Step1'
+ name: 'xmpgStep1'
})
break
case '11':
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index b468f8785..c30037169 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -1050,9 +1050,9 @@ export default {
break
//项目评估流程-项目
case '6':
- if(row.taskInfo === '标准法规部业务经理审批'){
+ if(row.taskInfo === '任务分发'){
this.$router.push({
- name: 'xmpg2Step2',
+ name: 'xmpgStep2',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
@@ -1061,9 +1061,9 @@ export default {
prcType: row.prcType
}
})
- }else if(row.taskInfo === '工程经理转办'){
+ }else if(row.taskInfo === '合规评估'){
this.$router.push({
- name: 'xmpg2Step3',
+ name: 'xmpgStep3',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
@@ -1072,9 +1072,9 @@ export default {
prcType: row.prcType
}
})
- } else if(row.taskInfo === '架构经理任务分发') {
+ } else if(row.taskInfo === '审核') {
this.$router.push({
- name: 'xmpg2Step4',
+ name: 'xmpgStep4',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
@@ -1083,9 +1083,9 @@ export default {
prcType: row.prcType
}
})
- } else if(row.taskInfo === '分发责任人下发') {
+ } else if(row.taskInfo === '批准') {
this.$router.push({
- name: 'xmpg2Step5',
+ name: 'xmpgStep5',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
index 0019a5ff9..e309d8511 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
@@ -627,7 +627,7 @@ export default {
break
case '6':
this.$router.push({
- name: 'xmpg2Step1-1',
+ name: 'xmpgStep1',
query: {
type: '6',
processName: '项目合规评估流程-项目',
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 0025eecb8..8426c21fa 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -3794,6 +3794,59 @@ export default {
}
})
},
+ async getTreeAsync(){
+
+ let tsResource = await this.selectMenu1()
+ let sarMenuStandard = await this.selectMenu2()
+
+ let list1 = []
+ let list2 = []
+ if(tsResource && tsResource.ok && tsResource.data){
+ list1 = tsResource.data
+ }
+
+ if(sarMenuStandard && sarMenuStandard.ok && sarMenuStandard.data){
+ list2 = sarMenuStandard.data
+ }
+
+ if(list2.length > 0){
+ list1 = list1.concat(list2)
+ }
+
+ if(list1.length > 0){
+ this.treeList = this.sortByKey(list1,"displaySeq")
+ }
+ },
+ sortByKey(ary, key) {
+ return ary.sort(function (a, b) {
+ let x = a[key]
+ let y = b[key]
+ return ((x < y) ? -1 : (x > y) ? 1 : 0)
+ })
+ },
+ selectMenu1() {
+ return new Promise((resolve, reject) => {
+ this.$http.get('sarResource/ts-resource/getListStand', {
+ sorDivide: 'INLAND_STAND',
+ userId: this.$store.getters.userInfo.userId
+ }, {
+ _this: this
+ }, res => {
+ const history = res;
+ resolve(history)
+ })
+ })
+ },
+ selectMenu2(res,json) {
+ return new Promise((resolve, reject) => {
+ this.$http.get('lawss/sarMenuStandard/getListStand', {dicId:'9m4qqqaansxmox5e82zm'}, {
+ _this: this
+ }, res => {
+ const history = res;
+ resolve(history)
+ })
+ })
+ },
// 查询二级菜单
selectMenu() {
this.$http.get('sarResource/ts-resource/getListStand', {
@@ -5803,7 +5856,7 @@ export default {
},
async mounted() {
// 进入页面后查询树形结构目录
- await this.selectMenu()
+ await this.getTreeAsync()
this.dragControllerLR()
// 进入页面后查询标准体系树形结构目录 引用 数据字典配置
// await this.selectStandardMenu()
diff --git a/src/router/index.js b/src/router/index.js
index 5e06cf72a..c3225a014 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -610,34 +610,6 @@ const routes = [
title: '项目合规评估流程'
}
},
- //流程保存界面
- {
- path: '/xmpgStep1-1',
- name: 'xmpgStep1-1',
- component: () => import('@/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue'),
- meta: {
- requireAuth: true,
- title: '项目合规评估流程'
- }
- },
- {
- path: '/xmpgStep1-2',
- name: 'xmpgStep1-2',
- component: () => import('@/pages/processCenter/pages/creatProcess/xmpg/step1-2.vue'),
- meta: {
- requireAuth: true,
- title: '项目合规评估流程'
- }
- },
- {
- path: '/xmpgStep1-7',
- name: 'xmpgStep1-7',
- component: () => import('@/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue'),
- meta: {
- requireAuth: true,
- title: '项目合规评估流程'
- }
- },
{
path: '/xmpgStep2',
name: 'xmpgStep2',
@@ -675,18 +647,9 @@ const routes = [
}
},
{
- path: '/xmpgStep6',
- name: 'xmpgStep6',
- component: () => import('@/pages/processCenter/pages/creatProcess/xmpg/step6.vue'),
- meta: {
- requireAuth: true,
- title: '项目合规评估流程'
- }
- },
- {
- path: '/xmpgStep7',
- name: 'xmpgStep7',
- component: () => import('@/pages/processCenter/pages/creatProcess/xmpg/step7.vue'),
+ path: '/xmpgStep1-5',
+ name: 'xmpgStep1-5',
+ component: () => import('@/pages/processCenter/pages/creatProcess/xmpg/step1-5.vue'),
meta: {
requireAuth: true,
title: '项目合规评估流程'