胡半仙 3 years ago
parent
commit
450b2d890d

+ 2 - 2
build/utils.js

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

+ 2 - 2
config/index.js

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

+ 5 - 5
src/views/WMS/components/steel/bar1_steel/bar1_steel_restack.vue

@@ -30,9 +30,9 @@
                     <el-button type="text" size="mini" @click="deleteclick(scope.row.resultId)">
                     <el-button type="text" size="mini" @click="deleteclick(scope.row.resultId)">
                      删除
                      删除
                    </el-button>
                    </el-button>
-                   <el-button type="text" size="mini"   @click="editclick(scope.row.resultId)">
+                   <!-- <el-button type="text" size="mini"   @click="editclick(scope.row.resultId)">
                      修改
                      修改
-                   </el-button>
+                   </el-button> -->
                 </template>
                 </template>
               </el-table-column>
               </el-table-column>
             </dilTable>
             </dilTable>
@@ -114,9 +114,9 @@ export default {
 
 
     //   },
     //   },
     //根据id进行修改
     //根据id进行修改
-    editclick(resultId) {
-      this.$router.push("/bar1_editSteel_restack/" + resultId);
-    },
+    // editclick(resultId) {
+    //   this.$router.push("/bar1_editSteel_restack/" + resultId);
+    // },
     handleClick(tab, event) {
     handleClick(tab, event) {
       console.log(tab, event);
       console.log(tab, event);
     },
     },

+ 13 - 7
src/views/WMS/components/steel/bar1_steel/bar1_steel_restackAdd.vue

@@ -86,7 +86,7 @@
             </div>
             </div>
             <div class="stack">
             <div class="stack">
                 <span>新垛位:</span>
                 <span>新垛位:</span>
-                <el-select v-model="value5" placeholder="请选择" @change ="onchange5()">
+                <el-select v-model="value5" placeholder="请选择">
                     <el-option
                     <el-option
                         v-for="(item,i) in options5"
                         v-for="(item,i) in options5"
                         :key="i"
                         :key="i"
@@ -194,6 +194,7 @@ export default {
         },
         },
     }
     }
   },
   },
+    
     mounted(){
     mounted(){
         this.initialization();
         this.initialization();
         //新增下拉框方法
         //新增下拉框方法
@@ -214,23 +215,28 @@ export default {
         makeSure1() {
         makeSure1() {
             this.table = false;
             this.table = false;
             let maps =this.selectionList1;
             let maps =this.selectionList1;
-            console.log("maps",maps)
+            console.log(maps)
             if(
             if(
                 maps[0]==null 
                 maps[0]==null 
             )this.$message.error("存在空值!");
             )this.$message.error("存在空值!");
+            // 判断用户填写的件数是否已经超过当前垛位的最大数量
             else
             else
             this.axios
             this.axios
                 .post("/api/v1/wms/createRestackMakeResult?keeperId=2&beforeLevel="+this.value3+"&afterStackingId="+this.value5+"&afterWarehouseId="+this.value1+"&afterBeforeStackingId="+this.value2+"&resultRemark="+"",maps)
                 .post("/api/v1/wms/createRestackMakeResult?keeperId=2&beforeLevel="+this.value3+"&afterStackingId="+this.value5+"&afterWarehouseId="+this.value1+"&afterBeforeStackingId="+this.value2+"&resultRemark="+"",maps)
                 .then((res) => {
                 .then((res) => {
+                    console.log(res);
                     if (res.data.code == 200) {
                     if (res.data.code == 200) {
                         this.$message({
                         this.$message({
-                        type: "success",
-                        message: "新增成功!",
+                            type: "success",
+                            message: "新增成功!",
                         });
                         });
-                        this.$router.go(-1);
-                    }else{
-                        this.$message.error("新增失败,可能存在重复!");
+                    }else if(res.data.code == 201){
+                        this.$message({
+                            type:"faile",
+                            message:res.data.data
+                        })
                     }
                     }
+                    this.$router.go(-1);
                     });
                     });
         },
         },
          open() {
          open() {

+ 2 - 0
src/views/WMS/components/steel/steel_real.vue

@@ -35,6 +35,8 @@ export default {
  name:"steel_real",
  name:"steel_real",
   data(){
   data(){
     return {
     return {
+      warehouseId:"",
+      time:'',
       rowIndex:null,
       rowIndex:null,
       mapList:[],
       mapList:[],
       inputText:"",
       inputText:"",