页面整合

build/utils.js

@@ -12,13 +12,12 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 // 指定开发模式下需要加载的模块（可以做到只加载当前模块，提高开发效率）
 // index模块（登录）为必须，all 为所有
 //    登录     合同                       首页       内转     排队   资源   销售                       零星物资
-// ['index','appoint'，'configManager','homepage','inward','queue','RMS','sale','serviceManager','SporadicManage'
+// ['index','appoint'，'configManager','homepage',''inward,'queue','RMS','sale','serviceManager','SporadicManage'
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow']
-// let devModules = ['index','WMS']
 let devModules = ['all']
-// let devModules = ['index','appoint','TMS','statisticalReport','RMS','sale'];
-// let devModules = ['index','WMS','sale','appoint'];
+// let devModules = ['index','TMS','statisticalReport','RMS','sale','appoint'];
+// let devModules = ['index','appoint','WMS'];
 if (pathSrc.indexOf('node_modules') > -1) {
     devModules = require('../../../cors.js').devModules;
 }

config/index.js

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

src/views/TMS/components/domesticMine/approveWagonPleaseAdd.vue

@@ -1,13 +1,7 @@
 <template>
   <!-- 新增批车作业页面 -->
   <div id="contractDetails">
-    <page-title>批车作业</page-title>
-
-    <div class="main">
-      <span class="text">选择已下发请车作业</span>
-      <span class="a"></span>
-    </div>
- 
+    <page-title>返回</page-title>
   <div>
       <dilTable
         v-bind.sync="option"
@@ -16,16 +10,11 @@
         ref="table"
         @radio-change="currentRadioChange"
       >
-    
       </dilTable>
     </div>
-    <div class="main">
-      <span class="text">新增批车作业</span>
-      <span class="a"></span>
-    </div>
     <div class="contractTitle">
-      <div class="form-box">
-        <div class="form-one">
+      <div class="form">
+        <div class="form_box">
           <dil-form :formId="105" v-model="form1"></dil-form>
         </div>
       </div>
@@ -33,11 +22,9 @@
     <div class="button-box">
       <el-button @click="onClickCancel">返回</el-button>
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
-      
     </div>
   </div>
 </template>
-
 <script>
 import PageTitle from "@/components/Page/Title";
 export default {
@@ -112,6 +99,45 @@ export default {
   },
 };
 </script>
-<style lang="scss" scoped>
+<style lang="scss">
 // @import "@/styles/appoint/contract/ContractInsert.scss";
+#contractDetails{
+  .form {
+    display: flex;
+    .form_box {
+      width: 240px;
+      margin-left: 35%;
+      margin-top: 30px;
+      margin-right: 22px;
+      .el-form {
+        .preview-group {
+     }
+    }
+  }          .el-form-item {
+            .el-form-item__label {
+              display: inline-block;
+              width: 70px !important;    
+              padding-right: 200px;
+              margin-bottom: 0px;
+            }
+            .el-form-item__content {
+              .el-select {
+                width: 230px;
+              }
+              .el-input {
+                width: 160px;
+                margin-left: -300px;
+                padding-bottom: 0%;
+               
+              }
+            }
+          }
+        }
+ 
+  .button-box{
+    margin-top: 50px;
+    margin-left: 550px;
+    
+  }
+}
 </style>

src/views/TMS/components/domesticMine/entrustMine.vue

@@ -2,12 +2,12 @@
   <!-- 计量委托 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-input class="el-input" placeholder="请输入内容" v-model="input" clearable> </el-input>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
-      <el-button type="primary" @click="btnclick(0)">
-        <i class="el-icon-s-promotion"></i>发送
+      <el-button type="primary" class="btn1" @click="btnclick(0)">
+        <i class="el-icon-success"></i>发送
       </el-button>
     </div>
     <dilTable v-bind.sync="option" @selection-change="selectionChange">
@@ -71,7 +71,19 @@ export default {
 <style lang='scss'>
 .homeworkPath {
   .top {
-    padding: 1.25rem 1.875rem;
+     padding: 1.25rem 0.375rem;
+     .el-input{
+       width: 20%;
+       margin-right: 40rpx;
+     }
+     .btn{
+       width: 5.5%;
+       margin-left: 0.25rem;
+     }
+     .btn1{
+       width: 7%;
+       margin-left: 00.375rem;
+     }
   }
 }
 </style>

src/views/TMS/components/domesticMine/wagonLoadAdd.vue

@@ -26,7 +26,8 @@
       <el-switch
         v-model="matching"
         active-color="#27d452"
-        inactive-color="#e1e3e6">
+        inactive-color="#e1e3e6"
+      >
       </el-switch>
       <span class="span"></span>
     </div>
@@ -43,12 +44,22 @@
     </div>
     <div class="remark from" v-if="matching">
       <span class="text">船名/备注：</span>
-      <el-input v-model="remark" @blur="onBlur" placeholder="可输入船名\备注重新匹配采购订单"> </el-input>
+      <el-input
+        v-model="remark"
+        @blur="onBlur"
+        placeholder="可输入船名\备注重新匹配采购订单"
+      >
+      </el-input>
       <span class="span"></span>
     </div>
     <div class="purchaseOrder from" v-if="matching">
       <span class="text">采购订单号：</span>
-      <el-input v-model="purchaseOrderNo" placeholder="请选择物资和发货单位" disabled> </el-input>
+      <el-input
+        v-model="purchaseOrderNo"
+        placeholder="请选择物资和发货单位"
+        disabled
+      >
+      </el-input>
       <span class="span"></span>
     </div>
 
@@ -66,7 +77,7 @@
       <el-input
         placeholder="请输入内容"
         v-model="inputText"
-        style="margin-top: 0.625rem; margin-left: 1.25rem"
+        style="margin-top: 0rem; margin-right: 0.1rem; width: 230px"
         clearable
       ></el-input>
       <el-button
@@ -142,12 +153,12 @@ export default {
       },
     };
   },
