前端sdy

src/lang/zh.js

@@ -529,8 +529,13 @@
     //发货反馈
     tranManagementTransporHairRespond: '发货反馈',
     tranManagementTransporFeedback: '反馈',
+
     tranManagementTransporFeedbackLook : '查看',
 
+    tranManagementReceivingFeedback:'收货反馈',
+    tranManagementReceivingloading:'反馈',
+    tranManagementReceivingloadingLook:'查看',
+
 
     // 采购模块
     procurement: '采购管理',
@@ -4761,6 +4766,12 @@
     tranManagementShippingArrangemen:'船次安排',
     tranManagementShippingLook:'船运调度详情'
   },
+  tranManagementReceivingFeedback:{
+    tranManagementReceivingFeedback:'收货反馈',
+    tranManagementReceivingloading:'反馈',
+    tranManagementReceivingloadingLook:'查看',
+    
+  },
   // 任务管理
   tranManagement: '任务管理',
   // 年度培训

src/model/transport/index.js

@@ -73,4 +73,5 @@ export const arrange = appRx.get(API_GET_AUTOMOBILE_ARRANGE, errorCatcher, error
 //发货反馈
 export const feedback = appRx.post(API_POST_AUTOMOBILE_FEEDBACK, errorCatcher, errorHandle, filter)
 //更改反馈状态
-export const state = appRx.post(API_POST_AUTOMOBILE_STATE, errorCatcher, errorHandle, filter)
+export const state = appRx.post(API_POST_AUTOMOBILE_STATE, errorCatcher, errorHandle, filter)
+

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

@@ -12,6 +12,7 @@ const tranManagementRouter = {
     icon: 'cg'
   },
   children: [
+
     //火运调度
     {
       path: 'tranManagementTransporTationFire',
@@ -41,8 +42,8 @@ const tranManagementRouter = {
       },
       hidden: true
     },
-     //火运调度详情
-     {
+    //火运调度详情
+    {
       path: 'tranManagementTransporTrainDetails',
       component: () =>
         import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementTransporTrainDetails'),
@@ -146,7 +147,7 @@ const tranManagementRouter = {
         permissicon: [],
         keepAlive: true
       },
-     
+
     },
     //编辑司机
     {
@@ -265,6 +266,7 @@ const tranManagementRouter = {
       },
       hidden: true
     },
+
     //反馈查看
     {
       path: 'tranManagementTransporFeedbackLook',
@@ -275,13 +277,53 @@ const tranManagementRouter = {
         title: 'tranManagementTransporFeedbackLook',
         shortcutEntrance: 'tranManagement',
         module: 'tranManagement.tranManagementTransporFeedbackLook',
+      }
+    },
+
+    //收货反馈
+    {
+      path: 'tranManagementReceivingFeedback',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementReceivingFeedback'),
+      name: 'tranManagementReceivingFeedback',
+      meta: {
+        title: 'tranManagementReceivingFeedback',
+        shortcutEntrance: 'tranManagement',
+        module: 'tranManagement.tranManagementDriver.tranManagementReceivingFeedback',
+        permissicon: [],
+
+      },
+    },
+    //反馈
+    {
+      path: 'tranManagementReceivingloading',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementReceivingloading'),
+      name: 'tranManagementReceivingloading',
+      meta: {
+        title: 'tranManagementReceivingloading',
+        shortcutEntrance: 'tranManagement',
+        module: 'tranManagement.tranManagementReceivingloading',
+        permissicon: [],
+        keepAlive: true
+      },
+      hidden: true
+    },
+    //反馈查看
+    {
+      path: 'tranManagementReceivingloadingLook',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementReceivingloadingLook'),
+      name: 'tranManagementReceivingloadingLook',
+      meta: {
+        title: 'tranManagementReceivingloadingLook',
+        shortcutEntrance: 'tranManagement',
+        module: 'tranManagement.tranManagementReceivingloadingLook',
         permissicon: [],
         keepAlive: true
       },
       hidden: true
     },
-
-
   ],
 };
 export default tranManagementRouter;

src/views/tranManagement/tranManagementReceivingFeedback.vue

@@ -0,0 +1,546 @@
+//收获反馈
+<template>
+  <div>
+    <BaseHeaderLayout :leftSpan="14">
+      <template slot="left">
+        <ws-button
+        class="but"
+          type="primary"
+          @click="handleAdd()"
+          >
+          执行中</ws-button
+        >
+        <ws-button
+        class="but"
+          @click="appp()"
+          
+          >已完成</ws-button
+        >
+        <ws-button
+        class="but"
+          @click="handleEdit()"
+          
+          >全部任务</ws-button
+        > 
+      </template>
+      <!-- 接单开始 -->
+      <template slot="left">
+            <ws-date-picker
+              v-model="deptBudgetList.startDate"
+              type="date"
+              placeholder="请选择开始日期"
+              value-format="yyyy-MM-dd"
+            />
+            <span>至</span>
+            <ws-date-picker
+              v-model="deptBudgetList.endDate"
+              type="date"
+              placeholder="请选择结束日期"
+              value-format="yyyy-MM-dd"
+            />
+        <ws-input
+          v-model="searchKeyWord"
+          placeholder="可按照合同编号、买方名称、卖方名称进行查找"
+          clearable
+          maxlength="500"
+          type="input"
+          class="findValue"
+        ></ws-input>
+        <ws-button
+          class="find"
+          type="primary"
+          @click="find()"
+          ><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.records"
+        style="width: 100%; margin-top: 20px"
+        height="780"
+      >
+        <el-table-column type="index" label="序号" width="80">
+          <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 class="table_td" prop="processNo" label="运输任务编号">
+        </el-table-column>
+        <el-table-column prop="tranType" label="运输方式" width="80">
+        </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>
+        </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.feedbackStatus == '待执行'"
+                    class="executory"
+                  ></span>
+                  <span
+                    v-if="scope.row.feedbackStatus == '执行中'"
+                    class="inExecution"
+                  ></span>
+                  <span
+                    v-if="scope.row.feedbackStatus == '已完成'"
+                    class="done"
+                  ></span
+                  >{{ scope.row.feedbackStatus }}
+                </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 class="table_td" label="接单日期" prop="receivingDate">
+        </el-table-column>
+        <el-table-column prop="seller" label="操作" width="300">
+          <template slot-scope="scope">
+            <ws-button class="completed" @click="trainSee(scope.row)">
+              查看
+            </ws-button>
+            <ws-button
+              class="putstorage"
+              @click="feedback(scope.row)"
+              v-show="scope.row.tranType == '汽运'"
+            >
+              反馈
+            </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 {
+ shippingList,
+} 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'
+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,
+    }
+  },
+  mounted(){
+    console.log(11111)
+    this.getList()
+  },
+  methods: {
+      //接口
+    getList() {
+        console.log(765)
+      shippingList({
+        compId: sessionStorage.getItem('ws-pf_compId'),
+        currentPage: this.currentPage,
+        pageSize: this.pageSize,
+        contractType:this.contractType,
+      })
+        .toPromise()
+        .then((response) => {
+          this.warehouseList = response
+        })
+    },
+    handleAdd(){
+        this.$router.push({
+            path: 'tranManagementReceivingloading',
+        })
+    },
+    delivery(item) {
+      this.$router.push({
+        path: 'warehouseManagementDelivery',
+        query: {
+          baseId: item.warehouseId,
+          positionId: item.binNumberId,
+          warehouseName: item.warehouseName,
+          binNumber: item.binNumber,
+          capacity: item.capacity,
+        },
+      })
+    },
+    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
+        }
+        }
+      })
+    },
+    //查看
+    trainSee(row) {
+      if (row.tranType == '汽运') {
+        this.$router.push({
+          path: 'tranManagementReceivingloadingLook',
+          query: {
+            id: row.id,
+          },
+        })
+      }
+        
+    },
+
+    //反馈
+    feedback(row) {
+      this.$router.push({
+        path: 'tranManagementReceivingloading',
+        query: {
+          id: row.id,
+        },
+      })
+    },
+    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()
+    },
+    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/tranManagementReceivingloading.vue

