huangfuli 3 лет назад
Родитель
Сommit
5c15306c0d

+ 279 - 199
src/views/tranManagement/tranManagementShippingFeedback.vue

@@ -90,25 +90,19 @@
         </ws-form-item>
       </ws-info-table>
       <div class="small-title" style="font-size: 16px">联络员及航次</div>
-      <div
-          style="width: 100%"
-          class="flex position"
-          v-for="(item, index) in this.freightspace"
-          :key="index"
-        >
       <ws-info-table>
         <!-- 姓名 -->
         <ws-form-item label="姓名" span="1" prop="driver">
-          {{ item.driver }}
+          {{ deptBudgetList.driver }}
         </ws-form-item>
         <!-- 电话 -->
         <ws-form-item label="电话" span="1" prop="driverPhone">
-          {{ item.driverPhone }}
+          {{ deptBudgetList.driverPhone }}
         </ws-form-item>
         <!--发船日期-->
         <ws-form-item label="发船日期" span="1" prop="sendDateStart">
           <ws-date-picker
-            v-model="item.sendDateStart"
+            v-model="deptBudgetList.sendDateStart"
             type="date"
             placeholder="请选择发船日期"
             value-format="yyyy-MM-dd"
@@ -116,37 +110,43 @@
         </ws-form-item>
         <!-- 预计到港日期 -->
         <ws-form-item label="预计到港日期" span="1" prop="receiveDateEnd">
-          {{ item.receiveDateEnd }}
+          {{ deptBudgetList.receiveDateEnd }}
         </ws-form-item>
         <!-- 船名 -->
         <ws-form-item label="船名" span="1" prop="shipName">
-          {{ item.shipName }}
+          {{ deptBudgetList.shipName }}
         </ws-form-item>
         <!-- 航次 -->
         <ws-form-item label="航次" span="1" prop="shipNo">
-          {{ item.shipNo }}
+          {{ deptBudgetList.shipNo }}
         </ws-form-item>
         <!-- 类型 -->
         <ws-form-item label="类型" span="1" prop="shipType">
-          {{ item.shipType }}
+          {{ deptBudgetList.shipType }}
         </ws-form-item>
         <!-- 数量 -->
-        <ws-form-item label="数量" span="1" prop="boxNumber" v-if="item.shipType == '集装箱'">
-          {{ item.boxNumber  }}
+        <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 style="font-size: 16px; width: 50%; float: left; text-align: right">
+        <el-button
+          class="bg-bottom"
+          type="primary"
+          size="small"
+          @click="import(deptBudgetList)"
+          >导入</el-button
+        >
       </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;">
-      <el-button
-        class="bg-bottom"
-        type="primary"
-        size="small"
-        @click="import(deptBudgetList)"
-        >导入</el-button
-      >
-    </div>
       <div class="liaison">
         <div
           style="width: 100%"
@@ -157,55 +157,82 @@
           <ws-info-table>
             <div class="catNos" v-if="item.shipType == '集装箱'">
               集装箱-{{ index + 1 }}
-              <span class="noservice" v-show="item.status == '未装船'">{{
-                  item.status
-                }}</span>
-                <span class="service" v-show="item.status == '已装船'">{{
-                  item.status
-                }}</span>
-                 <span class="serviced" v-show="item.status == '已送达'">{{
-                  item.status
+              <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               
                 }}</span>
             </div>
             <div class="catNos" v-if="item.shipType == '散船'">
               仓位号-{{ index + 1 }}
-              <span class="noservice" v-show="item.status == '未装船'">{{
-                  item.status
-                }}</span>
-                <span class="service" v-show="item.status == '已装船'">{{
-                  item.status
-                }}</span>
-                 <span class="serviced" v-show="item.status == '已送达'">{{
-                  item.status
+              <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               
                 }}</span>
             </div>
             <!--箱号-->
-            <el-form-item label="箱号"  prop="caseNo" v-if="item.shipType == '集装箱'">
-              <el-input 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-form-item>
             <!--封号-->
-            <el-form-item label="封号" prop="titleNo" v-if="item.shipType == '集装箱'">
-              <el-input 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-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 == '已送达'" 
+                v-if="item.status == '已装车' || item.status == '已送达'"
                 :disabled="readonly"
                 v-model="item.loadNetWeight"
                 placeholder="请输入装船净重"
                 maxlength="20"
                 size="small"
               />
-               <ws-input
+              <ws-input
                 v-else
                 v-model="item.loadNetWeight"
                 placeholder="请输入装船净重"
@@ -214,31 +241,46 @@
               />
             </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 v-show="item.temporaryDriverFlag == 0 && item.signStatus == '未签合同'" class="signStatus">
+            <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>
-                <div v-show="item.temporaryDriverFlag == 0 && item.signStatus == '已签合同'" class="signStatus1">
+                <div v-show=" item.signStatus == '已签合同'" class="signStatus1">
                   {{ item.signStatus }}
-                </div> -->
+                </div>
             <span
               width="22"
               height="22"
@@ -254,57 +296,57 @@
       <div style="text-align: right; color: #8890b1; font-size: 16px">
         合计(吨):{{ total }}/{{ deptBudgetList.weight }}
         <!--阶段状态-->
