前端孟祥旭

src/lang/zh.js

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

src/model/transport/index.js

@@ -68,3 +68,4 @@ export const seeCat = appRx.get(API_GET_AUTOMOBILE_SEE, errorCatcher, errorHandl
 export const nameXiala = appRx.get(API_GET_AUTOMOBILE_NAME, errorCatcher, errorHandle, filter)
 //司机其他信息
 export const arrange = appRx.get(API_GET_AUTOMOBILE_ARRANGE, errorCatcher, errorHandle, filter)
+

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

@@ -12,6 +12,7 @@ const tranManagementRouter = {
     icon: 'cg'
   },
   children: [
+    
     //火运调度
     {
       path: 'tranManagementTransporTationFire',
@@ -265,7 +266,35 @@ const tranManagementRouter = {
       },
       hidden: true
     },
-
+    //收货反馈
+    {
+      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
+    },
 
   ],
 };

src/views/tranManagement/tranManagementShipping.vue

@@ -153,7 +153,7 @@
               @click="handleLook(scope.row)"
               
             >
-              查看（{{ scope.row.number }}）
+              查看
             </ws-button>
             <ws-button
               class="putstorage"
@@ -273,23 +273,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 +305,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 +332,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.124:8090/',
+        target: 'http://192.168.1.119:8090/',
         // target: 'http://192.168.1.119:8090/',
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://product-server.winsea.com/',