页面样式修改

build/utils.js

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

config/index.js

@@ -74,6 +74,7 @@ let proxyTable = {
   "/views/api/v1": {
     target: "http://172.16.33.166:8080",
     // target: "http://172.16.33.166:8080",
+    // target: "http://192.168.1.115:8080",
     ws: true,
     pathRewrite: {
       "^/views/api/v1": "/api/v1"

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

@@ -1,19 +1,14 @@
 <template>
   <!-- 新增请作业页面 -->
-  <div id="contractDetails">
-    <page-title>请车作业</page-title>
-    <div class="main">
-      <span class="text">新增请车作业</span>
-      <span class="a"></span>
+  <div class="trainTransport">
+    <page-title>返回</page-title>
+    <div class="form">
+      <div class="form_box">
+          <dil-form :formId="122" v-model="form1" ref="from1"></dil-form>
+      </div>   
     </div>
-    <div class="contractTitle">
-      <div class="form-box">
-        <div class="form-one">
-          <dil-form :formId="122" v-model="form1" ></dil-form>
-        </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>
@@ -91,6 +86,37 @@ export default {
   },
 };
 </script>
-<style lang="scss" scoped>
-//@import "@/styles/appoint/contract/ContractInsert.scss";
+<style lang="scss">
+.trainTransport{
+  .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/importedMine/wagonPlease.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">
@@ -147,9 +147,13 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
-.homeworkPath {
+.trainTransport {
   .top {
-    padding: 1.25rem 1.875rem;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
   }
 }
 </style>

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

@@ -1,29 +1,25 @@
 <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-left: 5rem">
-        <el-form ><dil-form :formId="120" 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="120" v-model="form"></dil-form>
       </div>
     </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>
 
@@ -122,18 +118,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/addShipmentInstructions.vue

@@ -1,28 +1,33 @@
 <template>
   <!-- 装船指令新增页面 -->
-  <div id="endMaintenance">
-    <page-title>装船指令新增</page-title>
-    <el-divider content-position="left">新增指令</el-divider>
-     <div class="form-box" style="margin-right: 10rem">
-        <el-form><dil-form :formId="114" v-model="form1" ref="from1"></dil-form></el-form>
-        <div class="buttonins"><el-button type="primary" @click="onDrawer()">浏览</el-button></div>
+  <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>
-      <el-drawer
+      <div class="liulan">
+          <el-button type="primary" class="btn" @click="onDrawer">浏览</el-button>
+      </div>     
+    </div>
+    <!-- 确定和取消 -->
+    <div class="button_box">
+      <el-button @click="cancel">取消</el-button>
+      <el-button type="primary" @click="makeSure">确定</el-button>
+    </div>
+    <!-- 模态框 -->
+    <el-drawer
       :visible.sync="drawer"
       :direction="direction"
       :before-close="handleClose"
-      size="30%"
+      size="35%"
     >
-      <el-input placeholder="请输入内容" v-model="input"  style="margin-top:10px;margin-left:20px" clearable> </el-input>
+      <el-input placeholder="请输入内容" v-model="input"  style="margin-top:10px;margin-left:20px;width:250px" clearable> </el-input>
       <el-button type="primary" class="btn" @click="onclick()"  style="margin-bottom:15px">
         <i class="el-icon-search"></i>查询
       </el-button>
     <dilTable v-bind.sync="options" @radio-change="currentRadioChange1" ></dilTable>
     </el-drawer>
-    <div class="button-box">
-      <el-button @click="cancel">取消</el-button>
-      <el-button type="primary" @click="makeSure">确定</el-button>
-    </div>
   </div>
 </template>
 
@@ -99,8 +104,54 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped>
-.buttonins{
-  height: auto;
+<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;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  .liulan{
+      width: 120px;
+      margin-top: 30px;
+      .el-button{
+        width: 100px !important;
+        margin: auto;
+      }
+      .btn{
+        margin-top: 0px;
+      }
+      .btn1{
+        margin-top: 13px;
+      }
+      .btn2{
+        margin-top: 67px;
+      }
+  }
+  .button_box{
+    margin-left: 45%;
+  }
 }
 </style>

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

@@ -1,39 +1,26 @@
 <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 >
+<!-- 新增卸船作业 -->
+  <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="121" v-model="form"></dil-form>
-          <div style="magin:0 auto">
-              <el-button type="primary" @click="makeSure" >新增卸船作业</el-button>
-          </div>
-          
-        </el-form>
-        
       </div>
     </div>
-  
-    <div class="main">
-      <span class="text">选择船只</span>
-      <span class="a"></span>
+    <div class="button_box">
+        <el-button type="primary" @click="makeSure" >新增卸船作业</el-button>
     </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>
-    <dilTable v-bind.sync="option" @radio-change="currentRadioChange">
-    </dilTable>
-    
   </div>
-  
 </template>
 
 <script>
@@ -122,20 +109,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/addWaterQuality.vue

@@ -1,67 +1,56 @@
 <template>
-  <!-- 船只信息页面 -->
-  <div class="homeworkPath">
-    <page-title>水分质检信息</page-title>
-    <div class="main">
-      <span class="text">水分质检信息新增</span>
-      <span class="a"></span>
+  <!-- 新增水分质检信息 -->
+  <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="128" v-model="form"></dil-form>
+      </div>
     </div>
-    <div>
- <div class="form-box" style="margin-left:0 50rem">
-        <el-form ><dil-form :formId="128" v-model="form"></dil-form>
-         <el-form>
-         <el-form-item>
+    <!-- 下方内容 -->
+    <div class="other">
+      <el-form :inline="true">
+        <el-form-item>
           <label class="el-form-item__label" style="width: auto;">含水率</label>
-          <el-input
-        placeholder=""
-        v-model="resultMoistureContent">
-      </el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-input  placeholder="" v-model="resultMoistureContent"></el-input>
         </el-form-item>
          
-          <el-form-item>
+         <el-form-item>
           <label class="el-form-item__label" style="width: auto;">合同水分值</label>
-          <el-input
-        placeholder=""
-        v-model="contractMoistureValue"
-        :disabled="true">
-      </el-input>
         </el-form-item>
-      <el-form-item>
-      <label class="el-form-item__label" style="width: auto;">实装吨位</label>
-      <el-input
-        placeholder=""
-        v-model="realWeight"
-        :disabled="true">
-      </el-input>
-      </el-form-item>
-    <el-form-item>
-    <label class="el-form-item__label" style="width: auto;">水分吨位</label>
-      <el-input
-        placeholder=""
-        v-model="moistureTonnage"
-        :disabled="true">
-      </el-input>
-    </el-form-item>
-      </el-form>
-        <el-button type="primary" @click="makeSure">新增水分质检信息</el-button>
-        </el-form>
-      </div>
+        <el-form-item>
+          <el-input placeholder="" v-model="contractMoistureValue" :disabled="true"></el-input>
+        </el-form-item>
 
-     <div class="main">
-      <span class="text">选择船只</span>
-      <span class="a"></span>
-    </div>
+        <el-form-item>
+          <label class="el-form-item__label" style="width: auto;">实装吨位</label>
+        </el-form-item>
+        <el-form-item>
+          <el-input placeholder="" v-model="realWeight" :disabled="true"></el-input>
+        </el-form-item>
 
-     <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-form-item>
+          <label class="el-form-item__label" style="width: auto;">水分吨位</label>
+        </el-form-item>
+        <el-form-item>
+          <el-input placeholder="" v-model="moistureTonnage" :disabled="true"></el-input>
+        </el-form-item>
+      </el-form>
+        <el-button type="primary" @click="makeSure">新增水分质检信息</el-button>
     </div>
-
-    <dilTable v-bind.sync="option" @radio-change="currentRadioChange">
-    </dilTable>
-  </div>
+    
   </div>
 </template>
 
@@ -183,17 +172,66 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
-.homeworkPath{
-    .main{
-    margin-bottom: 0.125rem;
-  }
-  .button-ins{
-    margin: 0 50rem; 
-    text-align: center
+.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%;
+  }
+  .other{
+    width: 320px;
+      margin-left: 35%;
+      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;
+              }
+            }
+          }
+        }
+      }
   }
 }
 </style>

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