@@ -0,0 +1,663 @@
+// 汽运卸车反馈
+<template>
+  <div class="container">
+    <el-row>
+      <el-col :span="20">
+        <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()"
+          ><img
+            width="6"
+            height="10"
+            style="vertical-align: bottom; margin-right: 3px"
+            src="../../../public/img/lujing.png"
+            alt=""
+          />返回</el-button
+        >
+      </el-col>
+    </el-row>
+    <div class="center">
+    <ws-form ref="deptBudgetList" :model="deptBudgetList" :rules="rules">
+      <div class="basicInformation">
+        <h2> 任务编号 </h2>
+        <ws-info-table>
+          <!-- 任务编号 -->
+          <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>
+
+          <!--发货人电话-->
+          <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>
+         <!--收货人-->
+          <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="tranType">
+              {{deptBudgetList.tranType}}
+          </ws-form-item>
+        </ws-info-table>
+      
+        <div class="small-title"><h2>卸车详情</h2></div>
+        <div class="liaison">
+        <div
+          style="width: 100%"
+          class="flex position"
+          v-for="(item, index) in this.freightspace"
+          :key="index"
+        >
+          <ws-info-table>
+            <!--司机-->
+            <ws-form-item :label="'司机' + (index + 1)" span="1" prop="driver">
+               <el-input
+                v-show="item.temporaryDriverFlag != 0"
+                v-model="item.driver"
+                placeholder="请选择司机"
+                filterable
+                :filter-method="dataFilter"
+                @change="selectstaff"
+              >
+                <el-option
+                  v-for="item in options"
+                  :key="item.value"
+                  :label="item.staffName"
+                  :value="item.staffName"
+                />
+               </el-input> 
+               <span v-show="item.temporaryDriverFlag == 0">{{item.driver}} </span> 
+                   
+            </ws-form-item>
+            <!--电话-->
+            <ws-form-item label="司机电话" span="1" prop="driverPhone">
+               <ws-input
+               v-show="item.temporaryDriverFlag != 0"
+                v-model="item.driverPhone"
+                placeholder="请输入司机电话"
+                maxlength="20"
+                size="small"
+              /> 
+             <span v-show="item.temporaryDriverFlag == 0">{{item.driverPhone}} </span> 
+            </ws-form-item>
+            <!--车牌号-->
+            <ws-form-item label="车牌号" span="1" prop="carNo">
+               <ws-input
+               v-show="item.temporaryDriverFlag != 0"
+                v-model="item.carNo"
+                placeholder="请输入车牌号"
+                maxlength="20"
+                size="small"
+              /> 
+             <span v-show="item.temporaryDriverFlag == 0">{{item.carNo}} </span> 
+            </ws-form-item>
+            <!--装车净重-->
+            <ws-form-item label="装车(吨)" span="1" prop="loadNetWeight">
+              <ws-input
+                v-model="item.loadNetWeight"
+                placeholder="请输入装车净重"
+                maxlength="20"
+                size="small"
+              />
+            </ws-form-item>
+            <!--卸车净重(吨)-->
+            <ws-form-item label="卸车净重(吨)" span="1" prop="unloadNetWeight">
+              <ws-input
+                v-model="item.unloadNetWeight"
+                placeholder=""
+                maxlength="20"
+                size="small"
+              />
+            </ws-form-item>
+            <!--磅单-->
+            <ws-form-item label="磅单" span="1" prop="loadPoundImg">
+              <template slot-scope="scope">
+              
+                <img
+                  width="18"
+                  height="20"
+                  style="
+                    vertical-align: text-top;
+                    position: relative;
+                    top: -1px;
+                  "
+                  src="../../../public/img/fujian.png"
+                  @click="fujian(scope.row)"
+                  alt=""
+                />
+                <span v-show="item.temporaryDriverFlag == 0" >{{item.signStatus}}</span>
+              </template>
+            </ws-form-item>
+          </ws-info-table>
+        </div>
+      </div>
+      </div>
+    </ws-form>
+    <div style="text-align: right; padding: 10px">
+        <el-button
+          class="bg-bottom-up"
+          type="primary"
+          size="small"
+          @click="submit(deptBudgetList)"
+          >提交</el-button
+        >
+      </div>
+      <WinseaContentModal
+      v-model="accessoryTFs"
+      :title="$t('system.noticeCircular.information')"
+      @on-cancel="handleClose"
+    >
+      <p>上传附件</p>
+      <ws-upload
+        ref="upload"
+        table-name="maintain_work_order"
+        oss-key="mainPlan"
+        :comp-id="compId"
+        :file-list="fileList"
+        :appendix-ids="appendixIdsAdd"
+        :vesselId="deptBudgetList.loadPoundImg"
+        :size-limit="size"
+        @uploadSuccess="uploadSuccess"
+        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
+      />
+    </WinseaContentModal>
+    </div>
+  </div>
+  
+</template>
+<script>
+import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
+import {seeCat, packList, feedback} from '@/model/transport/index'
+import{getstaff}from '@/model/warehouse/index'
+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: {
+    WsUpload,
+    Pagination,
+  },
+  watch: {
+    // vesselId(val) {
+    //   this.getList()
+    // },
+    isShow(val) {
+      this.showType = val
+    },
+  },
+  data() {
+    return {
+      //弹出框
+      dialogViewSpareMoney: false,
+      dialogApproveFormVisible: false,
+      // 船舶类型
+      monetaryKey: null,
+      // 表格显示数据
+      tableDate: [],
+      // 是否显示
+      showType: true,
+      // 年
+      year: '',
+      item:[],
+      shipType:[],
+      tranType: 3,
+      deptBudgetTotal: 0,
+      currentPage: 1,
+      pageSize: 10,
+      searchType: 1,
+      searchKeyWord: '',
+      contractType: 2,
+      startDate: null,
+      endDate: null,
+      goodnameList: {},
+      // 提交类型
+      submitType: true,
+      storageType: [],
+      readonly: true,
+      appendixIdsAdd: '',
+      uploadSuccess: {},
+      onChange: {},
+      selectedOptions: [],
+        options:[],
+      tranCarInfoList: {},
+        staffList :[],
+      gradeList: [],
+      rules: {
+        netWeight: [
+          {
+            required: true,
+            type: 'number',
+            message: '请输入活动名称',
+            trigger: 'blur',
+          },
+        ],
+      },
+      fileList:[],
+     freightspace: [
+        {
+          driver: '',
+          driverPhone: '',
+          carNo: '',
+          loadNetWeight: '',
+        },
+      ],
+      size: 10,
+      compId: sessionStorage.getItem('ws-pf_compId'),
+      deptCircularPage: {},
+      packtypeList: {},
+      date: {
+        year: dayjs().format('YYYY'),
+        month: dayjs().format('MM'),
+      },
+      contractList: [],
+      deptBudgetList: {
+        warehouseInOutDetail: {},
+      },
+      historyList: [],
+
+      pickerBeginDateBefore: {
+        disabledDate: (time) => {
+          return time.getTime() > Date.now()
+        },
+      },
+      accessoryTFs: false,
+    }
+  },
+  mounted() {
+    this.deptBudgetList.id = this.$route.query.id
+    this.getList()
+  },
+//  activated(){
+//    this.loaddata()
+//    this.getList()
+//  },
+ computed: {
+    totalStorage: function () {
+      var maxStorage = 0
+      for (var i = 0; i < this.freightspace.length; i++) {
+        maxStorage += Number(this.freightspace[i].maxStorage)
+      }
+      return maxStorage
+    },
+  },
+  methods: {
+   getList() {
+      seeCat({ id: this.deptBudgetList.id })
+        .toPromise()
+        .then((response) => {
+          this.deptBudgetList = response
+          //  this.deptBudgetList.tranCarInfoList = response.tranCarInfoList
+          this.freightspace = response.tranCarInfoList
+          for (var i = 0; i < this.freightspace.length; i++) {
+            if (!this.freightspace[i].loadNetWeight) {
+              this.freightspace[i].loadNetWeight = 0
+            }
+          }
+        })
+    },
+    dataFilter(val) {
+      this.deptBudgetList.personCharge = val
+      if (val) {
+        console.log(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
+        }
+      }
+    },
+    // loaddata() {
+    //   dispatchCat({ id: this.deptBudgetList.id  })
+    //     .toPromise()
+    //     .then((response) => {
+    //       this.deptBudgetList = response
+    //         this.freightspace = response.tranCarInfoList
+    //         for (var i = 0; i < this.freightspace.length; i++) {
+    //         if (!this.freightspace[i].loadNetWeight) {
+    //           this.freightspace[i].loadNetWeight = 0
+    //         }
+    //       }
+        //   for(var i = 0; i<this.deptBudgetList.tranCarInfoList.length;i++){
+        //    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]
+        //      })
+        //    }
+
+        //   }
+  //   })
+  // },
+  //上传
+    fujian(row) {
+      if (
+        row.receiveAttachmentPath === null ||
+        row.receiveAttachmentPath === ''
+      ) {
+        EventBus.$emit(
+          'warning',
+          this.$t('system.noticeCircular.NoInformation')
+        )
+      } else {
+        this.accessoryTFs = true
+      }
+      this.appendixIdss = row.receiveAttachmentPath
+    },
+    //返回按钮
+    revert() {
+      this.freightspace=[]
+      this.$router.push({ path: 'tranManagementReceivingFeedback' })
+    },
+    
+    selectdriver() {},
+    handleChange(value) {
+      this.selectedOptions = value
+    },
+    returnsales() {
+      this.deptBudgetList = {}
+      this.freightspace = {}
+      this.selectedOptions = ''
+      this.$router.push({ path: 'tranManagementReceivingFeedback' })
+    },
+    //提交按钮
+    submit() { 
+      this.$confirm(`所有车辆完成卸车任务后，请及时修改任务状态，确定提交卸车信息？`, {
+        cancelButtonText: '取消',
+        confirmButtonText: '确定',
+        type: 'warning',
+      })
+        .then(() => {
+          this.$refs.deptBudgetList.validate((valid) => {
+            if (valid) {
+              
+            //  for(var i = 0; i < this.freightspace.length; i++){
+            //    var num  = this.freightspace[i].impurity + "/" + this.freightspace[i].positionWeight
+            //    this.arr.push(
+            //      num
+            //    )  
+            //  }
+          
+            this.tranCarInfoList=this.freightspace
+            this.tranCarInfoList.driver = this.deptBudgetList.driver
+              this.tranCarInfoList.driverPhone = this.deptBudgetList.driverPhone
+              this.tranCarInfoList. carNo = this.deptBudgetList.carNo
+              this.tranCarInfoList.loadNetWeight = this.deptBudgetList.loadNetWeigh
+              this.tranCarInfoList.unloadNetWeight = this.deptBudgetList.unloadNetWeight
+              this.tranCarInfoList.loadPoundImg = this.deptBudgetList.loadPoundImg
+              this.tranCarInfoList.tranType = this.deptBudgetList.tranType
+            for(var i = 0 ; i<this.tranCarInfoList.length;i++){
+                this.tranCarInfoList[i].id = this.freightspace[i].id
+                if(this.tranCarInfoList[i].temporaryDriverFlag !=0){
+                   this.tranCarInfoList[i].temporaryDriverFlag = 1
+                   this.tranCarInfoList[i].tranType = this.tranType
+                 }
+            }
+              var tranProcessInfo = {}
+              var tranList = this.tranCarInfoList
+              tranProcessInfo.id = this.deptBudgetList.id
+              tranProcessInfo.infoId = this.deptBudgetList.infoId
+              tranProcessInfo.tranCarInfoList = this.tranCarInfoList
+              feedback(tranProcessInfo)
+                .toPromise()
+                .then((response) => {
+                  this.$message.success('添加成功')
+                  this.deptBudgetList = {}
+                  this.freightspace = {}
+                  this.selectedOptions = ''
+                  this.$router.push({
+                    path: 'tranManagementReceivingFeedback',
+                  })
+                })
+            } else {
+              // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+              return false
+            }
+          })
+        })
+        .catch(() => {
+          return false
+        })
+    },
+    resetForm(deptBudgetList) {
+      this.$refs[deptBudgetList].resetFields()
+    },
+    handleClose() {
+      this.accessoryTFs = false
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.pageSize = val
+      this.getList()
+    },
+    handleCurrentChange(val) {
+      this.currentPage = val
+      console.log(`当前页: ${val}`)
+      this.getList()
+    },
+    selecttaskType(e) {
+      for (var i = 0; i < this.taskTypeList.length; i++) {
+        if (this.taskTypeList[i].value == e) {
+          this.searchType = this.taskTypeList[i].type
+        }
+      }
+    },
+    approve() {},
+    listQuery() {},
+  },
+}
+</script>
+<style lang="scss" scoped>
+/deep/.basicInformation {
+  .ws-info-table {
+    border: none;
+  }
+  .el-form-item {
+    width: 33.3333%;
+    border: none;
+    .el-form-item__label {
+      background: transparent;
+      border: none;
+    }
+    .el-form-item__content {
+      border: none;
+    }
+  }
+}
+.title {
+  position: relative;
+  padding-left: 10px;
+}
+.title::before {
+  content: '';
+  display: inline-block;
+  width: 5px;
+  height: 30px;
+  background: #5473e8;
+  position: absolute;
+  left: 0;
+}
+.el-form {
+  padding: 0 10%;
+}
+.el-button--primary {
+  background-color: #5878e8;
+  border-color: #5878e8;
+}
+.el-col {
+  background: #f6f7fc;
+}
+.bg-right {
+  text-align: right;
+  padding: 16px 20px;
+}
+.center{
+  width: 80%;
+  margin: 0 auto;
+}
+
+//表格文字
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+  text-align: left;
+  font-size: 14px;
+  font-weight: 400;
+  color: #8890b1;
+  line-height: 16px;
+}
+//蓝标
+.small-title {
+  position: relative;
+  padding: 10px;
+  font-weight: 600;
+}
+.small-title::before {
+  position: absolute;
+  content: '';
+  display: block;
+  background: #5473e8;
+  width: 4px;
+  height: 14px;
+  left: 0px;
+  top: 13px;
+  padding: 4px 2px;
+}
+.position{
+  width: 90%;
+}
+.position .siji{
+  width: 16%;
+}
+/deep/.position .ws-info-table .el-form-item .el-form-item__label{
+  width: 40%;
+  text-align: center;
+}
+.position .zaizhong{
+  width: 16%;
+}
+//减号
+.del {
+  right: -70px;
+}
+.bot{
+  width: 30%;
+}
+.position .siji {
+  width: 20.5%;
+}
+/deep/.el-form-item {
+  border-right: 0px;
+  border-bottom: 0px;
+}
+/deep/.ws-info-table {
+  border-left: 0px;
+  border-top: 0px;
+}
+.ws-info-table .el-form-item .el-form-item__content {
+  border-right: 0px;
+  border-bottom: 0px;
+  border-left: 0px;
+  border-top: 0px;
+}
+/deep/.ws-info-table .el-form-item {
+  border-right: 0px;
+  border-bottom: 0px;
+  border-left: 0px;
+  border-top: 0px;
+}
+/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;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #8890b1;
+  line-height: 16px;
+}
+// .flex .position{
+//   margin-top: 150px;
+//   margin-left: 20px;
+// }
+.position{
+  width: 100%;
+}
+.position .siji{
+  width: 20.6%;
+}
+</style>

