Merge branch 'hjw-devtest' into 'master-copy'

Hjw devtest

See merge request spfm/spfm-market-front!426

src/assets/js/common.js

@@ -4,7 +4,9 @@ import axios from "axios";
 var qs = require('qs')
 import bus from '../../components/common/bus'
 import apiConfig from '@/config/index.js'
+import getConfig from '../../config/dev.js'
 // import {Decimal} from './decimal.js';
+let config = getConfig()
 var Decimal = require('decimal')
 let moment = require('moment')
 let common = {
@@ -263,38 +265,64 @@ let common = {
                     if (!obj.disableLoading) {
                         loading.close()
                     }
-                    if (response.data.code === 1 ||response.data.code == '1') {
-                        bus.$message.success(response.data.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) {
-                                if (eval(apiConfig.ENV_CONFIG) == 'dev' || eval(apiConfig.ENV_CONFIG) == 'test') {
-                                    bus.$message({
-                                        message: response.message,
-                                        type: 'error'
-                                    })
+                    if (process.env.VUE_APP_ENV == 'development' || process.env.VUE_APP_ENV == 'devs') {
+                        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) {
+                                    if (eval(apiConfig.ENV_CONFIG) == 'dev' || eval(apiConfig.ENV_CONFIG) == 'test') {
+                                        bus.$message({
+                                            message: response.message,
+                                            type: 'error'
+                                        })
+                                    } else {
+                                        bus.$notify.error(response.message.substring(0, 100))
+                                    }
+                                    if (typeof error === 'function') {
+                                        error.call(example, response.message)
+                                    }
                                 } else {
-                                    bus.$notify.error(response.message.substring(0, 100))
-                                }
-                                if (typeof error === 'function') {
-                                    error.call(example, response.message)
+                                    bus.$notify.error('接口请求失败')
+                                    if (typeof error === 'function') {
+                                        error.call(example, '错误信息')
+                                    }
                                 }
-                            } else {
-                                bus.$notify.error('接口请求失败')
-                                if (typeof error === 'function') {
-                                    error.call(example, '错误信息')
+                            }
+                        }
+                    } else {
+                        if (response.data.code === 1 || response.data.code == '1') {
+                            bus.$message.success(response.data.message)
+                            loading.close()
+                            success(response.data.data)
+                            return response
+                        } else {
+                            if (obj.printMsg) {
+                                if (response.message) {
+                                    if (eval(apiConfig.ENV_CONFIG) == 'dev' || eval(apiConfig.ENV_CONFIG) == 'test') {
+                                        bus.$message({
+                                            message: response.message,
+                                            type: 'error'
+                                        })
+                                    } else {
+                                        bus.$notify.error(response.message.substring(0, 100))
+                                    }
+                                    if (typeof error === 'function') {
+                                        error.call(example, response.message)
+                                    }
+                                } else {
+                                    bus.$notify.error('接口请求失败')
+                                    if (typeof error === 'function') {
+                                        error.call(example, '错误信息')
+                                    }
                                 }
                             }
                         }
                     }
+
                 })
                 .catch(function (msgE) {
                     if (obj.printMsg) {

src/config/dev.js

@@ -3,19 +3,22 @@ let devs = {
     TITLE:'本地环境',
     BASE_URL:"http://43.138.50.94:9600/", //本地环境
     BASE_API:"http://43.138.50.94:8880/api",//工作流本地环境
-    EXCEL_URL:"http://43.138.50.94:7777" //本地excel路径
+    EXCEL_URL:"http://43.138.50.94:7777", //本地excel路径
+    provincialWorkOrderAreafresourceId:'a682dc9f-2fea-11ed-a6ed-02427ba2d388'//通用工单地市
 }
 let dev = {
     TITLE:'本地环境',
     BASE_URL:"http://127.0.0.1:8080", //本地环境
     BASE_API:"http://43.138.50.94:8880/api",//工作流本地环境
-    EXCEL_URL:"http://43.138.50.94:7777" //本地excel路径
+    EXCEL_URL:"http://43.138.50.94:7777", //本地excel路径
+    provincialWorkOrderAreafresourceId:'a682dc9f-2fea-11ed-a6ed-02427ba2d388'//通用工单地市
 }
 let test = {
     TITLE:'测试环境',
     BASE_URL:"http://10.149.85.91:8000/spfm", //测试环境
     BASE_API:"http://10.149.85.91:8000/api",//工作流测试环境
-    EXCEL_URL:"http://10.149.85.91:7777" //测试excel路径
+    EXCEL_URL:"http://10.149.85.91:7777", //测试excel路径
+    provincialWorkOrderAreafresourceId:'33b0af93-b1ce-11ed-be6b-00505687dcd3'//通用工单地市
 }
 let prod = {
     TITLE:'线上环境',

src/pages/main/provincialWorkOrder/provincialWorkOrderArea.vue

@@ -122,6 +122,7 @@ import {
     getNowdata,
 } from "../../../http/api.js";//../../../http/api.js
 import { log } from "console";
+import getConfig from '../../../config/dev.js'
 export default {
     components: {
         Table,
@@ -220,7 +221,8 @@ export default {
             requestForm: {
                 // fresourceId: "a682dc9f-2fea-11ed-a6ed-02427ba2d388", // 本地环境
                 // fresourceId: "canvas", // 生产环境
-                fresourceId: "33b0af93-b1ce-11ed-be6b-00505687dcd3", //测试91环境
+                // fresourceId: "33b0af93-b1ce-11ed-be6b-00505687dcd3", //测试91环境
+                fresourceId: _self.getConfig().provincialWorkOrderAreafresourceId, //测试91环境
                 processDefinitionKey: "tygd_cit_process",
             },
             dialogStatus: false, //dialog显示

src/router/index.js

@@ -2278,6 +2278,13 @@ const routes = [{
             name: 'provincialWorkOrderArea',
             component: resolve => require(['../pages/main/provincialWorkOrder/provincialWorkOrderArea.vue'], resolve),
             meta: { title: '地市-通用工单' }
+        },
+        {
+            meta: { name: '备份数据恢复申请流程', keepAlive: false },
+            path: '/bfsjList',
+            name: 'bfsjList',
+            component: (resolve) => require( /* webpackChunkName: "system" */
+                ['../pages/main/bfsj/bfsjList.vue'], resolve)
         }