소스 검색

前端 运输反馈单条提交sdy

zhongtianhaoyuan 3 년 전
부모
커밋
a831483d57

+ 74 - 44
src/views/tranManagement/tranManagementFireFeedback.vue

@@ -135,14 +135,15 @@
 
             <!-- 提交 -->
             <span class="servicein" v-show="item.status == '已装车' || item.status == '已送达'">已装车</span>
-            <span style="text-align: right; padding: 10px" class="center" v-if="
+            <span style="text-align: right;" class="noservicein" v-if="
                 item.status == '' ||
                 item.status == null ||
                 item.status == '未装车'
               ">
-              <div>
+              <!-- <div>
                 <el-button class="bg-bottom" type="primary" size="small" @click="submit(index)">提交</el-button>
-              </div>
+              </div> -->
+              未装车
             </span>
             <!-- <div
               v-show="
@@ -182,6 +183,7 @@
     </ws-form>
     <!-- 完货 -->
     <div style="text-align: right; padding: 10px" class="wanhuo">
+       <el-button class="bg-bottom" type="primary" size="small" @click="submit(index)">提交</el-button>
       <el-button class="bg-bottom" type="primary" size="small" @click="finished(deptBudgetList)">完货</el-button>
     </div>
   </div>
@@ -500,32 +502,41 @@
       validateFunc() {
         this.$refs.deptBudgetList.validate(valid => {
           if (valid) {
+            console.log(this.freightspace,"数组")
+            
             // this.deptBudgetList.totalStorage = this.totalStorage
-            this.tranCarInfoList = this.freightspace
-            this.tranCarInfoList.driver = this.deptBudgetList.driver
-            this.tranCarInfoList.driverPhone = this.deptBudgetList.driverPhone
-            this.tranCarInfoList.tranCarNo = this.deptBudgetList.tranCarNo
-            this.tranCarInfoList.carNo = this.deptBudgetList.carNo
-            this.tranCarInfoList[0].sendDateStart = this.deptBudgetList.sendDateStart
-            this.tranCarInfoList.loadNetWeight = this.deptBudgetList.loadNetWeight
-            this.tranCarInfoList.tranType = this.tranType
-            this.tranCarInfoList.loadPoundImg = this.deptBudgetList.loadPoundImg
+            // this.tranCarInfoList = this.freightspace
+            // this.tranCarInfoList.driver = this.deptBudgetList.driver
+            // this.tranCarInfoList.driverPhone = this.deptBudgetList.driverPhone
+            // this.tranCarInfoList.tranCarNo = this.deptBudgetList.tranCarNo
+            // this.tranCarInfoList.carNo = this.deptBudgetList.carNo
+            // this.tranCarInfoList[0].sendDateStart = this.deptBudgetList.sendDateStart
+            // this.tranCarInfoList.loadNetWeight = this.deptBudgetList.loadNetWeight
+            // this.tranCarInfoList.tranType = this.tranType
+            // this.tranCarInfoList.loadPoundImg = this.deptBudgetList.loadPoundImg
             // this.tranCarInfoList.boxNo = this.arr.toString()
-            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 = {}
-            tranProcessInfo.id = this.deptBudgetList.id
-            tranProcessInfo.infoId = this.deptBudgetList.infoId
-            tranProcessInfo.processNo = this.deptBudgetList.processNo
-            tranProcessInfo.tranPrice = this.deptBudgetList.tranPrice
-            tranProcessInfo.tranCarInfoList = this.tranCarInfoList
+            // 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 = {}
+            // tranProcessInfo.id = this.deptBudgetList.id
+            // tranProcessInfo.infoId = this.deptBudgetList.infoId
+            // tranProcessInfo.processNo = this.deptBudgetList.processNo
+            // tranProcessInfo.tranPrice = this.deptBudgetList.tranPrice
+            // tranProcessInfo.tranCarInfoList = this.tranCarInfoList
             // dispatchCat({tranCarInfo:{tranCarInfoList:[this.tranCarInfoList],id:this.deptBudgetList.id}
-            feedback(tranProcessInfo)
+            let tranCar = {}
+            tranCar.infoId = this.deptBudgetList.infoId
+             tranCar.id = this.deptBudgetList.id
+            tranCar.infoId = this.deptBudgetList.infoId
+            tranCar.processNo = this.deptBudgetList.processNo
+            tranCar.tranPrice = this.deptBudgetList.tranPrice
+            tranCar.tranCarInfoList = this.freightspace
+            feedback(tranCar)
               .toPromise()
               .then(response => {
                 this.$message.success('提交成功')
@@ -543,7 +554,7 @@
         })
       },
       submit(index) {
-        // for (var i = 0; i < this.freightspace.length; i++) {
+        for (var i = 0; i < this.freightspace.length; i++) {
         // if (!this.freightspace[i].driver) {
         //   this.$message({
         //     message: '司机姓名不能为空!',
@@ -565,7 +576,7 @@
         //   })
         //   return
         // }
-        if (!this.freightspace[index].loadNetWeight) {
+        if (!this.freightspace[i].loadNetWeight) {
           this.$message({
             message: '装车净重不能为空!',
             type: 'warning'
@@ -573,8 +584,8 @@
           return
         }
         if (
-          this.freightspace[index].loadNetWeight < 0 ||
-          this.freightspace[index].loadNetWeight > 10000
+          this.freightspace[i].loadNetWeight < 0 ||
+          this.freightspace[i].loadNetWeight > 10000
         ) {
           this.$message({
             message: '装车净重输入错误!',
@@ -582,13 +593,38 @@
           })
           return
         }
-        if (!this.freightspace[index].loadingDate) {
+         if (!this.freightspace[i].loadingDate) {
           this.$message({
             message: '装车日期不能为空!',
             type: 'warning'
           })
           return
         }
+        }
+        // if (!this.freightspace[index].loadNetWeight) {
+        //   this.$message({
+        //     message: '装车净重不能为空!',
+        //     type: 'warning'
+        //   })
+        //   return
+        // }
+        // if (
+        //   this.freightspace[index].loadNetWeight < 0 ||
+        //   this.freightspace[index].loadNetWeight > 10000
+        // ) {
+        //   this.$message({
+        //     message: '装车净重输入错误!',
+        //     type: 'warning'
+        //   })
+        //   return
+        // }
+        // if (!this.freightspace[index].loadingDate) {
+        //   this.$message({
+        //     message: '装车日期不能为空!',
+        //     type: 'warning'
+        //   })
+        //   return
+        // }
 
         // }
         if (sessionStorage.getItem('sh-msg')) {
@@ -852,11 +888,11 @@
     display: inline-block;
   }
 
-  .center {
-    width: 900px;
-    margin: -70px auto;
-    margin-right: 92px;
-  }
+  // .center {
+  //   width: 900px;
+  //   margin: -70px auto;
+  //   margin-right: 92px;
+  // }
 
   .wanhuo {
     width: 900px;
@@ -1158,18 +1194,12 @@
   }
 
   .noservicein {
-    background: #c4cada;
     color: #ffffff;
-    display: inline-block;
-    border-radius: 4px;
+    // display: inline-block;
     border: 1px solid #d8dce6;
     padding: 2px;
     font-size: 12px;
-    background: #e5f1f7;
-    color: #50cad4;
-    height: 23px;
-    margin-top: 11px;
-    margin-left: 53px;
+    background: #C4CADA;
   }
 
   .servicedin {

+ 31 - 36
src/views/tranManagement/tranManagementFireReceivingFeedback.vue

@@ -253,19 +253,7 @@
                 >
             
             </span> -->
-            <el-button
-              style="text-align: right; padding: 10px; margin: 4px 0 0 20px"
-              type="primary"
-              @click="submit(deptBudgetList)"
-              v-if="
-                item.status == '' ||
-                item.status == null ||
-                item.status == '未送达' ||
-                item.status == '已装车'
-              "
-            >
-              提交
-            </el-button>
+           
             <!-- <div
               v-show="
                 item.temporaryDriverFlag == 0 && item.signStatus == '未签合同'
@@ -317,6 +305,13 @@
     </ws-form>
     <!-- 完货 -->
     <div style="text-align: right; padding: 10px" class="wanhuo">
+       <el-button
+              style="text-align: right; padding: 10px; margin: 4px 0 0 20px"
+              type="primary"
+              @click="submit(deptBudgetList)"
+            >
+              提交
+            </el-button>
       <el-button
         class="bg-bottom"
         type="primary"
@@ -669,34 +664,34 @@ export default {
           this.$refs.deptBudgetList.validate((valid) => {
             if (valid) {
               // this.deptBudgetList.totalStorage = this.totalStorage
-              this.tranCarInfoList = this.freightspace
-              this.tranCarInfoList.driver = this.deptBudgetList.driver
-              this.tranCarInfoList.unloadingDate =
-                this.deptBudgetList.unloadingDate
-              this.tranCarInfoList[0].sendDateStart =
-                this.deptBudgetList.sendDateStart
-              this.tranCarInfoList.driverPhone = this.deptBudgetList.driverPhone
-              this.tranCarInfoList.tranCarNo = this.deptBudgetList.tranCarNo
-              this.tranCarInfoList.carNo = this.deptBudgetList.carNo
-              this.tranCarInfoList.unloadNetWeight =
-                this.deptBudgetList.unloadNetWeight
-              this.tranCarInfoList.tranType = this.tranType
-              this.tranCarInfoList.unloadPoundImg =
-                this.deptBudgetList.unloadPoundImg
-              // this.tranCarInfoList.boxNo = this.arr.toString()
-              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
-                }
-              }
+              // this.tranCarInfoList = this.freightspace
+              // this.tranCarInfoList.driver = this.deptBudgetList.driver
+              // this.tranCarInfoList.unloadingDate =
+              //   this.deptBudgetList.unloadingDate
+              // this.tranCarInfoList[0].sendDateStart =
+              //   this.deptBudgetList.sendDateStart
+              // this.tranCarInfoList.driverPhone = this.deptBudgetList.driverPhone
+              // this.tranCarInfoList.tranCarNo = this.deptBudgetList.tranCarNo
+              // this.tranCarInfoList.carNo = this.deptBudgetList.carNo
+              // this.tranCarInfoList.unloadNetWeight =
+              //   this.deptBudgetList.unloadNetWeight
+              // this.tranCarInfoList.tranType = this.tranType
+              // this.tranCarInfoList.unloadPoundImg =
+              //   this.deptBudgetList.unloadPoundImg
+              // // this.tranCarInfoList.boxNo = this.arr.toString()
+              // 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 = {}
               tranProcessInfo.id = this.deptBudgetList.id
               tranProcessInfo.infoId = this.deptBudgetList.infoId
               tranProcessInfo.processNo = this.deptBudgetList.processNo
               tranProcessInfo.tranPrice = this.deptBudgetList.tranPrice
-              tranProcessInfo.tranCarInfoList = this.tranCarInfoList
+              tranProcessInfo.tranCarInfoList = this.freightspace
               // dispatchCat({tranCarInfo:{tranCarInfoList:[this.tranCarInfoList],id:this.deptBudgetList.id}
               feedback(tranProcessInfo)
                 .toPromise()

+ 1292 - 1075
src/views/tranManagement/tranManagementShippingFeedback.vue

@@ -6,30 +6,58 @@
         <h2 class="bg-left title">船运装船反馈</h2>
       </el-col>
       <el-col :span="12" class="bg-right">
-        <el-button class="bg-bottom" type="primary" size="small" @click="returnsales()">
-          <img width="6" height="10" style="vertical-align: bottom; margin-right: 3px"
-            src="../../../public/img/lujing.png" alt />返回
+        <el-button
+          class="bg-bottom"
+          type="primary"
+          size="small"
+          @click="returnsales()"
+        >
+          <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 class="position" ref="deptBudgetList" :rules="rules" :model="deptBudgetList">
+    <ws-form
+      class="position"
+      ref="deptBudgetList"
+      :rules="rules"
+      :model="deptBudgetList"
+    >
       <div class="small-title" style="font-size: 16px">任务详情</div>
       <ws-info-table>
         <!--任务编号-->
-        <ws-form-item label="任务编号" span="1" prop="processNo">{{ deptBudgetList.processNo }}</ws-form-item>
+        <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="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="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" class="readonly">{{ deptBudgetList.sender }}</ws-form-item>
+        <ws-form-item label="发货人" span="1" prop="sender" class="readonly">{{
+          deptBudgetList.sender
+        }}</ws-form-item>
         <!--发货人电话-->
-        <ws-form-item label="发货人电话" span="1" prop="senderPhone" class="readonly">{{ deptBudgetList.senderPhone }}
+        <ws-form-item
+          label="发货人电话"
+          span="1"
+          prop="senderPhone"
+          class="readonly"
+          >{{ deptBudgetList.senderPhone }}
         </ws-form-item>
         <!--收货地址-->
         <ws-form-item label="收货地址" span="1" prop="receiveDetailedAddress">
@@ -37,153 +65,315 @@
           }}{{ 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="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="receiverPhone">{{
+          deptBudgetList.receiverPhone
+        }}</ws-form-item>
         <!--发货日期-->
-        <ws-form-item label="发货日期" span="1" prop="deliveryDateStart">{{ deptBudgetList.deliveryDateStart }}
+        <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="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="contractNo">{{
+          deptBudgetList.contractNo
+        }}</ws-form-item>
         <!-- 运输方式 -->
-        <ws-form-item label="运输方式" span="1" prop="tranType">{{ deptBudgetList.tranType }}</ws-form-item>
+        <ws-form-item label="运输方式" span="1" prop="tranType">{{
+          deptBudgetList.tranType
+        }}</ws-form-item>
       </ws-info-table>
       <div class="small-title" style="font-size: 16px">联络员及航次</div>
       <ws-info-table>
         <!-- 姓名 -->
-        <ws-form-item label="姓名" span="1" prop="driver">{{ deptBudgetList.driver }}</ws-form-item>
+        <ws-form-item label="姓名" span="1" prop="driver">{{
+          deptBudgetList.driver
+        }}</ws-form-item>
         <!-- 电话 -->
-        <ws-form-item label="电话" span="1" prop="driverPhone">{{ deptBudgetList.driverPhone }}</ws-form-item>
+        <ws-form-item label="电话" span="1" prop="driverPhone">{{
+          deptBudgetList.driverPhone
+        }}</ws-form-item>
         <!--发船日期-->
         <ws-form-item label="发船日期" span="1" prop="sendDateStart">
-          <ws-date-picker v-model="deptBudgetList.sendDateStart" type="date" placeholder="请选择发船日期"
-            value-format="yyyy-MM-dd" />
+          <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">{{ deptBudgetList.receiveDateEnd }}</ws-form-item>
+        <ws-form-item label="预计到港日期" span="1" prop="receiveDateEnd">{{
+          deptBudgetList.receiveDateEnd
+        }}</ws-form-item>
         <!-- 船名 -->
-        <ws-form-item label="船名" span="1" prop="shipName">{{ deptBudgetList.shipName }}</ws-form-item>
+        <ws-form-item label="船名" span="1" prop="shipName">{{
+          deptBudgetList.shipName
+        }}</ws-form-item>
         <!-- 航次 -->
-        <ws-form-item label="航次" span="1" prop="shipNo">{{ deptBudgetList.shipNo }}</ws-form-item>
+        <ws-form-item label="航次" span="1" prop="shipNo">{{
+          deptBudgetList.shipNo
+        }}</ws-form-item>
         <!-- 类型 -->
-        <ws-form-item label="类型" span="1" prop="shipType">{{ deptBudgetList.shipType }}</ws-form-item>
+        <ws-form-item label="类型" span="1" prop="shipType">{{
+          deptBudgetList.shipType
+        }}</ws-form-item>
         <!-- 数量 -->
-        <ws-form-item label="数量" span="1" prop="boxNumber" v-if="deptBudgetList.shipType == '集装箱'">
-          {{ deptBudgetList.boxNumber }}</ws-form-item>
+        <ws-form-item
+          label="数量"
+          span="1"
+          prop="boxNumber"
+          v-if="deptBudgetList.shipType == '集装箱'"
+        >
+          {{ deptBudgetList.boxNumber }}</ws-form-item
+        >
       </ws-info-table>
-      <div class="small-title" style="font-size: 16px; width: 50%; float: left">装船详情</div>
+      <div class="small-title" style="font-size: 16px; width: 50%; float: left">
+        装船详情
+      </div>
       <!-- 导入 -->
-      <div style="font-size: 16px; width: 50%; float: left; text-align: right;display:flex;justify-content:end;">
-
+      <div
+        style="
+          font-size: 16px;
+          width: 50%;
+          float: left;
+          text-align: right;
+          display: flex;
+          justify-content: end;
+        "
+      >
         <el-link
           href="https://taohaoliang.oss-cn-beijing.aliyuncs.com/pcfiles/%E5%8F%8D%E9%A6%88%E6%A8%A1%E6%9D%BF/%E8%88%B9%E8%BF%90%E8%A3%85%E8%BD%A6%E5%8F%8D%E9%A6%88%E6%A8%A1%E6%9D%BF.xlsx"
-          style="margin-left: 8px;">
+          style="margin-left: 8px"
+        >
           <el-button type="primary">模板下载</el-button>
         </el-link>
-        <el-upload style="margin-left: 8px;" class="upload-demo inline-block margin-right-10" action
-          :on-change="handleChange" :show-file-list="false"
+        <el-upload
+          style="margin-left: 8px"
+          class="upload-demo inline-block margin-right-10"
+          action
+          :on-change="handleChange"
+          :show-file-list="false"
           accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
-          :auto-upload="false">
+          :auto-upload="false"
+        >
           <el-button type="primary">导入</el-button>
         </el-upload>
       </div>
-      <div class="liaison" v-if="this.deptBudgetList.tranCarInfoList.length>0">
-        <div style="width: 100%" class="flex position" v-for="(item, index) in freightspace" :key="index">
+      <div class="liaison" v-if="deptBudgetList.tranCarInfoList.length > 0">
+        <div
+          style="width: 100%"
+          class="flex position"
+          v-for="(item, index) in freightspace"
+          :key="index"
+        >
           <ws-info-table>
             <div class="catNos" v-if="item.shipType == '集装箱'">
               集装箱-{{ index + 1 }}
-              <span class="noservice" v-show="item.status == '未装车'">未装船</span>
-              <span class="service" v-show="item.status == '已装车'">已装船</span>
+              <span class="noservice" v-show="item.status == '未装车'"
+                >未装船</span
+              >
+              <span class="service" v-show="item.status == '已装车'"
+                >已装船</span
+              >
               <span class="serviced" v-show="item.status == '已送达'">
-                {{
-                item.status
-                }}
+                {{ item.status }}
               </span>
             </div>
             <div class="catNos" v-if="item.shipType == '散船'">
               仓位号-{{ index + 1 }}
-              <span class="noservice" v-show="item.status == '未装车'">未装船</span>
-              <span class="service" v-show="item.status == '已装车'">已装船</span>
+              <span class="noservice" v-show="item.status == '未装车'"
+                >未装船</span
+              >
+              <span class="service" v-show="item.status == '已装车'"
+                >已装船</span
+              >
               <span class="serviced" v-show="item.status == '已送达'">
-                {{
-                item.status
-                }}
+                {{ item.status }}
               </span>
             </div>
             <!--箱号-->
-            <el-form-item label="箱号" prop="caseNo" v-if="item.shipType == '集装箱'">
-              <el-input v-if="item.status == '已装车' || item.status == '已送达'" :disabled="readonly" v-model="item.caseNo"
-                placeholder="请输入箱号"></el-input>
-              <el-input v-else v-model="item.caseNo" placeholder="请输入箱号"></el-input>
+            <el-form-item
+              label="箱号"
+              prop="caseNo"
+              v-if="item.shipType == '集装箱'"
+            >
+              <el-input
+                v-if="item.status == '已装车' || item.status == '已送达'"
+                :disabled="readonly"
+                v-model="item.caseNo"
+                placeholder="请输入箱号"
+              ></el-input>
+              <el-input
+                v-else
+                v-model="item.caseNo"
+                placeholder="请输入箱号"
+              ></el-input>
             </el-form-item>
             <!--封号-->
-            <el-form-item label="封号" prop="titleNo" v-if="item.shipType == '集装箱'">
-              <el-input v-if="item.status == '已装车' || item.status == '已送达'" :disabled="readonly" v-model="item.titleNo"
-                placeholder="请输入封号"></el-input>
-              <el-input v-else v-model="item.titleNo" placeholder="请输入封号"></el-input>
+            <el-form-item
+              label="封号"
+              prop="titleNo"
+              v-if="item.shipType == '集装箱'"
+            >
+              <el-input
+                v-if="item.status == '已装车' || item.status == '已送达'"
+                :disabled="readonly"
+                v-model="item.titleNo"
+                placeholder="请输入封号"
+              ></el-input>
+              <el-input
+                v-else
+                v-model="item.titleNo"
+                placeholder="请输入封号"
+              ></el-input>
             </el-form-item>
             <!-- 仓位号 -->
-            <ws-form-item span="1" prop="binNumber" v-if="item.shipType == '散船'">{{ item.binNumber }}</ws-form-item>
+            <ws-form-item
+              span="1"
+              prop="binNumber"
+              v-if="item.shipType == '散船'"
+              >{{ item.binNumber }}</ws-form-item
+            >
             <!-- 计划重量 -->
-            <ws-form-item label="计划重量(吨)" span="1" prop="positionWeight" v-if="item.shipType == '散船'">
-              {{ item.positionWeight }}</ws-form-item>
+            <ws-form-item
+              label="计划重量(吨)"
+              span="1"
+              prop="positionWeight"
+              v-if="item.shipType == '散船'"
+            >
+              {{ item.positionWeight }}</ws-form-item
+            >
             <!--装船净重-->
             <ws-form-item label="装船净重:" span="1" prop="loadNetWeight">
-              <ws-input v-if="item.status == '已装车' || item.status == '已送达'" :disabled="readonly"
-                v-model="item.loadNetWeight" placeholder="请输入装船净重" maxlength="20" size="small" />
-              <ws-input v-else v-model="item.loadNetWeight" placeholder="请输入装船净重" maxlength="20" size="small" />
+              <ws-input
+                v-if="item.status == '已装车' || item.status == '已送达'"
+                :disabled="readonly"
+                v-model="item.loadNetWeight"
+                placeholder="请输入装船净重"
+                maxlength="20"
+                size="small"
+              />
+              <ws-input
+                v-else
+                v-model="item.loadNetWeight"
+                placeholder="请输入装船净重"
+                maxlength="20"
+                size="small"
+              />
             </ws-form-item>
             <!--装船日期-->
-            <el-form-item label="装船日期:" span="1" prop="loadingDate" label-width="100px">
-              <ws-date-picker v-if="item.status == '已装车' || item.status == '已送达'" :disabled="readonly"
-                v-model="item.loadingDate" type="date" style="width: 150px" placeholder="请选择日期"
-                value-format="yyyy-MM-dd" />
-              <ws-date-picker v-else v-model="item.loadingDate" type="date" style="width: 150px" placeholder="请选择日期"
-                value-format="yyyy-MM-dd" />
+            <el-form-item
+              label="装船日期:"
+              span="1"
+              prop="loadingDate"
+              label-width="100px"
+            >
+              <ws-date-picker
+                v-if="item.status == '已装车' || item.status == '已送达'"
+                :disabled="readonly"
+                v-model="item.loadingDate"
+                type="date"
+                style="width: 150px"
+                placeholder="请选择日期"
+                value-format="yyyy-MM-dd"
+              />
+              <ws-date-picker
+                v-else
+                v-model="item.loadingDate"
+                type="date"
+                style="width: 150px"
+                placeholder="请选择日期"
+                value-format="yyyy-MM-dd"
+              />
             </el-form-item>
-            <div style=" padding: 10px" class="center1">
-              <el-button v-show="item.status == '未装车'" class="bg-bottom" type="primary" size="small"
-                @click="submit(deptBudgetList)">提交</el-button>
+            <div v-show="item.signStatus == '未签合同'" class="signStatus">
+              {{ item.signStatus }}
+            </div>
+            <div v-show="item.signStatus == '已签合同'" class="signStatus1">
+              {{ item.signStatus }}
             </div>
-            <div v-show=" item.signStatus == '未签合同'" class="signStatus">{{ item.signStatus }}</div>
-            <div v-show=" item.signStatus == '已签合同'" class="signStatus1">{{ item.signStatus }}</div>
           </ws-info-table>
         </div>
       </div>
-      <div v-if="this.deptBudgetList.tranCarInfoList.length>0" class="yd-bottom">
-
-        <ws-form-item label="运单:" span="1" prop="loadPoundImg" class="yd-bottom-left"
-          v-if="freightspace[0].status == '已装车'">
+      <div v-if="deptBudgetList.tranCarInfoList.length > 0" class="yd-bottom">
+        <ws-form-item
+          label="运单:"
+          span="1"
+          prop="loadPoundImg"
+          class="yd-bottom-left"
+          v-if="freightspace[0].status == '已装车'"
+        >
           <!-- slot-scope="scope" -->
           <template>
-            <el-upload action="https://www.zthymaoyi.com/upload/admin" :show-file-list="false"
-              :on-success=" (res) => { uploadSuccessHandle1(res)}" class="avatar-uploader"
-              accept=".jpg, .jpeg, .png, .gif" multiple>
-              <img width="18" height="20" style="vertical-align: text-top; position: relative"
-                src="../../../public/img/fujian.png" alt />
+            <el-upload
+              action="https://www.zthymaoyi.com/upload/admin"
+              :show-file-list="false"
+              :on-success="
+                (res) => {
+                  uploadSuccessHandle1(res)
+                }
+              "
+              class="avatar-uploader"
+              accept=".jpg, .jpeg, .png, .gif"
+              multiple
+            >
+              <img
+                width="18"
+                height="20"
+                style="vertical-align: text-top; position: relative"
+                src="../../../public/img/fujian.png"
+                alt
+              />
             </el-upload>
             <div class="tupian">
               <span
-                v-if="deptBudgetList.tranCarInfoList.length>0&&deptBudgetList.tranCarInfoList[0].loadPoundImg != null ">{{pictureTotal}}</span>
+                v-if="
+                  deptBudgetList.tranCarInfoList.length > 0 &&
+                  deptBudgetList.tranCarInfoList[0].loadPoundImg != null
+                "
+                >{{ pictureTotal }}</span
+              >
               <span
-                v-if="deptBudgetList.tranCarInfoList.length>0&&deptBudgetList.tranCarInfoList[0].loadPoundImg == null ">未上传</span>
+                v-if="
+                  deptBudgetList.tranCarInfoList.length > 0 &&
+                  deptBudgetList.tranCarInfoList[0].loadPoundImg == null
+                "
+                >未上传</span
+              >
             </div>
           </template>
         </ws-form-item>
 
-        <div style="text-align: right; color: #8890b1; font-size: 16px;width:100%;">
+        <div
+          style="
+            text-align: right;
+            color: #8890b1;
+            font-size: 16px;
+            width: 100%;
+          "
+        >
           合计(吨):{{ total }}/{{ deptBudgetList.weight }}
           <!--阶段状态-->
-          <span class="noservice" v-show="deptBudgetList.feedbackStatus == '执行中'">未完货</span>
-          <span class="service"
-            v-show="deptBudgetList.feedbackStatus == '已完货'">{{ deptBudgetList.feedbackStatus }}</span>
+          <span
+            class="noservice"
+            v-show="deptBudgetList.feedbackStatus == '执行中'"
+            >未完货</span
+          >
+          <span
+            class="service"
+            v-show="deptBudgetList.feedbackStatus == '已完货'"
+            >{{ deptBudgetList.feedbackStatus }}</span
+          >
         </div>
       </div>
-      <div v-if="this.deptBudgetList.tranCarInfoList.length==0">
-        暂无船次
-      </div>
+      <div v-if="this.deptBudgetList.tranCarInfoList.length == 0">暂无船次</div>
       <!--运单-->
       <!-- <div
           style="width: 100%"
@@ -196,1080 +386,1107 @@
     </ws-form>
     <!-- 完货 -->
     <div style="text-align: right; padding: 10px" class="center">
-      <el-button class="bg-bottom" type="primary" size="small" @click="finished(deptBudgetList)">完货</el-button>
+      <el-button
+        class="bg-bottom"
+        type="primary"
+        size="small"
+        @click="submit(deptBudgetList)"
+        >提交</el-button
+      >
+      <el-button
+        class="bg-bottom"
+        type="primary"
+        size="small"
+        @click="finished(deptBudgetList)"
+        >完货</el-button
+      >
     </div>
   </div>
 </template>
 <script>
-  import {
-    regionData
-  } from 'element-china-area-data'
-  import Pagination from '@/components/Pagination'
-  import {
-    seeCat,
-    packList,
-    feedback,
-    state,
-    importApplFileUrl
-  } from '@/model/transport/index'
-  import {
-    getstaff
-  } from '@/model/warehouse/index'
-  import WsUpload from '@/components/WsUpload'
-  import mapDrag from '@/components/mapdrag/mapdrag'
-  export default {
-    name: 'viewSpareMoney',
-    components: {
-      WsUpload,
-      mapDrag
+import { regionData } from 'element-china-area-data'
+import Pagination from '@/components/Pagination'
+import {
+  seeCat,
+  packList,
+  feedback,
+  state,
+  importApplFileUrl,
+} from '@/model/transport/index'
+import { getstaff } from '@/model/warehouse/index'
+import WsUpload from '@/components/WsUpload'
+import mapDrag from '@/components/mapdrag/mapdrag'
+export default {
+  name: 'viewSpareMoney',
+  components: {
+    WsUpload,
+    mapDrag,
+  },
+  watch: {
+    vesselId(val) {
+      this.getVesselData()
     },
-    watch: {
-      vesselId(val) {
-        this.getVesselData()
-      },
-      isShow(val) {
-        this.showType = val
-      }
+    isShow(val) {
+      this.showType = val
     },
-    data() {
-      return {
-        excelFreightspace: [],
-        pictureTotal: 0,
-        deptBudgetList: {
-          totalStorage: 0,
-          sendDateStart: ''
-        },
-        tranCarInfoList: {
-          loadPoundImg: ''
-        },
-        options_: regionData,
-        heightData: '600px',
-        zoom: 7,
-        selectedOptions: [],
-        center: [116.244694, 39.517344],
-        window: '',
-        radio: 1,
-        personCharge: [],
-        district: null,
-        driverList: [],
-        readonly: true,
-        listDate: {
-          country: '中国',
-          level: 'country',
-          city: ''
-        },
-        citylist: [],
-        compId: sessionStorage.getItem('ws-pf_compId'),
-        rules: {
-          warehouseName: [{
-              required: true,
-              message: '请输入仓库名称',
-              trigger: 'blur'
-            },
-            {
-              min: 2,
-              max: 20,
-              message: '仓库名长度不符合要求,请输入2-20字符之内',
-              trigger: 'blur'
-            }
-          ]
-        },
-        tranType: 1,
-        size: 10,
-        value1: '',
-        unitList: [],
-        fileTemp: '',
-        freightspace: [{
-            caseNo: '',
-            titleNo: '',
-            binNumber: '',
-            positionWeight: '',
-            loadNetWeight: '',
-            loadingDate: ''
-          }
-          // {loadPoundImg:{}},
+  },
+  data() {
+    return {
+      excelFreightspace: [],
+      pictureTotal: 0,
+      deptBudgetList: {
+        totalStorage: 0,
+        sendDateStart: '',
+        tranCarInfoList: [],
+      },
+      tranCarInfoList: {
+        loadPoundImg: '',
+      },
+      options_: regionData,
+      heightData: '600px',
+      zoom: 7,
+      selectedOptions: [],
+      center: [116.244694, 39.517344],
+      window: '',
+      radio: 1,
+      personCharge: [],
+      district: null,
+      driverList: [],
+      readonly: true,
+      listDate: {
+        country: '中国',
+        level: 'country',
+        city: '',
+      },
+      citylist: [],
+      compId: sessionStorage.getItem('ws-pf_compId'),
+      rules: {
+        warehouseName: [
+          {
+            required: true,
+            message: '请输入仓库名称',
+            trigger: 'blur',
+          },
+          {
+            min: 2,
+            max: 20,
+            message: '仓库名长度不符合要求,请输入2-20字符之内',
+            trigger: 'blur',
+          },
         ],
-        name: '',
-        staffList: [],
-        options: [],
-        carModel: [],
-        tranCarInfoList: {
-          loadPoundImg: ''
+      },
+      tranType: 1,
+      size: 10,
+      value1: '',
+      unitList: [],
+      fileTemp: '',
+      freightspace: [
+        {
+          caseNo: '',
+          titleNo: '',
+          binNumber: '',
+          positionWeight: '',
+          loadNetWeight: '',
+          loadingDate: '',
         },
-        //上传
-        accessoryTFs: false,
-        fileList: [],
-        appendixIdsAdd: '',
+        // {loadPoundImg:{}},
+      ],
+      name: '',
+      staffList: [],
+      options: [],
+      carModel: [],
+      tranCarInfoList: {
+        loadPoundImg: '',
+      },
+      //上传
+      accessoryTFs: false,
+      fileList: [],
+      appendixIdsAdd: '',
+    }
+  },
+  activated() {
+    this.deptBudgetList.id = this.$route.query.id
+    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
     },
-    activated() {
-      this.deptBudgetList.id = this.$route.query.id
-      this.getList()
-    },
-    computed: {
-      totalStorage: function() {
+    total: function () {
+      if (this.deptBudgetList.tranCarInfoList != null) {
         var maxStorage = 0
-        for (var i = 0; i < this.freightspace.length; i++) {
-          maxStorage += Number(this.freightspace[i].maxStorage)
+        for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
+          maxStorage += Number(
+            this.deptBudgetList.tranCarInfoList[i].loadNetWeight
+          )
         }
         return maxStorage
-      },
-      total: function() {
-        if (this.deptBudgetList.tranCarInfoList != null) {
-          var maxStorage = 0
-          for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
-            maxStorage += Number(
-              this.deptBudgetList.tranCarInfoList[i].loadNetWeight
-            )
-          }
-          return maxStorage
-        } else {
-          return 0
-        }
+      } else {
+        return 0
       }
     },
-    methods: {
-      dataFilter(val) {
-        this.deptBudgetList.personCharge = val
-        if (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.freightspace[i].driverPhone = this.staffList[i].staffMobilePhone
-            this.deptBudgetList.personChargeKey = this.staffList[i].staffId
+  },
+  methods: {
+    dataFilter(val) {
+      this.deptBudgetList.personCharge = val
+      if (val) {
+        this.options = this.staffList.filter((item) => {
+          if (
+            !!~item.staffName.indexOf(val) ||
+            !!~item.staffName.toUpperCase().indexOf(val.toUpperCase())
+          ) {
+            return true
           }
-        }
-      },
-      marker: function(item) {
-        this.deptBudgetList.warehousePositioning =
-          item.lnglat.lat + ',' + item.lnglat.lng
-      },
-      selectedAddress(e) {
-        this.deptBudgetList.warehousePositioning =
-          e.center.lat + ',' + e.center.lng
-      },
-      confirmPositioncity() {
-        this.listDate.level = 'city'
-        this.listDate.country = this.name
-      },
-      // 关闭 dialog时 处理文件url 初始化upload组件
-      handleClose() {
-        this.dialogViewSpareMoney = false
-      },
-      //下拉司机姓名改变事件
-      selectdriver() {},
-      handleChange(value) {
-        this.selectedOptions = value
-      },
-      returnsales() {
-        this.deptBudgetList = {}
-        this.freightspace = {}
-        this.selectedOptions = ''
-        this.deptBudgetList.tranCarInfoList = []
-        this.$router.push({
-          path: 'tranManagementTransporHairRespond'
         })
-      },
-      // 上传附件
-      uploadSuccess(data, files, url) {
-        console.log(data, files, url)
-      },
-      handleClose() {
-        this.accessoryTFs = false
-      },
-      handleChange(file, fileList) {
-        this.fileTemp = file.raw
-        let fileName = file.raw.name
-        let fileType = fileName.substring(fileName.lastIndexOf('.') + 1)
-        // 判断上传文件格式
-        if (this.fileTemp) {
-          if (fileType == 'xlsx' || fileType == 'xls') {
-            this.importf(this.fileTemp)
-          } else {
-            this.$message({
-              type: 'warning',
-              message: '附件格式错误,请删除后重新上传!'
-            })
-          }
+      } 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.freightspace[i].driverPhone = this.staffList[i].staffMobilePhone
+          this.deptBudgetList.personChargeKey = this.staffList[i].staffId
+        }
+      }
+    },
+    marker: function (item) {
+      this.deptBudgetList.warehousePositioning =
+        item.lnglat.lat + ',' + item.lnglat.lng
+    },
+    selectedAddress(e) {
+      this.deptBudgetList.warehousePositioning =
+        e.center.lat + ',' + e.center.lng
+    },
+    confirmPositioncity() {
+      this.listDate.level = 'city'
+      this.listDate.country = this.name
+    },
+    // 关闭 dialog时 处理文件url 初始化upload组件
+    handleClose() {
+      this.dialogViewSpareMoney = false
+    },
+    //下拉司机姓名改变事件
+    selectdriver() {},
+    handleChange(value) {
+      this.selectedOptions = value
+    },
+    returnsales() {
+      this.deptBudgetList = {}
+      this.freightspace = {}
+      this.selectedOptions = ''
+      this.deptBudgetList.tranCarInfoList = []
+      this.$router.push({
+        path: 'tranManagementTransporHairRespond',
+      })
+    },
+    // 上传附件
+    uploadSuccess(data, files, url) {
+      console.log(data, files, url)
+    },
+    handleClose() {
+      this.accessoryTFs = false
+    },
+    handleChange(file, fileList) {
+      this.fileTemp = file.raw
+      let fileName = file.raw.name
+      let fileType = fileName.substring(fileName.lastIndexOf('.') + 1)
+      // 判断上传文件格式
+      if (this.fileTemp) {
+        if (fileType == 'xlsx' || fileType == 'xls') {
+          this.importf(this.fileTemp)
         } else {
           this.$message({
             type: 'warning',
-            message: '请上传附件!'
+            message: '附件格式错误,删除后重新上传!',
           })
         }
-      },
-      importf(obj) {
-        this.excelFreightspace = []
-        this.dialogVisible = true
-        let _this = this
-        let inputDOM = this.$refs.inputer // 通过DOM取文件数据
-        this.file = event.currentTarget.files[0]
+      } else {
+        this.$message({
+          type: 'warning',
+          message: '请上传附件!',
+        })
+      }
+    },
+    importf(obj) {
+      this.excelFreightspace = []
+      this.dialogVisible = true
+      let _this = this
+      let inputDOM = this.$refs.inputer // 通过DOM取文件数据
+      this.file = event.currentTarget.files[0]
+      var rABS = false //是否将文件读取为二进制字符串
+      var f = this.file
+      var reader = new FileReader()
+      //if (!FileReader.prototype.readAsBinaryString) {
+      FileReader.prototype.readAsBinaryString = function (f) {
+        var binary = ''
         var rABS = false //是否将文件读取为二进制字符串
-        var f = this.file
+        var pt = this
+        var wb //读取完成的数据
+        var outdata
         var reader = new FileReader()
-        //if (!FileReader.prototype.readAsBinaryString) {
-        FileReader.prototype.readAsBinaryString = function(f) {
-          var binary = ''
-          var rABS = false //是否将文件读取为二进制字符串
-          var pt = this
-          var wb //读取完成的数据
-          var outdata
-          var reader = new FileReader()
-          reader.onload = function(e) {
-            var bytes = new Uint8Array(reader.result)
-            var length = bytes.byteLength
-            for (var i = 0; i < length; i++) {
-              binary += String.fromCharCode(bytes[i])
-            }
-            var XLSX = require('xlsx')
-            if (rABS) {
-              wb = XLSX.read(btoa(fixdata(binary)), {
-                //手动转化
-                type: 'base64'
-              })
-            } else {
-              wb = XLSX.read(binary, {
-                type: 'binary'
-              })
-            }
-            // outdata就是你想要的东西 excel导入的数据
-            outdata = XLSX.utils.sheet_to_json(wb.Sheets[wb.SheetNames[0]])
-            // excel 数据再处理
-            let arr = []
-            outdata.map(v => {
-              // let jsonString = JSON.stringify(v).replace(/\*/g, '').replace(/\s/ig,'');
-              let jsonString = JSON.stringify(v)
-                .replace(/\//g, '')
-                .replace(/\s/gi, '')
-              console.log(jsonString)
-              v = JSON.parse(jsonString)
-              let obj = {}
-              //xxx代表列名
-              obj.caseNo = v.箱号
-              obj.titleNo = v.封号
-              obj.binNumber = v.仓位号
-              obj.positionWeight = v.散船重量
-              obj.loadNetWeight = v.装船净重
-              obj.loadingDate = v.装船日期
-              obj.status = v.状态
-              obj.shipType = v.类型
-              console.log(obj)
-              _this.excelFreightspace.push(obj)
+        reader.onload = function (e) {
+          var bytes = new Uint8Array(reader.result)
+          var length = bytes.byteLength
+          for (var i = 0; i < length; i++) {
+            binary += String.fromCharCode(bytes[i])
+          }
+          var XLSX = require('xlsx')
+          if (rABS) {
+            wb = XLSX.read(btoa(fixdata(binary)), {
+              //手动转化
+              type: 'base64',
             })
-            let _ispushData = true
-            console.log(arr, _this.freightspace)
-            for (let i = 0; i < _this.excelFreightspace.length; i++) {
-              _ispushData = true
-              for (let k = 0; k < _this.freightspace.length; k++) {
-                if (_this.excelFreightspace[i].binNumber == _this.freightspace[k].binNumber) {
-                  _this.freightspace[k] = _this.excelFreightspace[i]
-                  _ispushData = false
-                }
+          } else {
+            wb = XLSX.read(binary, {
+              type: 'binary',
+            })
+          }
+          // outdata就是你想要的东西 excel导入的数据
+          outdata = XLSX.utils.sheet_to_json(wb.Sheets[wb.SheetNames[0]])
+          // excel 数据再处理
+          let arr = []
+          outdata.map((v) => {
+            // let jsonString = JSON.stringify(v).replace(/\*/g, '').replace(/\s/ig,'');
+            let jsonString = JSON.stringify(v)
+              .replace(/\//g, '')
+              .replace(/\s/gi, '')
+            console.log(jsonString)
+            v = JSON.parse(jsonString)
+            let obj = {}
+            //xxx代表列名
+            obj.caseNo = v.箱号
+            obj.titleNo = v.封号
+            obj.binNumber = v.仓位号
+            obj.positionWeight = v.散船重量
+            obj.loadNetWeight = v.装船净重
+            obj.loadingDate = v.装船日期
+            obj.status = v.状态
+            obj.shipType = v.类型
+            console.log(obj)
+            _this.excelFreightspace.push(obj)
+          })
+          let _ispushData = true
+          console.log(arr, _this.freightspace)
+          for (let i = 0; i < _this.excelFreightspace.length; i++) {
+            _ispushData = true
+            for (let k = 0; k < _this.freightspace.length; k++) {
+              if (
+                _this.excelFreightspace[i].binNumber ==
+                _this.freightspace[k].binNumber
+              ) {
+                _this.freightspace[k] = _this.excelFreightspace[i]
+                _ispushData = false
               }
-              if (_ispushData) {
-                _this.freightspace.push(_this.excelFreightspace[i])
+            }
+            if (_ispushData) {
+              _this.freightspace.push(_this.excelFreightspace[i])
 
-                _ispushData = true
-              }
+              _ispushData = true
             }
-            _this.$forceUpdate();
           }
-          reader.readAsArrayBuffer(f)
-        }
-        if (rABS) {
-          reader.readAsArrayBuffer(f)
-        } else {
-          reader.readAsBinaryString(f)
-        }
-        console.log(reader)
-      },
-      uploadSectionFile(param) {
-        var fileName = param.file.name.split('.')
-        var fileSuffix = fileName[fileName.length - 1]
-        if (
-          !(
-            fileSuffix.toLowerCase() == 'xlsx' ||
-            fileSuffix.toLowerCase() == 'xls'
-          )
-        ) {
-          EventBus.$emit('error', this.$t('upload.message08'))
-          loading.close()
-          return
+          _this.$forceUpdate()
         }
+        reader.readAsArrayBuffer(f)
+      }
+      if (rABS) {
+        reader.readAsArrayBuffer(f)
+      } else {
+        reader.readAsBinaryString(f)
+      }
+      console.log(reader)
+    },
+    uploadSectionFile(param) {
+      var fileName = param.file.name.split('.')
+      var fileSuffix = fileName[fileName.length - 1]
+      if (
+        !(
+          fileSuffix.toLowerCase() == 'xlsx' ||
+          fileSuffix.toLowerCase() == 'xls'
+        )
+      ) {
+        EventBus.$emit('error', this.$t('upload.message08'))
+        loading.close()
+        return
+      }
 
-        var data = new FormData()
-        data.append('file', param.file)
-        data.append('compId', sessionStorage.getItem('ws-pf_compId'))
-        data.append('userId', sessionStorage.getItem('ws-pf_userId'))
+      var data = new FormData()
+      data.append('file', param.file)
+      data.append('compId', sessionStorage.getItem('ws-pf_compId'))
+      data.append('userId', sessionStorage.getItem('ws-pf_userId'))
 
-        importApplFileUrl(data)
-          .toPromise()
-          .then(success => {
-            console.log(success)
-          })
-      },
+      importApplFileUrl(data)
+        .toPromise()
+        .then((success) => {
+          console.log(success)
+        })
+    },
 
-      //完货
-      finished() {
-        this.$confirm(`完货操作后,装船信息不可修改,是否确定完货?`, {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          })
-          .then(() => {
-            this.$refs.deptBudgetList.validate(valid => {
-              if (valid) {
-                var tranProcessInfo = {}
-                tranProcessInfo.id = this.deptBudgetList.id
-                state(tranProcessInfo)
-                  .toPromise()
-                  .then(response => {
-                    this.$message.success('完货成功')
-                    this.deptBudgetList = {}
-                    this.freightspace = {}
-                    this.selectedOptions = ''
-                    this.$router.push({
-                      path: 'tranManagementTransporHairRespond'
-                    })
+    //完货
+    finished() {
+      this.$confirm(`完货操作后,装船信息不可修改,是否确定完货?`, {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          this.$refs.deptBudgetList.validate((valid) => {
+            if (valid) {
+              var tranProcessInfo = {}
+              tranProcessInfo.id = this.deptBudgetList.id
+              state(tranProcessInfo)
+                .toPromise()
+                .then((response) => {
+                  this.$message.success('完货成功')
+                  this.deptBudgetList = {}
+                  this.freightspace = {}
+                  this.selectedOptions = ''
+                  this.$router.push({
+                    path: 'tranManagementTransporHairRespond',
                   })
-              } else {
-                return false
-              }
-            })
+                })
+            } else {
+              return false
+            }
           })
-          .catch(() => {
-            return false
+        })
+        .catch(() => {
+          return false
+        })
+    },
+    submit() {
+      for (let i = 0; i < this.freightspace.length; i++) {
+        if (this.freightspace.shipType == '集装箱') {
+          if (!this.freightspace[i].caseNo) {
+            this.$message({
+              message: '箱号不能为空!',
+              type: 'warning',
+            })
+            return
+          }
+          if (
+            this.freightspace[i].caseNo.length > 15 ||
+            this.freightspace[i].caseNo.length < 1
+          ) {
+            this.$message({
+              message: '箱号输入错误!',
+              type: 'warning',
+            })
+            return
+          }
+             if (!this.freightspace[i].titleNo) {
+          this.$message({
+            message: '封号不能为空!',
+            type: 'warning',
           })
-      },
-      submit() {
-        // if (!this.freightspace[i].sendDateStart) {
-        //   this.$message({
-        //     message: '发船日期不能为空!',
-        //     type: 'warning',
-        //   })
-        //   return
-        // }
-        // if (!this.freightspace[i].caseNo) {
-        //   this.$message({
-        //     message: '箱号不能为空!',
-        //     type: 'warning',
-        //   })
-        //   return
-        // }
-        // if (
-        //   this.freightspace[i].caseNo.length > 15 ||
-        //   this.freightspace[i].caseNo.length < 1
-        // ) {
-        //   this.$message({
-        //     message: '箱号输入错误!',
-        //     type: 'warning',
-        //   })
-        //   return
-        // }
-        // if (!this.freightspace[i].titleNo) {
-        //   this.$message({
-        //     message: '封号不能为空!',
-        //     type: 'warning',
-        //   })
-        //   return
-        // }
-        // if (
-        //   this.freightspace[i].titleNo.length > 15 ||
-        //   this.freightspace[i].titleNo.length < 1
-        // ) {
-        //   this.$message({
-        //     message: '封号输入错误!',
-        //     type: 'warning',
-        //   })
-        //   return
-        // }
-        // if (!this.freightspace[i].loadNetWeight) {
-        //   this.$message({
-        //     message: '装船净重不能为空!',
-        //     type: 'warning',
-        //   })
-        //   return
-        // }
-        // if (
-        //   (this.freightspace[i].loadNetWeight &&
-        //     String(this.freightspace[i].loadNetWeight).indexOf('.') != -1 &&
-        //     String(this.freightspace[i].loadNetWeight).length -
-        //       (String(this.freightspace[i].loadNetWeight).indexOf('.') + 1) >
-        //       2) ||
-        //   this.freightspace[i].loadNetWeight > 10000 ||
-        //   this.freightspace[i].loadNetWeight < 0
-        // ) {
-        //   this.$message({
-        //     message: '装船净重输入错误',
-        //     type: 'warning',
-        //   })
-        //   return
-        // }
-        // if (!this.freightspace[i].loadingDate) {
-        //   this.$message({
-        //     message: '装船日期不能为空!',
-        //     type: 'warning',
-        //   })
-        //   return
-        // }
-        this.$confirm(`提交成功后装船信息不可修改,是否确定提交?`, {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
+          return
+        }
+        if (
+          this.freightspace[i].titleNo.length > 15 ||
+          this.freightspace[i].titleNo.length < 1
+        ) {
+          this.$message({
+            message: '封号输入错误!',
+            type: 'warning',
           })
-          .then(() => {
-            this.$refs.deptBudgetList.validate(valid => {
-              if (valid) {
-                this.tranCarInfoList = this.freightspace
-                this.tranCarInfoList[0].sendDateStart = this.deptBudgetList.sendDateStart
-                for (var i = 0; i < this.tranCarInfoList.length; i++) {
-                  this.tranCarInfoList[i].id = this.freightspace[i].id
-                }
-                var tranProcessInfo = {}
-                tranProcessInfo.id = this.deptBudgetList.id
-                tranProcessInfo.infoId = this.deptBudgetList.infoId
-                tranProcessInfo.processNo = this.deptBudgetList.processNo
-                tranProcessInfo.tranCarInfoList = this.tranCarInfoList
-                feedback(tranProcessInfo)
-                  .toPromise()
-                  .then(response => {
-                    this.$message.success('提交成功')
-                    this.deptBudgetList = {}
-                    this.freightspace = {}
-                    this.selectedOptions = ''
-                    this.$router.push({
-                      path: 'tranManagementTransporHairRespond'
-                    })
-                  })
-              } else {
-                // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
-                return false
-              }
+          return
+        }
+        } else if (this.freightspace.shipType == '散船') {
+          if (!this.freightspace[i].binNumber) {
+            this.$message({
+              message: '仓位号不能为空!',
+              type: 'warning',
             })
+            return
+          }
+        }
+
+     
+        if (!this.freightspace[i].loadNetWeight) {
+          this.$message({
+            message: '装船净重不能为空!',
+            type: 'warning',
           })
-          .catch(() => {
-            return false
+          return
+        }
+        if (
+          (this.freightspace[i].loadNetWeight &&
+            String(this.freightspace[i].loadNetWeight).indexOf('.') != -1 &&
+            String(this.freightspace[i].loadNetWeight).length -
+              (String(this.freightspace[i].loadNetWeight).indexOf('.') + 1) >
+              2) ||
+          this.freightspace[i].loadNetWeight > 10000 ||
+          this.freightspace[i].loadNetWeight < 0
+        ) {
+          this.$message({
+            message: '装船净重输入错误',
+            type: 'warning',
           })
-      },
-      resetForm(deptBudgetList) {
-        this.$refs[deptBudgetList].resetFields()
-      },
-      getList() {
-        seeCat({
-            id: this.deptBudgetList.id
+          return
+        }
+        if (!this.freightspace[i].loadingDate) {
+          this.$message({
+            message: '装船日期不能为空!',
+            type: 'warning',
           })
-          .toPromise()
-          .then(response => {
-            this.deptBudgetList = response
-            if (response.tranCarInfoList.length > 0) {
-              this.deptBudgetList.driver = response.tranCarInfoList[0].driver
-              this.deptBudgetList.driverPhone =
-                response.tranCarInfoList[0].driverPhone
-              this.$set(
-                this.deptBudgetList,
-                'sendDateStart',
-                response.tranCarInfoList[0].sendDateStart
-              )
-              this.deptBudgetList.receiveDateEnd =
-                response.tranCarInfoList[0].receiveDateEnd
-              this.deptBudgetList.shipName = response.tranCarInfoList[0].shipName
-              this.deptBudgetList.shipNo = response.tranCarInfoList[0].shipNo
-              this.deptBudgetList.shipType = response.tranCarInfoList[0].shipType
-              this.deptBudgetList.boxNumber = response.tranCarInfoList[0].boxNumber
-              //上传附件计数
-              if (this.deptBudgetList.tranCarInfoList[0].loadPoundImg) {
-                this.pictureTotal = this.deptBudgetList.tranCarInfoList[0].loadPoundImg.split(",").length
+          return
+        }
+      }
+      this.$confirm(`提交成功后装船信息不可修改,是否确定提交?`, {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          this.$refs.deptBudgetList.validate((valid) => {
+            if (valid) {
+              this.tranCarInfoList = this.freightspace
+              this.tranCarInfoList[0].sendDateStart =
+                this.deptBudgetList.sendDateStart
+              for (var i = 0; i < this.tranCarInfoList.length; i++) {
+                this.tranCarInfoList[i].id = this.freightspace[i].id
               }
-              this.freightspace = response.tranCarInfoList
+              var tranProcessInfo = {}
+              tranProcessInfo.id = this.deptBudgetList.id
+              tranProcessInfo.infoId = this.deptBudgetList.infoId
+              tranProcessInfo.processNo = this.deptBudgetList.processNo
+              tranProcessInfo.tranCarInfoList = this.tranCarInfoList
+              feedback(tranProcessInfo)
+                .toPromise()
+                .then((response) => {
+                  this.$message.success('提交成功')
+                  this.deptBudgetList = {}
+                  this.freightspace = {}
+                  this.selectedOptions = ''
+                  this.$router.push({
+                    path: 'tranManagementTransporHairRespond',
+                  })
+                })
+            } else {
+              // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+              return false
+            }
+          })
+        })
+        .catch(() => {
+          return false
+        })
+    },
+    resetForm(deptBudgetList) {
+      this.$refs[deptBudgetList].resetFields()
+    },
+    getList() {
+      seeCat({
+        id: this.deptBudgetList.id,
+      })
+        .toPromise()
+        .then((response) => {
+          this.deptBudgetList = response
+          if (response.tranCarInfoList.length > 0) {
+            this.deptBudgetList.driver = response.tranCarInfoList[0].driver
+            this.deptBudgetList.driverPhone =
+              response.tranCarInfoList[0].driverPhone
+            this.$set(
+              this.deptBudgetList,
+              'sendDateStart',
+              response.tranCarInfoList[0].sendDateStart
+            )
+            this.deptBudgetList.receiveDateEnd =
+              response.tranCarInfoList[0].receiveDateEnd
+            this.deptBudgetList.shipName = response.tranCarInfoList[0].shipName
+            this.deptBudgetList.shipNo = response.tranCarInfoList[0].shipNo
+            this.deptBudgetList.shipType = response.tranCarInfoList[0].shipType
+            this.deptBudgetList.boxNumber =
+              response.tranCarInfoList[0].boxNumber
+            //上传附件计数
+            if (this.deptBudgetList.tranCarInfoList[0].loadPoundImg) {
+              this.pictureTotal =
+                this.deptBudgetList.tranCarInfoList[0].loadPoundImg.split(
+                  ','
+                ).length
             }
+            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.freightspace.length; i++) {
+            if (!this.freightspace[i].loadNetWeight) {
+              this.freightspace[i].loadNetWeight = 0
             }
-          })
-        //司机姓名下拉
-        getstaff({
-            compId: sessionStorage.getItem('ws-pf_compId')
-          })
-          .toPromise()
-          .then(response => {
-            this.options = response
-            this.staffList = response
-          }),
-          //车型
-          packList({
-            constId: 'TRAN5'
-          })
+          }
+        })
+      //司机姓名下拉
+      getstaff({
+        compId: sessionStorage.getItem('ws-pf_compId'),
+      })
+        .toPromise()
+        .then((response) => {
+          this.options = response
+          this.staffList = response
+        }),
+        //车型
+        packList({
+          constId: 'TRAN5',
+        })
           .toPromise()
-          .then(response => {
+          .then((response) => {
             this.carModel = response
           })
-      },
-      handleExamine() {},
-      approve() {},
-      // returnsales() {
-      //   this.$router.push({ path: 'purchaseContract' })
-      // },
-      selectChapterTwo(e) {
-        for (var i = 0; i < this.ChapterTwoList.length; i++) {
-          if (this.ChapterTwoList[i].constValue == e) {
-            this.deptBudgetList.gradeKey = this.ChapterTwoList[i].constKey
-          }
-        }
-      },
-      selectunitList(e) {
-        for (var i = 0; i < this.unitList.length; i++) {
-          if (this.unitList[i].constValue == e) {
-            this.deptBudgetList.acceptanceMethodKey = this.unitList[i].constKey
-          }
+    },
+    handleExamine() {},
+    approve() {},
+    // returnsales() {
+    //   this.$router.push({ path: 'purchaseContract' })
+    // },
+    selectChapterTwo(e) {
+      for (var i = 0; i < this.ChapterTwoList.length; i++) {
+        if (this.ChapterTwoList[i].constValue == e) {
+          this.deptBudgetList.gradeKey = this.ChapterTwoList[i].constKey
         }
-      },
-      selectgrade(e) {
-        for (var i = 0; i < this.gradeList.length; i++) {
-          if (this.gradeList[i].constValue == e) {
-            this.deptBudgetList.gradeKey = this.gradeList[i].constKey
-          }
+      }
+    },
+    selectunitList(e) {
+      for (var i = 0; i < this.unitList.length; i++) {
+        if (this.unitList[i].constValue == e) {
+          this.deptBudgetList.acceptanceMethodKey = this.unitList[i].constKey
         }
-      },
-      selectgoodsName(e) {
-        for (var i = 0; i < this.goodnameList.length; i++) {
-          if (this.goodnameList[i].constValue == e) {
-            this.deptBudgetList.goodsNameKey = this.goodnameList[i].constKey
-          }
+      }
+    },
+    selectgrade(e) {
+      for (var i = 0; i < this.gradeList.length; i++) {
+        if (this.gradeList[i].constValue == e) {
+          this.deptBudgetList.gradeKey = this.gradeList[i].constKey
         }
-      },
-      selectpackingMethod(e) {
-        for (var i = 0; i < this.packtypeList.length; i++) {
-          if (this.packtypeList[i].constValue == e) {
-            this.deptBudgetList.packingMethodKey = this.packtypeList[i].constKey
-          }
+      }
+    },
+    selectgoodsName(e) {
+      for (var i = 0; i < this.goodnameList.length; i++) {
+        if (this.goodnameList[i].constValue == e) {
+          this.deptBudgetList.goodsNameKey = this.goodnameList[i].constKey
         }
-      },
-      uploadSuccessHandle1(e) {
-        this.pictureTotal++;
-        if (this.deptBudgetList.tranCarInfoList[0].loadPoundImg) {
-          this.deptBudgetList.tranCarInfoList[0].loadPoundImg += ',' + e.url
-        } else {
-          this.deptBudgetList.tranCarInfoList[0].loadPoundImg = e.url
+      }
+    },
+    selectpackingMethod(e) {
+      for (var i = 0; i < this.packtypeList.length; i++) {
+        if (this.packtypeList[i].constValue == e) {
+          this.deptBudgetList.packingMethodKey = this.packtypeList[i].constKey
         }
-
-        console.log(this.deptBudgetList.tranCarInfoList, "duixiang1")
-        feedback(this.deptBudgetList)
-          .toPromise()
-          .then(response => {})
       }
-    }
-  }
+    },
+    uploadSuccessHandle1(e) {
+      this.pictureTotal++
+      if (this.deptBudgetList.tranCarInfoList[0].loadPoundImg) {
+        this.deptBudgetList.tranCarInfoList[0].loadPoundImg += ',' + e.url
+      } else {
+        this.deptBudgetList.tranCarInfoList[0].loadPoundImg = e.url
+      }
+
+      console.log(this.deptBudgetList.tranCarInfoList, 'duixiang1')
+      feedback(this.deptBudgetList)
+        .toPromise()
+        .then((response) => {})
+    },
+  },
+}
 </script>
 
 <style lang="scss" scoped>
-  /deep/.totalStorage .el-input__inner {
-    color: #afb5cb;
-    background: #f5f7fa;
-  }
-
-  .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;
-  }
-
-  .position {
-    position: relative;
-  }
-
-  .del {
-    position: absolute;
-    right: -38px;
-    top: 14px;
-    cursor: pointer;
-    right: 0;
-    display: inline-block;
-    font-size: 26px;
-    width: 26px;
-    height: 10px;
-    line-height: 0px;
-  }
-
-  .amap-page-container {
-    width: 300px;
-    height: 300px;
-  }
-
-  .el-form {
-    padding: 0 10%;
-  }
-
-  /deep/.ws-info-table .el-form-item {
-    border-right: 1px solid transparent;
-    border-bottom: 1px solid transparent;
-  }
-
-  .readonly {
-    position: relative;
-  }
-
-  .readonly:after {
-    content: '*';
-    color: #ff2727;
-    position: absolute;
-    right: 8px;
-    z-index: 10;
-    top: 21%;
-    font-size: 20px;
-  }
-
-  .title {
-    position: relative;
-  }
-
-  .title::before {
-    content: '';
-    display: inline-block;
-    width: 5px;
-    height: 30px;
-    background: #5473e8;
-    position: absolute;
-    left: 0;
-  }
-
-  .el-button--primary {
-    background-color: #5878e8;
-    border-color: #5878e8;
-  }
-
-  .el-col {
-    background: #f6f7fc;
-  }
-
-  /deep/.ws-info-table .el-form-item .el-form-item__content {
-    padding: 0 25px;
-    border-left: 1px solid transparent;
-    background: #fff;
-    display: flex;
-  }
-
-  /deep/.ws-info-table .el-form-item .el-form-item__label {
-    width: 100px;
-    text-align: center;
-    background: #fff;
-    // border: 1px solid #cdd2dc;
-  }
-
-  .button-container {
+/deep/.totalStorage .el-input__inner {
+  color: #afb5cb;
+  background: #f5f7fa;
+}
+
+.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;
+}
+
+.position {
+  position: relative;
+}
+
+.del {
+  position: absolute;
+  right: -38px;
+  top: 14px;
+  cursor: pointer;
+  right: 0;
+  display: inline-block;
+  font-size: 26px;
+  width: 26px;
+  height: 10px;
+  line-height: 0px;
+}
+
+.amap-page-container {
+  width: 300px;
+  height: 300px;
+}
+
+.el-form {
+  padding: 0 10%;
+}
+
+/deep/.ws-info-table .el-form-item {
+  border-right: 1px solid transparent;
+  border-bottom: 1px solid transparent;
+}
+
+.readonly {
+  position: relative;
+}
+
+.readonly:after {
+  content: '*';
+  color: #ff2727;
+  position: absolute;
+  right: 8px;
+  z-index: 10;
+  top: 21%;
+  font-size: 20px;
+}
+
+.title {
+  position: relative;
+}
+
+.title::before {
+  content: '';
+  display: inline-block;
+  width: 5px;
+  height: 30px;
+  background: #5473e8;
+  position: absolute;
+  left: 0;
+}
+
+.el-button--primary {
+  background-color: #5878e8;
+  border-color: #5878e8;
+}
+
+.el-col {
+  background: #f6f7fc;
+}
+
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  padding: 0 25px;
+  border-left: 1px solid transparent;
+  background: #fff;
+  display: flex;
+}
+
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+  width: 100px;
+  text-align: center;
+  background: #fff;
+  // border: 1px solid #cdd2dc;
+}
+
+.button-container {
+  display: flex;
+  flex-wrap: nowrap;
+  justify-content: space-between;
+  align-items: center;
+  background-color: #fff;
+  width: 100%;
+  height: 50px;
+  padding: 0 10px;
+
+  & > div {
+    margin-left: 10px;
     display: flex;
     flex-wrap: nowrap;
-    justify-content: space-between;
-    align-items: center;
-    background-color: #fff;
-    width: 100%;
-    height: 50px;
-    padding: 0 10px;
-
-    &>div {
-      margin-left: 10px;
-      display: flex;
-      flex-wrap: nowrap;
-      flex-direction: row;
-
-      &>span {
-        line-height: 50px;
-      }
-    }
-
-    /deep/.auditFlow-box {
-      position: unset;
-      margin-left: 10px;
+    flex-direction: row;
 
-      &/deep/.auditFlow-icon {
-        width: auto;
-        padding-right: 30px;
-      }
-
-      &/deep/.auditFlow-main {
-        position: absolute;
-      }
+    & > span {
+      line-height: 50px;
     }
   }
 
-  .box-app {
-    display: inline-block;
-    float: left;
-    margin-left: 30px;
-    line-height: 50px;
-  }
-
-  /deep/.el-dialog {
-    .el-form-item {
-      margin-bottom: 0 !important;
+  /deep/.auditFlow-box {
+    position: unset;
+    margin-left: 10px;
 
-      .el-input--medium {
-        textarea {
-          min-height: 100px !important;
-        }
-      }
+    &/deep/.auditFlow-icon {
+      width: auto;
+      padding-right: 30px;
     }
-  }
 
-  .collapse-bottom {
-    margin-bottom: 20px;
-  }
-
-  .input-main .textarea .el-textarea__inner {
-    width: 100%;
-    z-index: 1;
-  }
-
-  .bg-left {
-    padding-left: 30px;
-  }
-
-  .bg-right {
-    padding-right: 10px;
-    text-align: right;
-  }
-
-  .bg-bottom {
-    margin: 15px 0px;
-  }
-
-  .wenzi {
-    width: 900px;
-    margin: 0 auto;
-  }
-
-  .wenzi h3 {
-    display: inline-block;
-    left: 10px;
+    &/deep/.auditFlow-main {
+      position: absolute;
+    }
   }
+}
 
-  .wenzi p {
-    display: inline-block;
-  }
+.box-app {
+  display: inline-block;
+  float: left;
+  margin-left: 30px;
+  line-height: 50px;
+}
 
-  .center {
-    width: 900px;
-    margin: 0 auto;
-  }
+/deep/.el-dialog {
+  .el-form-item {
+    margin-bottom: 0 !important;
 
-  .center1 {
-    width: 100px;
-    margin: 0 auto;
-    margin-top: -2%;
+    .el-input--medium {
+      textarea {
+        min-height: 100px !important;
+      }
+    }
   }
-
-  .el-form-item {
-    width: 50%;
+}
+
+.collapse-bottom {
+  margin-bottom: 20px;
+}
+
+.input-main .textarea .el-textarea__inner {
+  width: 100%;
+  z-index: 1;
+}
+
+.bg-left {
+  padding-left: 30px;
+}
+
+.bg-right {
+  padding-right: 10px;
+  text-align: right;
+}
+
+.bg-bottom {
+  margin: 15px 0px;
+}
+
+.wenzi {
+  width: 900px;
+  margin: 0 auto;
+}
+
+.wenzi h3 {
+  display: inline-block;
+  left: 10px;
+}
+
+.wenzi p {
+  display: inline-block;
+}
+
+.center {
+  width: 900px;
+  margin: 0 auto;
+}
+
+.center1 {
+  width: 100px;
+  margin: 0 auto;
+  margin-top: -2%;
+}
+
+.el-form-item {
+  width: 50%;
+}
+
+.el-form-item__label {
+  text-align: center;
+}
+
+.ce {
+  width: 900px;
+  margin: 0 auto;
+}
+
+/*.crt-main .textarea /deep/ .el-form-item__label {*/
+/*  height: 82px;*/
+/*}*/
+// 控制select为只读的时候显示样式
+
+.hide-sel {
+  .el-input__inner {
+    border: 0px;
   }
 
-  .el-form-item__label {
-    text-align: center;
+  .el-icon-arrow-up {
+    display: none;
   }
 
-  .ce {
-    width: 900px;
-    margin: 0 auto;
+  .el-textarea__inner {
+    background-color: #fff !important;
+    border: 0;
   }
 
-  /*.crt-main .textarea /deep/ .el-form-item__label {*/
-  /*  height: 82px;*/
-  /*}*/
-  // 控制select为只读的时候显示样式
-
-  .hide-sel {
-    .el-input__inner {
-      border: 0px;
-    }
-
-    .el-icon-arrow-up {
+  .el-date-editor {
+    i {
       display: none;
     }
-
-    .el-textarea__inner {
-      background-color: #fff !important;
-      border: 0;
-    }
-
-    .el-date-editor {
-      i {
-        display: none;
-      }
-    }
-
-    // .is-disabled {
-    //   .el-input__inner:hover {
-    //     background-color: #fff !important;
-    //     border: 0;
-    //   }
-    //   color: #606266;
-    //   .el-input__inner {
-    //     background-color: #fff !important;
-    //     border: 0;
-    //     color: #606266;
-    //   }
-    //   .el-textarea__inner {
-    //     background-color: #fff !important;
-    //     border: 0;
-    //     color: #606266;
-    //   }
-    // }
-  }
-
-  // 控制select为只读的时候显示样式
-  /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;
+  // .is-disabled {
+  //   .el-input__inner:hover {
+  //     background-color: #fff !important;
+  //     border: 0;
   //   }
+  //   color: #606266;
   //   .el-input__inner {
-  //     background-color: #fff;
-  //     border-color: #fff !important;
-  //     color: #000 !important;
-  //     font-size: 14px;
-  //     cursor: text;
-  //     padding: 0 !important;
+  //     background-color: #fff !important;
+  //     border: 0;
+  //     color: #606266;
+  //   }
+  //   .el-textarea__inner {
+  //     background-color: #fff !important;
+  //     border: 0;
+  //     color: #606266;
   //   }
   // }
-  .winseaview-view {
-    padding: 0 0 20px;
-  }
-
-  .container {
-    overflow: scroll;
-    height: 93vh;
-  }
-
-  .ws-info-table .el-form-item {
-    width: 33.3333%;
-  }
+}
 
-  .readonly:after {
-    display: none;
-  }
-
-  .el-textarea__inner {
-    display: none;
-  }
-
-  .el-form {
-    margin-top: 50px;
-  }
-
-  .readonly {
-    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: none;
-  }
-
-  /deep/.ws-info-table .el-form-item {
-    border: none;
-    height: 50px;
-  }
-
-  /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: 13px;
-    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;
-  }
+// 控制select为只读的时候显示样式
+/deep/.ws-class-table-col {
+  height: auto;
+  padding: 0px 2px;
 
-  //联络员及车次
-  /deep/.liaison .ws-info-table .el-form-item {
-    width: 19%;
-  }
-
-  /deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
-    width: 37%;
-    background: #f6f7fc;
-  }
-
-  /deep/.liaison .ws-info-table {
-    width: 100%;
-    background: #f6f7fc;
-    border-radius: 4px;
-    border: 1px solid #d8dce6;
-    margin-top: 20px;
-  }
-
-  .catNos {
-    width: 100%;
-    height: 30px;
-    margin-top: 10px;
-    margin-left: 20px;
-    font-size: 14px;
-  }
-
-  .catNosCor {
-    color: #5473e8;
-  }
-
-  .add {
-    width: 130px;
-    height: 34px;
-    background: #f6f7fb;
-    border-radius: 17px;
-    color: #5473e8;
-    font-size: 14px;
-    border: none;
-  }
-
-  .add img {
-    display: inline-block;
-    margin-top: 3px;
-    margin-left: -30px;
-  }
-
-  .add .spans {
-    display: table-caption;
-    width: 56px;
-    height: 20px;
-    line-height: 18px;
-  }
-
-  .signStatus {
-    height: 25px;
-    border-radius: 3px;
-    border: 1px solid #5473e8;
-    padding: 0 3px;
-    color: #ffffff;
-    background: #c4cada;
-    line-height: 24px;
-    margin-left: 18px;
-  }
-
-  .signStatus1 {
-    height: 25px;
-    background: #e6ebff;
-    border-radius: 3px;
-    border: 1px solid #5473e8;
-    padding: 0 3px;
-    margin-left: 18px;
-    color: #5473e8;
-    line-height: 24px;
-  }
-
-  .line {
-    height: 26px;
-    margin-top: 6px;
-    left: 2px;
-  }
-
-  /deep/.liaison .ws-info-table .el-form-item .el-form-item__content {
-    padding: 0px;
-  }
-
-  .noservice {
-    background: #c4cada;
-    color: #ffffff;
-    padding: 5px 7px;
-    border-radius: 4px;
-  }
-
-  .service {
-    background: #e5f1f7;
-    color: #50cad4;
-  }
-
-  .tupian {
-    // margin-left: 14%;
-    // margin-top: -7%;
-  }
-
-  /deep/.el-input--suffix .el-input__inner {
-    padding-right: 0px;
-  }
-
-  .liaison {
-    margin-bottom: 20px;
-  }
-
-  .yd-bottom {
-    display: flex;
-    justify-content: space-between;
-  }
-
-  .yd-bottom-left {
-    display: flex;
-  }
-
-  .avatar-uploader {
-    margin-right: 10px;
-  }
-
-  /deep/.yd-bottom-left .el-form-item__content {
-    display: flex;
+  /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;
+//   }
+// }
+.winseaview-view {
+  padding: 0 0 20px;
+}
+
+.container {
+  overflow: scroll;
+  height: 93vh;
+}
+
+.ws-info-table .el-form-item {
+  width: 33.3333%;
+}
+
+.readonly:after {
+  display: none;
+}
+
+.el-textarea__inner {
+  display: none;
+}
+
+.el-form {
+  margin-top: 50px;
+}
+
+.readonly {
+  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: none;
+}
+
+/deep/.ws-info-table .el-form-item {
+  border: none;
+  height: 50px;
+}
+
+/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: 13px;
+  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/.liaison .ws-info-table .el-form-item {
+  width: 19%;
+}
+
+/deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
+  width: 37%;
+  background: #f6f7fc;
+}
+
+/deep/.liaison .ws-info-table {
+  width: 100%;
+  background: #f6f7fc;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  margin-top: 20px;
+}
+
+.catNos {
+  width: 100%;
+  height: 30px;
+  margin-top: 10px;
+  margin-left: 20px;
+  font-size: 14px;
+}
+
+.catNosCor {
+  color: #5473e8;
+}
+
+.add {
+  width: 130px;
+  height: 34px;
+  background: #f6f7fb;
+  border-radius: 17px;
+  color: #5473e8;
+  font-size: 14px;
+  border: none;
+}
+
+.add img {
+  display: inline-block;
+  margin-top: 3px;
+  margin-left: -30px;
+}
+
+.add .spans {
+  display: table-caption;
+  width: 56px;
+  height: 20px;
+  line-height: 18px;
+}
+
+.signStatus {
+  height: 25px;
+  border-radius: 3px;
+  border: 1px solid #5473e8;
+  padding: 0 3px;
+  color: #ffffff;
+  background: #c4cada;
+  line-height: 24px;
+  margin-left: 18px;
+}
+
+.signStatus1 {
+  height: 25px;
+  background: #e6ebff;
+  border-radius: 3px;
+  border: 1px solid #5473e8;
+  padding: 0 3px;
+  margin-left: 18px;
+  color: #5473e8;
+  line-height: 24px;
+}
+
+.line {
+  height: 26px;
+  margin-top: 6px;
+  left: 2px;
+}
+
+/deep/.liaison .ws-info-table .el-form-item .el-form-item__content {
+  padding: 0px;
+}
+
+.noservice {
+  background: #c4cada;
+  color: #ffffff;
+  padding: 5px 7px;
+  border-radius: 4px;
+}
+
+.service {
+  background: #e5f1f7;
+  color: #50cad4;
+}
+
+.tupian {
+  // margin-left: 14%;
+  // margin-top: -7%;
+}
+
+/deep/.el-input--suffix .el-input__inner {
+  padding-right: 0px;
+}
+
+.liaison {
+  margin-bottom: 20px;
+}
+
+.yd-bottom {
+  display: flex;
+  justify-content: space-between;
+}
+
+.yd-bottom-left {
+  display: flex;
+}
+
+.avatar-uploader {
+  margin-right: 10px;
+}
+
+/deep/.yd-bottom-left .el-form-item__content {
+  display: flex;
+}
 </style>

+ 60 - 65
src/views/tranManagement/tranManagementUnShippingFeedback.vue

@@ -268,16 +268,6 @@
                 value-format="yyyy-MM-dd"
               />
             </el-form-item>
-            <div style="text-align: right; padding: 10px" class="center1">
-              <el-button
-                v-show="item.status == '已装车'"
-                class="bg-bottom"
-                type="primary"
-                size="small"
-                @click="submit(deptBudgetList)"
-                >提交</el-button
-              >
-            </div>
             <div v-show="item.signStatus == '未签合同'" class="signStatus">
               {{ item.signStatus }}
             </div>
@@ -345,6 +335,13 @@
     </ws-form>
     <!-- 完货 -->
     <div style="text-align: right; padding: 10px" class="center">
+      <el-button
+                class="bg-bottom"
+                type="primary"
+                size="small"
+                @click="submit(deptBudgetList)"
+                >提交</el-button
+              >
       <el-button
         class="bg-bottom"
         type="primary"
@@ -691,42 +688,41 @@ export default {
         })
     },
     submit() {
-      // if (!this.freightspace[i].receiveDateEnd) {
-      //   this.$message({
-      //     message: '到港日期不能为空!',
-      //     type: 'warning',
-      //   })
-      //   return
-      // }
-      // if (!this.freightspace[i].unloadNetWeight) {
-      //   this.$message({
-      //     message: '卸船净重不能为空!',
-      //     type: 'warning',
-      //   })
-      //   return
-      // }
-      // if (
-      //   (this.freightspace[i].unloadNetWeight &&
-      //     String(this.freightspace[i].unloadNetWeight).indexOf('.') != -1 &&
-      //     String(this.freightspace[i].unloadNetWeight).length -
-      //       (String(this.freightspace[i].unloadNetWeight).indexOf('.') + 1) >
-      //       2) ||
-      //   this.freightspace[i].unloadNetWeight > 10000 ||
-      //   this.freightspace[i].unloadNetWeight < 0
-      // ) {
-      //   this.$message({
-      //     message: '卸船净重输入错误',
-      //     type: 'warning',
-      //   })
-      //   return
-      // }
-      // if (!this.freightspace[i].unloadingDate) {
-      //   this.$message({
-      //     message: '卸船日期不能为空!',
-      //     type: 'warning',
-      //   })
-      //   return
-      // }
+      for(let i = 0 ; i < this.freightspace.length ; i++){
+        if(this.freightspace[i].shipType == '集装箱'){
+            if (!this.freightspace[i].unloadNetWeight) {
+        this.$message({
+          message: '卸船净重不能为空!',
+          type: 'warning',
+        })
+        return
+      }
+      if (
+        (this.freightspace[i].unloadNetWeight &&
+          String(this.freightspace[i].unloadNetWeight).indexOf('.') != -1 &&
+          String(this.freightspace[i].unloadNetWeight).length -
+            (String(this.freightspace[i].unloadNetWeight).indexOf('.') + 1) >
+            2) ||
+        this.freightspace[i].unloadNetWeight > 10000 ||
+        this.freightspace[i].unloadNetWeight < 0
+      ) {
+        this.$message({
+          message: '卸船净重输入错误',
+          type: 'warning',
+        })
+        return
+      }
+      if (!this.freightspace[i].unloadingDate) {
+        this.$message({
+          message: '卸船日期不能为空!',
+          type: 'warning',
+        })
+        return
+      }
+
+        }
+      }
+      
       this.$confirm(`提交成功后装船信息不可修改,是否确定提交?`, {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -736,29 +732,28 @@ export default {
           this.$refs.deptBudgetList.validate((valid) => {
             if (valid) {
               // this.deptBudgetList.totalStorage = this.totalStorage
-              this.tranCarInfoList = this.freightspace
-              this.tranCarInfoList.driver = this.deptBudgetList.driver
-              this.tranCarInfoList.driverPhone = this.deptBudgetList.driverPhone
-              this.tranCarInfoList[0].sendDateStart =
-                this.deptBudgetList.sendDateStart
-              this.tranCarInfoList.receiveDateEnd =
-                this.deptBudgetList.receiveDateEnd
-              this.tranCarInfoList.shipName = this.deptBudgetList.shipName
-              this.tranCarInfoList.shipNo = this.shipNo
-              this.tranCarInfoList.shipType = this.deptBudgetList.shipType
-              this.tranCarInfoList.boxNumber = this.deptBudgetList.boxNumber
-              this.tranCarInfoList.unloadingDate =
-                this.deptBudgetList.unloadingDate
-              // this.tranCarInfoList.boxNo = this.arr.toString()
-              for (var i = 0; i < this.tranCarInfoList.length; i++) {
-                this.tranCarInfoList[i].id = this.freightspace[i].id
-              }
+              // this.tranCarInfoList = this.freightspace
+              // this.tranCarInfoList.driver = this.deptBudgetList.driver
+              // this.tranCarInfoList.driverPhone = this.deptBudgetList.driverPhone
+              // this.tranCarInfoList[0].sendDateStart =
+              //   this.deptBudgetList.sendDateStart
+              // this.tranCarInfoList.receiveDateEnd =
+              //   this.deptBudgetList.receiveDateEnd
+              // this.tranCarInfoList.shipName = this.deptBudgetList.shipName
+              // this.tranCarInfoList.shipNo = this.shipNo
+              // this.tranCarInfoList.shipType = this.deptBudgetList.shipType
+              // this.tranCarInfoList.boxNumber = this.deptBudgetList.boxNumber
+              // this.tranCarInfoList.unloadingDate =
+              //   this.deptBudgetList.unloadingDate
+              // // this.tranCarInfoList.boxNo = this.arr.toString()
+              // for (var i = 0; i < this.tranCarInfoList.length; i++) {
+              //   this.tranCarInfoList[i].id = this.freightspace[i].id
+              // }
               var tranProcessInfo = {}
               tranProcessInfo.id = this.deptBudgetList.id
               tranProcessInfo.infoId = this.deptBudgetList.infoId
               tranProcessInfo.processNo = this.deptBudgetList.processNo
-              tranProcessInfo.tranCarInfoList = this.tranCarInfoList
-              // dispatchCat({tranCarInfo:{tranCarInfoList:[this.tranCarInfoList],id:this.deptBudgetList.id}
+              tranProcessInfo.tranCarInfoList = this.freightspace
               feedback(tranProcessInfo)
                 .toPromise()
                 .then((response) => {

+ 1 - 1
vue.config.js

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