src/views/tranManagement/tranManagementReceivingloadingLook.vue

@@ -0,0 +1,580 @@
+// 查看汽车卸货详情
+<template>
+  <div class="container">
+    <el-row>
+      <el-col :span="20">
+        <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()"
+          ><img
+            width="6"
+            height="10"
+            style="vertical-align: bottom; margin-right: 3px"
+            src="../../../public/img/lujing.png"
+            alt=""
+          />返回</el-button
+        >
+      </el-col>
+    </el-row>
+
+    <ws-form ref="deptBudgetList" :rules="rules" :model="deptBudgetList">
+      <div class="small-title">任务详情</div>
+      <ws-info-table>
+        <!--任务编号-->
+        <ws-form-item label="任务编号" span="1" prop="processNo">
+          <ws-input
+            :disabled="disabled"
+            v-model="deptBudgetList.processNo"
+            placeholder="请输入任务编号"
+            maxlength="20"
+            size="small"
+          />
+        </ws-form-item>
+        <!--货名-->
+        <ws-form-item label="货名" span="1" prop="goodsName">
+          <!-- <el-select
+            v-model="deptBudgetList.goodsName"
+            placeholder="请选择货名"
+            filterable
+            :filter-method="dataFilter"
+            @change="selectstaff"
+          >
+            <el-option
+              v-for="item in personCharge"
+              :key="item.value"
+              :label="item.staffName"
+              :value="item.staffName"
+            /> -->
+          <ws-input
+            :disabled="disabled"
+            v-model="deptBudgetList.goodsName"
+            placeholder="请输入货名"
+            maxlength="20"
+            size="small"
+          />
+          <!-- </el-select> -->
+        </ws-form-item>
+        <!--重量（吨）-->
+        <ws-form-item label="重量（吨）" span="1" prop="weight">
+          <ws-input
+            :disabled="disabled"
+            v-model="deptBudgetList.weight"
+            placeholder="请输入重量（吨）"
+            maxlength="100"
+            size="small"
+          />
+        </ws-form-item>
+
+        <!--发货地址-->
+        <ws-form-item label="发货地址" span="1" prop="sendDetailedAddress">
+          <!-- <ws-input
+            v-model="deptBudgetList.sendDetailedAddress"
+            placeholder=""
+            maxlength="100"
+            size="small"
+          /> -->
+          {{ deptBudgetList.sendPrivate }}{{ deptBudgetList.sendCity
+          }}{{ deptBudgetList.sendArea }}
+        </ws-form-item>
+
+        <!--发货人-->
+        <ws-form-item label="发货人" span="1" prop="sender" class="readonly">
+          <ws-input
+            :disabled="disabled"
+            v-model="deptBudgetList.sender"
+            placeholder="请输入发货人"
+            maxlength="100"
+            size="small"
+          />
+        </ws-form-item>
+
+        <!--发货人电话-->
+        <ws-form-item
+          label="发货人电话"
+          span="1"
+          prop="senderPhone"
+          class="readonly"
+        >
+          <ws-input
+            :disabled="disabled"
+            v-model="deptBudgetList.senderPhone"
+            placeholder="请输入发货人电话"
+            maxlength="100"
+            size="small"
+          />
+        </ws-form-item>
+        <!--收货地址-->
+        <ws-form-item label="收货地址" span="1" prop="receiveDetailedAddress">
+          <!-- <ws-input
+            v-model="deptBudgetList.receiveDetailedAddress"
+            placeholder="请输入仓库名"
+            maxlength="20"
+            size="small"
+          /> -->
+          {{ deptBudgetList.receivePrivate }}{{ deptBudgetList.receiveCity
+          }}{{ deptBudgetList.receiveArea }}
+        </ws-form-item>
+        <!--收货人-->
+        <ws-form-item label="收货人" span="1" prop="receiver">
+          <ws-input
+            :disabled="disabled"
+            v-model="deptBudgetList.receiver"
+            placeholder="请输入仓库名"
+            maxlength="20"
+            size="small"
+          />
+        </ws-form-item>
+        <!--收货人电话-->
+        <ws-form-item label="收货人电话" span="1" prop="receiverPhone">
+          <ws-input
+            :disabled="disabled"
+            v-model="deptBudgetList.receiverPhone"
+            placeholder="请输入仓库名"
+            maxlength="20"
+            size="small"
+          />
+        </ws-form-item>
+        <!--发货日期-->
+        <ws-form-item label="发货日期" span="1" prop="deliveryDateStart">
+          <ws-input
+            :disabled="disabled"
+            v-model="deptBudgetList.deliveryDateStart"
+            placeholder="请输入仓库名"
+            maxlength="20"
+            size="small"
+          />
+        </ws-form-item>
+        <!--最晚到货日期-->
+        <ws-form-item label="最晚到货日期" span="1" prop="deliveryDateEnd">
+          <ws-input
+            :disabled="disabled"
+            v-model="deptBudgetList.deliveryDateEnd"
+            placeholder="请输入仓库名"
+            maxlength="20"
+            size="small"
+          />
+        </ws-form-item>
+        <!--合同编号-->
+        <ws-form-item label="合同编号" span="1" prop="contractNo">
+          <ws-input
+            :disabled="disabled"
+            v-model="deptBudgetList.contractNo"
+            placeholder="请输入合同编号"
+            maxlength="20"
+            size="small"
+          />
+        </ws-form-item>
+        <!-- 运输方式 -->
+          <ws-form-item label="运输方式" span="1" prop="tranType">
+              {{deptBudgetList.tranType}}
+          </ws-form-item>
+      </ws-info-table>
+      <div class="small-title">卸车详情</div>
+      <div
+        style="width: 100%"
+        class="driver"
+        v-for="(item, index) in deptBudgetList.tranCarInfoList"
+      >
+        <ws-info-table>
+          <span class="not" v-if="item.statusFlag == 3">{{ item.status }}</span>
+          <span class="already" v-if="item.statusFlag == 1">{{
+            item.status
+          }}</span>
+          <!--姓名-->
+          <ws-form-item label="司机" span="1" prop="driver">
+            <ws-input
+              :disabled="disabled"
+              v-model="item.driver"
+              placeholder="请输入姓名"
+              maxlength="20"
+              size="small"
+            />
+          </ws-form-item>
+          <ws-form-item class="phone" label="司机电话" span="1" prop="driverPhone">
+            <ws-input
+              :disabled="disabled"
+              v-model="item.driverPhone"
+              placeholder=""
+              maxlength="20"
+              size="small"
+            />
+          </ws-form-item>
+          <ws-form-item label="车牌号" span="1" prop="carNo">
+            <ws-input
+              :disabled="disabled"
+              v-model="item.carNo"
+              placeholder="请输入车牌号"
+              maxlength="20"
+              size="small"
+            />
+          </ws-form-item>
+          <ws-form-item label="装车（吨）" span="1" prop="loadNetWeight">
+            <ws-input
+              :disabled="disabled"
+              v-model="deptBudgetList.loadNetWeight"
+              placeholder=""
+              maxlength="20"
+              size="small"
+            />
+          </ws-form-item>
+          <ws-form-item label="卸车（吨）" span="1" prop="unloadNetWeight">
+            <ws-input
+              :disabled="disabled"
+              v-model="item.unloadNetWeight"
+              placeholder=""
+              maxlength="20"
+              size="small"
+            />
+          </ws-form-item>
+          <!--磅单-->
+            <ws-form-item label="磅单" span="1" prop="loadPoundImg">
+              <template slot-scope="scope">
+              
+                <img
+                  width="18"
+                  height="20"
+                  style="
+                    vertical-align: text-top;
+                    position: relative;
+                    top: -1px;
+                  "
+                  src="../../../public/img/fujian.png"
+                  @click="fujian(scope.row)"
+                  alt=""
+                />
+                <span v-show="item.temporaryDriverFlag == 0" >{{item.signStatus}}</span>
+              </template>
+            </ws-form-item>
+        </ws-info-table>
+      </div>
+    </ws-form>
+    <div style="text-align: right; padding: 10px">
+      <el-button
+        class="bg-bottom-up"
+        type="primary"
+        size="small"
+        @click="revert()"
+        >关闭</el-button
+      >
+    </div>
+  </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'
+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: '',
+      disabled: true,
+      deptBudgetTotal: 0,
+      currentPage: 1,
+      pageSize: 10,
+      searchType: 1,
+      searchKeyWord: '',
+      contractType: 2,
+      startDate: null,
+      endDate: null,
+      goodnameList: {},
+      // 提交类型
+      submitType: true,
+      storageType: [],
+      readonly: true,
+      appendixIdsAdd: '',
+      uploadSuccess: {},
+      onChange: {},
+      gradeList: [],
+      rules: {
+        netWeight: [
+          {
+            required: true,
+            type: 'number',
+            message: '请输入活动名称',
+            trigger: 'blur',
+          },
+        ],
+      },
+      size: 10,
+      compId: sessionStorage.getItem('ws-pf_compId'),
+      deptCircularPage: {},
+      packtypeList: {},
+      date: {
+        year: dayjs().format('YYYY'),
+        month: dayjs().format('MM'),
+      },
+      contractList: [],
+      deptBudgetList: {
+        warehouseInOutDetail: {},
+      },
+      historyList: [],
+
+      pickerBeginDateBefore: {
+        disabledDate: (time) => {
+          return time.getTime() > Date.now()
+        },
+      },
+      accessoryTFs: false,
+    }
+  },
+  activated() {
+    this.getList()
+  },
+  methods: {
+    //返回按钮
+    revert() {
+      this.$router.push({ path: 'tranManagementReceivingFeedback' })
+    },
+    del(index) {
+      if (this.freightspace.length > 1) {
+        this.freightspace.splice(index, 1)
+      }
+    },
+    getList() {
+      seeCat({ id: this.$route.query.id })
+        .toPromise()
+        .then((response) => {
+          for (var i = 0; i < response.tranCarInfoList.length; i++) {
+            if (
+              response.tranCarInfoList[i].loadNetWeight &&
+              response.tranCarInfoList[i].unloadNetWeight
+            ) {
+              response.tranCarInfoList[i].loss =
+                response.tranCarInfoList[i].loadNetWeight -
+                response.tranCarInfoList[i].unloadNetWeight
+            } else if (response.tranCarInfoList[i].loadNetWeight) {
+              response.tranCarInfoList[i].loss =
+                response.tranCarInfoList[i].loadNetWeight
+            } else {
+              response.tranCarInfoList[i].loss = 0
+            }
+          }
+          this.deptBudgetList = response
+        })
+    },
+    // 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
+    //     })
+    // },
+    // deletecontract(){},
+    //删除
+    approve() {},
+    listQuery() {},
+  },
+}
+</script>
+<style lang="scss" scoped>
+/deep/.basicInformation {
+  .ws-info-table {
+    border: none;
+  }
+  .el-form-item {
+    width: 33.3333%;
+    border: none;
+    .el-form-item__label {
+      background: transparent;
+      border: none;
+    }
+    .el-form-item__content {
+      border: none;
+    }
+  }
+}
+.title {
+  position: relative;
+  padding-left: 10px;
+}
+.title::before {
+  content: '';
+  display: inline-block;
+  width: 5px;
+  height: 30px;
+  background: #5473e8;
+  position: absolute;
+  left: 0;
+}
+.el-form {
+  padding: 0 10%;
+}
+.el-button--primary {
+  background-color: #5878e8;
+  border-color: #5878e8;
+}
+.el-col {
+  background: #f6f7fc;
+}
+.bg-right {
+  text-align: right;
+  padding: 16px 20px;
+}
+.center {
+  position: relative;
+  top: 50px;
+  width: 40%;
+  height: 2000px;
+  margin: 0 auto;
+}
+/deep/.ws-info-table .el-form-item {
+  width: 33.33%;
+}
+/deep/.el-form-item__label {
+  width: 160px;
+}
+//选填
+/deep/.el-form-item {
+  width: 50%;
+}
+.container {
+  overflow: scroll;
+  height: 120vh;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+  text-align: center;
+}
+.deliverydate {
+  display: inline-block;
+  width: 10%;
+}
+.center {
+  margin-top: -60px;
+  width: 80%;
+}
+//仓位
+
+.position {
+  border-radius: 2px;
+  font-size: 12px;
+  line-height: 20px;
+  display: inline-grid;
+  padding: 2px 4px;
+}
+//表格文字
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+  text-align: left;
+  font-size: 14px;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #000;
+  line-height: 16px;
+}
+.small-title {
+  position: relative;
+  padding: 10px;
+  font-weight: 600;
+}
+.small-title::before {
+  position: absolute;
+  content: '';
+  display: block;
+  background: #5473e8;
+  width: 4px;
+  height: 14px;
+  left: 0px;
+  top: 13px;
+  padding: 4px 2px;
+}
+// 下面列表
+.neifor {
+  width: 90%;
+  background-color: #f6f7fc;
+}
+/deep/.neifor .ws-info-table .el-form-item .el-form-item__label {
+  width: 35%;
+  text-align: center;
+}
+
+/deep/.neifor .el-input--small .el-input__inner {
+  width: 100%;
+}
+// .ws-info-table[data-v-850a44a6] .el-form-item {
+//     width: 16.66%;
+// }
+.xia {
+  width: 16%;
+}
+//去边框
+/deep/.el-form-item {
+  border-right: 0px;
+  border-bottom: 0px;
+}
+/deep/.ws-info-table {
+  border-left: 0px;
+  border-top: 0px;
+}
+.ws-info-table .el-form-item .el-form-item__content {
+  border-right: 0px;
+  border-bottom: 0px;
+  border-left: 0px;
+  border-top: 0px;
+}
+/deep/.ws-info-table .el-form-item {
+  border-right: 0px;
+  border-bottom: 0px;
+  border-left: 0px;
+  border-top: 0px;
+}
+.driver {
+  position: relative;
+}
+.not,
+.already {
+  position: absolute;
+  left: -45px;
+  top: 10px;
+}
+
+/deep/.driver .ws-info-table .el-form-item {
+  width: 14%;
+}
+/deep/.driver .ws-info-table .el-form-item .el-form-item__label {
+  width: 86px;
+}
+/deep/.driver .ws-info-table .el-form-item.phone .el-form-item__label {
+  width: 50px;
+}
+</style>