@@ -1,13 +1,13 @@
 <template>
   <!-- 驳船作业页面 -->
-  <div class="homeworkPath">
+  <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-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>
     </div>
     <dilTable v-bind.sync="option">
@@ -97,9 +97,13 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
-.homeworkPath {
+.shipTransport {
   .top {
-    padding: 1.25rem 1.875rem;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
   }
 }
 </style>

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

@@ -1,13 +1,13 @@
 <template>
   <!-- 装船作业页面 -->
-  <div class="homeworkPath">
+  <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-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>
     </div>
     <dilTable v-bind.sync="option">
@@ -85,9 +85,13 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
-.homeworkPath {
+.shipTransport {
   .top {
-    padding: 1.25rem 1.875rem;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
   }
 }
 </style>

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

@@ -1,11 +1,11 @@
 <template>
   <!-- 水路货物运单页面 -->
-  <div class="homeworkPath">
+  <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-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
     </div>
     <dilTable v-bind.sync="option">
     </dilTable>
@@ -38,9 +38,13 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
-.homeworkPath {
+.shipTransport {
   .top {
-    padding: 1.25rem 1.875rem;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
   }
 }
 </style>

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

@@ -1,12 +1,13 @@
 <template>
   <!-- 装船指令页面 -->
-  <div class="homeworkPath">
+  <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-button type="primary" @click="btnclick(0)"> 新增 </el-button>
+      <el-button type="primary" @click="btnclick(0)">
+        <i class="el-icon-circle-plus-outline"></i>新增</el-button>
     </div>
     <el-tabs v-model="activeName"  @tab-click="handleClick">
       <!-- 未下发 -->
@@ -44,8 +45,6 @@
         <dilTable v-bind.sync="option2"></dilTable>
       </el-tab-pane>
     </el-tabs>
-      
-    </dilTable>
   </div>
 </template>
 
@@ -141,9 +140,13 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
-.homeworkPath {
+.shipTransport {
   .top {
-    padding: 1.25rem 1.875rem;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
   }
 }
 </style>

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

@@ -1,13 +1,13 @@
 <template>
   <!-- 卸船作业页面 -->
-  <div class="homeworkPath">
+  <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-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>
     </div>
     <dilTable v-bind.sync="option">
@@ -85,9 +85,13 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
-.homeworkPath {
+.shipTransport {
   .top {
-    padding: 1.25rem 1.875rem;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
   }
 }
 </style>

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

@@ -1,13 +1,13 @@
 <template>
   <!-- 水分质检页面 -->
-  <div class="homeworkPath">
+  <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-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>
     </div>
     <dilTable v-bind.sync="option">
@@ -85,9 +85,13 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
-.homeworkPath {
+.shipTransport {
   .top {
-    padding: 1.25rem 1.875rem;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
   }
 }
 </style>

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

@@ -49,8 +49,8 @@ export default {
   methods:{
     onclick(){
        //改变查询条件
-      this.$refs.tab.setDataRequestQuery({"startTime":this.queryDate[0],
-                      "endTime": this.queryDate[1]
+      this.$refs.tab.setDataRequestQuery({"startTime":sjTime(this.queryDate[0]),
+                      "endTime":sjTime(this.queryDate[1]) 
                       });         
     },
     getToday() {

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

@@ -19,9 +19,13 @@
       <!-- <el-button type="primary" @click="refresh">
         <i class="el-icon-refresh"></i>刷新
       </el-button> -->
+      <span style="margin-left: 1rem;">总件数：</span>
+      <el-input v-model="totalNumber" :disabled="true" style="width: 150px;"></el-input>
+      <span style="margin-left: 1rem;">总重量：</span>
+      <el-input v-model="totalWeight" :disabled="true" style="width: 150px;"></el-input>
     </div>
     <div class="table">
-      <dilTable v-bind.sync="option" >
+      <dilTable v-bind.sync="option" @func="func">
       </dilTable>
     </div>
   </div>
@@ -35,6 +39,8 @@ export default {
       textInput:"",
       startTime: null,
       endTime: null,
+      totalNumber:0,
+      totalWeight:0,
       option:{
         // first请求数据的地址
         requestUrl: "/api/v1/wms/getWmsOutboundResultStatistics?apiId=446&warehouseId="+3+"&startTime=null&endTime=null&i=" +new Date()+"&con="+this.textInput,
@@ -45,6 +51,18 @@ export default {
       refresh(){
       this.$router.go(0);
     },
+    func(res){
+      console.log(res)
+      var total1 = 0
+      var total2 = 0
+      res.list.forEach(e => {
+        total1 = total1+e.coun
+        total2 = total2+e.theoreticalWeight
+      });
+  
+      this.totalNumber = total1
+      this.totalWeight = total2
+    },
    onclick() {
      console.log("textInput",this.textInput);
       let startTime = null;

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

@@ -1,5 +1,5 @@
 <template>
-  <!-- 添加汽运单价 -->
+  <!-- 添加汽运单价 111-->
   <div class="addTransportPrice">
     <page-title>新增</page-title>
     <div class="form">

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

@@ -1,51 +1,46 @@
 <template>
   <!-- 添加货权转移实绩 -->
-  <div class="addWagonLoad">
-    <PageTitle>返回</PageTitle>
-    <el-divider content-position="left">货权转移</el-divider>
-    <div class="form-box" style="margin-right: 10rem">
-      <dil-form :formId="109" v-model="form1" ref="from1"></dil-form>
+  <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="form-box f1">
-      <el-form :inline="true" class="demo-form-inline">
-        <el-form-item label="物资">
-          <el-input v-model="materialName" disabled> </el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="ondrawer(1)">浏览</el-button>
-        </el-form-item>
-      </el-form>
+    <!-- 物资 -->
+    <div class="mofrom">
+      <span class="motext">物资</span>
+      <el-input class="moinput" v-model="materialName" disabled> </el-input>
+      <el-button class="mobutton" type="primary" @click="ondrawer(1)">浏览</el-button>
     </div>
-    <div class="form-box f2">
-      <el-form :inline="true" class="demo-form-inline">
-        <el-form-item label="货权转移送达单位">
-          <el-input v-model="cargo" disabled> </el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="ondrawer(2)">浏览</el-button>
-        </el-form-item>
-      </el-form>
+    <!-- 货权转移送达单位 -->
+    <div class="mofrom">
+      <span class="motext">货权转移送达单位</span>
+      <el-input class="moinput" v-model="cargo" disabled> </el-input>
+      <el-button class="mobutton" type="primary" @click="ondrawer(2)">浏览</el-button>
     </div>
-    <div class="form-box f3">
-      <el-form :inline="true" class="demo-form-inline">
-        <el-form-item label="收货人">
-          <el-input v-model="receiver" disabled> </el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="ondrawer(3)">浏览</el-button>
-        </el-form-item>
-      </el-form>
+    <!-- 货权转移送达单位 -->
+    <div class="mofrom">
+      <span class="motext">收货人</span>
+      <el-input class="moinput" v-model="receiver" disabled> </el-input>
+      <el-button class="mobutton" type="primary" @click="ondrawer(3)">浏览</el-button>
     </div>
+    <!-- 确定和取消 -->
+    <div class="button_box">
+      <el-button @click="cancel">取消</el-button>
+      <el-button type="primary" @click="makeSure">确定</el-button>
+    </div>
+    <!-- 模态框 -->
     <el-drawer
       :visible.sync="drawer"
       :direction="direction"
       :before-close="handleClose"
-      size="30%"
+      size="50%"
     >
       <el-input
         placeholder="请输入内容"
         v-model="input"
-        style="margin-top: 10px; margin-left: 20px"
+        style="margin-top: 10px; margin-left: 20px; width:250px"
         clearable
       >
       </el-input>
@@ -76,10 +71,6 @@
         ></dilTable>
       </div>
     </el-drawer>
-    <div class="button-box">
-      <el-button @click="cancel">取消</el-button>
-      <el-button type="primary" @click="makeSure">确定</el-button>
-    </div>
   </div>
 </template>
 <script>
@@ -196,64 +187,53 @@ export default {
   },
 };
 </script>
-<style lang='scss' scoped>
-.form-box {
-  padding: 20px 30px;
-  margin-left: 330px;
-}
-.button-box {
-  padding: 20px 30px;
-  margin-left: 460px;
-}
-.btn-left {
-  margin-left: 470px;
-}
-.input {
-  margin-left: 90px;
-}
-.label {
-  margin-left: 445px;
-  margin-bottom: -30px;
-  font: bold;
-  font-size: 1rem;
-  padding-left: -30px;
-  font-family: Arial, Helvetica, sans-serif;
-  margin-bottom: 20px;
-}
-.label2 {
-  margin-left: 425px;
-  margin-bottom: -30px;
-  font: bold;
-  font-size: 1rem;
-  font-family: Arial, Helvetica, sans-serif;
-}
-.label1 {
-  margin-left: 345px;
-  margin-bottom: -30px;
-  font: bold;
-}
-.common {
-  font-weight: 700;
-  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen,
-    Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
-  font-size: 1rem;
-  cursor: default;
-  color: #2c3e50;
-}
-.f1 {
-  margin-top: -2.5rem;
-  margin-left: 26rem;
-}
-.f11 {
-  margin-top: -3rem;
-  // margin-left: 29rem;
-}
-.f2 {
-  margin-top: -2.5rem;
-  margin-left: 20.7rem;
-}
-.f3 {
-  margin-top: -2.5rem;
-  margin-left: 25rem;
+<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;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  .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%;
+  }
 }
 </style>

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

@@ -1,28 +1,33 @@
 <template>
   <!-- 添加发货通知 -->
-  <div class="addWagonLoad">
-    <PageTitle>返回</PageTitle>
-    <el-divider content-position="left">发货通知单</el-divider>
-     <div class="form-box" style="margin-right: 10rem">
-       <el-form><dil-form :formId="112" v-model="form1" ref="from1" @change="onchange"></dil-form></el-form>
-       <div class="buttonins"><el-button type="primary" @click="onDrawer">浏览</el-button></div> 
+  <div class="shipTransport">
+    <page-title>返回</page-title>
+    <div class="form">
+      <div class="form_box">
+          <dil-form :formId="112" v-model="form1" ref="from1" @change="onchange"></dil-form>
+      </div>
+      <div class="liulan">
+          <el-button type="primary" class="btn" @click="onDrawer">浏览</el-button>
+      </div>     
     </div>
+    <!-- 确定和取消 -->
+    <div class="button_box">
+      <el-button @click="cancel">取消</el-button>
+      <el-button type="primary" @click="makeSure">确定</el-button>
+    </div>
+    <!-- 模态框 -->
     <el-drawer
       :visible.sync="drawer"
       :direction="direction"
       :before-close="handleClose"
-      size="30%"
+      size="50%"
     >
-      <el-input placeholder="请输入内容" v-model="input"  style="margin-top:10px;margin-left:20px" clearable> </el-input>
+      <el-input placeholder="请输入内容" v-model="input"  style="margin-top:10px;margin-left:20px;width:250px" clearable> </el-input>
       <el-button type="primary" class="btn" @click="onclick()"  style="margin-bottom:15px">
         <i class="el-icon-search"></i>查询
       </el-button>
     <dilTable v-bind.sync="options" @radio-change="currentRadioChange1" ></dilTable>
     </el-drawer>
-    <div class="button-box">
-      <el-button @click="cancel">取消</el-button>
-      <el-button type="primary" @click="makeSure">确定</el-button>
-    </div>
   </div>
 </template>
 
@@ -121,9 +126,54 @@ export default {
   },
 };
 </script>
-<style lang='scss' scoped>
-
-.buttonins{
-  height: auto;
+<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;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  .liulan{
+      width: 120px;
+      margin-top: 30px;
+      .el-button{
+        width: 100px !important;
+        margin: auto;
+      }
+      .btn{
+        margin-top: 0px;
+      }
+      .btn1{
+        margin-top: 13px;
+      }
+      .btn2{
+        margin-top: 67px;
+      }
+  }
+  .button_box{
+    margin-left: 45%;
+  }
 }
 </style>

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

@@ -1,6 +1,6 @@
 <template>
-  <!-- 作业路径页面 -->
-  <div class="homeworkPath">
+  <!-- 货权转移页面 -->
+  <div class="shipTransport">
     <div class="top">
      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
  <el-button type="primary" class="btn" @click="onclick">
@@ -84,9 +84,13 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
-.homeworkPath {
+.shipTransport {
   .top {
-    padding: 1.25rem 1.875rem;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
   }
 }
 </style>

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

@@ -1,6 +1,6 @@
 <template>
   <!-- 提货委托页面 -->
-  <div class="homeworkPath">
+  <div class="shipTransport">
     <div class="top">
       <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
       
@@ -182,9 +182,13 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
-.homeworkPath {
+.shipTransport {
   .top {
-    padding: 20px 30px;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
   }
 }
 </style>

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

@@ -1,6 +1,6 @@
 <template>
   <!-- 发货通知页面 -->
-  <div class="homeworkPath">
+  <div class="shipTransport">
     <div class="top">
       <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
       
@@ -170,9 +170,13 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
-.homeworkPath {
+.shipTransport {
   .top {
-    padding: 20px 30px;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
   }
 }
 </style>

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

@@ -505,9 +505,11 @@ export default {
         requirementWorkEnvironment: this.form.requirementWorkEnvironment,
         requirementWorkType: this.form.requirementWorkType,
         requirementShipperId: this.shipperId,
+        DueTime:sjTime(this.form.DueTime),
         mapList:this.tableData,
         orgCode:getCookie("orgCode")
       };
+      console.log("requirement",requiremnet);
       this.axios
         .post("/api/v1/ams/addTruckRequirement", requiremnet)
         .then(res => {

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

@@ -2,14 +2,6 @@
   <div class="purchasFuelNewMonitor">
     <div class="frameCalculation">
       <span>计毛时间：</span>
-      <!-- <el-date-picker
-        v-model="Time"
-        :editable="true"
-        type="datetimerange"
-        range-separator="至"
-        start-placeholder="开始日期"
-        end-placeholder="结束日期">
-      </el-date-picker> -->
       <el-date-picker
         v-model="startTime"
         type="datetime"
@@ -41,6 +33,7 @@
 
 <script>
 import { sjTime } from '@/utils/sharedJsFile'
+import { getCookie } from "@/utils/util.js";
 export default {
   data() {
     return {
@@ -49,7 +42,7 @@ export default {
       pageSize:100,
       isKuang:false,
       option: {
-        requestUrl: "/api/v1/tms/getAllSaleReport?apiId=423&startTime=null&endTime=null&i=" +new Date(),
+        requestUrl: "",
       },
       startTime:null,
       endTime:null,
@@ -61,10 +54,19 @@ export default {
     };
   },
   created(){
-      const start = new Date(new Date(new Date().toLocaleDateString()).getTime());
-      var startTime = this.dataFormat(sjTime(start));
-      var endTime = this.dataFormat(sjTime(new Date()));
-      this.tableTitle = startTime + ' 至 ' + endTime;
+    //初始化表头
+    if (getCookie("orgCode") == "chengyunshang") {
+      this.option.requestUrl =
+        "/api/v1/tms/getAllSaleReport?apiId=423&startTime=null&endTime=null&carrierSsoId=" + getCookie("userId") +"&i=" +new Date();
+    } else {
+      this.option.requestUrl =
+        "/api/v1/tms/getAllSaleReport?apiId=423&startTime=null&endTime=null&carrierSsoId=" + null +"&i=" +new Date();
+    }
+    //时间段初始化
+    const start = new Date(new Date(new Date().toLocaleDateString()).getTime());
+    var startTime = this.dataFormat(sjTime(start));
+    var endTime = this.dataFormat(sjTime(new Date()));
+    this.tableTitle = startTime + ' 至 ' + endTime;
   },
   methods: {
     refresh(){
@@ -82,10 +84,6 @@ export default {
       // this.totalCapacity = res.total;
       this.isKuang = false;
     },
-    // requestQuery(q){
-    //   //调用获取总净重方法
-    //   this.calculationTotalNumber(q);
-    // },
     onclick() {
       let startTime = null;
       let endTime = null;
@@ -94,42 +92,30 @@ export default {
         endTime = sjTime(this.endTime);
         //修改报表名称
         this.tableTitle = this.dataFormat(startTime) + ' 至 ' + this.dataFormat(endTime);
-        this.option.requestUrl = "/api/v1/tms/getAllSaleReport?apiId=423&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+        //加上时间重置表头
+        if (getCookie("orgCode") == "chengyunshang") {
+          this.option.requestUrl =
+            "/api/v1/tms/getAllSaleReport?apiId=423&startTime=" + startTime + "&endTime=" + endTime + "&carrierSsoId=" + getCookie("userId") +"&i=" +new Date();
+        } else {
+          this.option.requestUrl =
+            "/api/v1/tms/getAllSaleReport?apiId=423&startTime=" + startTime + "&endTime=" + endTime + "&carrierSsoId=" + null +"&i=" +new Date();
+        }
       }else{
         if(this.startTime){
           startTime = sjTime(this.startTime);
         }else if(this.endTime){
           endTime = sjTime(this.endTime);
         }
-        this.option.requestUrl = "/api/v1/tms/getAllSaleReport?apiId=423&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+        //加上时间重置表头
+        if (getCookie("orgCode") == "chengyunshang") {
+          this.option.requestUrl =
+            "/api/v1/tms/getAllSaleReport?apiId=423&startTime=" + startTime + "&endTime=" + endTime + "&carrierSsoId=" + getCookie("userId") +"&i=" +new Date();
+        } else {
+          this.option.requestUrl =
+            "/api/v1/tms/getAllSaleReport?apiId=423&startTime=" + startTime + "&endTime=" + endTime + "&carrierSsoId=" + null +"&i=" +new Date();
+        }
       }
     },
-    // //获取当前条件下的总净重
-    // calculationTotalNumber(dataRequestQuery){
-    //   //初始化时间
-    //   let startTime = null;
-    //   let endTime = null;
-    //   if(this.Time != null){
-    //     startTime = sjTime(this.Time[0]);
-    //     endTime = sjTime(this.Time[1]);
-    //   }
-    //   //放入子组件筛选的值
-    //   let mapValue = undefined;
-    //       for (const key in dataRequestQuery) {
-         
-    //         const val = dataRequestQuery[key];
-    //         if (val||val==0) {
-             
-    //           if (!mapValue) mapValue = {};
-            
-    //           mapValue[key] = val;
-    //         }
-    //       }
-    //   this.axios.post("/api/v1/tms/getAllSaleReportTotal?startTime=" + startTime +"&endTime="+ endTime +"&i=" +new Date(),mapValue)
-    //   .then((res) => {
-    //       this.totalNumber = res.data.data;
-    //     });  
-    // },
     //格式化日期
     dataFormat(value){
       let date = new Date(value);