diff --git a/src/api/unqualProcess.js b/src/api/unqualProcess.js index 9daf74e57..61866c15e 100644 --- a/src/api/unqualProcess.js +++ b/src/api/unqualProcess.js @@ -1,68 +1,76 @@ -import axios from '@/common/axiosV2' +import axios from "@/common/axiosV2"; // 查询未整改项列表接口 -export function standUnqualified (data) { +export function standUnqualified(data) { return axios({ - url: '/api/sarStandUnqualified/sar-stand-unqualified', - method: 'get', + url: "/api/sarStandUnqualified/sar-stand-unqualified", + method: "get", params: data - }) -} -// 人员菜单列表获取 -export function roleTreeData (data) { - return axios({ - url: '/api/SarInstitution/institution/institutionAndUser', - method: 'get', - params: data - }) -} -// 上传文件 -export function uploadFileText (data) { - return axios({ - url: 'api/att/attFile/upload', - method: 'get', - params: data - }) -} -export function dicTypeData (data) { - return axios({ - url: 'api/sys/dictype/getDicTypeListCode', - method: 'get', - params: data - }) -} -export function StandardsInfoPage (data) { - return axios({ - url: 'api/sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageBak', - method: 'get', - params: data - }) -} -// 车型库清单的下拉列表 -export function solostarData (data) { - return axios({ - url: 'api/sarStandProjectLibrary/solostar', - method: 'get', - params: data - }) -} -// 活动日历查询接口 -export function meetingByMonth (params) { - return axios({ - url: 'api/sapMeetInfo/getMeetingsByMonthType', - method: 'get', - params - }) + }); } -export function addUn (closeState, standId,standName,standSerialNumber, itemsNum,itemsName, productType, productLine, - productName, reason, responsibleUnit, dutyEngineer, authEngineer, qaEngineer, qaEngineerName, - authEngineerName, dutyEngineerName, planCloseTime) { +// 人员菜单列表获取 +export function roleTreeData(data) { + return axios({ + url: "/api/SarInstitution/institution/institutionAndUser", + method: "get", + params: data + }); +} + +// 上传文件 +export function uploadFileText(data) { + return axios({ + url: "api/att/attFile/upload", + method: "get", + params: data + }); +} + +export function dicTypeData(data) { + return axios({ + url: "api/sys/dictype/getDicTypeListCode", + method: "get", + params: data + }); +} + +export function StandardsInfoPage(data) { + return axios({ + url: "api/sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageBak", + method: "get", + params: data + }); +} + +// 车型库清单的下拉列表 +export function solostarData(data) { + return axios({ + url: "api/sarStandProjectLibrary/solostar", + method: "get", + params: data + }); +} + +// 活动日历查询接口 +export function meetingByMonth(params) { + return axios({ + url: "api/sapMeetInfo/getMeetingsByMonthType", + method: "get", + params + }); +} + +//未符合项模块新增 +export function addUn( + closeState, standSerialNumber, standName, + itemsNum, itemsName, productType, + productLine, productName, reason, responsibleUnit, + dutyEngineer, authEngineer, qaEngineer, planCloseTime) { const data = { closeState, standSerialNumber, //标准号 standName, //标准名称 - standId, itemsNum, //条款号 itemsName, //条款名称 productType, @@ -73,14 +81,41 @@ export function addUn (closeState, standId,standName,standSerialNumber, itemsNum dutyEngineer, //责任工程师 authEngineer, //认证工程师 qaEngineer, //质量工程师 - qaEngineerName, - authEngineerName, - dutyEngineerName, - planCloseTime, //计划关闭时间 - } + planCloseTime //计划关闭时间 + }; return axios({ - url: 'api/sarStandUnqualified/sar-stand-unqualified/addOne', - method: 'post', + url: "api/sarStandUnqualified/sar-stand-unqualified/addOne", + method: "post", data - }) + }); +} + +//未符合项模块编辑 +export function editUn( + closeState, standSerialNumber, standName, + itemsNum, itemsName, productType, + productLine, productName, reason, responsibleUnit, + dutyEngineer, authEngineer, qaEngineer, planCloseTime, id) { + const data = { + closeState, + standSerialNumber, //标准号 + standName, //标准名称 + itemsNum, //条款号 + itemsName, //条款名称 + productType, + productLine, //产品线 + productName, //项目名称 + reason, //不合规项目 + responsibleUnit, //责任部门 + dutyEngineer, //责任工程师 + authEngineer, //认证工程师 + qaEngineer, //质量工程师 + planCloseTime, //计划关闭时间 + id + }; + return axios({ + url: "api/sarStandUnqualified/sar-stand-unqualified/updateOne", + method: "post", + data + }); } diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index 919158cb7..ff93290ba 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -254,7 +254,7 @@ export default { { title: '标准化活动日历', path: '/standCalendar', - menuId: '0ea66e3dd36873082b6851f69e92c8be' + menuId: '' }, // { // title: '标准比对库', diff --git a/src/components/treeSelect/treeSelectNew.vue b/src/components/treeSelect/treeSelectNew.vue index 8e8c3a0ea..35f323421 100644 --- a/src/components/treeSelect/treeSelectNew.vue +++ b/src/components/treeSelect/treeSelectNew.vue @@ -43,6 +43,12 @@ return ""; } }, + type: { + type: String, + default () { + return ""; + } + }, urlChild: { type: String, default () { @@ -169,7 +175,7 @@ if (node.level >= 1) { setTimeout(() => { - this.getChildByList(node.data.id, resolve); + this.getChildByList(node.data.level,node.data.vppsCode, resolve); }, 500); return resolve([]); // 加上这个,防止在该节点没有子节点时一直转圈的问题发生。 } @@ -186,8 +192,8 @@ } }) }, - getChildByList( _parentID,resolve) { // 获取子节点请求 - let params = {ids : _parentID}; + getChildByList( level,vppsCode,resolve) { // 获取子节点请求 + let params = {level : level,vppsCode :vppsCode,type : this.type}; this.$http.get(this.urlChild, params, { _this: this }, res => { @@ -200,7 +206,7 @@ }, loadTreeData(resolve) { // 获取loadtreeData 就是父节点数据,getChildByList就是异步获取子节点数据 - this.$http.get(this.url, '', { + this.$http.get(this.url, {type : this.type}, { _this: this }, res => { if(res.data){ diff --git a/src/main.js b/src/main.js index f96b1fb24..e9c9da873 100644 --- a/src/main.js +++ b/src/main.js @@ -54,15 +54,10 @@ import { mapMutations, mapActions } from 'vuex' // 路由拦截 router.beforeEach(function (to, from, next) { - console.log("auth : to =>", to); - console.log(webLoginType) let toName = to.name let token = store.state.token let path = to.path; let requireAuth = to.meta.requireAuth; - console.log("auth : path =>" + path); - console.log("token : token =>" + token); - console.log("requireAuth : requireAuth =>" + requireAuth); let taskId = to.query.taskIds; let prcId = to.query.prcId; let prcNum = to.query.prcNum; @@ -71,7 +66,6 @@ router.beforeEach(function (to, from, next) { let routerType = to.query.routerType; let param = "taskIds=" + taskId + "&prcId=" + prcId + "&prcNum=" + prcNum + "&prcName=" + prcName + "&prcType=" + prcType; - console.log(store) let url = window.location.search let code = ""; if(url){ @@ -232,7 +226,6 @@ router.beforeEach(function (to, from, next) { next({path: routerPath + '?' + param2}) } } - console.log("res : res =>", res); }) } if(path === '/loginVerify'){ diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue index 8d9373769..0cdb3a142 100644 --- a/src/pages/details/otherBussStandardDetails/index.vue +++ b/src/pages/details/otherBussStandardDetails/index.vue @@ -1194,7 +1194,6 @@ export default { methods: { child1Func(child1){ const list = [] - console.log(child1) if(child1 && child1.length > 1){ list.push(child1[0]) return list @@ -2157,7 +2156,6 @@ export default { const [displayLocation, {attrInfoMap: dynamicFormField}, formFieldList] = values // const relatedPlansRes = await this.queryRelatedPlans() // const relatedPlans = relatedPlansRes.list - console.log(formFieldList) formFieldList.forEach((field) => { displayLocation.forEach((location) => { location.isShowImp = '0' @@ -2194,16 +2192,12 @@ export default { displayLocation.forEach(location => { // 动态属性字段-FBGBJBD 单独添加至基础信息 const list = displayLocation.filter ( item => item.label === '过程稿件'); - console.log(list) if(location.label === '基础信息' && list && list.length > 0){ if (!list[0].child) { location['child1'] = [] }else { const childList = list[0].child.filter ( item => item.attrField === 'FBGBUSS'); - console.log(childList) - console.log(childList.length) location['child1'] = childList - console.log(location['child1']) } } diff --git a/src/pages/home2/components/empennage/index.vue b/src/pages/home2/components/empennage/index.vue index db012f25f..93343ec41 100644 --- a/src/pages/home2/components/empennage/index.vue +++ b/src/pages/home2/components/empennage/index.vue @@ -148,7 +148,6 @@ } let list list = res.data.slice(0, c) - console.log(list) this.linkList = list }) } diff --git a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue index babea2ac8..0bbe54f8e 100644 --- a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue +++ b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue @@ -39,10 +39,10 @@