Browse Source

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

zhongtianhaoyuan 4 years ago
parent
commit
815df518e2

+ 3 - 1
src/views/tranManagement/tranManagementShipping.vue

@@ -88,7 +88,9 @@
           
         </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">

+ 162 - 240
src/views/tranManagement/tranManagementShippingArrangemen.vue

@@ -28,155 +28,83 @@
         <ws-info-table>
           <!-- 任务编号 -->
           <ws-form-item label="任务编号" span="1" prop="processNo">
-            <ws-input
-             
-              v-model="deptBudgetList.processNo"
-              placeholder="请输入任务编号"
-              maxlength="20"
-              size="small"
-            />
-          </ws-form-item>
+          {{deptBudgetList.processNo}}
+        </ws-form-item>
         <!-- 货名 -->
           <ws-form-item label="货名" span="1" prop="goodsName">
-            <ws-input
-              v-model="deptBudgetList.goodsName"
-              placeholder="请输入货名"
-              maxlength="20"
-              size="small"
-              />
-          </ws-form-item>
+            {{deptBudgetList.goodsName}}
+        </ws-form-item>
           <!--重量(吨)-->
-          <ws-form-item
-            label="重量(吨)"
-            span="1"
-            prop="weight"
-            class="readonly"
-          >
-            <ws-input
-             
-              v-model="deptBudgetList.weight"
-              placeholder="请输入重重"
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
-
+          <ws-form-item label="重量(吨)" span="1" prop="weight">
+          {{deptBudgetList.weight}}
+        </ws-form-item>
           <!--发货地址-->
           <ws-form-item label="发货地址" span="1" prop="sendDetailedAddress">
-            <ws-input
-              readonly="readonly"
-              v-model="deptBudgetList.sendDetailedAddress"
-              placeholder=""
-              maxlength="120"
-              size="small"
-            />
+            
+            {{deptBudgetList.sendPrivate}}{{deptBudgetList.sendCity}}{{deptBudgetList.sendArea}}
           </ws-form-item>
          <!--发货人-->
           <ws-form-item label="发货人" span="1" prop="sender">
-            <ws-input
-              v-model="deptBudgetList.sender"
-              placeholder="请输入发货人姓名"
-              maxlength="100"
-              size="small"
-          />
+          
+          {{deptBudgetList.sender}}
           </ws-form-item>
 
           <!--发货人电话-->
           <ws-form-item label="发货人电话" span="1" prop="senderPhone">
-            <ws-input
-              v-model="deptBudgetList.senderPhone"
-              placeholder="请输入发货人电话"
-              maxlength="100"
-              size="small"
-            />
+            
+            {{deptBudgetList.senderPhone}}
           </ws-form-item>
           <!--收货地址-->
         <ws-form-item label="收货地址" span="1" prop="receiveDetailedAddress">
-            <ws-input
-              readonly="readonly"
-              v-model="deptBudgetList.receiveDetailedAddress"
-              placeholder=""
-              maxlength="120"
-              size="small"
-            />
+            
+             {{deptBudgetList.receivePrivate}}{{deptBudgetList.receiveCity}}{{deptBudgetList.receiveArea}}
         </ws-form-item>
          <!--收货人-->
           <ws-form-item label="收货人" span="1" prop="receiver">
-            <ws-input
-              v-model="deptBudgetList.receiver"
-              placeholder="请输入发货人"
-              maxlength="100"
-              size="small"
-          />
+            {{deptBudgetList.receiver}}
           </ws-form-item>
 
           <!--收货人电话-->
           <ws-form-item label="收货人电话" span="1" prop="receiverPhone">
-            <ws-input
-              v-model="deptBudgetList.receiverPhone"
-              placeholder="请输入收货人电话"
-              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">
+          
+          {{deptBudgetList.deliveryDateStart}}
+        </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">
+          
+          {{deptBudgetList.deliveryDateEnd}}
+        </ws-form-item>
           <!--合同编号-->
           <ws-form-item label="合同编号" span="1" prop="contractNo">
