提交

build/utils.js

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

config/index.js

@@ -68,7 +68,7 @@ let proxyTable = {
     target: "http://172.16.33.166:8080",
     // target: "http://localhost:8019",
     // target: "http://localhost:8080",
-    // target: "http://192.168.1.110:8019",
+    // target: "http://192.168.1.111:8019",
 
     ws: true,
     pathRewrite: {

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

@@ -1,6 +1,6 @@
 <template>
   <!-- 批车作业页面 -->
-  <div class="homeworkPath">
+  <div class="trainTransport">
     <div class="top">
       <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
       <el-button type="primary" class="btn" @click="onclick">
@@ -54,17 +54,13 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
-.homeworkPath {
+.trainTransport {
   .top {
-     padding: 1.25rem 0.375rem;
-     .el-input{
-       width: 20%;
-       margin-right: 40rpx;
-     }
-     .btn{
-       width: 5.5%;
-       margin-left: 0.25rem;
-     }
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
   }
 }
 </style>

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

@@ -1,8 +1,11 @@
 <template>
-  <!-- 新增入库 -->
-  <div class="contractDetails">
-    <page-title>返回</page-title>
-
+  <!-- 新增批车作业页面 -->
+  <div id="trainTransport">
+    <!-- <page-title>批车作业</page-title>
+    <div class="main">
+      <span class="text">选择已下发请车作业</span>
+      <span class="a"></span>
+    </div>
     <div>
       <dilTable
         v-bind.sync="option"
@@ -13,13 +16,38 @@
       >
       </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">
+          <dil-form :formId="105" v-model="form1"></dil-form>
+        </div>
+      </div>
+    </div>
+    <div class="button-box">
+      <el-button @click="onClickCancel">返回</el-button>
+      <el-button type="primary" @click="onClickConfirm">确认</el-button>
+    </div> -->
+    <page-title>返回</page-title>
+    <!-- 第一部分 -->
+      <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>
+      <dilTable v-bind.sync="option" v-model="table1" @change="handleCheckedCitiesChange" 
+      ref="table" @radio-change="currentRadioChange">
+      </dilTable>
     <div class="form">
+      <!-- 第二部分 -->
       <div class="form_box">
-        <dil-form :formId="105" v-model="form1" ref="from1"></dil-form>
+          <dil-form :formId="105" 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>
@@ -52,6 +80,9 @@ export default {
     // this.unit();
   },
   methods: {
+    onclick(){
+
+    },
     handleCheckedCitiesChange(value) {
       console.log(value);
     },
@@ -102,26 +133,26 @@ export default {
 };
 </script>
 <style lang="scss">
-.contractDetails {
-  .form {
+.shipTransport{
+  .form{
     display: flex;
-    .form_box {
-      width: 340px;
+    .form_box{
+      width: 320px;
       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;
               }
             }
@@ -130,16 +161,15 @@ export default {
       }
     }
   }
-  .button_box {
-    margin-left: 42%;
-    margin-top: 55px;
+  .top {
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
   }
-}
-.fromOther {
-  margin-left: 34.5%;
-  width: 50%;
-  .inline-input {
-    width: 300px;
+  .button_box{
+    margin-left: 45%;
   }
 }
 </style>

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

@@ -1,6 +1,6 @@
 <template>
   <!-- 发送计量委托界面 -->
-  <div class="homeworkPath">
+  <div class="trainTransport">
     <div class="top">
       <el-input class="el-input" placeholder="请输入内容" v-model="input" clearable> </el-input>
       <el-button type="primary" class="btn" @click="onclick">
@@ -55,17 +55,13 @@ export default {
 };
 </script>
 <style lang='scss'>
-.homeworkPath {
+.trainTransport {
   .top {
-     padding: 1.25rem 0.375rem;
-     .el-input{
-       width: 20%;
-       margin-right: 40rpx;
-     }
-     .btn{
-       width: 5.5%;
-       margin-left: 0.25rem;
-     }
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
   }
 }
 </style>

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

@@ -1,6 +1,6 @@
 <template>
   <!-- 批车作业页面 -->
-  <div class="homeworkPath">
+  <div class="trainTransport">
     <div class="top">
       <el-input class="el-input" placeholder="请输入内容" v-model="input" clearable> </el-input>
       <el-button type="primary" class="btn" @click="onclick">
@@ -55,17 +55,13 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
-.homeworkPath {
+.trainTransport {
   .top {
-     padding: 1.25rem 0.375rem;
-     .el-input{
-       width: 20%;
-       margin-right: 40rpx;
-     }
-     .btn{
-       width: 5.5%;
-       margin-left: 0.25rem;
-     }
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
   }
 }
 </style>

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

@@ -1,6 +1,6 @@
 <template>
   <!-- 装车作业页面 -->
-  <div class="homeworkPath">
+  <div class="trainTransport">
     <div class="top">
       <el-input
         class="el-input"
@@ -101,16 +101,12 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
-.homeworkPath {
+.trainTransport {
   .top {
     padding: 1.25rem 0.375rem;
     .el-input {
       width: 20%;
-      margin-right: 40rpx;
-    }
-    .btn {
-      width: 5.5%;
-      margin-left: 0.25rem;
+      margin-right: 1.25rem;
     }
   }
 }

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

@@ -1,6 +1,6 @@
 <template>
   <!-- 卸车作业页面 -->
-  <div class="homeworkPath">
+  <div class="trainTransport">
     <div class="top">
       <el-input class="el-input" placeholder="请输入内容" v-model="input" clearable> </el-input>
       <el-button type="primary" class="btn" @click="onclick">
@@ -88,17 +88,13 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
-.homeworkPath {
+.trainTransport {
   .top {
-     padding: 1.25rem 0.375rem;
-     .el-input{
-       width: 20%;
-       margin-right: 40rpx;
-     }
-     .btn{
-       width: 5.5%;
-       margin-left: 0.25rem;
-     }
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
   }
 }
 </style>

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

@@ -1,39 +1,31 @@
 <template>
-  <!-- 船只信息页面 -->
-  <div class="homeworkPath">
-    <page-title>驳船作业信息</page-title>
-    <div class="main">
-      <span class="text">驳船作业新增</span>
-      <span class="a"></span>
-    </div>
-    <div>
-      <div class="form-box" style="margin:0 50rem">
-        <el-form ><dil-form :formId="125" v-model="form"></dil-form>
-        <el-button type="primary" @click="makeSure">新增驳船作业</el-button>
-        </el-form>
-        
+  <!-- 新增驳船作业 -->
+<div class="shipTransport">
+    <page-title>返回</page-title>
+    <!-- 第一部分 -->
+      <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>
+      <dilTable v-bind.sync="option" @radio-change="currentRadioChange">
+      </dilTable>
+    <div class="form">
+      <!-- 第二部分 -->
+      <div class="form_box">
+          <dil-form :formId="125" v-model="form"></dil-form>
       </div>
     </div>
-    <div class="button-ins">   
-    </div>
-    <div class="main">
-      <span class="text">驳船作业新增</span>
-      <span class="a"></span>
-    </div>
-     <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 class="button_box">
+        <el-button type="primary" @click="makeSure">新增驳船作业</el-button>
     </div>
-    <dilTable v-bind.sync="option" @radio-change="currentRadioChange">
-    </dilTable>
   </div>
 </template>
 
 <script>
 import PageTitle from "@/components/Page/Title";
-
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
   data() {
@@ -119,18 +111,44 @@ export default {
   },
 };
 </script>
-<style lang='scss' scoped>
-.homeworkPath{
-  .main{
-    margin-bottom: 0.125rem;
-  }
-  .button-ins{
-    margin: 0 50rem; 
-    text-align: center
+<style lang='scss'>
+.shipTransport{
+  .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;
+              }
+            }
+          }
+        }
+      }
+    }
   }
   .top {
-    margin: 0 auto;
-    padding: 1.25rem 1.875rem;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
+  }
+  .button_box{
+    margin-left: 45%;
   }
 }
 </style>

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

@@ -25,7 +25,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
   data() {

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

@@ -30,7 +30,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
   data() {

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

@@ -33,7 +33,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-
+import { sjTime,isNumber } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
   data() {
@@ -61,7 +61,7 @@ export default {
     currentRadioChange1(selection){
         this.maplist = selection
         this.form1 = {
-          batchId:selection.shipName + selection.materialName
+          batchId:selection.resultForeignShipName + selection.materialName
                  }
     },
     handleClose(done){

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

@@ -25,7 +25,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
   data() {

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

@@ -56,7 +56,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
   data() {

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

@@ -42,7 +42,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
   data() {
@@ -134,7 +134,8 @@ export default {
                 message: "新增成功!",
               });
               // this.$refs.table.refreshData();
-              this.$router.go(this.option);
+              this.option.requestUrl = "/api/v1/tms/getCapacities?apiId=76&instructionsId=" + this.$route.params.instructionsId + "&i=" + new Date();
+              // this.$router.go(this.option);
             } else {
               this.$message.error("新增失败！");
             }

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

@@ -45,7 +45,7 @@ export default {
   },
   methods: {
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getLoadShipList?apiId=63&con=" + this.input;
+      // this.option.requestUrl = "/api/v1/tms/getLoadShipList?apiId=63&con=" + this.input;
     },
     click(resultId) {
       this.$router.push("/updateLoadShip/" + resultId);

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

@@ -85,7 +85,7 @@
 </template>
 
 <script>
-
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   name: "homeworkPath",
   data() {

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

@@ -72,8 +72,8 @@ export default {
       console.log(tab, event);
     },
     onclick() {
-      this.option.requestUrl =
-        "/api/v1/tms/getShipMentInstructionsList?apiId=74&con=" + this.input;
+      // this.option.requestUrl =
+      //   "/api/v1/tms/getShipMentInstructionsList?apiId=74&con=" + this.input;
     },
     btnclick() {
       this.$router.push("/addShipmentInstructions/");

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

@@ -1,20 +1,14 @@
 <template>
   <!-- 修改驳船作业 -->
-  <div id="contractDetails">
-    <page-title>编辑</page-title>
-    <div class="main">
-      <span class="text">驳船作业</span>
-      <span class="a"></span>
+    <div class="shipTransport">
+    <page-title>返回</page-title>
+    <div class="form">
+      <div class="form_box">
+          <dil-form :formId="133" v-model="form1" ref="from1"></dil-form>
+      </div> 
     </div>
-    <div class="contractTitle">
-      <div class="form-box">
-        <div class="form-one">
-          <dil-form :formId="133" v-model="form1"></dil-form>
-        </div>
-      </div>
-    </div>
-
-    <div class="button-box">
+    <!-- 确定和取消 -->
+    <div class="button_box">
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
       <el-button @click="onClickCancel">返回</el-button>
     </div>
@@ -23,7 +17,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
  data(){
@@ -96,6 +90,37 @@ export default {
   },
 };
 </script>
-<style lang="scss" scoped>
-//@import "@/styles/appoint/contract/ContractInsert.scss";
+<style lang="scss">
+.shipTransport{
+  .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: 45%;
+  }
+}
 </style>

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

@@ -1,20 +1,14 @@
 <template>
   <!-- 修改船只信息 -->
-  <div id="contractDetails">
-    <page-title>编辑</page-title>
-    <div class="main">
-      <span class="text">船只信息</span>
-      <span class="a"></span>
+    <div class="shipTransport">
+    <page-title>返回</page-title>
+    <div class="form">
+      <div class="form_box">
+          <dil-form :formId="130" v-model="form1" ref="from1"></dil-form>
+      </div> 
     </div>
-    <div class="contractTitle">
-      <div class="form-box">
-        <div class="form-one">
-          <dil-form :formId="130" v-model="form1"></dil-form>
-        </div>
-      </div>
-    </div>
-
-    <div class="button-box">
+    <!-- 确定和取消 -->
+    <div class="button_box">
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
       <el-button @click="onClickCancel">返回</el-button>
     </div>
@@ -23,7 +17,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
  data(){
@@ -95,6 +89,37 @@ export default {
   },
 };
 </script>
-<style lang="scss" scoped>
-//@import "@/styles/appoint/contract/ContractInsert.scss";
+<style lang="scss">
+.shipTransport{
+  .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: 45%;
+  }
+}
 </style>

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

@@ -1,20 +1,14 @@
 <template>
   <!-- 修改位置作业 -->
-  <div id="contractDetails">
-    <page-title>编辑</page-title>
-    <div class="main">
-      <span class="text">装船作业</span>
-      <span class="a"></span>
+    <div class="shipTransport">
+    <page-title>返回</page-title>
+    <div class="form">
+      <div class="form_box">
+          <dil-form :formId="136" v-model="form1" ref="from1"></dil-form>
+      </div> 
     </div>
-    <div class="contractTitle">
-      <div class="form-box">
-        <div class="form-one">
-          <dil-form :formId="136" v-model="form1"></dil-form>
-        </div>
-      </div>
-    </div>
-
-    <div class="button-box">
+    <!-- 确定和取消 -->
+    <div class="button_box">
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
       <el-button @click="onClickCancel">返回</el-button>
     </div>
@@ -23,7 +17,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
  data(){
@@ -98,6 +92,37 @@ export default {
   },
 };
 </script>
-<style lang="scss" scoped>
-//@import "@/styles/appoint/contract/ContractInsert.scss";
+<style lang="scss">
+.shipTransport{
+  .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: 45%;
+  }
+}
 </style>

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

@@ -1,20 +1,14 @@
 <template>
   <!-- 修改位置作业 -->
-  <div id="contractDetails">
-    <page-title>编辑</page-title>
-    <div class="main">
-      <span class="text">位置作业</span>
-      <span class="a"></span>
+  <div class="shipTransport">
+    <page-title>返回</page-title>
+    <div class="form">
+      <div class="form_box">
+          <dil-form :formId="132" v-model="form1" ref="from1"></dil-form>
+      </div> 
     </div>
-    <div class="contractTitle">
-      <div class="form-box">
-        <div class="form-one">
-          <dil-form :formId="132" v-model="form1"></dil-form>
-        </div>
-      </div>
-    </div>
-
-    <div class="button-box">
+    <!-- 确定和取消 -->
+    <div class="button_box">
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
       <el-button @click="onClickCancel">返回</el-button>
     </div>
@@ -23,7 +17,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
  data(){
@@ -92,6 +86,37 @@ export default {
   },
 };
 </script>
-<style lang="scss" scoped>
-//@import "@/styles/appoint/contract/ContractInsert.scss";
+<style lang="scss">
+.shipTransport{
+  .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: 45%;
+  }
+}
 </style>

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

@@ -1,20 +1,14 @@
 <template>
   <!-- 修改装船指令 -->
-  <div id="contractDetails">
-    <page-title>编辑</page-title>
-    <div class="main">
-      <span class="text">装船指令</span>
-      <span class="a"></span>
+  <div class="shipTransport">
+    <page-title>返回</page-title>
+    <div class="form">
+      <div class="form_box">
+          <dil-form :formId="114" v-model="form1" ref="from1"></dil-form>
+      </div> 
     </div>
-    <div class="contractTitle">
-      <div class="form-box">
-        <div class="form-one">
-          <dil-form :formId="114" v-model="form1"></dil-form>
-        </div>
-      </div>
-    </div>
-
-    <div class="button-box">
+    <!-- 确定和取消 -->
+    <div class="button_box">
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
       <el-button @click="onClickCancel">返回</el-button>
     </div>
@@ -23,7 +17,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
  data(){
@@ -88,6 +82,37 @@ export default {
   },
 };
 </script>
-<style lang="scss" scoped>
-//@import "@/styles/appoint/contract/ContractInsert.scss";
+<style lang="scss">
+.shipTransport{
+  .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: 45%;
+  }
+}
 </style>

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

@@ -1,20 +1,14 @@
 <template>
   <!-- 修改卸船作业 -->
-  <div id="contractDetails">
-    <page-title>编辑</page-title>
-    <div class="main">
-      <span class="text">卸船作业</span>
-      <span class="a"></span>
+  <div class="shipTransport">
+    <page-title>返回</page-title>
+    <div class="form">
+      <div class="form_box">
+          <dil-form :formId="134" v-model="form1" ref="from1"></dil-form>
+      </div> 
     </div>
-    <div class="contractTitle">
-      <div class="form-box">
-        <div class="form-one">
-          <dil-form :formId="134" v-model="form1"></dil-form>
-        </div>
-      </div>
-    </div>
-
-    <div class="button-box">
+    <!-- 确定和取消 -->
+    <div class="button_box">
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
       <el-button @click="onClickCancel">返回</el-button>
     </div>
@@ -23,7 +17,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
  data(){
@@ -96,6 +90,37 @@ export default {
   },
 };
 </script>
-<style lang="scss" scoped>
-//@import "@/styles/appoint/contract/ContractInsert.scss";
+<style lang="scss">
+.shipTransport{
+  .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: 45%;
+  }
+}
 </style>

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

@@ -1,20 +1,14 @@
 <template>
   <!-- 修改水分质检作业 -->
-  <div id="contractDetails">
-    <page-title>编辑</page-title>
-    <div class="main">
-      <span class="text">水分质检作业</span>
-      <span class="a"></span>
+  <div class="shipTransport">
+    <page-title>返回</page-title>
+    <div class="form">
+      <div class="form_box">
+          <dil-form :formId="135" v-model="form1" ref="from1"></dil-form>
+      </div> 
     </div>
-    <div class="contractTitle">
-      <div class="form-box">
-        <div class="form-one">
-          <dil-form :formId="135" v-model="form1"></dil-form>
-        </div>
-      </div>
-    </div>
-
-    <div class="button-box">
+    <!-- 确定和取消 -->
+    <div class="button_box">
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
       <el-button @click="onClickCancel">返回</el-button>
     </div>
@@ -23,7 +17,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
  data(){
@@ -90,6 +84,37 @@ export default {
   },
 };
 </script>
-<style lang="scss" scoped>
-//@import "@/styles/appoint/contract/ContractInsert.scss";
+<style lang="scss">
+.shipTransport{
+  .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: 45%;
+  }
+}
 </style>

src/views/appoint/components/saleContract/addSaleCokeSend.vue

@@ -457,6 +457,7 @@ export default {
             capacityId:row.capacityId,
             capacityNumber:row.capacityNumber,
             carrierName:row.carrierName,
+            carrierId:e.carrierId,
             lineId:row.lineId,
             lineName:row.lineName,
             materialId:row.materialId,
@@ -493,6 +494,7 @@ export default {
           capacityId:e.capacityId,
           capacityNumber:e.capacityNumber,
           carrierName:e.carrierName,
+          carrierId:e.carrierId,
           lineId:e.lineId,
           lineName:e.lineName,
           materialId:e.materialId,
@@ -526,6 +528,7 @@ export default {
           capacityId:e.capacityId,
           capacityNumber:e.capacityNumber,
           carrierName:e.carrierName,
+          carrierId:e.carrierId,
           materialName:this.materialName,
           materialId:this.materialId,
           lineName:this.lineName,

src/views/appoint/components/saleContract/saleOrderArrange.vue

@@ -119,7 +119,7 @@ export default {
           .then(() => {
             //初始化maplist
             var mapList = [];
-            this.first.mapList.forEach((item, i) => {
+            this.first.mapList.forEach((item) => {
               //初始化mapItem
               var mapItem = {
                 //销售订单物资中间表id

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

@@ -2,11 +2,6 @@
   <!-- 添加货权转移实绩 -->
   <div class="shipTransport">
     <page-title>返回</page-title>
-    <div class="form">
-      <div class="form_box">
-          <dil-form :formId="109" v-model="form1" ref="from1"></dil-form>
-      </div>        
-    </div>
     <!-- 物资 -->
     <div class="mofrom">
       <span class="motext">物资</span>
@@ -25,6 +20,11 @@
       <el-input class="moinput" v-model="receiver" disabled> </el-input>
       <el-button class="mobutton" type="primary" @click="ondrawer(3)">浏览</el-button>
     </div>
+    <div class="form">
+      <div class="form_box">
+          <dil-form :formId="109" v-model="form1" ref="from1"></dil-form>
+      </div>        
+    </div>
     <!-- 确定和取消 -->
     <div class="button_box">
       <el-button @click="cancel">取消</el-button>
@@ -34,7 +34,6 @@
     <el-drawer
       :visible.sync="drawer"
       :direction="direction"
-      :before-close="handleClose"
       size="50%"
     >
       <el-input
@@ -173,13 +172,6 @@ export default {
           "/api/v1/tms/getGroupList?apiId=21&con=" + this.input;
       }
     },
-    handleClose(done) {
-      this.$confirm("确认关闭？")
-        .then((_) => {
-          done();
-        })
-        .catch((_) => {});
-    },
     // 取消
     cancel() {
       this.$router.go(-1);
@@ -194,7 +186,6 @@ export default {
     .form_box{
       width: 320px;
       margin-left: 35%;
-      margin-top: 30px;
       margin-right: 20px;
       .el-form{
         .preview-group{

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

@@ -1,14 +1,14 @@
 <template>
-  <!-- 添加货权转移实绩 -->
+  <!-- 添加提货委托 -->
   <div class="shipTransport">
     <page-title>返回</page-title>
     <div class="form">
       <div class="form_box">
-         <dil-form :formId="113" v-model="form1" ref="from1"></dil-form>
+          <dil-form :formId="113" v-model="form1" ref="from1"></dil-form>
       </div>
       <div class="liulan">
-          <el-button type="primary" class="btn" @click="onDrawer">浏览</el-button>
-      </div>        
+          <el-button type="primary" class="btn" @click="onDrawer">浏览</el-button>
+      </div>     
     </div>
     <!-- 确定和取消 -->
     <div class="button_box">
@@ -20,7 +20,7 @@
       :visible.sync="drawer"
       :direction="direction"
       :before-close="handleClose"
-      size="30%"
+      size="50%"
     >
       <el-input
         placeholder="请输入内容"
@@ -46,6 +46,7 @@
 </template>
 <script>
 import PageTitle from "@/components/Page/Title";
+import { sjTime,isNumber } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
   data() {
@@ -77,13 +78,13 @@ export default {
     currentRadioChange1(selection) {
       this.maplist = selection;
       this.form1 = {
-        batchId: selection.shipName + selection.materialName,
+        batchId: selection.resultForeignShipName + selection.materialName,
       };
     },
     // 确定
     makeSure() {
       let AmsshipDeliveryAttorney = {
-        downSwimPortId: this.form1.downSwimPortId,
+        // downSwimPortId: this.form1.downSwimPortId,
         attorenyPickupIdcard: this.form1.attorenyPickupIdcard,
         attorneyContactTelephone: this.form1.attorneyContactTelephone,
         batchId: this.maplist.batchId,
@@ -92,7 +93,7 @@ export default {
         noticeId: this.form1.noticeId,
         portId: this.form1.portId,
         attorneyPickupContactPerson: this.form1.attorneyPickupContactPerson,
-        resultMemo: this.form1.resultMemo,
+        // resultMemo: this.form1.resultMemo,
       };
       if (
         // AmsshipDeliveryAttorney.attorneyId==null||
@@ -110,8 +111,6 @@ export default {
             AmsshipDeliveryAttorney
           )
           .then((res) => {
-            //   console.log(res);
-            //   console.log(this.form4);
             this.$router.go(-1);
           });
     },
@@ -167,22 +166,6 @@ export default {
       .btn2{
         margin-top: 67px;
       }
-    }
-  .mofrom {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    margin-top: 5px;
-    margin-bottom: 20px;
-    .motext{
-      width: 70px;
-    }
-    .moinput{
-      width: 250px;
-    }
-    .mobutton{
-      margin-left: 5px;
-    }
   }
   .button_box{
     margin-left: 45%;

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

@@ -33,6 +33,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
+import { sjTime,isNumber } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
   data() {
@@ -40,6 +41,7 @@ export default {
       input:'',
       drawer:false,
       direction:"rtl",
+      batchId:0,
       form1: {},
       options:{
         requestUrl:"/api/v1/tms/getBatchListForAttorney?apiId=375",
@@ -62,31 +64,28 @@ export default {
     },
     currentRadioChange1(selection){
         this.maplist = selection
-        this.form1 = {
-          batchId:selection.shipName + selection.materialName
-                 }
+        this.form1 = { batchId:selection.resultForeignShipName + selection.materialName}
+        this.batchId = selection.batchId;
     },
     handleClose(done){
         done();
     },
      makeSure() {
-      let AmsshipDeliveryNotice = {
       //  purchaseId:this.form1.purchaseId,
-       carrierId:this.form1.carrierId,
       //  noticeId:this.form1.noticeId,
       //  cargoId:this.form1.cargoId,
-       requesterGroupId:this.form1.requesterGroupId,
       //  cargoTransferResultId:this.form1.cargoTransferResultId,
+      let AmsshipDeliveryNotice = {
+       carrierId:this.form1.carrierId,
+       requesterGroupId:this.form1.requesterGroupId,
        noticeCommerceMethod:this.form1.noticeCommerceMethod,
        noticeHandoverMethod:this.form1.noticeHandoverMethod,
        portId:this.form1.portId,
        noticePortConstructionFee:this.form1.noticePortConstructionFee,
-       noticeDeliveryTime:sjTime(
-            this.form1.noticeDeliveryTime
-          ),
+       noticeDeliveryTime:sjTime(this.form1.noticeDeliveryTime),
        noticePileFreeDays:this.form1.noticePileFreeDays,
        noticeDistructionStatus:this.form1.noticeDistructionStatus,
-       batchId:this.maplist.batchId,
+       batchId:this.batchId,
        purchaseContractUnitPrice:this.form1.purchaseContractUnitPrice,
        purchaseContractMoisture:this.form1.purchaseContractMoisture,
        purchaseContractQualityindex:this.form1.purchaseContractQualityindex,
@@ -107,15 +106,13 @@ export default {
         // AmsshipDeliveryAttorney.attorneyPdffile==null
         AmsshipDeliveryNotice.noticeHandoverMethod==null
       ) this.$message.error("存在空值！");
-      else 
+      else
       this.axios
         .post(
           "/api/v1/tms/insertDeliveryNotice",
            AmsshipDeliveryNotice
         )
         .then((res) => {
-        //   console.log(res);
-        //   console.log(this.form4);
           this.$router.go(-1);
         });
     },

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

@@ -44,7 +44,7 @@ export default {
 
   methods: {
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getAmsshipCargoTranferResultList?apiId=66&con=" + this.input;
+      // this.option.requestUrl = "/api/v1/tms/getAmsshipCargoTranferResultList?apiId=66&con=" + this.input;
     },
     addClick() {
       this.$router.push("/addCargoResult/");

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

@@ -128,8 +128,8 @@ export default {
       console.log(tab, event);
     },
     onclick() {
-      this.option.requestUrl =
-        "/api/v1/tms/getAmsshipDeliveryAttroneyList?apiId=73&con=" + this.input;
+      // this.option.requestUrl =
+      //   "/api/v1/tms/getAmsshipDeliveryAttroneyList?apiId=73&con=" + this.input;
     },
     click(pathId) {
       this.$router.push("/path/addDeliveryNotice/" + pathId);

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

@@ -90,8 +90,8 @@ export default {
     //   };
     // },
     onclick() {
-      this.option.requestUrl =
-        "/api/v1/tms/getshipDeliveryNoticeList?apiId=69&con=" + this.input;
+      // this.option.requestUrl =
+      //   "/api/v1/tms/getshipDeliveryNoticeList?apiId=69&con=" + this.input;
     },
     addClick() {
       this.$router.push("/addDeliveryNotice/");

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

@@ -1,20 +1,14 @@
 <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">
+  <!-- 添加货权转移实绩 -->
+  <div class="shipTransport">
+    <page-title>返回</page-title>
+    <div class="form">
+      <div class="form_box">
           <dil-form :formId="137" v-model="form1"></dil-form>
-        </div>
-      </div>
+      </div>        
     </div>
- 
-    <div class="button-box">
+    <!-- 确定和取消 -->
+    <div class="button_box">
       <el-button @click="onClickCancel">返回</el-button>
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
     </div>
@@ -61,24 +55,6 @@ export default {
         resultFreignForwardingInfo: this.form1.resultFreignForwardingInfo,
         resultMemo: this.form1.resultMemo,
       };
-      // function isNumber() {
-      //   var value = AmsshipCargoTransferResult.resultTelephoneFax;
-      //   //验证是否为数字
-      //   var patrn = /^(-)?\d+(\.\d+)?$/;
-      //   if (patrn.exec(value) == null || value == "") {
-      //     return false;
-      //   } else {
-      //     return true;
-      //   }
-      // }
-      // var val = this.value;
-      // if (
-      //   AmsshipCargoTransferResult.resultTelephoneFax==null||
-      //   AmsshipCargoTransferResult.resultContactPerson==null
-      // ) this.$message.error("存在空值！");
-      // else
-      // if (!isNumber(val)) this.$message.error("联系电话必须是数字！");
-      // else
       this.axios
         .post("/api/v1/tms/editCargoTransferResult" ,
          AmsshipCargoTransferResult
@@ -98,6 +74,37 @@ export default {
   },
 };
 </script>
-<style lang="scss" scoped>
-
+<style lang="scss">
+.shipTransport{
+  .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: 45%;
+  }
+}
 </style>

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

@@ -1,20 +1,14 @@
 <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">
+  <div class="shipTransport">
+    <page-title>返回</page-title>
+    <div class="form">
+      <div class="form_box">
           <dil-form :formId="228" v-model="form1"></dil-form>
-        </div>
-      </div>
-    </div>  
- 
-    <div class="button-box">
+      </div>        
+    </div>
+    <!-- 确定和取消 -->
+    <div class="button_box">
       <el-button @click="onClickCancel">返回</el-button>
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
     </div>
@@ -89,6 +83,37 @@ export default {
   },
 };
 </script>
-<style lang="scss" scoped>
-
+<style lang="scss">
+.shipTransport{
+  .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: 45%;
+  }
+}
 </style>

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

@@ -1,20 +1,14 @@
 <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">
+    <div class="shipTransport">
+    <page-title>返回</page-title>
+    <div class="form">
+      <div class="form_box">
           <dil-form :formId="143" v-model="form1"></dil-form>
-        </div>
-      </div>
+      </div>        
     </div>
- 
-    <div class="button-box">
+    <!-- 确定和取消 -->
+    <div class="button_box">
       <el-button @click="onClickCancel">返回</el-button>
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
     </div>
@@ -116,6 +110,37 @@ export default {
 
 
 </script>
-<style lang="scss" scoped>
-
+<style lang="scss">
+.shipTransport{
+  .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: 45%;
+  }
+}
 </style>

src/views/sale/components/transport_appointment/openDistribution.vue

@@ -13,6 +13,9 @@
       <el-button v-if="activeName=='first'" type="primary" @click="receive">
         <i></i>批量接收订单
       </el-button>
+      <el-button v-if="activeName=='first'" type="primary" @click="refuse">
+        <i></i>批量拒绝订单
+      </el-button>
     </div>
     <div class="table">
       <el-tabs v-model="activeName" @tab-click="handleClick">
@@ -186,14 +189,12 @@ export default {
       this.$router.push("/openDistributionSection/" + scope.row.dispatchId);
     },
     // handleBtnClick1(){
-
 		// 		this.drawer=true
 		// 	},
     //车序号订单表格
     currentSelectChange(select){
       this.selectTruckOrder = [];
       this.selectTruckOrder = select;
-      console.log("this.selectTruckOrder",this.selectTruckOrder)
     },
     onclick() {
         this.third.requestUrl =
@@ -323,7 +324,7 @@ export default {
           }
           //所有选中的分派Id
           var dispatchIdList = [];
-          this.selectTruckOrder.forEach((item,i) => {
+          this.selectTruckOrder.forEach((item) => {
               //初始化mapItem
               var mapItem = {
                 //分派Id
@@ -337,7 +338,6 @@ export default {
             carrierSsoId : carrierSsoId,
             mapList : dispatchIdList
           }
-          console.log("map",map)
           //请求后端
           this.axios
             .post("/api/v1/ams/lockDispatchSaleOrderList",map)
@@ -347,7 +347,11 @@ export default {
                   type: "success",
                   message: "接收成功!",
                 });     
-                this.$router.go(0);
+                if(getCookie("orgCode") == "chengyunshang"){
+                  this.first.requestUrl = "/api/v1/ams/getPCDispatchSaleOrderList?apiId=242&dispatchType=0&carrierSsoId="+ getCookie('userId')+"&i="+new Date();
+                }else{
+                this.first.requestUrl = "/api/v1/ams/getPCDispatchSaleOrderList?apiId=242&dispatchType=0&carrierSsoId=" + this.ssoId+"&i="+new Date();
+                }
               } else {
                 this.$message({
                   message: "接单失败,请联系管理员!",
@@ -362,8 +366,55 @@ export default {
             message: "接单操作已取消!",
           });
         });
-
-      
+    },
+    //拒绝所有已选中的订单
+    refuse(){
+      this.$confirm("是否拒绝已选中的订单", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          //所有选中的分派Id
+          var mapList = [];
+          this.selectTruckOrder.forEach((item) => {
+              //初始化mapItem
+              var mapItem = {
+                //分派Id
+                dispatchId : 0,
+              }
+              mapItem.dispatchId = item.dispatchId;
+              mapList.push(mapItem);
+          })
+          //请求后端
+          this.axios
+            .post("/api/v1/ams/refuseDispatchSaleOrderList",mapList)
+            .then((res) => {
+              if (res.data.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "拒绝成功!",
+                });     
+                if(getCookie("orgCode") == "chengyunshang"){
+                  this.first.requestUrl = "/api/v1/ams/getPCDispatchSaleOrderList?apiId=242&dispatchType=0&carrierSsoId="+ getCookie('userId')+"&i="+new Date();
+                }else{
+                this.first.requestUrl = "/api/v1/ams/getPCDispatchSaleOrderList?apiId=242&dispatchType=0&carrierSsoId=" + this.ssoId+"&i="+new Date();
+                }
+              } else {
+                this.$message({
+                  message: "拒绝失败,请联系管理员!",
+                  type: "error",
+                });
+              }
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "拒绝操作已取消!",
+          });
+        });
     }
 
   }

src/views/statisticalReport/components/salesLogisticsStatistics/transportationPerformance.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="purchasFuelNewMonitor">
     <div class="frameCalculation">
-      <span>计毛时间：</span>
+      <span style="width:68px">计毛时间：</span>
       <el-date-picker
         v-model="startTime"
         type="datetime"
@@ -20,9 +20,9 @@
       <el-button type="primary" @click="refresh">
         <i class="el-icon-refresh"></i>刷新
       </el-button>
-      <span style="margin-left: 1rem;">合计净重：</span>
+      <span style="margin-left: 1rem;width:68px">合计净重：</span>
       <el-input v-model="totalNumber" :disabled="true" style="width: 150px;"></el-input>
-      <span style="margin-left: 1rem;">合计车数：</span>
+      <span style="margin-left: 1rem;width:68px">合计车数：</span>
       <el-input v-model="totalCapacity" :disabled="true" style="width: 150px;"></el-input>
     </div>
     <div class="table">