订单管理和前端配置文件

zkqy-custom-business/src/main/java/com/zkqy/business/controller/SaleAccountsReceivableDetailController.java

@@ -78,7 +78,7 @@ public class SaleAccountsReceivableDetailController extends BaseController {
     /**
      * 获取应收帐明细详细信息
      */
-    @PreAuthorize("@ss.hasPermi('system:SaleAccountsReceivableDetail:query')")
+    @PreAuthorize("@ss.hasPermi('system:SaleAccountsReceivableDetail:edit')")
     @GetMapping(value = "/{id}")
     @ApiOperation(value = "获取应收帐明细详细信息")
     public AjaxResult getInfo(@PathVariable("id") Long id) {

zkqy-ui/.env.development

@@ -8,18 +8,13 @@ ENV = 'development'
 VUE_APP_BASE_API = '/dev-api'
 
 # 图片路径
-#VUE_APP_BASE_IMG_API = 'http://192.168.2.127:1024/dev-api'
-VUE_APP_BASE_IMG_API = 'http://192.168.110.83:1025/dev-api'
+VUE_APP_BASE_IMG_API = 'http://192.168.110.182:1025/dev-api'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
 
 #本项目地址
-# VUE_APP_BASE_API1 = 'http://192.168.110.15:8066/'
-# VUE_APP_BASE_API1 = 'http://192.168.110.120:8066/'
-# VUE_APP_BASE_API1 = 'http://192.168.110.76:8066/'
-#VUE_APP_BASE_API1 = 'http://192.168.2.127:8066/'
-VUE_APP_BASE_API1 = 'http://192.168.110.83:8066/'
+VUE_APP_BASE_API1 = 'http://192.168.110.182:8066/'
 
 # ws地址
 VUE_APP_BASE_WS_API = '//127.0.0.1:8721'

zkqy-ui/.env.production

@@ -8,17 +8,18 @@ ENV = 'production'
 VUE_APP_BASE_API = '/prod-api'
 
 # 生产环境
-# VUE_APP_BASE_API1 = 'http://62.234.61.92:8055/'
-VUE_APP_BASE_API1 = 'http://192.168.2.135:8066/'
-#VUE_APP_BASE_API1 = 'http://192.168.3.17:8066/'
-#VUE_APP_BASE_API1 = 'http://192.168.110.83:8066/'
-#VUE_APP_BASE_API1 = 'http://175.27.169.173:8066/'
+# 铨一
+# VUE_APP_BASE_API1 = 'http://192.168.2.135:8066/'
+# 化纤
+# VUE_APP_BASE_API1 = 'http://192.168.3.17:8066/'
+# lth
+ VUE_APP_BASE_API1 = 'http://192.168.110.182:8066/'
+# 公网服务器
+# VUE_APP_BASE_API1 = 'http://175.27.169.173:8066/'
 
 
 # 图片路径
-#VUE_APP_BASE_IMG_API = 'http://192.168.3.17:1024/prod-api'
-VUE_APP_BASE_IMG_API = 'http://192.168.2.135:1025/prod-api'
-#VUE_APP_BASE_IMG_API = 'http://175.27.169.173:1025/prod-api'
+VUE_APP_BASE_IMG_API = 'http://192.168.110.182:1025/prod-api'
 
 # ws地址
 VUE_APP_BASE_WS_API = '//127.0.0.1:8721'

zkqy-ui/src/views/login.vue

@@ -307,14 +307,11 @@ export default {
             Cookies.remove("rememberMe");
           }
           let form = {
-                // uri: "?client_id=hmc&scope=basic&response_type=code&state=AB1357&redirect_uri=http://192.168.2.190:8066/oauth/callback",
-                //uri:"?client_id=mestools&scope=basic&response_type=code&state=AB1357&redirect_uri=http://175.27.169.173:8055/oauth/callback",
-               // uri:"?client_id=mestools&scope=basic&response_type=code&state=AB1357&redirect_uri=http://192.168.128.171:8066/oauth/callback",
-                 uri:"?client_id=mestools&scope=basic&response_type=code&state=AB1357&redirect_uri=http://192.168.2.135:8066/oauth/callback",
-             // uri:"?client_id=hmc&scope=basic&response_type=code&state=AB1357&redirect_uri=http://192.168.110.83:8066/oauth/callback",
-             //  uri:"?client_id=hmc&scope=basic&response_type=code&state=AB1357&redirect_uri=http://192.168.110.83:8066/oauth/callback",
-            // uri:"?client_id=hmc&scope=basic&response_type=code&state=AB1357&redirect_uri=http://172.20.10.5:8066/oauth/callback",
-            //   uri:"?client_id=mestools&scope=basic&response_type=code&state=AB1357&redirect_uri=http://192.168.3.17:8066/oauth/callback",
+            // uri:"?client_id=mestools&scope=basic&response_type=code&state=AB1357&redirect_uri=http://192.168.128.171:8066/oauth/callback",//实验室
+            // uri:"?client_id=mestools&scope=basic&response_type=code&state=AB1357&redirect_uri=http://192.168.2.135:8066/oauth/callback",//铨一
+            // uri:"?client_id=mestools&scope=basic&response_type=code&state=AB1357&redirect_uri=http://192.168.3.17:8066/oauth/callback",//化纤
+            // uri:"?client_id=hmc&scope=basic&response_type=code&state=AB1357&redirect_uri=http://192.168.110.83:8066/oauth/callback",//hmc
+             uri:"?client_id=hmc&scope=basic&response_type=code&state=AB1357&redirect_uri=http://192.168.110.182:8066/oauth/callback",//lth
             ...this.loginForm,
             tenantID: this.tenantId,
           };

zkqy-ui/src/views/orderMange/index.vue

@@ -1856,7 +1856,7 @@ export default {
               btnName: "编辑",
               btnType: "myEdit",
               btnIcon: "",
-              btnShowCondition:""
+              btnShowCondition:'[{"fieldName":"sale_order.status","mark":"3","refValue":"12"}]'
                 ,
               btnHasPermi: "huaxian:xsglddgl:INSERT",
               children: [],
@@ -1877,7 +1877,7 @@ export default {
               btnIcon: "",
               // btnShowCondition: "[]",
               btnShowCondition:
-                '[{"fieldName":"sale_order.status","mark":"6","refValue":"11"}]',
+                '[{"fieldName":"sale_order.status","mark":"6","refValue":"11"},{"fieldName":"sale_order.status","mark":"3","refValue":"12"}]',
               btnHasPermi: "huaxian:xsglddgl:INSERT",
               children: [],
             },
@@ -1887,7 +1887,7 @@ export default {
               btnIcon: "",
               // btnShowCondition: "[]",
               btnShowCondition:
-                '[{"fieldName":"sale_order.status","mark":"3","refValue":"1"},{"fieldName":"sale_order.status","mark":"3","refValue":"2"},{"fieldName":"sale_order.status","mark":"3","refValue":"8"},{"fieldName":"sale_order.status","mark":"3","refValue":"7"},{"fieldName":"sale_order.status","mark":"3","refValue":"11"}]',
+                '[{"fieldName":"sale_order.status","mark":"3","refValue":"1"},{"fieldName":"sale_order.status","mark":"3","refValue":"2"},{"fieldName":"sale_order.status","mark":"3","refValue":"8"},{"fieldName":"sale_order.status","mark":"3","refValue":"7"},{"fieldName":"sale_order.status","mark":"3","refValue":"11"},{"fieldName":"sale_order.status","mark":"3","refValue":"12"}]',
               btnHasPermi: "huaxian:xsglddgl:INSERT",
               children: [],
             },
@@ -1897,7 +1897,7 @@ export default {
               btnIcon: "",
               // btnShowCondition: "[]",
               btnShowCondition:
-                '[{"fieldName":"sale_order.status","mark":"3","refValue":"1"},{"fieldName":"sale_order.status","mark":"3","refValue":"2"},{"fieldName":"sale_order.status","mark":"3","refValue":"8"},{"fieldName":"sale_order.status","mark":"3","refValue":"7"},{"fieldName":"sale_order.status","mark":"3","refValue":"11"}]',
+                '[{"fieldName":"sale_order.status","mark":"3","refValue":"1"},{"fieldName":"sale_order.status","mark":"3","refValue":"2"},{"fieldName":"sale_order.status","mark":"3","refValue":"8"},{"fieldName":"sale_order.status","mark":"3","refValue":"7"},{"fieldName":"sale_order.status","mark":"3","refValue":"11"},{"fieldName":"sale_order.status","mark":"3","refValue":"12"}]',
               // ,{"fieldName":"sale_order.status","mark":"3","refValue":"3"}  3待生产
               btnHasPermi: "huaxian:xsglddgl:INSERT",
               children: [],
@@ -1915,7 +1915,7 @@ export default {
               btnType: "myDelete",
               btnIcon: "",
               btnShowCondition:
-                '[{"fieldName":"sale_order.status","mark":"3","refValue":"2"},{"fieldName":"sale_order.status","mark":"3","refValue":"3"},{"fieldName":"sale_order.status","mark":"3","refValue":"4"},{"fieldName":"sale_order.status","mark":"3","refValue":"5"},{"fieldName":"sale_order.status","mark":"3","refValue":"6"},{"fieldName":"sale_order.status","mark":"3","refValue":"8"},{"fieldName":"sale_order.status","mark":"3","refValue":"9"},{"fieldName":"sale_order.status","mark":"3","refValue":"11"}]',
+                '[{"fieldName":"sale_order.status","mark":"3","refValue":"2"},{"fieldName":"sale_order.status","mark":"3","refValue":"3"},{"fieldName":"sale_order.status","mark":"3","refValue":"4"},{"fieldName":"sale_order.status","mark":"3","refValue":"5"},{"fieldName":"sale_order.status","mark":"3","refValue":"6"},{"fieldName":"sale_order.status","mark":"3","refValue":"8"},{"fieldName":"sale_order.status","mark":"3","refValue":"9"},{"fieldName":"sale_order.status","mark":"3","refValue":"11"},{"fieldName":"sale_order.status","mark":"3","refValue":"12"}]',
               children: [],
               btnHasPermi: "huaxian:xsglddgl:INSERT",
             },
@@ -1924,7 +1924,7 @@ export default {
               btnType: "myComplate",
               btnIcon: "",
               btnShowCondition:
-                '[{"fieldName":"sale_order.status","mark":"6","refValue":"9"},{"fieldName":"sale_order.status","mark":"3","refValue":"11"}]',
+                '[{"fieldName":"sale_order.status","mark":"6","refValue":"9"},{"fieldName":"sale_order.status","mark":"3","refValue":"11"},{"fieldName":"sale_order.status","mark":"3","refValue":"12"}]',
               children: [],
               btnHasPermi: "huaxian:xsglddgl:INSERT",
             },
@@ -1932,7 +1932,7 @@ export default {
               btnName: "异常结束",
               btnType: "myEror",
               btnIcon: "",
-              btnShowCondition:"",
+              btnShowCondition:'[{"fieldName":"sale_order.status","mark":"3","refValue":"1"},{"fieldName":"sale_order.status","mark":"3","refValue":"2"},{"fieldName":"sale_order.status","mark":"3","refValue":"8"},{"fieldName":"sale_order.status","mark":"3","refValue":"7"},{"fieldName":"sale_order.status","mark":"3","refValue":"11"},{"fieldName":"sale_order.status","mark":"3","refValue":"12"}]',
               children: [],
               btnHasPermi: "huaxian:xsglddgl:INSERT",
             }

zkqy-ui/vue.config.js

@@ -38,15 +38,11 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-         // target: `http://172.20.10.5:8066`,
-         // target: `http://175.27.169.173:8066`,
-        // target: `http://192.168.110.83:8066`,
-        // target: `http://192.168.128.171:8066`,
-         target: `http://192.168.2.135:8066`, //铨一开发
-        // target: `http://192.168.2.190:8066`,
-        // target: `http://192.168.3.17:8066`,
-        // target: `http://192.168.2.135:8066`,
-        //  target: `http://192.168.128.171:8066`,
+        // target: `http://192.168.128.171:8066`, //实验室
+        // target: `http://192.168.2.135:8066`, //铨一开发
+        // target: `http://192.168.3.17:8066`, //化纤服务器
+         target: `http://192.168.110.182:8066`, //lth
+        // target: `http://192.168.110.83:8066`, //hmc
         // target: `http://175.27.169.173:8066`,//公网服务器
         changeOrigin: true,
         pathRewrite: {