前端gjy

src/api/V2/transport/index.js

@@ -22,3 +22,5 @@ export const API_GET_bank = '/driverViewInfo/bankShibie'
 export const API_POST_EDIT_DRIVER = '/driverViewInfo/api/editInfo'
 // 司机管理-车头、车型
 export const API_GET_PRAAMETER = '/commonSysParameter/getInfo'
+//运输任务查看
+export const API_POST_TRAN_LOOK = '/tranTaskInfo/getTranTask'

src/api/V2/warehouse/index.js

@@ -1,3 +1,4 @@
+
 export const API_GET_WAREHOUSE_BASEINFO = '/warehouseBaseInfo/selectWarehouseViewinfo'
 export const API_POST_ADD_WAREHOUSE_BASEINFO = '/warehouseBaseInfo/api/addWarehouse'
 //仓库列表查看

src/lang/zh.js

@@ -488,7 +488,7 @@
     salesContractAdd: '销售合同添加',
     purchaseContractAdd: '采购合同添加',
     purchaseContractEdit: '采购合同编辑',
-    //仓库管理、
+    //仓库管理
     warehouseManagementList: '仓库管理',
     warehouseManagementAdd: '仓库管理添加',
     warehouseManagementEdit: '仓库管理编辑',
@@ -510,13 +510,13 @@
     tranManagementTransport: '运输任务',
     tranManagementDriverEdit: '编辑司机',
 
-    warehouseManagementPerfectDelivery: '编辑',
     tranManagementLook: '运输任务查看',
     tranManagementTransportAdd: '运输任务添加',
     tranManagementTransportEdit: '运输任务编辑',
     tranManagementVehicle: '汽运调度',
     tranManagementVehicleDispatching: '汽车调度',
     tranManagementVehicleLook: '查看派车详情',
+    tranManagementTransporTationFire: '火运调度',
 
     // 采购模块
     procurement: '采购管理',
@@ -4731,6 +4731,9 @@
     tranManagementVehicleDispatching: '汽车调度',
     tranManagementVehicleLook: '查看派车详情',
   },
