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

src/api/V2/transport/index.js

@@ -1,8 +1,14 @@
 // 司机列表
 export const API_GET_TRAN_DRIVERINFO = '/driverViewInfo/selectDriverInfoPage'
+<<<<<<< HEAD
+export const API_POST_TRAN_DRIVERINFOADD = '/driverViewInfo/api/addInfo'
+export const API_GET_TRAN_LIST = '/tranTaskInfo/selectTranTaskInfoPage'
+export const API_POST_TRAN_ADD = '/tranTaskInfo/api/addTranTask'
+=======
 // 司机管理添加
 export const API_POST_TRAN_DRIVERINFOADD = '/driverViewInfo/api/addInfo'
 // 司机管理查看
 export const API_GET_DRIVERINFO_GETDRIVER = '/driverViewInfo/getDriver'
 // 司机管理-删除
-export const API_POST_DELETE_DRIVER = '/driverViewInfo/api/deleteDriver'
+export const API_POST_DELETE_DRIVER = '/driverViewInfo/api/deleteDriver'
+>>>>>>> f3ee2240cb2237ad61e6413e006e2b208c9c3038

src/lang/zh.js

@@ -503,11 +503,16 @@
     warehouseManagementPerfectput: '编辑',
     //运输管理
     tranManagement: '运输管理',
-    tranManagementDriver: '司机管理',
-    tranManagementDriverAdd: '添加司机',
-    tranManagementDriverLook: '查看司机',
-    warehouseManagementPerfectDelivery: '编辑',
-    tranManagementTransport: '运输任务',
+    tranManagementDriver:'司机管理',
+    tranManagementDriverAdd:'添加司机',
+    warehouseManagementPerfectDelivery:'编辑',
+    tranManagementTransport:'运输任务',
+    tranManagementLook:'运输任务查看',
+    tranManagementTransportAdd:'运输任务添加',
+    tranManagementTransportEdit:'运输任务编辑',
+    tranManagementVehicle:'汽运调度',
+    tranManagementVehicleDispatching:'汽车调度',
+    tranManagementVehicleLook:'查看派车详情',
 
     // 采购模块
     procurement: '采购管理',
@@ -4705,11 +4710,22 @@
 
   },
   //运输管理
