songwb hace 9 meses
padre
commit
0a82720b49
Se han modificado 3 ficheros con 20 adiciones y 18 borrados
  1. 2 2
      src/api/api.js
  2. 16 14
      src/components/taskCenter/taskApplicationFrom.vue
  3. 2 2
      src/utils/baseUrl.js

+ 2 - 2
src/api/api.js

@@ -30,8 +30,8 @@ export function apiGetModel(url, params) {
 //获取菜单数据
 export function apiGetMenuData() {
     return httpRequest({
-        // url: 'menu/menuList?parentId=10105', // 测试
-        url: 'menu/menuList?parentId=6802', // 生产
+        url: 'menu/menuList?parentId=10105', // 测试
+        // url: 'menu/menuList?parentId=6802', // 生产
         method: 'post'
     })
 }

+ 16 - 14
src/components/taskCenter/taskApplicationFrom.vue

@@ -799,21 +799,23 @@
                                 message: datas.data.data,
                                 type: 'success'
                             })
-                            let params = {
-                                id: that.instanceChild.bizKey,
-                                stage: '已驳回'
-                            }
-                            apideptAdState(params).then(values =>{
-                                if (values.success) {
-                                    that.dialogVisible = false
-                                    that.$emit('approveMsg', datas.data.isOk)
-                                } else {
-                                    that.$message({
-                                        message: values.message,
-                                        type: 'error'
-                                    });
+                            if (taskType === 'reject') {
+                                let params = {
+                                    id: that.instanceChild.bizKey,
+                                    stage: '已驳回'
                                 }
-                            })
+                                apideptAdState(params).then(values =>{
+                                    if (values.success) {
+                                        that.dialogVisible = false
+                                        that.$emit('approveMsg', datas.data.isOk)
+                                    } else {
+                                        that.$message({
+                                            message: values.message,
+                                            type: 'error'
+                                        });
+                                    }
+                                })
+                            }
                             
                         } else {
                             that.$message({

+ 2 - 2
src/utils/baseUrl.js

@@ -17,8 +17,8 @@ switch (process.env.NODE_ENV) {
  
     case 'production': 
         // baseUrl.ROOT = "http://123.60.219.66:28800/"
-        // baseUrl.ROOT = "http://10.65.78.23:28800/" //测试环境
-        baseUrl.ROOT = "http://10.65.78.81:28800/"  // 正式环境
+        baseUrl.ROOT = "http://10.65.78.23:28800/" //测试环境
+        // baseUrl.ROOT = "http://10.65.78.81:28800/"  // 正式环境
         break 
 }