修改入库作业和新增预留作业

build/utils.js

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

config/index.js

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

src/views/SporadicManage/components/sporadicMaterial/transportAppoint/addSporadicTransportAppoint.vue

@@ -289,9 +289,6 @@ export default {
         },{
           value:13,
           label:'出厂'
-        },{
-          value:20,
-          label:'内转(新区-老区)'
         }
       ],
       orderType:12,
@@ -555,7 +552,7 @@ export default {
     ondrawer(num) {
       if(getCookie("orgCode") == "biemeierchejian"){
         this.line.requestUrl =
-          "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&con=" + "二厂：零星单拼出厂" 
+          "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&con=" + "二厂-总厂：采购内转燃料路线" 
       }else{
         this.line.requestUrl =
           "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3" + "&t=" + new Date();

src/views/TMS/components/importedFuel/transportReserveRanAdd.vue

@@ -2,7 +2,24 @@
   <!-- 新增运输作业页面 -->
   <div id="contractDetails">
     <page-title>运输预约</page-title>
+    <div class="orderType from">
+      <span class="text">订单类别：</span>
+      <el-select
+        class="select"
+        v-model="orderType"
+        placeholder="请选择"
 
+      >
+        <el-option
+          v-for="item in orderTypeList"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        >
+        </el-option>
+      </el-select>
+      <span class="span"></span>
+    </div>
     <div class="material from">
       <span class="text">物资：</span>
       <el-input class="input" v-model="materialName" disabled> </el-input>
@@ -34,24 +51,6 @@
       <el-input class="input" v-model="purchaseOrderNo" disabled> </el-input>
       <el-button type="primary" @click="ondrawer(6)">浏览</el-button>
     </div>
-    <div class="orderType from">
-      <span class="text">订单类别：</span>
-      <el-select
-        class="select"
-        v-model="orderType"
-        placeholder="请选择"
-        disabled
-      >
-        <el-option
-          v-for="item in orderTypeList"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"
-        >
-        </el-option>
-      </el-select>
-      <span class="span"></span>
-    </div>
     <div class="contractTitle from">
       <dil-form :formId="219" v-model="form1"></dil-form>
     </div>
@@ -368,11 +367,11 @@ export default {
               this.remark = res.data.data.remark;
               this.purchaseOrderId = res.data.data.purchaseOrderId;
               this.purchaseOrderNo = res.data.data.purchaseOrderNo;
-              if (res.data.data.receiveUnitId == 1) {
-                this.orderType = 6;
-              } else {
-                this.orderType = 7;
-              }
+              // if (res.data.data.receiveUnitId == 1) {
+              //   this.orderType = 6;
+              // } else {
+              //   this.orderType = 7;
+              // }
             }
           } else {
             this.$message.error("请求失败");
@@ -495,7 +494,7 @@ export default {
           "/api/v1/uc/getUnloadingMesByLike?apiId=374&i=" + new Date();
       } else if (num == 5) {
         this.line.requestUrl =
-          "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&i=" + new Date();
+          "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&i=" + new Date() + "&con=" + "燃料";
       } else if (num == 6) {
         this.purchaseOrder.requestUrl =
           "/api/v1/ams/getPurchaseOrderList?apiId=81&sendCompId=" +
@@ -567,6 +566,12 @@ export default {
             type: "warning",
           });
           return;
+        } else if (!this.orderType) {
+          this.$message({
+            message: "请选择订单类别!",
+            type: "warning",
+          });
+          return;
         } else if (!this.supplierId) {
           this.$message({
             message: "请选择发货单位!",

src/views/TMS/components/purchaseChemicalMaterials/transportationReservationAdd.vue

@@ -2,7 +2,23 @@
   <!-- 新增运输作业页面 -->
   <div id="contractDetails">
     <page-title>运输预约</page-title>
-
+    <div class="orderType from">
+      <span class="text">订单类别：</span>
+      <el-select
+        class="select"
+        v-model="orderType"
+        placeholder="请选择"
+      >
+        <el-option
+          v-for="item in orderTypeList"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        >
+        </el-option>
+      </el-select>
+      <span class="span"></span>
+    </div>
     <div class="material from">
       <span class="text">物资：</span>
       <el-input class="input" v-model="materialName" disabled> </el-input>
@@ -34,24 +50,6 @@
       <el-input class="input" v-model="purchaseOrderNo" disabled> </el-input>
       <el-button type="primary" @click="ondrawer(6)">浏览</el-button>
     </div>
-    <div class="orderType from">
-      <span class="text">订单类别：</span>
-      <el-select
-        class="select"
-        v-model="orderType"
-        placeholder="请选择"
-        disabled
-      >
-        <el-option
-          v-for="item in orderTypeList"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"
-        >
-        </el-option>
-      </el-select>
-      <span class="span"></span>
-    </div>
     <div class="contractTitle from">
       <dil-form :formId="219" v-model="form1"></dil-form>
     </div>
@@ -372,11 +370,11 @@ export default {
               this.remark = res.data.data.remark;
               this.purchaseOrderId = res.data.data.purchaseOrderId;
               this.purchaseOrderNo=res.data.data.purchaseOrderNo;
-              if (res.data.data.receiveUnitId == 1) {
-                this.orderType = 17;
-              } else {
-                this.orderType = 18;
-              }
+              // if (res.data.data.receiveUnitId == 1) {
+              //   this.orderType = 17;
+              // } else {
+              //   this.orderType = 18;
+              // }
             }
           } else {
             this.$message.error("请求失败");
@@ -443,10 +441,9 @@ export default {
       } else if (num == 4) {
         this.unloadPoint.requestUrl = "/api/v1/uc/getUnloadingMesByLike?apiId=374&i=" + new Date();
       } else if (num == 5) {
-        this.line.requestUrl ="/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&i=" + new Date();
+        this.line.requestUrl ="/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&i=" + new Date() + "&con=化工材料";
       }else if (num == 6) {
-        this.purchaseOrder.requestUrl = "/api/v1/ams/getPurchaseOrderList?apiId=81" + "&sendCompId=" +
-          this.supplierId + "&i=" + new Date();
+        this.purchaseOrder.requestUrl = "/api/v1/ams/getPurchaseOrderList?apiId=81&i=" + new Date();
       }
       
     },
@@ -513,6 +510,12 @@ export default {
             type: "warning",
           });
           return;
+        } else if (!this.orderType) {
+          this.$message({
+            message: "请选择订单类别!",
+            type: "warning",
+          });
+          return;
         } else if (!this.supplierId) {
           this.$message({
             message: "请选择发货单位!",

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

@@ -10,9 +10,12 @@
       <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">
+      <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)">
@@ -33,6 +36,8 @@ export default {
       options:{
         // first请求数据的地址
         requestUrl: "/api/v1/wms/getWmsInboundResult?apiId=371",
+        selectionType: "select",
+        mapList: [],
       },
     }
   },
@@ -43,6 +48,62 @@ export default {
     },
     onclick(){
       console.log("点击事件");
+    },
+    selectionChange(selection) {
+      this.options.mapList = selection;
+    },
+    onreserved(){
+      console.log("fahaahahahaha")
+      if (this.options.mapList.length == 0) {
+        this.$message({
+          type: "warning",
+          message: "请先选择入库单!",
+        });
+      } else {
+        this.$confirm("是否预留", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+          center: true,
+        })
+          .then(() => {
+            //初始化maplist
+            var mapList = [];
+            this.options.mapList.forEach((item, i) => {
+              //初始化mapItem
+              var mapItem = {
+                //入库实绩表id
+                inboundId: 0,
+                // 给一个标记定义其为入库变为预留
+                status: 0,
+              };
+              mapItem.inboundId = item.inboundId;
+              mapList.push(mapItem);
+            });
+            this.$message({
+              type: "success",
+              message: "预留成功!",
+            });
+            console.log(mapList)
+            this.axios.post("/api/v1/wms/changeReserved", mapList).then((res) => {
+              console.log("res.data"+res.data)
+              if (res.data >= 1) {
+                //改变查询条件
+                this.$refs.table.setDataRequestQuery({
+                  
+                });  
+                this.$router.go(0);
+              }
+            });
+            console.log("fdagfaahh")
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "取消上传!",
+            });
+          });
+      }
     }
   }
 }

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

