Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

# Conflicts:
#	vue.config.js

public/index.html

@@ -8,18 +8,18 @@
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
   <!-- 强制Chromium内核，作用于360浏览器、QQ浏览器等国产双核浏览器 -->
   <meta name="renderer" content="webkit" />
-
+  <link rel="icon" href="<%= BASE_URL %>logo.ico">
   <!-- 强制Chromium内核，作用于其他双核浏览器 -->
   <meta name="force-rendering" content="webkit" />
 
   <!-- 如果有安装 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="icon" href="<%= BASE_URL %>/winseaLogo.ico" />
+  <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>WinSea | 专注船舶管理服务</title>
+  <title>易粮易运</title>
   <% if (process.env.NODE_ENV === 'production') { %>
     <script>
     !(function(c,i,e,b){var h = i.createElement("script");var f = i.getElementsByTagName("script")[0];h.type = "text/javascript";h.crossorigin = true;h.onload = function(){try {c[b]||(c[b] = new c.wpkReporter({bid: 'qj3rmxes-10jz7agi',spa: true,  plugins: []}));c[b].installAll();} catch (e) {console.error('init wpkReporter fail', e);}};f.parentNode.insertBefore(h, f);h.src = e})(window, document, "https://g.alicdn.com/woodpeckerx/jssdk??wpkReporter.js", "__wpk");

public/manifest.json

@@ -3,13 +3,13 @@
   "short_name": "Winsea",
   "icons": [
     {
-      "src": "/img/icons/winseaLogo_16x16.png",
-      "type": "image/png",
+      "src": "/img/logo.ico",
+      "type": "image/x-icon",
       "sizes": "16x16"
     },
     {
-      "src": "/img/icons/winseaLogo_144x144.png",
-      "type": "image/png",
+      "src": "/img/logo.ico",
+      "type": "image/x-icon",
       "sizes": "144x144"
     }
   ],

src/components/base/BaseTabsRouterLayout/index-V2.vue

@@ -114,10 +114,10 @@ export default {
       </BaseTabPane>
     </BaseTabs>
     <section v-if="isRouter">
-      <keep-alive>
+      <!-- <keep-alive> -->
         <router-view v-if="$route.meta.keepAlive"></router-view>
-      </keep-alive>
-      <router-view v-if="!$route.meta.keepAlive"></router-view>
+      <!-- </keep-alive> -->
+      <!-- <router-view v-if="!$route.meta.keepAlive"></router-view> -->
     </section>
   </section>
 </template>

src/enums/permissions.js

@@ -7,10 +7,11 @@
  */
 
 export default {
-  PURSPPURCHASINFO_UPDATEPURCHASINFO: 'procurement.sparepart.purchasDetail.save',
-  PURSPAPPLINFO_SUBMITTOENQUIRY: 'procurement.sparepart.purSpApplInfo.enquiry',
-  PURSPQUOTESINFO_UPDATEQUOTES: 'procurement.sparepart.quotesDetail.saveQuotation',
-  PURSPPARITYINFO_UPDATEPARITYINFO: 'procurement.sparepart.spparity.save',
+  // 合同管理
+  BUYCONTRACTINFO_ADD: 'contractManagement.buyContract.buyContractInfo.add',
+  BUYCONTRACTINFO_DELETE: 'contractManagement.buyContract.buyContractInfo.delete',
+  BUYCONTRACTINFO_EDIT: 'contractManagement.buyContract.buyContractInfo.edit',
+  BUYCONTRACTINFO_EDIT_VIEW: 'contractManagement.buyContract.buyContractInfo.view',
   PURSPBILLINFO_UPDATEBILL: 'procurement.sparepart.billDetail.save',
   PURMAPARITYINFO_UPDATEPARITYINFO: 'procurement.spareMaterial.spparityMa.save',
   PURMABILLINFO_UPDATEBILL: 'procurement.spareMaterial.billDetailMa.save',

src/lang/zh.js

@@ -4781,8 +4781,9 @@
 
   },
   // 任务管理
-  tranManagement: '任务管理',
+  taskManagement: '任务管理',
   tranManagementWarehouseInOutTaskEdit:'编辑',
+  moveWarehouseTask :'移库任务',
   // 年度培训
   annualTraining: {
     trainingResults: '培训结果',

src/layout/index/sidebar/index.vue

@@ -39,7 +39,6 @@ export default {
     return {}
   },
   created() {
-    console.log(this.menu)
   },
   computed: {
     ...mapGetters(['website', 'menu', 'tag', 'keyCollapse', 'screen']),

src/layout/index/top/index.vue

@@ -406,35 +406,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.taskType {
-  width: 100%;
-  background-color: #fff;
-  margin-top: 2px;
-  margin-bottom: 10px;
-  // padding-bottom: 20px;
-  li {
-    float: left;
-    border: 1px solid #6ea0f3;
-    border-radius: 5px;
-    max-width: 190px;
-    padding: 0 5px;
-    text-align: center;
-    margin-top: 20px;
-    margin-left: 20px;
-    cursor: pointer;
-    font-size: 14px;
-    p {
-      margin: 8px 0px;
-      span {
-        color: #e74c3c;
-      }
-    }
-  }
-  li:hover {
-    background-color: #e4eeff;
-    color: #1d6ced;
-  }
-}
 .dayClass {
   font-size: 14px !important;
   span {

src/store/modules/permission.js

@@ -19,12 +19,13 @@ function filterAsyncRoutes(routes, roles) {
     };
     if (currentRoute.meta && currentRoute.meta.module) {
       const routeModule = currentRoute.meta.module;
-      // if (roles.some(role => role.indexOf(routeModule) === 0)) {
+      // console.log(roles)
+      if (roles.some(role => role.indexOf(routeModule) === 0)) {
       if (Array.isArray(currentRoute.children) && currentRoute.children.length > 0) {
         currentRoute.children = filterAsyncRoutes(currentRoute.children, roles);
       }
       res.push(currentRoute);
-      // }
+      }
     } else {
       res.push(currentRoute);
     }
@@ -40,12 +41,17 @@ function filterAsyncRoutes(routes, roles) {
  * @param {*} parentModule
  */
 function handleRoles(roles, res, parentModule) {
+  console.log(roles, res, parentModule)
   roles.forEach((role) => {
     if (Array.isArray(role.children) && role.children.length > 0) {
       handleRoles(role.children, res, parentModule + role.name + '.')
     } else {
       const lastIndex = role.name.lastIndexOf('.');
-      res.push(`${parentModule}${role.name.substring(lastIndex + 1)}`)
+      if(parentModule.indexOf(role.name.split('.')[0])!=-1){
+        res.push(`${parentModule}${role.name.substring(lastIndex + 1)}`)
+      }else{
+        res.push(`${parentModule}${role.name}`)
+      } 
     }
   })
 }

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

@@ -28,14 +28,14 @@ const contractManagementRouter = {
     },
     // 采购合同
     {
-      path: 'purchaseContract',
+      path: 'buyContract',
       component: () =>
         import(/* webpackChunkName: "sparepartList" */ '@/views/contractManagement/purchaseContract'),
-      name: 'purchaseContract',
+      name: 'buyContract',
       meta: {
         title: 'purchaseContract',
         shortcutEntrance: 'contractManagement',
-        module: 'contractManagement.purchaseContract',
+        module: 'contractManagement.buyContract',
         permissicon: [],
         keepAlive: true
       }
@@ -48,7 +48,7 @@ const contractManagementRouter = {
       meta: {
         title: 'purchaseContractExamine',
         shortcutEntrance: 'contractManagement',
-        module: 'contractManagement.salesContract.purchaseContractExamine',
+        module: 'contractManagement.buyContract.buyContractInfo.view',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
@@ -63,7 +63,7 @@ const contractManagementRouter = {
       meta: {
         title: 'purchaseContractEdit',
         shortcutEntrance: 'contractManagement',
-        module: 'contractManagement.salesContract.purchaseContractEdit',
+        module: 'contractManagement.buyContract.buyContractInfo.edit',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
@@ -78,7 +78,7 @@ const contractManagementRouter = {
       meta: {
         title: 'purchaseContractAdd',
         shortcutEntrance: 'contractManagement',
-        module: 'contractManagement.salesContract.purchaseContractAdd',
+        module: 'contractManagement.buyContract.buyContractInfo.add',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
@@ -93,7 +93,7 @@ const contractManagementRouter = {
       meta: {
         title: 'salesContractExamine',
         shortcutEntrance: 'contractManagement',
-        module: 'contractManagement.salesContract.salesContractExamine',
+        module: 'contractManagement.salesContract.salesContractInfo.view',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
@@ -108,7 +108,7 @@ const contractManagementRouter = {
       meta: {
         title: 'salesContractEdit',
         shortcutEntrance: 'contractManagement',
-        module: 'contractManagement.salesContract.salesContractEdit',
+        module: 'contractManagement.salesContract.salesContractInfo.edit',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
@@ -123,7 +123,7 @@ const contractManagementRouter = {
       meta: {
         title: 'salesContractAdd',
         shortcutEntrance: 'contractManagement',
-        module: 'contractManagement.salesContract.salesContractAdd',
+        module: 'contractManagement.salesContract.salesContractInfo.add',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'

src/views/contractManagement/purchaseContract.vue

@@ -5,6 +5,9 @@
     <BaseHeaderLayout :leftSpan="10">
       <template slot="left">
         <ws-button type="primary" @click="handleAdd()"
+        v-hasPermission="
+            `contractManagement.buyContract.buyContractInfo.add`
+          "
           ><img
             width="13"
             height="13"
@@ -21,7 +24,7 @@
         <ws-button
           @click="exportlist()"
           v-hasPermission="
-            `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
+           `contractManagement.buyContract.buyContractInfo.view`
           "
           >导出</ws-button
         >
@@ -150,7 +153,7 @@
             </template>
             <div>
               <p style="margin-top: 0; padding-left: 10px">操作历史</p>
-              <div v-for="(item, index) in historyList" class="flex">
+              <div v-for="(item, index) in historyList" :key='index' class="flex">
                 <div class="vertical-text vertical-text-left">
                   {{ item.updateDate }}
                 </div>
@@ -205,6 +208,9 @@
             style="vertical-align: text-top; margin: 0 6px"
             src="../../../public/img/chakan.png"
             @click="handleExamine(scope.row)"
+            v-hasPermission="
+           `contractManagement.buyContract.buyContractInfo.view`
+          "
             alt=""
           />
           <img
@@ -213,6 +219,9 @@
             style="vertical-align: text-top; margin: 0 6px"
             src="../../../public/img/bianji.png"
             @click="handleEdit(scope.row)"
+            v-hasPermission="
+           `contractManagement.buyContract.buyContractInfo.edit`
+          "
             alt=""
           />
           <img
@@ -225,6 +234,9 @@
               margin: 0 6px;
             "
             src="../../../public/img/shanchu.png"
+            v-hasPermission="
+           `contractManagement.buyContract.buyContractInfo.delete`
+          "
             @click="handleDelete(scope.row)"
             alt=""
           />
@@ -272,7 +284,7 @@ import {
 import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
-import { dayjs, fmoney, EventBus } from 'base-core-lib'
+import { dayjs,  EventBus } from 'base-core-lib'
 export default {
   name: 'viewSpareMoney',
   components: {
@@ -383,6 +395,7 @@ export default {
     }
   },
   activated() {
+    console.log(this.$permission('PERMISSIONS.BUYCONTRACTINFO_ADD'))
     //cg.viewBudget
     //cg.viewSpareMoney
     // this.getVesselData();

src/views/contractManagement/purchaseContractAdd.vue

@@ -713,7 +713,7 @@ export default {
       this.deptBudgetList.finalTradingVolume = e
     },
     returnsales() {
-      this.$router.push({ path: 'purchaseContract' })
+      this.$router.push({ path: 'buyContract' })
     },
     loaddata() {
       // 包装方式
@@ -1252,7 +1252,7 @@ export default {
                 },
                 contractProcessInfo: {},
               }
-              this.$router.push({ path: 'purchaseContract' })
+              this.$router.push({ path: 'buyContract' })
             })
             .catch((req) => {
               EventBus.$emit('error', req.message)

src/views/contractManagement/purchaseContractEdit.vue

@@ -759,7 +759,7 @@ export default {
     handleExamine() {},
     approve() {},
     returnsales() {
-      this.$router.push({ path: 'purchaseContract' })
+      this.$router.push({ path: 'buyContract' })
     },
     selectChapterTwo(e) {
       for (var i = 0; i < this.ChapterTwoList.length; i++) {
@@ -1322,7 +1322,7 @@ export default {
             .toPromise()
             .then((response) => {
               this.$message.success('编辑成功')
-              this.$router.push({ path: 'purchaseContract' })
+              this.$router.push({ path: 'buyContract' })
             })
         } else {
           EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))

src/views/contractManagement/purchaseContractExamine.vue

@@ -203,14 +203,9 @@
 <script>
 import {
   packList,
-  addList,
   xiala,
-  addxiala,
-  editxiala,
-  delxiala,
   examineList,
 } from '@/model/contarct/index'
-import { dayjs } from 'base-core-lib'
 export default {
   name: 'viewSpareMoney',
   watch: {
@@ -321,7 +316,7 @@ export default {
     handleExamine() {},
     approve() {},
     returnsales() {
-      this.$router.push({ path: 'purchaseContract' })
+      this.$router.push({ path: 'buyContract' })
     },
   },
 }

src/views/contractManagement/salesContract.vue

@@ -8,6 +8,9 @@
         <ws-button
           type="primary"
           @click="handleAdd()"
+          v-hasPermission="
+            `contractManagement.salesContract.salesContractInfo.add`
+          "
           ><img
             width="13"
             height="13"
@@ -24,7 +27,7 @@
         <ws-button
           @click="exportlist()"
           v-hasPermission="
-            `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
+            `contractManagement.salesContract.salesContractInfo.view`
           "
           >导出</ws-button
         >
@@ -215,6 +218,9 @@
             style="vertical-align: text-top; margin: 0 6px"
             src="../../../public/img/chakan.png"
             @click="handleExamine(scope.row)"
+            v-hasPermission="
+            `contractManagement.salesContract.salesContractInfo.view`
+          "
             alt=""
           />
           <img
@@ -222,6 +228,9 @@
             height="16"
             style="vertical-align: text-top; margin: 0 6px"
             src="../../../public/img/bianji.png"
+            v-hasPermission="
+            `contractManagement.salesContract.salesContractInfo.edit`
+          "
             @click="handleEdit(scope.row)"
             alt=""
           />
@@ -235,6 +244,9 @@
               margin: 0 6px;
             "
             src="../../../public/img/shanchu.png"
+            v-hasPermission="
+            `contractManagement.salesContract.salesContractInfo.delete`
+          "
             @click="handleDelete(scope.row)"
             alt=""
           />

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

@@ -2,14 +2,14 @@ import Layout from '@/layout/index';
 
 const tranManagementRouter = {
 
-  path: '/taskManagement',
+  path: '/transportationTask',
   component: Layout,
   redirect: '/taskManagement',
-  name: 'taskManagement',
+  name: 'transportationTask',
   alwaysShow: true, // will always show the root menu
   meta: {
     title: 'taskManagement',
-    module: 'taskManagement',
+    module: 'transportationTask',
     icon: 'cg'
   },
   children: [
@@ -22,7 +22,7 @@ const tranManagementRouter = {
       meta: {
         title: 'tranManagementTransport',
         shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementDriver.tranManagementTransport',
+        module: 'transportationTask.transportation.transportationInfo',
         permissicon: [],
         keepAlive: true
       },
@@ -38,7 +38,7 @@ const tranManagementRouter = {
       meta: {
         title: 'tranManagementLook',
         shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementDriver.tranManagementLook',
+        module: 'transportationTask.transportation.transportationInfo.view',
         permissicon: [],
         keepAlive: true
       },
@@ -53,7 +53,7 @@ const tranManagementRouter = {
       meta: {
         title: 'tranManagementTransportAdd',
         shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementDriver.tranManagementTransportAdd',
+        module: 'transportationTask.transportation.transportationInfo.add',
         permissicon: [],
         keepAlive: true
       },
@@ -68,7 +68,7 @@ const tranManagementRouter = {
       meta: {
         title: 'tranManagementTransportEdit',
         shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementDriver.tranManagementTransportEdit',
+        module: 'transportationTask.transportation.transportationInfo.view',
         permissicon: [],
         keepAlive: true
       },
@@ -85,7 +85,9 @@ const tranManagementRouter = {
         title: 'moveWarehouseTask',
         shortcutEntrance: 'tranManagement',
         module: 'tranManagement.tranManagementDriver.moveWarehouseTask',
-      }
+        permissicon: [],
+        keepAlive: true
+      },
     },
     //移库查看
     {
@@ -96,9 +98,8 @@ const tranManagementRouter = {
       meta: {
         title: 'moveWarehouseTaskLook',
         shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementDriver.moveWarehouseTaskLook',
+        module: 'warehouseManagement.warehouse.warehouseInfoTask.view',
       },
-      hidden: true
     },
     //出入库任务
     {
@@ -109,7 +110,7 @@ const tranManagementRouter = {
       meta: {
         title: 'tranManagementWarehouseInOutTask',
         shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementDriver.tranManagementWarehouseInOutTask',
+        module: 'warehouseManagement.warehouse.warehouseInfoTask',
         permissicon: [],
         keepAlive: true
       },
@@ -123,7 +124,7 @@ const tranManagementRouter = {
       meta: {
         title: 'inOutWarehouseTaskEdit',
         shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementDriver.inOutWarehouseTaskEdit',
+        module: 'warehouseManagement.warehouse.warehouseInfoTask.view',
       },
       hidden: true
     },
@@ -136,7 +137,7 @@ const tranManagementRouter = {
       meta: {
         title: 'tranManagementWarehouseInOutTaskAdd',
         shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementDriver.tranManagementWarehouseInOutTaskAdd',
+        module: 'warehouseManagement.warehouse.warehouseInfoTask.add',
         permissicon: [],
         keepAlive: true
       },
@@ -151,7 +152,7 @@ const tranManagementRouter = {
       meta: {
         title: 'tranManagementWarehouseInOutTaskEdit',
         shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementDriver.tranManagementWarehouseInOutTaskEdit',
+        module: 'warehouseManagement.warehouse.warehouseInfoTask.edit',
         permissicon: [],
         keepAlive: true
       },

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,24 +1,25 @@
 <!--运输任务-->
 <template>
   <div>
-    <BaseHeaderLayout :leftSpan="15">
+    <BaseHeaderLayout :leftSpan="12">
       <template slot="left">
+        <ws-button
+          class="but"
+          type="primary"
+          @click="handleAdd()"
+          v-hasPermission="
+           `transportationTask.transportation.transportationInfo.add`
+          "
+        >添加</ws-button>
+        <ws-button class="but" :type="primary == 1 ? 'primary' : ''" @click="handlestatus(1)">执行中</ws-button>
+        <ws-button class="but" :type="primary == 2 ? 'primary' : ''" @click="handlestatus(2)">已完成</ws-button>
+        <ws-button class="but" :type="primary == 3 ? 'primary' : ''" @click="handlestatus('')">全部任务</ws-button>
+      </template>
+      <template slot="right">
         <span style="width: 134px; display: inline-block">起点：</span>
-        <el-input
-          label="起点"
-          placeholder="请输入起点"
-          clearable
-          maxlength="200"
-          type="input"
-        ></el-input>
+        <el-input label="起点" placeholder="请输入起点" clearable maxlength="200" type="input"></el-input>
         <span style="width: 134px; display: inline-block">终点：</span>
-        <el-input
-          label="终点"
-          placeholder="请输入终点"
-          clearable
-          maxlength="200"
-          type="input"
-        ></el-input>
+        <el-input label="终点" placeholder="请输入终点" clearable maxlength="200" type="input"></el-input>
         <el-input
           v-model="warehouseName"
           placeholder="可按合同编号或运输任务编号查找"
@@ -29,8 +30,8 @@
         ></el-input>
         <!-- v-hasPermission="'procurement.sparepart.directShip'" -->
         <div class="search">
-          <ws-button class="find" type="primary" @click="lookUp()"
-            ><img
+          <ws-button class="find" type="primary" @click="lookUp()">
+            <img
               width="16"
               height="16"
               style="
@@ -40,40 +41,18 @@
                 left: -8px;
               "
               src="../../../public/img/sousuo.png"
-              alt=""
-          /></ws-button>
+              alt
+            />
+          </ws-button>
         </div>
       </template>
-      <template slot="right">
-        <ws-button class="but" type="primary" @click="handleAdd()"
-          >添加</ws-button
-        >
-      </template>
     </BaseHeaderLayout>
+
     <div>
-      <ws-button
-        class="but"
-        :type="primary == 1 ? 'primary' : ''"
-        @click="handlestatus(1)"
-      >
-        执行中</ws-button
-      >
-      <ws-button
-        class="but"
-        :type="primary == 2 ? 'primary' : ''"
-        @click="handlestatus(2)"
-        >已完成</ws-button
-      >
-      <ws-button
-        class="but"
-        :type="primary == 3 ? 'primary' : ''"
-        @click="handlestatus('')"
-        >全部任务</ws-button
-      >
       <el-table
         class="wenzi"
         :data="gainList.records"
-        style="width: 100%; margin-top: 20px"
+        style="width: 100%; "
         height="780"
       >
         <el-table-column type="index" label="序号">
@@ -82,34 +61,19 @@
             <span v-else>{{ scope.$index + 1 }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="taskNo" label="运输任务编号" width="160">
-        </el-table-column>
-        <el-table-column prop="contractNo" label="合同编号" width="160">
-        </el-table-column>
+        <el-table-column prop="taskNo" label="运输任务编号" width="140"></el-table-column>
+        <el-table-column prop="contractNo" label="合同编号" width="160"></el-table-column>
         <el-table-column prop=" weight" class="table_td" label="货物（吨数）">
-          <template slot-scope="scope">
-            {{ scope.row.goodsName }}({{ scope.row.weight }})
-          </template>
+          <template slot-scope="scope">{{ scope.row.goodsName }}({{ scope.row.weight }})</template>
         </el-table-column>
-        <el-table-column
-          prop="tranType"
-          class="table_td"
-          label="运输方式"
-          width="120"
-        >
-        </el-table-column>
-        <el-table-column prop="" class="table_td" label="起点">
+        <el-table-column prop="tranType" class="table_td" label="运输方式" width="120"></el-table-column>
+        <el-table-column prop class="table_td" label="起点">
           <template slot-scope="scope">
             {{ scope.row.startPrivate }}{{ scope.row.startCity
             }}{{ scope.row.startArea }}{{ scope.row.startDetailedAddress }}
           </template>
         </el-table-column>
-        <el-table-column
-          prop="currentTransferAddress"
-          class="table_td"
-          label="当前中转"
-        >
-        </el-table-column>
+        <el-table-column prop="currentTransferAddress" class="table_td" label="当前中转"></el-table-column>
         <el-table-column prop="end" class="table_td" label="终点">
           <template slot-scope="scope">
             {{ scope.row.endPrivate }}{{ scope.row.endCity
@@ -128,33 +92,24 @@
             >
               <template>
                 <span slot="reference">
-                  <span
-                    v-if="scope.row.status == '待执行'"
-                    class="executory"
-                  ></span>
-                  <span
-                    v-if="scope.row.status == '执行中'"
-                    class="inExecution"
-                  ></span>
-                  <span v-if="scope.row.status == '已完成'" class="done"></span
-                  >{{ scope.row.status }}
+                  <span v-if="scope.row.status == '待执行'" class="executory"></span>
+                  <span v-if="scope.row.status == '执行中'" class="inExecution"></span>
+                  <span v-if="scope.row.status == '已完成'" class="done"></span>
+                  {{ scope.row.status }}
                 </span>
               </template>
               <div>
                 <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 }}
-                  </div>
+                  <div class="vertical-text vertical-text-left">{{ item.updateDate }}</div>
                   <div>
                     <div class="vertical-circle"></div>
-                    <div
-                      v-if="index != historyList.length - 1"
-                      class="vertical-line"
-                    ></div>
+                    <div v-if="index != historyList.length - 1" class="vertical-line"></div>
                   </div>
                   <div class="vertical-text">
-                    {{ item.operateUser }}<br />{{ item.dealMsg }}
+                    {{ item.operateUser }}
+                    <br />
+                    {{ item.dealMsg }}
                   </div>
                 </div>
               </div>
@@ -165,7 +120,7 @@
               style="vertical-align: text-top; position: relative; top: -1px"
               src="../../../public/img/edit.png"
               @click="editClick(scope.row)"
-              alt=""
+              alt
             />
           </template>
         </el-table-column>
@@ -177,16 +132,28 @@
             <ws-button class="putstorage" @click="delivery(scope.row)">
               编辑
             </ws-button>
-            <ws-button @click="deleteclick(scope.row)"> 删除 </ws-button> -->
-            <div class="record" @click="nocomplete(scope.row)">
-              查看
-            </div>
-            <div class="record" @click="delivery(scope.row)">
-              编辑
-            </div>
-            <div class="record" @click="deleteclick(scope.row)">
-              删除
-            </div>
+            <ws-button @click="deleteclick(scope.row)"> 删除 </ws-button>-->
+            <div
+              class="record"
+              @click="nocomplete(scope.row)"
+              v-hasPermission="
+           `transportationTask.transportation.transportationInfo.view`
+          "
+            >查看</div>
+            <div
+              class="record"
+              @click="delivery(scope.row)"
+              v-hasPermission="
+           `transportationTask.transportation.transportationInfo.edit`
+          "
+            >编辑</div>
+            <div
+              class="record"
+              @click="deleteclick(scope.row)"
+              v-hasPermission="
+           `transportationTask.transportation.transportationInfo.delete`
+          "
+            >删除</div>
           </template>
         </el-table-column>
       </el-table>
@@ -203,7 +170,7 @@ export default {
   name: 'viewSpareMoney',
   components: {
     WsUpload,
-    Pagination,
+    Pagination
   },
   watch: {
     vesselId(val) {
@@ -211,7 +178,7 @@ export default {
     },
     isShow(val) {
       this.showType = val
-    },
+    }
   },
   data() {
     return {
@@ -244,11 +211,11 @@ export default {
       deptCircularPage: {},
       historyList: [],
       pickerBeginDateBefore: {
-        disabledDate: (time) => {
+        disabledDate: time => {
           return time.getTime() > Date.now()
-        },
+        }
       },
-      accessoryTFs: false,
+      accessoryTFs: false
     }
   },
   activated() {
@@ -270,15 +237,15 @@ export default {
       this.$confirm(`运输任务删除后不可恢复，是否确定删除？`, {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: 'warning',
+        type: 'warning'
       })
         .then(() => {
           console.log(row)
           deltran({
-            id: row.id,
+            id: row.id
           })
             .toPromise()
-            .then((response) => {
+            .then(response => {
               this.getList()
             })
         })
@@ -292,10 +259,10 @@ export default {
         currentPage: this.currentPage,
         pageSize: this.pageSize,
         searchType: this.searchType,
-        searchKeyWord: this.searchKeyWord,
+        searchKeyWord: this.searchKeyWord
       })
         .toPromise()
-        .then((response) => {
+        .then(response => {
           this.gainList = response
         })
     },
@@ -308,7 +275,6 @@ export default {
       } else {
         this.primary = 3
       }
-
       this.getList()
     },
     //编辑
@@ -316,8 +282,8 @@ export default {
       this.$router.push({
         path: 'tranManagementTransportEdit',
         query: {
-          id: item.id,
-        },
+          id: item.id
+        }
       })
     },
     //查看
@@ -333,8 +299,8 @@ export default {
           positionId: item.binNumberId,
           warehouseName: item.warehouseName,
           binNumber: item.binNumber,
-          capacity: item.capacity - free,
-        },
+          capacity: item.capacity - free
+        }
       })
     },
     getSpanArr(data) {
@@ -373,8 +339,8 @@ export default {
       this.$router.push({
         path: 'tranManagementLook',
         query: {
-          id: row.id,
-        },
+          id: row.id
+        }
       })
     },
     //查看
@@ -395,7 +361,7 @@ export default {
         'Y+': date.getFullYear().toString(), // 年
         'm+': (date.getMonth() + 1).toString(), // 月
         'd+': date.getDate().toString(), // 日
-        'H+': date.getHours().toString(), // 时
+        'H+': date.getHours().toString() // 时
         // "M+": date.getMinutes().toString(),         // 分
         // "S+": date.getSeconds().toString()          // 秒
         // 有其他格式化字符需求可以继续添加，必须转化成字符串
@@ -435,19 +401,19 @@ export default {
       this.$confirm(`是否将状态改为${status}`, {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: 'warning',
+        type: 'warning'
       })
         .then(() => {
           editstatus({ id: row.id })
             .toPromise()
-            .then((response) => {
+            .then(response => {
               this.$notify.success({
                 title: '成功',
-                message: '状态修改成功',
+                message: '状态修改成功'
               })
               this.getList()
             })
-            .catch((response) => {
+            .catch(response => {
               // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
             })
         })
@@ -465,48 +431,19 @@ export default {
     handleExamine(row) {
       this.$router.push({
         name: 'salesContractExamine',
-        query: { id: row.id },
+        query: { id: row.id }
       })
     },
     // 关闭 dialog时 处理文件url 初始化upload组件
     handleCloe() {
       this.dialogViewSpareMoney = false
     },
-    history(row) {
-      billoperatehis({ id: row.id })
-        .toPromise()
-        .then((response) => {
-          this.historyList = response
-        })
-    },
+
     find() {
       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>
 <style lang="scss" scoped>
@@ -577,11 +514,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;
@@ -626,4 +564,18 @@ export default {
 .done {
   background: #50cad4;
 }
+/deep/.el-row {
+    -webkit-box-sizing: border-box;
+    height: 50px;
+    box-sizing: border-box;
+}
+/deep/.el-col-12 {
+    width: 50%;
+    height: 50px;
+}
+.el-button--primary {
+    background-color: #5878e8;
+    border-color: #5878e8;
+    margin-left: 6px;
+}
 </style>

src/views/taskManagement/tranManagementTransportAdd.vue

@@ -538,18 +538,6 @@ export default {
         .then((response) => {
           this.contractNoList = response
         })
-      // // 车型
-      // packList({ constId: 'TRAN1' })
-      //   .toPromise()
-      //   .then((response) => {
-      //     this.carModelList = response
-      //   })
-      // // 车长
-      // packList({ constId: 'TRAN2' })
-      //   .toPromise()
-      //   .then((response) => {
-      //     this.carLengthList = response
-      //   })
     },
     confirmPositioncity() {
       this.listDate.level = 'city'

src/views/taskManagement/tranManagementTransportEdit.vue

@@ -142,7 +142,6 @@
         >
           <el-select
             v-model="deptBudgetList.receiveWarehouse"
-            :disabled="warehouse"
             placeholder="请输入收货库点"
             class="typeselect"
             style="width: 100%"
@@ -392,6 +391,7 @@ export default {
       radio: '1',
       carModelList: [],
       carLengthList: [],
+      warehouseType: '1',
       options_: regionData,
       heightData: '600px',
       selectedOptions: [],
@@ -496,7 +496,7 @@ export default {
         })
       getwarehousename({
         compId: this.compId,
-        warehouseType: this.deptBudgetList.warehouseType,
+        warehouseType: this.warehouseType,
       })
         .toPromise()
         .then((response) => {

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -1,9 +1,16 @@
 <!--出入库任务-->
 <template>
-   <div class="container">
-      <div class="nav">
-        <ws-button class="butt" type="primary" @click="handleAdd()"
-          ><img
+  <div class="container">
+    <BaseHeaderLayout :leftSpan="14">
+      <template slot="left">
+        <ws-button
+          type="primary"
+          @click="handleAdd()"
+          v-hasPermission="
+            `warehouseManagement.warehouse.warehouseInfoTask.add`
+          "
+        >
+          <img
             width="13"
             height="13"
             style="
@@ -13,48 +20,70 @@
               left: -4px;
             "
             src="../../../public/img/header-add.png"
-            alt=""
-          />添加</ws-button
+            alt
+          />添加
+        </ws-button>
+        <ws-button
+          class="but"
+          :type="primary == 1 ? 'primary' : ''"
+          @click="handlestatus(1)"
+          >待审核</ws-button
+        >
+        <ws-button
+          class="but"
+          :type="primary == 2 ? 'primary' : ''"
+          @click="handlestatus(2)"
+          >已驳回</ws-button
+        >
+        <ws-button
+          class="but"
+          :type="primary == 3 ? 'primary' : ''"
+          @click="handlestatus(3)"
+          >执行中</ws-button
+        >
+        <ws-button
+          class="but"
+          :type="primary == 4 ? 'primary' : ''"
+          @click="handlestatus(4)"
+          >已完成</ws-button
+        >
+        <ws-button
+          class="but"
+          :type="primary == 5 ? 'primary' : ''"
+          @click="handlestatus('')"
+          >全部任务</ws-button
         >
+      </template>
+      <template slot="right">
         <ws-input
           v-model="warehouseName"
           placeholder="可按合同编号或任务编号查找"
           clearable
           maxlength="500"
           type="input"
-          class="Value"
-        ></ws-input> 
-          <ws-button class="find" type="primary" @click="lookUp()"
-            ><img
-              width="16"
-              height="16"
-              style="
-                vertical-align: text-top;
-                position: relative;
-                top: 0px;
-                left: -1px;
-              "
-              src="../../../public/img/sousuo.png"
-              alt=""
-          /></ws-button> 
-      </div>
-    <div class="nav2" >
-       </div> 
+        ></ws-input>
+        <ws-button class="find" type="primary" @click="lookUp()">
+          <img
+            width="16"
+            height="16"
+            style="
+              vertical-align: text-top;
+              position: relative;
+              top: 0px;
+              left: -1px;
+            "
+            src="../../../public/img/sousuo.png"
+            alt
+          />
+        </ws-button>
+      </template>
+    </BaseHeaderLayout>
     <div class="navv">
-        <ws-button class="but"  @click="handlestatus()">
-          待审核</ws-button>
-          <ws-button class="but"  @click="handlestatus()">
-          已驳回</ws-button>
-        <ws-button class="but"  @click="handlestatus(1)">
-          执行中</ws-button
-        >
-        <ws-button class="but" @click="handlestatus(2)">已完成</ws-button>
-        <ws-button class="but" type="primary" @click="handlestatus('')">全部任务</ws-button>
       <el-table
         class="wenzi"
         :data="gainList.records"
         style="width: 100%; margin-top: 20px"
-        height="650"
+        height="780"
       >
         <el-table-column type="index" label="序号">
           <template scope="scope">
@@ -62,21 +91,42 @@
             <span v-else>{{ scope.$index + 1 }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="contractNo" label="合同编号" width="80">
-        </el-table-column>
-        <el-table-column prop="inOutTaskNo" label="任务编号"> </el-table-column>
-        <el-table-column prop="warehouseName" class="table_td" label="库房名">
-        </el-table-column>
-        <el-table-column prop="inOutType" class="table_td" label="出入库类型">
-        </el-table-column>
-        <el-table-column prop="goodsName" class="table_td" label="货名">
-        </el-table-column>
-        <el-table-column prop="weight" class="table_td" label="重量（吨）">
-        </el-table-column>
-        <el-table-column prop="predictDate" class="table_td" label="预计日期">
-        </el-table-column>
-        <el-table-column prop="publisher" class="table_td" label="发布者">
-        </el-table-column>
+        <el-table-column
+          prop="contractNo"
+          label="合同编号"
+          width="80"
+        ></el-table-column>
+        <el-table-column prop="inOutTaskNo" label="任务编号"></el-table-column>
+        <el-table-column
+          prop="warehouseName"
+          class="table_td"
+          label="库房名"
+        ></el-table-column>
+        <el-table-column
+          prop="inOutType"
+          class="table_td"
+          label="出入库类型"
+        ></el-table-column>
+        <el-table-column
+          prop="goodsName"
+          class="table_td"
+          label="货名"
+        ></el-table-column>
+        <el-table-column
+          prop="weight"
+          class="table_td"
+          label="重量（吨）"
+        ></el-table-column>
+        <el-table-column
+          prop="predictDate"
+          class="table_td"
+          label="预计日期"
+        ></el-table-column>
+        <el-table-column
+          prop="publisher"
+          class="table_td"
+          label="发布者"
+        ></el-table-column>
         <el-table-column prop="taskStatus" label="状态">
           <template slot-scope="scope">
             <el-popover
@@ -99,8 +149,8 @@
                   <span
                     v-if="scope.row.taskStatus == '已完成'"
                     class="done"
-                  ></span
-                  >{{ scope.row.taskStatus }}
+                  ></span>
+                  {{ scope.row.taskStatus }}
                 </span>
               </template>
               <div>
@@ -117,7 +167,9 @@
                     ></div>
                   </div>
                   <div class="vertical-text">
-                    {{ item.operateUser }}<br />{{ item.dealMsg }}
+                    {{ item.operateUser }}
+                    <br />
+                    {{ item.dealMsg }}
                   </div>
                 </div>
               </div>
@@ -128,18 +180,30 @@
               style="vertical-align: text-top; position: relative; top: -1px"
               src="../../../public/img/edit.png"
               @click="editClick(scope.row)"
-              alt=""
+              alt
             />
           </template>
         </el-table-column>
-        <el-table-column prop="establishDate" class="table_td" label="创建时间">
-        </el-table-column>
+        <el-table-column
+          prop="establishDate"
+          class="table_td"
+          label="创建时间"
+        ></el-table-column>
         <el-table-column prop="seller" label="操作" width="300">
           <template slot-scope="scope">
-            <div class="record" @click="nocomplete(scope.row)">
+            <div
+              class="record"
+              @click="nocomplete(scope.row)"
+              v-hasPermission="
+                `warehouseManagement.warehouse.warehouseInfoTask.view`
+              "
+            >
               查看
             </div>
             <div
+              v-hasPermission="
+                `warehouseManagement.warehouse.warehouseInfoTask.audit`
+              "
               v-if="scope.row.taskStatus == '待审核'"
               class="adjustment"
               @click="delivery(scope.row)"
@@ -147,6 +211,9 @@
               审核
             </div>
             <div
+              v-hasPermission="
+                `warehouseManagement.warehouse.warehouseInfoTask.edit`
+              "
               v-if="
                 scope.row.taskStatus == '执行中' ||
                 scope.row.taskStatus == '已驳回'
@@ -157,6 +224,9 @@
               编辑
             </div>
             <div
+              v-hasPermission="
+                `warehouseManagement.warehouse.warehouseInfoTask.delete`
+              "
               v-if="
                 scope.row.taskStatus == '执行中' ||
                 scope.row.taskStatus == '已驳回'
@@ -176,8 +246,7 @@
         :page-size="pageSize"
         layout="total, sizes, prev, pager, next, jumper"
         :total="deptBudgetTotal"
-      >
-      </el-pagination>
+      ></el-pagination>
     </div>
   </div>
 </template>
@@ -217,6 +286,7 @@ export default {
       year: '',
       gainList: [],
       currentPage: 1,
+      primary: '1',
       pageSize: 10,
       searchType: 1,
       searchTypeText: '未完成',
@@ -274,7 +344,7 @@ export default {
           outdelete({
             id: row.id,
             relevanceId: row.relevanceId,
-            inOutFlag:row.inOutFlag
+            inOutFlag: row.inOutFlag,
           })
             .toPromise()
             .then((response) => {
@@ -290,7 +360,7 @@ export default {
         compId: sessionStorage.getItem('ws-pf_compId'),
         currentPage: this.currentPage,
         pageSize: this.pageSize,
-        // searchType: this.searchType,
+        searchType: this.searchType,
         searchKeyWord: this.searchKeyWord,
       })
         .toPromise()
@@ -303,6 +373,17 @@ export default {
         })
     },
     handlestatus(status) {
+      if (status == 1) {
+        this.primary = 1
+      } else if (status == 2) {
+        this.primary = 2
+      } else if (status == 3) {
+        this.primary = 3
+      } else if (status == 4) {
+        this.primary = 4
+      } else {
+        this.primary = 5
+      }
       this.searchType = status
       this.getList()
     },
@@ -541,44 +622,35 @@ export default {
   background: #e9ecf7;
 }
 .el-row {
-  height: 80px;
-}
-.base_header_layout .grid-content {
-  margin-top: 80px;
-}
-.but {
-  margin-left: 55px;
-  margin-top: 30px;
+  height: 50px;
 }
+
 .findValue {
   width: 0%;
   margin-left: 25%;
 }
-
 .search {
   margin-left: -250px;
 }
-.butt{
- margin-left: 60px;
- margin-top: 20px;
-}
-.Value{
+.Value {
   width: 300px;
+  margin-left: 766px;
 }
 .el-pagination {
   margin-bottom: 20px;
   margin-left: 40%;
 }
-.winseaview-main{
- background: #E8ECF6;
-box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.1);
+.winseaview-main {
+  background: #e8ecf6;
+  box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.1);
 }
-.nav{
-  background: white
-  
-}
-.navv{
-  background: #FFFFFF;
+// .nav {
+//   background: white;
+//   height: 60px;
+//   margin-top: -20px;
+// }
+.navv {
+  background: #ffffff;
   border-radius: 4px;
   margin-top: -8px;
 }
@@ -587,9 +659,9 @@ box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.1);
 //   height: 5px;
 //   background-color: #e8eaf1;
 // }
-.nav2{
+.nav2 {
   height: 25px;
-  background: #E8ECF6;
+  background: #e8ecf6;
   margin-top: 15px;
 }
 .spans {

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

@@ -1,42 +1,42 @@
 import Layout from '@/layout/index';
 
 const tranManagementRouter = {
-  path: '/tranManagement',
+  path: '/transportationTask/transportation',
   component: Layout,
-  redirect: '/tranManagement',
-  name: 'tranManagement',
+  redirect: '/transportationTask',
+  name: 'transportationTask',
   alwaysShow: true, // will always show the root menu
   meta: {
     title: 'tranManagement',
-    module: 'tranManagement',
+    module: 'transportationTask.transportation',
     icon: 'cg'
   },
   children: [
 
     //火运调度
     {
-      path: 'tranManagementTransporTationFire',
+      path: 'fireDispatching',
       component: () =>
         import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementTransporTationFire'),
-      name: 'tranManagementTransporTationFire',
+      name: 'fireDispatching',
       meta: {
         title: 'tranManagementTransporTationFire',
-        shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementDriver.tranManagementTransporTationFire',
+        shortcutEntrance: 'transportationTask',
+        module: 'transportationTask.transportation.fireDispatching',
         permissicon: [],
         keepAlive: true
       },
     },
     //车次安排
     {
-      path: 'tranManagementTransporTrainNo',
+      path: 'fireDispatching/car',
       component: () =>
         import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementTransporTrainNo'),
-      name: 'tranManagementTransporTrainNo',
+      name: 'fireDispatchingcar',
       meta: {
         title: 'tranManagementTransporTrainNo',
         shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementDriver.tranManagementTransporTrainNo',
+        module: 'transportationTask.transportation.fireDispatching.car',
         permissicon: [],
         keepAlive: true
       },
@@ -44,14 +44,14 @@ const tranManagementRouter = {
     },
     //火运调度详情
     {
-      path: 'tranManagementTransporTrainDetails',
+      path: 'fireDispatching/view',
       component: () =>
         import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementTransporTrainDetails'),
-      name: 'tranManagementTransporTrainDetails',
+      name: 'fireDispatchingview',
       meta: {
         title: 'tranManagementTransporTrainDetails',
-        shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementDriver.tranManagementTransporTrainDetails',
+        shortcutEntrance: 'transportationTask',
+        module: 'transportationTask.transportation.fireDispatching.view',
         permissicon: [],
         keepAlive: true
       },
@@ -59,14 +59,14 @@ const tranManagementRouter = {
     },
     //船次安排
     {
-      path: 'tranManagementShippingArrangemen',
+      path: 'shippingDispatching/car',
       component: () =>
         import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementShippingArrangemen'),
-      name: 'tranManagementShippingArrangemen',
+      name: 'shippingDispatchingcar',
       meta: {
         title: 'tranManagementShippingArrangemen',
         shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementDriver.tranManagementShippingArrangemen',
+        module: 'transportationTask.transportation.shippingDispatching.car',
         permissicon: [],
         keepAlive: true
       },
@@ -75,14 +75,14 @@ const tranManagementRouter = {
     },
     //船运调度详情
     {
-      path: 'tranManagementShippingLook',
+      path: 'tshippingDispatching/view',
       component: () =>
         import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementShippingLook'),
-      name: 'tranManagementShippingLook',
+      name: 'tshippingDispatchingview',
       meta: {
         title: 'tranManagementShippingLook',
         shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementDriver.tranManagementShippingLook',
+        module: 'transportationTask.transportation.shippingDispatching.view',
         permissicon: [],
         keepAlive: true
       },
@@ -104,31 +104,16 @@ const tranManagementRouter = {
       },
       hidden: true
     },
-    //编辑司机
-    {
-      path: 'tranManagementDriverEdit',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementDriverEdit'),
-      name: 'tranManagementDriverEdit',
-      meta: {
-        title: 'tranManagementDriverEdit',
-        shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementDriver.tranManagementDriverEdit',
-        permissicon: [],
-        keepAlive: true
-      },
-      hidden: true
-    },
     //汽运调度
     {
-      path: 'tranManagementVehicle',
+      path: 'vehicleDispatching',
       component: () =>
         import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementVehicle'),
-      name: 'tranManagementVehicle',
+      name: 'vehicleDispatching',
       meta: {
         title: 'tranManagementVehicle',
         shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementDriver.tranManagementVehicle',
+        module: 'transportationTask.transportation.vehicleDispatching',
         permissicon: [],
         keepAlive: true
       },
@@ -136,14 +121,14 @@ const tranManagementRouter = {
     },
     //船运调度
     {
-      path: 'tranManagementShipping',
+      path: 'shippingDispatching',
       component: () =>
         import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementShipping'),
-      name: 'tranManagementShipping',
+      name: 'shippingDispatching',
       meta: {
         title: 'tranManagementShipping',
         shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementDriver.tranManagementShipping',
+        module: 'transportationTask.transportation.shippingDispatching',
         permissicon: [],
         keepAlive: true
       },
@@ -151,14 +136,14 @@ const tranManagementRouter = {
     },
     //编辑司机
     {
-      path: 'tranManagementDriverEdit',
+      path: 'driverManagement/edit',
       component: () =>
         import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementDriverEdit'),
-      name: 'tranManagementDriverEdit',
+      name: 'driverManagementedit',
       meta: {
         title: 'tranManagementDriverEdit',
         shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementDriver.tranManagementDriverEdit',
+        module: 'transportationTask.transportation.driverManagement.edit',
         permissicon: [],
         keepAlive: true
       },
@@ -166,28 +151,28 @@ const tranManagementRouter = {
     },
     //司机查看
     {
-      path: 'tranManagementDriverLook',
+      path: 'driverManagement/view',
       component: () =>
         import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementDriverLook'),
-      name: 'tranManagementDriverLook',
+      name: 'driverManagementview',
       meta: {
         title: 'tranManagementDriverLook',
         shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementDriver.tranManagementDriverLook',
+        module: 'transportationTask.transportation.driverManagement.edit',
         permissicon: [],
         keepAlive: true
       },
       hidden: true
     }, //司机添加
     {
-      path: 'tranManagementDriverAdd',
+      path: 'driverManagement/add',
       component: () =>
         import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementDriverAdd'),
-      name: 'tranManagementDriverAdd',
+      name: 'driverManagementadd',
       meta: {
         title: 'tranManagementDriverAdd',
         shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementDriver.tranManagementDriverAdd',
+        module: 'transportationTask.transportation.driverManagement.add',
         permissicon: [],
         keepAlive: true
       },
@@ -195,14 +180,14 @@ const tranManagementRouter = {
     },
     //汽车调度
     {
-      path: 'tranManagementVehicleDispatching',
+      path: 'vehicleDispatching/car',
       component: () =>
         import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementVehicleDispatching'),
-      name: 'tranManagementVehicleDispatching',
+      name: 'vehicleDispatchingcar',
       meta: {
         title: 'tranManagementVehicleDispatching',
-        shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementDriver.tranManagementVehicleDispatching',
+        shortcutEntrance: 'transportationTask',
+        module: 'transportationTask.transportation.vehicleDispatching.car',
         permissicon: [],
         keepAlive: true
       },
@@ -210,14 +195,14 @@ const tranManagementRouter = {
     },
     //查看派车详情
     {
-      path: 'tranManagementVehicleLook',
+      path: 'vehicleDispatching/view',
       component: () =>
         import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementVehicleLook'),
-      name: 'tranManagementVehicleLook',
+      name: 'vehicleDispatchingview',
       meta: {
         title: 'tranManagementVehicleLook',
         shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementDriver.tranManagementVehicleLook',
+        module: 'transportationTask.transportation.vehicleDispatching.view',
         permissicon: [],
         keepAlive: true
       },
@@ -225,14 +210,14 @@ const tranManagementRouter = {
     },
     //司机管理
     {
-      path: 'tranManagementDriver',
+      path: 'driverManagement',
       component: () =>
         import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementDriver'),
-      name: 'tranManagementDriver',
+      name: 'driverManagement',
       meta: {
         title: 'tranManagementDriver',
         shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementDriver',
+        module: 'transportationTask.transportation.driverManagement',
         permissicon: [],
         keepAlive: true
       }
@@ -246,7 +231,7 @@ const tranManagementRouter = {
       meta: {
         title: 'tranManagementTransporHairRespond',
         shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementTransporHairRespond',
+        module: 'transportationTask.transportation',
         permissicon: [],
         keepAlive: true
       }
@@ -260,7 +245,7 @@ const tranManagementRouter = {
       meta: {
         title: 'tranManagementTransporFeedback',
         shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementTransporFeedback',
+        module: 'transportationTask.transportation',
         permissicon: [],
         keepAlive: true
       },
@@ -276,7 +261,7 @@ const tranManagementRouter = {
       meta: {
         title: 'tranManagementTransporFeedbackLook',
         shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementTransporFeedbackLook',
+        module: 'transportationTask.transportation',
       },
       hidden: true
     },
@@ -290,7 +275,7 @@ const tranManagementRouter = {
       meta: {
         title: 'tranManagementReceivingFeedback',
         shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementDriver.tranManagementReceivingFeedback',
+        module: 'transportationTask.transportation',
         permissicon: [],
 
       },
@@ -304,7 +289,7 @@ const tranManagementRouter = {
       meta: {
         title: 'tranManagementReceivingloading',
         shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementReceivingloading',
+        module: 'transportationTask.transportation',
         permissicon: [],
         keepAlive: true
       },
@@ -319,7 +304,7 @@ const tranManagementRouter = {
       meta: {
         title: 'tranManagementReceivingloadingLook',
         shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementReceivingloadingLook',
+        module: 'transportationTask.transportation',
         permissicon: [],
         keepAlive: true
       },
@@ -327,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"
@@ -237,7 +236,6 @@
             <el-button
               v-if="scope.row.disableStatusFlag != 1"
               size="medium"
-              class="record"
               type="text"
               @click="stop(scope.row)"
               >禁用</el-button
@@ -324,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>
@@ -354,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'
@@ -441,7 +418,7 @@ export default {
     },
     edit(row) {
       this.$router.push({
-        name: 'tranManagementDriverEdit',
+        name: 'driverManagementedit',
         query: { id: row.id },
       })
     },
@@ -459,16 +436,14 @@ export default {
     },
     look(row) {
       this.$router.push({
-        name: 'tranManagementDriverLook',
+        name: 'driverManagementview',
         query: { id: row.id },
       })
     },
     //添加
     handleAdd() {
-      this.$router.push({ path: 'tranManagementDriverAdd' })
-    },
-    handleDelete() {
-      this.$router.push({ path: 'warehouseManagementDelete' })
+      console.log(11111)
+      this.$router.push({ name: 'driverManagementadd' })
     },
     selectcar(e, row) {
       console.log(e, row)

src/views/tranManagement/tranManagementDriverAdd.vue

@@ -745,7 +745,7 @@ export default {
       this.selectedOptions = value
     },
     returnsales() {
-      this.$router.push({ path: 'tranManagementDriver' })
+      this.$router.go(-1)
     },
     // confirmPosition() {
     //   this.draggable = false
@@ -964,7 +964,7 @@ export default {
                   bankCard: '',
                 },
               ]
-              this.$router.push({ path: 'tranManagementDriver' })
+              this.$router.go(-1)
             })
         } else {
           EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))

src/views/tranManagement/tranManagementDriverEdit.vue

@@ -810,7 +810,7 @@ export default {
       console.log(this.selectedOptions)
     },
     returnsales() {
-      this.$router.push({ path: 'tranManagementDriver' })
+      this.$router.go(-1)
     },
     // confirmPosition() {
     //   this.draggable = false
@@ -864,7 +864,7 @@ export default {
             .toPromise()
             .then((response) => {
               this.$message.success('添加成功')
-              this.$router.push({ path: 'tranManagementDriver' })
+              this.$router.go(-1)
             })
         } else {
           EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))

src/views/tranManagement/tranManagementDriverLook.vue

@@ -348,7 +348,7 @@ export default {
       this.selectedOptions = value
     },
     returnsales() {
-      this.$router.push({ path: 'tranManagementDriver' })
+      this.$router.go(-1)
     },
     resetForm(deptBudgetList) {
       this.$refs[deptBudgetList].resetFields()

src/views/tranManagement/tranManagementReceivingFeedback.vue

@@ -1,21 +1,21 @@
-//收获反馈
+//收货反馈
 <template>
   <div>
     <BaseHeaderLayout :leftSpan="13">
       <template slot="left">
-        <ws-button class="but"  @click="statusquery(1)">
+        <ws-button class="but" :type="primary == 1 ? 'primary' : ''" @click="statusquery(1)">
           执行中</ws-button
         >
-        <ws-button class="but" @click="statusquery(2)">已完成</ws-button>
-        <ws-button class="but" @click="statusquery()">全部任务</ws-button>
+        <ws-button class="but" :type="primary == 2 ? 'primary' : ''" @click="statusquery(2)">已完成</ws-button>
+        <ws-button class="but" :type="primary == 3 ? 'primary' : ''" @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
@@ -53,7 +53,7 @@
       <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">
@@ -64,7 +64,7 @@
         </el-table-column>
         <el-table-column class="table_td" prop="processNo" label="运输任务编号">
         </el-table-column>
-        <el-table-column prop="tranType" label="运输方式" width="80">
+        <el-table-column prop="tranType" label="运输方式">
         </el-table-column>
         <el-table-column class="table_td" prop="goodsName" label="货名">
 
@@ -72,10 +72,10 @@
         <el-table-column class="table_td" label="重量（吨）" prop="weight">
          
         </el-table-column>
-        <el-table-column class="table_td" label="发货" prop="send">
+        <el-table-column class="table_td" label="发货" prop="send" width="240">
           
         </el-table-column>
-        <el-table-column class="table_td" label="收货" prop="receive">
+        <el-table-column class="table_td" label="收货" prop="receive" width="240">
           
         </el-table-column>
         <el-table-column class="table_td" label="运输周期" prop="tranCycle">
@@ -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 }}
@@ -207,7 +207,7 @@ export default {
       year: '',
       currentPage: 1,
       pageSize: 10,
-      searchType: 1,
+      feedbackFlag: 1,
       searchTypeText: '未完成',
       searchKeyWord: '',
       contractType: 2,
@@ -215,6 +215,7 @@ export default {
       // 提交类型
       submitType: true,
       size: 10,
+      primary:'1',
       spanArr: [],
       warehouseName: '',
       deptBudgetTotal: 0,
@@ -224,6 +225,7 @@ export default {
       deptBudgetList: {},
       historyList: [],
       value2:'',
+      inOutDate:[],
       pickerOptions:[],
       pickerBeginDateBefore: {
         disabledDate: (time) => {
@@ -239,13 +241,14 @@ export default {
   methods: {
       //接口
     getList() {
-        console.log(765)
       shippingList({
         compId: sessionStorage.getItem('ws-pf_compId'),
         currentPage: this.currentPage,
         pageSize: this.pageSize,
-        contractType: this.contractType,
-        searchType: this.searchType,
+        feedbackFlag: this.feedbackFlag,
+         startDate: this.startDate ,
+        endDate:this.endDate,
+        searchKeyWord : this.searchKeyWord
         
       })
         .toPromise()
@@ -257,7 +260,14 @@ export default {
         })
     },
     statusquery(status){
-      this.searchType = status
+      if (status == 1) {
+        this.primary = 1
+      } else if (status == 2) {
+        this.primary = 2
+      } else {
+        this.primary = 3
+      }
+      this.feedbackFlag = status
       this.getList()
     },
     delivery(item) {
@@ -429,32 +439,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>
@@ -523,21 +517,18 @@ 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;
-}
+
 .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,
@@ -567,4 +558,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 {
@@ -229,13 +241,14 @@ export default {
     }
   },
   activated() {
+    this.deptBudgetList.id = this.$route.query.id
     this.getList()
   },
   computed: {
     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 +267,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 +313,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) {
@@ -604,4 +624,8 @@ export default {
   height: 20px;
   line-height: 18px;
 }
+.container {
+  overflow: scroll;
+  height: 93vh;
+}
 </style>

src/views/tranManagement/tranManagementReceivingloadingLook.vue

@@ -137,9 +137,9 @@
                   @click="fujian(scope.row)"
                   alt=""
                 />
-                <div v-show="item.temporaryDriverFlag == 0">
+                <!-- <div v-show="item.temporaryDriverFlag == 0">
                   {{ item.signStatus }}
-                </div>
+                </div> -->
               </template>
             </ws-form-item>
            
@@ -257,11 +257,14 @@ export default {
       arr: [],
     }
   },
-  mounted() {
-    this.deptBudgetList.id = this.$route.query.id
-    this.getList()
-  },
-
+  // mounted() {
+   
+  //   this.getList()
+  // },
+activated(){
+   this.deptBudgetList.id = this.$route.query.id
+  this.getList()
+},
   computed: {
     totalStorage: function () {
       var maxStorage = 0
@@ -764,6 +767,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(2)">已完成</ws-button>
-        <ws-button class="but" @click="statusquery()">全部任务</ws-button>
+        <ws-button class="but" :type="searchType == 1 ?'primary':''"  @click="statusquery(1)"> 执行中</ws-button>
+        <ws-button class="but" :type="searchType == 2 ?'primary':''"  @click="statusquery(2)">已完成</ws-button>
+        <ws-button class="but" :type="searchType == undefined ?'primary':''"  @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,62 +279,35 @@ 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 },
-         })
+      })
     },
 
     // 派船
-    shipping(row){
-        this.$router.push({
-           name: 'tranManagementShippingArrangemen',
-           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,      
-           }
-           })
+    shipping(row) {
+      this.$router.push({
+        name: 'shippingDispatchingcar',
+        query: {
+          id: row.id,
+        },
+      })
     },
     dateFormat(fmt, date) {
       let ret
@@ -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,19 @@ export default {
   height: 12px;
   background: #e9ecf7;
 }
-.el-row{
-    height: 150px;
+.el-row {
+  height: 60px;
 }
-.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;
+
+.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 +540,8 @@ export default {
 .done {
   background: #50cad4;
 }
-.record, .adjustment{
+.record,
+.adjustment {
   display: inline-block;
   color: #5878e8;
   padding: 0 4px !important;

src/views/tranManagement/tranManagementShippingArrangemen.vue

@@ -22,127 +22,112 @@
         <div class="basicInformation">
           <div class="small-title">任务详情</div>
           <ws-info-table>
-            <!-- 任务编号 -->
-            <ws-form-item label="任务编号" span="1" prop="processNo">{{deptBudgetList.processNo}}</ws-form-item>
-            <!-- 货名 -->
+             <ws-form-item label="任务编号" span="1" prop="processNo">{{deptBudgetList.processNo}}</ws-form-item>
             <ws-form-item label="货名" span="1" prop="goodsName">{{deptBudgetList.goodsName}}</ws-form-item>
-            <!--重量（吨）-->
             <ws-form-item label="重量（吨）" span="1" prop="weight">{{deptBudgetList.weight}}</ws-form-item>
-            <!--发货地址-->
             <ws-form-item
               label="发货地址"
               span="1"
               prop="sendDetailedAddress"
-            >{{deptBudgetList.sendPrivate}}{{deptBudgetList.sendCity}}{{deptBudgetList.sendArea}}</ws-form-item>
-            <!--发货人-->
-            <ws-form-item label="发货人" span="1" prop="sender">{{deptBudgetList.sender}}</ws-form-item>
-
-            <!--发货人电话-->
+            >{{deptBudgetList.sendDetailedAddress}}</ws-form-item>
+           <ws-form-item label="发货人" span="1" prop="sender">{{deptBudgetList.sender}}</ws-form-item>
             <ws-form-item label="发货人电话" span="1" prop="senderPhone">{{deptBudgetList.senderPhone}}</ws-form-item>
-            <!--收货地址-->
             <ws-form-item
               label="收货地址"
               span="1"
               prop="receiveDetailedAddress"
-            >{{deptBudgetList.receivePrivate}}{{deptBudgetList.receiveCity}}{{deptBudgetList.receiveArea}}</ws-form-item>
-            <!--收货人-->
+            >{{deptBudgetList.receiveDetailedAddress}}</ws-form-item>
             <ws-form-item label="收货人" span="1" prop="receiver">{{deptBudgetList.receiver}}</ws-form-item>
-
-            <!--收货人电话-->
             <ws-form-item
               label="收货人电话"
               span="1"
               prop="receiverPhone"
             >{{deptBudgetList.receiverPhone}}</ws-form-item>
-            <!--发货日期-->
             <ws-form-item
               label="发货日期"
               span="1"
               prop="deliveryDateStart"
             >{{deptBudgetList.deliveryDateStart}}</ws-form-item>
-            <!--最晚发货日期-->
             <ws-form-item
               label="最晚到货日期"
               span="1"
               prop="deliveryDateEnd"
             >{{deptBudgetList.deliveryDateEnd}}</ws-form-item>
-            <!--合同编号-->
-            <ws-form-item label="合同编号" span="1" prop="contractNo">{{deptBudgetList.contractNo}}</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-info-table>
-                <!--姓名-->
-                <ws-form-item label="姓名" span="1" prop="driver" class="siji">
+                <ws-form-item label="姓名" span="1" prop="driver" >
                   <el-select
                     v-model="item.driver"
                     placeholder="请选择姓名"
                     filterable
                     :filter-method="dataFilter"
                     @change="selectstaff"
+                    class="small"
                   >
                     <el-option
                       v-for="item in options"
                       :key="item.value"
                       :label="item.staffName"
                       :value="item.staffName"
+                       
                     />
                   </el-select>
                 </ws-form-item>
-                <!--电话-->
-                <ws-form-item label="电话" span="1" prop="driverPhone" class="siji">
+                <ws-form-item label="电话" span="1" prop="driverPhone" class="biao">
                   <ws-input
                     :readonly="true"
                     v-model="item.driverPhone"
                     placeholder="请输入电话"
                     maxlength="20"
                     size="small"
+                    class="ys"
                   />
                 </ws-form-item>
-                <!--发船日期-->
-                <ws-form-item label="发船日期" span="1" prop="sendDateStart" class="siji">
+                <ws-form-item label="发船日期" span="1" prop="sendDateStart" class="biao2">
                   <ws-date-picker
                     v-model="item.sendDateStart"
                     type="date"
                     placeholder="请选择发货日期"
                     value-format="yyyy-MM-dd"
+                    class="small"
                   />
                 </ws-form-item>
-                <!--预计到港日-->
-                <ws-form-item label="预计到港日期" span="1" prop="receiveDateEnd" class="siji">
+                <ws-form-item label="预计到港日期" span="1" prop="receiveDateEnd" class="biao3">
                   <ws-date-picker
                     v-model="item.receiveDateEnd"
                     type="date"
                     placeholder="请选择发货日期"
                     value-format="yyyy-MM-dd"
+                    class="small"
                   />
                 </ws-form-item>
-                <!-- 船名 -->
-                <ws-form-item label="船名" span="1" prop="shipName" class="siji">
+                 <ws-form-item label="航次" span="1" prop="shipNo" class="biao4">
+                  <ws-input v-model="item.shipNo" placeholder="请选择航次" maxlength="100" size="small" class="ys"></ws-input>
+                </ws-form-item>
+                <ws-form-item label="船名" span="1" prop="shipName" class="">
                   <ws-input
                     v-model="item.shipName"
                     placeholder="请输入船名"
                     maxlength="100"
                     size="small"
+                    class="ys"
                   ></ws-input>
                 </ws-form-item>
-                <!-- 航次 -->
-                <ws-form-item label="航次" span="1" prop="shipNo" class="siji">
-                  <ws-input v-model="item.shipNo" placeholder="请选择航次" maxlength="100" size="small"></ws-input>
-                </ws-form-item>
-                <!-- 类型 -->
-                <ws-form-item label="类型" span="1" prop="shipType" class="siji">
-                  <ws-select v-model="item.shipType" placeholder="请输入" class="typeselect">
+                <ws-form-item label="类型" span="1" prop="shipType" class="biao5">
+                  <ws-select v-model="item.shipType" placeholder="请输入" class="ys">
                     <ws-option
                       v-for="items in shipType"
                       :key="items.constKey"
                       :label="items.constValue"
                       :value="items.constValue"
+                       
                     />
                   </ws-select>
                 </ws-form-item>
@@ -150,10 +135,10 @@
                   label="数量"
                   span="1"
                   prop="boxNumber"
-                  class="siji"
+                  class="biao6"
                   v-show="item.shipType=='集装箱'"
                 >
-                  <ws-input v-model="item.boxNumber" placeholder="请输入数量" size="small"></ws-input>
+                  <ws-input v-model="item.boxNumber" placeholder="请输入数量" class="ys"></ws-input>
                 </ws-form-item>
               </ws-info-table>
             </div>
@@ -161,29 +146,15 @@
               style="width: 530px"
               class="xia"
               v-for="(items, index) in freightspace"
-              :key="index"
               v-show="item.shipType=='散船'"
+              :key="index"
             >
               <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"
@@ -209,7 +180,7 @@
             </div>
           </div>
         </div>
-      </ws-form>
+      </ws-form> 
       <div style="text-align: right; padding: 10px">
         <el-button class="bg-bottom-up" type="primary" size="small" @click="submit()">提交</el-button>
       </div>
@@ -231,9 +202,9 @@ export default {
     Pagination
   },
   watch: {
-    // vesselId(val) {
-    //   this.getList()
-    // },
+    vesselId(val) {
+      this.getList()
+    },
     isShow(val) {
       this.showType = val
     }
@@ -392,7 +363,7 @@ export default {
     //返回按钮
     revert() {
       this.freightspace = []
-      this.$router.push({ name: 'tranManagementShipping' })
+      this.$router.go(-1)
     },
     del(index) {
       if (this.freightspace.length > 1) {
@@ -475,14 +446,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 (
@@ -540,9 +511,7 @@ export default {
                   this.deptBudgetList = {}
                   this.freightspace = {}
                   this.selectedOptions = ''
-                  this.$router.push({
-                    path: 'tranManagementShipping'
-                  })
+                  this.$router.go(-1)
                 })
             } else {
               // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
@@ -573,9 +542,9 @@ export default {
           this.searchType = this.taskTypeList[i].type
         }
       }
-    },
-    approve() {},
-    listQuery() {}
+    }
+    // approve() {},
+    // listQuery() {}
   }
 }
 </script>
@@ -725,6 +694,7 @@ export default {
   border-radius: 4px;
   /* border: 1px solid #d8dce6; */
   width: 1010px;
+  
 }
 /deep/.zi {
   width: 64px;
@@ -811,12 +781,61 @@ export default {
   border: none;
   width: 1000px;
 }
-.el-input--small .el-input__inner {
-  border-block-color: #f6f7fc;
-  background: #f6f7fc;
-}
+/deep/.el-select .el-input__inner {
+    border: 1px solid #ccc !important;
+    padding: 0 15px !important;
+    font-size: 12px !important;
+    width: 150px;
+}
+// .el-input--small .el-input__inner {
+//   height: 32px;
+//     line-height: 32px;
+//     width: 150px;
+//   border-block-color: #f6f7fc;
+//   background: #f6f7fc;
+  
+// }
 .zhong {
   background: #f6f7fc;
   border: 1px solid #d8dce6;
 }
+.bg-left {
+  padding-left: 30px;
+}
+/deep/.el-icon-arrow-up:before {
+    margin-left: 116px;
+}
+/deep/.el-input--prefix .el-input__inner {
+    padding-left: 30px;
+    width: 150px;
+}
+.ys{
+  // margin-left: 300px;
+  width: 100px;
+
+}
+.biao{
+  margin-left: 200px;
+  margin-top: -57px;
+}
+.biao2{
+  margin-left: 350px;
+  margin-top: -57px;
+}
+.biao3{
+   margin-left: 580px;
+  margin-top: -57px;
+}
+.biao4{
+  margin-left: 850px;
+  margin-top: -57px;
+}
+.biao5{
+  margin-left: 200px;
+  margin-top: -57px;
+}
+.biao6{
+  margin-left: 400px;
+  margin-top: -57px;
+}
 </style>

src/views/tranManagement/tranManagementShippingLook.vue

@@ -6,7 +6,12 @@
         <h2 class="bg-left title">船运调度详情</h2>
       </el-col>
       <el-col :span="4" class="bg-right">
-        <el-button class="bg-bottom" type="primary" size="small" @click="revert()">
+        <el-button
+          class="bg-bottom"
+          type="primary"
+          size="small"
+          @click="revert()"
+        >
           <img
             width="6"
             height="10"
@@ -20,225 +25,141 @@
     <div class="center">
       <ws-form ref="deptBudgetList" :model="deptBudgetList">
         <div class="basicInformation">
-          <h2>任务编号</h2>
+          <div class="small-title">任务详情</div>
           <ws-info-table>
             <!-- 任务编号 -->
             <ws-form-item label="任务编号" span="1" prop="processNo">
-              <!-- <ws-input
-              v-model="deptBudgetList.processNo" 
-              placeholder="请输入任务编号"
-              maxlength="20"
-              size="small"
-              />-->
-              {{deptBudgetList.processNo}}
+              {{ deptBudgetList.processNo }}
             </ws-form-item>
             <!-- 货名 -->
             <ws-form-item label="货名" span="1" prop="goodsName">
-              <!-- <ws-input
-              v-model="deptBudgetList.goodsName"
-              placeholder="请输入货名"
-              maxlength="20"
-              size="small"
-              />-->
-              {{deptBudgetList.goodsName}}
+              {{ deptBudgetList.goodsName }}
             </ws-form-item>
             <!--重量（吨）-->
-            <ws-form-item label="重量（吨）" span="1" prop="weight" class="readonly">
-              <!-- <ws-input
-              v-model="deptBudgetList.weight"
-              placeholder="请输入重重"
-              maxlength="100"
-              size="small"
-              />-->
-              {{deptBudgetList.weight}}
+            <ws-form-item
+              label="重量（吨）"
+              span="1"
+              prop="weight"
+              class="readonly"
+            >
+              {{ deptBudgetList.weight }}
             </ws-form-item>
 
             <!--发货地址-->
             <ws-form-item label="发货地址" span="1">
-              <!-- <ws-input
-              readonly="readonly"
-              v-model="deptBudgetList.sendDetailedAddress"
-              placeholder=""
-              maxlength="120"
-              size="small"
-              />-->
-              {{deptBudgetList.sendPrivate}}{{deptBudgetList.sendCity}}{{deptBudgetList.sendArea}}
+              {{ deptBudgetList.sendPrivate }}{{ deptBudgetList.sendCity
+              }}{{ deptBudgetList.sendArea }}
             </ws-form-item>
             <!--发货人-->
             <ws-form-item label="发货人" span="1" prop="sender">
-              <!-- <ws-input
-              v-model="deptBudgetList.sender"
-              placeholder="请输入发货人姓名"
-              maxlength="100"
-              size="small"
-              />-->
-              {{deptBudgetList.sender}}
+              {{ deptBudgetList.sender }}
             </ws-form-item>
 
             <!--发货人电话-->
             <ws-form-item label="发货人电话" span="1" prop="senderPhone">
-              <!-- <ws-input
-              v-model="deptBudgetList.senderPhone"
-              placeholder="请输入发货人电话"
-              maxlength="100"
-              size="small"
-              />-->
-              {{deptBudgetList.senderPhone}}
+              {{ deptBudgetList.senderPhone }}
             </ws-form-item>
             <!--收货地址-->
-            <ws-form-item label="收货地址" span="1" prop="receiveDetailedAddress">
-              <!-- <el-cascader
-            v-model="deptBudgetList.receiveDetailedAddress"
-            clearable
-            size="large"
-            placeholder="请选择发货地址"
-            style="width: 200%"
-              />-->
-              {{deptBudgetList.receivePrivate}}{{deptBudgetList.receiveCity}}{{deptBudgetList.receiveArea}}
+            <ws-form-item
+              label="收货地址"
+              span="1"
+              prop="receiveDetailedAddress"
+            >
+              {{ deptBudgetList.receivePrivate }}{{ deptBudgetList.receiveCity
+              }}{{ deptBudgetList.receiveArea }}
             </ws-form-item>
             <!--收货人-->
             <ws-form-item label="收货人" span="1" prop="receiver">
-              <!-- <ws-input
-              v-model="deptBudgetList.receiver"
-              placeholder="请输入发货人"
-              maxlength="100"
-              size="small"
-              />-->
-              {{deptBudgetList.receiver}}
+              {{ deptBudgetList.receiver }}
             </ws-form-item>
 
             <!--收货人电话-->
             <ws-form-item label="收货人电话" span="1" prop="receiverPhone">
-              <!-- <ws-input
-              v-model="deptBudgetList.receiverPhone"
-              placeholder="请输入收货人电话"
-              maxlength="100"
-              size="small"
-              />-->
-              {{deptBudgetList.receiverPhone}}
+              {{ deptBudgetList.receiverPhone }}
             </ws-form-item>
 
             <!--发船日期-->
             <ws-form-item label="发船日期" span="1" prop="deliveryDateStart">
-              <!-- <ws-input
-            v-model="deptBudgetList.deliveryDateStart"
-            placeholder=""
-            maxlength="20"
-            size="small"
-              />-->
-              {{deptBudgetList.deliveryDateStart}}
+              {{ deptBudgetList.deliveryDateStart }}
             </ws-form-item>
 
             <!--最晚发货日期-->
             <ws-form-item label="最晚到货日期" span="1" prop="deliveryDateEnd">
-              <!-- <ws-input
-            v-model="deptBudgetList.deliveryDateEnd"
-            placeholder=""
-            maxlength="20"
-            size="small"
-              />-->
-              {{deptBudgetList.deliveryDateEnd}}
+              {{ deptBudgetList.deliveryDateEnd }}
             </ws-form-item>
             <!--合同编号-->
             <ws-form-item label="合同编号" span="1" prop="contractNo">
-              <!-- <ws-input
-            v-model="deptBudgetList.contractNo"
-            placeholder="请输入合同编号"
-            maxlength="20"
-            size="small"
-              />-->
-              {{deptBudgetList.contractNo}}
+              {{ deptBudgetList.contractNo }}
             </ws-form-item>
           </ws-info-table>
           <div class="small-title">联络员及航次</div>
-          <div class="aa">
-            <div class="small-title">航次信息</div>
-            <div
-              style="width: 100%"
-              class="flex position"
-              v-for="(item, index) in deptBudgetList.tranCarInfoList"
-            >
-              <ws-info-table>
-                <!-- 姓名 -->
-                <ws-form-item label="姓名" span="1" prop="driver" class="siji">
-                  <!-- <ws-input
-                  v-model="item.driver"
-                  placeholder="请选择联络员"
-                  size="small"
-                  ></ws-input>-->
-                  {{item.driver}}
-                </ws-form-item>
-                <!-- 电话 -->
-                <ws-form-item label="电话" span="1" prop="driverPhone" class="siji">
-                  <!-- <ws-input
-                  v-model="item.driverPhone"
-                  placeholder="联络员电话"
-                  size="small"
-                  ></ws-input>-->
-                  {{item.driverPhone}}
-                </ws-form-item>
-                <!--发船日期-->
-                <ws-form-item label="发船日期" span="1" prop="sendDateStart" class="siji">
-                  <!-- <ws-input
-                  v-model="item.sendDateStart"
-                  placeholder="请选择日期"
-                  ></ws-input>-->
-                  {{item.sendDateStart}}
-                </ws-form-item>
-                <ws-form-item label="预计到港日期" span="1" prop="receiveDateEnd" class="siji">
-                  <!-- <ws-input
-                  v-model="item.receiveDateEnd"
-                  placeholder="请选择日期"
-                  value-format="yyyy-MM-dd"
-                  size="small"
-                  />-->
-                  {{item.receiveDateEnd}}
-                </ws-form-item>
-                <!-- 船名 -->
-                <ws-form-item label="船名" span="1" prop="shipName" class="siji">
-                  <!-- <ws-input 
-                  v-model="item.shipName"
-                  placeholder="请输入船名"
-                  maxlength="100"
-                  size="small"
-                  ></ws-input>-->
-                  {{item.shipName}}
-                </ws-form-item>
-                <!-- 航次 -->
-                <ws-form-item label="航次" span="1" prop="shipNo" class="siji">
-                  <!-- <ws-input 
-                  v-model="item.shipNo"
-                  placeholder="请选择航次"
-                  maxlength="100"
-                  size="small"
-                  ></ws-input>-->
-                  {{item.shipNo}}
-                </ws-form-item>
-                <!-- 类型 -->
-                <ws-form-item label="类型" span="1" prop="shipType" class="siji">
-                  <!-- <ws-input
-                  v-model="item.shipType"
-                  placeholder=""
-                  size="small"
-                  ></ws-input>-->
-                  {{item.shipType}}
-                </ws-form-item>
-                <ws-form-item
-                  label="数量"
-                  span="1"
-                  prop="boxNumber"
-                  class="siji"
-                  v-show="item.shipType=='集装箱'"
-                >
-                  <!-- <ws-input
-          v-model="item.boxNumber"
-          placeholder="请输入数量"
-          size="small"
-                  ></ws-input>-->
-                  {{item.boxNumber}}
-                </ws-form-item>
-              </ws-info-table>
-            </div>
+          <div
+            style="width: 100%"
+            class="flex position middle"
+            v-for="(item, index) in deptBudgetList.tranCarInfoList"
+          >
+        <div style="margin: 18px;color: #69708C;">航次信息</div>
+            <ws-info-table>
+              <!-- 姓名 -->
+              <ws-form-item label="姓名" span="1" prop="driver" class="siji">
+                {{ item.driver }}
+              </ws-form-item>
+              <el-divider direction="vertical" class="line"></el-divider>
+              <!-- 电话 -->
+              <ws-form-item
+                label="电话"
+                span="1"
+                prop="driverPhone"
+                class="siji"
+              >
+                {{ item.driverPhone }}
+              </ws-form-item>
+              <el-divider direction="vertical" class="line"></el-divider>
+              <!--发船日期-->
+              <ws-form-item
+                label="发船日期"
+                span="1"
+                prop="sendDateStart"
+                class="siji"
+              >
+                {{ item.sendDateStart }}
+              </ws-form-item>
+              <el-divider direction="vertical" class="line"></el-divider>
+              <ws-form-item
+                label="预计到港日期"
+                span="1"
+                prop="receiveDateEnd"
+                class="siji"
+              >
+                {{ item.receiveDateEnd }}
+              </ws-form-item>
+              <el-divider direction="vertical" class="line"></el-divider>
+              <!-- 船名 -->
+              <ws-form-item label="船名" span="1" prop="shipName" class="siji">
+                {{ item.shipName }}
+              </ws-form-item>
+            <el-divider direction="vertical" class="line"></el-divider>
+              <!-- 航次 -->
+              <ws-form-item label="航次" span="1" prop="shipNo" class="siji">
+                {{ item.shipNo }}
+              </ws-form-item>
+
+              <el-divider direction="vertical" class="line"></el-divider>
+              <!-- 类型 -->
+              <ws-form-item label="类型" span="1" prop="shipType" class="siji">
+                {{ item.shipType }}
+              </ws-form-item>
+              <ws-form-item
+                label="数量"
+                span="1"
+                prop="boxNumber"
+                class="siji"
+                v-show="item.shipType == '集装箱'"
+              >
+                {{ item.boxNumber }}
+              </ws-form-item>
+               
+            </ws-info-table>
           </div>
           <div class="xia">
             <div
@@ -248,43 +169,34 @@
               :key="index"
             >
               <ws-info-table>
-                <ws-form-item :label="'仓位号-'+ (index + 1 )" span="1" prop="impurity" class="bot">
-                  <!-- <ws-input
-          v-model="item.impurity"
-          placeholder="请输入仓位号"
-          size="small"
-                  ></ws-input>-->
-                  {{items.impurity}}
+                <ws-form-item
+                  :label="'仓位号-' + (index + 1)"
+                  span="1"
+                  prop="impurity"
+                  class="bot"
+                >
+                  {{ items.impurity }}
                 </ws-form-item>
                 <!-- 重量（吨） -->
-                <ws-form-item label="重量(吨)" span="1" prop="positionWeight" class="bot">
-                  <!-- <ws-input
-          v-model="item.positionWeight"
-          placeholder="请输入装仓重量"
-          size="small"
-                  ></ws-input>-->
-                  {{items.positionWeight}}
+                <ws-form-item
+                  label="重量(吨)"
+                  span="1"
+                  prop="positionWeight"
+                  class="bot"
+                >
+                  {{ items.positionWeight }}
                 </ws-form-item>
               </ws-info-table>
-              <!-- <img
-            width="22"
-            height="22"
-            class="del"
-            @click="del(index)"
-            src="../../../public/img/del.png"
-            alt=""
-              />-->
             </div>
           </div>
-          <!-- <el-button
-          class="add"
-          type="primary"
-          size="small"
-          @click="add()"
-          >添加仓位</el-button
-          >-->
           <div style="text-align: right; padding: 10px">
-            <el-button class="bg-bottom-up" type="primary" size="small" @click="returnsales()">关闭</el-button>
+            <el-button
+              class="bg-bottom-up"
+              type="primary"
+              size="small"
+              @click="returnsales()"
+              >关闭</el-button
+            >
           </div>
         </div>
       </ws-form>
@@ -301,7 +213,7 @@ export default {
   name: 'viewSpareMoney',
   components: {
     WsUpload,
-    Pagination
+    Pagination,
   },
   watch: {
     // vesselId(val) {
@@ -309,7 +221,7 @@ export default {
     // },
     isShow(val) {
       this.showType = val
-    }
+    },
   },
   data() {
     return {
@@ -344,16 +256,16 @@ export default {
       tranCarInfoList: [],
       list: [],
       arr: [],
-      freightspace: [{ binNumber: '', maxStorage: '', remark: '' }],
+      freightspace: [],
       rules: {
         netWeight: [
           {
             required: true,
             type: 'number',
             message: '请输入活动名称',
-            trigger: 'blur'
-          }
-        ]
+            trigger: 'blur',
+          },
+        ],
       },
       size: 10,
       compId: sessionStorage.getItem('ws-pf_compId'),
@@ -361,21 +273,21 @@ export default {
       packtypeList: {},
       date: {
         year: dayjs().format('YYYY'),
-        month: dayjs().format('MM')
+        month: dayjs().format('MM'),
       },
       contractList: [],
       deptBudgetList: {
         warehouseInOutDetail: {},
-        tranCarInfoList: []
+        tranCarInfoList: [],
       },
       historyList: [],
 
       pickerBeginDateBefore: {
-        disabledDate: time => {
+        disabledDate: (time) => {
           return time.getTime() > Date.now()
-        }
+        },
       },
-      accessoryTFs: false
+      accessoryTFs: false,
     }
   },
   mounted() {
@@ -392,26 +304,16 @@ export default {
     loaddata() {
       shippingLook({ id: this.$route.query.id })
         .toPromise()
-        .then(response => {
+        .then((response) => {
           this.deptBudgetList = response
-          // this.deptBudgetList.driver = this.deptBudgetList.tranCarInfoList[0].driver
-          // this.deptBudgetList.driverPhone = this.deptBudgetList.tranCarInfoList[0].driverPhone
-          // this.deptBudgetList.sendDateStart = this.deptBudgetList.tranCarInfoList[0].sendDateStart
-          //   this.deptBudgetList.sendDateStart = this.deptBudgetList.tranCarInfoList[0].sendDateStart
-          //    this.deptBudgetList.receiveDateEnd = this.deptBudgetList.tranCarInfoList[0].receiveDateEnd
-          //   this.deptBudgetList.shipName = this.deptBudgetList.tranCarInfoList[0].shipName
-          //    this.deptBudgetList.shipNo = this.deptBudgetList.tranCarInfoList[0].shipNo
-          //     this.deptBudgetList.shipType = this.deptBudgetList.tranCarInfoList[0].shipType
-          //    this.deptBudgetList. boxNumber =this.deptBudgetList.tranCarInfoList[0].boxNumber
           for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
-            var num = this.deptBudgetList.tranCarInfoList[
-              i
-            ].positionWeight.split(',')
+            var num =
+              this.deptBudgetList.tranCarInfoList[i].positionWeight.split(',')
             for (var j = 0; j < num.length; j++) {
               var num2 = num[j].split('/')
               this.freightspace.push({
                 impurity: num2[i],
-                positionWeight: num2[num2.length - 1]
+                positionWeight: num2[num2.length - 1],
               })
             }
           }
@@ -423,17 +325,17 @@ export default {
         currentPage: this.currentPage,
         pageSize: this.pageSize,
         contractType: this.contractType,
-        tranTypeKey: this.tranTypeKey
+        tranTypeKey: this.tranTypeKey,
       })
         .toPromise()
-        .then(response => {
+        .then((response) => {
           this.warehouseList = response
         })
     },
     //返回按钮
     revert() {
       this.freightspace = []
-      this.$router.push({ path: 'tranManagementShipping' })
+      this.$router.go(-1)
     },
     del(index) {
       if (this.freightspace.length > 1) {
@@ -444,7 +346,7 @@ export default {
       this.freightspace.push({
         binNumber: '',
         maxStorage: '',
-        remark: ''
+        remark: '',
       })
     },
     //提交按钮
@@ -452,19 +354,18 @@ export default {
       this.$confirm(`暂存后可在待完成页面查看，确定暂存`, {
         cancelButtonText: '取消',
         confirmButtonText: '确定',
-        type: 'warning'
+        type: 'warning',
       })
         .then(() => {
-          this.$refs.deptBudgetList.validate(valid => {
+          this.$refs.deptBudgetList.validate((valid) => {
             if (valid) {
-              this.deptBudgetList.compId = sessionStorage.getItem(
-                'ws-pf_compId'
-              )
+              this.deptBudgetList.compId =
+                sessionStorage.getItem('ws-pf_compId')
               this.deptBudgetList.inOutFlag = 2
               this.deptBudgetList.statusFlag = 1
               addstorageputList(this.deptBudgetList)
                 .toPromise()
-                .then(response => {
+                .then((response) => {
                   this.$message.success('暂存成功')
                   this.$router.push({ path: 'warehouseManagementList' })
                 })
@@ -522,8 +423,8 @@ export default {
       }
     },
     approve() {},
-    listQuery() {}
-  }
+    listQuery() {},
+  },
 }
 </script>
 <style lang="scss" scoped>
@@ -695,23 +596,6 @@ export default {
     border: none;
   }
 }
-//联络员及航次样式
-.aa {
-  width: 100%;
-  height: 90px;
-  background: #f5f7fa;
-  border-radius: 4px;
-  border: 1px solid #d8dce6;
-}
-// .xia{
-//   width:500px;
-//   // height: 46px;
-//   background: #F5F7FA;
-//   border-radius: 4px;
-//   // border: 1px solid #D8DCE6;
-//   margin-top: 10px;
-//   border: none;
-// }
 .xia {
   width: 700px;
   // height: 50px;
@@ -729,7 +613,7 @@ export default {
   line-height: 16px;
 }
 .position .siji {
-  width: 14.2%;
+  width: 13%;
 }
 .el-form {
   height: 1000px;
@@ -740,4 +624,14 @@ export default {
 /deep/.position .ws-info-table .el-form-item .el-form-item__label {
   background-color: #f5f7fa;
 }
+.middle {
+  background: #f6f7fc;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+}
+.line{
+  height: 26px;
+  margin-top: 6px;
+  left: -20px;
+}
 </style>

src/views/tranManagement/tranManagementTransporHairRespond.vue

@@ -3,11 +3,11 @@
   <div>
     <BaseHeaderLayout :leftSpan="12">
       <template slot="left">
-        <ws-button class="but" type="primary" @click="statusquery(1)">
+         <ws-button class="but"  :type="primary == 1 ? 'primary' : ''" @click="statusquery(1)">
           执行中</ws-button
         >
-        <ws-button class="but" @click="statusquery(2)">已完成</ws-button>
-        <ws-button class="but" @click="statusquery()">全部任务</ws-button>
+        <ws-button class="but"  :type="primary == 2 ? 'primary' : ''" @click="statusquery(2)">已完成</ws-button>
+        <ws-button class="but"  :type="primary == 3 ? 'primary' : ''" @click="statusquery()">全部任务</ws-button>
       </template>
       <!-- 接单开始 -->
       <template slot="right">
@@ -17,7 +17,7 @@
           >
         </div>
         <el-date-picker
-          v-model="deptBudgetList.inOutDate"
+          v-model="inOutDate"
           type="daterange"
           align="right"
           unlink-panels
@@ -28,7 +28,7 @@
         </el-date-picker>
         <ws-input
           v-model="searchKeyWord"
-          placeholder="可按照合同编号、买方名称、卖方名称进行查找"
+          placeholder="可按发货人、收货人、任务编号查找"
           clearable
           maxlength="500"
           type="input"
@@ -50,6 +50,7 @@
       </template>
     </BaseHeaderLayout>
     <div class="container">
+      
       <el-table
         class="wenzi"
         :data="tranManagementList.records"
@@ -62,17 +63,17 @@
             <span v-else>{{ scope.$index + 1 }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="processNo" label="运输任务编号" width="120">
+        <el-table-column prop="processNo" label="运输任务编号" >
         </el-table-column>
-        <el-table-column prop="tranType" label="运输方式" width="80">
+        <el-table-column prop="tranType" label="运输方式" >
         </el-table-column>
-        <el-table-column prop="goodsName" label="货名" width="80">
+        <el-table-column prop="goodsName" label="货名" >
         </el-table-column>
         <el-table-column prop="weight" label="重量（吨）" width="120">
         </el-table-column>
-        <el-table-column prop="send" label="发货" width="200">
+        <el-table-column prop="send" label="发货" width="240">
         </el-table-column>
-        <el-table-column prop="receive" label="收货" width="200">
+        <el-table-column prop="receive" label="收货" width="240">
         </el-table-column>
         <el-table-column prop="tranCycle" label="运输周期" width="160">
           <template scope="scope">
@@ -141,21 +142,29 @@
         <el-table-column prop="receivingDate" class="table_td" label="接单日期">
         </el-table-column>
         <el-table-column prop="seller" label="操作" width="300">
-          <template slot-scope="scope">
-            <div class="record" @click="trainSee(scope.row)">查看</div>
-            <div
-              class="adjustment"
-              @click="feedback(scope.row)"
-              v-show="
+          <template  slot-scope="scope">
+              <template v-if="
                 scope.row.tranType == '汽运' &&
                 scope.row.feedbackStatus != '已完成'
-              "
-            >
-              反馈
-            </div>
+              ">
+                <div class="record" @click="trainSee(scope.row)">查看</div>
+                <div class="adjustment" @click="feedback(scope.row)">反馈</div>
+              </template>
+              <template v-else>
+                <div class="record1" @click="trainSee(scope.row)">查看</div>
+              </template>
           </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>
@@ -195,16 +204,19 @@ export default {
       year: '',
       currentPage: 1,
       pageSize: 10,
+      deptBudgetTotal: 0,
       searchTypeText: '未完成',
       searchKeyWord: '',
       contractType: 2,
       tranTypeKey: 2,
-      searchTypeFeedback: 1,
+      feedbackFlag: 1,
       searchTypeOne: 1,
       // 提交类型
       submitType: true,
       size: 10,
+      primary:'1',
       spanArr: [],
+      inOutDate:[],
       warehouseName: '',
       compId: sessionStorage.getItem('ws-pf_compId'),
       deptCircularPage: {},
@@ -272,7 +284,14 @@ export default {
       })
     },
     statusquery(status) {
-      this.searchTypeFeedback = status
+       if (status == 1) {
+        this.primary = 1
+      } else if (status == 2) {
+        this.primary = 2
+      } else {
+        this.primary = 3
+      }
+      this.feedbackFlag = status
       this.getList()
     },
     dateFormat(fmt, date) {
@@ -313,13 +332,18 @@ export default {
     getList() {
       automobileList({
         compId: sessionStorage.getItem('ws-pf_compId'),
-        contractType: this.contractType,
-        searchTypeFeedback: this.searchTypeFeedback,
+        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
         })
     },
@@ -364,6 +388,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()
     }
@@ -399,7 +430,7 @@ export default {
 }
 
 //操作按钮
-.record,
+.record,.record1,
 .adjustment {
   display: inline-block;
   color: #5878e8;
@@ -453,23 +484,22 @@ export default {
 /deep/.el-table tr th.is-leaf:first-child {
   border-left: 1px solid #e9ecf7;
 }
-
-.el-row {
-  height: 150px;
-}
 .base_header_layout .grid-content {
   margin-top: 80px;
 }
-//待完成三按钮
-.but {
-  margin-top: 150px;
-  margin-left: 110px;
-}
 .el-input--small .el-input__inner {
   margin-left: 20px;
 }
 .el-range-editor--small.el-input__inner {
   height: 32px;
-  margin: 0 10px;
+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

@@ -3,17 +3,36 @@
   <div>
     <BaseHeaderLayout :leftSpan="12">
       <template slot="left">
-        <ws-button class="but" :type="searchType==1 ?'primary':''" @click="statusquery(1)"> 执行中</ws-button>
-        <ws-button class="but" :type="searchType==2 ?'primary':''" @click="statusquery(2)">已完成</ws-button>
-        <ws-button class="but" :type="searchType== undefined ?'primary':''" @click="statusquery()">全部任务</ws-button>
+        <ws-button
+          class="but"
+          :type="searchType == 1 ? 'primary' : ''"
+          @click="statusquery(1)"
+        >
+          执行中</ws-button
+        >
+        <ws-button
+          class="but"
+          :type="searchType == 2 ? 'primary' : ''"
+          @click="statusquery(2)"
+          >已完成</ws-button
+        >
+        <ws-button
+          class="but"
+          :type="searchType == undefined ? 'primary' : ''"
+          @click="statusquery()"
+          >全部任务</ws-button
+        >
       </template>
       <!-- 接单开始 -->
       <template slot="right">
         <div>
-           <span style="display: inline-block; width: 60px;color: #8890B1;">接单日期</span>
+          <span style="display: inline-block; width: 60px; color: #8890b1"
+            >接单日期</span
+          >
         </div>
-         <el-date-picker
-          v-model="deptBudgetList.inOutDate"
+        <!-- v-model="deptBudgetList.inOutDate" -->
+        <el-date-picker
+          v-model="inOutDate"
           type="daterange"
           align="right"
           unlink-panels
@@ -24,7 +43,7 @@
         </el-date-picker>
         <ws-input
           v-model="searchKeyWord"
-          placeholder="可按照合同编号、买方名称、卖方名称进行查找"
+          placeholder="可按发货人、收货人、任务编号查找"
           clearable
           maxlength="500"
           type="input"
@@ -51,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">
@@ -94,13 +113,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">XXXXX</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>
@@ -134,26 +160,40 @@
              <div
               class="record"
               @click="trainSee(scope.row)"
+              v-hasPermission="'transportationTask.transportation.fireDispatching.view'"
             >
               查看
             </div>
              <div
               class="adjustment"
               @click="trainNumber(scope.row)"
+              v-hasPermission="'transportationTask.transportation.fireDispatching.car'"
             >
               车次
             </div>
           </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>
 <script>
-import { automobileList ,alsostate} from '@/model/transport/index'
+import { automobileList, alsostate } from '@/model/transport/index'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
-import { dayjs, fmoney, EventBus } from 'base-core-lib'
+import {  EventBus } from 'base-core-lib'
+import {
+  billoperatehis,
+} from '@/model/contarct/index'
 export default {
   name: 'viewSpareMoney',
   components: {
@@ -184,9 +224,9 @@ export default {
       year: '',
       currentPage: 1,
       pageSize: 10,
+      deptBudgetTotal:0,
       searchTypeText: '未完成',
       searchKeyWord: '',
-      contractType: 2,
       tranTypeKey: 2,
       // 提交类型
       submitType: true,
@@ -194,11 +234,14 @@ export default {
       spanArr: [],
       warehouseName: '',
       searchType: 1,
+      startDate: null,
+      endDate: null,
       compId: sessionStorage.getItem('ws-pf_compId'),
       deptCircularPage: {},
       tranManagementList: [],
       deptBudgetList: {},
       historyList: [],
+      inOutDate: [],
       pickerBeginDateBefore: {
         disabledDate: (time) => {
           return time.getTime() > Date.now()
@@ -244,7 +287,7 @@ export default {
     //查看火运调度详细
     trainSee(row) {
       this.$router.push({
-        path: 'tranManagementTransporTrainDetails',
+        name: 'fireDispatchingview',
         query: {
           id: row.id,
         },
@@ -253,13 +296,13 @@ export default {
     //车次
     trainNumber(row) {
       this.$router.push({
-        path: 'tranManagementTransporTrainNo',
+        name: 'fireDispatchingcar',
         query: {
           id: row.id,
         },
       })
     },
-    statusquery(state){
+    statusquery(state) {
       this.searchType = state
       this.getList()
     },
@@ -302,32 +345,36 @@ export default {
     getList() {
       automobileList({
         compId: sessionStorage.getItem('ws-pf_compId'),
-        contractType: this.contractType,
-        searchType : this.searchType,
+        searchType: this.searchType,
         currentPage: this.currentPage,
         pageSize: this.pageSize,
         tranTypeKey: this.tranTypeKey,
+        startDate: this.startDate,
+        endDate: this.endDate,
+        searchKeyWord: this.searchKeyWord,
       })
         .toPromise()
         .then((response) => {
           this.tranManagementList = response
+           this.deptCircularPage.currentPage = response.current
+          this.deptCircularPage.pageSize = response.size
+          this.deptBudgetTotal = response.total
         })
     },
     editClick(row) {
       var status = ''
-      if (row.status == '待执行' || row.status == '已完成') {
+      if (row.processStatus == '待执行' || row.processStatus == '已完成') {
         status = '执行中'
-      } else if (row.status == '执行中') {
+      } else if (row.processStatus == '执行中') {
         status = '已完成'
       }
-      //cancelButtonClass: "btn-custom-cancel"
       this.$confirm(`是否将状态改为${status}`, {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning',
       })
         .then(() => {
-         alsostate({ id: row.id })
+          alsostate({ id: row.id })
             .toPromise()
             .then((response) => {
               this.$notify.success({
@@ -383,6 +430,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()
     },
@@ -472,15 +526,12 @@ 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;
-}
+
 .el-input--small .el-input__inner {
   margin-left: 20px;
 }
@@ -488,4 +539,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

@@ -99,18 +99,22 @@
           <ws-form-item label="姓名：" span="1" prop="driver">
             {{ item.driver }}
           </ws-form-item>
+          <el-divider direction="vertical" class="line"></el-divider>
           <!--电话-->
           <ws-form-item label="电话：" span="1" prop="driverPhone">
             {{ item.driverPhone }}
           </ws-form-item>
+          <el-divider direction="vertical" class="line"></el-divider>
           <!--发车日期-->
           <ws-form-item label="发车日期：" span="1" prop="sendDateStart">
             {{ item.sendDateStart }}
           </ws-form-item>
+          <el-divider direction="vertical" class="line"></el-divider>
           <!--到站日期-->
           <ws-form-item label="到站日期：" span="1" prop="receiveDateEnd">
             {{ item.receiveDateEnd }}
           </ws-form-item>
+          <el-divider direction="vertical" class="line"></el-divider>
           <!--车型-->
           <ws-form-item label="车型：" span="1" prop="carModel">
             {{ item.carModel }}
@@ -131,6 +135,7 @@
             >
               {{ items.trainNo }}
             </ws-form-item>
+               <el-divider direction="vertical" class="line" v-if="(index+1) % 5 != 0"></el-divider>
           </div>
         </ws-info-table>
       </div>
@@ -237,29 +242,6 @@ export default {
     },
   },
   methods: {
-    // dataFilter(val) {
-    //   this.deptBudgetList.personCharge = val
-    //   if (val) {
-    //     this.options = this.staffList.filter((item) => {
-    //       if (
-    //         !!~item.staffName.indexOf(val) ||
-    //         !!~item.staffName.toUpperCase().indexOf(val.toUpperCase())
-    //       ) {
-    //         return true
-    //       }
-    //     })
-    //   } else {
-    //     this.options = this.staffList
-    //   }
-    // },
-    // selectstaff(e) {
-    //   for (var i = 0; i < this.staffList.length; i++) {
-    //     if (this.staffList[i].staffName == e) {
-    //       this.deptBudgetList.driverPhone = this.staffList[i].staffMobilePhone
-    //       this.deptBudgetList.personChargeKey = this.staffList[i].staffId
-    //     }
-    //   }
-    // },
     marker: function (item) {
       this.deptBudgetList.warehousePositioning =
         item.lnglat.lat + ',' + item.lnglat.lng
@@ -281,9 +263,9 @@ export default {
     },
     returnsales() {
       this.deptBudgetList = {}
-      this.freightspace = {}
+      this.freightspace = []
       this.selectedOptions = ''
-      this.$router.push({ path: 'tranManagementTransporTationFire' })
+      this.$router.go(-1)
     },
     // confirmPosition() {
     //   this.draggable = false
@@ -302,18 +284,15 @@ export default {
         .then((response) => {
           this.deptBudgetList = response
           this.deptBudgetList.tranCarInfoList = response.tranCarInfoList
-          if (this.deptBudgetList.tranCarInfoList.length > 0) {
-            
+          if (this.deptBudgetList.tranCarInfoList.length > 0) {      
             if (response.tranCarInfoList[0].boxNo) {
-              // alert("数组拆分")
               this.list = response.tranCarInfoList[0].boxNo.split(',')
               for (var i = 0; i < this.list.length; i++) {
                 var num = this.list[i]
                 this.freightspace.push({
-                  trainNo: num,
+                  'trainNo': num,
                 })
               }
-              console.log(this.freightspace,"拆分车厢号数组")
             }
           }
         })
@@ -468,11 +447,7 @@ export default {
 .el-col {
   background: #f6f7fc;
 }
-/deep/.ws-info-table .el-form-item .el-form-item__content {
-  padding: 0 25px;
-  border-left: 1px solid transparent;
-  background: #fff;
-}
+
 /deep/.ws-info-table .el-form-item .el-form-item__label {
   width: 100px;
   text-align: center;
@@ -666,18 +641,6 @@ export default {
   border: none;
   height: 50px;
 }
-/deep/.ws-info-table .el-form-item .el-form-item__content {
-  background: #f5f7fa;
-  border-radius: 4px;
-  border: 1px solid #d8dce6;
-  font-family: PingFangSC-Regular, PingFang SC;
-  margin-bottom: 5px;
-  background-color: #fff;
-  font-size: 14px;
-  font-weight: 400;
-  color: #8890b1;
-  line-height: 16px;
-}
 /deep/.ws-info-table .el-form-item .el-form-item__label {
   background-color: #fff;
   font-size: 14px;
@@ -688,16 +651,21 @@ export default {
 }
 
 /deep/.ws-info-table .el-form-item .el-form-item__content {
-  background: #f5f7fa;
   border-radius: 4px;
-  border: 1px solid #d8dce6;
+  margin-bottom: 5px;
+  background-color: #fff;
+  font-size: 14px;
+  color: #8890b1;
+  padding: 0 25px;
+  border-left: 1px solid transparent;
+  background: #F5F7FA;
 }
 /deep/.flex .ws-info-table .el-form-item .el-form-item__content {
   border: 0px;
 }
 //联络员及车次
 /deep/.liaison .ws-info-table .el-form-item {
-  width: 20%;
+  width: 18.7%;
 }
 /deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
   width: 30%;
@@ -715,8 +683,11 @@ export default {
 /deep/.liaison .ws-info-table .el-form-item .el-form-item__content {
   // border: 0px solid #d8dce6;
   border-radius: 0px;
-  border-left: none;
-  border-bottom: none;
-  border-top: none;
+border: none;
+}
+.line{
+  height: 26px;
+  margin-top: 14px;
+  left: -34px;
 }
 </style>

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="发货人电话"
@@ -92,6 +90,7 @@
       <div
         class="liaison"
         v-for="(item, index) in deptBudgetList.tranCarInfoList"
+        :key='index'
       >
         <ws-info-table>
           <!--姓名-->
@@ -214,7 +213,7 @@
   </div>
 </template>
 <script>
-import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
+import { regionData } from 'element-china-area-data'
 import { seeCat, dispatchCat, packList } from '@/model/transport/index'
 import { getstaff } from '@/model/warehouse/index'
 import WsUpload from '@/components/WsUpload'
@@ -355,7 +354,7 @@ export default {
       this.deptBudgetList = {}
       this.freightspace = []
       this.selectedOptions = ''
-      this.$router.push({ path: 'tranManagementTransporTationFire' })
+      this.$router.go(-1)
     },
     // confirmPosition() {
     //   this.draggable = false
@@ -466,9 +465,7 @@ export default {
                   this.deptBudgetList = {}
                   this.freightspace = {}
                   this.selectedOptions = ''
-                  this.$router.push({
-                    path: 'tranManagementTransporTationFire',
-                  })
+                  this.$router.go(-1)
                 })
             } else {
               // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
@@ -573,36 +570,6 @@ export default {
         }
       }
     },
-    // 编辑
-    editClick(item, index) {
-      const map = JSON.parse(JSON.stringify(item))
-      if (Object.is(item.id, 1)) {
-        return
-      }
-      if (Object.is(this.unitList[index].flag, 'delete')) {
-        map.flag = 'check'
-        this.$set(this.unitList, index, map)
-      } else {
-        map.flag = 'delete'
-        this.$set(this.unitList, index, map)
-      }
-    },
-    // 删除
-    deleteClick(item, index) {
-      if (Object.is(item.constKey, 1)) {
-        return
-      }
-      if (!item.constValue) {
-        this.unitList.splice(index, 1)
-        return
-      }
-      delxiala({ id: this.unitList[index].id })
-        .toPromise()
-        .then((response) => {
-          this.getUnitList()
-          this.pleaseChoose = ''
-        })
-    },
   },
 }
 </script>
@@ -889,7 +856,6 @@ export default {
   color: #8890b1;
   line-height: 16px;
 }
-
 /deep/.ws-info-table .el-form-item .el-form-item__content {
   background: #f5f7fa;
   border-radius: 4px;

src/views/tranManagement/tranManagementVehicle.vue

@@ -3,26 +3,25 @@
   <div>
     <BaseHeaderLayout :leftSpan="12">
       <template slot="left">
-        <ws-button class="but" :type="status==1?'primary':''" @click="changestatus(1)">
+        <ws-button class="but" :type="searchType == 1?'primary':''" @click="changestatus(1)">
           执行中</ws-button
         >
-        <ws-button class="but" :type="status1==1?'primary':''" @click="changestatus(2)">已完成</ws-button>
-        <ws-button class="but" :type="status2==1?'primary':''" @click="changestatus()">全部任务</ws-button>
+        <ws-button class="but" :type="searchType == 2?'primary':''" @click="changestatus(2)">已完成</ws-button>
+        <ws-button class="but" :type="searchType == undefined?'primary':''" @click="changestatus()">全部任务</ws-button>
       </template>
       <!-- 接单开始 -->
       <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">
@@ -98,7 +97,7 @@
               </template>
               <div>
                 <p style="margin-top: 0; padding-left: 10px">XXXXX</p>
-                <div v-for="(item, index) in historyList" class="flex">
+                <div v-for="(item, index) in historyList" :key='index' class="flex">
                   <div class="vertical-text vertical-text-left">
                     {{ item.updateDate }}
                   </div>
@@ -144,15 +143,26 @@
           </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>
 <script>
 import { automobileList,alsostate } from '@/model/transport/index'
-import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
-import { dayjs, fmoney, EventBus } from 'base-core-lib'
+import {  EventBus } from 'base-core-lib'
+import {
+  billoperatehis,
+} from '@/model/contarct/index'
 export default {
   name: 'viewSpareMoney',
   components: {
@@ -176,13 +186,13 @@ export default {
       monetaryKey: null,
       // 表格显示数据
       tableDate: [],
-
       // 是否显示
       showType: true,
       // 年
       year: '',
       currentPage: 1,
       pageSize: 10,
+    deptBudgetTotal :0,
       searchTypeText: '未完成',
       searchKeyWord: '',
       contractType: 2,
@@ -191,6 +201,7 @@ export default {
       submitType: true,
       size: 10,
       spanArr: [],
+      inOutDate:[],
       tranTypeKey: '1',
       warehouseName: '',
       compId: sessionStorage.getItem('ws-pf_compId'),
@@ -214,23 +225,10 @@ export default {
     this.showType = this.isShow
   },
   methods: {
-    //出库
-    delivery(item) {
-      this.$router.push({
-        path: 'warehouseManagementDelivery',
-        query: {
-          baseId: item.warehouseId,
-          positionId: item.binNumberId,
-          warehouseName: item.warehouseName,
-          binNumber: item.binNumber,
-          capacity: item.capacity,
-        },
-      })
-    },
     //派车
     warehousing(item) {
       this.$router.push({
-        path: 'tranManagementVehicleDispatching',
+        name: 'vehicleDispatchingcar',
         query: {
           id: item.id,
         },
@@ -270,7 +268,7 @@ export default {
     //查看//传参
     nocomplete(row) {
       this.$router.push({
-        path: 'tranManagementVehicleLook',
+        name: 'vehicleDispatchingview',
         query: {
           id: row.id,
         },
@@ -330,18 +328,24 @@ 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
         })
     },
     editClick(row) {
       var status = ''
-      if (row.status == '待执行' || row.status == '已完成') {
+      if (row.processStatus == '待执行' || row.processStatus == '已完成') {
         status = '执行中'
-      } else if (row.status == '执行中') {
+      } else if (row.processStatus == '执行中') {
         status = '已完成'
       }
       //cancelButtonClass: "btn-custom-cancel"
@@ -407,32 +411,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>
@@ -536,21 +524,24 @@ 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;
-}
 .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>

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -103,6 +103,7 @@
           <div
             class="driver position liaison"
             v-for="(item, index) in deptBudgetList.tranCarInfoList"
+            :key='index'
           >
             <ws-info-table>
               <div class="catNos">
@@ -364,7 +365,7 @@ export default {
   methods: {
     //返回按钮
     revert() {
-      this.$router.push({ path: 'tranManagementVehicle' })
+      this.$router.go(-1)
     },
     del(index) {
       if (this.deptBudgetList.tranCarInfoList.length > 1) {

src/views/tranManagement/tranManagementVehicleLook.vue

@@ -89,6 +89,7 @@
         style="width: 100%"
         class="driver"
         v-for="(item, index) in deptBudgetList.tranCarInfoList"
+        :key='index'
       >
         <ws-info-table>
           <div class="catNos">
@@ -104,21 +105,27 @@
           <ws-form-item label="姓名" span="1" prop="driver">
             {{ item.driver }}
           </ws-form-item>
+           <el-divider direction="vertical" class="line"></el-divider>
           <ws-form-item class="phone" label="电话" span="1" prop="driverPhone">
             {{ item.driverPhone }}
           </ws-form-item>
+           <el-divider direction="vertical" class="line"></el-divider>
           <ws-form-item label="车牌号" span="1" prop="carNo">
             {{ item.carNo }}
           </ws-form-item>
+            <el-divider direction="vertical" class="line"></el-divider>
           <ws-form-item label="装车（吨）" span="1" prop="loadNetWeight">
             {{ item.loadNetWeight }}
           </ws-form-item>
+            <el-divider direction="vertical" class="line"></el-divider>
           <ws-form-item label="卸车（吨）" span="1" prop="unloadNetWeight">
             {{ item.unloadNetWeight }}
           </ws-form-item>
+            <el-divider direction="vertical" class="line"></el-divider>
           <ws-form-item label="损耗（吨）" span="1" prop="loss">
             {{ item.loss }}
           </ws-form-item>
+            <el-divider direction="vertical" class="line"></el-divider>
           <ws-form-item label="合同" span="1" prop="unloadNetWeight" class="hetong">
           </ws-form-item>
         </ws-info-table>
@@ -136,12 +143,11 @@
   </div>
 </template>
 <script>
-import { pullDown, addstorageputList } from '@/model/warehouse/index'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
 import { seeCat } from '@/model/transport/index'
 // import { dayjs, fmoney, EventBus } from 'base-core-lib'
-import { dayjs, EventBus } from 'base-core-lib'
+import { dayjs } from 'base-core-lib'
 export default {
   name: 'viewSpareMoney',
   components: {
@@ -225,7 +231,7 @@ export default {
   methods: {
     //返回按钮
     revert() {
-      this.$router.push({ path: 'tranManagementVehicle' })
+      this.$router.go(-1)
     },
     del(index) {
       if (this.freightspace.length > 1) {
@@ -425,7 +431,7 @@ export default {
   font-size: 14px;
 }
 /deep/.driver .ws-info-table .el-form-item {
-  width: 14.28%;
+  width: 13.1%;
 }
 /deep/.driver .ws-info-table .el-form-item .el-form-item__label {
   width: 86px;
@@ -444,7 +450,7 @@ export default {
   margin-left: 15px;
 }
 /deep/.driver .ws-info-table .el-form-item .el-form-item__content {
-  border-right: 1px solid #8890b1;
+  // border-right: 1px solid #8890b1;
   background: #f6f7fb;
   font-size: 14px;
   color: #8890b1;
@@ -472,4 +478,9 @@ export default {
 /deep/.driver.ws-info-table .el-form-item .el-form-item__content{
   border:none
 }
+.line{
+ height: 26px;
+ margin-top: 6px;
+left: -36px;
+}
 </style>

src/views/warehouse/component/router/index.js

@@ -8,7 +8,7 @@ const warehouseManagementRouter = {
   alwaysShow: true, // will always show the root menu
   meta: {
     title: 'warehouseManagementList',
-    module: 'warehouse',
+    module: 'warehouseManagement',
     icon: 'cg'
   },
   children: [
@@ -20,7 +20,7 @@ const warehouseManagementRouter = {
       meta: {
         title: 'warehouseManagementList',
         shortcutEntrance: 'warehouseManagementList',
-        module: 'warehouse.warehouseManagementList',
+        module: 'warehouseManagement.warehouse',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
@@ -36,7 +36,7 @@ const warehouseManagementRouter = {
       meta: {
         title: 'warehouseManagementAdd',
         shortcutEntrance: 'warehouseManagementAdd',
-        module: 'warehouse.warehouseManagementAdd',
+        module: 'warehouseManagement.warehouse.warehouseInfo.add',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
@@ -53,7 +53,7 @@ const warehouseManagementRouter = {
       meta: {
         title: 'warehouseManagementEdit',
         shortcutEntrance: 'warehouseManagementEdit',
-        module: 'warehouse.warehouseManagementEdit',
+        module: 'warehouseManagement.warehouse.warehouseInfo.edit',
         permissicon: [],
         keepAlive: true
       },
@@ -67,7 +67,7 @@ const warehouseManagementRouter = {
       meta: {
         title: 'warehouseManagementLook',
         shortcutEntrance: 'warehouseManagementLook',
-        module: 'warehouse.warehouseManagementLook',
+        module: 'warehouseManagement.warehouse.warehouseInfo.view',
 
         permissicon: [],
         keepAlive: true
@@ -84,7 +84,7 @@ const warehouseManagementRouter = {
       meta: {
         title: 'warehouseManagementPut',
         shortcutEntrance: 'warehouseManagementPut',
-        module: 'warehouse.warehouseManagementPut',
+        module: 'warehouseManagement.warehouse.warehouseInfo.in',
       },
       hidden: true
     },
@@ -96,7 +96,7 @@ const warehouseManagementRouter = {
       meta: {
         title: 'warehouseManagementDelete',
         shortcutEntrance: 'warehouseManagementDelete',
-        module: 'warehouse.warehouseManagementDelete',
+        module: 'warehouseManagement.warehouse.warehouseInfo.delete',
 
         permissicon: [],
         keepAlive: true
@@ -113,7 +113,7 @@ const warehouseManagementRouter = {
       meta: {
         title: 'warehouseManagementDelivery',
         shortcutEntrance: 'warehouseManagementDelivery',
-        module: 'warehouse.warehouseManagementDelivery',
+        module: 'warehouseManagement.warehouse.warehouseInfo.out',
       },
       hidden: true
     },
@@ -125,8 +125,7 @@ const warehouseManagementRouter = {
       meta: {
         title: 'warehouseManagementIoss',
         shortcutEntrance: 'warehouseManagementIoss',
-        module: 'warehouse.warehouseManagementIoss',
-
+        module: 'warehouseManagement.warehouse.warehouseInfo.debit',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
@@ -142,7 +141,7 @@ const warehouseManagementRouter = {
       meta: {
         title: 'warehouseManagementIossRecord',
         shortcutEntrance: 'warehouseManagementIossRecord',
-        module: 'warehouse.warehouseManagementIossRecord',
+        module: 'warehouseManagement.warehouse.warehouseInfo.debit',
 
         permissicon: [],
         keepAlive: true
@@ -159,7 +158,7 @@ const warehouseManagementRouter = {
       meta: {
         title: 'warehouseManagementRecord',
         shortcutEntrance: 'warehouseManagementRecord',
-        module: 'warehouse.warehouseManagementRecord',
+        module: 'warehouseManagement.warehouse.warehouseInfo.view',
 
         permissicon: [],
         keepAlive: true
@@ -177,7 +176,7 @@ const warehouseManagementRouter = {
       meta: {
         title: 'warehouseManagementNoComplete',
         shortcutEntrance: 'warehouseManagementNoComplete',
-        module: 'warehouse.warehouseManagementNoComplete',
+        module: 'warehouseManagement.warehouse.warehouseInfo.view',
         permissicon: [],
         keepAlive: true
       },
@@ -191,7 +190,7 @@ const warehouseManagementRouter = {
       meta: {
         title: 'warehouseManagementPerfectput',
         shortcutEntrance: 'warehouseManagementPerfectput',
-        module: 'warehouse.warehouseManagementPerfectput',
+        module: 'warehouseManagement.warehouse.warehouseInfo.in',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
@@ -206,7 +205,7 @@ const warehouseManagementRouter = {
       meta: {
         title: 'warehouseManagementPerfectDelivery',
         shortcutEntrance: 'warehouseManagementPerfectDelivery',
-        module: 'warehouse.warehouseManagementPerfectDelivery',
+        module: 'warehouseManagement.warehouse.warehouseInfo.out',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
@@ -238,7 +237,7 @@ const warehouseManagementRouter = {
       meta: {
         title: 'warehouseManagementPutOutLook',
         shortcutEntrance: 'warehouseManagementPutOutLook',
-        module: 'warehouse.warehouseManagementPutOutLook',
+        module: 'warehouseManagement.warehouse.warehouseInfoTask.View',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'

src/views/warehouse/warehouseManagementList.vue

@@ -4,6 +4,9 @@
     <BaseHeaderLayout :leftSpan="20">
       <template slot="left">
         <ws-button type="primary" @click="handleAdd()"
+        v-hasPermission="
+           `warehouseManagement.warehouse.warehouseInfo.add`
+          "
           ><img
             width="11"
             height="11"
@@ -14,10 +17,18 @@
           添加</ws-button
         >
 
-        <ws-button @click="handleLook()">查看</ws-button>
-        <ws-button @click="handleEdit()">编辑</ws-button>
-        <ws-button @click="handleDelete()">删除</ws-button>
-        <ws-button @click="handlTask()">任务</ws-button>
+        <ws-button v-hasPermission="
+           `warehouseManagement.warehouse.warehouseInfo.view`
+          " @click="handleLook()">查看</ws-button>
+        <ws-button v-hasPermission="
+           `warehouseManagement.warehouse.warehouseInfo.edit`
+          " @click="handleEdit()">编辑</ws-button>
+        <ws-button v-hasPermission="
+           `warehouseManagement.warehouse.warehouseInfo.deiete`
+          " @click="handleDelete()">删除</ws-button>
+        <ws-button v-hasPermission="
+           `warehouseManagement.warehouse.warehouseInfo.view`
+          " @click="handlTask()">任务</ws-button>
       </template>
       <template slot="left">
         <div style="margin-top: 2px">
@@ -118,21 +129,31 @@
         </el-table-column>
         <el-table-column prop="seller" label="出入库" width="300">
           <template slot-scope="scope">
-            <ws-button class="completed" @click="nocomplete(scope.row)">
+            <ws-button v-hasPermission="
+           `warehouseManagement.warehouse.warehouseInfo.view`
+          " class="completed" @click="nocomplete(scope.row)">
               待完成（{{ scope.row.number }}）
             </ws-button>
-            <ws-button class="putstorage" @click="warehousing(scope.row)">
+            <ws-button v-hasPermission="
+           `warehouseManagement.warehouse.warehouseInfo.in`
+          " class="putstorage" @click="warehousing(scope.row)">
               入库
             </ws-button>
-            <ws-button class="deliverystorage" @click="delivery(scope.row)">
+            <ws-button v-hasPermission="
+           `warehouseManagement.warehouse.warehouseInfo.out`
+          " class="deliverystorage" @click="delivery(scope.row)">
               出库
             </ws-button>
           </template>
         </el-table-column>
         <el-table-column prop="address" label="操作" width="200">
           <template slot-scope="scope">
-            <div class="record" @click="record(scope.row)">记录</div>
-            <div class="adjustment" @click="loss(scope.row)">盘损</div>
+            <div class="record" v-hasPermission="
+           `warehouseManagement.warehouse.warehouseInfo.view`
+          " @click="record(scope.row)">记录</div>
+            <div class="adjustment" v-hasPermission="
+           `warehouseManagement.warehouse.warehouseInfo.view`
+          " @click="loss(scope.row)">盘损</div>
           </template>
         </el-table-column>
       </el-table>
@@ -471,7 +492,7 @@ export default {
     },
     //任务
     handlTask(){
-      this.$router.push({path:'warehouseManagementPutOut'})
+      this.$router.push({ path: 'warehouseManagementPutOut' })
     },
     dateFormat(fmt, date) {
       let ret

vue.config.js

@@ -139,12 +139,15 @@ module.exports = {
         logLevel: 'debug',
       },
       '/pb': {
-
         // target: 'https://product-server.winsea.com/', //目标地址
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
         // target: 'http://192.168.1.121:8090/',
+<<<<<<< HEAD
         target: 'http://192.168.1.117:9100/',
+=======
+        target: 'http://192.168.1.116:8090/',
+>>>>>>> 4661853b87be0f6a5d8e7758cca7714d2a8e4321
         // target: 'http://192.168.1.119:8090/',
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://product-server.winsea.com/',