-            <ws-input
-              v-model="deptBudgetList.contractNo"
-              placeholder="请输入合同编号"
-              maxlength="100"
-              size="small"
-            />
+            
+            {{deptBudgetList.contractNo}}
           </ws-form-item>
           
         </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"
         >
         <ws-info-table>
           <!--姓名-->
          <ws-form-item label="姓名" span="1" prop="driver">
             <el-select
               v-model="deptBudgetList.driver"
-              placeholder="请选择负责人"
+              placeholder="请选择姓名"
               filterable
               :filter-method="dataFilter"
               @change="selectstaff"
             >
               <el-option
-                v-for="item in driver"
+                v-for="item in options"
                 :key="item.value"
                 :label="item.staffName"
                 :value="item.staffName"
@@ -184,30 +112,31 @@
             </el-select>
           </ws-form-item>
           <!--电话-->
-          <ws-form-item label="电话" span="1" prop="driverPhone" class="siji">
-            <ws-select
-                v-model="deptBudgetList.driverPhone"
-                placeholder="联络员电话"
-            ></ws-select>
-          </ws-form-item>
+          <ws-form-item label="电话" span="1" prop="driverPhone">
+          <ws-input
+            v-model="deptBudgetList.driverPhone"
+            placeholder="请输入电话"
+            maxlength="20"
+            size="small"
+          />
+        </ws-form-item>
           <!--发船日期-->
           <ws-form-item label="发船日期" span="1" prop="sendDateStart" class="siji">
-            <ws-select
-                v-model="deptBudgetList.sendDateStart"
-                placeholder="请选择日期"
-                class="typeselect"
-               
-            ></ws-select>
+            <ws-date-picker
+            v-model="deptBudgetList.sendDateStart"
+            type="date"
+            placeholder="请选择发货日期"
+            value-format="yyyy-MM-dd"
+          />
           </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-date-picker
+            v-model="deptBudgetList.receiveDateEnd"
+            type="date"
+            placeholder="请选择发货日期"
+            value-format="yyyy-MM-dd"
+          />
           </ws-form-item>
           <!-- 船名 -->
           <ws-form-item label="船名" span="1" prop="shipName" class="siji">
@@ -228,16 +157,23 @@
             ></ws-input>
           </ws-form-item>
         <!-- 类型 -->
-        <ws-form-item label="类型" span="1" prop="tranType" class="siji">
+        <ws-form-item label="类型" span="1" prop="shipType" class="siji">
           <ws-select
-          v-model="deptBudgetList.impurity"
-          placeholder=""
-          size="small"
-          ></ws-select>
+            v-model="deptBudgetList.shipType"
+            placeholder="请输入"
+            class="typeselect"
+          >
+            <ws-option
+              v-for="item in shipType"
+              :key="item.constKey"
+              :label="item.constValue"
+              :value="item.constValue"
+            />
+          </ws-select>
         </ws-form-item>
         <ws-form-item label="数量" span="1" prop="boxNumber" class="siji">
           <ws-input
-          v-model="deptBudgetList.impurity"
+          v-model="deptBudgetList.boxNumber"
           placeholder="请输入数量"
           size="small"
           ></ws-input>
@@ -248,16 +184,26 @@
       <div
           style="width: 100%"
           class="flex position"
-         
+         :model="deptBudgetList"
+         v-show="deptBudgetList.shipType == '散船'"
         >
         <ws-info-table>
           <!-- 姓名 -->
-          <ws-form-item label="姓名" span="1" prop="driver" class="siji">
-            <ws-select
-            v-model="deptBudgetList.driver"
-            placeholder="请选择联络员"
-            size="small"
-            ></ws-select>
+          <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">
@@ -302,9 +248,9 @@
             ></ws-input>
           </ws-form-item>
         <!-- 类型 -->