src/views/tranManagement/tranManagementShipping.vue

@@ -25,19 +25,18 @@
       </template>
       <!-- 接单开始 -->
       <template slot="left">
-            <ws-date-picker
-              v-model="deptBudgetList.startDate"
-              type="date"
-              placeholder="请选择开始日期"
-              value-format="yyyy-MM-dd"
-            />
-            <span>至</span>
-            <ws-date-picker
-              v-model="deptBudgetList.endDate"
-              type="date"
-              placeholder="请选择结束日期"
-              value-format="yyyy-MM-dd"
-            />
+       <h1>654565</h1>
+            <el-date-picker
+          v-model="value2"
+          type="daterange"
+          align="right"
+          unlink-panels
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :picker-options="pickerOptions"
+        >
+        </el-date-picker>
         <ws-input
           v-model="searchKeyWord"
           placeholder="可按照合同编号、买方名称、卖方名称进行查找"
@@ -153,7 +152,7 @@
               @click="handleLook(scope.row)"
               
             >
-              查看（{{ scope.row.number }}）
+              查看
             </ws-button>
             <ws-button
               class="putstorage"
@@ -273,23 +272,6 @@ export default {
         },
       })
     },
-    
-    // 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
 
@@ -322,17 +304,17 @@ export default {
       })
     },
     //查看//传参
