修改

build/utils.js

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

config/index.js

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

src/views/ADMINISTRATORS/app.html

@@ -6,7 +6,7 @@
     <meta name="renderer" content="webkit">
     <meta content="智慧物流平台" name="keywords">
     <meta content="智慧物流平台" name="description">
-    <title>合同管理 - 智慧物流平台</title>
+    <title>后台管理 - 智慧物流平台</title>
     <link href="../static/css/common.css" rel="stylesheet"/>
     <link href="../static/img/favicon.ico" rel="shortcut icon"/>
     <script src="../static/lib/jquery/jquery.min.js" type="text/javascript"></script>

src/views/ADMINISTRATORS/components/ADMINISTRATORS1.vue

@@ -324,10 +324,10 @@ export default {
         }else{
             arr.push(mapFirst)
         }
-        this.axios.post("/api/v1/join/receiveTmsTruckWeightResult",arr).then((res) =>{
+        this.axios.post("http://172.16.33.166:8066/api/v1/join/tmstruckweightresult/receiveTmsTruckWeightResult",arr).then((res) =>{
             if(res.data.code == "200"){
                 this.$message.success("补录计量实绩成功")
-                this.$router.go(-1)
+                this.$router.go(0)
             }
         })
     },

src/views/ADMINISTRATORS/router/index.js

@@ -14,7 +14,7 @@ const constantRouterMap = [
     name: 'main',
     meta: {title: '首页', code: 'xtpzgl'},
     component: main,
-    redirect: {name: 'cargoResult'},
+    redirect: {name: 'ADMINISTRATORS1'},
     children: [
       {path: 'ADMINISTRATORS1', name: 'ADMINISTRATORS1', meta: {code: 'xtpzgl-jggl'}, component: ADMINISTRATORS1}
     ]

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>
-                   <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>
               </el-table-column>
             </dilTable>
@@ -114,9 +114,9 @@ export default {
 
     //   },
     //根据id进行修改
-    editclick(resultId) {
-      this.$router.push("/bar1_editSteel_restack/" + resultId);
-    },
+    // editclick(resultId) {
+    //   this.$router.push("/bar1_editSteel_restack/" + resultId);
+    // },
     handleClick(tab, event) {
       console.log(tab, event);
     },

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

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

src/views/WMS/components/steel/steel_inbound.vue

@@ -1,17 +1,11 @@
-//入库
+//入库转预留
 <template>
   <div class="steel_inbound">
     <div class="sache">
-      <!-- <el-input
-        placeholder="请输入内容"
-        v-model="inputText"
-        clearable>
-      </el-input>
-       -->
-      <span>入库时间：</span>
+      <span class="text">入库时间：</span>
       <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
       </el-date-picker>
-      <span>至</span>
+      <span class="text">至</span>
       <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
       </el-date-picker>
       <el-button type="primary" class="btn" @click="onclick">
@@ -23,13 +17,6 @@
     </div>
     <div class="table">
       <dilTable v-bind.sync="options" >
-        <!-- <el-table-column fixed="right" label="操作" width="150">
-								<template slot-scope="scope">
-									<el-button type="text" size="mini" @click="inboundDetails(scope)">
-										详情
-									</el-button>
-								</template>
-				</el-table-column> -->
       </dilTable>
     </div>
   </div>
@@ -100,11 +87,29 @@ export default {
 
 <style lang="scss" scode>
 .steel_inbound{
-  .sache{
-    height: 5rem;
-    display: flex;
-    align-items: center;
-    padding-left: 1.875rem;
-  }
+  margin-top: 30px;
+  margin-left: 20px;
+    .sache{
+      display: flex;
+      margin-bottom: 10px;
+      padding-right: 10px;
+      .text {
+        text-align: left;
+        line-height: 40px;
+      }
+      .el-date-editor {
+        margin-right: 5px;
+        margin-left: 5px;
+      }
+      .btn {
+        margin-left: 10px;
+      }
+      .el-select {
+      width: 100%;
+      .el-input__inner {
+        width: 150px;
+      }
+    }
+    }
 }
 </style>

src/views/WMS/components/steel/steel_inboundReal.vue

@@ -2,10 +2,10 @@
 <template>
   <div class="steel_inbound_real">
     <div class="sache">
-      <span>入库时间：</span>
+      <span class="text">入库时间：</span>
       <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
       </el-date-picker>
-      <span>至</span>
+      <span class="text">至</span>
       <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
       </el-date-picker>
       <el-select v-model="region" placeholder="请选择班次" style="width: auto;">
@@ -17,19 +17,9 @@
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
-      <!-- <el-button type="primary" class="btn" @click="onreserved">
-        预留
-      </el-button> -->
     </div>
     <div class="table">
       <dilTable v-bind.sync="options" @selection-change="selectionChange" ref="table">
-        <!-- <el-table-column fixed="right" label="操作" width="150">
-								<template slot-scope="scope">
-									<el-button type="text" size="mini" @click="inboundDetails(scope)">
-										详情
-									</el-button>
-								</template>
-				</el-table-column> -->
       </dilTable>
     </div>
   </div>
@@ -220,13 +210,23 @@ export default {
 
 <style lang="scss" scoped>
   .steel_inbound_real{
+     margin-top: 40px;
+     margin-left: 20px;
     .sache{
       display: flex;
-      justify-content: start;
-      align-items: center;
-      line-height: 40px;
-      height: 40px;
-      padding-left: 1.875rem;
+      margin-bottom: 10px;
+      padding-right: 10px;
+      .text {
+        text-align: left;
+        line-height: 40px;
+      }
+      .el-date-editor {
+        margin-right: 5px;
+        margin-left: 5px;
+      }
+      .btn {
+        margin-left: 10px;
+      }
       .el-select {
       width: 100%;
       .el-input__inner {

src/views/WMS/components/steel/steel_inboundStatistics.vue

@@ -2,10 +2,10 @@
 <template>
   <div class="steel_inboundStatistics">
     <div class="sache">
-      <span>入库时间：</span>
+      <span class="text">入库时间：</span>
       <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
       </el-date-picker>
-      <span>至</span>
+      <span class="text1">至</span>
       <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
       </el-date-picker>
       <el-select v-model="region" placeholder="请选择班次" style="width: auto;">
@@ -18,13 +18,13 @@
         <i class="el-icon-search"></i>查询
       </el-button>
       <el-col :span="3" v-html="'\u2003'"/>
-      <span>生产总件数</span>
+      <span class="text">生产总件数</span>
       <el-input
         placeholder="请输入内容"
         v-model="input3"
         :disabled="true" class="inputs" style="width:10%">
       </el-input>
-      <span>生产总重量</span>
+      <span class="text">生产总重量</span>
       <el-input
         placeholder="请输入内容"
         v-model="input4"
@@ -200,24 +200,35 @@ export default {
 
 <style lang="scss" scoped>
 .steel_inboundStatistics {
-  .sache{
-    height: 5rem;
-    display: flex;
-    align-items: center;
-    padding-left: 1.875rem;
-    .el-select {
+    margin-top: 30px;
+    margin-left: 20px;
+    .sache{
+      display: flex;
+      margin-bottom: 10px;
+      padding-right: 10px;
+      .text {
+        text-align: left;
+        line-height: 40px;
+        width: 70px;
+      }
+      .text1 {
+        text-align: left;
+        line-height: 40px;
+      }
+      .el-date-editor {
+        margin-right: 5px;
+        margin-left: 5px;
+      }
+      .btn {
+        margin-left: 10px;
+      }
+      .el-select {
       width: 100%;
       .el-input__inner {
         width: 150px;
       }
     }
-  }
-  .funcnum {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-
-  }
+    }
 }
 
 </style>

src/views/WMS/components/steel/steel_outbound.vue

@@ -1,29 +1,19 @@
 //出库作业
 <template>
-  <div class="steel_inbound_real">
+  <div class="gaoxian_outbound">
     <div class="sache">
-      <span>出库时间：</span>
+      <span class="text">出库时间：</span>
       <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
       </el-date-picker>
-      <span>至</span>
+      <span class="text">至</span>
       <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
       </el-date-picker>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
-      <!-- <el-button type="primary" class="btn" @click="onreserved">
-        预留
-      </el-button> -->
     </div>
     <div class="table">
       <dilTable v-bind.sync="options" @selection-change="selectionChange" ref="table">
-        <!-- <el-table-column fixed="right" label="操作" width="150">
-								<template slot-scope="scope">
-									<el-button type="text" size="mini" @click="inboundDetails(scope)">
-										详情
-									</el-button>
-								</template>
-				</el-table-column> -->
       </dilTable>
     </div>
   </div>
@@ -88,14 +78,24 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-  .steel_inbound_real{
+  .gaoxian_outbound{
+    margin-top: 40px;
+    margin-left: 20px;
     .sache{
       display: flex;
-      justify-content: start;
-      align-items: center;
-      line-height: 40px;
-      height: 40px;
-      padding-left: 1.875rem;
+      margin-bottom: 10px;
+      padding-right: 10px;
+      .text {
+        text-align: left;
+        line-height: 40px;
+      }
+      .el-date-editor {
+        margin-right: 5px;
+        margin-left: 5px;
+      }
+      .btn {
+        margin-left: 10px;
+      }
       .el-select {
       width: 100%;
       .el-input__inner {

src/views/WMS/components/steel/steel_outboundStatistics.vue

@@ -2,10 +2,10 @@
 <template>
   <div class="steel_inbound">
     <div class="sache">
-      <span>出库时间：</span>
+      <span class="text">出库时间：</span>
       <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
       </el-date-picker>
-      <span>至</span>
+      <span class="text1">至</span>
       <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
       </el-date-picker>
            <el-input
@@ -19,9 +19,9 @@
       <!-- <el-button type="primary" @click="refresh">
         <i class="el-icon-refresh"></i>刷新
       </el-button> -->
-      <span style="margin-left: 1rem;">总件数：</span>
+      <span style="margin-left: 1rem;" class="text">总件数：</span>
       <el-input v-model="totalNumber" :disabled="true" style="width: 150px;"></el-input>
-      <span style="margin-left: 1rem;">总重量：</span>
+      <span style="margin-left: 1rem;" class="text">总重量：</span>
       <el-input v-model="totalWeight" :disabled="true" style="width: 150px;"></el-input>
     </div>
     <div class="table">
@@ -92,17 +92,39 @@ export default {
 }
 </script>
 
-<style lang="scss" scode>
+<style lang="scss" scope>
 .steel_inbound{
-  .sache{
-    height: 5rem;
-    display: flex;
-    align-items: center;
-    padding-left: 1.875rem;
-     .el-input {
-      width: 20%;
-      margin-right: 1.25rem;
+  margin-top: 30px;
+  margin-left: 20px;
+    .sache{
+      display: flex;
+      margin-bottom: 10px;
+      padding-right: 10px;
+      .text {
+        text-align: left;
+        line-height: 40px;
+        width: 70px;
+      }
+      .text1 {
+        text-align: left;
+        line-height: 40px;
+      }
+      .el-date-editor {
+        margin-right: 5px;
+        margin-left: 5px;
+      }
+      .btn {
+        margin-left: 10px;
+      }
+      .el-input {
+        width: 250px;
+      }
+      .el-select {
+      width: 100%;
+      .el-input__inner {
+        width: 150px;
+      }
+    }
     }
-  }
 }
 </style>

src/views/WMS/components/steel/steel_real.vue

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

src/views/WMS/components/steel/steel_reserved.vue

@@ -7,13 +7,6 @@
         v-model="inputText"
         clearable>
       </el-input>
-      
-      <!-- <span>入库时间：</span>
-      <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
-      </el-date-picker>
-      <span>至</span>
-      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
-      </el-date-picker> -->
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -23,13 +16,6 @@
     </div>
     <div class="table">
       <dilTable v-bind.sync="options" >
-        <!-- <el-table-column fixed="right" label="操作" width="150">
-								<template slot-scope="scope">
-									<el-button type="text" size="mini" @click="inboundDetails(scope)">
-										详情
-									</el-button>
-								</template>
-				</el-table-column> -->
       </dilTable>
     </div>
   </div>
@@ -71,13 +57,24 @@ export default {
 }
 </script>
 
-<style lang="scss" scode>
+<style lang="scss" scope>
 .steel_inbound{
-  .sache{
-    height: 5rem;
-    display: flex;
-    align-items: center;
-    padding-left: 1.875rem;
-  }
+  margin-top: 30px;
+  margin-left: 20px;
+    .sache{
+      display: flex;
+      margin-bottom: 10px;
+      padding-right: 10px;
+      .text {
+        text-align: left;
+        line-height: 40px;
+      }
+      .btn {
+        margin-left: 10px;
+      }
+      .el-input {
+        width: 250px;
+      }
+    }
 }
 </style>