火运装车反馈

src/views/tranManagement/tranManagementFireFeedback.vue

@@ -10,7 +10,7 @@
           class="bg-bottom"
           type="primary"
           size="small"
-          @click="returnsales()"
+          @click="revert()"
           ><img
             width="6"
             height="10"
@@ -91,25 +91,19 @@
       </ws-info-table>
       <div class="small-title" style="font-size: 16px">联络员及车次</div>
       <div class="lianluoyuan">
-        <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">
-            <span>{{ item.driver }}</span>
+            <span>{{ deptBudgetList.driver }}</span>
           </ws-form-item>
           <!--电话-->
           <ws-form-item label="电话:" span="1" prop="driverPhone">
-            <span>{{ item.driverPhone }}</span>
+            <span>{{ deptBudgetList.driverPhone }}</span>
           </ws-form-item>
           <!--发车日期-->
           <el-form-item label="发车日期:" span="1" prop="sendDateStart">
             <ws-date-picker
-              v-model="item.sendDateStart"
+              v-model="deptBudgetList.sendDateStart"
               type="date"
               style="width: 150px"
               placeholder="请选择日期"
@@ -118,15 +112,14 @@
           </el-form-item>
           <!--预计到站日期-->
           <ws-form-item label="预计到站日期:" span="1" prop="receiveDateEnd">
-            <span>{{ item.receiveDateEnd }}</span>
+            <span>{{ deptBudgetList.receiveDateEnd }}</span>
           </ws-form-item>
           <!--车型-->
           <ws-form-item label="车型:" span="1" prop="caeModel">
-            <span>{{ item.carModel }}</span>
+            <span>{{ deptBudgetList.carModel }}</span>
           </ws-form-item>
         </ws-info-table>
       </div>
-      </div>
       <div class="small-title" style="font-size: 16px">装车详情</div>
       <div class="liaison">
         <div
@@ -137,9 +130,7 @@
         >
           <ws-info-table>
             <!--车厢号-->
-            <div class="catNos">
-             车厢号-{{ index + 1 }}
-            </div>
+            <div class="catNos">车厢号-{{ index + 1 }}</div>
             <ws-form-item label="车厢号:" span="1" prop="boxNo">
               <span>{{ item.boxNo }}</span>
             </ws-form-item>
@@ -198,28 +189,38 @@
               </template>
             </ws-form-item>
             <!--装车日期-->
-            <el-form-item label="装车日期:" span="1" prop="sendDateStart" >
-            <ws-date-picker
-              v-model="item.sendDateStart"
-              type="date"
-              style="width: 150px;"
-              placeholder="请选择日期"
-              value-format="yyyy-MM-dd"
-            />
-          </el-form-item>
-
-          <!-- 提交 -->
-    <div style="text-align: right; padding: 10px" class="center">
-      <el-button
-        class="bg-bottom"
-        type="primary"
-        size="small"
-        @click="submit(deptBudgetList)"
-        >提交</el-button
-      >
-    </div>
+            <el-form-item label="装车日期:" span="1" prop="loadingDate">
+              <ws-date-picker
+                v-model="item.loadingDate"
+                type="date"
+                style="width: 150px"
+                placeholder="请选择日期"
+                value-format="yyyy-MM-dd"
+              />
+            </el-form-item>
 
-            <div
+            <!-- 提交 -->
+            <span class="servicein" v-show="item.status == '已装车' || item.status == '已送达'">已装车</span>
+            <span
+              style="text-align: right; padding: 10px"
+              class="center"
+              v-if="
+                item.status == '' ||
+                item.status == null ||
+                item.status == '未装车'
+              "
+            >
+              <div>
+                <el-button
+                  class="bg-bottom"
+                  type="primary"
+                  size="small"
+                  @click="submit(deptBudgetList)"
+                  >提交</el-button
+                >
+              </div>
+            </span>
+            <!-- <div
               v-show="
                 item.temporaryDriverFlag == 0 && item.signStatus == '未签合同'
               "
@@ -234,7 +235,7 @@
               class="signStatus1"
             >
               {{ item.signStatus }}
-            </div>
+            </div> -->
             <span
               v-show="item.temporaryDriverFlag != 0"
               width="22"
@@ -248,7 +249,7 @@
           </ws-info-table>
         </div>
       </div>
-      <div style="text-align: right; color: #8890b1; font-size: 16px">
+      <div style="text-align: center; color: #8890b1; font-size: 16px">
         合计(吨)：{{ total }}/{{ deptBudgetList.weight }}
       </div>
       <!-- <el-button class="add bg-bottom" type="primary" size="small" @click="add">
@@ -256,7 +257,7 @@
         <div class="spans">添加临时用车</div></el-button
       > -->
     </ws-form>
-    <!-- 提交 -->
+    <!-- 完货 -->
     <div style="text-align: right; padding: 10px" class="wanhuo">
       <el-button
         class="bg-bottom"
@@ -322,7 +323,7 @@ export default {
           },
         ],
       },
-      tranType: 1,
+      tranType: 2,
       size: 10,
       value1: '',
       unitList: [],
@@ -343,7 +344,7 @@ export default {
           boxNo: '',
           loadNetWeight: '',
           loadPoundImg: '',
-          loadingDate:'',
+          loadingDate: '',
         },
         // {loadPoundImg:{}},
       ],
@@ -394,42 +395,10 @@ export default {
     },
   },
   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
-        }
-      }
-    },
     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
@@ -447,25 +416,9 @@ export default {
         this.freightspace.splice(index, 1)
       }
     },