-    nocomplete(row) {
-      this.$router.push({
-        path: 'tranManagementVehicleLook',
+    // 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({
@@ -349,12 +331,6 @@ export default {
         },
       })
     },
-    
-    handleAdd(){
-        this.$router.push({
-            path: 'tranManagementShippingArrangemen',
-        })
-    },
     //查看
     handleLook(row) {
       this.$router.push({ 

src/views/tranManagement/tranManagementShippingArrangemen.vue

@@ -87,17 +87,18 @@
           
         </ws-info-table>
       
-      <div class="small-title" ><h2>联络员及航次</h2></div>
+        <div class="small-title"><h2>联络员及航次</h2></div>
         <div
           style="width: 100%"
-          class="flex position"
-          :model="deptBudgetList"
+          class=" position siji"
+          v-for='(item,index) in deptBudgetList.tranCarInfoList'
+          :key='index'
         >
-        <ws-info-table>
+          <ws-info-table>
           <!--姓名-->
-         <ws-form-item label="姓名" span="1" prop="driver">
+          <ws-form-item label="姓名" span="1" prop="driver" class="siji">
             <el-select
-              v-model="deptBudgetList.driver"
+              v-model="item.driver"
               placeholder="请选择姓名"
               filterable
               :filter-method="dataFilter"
@@ -112,18 +113,19 @@
             </el-select>
           </ws-form-item>
           <!--电话-->
-          <ws-form-item label="电话" span="1" prop="driverPhone">
-          <ws-input
-            v-model="deptBudgetList.driverPhone"
+          <ws-form-item label="电话" span="1" prop="driverPhone" class="siji">
+            <ws-input
+            :readonly="true"
+            v-model="item.driverPhone"
             placeholder="请输入电话"
             maxlength="20"
             size="small"
           />
-        </ws-form-item>
+          </ws-form-item>
           <!--发船日期-->
           <ws-form-item label="发船日期" span="1" prop="sendDateStart" class="siji">
             <ws-date-picker
-            v-model="deptBudgetList.sendDateStart"
+            v-model="item.sendDateStart"
             type="date"
             placeholder="请选择发货日期"
             value-format="yyyy-MM-dd"
@@ -132,7 +134,7 @@
           <!--预计到港日-->
           <ws-form-item label="预计到港日期" span="1" prop="receiveDateEnd" class="siji">
             <ws-date-picker
-            v-model="deptBudgetList.receiveDateEnd"
+            v-model="item.receiveDateEnd"
             type="date"
             placeholder="请选择发货日期"
             value-format="yyyy-MM-dd"
@@ -141,7 +143,7 @@
           <!-- 船名 -->
           <ws-form-item label="船名" span="1" prop="shipName" class="siji">
             <ws-input 
-              v-model="deptBudgetList.shipName"
+              v-model="item.shipName"
               placeholder="请输入船名"
               maxlength="100"
               size="small"
@@ -150,163 +152,85 @@
           <!-- 航次 -->
           <ws-form-item label="航次" span="1" prop="shipNo" class="siji">
             <ws-input 
-              v-model="deptBudgetList.shipNo"
+              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="deptBudgetList.shipType"
+          <!-- 类型 -->
+          <ws-form-item label="类型" span="1" prop="shipType" class="siji">
+            <ws-select
+            v-model="item.shipType"
             placeholder="请输入"
             class="typeselect"
           >
-            <ws-option
-              v-for="item in shipType"
-              :key="item.constKey"
-              :label="item.constValue"
-              :value="item.constValue"
+              <ws-option
+              v-for="items in shipType"
+              :key="items.constKey"
+              :label="items.constValue"
+              :value="items.constValue"
             />
           </ws-select>
-        </ws-form-item>
-        <ws-form-item label="数量" span="1" prop="boxNumber" class="siji">
-          <ws-input
-          v-model="deptBudgetList.boxNumber"
-          placeholder="请输入数量"
-          size="small"
-          ></ws-input>
-        </ws-form-item>
-        </ws-info-table>
-      </div>
-      <div class="small-title"><h2>联络员及航次</h2></div>
-      <div
-          style="width: 100%"
-          class="flex position"
-         :model="deptBudgetList"
-         v-show="deptBudgetList.shipType == '散船'"
-        >
-        <ws-info-table>
-          <!-- 姓名 -->
-          <ws-form-item label="姓名" span="1" prop="driver">
-            <el-select
-              v-model="deptBudgetList.driver"
-              placeholder="请选择姓名"
-              filterable
-              :filter-method="dataFilter"
-              @change="selectstaff"
-            >
-              <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="boxNumber" class="siji" v-show="item.shipType=='集装箱'">
             <ws-input
-            v-model="deptBudgetList.driverPhone"
-            placeholder="联络员电话"
-            size="small"
-            ></ws-input>
-          </ws-form-item>
-          <!--发船日期-->
-          <ws-form-item label="发船日期" span="1" prop="deliveryDateStart" class="siji">
-            <ws-select
-                v-model="deptBudgetList.deliveryDateStart"
-                placeholder="请选择日期"
-            ></ws-select>
-          </ws-form-item>
-        <ws-form-item label="预计到港日期" span="1" prop="receiveDateEnd" class="siji">
-          <ws-input
-              v-model="deptBudgetList.receiveDateEnd"
-              type="date"
-              placeholder="请选择日期"
-              value-format="yyyy-MM-dd"
-              size="small"
-            />
-        </ws-form-item>
-          <!-- 船名 -->
-          <ws-form-item label="船名" span="1" prop="shipName" class="siji">
-            <ws-input 
-              v-model="deptBudgetList.shipName"
-              placeholder="请输入船名"
-              maxlength="100"
-              size="small"
-            ></ws-input>
-          </ws-form-item>
-          <!-- 航次 -->
-          <ws-form-item label="航次" span="1" prop="shipNo" class="siji">
-            <ws-input 
-              v-model="deptBudgetList.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="deptBudgetList.shipType"
-          placeholder=""
-          size="small"
-          ></ws-select>
-        </ws-form-item>
-        <ws-form-item label="数量" span="1" prop=" boxNumber" class="siji">
-          <ws-input
-          v-model="deptBudgetList. boxNumber"
+          v-model="item.boxNumber"
           placeholder="请输入数量"
           size="small"
           ></ws-input>
-        </ws-form-item>
-        </ws-info-table>
-        </div>
-      <div
+          </ws-form-item>
+          </ws-info-table>
+          <div  >
+            <div
           style="width: 100%"
           class="flex position"
-          v-for="(item, index) in freightspace"
-          
+          v-for="(items, index) in freightspace"
+          :key="index"
+          v-show="item.shipType=='散船'"
         >
-     <ws-info-table>
-        <ws-form-item :label="'仓位号-'+ (index + 1 )" span="1" prop="impurity" class="bot">
+        <ws-info-table>
+          <ws-form-item :label="'仓位号-'+ (index +1 )" span="1" prop="impurity" class="bot" >
             <ws-input
-          v-model="item.impurity"
+          v-model="items.impurity"
           placeholder="请输入仓位号"
           size="small"
           ></ws-input>
           </ws-form-item>
-          <!-- 重量（吨） -->
-          <ws-form-item label="重量(吨)" span="1" prop="positionWeight" class="bot">
+         
+        <ws-form-item label="重量(吨)" span="1" prop="positionWeight" class="bot" >
           <ws-input
-          v-model="item.positionWeight"
+          v-model="items.positionWeight"
           placeholder="请输入装仓重量"
           size="small"
           ></ws-input>
         </ws-form-item>
-        
-     </ws-info-table>
-      <img
+          <img
             width="22"
             height="22"
             class="del"
             @click="del(index)"
             src="../../../public/img/del.png"
             alt=""
-          />
-
-      </div>
-      <el-button
-          class="add"
+          />  
+         
+        </ws-info-table> 
+         
+      </div> 
+        <el-button
+          v-show="item.shipType=='散船'"
+          class="add bg-bottom"
           type="primary"
           size="small"
-          @click="add()"
+          @click="add"
           >添加仓位</el-button
-        >
-      <div style="text-align: right; padding: 10px">
-        
+        >    
+      </div>
+        </div>
+      </div>
+      
+    </ws-form>
+    <div style="text-align: right; padding: 10px">
         <el-button
           class="bg-bottom-up"
           type="primary"
@@ -315,8 +239,6 @@
           >提交</el-button
         >
       </div>
-      </div>
-    </ws-form>
     </div>
   </div>
   
@@ -356,7 +278,9 @@ export default {
       showType: true,
       // 年
       year: '',
+      item:[],
       shipType:[],
+      tranType: 3,
       deptBudgetTotal: 0,
       currentPage: 1,
       pageSize: 10,
@@ -390,9 +314,9 @@ export default {
       },
       arr:[],
       freightspace: [
-        {
-          impurity:'',
-        },
+        // {
+        //   impurity:'',
+        // },
       ],
       size: 10,
       compId: sessionStorage.getItem('ws-pf_compId'),
@@ -476,10 +400,22 @@ export default {
         .toPromise()
         .then((response) => {
           this.deptBudgetList = response
+          for(var i = 0; i<this.deptBudgetList.tranCarInfoList.length;i++){
+           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]
+             })
+           }
+
+          }
     })
   },
     //返回按钮
     revert() {
+      this.freightspace=[]
       this.$router.push({ path: 'tranManagementShipping' })
     },
     del(index){
@@ -520,17 +456,19 @@ export default {
                )  
              }
              