-        <ws-form-item label="类型" span="1" prop="tranType" class="siji">
+        <ws-form-item label="类型" span="1" prop="shipType" class="siji">
           <ws-select
-          v-model="deptBudgetList.tranType"
+          v-model="deptBudgetList.shipType"
           placeholder=""
           size="small"
           ></ws-select>
@@ -322,11 +268,12 @@
           style="width: 100%"
           class="flex position"
           v-for="(item, index) in freightspace"
+          
         >
      <ws-info-table>
-        <ws-form-item :label="'仓位号1-'+ (index+1)" span="1" prop="impurity" class="bot">
+        <ws-form-item :label="'仓位号-'+ (index + 1 )" span="1" prop="impurity" class="bot">
             <ws-input
-          v-model="deptBudgetList.impurity"
+          v-model="item.impurity"
           placeholder="请输入仓位号"
           size="small"
           ></ws-input>
@@ -334,7 +281,7 @@
           <!-- 重量(吨) -->
           <ws-form-item label="重量(吨)" span="1" prop="positionWeight" class="bot">
           <ws-input
-          v-model="deptBudgetList.impurity"
+          v-model="item.positionWeight"
           placeholder="请输入装仓重量"
           size="small"
           ></ws-input>
@@ -376,7 +323,7 @@
 </template>
 <script>
 import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
-import {shippingLook,shippingList } from '@/model/transport/index'
+import {shippingLook,packList,dispatchCat} from '@/model/transport/index'
 import{getstaff}from '@/model/warehouse/index'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
