3.10

build/utils.js

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

config/index.js

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

src/views/WMS/components/steel/bar1_steel/bar1_steel_inboundReal.vue

@@ -23,13 +23,13 @@
     </div>
     <div class="table">
       <dilTable v-bind.sync="options" @selection-change="selectionChange" ref="table">
-        <!-- <el-table-column fixed="right" label="操作" width="150">
+        <el-table-column fixed="right" label="操作" width="150">
 								<template slot-scope="scope">
-									<el-button type="text" size="mini" @click="inboundDetails(scope)">
-										详情
+									<el-button type="text" size="mini" @click="deleteInbound(scope)">
+										删除
 									</el-button>
 								</template>
-				</el-table-column> -->
+				</el-table-column>
       </dilTable>
     </div>
   </div>
@@ -47,16 +47,46 @@ export default {
       region: "0",
       options:{
         // first请求数据的地址
-        requestUrl: "/api/v1/wms/getWmsInboundResults?apiId=371&warehouseId="+1,
+        requestUrl: "/api/v1/wms/getWmsInboundResults?apiId=450&warehouseId="+1,
         // selectionType: "select",
         // mapList: [],
       },
     }
   },
   methods:{
-    // inboundDetails(scope){
-    //   	this.$router.push("/inboundDetails/" + scope.row.inboundId)
-    // },
+    deleteInbound(scope){
+       this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.axios
+            .post("/api/v1/wms/undoInbound?inboundId=" + scope.row.inboundId)
+            .then((res) => {
+              if (res.data.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "删除成功!",
+                });     
+                this.$router.go(0);
+              } else {
+                this.$message({
+                  message: "删除失败",
+                  type: "warning",
+                });
+              }
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "删除操作已取消!",
+          });
+        });
+    },
+    },
     // 获取当前月份的最后一天
     getdaysinmonth(year,month){
       month = parseInt(month,10)+1;
@@ -167,7 +197,7 @@ export default {
       if (startTime && endTime) {
         if (startTime < endTime) {
           // if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
-          this.options.requestUrl = "/api/v1/wms/getWmsInboundResults?apiId=371&warehouseId="+1+"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+          this.options.requestUrl = "/api/v1/wms/getWmsInboundResults?apiId=350&warehouseId="+1+"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
           // }else if(getCookie("orgCode") == "wuliuchuyunzhongxin"){
           // this.options.requestUrl = "/api/v1/wms/getWmsInboundResults?apiId=371&orderType=13&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
           // }else{
@@ -239,7 +269,7 @@ export default {
       }
     }
   }
-}
+
 </script>
 
 <style lang="scss" scoped>

src/views/WMS/components/steel/bar2_steel/bar2_steel_inboundReal.vue

@@ -23,13 +23,13 @@
     </div>
     <div class="table">
       <dilTable v-bind.sync="options" @selection-change="selectionChange" ref="table">
-        <!-- <el-table-column fixed="right" label="操作" width="150">
+        <el-table-column fixed="right" label="操作" width="150">
 								<template slot-scope="scope">
-									<el-button type="text" size="mini" @click="inboundDetails(scope)">
-										详情
+									<el-button type="text" size="mini" @click="deleteInbound(scope)">
+										删除
 									</el-button>
 								</template>
-				</el-table-column> -->
+				</el-table-column>
       </dilTable>
     </div>
   </div>
@@ -47,16 +47,46 @@ export default {
       region: "0",
       options:{
         // first请求数据的地址
-        requestUrl: "/api/v1/wms/getWmsInboundResults?apiId=371&warehouseId="+2,
+        requestUrl: "/api/v1/wms/getWmsInboundResults?apiId=450&warehouseId="+2,
         // selectionType: "select",
         // mapList: [],
       },
     }
   },
   methods:{
-    // inboundDetails(scope){
-    //   	this.$router.push("/inboundDetails/" + scope.row.inboundId)
-    // },
+    deleteInbound(scope){
+       this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.axios
+            .post("/api/v1/wms/undoInbound?inboundId=" + scope.row.inboundId)
+            .then((res) => {
+              if (res.data.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "删除成功!",
+                });     
+                this.$router.go(0);
+              } else {
+                this.$message({
+                  message: "删除失败",
+                  type: "warning",
+                });
+              }
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "删除操作已取消!",
+          });
+        });
+    },
+    },
     // 获取当前月份的最后一天
     getdaysinmonth(year,month){
       month = parseInt(month,10)+1;
@@ -167,7 +197,7 @@ export default {
       if (startTime && endTime) {
         if (startTime < endTime) {
           // if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
-          this.options.requestUrl = "/api/v1/wms/getWmsInboundResults?apiId=371&warehouseId="+2+"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+          this.options.requestUrl = "/api/v1/wms/getWmsInboundResults?apiId=350&warehouseId="+2+"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
           // }else if(getCookie("orgCode") == "wuliuchuyunzhongxin"){
           // this.options.requestUrl = "/api/v1/wms/getWmsInboundResults?apiId=371&orderType=13&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
           // }else{
@@ -239,7 +269,7 @@ export default {
       }
     }
   }
-}
+
 </script>
 
 <style lang="scss" scoped>