+  tranManagementTransporTationFire: {
+    tranManagementTransporTationFire: '火运调度'
+  },
   // 年度培训
   annualTraining: {
     trainingResults: '培训结果',

src/model/transport/index.js

@@ -15,6 +15,7 @@ import {
     API_GET_bank,
     API_POST_EDIT_DRIVER,
     API_GET_PRAAMETER,
+    API_POST_TRAN_LOOK,
 } from '@/api/V2/transport'
 // 司机列表
 export const selectDriver = appRx.get(API_GET_TRAN_DRIVERINFO, errorCatcher, errorHandle, filter)
@@ -41,4 +42,6 @@ export const getbank = appRx.get(API_GET_bank, errorCatcher, errorHandle, filter
 // 司机管理-编辑
 export const editdriver = appRx.post(API_POST_EDIT_DRIVER, errorCatcher, errorHandle, filter)
 // 司机管理-车头、车型
-export const packList = appRx.get(API_GET_PRAAMETER, errorCatcher, errorHandle, filter)
+export const packList = appRx.get(API_GET_PRAAMETER, errorCatcher, errorHandle, filter)
+//运输任务查看
+export const lookTranTask = appRx.get(API_POST_TRAN_LOOK, errorCatcher, errorHandle, filter)

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

@@ -12,7 +12,6 @@ const tranManagementRouter = {
     icon: 'cg'
   },
   children: [
-
     //运输任务
     {
       path: 'tranManagementTransport',
@@ -26,6 +25,24 @@ const tranManagementRouter = {
         permissicon: [],
         keepAlive: true
       },
+
+      // hidden: true
+    },
+    //火运调度
+    {
+      path: 'tranManagementTransporTationFire',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementTransporTationFire'),
+      name: 'tranManagementTransporTationFire',
+      meta: {
+        title: 'tranManagementTransporTationFire',
+        shortcutEntrance: 'tranManagement',
+        module: 'tranManagement.tranManagementDriver.tranManagementTransporTationFire',
+        permissicon: [],
+        keepAlive: true
+      },
+
+
     },
     //添加司机
     {
@@ -101,6 +118,7 @@ const tranManagementRouter = {
         keepAlive: true
       },
       hidden: true
+
     },
     //汽运调度
     {
@@ -117,19 +135,49 @@ const tranManagementRouter = {
       },
 
     },
-    //司机管理
+    //司机查看
     {
-      path: 'tranManagementDriver',
+      path: 'tranManagementDriverLook',
       component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementDriver'),
-      name: 'tranManagementDriver',
+        import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementDriverLook'),
+      name: 'tranManagementDriverLook',
       meta: {
-        title: 'tranManagementDriver',
+        title: 'tranManagementDriverLook',
         shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementDriver',
+        module: 'tranManagement.tranManagementDriver.tranManagementDriverLook',
         permissicon: [],
         keepAlive: true
-      }
+      },
+      hidden: 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: 'tranManagementDriverAdd',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementDriverAdd'),
+      name: 'tranManagementDriverAdd',
+      meta: {
+        title: 'tranManagementDriverAdd',
+        shortcutEntrance: 'tranManagement',
+        module: 'tranManagement.tranManagementDriver.tranManagementDriverAdd',
+        permissicon: [],
+        keepAlive: true
+      },
+      hidden: true
     },
     //汽车调度
     {
@@ -161,6 +209,35 @@ const tranManagementRouter = {
       },
       hidden: true
     },
+    //添加运输
+    {
+      path: 'tranManagementTransportAdd',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementTransportAdd'),
+      name: 'tranManagementTransportAdd',
+      meta: {
+        title: 'tranManagementTransportAdd',
+        shortcutEntrance: 'tranManagement',
+        module: 'tranManagement.tranManagementTransportAdd',
+        permissicon: [],
+        keepAlive: true
+      },
+      hidden: true
+    },
+    //司机管理
+    {
+      path: 'tranManagementDriver',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementDriver'),
+      name: 'tranManagementDriver',
+      meta: {
+        title: 'tranManagementDriver',
+        shortcutEntrance: 'tranManagement',
+        module: 'tranManagement.tranManagementDriver',
+        permissicon: [],
+        keepAlive: true
+      }
+    },
 
   ],
 

src/views/tranManagement/tranManagementLook.vue

@@ -226,7 +226,7 @@
   </div>
 </template>
 <script>
-import { pullDown, addstorageputList } from '@/model/warehouse/index'
+import { lookTranTask ,gain } from '@/model/transport/index'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
 // import { dayjs, fmoney, EventBus } from 'base-core-lib'

src/views/tranManagement/tranManagementTransporTationFire.vue

@@ -0,0 +1,649 @@
+//火运调度
+<template>
+  <div>
+    <BaseHeaderLayout :leftSpan="20">
+      <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-date-picker
+              v-model="deptBudgetList.inOutDate"
+              type="date"
+              placeholder="请选择开始日期"
+              value-format="yyyy-MM-dd"
+            />
+            <span>至</span>
+            <ws-date-picker
+              v-model="deptBudgetList.inOutDate"
+              type="date"
+              placeholder="请选择结束日期"
+              value-format="yyyy-MM-dd"
+            />
+        <ws-input
+          v-model="searchKeyWord"
+          placeholder="可按照合同编号、买方名称、卖方名称进行查找"
+          clearable
+          maxlength="500"
+          type="input"
+          class="findValue"
+        ></ws-input>
+        <!-- v-hasPermission="'procurement.sparepart.directShip'" -->
+        <ws-button
+          class="find"
+          type="primary"
+          @click="find()"
+          v-hasPermission="
+            `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
+          "
+          ><img
+            width="16"
+            height="16"
+            style="
+              vertical-align: text-top;
+              position: relative;
+              top: 0px;
+              left: -8px;
+            "
+            src="../../../public/img/sousuo.png"
+            alt=""
+        /></ws-button>
+      </template>
+    </BaseHeaderLayout>
+    <div>
+      <el-table
+        class="wenzi"
+        :data="warehouseList"
+        style="width: 100%; margin-top: 20px"
+        height="780"
+      >
+        <el-table-column prop="warehouseName" label="序号" width="80">
+        </el-table-column>
+        <el-table-column prop="binNumber" label="运输任务编号" width="80">
+        </el-table-column>
+        <el-table-column prop="capacity" 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 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 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 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 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="status" label="状态">
+        <template slot-scope="scope">
+          <el-popover
+          placement="left"
+          :width="285"
+          trigger="click"
+          visible-arrow="false"
+          @show="history(scope.row)"
+          >
+          <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">XXXXX</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 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="seller" label="操作" width="300">
+          <template slot-scope="scope">
+            <ws-button
+              class="completed"
+              @click="nocomplete(scope.row)"
+              v-hasPermission="
+                `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
+              "
+            >
+              查看（{{ scope.row.number }}）
+            </ws-button>
+            <ws-button
+              class="putstorage"
+              @click="warehousing(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>
+    </div>
+  </div>
+</template>
+<script>
+import {
+  getList,
+  export1,
+  editstatus,
+  billoperatehis,
+} from '@/model/warehouse/index'
+import { downloadFile } from '@/utils/batchDown'
+import Pagination from '@/components/Pagination'
+import WsUpload from '@/components/WsUpload'
+import { dayjs, fmoney, EventBus } from 'base-core-lib'
+export default {
+  name: 'viewSpareMoney',
+  components: {
+    WsUpload,
+    Pagination,
+  },
+  watch: {
+    vesselId(val) {
+      this.getList()
+    },
+    isShow(val) {
+      this.showType = val
+    },
+  },
+  data() {
+    return {
+      //弹出框
+      dialogViewSpareMoney: false,
+      dialogApproveFormVisible: false,
+      // 船舶类型
+      monetaryKey: null,
+      // 表格显示数据
+      tableDate: [],
+
+      // 是否显示
+      showType: true,
+      // 年
+      year: '',
+      currentPage: 1,
+      pageSize: 10,
+      searchType: 1,
+      searchTypeText: '未完成',
+      searchKeyWord: '',
+      contractType: 2,
+      // 提交类型
+      submitType: true,
+      size: 10,
+      spanArr: [],
+      warehouseName: '',
+      compId: sessionStorage.getItem('ws-pf_compId'),
+      deptCircularPage: {},
+      warehouseList: [],
+      deptBudgetList: {},
+      historyList: [],
+      pickerBeginDateBefore: {
+        disabledDate: (time) => {
+          return time.getTime() > Date.now()
+        },
+      },
+      accessoryTFs: false,
+    }
+  },
+  activated() {
+    //cg.viewBudget
+    //cg.viewSpareMoney
+    // this.getVesselData();
+    this.getList()
+    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) {
+      var free = 0
+      for (var i = 0; i < item.warehouseNumViewList.length; i++) {
+        free += Number(item.warehouseNumViewList[i].storage)
+      }
+      this.$router.push({
+        path: 'tranManagementVehicleDispatching',
+        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: 'tranManagementVehicleLook',
+        // 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.$router.push({ path: 'tranManagementVehicleLook' })
+    },
+    //添加
+    handleAdd() {
+      this.$router.push({ path: 'tranManagementTransportAdd' })
+    },
+    //编辑
+    handleEdit() {
+      this.$router.push({ path: 'tranManagementTransportEdit' })
+    },
+    // 派车
+    warehousing(){
+        this.$router.push({ path: 'tranManagementVehicleDispatching'})
+    },
+    dateFormat(fmt, date) {
+      let ret
+      const opt = {
+        'Y+': date.getFullYear().toString(), // 年
+        'm+': (date.getMonth() + 1).toString(), // 月
+        'd+': date.getDate().toString(), // 日
+        'H+': date.getHours().toString(), // 时
+        // "M+": date.getMinutes().toString(),         // 分
+        // "S+": date.getSeconds().toString()          // 秒
+        // 有其他格式化字符需求可以继续添加，必须转化成字符串
+      }
+      for (let k in opt) {
+        ret = new RegExp('(' + k + ')').exec(fmt)
+        if (ret) {
+          fmt = fmt.replace(
+            ret[1],
+            ret[1].length == 1 ? opt[k] : opt[k].padStart(ret[1].length, '0')
+          )
+        }
+      }
+      return fmt
+    },
+    handleClose() {
+      this.accessoryTFs = false
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.pageSize = val
+      this.getList()
+    },
+    handleCurrentChange(val) {
+      this.currentPage = val
+      console.log(`当前页: ${val}`)
+      this.getList()
+    },
+    getList() {
+      getList({
+        compId: sessionStorage.getItem('ws-pf_compId'),
+        warehouseName: this.warehouseName,
+      })
+        .toPromise()
+        .then((response) => {
+          this.warehouseList = response
+        })
+    },
+    editClick(row) {
+      var status = ''
+      if (row.status == '待执行' || row.status == '已完成') {
+        status = '执行中'
+      } else if (row.status == '执行中') {
+        status = '已完成'
+      }
+      //cancelButtonClass: "btn-custom-cancel"
+      this.$confirm(`是否将状态改为${status}`, {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          editstatus({ id: row.id })
+            .toPromise()
+            .then((response) => {
+              this.$notify.success({
+                title: '成功',
+                message: '状态修改成功',
+              })
+              this.getList()
+            })
+            .catch((response) => {
+              // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+            })
+        })
+        .catch(() => {
+          return false
+        })
+    },
+    selecttaskType(e) {
+      for (var i = 0; i < this.taskTypeList.length; i++) {
+        if (this.taskTypeList[i].value == e) {
+          this.searchType = this.taskTypeList[i].type
+        }
+      }
+    },
+    fujian(row) {
+      if (
+        row.receiveAttachmentPath === null ||
+        row.receiveAttachmentPath === ''
+      ) {
+        EventBus.$emit(
+          'warning',
+          this.$t('system.noticeCircular.NoInformation')
+        )
+      } else {
+        this.accessoryTFs = true
+      }
+      this.appendixIdss = row.receiveAttachmentPath
+    },
+    handleExamine(row) {
+      this.$router.push({
+        name: 'salesContractExamine',
+        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>
+.connert {
+  width: 90%;
+  margin: 0 auto;
+}
+.vertical-text-left {
+  width: 62px;
+  text-align: right;
+}
+.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;
+}
+.el-input--small .el-input__inner{
+    margin-left: 20px;
+}
+.el-range-editor--small.el-input__inner {
+    height: 32px;
+    margin-left: -20%;
+}
+</style>

src/views/tranManagement/tranManagementTransport.vue

@@ -17,7 +17,7 @@
         <ws-button
         class="but"
           type="primary"
-          @click="handleAdd()"
+          @click="handle()"
           v-hasPermission="
             `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
           "
@@ -325,6 +325,10 @@ export default {
     this.showType = this.isShow
   },
   methods: {
+    //添加
+    add(){
+      this.$router.push({ path :'tranManagementTransportAdd'})
+    },
     //查找
       lookUp(){
         this.currentPage= 1

src/views/tranManagement/tranManagementTransportAdd.vue

@@ -32,7 +32,6 @@
         v-for="(item, index) in freightspace"
       >
         <div class="flex">
-          <!-- <div class="driver">货车信息-{{ index + 1 }}</div> -->
           <ws-info-table class="el-table">
             <!--任务编号-->
             <ws-form-item
@@ -43,7 +42,7 @@
               width="400px"
             >
               <ws-input
-                v-model="item.taskNo"
+                v-model="deptBudgetList.taskNo"
                 placeholder="请输入任务编号"
                 maxlength="20"
                 size="small"
@@ -52,7 +51,7 @@
             <!-- 任务类型 -->
           <ws-form-item prop="taskType" label="任务类型" span="1">
             <ws-select
-              v-model="taskType"
+              v-model="deptBudgetList.taskType"
               placeholder=""
               class="typeselect"
               @change="selectstorageType"
@@ -68,7 +67,7 @@
           <!-- 合同编号 -->
           <ws-form-item prop="contractNo" label="合同编号" span="1">
             <ws-select
-              v-model="contractNo"
+              v-model="deptBudgetList.contractNo"
               placeholder="请输入合同编号"
               class="typeselect"
               @change="selectstorageType"
@@ -237,9 +236,9 @@
     </ws-form>
     <span class="zi">运输方式</span>
   <el-checkbox-group v-model="checkList" prop="tranType">
-    <el-checkbox label="汽运" prop="1"></el-checkbox>
-    <el-checkbox label="火运" prop="2"></el-checkbox>
-    <el-checkbox label="船运" prop="3"></el-checkbox>
+    <el-checkbox label="汽运" ></el-checkbox>
+    <el-checkbox label="火运"></el-checkbox>
+    <el-checkbox label="船运"></el-checkbox>
   </el-checkbox-group>
   
     <ws-form
@@ -389,8 +388,7 @@
 </template>
 <script>
 import { provinceAndCityData, CodeToText } from 'element-china-area-data'
-
-import {addtrantask} from '@/model/transport/index'
+import {addTranTask} from '@/model/transport/index'
 import WsUpload from '@/components/WsUpload'
 import mapDrag from '@/components/mapdrag/mapdrag'
 export default {
@@ -438,10 +436,10 @@ export default {
       unitList: [],
       freightspace: [
         {
-          carNumber: '',
-          carModel: '高栏',
-          carModelKey: '1',
-          carLength: '13',
+          waterContent:'',
+          taskType: '高栏',
+          goodsName: '1',
+          weight: '13',
           carLengthKey: '1',
           carLoad: '',
           yearManufacture: '',
@@ -468,8 +466,15 @@ export default {
   },
   computed: {},
   methods: {
-    addtrantask(){
-
+    getList(){
+      addtrantask({
+        compId: sessionStorage.getItem('ws-pf_compId'),
+      })
+      .toPromise()
+      .then((response)=>{
+        this.deptBudgetList = response
+      })
+     
     },
     IdCard(UUserCard) {
       //获取年龄
@@ -574,17 +579,17 @@ export default {
       this.$refs.deptBudgetList.validate((valid) => {
         if (valid) {
           this.deptBudgetList.compId = sessionStorage.getItem('ws-pf_compId')
-          this.deptBudgetList.residentCityProvincial =
-            CodeToText[this.selectedOptions[0]]
-          this.deptBudgetList.residentCityMunicipal =
-            CodeToText[this.selectedOptions[1]]
-          this.deptBudgetList.driverCarInfoList = this.freightspace
-          this.deptBudgetList.driverPayeeInfoList = this.freightspace1
-          addDriver(this.deptBudgetList)
+          // this.deptBudgetList.residentCityProvincial =
+          //   CodeToText[this.selectedOptions[0]]
+          // this.deptBudgetList.residentCityMunicipal =
+          //   CodeToText[this.selectedOptions[1]]
+          // this.deptBudgetList.driverCarInfoList = this.freightspace
+          // this.deptBudgetList.driverPayeeInfoList = this.freightspace1
+          addTranTask(this.deptBudgetList)
             .toPromise()
             .then((response) => {
               this.$message.success('添加成功')
-              this.$router.push({ path: 'tranManagementDriver' })
+              this.$router.push({ path: 'tranManagementTransport' })
             })
         } else {
           EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -743,20 +743,6 @@ export default {
         query: { id: row.id },
       })
     },
-
-    // 关闭 dialog时 处理文件url 初始化upload组件
-    // handleCloe() {
-    //   this.dialogViewSpareMoney = false
-    // },
-    // history(row) {
-    //   billoperatehis({ id: row.id })
-    //     .toPromise()
-    //     .then((response) => {
-    //       this.historyList = response
-    //     })
-    // },
-    // deletecontract(){},
-    //删除
     approve() {},
     listQuery() {},
   },
@@ -904,6 +890,6 @@ padding: 2px 4px;
   width: 100%;
 }
 .ws-info-table[data-v-850a44a6] .el-form-item {
-    width: 16.66%;
+    width: 29%;
 }
 </style>

src/views/warehouse/warehouseManagementIoss.vue

@@ -267,7 +267,6 @@ export default {
     this.deptBudgetList1.positionId = this.deptBudgetList.positionId
     this.loaddata()
     this.showType = this.isShow
-    console.log(this.deptBudgetList)
   },
   methods: {
     //返回按钮

src/views/warehouse/warehouseManagementIossRecord.vue

@@ -167,6 +167,7 @@ export default {
   },
   methods: {
     returnWarehouse() {
+      
       this.$router.go(-1)
     },
     dateFormat(fmt, date) {

src/views/warehouse/warehouseManagementList.vue

@@ -328,9 +328,7 @@ export default {
           baseId: item.warehouseId,
           positionId: item.binNumberId,
           warehouseName: item.warehouseName,
-        },
-        params: {
-          remark: item.remark,
+           remark: item.remark,
           binNumber: item.binNumber,
           capacity: item.capacity,
         },

src/views/warehouse/warehouseManagementLook.vue

@@ -61,7 +61,9 @@
           </ws-form-item>
           <!--仓库所在地-->
           <ws-form-item label="仓库所在地" span="1" prop="warehouseLocation">
-            {{ deptBudgetList.warehousePrivate }}{{deptBudgetList.warehouseCity}}{{deptBudgetList.warehouseArea}}
+            {{ deptBudgetList.warehousePrivate
+            }}{{ deptBudgetList.warehouseCity
+            }}{{ deptBudgetList.warehouseArea }}
           </ws-form-item>
           <!--详细地址-->
           <ws-form-item
@@ -99,9 +101,8 @@
               {{ item.maxStorage }}
             </ws-form-item>
             <!--现有储量-->
-            <ws-form-item label="现有储量" span="1" prop="nowStorage">
-    
-              {{ item.nowStorage }}
+            <ws-form-item :label="wwss" span="1" prop="detailStorage" >
+              {{ item.detailStorage }}
             </ws-form-item>
             <!--备注（选填）-->
             <ws-form-item label="备注（选填）" span="1" prop="remark">
@@ -142,6 +143,7 @@ export default {
     isShow(val) {
       this.showType = val
     },
+ 
   },
   data() {
     return {
@@ -192,17 +194,23 @@ export default {
     this.showType = this.isShow
     this.loaddata()
   },
-  computed : {
-   totalStorage :function() {
-     var sum  = 0
-     if(this.deptBudgetList.warehousePositionInfoList){
-       for(var i = 0;i < this.deptBudgetList.warehousePositionInfoList.length; i++ ){
-      sum += Number(this.deptBudgetList.warehousePositionInfoList[i].maxStorage)
-     }
-     }    
-     return sum
+  computed: {
+    totalStorage: function () {
+      var sum = 0
+      if (this.deptBudgetList.warehousePositionInfoList) {
+        for (
+          var i = 0;
+          i < this.deptBudgetList.warehousePositionInfoList.length;
+          i++
+        ) {
+          sum += Number(
+            this.deptBudgetList.warehousePositionInfoList[i].maxStorage
+          )
+        }
+      }
+      return sum
     },
-},
+  },
   methods: {
     //返回按钮
     returnWarehouse() {

src/views/warehouse/warehouseManagementRecord.vue

@@ -30,8 +30,8 @@
           src="../../../public/img/cangku.png"
           alt=""
         />
-        <span style="color: #323233">{{ deptBudgetList.warehouseName }}库</span>
-        <span class="ware">{{ binNumber }}仓位(容量{{ capacity }}吨)</span>
+        <span style="color: #323233">{{ deptBudgetList.warehouseName }}</span>
+        <span class="ware">{{binNumber}}仓位(容量{{capacity}}吨)</span>
       </h2>
       <p
         style="
@@ -41,7 +41,7 @@
           width: 245px;
         "
       >
-        备注：{{ remark }}
+        备注：{{remark }}
       </p>
 
       <ws-form ref="deptBudgetList" :model="deptBudgetList">
@@ -295,6 +295,7 @@ export default {
       submitType: true,
       selectpackingMethod: {},
       size: 10,
+     deptBudgetList1: {},
       compId: sessionStorage.getItem('ws-pf_compId'),
       deptCircularPage: {},
       packtypeList: {},
@@ -317,14 +318,14 @@ export default {
       accessoryTFs: false,
     }
   },
+ 
   activated() {
     this.deptBudgetList.baseId = this.$route.query.baseId
     this.deptBudgetList.positionId = this.$route.query.positionId
     this.deptBudgetList.warehouseName = this.$route.query.warehouseName
-    this.remark = this.$route.params.remark
-    this.binNumber = this.$route.params.binNumber
-    this.capacity = this.$route.params.capacity
-    console.log(111)
+    this.remark = this.$route.query.remark
+    this.binNumber = this.$route.query.binNumber
+    this.capacity = this.$route.query.capacity
     this.getList()
     this.showType = this.isShow
   },

vue.config.js

@@ -144,7 +144,7 @@ module.exports = {
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
         // target: 'http://192.168.1.121:8090/',
-        target: 'http://192.168.1.124:8090/',
+        target: 'http://192.168.1.119:8090/',
         // target: 'http://192.168.1.119:8090/',
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://product-server.winsea.com/',