前端gjy

public/index.html

@@ -14,9 +14,11 @@
 
   <!-- 如果有安装 Google Chrome Frame 插件则强制为Chromium内核，否则强制本机支持的最高版本IE内核，作用于IE浏览器 -->
   <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" />
-  <link rel="manifest" href="<%= BASE_URL %>/manifest.json" />
+  <!-- <link rel="manifest" href="<%= BASE_URL %>/manifest.json" /> -->
   <link rel="icon" href="<%= BASE_URL %>logo.ico">
-
+  <% for (var i in htmlWebpackPlugin.options.cdn && htmlWebpackPlugin.options.cdn.css[process.env.VUE_APP_PACKAGE_ENV]) { %>
+      <link href="<%= htmlWebpackPlugin.options.cdn.css[process.env.VUE_APP_PACKAGE_ENV][i] %>" rel="stylesheet">
+  <% } %>
   <title>易粮易运</title>
   <% if (process.env.NODE_ENV === 'production') { %>
     <script>

src/views/taskManagement/inOutWarehouseTaskEdit.vue

@@ -25,10 +25,10 @@
         <el-radio label="4">退库并出库</el-radio>-->
       </el-radio-group>
       <div class="nav">
-      <span class="ziti">
-        任务类型：
-        <h1 class="ziti1">{{dataList.inOutType}}</h1>
-      </span>
+        <span class="ziti">
+          任务类型：
+          <h1 class="ziti1">{{dataList.inOutType}}</h1>
+        </span>
       </div>
       <div class="nav2"></div>
       <div v-if="dataList.taskTypeKey != 2" class="center1">
@@ -912,27 +912,27 @@ export default {
   background: #e8ecf6;
   margin-top: 15px;
 }
-.ziti[data-v-492ee0c6] {
-    width: 72px;
-    height: 20px;
-    font-size: 14px;
-    font-family: PingFangSC-Regular, PingFang SC;
-    font-weight: 400;
-    color: #8890b1;
-    line-height: 20px;
-    margin-left: 130px;
-    /* margin-top: 112px; */
+.ziti {
+  width: 72px;
+  height: 20px;
+  font-size: 14px;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #8890b1;
+  line-height: 20px;
+  margin-left: 130px;
+  /* margin-top: 112px; */
 }
 /deep/.ziti1 {
-    height: 40px;
-    font-size: 16px;
-    font-family: PingFangSC-Medium, PingFang SC;
-    font-weight: 500;
-    color: #262626;
-    line-height: 20px;
-    margin-left: 206px;
-    margin-top: -23px;
-    width: 100px;
+  height: 40px;
+  font-size: 16px;
+  font-family: PingFangSC-Medium, PingFang SC;
+  font-weight: 500;
+  color: #262626;
+  line-height: 20px;
+  margin-left: 206px;
+  margin-top: -23px;
+  width: 100px;
 }
 .winseaview-view {
   padding: 0 0 20px;
@@ -960,7 +960,7 @@ export default {
   color: #232323;
   line-height: 14px;
 }
-.nav{
+.nav {
   width: 200px;
   height: 20px;
 }

src/views/taskManagement/tranManagementTransport.vue

@@ -1,8 +1,16 @@
 <!--运输任务-->
 <template>
   <div>
-    <BaseHeaderLayout :leftSpan="15">
-      <template slot="left">
+    <BaseHeaderLayout :leftSpan="12">
+    <template slot="left">
+        <ws-button class="but" type="primary" @click="handleAdd()"
+        v-hasPermission="
+           `transportationTask.transportation.transportationInfo.add`
+          "
+          >添加</ws-button
+        >
+      </template>
+      <template slot="right">
         <span style="width: 134px; display: inline-block">起点：</span>
         <el-input
           label="起点"
@@ -44,14 +52,7 @@
           /></ws-button>
         </div>
       </template>
-      <template slot="right">
-        <ws-button class="but" type="primary" @click="handleAdd()"
-        v-hasPermission="
-           `transportationTask.transportation.transportationInfo.add`
-          "
-          >添加</ws-button
-        >
-      </template>
+      
     </BaseHeaderLayout>
     <div>
       <ws-button
@@ -588,11 +589,12 @@ export default {
   text-align: center;
 }
 .findValue.el-input {
-  width: 50%;
+  width: 100%;
   margin: 0;
 }
 .el-input {
   margin: 0 10px;
+  width: 70%;
 }
 /deep/.search .el-button--small {
   padding: 0;

src/views/taskManagement/tranManagementWarehouseInOutTaskEdit.vue

@@ -29,7 +29,12 @@
         <el-radio label="3" class="a">移库</el-radio>
         <el-radio label="4" class="a">退库并出库</el-radio> -->
       </el-radio-group>
-        <span class="ziti">任务类型：<b><h1 class="ziti1">{{dataList.inOutType}}</h1></b></span>
+        <div class="nav">
+        <span class="ziti">
+          任务类型：
+          <h1 class="ziti1">{{dataList.inOutType}}</h1>
+        </span>
+      </div>
       </div>
       <div class="ding"></div>
        <div v-if="dataList.taskTypeKey != 2&&dataList.taskTypeKey != 4" class="center1">
@@ -1407,26 +1412,26 @@ export default {
   background: #E8ECF6;
   box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.1);
 }
-.ziti{
-  width: 70px;
+.ziti {
+  width: 72px;
   height: 20px;
   font-size: 14px;
   font-family: PingFangSC-Regular, PingFang SC;
   font-weight: 400;
-  color: #8890B1;
+  color: #8890b1;
   line-height: 20px;
-  margin-left: 80px;
-  margin-top: 5px;
+  margin-left: 130px;
+  /* margin-top: 112px; */
 }
-.ziti1{
-  font-size: 16px;
-  font-family: PingFangSC-Medium, PingFang SC;
-  font-weight: 500;
-  color: #262626;
-  line-height: 22px;
-  margin-left: 240px;
-  margin-top: -27px;
-
+.ziti1 {
+    width: 100px;
+    font-size: 16px;
+    font-family: PingFangSC-Medium, PingFang SC;
+    font-weight: 500;
+    color: #262626;
+    line-height: 22px;
+    margin-left: 197px;
+    margin-top: -22px;
 }
 .winseaview-view {
   padding: 0 0 20px;
@@ -1435,4 +1440,8 @@ export default {
   overflow: scroll;
   height: 93vh;
 }
+.nav {
+  width: 200px;
+  height: 20px;
+}
 </style>

src/views/tranManagement/component/routers/route.js

@@ -75,7 +75,7 @@ const tranManagementRouter = {
     },
     //船运调度详情
     {
-      path: 'shippingDispatching/view',
+      path: 'tshippingDispatching/view',
       component: () =>
         import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementShippingLook'),
       name: 'tshippingDispatchingview',
@@ -312,4 +312,4 @@ const tranManagementRouter = {
     },
   ],
 };
-export default tranManagementRouter;
+export default tranManagementRouter;  

src/views/tranManagement/tranManagementDriver.vue

@@ -2,10 +2,10 @@
 <template>
   <div>
     <BaseHeaderLayout :leftSpan="12">
-      <template slot="right">
+      <template slot="left">
         <ws-button type="primary" @click="handleAdd()">添加</ws-button>
       </template>
-      <template slot="left">
+      <template slot="right">
         <span style="display: inline-block; width: 60px; color: #8890b1"
           >城市</span
         >
@@ -26,7 +26,6 @@
           type="input"
           class="findValue"
         ></ws-input>
-
         <ws-button type="primary" @click="handleLook()">
           <img
             width="14"
@@ -323,26 +322,6 @@
       <p>查看附件</p>
       <img width="100" height="100" :src="accessurl" alt="" />
     </WinseaContentModal>
-    <!-- <WinseaContentModal
-      v-model="accessoryTFs"
-      :title="$t('system.noticeCircular.information')"
-      @on-cancel="handleClose"
-    >
-      <el-upload
-        class="upload-demo"
-        action="https://jsonplaceholder.typicode.com/posts/"
-        :file-list="fileList"
-        list-type="picture"
-        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
-      >
-        <el-button size="small" type="primary">点击上传</el-button>
-        <template #tip>
-          <div class="el-upload__tip">
-            只能上传 jpg/png 文件，且不超过 500kb
-          </div>
-        </template>
-      </el-upload>
-    </WinseaContentModal> -->
   </div>
 </template>
 <script>
@@ -353,7 +332,6 @@ import {
   disableDriver,
 } from '@/model/transport/index'
 import Pagination from '@/components/Pagination'
-// provinceAndCityData省市二级
 import { provinceAndCityData, CodeToText } from 'element-china-area-data'
 import WsUpload from '@/components/WsUpload'
 import { dayjs, fmoney, EventBus } from 'base-core-lib'

src/views/tranManagement/tranManagementReceivingFeedback.vue

@@ -1,4 +1,4 @@
-//收获反馈
+//收货反馈
 <template>
   <div>
     <BaseHeaderLayout :leftSpan="13">
@@ -12,10 +12,10 @@
       <!-- 接单开始 -->
       <template slot="right">
        <div>
-          <span style="display: inline-block; width: 239px;color: #8890B1;">接单日期</span>
+          <span style="display: inline-block; width: 60px;color: #8890B1;">接单日期</span>
         </div>
         <el-date-picker
-          v-model="deptBudgetList.inOutDate"
+          v-model="inOutDate"
           type="daterange"
           align="right"
           unlink-panels
@@ -53,8 +53,8 @@
       <el-table
         class="wenzi"
         :data="warehouseList.records"
-        style="width: 100%; margin-top: 20px"
-        height="650"
+        style="width: 100%;"
+        height="780"
       >
         <el-table-column type="index" label="序号" width="80">
           <template scope="scope">
@@ -110,7 +110,7 @@
                 </span>
               </template>
           <div>
-              <p style="margin-top: 0; padding-left: 10px">XXXXX</p>
+              <p style="margin-top: 0; padding-left: 10px">历史记录</p>
               <div v-for="(item, index) in historyList" class="flex">
                 <div class="vertical-text vertical-text-left">
                   {{ item.updateDate }}
@@ -225,6 +225,7 @@ export default {
       deptBudgetList: {},
       historyList: [],
       value2:'',
+      inOutDate:[],
       pickerOptions:[],
       pickerBeginDateBefore: {
         disabledDate: (time) => {
@@ -245,6 +246,9 @@ export default {
         currentPage: this.currentPage,
         pageSize: this.pageSize,
         feedbackFlag: this.feedbackFlag,
+         startDate: this.startDate ,
+        endDate:this.endDate,
+        searchKeyWord : this.searchKeyWord
         
       })
         .toPromise()
@@ -435,6 +439,13 @@ export default {
         })
     },
     find() {
+     if (this.inOutDate.length > 0) {
+        this.startDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[0])
+        this.endDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[1])
+      } else {
+        this.startDate = ''
+        this.endDate = ''
+      }
       this.currentPage = 1
       this.getList()
     },
@@ -512,15 +523,14 @@ export default {
     margin-top: 80px;
 }
 .but{
-    margin-top: 150px;
-    margin-left: 110px;
+    margin-left: 6px;
 }
 .el-input--small .el-input__inner{
     margin-left: 20px;
 }
 .el-range-editor--small.el-input__inner {
     height: 32px;
-    margin-left: -20%;
+    margin: 0 10px;
 }
 //状态样式
 .executory,
@@ -550,4 +560,12 @@ export default {
     position: relative;
     font-size: 14px;
 }
+/deep/.el-pagination {
+    text-align: center;
+    white-space: nowrap;
+    padding: 2px 5px;
+    color: #303133;
+    font-weight: 700;
+    margin-bottom: 20px;
+}
 </style>

src/views/tranManagement/tranManagementReceivingloading.vue

@@ -133,24 +133,36 @@
               </ws-form-item>
               <!--磅单-->
               <ws-form-item label="磅单：" span="1" prop="loadPoundImg">
-                <template slot-scope="scope">
-                  <img
+              <template slot-scope="scope">
+                <el-upload
+                  action="https://www.zthymaoyi.com/upload/admin"
+                  :show-file-list="false"
+                  :on-success="
+                    (res, file) => {
+                      uploadSuccessHandle1(index, res, file)
+                    }
+                  "
+                  class="avatar-uploader"
+                  accept=".jpg, .jpeg, .png, .gif"
+                  ><img
                     width="18"
                     height="20"
                     style="
-                    vertical-align: text-top;
-                    position: relative;
-                    top: -1px;
-                  "
+                      vertical-align: text-top;
+                      position: relative;
+                    "
                     src="../../../public/img/fujian.png"
-                    @click="fujian(scope.row)"
-                    alt
+                    alt=""
                   />
-                  <span
-                    v-if="scope.row.loadPoundImgArray.length >0"
-                  >{{scope.row.loadPoundImgArray.length}}</span>
-                </template>
-              </ws-form-item>
+                </el-upload>
+                <div v-show="item.temporaryDriverFlag == 0 && item.signStatus == '未签合同'" class="signStatus">
+                  {{ item.signStatus }}
+                </div>
+                <div v-show="item.temporaryDriverFlag == 0 && item.signStatus == '已签合同'" class="signStatus1">
+                  {{ item.signStatus }}
+                </div>
+              </template>
+            </ws-form-item>
             </ws-info-table>
           </div>
           <div
@@ -167,7 +179,7 @@
 <script>
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
-import { seeCat, packList, feedback } from '@/model/transport/index'
+import { seeCat, packList, feedback,getbank } from '@/model/transport/index'
 // import { dayjs, fmoney, EventBus } from 'base-core-lib'
 import { dayjs, EventBus } from 'base-core-lib'
 export default {
@@ -235,7 +247,7 @@ export default {
     total: function() {
       var maxStorage = 0
       for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
-        maxStorage == Number(this.deptBudgetList.tranCarInfoList[i].loadWeight)
+        maxStorage += Number(this.deptBudgetList.tranCarInfoList[i].unloadNetWeight)
       }
       return maxStorage
     }
@@ -254,15 +266,21 @@ export default {
         this.deptBudgetList.tranCarInfoList.splice(index, 1)
       }
     },
-    fujian(row) {
-      if (row.loadPoundImg === null || row.loadPoundImg === '') {
-        EventBus.$emit(
-          'warning',
-          this.$t('system.noticeCircular.NoInformation')
-        )
-      } else {
-        this.accessoryTFs = true
-      }
+    uploadSuccessHandle1(index, e, fileList) {
+      const that = this
+      getbank({ bankImg: e.url })
+        .toPromise()
+        .then((response) => {
+          for (var i = 0; i < this.freightspace1.length; i++) {
+            if (i == index) {
+              this.freightspace1[i].payeeAddressUrl = e.url
+              this.freightspace1[i].bankCard = response.bankNo
+              this.freightspace1[i].bankDeposit = response.bankName
+              this.freightspace1[i].bankDepositBranchList =
+                response.bankNameZhihang
+            }
+          }
+        })
     },
     selectwaterContent() {},
     //提交按钮
@@ -294,6 +312,7 @@ export default {
               this.tranCarInfoList.loadNetWeight = this.deptBudgetList.loadNetWeight
               this.tranCarInfoList.tranType = this.tranType
               this.tranCarInfoList.loadPoundImg = this.deptBudgetList.loadPoundImg
+              this.tranCarInfoList.unloadNetWeight = this.deptBudgetList.unloadNetWeight
               for (var i = 0; i < this.tranCarInfoList.length; i++) {
                 this.tranCarInfoList[i].id = this.freightspace[i].id
                 if (this.tranCarInfoList[i].temporaryDriverFlag != 0) {

src/views/tranManagement/tranManagementReceivingloadingLook.vue

@@ -764,6 +764,7 @@ export default {
   background: #F6F7FC;
 border-radius: 4px;
 border: 1px solid #D8DCE6;
+margin-top: 20px;
 }
 .catNos{
   width: 100%;

src/views/tranManagement/tranManagementShipping.vue

@@ -3,26 +3,25 @@
   <div>
     <BaseHeaderLayout :leftSpan="12">
       <template slot="left">
-        <ws-button class="but" @click="statusquery(1)">
-          执行中</ws-button
-        >
+        <ws-button class="but" @click="statusquery(1)"> 执行中</ws-button>
         <ws-button class="but" @click="statusquery(2)">已完成</ws-button>
         <ws-button class="but" @click="statusquery()">全部任务</ws-button>
       </template>
       <!-- 接单开始 -->
       <template slot="right">
         <div>
-        <span style="display: inline-block; width: 239px;color: #8890B1;">接单日期</span>
+          <span style="display: inline-block; width: 60px; color: #8890b1"
+            >接单日期</span
+          >
         </div>
         <el-date-picker
-          v-model="deptBudgetList.inOutDate"
+          v-model="inOutDate"
           type="daterange"
           align="right"
           unlink-panels
           range-separator="至"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
-
         >
         </el-date-picker>
         <ws-input
@@ -47,38 +46,33 @@
             src="../../../public/img/sousuo.png"
             alt=""
         /></ws-button>
-       
       </template>
     </BaseHeaderLayout>
     <div>
       <el-table
         class="wenzi"
         :data="warehouseList.records"
-        style="width: 100%; margin-top: 20px"
+        style="width: 100%;"
         height="780"
       >
-        <el-table-column type="index" label="序号" width="80" >
+        <el-table-column type="index" label="序号" width="80">
         </el-table-column>
         <el-table-column class="table_td" prop="processNo" label="运输任务编号">
         </el-table-column>
         <el-table-column class="table_td" prop="goodsName" label="货名">
-
         </el-table-column>
         <el-table-column class="table_td" label="重量（吨）" prop="weight">
-         
         </el-table-column>
         <el-table-column class="table_td" label="发货" prop="send">
-          
         </el-table-column>
         <el-table-column class="table_td" label="收货" prop="receive">
-          
         </el-table-column>
         <el-table-column class="table_td" label="运输周期" prop="tranCycle">
-         <template scope="scope">
-               {{scope.row.deliveryDateStart}} ~ {{scope.row.deliveryDateEnd}}
-             </template>
+          <template scope="scope">
+            {{ scope.row.deliveryDateStart }} ~ {{ scope.row.deliveryDateEnd }}
+          </template>
         </el-table-column>
-      <el-table-column prop="status" label="状态">
+        <el-table-column prop="status" label="状态">
           <template slot-scope="scope">
             <el-popover
               placement="left"
@@ -97,13 +91,20 @@
                     v-if="scope.row.processStatus == '执行中'"
                     class="inExecution"
                   ></span>
-                  <span v-if="scope.row.processStatus == '已完成'" class="done"></span
+                  <span
+                    v-if="scope.row.processStatus == '已完成'"
+                    class="done"
+                  ></span
                   >{{ scope.row.processStatus }}
                 </span>
               </template>
               <div>
                 <p style="margin-top: 0; padding-left: 10px">历史记录</p>
-                <div v-for="(item, index) in historyList" class="flex" :key="index">
+                <div
+                  v-for="(item, index) in historyList"
+                  class="flex"
+                  :key="index"
+                >
                   <div class="vertical-text vertical-text-left">
                     {{ item.updateDate }}
                   </div>
@@ -129,17 +130,13 @@
               alt=""
             />
           </template>
-      </el-table-column>
-      <el-table-column class="table_td" label="接单日期" prop="receivingDate">
+        </el-table-column>
+        <el-table-column class="table_td" label="接单日期" prop="receivingDate">
         </el-table-column>
         <el-table-column prop="seller" label="操作" width="300">
           <template slot-scope="scope">
-            <div class="record" @click="handleLook(scope.row)">
-              查看
-            </div>
-            <div class="adjustment" @click="shipping(scope.row)">
-              船次
-            </div>
+            <div class="record" @click="handleLook(scope.row)">查看</div>
+            <div class="adjustment" @click="shipping(scope.row)">船次</div>
           </template>
         </el-table-column>
       </el-table>
@@ -157,11 +154,7 @@
   </div>
 </template>
 <script>
-import {
-  getList,
-  shippingList,
-  alsostate,
-} from '@/model/transport/index'
+import { getList, shippingList, alsostate } from '@/model/transport/index'
 import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
@@ -194,19 +187,18 @@ export default {
       showType: true,
       // 年
       year: '',
-      pickerOptions:{
-        
-      },
+      pickerOptions: {},
       value2: '',
-      deptBudgetTotal:0,
+      deptBudgetTotal: 0,
       currentPage: 1,
-      tranTypeKey:3,
+      tranTypeKey: 3,
       pageSize: 10,
       searchType: 1,
       searchTypeText: '未完成',
       searchKeyWord: '',
       contractType: 2,
-      
+      inOutDate: [],
+
       // 提交类型
       submitType: true,
       size: 10,
@@ -233,28 +225,27 @@ export default {
     this.showType = this.isShow
   },
   methods: {
-    getList(){
-      console.log(123456)
+    getList() {
       shippingList({
         compId: sessionStorage.getItem('ws-pf_compId'),
-        currentPage:this.currentPage,
-        pageSize:this.pageSize,
-        contractType:this.contractType,
-        tranTypeKey: this.tranTypeKey, 
-        searchType:this.searchType,
-
-      })
-      .toPromise()
-      .then((response)=>{
-        this.warehouseList = response
-        this.deptCircularPage.currentPage = response.current
-        this.deptCircularPage.pageSize = response.size
-        this.deptBudgetTotal = response.total
-        
-        
+        currentPage: this.currentPage,
+        pageSize: this.pageSize,
+        contractType: this.contractType,
+        tranTypeKey: this.tranTypeKey,
+        searchType: this.searchType,
+        startDate: this.startDate,
+        endDate: this.endDate,
+        searchKeyWord: this.searchKeyWord,
       })
+        .toPromise()
+        .then((response) => {
+          this.warehouseList = response
+          this.deptCircularPage.currentPage = response.current
+          this.deptCircularPage.pageSize = response.size
+          this.deptBudgetTotal = response.total
+        })
     },
-    statusquery(state){
+    statusquery(state) {
       this.searchType = state
       this.getList()
     },
@@ -288,39 +279,25 @@ export default {
           this.spanArr.push(1)
           this.pos = 0
         } else {
-        //不是第一项时，就根据标识去存储
-        if (data[index].warehouseNumViewList.length > 1) {
-          查找到符合条件的数据时每次要把之前存储的数据+1
-          this.spanArr[this.pos] = data[index].warehouseNumViewList.length
-          this.spanArr.push(0)
-        } else {
-          // 没有符合的数据时，要记住当前的index
-          this.spanArr.push(1)
-          this.pos = index
-        }
+          //不是第一项时，就根据标识去存储
+          if (data[index].warehouseNumViewList.length > 1) {
+            查找到符合条件的数据时每次要把之前存储的数据 + 1
+            this.spanArr[this.pos] = data[index].warehouseNumViewList.length
+            this.spanArr.push(0)
+          } else {
+            // 没有符合的数据时，要记住当前的index
+            this.spanArr.push(1)
+            this.pos = index
+          }
         }
       })
     },
-    //查看//传参
-    // nocomplete(row) {
-    //   this.$router.push({
-    //     path: 'tranManagementVehicleLook',
-        // query: {
-        //   baseId: row.warehouseId,
-        //   positionId: row.binNumberId,
-        //   warehouseName: row.warehouseName,
-        //   binNumber: row.binNumber,
-    //     // },
-    //   })
-    // },
-    
-    
     //查看
     handleLook(row) {
-      this.$router.push({ 
-        name: 'tranManagementShippingLook',
+      this.$router.push({
+        name: 'tshippingDispatchingview',
         query: { id: row.id },
-         })
+      })
     },
 
     // 派船
@@ -328,20 +305,7 @@ export default {
         this.$router.push({
            name: 'shippingDispatchingcar',
            query:{
-                 id: row.id , 
-              // infoId:row.infoId,
-              // processId:row.processId,
-              //  driver:row.driver,
-              //  driverType:row.driver,
-              //  driverPhone:row.driverPhone,
-              //  shipNo:row.shipNo,
-              //   loadWeight:row.loadWeight,
-              //   shipName:row.shipName,
-              //   shipType:row.shipType,
-              //   boxNumber:row.boxNumber,
-              //    positionWeight:row.positionWeight,
-              //    sendDateStart:row.sendDateStart,
-              //     receiveDateEnd:row.receiveDateEnd,      
+                 id: row.id ,    
            }
            })
     },
@@ -450,33 +414,16 @@ export default {
         })
     },
     find() {
+      if (this.inOutDate.length > 0) {
+        this.startDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[0])
+        this.endDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[1])
+      } else {
+        this.startDate = ''
+        this.endDate = ''
+      }
       this.currentPage = 1
       this.getList()
     },
-    async exportlist() {
-      const { data } = await export1(
-        {
-          compId: sessionStorage.getItem('ws-pf_compId'),
-          contractType: this.contractType,
-          currentPage: this.currentPage,
-          pageSize: this.pageSize,
-          searchType: this.searchType,
-          searchKeyWord: this.searchKeyWord,
-          startDate: this.startDate,
-          endDate: this.endDate,
-        },
-        {},
-        { responseType: 'blob' }
-      ).toPromise()
-      downloadFile({
-        res: data,
-        fileName: `${
-          this.date.year + (this.date.month ? `-${this.date.month}` : '')
-        }_采购合同`,
-        type: 'xls',
-      })
-    },
-    total(){},
   },
 }
 </script>
@@ -558,22 +505,21 @@ export default {
   height: 12px;
   background: #e9ecf7;
 }
-.el-row{
-    height: 150px;
+.el-row {
+  height: 150px;
 }
-.base_header_layout .grid-content{
-    margin-top: 80px;
+.base_header_layout .grid-content {
+  margin-top: 80px;
 }
-.but{
-    margin-top: 150px;
-    margin-left: 110px;
-    }
-.el-input--small .el-input__inner{
-    margin-left: 20px;
+.but {
+  margin-left: 6px;
+}
+.el-input--small .el-input__inner {
+  margin-left: 20px;
 }
 .el-range-editor--small.el-input__inner {
-    height: 32px;
-    margin-left: -20%;
+  height: 32px;
+  margin: 0 10px;
 }
 //执行样式
 .executory,
@@ -596,7 +542,8 @@ export default {
 .done {
   background: #50cad4;
 }
-.record, .adjustment{
+.record,
+.adjustment {
   display: inline-block;
   color: #5878e8;
   padding: 0 4px !important;

src/views/tranManagement/tranManagementShippingArrangemen.vue

@@ -55,12 +55,12 @@
             >{{deptBudgetList.deliveryDateEnd}}</ws-form-item>
             <ws-form-item label="合同编号" span="1" prop="contractNo">{{deptBudgetList.contractNo}}</ws-form-item> 
           </ws-info-table>
+          <div class="small-title">联络员及航次</div>
           <div
             class="position siji"
-            v-for="(item,index) in deptBudgetList.tranCarInfoList"
-            :key="index+'siji'"
+            v-for="(item, index) in deptBudgetList.tranCarInfoList"
+            :key="index"
           >
-            <div class="small-title">联络员及航次</div>
             <div class="zhong">
                 <ws-form-item label="姓名" span="1" prop="driver" class="siji">
                   <el-select
@@ -139,29 +139,14 @@
               style="width: 530px"
               class="xia"
               v-for="(items, index) in freightspace"
-              :key="index"
               v-show="item.shipType=='散船'"
             >
               <ws-info-table>
-                <ws-form-item
-                  :label="'仓位号-'+ (index +1 )"
-                  span="1"
-                  prop="impurity"
-                  class="bot"
-                >
-                <el-input
-                  v-model="items.impurity"
-                ></el-input>
+                <ws-form-item :label="'仓位号-'+ (index +1 )" span="1" prop="impurity" class="bot">
+                  <el-input v-model="items.impurity"></el-input>
                 </ws-form-item>
-                <ws-form-item
-                  label="重量(吨)"
-                  span="1"
-                  prop="positionWeight"
-                  class="bot"
-                >
-                <el-input
-                  v-model="items.positionWeight"
-                ></el-input>
+                <ws-form-item label="重量(吨)" span="1" prop="positionWeight" class="bot">
+                  <el-input v-model="items.positionWeight"></el-input>
                 </ws-form-item>
                 <span
                   width="22"
@@ -172,7 +157,7 @@
                   alt
                 >X</span>
               </ws-info-table>
-            </div>
+            </div>-->
             <div>
               <el-button
                 class="add bg-bottom"
@@ -209,9 +194,9 @@ export default {
     Pagination
   },
   watch: {
-    // vesselId(val) {
-    //   this.getList()
-    // },
+    vesselId(val) {
+      this.getList()
+    },
     isShow(val) {
       this.showType = val
     }
@@ -453,14 +438,14 @@ export default {
         }
         if (!this.deptBudgetList.tranCarInfoList[i].impurity) {
           this.$message({
-            message:'仓位号不能为空',
+            message: '仓位号不能为空',
             type: 'warning'
           })
         }
         if (!this.deptBudgetList.tranCarInfoList[i].positionWeight) {
           this.$message({
-            message:'重量不能为空',
-            type : 'warning'
+            message: '重量不能为空',
+            type: 'warning'
           })
         }
         if (
@@ -549,9 +534,9 @@ export default {
           this.searchType = this.taskTypeList[i].type
         }
       }
-    },
-    approve() {},
-    listQuery() {}
+    }
+    // approve() {},
+    // listQuery() {}
   }
 }
 </script>

src/views/tranManagement/tranManagementTransporHairRespond.vue

@@ -12,7 +12,7 @@
           >
         </div>
         <el-date-picker
-          v-model="deptBudgetList.inOutDate"
+          v-model="inOutDate"
           type="daterange"
           align="right"
           unlink-panels
@@ -54,7 +54,7 @@
         class="wenzi"
         :data="tranManagementList.records"
         style="width: 100%; margin-top: 20px"
-        height="680"
+        height="780"
       >
         <el-table-column type="index" label="序号" width="80">
           <template scope="scope">
@@ -155,6 +155,15 @@
           </template>
         </el-table-column>
       </el-table>
+       <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="currentPage"
+        :page-size="deptCircularPage.pageSize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="deptBudgetTotal"
+      >
+      </el-pagination>
     </div>
   </div>
 </template>
@@ -194,6 +203,7 @@ export default {
       year: '',
       currentPage: 1,
       pageSize: 10,
+      deptBudgetTotal: 0,
       searchTypeText: '未完成',
       searchKeyWord: '',
       contractType: 2,
@@ -205,6 +215,7 @@ export default {
       size: 10,
       primary:'1',
       spanArr: [],
+      inOutDate:[],
       warehouseName: '',
       compId: sessionStorage.getItem('ws-pf_compId'),
       deptCircularPage: {},
@@ -323,9 +334,15 @@ export default {
         feedbackFlag: this.feedbackFlag,
         currentPage: this.currentPage,
         pageSize: this.pageSize,
+         startDate:this.startDate,
+        endDate:this.endDate,
+        searchKeyWord : this.searchKeyWord,
       })
         .toPromise()
         .then((response) => {
+            this.deptCircularPage.currentPage = response.current
+          this.deptCircularPage.pageSize = response.size
+          this.deptBudgetTotal = response.total
           this.tranManagementList = response
         })
     },
@@ -370,6 +387,13 @@ export default {
       }
     },
     find() {
+     if (this.inOutDate.length > 0) {
+        this.startDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[0])
+        this.endDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[1])
+      } else {
+        this.startDate = ''
+        this.endDate = ''
+      }
       this.currentPage = 1
       this.getList()
     }
@@ -465,7 +489,7 @@ export default {
 //待完成三按钮
 .but {
   margin-top: 10px;
-  margin-left: 10px;
+  margin-left: 110px;
 }
 .el-input--small .el-input__inner {
   margin-left: 20px;
@@ -474,4 +498,12 @@ export default {
   height: 32px;
 margin:0 10px;
 }
+/deep/.el-pagination {
+    text-align: center;
+    white-space: nowrap;
+    padding: 2px 5px;
+    color: #303133;
+    font-weight: 700;
+    margin-bottom: 20px;
+}
 </style>

src/views/tranManagement/tranManagementTransporTationFire.vue

@@ -70,7 +70,7 @@
       <el-table
         class="wenzi"
         :data="tranManagementList.records"
-        style="width: 100%; margin-top: 20px"
+        style="width: 100%;"
         height="780"
       >
         <el-table-column type="index" label="序号" width="80">
@@ -174,6 +174,15 @@
           </template>
         </el-table-column>
       </el-table>
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="currentPage"
+        :page-size="deptCircularPage.pageSize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="deptBudgetTotal"
+      >
+      </el-pagination>
     </div>
   </div>
 </template>
@@ -215,9 +224,9 @@ export default {
       year: '',
       currentPage: 1,
       pageSize: 10,
+      deptBudgetTotal:0,
       searchTypeText: '未完成',
       searchKeyWord: '',
-      contractType: 2,
       tranTypeKey: 2,
       // 提交类型
       submitType: true,
@@ -336,7 +345,6 @@ export default {
     getList() {
       automobileList({
         compId: sessionStorage.getItem('ws-pf_compId'),
-        contractType: this.contractType,
         searchType: this.searchType,
         currentPage: this.currentPage,
         pageSize: this.pageSize,
@@ -348,6 +356,9 @@ export default {
         .toPromise()
         .then((response) => {
           this.tranManagementList = response
+           this.deptCircularPage.currentPage = response.current
+          this.deptCircularPage.pageSize = response.size
+          this.deptBudgetTotal = response.total
         })
     },
     editClick(row) {
@@ -419,7 +430,7 @@ export default {
         })
     },
     find() {
-      if (this.inOutDate) {
+      if (this.inOutDate.length > 0) {
         this.startDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[0])
         this.endDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[1])
       } else {
@@ -515,14 +526,13 @@ export default {
   border-left: 1px solid #e9ecf7;
 }
 .el-row {
-  height: 150px;
+  height: 60px;
 }
 .base_header_layout .grid-content {
   margin-top: 80px;
 }
 .but {
-  margin-top: 150px;
-  margin-left: 110px;
+  margin-left: 6px;
 }
 .el-input--small .el-input__inner {
   margin-left: 20px;
@@ -531,4 +541,12 @@ export default {
   height: 32px;
   margin: 0 10px;
 }
+/deep/.el-pagination {
+    text-align: center;
+    white-space: nowrap;
+    padding: 2px 5px;
+    color: #303133;
+    font-weight: 700;
+    margin-bottom: 20px;
+}
 </style>

src/views/tranManagement/tranManagementTransporTrainDetails.vue

@@ -260,7 +260,7 @@ export default {
       this.deptBudgetList = {}
       this.freightspace = []
       this.selectedOptions = ''
-      this.$router.push({ path: 'tranManagementTransporTationFire' })
+      this.$router.go(-1)
     },
     // confirmPosition() {
     //   this.draggable = false

src/views/tranManagement/tranManagementTransporTrainNo.vue

@@ -47,12 +47,10 @@
           {{ deptBudgetList.sendPrivate }}{{ deptBudgetList.sendCity
           }}{{ deptBudgetList.sendArea }}
         </ws-form-item>
-
         <!--发货人-->
         <ws-form-item label="发货人" span="1" prop="sender" class="readonly">
           {{ deptBudgetList.sender }}
         </ws-form-item>
-
         <!--发货人电话-->
         <ws-form-item
           label="发货人电话"

src/views/tranManagement/tranManagementVehicle.vue

@@ -12,17 +12,16 @@
       <!-- 接单开始 -->
       <template slot="right">
         <div>
-          <span style="display: inline-block; width: 300px;color: #8890B1;">接单日期</span>
+          <span style="display: inline-block; width: 60px;color: #8890B1;">接单日期</span>
         </div>
         <el-date-picker
-          v-model="deptBudgetList.inOutDate"
+          v-model="inOutDate"
           type="daterange"
           align="right"
           unlink-panels
           range-separator="至"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
-
         >
         </el-date-picker>
         <ws-input
@@ -53,7 +52,7 @@
       <el-table
         class="wenzi"
         :data="warehouseList.records"
-        style="width: 100%; margin-top: 20px"
+        style="width: 100%;"
         height="780"
       >
         <el-table-column prop="warehouseName" label="序号" width="80">
@@ -144,6 +143,15 @@
           </template>
         </el-table-column>
       </el-table>
+       <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="currentPage"
+        :page-size="deptCircularPage.pageSize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="deptBudgetTotal"
+      >
+      </el-pagination>
     </div>
   </div>
 </template>
@@ -185,6 +193,7 @@ export default {
       year: '',
       currentPage: 1,
       pageSize: 10,
+    deptBudgetTotal :0,
       searchTypeText: '未完成',
       searchKeyWord: '',
       contractType: 2,
@@ -193,6 +202,7 @@ export default {
       submitType: true,
       size: 10,
       spanArr: [],
+      inOutDate:[],
       tranTypeKey: '1',
       warehouseName: '',
       compId: sessionStorage.getItem('ws-pf_compId'),
@@ -319,10 +329,16 @@ export default {
         currentPage: this.currentPage,
         pageSize: this.pageSize,
         searchType: this.searchType,
+        startDate: this.startDate ,
+       endDate: this.endDate ,
+       searchKeyWord :this.searchKeyWord,
         tranTypeKey: this.tranTypeKey,
       })
         .toPromise()
         .then((response) => {
+           this.deptCircularPage.currentPage = response.current
+          this.deptCircularPage.pageSize = response.size
+          this.deptBudgetTotal = response.total
           this.warehouseList = response
         })
     },
@@ -396,32 +412,16 @@ export default {
         })
     },
     find() {
+       if (this.inOutDate.length > 0) {
+        this.startDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[0])
+        this.endDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[1])
+      } else {
+        this.startDate = ''
+        this.endDate = ''
+      }
       this.currentPage = 1
       this.getList()
-    },
-    // async exportlist() {
-    //   const { data } = await export1(
-    //     {
-    //       compId: sessionStorage.getItem('ws-pf_compId'),
-    //       contractType: this.contractType,
-    //       currentPage: this.currentPage,
-    //       pageSize: this.pageSize,
-    //       searchType: this.searchType,
-    //       searchKeyWord: this.searchKeyWord,
-    //       startDate: this.startDate,
-    //       endDate: this.endDate,
-    //     },
-    //     {},
-    //     { responseType: 'blob' }
-    //   ).toPromise()
-    //   downloadFile({
-    //     res: data,
-    //     fileName: `${
-    //       this.date.year + (this.date.month ? `-${this.date.month}` : '')
-    //     }_采购合同`,
-    //     type: 'xls',
-    //   })
-    // },
+    }
   },
 }
 </script>
@@ -525,21 +525,27 @@ export default {
   background: #e9ecf7;
 }
 .el-row {
-  height: 150px;
+  height: 60px;
 }
 .base_header_layout .grid-content {
   margin-top: 80px;
 }
 .but {
-  margin-top: 150px;
-  margin-left: 110px;
+  margin-left: 6px;
 }
 .el-input--small .el-input__inner {
   margin-left: 20px;
 }
 .el-range-editor--small.el-input__inner {
   height: 32px;
-  margin-left: -20%;
-  
+  margin:0 10px; 
+}
+/deep/.el-pagination {
+    text-align: center;
+    white-space: nowrap;
+    padding: 2px 5px;
+    color: #303133;
+    font-weight: 700;
+    margin-bottom: 20px;
 }
 </style>