-             console.log(this.arr,"字符串")
              this.deptBudgetList.totalStorage = this.totalStorage
              this.tranCarInfoList.driver = this.deptBudgetList.driver
               this.tranCarInfoList.driverPhone = this.deptBudgetList.driverPhone
-              this.tranCarInfoList.deliveryDateStart = this.deptBudgetList.deliveryDateStart
+              this.tranCarInfoList.sendDateStart = this.deptBudgetList.sendDateStart
               this.tranCarInfoList.receiveDateEnd = this.deptBudgetList.receiveDateEnd
               this.tranCarInfoList.shipName = this.deptBudgetList.shipName
               this.tranCarInfoList.shipNo = this.deptBudgetList.shipNo
+              this.tranCarInfoList.id = this.deptBudgetList.tranCarInfoList[0].id
+              
               this.tranCarInfoList.tranType = this.deptBudgetList.tranType
               this.tranCarInfoList.boxNumber = this.deptBudgetList.boxNumber
-              this.tranCarInfoList.boxNo = this.arr.toString()
+              this.tranCarInfoList.shipType = this.deptBudgetList.shipType
+              this.tranCarInfoList.positionWeight = this.arr.toString()
               var tranCarInfo = {}
               var tranList = [this.tranCarInfoList]
               tranCarInfo.id = this.deptBudgetList.id
