diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index d228e91d0..aaf834d54 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -978,6 +978,7 @@ export default { for (let i = 0; i < data.length; i++) { this.selectedList.push(data[i].id); } + console.log(this.selectedList); }, //标准表格选择框改变 selectStandChange(data) { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index 3c007c8d7..0bdf9b2ad 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -76,7 +76,12 @@ - + @@ -270,12 +275,12 @@ align="center"> @@ -399,32 +404,14 @@ export default { isSubmit: false, saveLoading: false, selectedList: [], //拆分标准的选择框 - dataList:[ - { - id: 1, - productLine: '风景线', - cpxzrr: '李四', - ffzrr: '张三', - }, - { - id: 2, - productLine: '风景线', - cpxzrr: '李四', - ffzrr: '张三', - }, { - id: 3, - productLine: '风景线', - cpxzrr: '李四', - ffzrr: '张三', - }, - - ], + dataList:[], page: 1, total: 0, pageSize: this.$store.getters.userInfo.configContent, pageNo: 1, totalNo: 0, pageSizeNo: this.$store.getters.userInfo.configContent, + product: new Map(), listForm: { standNumber: "", //标准编号 standName: "",//标准名称 @@ -491,7 +478,20 @@ export default { }, //确认添加事件 okStand() { - this.standModel = false + if(this.standList.length >= 1){ + let deposit = new Map(); + this.sarAccessListDatas.forEach(item => { + deposit.set(item.id, item); + }); + let bringData = []; + for (let i = 0; i < this.standList.length; i++) { + bringData.push(deposit.get(this.standList[i])); + } + console.log(bringData); + this.standModel = false + }else{ + this.$message.warning('请选择一条数据进行添加') + } }, //保存事件 handleSave() { @@ -581,7 +581,10 @@ export default { }, //添加产品线select的改变 selectThree(data) { - this.standList = data; + this.standList = []; + for(let i=0;i { + this.productData = res.data + }, e => { + + }) + }, }, computed: {}, mounted() { this.getTree(); + this.getProductData() } }; diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue index b9d8407a2..b8dc2838e 100644 --- a/src/pages/processCenter/pages/newProcess/index.vue +++ b/src/pages/processCenter/pages/newProcess/index.vue @@ -11,7 +11,7 @@
标准发放申请流程
标准清单发布/更新流程
项目合规评估流程
-
未符合项整改流程
+
未符合项整改流程
@@ -88,7 +88,7 @@ export default { case '7': //项目评估流程 this.$router.push({ - name:'xmpgStep1' + name: 'xmpgStep1' }) break case '8': diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 5be78956f..e839c14a9 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -1015,6 +1015,7 @@ export default { this.sarAccessInfoList.push(item) ) }) + this.selectedAccInfoSearchList = [] this.$refs.entryTable.clearSelection() this.$refs.searchTable.clearSelection() } else { @@ -1119,8 +1120,12 @@ export default { } }, // 清单条目 table select事件 - sarAccessInfoSelect (selectData) { - this.sarAccessInfoListArry = selectData + sarAccessInfoSelect (data) { + let sarAccessInfoListArry = []; + for(let i = 0; i< data.length; i++){ + this.sarAccessInfoListArry.push(data[i].id) + } + console.log(this.sarAccessInfoListArry); }, // 点击取消按钮 返回事件 backCancal () { diff --git a/src/pages/regulatoryRepository/enterBSysRevPlanManaLib/index.vue b/src/pages/regulatoryRepository/enterBSysRevPlanManaLib/index.vue index d134c484c..639a80f58 100644 --- a/src/pages/regulatoryRepository/enterBSysRevPlanManaLib/index.vue +++ b/src/pages/regulatoryRepository/enterBSysRevPlanManaLib/index.vue @@ -3,7 +3,7 @@
- + import('@/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue'), - meta: { - requireAuth: true, - title: '未符合项整改流程' - } - }, { path: '/xmpgStep1', name: 'xmpgStep1', @@ -294,6 +285,15 @@ const routes = [ title: '项目合规评估流程' } }, + { + path: '/wfhxzgStep1', + name: 'wfhxzgStep2', + component: () => import('@/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue'), + meta: { + requireAuth: true, + title: '未符合项整改发布/更新流程' + } + }, { path: '/wfhxzgStep2', name: 'wfhxzgStep2', diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index ee961b101..39134bcc1 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -6,8 +6,8 @@ // 服务器地址 // const devIp = '39.98.140.126' // const devInterfacePORT = '10005' -const devIp = '192.168.10.248' -const devInterfacePORT = '9999' +const devIp = '192.168.10.121' +const devInterfacePORT = '9988' // 云端端口号 const DEV_CLOUD_RES_INTERFACE_PORT = '7777' const simpleFilePath = 'att/attFile/upload' @@ -51,4 +51,4 @@ module.exports = { enterprise: enterprise, // GQ广汽 SJZX数据中心 theme: theme, // 主题 processInterfaceURL: `http://${serverIP}:${processPort}/bat-wkflow` -} \ No newline at end of file +}