胡半仙 3 years ago
parent
commit
f0a85fc1fc

+ 2 - 2
build/utils.js

@@ -15,9 +15,9 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 // ['index','appoint','configManager','homepage','inward','queue','RMS','sale','serviceManager','SporadicManage'
 // ['index','appoint','configManager','homepage','inward','queue','RMS','sale','serviceManager','SporadicManage'
 //       统计报表       组织机构/系统管理 采购  仓储
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow']
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow']
-let devModules = ['all'];
+// let devModules = ['all'];
 // let devModules = ['index','SporadicManage','TMS','statisticalReport','RMS'];
 // let devModules = ['index','SporadicManage','TMS','statisticalReport','RMS'];
-// let devModules = ['index','appoint','TMS'];
+let devModules = ['index','appoint','TMS','WMS'];
 if (pathSrc.indexOf('node_modules') > -1) {
 if (pathSrc.indexOf('node_modules') > -1) {
     devModules = require('../../../cors.js').devModules;
     devModules = require('../../../cors.js').devModules;
 }
 }

+ 2 - 2
config/index.js

@@ -65,7 +65,7 @@ let proxyTable = {
   // 所有数据的请求域名地址
   // 所有数据的请求域名地址
   "/api/v1": {
   "/api/v1": {
     // target: "http://172.16.33.166:8080",
     // target: "http://172.16.33.166:8080",
-    target: "http://192.168.1.113:8019",
+    target: "http://192.168.1.110:8019",
     // target: "http://192.168.1.114:8019",
     // target: "http://192.168.1.114:8019",
     ws: true,
     ws: true,
     pathRewrite: {
     pathRewrite: {
@@ -73,7 +73,7 @@ let proxyTable = {
     }
     }
   },
   },
   "/views/api/v1": {
   "/views/api/v1": {
-    target: "http://172.16.33.166:8080",
+    target: "http://192.168.1.110:8019",
     ws: true,
     ws: true,
     pathRewrite: {
     pathRewrite: {
       "^/views/api/v1": "/api/v1"
       "^/views/api/v1": "/api/v1"

+ 1 - 1
src/views/WMS/components/steel/addCheckWarehouse.vue

@@ -105,7 +105,7 @@ export default {
       this.drawer = true;
       this.drawer = true;
       this.a = num;
       this.a = num;
       if(num==1){
       if(num==1){
-          this.first.requestUrl = "/api/v1/uc/queryMaterialByLike?apiId=244" + "&i=" + new Date()
+          this.first.requestUrl = "/api/v1/wms/getSteelMaterialList?apiId=443"
       }else{
       }else{
           this.second.requestUrl = "/api/v1/uc/getUnloadingMesByLike?apiId=374&index=库" + "&i=" + new Date();
           this.second.requestUrl = "/api/v1/uc/getUnloadingMesByLike?apiId=374&index=库" + "&i=" + new Date();
       }
       }

+ 11 - 10
src/views/WMS/components/steel/steel_real.vue

@@ -20,25 +20,26 @@
     </div>
     </div>
 </template>
 </template>
 
 
-
-
 <script>
 <script>
 export default {
 export default {
  name:"steel_real",
  name:"steel_real",
-data(){
-   return {
-     inputText:"",
-     option: {
-      requestUrl: "/api/v1/wms/selectGridMaterialList?apiId=167",
-      },
-    };
-  },
+  data(){
+    return {
+      inputText:"",
+      option: {
+        requestUrl: "/api/v1/wms/selectGridMaterialList?apiId=167",
+        },
+      };
+    },
   mounted(){
   mounted(){
 
 
   },
   },
   methods:{
   methods:{
     demotionClick(gridId){
     demotionClick(gridId){
       this.$router.push("/steel_realDown/" + gridId);
       this.$router.push("/steel_realDown/" + gridId);
+    },
+    onClick(){
+      
     }
     }
   },
   },
 };
 };