diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index 947c63e23..e05997f7f 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -334,67 +334,66 @@ export default { // } ] }, - // { - // title: '个人中心', - // path: '/personal', - // 'icon-class': 'ucenter', - // menuId: 'ZY9RFA4M35', - // children: [ - // { - // title: '我的消息', - // path: '/dynamics', - // menuId: 'JCEV4AEV32' - // }, - // { - // title: '我的企标', - // path: '/MyEnterpriseStandard', - // menuId: 'LKU3W23UMEHDM9VLDHGK' - // }, - // { - // title: '我的收藏', - // path: '/collection', - // menuId: 'JY5LKL2HPD' - // }, - // - // { - // title: '我的浏览', - // path: '/browsing', - // menuId: 'HAEY2A4LMX' - // }, - // { - // title: '已收分享', - // path: '/push', - // menuId: '9F8T7DPYHE' - // }, - // { - // title: '已发分享', - // path: '/forward', - // menuId: 'K45Y9TGKZV2K4XP4CETD' - // }, - // { - // title: '我的问答', - // path: '/questionsAndAnswers', - // menuId: '8VKLZATQQG4NQHXV9UDS' - // }, - // { - // title: '我的板块', - // path: '/plate', - // menuId: 'TUYHX8JBWV' - // } - // // { - // // title: '个人信息', - // // path: '/info', - // // menuId: '8K7FDHG89G' - // // } - // ] - // }, { - title: '搜索中心', - path: '/advancedSearch', - 'icon-class': 'search', - menuId: 'K9BAYUPZBC', - isChildren: true // 判断没有子菜单 + title: '个人中心', + path: '/personal', + 'icon-class': 'ucenter', + menuId: 'ZY9RFA4M35', + children: [ + // { + // title: '我的消息', + // path: '/dynamics', + // menuId: 'JCEV4AEV32' + // }, + // { + // title: '我的企标', + // path: '/MyEnterpriseStandard', + // menuId: 'LKU3W23UMEHDM9VLDHGK' + // }, + { + title: '我的收藏', + path: '/collection', + menuId: 'JY5LKL2HPD' + }, + // { + // title: '我的浏览', + // path: '/browsing', + // menuId: 'HAEY2A4LMX' + // }, + // { + // title: '已收分享', + // path: '/push', + // menuId: '9F8T7DPYHE' + // }, + // { + // title: '已发分享', + // path: '/forward', + // menuId: 'K45Y9TGKZV2K4XP4CETD' + // }, + // { + // title: '我的问答', + // path: '/questionsAndAnswers', + // menuId: '8VKLZATQQG4NQHXV9UDS' + // }, + // { + // title: '我的板块', + // path: '/plate', + // menuId: 'TUYHX8JBWV' + // } + // { + // title: '个人信息', + // path: '/info', + // menuId: '8K7FDHG89G' + // } + ] }, + { + title: '搜索中心', + path: '/advancedSearch', + 'icon-class': 'search', + menuId: 'K9BAYUPZBC', + isChildren: true // 判断没有子菜单 + }, // { // title: '标准比对库', // path: '/standardComparisonLibrary', diff --git a/src/pages/personal/pages/my-collection/components/CollectionStandard.vue b/src/pages/personal/pages/my-collection/components/CollectionStandard.vue index f0e80e88b..57f18d034 100644 --- a/src/pages/personal/pages/my-collection/components/CollectionStandard.vue +++ b/src/pages/personal/pages/my-collection/components/CollectionStandard.vue @@ -6,7 +6,7 @@
- - 取消收藏 + + + + + + +
@@ -40,62 +46,31 @@
-
+
所属板块:{{ item.collectType === 'INLAND_STAND' ? '国内标准法规' : (item.collectType === 'FOREIGN_STAND' ? '海外标准法规' : '企业标准') }} -
标题:{{ item.collectTitle }}
+
标题:{{ item.name }}
-
标题:{{ item.collectTitle }}
+
标题:{{ item.name }}
- 创建时间:{{getDate(item.creationTime)}} + 创建时间:{{getDate(item.createTime)}}
取消收藏 -
-
- 添加笔记 -
-
笔记{{index2 +1 }}: {{note.noteContentValue}}
-
- 查看此条笔记 - 修改笔记 - 删除笔记 -
-
-
数据获取中 - -
- - - - - -
-
- 取消 - 确认 -
-
@@ -113,7 +88,7 @@ export default { loadDate: false, // 查询 search: { - collectionStandard: '' + name: '' }, // 分页 total: 0, @@ -121,108 +96,25 @@ export default { rows: 10, // 数据内容 standardList: [], - // 对话框状态 - standardModal: false, - // 对话框标题 - standardTitle: '', - // 对话框内容 - standardForm: { - textarea: '', - collectId: '', - id: '' - }, - modalType: '', - // 是否读写 - noteType: false, - // 计算 - // 笔记规则 - standardFormRules: { - textarea: [ - {required: true, message: '笔记不能为空', trigger: 'blur'}, - {type: 'string', max: 20000, message: '最多输入20000字符'} - ] - }, checkAll: false, // 是否全选 indeterminate: false, // 是否半选 - isSubmit: false, selectedList: [], selectedAllInfoList: [] } }, methods: { - // 对话框关闭清除表单 - noteChange (type) { - if (!type) { - this.$refs['standardForm'].resetFields() - } - }, // 重置 resetSelect () { - this.search.collectionStandard = '' + this.search.name = '' this.pageChange(1) }, - // 笔记数字提示 - descInput () { - if (this.standardForm.textarea.length > 20000) { - this.error('最多输入20000字') - } - }, - error (msg) { - this.$Message.error(msg) - }, - // 跳转 - detailsStandard (item) { - console.log(item); - this.$http.get('lawss/sarMenu/judgeSarMenuByRole', { - sarId: item.collectResId, - sarType: item.collectType - }, { - _this: this - }, res => { - if (res.ok) { - if (item.collectType === 'BUSINESS_STAND') { - // if (this.$hasPermission('YJUHC32R7G')) { - let routeUrl = this.$router.resolve({ - name: 'OtherBussStandardDetails', - params: { - id: item.collectResId, - pageType: item.collectType - } - }) - window.open(routeUrl.href, '_blank') - // } else { - // this.$message.warning('无权访问') - // } - } else { - // if (this.$hasPermission('SSA6WR4HV8')) { - let routeUrl = this.$router.resolve({ - name: 'OtherStandardDetails', - params: { - id: item.collectResId, - pageType: item.collectType - } - }) - window.open(routeUrl.href, '_blank') - // } else { - // this.$message.warning('无权访问') - // } - } - } else { - this.$message.error(res.message) - } - }, e => { - this.$message.error('无权访问') - }) - }, // 分页 pageChange (page) { this.page = page - this.saveNote = '' this.selectStandard() }, pageSizeChange (pageSize) { this.rows = pageSize - this.saveNote = '' this.selectStandard() }, // 搜索 @@ -232,36 +124,19 @@ export default { }, // 查询、加载数据 selectStandard () { - this.$http.get('person/personCollect/page', { - pageNo: this.page, - pageSize: this.$store.getters.userInfo.configContent, - modeType: 'STAND', - collectTitle: this.search.collectionStandard, - userId: this.$store.getters.userInfo.userId + this.$http.get('sarPersonalCenter/sar-user-star/getList', { + current: this.page, + size: this.$store.getters.userInfo.configContent, + userId: this.$store.getters.userInfo.userId, + name: this.search.name }, { _this: this, loading: 'loading' }, res => { - // for (let i = 0; i < res.data.list.length; i++) { - // res.data.list[i].checked = false - // res.data.list[i].check = false - // res.data.list[i].seeBtn = '查看笔记' - // } - res.data.list.map((item, index) => { - item.checked = false - }) this.standardList = [] - this.standardList = res.data.list - this.total = res.data.count + this.standardList = res.data.records + this.total = res.data.total this.contentOpen = true - // if (this.saveNote !== '') { - // this.standardList[this.saveNote].check = true - // if (this.standardList[this.saveNote].check === true) { - // this.standardList[this.saveNote].seeBtn = '关闭笔记' - // } else { - // this.standardList[this.saveNote].seeBtn = '查看笔记' - // } - // } }, e => {}) }, // 取消收藏 @@ -273,130 +148,28 @@ export default { confirmButtonClass: 'common-button-primary', roundButton: true }).then(() => { - this.$http.put('person/personCollect/updateByUserId ', { - modeType: 'STAND', - id: id - }, { - _this: this - }, res => { - this.contentOpen = false - this.pageChange(1) - }, e => { - }) - }).catch(() => { - }) - }, - // 查看笔记 - writeStandardNotes (item, index) { - item.check = !item.check - if (item.check === true) { - item.seeBtn = '关闭笔记' - } else { - item.seeBtn = '查看笔记' - } - for (let i = 0; i < this.standardList.length; i++) { - if (i !== index) { - this.standardList[i].check = false - this.standardList[i].seeBtn = '查看笔记' - } - } - }, - // 添加笔记 - createStandardNote (item, index) { - this.standardModal = true - this.noteType = false - this.modalType = 1 - this.standardTitle = '添加笔记' - this.standardForm.textarea = '' - this.standardForm = item - this.saveNote = index - }, - // 查看此条笔记 - viewStandardData (note) { - this.standardModal = true - this.standardTitle = '查看笔记' - this.standardForm.textarea = note.noteContentValue - this.noteType = true - this.modalType = 3 - }, - // 修改笔记 - noteStandardEdit (note, index) { - this.standardModal = true - this.noteType = false - this.standardTitle = '修改笔记' - this.modalType = 2 - this.standardForm.id = note.id - this.standardForm.textarea = note.noteContentValue - this.saveNote = index - }, - // 删除笔记 - noteStandardDel (note, index) { - this.saveNote = index - this.$confirm('确认删除该条数据?', '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning', - confirmButtonClass: 'common-button-primary', - roundButton: true - }).then(() => { - this.$http.post('lawss/utNoteInfo/deleteNote', { - ids: note.id - }, - { + var json = {} + json.userId = this.$store.getters.userInfo.userId + json.id = id + this.$http.postData('/sarPersonalCenter/sar-user-star/delete',json, { _this: this }, res => { if (res.ok) { - this.selectStandard() - } else { + this.$message.success('已取消收藏') + this.contentOpen = false + this.pageChange(1) } - }).catch(() => { + }, e => { }) - }) - }, - closeModal () { - this.standardModal = false - this.$refs['standardForm'].resetFields() - }, - // 保存笔记 (新增、编辑) - saveClass () { - this.$refs['standardForm'].validate((valid) => { - if (valid) { - this.standardModal = false - if (this.modalType === 1) { - let noteForm = {} - noteForm.noteContentValue = this.standardForm.textarea - noteForm.sourceType = 'COSTAND' - noteForm.noteName = this.standardForm.collectTitle - noteForm.sarId = this.standardForm.id - noteForm.forwardId = this.standardForm.collectResId - this.$http.post('lawss/utNoteInfo/saveNote', noteForm, { - _this: this, - loading: 'isSubmit' - }, res => { - this.selectStandard() - }, e => { - }) - } else if (this.modalType === 2) { - let noteForm = { - id: this.standardForm.id, - noteContentValue: this.standardForm.textarea - } - this.$http.post('lawss/utNoteInfo/updateNote', noteForm, { - _this: this - }, res => { - this.selectStandard() - }, e => { - }) - } - } else { - this.$message.error('请正确输入') - } + }).catch(() => { }) }, getDate (date) { return date != null ? date.substring(0, date.indexOf(' ')) : '' }, cancleCollectBatch () { + console.log(this.selectedList); + return if (this.selectedList.length === 0) { this.$confirm('请先选择数据进行取消收藏', '提示', { showCancelButton: false, diff --git a/src/pages/personal/pages/my-collection/index.vue b/src/pages/personal/pages/my-collection/index.vue index 94e0f944e..2f383b30e 100644 --- a/src/pages/personal/pages/my-collection/index.vue +++ b/src/pages/personal/pages/my-collection/index.vue @@ -17,19 +17,22 @@ export default { data () { return { active: 'CollectionStandard', - tabsList: [ { - title: '已收藏的标准法规', - name: 'CollectionStandard' - }, { - title: '已收藏的动态&资料 ', - name: 'CollectionDynamics' - }, { - title: '已收藏的政策', - name: 'CollectionLaws' - }, { - title: '已收藏的标准拆分', - name: 'CollectionBreak' - }] + tabsList: [ + { + title: '已收藏的标准法规', + name: 'CollectionStandard' + }, + // { + // title: '已收藏的动态&资料 ', + // name: 'CollectionDynamics' + // }, { + // title: '已收藏的政策', + // name: 'CollectionLaws' + // }, { + // title: '已收藏的标准拆分', + // name: 'CollectionBreak' + // } + ] } }, methods: { diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index dbe623393..663aee630 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -7,7 +7,7 @@
基础信息
-
审批历史
+
流程信息
@@ -44,7 +44,8 @@ + placeholder="请选择标准年份" + value-format="yyyy"> @@ -545,7 +546,7 @@
-
+
@@ -554,12 +555,12 @@ :rows="3" resize="none" placeholder="请输入意见" - v-model="textarea"> + v-model="commentText">
-
+
@@ -623,11 +624,12 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' + import {saveTaskFirst} from "api/process"; export default { name: "bzrkStep1", data () { return { - textarea: '', // 意见 + commentText: '', // 意见 title: '', // 新增编辑抽屉标题 ListModel: false, // 新增编辑抽屉开关 active: '1', // 默认显示 @@ -737,11 +739,36 @@ handleTabs(name) { this.active = name }, - handleSave() {}, + //保存 + handleSave() { + this.saveLoading = true + let _formData = new FormData() + // _formData.append('id', this.bpnId) + _formData.append('createUser', this.$store.getters.userInfo.userId) + _formData.append('createUserName', this.$store.getters.userInfo.uName) + _formData.append('prcType', this.$route.query.type) + _formData.append('json', JSON.stringify({ + prcForm: this.prcForm, + sarAccessInfoList: this.sarAccessInfoList, + sarAccessInfoListADMIN: this.sarAccessInfoListADMIN, + bzqdForm: this.bzqdForm, + listInfo: this.listInfo, + id: this.id + })) + saveTaskFirst(_formData).then(res => { + this.saveLoading = false + this.$message.success('保存成功') + // this.$router.push('/processCenter') + // this.bpnId = res.result + }).catch(e => { + this.saveLoading = false + }) + }, handleSubmit() { var json = this.form json.zrUserId = this.$store.getters.userInfo.userId json.jlUserId = this.$store.getters.userInfo.userId + json.commentText = this.commentText json.applyUpdUserId = this.$store.getters.userInfo.userId json.prcCreateUser = this.$store.getters.userInfo.userId json.prcCreateUserName = this.$store.getters.userInfo.account @@ -756,8 +783,8 @@ }, { _this: this }, res => { - console.log(res); - if (res.ok) { + if (res.success) { + this.$message.success(res.message) } }) } diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index b936728b9..ada10c0d7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -7,7 +7,8 @@
基础信息
-
审批历史
+
审批历史
+
@@ -45,7 +46,8 @@ disabled v-model="form.standYear" type="year" - placeholder="请选择标准年份"> + placeholder="请选择标准年份" + value-format="yyyy"> @@ -528,7 +530,7 @@ :rows="3" resize="none" placeholder="请输入意见" - v-model="textarea"> + v-model="commentText">
@@ -581,6 +583,75 @@
+
+
+ + + + + + + + + + + + + + + + + + + + + 流程列表加载中 +
+
{ + this.detailData = res + }, e => {}) + }, getData() { return new Promise((resolve, reject) => { inboundLiaisonDetail({ - taskIds: this.$route.query.taskIds, - pId: this.$route.query.prcId + taskIds: this.taskIds, + pId: this.pId }).then(res => { if (res) { - this.form = JSON.parse(res.mesg) + const processForm = JSON.parse(res.mesg) + this.getFormFieldList(processForm) } }).catch(e => { }) }) }, + /** + * @description: 动态表单读取 + */ + getFormFieldList (item) { + this.$nextTick(() => { + this.form = JSON.parse(JSON.stringify(item)) + this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN' + this.form.prcNum = this.prcNum + this.form.prcName = this.prcName + this.form['id'] = item.id + }) + }, closeDrawer() { this.ListModel = false }, @@ -728,33 +843,49 @@ }, handleSave() {}, handleSubmit() { - var json = this.form - json.zrUserId = this.$store.getters.userInfo.userId - json.jlUserId = this.$store.getters.userInfo.userId - json.applyUpdUserId = this.$store.getters.userInfo.userId - json.prcCreateUser = this.$store.getters.userInfo.userId - json.prcCreateUserName = this.$store.getters.userInfo.account - this.$http.get('lawss/activiti/startProcess', {type: '1'}, { + const json = JSON.stringify(this.form); + json.commentText = this.commentText + json.approvalOpinion = this.approvalOpinion + console.log(json) + this.$http.post('lawss/activiti/completeTask', { + taskIds: this.taskIds, + userId : this.userId, + json: json + }, { _this: this }, res => { - if (res.ok) { - this.$http.post('lawss/activiti/completeTask', { - taskIds: res.data, - userId : this.$store.getters.userInfo.userId, - json: JSON.stringify(json) - }, { - _this: this - }, res => { - console.log(res); - if (res.ok) { - } - }) + console.log(res); + if (res.success) { + this.processCreateStand(json) } }) - } + }, + + /** + * @description: 流程入库 + * @date: 2020-11-18 21:47:58 + * @auth: chenxiaoxi + */ + processCreateStand(json) { + const _formData = new FormData() + _formData.append('infoJson', json) + processCreateStand(_formData).then(res => { + if (res.result === '操作成功' || res.data === '入库成功') { + this.$message.success(res.data) + setTimeout(() => { + this.$router.push({ + name: 'ProcessCenter' + }) + }, 100) + } else { + this.$message.warning(res.message) + } + }) + }, }, mounted () { this.getData() + this.processTable() this.$http.get('sys/dictype/getDicTypeListCode', '', { _this: this }, res => { diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue new file mode 100644 index 000000000..17a7e98ea --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue @@ -0,0 +1,843 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue new file mode 100644 index 000000000..67d7ba459 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -0,0 +1,843 @@ + + + + + diff --git a/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue index 2351d1a65..52aa76563 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue @@ -124,7 +124,7 @@ - 办理 + 查看
@@ -167,7 +167,7 @@ export default { methods: { handleCommand (command) { switch (command[1]) { - case '办理': + case '查看': this.dealWith(command[0]) break } @@ -210,7 +210,7 @@ export default { pageSizeChange (pageSize) { // 数量改变 this.queryProcess() }, - dealWith (row) { // 办理 + dealWith (row) { // 查看 this.$router.push({ name: 'ProcessDetail', query: { diff --git a/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue b/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue index 446f7a84e..ec7c033cb 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue @@ -124,7 +124,7 @@ - 办理 + 查看 @@ -167,7 +167,7 @@ export default { methods: { handleCommand (command) { switch (command[1]) { - case '办理': + case '查看': this.dealWith(command[0]) break } @@ -211,7 +211,7 @@ export default { pageSizeChange (pageSize) { // 数量改变 this.queryProcess() }, - dealWith (row) { // 办理 + dealWith (row) { // 查看 this.$router.push({ name: 'ProcessDetail', query: { diff --git a/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue index 24bd71036..43a7c2803 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue @@ -124,7 +124,7 @@ - 查看 + 查看 @@ -211,7 +211,7 @@ export default { pageSizeChange (pageSize) { // 数量改变 this.queryProcess() }, - dealWith (row) { // 办理 + dealWith (row) { // 查看 this.$router.push({ name: 'ProcessDetail', query: { diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index f55bc97d9..349d54a99 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -214,14 +214,43 @@ export default { this.queryProcess() }, dealWith (row) { // 办理 - switch(row.prcType) { + this.setHandleInfo(JSON.stringify(row)) + const prcType = row.prcType + console.log(prcType) + console.log(row.taskInfo) + switch(prcType) { case '1': if (row.taskInfo === '标准法规业务经理审批') { this.$router.push({ name: 'bzrkStep2', query: { taskIds: row.taskIds, - prcId: row.prcId + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if (row.taskInfo === '责任人会签'){ + this.$router.push({ + name: 'step3', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if (row.taskInfo === '申请人修订'){ + this.$router.push({ + name: 'step4', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType } }) } diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue index a666b610f..b6842a975 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue @@ -209,6 +209,7 @@ export default { this.queryProcess() }, dealWith (row) { // 办理 + //草稿办理待开发 }, ...mapMutations(['setProcess', 'setHandleInfo']), ...mapActions(['setMenu']) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue index bcf09c84c..c2080cfa8 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue @@ -1098,8 +1098,15 @@ export default { this.$http.get('sarStandProjectLibrary/queryProject', this.localProTableSearch, { _this: this, loading: 'loading' }, res => { - console.log(res.data) - this.localProTableList = res.data.Maintenance.records + // console.log(res.data) + if (this.localProTableSearch.prodectCode === 'Maintenance') { + this.localProTableList = res.data.Maintenance.records + } + else if (this.localProTableSearch.prodectCode === 'notMaintenance') + { + this.localProTableList = res.data.notMaintenance.records + + } this.total = res.data.count // this.localProTableList.map((item) => { // this.xmztOptions.map((opr) => { diff --git a/src/router/index.js b/src/router/index.js index 22500369a..0872bd5bc 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -222,6 +222,15 @@ const routes = [ title: '标准需求(翻译)申请流程' } }, + { + path: '/processDetail', + name: 'ProcessDetail', + component: () => import('@/pages/processCenter/pages/processDetail/index.vue'), + meta: { + requireAuth: true, + title: '流程详情' + } + }, { path: '/bzffStep1', name: 'bzffStep1', @@ -240,6 +249,24 @@ const routes = [ title: '标准入库流程' } }, + { + path: '/bzrkStep3', + name: 'bzrkStep3', + component: () => import('@/pages/processCenter/pages/creatProcess/bzrk/step3.vue'), + meta: { + requireAuth: true, + title: '标准入库流程' + } + }, + { + path: '/bzrkStep4', + name: 'bzrkStep4', + component: () => import('@/pages/processCenter/pages/creatProcess/bzrk/step4.vue'), + meta: { + requireAuth: true, + title: '标准入库流程' + } + }, { path: '/bzrkStep2', name: 'bzrkStep2',