胡半仙 3 năm trước cách đây
mục cha
commit
ca15b02e72

+ 2 - 2
build/utils.js

@@ -16,8 +16,8 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow']
 
-//  let devModules = ['all']
- let devModules = ['index','WMS']
+ let devModules = ['all']
+//  let devModules = ['index','WMS']
 // let devModules = ['index','SporadicManage','TMS','statisticalReport','RMS'];
 // let devModules = ['index','appoint','WMS'];
 

+ 2 - 2
config/index.js

@@ -64,9 +64,9 @@ let proxyTable = {
   },
   // 所有数据的请求域名地址
   "/api/v1": {
-    // target: "http://172.16.33.166:8080",
+    target: "http://172.16.33.166:8080",
     // target: "http://localhost:8019",
-    target: "http://localhost:8080",
+    // target: "http://localhost:8080",
     ws: true,
     pathRewrite: {
       "^/api/v1": "/api/v1"

+ 7 - 0
src/views/WMS/components/steel/addSteelInbound.vue

@@ -63,6 +63,10 @@ export default {
       materialName: null,
       //物资编码
       materialCode:null,
+      // 物资规格
+      materialSpecification:null,
+      // 物资型号
+      materialModel:null,
       //盘点数量
       materialNumber:null,
       //物资id
@@ -114,6 +118,9 @@ export default {
     currentRadioChange1(selection) {
       console.log(selection);
       this.materialName = selection.materialName;
+      this.materialCode = selection.materialCode;
+      this.materialSpecification = selection.materialSpecification;
+      this.materialModel = selection.materialModel;
       this.max = selection.max;
     },
     currentRadioChange2(selection) {

+ 4 - 0
src/views/WMS/components/steel/addSteelReserved.vue

@@ -63,6 +63,10 @@ export default {
       materialName: null,
       //物资编码
       materialCode:null,
+       // 物资规格
+      materialSpecification:null,
+      // 物资型号
+      materialModel:null,
       //盘点数量
       materialNumber:null,
       //物资id

+ 4 - 0
src/views/WMS/components/steel/bar1_steel/bar1_addSteelInbound.vue

@@ -63,6 +63,10 @@ export default {
       materialName: null,
       //物资编码
       materialCode:null,
+       // 物资规格
+      materialSpecification:null,
+      // 物资型号
+      materialModel:null,
       //盘点数量
       materialNumber:null,
       //物资id

+ 7 - 0
src/views/WMS/components/steel/bar1_steel/bar1_addSteelReserved.vue

@@ -63,6 +63,10 @@ export default {
       materialName: null,
       //物资编码
       materialCode:null,
+       // 物资规格
+      materialSpecification:null,
+      // 物资型号
+      materialModel:null,
       //盘点数量
       materialNumber:null,
       //物资id
@@ -113,6 +117,9 @@ export default {
     currentRadioChange1(selection) {
       console.log(selection);
       this.materialName = selection.materialName;
+      this.materialCode = selection.materialCode;
+      this.materialSpecification = selection.materialSpecification;
+      this.materialModel = selection.materialModel;
       this.max = selection.max;
     },
     currentRadioChange2(selection) {

+ 4 - 0
src/views/WMS/components/steel/bar2_steel/bar2_addSteelInbound.vue

@@ -63,6 +63,10 @@ export default {
       materialName: null,
       //物资编码
       materialCode:null,
+       // 物资规格
+      materialSpecification:null,
+      // 物资型号
+      materialModel:null,
       //盘点数量
       materialNumber:null,
       //物资id

+ 4 - 0
src/views/WMS/components/steel/bar2_steel/bar2_addSteelReserved.vue

@@ -63,6 +63,10 @@ export default {
       materialName: null,
       //物资编码
       materialCode:null,
+       // 物资规格
+      materialSpecification:null,
+      // 物资型号
+      materialModel:null,
       //盘点数量
       materialNumber:null,
       //物资id