merge

config/dev.env.js

@@ -6,9 +6,9 @@ module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
   ctx:'"http://127.0.0.1:8080"',
-  ctxForm: '"http://10.149.85.91:8000"',//dev
+  // ctxForm: '"http://10.149.85.91:8000"',//dev
   // ctxForm: '"http://43.138.50.94:8880"',//test
-  // ctxForm: '"http://192.168.2.124:8880"',//test
+  ctxForm: '"http://192.168.2.44:8880"',//test
   // ctxForm: '"http://10.230.26.15:8000"',//生产
 
   excludeMeWhenSelectNextHandler:false,

src/assets/js/common.js

@@ -263,16 +263,16 @@ let common = {
                     if (!obj.disableLoading) {
                         loading.close()
                     }
-                    if (response.data.code === 1 ||response.data.code == '1') {
-                        bus.$message.success(response.data.message)
-                         loading.close()
-                         success(response.data.data)
-                         return response
-                        // if (response.code === 1 ||response.code == '1') {
-                        //     bus.$message.success(response.data.message)
-                        //      loading.close()
-                        //      success(response.data.data)
-                        //      return response
+                    // if (response.data.code === 1 ||response.data.code == '1') {
+                    //     bus.$message.success(response.data.message)
+                    //      loading.close()
+                    //      success(response.data.data)
+                    //      return response
+                        if (response.code === 1 ||response.code == '1') {
+                            bus.$message.success(response.data.message)
+                             loading.close()
+                             success(response.data)
+                             return response
                     } else {
                         if (obj.printMsg) {
                             if (response.message) {

src/pages/main/leader/components/formTable.vue

@@ -497,9 +497,9 @@ export default {
         needName: [
           { required: true, message: "请输入需求名称", trigger: "blur" },
         ],
-        mkFileShareAttachList: [
-          { required: true, validator: this.validateFiles },
-        ],
+        // mkFileShareAttachList: [
+        //   { required: true, validator: this.validateFiles },
+        // ],
         applyDept: [
           { required: true, message: "请输入申请部门", trigger: "blur" },
         ],

src/pages/main/leader/demand/demandHome.vue

@@ -196,8 +196,8 @@ export default {
         processDefinitionKey: "request_form_process",
       },
       requestForm: {
-        // fresourceId: "0d94de8a-0281-11ed-a302-4ae7da54db39", // 本地环境
-        fresourceId: "bf79721c-33f3-11ed-ba0b-00505687dcd3", //测试环境
+        fresourceId: "0d94de8a-0281-11ed-a302-4ae7da54db39", // 本地环境
+        // fresourceId: "bf79721c-33f3-11ed-ba0b-00505687dcd3", //测试环境
         // fresourceId:'81455799-600d-11ed-b399-e00084564cce',//生产环境
         processDefinitionKey: "request_form_process",
       },
@@ -1612,6 +1612,7 @@ export default {
         },
         data: e || {},
       }).then((res) => {
+        console.log(res);
         if (status === 0) {
           this.clickDemand("需求名称", res.data.data[0]);
         } else {

vue.config.js

@@ -133,7 +133,7 @@ module.exports = {
                 // target: 'http://192.168.1.9:9600/spfm',
                 // target: 'http://127.0.0.1:9600/',
                 // target: 'http://192.168.0.156:9600/',
-                target: 'http://192.168.2.69:9600/',
+                target: 'http://192.168.2.44:9600/',
                 // target: 'http://192.168.2.124:9600/',
                 // target: "http://124.223.66.248:9600",
                 // target: "http://43.138.50.94:9600",