内转钢材到异地库

build/utils.js

@@ -17,7 +17,7 @@ const devPathSrc = path.resolve(__dirname, "../../../src"); // node_modules应
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow']
 // let devModules = ["index", "appoint", "statisticalReport", "WMS","TMS"];
 // let devModules = ["index", "TMS", "appoint", "WMS", "queue"];
-let devModules = ["all"];
+let devModules = ["index", "inward"];
 
 if (pathSrc.indexOf("node_modules") > -1) {
   devModules = require("../../../cors.js").devModules;

config/index.js

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

src/views/inward/components/inwardFactory/timeTaskResult.vue

@@ -1,66 +1,71 @@
 // 计时作业
 <template>
-    <div class="sale">
-        <div class="top">
-            <!-- 框计算 -->
-            <span class="text">计时时间：</span>
-            <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
-            </el-date-picker>
-            <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>
-            <!-- excel导出 -->
-            <el-button type="primary" @click="exportData()">
-                <i class="el-icon-download"></i>导出(Excel)
-            </el-button>
-        </div>
-        <div class="tab">
-            <dilTable v-bind.sync="option"  ref="excelDom">
-                <el-table-column fixed="right" label="操作" width="180">
-                <template slot-scope="scope">
-                    <div class="step">
-                        <el-button
-                        @click="detailclick1(scope.row)"
-                        type="text"
-                        size="small"
-                        >运输详情</el-button>
-                    </div>
-                  <!-- <el-button @click="" type="primary" style="margin-left: 16px;">
+  <div class="sale">
+    <div class="top">
+      <!-- 框计算 -->
+      <span class="text">计时时间：</span>
+      <el-date-picker
+        v-model="startTime"
+        type="datetime"
+        placeholder="选择日期"
+      >
+      </el-date-picker>
+      <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>
+      <!-- excel导出 -->
+      <el-button type="primary" @click="exportData()">
+        <i class="el-icon-download"></i>导出(Excel)
+      </el-button>
+    </div>
+    <div class="tab">
+      <dilTable v-bind.sync="option" ref="excelDom">
+        <el-table-column fixed="right" label="操作" width="180">
+          <template slot-scope="scope">
+            <div class="step">
+              <el-button
+                @click="detailclick1(scope.row)"
+                type="text"
+                size="small"
+                >运输详情</el-button
+              >
+            </div>
+            <!-- <el-button @click="" type="primary" style="margin-left: 16px;">
                     运输详情
                   </el-button> -->
-                </template>
-                </el-table-column>
-                <!-- 运输进程详情 -->
-                <el-table-column type="expand" width="1">
-                    <template slot-scope="props">
-                        <el-form label-position="center" inline class="demo-table-expand">
-                        <div v-if="false">{{ props }}</div>
-                        <div>
-                            <el-table :data="tableData1" border>
-                            <el-table-column
-                                v-for="(item, i) in tableHead"
-                                :key="i"
-                                :prop="item.prop"
-                                :label="item.label"
-                                :width="item.width"
-                            ></el-table-column>
-                            </el-table>
-                        </div>
-                        </el-form>
-                    </template>
-                </el-table-column>
-            </dilTable>
-        </div>
-        
+          </template>
+        </el-table-column>
         <!-- 运输进程详情 -->
-        <!-- <el-drawer
+        <el-table-column type="expand" width="1">
+          <template slot-scope="props">
+            <el-form label-position="center" inline class="demo-table-expand">
+              <div v-if="false">{{ props }}</div>
+              <div>
+                <el-table :data="tableData1" border>
+                  <el-table-column
+                    v-for="(item, i) in tableHead"
+                    :key="i"
+                    :prop="item.prop"
+                    :label="item.label"
+                    :width="item.width"
+                  ></el-table-column>
+                </el-table>
+              </div>
+            </el-form>
+          </template>
+        </el-table-column>
+      </dilTable>
+    </div>
+
+    <!-- 运输进程详情 -->
+    <!-- <el-drawer
             :visible.sync="drawer"
             :direction="direction"> -->
-            <!-- 步骤条显示 -->
-            <!-- <div style="height: 200px;content-align:center" >
+    <!-- 步骤条显示 -->
+    <!-- <div style="height: 200px;content-align:center" >
                 <el-table
                 :data="stepList"
                 style="width: 100%">
@@ -77,188 +82,209 @@
                 </el-table>
             </div>
         </el-drawer> -->
-    </div>
+  </div>
 </template>
 <script>
 import { getCookie } from "@/utils/util.js";
 import { sjTime } from "@/utils/sharedJsFile";
 export default {
-    data(){
-        return{
-            inputText:'',
-            option: {       
-                // 表格请求数据的地址
-                requestUrl: "",
-            },
-            tableHead: [
-                {
-                prop: "linkName",
-                label: "计时状态",
-                width: 150,
-                },
-                {
-                prop: "pointDate",
-                label: "时间",
-                width: 150,
-                }
-            ],
-            tableData1: [],
-            tableData: [],
-            startTime: null,
-            endTime: null,
-            oldRow1: "",
-            oldRowCount1: 1,
-            drawer: false,
-            direction: 'rtl',
-            orderId: 0,
-            stepList:[],
-            tableTitle:'计时统计'
+  data() {
+    return {
+      inputText: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: ""
+      },
+      tableHead: [
+        {
+          prop: "linkName",
+          label: "计时状态",
+          width: 150
+        },
+        {
+          prop: "pointDate",
+          label: "时间",
+          width: 150
         }
-    },
-    created(){
-        if(getCookie("orgCode") == "dagangadmin"||getCookie("orgCode") == "zidonghuabu"||getCookie("orgCode") == "wuliuchuyunzhongxin"){
-            this.option.requestUrl = "/api/v1/tms/getAllTimeTaskResult?apiId=458"
-        }else{
-            console.log("cookier"+getCookie("userId"))
-            this.option.requestUrl = "/api/v1/tms/getAllTimeTaskResult?apiId=458&orgCode="+getCookie("userId");
+      ],
+      tableData1: [],
+      tableData: [],
+      startTime: null,
+      endTime: null,
+      oldRow1: "",
+      oldRowCount1: 1,
+      drawer: false,
+      direction: "rtl",
+      orderId: 0,
+      stepList: [],
+      tableTitle: "计时统计"
+    };
+  },
+  created() {
+    if (
+      getCookie("orgCode") == "dagangadmin" ||
+      getCookie("orgCode") == "zidonghuabu" ||
+      getCookie("orgCode") == "wuliuchuyunzhongxin"
+    ) {
+      this.option.requestUrl = "/api/v1/tms/getAllTimeTaskResult?apiId=458";
+    } else {
+      this.option.requestUrl =
+        "/api/v1/tms/getAllTimeTaskResult?apiId=458&userId=" +
+        getCookie("orgCode");
+    }
+  },
+  methods: {
+    // -------查看物资详情(已拒绝)
+    detailclick1(row) {
+      // 记录重复点击次数
+      if (this.oldRow1 === row) {
+        this.oldRowCount1 += 1;
+      }
+      this.orderId = row.orderId;
+      let map = {
+        orderId: this.orderId
+      };
+      // 切换当前详情表
+      this.$refs.excelDom.toggleRowExpansion(row);
+      // 打开前关闭上一个详情表
+      if (this.oldRow1 != "") {
+        if (this.oldRow1 != row) {
+          if (this.oldRowCount1 % 2 === 1) {
+            this.$refs.excelDom.toggleRowExpansion(this.oldRow1);
+          } else {
+            this.oldRowCount1 = 1;
+          }
+        } else {
+          this.oldRow1 = null;
+          return;
         }
+      }
+      // 重置上一个点击对象
+      this.oldRow1 = row;
+      // 根据销售订单物资中间表id查询物资信息
+      this.axios.post("/api/v1/oms/getOrderResult?orderId=", map).then(res => {
+        console.log("res", res);
+        this.tableData1 = res.data;
+      });
     },
-    methods:{
-        // -------查看物资详情(已拒绝)
-        detailclick1(row) {
-        // 记录重复点击次数
-        if (this.oldRow1 === row) {
-            this.oldRowCount1 += 1;
-        }
-        this.orderId = row.orderId
-        let map = {
-            orderId : this.orderId
+    getStepsList(row) {
+      console.log(row.orderId);
+      this.orderId = row.orderId;
+      this.drawer = true;
+      let map = {
+        orderId: this.orderId
+      };
+      this.axios.post("/api/v1/oms/getOrderResult", map).then(res => {
+        console.log(res);
+        if (res.status == 200) {
+          this.stepList = res.data;
+        } else {
+          this.$message.error("展示失败！");
         }
-        // 切换当前详情表
-        this.$refs.excelDom.toggleRowExpansion(row);
-        // 打开前关闭上一个详情表
-        if (this.oldRow1 != "") {
-            if (this.oldRow1 != row) {
-            if (this.oldRowCount1 % 2 === 1) {
-                this.$refs.excelDom.toggleRowExpansion(this.oldRow1);
-            } else {
-                this.oldRowCount1 = 1;
-            }
-            } else {
-            this.oldRow1 = null;
-            return;
-            }
-        }
-        // 重置上一个点击对象
-        this.oldRow1 = row;
-        // 根据销售订单物资中间表id查询物资信息
-        this.axios
-            .post("/api/v1/oms/getOrderResult?orderId=",map)
-            .then((res) => {
-            console.log("res",res)
-            this.tableData1 = res.data;
-            });
-        },
-        getStepsList(row){
-            console.log(row.orderId)
-            this.orderId = row.orderId
-            this.drawer = true
-            let map = {
-                orderId : this.orderId
-            }
-            this.axios.post("/api/v1/oms/getOrderResult",map)
-                .then((res) => {
-                    console.log(res)
-                if (res.status == 200) {
-                    this.stepList = res.data
-                } else {
-                    this.$message.error("展示失败！");
-                }
-            });
-            console.log(this.stepList)
-        },
-        getRequirementMaterial1(row) {
-        // 记录重复点击次数
-        if (this.oldRow1 === row) {
-            this.oldRowCount1 += 1;
+      });
+      console.log(this.stepList);
+    },
+    getRequirementMaterial1(row) {
+      // 记录重复点击次数
+      if (this.oldRow1 === row) {
+        this.oldRowCount1 += 1;
+      }
+      // 切换当前详情表
+      this.$refs.excelDom.toggleRowExpansion(row);
+      // 打开前关闭上一个详情表
+      if (this.oldRow1 != "") {
+        if (this.oldRow1 != row) {
+          if (this.oldRowCount1 % 2 === 1) {
+            this.$refs.excelDom.toggleRowExpansion(this.oldRow1);
+          } else {
+            this.oldRowCount1 = 1;
+          }
+        } else {
+          this.oldRow1 = null;
+          return;
         }
-        // 切换当前详情表
-        this.$refs.excelDom.toggleRowExpansion(row);
-        // 打开前关闭上一个详情表
-        if (this.oldRow1 != "") {
-            if (this.oldRow1 != row) {
-            if (this.oldRowCount1 % 2 === 1) {
-                this.$refs.excelDom.toggleRowExpansion(this.oldRow1);
-            } else {
-                this.oldRowCount1 = 1;
-            }
-            } else {
-            this.oldRow1 = null;
-            return;
-            }
+      }
+      // 重置上一个点击对象
+      this.oldRow1 = row;
+      this.getMaterial(row.orderId);
+    },
+    onclick() {
+      let startTime = null;
+      let endTime = null;
+      if (this.startTime) {
+        startTime = sjTime(this.startTime);
+      }
+      if (this.endTime) {
+        endTime = sjTime(this.endTime);
+      }
+      if (startTime && endTime) {
+        if (startTime < endTime) {
+          console.log(startTime);
+          console.log(endTime);
+          if (
+            getCookie("orgCode") == "dagangadmin" ||
+            getCookie("orgCode") == "zidonghuabu" ||
+            getCookie("orgCode") == "wuliuchuyunzhongxin"
+          ) {
+            this.option.requestUrl =
+              "/api/v1/tms/getAllTimeTaskResult?apiId=458&startTime=" +
+              startTime +
+              "&endTime=" +
+              endTime +
+              "&i=" +
+              new Date();
+          } else {
+            this.option.requestUrl =
+              "/api/v1/tms/getAllTimeTaskResult?apiId=458&userId=" +
+              getCookie("orgCode") +
+              "&startTime=" +
+              startTime +
+              "&endTime=" +
+              endTime +
+              "&i=" +
+              new Date();
+          }
+        } else {
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning("开始时间要比结束时间早");
         }
-        // 重置上一个点击对象
-        this.oldRow1 = row;
-        this.getMaterial(row.orderId);
-        },
-        onclick(){
-            let startTime = null;
-            let endTime = null;
-            if (this.startTime) {
-                startTime = sjTime(this.startTime);
-            }
-            if (this.endTime) {
-                endTime = sjTime(this.endTime);
-            }
-            if (startTime && endTime) {
-                if (startTime < endTime) {
-                    console.log(startTime)
-                    console.log(endTime)
-                if(getCookie("orgCode") == "dagangadmin"||getCookie("orgCode") == "zidonghuabu"||getCookie("orgCode") == "wuliuchuyunzhongxin"){
-                    this.option.requestUrl = "/api/v1/tms/getAllTimeTaskResult?apiId=458&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
-                }else{
-                    this.option.requestUrl = "/api/v1/tms/getAllTimeTaskResult?apiId=458&orgCode="+getCookie("userId")+"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
-                }
-                } else {
-                this.startTime = null;
-                this.endTime = null;
-                this.$message.warning("开始时间要比结束时间早");
-                }
-            } else {
-               
-            }
-        },
-        getMaterial(orderId){
-            console.log(orderId)
-            this.axios.post("/api/v1/oms/getPauseTimeTaskDetail/" + orderId).then((res) => {
-                console.log(res)
-                this.tableData = res.data.data
-            })
-        },
+      } else {
+      }
+    },
+    getMaterial(orderId) {
+      console.log(orderId);
+      this.axios
+        .post("/api/v1/oms/getPauseTimeTaskDetail/" + orderId)
+        .then(res => {
+          console.log(res);
+          this.tableData = res.data.data;
+        });
     }
-}
+  }
+};
 </script>
 <style lang="scss">
-    .sale{
-        .top {
-            padding: 1.25rem 1.875rem;
-            .el-input{
-            width: 20%;
-            }
-        }
-    }
-    .el-table th.el-table__cell>.cell {
-        display: inline-block;
-        -webkit-box-sizing: border-box;
-        box-sizing: border-box;
-        position: relative;
-        vertical-align: middle;
-        padding-left: 10px;
-        padding-right: 10px;
-        width: 100%;
-        text-align: center;
-    }
-    .step {
-    text-align: center;
+.sale {
+  .top {
+    padding: 1.25rem 1.875rem;
+    .el-input {
+      width: 20%;
     }
-</style>
+  }
+}
+.el-table th.el-table__cell > .cell {
+  display: inline-block;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  position: relative;
+  vertical-align: middle;
+  padding-left: 10px;
+  padding-right: 10px;
+  width: 100%;
+  text-align: center;
+}
+.step {
+  text-align: center;
+}
+</style>

src/views/inward/components/offsetSteel/saleSteelTruckOrder/platformStockInfo.vue

@@ -191,24 +191,24 @@
         >
         </el-table-column>
         <el-table-column
-          prop="strawMats"
-          label="草垫根数"
+          prop="orderNum"
+          label="运输订单号"
           align="center"
           width="150px"
         >
-          <template slot-scope="scope">
-            <el-input
-              v-model.number="scope.row.strawMats"
-              placeholder="草垫根数"
-            >
-            </el-input>
-          </template>
         </el-table-column>
         <el-table-column
-          prop="orderNum"
-          label="运输订单号"
+          prop="wgmDelete"
+          label="入库状态"
           align="center"
           width="150px"
+          column-key="wgmDelete"
+          :filters="[
+            { text: '入库', value: '入库' },
+            { text: '出库', value: '出库' },
+            { text: '待入库', value: '待入库' }
+          ]"
+          :filter-method="filterDeleted"
         >
         </el-table-column>
         <el-table-column
@@ -237,17 +237,6 @@
             </el-input>
           </template>
         </el-table-column>
-        <el-table-column
-          prop="wagonWeight"
-          label="标重"
-          align="center"
-          width="150px"
-        >
-          <template slot-scope="scope">
-            <el-input v-model.number="scope.row.wagonWeight" placeholder="标重">
-            </el-input>
-          </template>
-        </el-table-column>
         <el-table-column
           prop="wagonBillWeight"
           label="计费吨位"
@@ -318,6 +307,14 @@ export default {
         {
           value: "收货单位",
           lable: "收货单位"
+        },
+        {
+          value: "车皮号",
+          lable: "车皮号"
+        },
+        {
+          value: "到站",
+          lable: "到站"
         }
       ],
       input: null,
@@ -419,6 +416,19 @@ export default {
     onclick() {
       let startTime = null;
       let endTime = null;
+      let wagonNo = null;
+      let consigneeName = null;
+      let sendStation = null;
+      let toTheStation = null;
+      if (this.screen == "发站") {
+        sendStation = this.input;
+      } else if (this.screen == "到站") {
+        toTheStation = this.input;
+      } else if (this.screen == "收货单位") {
+        consigneeName = this.input;
+      } else if (this.screen == "车皮号") {
+        wagonNo = this.input;
+      }
       if (this.startTime && this.endTime) {
         startTime = sjTime(this.startTime);
         endTime = sjTime(this.endTime);
@@ -428,7 +438,15 @@ export default {
           "/api/v1/oms/getWagonShippingDetails?startTime=" +
             startTime +
             "&endTime=" +
-            endTime
+            endTime +
+            "&wagonNo=" +
+            wagonNo +
+            "&consigneeName=" +
+            consigneeName +
+            "&toTheStation=" +
+            toTheStation +
+            "&sendStation=" +
+            sendStation
         )
         .then(res => {
           this.tableData = res.data.data;
@@ -450,6 +468,8 @@ export default {
     },
     //刷新
     refresh() {
+      this.screen = null;
+      this.input = null;
       this.getRequestUrl();
     },
     //筛选发站
@@ -460,6 +480,10 @@ export default {
     filterType(value, row, column) {
       return row.orderType === value;
     },
+    //筛选是否入库数据
+    filterDeleted(value, row, column) {
+      return row.wgmDelete === value;
+    },
     //将合计行置顶
     showSummariesPosition() {
       const table = document.querySelector(".table");