-    //下拉司机姓名改变事件
-    selectdriver() {},
-    handleChange(value) {
-      this.selectedOptions = value
-    },
-    returnsales() {
-      this.deptBudgetList = {}
-      this.freightspace = {}
-      this.selectedOptions = ''
-      this.deptBudgetList.tranCarInfoList = []
+    revert() {
       this.$router.push({ path: 'tranManagementTransporHairRespond' })
     },
-    // 上传附件
-    uploadSuccess(data, files, url) {
-      console.log(data, files, url)
-    },
-    handleClose() {
-      this.accessoryTFs = false
-    },
     submit() {
       for (var i = 0; i < this.freightspace.length; i++) {
         if (this.freightspace[i].temporaryDriverFlag != 0) {
@@ -554,15 +507,20 @@ export default {
           return false
         })
     },
-    resetForm(deptBudgetList) {
-      this.$refs[deptBudgetList].resetFields()
-    },
     getList() {
       seeCat({ id: this.deptBudgetList.id })
         .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.carModel = response.tranCarInfoList[0].carModel
           this.freightspace = response.tranCarInfoList
           for (var i = 0; i < this.freightspace.length; i++) {
             if (!this.freightspace[i].loadNetWeight) {
@@ -570,59 +528,6 @@ export default {
             }
           }
         })
-      //司机姓名下拉
-      getstaff({ compId: sessionStorage.getItem('ws-pf_compId') })
-        .toPromise()
-        .then((response) => {
-          this.options = response
-          this.staffList = response
-        })
-      //车型
-      packList({ constId: 'TRAN5' })
-        .toPromise()
-        .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
-        }
-      }
-    },
-    selectgrade(e) {
-      for (var i = 0; i < this.gradeList.length; i++) {
-        if (this.gradeList[i].constValue == e) {
-          this.deptBudgetList.gradeKey = this.gradeList[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
-        }
-      }
-    },
-    selectpackingMethod(e) {
-      for (var i = 0; i < this.packtypeList.length; i++) {
-        if (this.packtypeList[i].constValue == e) {
-          this.deptBudgetList.packingMethodKey = this.packtypeList[i].constKey
-        }
-      }
     },
     uploadSuccessHandle1(e, index) {
       this.freightspace[index].loadPoundImg = e.url
@@ -797,9 +702,9 @@ export default {
   display: inline-block;
 }
 .center {
-    width: 900px;
-    margin: -70px auto;
-    margin-right: 38px;
+  width: 900px;
+  margin: -70px auto;
+  margin-right: 92px;
 }
 .wanhuo {
   width: 900px;
@@ -946,12 +851,12 @@ export default {
   border: 0px;
 }
 .catNos {
-    width: 5%;
-    height: 30px;
-    margin-top: 10px;
-    margin-left: 20px;
-    margin-right: -5px;
-    font-size: 14px;
+  width: 5%;
+  height: 30px;
+  margin-top: 10px;
+  margin-left: 20px;
+  margin-right: -5px;
+  font-size: 14px;
 }
 .catNosCor {
   color: #5473e8;
@@ -1003,7 +908,7 @@ export default {
 }
 //装车详情
 /deep/.liaison .ws-info-table .el-form-item {
-  width: 20%;
+  width: 19%;
 }
 /deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
   width: 50%;
@@ -1027,9 +932,9 @@ export default {
   width: 20%;
 }
 /deep/.lianluoyuan .ws-info-table .el-form-item .el-form-item__label {
-  width: 50%;
+  width: 43%;
   background: #f6f7fc;
-  padding-right: 28px;
+  padding-right: 0px;
   margin-top: 5px;
 }
 /deep/.lianluoyuan .flex {
@@ -1045,4 +950,44 @@ export default {
   padding: 0px;
   margin-top: 5px;
 }
+//装车状态
+.noservicein,
+.servicein {
+  display: inline-block;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  padding: 2px;
+  font-size: 12px;
+  background: #e5f1f7;
+  color: #50cad4;
+  height: 23px;
+  margin-top: 11px;
+  margin-left: 53px;
+}
+.noservicein {
+  background: #c4cada;
+  color: #ffffff;
+  display: inline-block;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  padding: 2px;
+  font-size: 12px;
+  background: #e5f1f7;
+  color: #50cad4;
+  height: 23px;
+  margin-top: 11px;
+  margin-left: 53px;
+}
+.servicedin {
+  display: inline-block;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  padding: 2px;
+  font-size: 12px;
+  background: #e5f1f7;
+  color: #50cad4;
+  height: 23px;
+  margin-top: 11px;
+  margin-left: 53px;
+}
 </style>

src/views/tranManagement/tranManagementFireFeedbackLook.vue

@@ -90,7 +90,7 @@
           {{ deptBudgetList.tranType }}
         </ws-form-item>
       </ws-info-table>
-        <div class="small-title" style="font-size: 16px">联络员及车次</div>
+      <div class="small-title" style="font-size: 16px">联络员及车次</div>
       <div class="lianluoyuan">
         <ws-info-table>
           <!--姓名-->
@@ -103,20 +103,14 @@
           </ws-form-item>
           <!--发车日期-->
           <el-form-item label="发车日期:" span="1" prop="sendDateStart">
-            <ws-date-picker
-              v-model="deptBudgetList.sendDateStart"
-              type="date"
-              style="width: 150px"
-              placeholder="请选择日期"
-              value-format="yyyy-MM-dd"
-            />
+            <span>{{ deptBudgetList.sendDateStart }}</span>
           </el-form-item>
           <!--预计到站日期-->
           <ws-form-item label="预计到站日期:" span="1" prop="receiveDateEnd">
             <span>{{ deptBudgetList.receiveDateEnd }}</span>
           </ws-form-item>
           <!--车型-->
-          <ws-form-item label="车型:" span="1" prop="caeModel">
+          <ws-form-item label="车型:" span="1" prop="carModel">
             <span>{{ deptBudgetList.carModel }}</span>
           </ws-form-item>
         </ws-info-table>
@@ -131,9 +125,7 @@
         >
           <ws-info-table>
             <!--车厢号-->
-            <div class="catNos">
-             车厢号-{{ index + 1 }}
-            </div>
+            <div class="catNos">车厢号-{{ index + 1 }}</div>
             <ws-form-item label="车厢号:" span="1" prop="boxNo">
               <span>{{ item.boxNo }}</span>
             </ws-form-item>
@@ -166,17 +158,18 @@
                     deptBudgetList.tranCarInfoList[index].loadPoundImgArr.length
                   }}</span
                 >
-                 <span
+                <span
                   v-if="
                     deptBudgetList.tranCarInfoList[index].loadPoundImgArr
                       .length == 0
                   "
-                  >无</span>
+                  >无</span
+                >
               </template>
             </ws-form-item>
-             <!--装车日期-->
-            <ws-form-item label="装车日期:" span="1" prop="caseNo">
-             <span>{{ item.receiveDateEnd }}</span>
+            <!--装车日期-->
+            <ws-form-item label="装车日期:" span="1" prop="loadingDate">
+              <span>{{ item.loadingDate }}</span>
             </ws-form-item>
             <!-- <div
             v-show="
@@ -196,30 +189,25 @@
           >
             {{ item.signStatus }}
           </div> -->
-          <!-- v-show="item.status == '未装车'" -->
-          <!-- v-show="item.status == '已装车'" -->
-          <!-- v-show="item.status == '已送达'" -->
-          <span class="noservice" >{{
-                  item.status
-                }} 未装车</span>
-          <!-- <span class="service" >{{
-                  item.status
-                }}已装车</span>
-          <span class="serviced" >{{
-                  item.status
-                }}已送达</span> -->
+            <span class="noservicein" v-show="item.status == '未装车'">{{ item.status}}</span>
+            <span class="servicein" v-show="item.status == '已装车' || item.status == '已送达'">已装车</span>
           </ws-info-table>
         </div>
       </div>
       <div style="text-align: center; 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>
     <!-- 关闭 -->
@@ -381,14 +369,6 @@ export default {
       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
@@ -396,25 +376,12 @@ export default {
     handleClose1() {
       this.accesscard = false
     },
-    handleChange(value) {
-      this.selectedOptions = value
-    },
     returnsales() {
       this.deptBudgetList = {}
       this.freightspace = {}
       this.selectedOptions = ''
       this.$router.push({ path: 'tranManagementTransporHairRespond' })
     },
-    // confirmPosition() {
-    //   this.draggable = false
-    // },
-    // 上传附件
-    uploadSuccess(data, files, url) {
-      console.log(data, files, url)
-    },
-    handleClose() {
-      this.accessoryTFs = false
-    },
     resetForm(deptBudgetList) {
       this.$refs[deptBudgetList].resetFields()
     },
@@ -423,8 +390,15 @@ export default {
         .toPromise()
         .then((response) => {
           this.deptBudgetList = response
-          //  this.deptBudgetList.tranCarInfoList = response.tranCarInfoList
           this.freightspace = 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.carModel = response.tranCarInfoList[0].carModel
           for (var i = 0; i < this.freightspace.length; i++) {
             if (!this.freightspace[i].loadNetWeight) {
               this.freightspace[i].loadNetWeight = 0
@@ -440,41 +414,6 @@ export default {
           }
         })
     },
-    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
-        }
-      }
-    },
-    selectgrade(e) {
-      for (var i = 0; i < this.gradeList.length; i++) {
-        if (this.gradeList[i].constValue == e) {
-          this.deptBudgetList.gradeKey = this.gradeList[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
-        }
-      }
-    },
-    selectpackingMethod(e) {
-      for (var i = 0; i < this.packtypeList.length; i++) {
-        if (this.packtypeList[i].constValue == e) {
-          this.deptBudgetList.packingMethodKey = this.packtypeList[i].constKey
-        }
-      }
-    },
     //上传
     fujian(index) {
       if (
@@ -810,12 +749,12 @@ export default {
   margin-top: 20px;
 }
 .catNos {
-    width: 5%;
-    height: 30px;
-    margin-top: 10px;
-    margin-left: 20px;
-    margin-right: -5px;
-    font-size: 14px;
+  width: 5%;
+  height: 30px;
+  margin-top: 10px;
+  margin-left: 20px;
+  margin-right: -5px;
+  font-size: 14px;
 }
 .catNosCor {
   color: #5473e8;
@@ -863,7 +802,7 @@ export default {
   padding: 0px;
   margin-top: 5px;
 }
-//送达/未送达
+//完货
 .noservice,
 .service {
   display: inline-block;
@@ -880,4 +819,42 @@ export default {
   background: #e5f1f7;
   color: #50cad4;
 }
+//装车状态
+.noservicein,
+.servicein {
+  display: inline-block;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  padding: 2px;
+  font-size: 12px;
+  background: #e5f1f7;
+  color: #50cad4;
+  height: 23px;
+  margin-top: 11px;
+  margin-left: 53px;
+}
+.noservicein {
+  background: #c4cada;
+  color: #ffffff;
+  display: inline-block;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  padding: 2px;
+  font-size: 12px;
+  height: 23px;
+  margin-top: 11px;
+  margin-left: 53px;
+}
+.servicedin {
+  display: inline-block;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  padding: 2px;
+  font-size: 12px;
+  background: #e5f1f7;
+  color: #50cad4;
+  height: 23px;
+  margin-top: 11px;
+  margin-left: 53px;
+}
 </style>

src/views/tranManagement/tranManagementFireReceivingFeedback.vue

@@ -10,7 +10,7 @@
           class="bg-bottom"
           type="primary"
           size="small"
-          @click="returnsales()"
+          @click="revert()"
           ><img
             width="6"
             height="10"
@@ -91,25 +91,19 @@
       </ws-info-table>
       <div class="small-title" style="font-size: 16px">联络员及车次</div>
       <div class="lianluoyuan">
-        <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">
-            <span>{{ item.driver }}</span>
+            <span>{{ deptBudgetList.driver }}</span>
           </ws-form-item>
           <!--电话-->
           <ws-form-item label="电话:" span="1" prop="driverPhone">
-            <span>{{ item.driverPhone }}</span>
+            <span>{{ deptBudgetList.driverPhone }}</span>
           </ws-form-item>
           <!--发车日期-->
           <el-form-item label="发车日期:" span="1" prop="sendDateStart">
             <ws-date-picker
-              v-model="item.sendDateStart"
+              v-model="deptBudgetList.sendDateStart"
               type="date"
               style="width: 150px"
               placeholder="请选择日期"
@@ -118,15 +112,14 @@
           </el-form-item>
           <!--到站日期-->
           <ws-form-item label="到站日期:" span="1" prop="receiveDateEnd">
-            <span>{{ item.receiveDateEnd }}</span>
+            <span>{{ deptBudgetList.receiveDateEnd }}</span>
           </ws-form-item>
           <!--车型-->
           <ws-form-item label="车型:" span="1" prop="caeModel">
-            <span>{{ item.carModel }}</span>
+            <span>{{ deptBudgetList.carModel }}</span>
           </ws-form-item>
         </ws-info-table>
       </div>
-      </div>
       <div class="small-title" style="font-size: 16px">卸车详情</div>
       <div class="liaison">
         <div
@@ -137,32 +130,34 @@
         >
           <ws-info-table>
             <!--车厢号-->
-            <div class="catNos">
-             车厢号-{{ index + 1 }}
-            </div>
+            <div class="catNos">车厢号-{{ index + 1 }}</div>
             <ws-form-item label="车厢号:" span="1" prop="boxNo">
               <span>{{ item.boxNo }}</span>
             </ws-form-item>
+            <!--装车净重 -->
+            <ws-form-item label="装车净重:" span="1" prop="loadNetWeight">
+              <span>{{ item.loadNetWeight }}</span>
+            </ws-form-item>
             <!--卸车净重-->
-            <ws-form-item label="卸车净重：" span="1" prop="loadNetWeight">
+            <ws-form-item label="卸车净重：" span="1" prop="unloadNetWeight">
               <ws-input
                 v-if="item.status == '已卸车' || item.status == '已送达'"
                 :disabled="readonly"
-                v-model="item.loadNetWeight"
+                v-model="item.unloadNetWeight"
                 placeholder="请输入卸车净重"
                 maxlength="20"
                 size="small"
               />
               <ws-input
                 v-else
-                v-model="item.loadNetWeight"
+                v-model="item.unloadNetWeight"
                 placeholder="请输入卸车净重"
                 maxlength="20"
                 size="small"
               />
             </ws-form-item>
             <!--磅单-->
-            <ws-form-item label="磅单：" span="1" prop="loadPoundImg">
+            <ws-form-item label="磅单：" span="1" prop="unloadPoundImg">
               <!-- slot-scope="scope" -->
               <template>
                 <el-upload
@@ -185,41 +180,57 @@
                 </el-upload>
                 <span
                   v-if="
-                    deptBudgetList.tranCarInfoList[index].loadPoundImg != null
+                    deptBudgetList.tranCarInfoList[index].unloadPoundImg != null
                   "
                   >1</span
                 >
                 <span
                   v-if="
-                    deptBudgetList.tranCarInfoList[index].loadPoundImg == null
+                    deptBudgetList.tranCarInfoList[index].unloadPoundImg == null
                   "
                   >未上传</span
                 >
               </template>
             </ws-form-item>
             <!--卸车日期-->
-            <el-form-item label="卸车日期:" span="1" prop="sendDateStart" >
-            <ws-date-picker
-              v-model="item.sendDateStart"
-              type="date"
-              style="width: 150px;"
-              placeholder="请选择日期"
-              value-format="yyyy-MM-dd"
-            />
-          </el-form-item>
-
-          <!-- 提交 -->
-    <div style="text-align: right; padding: 10px" class="center">
-      <el-button
-        class="bg-bottom"
-        type="primary"
-        size="small"
-        @click="submit(deptBudgetList)"
-        >提交</el-button
-      >
-    </div>
+            <el-form-item label="卸车日期:" span="1" prop="unloadingDate">
+              <ws-date-picker
+                v-model="item.unloadingDate"
+                type="date"
+                style="width: 150px"
+                placeholder="请选择日期"
+                value-format="yyyy-MM-dd"
+              />
+            </el-form-item>
+            <!-- 提交 -->
+            <span class="servicedout" v-show="item.status == '已送达'"
+              >已卸车</span
+            >
+            <span class="noserviceout" v-show="item.status == '未装车'">{{
+              item.status
+            }}</span>
+            <span
+              style="text-align: right; padding: 10px"
+              class="center"
+              v-if="
+                item.status == '' ||
+                item.status == null ||
+                item.status == '未送达' ||
+                item.status == '已装车'
+              "
+            >
+              <div>
+                <el-button
+                  class="bg-bottom"
+                  type="primary"
+                  size="small"
+                  @click="submit(deptBudgetList)"
+                  >提交</el-button
+                >
+              </div>
+            </span>
 
-            <div
+            <!-- <div
               v-show="
                 item.temporaryDriverFlag == 0 && item.signStatus == '未签合同'
               "
@@ -234,7 +245,7 @@
               class="signStatus1"
             >
               {{ item.signStatus }}
-            </div>
+            </div> -->
             <span
               v-show="item.temporaryDriverFlag != 0"
               width="22"
@@ -248,7 +259,7 @@
           </ws-info-table>
         </div>
       </div>
-      <div style="text-align: right; color: #8890b1; font-size: 16px">
+      <div style="text-align: center; color: #8890b1; font-size: 16px">
         合计(吨)：{{ total }}/{{ deptBudgetList.weight }}
       </div>
       <!-- <el-button class="add bg-bottom" type="primary" size="small" @click="add">
@@ -256,7 +267,7 @@
         <div class="spans">添加临时用车</div></el-button
       > -->
     </ws-form>
-    <!-- 提交 -->
+    <!-- 完货 -->
     <div style="text-align: right; padding: 10px" class="wanhuo">
       <el-button
         class="bg-bottom"
@@ -322,7 +333,7 @@ export default {
           },
         ],
       },
-      tranType: 1,
+      tranType: 2,
       size: 10,
       value1: '',
       unitList: [],
@@ -341,9 +352,9 @@ export default {
       freightspace: [
         {
           boxNo: '',
-          loadNetWeight: '',
-          loadPoundImg: '',
-          loadingDate:'',
+          unloadNetWeight: '',
+          unloadPoundImg: '',
+          unloadingDate: '',
         },
         // {loadPoundImg:{}},
       ],
@@ -352,7 +363,7 @@ export default {
       options: [],
       carModel: [],
       tranCarInfoList: {
-        loadPoundImg: '',
+        unloadPoundImg: '',
       },
       //  tranCarList: {
       //   driver: '',
@@ -394,42 +405,10 @@ export default {
     },
   },
   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
-        }
-      }
-    },
     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
@@ -447,25 +426,6 @@ export default {
         this.freightspace.splice(index, 1)
       }
     },
-    //下拉司机姓名改变事件
-    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
-    },
     submit() {
       for (var i = 0; i < this.freightspace.length; i++) {
         if (this.freightspace[i].temporaryDriverFlag != 0) {
@@ -510,14 +470,15 @@ export default {
               // this.deptBudgetList.totalStorage = this.totalStorage
               this.tranCarInfoList = this.freightspace
               this.tranCarInfoList.driver = this.deptBudgetList.driver
+              this.tranCarInfoList.unloadingDate = this.deptBudgetList.unloadingDate
               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.unloadNetWeight =
+                this.deptBudgetList.unloadNetWeight
               this.tranCarInfoList.tranType = this.tranType
-              this.tranCarInfoList.loadPoundImg =
-                this.deptBudgetList.loadPoundImg
+              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
@@ -541,7 +502,7 @@ export default {
                   this.freightspace = {}
                   this.selectedOptions = ''
                   this.$router.push({
-                    path: 'tranManagementTransporHairRespond',
+                    path: 'tranManagementReceivingFeedback',
                   })
                 })
             } else {
@@ -554,8 +515,8 @@ export default {
           return false
         })
     },
-    resetForm(deptBudgetList) {
-      this.$refs[deptBudgetList].resetFields()
+    revert() {
+      this.$router.push({ path: 'tranManagementReceivingFeedback' })
     },
     getList() {
       seeCat({ id: this.deptBudgetList.id })
@@ -563,6 +524,14 @@ export default {
         .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.carModel = response.tranCarInfoList[0].carModel
           this.freightspace = response.tranCarInfoList
           for (var i = 0; i < this.freightspace.length; i++) {
             if (!this.freightspace[i].loadNetWeight) {
@@ -570,62 +539,9 @@ export default {
             }
           }
         })
-      //司机姓名下拉
-      getstaff({ compId: sessionStorage.getItem('ws-pf_compId') })
-        .toPromise()
-        .then((response) => {
-          this.options = response
-          this.staffList = response
-        })
-      //车型
-      packList({ constId: 'TRAN5' })
-        .toPromise()
-        .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
-        }
-      }
-    },
-    selectgrade(e) {
-      for (var i = 0; i < this.gradeList.length; i++) {
-        if (this.gradeList[i].constValue == e) {
-          this.deptBudgetList.gradeKey = this.gradeList[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
-        }
-      }
-    },
-    selectpackingMethod(e) {
-      for (var i = 0; i < this.packtypeList.length; i++) {
-        if (this.packtypeList[i].constValue == e) {
-          this.deptBudgetList.packingMethodKey = this.packtypeList[i].constKey
-        }
-      }
     },
     uploadSuccessHandle1(e, index) {
-      this.freightspace[index].loadPoundImg = e.url
+      this.freightspace[index].unloadPoundImg = e.url
     },
   },
 }
@@ -797,9 +713,9 @@ export default {
   display: inline-block;
 }
 .center {
-    width: 900px;
-    margin: -60px auto;
-    margin-right: 38px;
+  width: 900px;
+  margin: -70px auto;
+  margin-right: 92px;
 }
 .wanhuo {
   width: 900px;
@@ -946,12 +862,12 @@ export default {
   border: 0px;
 }
 .catNos {
-    width: 5%;
-    height: 30px;
-    margin-top: 10px;
-    margin-left: 20px;
-    margin-right: -5px;
-    font-size: 14px;
+  width: 5%;
+  height: 30px;
+  margin-top: 10px;
+  margin-left: 20px;
+  margin-right: -5px;
+  font-size: 14px;
 }
 .catNosCor {
   color: #5473e8;
@@ -1003,7 +919,7 @@ export default {
 }
 //卸车详情
 /deep/.liaison .ws-info-table .el-form-item {
-  width: 20%;
+  width: 15%;
 }
 /deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
   width: 50%;
@@ -1045,4 +961,30 @@ export default {
   padding: 0px;
   margin-top: 5px;
 }
+//卸车状态
+.noserviceout,
+.noserviceout {
+  background: #c4cada;
+  color: #ffffff;
+  display: inline-block;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  padding: 2px;
+  font-size: 12px;
+  height: 23px;
+  margin-top: 11px;
+  margin-left: 53px;
+}
+.servicedout {
+  background: #e5f1f7;
+  color: #50cad4;
+  display: inline-block;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  padding: 2px;
+  font-size: 12px;
+  height: 23px;
+  margin-top: 11px;
+  margin-left: 53px;
+}
 </style>

src/views/tranManagement/tranManagementFireReceivingFeedbackLook.vue

@@ -3,7 +3,7 @@
   <div class="container">
     <el-row>
       <el-col :span="12">
-        <h2 class="bg-left title">查看火运卸车反馈</h2>
+        <h2 class="bg-left title">查看火运卸车信息</h2>
       </el-col>
       <el-col :span="12" class="bg-right">
         <el-button
@@ -90,7 +90,7 @@
           {{ deptBudgetList.tranType }}
         </ws-form-item>
       </ws-info-table>
-        <div class="small-title" style="font-size: 16px">联络员及车次</div>
+      <div class="small-title" style="font-size: 16px">联络员及车次</div>
       <div class="lianluoyuan">
         <ws-info-table>
           <!--姓名-->
@@ -131,18 +131,20 @@
         >
           <ws-info-table>
             <!--车厢号-->
-            <div class="catNos">
-             车厢号-{{ index + 1 }}
-            </div>
+            <div class="catNos">车厢号-{{ index + 1 }}</div>
             <ws-form-item label="车厢号:" span="1" prop="boxNo">
               <span>{{ item.boxNo }}</span>
             </ws-form-item>
+            <!--装车净重 -->
+            <ws-form-item label="装车净重:" span="1" prop="loadNetWeight">
+              <span>{{ item.loadNetWeight }}</span>
+            </ws-form-item>
             <!--卸车(吨)-->
-            <ws-form-item label="卸车净重(吨):" span="1" prop="loadNetWeight">
-              {{ item.loadNetWeight }}
+            <ws-form-item label="卸车净重(吨):" span="1" prop="unloadNetWeight">
+              {{ item.unloadNetWeight }}
             </ws-form-item>
             <!--磅单-->
-            <ws-form-item label="磅单:" span="1" prop="loadPoundImg">
+            <ws-form-item label="磅单:" span="1" prop="unloadPoundImg">
               <template>
                 <img
                   width="18"
@@ -166,17 +168,18 @@
                     deptBudgetList.tranCarInfoList[index].loadPoundImgArr.length
                   }}</span
                 >
-                 <span
+                <span
                   v-if="
                     deptBudgetList.tranCarInfoList[index].loadPoundImgArr
                       .length == 0
                   "
-                  >无</span>
+                  >无</span
+                >
               </template>
             </ws-form-item>
-             <!--卸车日期-->
-            <ws-form-item label="卸车日期:" span="1" prop="caseNo">
-             <span>{{ item.receiveDateEnd }}</span>
+            <!--卸车日期-->
+            <ws-form-item label="卸车日期:" span="1" prop="unloadingDate">
+              <span>{{ item.unloadingDate }}</span>
             </ws-form-item>
             <!-- <div
             v-show="
@@ -196,33 +199,35 @@
           >
             {{ item.signStatus }}
           </div> -->
-          <!-- v-show="item.status == '未卸车'" -->
-          <!-- v-show="item.status == '已卸车'" -->
-          <!-- v-show="item.status == '已送达'" -->
-          <span class="noservice" >{{
-                  item.status
-                }} 未卸车</span>
-          <!-- <span class="service" >{{
-                  item.status
-                }}已卸车</span>
-          <span class="serviced" >{{
-                  item.status
-                }}已送达</span> -->
+            <span class="noserviceout" v-show="item.status == '未装车'"
+              >{{ item.status }}
+            </span>
+            <span class="servicedout" v-show="item.status == '已送达'"
+              >已卸车</span
+            >
+            <span class="noserviceout" v-show="item.status == '未送达' || item.status == '已装车'"
+              >未卸车</span
+            >
           </ws-info-table>
         </div>
       </div>
       <div style="text-align: center; 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>
-    <!-- 关闭 -->
+    <!-- 提交 -->
     <div style="text-align: right; padding: 10px" class="center">
       <el-button
         class="bg-bottom"
@@ -259,6 +264,7 @@
 <script>
 import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
 import { seeCat, packList, feedback } from '@/model/transport/index'
+import { getstaff } from '@/model/warehouse/index'
 import WsUpload from '@/components/WsUpload'
 import mapDrag from '@/components/mapdrag/mapdrag'
 export default {
@@ -277,8 +283,10 @@ export default {
   },
   data() {
     return {
+      staffList: [],
       deptBudgetList: {
         totalStorage: 0,
+        tranCarInfoList: [],
       },
       options_: regionData,
       heightData: '600px',
@@ -293,6 +301,7 @@ export default {
       listDate: { country: '中国', level: 'country', city: '' },
       citylist: [],
       compId: sessionStorage.getItem('ws-pf_compId'),
+      tranType: 2,
       rules: {
         warehouseName: [
           {
@@ -308,38 +317,30 @@ export default {
           },
         ],
       },
-      tranType: 1,
+      accessoryTFs: false,
+      fileList: [],
+      appendixIdsAdd: '',
       size: 10,
       value1: '',
       unitList: [],
-      freightspace: [
-        {
-          driver: '',
-          driverPhone: '',
-          carNo: '',
-          loadNetWeight: '',
-        },
-      ],
+      freightspace: [],
       name: '',
+      list: [],
       staffList: [],
       options: [],
-      // carModel: [],
+      carModel: [],
       tranCarInfoList: {},
-      //上传
-      accessoryTFs: false,
-      accesscard: false,
+      arr: [],
       accessurl: '',
-      fileList: [],
-      // appendixIdsAdd: '',
       //附件
       appendixIdss: [],
+      accesscard: false,
     }
   },
-  mounted() {
+  activated() {
     this.deptBudgetList.id = this.$route.query.id
     this.getList()
   },
-
   computed: {
     totalStorage: function () {
       var maxStorage = 0
@@ -349,28 +350,25 @@ export default {
       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
+      var maxStorage = 0
+      for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
+        maxStorage += Number(
+          this.deptBudgetList.tranCarInfoList[i].loadNetWeight
+        )
       }
+      return maxStorage
     },
     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 '司机名称（临）'
-      //   }
-      //  }
+      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
@@ -381,14 +379,6 @@ export default {
       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
@@ -396,27 +386,11 @@ export default {
     handleClose1() {
       this.accesscard = false
     },
-    handleChange(value) {
-      this.selectedOptions = value
-    },
     returnsales() {
       this.deptBudgetList = {}
       this.freightspace = {}
       this.selectedOptions = ''
-      this.$router.push({ path: 'tranManagementTransporHairRespond' })
-    },
-    // confirmPosition() {
-    //   this.draggable = false
-    // },
-    // 上传附件
-    uploadSuccess(data, files, url) {
-      console.log(data, files, url)
-    },
-    handleClose() {
-      this.accessoryTFs = false
-    },
-    resetForm(deptBudgetList) {
-      this.$refs[deptBudgetList].resetFields()
+      this.$router.push({ path: 'tranManagementReceivingFeedback' })
     },
     getList() {
       seeCat({ id: this.deptBudgetList.id })
@@ -424,62 +398,35 @@ export default {
         .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.carModel = response.tranCarInfoList[0].carModel
           this.freightspace = response.tranCarInfoList
           for (var i = 0; i < this.freightspace.length; i++) {
             if (!this.freightspace[i].loadNetWeight) {
               this.freightspace[i].loadNetWeight = 0
             }
-            if (this.deptBudgetList.tranCarInfoList[i].loadPoundImg != null) {
+            if (this.deptBudgetList.tranCarInfoList[i].unloadPoundImg != null) {
               this.deptBudgetList.tranCarInfoList[i].loadPoundImgArr =
-                this.deptBudgetList.tranCarInfoList[i].loadPoundImg.split(',')
+                this.deptBudgetList.tranCarInfoList[i].unloadPoundImg.split(',')
               this.fileList[i] =
-                this.deptBudgetList.tranCarInfoList[i].loadPoundImg.split(',')
+                this.deptBudgetList.tranCarInfoList[i].unloadPoundImg.split(',')
             } else {
               this.deptBudgetList.tranCarInfoList[i].loadPoundImgArr = []
             }
           }
         })
     },
-    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
-        }
-      }
-    },
-    selectgrade(e) {
-      for (var i = 0; i < this.gradeList.length; i++) {
-        if (this.gradeList[i].constValue == e) {
-          this.deptBudgetList.gradeKey = this.gradeList[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
-        }
-      }
-    },
-    selectpackingMethod(e) {
-      for (var i = 0; i < this.packtypeList.length; i++) {
-        if (this.packtypeList[i].constValue == e) {
-          this.deptBudgetList.packingMethodKey = this.packtypeList[i].constKey
-        }
-      }
-    },
     //上传
     fujian(index) {
       if (
-        this.deptBudgetList.tranCarInfoList[index].loadPoundImg === null ||
-        this.deptBudgetList.tranCarInfoList[index].loadPoundImg === ''
+        this.deptBudgetList.tranCarInfoList[index].unloadPoundImg === null ||
+        this.deptBudgetList.tranCarInfoList[index].unloadPoundImg === ''
       ) {
         this.$message({
           message: '暂无附件！',
@@ -495,7 +442,6 @@ export default {
   },
 }
 </script>
-
 <style lang="scss" scoped>
 /deep/.totalStorage .el-input__inner {
   color: #afb5cb;
@@ -792,9 +738,9 @@ export default {
   border-radius: 0px;
   padding: 0px;
 }
-//卸车详情
+//装车详情
 /deep/.liaison .ws-info-table .el-form-item {
-  width: 20%;
+  width: 17%;
 }
 /deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
   width: 50%;
@@ -810,12 +756,12 @@ export default {
   margin-top: 20px;
 }
 .catNos {
-    width: 5%;
-    height: 30px;
-    margin-top: 10px;
-    margin-left: 20px;
-    margin-right: -5px;
-    font-size: 14px;
+  width: 5%;
+  height: 30px;
+  margin-top: 10px;
+  margin-left: 20px;
+  margin-right: -5px;
+  font-size: 14px;
 }
 .catNosCor {
   color: #5473e8;
@@ -863,7 +809,7 @@ export default {
   padding: 0px;
   margin-top: 5px;
 }
-//送达/未送达
+//完货
 .noservice,
 .service {
   display: inline-block;
@@ -880,4 +826,30 @@ export default {
   background: #e5f1f7;
   color: #50cad4;
 }
+//卸车状态
+.noserviceout,
+.noserviceout {
+  background: #c4cada;
+  color: #ffffff;
+  display: inline-block;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  padding: 2px;
+  font-size: 12px;
+  height: 23px;
+  margin-top: 11px;
+  margin-left: 30px;
+}
+.servicedout {
+  background: #e5f1f7;
+  color: #50cad4;
+  display: inline-block;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  padding: 2px;
+  font-size: 12px;
+  height: 23px;
+  margin-top: 11px;
+  margin-left: 30px;
+}
 </style>

src/views/tranManagement/tranManagementReceivingFeedback.vue

@@ -343,7 +343,7 @@ export default {
           },
         })
       }
-      if (row.tranType == '火运') {
+      else if (row.tranType == '火运') {
         this.$router.push({
           path: 'tranManagementFireReceivingFeedbackLook',
           query: {

src/views/tranManagement/tranManagementReceivingloading.vue

@@ -302,7 +302,7 @@ export default {
       deptBudgetList: {
         tranCarInfoList: [
           {
-            unloadPoundImg:"",
+            unloadPoundImg:'',
           }
         ]
       },
@@ -378,7 +378,7 @@ export default {
               this.tranCarInfoList.loadNetWeight = this.deptBudgetList.loadNetWeight
               this.tranCarInfoList.tranType = this.tranType
               // this.tranCarInfoList.unloadPoundImg = this.deptBudgetList.tranCarInfoList.unloadPoundImg
-              console.log( this.deptBudgetList.tranCarInfoList[0].unloadPoundImg,"图片")
+              console.log( this.deptBudgetList.tranCarInfoList[0].unloadPoundImg,'图片')
               this.tranCarInfoList.unloadNetWeight = this.deptBudgetList.unloadNetWeight
               for (var i = 0; i < this.tranCarInfoList.length; i++) {
                 this.tranCarInfoList[i].id = this.freightspace[i].id
@@ -387,7 +387,7 @@ export default {
                   this.tranCarInfoList[i].tranType = this.tranType
                 }
               }
-              console.log(this.tranCarInfoList,"12121212")
+              console.log(this.tranCarInfoList,'12121212')
               var tranProcessInfo = {}
               tranProcessInfo.id = this.deptBudgetList.id
               tranProcessInfo.infoId = this.deptBudgetList.infoId
@@ -698,7 +698,7 @@ export default {
   background: #c4cada;
   color: #ffffff;
 }
-.service {
+.serviced {
   background: #e5f1f7;
   color: #50cad4;
 }

src/views/tranManagement/tranManagementTransporTrainNo.vue

@@ -216,7 +216,7 @@ export default {
       driverList: [],
       listDate: { country: '中国', level: 'country', city: '' },
       citylist: [],
-      tranType: 2,
+      tranType: '2',
       rules: {
         warehouseName: [
           {
@@ -302,7 +302,7 @@ export default {
         receiveDateEnd:this.deptBudgetList.tranCarInfoList[0].receiveDateEnd,
         carModel:this.deptBudgetList.tranCarInfoList[0].carModel,
         boxNo: '',
-        tranType: "2"
+        tranType: '2'
       })
     },
     del(index) {
@@ -394,6 +394,7 @@ export default {
               var tranCarInfo = {}
               tranCarInfo.id = this.deptBudgetList.id
               tranCarInfo.infoId = this.deptBudgetList.infoId
+              tranCarInfo.tranType = '2'
               tranCarInfo.tranCarInfoList = this.deptBudgetList.tranCarInfoList
               dispatchCat(tranCarInfo)
                 .toPromise()
@@ -419,8 +420,7 @@ export default {
         .toPromise()
         .then((response) => {
           this.deptBudgetList = response
-          if (response.tranCarInfoList.length > 0) {
-          } else {
+          if (response.tranCarInfoList.length == 0) 
             this.deptBudgetList.tranCarInfoList = [
               {
                 driver: '',
@@ -429,9 +429,9 @@ export default {
                 receiveDateEnd: '',
                 carModel: '',
                 boxNo: '',
+                tranType :'2'
               },
             ]
-          }
         })
       //司机姓名下拉
       getstaff({ compId: sessionStorage.getItem('ws-pf_compId') })