@@ -409,6 +356,7 @@ export default {
       showType: true,
       // 年
       year: '',
+      shipType:[],
       deptBudgetTotal: 0,
       currentPage: 1,
       pageSize: 10,
@@ -425,12 +373,11 @@ export default {
       appendixIdsAdd: '',
       uploadSuccess: {},
       onChange: {},
-      driver:[],
+      selectedOptions: [],
         options:[],
+      tranCarInfoList: {},
         staffList :[],
-
       gradeList: [],
-       freightspace: [{ binNumber: '', maxStorage: '', remark: '' }],
       rules: {
         netWeight: [
           {
@@ -441,6 +388,12 @@ export default {
           },
         ],
       },
+      arr:[],
+      freightspace: [
+        {
+          impurity:'',
+        },
+      ],
       size: 10,
       compId: sessionStorage.getItem('ws-pf_compId'),
       deptCircularPage: {},
@@ -464,40 +417,38 @@ export default {
     }
   },
   mounted() {
-    this.deptBudgetList.infoId = this.$route.query.infoId
-    this.deptBudgetList.processId = this.$route.query.processId
-    this.deptBudgetList.driver = this.$route.query.driver
-    this.deptBudgetList.driverType = this.$route.query.driverType
-    this.deptBudgetList.driverPhone = this.$route.query.driverPhone
-    this.deptBudgetList.shipNo = this.$route.query.shipNo
-    this.deptBudgetList.loadWeight = this.$route.query.loadWeight
-    this.deptBudgetList.shipName = this.$route.query.shipName
-    this.deptBudgetList.shipType = this.$route.query.shipType
-    this.deptBudgetList.boxNumber = this.$route.query.boxNumber
-    this.deptBudgetList.positionWeight = this.$route.query.positionWeight
-    this.deptBudgetList.sendDateStart = this.$route.query.sendDateStart
-    this.deptBudgetList.receiveDateEnd = this.$route.query.receiveDateEnd
-    this.getList1()
+    this.getList()
     
   },
  activated(){
    this.loaddata()
  },
+ 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(){
-    
      getstaff({ compId: sessionStorage.getItem('ws-pf_compId') })
         .toPromise()
         .then((response) => {
-          // this.agent = response
           this.options = response
            this.staffList = response
-
         })
-
+        //类型
+        packList({ constId: 'TRAN4' })
+        .toPromise()
+        .then((response) => {
+          this.shipType = response
+        })
    },
     dataFilter(val) {
-      this.deptBudgetList.driver = val
+      this.deptBudgetList.personCharge = val
       if (val) {
         console.log(val)
         this.options = this.staffList.filter((item) => {
@@ -515,7 +466,7 @@ export default {
     selectstaff(e) {
       for (var i = 0; i < this.staffList.length; i++) {
         if (this.staffList[i].staffName == e) {
-          this.deptBudgetList.personPhone = this.staffList[i].staffMobilePhone
+          this.deptBudgetList.driverPhone = this.staffList[i].staffMobilePhone
           this.deptBudgetList.personChargeKey = this.staffList[i].staffId
         }
       }
@@ -527,23 +478,9 @@ export default {
           this.deptBudgetList = response
     })
   },
-    getList1(){
-      console.log(123456)
-      shippingList({
-        compId: sessionStorage.getItem('ws-pf_compId'),
-        currentPage:this.currentPage,
-        pageSize:this.pageSize,
-        contractType:this.contractType,
-        tranTypeKey: this.tranTypeKey, 
-      })
-      .toPromise()
-      .then((response)=>{
-        this.warehouseList = response 
-      })
-    },
     //返回按钮
     revert() {
-      this.$router.push({ path: 'tranManagementVehicle' })
+      this.$router.push({ path: 'tranManagementShipping' })
     },
     del(index){
         if(this.freightspace.length > 1 ){
@@ -552,14 +489,22 @@ export default {
     },
       add() {
       this.freightspace.push({
-        binNumber: '',
-        maxStorage: '',
-        remark: '',
+       impurity:'',
       })
     },
+    selectdriver() {},
+    handleChange(value) {
+      this.selectedOptions = value
+    },
+    returnsales() {
+      this.deptBudgetList = {}
+      this.freightspace = {}
+      this.selectedOptions = ''
+      this.$router.push({ path: 'tranManagementShipping' })
+    },
     //提交按钮
     submit() { 
-      this.$confirm(`暂存后可在待完成页面查看,确定暂存`, {
+      this.$confirm(`提交成功后,任务将下发给相关人员,是否确定提交?`, {
         cancelButtonText: '取消',
         confirmButtonText: '确定',
         type: 'warning',
@@ -567,19 +512,43 @@ export default {
         .then(() => {
           this.$refs.deptBudgetList.validate((valid) => {
             if (valid) {
-              this.deptBudgetList.compId = sessionStorage.getItem(
-                'ws-pf_compId'
-              )
-              this.deptBudgetList.inOutFlag = 2
-              this.deptBudgetList.statusFlag = 1
-              addstorageputList(this.deptBudgetList)
+              
+             for(var i = 0; i < this.freightspace.length; i++){
+               var num  = this.freightspace[i].impurity + "/" + this.freightspace[i].positionWeight
+               this.arr.push(
+                 num
+               )  
+             }
+             
+             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.receiveDateEnd = this.deptBudgetList.receiveDateEnd
+              this.tranCarInfoList.shipName = this.deptBudgetList.shipName
+              this.tranCarInfoList.shipNo = this.deptBudgetList.shipNo
+              this.tranCarInfoList.tranType = this.deptBudgetList.tranType
+              this.tranCarInfoList.boxNumber = this.deptBudgetList.boxNumber
+              this.tranCarInfoList.boxNo = this.arr.toString()
+              var tranCarInfo = {}
+              var tranList = [this.tranCarInfoList]
+              tranCarInfo.id = this.deptBudgetList.id
+              tranCarInfo.infoId = this.deptBudgetList.infoId
+              tranCarInfo.tranCarInfoList = tranList
+              dispatchCat(tranCarInfo)
                 .toPromise()
                 .then((response) => {
-                  this.$message.success('暂存成功')
-                  this.$router.push({ path: 'warehouseManagementList' })
+                  this.$message.success('添加成功')
+                  this.deptBudgetList = {}
+                  this.freightspace = {}
+                  this.selectedOptions = ''
+                  this.$router.push({
+                    path: 'tranManagementShipping',
+                  })
                 })
             } else {
-              EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+              // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
               return false
             }
           })
@@ -588,19 +557,6 @@ export default {
           return false
         })
     },
-  //  getList() {
-  //     shippingArrangemen({  
-  //       compId: sessionStorage.getItem('ws-pf_compId'),
-  //       currentPage:this.currentPage,
-  //       pageSize:this.pageSize,
-  //       contractType:this.contractType,
-  //       tranTypeKey: this.tranTypeKey,
-  //       })
-  //       .toPromise()
-  //       .then((response) => {
-  //         this.warehouseList = response
-  //       })
-  //   },
     handleClose() {
       this.accessoryTFs = false
     },
@@ -614,26 +570,6 @@ export default {
       console.log(`当前页: ${val}`)
       this.getList()
     },
-    // getList() {
-    //   // 货名
-    //   pullDown({ constId: 'CON2' })
-    //     .toPromise()
-    //     .then((response) => {
-    //       this.goodnameList = response
-    //     })
-    //   // 品级
-    //   pullDown({ constId: 'CON3' })
-    //     .toPromise()
-    //     .then((response) => {
-    //       this.gradeList = response
-    //     })
-    //   // 类型
-    //   pullDown({ constId: 'CON5' })
-    //     .toPromise()
-    //     .then((response) => {
-    //       this.storageType = response
-    //     })
-    // },
     selecttaskType(e) {
       for (var i = 0; i < this.taskTypeList.length; i++) {
         if (this.taskTypeList[i].value == e) {
@@ -641,20 +577,6 @@ export default {
         }
       }
     },
-    // fujian(row) {
-    //   if (
-    //     row.receiveAttachmentPath === null ||
-    //     row.receiveAttachmentPath === ''
-    //   ) {
-    //     EventBus.$emit(
-    //       'warning',
-    //       this.$t('system.noticeCircular.NoInformation')
-    //     )
-    //   } else {
-    //     this.accessoryTFs = true
-    //   }
-    //   this.appendixIdss = row.receiveAttachmentPath
-    // },
     approve() {},
     listQuery() {},
   },

+ 86 - 68
src/views/tranManagement/tranManagementShippingLook.vue

@@ -169,70 +169,78 @@
         <ws-info-table>
           <!--姓名-->
           <ws-form-item label="姓名" span="1"  prop="driver" class="siji" >
-            <ws-input
+            <!-- <ws-input
                 v-model="deptBudgetList.driver"
                 placeholder="请选择联络员"
 
-            ></ws-input>
+            ></ws-input> -->
+            {{deptBudgetList.driver}}
           </ws-form-item>
          <!-- 电话 -->
           <ws-form-item label="电话" span="1" prop="driverPhone" class="siji">
-            <ws-input
+            <!-- <ws-input
             v-model="deptBudgetList.driverPhone"
             placeholder="联络员电话"
             size="small"
-            ></ws-input>
+            ></ws-input> -->
+            {{deptBudgetList.driverPhone}}
           </ws-form-item>
           <!--发船日期-->
           <ws-form-item label="发船日期" span="1" prop="sendDateStart" class="siji">
-            <ws-select
+            <!-- <ws-select
                 v-model="deptBudgetList.sendDateStart"
                 placeholder="请选择日期"
                 
-            ></ws-select>
+            ></ws-select> -->
+            {{deptBudgetList.sendDateStart}}
           </ws-form-item>
           <!--预计到港日-->
           <ws-form-item label="预计到港日期" span="1" prop="receiveDateEnd" class="siji">
-            <ws-input
+            <!-- <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 
+            <!-- <ws-input 
               v-model="deptBudgetList.shipName"
               placeholder="请输入船名"
               maxlength="100"
               size="small"
-            ></ws-input>
+            ></ws-input> -->
+            {{deptBudgetList.shipName}}
           </ws-form-item>
           <!-- 航次 -->
           <ws-form-item label="航次" span="1" prop="shipNo" class="siji">
-            <ws-input 
+            <!-- <ws-input 
               v-model="deptBudgetList.shipNo"
               placeholder="请选择航次"
               maxlength="100"
               size="small"
-            ></ws-input>
+            ></ws-input> -->
+            {{deptBudgetList.shipNo}}
           </ws-form-item>
         <!-- 类型 -->
-        <ws-form-item label="类型" span="1" prop="impurity" class="siji">
-          <ws-select
-          v-model="deptBudgetList.impurity"
+        <ws-form-item label="类型" span="1" prop="tranType" class="siji">
+          <!-- <ws-select
+          v-model="deptBudgetList.tranType"
           placeholder=""
           size="small"
-          ></ws-select>
+          ></ws-select> -->
+          {{deptBudgetList.tranType}}
         </ws-form-item>
-        <ws-form-item label="数量" span="1" prop="impurity" class="siji">
-          <ws-input
-          v-model="deptBudgetList.impurity"
+        <ws-form-item label="数量" span="1" prop="boxNumber" class="siji">
+          <!-- <ws-input
+          v-model="deptBudgetList.boxNumber"
           placeholder="请输入数量"
           size="small"
-          ></ws-input>
+          ></ws-input> -->
+          {{deptBudgetList.boxNumber}}
         </ws-form-item>
         </ws-info-table>
       </div>
@@ -246,69 +254,77 @@
         <ws-info-table>
           <!-- 姓名 -->
           <ws-form-item label="姓名" span="1" prop="driver" class="siji">
-            <ws-select
+            <!-- <ws-select
             v-model="deptBudgetList.driver"
             placeholder="请选择联络员"
             size="small"
-            ></ws-select>
+            ></ws-select> -->
+             {{deptBudgetList.driver}}
           </ws-form-item>
           <!-- 电话 -->
           <ws-form-item label="电话" span="1" prop="driverPhone" class="siji">
-            <ws-input
+            <!-- <ws-input
             v-model="deptBudgetList.driverPhone"
             placeholder="联络员电话"
             size="small"
-            ></ws-input>
+            ></ws-input> -->
+            {{deptBudgetList.driverPhone}}
           </ws-form-item>
           <!--发船日期-->
           <ws-form-item label="发船日期" span="1" prop="sendDateStart" class="siji">
-            <ws-input
+            <!-- <ws-input
                 v-model="deptBudgetList.sendDateStart"
                 placeholder="请选择日期"
                 
-            ></ws-input>
+            ></ws-input> -->
+            {{deptBudgetList.sendDateStart}}
           </ws-form-item>
         <ws-form-item label="预计到港日期" span="1" prop="receiveDateEnd" class="siji">
-          <ws-input
+          <!-- <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 
+            <!-- <ws-input 
               v-model="deptBudgetList.shipName"
               placeholder="请输入船名"
               maxlength="100"
               size="small"
-            ></ws-input>
+            ></ws-input> -->
+            {{deptBudgetList.shipName}}
           </ws-form-item>
           <!-- 航次 -->
           <ws-form-item label="航次" span="1" prop="shipNo" class="siji">
-            <ws-input 
+            <!-- <ws-input 
               v-model="deptBudgetList.shipNo"
               placeholder="请选择航次"
               maxlength="100"
               size="small"
-            ></ws-input>
+            ></ws-input> -->
+            {{deptBudgetList.shipNo}}
           </ws-form-item>
         <!-- 类型 -->
-        <ws-form-item label="类型" span="1" prop="impurity" class="siji">
-          <ws-select
-          v-model="deptBudgetList.impurity"
+        <ws-form-item label="类型" span="1" prop="tranType" class="siji">
+          <!-- <ws-select
+          v-model="deptBudgetList.tranType"
           placeholder=""
           size="small"
-          ></ws-select>
+          ></ws-select> -->
+          {{deptBudgetList.tranType}}
         </ws-form-item>
-        <ws-form-item label="数量" span="1" prop="impurity" class="siji">
-          <ws-input
-          v-model="deptBudgetList.impurity"
+        <ws-form-item label="数量" span="1" prop="boxNumber" class="siji">
+          <!-- <ws-input
+          v-model="deptBudgetList.boxNumber"
           placeholder="请输入数量"
           size="small"
-          ></ws-input>
+          ></ws-input> -->
+          {{deptBudgetList.boxNumber}}
         </ws-form-item>
         </ws-info-table>
         </div>
@@ -319,19 +335,21 @@
         >
      <ws-info-table>
         <ws-form-item :label="'仓位号1-'+ (index+1)" span="1" prop="impurity" class="bot">
-            <ws-input
+            <!-- <ws-input
           v-model="deptBudgetList.impurity"
           placeholder="请输入仓位号"
           size="small"
-          ></ws-input>
+          ></ws-input> -->
+          {{deptBudgetList.impurity}}
           </ws-form-item>
           <!-- 重量(吨) -->
           <ws-form-item label="重量(吨)" span="1" prop="positionWeight" class="bot">
-          <ws-input
+          <!-- <ws-input
           v-model="deptBudgetList.impurity"
           placeholder="请输入装仓重量"
           size="small"
-          ></ws-input>
+          ></ws-input> -->
+          {{deptBudgetList.positionWeight}}
         </ws-form-item>
         
      </ws-info-table>
@@ -344,14 +362,14 @@
             alt=""
           />
       </div>
-      <el-button
+      <!-- <el-button
           class="add"
           type="primary"
           size="small"
           @click="add()"
           >添加仓位</el-button
-        >
-      <div style="text-align: right; padding: 10px">
+        > -->
+      <!-- <div style="text-align: right; padding: 10px">
         
         <el-button
           class="bg-bottom-up"
@@ -360,7 +378,7 @@
           @click="submit()"
           >提交</el-button
         >
-      </div>
+      </div> -->
       </div>
     </ws-form>
     </div>
@@ -544,26 +562,26 @@ export default {
       console.log(`当前页: ${val}`)
       this.getList()
     },
-    getList() {
-      // 货名
-      pullDown({ constId: 'CON2' })
-        .toPromise()
-        .then((response) => {
-          this.goodnameList = response
-        })
-      // 品级
-      pullDown({ constId: 'CON3' })
-        .toPromise()
-        .then((response) => {
-          this.gradeList = response
-        })
-      // 类型
-      pullDown({ constId: 'CON5' })
-        .toPromise()
-        .then((response) => {
-          this.storageType = response
-        })
-    },
+    // getList() {
+    //   // 货名
+    //   pullDown({ constId: 'CON2' })
+    //     .toPromise()
+    //     .then((response) => {
+    //       this.goodnameList = response
+    //     })
+    //   // 品级
+    //   pullDown({ constId: 'CON3' })
+    //     .toPromise()
+    //     .then((response) => {
+    //       this.gradeList = response
+    //     })
+    //   // 类型
+    //   pullDown({ constId: 'CON5' })
+    //     .toPromise()
+    //     .then((response) => {
+    //       this.storageType = response
+    //     })
+    // },
     selecttaskType(e) {
       for (var i = 0; i < this.taskTypeList.length; i++) {
         if (this.taskTypeList[i].value == e) {

+ 1 - 0
src/views/tranManagement/tranManagementTransporTrainNo.vue

@@ -365,6 +365,7 @@ export default {
                   num  
                 )
               }
+              console.log(this.tranCarInfoList.boxNo = this.arr.toString())
               this.deptBudgetList.totalStorage = this.totalStorage
 
               this.tranCarInfoList.driver = this.deptBudgetList.driver