-  tranManagement: {
-    tranManagementDriver: '司机管理',
-    tranManagementDriverAdd: '添加司机',
-    tranManagementDriverLook: '查看司机',
-    tranManagementTransport: '运输任务',
+  tranManagement:{
+    tranManagementDriver:'司机管理',
+    tranManagementDriverAdd:'添加司机',
+   
+    
+  },
+  tranManagementTransport:{
+    tranManagementTransport:'运输任务',
+    tranManagementLook:'运输任务查看',
+    tranManagementTransportAdd:'运输任务添加',
+    tranManagementTransportEdit:'运输任务编辑',
+  },
+  tranManagementVehicle:{
+    tranManagementVehicle:'汽运调度',
+    tranManagementVehicleDispatching:'汽车调度',
+    tranManagementVehicleLook:'查看派车详情',
   },
   // 年度培训
   annualTraining: {

src/model/transport/index.js

@@ -4,14 +4,26 @@ import { appRx } from '../defalutConfig/indexRx'
 import {
     API_GET_TRAN_DRIVERINFO,
     API_POST_TRAN_DRIVERINFOADD,
+<<<<<<< HEAD
+    API_GET_TRAN_LIST,
+    API_POST_TRAN_ADD,
+=======
     API_GET_DRIVERINFO_GETDRIVER,
     API_POST_DELETE_DRIVER
+>>>>>>> f3ee2240cb2237ad61e6413e006e2b208c9c3038
 } from '@/api/V2/transport'
 // 司机列表
 export const selectDriver = appRx.get(API_GET_TRAN_DRIVERINFO, errorCatcher, errorHandle, filter)
 // 添加司机信息
 export const addDriver = appRx.post(API_POST_TRAN_DRIVERINFOADD, errorCatcher, errorHandle, filter)
+<<<<<<< HEAD
+//运输任务列表
+export const gain = appRx.get(API_GET_TRAN_LIST, errorCatcher, errorHandle, filter)
+//运输任务添加
+export const addtrantask = appRx.post(API_POST_TRAN_ADD,errorCatcher, errorHandle, filter) 
+=======
 // 司机管理-查看
 export const lookDriver = appRx.get(API_GET_DRIVERINFO_GETDRIVER, errorCatcher, errorHandle, filter)
 // 司机管理-删除
-export const delDriver = appRx.post(API_POST_DELETE_DRIVER, errorCatcher, errorHandle, filter)
+export const delDriver = appRx.post(API_POST_DELETE_DRIVER, errorCatcher, errorHandle, filter)
+>>>>>>> f3ee2240cb2237ad61e6413e006e2b208c9c3038

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

@@ -12,8 +12,102 @@ const tranManagementRouter = {
     icon: 'cg'
   },
   children: [
+<<<<<<< HEAD
+     
+    //运输任务
+    {
+      path: 'tranManagementTransport',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementTransport'),
+      name: 'tranManagementTransport',
+      meta: {
+        title: 'tranManagementTransport',
+        shortcutEntrance: 'tranManagement',
+        module: 'tranManagement.tranManagementDriver.tranManagementTransport',
+        permissicon: [],
+        keepAlive: true
+      },
+    },
+    //添加司机
+    {
+      path: 'tranManagementDriverAdd',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementDriverAdd'),
+      name: 'tranManagementDriverAdd',
+      meta: {
+        title: 'tranManagementDriverAdd',
+        shortcutEntrance: 'tranManagement',
+        module: 'tranManagement.tranManagementDriver.tranManagementDriverAdd',
+        permissicon: [],
+        keepAlive: true
+      },
+      hidden: true
+    },
+    //运输查看
+    {
+      path: 'tranManagementLook',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementLook'),
+      name: 'tranManagementLook',
+      meta: {
+        title: 'tranManagementLook',
+        shortcutEntrance: 'tranManagement',
+        module: 'tranManagement.tranManagementDriver.tranManagementLook',
+        permissicon: [],
+        keepAlive: true
+      },
+      hidden: true
+    },
+    //运输添加
+    {
+      path: 'tranManagementTransportAdd',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementTransportAdd'),
+      name: 'tranManagementTransportAdd',
+      meta: {
+        title: 'tranManagementTransportAdd',
+        shortcutEntrance: 'tranManagement',
+        module: 'tranManagement.tranManagementDriver.tranManagementTransportAdd',
+        permissicon: [],
+        keepAlive: true
+      },
+      hidden: true
+    },
+    //运输编辑
+    {
+      path: 'tranManagementTransportEdit',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementTransportEdit'),
+      name: 'tranManagementTransportEdit',
+      meta: {
+        title: 'tranManagementTransportEdit',
+        shortcutEntrance: 'tranManagement',
+        module: 'tranManagement.tranManagementDriver.tranManagementTransportEdit',
+        permissicon: [],
+        keepAlive: true
+      },
+      hidden: true
+    },
+    //汽运调度
+=======
     //司机管理
+>>>>>>> f3ee2240cb2237ad61e6413e006e2b208c9c3038
     {
+      path: 'tranManagementVehicle',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementVehicle'),
+      name: 'tranManagementVehicle',
+      meta: {
+        title: 'tranManagementVehicle',
+        shortcutEntrance: 'tranManagement',
+        module: 'tranManagement.tranManagementDriver.tranManagementVehicle',
+        permissicon: [],
+        keepAlive: true
+      },
+      
+    },
+     //司机管理
+     {
       path: 'tranManagementDriver',
       component: () =>
         import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementDriver'),
@@ -26,35 +120,39 @@ const tranManagementRouter = {
         keepAlive: true
       }
     },
-    //运输任务
+    //汽车调度
     {
-      path: 'tranManagementTransport',
+      path: 'tranManagementVehicleDispatching',
       component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementTransport'),
-      name: 'tranManagementTransport',
+        import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementVehicleDispatching'),
+      name: 'tranManagementVehicleDispatching',
       meta: {
-        title: 'tranManagementTransport',
+        title: 'tranManagementVehicleDispatching',
         shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementDriver.tranManagementTransport',
+        module: 'tranManagement.tranManagementDriver.tranManagementVehicleDispatching',
         permissicon: [],
         keepAlive: true
       },
+      hidden: true
     },
-    //添加司机
+    //查看派车详情
     {
-      path: 'tranManagementDriverAdd',
+      path: 'tranManagementVehicleLook',
       component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementDriverAdd'),
-      name: 'tranManagementDriverAdd',
+        import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementVehicleLook'),
+      name: 'tranManagementVehicleLook',
       meta: {
-        title: 'tranManagementDriverAdd',
+        title: 'tranManagementVehicleLook',
         shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementDriver.tranManagementDriverAdd',
+        module: 'tranManagement.tranManagementDriver.tranManagementVehicleLook',
         permissicon: [],
         keepAlive: true
       },
       hidden: true
     },
+<<<<<<< HEAD
+    
+=======
     //查看司机
     {
       path: 'tranManagementDriverLook',
@@ -71,6 +169,7 @@ const tranManagementRouter = {
       hidden: true
     },
 
+>>>>>>> f3ee2240cb2237ad61e6413e006e2b208c9c3038
   ],
 
 };

src/views/tranManagement/tranManagementTransport.vue

@@ -1,123 +1,271 @@
-// 运输管理
+<!--运输任务-->
 <template>
   <div>
     <BaseHeaderLayout :leftSpan="20">
-      <template slot="right">
-          <ws-form-item label="起点" span="1" prop="agent">
-            <ws-input
-              v-model="deptBudgetList.agent"
-              placeholder="请输入起点"
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
-          <ws-form-item label="终点" span="1" prop="agent">
-            <ws-input
-              v-model="deptBudgetList.agent"
-              placeholder="请输入终点"
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
+     <template slot="right">
+        <ws-button
+        class="but"
+          type="primary"
+          @click="handleAdd()"
+          v-hasPermission="
+            `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
+          "
+          >添加</ws-button
+        >
+      </template>
+      <template slot="left">
+        <ws-button
+        class="but"
+          type="primary"
+          @click="handleAdd()"
+          v-hasPermission="
+            `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
+          "
+          >
+          执行中</ws-button
+        >
+        <ws-button
+        class="but"
+          @click="handleLook()"
+          v-hasPermission="
+            `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
+          "
+          >已完成</ws-button
+        >
+        <ws-button
+        class="but"
+          @click="handleEdit()"
+          v-hasPermission="
+            `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
+          "
+          >全部任务</ws-button
+        >
+        
+      </template>
+      <template slot="left">
           <ws-input
+          label="起点"
+         
+          placeholder="请输入起点"
+          clearable
+          maxlength="200"
+          type="input"
+          class="find"
+        ></ws-input>
+        
+        <ws-input
+        label="终点"
+          
+          placeholder="请输入终点"
+          clearable
+          maxlength="200"
+          type="input"
+          class="find"
+        ></ws-input>
+        <ws-input
           v-model="warehouseName"
-          placeholder="请输入仓库名"
+          placeholder="可按合同编号或运输任务编号查找"
           clearable
           maxlength="500"
           type="input"
           class="findValue"
         ></ws-input>
-       <ws-button
+        <!-- v-hasPermission="'procurement.sparepart.directShip'" -->
+        <div class="search">
+            <ws-button
+          class="find"
           type="primary"
-          @click="handleLook()"
+          @click="lookUp()"
           v-hasPermission="
             `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
           "
-          >查找</ws-button
-        >
-      </template>
-      <template slot="left">
-        
+          ><img
+            width="16"
+            height="16"
+            style="
+              vertical-align: text-top;
+              position: relative;
+              top: 0px;
+              left: -8px;
+            "
+            src="../../../public/img/sousuo.png"
+            alt=""
+        /></ws-button>
+        </div>
         
       </template>
     </BaseHeaderLayout>
-    <div class="connert">
+    <div>
       <el-table
         class="wenzi"
-        :data="driverList.records"
+        :data="gainList"
         style="width: 100%; margin-top: 20px"
-        fit
         height="780"
       >
-        <el-table-column type="index" label="序号">
-          <template scope="scope">
-            <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
-            <span v-else>{{ scope.$index + 1 }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="driverName" label="姓名" width="100">
+        <el-table-column prop="index" label="序号" width="80">
         </el-table-column>
-        <el-table-column prop="numberCard" label="运输任务编号" width="200">
+        <el-table-column prop=" taskNo" label="运输任务编号" width="80">
         </el-table-column>
-        <el-table-column prop="driverPhone" label="合同编号" width="120">
-        </el-table-column>
-        <el-table-column prop="carNumber" label="货物（吨数）" width="80">
+        <el-table-column prop=" contractNo" label="合同编号">
+          <template slot-scope="scope">
+            <div
+              v-if="scope.row.capacity != 'null' && scope.row.capacity != null"
+            >
+              {{ scope.row.capacity }}
+            </div>
+          </template>
         </el-table-column>
-        <el-table-column prop="binNumber" label="运输方式" width="120">
+        <el-table-column prop=" weight" class="table_td" label="货物（吨数）" >
+          <!-- <template slot-scope="scope">
+            <div
+              style="height: 24px"
+              v-for="(item, i) in scope.row.warehouseNumViewList"
+            >
+              {{ item.inNetWeight }}
+            </div>
+          </template> -->
         </el-table-column>
-        <el-table-column prop="carModel" label="起点" width="80">
+        <el-table-column class="table_td" label="运输方式">
+          <!-- <template slot-scope="scope">
+            <div
+              style="height: 24px"
+              v-for="(item, i) in scope.row.warehouseNumViewList"
+            >
+              {{ item.outNetWeight }}
+            </div>
+          </template> -->
         </el-table-column>
-        <el-table-column prop="carLength" label="当前中转" width="80">
+        <el-table-column prop=" start" class="table_td" label="起点">
+          <!-- <template slot-scope="scope">
+            <div
+              style="height: 24px"
+              v-for="(item, i) in scope.row.warehouseNumViewList"
+            >
+              {{ item.storage }}
+            </div>
+          </template> -->
         </el-table-column>
-         <el-table-column prop="carLength" label="终点" width="80">
+        <el-table-column prop="currentTransferAddress" class="table_td" label="当前中转">
+          <!-- <template slot-scope="scope">
+            <div
+              style="height: 24px"
+              v-for="(item, i) in scope.row.warehouseNumViewList"
+            >
+              {{ item.storage }}
+            </div>
+          </template> -->
         </el-table-column>
-         <el-table-column prop="carLength" label="状态" width="80">
+        <el-table-column prop="end" class="table_td" label="终点">
+          <!-- <template slot-scope="scope"> -->
+            <!-- <div
+              style="height: 24px"
+              v-for="(item, i) in scope.row.warehouseNumViewList"
+            >
+              {{ item.storage }}
+            </div> -->
+          <!-- </template> -->
         </el-table-column>
-        <el-table-column prop="address" label="操作" width="200">
-          <ws-button
-            type="primary"
-            @click="look()"
-            v-hasPermission="
-              `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-            "
-            >查看</ws-button
+
+      <el-table-column prop="status" label="状态">
+        <template slot-scope="scope">
+          <el-popover
+          placement="left"
+          :width="285"
+          trigger="click"
+          visible-arrow="false"
+          @show="history(scope.row)"
           >
-          <ws-button
-            type="primary"
-            @click="edit()"
-            v-hasPermission="
-              `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-            "
-            >编辑</ws-button
-          >
-          <ws-button
-            type="primary"
-            @click="deletes()"
-            v-hasPermission="
-              `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-            "
-            >删除</ws-button
-          >
-          <!-- </template> -->
+          <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>
+          </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>
+                  <div class="vertical-circle"></div>
+                  <div
+                    v-if="index != historyList.length - 1"
+                    class="vertical-line"
+                  ></div>
+                </div>
+                <div class="vertical-text">
+                  {{ item.operateUser }}<br />{{ item.dealMsg }}
+                </div>
+              </div>
+            </div>
+          </el-popover>
+          <img
+            width="17"
+            height="18"
+            style="vertical-align: text-top; position: relative; top: -1px"
+            src="../../../public/img/edit.png"
+            @click="editClick(scope.row)"
+            alt=""
+          />
+        </template>
+       
+      </el-table-column>
+        <el-table-column prop="seller" label="操作" width="300">
+          <template slot-scope="scope">
+            <ws-button
+              class="completed"
+              @click="nocomplete(scope.row)"
+              v-hasPermission="
+                `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
+              "
+            >
+              查看
+            </ws-button>
+            <ws-button
+              class="putstorage"
+              @click="warehousing(scope.row)"
+              v-hasPermission="
+                `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
+              "
+            >
+              编辑
+            </ws-button>
+            <ws-button
+              class="deliverystorage"
+              @click="delivery(scope.row)"
+              v-hasPermission="
+                `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
+              "
+            >
+              删除
+            </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>
+          </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 { selectDriver, billoperatehis } from '@/model/transport/index'
+import {
+  gain,
+} from '@/model/transport/index'
+import { downloadFile } from '@/utils/batchDown'
 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'
 export default {
@@ -139,34 +287,29 @@ export default {
       //弹出框
       dialogViewSpareMoney: false,
       dialogApproveFormVisible: false,
-      options_: provinceAndCityData,
+      // 船舶类型
+      monetaryKey: null,
       // 表格显示数据
       tableDate: [],
+
       // 是否显示
       showType: true,
       // 年
       year: '',
-      deptBudgetTotal: 0,
+     gainList:[],
       currentPage: 1,
       pageSize: 10,
       searchType: 1,
+      searchTypeText: '未完成',
       searchKeyWord: '',
       contractType: 2,
-      startDate: null,
-      endDate: null,
-      searchTypeText: '',
       // 提交类型
       submitType: true,
       size: 10,
       spanArr: [],
+      warehouseName: '',
       compId: sessionStorage.getItem('ws-pf_compId'),
       deptCircularPage: {},
-      date: {
-        year: dayjs().format('YYYY'),
-        month: dayjs().format('MM'),
-      },
-      driverList: [],
-      deptBudgetList: {},
       historyList: [],
       pickerBeginDateBefore: {
         disabledDate: (time) => {
@@ -177,25 +320,141 @@ export default {
     }
   },
   activated() {
+    
     this.getList()
     this.showType = this.isShow
   },
   methods: {
     //查找
+      lookUp(){
+        this.currentPage= 1
+        this.getList()
+      },
+    getList() {
+      gain({
+        compId: sessionStorage.getItem('ws-pf_compId'),
+        currentPage:this.currentPage,
+        pageSize:this.pageSize,
+        searchType:this.searchType,
+        searchKeyWord:this.searchKeyWord,
+      })
+      .toPromise()
+      .then((response)=>{
+        this.gainList = response
+      })
+    },
+    //编辑
+    delivery(item) {
+      this.$router.push({
+        path: 'tranManagementTransportEdit',
+        query: {
+          baseId: item.warehouseId,
+          positionId: item.binNumberId,
+          warehouseName: item.warehouseName,
+          binNumber: item.binNumber,
+          capacity: item.capacity,
+        },
+      })
+    },
+    //查看
+    warehousing(item) {
+      var free = 0
+      for (var i = 0; i < item.warehouseNumViewList.length; i++) {
+        free += Number(item.warehouseNumViewList[i].storage)
+      }
+      this.$router.push({
+        path: 'tranManagementLook',
+        query: {
+          baseId: item.warehouseId,
+          positionId: item.binNumberId,
+          warehouseName: item.warehouseName,
+          binNumber: item.binNumber,
+          capacity:item.capacity - free ,
+        },
+      })
+    },
+    getSpanArr(data) {
+      let that = this
+
+      //页面展示的数据，不一定是全部的数据，所以每次都清空之前存储的 保证遍历的数据是最新的数据。以免造成数据渲染混乱
+
+      that.spanArr = []
+
+      that.pos = 0
+
+      //遍历数据
+
+      data.forEach((item, index) => {
+        //判断是否是第一项
+
+        // if (index === 0) {
+        //   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
+        }
+        // }
+      })
+    },
+    //查看//传参
+    nocomplete(row) {
+      this.$router.push({
+        path: 'tranManagementLook',
+        // query: {
+        //   baseId: row.warehouseId,
+        //   positionId: row.binNumberId,
+        //   warehouseName: row.warehouseName,
+        //   binNumber: row.binNumber,
+        // },
+      })
+    },
+    //记录
+    // record(item) {
+    //   this.$router.push({
+    //     name: 'warehouseManagementRecord',
+    //     query: {
+    //       baseId: item.warehouseId,
+    //       positionId: item.binNumberId,
+    //       warehouseName: item.warehouseName,
+    //     },
+    //     params: {
+    //       remark: item.remark,
+    //       binNumber: item.binNumber,
+    //       capacity: item.capacity,
+    //     },
+    //   })
+    // },
+    //盘损
+    // loss(item) {
+    //   this.$router.push({
+    //     path: 'warehouseManagementIoss',
+    //     query: {
+    //       baseId: item.warehouseId,
+    //       positionId: item.binNumberId,
+    //       warehouseName: item.warehouseName,
+    //       binNumber: item.binNumber,
+    //     },
+    //   })
+    // },
+    //查看
     handleLook() {
-      this.currentPage = 1
-      this.getList()
+      this.$router.push({ path: 'tranManagementLook' })
     },
     //添加
     handleAdd() {
-      this.$router.push({ path: 'tranManagementDriverAdd' })
+      this.$router.push({ path: 'tranManagementTransportAdd' })
     },
     //编辑
     handleEdit() {
-      this.$router.push({ path: 'warehouseManagementEdit' })
-    },
-    handleDelete() {
-      this.$router.push({ path: 'warehouseManagementDelete' })
+      this.$router.push({ path: 'tranManagementTransportEdit' })
     },
     dateFormat(fmt, date) {
       let ret
@@ -232,22 +491,6 @@ export default {
       console.log(`当前页: ${val}`)
       this.getList()
     },
-    getList() {
-      selectDriver({
-        compId: sessionStorage.getItem('ws-pf_compId'),
-        currentPage: this.currentPage,
-        pageSize: this.pageSize,
-        searchType: this.searchType,
-        searchKeyWord: this.searchKeyWord,
-      })
-        .toPromise()
-        .then((response) => {
-          this.deptCircularPage.currentPage = response.current
-          this.deptCircularPage.pageSize = response.size
-          this.deptBudgetTotal = response.total
-          this.driverList = response
-        })
-    },
     editClick(row) {
       var status = ''
       if (row.status == '待执行' || row.status == '已完成') {
@@ -280,21 +523,11 @@ export default {
         })
     },
     selecttaskType(e) {
-      this.selectedOptions = e
-    },
-    fujian(row) {
-      if (
-        row.receiveAttachmentPath === null ||
-        row.receiveAttachmentPath === ''
-      ) {
-        EventBus.$emit(
-          'warning',
-          this.$t('system.noticeCircular.NoInformation')
-        )
-      } else {
-        this.accessoryTFs = true
+      for (var i = 0; i < this.taskTypeList.length; i++) {
+        if (this.taskTypeList[i].value == e) {
+          this.searchType = this.taskTypeList[i].type
+        }
       }
-      this.appendixIdss = row.receiveAttachmentPath
     },
     handleExamine(row) {
       this.$router.push({
@@ -307,7 +540,6 @@ export default {
       this.dialogViewSpareMoney = false
     },
     history(row) {
-      console.log(row)
       billoperatehis({ id: row.id })
         .toPromise()
         .then((response) => {
@@ -315,11 +547,32 @@ export default {
         })
     },
     find() {
-      this.startDate = this.dateFormat('YYYY-mm-dd', this.value2[0])
-      this.endDate = this.dateFormat('YYYY-mm-dd', this.value2[1])
       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>
@@ -332,7 +585,80 @@ export default {
   width: 62px;
   text-align: right;
 }
-.findValue {
-  margin: 0 10px;
+.el-button--primary {
+  background-color: #5878e8;
+  border-color: #5878e8;
+}
+.el-button--default {
+  color: #8890b1;
+  border-color: #e8eaf1;
+}
+/deep/.base_header_layout .grid-content.right .find.el-button--primary {
+  width: 30px;
+  margin-left: 0;
+  border-top-left-radius: 0px;
+  border-bottom-left-radius: 0px;
+}
+/deep/.findValue .el-input__inner {
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px;
+}
+.completed.el-button--default {
+  border-color: #5878e8;
+  background-color: #f6f7fc;
+  color: #5878e8;
+}
+.putstorage.el-button--default,
+.deliverystorage.el-button--default {
+  border-color: #8890b1;
+  background-color: #fff;
+  color: #8890b1;
+}
+/deep/.el-table td,
+/deep/.el-table th.is-leaf {
+  border-right: 1px solid #e9ecf7;
+  text-align: center;
+}
+/deep/.el-table tr td:first-child,
+/deep/.el-table tr th.is-leaf:first-child {
+  border-left: 1px solid #e9ecf7;
+}
+.record,
+.adjustment {
+  display: inline-block;
+  color: #5878e8;
+  padding: 0 4px !important;
+  position: relative;
+}
+.record:after {
+  position: absolute;
+  content: '';
+  display: block;
+  top: 5px;
+  right: -2px;
+  width: 1px;
+  height: 12px;
+  background: #e9ecf7;
+}
+.el-row{
+    height: 150px;
+}
+.base_header_layout .grid-content{
+    margin-top: 80px;
+}
+.but{
+    margin-top: 150px;
+}
+.findValue{
+    width: 50%;
+    margin-left: 25%;
+}
+/deep/.el-input--small .el-input__inner{
+  margin-left: -230px;
+   width: 300px;
+}
+.search{
+  margin-left: -100px;
 }
+
 </style>