tijiao

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','appoint','WMS'];
+// let devModules = ['all']
+let devModules = ['index','inward','WMS'];
 if (pathSrc.indexOf('node_modules') > -1) {
     devModules = require('../../../cors.js').devModules;
 }

config/index.js

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

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

@@ -2,12 +2,6 @@
 <template>
   <div class="steel_inbound">
     <div class="sache">
-      <!-- <el-input
-        placeholder="请输入内容"
-        v-model="inputText"
-        clearable>
-      </el-input>
-       -->
       <span>入库时间：</span>
       <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
       </el-date-picker>
@@ -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,6 +87,8 @@ export default {
 
 <style lang="scss" scode>
 .steel_inbound{
+  margin-left: 20px;
+  margin-top: 20px;
   .sache{
     height: 5rem;
     display: flex;

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_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_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>

src/views/inward/components/truckAppoint/addRequirement2.vue

@@ -487,6 +487,7 @@ export default {
     },
     // 新增
     makeSure() {
+      console.log("----")
       console.log(this.tableData)
       console.log(typeof(this.form.requirementEstimatedDuration))
       if(this.shipperId == null){
@@ -519,7 +520,6 @@ export default {
          return
       }
       console.log(this.tableData)
-      debugger
       let requiremnet = {
         requirementEstimatedDuration: this.form.requirementEstimatedDuration,
         requirementOverlimit: this.form.requirementOverlimit,