@@ -0,0 +1,121 @@
+//查询预留
+<template>
+  <div class="steel_inbound">
+    <div class="sache">
+      <el-input
+        placeholder="请输入内容"
+        v-model="inputText"
+        clearable>
+      </el-input>
+      <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>
+</template>
+
+<script>
+export default {
+  data(){
+    return{
+      inputText:"",
+      options:{
+        // first请求数据的地址
+        requestUrl: "/api/v1/wms/getWmsReservedResult?apiId=371",
+        selectionType: "select",
+        mapList: [],
+      },
+    }
+  },
+  methods:{
+    inboundDetails(scope){
+      	this.$router.push("/inboundDetails/" + scope.row.inboundId)
+      	
+    },
+    onclick(){
+      console.log("点击事件");
+    },
+    selectionChange(selection) {
+      this.options.mapList = selection;
+    },
+    onreserved(){
+      console.log("fahaahahahaha")
+      if (this.options.mapList.length == 0) {
+        this.$message({
+          type: "warning",
+          message: "请先选择入库单!",
+        });
+      } else {
+        this.$confirm("是否预留", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+          center: true,
+        })
+          .then(() => {
+            //初始化maplist
+            var mapList = [];
+            this.options.mapList.forEach((item, i) => {
+              //初始化mapItem
+              var mapItem = {
+                //入库实绩表id
+                inboundId: 0,
+                // 给一个标记定义其为预留变为入库
+                status: 1,
+              };
+              mapItem.inboundId = item.inboundId;
+              mapList.push(mapItem);
+            });
+            this.$message({
+              type: "success",
+              message: "预留成功!",
+            });
+            console.log(mapList)
+            this.axios.post("/api/v1/wms/changeReserved", mapList).then((res) => {
+              console.log("res.data"+res.data)
+              if (res.data >= 1) {
+                //改变查询条件
+                this.$refs.table.setDataRequestQuery({
+                  
+                });  
+                this.$router.go(0);
+              }
+            });
+            console.log("fdagfaahh")
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "取消上传!",
+            });
+          });
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scode>
+.steel_inbound{
+  .sache{
+    height: 5rem;
+    display: flex;
+    align-items: center;
+    padding-left: 1.875rem;
+  }
+}
+</style>

src/views/WMS/router/index.js

@@ -27,6 +27,7 @@ import insertTransfer from '../components/steel/insertTransfer.vue'
 import steel_check from '../components/steel/steel_check.vue'
 import steel_close from '../components/steel/steel_close.vue'
 import steel_inbound from '../components/steel/steel_inbound.vue'
+import steel_reserved from '../components/steel/steel_reserved.vue'
 import steel_outbound from '../components/steel/steel_outbound.vue'
 import steel_real from '../components/steel/steel_real.vue'
 import steel_realDown from '../components/steel/steel_realDown.vue'
@@ -68,6 +69,7 @@ const constantRouterMap = [
 		{path: 'steel_check', name: 'steel_check', meta: {code: 'xtpzgl-yhgl'}, component: steel_check},
 		{path: 'steel_close', name: 'steel_close', meta: {code: 'xtpzgl-yhgl'}, component: steel_close},
 		{path: 'steel_inbound', name: 'steel_inbound', meta: {code: 'xtpzgl-yhgl'}, component: steel_inbound},
+		{path: 'steel_reserved', name: 'steel_reserved', meta: {code: 'xtpzgl-yhgl'}, component: steel_reserved},
 		{path: 'steel_outbound', name: 'steel_outbound', meta: {code: 'xtpzgl-yhgl'}, component: steel_outbound},
 		{path: 'steel_real', name: 'steel_real', meta: {code: 'xtpzgl-yhgl'}, component: steel_real},
 		{path: 'steel_realDown/gridId', name: 'steel_realDown', meta: {code: 'xtpzgl-yhgl'}, component: steel_realDown},

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

@@ -2,8 +2,8 @@
 <template>
   <div class="addInwardPlan">
     <page-title>新增计划</page-title>
-<div class="form-box">
-<el-form  class="demo-form-inline"  label-width="80px" label-position="left">
+  <div class="carrier form">
+  <el-form  class="demo-form-inline"  label-width="80px" label-position="left">
   <el-form-item label="承运商">
     <el-autocomplete
       class="inline-input"
@@ -19,11 +19,13 @@
   </template>
     </el-autocomplete>
   </el-form-item>
-  <el-form  class="demo-form-inline"  label-width="80px" label-position="left">
-  <el-form-item label="车数">
+  <div class="truckNum">
+    <el-form  class="demo-form-inline"  label-width="80px" label-position="left">
+    <el-form-item label="车数">
     <el-input   v-model="planTruckNumber" placeholder="必填" class="input"></el-input>
-  </el-form-item>
+    </el-form-item>
   </el-form>
+  </div>
 </el-form>
 </div>
     <template>
@@ -139,11 +141,11 @@ export default {
 
 <style lang="scss" scoped>
 .addInwardPlan{
-.form-box{
+.carrier{
   display: inline-block !important;
   margin-left: 38%;
   .el-input{
-    width:288px
+    width:250px
   }
   .input{
     margin-left: -10px;
@@ -152,8 +154,15 @@ export default {
     padding: 10px;  
   }
 }
+.truckNum {
+  .el-input{
+    width: 250px;
+  }
+}
 .button-box
 {
+  display: flex;
+  justify-content: center;
   margin-left: 25px !important;
 }
 }

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

@@ -96,12 +96,14 @@ export default {
   },
   methods: {
     func(res){
+        console.log("-----");
         console.log(res.list)
+        console.log("-----");
         res.list.forEach(e => {
-            if(e.enable = "未启用"){
-               this.startStop = "启用"
+            if(e.enable == "未启用"){
+               this.startStop = "停用"
             }else{
-               this.enable = "停用"
+               this.startStop = "停用"
             }
         });
     },

src/views/inward/components/truckOrder/addPurInwardOrder.vue

@@ -12,7 +12,7 @@
     </div>
     <!-- 表单选择车辆-->
     <div class="from">
-       <div class="line">
+        <div class="line">
         <span class="text">线路</span>
         <el-input
           v-model="lineName"
@@ -21,6 +21,18 @@
         ></el-input>
         <el-button type="primary" @click="onClick(1)">浏览</el-button>
       </div>
+      <div class="orderType">
+        <span class="text">订单类型</span>
+        <el-select v-model="orderType" placeholder="请选择">
+        <el-option
+          v-for="item in orderTypeList"
+          :key="item.value"
+          :label="item.label" 
+          :value="item.value"
+        >
+        </el-option>
+      </el-select>
+      </div>
       <div class="vehicle">
         <span class="text">车辆</span>
         <el-button type="primary" @click="onClick(2)">浏览</el-button>
@@ -170,6 +182,17 @@ export default {
         requestUrl: "",
         selectionType: "radio",
       },
+      //订单类型
+      orderTypeList:[
+        {
+          value:10,
+          label:'采购内转(铁专线-新区)'
+        },{
+          value:20,
+          label:'采购内转(铁专线-老区)'
+          }
+      ],
+      orderType:null,
       //已经选择车辆物资信息
       selectionList:[],
       //销售订单物资信息
@@ -241,7 +264,7 @@ export default {
         this.axios.post('/api/v1/oms/addPurInwardOrder',{
           materialId:this.materialId,
           lineId:this.lineId,
-          orderType:10,
+          orderType:this.orderType,
           orderId:this.orderId,
           planId:this.planId,
           mapList:this.selectionList,
@@ -363,6 +386,17 @@ export default {
       }
     }
   }
+  .orderType{
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin-top: 20px;
+    margin-right: 130px;
+    .el-select {
+      padding-left: 10px;
+    }
+    
+  }
   .tablecls{
     margin-top: 20px;
   }

src/views/inward/components/truckOrder/decomposePlan.vue

@@ -286,21 +286,18 @@ export default {
   }
 }
 .box-form{
-  display: inline-block !important;
-  padding-left: 38%;
-  .el-form-item{
-  display: flex;
-  padding: 10px;
-  .el-form-item__label{
-    width: 80px !important;
-  }
-  .el-input{
-    width:288px
-  }
+  // display: flex;
+  // justify-content: center;
+  padding-left: 40.5%;
+  margin-right: 100px;
+  .el-form-item__content {
+    display: flex;
   }
 }
 .button-box{
- margin-left: 25px !important;
+  display: flex;
+  justify-content: center;
+  margin-left: 25px !important;
 }
 }