-         <span class="noservice" v-show="deptBudgetList.feedbackStatus=='执行中'">
+        <span
+          class="noservice"
+          v-show="deptBudgetList.feedbackStatus == '执行中'"
+        >
           未完货
         </span>
-        <span class="service" v-show="deptBudgetList.feedbackStatus=='已完货'">{{
-          deptBudgetList.feedbackStatus
-        }}</span>
+        <span
+          class="service"
+          v-show="deptBudgetList.feedbackStatus == '已完货'"
+          >{{ deptBudgetList.feedbackStatus }}</span
+        >
       </div>
       <!--运单-->
-            <ws-form-item label="运单:" span="1" prop="loadPoundImg">
-              <!-- slot-scope="scope" -->
-              <template >
-                <el-upload
-                  action="https://www.zthymaoyi.com/upload/admin"
-                  :show-file-list="false"
-                  :on-success=" (res) => { uploadSuccessHandle1(res,index)}"
-                  class="avatar-uploader"
-                  accept=".jpg, .jpeg, .png, .gif"
-                  ><img
-                    width="18"
-                    height="20"
-                    style="
-                      vertical-align: text-top;
-                      position: relative;
-                    "
-                    src="../../../public/img/fujian.png"
-                    alt=""
-                  />
-                </el-upload>
-                 <!-- <span v-if="deptBudgetList.tranCarInfoList[index].loadPoundImg != null " >1</span>
-                 <span
-                  v-if="
-                    deptBudgetList.tranCarInfoList[index].loadPoundImg == null
-                  "
-                  >未上传</span> -->
-              </template>
-            </ws-form-item>
+      <!-- <div
+          style="width: 100%"
+          class="flex position"
+          v-for="(item, index) in this.freightspace"
+          :key="index"
+        > -->
+      <ws-form-item label="运单:" span="1" prop="loadPoundImg">
+        <!-- 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"
+            ><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[0].loadPoundImg != null " >1</span>
+          <span v-if="deptBudgetList.tranCarInfoList[0].loadPoundImg == null ">未上传</span>
+          </div>
+        </template>       
+      </ws-form-item>
+      <!-- </div> -->
     </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"
-        size="small"
-        @click="finished (deptBudgetList)"
+        @click="finished(deptBudgetList)"
         >完货</el-button
       >
     </div>
@@ -336,7 +378,7 @@ export default {
         totalStorage: 0,
       },
       tranCarInfoList: {
-        driver:'',
+        loadPoundImg: '',
       },
       options_: regionData,
       heightData: '600px',