-  watch:{
-    matching(val){
-      if(val){
+  watch: {
+    matching(val) {
+      if (val) {
         this.getPurchaseOrderNo();
       }
-    }
+    },
   },
   created() {
     this.form1 = {
@@ -159,14 +170,14 @@ export default {
       this.input = null;
       this.materialName = selection.materialName;
       this.materialId = selection.materialId;
-      if(this.matching){
+      if (this.matching) {
         this.getPurchaseOrderNo();
       }
     },
     currentRadioChange2(selection) {
       this.supplierName = selection.supplierName;
       this.supplierId = selection.supplierId;
-      if(this.matching){
+      if (this.matching) {
         this.getPurchaseOrderNo();
       }
     },
@@ -180,12 +191,12 @@ export default {
       }
     },
     onBlur() {
-      if(this.matching){
+      if (this.matching) {
         this.getPurchaseOrderNo();
       }
     },
     getPurchaseOrderNo() {
-      console.log(this.matching)
+      console.log(this.matching);
       let map = {
         materialId: this.materialId,
         supplierId: this.supplierId,
@@ -264,12 +275,12 @@ export default {
         if (this.input.length == 7) {
           this.list.push(this.input);
           this.input = "";
-        } else if (this.input.length < 7){
+        } else if (this.input.length < 7) {
           this.$message({
             type: "warning",
             message: "车皮号长度不足7位数，请重新输入！",
           });
-        } else if (this.input.length > 7){
+        } else if (this.input.length > 7) {
           this.$message({
             type: "warning",
             message: "车皮号长度超过7位数，请重新输入！",
@@ -297,41 +308,41 @@ export default {
             message: "请输入车皮号！",
           });
         } else {
-            if (this.form1.sendStationId) {
-              if (this.form1.arrivalStationId) {
-                if (this.form1.resultLoadingDate) {
-                  if(this.supplierId){
-                    if(this.materialId){
-                    }else{
-                      this.$message({
-                        type: "warning",
-                        message: "请选择物资",
-                      });
-                    }
-                  }else{
+          if (this.form1.sendStationId) {
+            if (this.form1.arrivalStationId) {
+              if (this.form1.resultLoadingDate) {
+                if (this.supplierId) {
+                  if (this.materialId) {
+                  } else {
                     this.$message({
                       type: "warning",
-                      message: "请选择发货单位",
+                      message: "请选择物资",
                     });
                   }
                 } else {
                   this.$message({
                     type: "warning",
-                    message: "请选择装车时间！",
+                    message: "请选择发货单位",
                   });
                 }
               } else {
                 this.$message({
                   type: "warning",
-                  message: "请选择到站！",
+                  message: "请选择装车时间！",
                 });
               }
             } else {
               this.$message({
                 type: "warning",
-                message: "请选择发站！",
+                message: "请选择到站！",
               });
             }
+          } else {
+            this.$message({
+              type: "warning",
+              message: "请选择发站！",
+            });
+          }
         }
       }
       if (state == 1) {
@@ -342,21 +353,21 @@ export default {
           resultLoadingDate: sjTime(this.form1.resultLoadingDate),
           resultRemarks: this.form1.resultRemarks,
           resultType: 3,
-          sendUnitId:this.supplierId,
-          materialId:this.materialId,
+          sendUnitId: this.supplierId,
+          materialId: this.materialId,
         };
-        if(this.matching){
-          map = { 
+        if (this.matching) {
+          map = {
             wagonNoList: this.list,
             sendStationId: this.form1.sendStationId,
             arrivalStationId: this.form1.arrivalStationId,
             resultLoadingDate: sjTime(this.form1.resultLoadingDate),
             resultRemarks: this.form1.resultRemarks,
             resultType: 3,
-            sendUnitId:this.supplierId,
-            materialId:this.materialId,
+            sendUnitId: this.supplierId,
+            materialId: this.materialId,
             purchaseOrderRailPlanId: this.purchaseOrderId,
-          }
+          };
         }
         this.axios
           .post("/api/v1/tms/addDomesticLoadResult", map)
@@ -381,19 +392,20 @@ export default {
 <style lang='scss'>
 .addWagonLoad {
   color: #606266;
-  font-size: 0.875rem;
-  font-weight: 600;
+  font-size: 0.675rem;
+  font-weight: 500;
   .cp {
-    width: 100%;
+    width: 49%;
     display: flex;
     justify-content: center;
     align-items: center;
     padding-top: 0.625rem;
     padding-bottom: 0.625rem;
+    margin-left: 364px;
     .cp_title {
       .cp_top {
         width: 3.125rem;
-        padding-right: 1.25rem;
+        padding-right: 1.55rem;
       }
     }
   }
@@ -427,16 +439,16 @@ export default {
       }
     }
   }
-  .matching{
+  .matching {
     width: 100%;
     height: 3.125rem;
     display: flex;
     justify-content: center;
     align-items: center;
-    .text{
+    .text {
       width: 8.75rem;
     }
-    .span{
+    .span {
       display: inline-block;
       width: 310px;
       height: 0.0625rem;
@@ -447,6 +459,8 @@ export default {
     justify-content: center;
     align-items: center;
     height: 3.75rem;
+    margin-left: 27rem;
+    width: 20rem;
     .text {
       text-align: right;
       width: 8.125rem;
@@ -457,6 +471,8 @@ export default {
     justify-content: center;
     align-items: center;
     height: 3.75rem;
+    margin-left: 27rem;
+    width: 20rem;
     .text {
       text-align: right;
       width: 8.125rem;
@@ -471,18 +487,20 @@ export default {
       text-align: right;
       width: 5.625rem;
     }
-    .span{
+    .span {
       display: inline-block;
-      width: 1.875rem;height: 1.25rem;
+      width: 1.875rem;
+      height: 1.25rem;
     }
   }
-  .purchaseOrder{
+  .purchaseOrder {
     display: flex;
     justify-content: center;
     align-items: center;
-    .span{
+    .span {
       display: inline-block;
-      width: 1.875rem;height: 0.0625rem;
+      width: 1.875rem;
+      height: 0.0625rem;
     }
   }
   .form {
@@ -494,6 +512,7 @@ export default {
   .button-box {
     display: flex;
     justify-content: center;
+    padding-top: 30px;
   }
 }
 </style>

src/views/TMS/components/domesticMine/wagonLoadMine.vue

@@ -2,7 +2,7 @@
   <!-- 装车作业页面 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-input class="el-input" placeholder="请输入内容" v-model="input" clearable> </el-input>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -94,7 +94,15 @@ export default {
 <style lang='scss' scoped>
 .homeworkPath {
   .top {
-    padding: 1.25rem 1.875rem;
+     padding: 1.25rem 0.375rem;
+     .el-input{
+       width: 20%;
+       margin-right: 40rpx;
+     }
+     .btn{
+       width: 5.5%;
+       margin-left: 0.25rem;
+     }
   }
 }
 </style>

src/views/TMS/components/domesticMine/wagonPleaseAdd.vue

@@ -1,25 +1,18 @@
 <template>
   <!-- 新增请作业页面 -->
   <div id="contractDetails">
-    <page-title>请车作业</page-title>
-    <div class="main">
-      <span class="text">新增请车作业</span>
-      <span class="a"></span>
-    </div>
-    <div class="contractTitle">
-      <div class="form-box">
-        <div class="form-one">
-          <dil-form :formId="122" v-model="form1" ></dil-form>
-        </div>
+    <page-title>返回</page-title>
+    <div class="form">
+      <div class="form_box">
+        <dil-form :formId="122" v-model="form1"></dil-form>
       </div>
     </div>
     <div class="button-box">
       <el-button @click="onClickCancel">返回</el-button>
-      <el-button type="primary" @click="onClickConfirm" >确认</el-button>
+      <el-button type="primary" @click="onClickConfirm">确认</el-button>
     </div>
   </div>
 </template>
-
 <script>
 import PageTitle from "@/components/Page/Title";
 
@@ -38,12 +31,12 @@ export default {
     handleCheckedCitiesChange(value) {
       console.log(value);
     },
-    
+
     // 返回
     onClickCancel() {
       this.$router.go(-1);
     },
-     // 确认
+    // 确认
     onClickConfirm() {
       let tmstrainPleaseApproveResult = {
         resultPlanDate: sjTime(this.form1.resultPlanDate),
@@ -52,7 +45,7 @@ export default {
         sendStationId: this.form1.sendStationId,
         toTheStationId: this.form1.toTheStationId,
         resultPleaseNumber: this.form1.resultPleaseNumber,
-        resultType: 3
+        resultType: 3,
       };
       function isNumber() {
         var value = tmstrainPleaseApproveResult.resultPleaseNumber;
@@ -66,29 +59,67 @@ export default {
       }
       var val = this.value;
       if (
-        tmstrainPleaseApproveResult.resultPlanDate==null||
-        tmstrainPleaseApproveResult.resultCategory==null||
-        tmstrainPleaseApproveResult.shipperId==null||
-        tmstrainPleaseApproveResult.sendStationId==null||
-        tmstrainPleaseApproveResult.toTheStationId==null||
-        tmstrainPleaseApproveResult.resultPleaseNumber==null
-      ) this.$message.error("存在空值！");
+        tmstrainPleaseApproveResult.resultPlanDate == null ||
+        tmstrainPleaseApproveResult.resultCategory == null ||
+        tmstrainPleaseApproveResult.shipperId == null ||
+        tmstrainPleaseApproveResult.sendStationId == null ||
+        tmstrainPleaseApproveResult.toTheStationId == null ||
+        tmstrainPleaseApproveResult.resultPleaseNumber == null
+      )
+        this.$message.error("存在空值！");
+      else if (!isNumber(val)) this.$message.error("请车数量必须是数字！");
       else
-      if (!isNumber(val)) this.$message.error("请车数量必须是数字！");
-      else
-      this.axios
-        .post("/api/v1/tms/addWagonPlease", tmstrainPleaseApproveResult)
-        .then(() => {
-          this.$message({
-            type: "success",  
-            message: "新增成功!",
+        this.axios
+          .post("/api/v1/tms/addWagonPlease", tmstrainPleaseApproveResult)
+          .then(() => {
+            this.$message({
+              type: "success",
+              message: "新增成功!",
+            });
+            this.$router.go(-1);
           });
-          this.$router.go(-1);
-        });
     },
   },
 };
 </script>
 <style lang="scss" scoped>
-// @import "@/styles/appoint/contract/ContractInsert.scss";
+#contractDetails{
+  .form {
+    display: flex;
+    .form_box {
+      width: 240px;
+      margin-left: 35%;
+      margin-top: 30px;
+      margin-right: 22px;
+      .el-form {
+        .preview-group {
+     }
+    }
+  }          .el-form-item {
+            .el-form-item__label {
+              display: inline-block;
+              width: 70px !important;    
+              padding-right: 200px;
+              margin-bottom: 0px;
+            }
+            .el-form-item__content {
+              .el-select {
+                width: 230px;
+              }
+              .el-input {
+                width: 160px;
+                margin-left: -300px;
+                padding-bottom: 0%;
+               
+              }
+            }
+          }
+        }
+ 
+  .button-box{
+    margin-top: 50px;
+    margin-left: 550px;
+    
+  }
+}
 </style>

src/views/TMS/components/domesticMine/wagonPleaseMine.vue

@@ -2,12 +2,12 @@
   <!-- 请车作业页面 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-input class="el-input" placeholder="请输入内容" v-model="input" clearable> </el-input>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
       <el-button type="primary" @click="insertClick">
-        <i class="el-icon-plus"></i>新增
+      <i class="el-icon-circle-plus-outline"></i>新增
       </el-button>
     </div>
     <el-tabs v-model="activeName">
@@ -145,7 +145,15 @@ export default {
 <style lang='scss' scoped>
 .homeworkPath {
   .top {
-    padding: 1.25rem 1.875rem;
+     padding: 1.25rem 0.375rem;
+     .el-input{
+       width: 20%;
+       margin-right: 40rpx;
+     }
+     .btn{
+       width: 5.5%;
+       margin-left: 0.25rem;
+     }
   }
 }
 </style>

src/views/TMS/components/domesticMine/wagonUnLoadAdd.vue

@@ -1,9 +1,9 @@
 <template>
   <!-- 添加车皮卸车实绩 -->
   <div class="addWagonLoad">
-    <page-title>新增</page-title>
+    <page-title>返回</page-title>
     <div class="main">
-      <el-divider content-position="left">选择已装车实绩</el-divider>
+      <el-divider content-position="left"></el-divider>
     </div>
     <div>
       <dilTable
@@ -13,9 +13,11 @@
       >
       </dilTable>
     </div>
-    <el-divider content-position="left">车皮卸车实绩</el-divider>
-    <div class="form-box" style="margin-right: 10rem">
-      <dil-form :formId="255" v-model="form1" ref="from1"></dil-form>
+    <!-- <el-divider content-position="left">车皮卸车实绩</el-divider> -->
+    <div class="form">
+      <div class="form_box" style="margin-right: 10rem">
+        <dil-form :formId="255" v-model="form1" ref="from1"></dil-form>
+      </div>
     </div>
     <div class="button-box">
       <el-button @click="cancel">取消</el-button>
@@ -25,7 +27,6 @@
 </template>
 <script>
 import PageTitle from "@/components/Page/Title";
-
 export default {
   components: { PageTitle },
   data() {
@@ -56,7 +57,7 @@ export default {
     },
     // 确定
     makeSure() {
-      console.log(this.list)
+      console.log(this.list);
       let tmstrainWagonUnloadResult = {
         wagonNoList: this.list,
         resultArrivalDate: sjTime(this.form1.resultArrivalDate),
@@ -97,5 +98,50 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
-
+.addWagonLoad {
+  .form {
+    display: flex;
+    .form_box {
+      width: 320px;
+      margin-left: 35%;
+      margin-top: 30px;
+      margin-right: 22px;
+      .el-form {
+        .preview-group {
+          .el-form-item {
+            .el-form-item__label {
+              display: inline-block;
+              width: 70px !important;
+            }
+            .el-form-item__content {
+              .el-select {
+                width: 250px;
+              }
+              .el-input {
+                width: 220px;
+              }
+            .el-textarea{
+                .el-textarea__inner {
+                  display: block;
+                  resize: vertical;
+                  padding: 5px 13px;
+                  line-height: 1.5;
+                  width: 70%;
+                  border-radius: 4px;
+                  margin-left: 56px;
+                  margin-top: -25px;
+    
+                }
+             }  
+            }
+          }
+        }
+      }
+    }
+  }
+  .button-box{
+    margin-top: 50px;
+    margin-left: 600px;
+  }
+}
 </style>

src/views/TMS/components/domesticMine/wagonUnLoadMine.vue

@@ -2,7 +2,7 @@
   <!-- 卸车作业页面 -->
   <div class="homeworkPath">
     <div class="top">
-       <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+       <el-input class="el-input" placeholder="请输入内容" v-model="input" clearable> </el-input>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -86,7 +86,15 @@ export default {
 <style lang='scss' scoped>
 .homeworkPath {
   .top {
-    padding: 1.25rem 1.875rem;
+     padding: 1.25rem 0.375rem;
+     .el-input{
+       width: 20%;
+       margin-right: 40rpx;
+     }
+     .btn{
+       width: 5.5%;
+       margin-left: 0.25rem;
+     }
   }
 }
 </style>

src/views/TMS/components/importedEmergency/addWagonLoadEmergency.vue

@@ -44,7 +44,7 @@
       <el-button type="primary" @click="ondrawer(4)">浏览</el-button>
     </div>
     <div class="form">
-      <div class="form-box" style="margin-right: 10rem">
+      <div class="form_box" style="margin-right: 10rem">
         <dil-form :formId="254" v-model="form1" ref="from1"></dil-form>
       </div>
     </div>
@@ -377,17 +377,21 @@ export default {
 </script>
 <style lang='scss'>
 .addWagonLoad {
+  color: #606266;
+  font-size: 0.675rem;
+  font-weight: 500;
   .cp {
-    width: 100%;
+    width: 49%;
     display: flex;
     justify-content: center;
     align-items: center;
     padding-top: 0.625rem;
     padding-bottom: 0.625rem;
+    margin-left: 364px;
     .cp_title {
       .cp_top {
         width: 3.125rem;
-        padding-right: 1.25rem;
+        padding-right: 1.55rem;
       }
     }
   }
@@ -421,11 +425,28 @@ export default {
       }
     }
   }
+  .matching {
+    width: 100%;
+    height: 3.125rem;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    .text {
+      width: 8.75rem;
+    }
+    .span {
+      display: inline-block;
+      width: 310px;
+      height: 0.0625rem;
+    }
+  }
   .material {
     display: flex;
     justify-content: center;
     align-items: center;
     height: 3.75rem;
+    margin-left: 27rem;
+    width: 20rem;
     .text {
       text-align: right;
       width: 8.125rem;
@@ -436,6 +457,8 @@ export default {
     justify-content: center;
     align-items: center;
     height: 3.75rem;
+    margin-left: 27rem;
+    width: 20rem;
     .text {
       text-align: right;
       width: 8.125rem;
@@ -448,18 +471,66 @@ export default {
     height: 3.75rem;
     .text {
       text-align: right;
-      width: 60px;
+      width: 5.625rem;
+    }
+    .span {
+      display: inline-block;
+      width: 1.875rem;
+      height: 1.25rem;
+    }
+    .el-input{
+      width: 13.5rem;
+      margin-right: 2.375rem;
     }
   }
-  .form {
-    margin-top: 1.25rem;
+  .purchaseOrder {
     display: flex;
     justify-content: center;
-    padding-left: 9.375rem;
+    align-items: center;
+    .span {
+      display: inline-block;
+      width: 1.875rem;
+      height: 0.0625rem;
+    }
+  }
+  .form {
+   display: flex;
+    .form_box {
+      width: 340px;
+      margin-left: 37%;
+     
+      margin-right: 20px;
+      .el-form {
+        .preview-group {
+          .el-form-item {
+            .el-form-item__label {
+              display: inline-block;
+              width: 70px !important;
+            }
+            .el-form-item__content {
+              .el-select {
+                width: 250px;
+              }
+              .el-input {
+                width: 250px;
+              }
+              .el-textarea{
+                .el-textarea__inner{
+                  width: 220px;
+                  margin-left: 65px;
+                  margin-top: 0.03rem;
+                }
+              }
+            }
+          }
+        }
+      }
+    }
   }
   .button-box {
     display: flex;
     justify-content: center;
+    padding-top: 30px;
   }
 }
 </style>

src/views/TMS/components/importedEmergency/addWagonUnLoadEmergency.vue

@@ -1,11 +1,7 @@
 <template>
   <!-- 添加车皮卸车实绩 -->
   <div class="addWagonLoad">
-    <page-title>新增</page-title>
-
-    <div class="main">
-      <el-divider content-position="left">选择已装车实绩</el-divider>
-    </div>
+    <page-title>返回</page-title>
 
     <div>
       <dilTable
@@ -16,15 +12,15 @@
       </dilTable>
     </div>
 
-    <el-divider content-position="left">车皮卸车实绩</el-divider>
-     <div class="form-box" style="margin-right: 10rem">
-        <dil-form :formId="255" v-model="form1" ref="from1"></dil-form>
+  <div class="form">
+      <div class="form_box">
+         <dil-form :formId="255" v-model="form1" ></dil-form>
       </div>
-    <div class="button-box">
+    </div>
+    <div class="button_box">
       <el-button @click="cancel">取消</el-button>
       <el-button type="primary" @click="makeSure">确定</el-button>
     </div>
-    
   </div>
 </template>
 
@@ -36,10 +32,9 @@ export default {
   data() {
     return {
       form1: {},
-       option: {
+      option: {
         // 表格请求数据的地址
-        requestUrl:
-          "/api/v1/tms/getWagonNo/2?apiId=213",
+        requestUrl: "/api/v1/tms/getWagonNo/2?apiId=213",
         // 控制显示当选列
         selectionType: "select",
       },
@@ -49,14 +44,13 @@ export default {
   },
   mounted() {},
   methods: {
-    selectionChange(selection){
+    selectionChange(selection) {
       this.list = [];
-      selection.forEach(e => {
-        this.list.push(
-          {
-            resultWagonNo:e.resultWagonNo,
-            resultId:e.resultId
-          })
+      selection.forEach((e) => {
+        this.list.push({
+          resultWagonNo: e.resultWagonNo,
+          resultId: e.resultId,
+        });
       });
     },
     // 确定
@@ -69,37 +63,87 @@ export default {
         resultBigTicketWeight: this.form1.resultBigTicketWeight,
         resultRailHorizontalWeight: this.form1.resultRailHorizontalWeight,
         resultRemark: this.form1.resultRemark,
-        resultType: 2
+        resultType: 2,
       };
       console.log(tmstrainWagonUnloadResult);
-      if (tmstrainWagonUnloadResult.wagonNoList==null
-      ||tmstrainWagonUnloadResult.resultArrivalDate==null||
-      tmstrainWagonUnloadResult.resultUnloadTime==null||
-      tmstrainWagonUnloadResult.unloadingPointId==null||
-      tmstrainWagonUnloadResult.resultBigTicketWeight==null||
-      tmstrainWagonUnloadResult.resultRailHorizontalWeight==null
-      ) this.$message.error("存在空值！");
+      if (
+        tmstrainWagonUnloadResult.wagonNoList == null ||
+        tmstrainWagonUnloadResult.resultArrivalDate == null ||
+        tmstrainWagonUnloadResult.resultUnloadTime == null ||
+        tmstrainWagonUnloadResult.unloadingPointId == null ||
+        tmstrainWagonUnloadResult.resultBigTicketWeight == null ||
+        tmstrainWagonUnloadResult.resultRailHorizontalWeight == null
+      )
+        this.$message.error("存在空值！");
       else
-      this.axios
-        .post(
-          "/api/v1/tms/insertTmstrainWagonUnLoadResult",
-          tmstrainWagonUnloadResult
-        )
-        .then(() => {
-          this.$message({
-            type: "success",  
-            message: "新增成功!",
+        this.axios
+          .post(
+            "/api/v1/tms/insertTmstrainWagonUnLoadResult",
+            tmstrainWagonUnloadResult
+          )
+          .then((res) => {
+            if (res.data.code == "200") {
+              this.$message({
+                type: "success",
+                message: "新增成功!",
+              });
+            }
+            this.$router.go(-1);
           });
-          this.$router.go(-1);
-        });
     },
     // 取消
-    cancel() {
+    cancel(){
       this.$router.go(-1);
     },
   },
 };
 </script>
-<style lang='scss' scoped>
-
+<style lang='scss'>
+.addWagonLoad {
+  .form {
+    display: flex;
+    .form_box {
+      width: 340px;
+      margin-left: 35%;
+      margin-top: 30px;
+      margin-right: 20px;
+      .el-form {
+        .preview-group {
+          .el-form-item {
+            .el-form-item__label {
+              display: inline-block;
+              width: 70px !important;
+            }
+            .el-form-item__content {
+              .el-select {
+                width: 250px;
+              }
+              .el-input {
+                width: 250px;
+              }
+            }
+            .el-textarea {
+                .el-textarea__inner {
+                  width: 230px;
+                  margin-left: 65px;
+                  margin-top: 0.03rem;
+                }
+              }
+          }
+        }
+      }
+    }
+  }
+  .button_box {
+    margin-left: 42%;
+    margin-top: 55px;
+  }
+}
+.fromOther {
+  margin-left: 34.5%;
+  width: 50%;
+  .inline-input {
+    width: 300px;
+  }
+}
 </style>

src/views/TMS/components/importedEmergency/entrustEmergency.vue

@@ -2,7 +2,7 @@
   <!-- 计量委托 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-input class="el-input" placeholder="请输入内容" v-model="input" clearable> </el-input>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -57,7 +57,19 @@ export default {
 <style lang='scss'>
 .homeworkPath {
   .top {
-    padding: 1.25rem 1.875rem;
+     padding: 1.25rem 0.375rem;
+     .el-input{
+       width: 20%;
+       margin-right: 40rpx;
+     }
+     .btn{
+       width: 5.5%;
+       margin-left: 0.25rem;
+     }
+     .btn1{
+       width: 7%;
+       margin-left: 00.375rem;
+     }
   }
 }
 </style>

src/views/TMS/components/importedEmergency/wagonLoadEmergency.vue

@@ -2,7 +2,7 @@
   <!-- 装车作业页面 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-input class="el-input" placeholder="请输入内容" v-model="input" clearable> </el-input>
       <el-button type="primary" class="btn" @click="onclick(0)">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -83,7 +83,15 @@ export default {
 <style lang='scss' scoped>
 .homeworkPath {
   .top {
-    padding: 1.25rem 1.875rem;
+     padding: 1.25rem 0.375rem;
+     .el-input{
+       width: 20%;
+       margin-right: 40rpx;
+     }
+     .btn{
+       width: 5.5%;
+       margin-left: 0.25rem;
+     }
   }
 }
 </style>

src/views/TMS/components/importedEmergency/wagonUnLoadEmergency.vue

@@ -2,7 +2,7 @@
   <!-- 卸车作业页面 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-input class="el-input" placeholder="请输入内容" v-model="input" clearable> </el-input>
       <el-button type="primary" class="btn" @click="btnclick(0)">
         <i class="el-icon-search"></i>查询
       </el-button>

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

@@ -307,7 +307,7 @@ export default {
           driverCapacityIdList: this.selectionList,
           orderType: 5
         };
-        console.log(map);
+        // console.log("map",map);
         this.axios.post("/api/v1/oms/addPurOrder", map).then((res) => {
           if (res.data.code == "200") {
             this.$message({

src/views/TMS/components/importedMine/addApproveWagonPlease.vue

@@ -54,10 +54,9 @@
     </div>
   </div>
 </template>
-
 <script>
 import PageTitle from "@/components/Page/Title";
-
+import { sjTime, isNumber } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
   data() {
@@ -99,7 +98,7 @@ export default {
       let approveWagonPlease = {
         resultId: this.inf.resultId,
         resultApproveDate: sjTime(this.form1.resultApproveDate),
-        resultApproveNumber: this.form1.resultApproveNumber
+        resultApproveNumber: this.form1.resultApproveNumber,
       };
       function isNumber() {
         var value = approveWagonPlease.resultApproveNumber;
@@ -113,18 +112,18 @@ export default {
       }
       var val = this.value;
       if (
-        approveWagonPlease.resultId==null||
-        approveWagonPlease.resultApproveDate==null||
-        approveWagonPlease.resultApproveNumber==null
-      ) this.$message.error("存在空值！");
-      else
-      if (!isNumber(val)) this.$message.error("请车数量必须是数字！");
-      else
+        approveWagonPlease.resultId == null ||
+        approveWagonPlease.resultApproveDate == null ||
+        approveWagonPlease.resultApproveNumber == null
+      )
+        this.$message.error("存在空值！");
+      else if (!isNumber(val)) this.$message.error("请车数量必须是数字！");
+      else console.log(approveWagonPlease);
       this.axios
         .post("/api/v1/tms/addApproveWagonPlease", approveWagonPlease)
         .then(() => {
           this.$message({
-            type: "success",  
+            type: "success",
             message: "新增成功!",
           });
           this.$router.go(-1);

src/views/TMS/components/importedMine/addWagonLoad.vue

@@ -2,7 +2,7 @@
   <!-- 添加车皮装车实绩 -->
   <div class="addWagonLoad">
     <page-title>新增</page-title>
-    <el-divider content-position="left">车皮装车实绩</el-divider>
+ 
     <div class="cp">
       <span>车皮号：</span>
       <el-input
@@ -35,7 +35,7 @@
     </div>
     <div class="remark from">
       <span class="text">船名：</span>
-      <el-input v-model="remark" @blur="onBlur"> </el-input>
+      <el-input class="el-input" v-model="remark" @blur="onBlur"> </el-input>
       <span class="span"></span>
     </div>
     <div class="forwardingUnit from">
@@ -44,7 +44,7 @@
       <el-button type="primary" @click="ondrawer(4)">浏览</el-button>
     </div>
     <div class="form">
-      <div class="form-box" style="margin-right: 10rem">
+      <div class="form_box" style="margin-right: 10rem">
         <dil-form :formId="102" v-model="form1" ref="from1"></dil-form>
       </div>
     </div>
@@ -92,7 +92,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-
+import { sjTime,isNumber } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
   data() {
@@ -357,6 +357,8 @@ export default {
           wagonNoList:this.list,
           unloadingPointId:this.unloadPointId,
           purchaseOrderRailPlanId:this.purchaseOrderId,
+          materialId:this.materialId,
+          sendUnitId:this.supplierId,
           resultIsclear:this.form1.resultIsclear,
           resultClass: this.form1.resultClass,
           sendStationId: this.form1.sendStationId,
@@ -386,17 +388,21 @@ export default {
 </script>
 <style lang='scss'>
 .addWagonLoad {
+  color: #606266;
+  font-size: 0.675rem;
+  font-weight: 500;
   .cp {
-    width: 100%;
+    width: 49%;
     display: flex;
     justify-content: center;
     align-items: center;
     padding-top: 0.625rem;
     padding-bottom: 0.625rem;
+    margin-left: 364px;
     .cp_title {
       .cp_top {
         width: 3.125rem;
-        padding-right: 1.25rem;
+        padding-right: 1.55rem;
       }
     }
   }
@@ -430,11 +436,28 @@ export default {
       }
     }
   }
+  .matching {
+    width: 100%;
+    height: 3.125rem;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    .text {
+      width: 8.75rem;
+    }
+    .span {
+      display: inline-block;
+      width: 310px;
+      height: 0.0625rem;
+    }
+  }
   .material {
     display: flex;
     justify-content: center;
     align-items: center;
     height: 3.75rem;
+    margin-left: 27rem;
+    width: 20rem;
     .text {
       text-align: right;
       width: 8.125rem;
@@ -445,6 +468,8 @@ export default {
     justify-content: center;
     align-items: center;
     height: 3.75rem;
+    margin-left: 27rem;
+    width: 20rem;
     .text {
       text-align: right;
       width: 8.125rem;
@@ -457,18 +482,66 @@ export default {
     height: 3.75rem;
     .text {
       text-align: right;
-      width: 60px;
+      width: 5.625rem;
+    }
+    .span {
+      display: inline-block;
+      width: 1.875rem;
+      height: 1.25rem;
+    }
+    .el-input{
+      width: 13.5rem;
+      margin-right: 2.375rem;
     }
   }
-  .form {
-    margin-top: 1.25rem;
+  .purchaseOrder {
     display: flex;
     justify-content: center;
-    padding-left: 9.375rem;
+    align-items: center;
+    .span {
+      display: inline-block;
+      width: 1.875rem;
+      height: 0.0625rem;
+    }
+  }
+  .form {
+   display: flex;
+    .form_box {
+      width: 340px;
+      margin-left: 37%;
+     
+      margin-right: 20px;
+      .el-form {
+        .preview-group {
+          .el-form-item {
+            .el-form-item__label {
+              display: inline-block;
+              width: 70px !important;
+            }
+            .el-form-item__content {
+              .el-select {
+                width: 250px;
+              }
+              .el-input {
+                width: 250px;
+              }
+              .el-textarea{
+                .el-textarea__inner{
+                  width: 220px;
+                  margin-left: 65px;
+                  margin-top: 0.03rem;
+                }
+              }
+            }
+          }
+        }
+      }
+    }
   }
   .button-box {
     display: flex;
     justify-content: center;
+    padding-top: 30px;
   }
 }
 </style>

src/views/TMS/components/importedMine/addWagonPlease.vue

@@ -1,5 +1,36 @@
 <template>
   <!-- 新增请作业页面 -->
+ <div class="contractDetails">
+    <page-title>返回</page-title>
+
+    <div class="form">
+      <div class="form_box">
+         <dil-form :formId="122" v-model="form1" ></dil-form>
+      </div>
+    </div>
+
+     <div class="fromOther">
+          <el-form
+        :inline="true"
+        class="demo-form-inline"
+        label-width="80px"
+        >
+        <el-form-item label="发货单位">
+         <el-autocomplete
+          class="inline-input"
+          v-model="stateSupplier"
+          :fetch-suggestions="querySearchSupplier"
+          placeholder="请输入发货单位名称"
+          :trigger-on-focus="false"
+          @select="handleSelectSupplier"
+        >
+        <template slot-scope="{ item }">
+          <div class="name">{{ item.supplierName }}</div>
+        </template>
+        </el-autocomplete>
+        </el-form-item>
+        </el-form>
+    </div>
   <div class="trainTransport">
     <page-title>返回</page-title>
     <div class="form">
@@ -10,20 +41,25 @@
     <!-- 确定和取消 -->
     <div class="button_box">
       <el-button @click="onClickCancel">返回</el-button>
-      <el-button type="primary" @click="onClickConfirm" >确认</el-button>
+      <el-button type="primary" @click="onClickConfirm">确认</el-button>
     </div>
   </div>
+ </div>
 </template>
 
 <script>
 import PageTitle from "@/components/Page/Title";
-
+import { sjTime, isNumber } from "@/utils/sharedJsFile";
+import { getCookie } from "@/utils/util.js";
 export default {
   components: { PageTitle },
   data() {
     return {
       // 表单
       form1: {},
+      supplierId: null,
+      supplierName: "",
+      stateSupplier: "",
     };
   },
   mounted() {
@@ -33,22 +69,52 @@ export default {
     handleCheckedCitiesChange(value) {
       console.log(value);
     },
-    
+    //发货单位弹出层
+    handleSelectSupplier(item) {
+      this.supplierId = item.supplierId;
+      item.supplierName = this.supplierName;
+    },
+    //以下是发货单位边输边查搜索
+    querySearchSupplier(queryString, cb) {
+      this.axios
+        .post("/api/v1/uc/getSupplierMesByLike?index=" + this.stateSupplier)
+        .then((res) => {
+          if (res.data.code == "200") {
+            var restaurantsSupplier = res.data.data;
+            var results = queryString
+              ? restaurantsSupplier.filter(
+                  this.createFilterSupplier(queryString)
+                )
+              : restaurantsSupplier;
+            // 调用 callback 返回建议列表的数据
+            cb(results);
+          }
+        });
+    },
+    createFilterSupplier(queryString) {
+      return (restaurantsSupplier) => {
+        return (
+          restaurantsSupplier.value
+            .toLowerCase()
+            .indexOf(queryString.toLowerCase()) > -1
+        );
+      };
+    },
     // 返回
     onClickCancel() {
       this.$router.go(-1);
     },
-     // 确认
+    // 确认
     onClickConfirm() {
       let tmstrainPleaseApproveResult = {
         resultPlanDate: sjTime(this.form1.resultPlanDate),
         resultCategory: this.form1.resultCategory,
-        shipperId: this.form1.shipperId,
+        supplierId: this.supplierId,
         sendStationId: this.form1.sendStationId,
         toTheStationId: this.form1.toTheStationId,
         resultPleaseNumber: this.form1.resultPleaseNumber,
-        insertUsername: "admin",
-        resultType: 1
+        userId: getCookie("orgCode"),
+        resultType: 1,
       };
       function isNumber() {
         var value = tmstrainPleaseApproveResult.resultPleaseNumber;
@@ -62,61 +128,71 @@ export default {
       }
       var val = this.value;
       if (
-        tmstrainPleaseApproveResult.resultPlanDate==null||
-        tmstrainPleaseApproveResult.resultCategory==null||
-        tmstrainPleaseApproveResult.shipperId==null||
-        tmstrainPleaseApproveResult.sendStationId==null||
-        tmstrainPleaseApproveResult.toTheStationId==null||
-        tmstrainPleaseApproveResult.resultPleaseNumber==null
-
-      ) this.$message.error("存在空值！");
-      else
-      if (!isNumber(val)) this.$message.error("请车数量必须是数字！");
+        tmstrainPleaseApproveResult.resultPlanDate == null ||
+        tmstrainPleaseApproveResult.resultCategory == null ||
+        tmstrainPleaseApproveResult.supplierId == null ||
+        tmstrainPleaseApproveResult.sendStationId == null ||
+        tmstrainPleaseApproveResult.toTheStationId == null ||
+        tmstrainPleaseApproveResult.resultPleaseNumber == null
+      )
+        this.$message.error("存在空值！");
+      else if (!isNumber(val)) this.$message.error("请车数量必须是数字！");
       else
-      this.axios
-        .post("/api/v1/tms/addWagonPlease", tmstrainPleaseApproveResult)
-        .then(() => {
-          this.$message({
-            type: "success",  
-            message: "新增成功!",
+        this.axios
+          .post("/api/v1/tms/addWagonPlease", tmstrainPleaseApproveResult)
+          .then(() => {
+            this.$message({
+              type: "success",
+              message: "新增成功!",
+            });
+            this.$router.go(-1);
           });
-          this.$router.go(-1);
-        });
     },
   },
 };
 </script>
 <style lang="scss">
-.trainTransport{
-  .form{
+.contractDetails {
+  .form {
     display: flex;
-    .form_box{
-      width: 320px;
+    .form_box {
+      width: 340px;
       margin-left: 35%;
       margin-top: 30px;
       margin-right: 20px;
-      .el-form{
-        .preview-group{
-          .el-form-item{
-            .el-form-item__label{
+      .el-form {
+        .preview-group {
+          .el-form-item {
+            .el-form-item__label {
               display: inline-block;
               width: 70px !important;
             }
-            .el-form-item__content{
-              .el-select{
+            .el-form-item__content {
+              .el-select {
                 width: 250px;
               }
-              .el-input{
+              .el-input {
                 width: 250px;
               }
             }
+            .button_box {
+              margin-left: 42%;
+              margin-top: 55px;
+            }
+          }
+          .fromOther {
+            margin-left: 34.5%;
+            width: 50%;
+            .inline-input {
+              width: 300px;
+              .button_box {
+                margin-left: 45%;
+              }
+            }
           }
         }
       }
     }
   }
-  .button_box{
-    margin-left: 45%;
-  }
 }
 </style>

src/views/TMS/components/importedMine/addWagonUnLoad.vue

@@ -1,10 +1,9 @@
 <template>
   <!-- 添加车皮卸车实绩 -->
-  <div class="addWagonLoad">
-    <page-title>新增</page-title>
-    <div class="main">
-      <el-divider content-position="left">选择已装车实绩</el-divider>
-    </div>
+  <!-- 新增请作业页面 -->
+  <div class="contractDetails">
+    <page-title>返回</page-title>
+
     <div>
       <dilTable
         v-bind.sync="option"
@@ -13,20 +12,23 @@
       >
       </dilTable>
     </div>
-    <el-divider content-position="left">车皮卸车实绩</el-divider>
-    <div class="form-box" style="margin-right: 10rem">
-      <dil-form :formId="116" v-model="form1" ref="from1"></dil-form>
+
+    <div class="form">
+      <div class="form_box">
+        <dil-form :formId="116" v-model="form1"></dil-form>
+      </div>
     </div>
-    <div class="button-box">
-      <el-button @click="cancel" class="btn">取消</el-button>
-      <el-button type="primary" @click="makeSure" class="btn">确定</el-button>
+    <!-- 确定和取消 -->
+    <div class="button_box">
+      <el-button @click="onClickCancel">返回</el-button>
+      <el-button type="primary" @click="onClickConfirm">确认</el-button>
     </div>
   </div>
 </template>
 
 <script>
 import PageTitle from "@/components/Page/Title";
-
+import { sjTime,isNumber } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
   data() {
@@ -56,14 +58,12 @@ export default {
       });
     },
     // 确定
-    makeSure() {
+    onClickConfirm() {
       let tmstrainWagonUnloadResult = {
         wagonNoList: this.list,
         resultArrivalDate: sjTime(this.form1.resultArrivalDate),
         resultUnloadTime: sjTime(this.form1.resultUnloadTime),
         unloadingPointId: this.form1.unloadingPointId,
-        resultBigTicketWeight: this.form1.resultBigTicketWeight,
-        resultRailHorizontalWeight: this.form1.resultRailHorizontalWeight,
         resultRemark: this.form1.resultRemark,
         resultType: 1,
       };
@@ -71,11 +71,7 @@ export default {
       if (
         tmstrainWagonUnloadResult.wagonNoList == null ||
         tmstrainWagonUnloadResult.resultArrivalDate == null ||
-        tmstrainWagonUnloadResult.resultUnloadTime == null ||
-        tmstrainWagonUnloadResult.unloadingPointId == null ||
-        tmstrainWagonUnloadResult.resultBigTicketWeight == null ||
-        tmstrainWagonUnloadResult.resultRailHorizontalWeight == null ||
-        tmstrainWagonUnloadResult.resultRemark == null
+        tmstrainWagonUnloadResult.resultUnloadTime == null 
       )
         this.$message.error("存在空值！");
       else
@@ -84,20 +80,72 @@ export default {
             "/api/v1/tms/insertTmstrainWagonUnLoadResult",
             tmstrainWagonUnloadResult
           )
-          .then(() => {
-            this.$message({
-              type: "success",
-              message: "新增成功!",
-            });
+          .then((res) => {
+            if ((res.data.code = "200")) {
+              this.$message({
+                type: "success",
+                message: "新增成功!",
+              });
+            } else {
+              ({ type: "failed", message: "新增失败!" });
+            }
+
             this.$router.go(-1);
           });
     },
     // 取消
-    cancel() {
+    onClickCancel() {
       this.$router.go(-1);
     },
   },
 };
 </script>
-<style lang='scss' scoped>
+<style lang='scss'>
+.contractDetails {
+  .form {
+    display: flex;
+    .form_box {
+      width: 340px;
+      margin-left: 35%;
+      margin-top: 30px;
+      margin-right: 20px;
+      .el-form {
+        .preview-group {
+          .el-form-item {
+            .el-form-item__label {
+              display: inline-block;
+              width: 70px !important;
+            }
+            .el-form-item__content {
+              .el-select {
+                width: 250px;
+              }
+              .el-input {
+                width: 250px;
+              }
+            }
+            .el-textarea {
+              .el-textarea__inner {
+                width: 230px;
+                margin-left: 65px;
+                margin-top: 0.03rem;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  .button_box {
+    margin-left: 42%;
+    margin-top: 55px;
+  }
+}
+.fromOther {
+  margin-left: 34.5%;
+  width: 50%;
+  .inline-input {
+    width: 300px;
+  }
+}
 </style>

src/views/TMS/components/importedMine/editApproveWagonPlease.vue

@@ -1,20 +1,15 @@
 <template>
-  <!-- 修改批车作业页面 -->
-  <div id="contractDetails">
-    <page-title>批车作业</page-title>
-    <div class="main">
-      <span class="text">修改批车作业</span>
-      <span class="a"></span>
-    </div>
-    <div class="contractTitle">
-      <div class="form-box">
-        <div class="form-one">
-          <dil-form :formId="140" v-model="form1"></dil-form>
-        </div>
+ <div class="contractDetails">
+    <page-title>返回</page-title>
+
+
+    <div class="form">
+      <div class="form_box">
+       <dil-form :formId="140" v-model="form1"></dil-form>
       </div>
-    </div>  
- 
-    <div class="button-box">
+    </div>
+
+    <div class="button_box">
       <el-button @click="onClickCancel">返回</el-button>
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
     </div>
@@ -23,6 +18,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
+import { getCookie } from "@/utils/util.js";
 export default {
   components: { PageTitle },
     data(){
@@ -54,11 +50,11 @@ export default {
         resultId: this.$route.params.resultId,
         resultApproveDate: this.form1.resultApproveDate,
         resultApproveNumber: this.form1.resultApproveNumber,
-        shipperId: this.form1.shipperId,
+        // shipperId: this.form1.shipperId,
         resultCategory: this.form1.resultCategory,
         sendStationId: this.form1.sendStationId,
         toTheStationId: this.form1.toTheStationId,
-        updateUsername: "admin"
+        userId:getCookie("orgCode"),
       };
       function isNumber() {
         var value = approveWagonPlease.resultApproveNumber;
@@ -74,7 +70,7 @@ export default {
       if (
         approveWagonPlease.resultApproveDate==null||
         approveWagonPlease.resultApproveNumber==null||
-        approveWagonPlease.shipperId==null||
+        // approveWagonPlease.shipperId==null||
         approveWagonPlease.resultCategory==null||
         approveWagonPlease.sendStationId==null||
         approveWagonPlease.toTheStationId==null
@@ -95,6 +91,45 @@ export default {
   },
 };
 </script>
-<style lang="scss" scoped>
-//@import "@/styles/appoint/contract/ContractInsert.scss";
+<style lang="scss">
+.contractDetails {
+  .form {
+    display: flex;
+    .form_box {
+      width: 340px;
+      margin-left: 35%;
+      margin-top: 30px;
+      margin-right: 20px;
+      .el-form {
+        .preview-group {
+          .el-form-item {
+            .el-form-item__label {
+              display: inline-block;
+              width: 70px !important;
+            }
+            .el-form-item__content {
+              .el-select {
+                width: 250px;
+              }
+              .el-input {
+                width: 250px;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  .button_box {
+    margin-left: 42%;
+    margin-top: 55px;
+  }
+}
+.fromOther {
+  margin-left: 34.5%;
+  width: 50%;
+  .inline-input {
+    width: 300px;
+  }
+}
 </style>

src/views/TMS/components/importedMine/editWagonLoad.vue

@@ -1,36 +1,32 @@
 <template>
   <!-- 修改车皮装车实绩 -->
-  <div id="contractDetails">
-    <page-title>编辑</page-title>
-    <div class="main">
-      <span class="text">车皮装车实绩</span>
-      <span class="a"></span>
-    </div>
-    <div class="contractTitle">
-      <div class="form-box">
-        <div class="form-one">
-          <dil-form :formId="103" v-model="form1"></dil-form>
-        </div>
+  <div class="contractDetails">
+    <page-title>返回</page-title>
+
+    <div class="form">
+      <div class="form_box">
+        <dil-form :formId="103" v-model="form1"></dil-form>
       </div>
     </div>
 
-    <div class="button-box">
-      <el-button type="primary" @click="onClickConfirm">确认</el-button>
+    <!-- 确定和取消 -->
+    <div class="button_box">
       <el-button @click="onClickCancel">返回</el-button>
+      <el-button type="primary" @click="onClickConfirm">确认</el-button>
     </div>
   </div>
 </template>
 
 <script>
 import PageTitle from "@/components/Page/Title";
-
+import { sjTime, isNumber } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
- data(){
-     return {
+  data() {
+    return {
       form1: {},
-  }
- },
+    };
+  },
   mounted() {
     this.information();
   },
@@ -38,7 +34,10 @@ export default {
     information() {
       //编辑车皮装车作业
       this.axios
-        .post("/api/v1/tms/getTmstrainLoadingResultByResultId/" + this.$route.params.resultId)
+        .post(
+          "/api/v1/tms/getTmstrainLoadingResultByResultId/" +
+            this.$route.params.resultId
+        )
         .then((res) => {
           res.data.data.forEach((e) => {
             this.form1 = e;
@@ -62,44 +61,90 @@ export default {
     onClickConfirm() {
       let tmstrainLoadingResult = {
         resultId: this.$route.params.resultId,
-        resultWagonNo: this.form1.resultWagonNo,
-        resultBillableTonnage: this.form1.resultBillableTonnage,
         resultIsclear: this.form1.resultIsclear,
         resultClass: this.form1.resultClass,
         sendStationId: this.form1.sendStationId,
         arrivalStationId: this.form1.arrivalStationId,
         resultLoadingDate: sjTime(this.form1.resultLoadingDate),
-        batchId: this.form1.batchId,
         capacityId: this.form1.capacityId,
         resultMaterialNumber: this.form1.resultMaterialNumber,
         resultMaterialTheoryweight: this.form1.resultMaterialTheoryweight,
-        resultRemarks: this.form1.resultRemarks
+        resultRemarks: this.form1.resultRemarks,
       };
       if (
-      tmstrainLoadingResult.resultWagonNo==null||
-      tmstrainLoadingResult.resultBillableTonnage==null||
-      tmstrainLoadingResult.resultIsclear==null||
-      tmstrainLoadingResult.resultClass==null||
-      tmstrainLoadingResult.sendStationId==null||
-      tmstrainLoadingResult.arrivalStationId==null||
-      tmstrainLoadingResult.resultLoadingDate==null||
-      tmstrainLoadingResult.batchId==null||
-      tmstrainLoadingResult.resultRemarks==null
-      ) this.$message.error("必填项存在空值！");
+        tmstrainLoadingResult.resultIsclear == null ||
+        tmstrainLoadingResult.resultClass == null ||
+        tmstrainLoadingResult.sendStationId == null ||
+        tmstrainLoadingResult.arrivalStationId == null ||
+        tmstrainLoadingResult.resultLoadingDate == null
+      )
+        this.$message.error("必填项存在空值！");
       else
-      this.axios
-        .post("/api/v1/tms/upadteTmstrainLoadingResultByResultId",tmstrainLoadingResult)
-        .then(() => {
-          this.$message({
-            type: "success",  
-            message: "修改成功!",
+        this.axios
+          .post(
+            "/api/v1/tms/upadteTmstrainLoadingResultByResultId",
+            tmstrainLoadingResult
+          )
+          .then((res) => {
+            if (res.data.code == "200") {
+              this.$message({
+                type: "success",
+                message: "修改成功!",
+              });
+            }
+
+            this.$router.go(-1);
           });
-          this.$router.go(-1);
-        });
     },
   },
 };
 </script>
-<style lang="scss" scoped>
-//@import "@/styles/TMS/addwagonload.scss";
+<style lang="scss">
+.contractDetails {
+  .form {
+    display: flex;
+    .form_box {
+      width: 340px;
+      margin-left: 35%;
+      margin-top: 30px;
+      margin-right: 20px;
+      .el-form {
+        .preview-group {
+          .el-form-item {
+            .el-form-item__label {
+              display: inline-block;
+              width: 70px !important;
+            }
+            .el-form-item__content {
+              .el-select {
+                width: 250px;
+              }
+              .el-input {
+                width: 250px;
+              }
+              .el-textarea {
+                .el-textarea__inner {
+                  width: 220px;
+                  margin-left: 65px;
+                  margin-top: 0.03rem;
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  .button_box {
+    margin-left: 42%;
+    margin-top: 55px;
+  }
+}
+.fromOther {
+  margin-left: 34.5%;
+  width: 50%;
+  .inline-input {
+    width: 300px;
+  }
+}
 </style>

src/views/TMS/components/importedMine/editWagonPlease.vue

@@ -1,20 +1,34 @@
 <template>
-  <!-- 修改请车作业页面 -->
-  <div id="contractDetails">
-    <page-title>请车作业</page-title>
-    <div class="main">
-      <span class="text">修改请车作业</span>
-      <span class="a"></span>
-    </div>
-    <div class="contractTitle">
-      <div class="form-box">
-        <div class="form-one">
-          <dil-form :formId="117" v-model="form1"></dil-form>
-        </div>
+  <div class="contractDetails">
+    <page-title>返回</page-title>
+
+    <div class="form">
+      <div class="form_box">
+        <dil-form :formId="117" v-model="form1"></dil-form>
       </div>
-    </div>  
- 
-    <div class="button-box">
+    </div>
+
+    <div class="fromOther">
+      <el-form :inline="true" class="demo-form-inline" label-width="80px">
+        <el-form-item label="发货单位">
+          <el-autocomplete
+            class="inline-input"
+            v-model="stateSupplier"
+            :fetch-suggestions="querySearchSupplier"
+            placeholder="请输入发货单位名称"
+            :trigger-on-focus="false"
+            @select="handleSelectSupplier"
+          >
+            <template slot-scope="{ item }">
+              <div class="name">{{ item.supplierName }}</div>
+            </template>
+          </el-autocomplete>
+        </el-form-item>
+      </el-form>
+    </div>
+
+    <!-- 确定和取消 -->
+    <div class="button_box">
       <el-button @click="onClickCancel">返回</el-button>
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
     </div>
@@ -23,14 +37,17 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-
+import { sjTime,isNumber } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
-    data(){
-          return {
-          form1: {},
-        }
-    },
+  data() {
+    return {
+      form1: {},
+      supplierId: null,
+      supplierName: "",
+      stateSupplier: "",
+    };
+  },
   mounted() {
     this.information();
   },
@@ -43,22 +60,47 @@ export default {
           res.data.data.forEach((e) => {
             this.form1 = e;
           });
+          this.stateSupplier = res.data.data[0].supplierName;
+          this.supplierId = res.data.data[0].supplierId;
         });
     },
-     // 返回
+    // 返回
     onClickCancel() {
       this.$router.go(-1);
     },
-     // 确认
+       //发货单位弹出层
+    handleSelectSupplier(item){
+      this.supplierId = item.supplierId
+      item.supplierName = this.supplierName
+    },
+    //以下是发货单位边输边查搜索
+    querySearchSupplier(queryString, cb) {
+        this.axios.post('/api/v1/uc/getSupplierMesByLike?index='+this.stateSupplier).then((res)=>{
+        if(res.data.code == "200"){    
+          var restaurantsSupplier = res.data.data
+          var results = queryString ? restaurantsSupplier.filter(this.createFilterSupplier(queryString)) :restaurantsSupplier;
+          // 调用 callback 返回建议列表的数据
+          cb(results);
+        }
+      })  
+      },
+    createFilterSupplier(queryString) {
+        return (restaurantsSupplier) => {
+          return (restaurantsSupplier.value.toLowerCase().indexOf(queryString.toLowerCase()) > -1);
+        };
+      },
+
+
+    // 确认
     onClickConfirm() {
       let tmstrainPleaseApproveResult = {
         resultId: this.$route.params.resultId,
         resultPlanDate: sjTime(this.form1.resultPlanDate),
         resultCategory: this.form1.resultCategory,
-        shipperId: this.form1.shipperId,
+        supplierId: this.supplierId,
         sendStationId: this.form1.sendStationId,
         toTheStationId: this.form1.toTheStationId,
-        resultPleaseNumber: this.form1.resultPleaseNumber
+        resultPleaseNumber: this.form1.resultPleaseNumber,
       };
       function isNumber() {
         var value = tmstrainPleaseApproveResult.resultPleaseNumber;
@@ -72,29 +114,71 @@ export default {
       }
       var val = this.value;
       if (
-        tmstrainPleaseApproveResult.resultPlanDate==null||
-        tmstrainPleaseApproveResult.resultCategory==null||
-        tmstrainPleaseApproveResult.shipperId==null||
-        tmstrainPleaseApproveResult.sendStationId==null||
-        tmstrainPleaseApproveResult.toTheStationId==null||
-        tmstrainPleaseApproveResult.resultPleaseNumber==null
-      ) this.$message.error("存在空值！");
-      else
-      if (!isNumber(val)) this.$message.error("请车数必须是数字！");
+        tmstrainPleaseApproveResult.resultPlanDate == null ||
+        tmstrainPleaseApproveResult.resultCategory == null ||
+        tmstrainPleaseApproveResult.supplierId == null ||
+        tmstrainPleaseApproveResult.sendStationId == null ||
+        tmstrainPleaseApproveResult.toTheStationId == null ||
+        tmstrainPleaseApproveResult.resultPleaseNumber == null
+      )
+        this.$message.error("存在空值！");
+      else if (!isNumber(val)) this.$message.error("请车数必须是数字！");
       else
-      this.axios
-        .post("/api/v1/tms/updateApproveWagonPlease", tmstrainPleaseApproveResult)
-        .then(() => {
-          this.$message({
-            type: "success",  
-            message: "修改成功!",
+        this.axios
+          .post(
+            "/api/v1/tms/updateApproveWagonPlease",
+            tmstrainPleaseApproveResult
+          )
+          .then(() => {
+            this.$message({
+              type: "success",
+              message: "修改成功!",
+            });
+            this.$router.go(-1);
           });
-          this.$router.go(-1);
-        });
     },
   },
 };
 </script>
-<style lang="scss" scoped>
-//@import "@/styles/appoint/contract/ContractInsert.scss";
+<style lang="scss">
+.contractDetails {
+  .form {
+    display: flex;
+    .form_box {
+      width: 340px;
+      margin-left: 35%;
+      margin-top: 30px;
+      margin-right: 20px;
+      .el-form {
+        .preview-group {
+          .el-form-item {
+            .el-form-item__label {
+              display: inline-block;
+              width: 70px !important;
+            }
+            .el-form-item__content {
+              .el-select {
+                width: 250px;
+              }
+              .el-input {
+                width: 250px;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  .button_box {
+    margin-left: 42%;
+    margin-top: 55px;
+  }
+}
+.fromOther {
+  margin-left: 34.5%;
+  width: 50%;
+  .inline-input {
+    width: 300px;
+  }
+}
 </style>

src/views/TMS/components/importedMine/editWagonUnLoad.vue

@@ -1,36 +1,31 @@
 <template>
-  <!-- 修改车皮装车实绩 -->
-  <div id="contractDetails">
-    <page-title>编辑</page-title>
-    <div class="main">
-      <span class="text">车皮卸车实绩</span>
-      <span class="a"></span>
-    </div>
-    <div class="contractTitle">
-      <div class="form-box">
-        <div class="form-one">
-          <dil-form :formId="118" v-model="form1"></dil-form>
-        </div>
+  <!-- 新增请作业页面 -->
+  <div class="contractDetails">
+    <page-title>返回</page-title>
+
+    <div class="form">
+      <div class="form_box">
+        <dil-form :formId="118" v-model="form1"></dil-form>
       </div>
     </div>
-      
-    <div class="button-box">
-      <el-button type="primary" @click="onClickConfirm">确认</el-button>
+    <!-- 确定和取消 -->
+    <div class="button_box">
       <el-button @click="onClickCancel">返回</el-button>
+      <el-button type="primary" @click="onClickConfirm">确认</el-button>
     </div>
   </div>
 </template>
 
 <script>
 import PageTitle from "@/components/Page/Title";
-
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
- data(){
-     return {
+  data() {
+    return {
       form1: {},
-  }
- },
+    };
+  },
   mounted() {
     this.information();
   },
@@ -38,7 +33,10 @@ export default {
     information() {
       //编辑车皮装车作业
       this.axios
-        .post("/api/v1/tms/getTmstrainWagonUnLoadResultByUnLoadingId/" + this.$route.params.unloadingId)
+        .post(
+          "/api/v1/tms/getTmstrainWagonUnLoadResultByUnLoadingId/" +
+            this.$route.params.unloadingId
+        )
         .then((res) => {
           res.data.data.forEach((e) => {
             this.form1 = e;
@@ -66,35 +64,85 @@ export default {
         resultArrivalDate: sjTime(this.form1.resultArrivalDate),
         resultUnloadTime: sjTime(this.form1.resultUnloadTime),
         unloadingPointId: this.form1.unloadingPointId,
-        resultBigTicketWeight: this.form1.resultBigTicketWeight,
-        resultRailHorizontalWeight: this.form1.resultRailHorizontalWeight,
-        resultRemark: this.form1.resultRemark
+        resultRemark: this.form1.resultRemark,
       };
       console.log(tmstrainWagonUnloadResult);
-      if (tmstrainWagonUnloadResult.resultWagonNo==null
-      ||tmstrainWagonUnloadResult.resultArrivalDate==null||
-      tmstrainWagonUnloadResult.resultUnloadTime==null||
-      tmstrainWagonUnloadResult.unloadingPointId==null||
-      tmstrainWagonUnloadResult.resultBigTicketWeight==null||
-      tmstrainWagonUnloadResult.resultRailHorizontalWeight==null
-      ) this.$message.error("存在空值！");
+      if (
+        tmstrainWagonUnloadResult.resultWagonNo == null ||
+        tmstrainWagonUnloadResult.resultArrivalDate == null ||
+        tmstrainWagonUnloadResult.resultUnloadTime == null
+      )
+        this.$message.error("存在空值！");
       else
-      this.axios
-        .post(
-          "/api/v1/tms/upadteTmstrainWagonUnLoadResultByUnLoadingId",
-          tmstrainWagonUnloadResult
-        )
-       .then(() => {
-          this.$message({
-            type: "success",  
-            message: "修改成功!",
+        this.axios
+          .post(
+            "/api/v1/tms/upadteTmstrainWagonUnLoadResultByUnLoadingId",
+            tmstrainWagonUnloadResult
+          )
+          .then((res) => {
+            if (res.data.code == "200") {
+              this.$message({
+                type: "success",
+                message: "修改成功!",
+              });
+            } else {
+              this.$message({
+                type: "failed",
+                message: "修改失败，请联系管理员!",
+              });
+            }
+            this.$router.go(-1);
           });
-          this.$router.go(-1);
-        });
     },
   },
 };
 </script>
-<style lang="scss" scoped>
-//@import "@/styles/TMS/addwagonload.scss";
+<style lang="scss">
+.contractDetails {
+  .form {
+    display: flex;
+    .form_box {
+      width: 340px;
+      margin-left: 35%;
+      margin-top: 30px;
+      margin-right: 20px;
+      .el-form {
+        .preview-group {
+          .el-form-item {
+            .el-form-item__label {
+              display: inline-block;
+              width: 70px !important;
+            }
+            .el-form-item__content {
+              .el-select {
+                width: 250px;
+              }
+              .el-input {
+                width: 250px;
+              }
+            }
+            .el-textarea {
+              .el-textarea__inner {
+                width: 230px;
+                margin-left: 65px;
+                margin-top: 0.03rem;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  .button_box {
+    margin-left: 42%;
+    margin-top: 55px;
+  }
+}
+.fromOther {
+  margin-left: 34.5%;
+  width: 50%;
+  .inline-input {
+    width: 300px;
+  }
+}
 </style>

src/views/TMS/components/importedMine/entrust.vue

@@ -2,7 +2,7 @@
   <!-- 发送计量委托界面 -->
   <div class="trainTransport">
     <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-input class="el-input" placeholder="请输入内容" v-model="input" clearable> </el-input>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -41,7 +41,7 @@ export default {
             type: "success",
             message: "发送成功",
           });
-          this.option.requestUrl = "/api/v1/tms/getLoadResultToSendMC?apiId=58&resultType=1";
+          this.option.requestUrl = "/api/v1/tms/getLoadResultToSendMC?apiId=58&resultType=1"+"&i=" + new Date();
         }
       })
     },

src/views/TMS/components/importedMine/wagonApprove.vue

@@ -2,12 +2,12 @@
   <!-- 批车作业页面 -->
   <div class="trainTransport">
     <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-input class="el-input" placeholder="请输入内容" v-model="input" clearable> </el-input>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
       <el-button type="primary" @click="btnclick">
-        <i class="el-icon-plus"></i>新增
+         <i class="el-icon-circle-plus-outline"></i>新增
       </el-button>
     </div>
 

src/views/TMS/components/importedMine/wagonLoad.vue

@@ -2,7 +2,13 @@
   <!-- 装车作业页面 -->
   <div class="trainTransport">
     <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-input
+        class="el-input"
+        placeholder="请输入内容"
+        v-model="input"
+        clearable
+      >
+      </el-input>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -38,13 +44,23 @@ export default {
       input: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getTmstrainWagonLoad?apiId=58&resultType=1",
+        requestUrl:
+          "",
       },
     };
   },
+     created() {
+      this.getRequestUrl();
+    },
   methods: {
+ 
+     getRequestUrl(){
+      this.option.requestUrl = "/api/v1/tms/getTmstrainWagonLoad?apiId=58&resultType=1"  
+    },
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getTmstrainWagonLoad?apiId=58&resultType=1&con="+this.input;
+      this.option.requestUrl =
+        "/api/v1/tms/getTmstrainWagonLoad?apiId=58&resultType=1&con=" +
+        this.input;
     },
     btnclick() {
       this.$router.push("/addWagonLoad");
@@ -65,13 +81,13 @@ export default {
             type: "success",
             message: "删除成功!",
           });
-          this.$axios
+          this.axios
             .post(
               "/api/v1/tms/deleteTmstrainLoadingResultByResultId?resultId=" +
                 resultId
             )
             .then(() => {
-              this.$router.go(0);
+              this.getRequestUrl()
             });
         })
         .catch(() => {

src/views/TMS/components/importedMine/wagonPlease.vue

@@ -59,16 +59,23 @@ export default {
       option1: {
         // 表格请求数据的地址
         requestUrl:
-          "/api/v1/tms/getAllWagonPlease?apiId=57&status=0&resultType=1",
+          "",
       },
       option2: {
         // 表格请求数据的地址
         requestUrl:
-          "/api/v1/tms/getAllWagonPlease?apiId=57&status=1&resultType=1",
+          "",
       },
     };
   },
+  created(){
+      this.getRequestUrl()
+  },
   methods: {
+    getRequestUrl(){
+      this.option1.requestUrl = "/api/v1/tms/getAllWagonPlease?apiId=57&status=0&resultType=1" + "&i=" + new Date() 
+      this.option2.requestUrl = "/api/v1/tms/getAllWagonPlease?apiId=57&status=1&resultType=1" + "&i=" + new Date() 
+    },
     onclick() {
       if (this.activeName == "first") {
         this.option1.requestUrl =
@@ -116,18 +123,23 @@ export default {
         center: true,
       })
         .then(() => {
+          console.log("enter!1!")
+           this.axios
+            .post("/api/v1/tms/sendWagonPlease/" + resultId)
+            .then((res) => {
+              if(res.data.code == "200"){
+                 this.getRequestUrl()
+              }              
+            });
           this.$message({
             type: "success",
             message: "下发成功!",
           });
           // console.log(this.arr[0].text_prop);
-          this.$axios
-            .post("/api/v1/tms/sendWagonPlease/" + resultId)
-            .then(() => {
-              this.$router.go(0);
-            });
+         
         })
         .catch(() => {
+          console.log("out!S")
           this.$message({
             type: "info",
             message: "取消下发!",
@@ -146,7 +158,8 @@ export default {
   },
 };
 </script>
-<style lang='scss' scoped>
+
+<style lang='scss' >
 .trainTransport {
   .top {
     padding: 1.25rem 0.375rem;
@@ -154,6 +167,7 @@ export default {
       width: 20%;
       margin-right: 1.25rem;
     }
+
   }
 }
 </style>

src/views/TMS/components/importedMine/wagonUnLoad.vue

@@ -2,7 +2,7 @@
   <!-- 卸车作业页面 -->
   <div class="trainTransport">
     <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-input class="el-input" placeholder="请输入内容" v-model="input" clearable> </el-input>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>

src/views/TMS/components/importedShip/bargeShip.vue

@@ -2,12 +2,13 @@
   <!-- 驳船作业页面 -->
   <div class="shipTransport">
     <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
-      <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
-      </el-button>
+
+      <el-input class="el-input" placeholder="请输入内容" v-model="input" 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="addclick">
-        <i class="el-icon-circle-plus-outline"></i>新增
+         <i class="el-icon-circle-plus-outline"></i>新增
       </el-button>
     </div>
     <dilTable v-bind.sync="option">
@@ -99,11 +100,16 @@ export default {
 <style lang='scss' scoped>
 .shipTransport {
   .top {
-    padding: 1.25rem 0.375rem;
-    .el-input {
-      width: 20%;
-      margin-right: 1.25rem;
-    }
+     padding: 1.25rem 0.375rem;
+     .el-input{
+       width: 20%;
+       margin-right: 40rpx;
+     }
+     .btn{
+       width: 5.5%;
+       margin-left: 0.25rem;
+     }
+
   }
 }
 </style>

src/views/TMS/components/importedShip/loadShip.vue

@@ -2,12 +2,12 @@
   <!-- 装船作业页面 -->
   <div class="shipTransport">
     <div class="top">
-     <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
-      <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
-      </el-button>
+     <el-input class="el-input" placeholder="请输入内容" v-model="input" 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="addclick">
-        <i class="el-icon-circle-plus-outline"></i>新增
+            <i class="el-icon-circle-plus-outline"></i>新增
       </el-button>
     </div>
     <dilTable v-bind.sync="option">
@@ -87,11 +87,15 @@ export default {
 <style lang='scss' scoped>
 .shipTransport {
   .top {
-    padding: 1.25rem 0.375rem;
-    .el-input {
-      width: 20%;
-      margin-right: 1.25rem;
-    }
+     padding: 1.25rem 0.375rem;
+     .el-input{
+       width: 20%;
+       margin-right: 40rpx;
+     }
+     .btn{
+       width: 5.5%;
+       margin-left: 0.25rem;
+     }
   }
 }
 </style>

src/views/TMS/components/importedShip/shipResult.vue

@@ -2,14 +2,15 @@
   <!-- 水路货物运单页面 -->
   <div class="shipTransport">
     <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
-      <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
-      </el-button>
-    </div>
+
+      <el-input class="el-input" placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
     <dilTable v-bind.sync="option">
     </dilTable>
   </div>
+  </div>
 </template>
 
 <script>
@@ -40,11 +41,16 @@ export default {
 <style lang='scss' scoped>
 .shipTransport {
   .top {
-    padding: 1.25rem 0.375rem;
-    .el-input {
-      width: 20%;
-      margin-right: 1.25rem;
-    }
+     padding: 1.25rem 0.375rem;
+     .el-input{
+       width: 20%;
+       margin-right: 40rpx;
+     }
+     .btn{
+       width: 5.5%;
+       margin-left: 0.25rem;
+     }
+
   }
 }
 </style>

src/views/TMS/components/importedShip/shipmentInstructions.vue

@@ -2,12 +2,12 @@
   <!-- 装船指令页面 -->
   <div class="shipTransport">
     <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input> 
+      <el-input class="el-input" placeholder="请输入内容" v-model="input" clearable> </el-input> 
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
-      <el-button type="primary" @click="btnclick(0)">
-        <i class="el-icon-circle-plus-outline"></i>新增</el-button>
+      <el-button class="btn" type="primary" @click="btnclick(0)">
+         <i class="el-icon-circle-plus-outline"></i>新增 </el-button>
     </div>
     <el-tabs v-model="activeName"  @tab-click="handleClick">
       <!-- 未下发 -->
@@ -142,11 +142,16 @@ export default {
 <style lang='scss' scoped>
 .shipTransport {
   .top {
-    padding: 1.25rem 0.375rem;
-    .el-input {
-      width: 20%;
-      margin-right: 1.25rem;
-    }
+
+     padding: 1.25rem 0.375rem;
+     .el-input{
+       width: 20%;
+       margin-right: 40rpx;
+     }
+     .btn{
+       width: 5.5%;
+       margin-left: 0.25rem;
+     }
   }
 }
 </style>

src/views/TMS/components/importedShip/unloadShip.vue

@@ -2,10 +2,10 @@
   <!-- 卸船作业页面 -->
   <div class="shipTransport">
     <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
-      <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
-      </el-button>
+      <el-input class="el-input" placeholder="请输入内容" v-model="input" 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="addclick">
         <i class="el-icon-circle-plus-outline"></i>新增
       </el-button>
@@ -87,11 +87,15 @@ export default {
 <style lang='scss' scoped>
 .shipTransport {
   .top {
-    padding: 1.25rem 0.375rem;
-    .el-input {
-      width: 20%;
-      margin-right: 1.25rem;
-    }
-  }
+     padding: 1.25rem 0.375rem;
+     .el-input{
+       width: 20%;
+       margin-right: 40rpx;
+     }
+     .btn{
+       width: 5.5%;
+       margin-left: 0.25rem;
+     }
+}
 }
 </style>

src/views/TMS/components/importedShip/waterQuality.vue

@@ -7,7 +7,7 @@
         <i class="el-icon-search"></i>查询
       </el-button>
       <el-button type="primary" class="btn" @click="addclick">
-        <i class="el-icon-circle-plus-outline"></i>新增
+         <i class="el-icon-circle-plus-outline"></i>新增
       </el-button>
     </div>
     <dilTable v-bind.sync="option">
@@ -87,11 +87,16 @@ export default {
 <style lang='scss' scoped>
 .shipTransport {
   .top {
-    padding: 1.25rem 0.375rem;
-    .el-input {
-      width: 20%;
-      margin-right: 1.25rem;
-    }
+     padding: 1.25rem 0.375rem;
+     .el-input{
+       width: 20%;
+       margin-right: 40rpx;
+     }
+     .btn{
+       width: 5.5%;
+       margin-left: 0.25rem;
+     }
+
   }
 }
 </style>

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

@@ -590,6 +590,7 @@ export default {
           lineId: this.lineId,
           isMoreTrips:this.isMoreTrips,
         };
+        console.log("map",map);
         this.axios.post("/api/v1/oms/addPurOrder", map).then((res) => {
           if (res.data.code == "200") {
             this.$message({

src/views/WMS/app.js

@@ -11,6 +11,10 @@ import store from '@/store/index.js';
 // router
 import router from './router/index.js';
 
+// 导出Excel全局组件
+import tableToExcel from '@/components/exportExcel/exportExcel'
+Vue.use(tableToExcel)
+
 import VueApollo from 'vue-apollo'
 
 import apollo from '@/config/apolloConfig.js'

src/views/WMS/components/port_deposit/loadPortStock.vue

@@ -48,7 +48,13 @@ export default {
 <style lang='scss' scoped>
 .homeworkPath {
   .top {
-    padding: 1.25rem 1.875rem;
+     padding: 1.25rem 0.375rem;
+     .my-autocomplete{
+       width: 20%;
+       margin-right: 40rpx;
+     }
+   
   }
+ 
 }
 </style>

src/views/WMS/components/port_deposit/port_deposit_inbound.vue

@@ -2,32 +2,36 @@
   <!-- 入库 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-input
-        placeholder="请输入内容"
-        v-model="input"
-        clearable>
-      </el-input>
-      
-     <el-button type="primary" class="btn" @click="onclick">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+
+      <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
-      <el-button type="primary" @click="insertClick" >
+      <el-button type="primary" @click="insertClick">
         <i class="el-icon-plus"></i>新增
       </el-button>
     </div>
     <el-tabs v-model="activeName" @tab-click="handleClick">
       <dilTable v-bind.sync="option1" ref="table">
-          <el-table-column fixed="right" align="center" label="操作" width="100">
-            <template slot-scope="scope">
-              <el-button @click="updateClick(scope.row.resultId)" type="text" size="small">
-                修改
-              </el-button>
-              <el-button @click="deleteClick(scope.row.resultId)" type="text" size="small">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </dilTable>
+        <el-table-column fixed="right" align="center" label="操作" width="100">
+          <template slot-scope="scope">
+            <el-button
+              @click="updateClick(scope.row.resultId)"
+              type="text"
+              size="small"
+            >
+              修改
+            </el-button>
+            <el-button
+              @click="deleteClick(scope.row.resultId)"
+              type="text"
+              size="small"
+            >
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </dilTable>
     </el-tabs>
   </div>
 </template>
@@ -42,16 +46,15 @@ export default {
       activeName: "first",
       option1: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/wmsh/getInBoundResult?apiId=157"
+        requestUrl: "/api/v1/wmsh/getInBoundResult?apiId=157",
       },
     };
   },
   methods: {
     onclick() {
-      if(this.activeName == "first"){
-        // this.option1.requestUrl="/api/v1/truckTms/amstruckpurplans/getAllPurPlan/79?status=0&con=" + this.input;
-      }else{
-        // this.option2.requestUrl="/api/v1/truckTms/amstruckpurplans/getAllPurPlan/79?status=1&con=" + this.input;
+      if (this.activeName == "first") {
+        this.option1.requestUrl =
+          "/api/v1/wmsh/getInBoundResult?apiId=157&con=" + this.input;
       }
     },
     handleClick(tab, event) {
@@ -72,9 +75,7 @@ export default {
           });
           // console.log(this.arr[0].text_prop);
           this.axios
-            .post(
-              "/api/v1/wmsh/deleteWareHosingResult/" + resultId
-            )
+            .post("/api/v1/wmsh/deleteWareHosingResult/" + resultId)
             .then(() => {
               this.$router.go(0);
             });
@@ -92,17 +93,24 @@ export default {
     },
     //修改
     updateClick(resultId) {
-      console.log(resultId)
+      console.log(resultId);
       this.$router.push("/port_deposit_inbound_edit/" + resultId);
     },
-
   },
 };
 </script>
 <style lang='scss' scoped>
 .homeworkPath {
-   .top {
-    padding: 1.25rem 1.875rem;
+  .top {
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 40rpx;
+    }
+    .btn {
+      width: 5.5%;
+      margin-left: 0.25rem;
+    }
   }
 }
 </style>

src/views/WMS/components/port_deposit/port_deposit_inbound_add.vue

@@ -1,33 +1,54 @@
 <template>
   <!-- 新增入库 -->
-  <div id="contractDetails">
-    <page-title>港存库入库</page-title>
-    <div class="main">
-      <span class="text">新增入库实绩</span>
-      <span class="a"></span>
+  <div class="contractDetails">
+    <page-title>返回</page-title>
+ 
+       <div class="form">
+      <div class="form_box">
+          <dil-form :formId="228" v-model="form1" ref="from1"></dil-form>
+      </div>   
     </div>
-    <div class="contractTitle">
-      <div class="form-box">
-        <div class="form-one">
-          <dil-form :formId="228" v-model="form1" ></dil-form>
-        </div>
-      </div>
+
+     <div class="fromOther">
+      <el-form :inline="true" class="demo-form-inline" label-width="80px">
+        <el-form-item label="批次">
+          <el-autocomplete
+            class="inline-input"
+            v-model="stateBatch"
+            :fetch-suggestions="querySearchBatch"
+            placeholder="请输入批次"
+            :trigger-on-focus="false"
+            @select="handleSelectBatch"
+          >
+            <template slot-scope="{ item }">
+              <div class="name">{{ item.value }}</div>
+            </template>
+          </el-autocomplete>
+        </el-form-item>
+      </el-form>
     </div>
-    <div class="button-box">
+
+
+    <!-- 确定和取消 -->
+    <div class="button_box">
       <el-button @click="onClickCancel">返回</el-button>
-      <el-button type="primary" @click="onClickConfirm" >确认</el-button>
+      <el-button type="primary" @click="onClickConfirm">确认</el-button>
     </div>
   </div>
 </template>
 
 <script>
 import PageTitle from "@/components/Page/Title";
+import { getCookie } from "@/utils/util.js";
 export default {
   components: { PageTitle },
   data() {
     return {
       // 表单
       form1: {},
+      stateBatch: null,
+      batchId: "",
+      value: "",
     };
   },
   mounted() {
@@ -37,18 +58,49 @@ export default {
     handleCheckedCitiesChange(value) {
       console.log(value);
     },
-    
+    //批次弹出层
+    handleSelectBatch(item) {
+      // console.log("item",item)
+      this.batchId = item.batchId;
+      item.value = this.value;
+    },
+    //以下是批次边输边查搜索
+    querySearchBatch(queryString, cb) {
+      this.axios("/api/v1/uc/getBatchByLike?index=" +this.stateBatch).then(
+        (res) => {
+          if (res.data.code == "200") {
+            // console.log(res.data.data);
+            var restaurantsforeignShipName = res.data.data;
+            var results = queryString ? restaurantsforeignShipName.filter( this.createFilterConsignee(queryString) ) : restaurantsforeignShipName;
+            // 调用 callback 返回建议列表的数据
+            cb(results);
+          }
+        }
+      );
+    },
+    createFilterConsignee(queryString) {
+      return (restaurantsforeignShipName) => {
+        return (
+          restaurantsforeignShipName.value
+            .toLowerCase()
+            .indexOf(queryString.toLowerCase()) > -1
+        );
+      };
+    },
+
     // 返回
     onClickCancel() {
       this.$router.go(-1);
     },
-     // 确认
+    // 确认
     onClickConfirm() {
       let mes = {
-        batchId: this.form1.batchId,
+        batchId: this.batchId,
         portId: this.form1.portId,
-        resultMaterialNumber: this.form1.resultMaterialNumber
+        resultMaterialNumber: this.form1.resultMaterialNumber,
+        userId:getCookie("orgCode"),
       };
+      console.log("mes",mes);
       function isNumber() {
         var value = mes.resultMaterialNumber;
         //验证是否为数字
@@ -61,18 +113,16 @@ export default {
       }
       var val = this.value;
       if (
-        mes.batchId==null||
-        mes.portId==null||
-        mes.resultMaterialNumber==null
-      ) this.$message.error("存在空值！");
-      else
-      if (!isNumber(val)) this.$message.error("物资吨位必须是数字！");
+        mes.batchId == null ||
+        mes.portId == null ||
+        mes.resultMaterialNumber == null
+      )
+        this.$message.error("存在空值！");
+      else if (!isNumber(val)) this.$message.error("物资吨位必须是数字！");
       else
-      this.axios
-        .post("/api/v1/wmsh/addWarehousingResult", mes)
-        .then(() => {
+        this.axios.post("/api/v1/wmsh/addWarehousingResult", mes).then(() => {
           this.$message({
-            type: "success",  
+            type: "success",
             message: "新增成功!",
           });
           this.$router.go(-1);
@@ -81,6 +131,45 @@ export default {
   },
 };
 </script>
-<style lang="scss" scoped>
-
+<style lang="scss">
+.contractDetails{
+  .form{
+    display: flex;
+    .form_box{
+      width: 340px;
+      margin-left: 35%;
+      margin-top: 30px;
+      margin-right: 20px;
+      .el-form{
+        .preview-group{
+          .el-form-item{
+            .el-form-item__label{
+              display: inline-block;
+              width: 70px !important;
+            }
+            .el-form-item__content{
+              .el-select{
+                width: 250px;
+              }
+              .el-input{
+                width: 250px;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  .button_box{
+    margin-left: 42%;
+    margin-top: 55px;
+  }
+}
+.fromOther{
+  margin-left: 34.5%;
+  width: 50%;
+  .inline-input{
+    width: 300px;
+  }
+}
 </style>

src/views/WMS/components/port_deposit/port_deposit_inbound_edit.vue

@@ -1,20 +1,34 @@
 <template>
-  <!-- 修改入库实绩页面 -->
-  <div id="contractDetails">
-    <page-title>港存库入库</page-title>
-    <div class="main">
-      <span class="text">修改入库实绩</span>
-      <span class="a"></span>
-    </div>
-    <div class="contractTitle">
-      <div class="form-box">
-        <div class="form-one">
-          <dil-form :formId="228" v-model="form1"></dil-form>
-        </div>
+  <div class="contractDetails">
+    <page-title>返回</page-title>
+
+    <div class="form">
+      <div class="form_box">
+        <dil-form :formId="228" v-model="form1" ref="from1"></dil-form>
       </div>
-    </div>  
- 
-    <div class="button-box">
+    </div>
+
+     <div class="fromOther">
+      <el-form :inline="true" class="demo-form-inline" label-width="80px">
+        <el-form-item label="批次">
+          <el-autocomplete
+            class="inline-input"
+            v-model="stateBatch"
+            :fetch-suggestions="querySearchBatch"
+            placeholder="请输入批次"
+            :trigger-on-focus="false"
+            @select="handleSelectBatch"
+          >
+            <template slot-scope="{ item }">
+              <div class="name">{{ item.value}}</div>
+            </template>
+          </el-autocomplete>
+        </el-form-item>
+      </el-form>
+    </div>
+
+    <!-- 确定和取消 -->
+    <div class="button_box">
       <el-button @click="onClickCancel">返回</el-button>
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
     </div>
@@ -23,13 +37,17 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
+import { getCookie } from "@/utils/util.js";
 export default {
   components: { PageTitle },
-    data(){
-          return {
-          form1: {},
-        }
-    },
+  data() {
+    return {
+      form1: {},
+      stateBatch: null,
+      batchId: "",
+      value: "",
+    };
+  },
   mounted() {
     this.information();
   },
@@ -42,19 +60,58 @@ export default {
           res.data.data.forEach((e) => {
             this.form1 = e;
           });
+          this.stateBatch = res.data.data[0].resultForeignShipName;
+          this.batchId = res.data.data[0].batchId;
         });
     },
-     // 返回
+   
+    //批次弹出层
+    handleSelectBatch(item) {
+      //  console.log("item",item);
+      this.batchId = item.batchId;
+      item.value = this.value;
+    },
+  
+    //以下是发货单位边输边查搜索
+    querySearchBatch(queryString, cb) {
+      this.axios("/api/v1/uc/getBatchByLike?index=" + queryString).then(
+        (res) => {
+          if (res.data.code == "200") {
+            // console.log(res);
+            var restaurantsforeignShipName = res.data.data;
+            var results = queryString
+              ? restaurantsforeignShipName.filter(
+                  this.createFilterConsignee(queryString)
+                )
+              : restaurantsforeignShipName;
+            // 调用 callback 返回建议列表的数据
+            cb(results);
+          }
+        }
+      );
+    },
+    createFilterConsignee(queryString) {
+      return (restaurantsforeignShipName) => {
+        return (
+          restaurantsforeignShipName.value
+            .toLowerCase()
+            .indexOf(queryString.toLowerCase()) > -1
+        );
+      };
+    },
+
+    // 返回
     onClickCancel() {
       this.$router.go(-1);
     },
-     // 确认
+    // 确认
     onClickConfirm() {
       let mes = {
         resultId: this.$route.params.resultId,
-        batchId: this.form1.batchId,
+        batchId: this.batchId,
         portId: this.form1.portId,
-        resultMaterialNumber: this.form1.resultMaterialNumber
+        resultMaterialNumber: this.form1.resultMaterialNumber,
+        userId: getCookie("orgCode"),
       };
       function isNumber() {
         var value = mes.resultMaterialNumber;
@@ -68,26 +125,65 @@ export default {
       }
       var val = this.value;
       if (
-        mes.batchId==null||
-        mes.portId==null||
-        mes.resultMaterialNumber==null
-      ) this.$message.error("存在空值！");
-      else
-      if (!isNumber(val)) this.$message.error("物资件数必须是数字");
+        mes.batchId == null ||
+        mes.portId == null ||
+        mes.resultMaterialNumber == null
+      )
+        this.$message.error("存在空值！");
+      else if (!isNumber(val)) this.$message.error("物资件数必须是数字");
       else
-      this.axios
-        .post("/api/v1/wms/wmshinboundresults/updateWareHosingResult", mes)
-        .then(() => {
-          this.$message({
-            type: "success",  
-            message: "修改成功!",
+        this.axios
+          .post("/api/v1/wmsh/updateWareHosingResult", mes)
+          .then(() => {
+            this.$message({
+              type: "success",
+              message: "修改成功!",
+            });
+            this.$router.go(-1);
           });
-          this.$router.go(-1);
-        });
     },
   },
 };
 </script>
 <style lang="scss" scoped>
-
+.contractDetails {
+  .form {
+    display: flex;
+    .form_box {
+      width: 320px;
+      margin-left: 35%;
+      margin-top: 30px;
+      margin-right: 20px;
+      .el-form {
+        .preview-group {
+          .el-form-item {
+            .el-form-item__label {
+              display: inline-block;
+              width: 70px !important;
+            }
+            .el-form-item__content {
+              .el-select {
+                width: 250px;
+              }
+              .el-input {
+                width: 250px;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  .button_box {
+    margin-left: 42%;
+    margin-top: 55px;
+  }
+}
+.fromOther{
+  margin-left: 34.5%;
+  width: 50%;
+  .inline-input{
+    width: 300px;
+  }
+}
 </style>

src/views/WMS/components/port_deposit/port_deposit_outbound.vue

@@ -2,19 +2,14 @@
   <!-- 出库 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-input
-        placeholder="请输入内容"
-        v-model="input"
-        clearable>
-      </el-input>
-      
-     <el-button type="primary" class="btn" @click="onclick">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+
+      <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
     </div>
     <el-tabs v-model="activeName" @tab-click="handleClick">
-      <dilTable v-bind.sync="option1" ref="table">
-        </dilTable>
+      <dilTable v-bind.sync="option1" ref="table"> </dilTable>
     </el-tabs>
   </div>
 </template>
@@ -29,16 +24,15 @@ export default {
       activeName: "first",
       option1: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/wmsh/getOutBoundResult?apiId=159"
+        requestUrl: "/api/v1/wmsh/getOutBoundResult?apiId=159",
       },
     };
   },
   methods: {
     onclick() {
-      if(this.activeName == "first"){
-        // this.option1.requestUrl="/api/v1/truckTms/amstruckpurplans/getAllPurPlan/79?status=0&con=" + this.input;
-      }else{
-        // this.option2.requestUrl="/api/v1/truckTms/amstruckpurplans/getAllPurPlan/79?status=1&con=" + this.input;
+      if (this.activeName == "first") {
+        this.option1.requestUrl =
+          "/api/v1/wmsh/getOutBoundResult?apiId=159&con=" + this.input;
       }
     },
     handleClick(tab, event) {
@@ -49,8 +43,16 @@ export default {
 </script>
 <style lang='scss' scoped>
 .homeworkPath {
-   .top {
-    padding: 1.25rem 1.875rem;
+  .top {
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 40rpx;
+    }
+    .btn {
+      width: 5.5%;
+      margin-left: 0.25rem;
+    }
   }
 }
 </style>

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

@@ -1,49 +1,73 @@
 //结转
 <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">
+    <div class="sache">     
+    <span class="demonstration">月</span>
+    <el-date-picker
+      v-model="value"
+      type="month"
+      placeholder="选择月">
+    </el-date-picker>
+    <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
+    <el-button type="primary" @click="exportData()"><i class="el-icon-download"></i>导出(Excel)</el-button>        
+      <span style="margin-left: 1rem;">合计本月总库存：</span>
+      <el-input v-model="totalNumber" :disabled="true" style="width: 150px;"></el-input>
     </div>
     <div class="table">
-      <dilTable v-bind.sync="options">
+      <dilTable ref="excelDom" v-bind.sync="option" @func="func">
       </dilTable>
     </div>
   </div>
 </template>
 
 <script>
+import { sjTime } from '@/utils/sharedJsFile'
 export default {
   data(){
     return{
-      inputText:"",
-      options:{
+      value : null,
+      totalNumber: 0,
+      option:{
         // first请求数据的地址
-        requestUrl: "/api/v1/wms/getInventoryClose?apiId=95",
+        requestUrl: "/api/v1/wms/getInventoryClose?apiId=95&warehouseId=1&value="+ (sjTime(new Date() + "")),
       },
     }
   },
   methods:{
+       func(res){
+      console.log(res)
+      var total = 0
+      res.list.forEach(e => {
+        total = total+e.close_thismonth_inventory
+      });
+      this.totalNumber = total
+    
+    },
     onclick(){
-      console.log("点击事件");
+      console.log("value",this.value)
+      var value = null;
+      if(this.value){
+        value = sjTime(this.value)
+      }
+      this.option.requestUrl = "/api/v1/wms/getInventoryClose?apiId=95&warehouseId=1&value="+value;
     }
   }
 }
 </script>
 
 <style lang="scss" scode>
-.steel_inbound{
-  .sache{
-    height: 5rem;
+.steel_inbound {
+  .sache {
+    width: 100%;
+    height: 100px;
     display: flex;
     align-items: center;
-    padding-left: 1.875rem;
+    padding-left: 50px;
+    .el-date-editor{
+      margin: 20px;
+    }
   }
 }
 </style>

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

@@ -217,13 +217,21 @@ export default {
 }
 </script>
 
-<style lang="scss" scode>
-.steel_inbound{
-  .sache{
-    height: 5rem;
-    display: flex;
-    align-items: center;
-    padding-left: 1.875rem;
+<style lang="scss" scoped>
+.steel_inbound_real{
+    .sache{
+      display: flex;
+      justify-content: start;
+      align-items: center;
+      line-height: 40px;
+      height: 40px;
+      padding-left: 1.875rem;
+      .el-select {
+      width: 100%;
+      .el-input__inner {
+        width: 150px;
+      }
+    }
+    }
   }
-}
 </style>

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

@@ -2,12 +2,6 @@
 <template>
   <div class="steel_inboundStatistics">
     <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,19 +17,6 @@
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
-    </div>
-    <div>
-      <span style="font-size:10px">炉号</span>
-      <el-input
-        v-model="input1"
-        :disabled="true" class="inputs" style="width:15%;">
-      </el-input>
-      <!-- <span>物资名称</span>
-      <el-input
-        placeholder="请输入内容"
-        v-model="input2"
-        :disabled="true" style="width:13%">
-      </el-input> -->
       <el-col :span="3" v-html="'\u2003'"/>
       <span>生产总件数</span>
       <el-input
@@ -43,29 +24,15 @@
         v-model="input3"
         :disabled="true" class="inputs" style="width:10%">
       </el-input>
-
-      <!-- <span>生产总重量</span>
+      <span>生产总重量</span>
       <el-input
         placeholder="请输入内容"
         v-model="input4"
         :disabled="true" style="width:10%">
-      </el-input> -->
-      <!-- <span>第一件物资生产时间</span>
-      <el-input
-        placeholder="请输入内容"
-        v-model="input5"
-        :disabled="true" style="width:13%">
-      </el-input> -->
+      </el-input>
     </div>
     <div class="table">
-      <dilTable v-bind.sync="options" @func="func">
-        <!-- <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 v-bind.sync="options" @func="func" :rowClassName="rowClassName">
       </dilTable>
     </div>
   </div>
@@ -77,6 +44,12 @@ import { getCookie } from '@/utils/util.js';
 export default {
   data(){
     return{
+      rowClassName({row, rowIndex}) {
+        if (rowIndex === 0) {
+          return 'success-row';
+        }
+        return '';
+      },
       input1: '',
       input2: '',
       input3: '',
@@ -99,12 +72,24 @@ export default {
   },
   methods:{
     func(res){
-      console.log(res.list[0])
-      this.input1 = res.list[0].furnaceNumber1,
-      this.input2 = res.list[0].materialName,
-      this.input3 = res.list[0].count,
-      this.input4 = res.list[0].weight,
-      this.input5 = res.list[0].onetime
+      // console.log(res.list[0])
+      // this.input1 = this.input1 + e.furnaceNumber1,
+      let num1 = 0;
+      let num2 = 0;
+      res.list.forEach(e => {
+        console.log(e)
+        console.log(e.count)
+        console.log(e.weight)
+        num1 = num1 + e.count,
+        num2 = num2 + e.weight
+      });
+      this.input3 = num1;
+      this.input4 = num2;
+      // this.input1 = res.list[0].furnaceNumber1,
+      // this.input2 = res.list[0].materialName,
+      // this.input3 = res.list[0].count,
+      // this.input4 = res.list[0].weight,
+      // this.input5 = res.list[0].onetime
     },
     // inboundDetails(scope){
     //   	this.$router.push("/inboundDetails/" + scope.row.inboundId)
@@ -220,11 +205,19 @@ export default {
     display: flex;
     align-items: center;
     padding-left: 1.875rem;
+    .el-select {
+      width: 100%;
+      .el-input__inner {
+        width: 150px;
+      }
+    }
+  }
+  .funcnum {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
   }
 }
-.inputs el-input is-disabled /deep/ el-input__inner{
-    
-    color: #f80808;
-    background-color: #f80808;
-}
+
 </style>

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

@@ -31,7 +31,7 @@ export default {
   },
   methods:{
     onclick(){
-      this.option.requestUrl="/api/v1/wms/getWmspOutboundResult/152?con="+this.inputText;
+      this.option.requestUrl="/api/v1/wms/getWmspOutboundResult?apiId=152?con="+this.inputText;
     },
   }
 }

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

@@ -39,7 +39,7 @@ export default {
       this.$router.push("/steel_realDown/" + gridId);
     },
     onClick(){
-      this.option.requestUrl= "/api/v1/wms/selectGridMaterialList?apiId=167&&con="+this.inputText;
+      this.option.requestUrl= "/api/v1/wms/selectGridMaterialList?apiId=167&con="+this.inputText;
       console.log(this.inputText)
     }
   },

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

@@ -46,7 +46,7 @@ export default {
       endTime: null,
       options:{
         // first请求数据的地址
-        requestUrl: "/api/v1/wms/getWmsReservedResult?apiId=371",
+        requestUrl: "/api/v1/wms/getWmsReservedResult?apiId=371&warehouseId="+1,
         // selectionType: "select",
         // mapList: [],
       },
@@ -57,7 +57,7 @@ export default {
     //   	this.$router.push("/inboundDetails/" + scope.row.inboundId)
     // },
     onclick(){
-      this.options.requestUrl= "/api/v1/wms/getWmsReservedResult?apiId=371&con="+this.inputText;
+      this.options.requestUrl= "/api/v1/wms/getWmsReservedResult?apiId=371&warehouseId="+1+"&con="+this.inputText;
     },
     selectionChange(selection) {
       this.options.mapList = selection;

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

@@ -62,7 +62,7 @@ export default {
         // second请求数据的地址
         // 请求已下发的数据
         requestUrl:
-          "/api/v1/wms/selectRestackList2?apiId=440&DistrubtionStatus=1",
+          "/api/v1/wms/?apiId=440&DistrubtionStatus=1",
       },
       //默认显示待下发的标签页
       activeName: "first",

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

@@ -111,10 +111,10 @@
                 </dilTable>
             </div>
         </el-drawer> 
-        <!-- <div class="table" >
+        <div class="table" >
             <dilTable v-bind.sync="options11"  @selection-change="selectionChange"></diltable>
         </div>
-            <div class="search">
+           <!-- <div class="search">
             <div class="warehouse">
                 <span>仓库名称：</span>
                 <el-select v-model="value1" disabled  placeholder="请选择" @change="onchange4()">
@@ -140,10 +140,10 @@
                 </el-select>
             </div>
      
-        </div> -->
+        </div>
          <div class="table">
             <dilTable v-bind.sync="options" ></diltable>
-        </div> 
+        </div>  -->
     </div>  
 </template>
 

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

@@ -40,7 +40,7 @@ export default {
   data() {
     return {
       option: {
-        requestUrl: "/api/v1/wms/getSendReceive?apiId=97&startTime=null&endTime=null&i=" +new Date(),
+        requestUrl: "/api/v1/wms/getSendReceive?apiId=97&warehouseId=1&startTime=null&endTime=null&i=" +new Date(),
       },
       startTime: null,
       endTime: null,
@@ -76,14 +76,14 @@ export default {
       }
       if(startTime && endTime){
         if(startTime < endTime){
-          this.option.requestUrl = "/api/v1/wms/getSendReceive?apiId=97&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+          this.option.requestUrl = "/api/v1/wms/getSendReceive?apiId=97&warehouseId=1&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
         }else{
           this.startTime = null;
           this.endTime = null;
           this.$message.warning('开始时间要比结束时间早')
         }
       }else{
-        this.option.requestUrl = "/api/v1/wms/getSendReceive?apiId=97&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+        this.option.requestUrl = "/api/v1/wms/getSendReceive?apiId=97&warehouseId=1&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
       }
     },
   },

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

@@ -1,49 +1,73 @@
 //结转
 <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">
+    <div class="sache">     
+    <span class="demonstration">月</span>
+    <el-date-picker
+      v-model="value"
+      type="month"
+      placeholder="选择月">
+    </el-date-picker>
+    <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
+    <el-button type="primary" @click="exportData()"><i class="el-icon-download"></i>导出(Excel)</el-button>        
+      <span style="margin-left: 1rem;">合计本月总库存：</span>
+      <el-input v-model="totalNumber" :disabled="true" style="width: 150px;"></el-input>
     </div>
     <div class="table">
-      <dilTable v-bind.sync="options">
+      <dilTable ref="excelDom" v-bind.sync="option" @func="func">
       </dilTable>
     </div>
   </div>
 </template>
 
 <script>
+import { sjTime } from '@/utils/sharedJsFile'
 export default {
   data(){
     return{
-      inputText:"",
-      options:{
+      value : null,
+      totalNumber: 0,
+      option:{
         // first请求数据的地址
-        requestUrl: "/api/v1/wms/getInventoryClose?apiId=95",
+        requestUrl: "/api/v1/wms/getInventoryClose?apiId=95&warehouseId=3&value="+ (sjTime(new Date() + "")),
       },
     }
   },
   methods:{
+       func(res){
+      console.log(res)
+      var total = 0
+      res.list.forEach(e => {
+        total = total+e.close_thismonth_inventory
+      });
+      this.totalNumber = total
+    
+    },
     onclick(){
-      console.log("点击事件");
+      console.log("value",this.value)
+      var value = null;
+      if(this.value){
+        value = sjTime(this.value)
+      }
+      this.option.requestUrl = "/api/v1/wms/getInventoryClose?apiId=95&warehouseId=3&value="+value;
     }
   }
 }
 </script>
 
 <style lang="scss" scode>
-.steel_inbound{
-  .sache{
-    height: 5rem;
+.steel_inbound {
+  .sache {
+    width: 100%;
+    height: 100px;
     display: flex;
     align-items: center;
-    padding-left: 1.875rem;
+    padding-left: 50px;
+    .el-date-editor{
+      margin: 20px;
+    }
   }
 }
 </style>

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

@@ -8,7 +8,7 @@
 				<i class="el-icon-search"></i>查询
 			</el-button>
 		</div>
-  <dilTable v-bind.sync="option">
+    <dilTable v-bind.sync="option" @func="func" :rowClassName="rowClassName">
       <!-- <el-table-column fixed="right" label="操作" width="110">
         <template slot-scope="scope">
           <el-button @click="demotionClick(scope.row.gridId)" type="text" size="small"
@@ -17,6 +17,9 @@
         </template>
       </el-table-column> -->
     </dilTable>
+    <!-- <dilTable v-bind.sync="options" >
+
+    </dilTable> -->
     </div>
 </template>
 
@@ -25,21 +28,54 @@ export default {
  name:"steel_real",
   data(){
     return {
+      mapList:[],
+      rowClassName({row, rowIndex}) {
+        
+        if (rowIndex === 0) {
+          return 'success-row';
+        }
+        return '';
+      },
       inputText:"",
       option: {
-        requestUrl: "/api/v1/wms/selectGridMaterialList?apiId=167",
-        },
-      };
-    },
+        requestUrl: "/api/v1/wms/selectGridMaterialList?apiId=167&warehouseId="+3,
+      },
+      rowId:''
+    };
+  },
   mounted(){
-
+    
+  },
+  created(){
+    // 查询实时库存中已经超过库龄预警的数据
+    // mapList=this.option1
+    // console.log(this.mapList+"这是第一个")
+    // this.axios.post(
+    //       "/api/v1/wms/getGridMaterialAgeList?warehouseId="+3
+    //     )
+    //     .then((res) => {
+    //       this.mapList = res.data.data
+    //       // console.log(res.data.data)
+    //       // console.log(this.mapList)
+    //     });
   },
   methods:{
+    func(res){
+      // console.log(res)
+      res.list.forEach(e => {
+        console.log(e.status)
+        if(e.status == 0){
+          // 表示这个物资已经达到库龄预警
+          this.rowClassName(e,e.ROW_ID)
+        }
+        // console.log(this.mapList)
+      });
+    },
     demotionClick(gridId){
       this.$router.push("/steel_realDown/" + gridId);
     },
     onClick(){
-      this.option.requestUrl= "/api/v1/wms/selectGridMaterialList?apiId=167&&con="+this.inputText;
+      this.option.requestUrl= "/api/v1/wms/selectGridMaterialList?apiId=167&warehouseId="+3+"&con="+this.inputText;
       console.log(this.inputText)
     }
   },

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

@@ -46,7 +46,7 @@ export default {
       endTime: null,
       options:{
         // first请求数据的地址
-        requestUrl: "/api/v1/wms/getWmsReservedResult?apiId=371",
+        requestUrl: "/api/v1/wms/getWmsReservedResult?apiId=371&warehouseId="+3,
         // selectionType: "select",
         // mapList: [],
       },
@@ -57,7 +57,7 @@ export default {
     //   	this.$router.push("/inboundDetails/" + scope.row.inboundId)
     // },
     onclick(){
-      this.options.requestUrl= "/api/v1/wms/getWmsReservedResult?apiId=371&con="+this.inputText;
+      this.options.requestUrl= "/api/v1/wms/getWmsReservedResult?apiId=371&warehouseId="+3+"&con="+this.inputText;
     },
     selectionChange(selection) {
       this.options.mapList = selection;

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

@@ -15,8 +15,8 @@
       </el-button>
     </div>
     <div class="table">
-<!--       <dilTable v-bind.sync="options"> 
-      </dilTable> -->
+      <dilTable v-bind.sync="options"> 
+      </dilTable>
     </div>
       <template>
         <el-tabs v-model="activeName" @tab-click="handleClick">

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

@@ -111,7 +111,7 @@
                 </dilTable>
             </div>
         </el-drawer> 
-        <!-- <div class="table" >
+        <div class="table" >
             <dilTable v-bind.sync="options11"  @selection-change="selectionChange"></diltable>
         </div>
             <div class="search">
@@ -140,7 +140,7 @@
                 </el-select>
             </div>
      
-        </div> -->
+        </div>
          <div class="table">
             <dilTable v-bind.sync="options" ></diltable>
         </div> 

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

@@ -40,7 +40,7 @@ export default {
   data() {
     return {
       option: {
-        requestUrl: "/api/v1/wms/getSendReceive?apiId=97&startTime=null&endTime=null&i=" +new Date(),
+        requestUrl: "/api/v1/wms/getSendReceive?apiId=97&warehouseId=3&startTime=null&endTime=null&i=" +new Date(),
       },
       startTime: null,
       endTime: null,
@@ -76,14 +76,14 @@ export default {
       }
       if(startTime && endTime){
         if(startTime < endTime){
-          this.option.requestUrl = "/api/v1/wms/getSendReceive?apiId=97&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+          this.option.requestUrl = "/api/v1/wms/getSendReceive?apiId=97&warehouseId=3&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
         }else{
           this.startTime = null;
           this.endTime = null;
           this.$message.warning('开始时间要比结束时间早')
         }
       }else{
-        this.option.requestUrl = "/api/v1/wms/getSendReceive?apiId=97&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+        this.option.requestUrl = "/api/v1/wms/getSendReceive?apiId=97&warehouseId=3&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
       }
     },
   },

src/views/appoint/components/ship/addDeliveryAttorney.vue

@@ -97,13 +97,13 @@ export default {
       };
       if (
         // AmsshipDeliveryAttorney.attorneyId==null||
-        // AmsshipDeliveryAttorney.downSwimPortId==null||
-        // AmsshipDeliveryAttorney.attorenyPickupIdcard==null||
-        AmsshipDeliveryAttorney.attorneyContactTelephone == null
-        // AmsshipDeliveryAttorney.attorneyTime==null||
-        // AmsshipDeliveryAttorney.attorneyPdffile==null
+        AmsshipDeliveryAttorney.downSwimPortId == null ||
+        AmsshipDeliveryAttorney.attorenyPickupIdcard == null ||
+        AmsshipDeliveryAttorney.attorneyContactTelephone == null ||
+        AmsshipDeliveryAttorney.noticeId == null ||
+        AmsshipDeliveryAttorney.attorneyPickupContactPerson == null
       )
-        this.$message.error("存在空值！");
+        this.$message.error("存在空值,请核实以后再提交");
       else
         this.axios
           .post(
@@ -171,5 +171,6 @@ export default {
     margin-left: 45%;
   }
 }
+
 </style>
 

src/views/appoint/components/ship/deliveryAttorney.vue

@@ -2,15 +2,27 @@
   <!-- 提货委托页面 -->
   <div class="shipTransport">
     <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
-      
+      <el-input
+        class="el-input"
+        placeholder="请输入内容"
+        v-model="input"
+        clearable
+      >
+      </el-input>
+
       <el-button type="primary" class="btn" @click="onclick">
-         <i class="el-icon-search"></i>查询 
+        <i class="el-icon-search"></i>查询
       </el-button>
       <el-button type="primary" class="btn" @click="addClick">
         <i class="el-icon-circle-plus-outline"></i>新增
       </el-button>
-      <el-button type="primary" class="btn" @click="addPick" v-show="activeName==='second'" v-model="makeSure">
+      <el-button
+        type="primary"
+        class="btn"
+        @click="addPick"
+        v-show="activeName === 'second'"
+        v-model="makeSure"
+      >
         <i class="el-icon-circle-plus-outline"></i>生成提货委托书
       </el-button>
     </div>
@@ -52,8 +64,11 @@
       </el-tab-pane>
       <!-- 已下发 -->
       <el-tab-pane label="已下发" name="second">
-        <dilTable v-bind.sync="option2" @selection-change="currentSelectionChange">
-           </dilTable>
+        <dilTable
+          v-bind.sync="option2"
+          @selection-change="currentSelectionChange"
+        >
+        </dilTable>
       </el-tab-pane>
     </el-tabs>
   </div>
@@ -67,7 +82,7 @@ export default {
       // restaurants: [],
       input: "",
       activeName: "first",
-      amsShipDeliveryList:{},
+      amsShipDeliveryList: {},
       option1: {
         // 表格请求数据的地址
         requestUrl:
@@ -77,8 +92,8 @@ export default {
         // 表格请求数据的地址
         requestUrl:
           "/api/v1/tms/getAmsshipDeliveryAttroneyList?apiId=73&status=1",
-          selectionType:"select",
-          amsShipList:[]
+        selectionType: "select",
+        amsShipList: [],
       },
     };
   },
@@ -100,14 +115,14 @@ export default {
     //   };
     // },
     // 将所有数据送到新增提货委托书
-    makeSure(){
+    makeSure() {
       // let amsShipDeliveryList={
       //   amsShipDeliveryList=this.amsShipDeliveryList
       // }
     },
     // 通过事件显示生成提货委托书按钮
-    currentSelectionChange(selection){
-      this.amsShipDeliveryList=selection
+    currentSelectionChange(selection) {
+      this.amsShipDeliveryList = selection;
     },
     handleClick(tab, event) {
       console.log(tab, event);
@@ -187,7 +202,7 @@ export default {
     padding: 1.25rem 0.375rem;
     .el-input {
       width: 20%;
-      margin-right: 1.25rem;
+      margin-right: 40rpx;
     }
   }
 }

src/views/appoint/components/ship/deliveryNotice.vue

@@ -172,11 +172,12 @@ export default {
 <style lang='scss' scoped>
 .shipTransport {
   .top {
-    padding: 1.25rem 0.375rem;
-    .el-input {
-      width: 20%;
-      margin-right: 1.25rem;
-    }
+     padding: 1.25rem 0.375rem;
+     .el-input{
+       width: 20%;
+       margin-right: 40rpx;
+     }
   }
+ 
 }
 </style>

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

@@ -29,6 +29,28 @@
       <div class="form-box">
         <dil-form :formId="300" v-model="form"></dil-form>
       </div>
+
+      <div class="DueTime">
+        <el-form :inline="true" style="margin-top: 0.5rem;">
+          <el-form-item>
+            <el-switch
+              v-model="isOpenDueTime"
+              active-text="打开截止日期"
+              inactive-text="关闭截止日期">
+            </el-switch>
+          </el-form-item>
+          <div class="chooseDueTime">
+          <el-form-item v-if="isOpenDueTime==true">
+            <label class="el-form-item__label" style="width: auto; margin-left:10px;">截止日期</label>
+            <el-date-picker
+              v-model="DueTime"
+              type="date"
+              placeholder="选择日期">
+            </el-date-picker>
+          </el-form-item>
+          </div>
+          </el-form>
+      </div>
       <div class="materialDrawer">
          <el-form
         :inline="true"
@@ -233,6 +255,8 @@ export default {
       disabled:false,
       options: [],
       value: '',
+      isOpenDueTime : false,
+      DueTime:null,
       // 件数与重量的开关
       value: false,
       //物资模态框开关
@@ -505,7 +529,8 @@ export default {
         requirementWorkEnvironment: this.form.requirementWorkEnvironment,
         requirementWorkType: this.form.requirementWorkType,
         requirementShipperId: this.shipperId,
-        DueTime:sjTime(this.form.DueTime),
+        // 用车截日期
+        DueTime:sjTime(this.DueTime),
         mapList:this.tableData,
         orgCode:getCookie("orgCode")
       };
@@ -545,6 +570,17 @@ export default {
     width: 240px;
   }
 }
+  .DueTime{
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-top: 5px;
+    margin-bottom: 20px;
+ 
+    .chooseDueTime{
+      margin-right: 70px;
+    }
+  }
 .materialDrawer {
   display: flex;
   justify-content: center;
@@ -576,7 +612,7 @@ export default {
     font-size: 14px;
   }
   .switch{
-    margin-right: -60px
+    margin-right: -30px
   }
 }
   .material {
@@ -647,7 +683,7 @@ export default {
     justify-content: center;
     margin-top: 20px;
     margin-bottom: 20px;
-    margin-right: 212px;
+    margin-left: -222px;
     .el-form-item {
       display: flex;
       .el-form-item__label {

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

@@ -69,7 +69,7 @@
         <i class="el-icon-search"></i>查询
       </el-button>
       <el-button type="primary" class="btn" @click="onConfirm()"  style="margin-bottom:15px">
-        <i class="el-icon-search"></i>确认
+        <i class="el-icon-plus"></i>确认
       </el-button>
    <dilTable v-bind.sync="second" @selection-change="currentRadioChange" ></dilTable>    
     </el-drawer>
@@ -247,6 +247,8 @@ export default {
     },
     drawerCapacity(){ 
       this.drawer = true;
+      //重新初始化
+      this.second.requestUrl = "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null + "&i=" + new Date();
     },
     onConfirm(){
       console.log(this.mapList1)
@@ -262,9 +264,9 @@ export default {
     },
     onclick(){
       if(this.input != ''){
-        this.second.requestUrl = "/api/v1/oms/getCapacityAndDriverList?apiId=246&con="+this.input +"&carrierId=" + getCookie('userId');
+        this.second.requestUrl = "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId="+this.input +"&carrierId=" + getCookie('userId');
       }else{
-        this.second.requestUrl = "/api/v1/oms/getCapacityAndDriverList?apiId=246&carrierId=" + this.userCarrierId
+        this.second.requestUrl = "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + this.userCarrierId
       }     
     },
     currentRadioChange(selection){

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

@@ -15,33 +15,58 @@
             <dilTable v-bind.sync="first" ref="table">
               <el-table-column fixed="right" label="操作" width="180">
                 <template slot-scope="scope">
-                  <el-button type="text" size="mini" @click="getRequirementMaterial(scope.row)">
+                  <el-button
+                    type="text"
+                    size="mini"
+                    @click="getRequirementMaterial(scope.row)"
+                  >
                     物资详情
                   </el-button>
-                  <el-button type="text" size="mini" @click="updatePlan(scope)">
+                  <!-- <el-button type="text" size="mini" @click="updatePlan(scope)">
                     修改
-                  </el-button>
+                  </el-button> -->
+                </template>
+              </el-table-column>
+              <!-- 车辆信息 -->
+              <el-dialog
+                title="车辆信息"
+                :visible.sync="dialogTableVisible"
+                :before-close="handleClose"
+              >
+                <dilTable
+                  v-bind.sync="truck"
+                  @radio-change="currentRadioChange1"
+                ></dilTable>
+                <span slot="footer" class="dialog-footer">
+                  <el-button @click="cancelUpdate()">取 消</el-button>
+                  <el-button type="primary" @click="updateTruckCapacity()"
+                    >确 定</el-button
+                  >
+                </span>
+              </el-dialog>
+              <!-- 物资详情抽屉 -->
+              <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="tableData" 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>
-                 <!-- 物资详情抽屉 -->
-          <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="tableData" 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>
           </el-tab-pane>
           <el-tab-pane label="已接收" name="second">
@@ -58,36 +83,48 @@ export default {
   data() {
     return {
       inputText: "",
-      userCarrierId:'',
+      userCarrierId: "",
+      //是否弹出对话框
+      dialogTableVisible: false,
       first: {
-        // 
+        //
         requestUrl:
-          "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=4&carrierId=" + '',
+          "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=4&carrierId=" +
+          "",
       },
+      //车辆信息的表格
+      truck: {
+        requestUrl:
+          "/api/v1/oms/getCapacityAndDriverList?apiId=246&carrierId=" + "",
+        // 控制显示当选列
+        selectionType: "radio",
+      },
+      //选中的运力id
+      capacityId: null,
       activeName: "first",
       second: {
-        requestUrl:""
+        requestUrl: "",
       },
-       tableHead: [
+      tableHead: [
         {
           prop: "materialName",
           label: "物资名称",
           width: 150,
         },
         {
-          prop:"loadName",
-          label:"装货点",
-          width:150
+          prop: "loadName",
+          label: "装货点",
+          width: 150,
         },
         {
-          prop:"unloadName",
-          label:"卸货点",
-          width:150
+          prop: "unloadName",
+          label: "卸货点",
+          width: 150,
         },
         {
-          prop:"loadSequence",
-          label:"装卸货次序",
-          width:150
+          prop: "loadSequence",
+          label: "装卸货次序",
+          width: 150,
         },
         {
           prop: "materialWeight",
@@ -101,34 +138,74 @@ export default {
         },
       ],
       tableData: [],
-       //记录旧的row对象(未下发)
+      //记录旧的row对象(未下发)
       oldRow: "",
       //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态(未下发)
       oldRowCount: 1,
     };
   },
-  created(){
-      if(getCookie("orgCode") == "chengyunshang"){
-          this.first.requestUrl = "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=4&carrierId=" + getCookie("userId") 
-          this.second.requestUrl = "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=5&carrierId=" + getCookie("userId")
-      }else{
-          this.first.requestUrl = "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=4"
-          this.second.requestUrl = "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=5"
-      }
+  created() {
+    if (getCookie("orgCode") == "chengyunshang") {
+      this.first.requestUrl =
+        "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=4&carrierId=" +
+        getCookie("userId");
+      this.second.requestUrl =
+        "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=5&carrierId=" +
+        getCookie("userId");
+    } else {
+      this.first.requestUrl =
+        "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=4";
+      this.second.requestUrl =
+        "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=5";
+    }
   },
   methods: {
-    getRequest(){
-      if(getCookie("orgCode") == "chengyunshang"){
-          this.first.requestUrl = "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=4&carrierId=" + getCookie("userId") + new Date()
-          this.second.requestUrl = "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=5&carrierId=" + getCookie("userId") + new Date()
-      }else{
-          this.first.requestUrl = "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=4"
-          this.second.requestUrl = "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=5"
+    getRequest() {
+      if (getCookie("orgCode") == "chengyunshang") {
+        this.first.requestUrl =
+          "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=4&carrierId=" +
+          getCookie("userId") +
+          new Date();
+        this.second.requestUrl =
+          "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=5&carrierId=" +
+          getCookie("userId") +
+          new Date();
+      } else {
+        this.first.requestUrl =
+          "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=4";
+        this.second.requestUrl =
+          "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=5";
       }
-      
     },
-    handleClick(){
-      this.getRequirementMaterial()
+
+    // //修改运力
+    // updatePlan() {
+    //   if (this.capacityId == null) {
+    //     this.$message.error("未选中运力");
+    //     return;
+    //   }
+    //   this.axios
+    //     .post("/api/v1/oms/updateCapacityId", {
+    //       capacityId: this.capacityId,
+    //       orderId: this.orderId,
+    //     })
+    //     .then((res) => {
+    //       if (res.data.code == "200") {
+    //         this.$message.success("修改运力成功");
+    //         this.getRequestUrl();
+    //         this.dialogTableVisible = false;
+    //       } else {
+    //         this.$message.error("修改运力失败");
+    //       }
+    //     });
+    // },
+
+    // cancelUpdate() {
+    //   this.dialogTableVisible = false;
+    //   this.$message.info("取消修改运力");
+    // },
+    handleClick() {
+      this.getRequirementMaterial();
     },
     getRequirementMaterial(row) {
       // 记录重复点击次数
@@ -154,12 +231,14 @@ export default {
       this.oldRow = row;
       this.getMaterial(row.requirementId);
     },
-     getMaterial(requirementId){
-      console.log(requirementId)
-      this.axios.post("/api/v1/ams/getRequirementMaterial/" + requirementId).then((res) => {
-        this.tableData = res.data.data
-        console.log(res.data.data)
-      })
+    getMaterial(requirementId) {
+      console.log(requirementId);
+      this.axios
+        .post("/api/v1/ams/getRequirementMaterial/" + requirementId)
+        .then((res) => {
+          this.tableData = res.data.data;
+          console.log(res.data.data);
+        });
     },
     deletePlan(scope) {
       this.$confirm("是否删除", "提示", {
@@ -198,13 +277,13 @@ export default {
 };
 </script>
 <style lang="scss">
-.steel_inbound{
-  .sache{
+.steel_inbound {
+  .sache {
     padding: 1.25rem 0.375rem;
     .el-input {
       width: 20%;
       margin-right: 1.25rem;
     }
   }
-  }
+}
 </style>