@@ -660,7 +598,7 @@ export default {
   width: 90%;
 }
 .position .siji{
-  width: 23%;
+  width: 16%;
 }
 /deep/.position .ws-info-table .el-form-item .el-form-item__label{
   width: 40%;
@@ -676,4 +614,57 @@ export default {
 .bot{
   width: 30%;
 }
+.position .siji {
+  width: 20.5%;
+}
+/deep/.el-form-item {
+  border-right: 0px;
+  border-bottom: 0px;
+}
+/deep/.ws-info-table {
+  border-left: 0px;
+  border-top: 0px;
+}
+.ws-info-table .el-form-item .el-form-item__content {
+  border-right: 0px;
+  border-bottom: 0px;
+  border-left: 0px;
+  border-top: 0px;
+}
+/deep/.ws-info-table .el-form-item {
+  border-right: 0px;
+  border-bottom: 0px;
+  border-left: 0px;
+  border-top: 0px;
+}
+/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;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #8890b1;
+  line-height: 16px;
+}
+// .flex .position{
+//   margin-top: 150px;
+//   margin-left: 20px;
+// }
+.position{
+  width: 100%;
+}
+.position .siji{
+  width: 20.6%;
+}
 </style>

src/views/tranManagement/tranManagementShippingLook.vue

@@ -34,6 +34,7 @@
               maxlength="20"
               size="small"
             />
+            <!-- {{deptBudgetList.processNo}} -->
           </ws-form-item>
         <!-- 货名 -->
           <ws-form-item label="货名" span="1" prop="goodsName">
@@ -43,6 +44,7 @@
               maxlength="20"
               size="small"
               />
+              <!-- {{deptBudgetList.goodsName}} -->
           </ws-form-item>
           <!--重量（吨）-->
           <ws-form-item
@@ -57,6 +59,7 @@
               maxlength="100"
               size="small"
             />
+            <!-- {{deptBudgetList.weight}} -->
           </ws-form-item>
 
           <!--发货地址-->
@@ -78,6 +81,7 @@
               maxlength="100"
               size="small"
           />
+          <!-- {{deptBudgetList.sender}} -->
           </ws-form-item>
 
           <!--发货人电话-->
@@ -88,6 +92,7 @@
               maxlength="100"
               size="small"
             />
+            <!-- {{deptBudgetList.senderPhone}} -->
           </ws-form-item>
           <!--收货地址-->
         <ws-form-item label="收货地址" span="1" prop="receiveDetailedAddress">
@@ -108,6 +113,7 @@
               maxlength="100"
               size="small"
           />
+          <!-- {{deptBudgetList.receiver}} -->
           </ws-form-item>
 
           <!--收货人电话-->
@@ -118,249 +124,151 @@
               maxlength="100"
               size="small"
             />
+            <!-- {{deptBudgetList.receiverPhone}} -->
           </ws-form-item>
-          <!--发货日期-->
-          <ws-form-item
-            label="发货日期"
-            span="1"
-            prop="deliveryDateStart"
-            class="deliverydate"
-          >
-            <ws-date-picker
-              v-model="deptBudgetList.deliveryDateStart"
-              type="date"
-              placeholder="请选择发货日期"
-              value-format="yyyy-MM-dd"
-            />
-          </ws-form-item>
+         
+          <!--发船日期-->
+        <ws-form-item label="发船日期" span="1" prop="deliveryDateStart">
+          <ws-input
+           
+            v-model="deptBudgetList.deliveryDateStart"
+            placeholder=""
+            maxlength="20"
+            size="small"
+          />
+        </ws-form-item>
            <!--最晚发货日期-->
-          <ws-form-item
-            label="最晚发货日期"
-            span="1"
-            prop="deliveryDateEnd"
-            class="deliverydate"
-          >
-            <ws-date-picker
-              v-model="deptBudgetList.deliveryDateEnd"
-              type="date"
-              placeholder="请选择最晚发货日期"
-              value-format="yyyy-MM-dd"
-            />
-          </ws-form-item>
+          <ws-form-item label="最晚到货日期" span="1" prop="deliveryDateEnd">
+          <ws-input
+          
+            v-model="deptBudgetList.deliveryDateEnd"
+            placeholder=""
+            maxlength="20"
+            size="small"
+          />
+        </ws-form-item>
           <!--合同编号-->
           <ws-form-item label="合同编号" span="1" prop="contractNo">
-            <ws-input
-              v-model="deptBudgetList.contractNo"
-              placeholder="请输入合同编号"
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
-          
-        </ws-info-table>
-      
-      <div class="small-title"><h2>联络员及航次</h2></div>
-        <div
-          style="width: 100%"
-          class="flex position"
-          :model="deptBudgetList"
+          <ws-input
           
-        >
-        <ws-info-table>
-          <!--姓名-->
-          <ws-form-item label="姓名" span="1"  prop="driver" class="siji" >
-            <!-- <ws-input
-                v-model="deptBudgetList.driver"
-                placeholder="请选择联络员"
-
-            ></ws-input> -->
-            {{deptBudgetList.driver}}
-          </ws-form-item>
-         <!-- 电话 -->
-          <ws-form-item label="电话" span="1" prop="driverPhone" class="siji">
-            <!-- <ws-input
-            v-model="deptBudgetList.driverPhone"
-            placeholder="联络员电话"
+            v-model="deptBudgetList.contractNo"
+            placeholder="请输入合同编号"
+            maxlength="20"
             size="small"
-            ></ws-input> -->
-            {{deptBudgetList.driverPhone}}
-          </ws-form-item>
-          <!--发船日期-->
-          <ws-form-item label="发船日期" span="1" prop="sendDateStart" class="siji">
-            <!-- <ws-select
-                v-model="deptBudgetList.sendDateStart"
-                placeholder="请选择日期"
-                
-            ></ws-select> -->
-            {{deptBudgetList.sendDateStart}}
-          </ws-form-item>
-          <!--预计到港日-->
-          <ws-form-item label="预计到港日期" span="1" prop="receiveDateEnd" class="siji">
-            <!-- <ws-input
-              v-model="deptBudgetList.receiveDateEnd"
-              type="date"
-              placeholder="请选择日期"
-              value-format="yyyy-MM-dd"
-              size="small"
-            /> -->
-            {{deptBudgetList.receiveDateEnd}}
-          </ws-form-item>
-          <!-- 船名 -->
-          <ws-form-item label="船名" span="1" prop="shipName" class="siji">
-            <!-- <ws-input 
-              v-model="deptBudgetList.shipName"
-              placeholder="请输入船名"
-              maxlength="100"
-              size="small"
-            ></ws-input> -->
-            {{deptBudgetList.shipName}}
-          </ws-form-item>
-          <!-- 航次 -->
-          <ws-form-item label="航次" span="1" prop="shipNo" class="siji">
-            <!-- <ws-input 
-              v-model="deptBudgetList.shipNo"
-              placeholder="请选择航次"
-              maxlength="100"
-              size="small"
-            ></ws-input> -->
-            {{deptBudgetList.shipNo}}
-          </ws-form-item>
-        <!-- 类型 -->
-        <ws-form-item label="类型" span="1" prop="tranType" class="siji">
-          <!-- <ws-select
-          v-model="deptBudgetList.tranType"
-          placeholder=""
-          size="small"
-          ></ws-select> -->
-          {{deptBudgetList.tranType}}
-        </ws-form-item>
-        <ws-form-item label="数量" span="1" prop="boxNumber" class="siji">
-          <!-- <ws-input
-          v-model="deptBudgetList.boxNumber"
-          placeholder="请输入数量"
-          size="small"
-          ></ws-input> -->
-          {{deptBudgetList.boxNumber}}
+          />
         </ws-form-item>
+          
         </ws-info-table>
-      </div>
       <div class="small-title"><h2>联络员及航次</h2></div>
       <div
           style="width: 100%"
           class="flex position"
-          :model="deptBudgetList"
-         
+           v-for="(item, index) in deptBudgetList.tranCarInfoList"
+           :key="index.id"
         >
         <ws-info-table>
           <!-- 姓名 -->
           <ws-form-item label="姓名" span="1" prop="driver" class="siji">
-            <!-- <ws-select
-            v-model="deptBudgetList.driver"
+            <ws-input
+            v-model="item.driver"
             placeholder="请选择联络员"
             size="small"
-            ></ws-select> -->
-             {{deptBudgetList.driver}}
+            ></ws-input>
           </ws-form-item>
           <!-- 电话 -->
           <ws-form-item label="电话" span="1" prop="driverPhone" class="siji">
-            <!-- <ws-input
-            v-model="deptBudgetList.driverPhone"
+            <ws-input
+            v-model="item.driverPhone"
             placeholder="联络员电话"
             size="small"
-            ></ws-input> -->
-            {{deptBudgetList.driverPhone}}
+            ></ws-input>
+
           </ws-form-item>
           <!--发船日期-->
           <ws-form-item label="发船日期" span="1" prop="sendDateStart" class="siji">
-            <!-- <ws-input
-                v-model="deptBudgetList.sendDateStart"
+            <ws-input
+                v-model="item.sendDateStart"
                 placeholder="请选择日期"
                 
-            ></ws-input> -->
-            {{deptBudgetList.sendDateStart}}
+            ></ws-input>
           </ws-form-item>
         <ws-form-item label="预计到港日期" span="1" prop="receiveDateEnd" class="siji">
-          <!-- <ws-input
-              v-model="deptBudgetList.receiveDateEnd"
-              type="date"
+          <ws-input
+              v-model="item.receiveDateEnd"
               placeholder="请选择日期"
               value-format="yyyy-MM-dd"
               size="small"
-            /> -->
-            {{deptBudgetList.receiveDateEnd}}
+            />
+           
         </ws-form-item>
           <!-- 船名 -->
           <ws-form-item label="船名" span="1" prop="shipName" class="siji">
-            <!-- <ws-input 
-              v-model="deptBudgetList.shipName"
+            <ws-input 
+              v-model="item.shipName"
               placeholder="请输入船名"
               maxlength="100"
               size="small"
-            ></ws-input> -->
-            {{deptBudgetList.shipName}}
+            ></ws-input>
           </ws-form-item>
           <!-- 航次 -->
           <ws-form-item label="航次" span="1" prop="shipNo" class="siji">
-            <!-- <ws-input 
-              v-model="deptBudgetList.shipNo"
+            <ws-input 
+              v-model="item.shipNo"
               placeholder="请选择航次"
               maxlength="100"
               size="small"
-            ></ws-input> -->
-            {{deptBudgetList.shipNo}}
+            ></ws-input>
           </ws-form-item>
         <!-- 类型 -->
-        <ws-form-item label="类型" span="1" prop="tranType" class="siji">
-          <!-- <ws-select
-          v-model="deptBudgetList.tranType"
+        <ws-form-item label="类型" span="1" prop="shipType" class="siji">
+          <ws-input
+          v-model="item.shipType"
           placeholder=""
           size="small"
-          ></ws-select> -->
-          {{deptBudgetList.tranType}}
+          ></ws-input>
+          
         </ws-form-item>
-        <ws-form-item label="数量" span="1" prop="boxNumber" class="siji">
-          <!-- <ws-input
-          v-model="deptBudgetList.boxNumber"
+        <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> -->
-          {{deptBudgetList.boxNumber}}
+          ></ws-input>
         </ws-form-item>
         </ws-info-table>
         </div>
       <div
           style="width: 100%"
           class="flex position"
-          v-for="(item, index) in freightspace"
+         v-for="(item, index) in freightspace"
+         :key="index"
         >
      <ws-info-table>
-        <ws-form-item :label="'仓位号1-'+ (index+1)" span="1" prop="impurity" class="bot">
-            <!-- <ws-input
-          v-model="deptBudgetList.impurity"
+        <ws-form-item :label="'仓位号-'+ (index + 1 )" span="1" prop="impurity" class="bot">
+            <ws-input
+          v-model="item.impurity"
           placeholder="请输入仓位号"
           size="small"
-          ></ws-input> -->
-          {{deptBudgetList.impurity}}
+          ></ws-input>
           </ws-form-item>
           <!-- 重量（吨） -->
           <ws-form-item label="重量(吨)" span="1" prop="positionWeight" class="bot">
-          <!-- <ws-input
-          v-model="deptBudgetList.impurity"
+          <ws-input
+          v-model="item.positionWeight"
           placeholder="请输入装仓重量"
           size="small"
-          ></ws-input> -->
-          {{deptBudgetList.positionWeight}}
+          ></ws-input>
         </ws-form-item>
         
      </ws-info-table>
-      <img
+      <!-- <img
             width="22"
             height="22"
             class="del"
             @click="del(index)"
             src="../../../public/img/del.png"
             alt=""
-          />
+          /> -->
       </div>
       <!-- <el-button
           class="add"
@@ -369,16 +277,16 @@
           @click="add()"
           >添加仓位</el-button
         > -->
-      <!-- <div style="text-align: right; padding: 10px">
+      <div style="text-align: right; padding: 10px">
         
         <el-button
           class="bg-bottom-up"
           type="primary"
           size="small"
-          @click="submit()"
-          >提交</el-button
+          @click="returnsales()"
+          >关闭</el-button
         >
-      </div> -->
+      </div>
       </div>
     </ws-form>
     </div>
@@ -386,6 +294,7 @@
   
 </template>
 <script>
+import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
 import {shippingList,shippingLook } from '@/model/transport/index'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
@@ -435,6 +344,9 @@ export default {
       uploadSuccess: {},
       onChange: {},
       gradeList: [],
+       tranCarInfoList: [],
+       list:[],
+       arr:[],
        freightspace: [{ binNumber: '', maxStorage: '', remark: '' }],
       rules: {
         netWeight: [
@@ -457,6 +369,7 @@ export default {
       contractList: [],
       deptBudgetList: {
         warehouseInOutDetail: {},
+        tranCarInfoList:[]
       },
       historyList: [],
 
@@ -485,10 +398,29 @@ export default {
         .toPromise()
         .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("," )  
+           for(var j = 0;j<num.length;j++){
+            var num2 = num[j].split("/")
+             this.freightspace.push({
+               'impurity': num2[i],
+               'positionWeight':num2[num2.length-1]
+             })
+           }
+
+          }  
     })
   },
     getList(){
-      console.log(123456)
       shippingList({
         compId: sessionStorage.getItem('ws-pf_compId'),
         currentPage:this.currentPage,
@@ -503,7 +435,8 @@ export default {
     },
     //返回按钮
     revert() {
-      this.$router.push({ path: 'tranManagementVehicle' })
+      this.freightspace=[]
+      this.$router.push({ path: 'tranManagementShipping' })
     },
     del(index){
         if(this.freightspace.length > 1 ){
@@ -548,7 +481,9 @@ export default {
           return false
         })
     },
-  
+  returnsales(){
+     this.$router.push({ path: 'tranManagementShipping' })
+  },
     handleClose() {
       this.accessoryTFs = false
     },
@@ -686,7 +621,7 @@ export default {
   width: 90%;
 }
 .position .siji{
-  width: 23%;
+  width: 16%;
 }
 /deep/.position .ws-info-table .el-form-item .el-form-item__label{
   width: 40%;
@@ -702,4 +637,77 @@ export default {
 .bot{
   width: 30%;
 }
+.siji{
+  width: 300px;
+}
+/deep/.el-form-item {
+  border-right: 0px;
+  border-bottom: 0px;
+}
+/deep/.ws-info-table {
+  border-left: 0px;
+  border-top: 0px;
+}
+.ws-info-table .el-form-item .el-form-item__content {
+  border-right: 0px;
+  border-bottom: 0px;
+  border-left: 0px;
+  border-top: 0px;
+}
+/deep/.ws-info-table .el-form-item {
+  border-right: 0px;
+  border-bottom: 0px;
+  border-left: 0px;
+  border-top: 0px;
+}
+/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;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #8890b1;
+  line-height: 16px;
+}
+
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  background: #f5f7fa;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+}
+/deep/.flex .ws-info-table .el-form-item .el-form-item__content{
+  border: 0px;
+}
+/deep/.ws-class-table-col {
+  height: auto;
+  padding: 0px 2px;
+  /deep/.el-input__inner {
+    padding: 0px 2px;
+  }
+}
+/deep/.is-disabled {
+  .el-input__prefix,
+  .el-input__suffix {
+    display: none;
+  }
+  .el-input__inner {
+    background-color: #fff;
+    border-color: #fff !important;
+    color: #000 !important;
+    font-size: 14px;
+    cursor: text;
+    padding: 0 !important;
+  }
+}
 </style>

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.115: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/',