@@ -371,25 +413,14 @@ export default {
       size: 10,
       value1: '',
       unitList: [],
-
-      freightspace1: [
-        {
-          accountTypeFlag: '1',
-          payeeName: '',
-          payeeNumberCard: '',
-          compName: '',
-          bankDeposit: '',
-          addressUrlArray: [],
-          bankCard: '',
-        },
-      ],
       freightspace: [
         {
-          driver: '',
-          driverPhone: '',
-          carNo: '',
+          caseNo: '',
+          titleNo: '',
+          binNumber: '',
+          positionWeight: '',
           loadNetWeight: '',
-          loadPoundImg: '',
+          loadingDate: '',
         },
         // {loadPoundImg:{}},
       ],
@@ -473,14 +504,14 @@ export default {
     handleClose() {
       this.dialogViewSpareMoney = false
     },
-    add() {
-      this.freightspace.push({
-        driver: '',
-        driverPhone: '',
-        carNo: '',
-        loadNetWeight: '',
-      })
-    },
+    // add() {
+    //   this.freightspace.push({
+    //     driver: '',
+    //     driverPhone: '',
+    //     carNo: '',
+    //     loadNetWeight: '',
+    //   })
+    // },
     del(index) {
       if (this.freightspace.length > 1) {
         this.freightspace.splice(index, 1)
@@ -506,12 +537,10 @@ export default {
       this.accessoryTFs = false
     },
     //导入
-    import(){
-
-    },
+    import() {},
     //完货
-    finished(){
-       this.$confirm(`完货操作后,装船信息不可修改,是否确定完货?`, {
+    finished() {
+      this.$confirm(`完货操作后,装船信息不可修改,是否确定完货?`, {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning',
@@ -540,41 +569,78 @@ export default {
         .catch(() => {
           return false
         })
-
     },
     submit() {
-      for (var i = 0; i < this.freightspace.length; i++) {
-        if (this.freightspace[i].temporaryDriverFlag != 0) {
-          if (!this.freightspace[i].driver) {
-            this.$message({
-              message: '司机姓名不能为空!',
-              type: 'warning',
-            })
-            return
-          }
-          if (!this.freightspace[i].driverPhone) {
-            this.$message({
-              message: '司机电话不能为空!',
-              type: 'warning',
-            })
-            return
-          }
-          if (!this.freightspace[i].carNo) {
-            this.$message({
-              message: '车牌号不能为空!',
-              type: 'warning',
-            })
-            return
-          }
-          if (!this.freightspace[i].loadNetWeight) {
-            this.$message({
-              message: '装载净重不能为空!',
-              type: 'warning',
-            })
-            return
-          }
-        }
-      }
+      // 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: '取消',
@@ -587,26 +653,20 @@ export default {
               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.loadNetWeight =
-                this.deptBudgetList.loadNetWeight
-              this.tranCarInfoList.tranType = this.tranType
-              this.tranCarInfoList.loadPoundImg =
-                this.deptBudgetList.loadPoundImg
+              this.tranCarInfoList.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.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
               // dispatchCat({tranCarInfo:{tranCarInfoList:[this.tranCarInfoList],id:this.deptBudgetList.id}
               feedback(tranProcessInfo)
@@ -638,6 +698,17 @@ export default {
         .toPromise()
         .then((response) => {
           this.deptBudgetList = response
+          this.deptBudgetList.driver = response.tranCarInfoList[0].driver
+          this.deptBudgetList.driverPhone =
+            response.tranCarInfoList[0].driverPhone
+          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
           //  this.deptBudgetList.tranCarInfoList = response.tranCarInfoList
           this.freightspace = response.tranCarInfoList
           for (var i = 0; i < this.freightspace.length; i++) {
@@ -653,12 +724,12 @@ export default {
           this.options = response
           this.staffList = response
         }),
-      //车型
-      packList({ constId: 'TRAN5' })
-        .toPromise()
-        .then((response) => {
-          this.carModel = response
-        })
+        //车型
+        packList({ constId: 'TRAN5' })
+          .toPromise()
+          .then((response) => {
+            this.carModel = response
+          })
     },
     handleExamine() {},
     approve() {},
@@ -700,8 +771,8 @@ export default {
         }
       }
     },
-    uploadSuccessHandle1(e, index) {
-      this.freightspace[index].loadPoundImg = e.url
+    uploadSuccessHandle1(e) {
+      this.deptBudgetList.tranCarInfoList[0].loadPoundImg = e.url
     },
   },
 }
@@ -876,6 +947,11 @@ export default {
   width: 900px;
   margin: 0 auto;
 }
+.center1 {
+  width: 100px;
+  margin: 0 auto;
+  margin-top: -2%
+}
 .el-form-item {
   width: 50%;
 }
@@ -1099,4 +1175,8 @@ export default {
   background: #e5f1f7;
   color: #50cad4;
 }
+.tupian{
+  margin-left: 14%;
+  margin-top: -7%;
+}
 </style>

+ 73 - 74
src/views/tranManagement/tranManagementShippingFeedbackLook.vue

@@ -43,8 +43,7 @@
         </ws-form-item>
         <!--发货地址-->
         <ws-form-item label="发货地址" span="1" prop="sendDetailedAddress">
-          {{ deptBudgetList.sendPrivate }}{{ deptBudgetList.sendCity
-          }}{{ deptBudgetList.sendArea }}
+          {{ deptBudgetList.sendPrivate }}{{ deptBudgetList.sendCity}}{{ deptBudgetList.sendArea }}
         </ws-form-item>
         <!--发货人-->
         <ws-form-item label="发货人" span="1" prop="sender" class="readonly">
@@ -90,47 +89,40 @@
         </ws-form-item>
       </ws-info-table>
       <div class="small-title" style="font-size: 16px">联络员及航次</div>
-      <div
-          style="width: 100%"
-          class="flex position"
-          v-for="(item, index) in this.freightspace"
-          :key="index"
-        >
       <ws-info-table>
         <!-- 姓名 -->
         <ws-form-item label="姓名" span="1" prop="driver">
-          {{ item.driver }}
+          {{ deptBudgetList.driver }}
         </ws-form-item>
         <!-- 电话 -->
         <ws-form-item label="电话" span="1" prop="driverPhone">
-          {{ item.driverPhone }}
+          {{ deptBudgetList.driverPhone }}
         </ws-form-item>
         <!--发船日期-->
           <ws-form-item label="发船日期" span="1" prop="sendDateStart">
-            {{ item.sendDateStart }}
+            {{ deptBudgetList.sendDateStart }}
           </ws-form-item>
         <!-- 预计到港日期 -->
         <ws-form-item label="预计到港日期" span="1" prop="receiveDateEnd">
-          {{ item.receiveDateEnd }}
+          {{ deptBudgetList.receiveDateEnd }}
         </ws-form-item>
         <!-- 船名 -->
         <ws-form-item label="船名" span="1" prop="shipName">
-          {{ item.shipName }}
+          {{ deptBudgetList.shipName }}
         </ws-form-item>
         <!-- 航次 -->
         <ws-form-item label="航次" span="1" prop="shipNo">
-          {{ item.shipNo }}
+          {{ deptBudgetList.shipNo }}
         </ws-form-item>
         <!-- 类型 -->
         <ws-form-item label="类型" span="1" prop="shipType">
-          {{ item.shipType }}
+          {{ deptBudgetList.shipType }}
         </ws-form-item>
         <!-- 数量 -->
-        <ws-form-item label="数量" span="1" prop="tranType" v-if="item.shipType == '集装箱'">
-          {{ item.tranType }}
+        <ws-form-item label="数量" span="1" prop="tranType" v-if="deptBudgetList.shipType == '集装箱'">
+          {{ deptBudgetList.tranType }}
         </ws-form-item>
       </ws-info-table>     
-      </div>  
       <div class="small-title" style="font-size: 16px">装船详情</div>
       <div class="liaison">
         <div
@@ -142,26 +134,26 @@
           <ws-info-table>
            <div class="catNos" v-if="item.shipType == '集装箱'">
               集装箱-{{ index + 1 }}
-              <span class="noservice" v-show="item.status == '未装船'">{{
-                  item.status
-                }}</span>
-                <span class="service" v-show="item.status == '已装船'">{{
-                  item.status
-                }}</span>
-                 <span class="serviced" v-show="item.status == '已送达'">{{
-                  item.status
+              <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               
                 }}</span>
             </div>
             <div class="catNos" v-if="item.shipType == '散船'">
               仓位号-{{ index + 1 }}
-              <span class="noservice" v-show="item.status == '未装船'">{{
-                  item.status
-                }}</span>
-                <span class="service" v-show="item.status == '已装船'">{{
-                  item.status
-                }}</span>
-                 <span class="serviced" v-show="item.status == '已送达'">{{
-                  item.status
+              <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               
                 }}</span>
             </div>
             <!--箱号-->
@@ -219,31 +211,34 @@
       </div>
       <!--运单-->
             <ws-form-item label="运单:" span="1" prop="loadPoundImg">
-              <!-- slot-scope="scope" -->
-              <template >
-                <el-upload
-                  action="https://www.zthymaoyi.com/upload/admin"
-                  :show-file-list="false"
-                  :on-success=" (res) => { uploadSuccessHandle1(res,index)}"
-                  class="avatar-uploader"
-                  accept=".jpg, .jpeg, .png, .gif"
-                  ><img
-                    width="18"
-                    height="20"
-                    style="
-                      vertical-align: text-top;
-                      position: relative;
-                    "
-                    src="../../../public/img/fujian.png"
-                    alt=""
-                  />
-                </el-upload>
-                 <!-- <span v-if="deptBudgetList.tranCarInfoList[index].loadPoundImg != null " >1</span>
+             <template>
+                <img
+                  width="18"
+                  height="20"
+                  style="
+                    vertical-align: text-top;
+                    position: relative;
+                    top: -1px;
+                  "
+                  src="../../../public/img/fujian.png"
+                  @click="fujian()"
+                  alt=""
+                />
+                <span
+                  v-if="
+                    deptBudgetList.tranCarInfoList[0].loadPoundImgArr
+                      .length > 0
+                  "
+                  >{{
+                    deptBudgetList.tranCarInfoList[0].loadPoundImgArr.length
+                  }}</span
+                >
                  <span
                   v-if="
-                    deptBudgetList.tranCarInfoList[index].loadPoundImg == null
+                    deptBudgetList.tranCarInfoList[0].loadPoundImgArr
+                      .length == 0
                   "
-                  >未上传</span> -->
+                  >无</span>
               </template>
             </ws-form-item>  
     </ws-form>
@@ -385,20 +380,6 @@ export default {
         return 0
       }
     },
-    label1: function () {
-      //  for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
-      //   if (this.deptBudgetList.tranCarInfoList[i].temporaryDriverFlag == 0) {
-      //     return '司机名称'
-      //   }
-      //   else if (this.deptBudgetList.tranCarInfoList[i].temporaryDriverFlag == 1) {
-      //     // alert(this.deptBudgetList.tranCarInfoList[i].temporaryDriverFlag)
-      //     return '司机名称(临)'
-      //   }
-      //  }
-      return '(临)'
-
-      // item.temporaryDriverFlag == 0
-    },
   },
   methods: {
     marker: function (item) {
@@ -447,6 +428,14 @@ export default {
         .toPromise()
         .then((response) => {
           this.deptBudgetList = response
+          this.deptBudgetList.driver= response.tranCarInfoList[0].driver
+          this.deptBudgetList.driverPhone = response.tranCarInfoList[0].driverPhone
+          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
           //  this.deptBudgetList.tranCarInfoList = response.tranCarInfoList
           this.freightspace = response.tranCarInfoList
           for (var i = 0; i < this.freightspace.length; i++) {
@@ -500,10 +489,10 @@ export default {
       }
     },
     //上传
-    fujian(index) {
+    fujian(e) {
       if (
-        this.deptBudgetList.tranCarInfoList[index].loadPoundImg === null ||
-        this.deptBudgetList.tranCarInfoList[index].loadPoundImg === ''
+        this.deptBudgetList.tranCarInfoList[0].loadPoundImg === null ||
+        this.deptBudgetList.tranCarInfoList[0].loadPoundImg === ''
       ) {
         this.$message({
           message: '暂无附件!',
@@ -514,7 +503,7 @@ export default {
         this.accessoryTFs = true
       }
       this.appendixIdss =
-        this.deptBudgetList.tranCarInfoList[index].loadPoundImgArr
+        this.deptBudgetList.tranCarInfoList[0].loadPoundImgArr
     },
   },
 }
@@ -871,4 +860,14 @@ export default {
   background: #e5f1f7;
   color: #50cad4;
 }
+.forlist{
+  background-color: #F5F7FA;
+  border-radius: 10px;
+  width: 100%;
+  padding-left: 15px;
+  height: 35px;
+  line-height: 35px;
+  color: #C0C4CC;
+  font-size: 14px;
+}
 </style>

+ 221 - 175
src/views/tranManagement/tranManagementUnShippingFeedback.vue

@@ -90,25 +90,19 @@
         </ws-form-item>
       </ws-info-table>
       <div class="small-title" style="font-size: 16px">联络员及航次</div>
-      <div
-          style="width: 100%"
-          class="flex position"
-          v-for="(item, index) in this.freightspace"
-          :key="index"
-        >
       <ws-info-table>
         <!-- 姓名 -->
         <ws-form-item label="姓名" span="1" prop="driver">
-          {{ item.driver }}
+          {{ deptBudgetList.driver }}
         </ws-form-item>
         <!-- 电话 -->
         <ws-form-item label="电话" span="1" prop="driverPhone">
-          {{ item.driverPhone }}
+          {{ deptBudgetList.driverPhone }}
         </ws-form-item>
         <!--发船日期-->
         <ws-form-item label="发船日期" span="1" prop="sendDateStart">
           <ws-date-picker
-            v-model="item.sendDateStart"
+            v-model="deptBudgetList.sendDateStart"
             type="date"
             placeholder="请选择发船日期"
             value-format="yyyy-MM-dd"
@@ -116,37 +110,43 @@
         </ws-form-item>
         <!-- 到港日期 -->
         <ws-form-item label="到港日期" span="1" prop="receiveDateEnd">
-          {{ item.receiveDateEnd }}
+          {{ deptBudgetList.receiveDateEnd }}
         </ws-form-item>
         <!-- 船名 -->
         <ws-form-item label="船名" span="1" prop="shipName">
-          {{ item.shipName }}
+          {{ deptBudgetList.shipName }}
         </ws-form-item>
         <!-- 航次 -->
         <ws-form-item label="航次" span="1" prop="shipNo">
-          {{ item.shipNo }}
+          {{ deptBudgetList.shipNo }}
         </ws-form-item>
         <!-- 类型 -->
         <ws-form-item label="类型" span="1" prop="shipType">
-          {{ item.shipType }}
+          {{ deptBudgetList.shipType }}
         </ws-form-item>
         <!-- 数量 -->
-        <ws-form-item label="数量" span="1" prop="boxNumber" v-if="item.shipType == '集装箱'">
-          {{ item.boxNumber  }}
+        <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 style="font-size: 16px; width: 50%; float: left; text-align: right">
+        <el-button
+          class="bg-bottom"
+          type="primary"
+          size="small"
+          @click="import(deptBudgetList)"
+          >导入</el-button
+        >
       </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;">
-      <el-button
-        class="bg-bottom"
-        type="primary"
-        size="small"
-        @click="import(deptBudgetList)"
-        >导入</el-button
-      >
-    </div>
       <div class="liaison">
         <div
           style="width: 100%"
@@ -157,40 +157,52 @@
           <ws-info-table>
             <div class="catNos" v-if="item.shipType == '集装箱'">
               集装箱-{{ index + 1 }}
-              <span class="noservice" v-show="item.status == '未装船'">{{
-                  item.status
-                }}</span>
-                <span class="service" v-show="item.status == '已卸船'">{{
-                  item.status
-                }}</span>
-                 <span class="serviced" v-show="item.status == '已送达'">{{
-                  item.status
-                }}</span>
+              <span class="noservice" v-show="item.status == '未装车'">
+                未装船
+              </span>
+              <span class="noservice" v-show="item.status == '已装车'">
+                未卸船
+              </span>
+              <span class="service" v-show="item.status == '已送达'">
+                已卸船
+              </span>
             </div>
             <div class="catNos" v-if="item.shipType == '散船'">
               仓位号-{{ index + 1 }}
-              <span class="noservice" v-show="item.status == '未装船'">{{
-                  item.status
-                }}</span>
-                <span class="service" v-show="item.status == '已卸船'">{{
-                  item.status
-                }}</span>
-                 <span class="serviced" v-show="item.status == '已送达'">{{
-                  item.status
-                }}</span>
+              <span class="noservice" v-show="item.status == '未装车'">
+                未装船
+              </span>
+              <span class="noservice" v-show="item.status == '已装车'">
+                未卸船
+              </span>
+              <span class="service" v-show="item.status == '已送达'">
+                已卸船
+              </span>
             </div>
             <!--箱号-->
-            <el-form-item label="箱号"  prop="caseNo" v-if="item.shipType == '集装箱'">
+            <el-form-item
+              label="箱号"
+              prop="caseNo"
+              v-if="item.shipType == '集装箱'"
+            >
               {{ item.caseNo }}
             </el-form-item>
             <!--封号-->
-            <el-form-item label="封号" prop="titleNo" v-if="item.shipType == '集装箱'">
+            <el-form-item
+              label="封号"
+              prop="titleNo"
+              v-if="item.shipType == '集装箱'"
+            >
               {{ item.titleNo }}
             </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="loadNetWeight">
               {{ item.loadNetWeight }}
@@ -198,14 +210,14 @@
             <!--卸船净重-->
             <ws-form-item label="卸船净重:" span="1" prop="unloadNetWeight">
               <ws-input
-                v-if="item.status == '已卸船'||item.status == '已送达'" 
+                v-if="item.status == '未装车' || item.status == '已送达'"
                 :disabled="readonly"
                 v-model="item.unloadNetWeight"
                 placeholder="请输入卸船净重"
                 maxlength="20"
                 size="small"
               />
-               <ws-input
+              <ws-input
                 v-else
                 v-model="item.unloadNetWeight"
                 placeholder="请输入卸船净重"
@@ -214,31 +226,46 @@
               />
             </ws-form-item>
             <!--卸船日期-->
-            <el-form-item label="卸船日期:" span="1" prop="unLoadingDate" label-width="100px">
-            <ws-date-picker
-              v-if="item.status == '已卸船'||item.status == '已送达'" 
-              :disabled="readonly"
-              v-model="item.unLoadingDate"
-              type="date"
-              style="width: 150px;"
-              placeholder="请选择日期"
-              value-format="yyyy-MM-dd"
-            />
-               <ws-date-picker
-              v-else
-              v-model="item.unLoadingDate"
-              type="date"
-              style="width: 150px;"
-              placeholder="请选择日期"
-              value-format="yyyy-MM-dd"
-            />
+            <el-form-item
+              label="卸船日期:"
+              span="1"
+              prop="unloadingDate"
+              label-width="100px"
+            >
+              <ws-date-picker
+                v-if="item.status == '未装车' || item.status == '已送达'"
+                :disabled="readonly"
+                v-model="item.unloadingDate"
+                type="date"
+                style="width: 150px"
+                placeholder="请选择日期"
+                value-format="yyyy-MM-dd"
+              />
+              <ws-date-picker
+                v-else
+                v-model="item.unloadingDate"
+                type="date"
+                style="width: 150px"
+                placeholder="请选择日期"
+                value-format="yyyy-MM-dd"
+              />
             </el-form-item>
-               <!-- <div v-show="item.temporaryDriverFlag == 0 && item.signStatus == '未签合同'" class="signStatus">
-                  {{ item.signStatus }}
-                </div>
-                <div v-show="item.temporaryDriverFlag == 0 && item.signStatus == '已签合同'" class="signStatus1">
-                  {{ item.signStatus }}
-                </div> -->
+            <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>
+            <div v-show="item.signStatus == '已签合同'" class="signStatus1">
+              {{ item.signStatus }}
+            </div>
             <span
               width="22"
               height="22"
@@ -254,57 +281,58 @@
       <div style="text-align: right; color: #8890b1; font-size: 16px">
         合计(吨):{{ total }}/{{ deptBudgetList.weight }}
         <!--阶段状态-->
-         <span class="noservice" v-show="deptBudgetList.feedbackStatus=='执行中'">
+        <span
+          class="noservice"
+          v-show="deptBudgetList.feedbackStatus == '执行中'"
+        >
           未完货
         </span>
-        <span class="service" v-show="deptBudgetList.feedbackStatus=='已完货'">{{
-          deptBudgetList.feedbackStatus
-        }}</span>
+        <span
+          class="service"
+          v-show="deptBudgetList.feedbackStatus == '已完货'"
+          >{{ deptBudgetList.feedbackStatus }}</span
+        >
       </div>
       <!--运单-->
-            <ws-form-item label="运单:" span="1" prop="loadPoundImg">
-              <!-- slot-scope="scope" -->
-              <template >
-                <el-upload
-                  action="https://www.zthymaoyi.com/upload/admin"
-                  :show-file-list="false"
-                  :on-success=" (res) => { uploadSuccessHandle1(res,index)}"
-                  class="avatar-uploader"
-                  accept=".jpg, .jpeg, .png, .gif"
-                  ><img
-                    width="18"
-                    height="20"
-                    style="
-                      vertical-align: text-top;
-                      position: relative;
-                    "
-                    src="../../../public/img/fujian.png"
-                    alt=""
-                  />
-                </el-upload>
-                 <!-- <span v-if="deptBudgetList.tranCarInfoList[index].loadPoundImg != null " >1</span>
-                 <span
-                  v-if="
-                    deptBudgetList.tranCarInfoList[index].loadPoundImg == null
-                  "
-                  >未上传</span> -->
-              </template>
-            </ws-form-item>
+      <ws-form-item label="运单:" span="1" prop="loadPoundImg">
+        <!-- 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"
+            ><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[0].loadPoundImg != null"
+              >1</span
+            >
+            <span v-if="deptBudgetList.tranCarInfoList[0].loadPoundImg == null"
+              >未上传</span
+            >
+          </div>
+        </template>
+      </ws-form-item>
     </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"
-        size="small"
-        @click="finished (deptBudgetList)"
+        @click="finished(deptBudgetList)"
         >完货</el-button
       >
     </div>
@@ -336,7 +364,7 @@ export default {
         totalStorage: 0,
       },
       tranCarInfoList: {
-        driver:'',
+        driver: '',
       },
       options_: regionData,
       heightData: '600px',
@@ -423,7 +451,7 @@ export default {
         var maxStorage = 0
         for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
           maxStorage += Number(
-            this.deptBudgetList.tranCarInfoList[i].loadNetWeight
+            this.deptBudgetList.tranCarInfoList[i].unloadNetWeight
           )
         }
         return maxStorage
@@ -506,12 +534,10 @@ export default {
       this.accessoryTFs = false
     },
     //导入
-    import(){
-
-    },
+    import() {},
     //完货
-    finished(){
-       this.$confirm(`完货操作后,装船信息不可修改,是否确定完货?`, {
+    finished() {
+      this.$confirm(`完货操作后,装船信息不可修改,是否确定完货?`, {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning',
@@ -540,41 +566,44 @@ export default {
         .catch(() => {
           return false
         })
-
     },
     submit() {
-      for (var i = 0; i < this.freightspace.length; i++) {
-        if (this.freightspace[i].temporaryDriverFlag != 0) {
-          if (!this.freightspace[i].driver) {
-            this.$message({
-              message: '司机姓名不能为空!',
-              type: 'warning',
-            })
-            return
-          }
-          if (!this.freightspace[i].driverPhone) {
-            this.$message({
-              message: '司机电话不能为空!',
-              type: 'warning',
-            })
-            return
-          }
-          if (!this.freightspace[i].carNo) {
-            this.$message({
-              message: '车牌号不能为空!',
-              type: 'warning',
-            })
-            return
-          }
-          if (!this.freightspace[i].loadNetWeight) {
-            this.$message({
-              message: '装载净重不能为空!',
-              type: 'warning',
-            })
-            return
-          }
-        }
-      }
+      // 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
+      // }
       this.$confirm(`提交成功后装船信息不可修改,是否确定提交?`, {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -587,26 +616,23 @@ export default {
               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.loadNetWeight =
-                this.deptBudgetList.loadNetWeight
-              this.tranCarInfoList.tranType = this.tranType
-              this.tranCarInfoList.loadPoundImg =
-                this.deptBudgetList.loadPoundImg
+              this.tranCarInfoList.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
-                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)
@@ -638,6 +664,17 @@ export default {
         .toPromise()
         .then((response) => {
           this.deptBudgetList = response
+          this.deptBudgetList.driver = response.tranCarInfoList[0].driver
+          this.deptBudgetList.driverPhone =
+            response.tranCarInfoList[0].driverPhone
+          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
           //  this.deptBudgetList.tranCarInfoList = response.tranCarInfoList
           this.freightspace = response.tranCarInfoList
           for (var i = 0; i < this.freightspace.length; i++) {
@@ -653,12 +690,12 @@ export default {
           this.options = response
           this.staffList = response
         }),
-      //车型
-      packList({ constId: 'TRAN5' })
-        .toPromise()
-        .then((response) => {
-          this.carModel = response
-        })
+        //车型
+        packList({ constId: 'TRAN5' })
+          .toPromise()
+          .then((response) => {
+            this.carModel = response
+          })
     },
     handleExamine() {},
     approve() {},
@@ -698,7 +735,7 @@ export default {
       }
     },
     uploadSuccessHandle1(e, index) {
-      this.freightspace[index].loadPoundImg = e.url
+      this.deptBudgetList.tranCarInfoList[0].loadPoundImg = e.url
     },
   },
 }
@@ -1096,4 +1133,13 @@ export default {
   background: #e5f1f7;
   color: #50cad4;
 }
+.center1 {
+  width: 100px;
+  margin: 0 auto;
+  margin-top: -2%;
+}
+.tupian{
+  margin-left: 14%;
+  margin-top: -7%;
+}
 </style>

+ 66 - 63
src/views/tranManagement/tranManagementUnShippingFeedbackLook.vue

@@ -90,47 +90,40 @@
         </ws-form-item>
       </ws-info-table>
       <div class="small-title" style="font-size: 16px">联络员及航次</div>
-      <div
-          style="width: 100%"
-          class="flex position"
-          v-for="(item, index) in this.freightspace"
-          :key="index"
-        >
       <ws-info-table>
         <!-- 姓名 -->
         <ws-form-item label="姓名" span="1" prop="driver">
-          {{ item.driver }}
+          {{ deptBudgetList.driver }}
         </ws-form-item>
         <!-- 电话 -->
         <ws-form-item label="电话" span="1" prop="driverPhone">
-          {{ item.driverPhone }}
+          {{ deptBudgetList.driverPhone }}
         </ws-form-item>
         <!--发船日期-->
           <ws-form-item label="发船日期" span="1" prop="sendDateStart">
-            {{ item.sendDateStart }}
+            {{ deptBudgetList.sendDateStart }}
           </ws-form-item>
         <!-- 预计到港日期 -->
         <ws-form-item label="预计到港日期" span="1" prop="receiveDateEnd">
-          {{ item.receiveDateEnd }}
+          {{ deptBudgetList.receiveDateEnd }}
         </ws-form-item>
         <!-- 船名 -->
         <ws-form-item label="船名" span="1" prop="shipName">
-          {{ item.shipName }}
+          {{ deptBudgetList.shipName }}
         </ws-form-item>
         <!-- 航次 -->
         <ws-form-item label="航次" span="1" prop="shipNo">
-          {{ item.shipNo }}
+          {{ deptBudgetList.shipNo }}
         </ws-form-item>
         <!-- 类型 -->
         <ws-form-item label="类型" span="1" prop="shipType">
-          {{ item.shipType }}
+          {{ deptBudgetList.shipType }}
         </ws-form-item>
         <!-- 数量 -->
-        <ws-form-item label="数量" span="1" prop="tranType" v-if="item.shipType == '集装箱'">
-          {{ item.tranType }}
+        <ws-form-item label="数量" span="1" prop="tranType" v-if="deptBudgetList.shipType == '集装箱'">
+          {{ deptBudgetList.tranType }}
         </ws-form-item>
       </ws-info-table>     
-      </div>  
       <div class="small-title" style="font-size: 16px">装船详情</div>
       <div class="liaison">
         <div
@@ -142,27 +135,27 @@
           <ws-info-table>
            <div class="catNos" v-if="item.shipType == '集装箱'">
               集装箱-{{ index + 1 }}
-              <span class="noservice" v-show="item.status == '未装船'">{{
-                  item.status
-                }}</span>
-                <span class="service" v-show="item.status == '已装船'">{{
-                  item.status
-                }}</span>
-                 <span class="serviced" v-show="item.status == '已送达'">{{
-                  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 == '已送达'">
+                   已卸船
+                </span>
             </div>
             <div class="catNos" v-if="item.shipType == '散船'">
               仓位号-{{ index + 1 }}
-              <span class="noservice" v-show="item.status == '未装船'">{{
-                  item.status
-                }}</span>
-                <span class="service" v-show="item.status == '已装船'">{{
-                  item.status
-                }}</span>
-                 <span class="serviced" v-show="item.status == '已送达'">{{
-                  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 == '已送达'">
+                   已卸船
+                </span>
             </div>
             <!--箱号-->
             <ws-form-item label="箱号:" span="1" prop="caseNo" v-if="item.shipType == '集装箱'">
@@ -185,8 +178,8 @@
               {{ item.unloadNetWeight }}
             </ws-form-item>
             <!--卸船日期-->
-            <ws-form-item label="卸船日期" span="1" prop="unLoadingDate">
-                {{ item.unLoadingDate }}
+            <ws-form-item label="卸船日期" span="1" prop="unloadingDate">
+                {{ item.unloadingDate }}
             </ws-form-item>
                <!-- <div v-show="item.temporaryDriverFlag == 0 && item.signStatus == '未签合同'" class="signStatus">
                   {{ item.signStatus }}
@@ -219,31 +212,34 @@
       </div>
       <!--运单-->
             <ws-form-item label="运单:" span="1" prop="loadPoundImg">
-              <!-- slot-scope="scope" -->
-              <template >
-                <el-upload
-                  action="https://www.zthymaoyi.com/upload/admin"
-                  :show-file-list="false"
-                  :on-success=" (res) => { uploadSuccessHandle1(res,index)}"
-                  class="avatar-uploader"
-                  accept=".jpg, .jpeg, .png, .gif"
-                  ><img
-                    width="18"
-                    height="20"
-                    style="
-                      vertical-align: text-top;
-                      position: relative;
-                    "
-                    src="../../../public/img/fujian.png"
-                    alt=""
-                  />
-                </el-upload>
-                 <!-- <span v-if="deptBudgetList.tranCarInfoList[index].loadPoundImg != null " >1</span>
+              <template>
+                <img
+                  width="18"
+                  height="20"
+                  style="
+                    vertical-align: text-top;
+                    position: relative;
+                    top: -1px;
+                  "
+                  src="../../../public/img/fujian.png"
+                  @click="fujian()"
+                  alt=""
+                />
+                <span
+                  v-if="
+                    deptBudgetList.tranCarInfoList[0].loadPoundImgArr
+                      .length > 0
+                  "
+                  >{{
+                    deptBudgetList.tranCarInfoList[0].loadPoundImgArr.length
+                  }}</span
+                >
                  <span
                   v-if="
-                    deptBudgetList.tranCarInfoList[index].loadPoundImg == null
+                    deptBudgetList.tranCarInfoList[0].loadPoundImgArr
+                      .length == 0
                   "
-                  >未上传</span> -->
+                  >无</span>
               </template>
             </ws-form-item>  
     </ws-form>
@@ -447,7 +443,14 @@ export default {
         .toPromise()
         .then((response) => {
           this.deptBudgetList = response
-          //  this.deptBudgetList.tranCarInfoList = response.tranCarInfoList
+          this.deptBudgetList.driver= response.tranCarInfoList[0].driver
+          this.deptBudgetList.driverPhone = response.tranCarInfoList[0].driverPhone
+          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
           this.freightspace = response.tranCarInfoList
           for (var i = 0; i < this.freightspace.length; i++) {
             if (!this.freightspace[i].loadNetWeight) {
@@ -500,10 +503,10 @@ export default {
       }
     },
     //上传
-    fujian(index) {
+    fujian(e) {
       if (
-        this.deptBudgetList.tranCarInfoList[index].loadPoundImg === null ||
-        this.deptBudgetList.tranCarInfoList[index].loadPoundImg === ''
+        this.deptBudgetList.tranCarInfoList[0].loadPoundImg === null ||
+        this.deptBudgetList.tranCarInfoList[0].loadPoundImg === ''
       ) {
         this.$message({
           message: '暂无附件!',
@@ -514,7 +517,7 @@ export default {
         this.accessoryTFs = true
       }
       this.appendixIdss =
-        this.deptBudgetList.tranCarInfoList[index].loadPoundImgArr
+        this.deptBudgetList.tranCarInfoList[0].loadPoundImgArr
     },
   },
 }