Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/views/taskManagement/inOutWarehouseTaskEdit.vue

@@ -1052,7 +1052,7 @@ export default {
   display: inline-block;
 }
 .center1 .small-title {
-  margin-left: 150px;
+  margin-left: 323px;
 }
 .center1 {
   width: 90%;
@@ -1088,6 +1088,7 @@ export default {
   font-weight: 400;
   color: #8890b1;
   line-height: 16px;
+  margin-left: 130px;
 }
 .a {
   margin-left: -32px;
@@ -1113,7 +1114,7 @@ export default {
   font-weight: 400;
   color: #8890b1;
   line-height: 20px;
-  margin-left: 130px;
+  margin-left: 314px;
   /* margin-top: 112px; */
 }
 /deep/.ziti1 {
@@ -1123,8 +1124,8 @@ export default {
   font-weight: 500;
   color: #262626;
   line-height: 20px;
-  margin-left: 206px;
-  margin-top: -23px;
+  margin-left: 381px;
+  margin-top: -21px;
   width: 100px;
 }
 .winseaview-view {
@@ -1154,7 +1155,7 @@ export default {
   line-height: 14px;
 }
 .nav {
-  width: 200px;
+  width: 400px;
   height: 20px;
 }
 </style>

src/views/taskManagement/moveWarehouseTaskLook.vue

@@ -38,28 +38,30 @@
         <!--出货库-->
         <div class="library">
           <span style="margin-left: 14px"
-            >出货库：{{ this.shipment.sendWarehouse }}</span
+            >出货库：{{ shipment1.sendWarehouse }}</span
           >
-          <span style="margin-left: 10px">{{ this.shipment.taskStatus }}</span>
+          <span class="status" v-show="shipment1.taskStatus == '待审核'">{{ shipment1.taskStatus }}</span>
+           <span class="status2" v-show="shipment1.taskStatus == '执行中'">{{ shipment1.taskStatus }}</span>
+          <span class="status1" v-show="shipment1.taskStatus == '已完成'">{{ shipment1.taskStatus }}</span>
         </div>
         <!--出库经办人-->
         <ws-form-item label="出库经办人：" span="1" prop="agent">
-          {{ this.shipment.agent }}
+          {{shipment1.agent}}
         </ws-form-item>
         <el-divider direction="vertical" class="line"></el-divider>
         <!--出库重量（吨）-->
         <ws-form-item label="出库重量（吨）：" span="1" prop="weight">
-          {{ shipment.weight }}
+          {{ shipment1.weight }}
         </ws-form-item>
         <el-divider direction="vertical" class="line"></el-divider>
         <!--仓位-->
         <ws-form-item label="仓位：" span="1" prop="deliveryVolume">
-          {{ shipment.binNumber == null ? '未指定' : shipment.binNumber }}
+          {{ shipment1.binNumber == null ? '未指定' : shipment1.binNumber }}
         </ws-form-item>
         <el-divider direction="vertical" class="line"></el-divider>
         <!--预计出库日期-->
         <ws-form-item label="预计出库日期：" span="1" prop="predictDate">
-          {{ shipment.predictDate }}
+          {{ shipment1.predictDate }}
         </ws-form-item>
       </ws-info-table>
       <!-- </div> -->
@@ -69,7 +71,9 @@
           <span style="margin-left: 14px">
             入货库：{{ enter.warehouseName }}</span
           >
-          <span style="margin-left: 10px">{{ enter.taskStatus }}</span>
+          <span class="status" v-show="enter.taskStatus == '待审核'">{{ enter.taskStatus }}</span>
+            <span class="status2" v-show="enter.taskStatus == '执行中'">{{ enter.taskStatus }}</span>
+          <span class="status1" v-show="enter.taskStatus  == '已完成'">{{ enter.taskStatus  }}</span>
         </div>
         <!--入库经办人-->
         <ws-form-item label="入库经办人：" span="1" prop="agent">
@@ -152,26 +156,26 @@
       />
       <div class="small-title" style="font-size: 16px">实际流转数量</div>
       <ws-info-table class="flow">
-        <el-table :data="weights" height="90" border style="width: 100%">
+        <el-table :data="weights"  border style="width: 100%">
           <el-table-column prop="weightOut" label="累计出库量（吨）">
           </el-table-column>
           <el-table-column prop="weightIn" label="累计入库量（吨）">
           </el-table-column>
           <el-table-column prop="transportLoss" label="累计运输损耗（吨）"> 
-            <!-- <template scope="scope">
-              {{weightOut}}
-            </template> -->
+            <template scope="scope">
+              {{scope.row.weightOut - scope.row.weightIn}}
+            </template>
           </el-table-column>
         </el-table>
       </ws-info-table>
       <ws-info-table class="flow1">
         <el-table :data="enter.inOutWarehouseTaskList"  border style="width: 100%">
           <el-table-column prop="weight" label="累计退库量（吨）">
-            <!-- <template>
-              <div>30</div>
-            </template> -->
+             <template >
+             {{this.enter.stockReturnCount}}
+            </template> 
              <template scope="scope">
-              {{scope.row.weight}}<span style="margin: 0 20px">至</span>{{scope.row.warehouseName}}
+              {{scope.row.weight}}<span style="margin: 0 30px;color: #8890B1;">退至</span>{{scope.row.warehouseName}}
               <div></div>
             </template> 
           </el-table-column>
@@ -237,6 +241,7 @@ export default {
       name: '',
       moveLookData: [],
       shipment: {},
+      shipment1:{},
       enter: {},
       moveTaskNo: '',
       weights:[
@@ -304,18 +309,16 @@ export default {
           for (var i = 0; i < this.moveLookData.length; i++) {
             if (this.moveLookData[i].inOutType == '移库出库') {
               this.shipment = this.moveLookData[i]
+              this.shipment1 = this.moveLookData[i]
                this.weightOut = this.moveLookData[i].weight
                this.$set(this.weights[0],'weightOut',this.moveLookData[i].weight)
-              // this.weights.splice(1,1,{weightOut:this.moveLookData[i].weight})
-
             } else  {
               // if (this.moveLookData[i].inOutType == '移库入库')
-              this.enter = this.shipment = this.moveLookData[i]
+               this.enter = this.shipment = this.moveLookData[i]
                 this.weightIn = this.moveLookData[i].weight
                 this.$set(this.weights[0],'weightIn',this.moveLookData[i].weight)
               this.businessDescribe = this.moveLookData[i].businessDescribe
             }
-            console.log(this.weights)
            this.transportLoss = this.weightOut - this.weightIn
             this.goodsName = this.moveLookData[0].goodsName
             this.grade = this.moveLookData[0].grade
@@ -324,6 +327,7 @@ export default {
             this.weight = this.moveLookData[0].weight
             this.unitPrice = this.moveLookData[0].unitPrice
           }
+          console.log(this.shipment1,"出库对象")
         })
     },
     selectChapterTwo(e) {
@@ -644,9 +648,14 @@ export default {
 }
 .flow,
 .flow1 {
-  border-radius: 4px;
+  border-radius: 5px;
   border: 1px solid #d8dce6;
   margin-top: 20px;
+  // border-bottom: 0px;
+  border-top: 0px;
+}
+.flow{
+  height: 95px;
 }
 /deep/.flow .el-form-item {
   display: inline-grid;
@@ -683,4 +692,25 @@ export default {
 /deep/.el-table td{
   text-align: center;
 }
+.status{
+  margin-left: 10px;
+  background: #E6EAF8;
+  padding: 2px 5px;
+  border-radius: 3px;
+  color: #5473E8;
+}
+.status1{
+   margin-left: 10px;
+background: #E5F1F7;
+  padding: 2px 5px;
+  border-radius: 3px;
+  color: #50CAD4;
+}
+.status2{
+   margin-left: 10px;
+background: #E1E7FD;
+  padding: 2px 5px;
+  border-radius: 3px;
+  color: #5473E8;
+}
 </style>

src/views/taskManagement/tranManagementTransportAdd.vue

@@ -367,6 +367,7 @@ export default {
         warehouseType: '1',
         tranProcessInfoList: [
           {
+            sort:0,
             processNo: '',
             tranType: '汽运',
             tranTypeKey: '1',
@@ -785,6 +786,11 @@ export default {
 
           this.deptBudgetList.compId = sessionStorage.getItem('ws-pf_compId')
           this.deptBudgetList.tranType = this.checkList.toString()
+          for(var i = 0 ; i < this.deptBudgetList.tranProcessInfoList.length ; i++){
+            this.deptBudgetList.tranProcessInfoList[i].sort = i
+
+          }
+          console.log(this.deptBudgetList.tranProcessInfoList,"数组111")
           addtrantask(this.deptBudgetList)
             .toPromise()
             .then(response => {

src/views/taskManagement/tranManagementTransportEdit.vue

@@ -78,7 +78,7 @@
         </el-form-item>
         <el-form-item label="重量（吨）" span="1" prop="weight">
           <el-input
-          @input='weightchange'
+            @input="weightchange"
             v-model="deptBudgetList.weight"
             placeholder="请输入重量"
             maxlength="20"
@@ -87,14 +87,13 @@
         </el-form-item>
       </ws-info-table>
       <ws-info-table class="el-table">
-        <div class="start-address" style="width : 36%">
-          <el-radio-group @change='warehouseTypechange' v-model="deptBudgetList.warehouseType">
-          <el-radio label="1"
-            >常用仓库发货</el-radio
-          >
-          <el-radio label="2"
-            >临时仓库发货</el-radio
+        <div class="start-address" style="width: 36%">
+          <el-radio-group
+            @change="warehouseTypechange"
+            v-model="deptBudgetList.warehouseType"
           >
+            <el-radio label="1">常用仓库发货</el-radio>
+            <el-radio label="2">临时仓库发货</el-radio>
           </el-radio-group>
           <el-select
             v-model="deptBudgetList.sendWarehouse"
@@ -198,8 +197,11 @@
         :key="index"
       >
         <div class="driver">
-          <span style='vertical-align: top;'>运输阶段{{ index + 1 }} {{ item.processNo }}</span>
-          <img v-if='!endflag'
+          <span style="vertical-align: top"
+            >运输阶段{{ index + 1 }} {{ item.processNo }}</span
+          >
+          <img
+            v-if="!endflag"
             width="22"
             height="22"
             class="add"
@@ -216,13 +218,13 @@
             alt=""
           />
           <el-checkbox
-          @change='engflagchange'
-           class='endflag'
+            @change="engflagchange"
+            class="endflag"
             v-if="index == deptBudgetList.tranProcessInfoList.length - 1"
             v-model="item.endFlag"
             :label="1"
             >最终阶段</el-checkbox
-          >     
+          >
         </div>
         <ws-info-table>
           <el-form-item label="运输方式" span="1" prop="waterContent">
@@ -398,7 +400,7 @@ export default {
       checkList: [],
       deptBudgetList: {},
       radio: '1',
-      endflag:false,
+      endflag: false,
       carModelList: [],
       carLengthList: [],
       warehouseType: '1',
@@ -437,8 +439,8 @@ export default {
     },
   },
   methods: {
-    warehouseTypechange(){
-        getwarehousename({
+    warehouseTypechange() {
+      getwarehousename({
         compId: this.compId,
         warehouseType: this.deptBudgetList.warehouseType,
       })
@@ -447,57 +449,82 @@ export default {
           this.warehouseList = response
         })
     },
-    weightchange(e){
-      this.deptBudgetList.tranProcessInfoList[0].weight=e
+    weightchange(e) {
+      this.deptBudgetList.tranProcessInfoList[0].weight = e
     },
-    engflagchange(e){
-      this.endflag=e
+    engflagchange(e) {
+      this.endflag = e
     },
     loaddata() {
       examinetran({ id: this.$route.query.id })
         .toPromise()
         .then((response) => {
-          var tmp = []
-          tmp[0] = TextToCode[response.startPrivate].code
-          tmp[1] = TextToCode[response.startPrivate][response.startCity].code
-          tmp[2] =
-            TextToCode[response.startPrivate][response.startCity][
-              response.startArea
-            ].code
-          this.selectedOptions = tmp
-          var tmp1 = []
-          tmp1[0] = TextToCode[response.endPrivate].code
-          tmp1[1] = TextToCode[response.endPrivate][response.endCity].code
-          tmp1[2] =
-            TextToCode[response.endPrivate][response.endCity][
-              response.endArea
-            ].code
-          this.selectedOptions1 = tmp1
-          for (var i = 0; i < response.tranProcessInfoList.length; i++) {
-            var tmp2 = []
-            tmp2[0] =
-              TextToCode[response.tranProcessInfoList[i].sendPrivate].code
-            tmp2[1] =
-              TextToCode[response.tranProcessInfoList[i].sendPrivate][
-                response.tranProcessInfoList[i].sendCity
+          if (
+            response.startPrivate != null &&
+            response.startCity != null &&
+            response.startArea != null
+          ) {
+            var tmp = []
+            tmp[0] = TextToCode[response.startPrivate].code
+            tmp[1] = TextToCode[response.startPrivate][response.startCity].code
+            tmp[2] =
+              TextToCode[response.startPrivate][response.startCity][
+                response.startArea
               ].code
-            tmp2[2] =
-              TextToCode[response.tranProcessInfoList[i].sendPrivate][
-                response.tranProcessInfoList[i].sendCity
-              ][response.tranProcessInfoList[i].sendArea].code
-            response.tranProcessInfoList[i].selectedOptions = tmp2
-            var tmp3 = []
-            tmp3[0] =
-              TextToCode[response.tranProcessInfoList[i].receivePrivate].code
-            tmp3[1] =
-              TextToCode[response.tranProcessInfoList[i].receivePrivate][
-                response.tranProcessInfoList[i].receiveCity
+            this.selectedOptions = tmp
+          }
+          if (
+            response.endPrivate != null &&
+            response.endCity != null &&
+            response.endArea != null
+          ) {
+            var tmp1 = []
+            tmp1[0] = TextToCode[response.endPrivate].code
+            tmp1[1] = TextToCode[response.endPrivate][response.endCity].code
+            tmp1[2] =
+              TextToCode[response.endPrivate][response.endCity][
+                response.endArea
               ].code
-            tmp3[2] =
-              TextToCode[response.tranProcessInfoList[i].receivePrivate][
-                response.tranProcessInfoList[i].receiveCity
-              ][response.tranProcessInfoList[i].receiveArea].code
-            response.tranProcessInfoList[i].selectedOptions1 = tmp3
+            this.selectedOptions1 = tmp1
+          }
+
+          for (var i = 0; i < response.tranProcessInfoList.length; i++) {
+            if (
+              response.tranProcessInfoList[i].sendPrivate != '' &&
+              response.tranProcessInfoList[i].sendCity != '' &&
+              response.tranProcessInfoList[i].sendArea != ''
+            ) {
+              var tmp2 = []
+              tmp2[0] =
+                TextToCode[response.tranProcessInfoList[i].sendPrivate].code
+              tmp2[1] =
+                TextToCode[response.tranProcessInfoList[i].sendPrivate][
+                  response.tranProcessInfoList[i].sendCity
+                ].code
+              tmp2[2] =
+                TextToCode[response.tranProcessInfoList[i].sendPrivate][
+                  response.tranProcessInfoList[i].sendCity
+                ][response.tranProcessInfoList[i].sendArea].code
+              response.tranProcessInfoList[i].selectedOptions = tmp2
+            }
+            if (
+              response.tranProcessInfoList[i].receivePrivate != '' &&
+              response.tranProcessInfoList[i].receiveCity != '' &&
+              response.tranProcessInfoList[i].receiveArea != ''
+            ) {
+              var tmp3 = []
+              tmp3[0] =
+                TextToCode[response.tranProcessInfoList[i].receivePrivate].code
+              tmp3[1] =
+                TextToCode[response.tranProcessInfoList[i].receivePrivate][
+                  response.tranProcessInfoList[i].receiveCity
+                ].code
+              tmp3[2] =
+                TextToCode[response.tranProcessInfoList[i].receivePrivate][
+                  response.tranProcessInfoList[i].receiveCity
+                ][response.tranProcessInfoList[i].receiveArea].code
+              response.tranProcessInfoList[i].selectedOptions1 = tmp3
+            }
           }
           this.checkList = response.tranType.split(',')
           this.deptBudgetList = response
@@ -631,6 +658,87 @@ export default {
           ) {
             this.deptBudgetList.tranProcessInfoList[i].processNo =
               this.deptBudgetList.taskNo + (i + 1)
+            if (
+              new Date(
+                this.deptBudgetList.tranProcessInfoList[i].deliveryDateStart
+              ).getTime() >
+              new Date(
+                this.deptBudgetList.tranProcessInfoList[i].deliveryDateEnd
+              ).getTime()
+            ) {
+              this.$message({
+                message: '发货日期不能大于最晚到货日期',
+                type: 'warning',
+              })
+              return
+            }
+            if (!this.deptBudgetList.tranProcessInfoList[i].deliveryDateStart) {
+              this.$message({
+                message: '发货日期不能为空',
+                type: 'warning',
+              })
+              return
+            }
+            if (!this.deptBudgetList.tranProcessInfoList[i].deliveryDateEnd) {
+              this.$message({
+                message: '最晚到货日期不能为空',
+                type: 'warning',
+              })
+              return
+            }
+            if (!this.deptBudgetList.tranProcessInfoList[i].weight) {
+              this.$message({
+                message: '重量不能为空',
+                type: 'warning',
+              })
+              return
+            }
+            if (!this.deptBudgetList.tranProcessInfoList[i].sender) {
+              this.$message({
+                message: '发货人不能为空',
+                type: 'warning',
+              })
+              return
+            }
+            if (!this.deptBudgetList.tranProcessInfoList[i].senderPhone) {
+              this.$message({
+                message: '发货人电话不能为空',
+                type: 'warning',
+              })
+              return
+            }
+            if (!this.deptBudgetList.tranProcessInfoList[i].receiver) {
+              this.$message({
+                message: '收货人不能为空',
+                type: 'warning',
+              })
+              return
+            }
+            if (!this.deptBudgetList.tranProcessInfoList[i].receiverPhone) {
+              this.$message({
+                message: '收货人电话不能为空',
+                type: 'warning',
+              })
+              return
+            }
+            if (
+              !this.deptBudgetList.tranProcessInfoList[i].receiveDetailedAddress
+            ) {
+              this.$message({
+                message: '收获详细地址不能为空',
+                type: 'warning',
+              })
+              return
+            }
+            if (
+              !this.deptBudgetList.tranProcessInfoList[i].sendDetailedAddress
+            ) {
+              this.$message({
+                message: '发货详细地址不能为空',
+                type: 'warning',
+              })
+              return
+            }
           }
           this.deptBudgetList.compId = sessionStorage.getItem('ws-pf_compId')
           this.deptBudgetList.tranType = this.checkList.toString()
@@ -666,9 +774,9 @@ export default {
 .position .ws-info-table .el-form-item {
   width: 25%;
 }
-.typeselect{
-  width:42%;
-  margin-left:32px;
+.typeselect {
+  width: 42%;
+  margin-left: 32px;
 }
 /deep/.position .ws-info-table .el-form-item .el-form-item__label,
 /deep/.position .ws-info-table .el-form-item .el-form-item__content {
@@ -700,8 +808,10 @@ export default {
   color: #8890b1;
   font-size: 14px;
 }
-/deep/.el-table--border:after, /deep/.el-table--group:after, /deep/.el-table:before {
-  background:transparent;
+/deep/.el-table--border:after,
+/deep/.el-table--group:after,
+/deep/.el-table:before {
+  background: transparent;
 }
 .el-form {
   padding: 0 10%;
@@ -801,8 +911,11 @@ export default {
   font-size: 16px;
   color: #5473e8;
 }
-.el-form{
-      height: 73vh;
-    overflow: scroll;
+.el-form {
+  height: 73vh;
+  overflow: scroll;
+}
+.el-cascader{
+  width: 100%;
 }
 </style>

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -42,7 +42,7 @@
           />
         </ws-select>
         <ws-input
-          v-model="warehouseName"
+          v-model="searchKeyWord"
           placeholder="可按合同编号或任务编号查找"
           clearable
           maxlength="500"
@@ -56,7 +56,7 @@
               vertical-align: text-top;
               position: relative;
               top: 0px;
-              left: -1px;
+              left: -7px;
             "
             src="../../../public/img/sousuo.png"
             alt

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -236,7 +236,7 @@
       </div>
       <div v-show="dataList.taskTypeKey != 1" class="center1">
         <img
-            style="position: relative; top: 40px; left: 128px;" 
+            style="position: relative; top: 40px; left: 300px;" 
             width="19"
             height="19"
             src="../../../public/img/cangku.png"

src/views/taskManagement/tranManagementWarehouseInOutTaskAudit.vue

@@ -35,7 +35,7 @@
       <div class="ding"></div>
        <div v-if="dataList.taskTypeKey != 2&&dataList.taskTypeKey != 4" class="center1">
           <img
-            style="position: relative; top: 40px; left: 128px;" 
+            style="position: relative; top: 40px; left: 300px;" 
             width="19"
             height="19"
             src="../../../public/img/cangku.png"
@@ -255,7 +255,7 @@
       </div>
       <div v-show="dataList.taskTypeKey != 1" class="center1">
         <img
-            style="position: relative; top: 40px; left: 128px;" 
+            style="position: relative; top: 40px; left: 300px;" 
             width="19"
             height="19"
             src="../../../public/img/cangku.png"
@@ -1416,7 +1416,7 @@ export default {
   display: inline-block;
 }
 .center1 .small-title {
-  margin-left: 150px;
+  margin-left: 323px;
 }
 .center1 {
   width: 90%;
@@ -1454,6 +1454,7 @@ export default {
   font-weight: 400;
   color: #8890B1;
   line-height: 16px;
+  margin-left: 130px;
 }
 .a{
   margin-left: -32px;
@@ -1474,7 +1475,7 @@ export default {
   font-weight: 400;
   color: #8890b1;
   line-height: 20px;
-  margin-left: 130px;
+  margin-left: 310px;
   /* margin-top: 112px; */
 }
 .ziti1 {
@@ -1484,8 +1485,8 @@ export default {
     font-weight: 500;
     color: #262626;
     line-height: 22px;
-    margin-left: 197px;
-    margin-top: -22px;
+    margin-left: 381px;
+    margin-top: -21px;
 }
 .winseaview-view {
   padding: 0 0 20px;
@@ -1495,7 +1496,7 @@ export default {
   height: 93vh;
 }
 .nav {
-  width: 200px;
+  width: 381px;
   height: 20px;
 }
 </style>

src/views/taskManagement/tranManagementWarehouseInOutTaskEdit.vue

@@ -39,7 +39,7 @@
       <div class="ding"></div>
        <div v-if="dataList.taskTypeKey != 2&&dataList.taskTypeKey != 4" class="center1">
           <img
-            style="position: relative; top: 40px; left: 128px;" 
+            style="position: relative; top: 40px; left: 300px;" 
             width="19"
             height="19"
             src="../../../public/img/cangku.png"
@@ -243,7 +243,7 @@
       </div>
       <div v-show="dataList.taskTypeKey != 1" class="center1">
         <img
-            style="position: relative; top: 40px; left: 128px;" 
+            style="position: relative; top: 40px; left: 300px;" 
             width="19"
             height="19"
             src="../../../public/img/cangku.png"
@@ -1373,7 +1373,7 @@ export default {
   display: inline-block;
 }
 .center1 .small-title {
-  margin-left: 150px;
+  margin-left: 323px;
 }
 .center1 {
   width: 90%;
@@ -1411,6 +1411,7 @@ export default {
   font-weight: 400;
   color: #8890B1;
   line-height: 16px;
+  margin-left: 130px;
 }
 .a{
   margin-left: -32px;
@@ -1431,7 +1432,7 @@ export default {
   font-weight: 400;
   color: #8890b1;
   line-height: 20px;
-  margin-left: 130px;
+  margin-left: 310px;
   /* margin-top: 112px; */
 }
 .ziti1 {
@@ -1441,8 +1442,8 @@ export default {
     font-weight: 500;
     color: #262626;
     line-height: 22px;
-    margin-left: 197px;
-    margin-top: -22px;
+    margin-left: 381px;
+    margin-top: -21px;
 }
 .winseaview-view {
   padding: 0 0 20px;
@@ -1452,7 +1453,7 @@ export default {
   height: 93vh;
 }
 .nav {
-  width: 200px;
+  width: 380px;
   height: 20px;
 }
 </style>

src/views/tranManagement/tranManagementDriverEdit.vue

@@ -544,10 +544,8 @@ export default {
             TextToCode[this.deptBudgetList.residentCityProvincial][
               this.deptBudgetList.residentCityMunicipal
             ].code
-          this.selectedOptions = tmp
-           
+          this.selectedOptions = tmp         
         })
-      console.log(11111)
       // 车型
       packList({ constId: 'TRAN1' })
         .toPromise()

src/views/tranManagement/tranManagementReceivingFeedback.vue

@@ -150,16 +150,24 @@
       </el-table-column>
       <el-table-column class="table_td" label="接单时间" prop="createDate">
         </el-table-column>
-        <el-table-column prop="seller" label="操作" width="300">
-            <template slot-scope="scope">
-            <div class="record" @click="trainSee(scope.row)">
-              查看
-            </div>
-            <div class="adjustment" @click="feedback(scope.row)"
-              v-show="scope.row.tranType == '汽运'"
-            >
-              反馈
-            </div>
+     <el-table-column prop="seller" label="操作" width="300">
+          <template  slot-scope="scope">
+              <template v-if="
+                scope.row.tranType == '汽运' &&
+                scope.row.feedbackStatus != '已完成'
+              ">
+                <div class="record" @click="trainSee(scope.row)">查看</div>
+                <div class="adjustment" @click="feedback(scope.row)">反馈</div>
+              </template>
+              <template v-else-if="
+                scope.row.tranType == '汽运' &&
+                scope.row.feedbackStatus == '已完成'
+              ">
+                <div class="record1" @click="trainSee(scope.row)">查看</div>
+              </template>
+               <template v-else>
+                <div class="record1">—— ——</div>
+              </template>
           </template>
         </el-table-column>
       </el-table>
@@ -515,12 +523,13 @@ export default {
 /deep/.el-table tr th.is-leaf:first-child {
   border-left: 1px solid #e9ecf7;
 }
-.record,
+.record,.record1,
 .adjustment {
   display: inline-block;
   color: #5878e8;
   padding: 0 4px !important;
   position: relative;
+  font-size: 14px;
 }
 .record:after {
   position: absolute;
@@ -567,13 +576,13 @@ export default {
 .done {
   background: #50cad4;
 }
-.record, .adjustment {
-    display: inline-block;
-    color: #5878e8;
-    padding: 0 4px !important;
-    position: relative;
-    font-size: 14px;
-}
+// .record, .adjustment {
+//     display: inline-block;
+//     color: #5878e8;
+//     padding: 0 4px !important;
+//     position: relative;
+//     font-size: 14px;
+// }
 /deep/.el-pagination {
     text-align: center;
     white-space: nowrap;

src/views/tranManagement/tranManagementReceivingloading.vue

@@ -92,36 +92,22 @@
               <ws-form-item label="姓名：" span="1" prop="driver">
                 <span v-show="item.temporaryDriverFlag == 0">{{ item.driver }}</span>
               </ws-form-item>
+               <el-divider direction="vertical" class="line"></el-divider>
               <!--电话-->
               <ws-form-item label="电话：" span="1" prop="driverPhone">
-                <!-- <ws-input
-                v-show="item.temporaryDriverFlag != 0"
-                v-model="item.driverPhone"
-                maxlength="20"
-                size="small"
-                />-->
                 <span v-show="item.temporaryDriverFlag == 0">{{ item.driverPhone }}</span>
               </ws-form-item>
+               <el-divider direction="vertical" class="line"></el-divider>
               <!--车牌号-->
               <ws-form-item label="车牌号：" span="1" prop="carNo">
-                <!-- <ws-input
-                v-show="item.temporaryDriverFlag != 0"
-                v-model="item.carNo"
-                maxlength="20"
-                size="small"
-                />-->
                 <span v-show="item.temporaryDriverFlag == 0">{{ item.carNo }}</span>
               </ws-form-item>
+               <el-divider direction="vertical" class="line"></el-divider>
               <!--装车净重-->
               <ws-form-item label="装车(吨)：" span="1" prop="loadNetWeight">
-                <!-- <ws-input
-                v-model="item.loadNetWeight"
-                placeholder="请输入装车(吨)"
-                maxlength="20"
-                size="small"
-                />-->
                 {{item.loadNetWeight}}
               </ws-form-item>
+               <el-divider direction="vertical" class="line"></el-divider>
               <!--卸车净重(吨)-->
               <ws-form-item label="卸车净重(吨)：" span="1" prop="unloadNetWeight">
                 <ws-input
@@ -131,6 +117,7 @@
                   size="small"
                 />
               </ws-form-item>
+               <el-divider direction="vertical" class="line"></el-divider>
               <!--磅单-->
               <ws-form-item label="磅单：" span="1" prop="loadPoundImg">
               <template slot-scope="scope">
@@ -155,12 +142,6 @@
                     alt=""
                   />
                 </el-upload>
-                <!-- <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> -->
               </template>
             </ws-form-item>
             </ws-info-table>
@@ -489,7 +470,7 @@ export default {
 //表格文字
 /deep/.ws-info-table .el-form-item .el-form-item__label {
   text-align: left;
-  font-size: 14px;
+  font-size: 13px;
   font-weight: 400;
   color: #8890b1;
   line-height: 16px;
@@ -537,13 +518,14 @@ export default {
   background: #f5f7fa;
   border-radius: 4px;
   color: #8890b1;
-  font-size: 14px;
+  font-size: 12px;
+  font-weight: 400;
 }
 /deep/.driver .ws-info-table .el-form-item .el-form-item__label {
   width: 72px;
 }
 /deep/.liaison .ws-info-table .el-form-item {
-  width: 16.66%;
+  width: 14.66%;
   color: #8890b1;
   font-size: 14px;
 }
@@ -552,7 +534,7 @@ export default {
   height: 50px;
 }
 /deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
-  width: 40%;
+  width:55%;
   border: 0px solid #d8dce6;
   background: #f5f7fa;
   text-align: center;
@@ -628,4 +610,22 @@ export default {
   overflow: scroll;
   height: 93vh;
 }
+.line{
+  height: 26px;
+  margin-top: 6px;
+  left: 2px;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+    // background-color: #eee;
+    // padding-right: 8px;
+    // padding-left: 8px;
+    // width: 100px;
+    font-size: 12px;
+    font-weight: bold;
+    // color: #333;
+    // overflow: hidden;
+    // text-overflow: ellipsis;
+    white-space: nowrap;
+    // line-height: 40px;
+}
 </style>

src/views/tranManagement/tranManagementReceivingloadingLook.vue

@@ -102,28 +102,32 @@
             <div class="catNos" v-show="item.temporaryDriverFlag == 0">司机-{{index+1}}</div>
              <div class="catNos catNosCor" v-show="item.temporaryDriverFlag != 0">司机-{{index+1}}(临)</div>
             <!--姓名-->
-            <ws-form-item label="姓名" span="1" prop="driver" v-show="freightspace[index].temporaryDriverFlag == 0">
+            <ws-form-item label="姓名:" span="1" prop="driver" v-show="freightspace[index].temporaryDriverFlag == 0">
               <span>{{ item.driver }} </span>
             </ws-form-item>
-
+           <el-divider direction="vertical" class="line"></el-divider>
             <!--电话-->
-            <ws-form-item label="电话" span="1" prop="driverPhone">
+            <ws-form-item label="电话:" span="1" prop="driverPhone">
               <span>{{ item.driverPhone }} </span>
             </ws-form-item>
+             <el-divider direction="vertical" class="line"></el-divider>
             <!--车牌号-->
-            <ws-form-item label="车牌号" span="1" prop="carNo">
+            <ws-form-item label="车牌号:" span="1" prop="carNo">
               <span>{{ item.carNo }} </span>
             </ws-form-item>
+             <el-divider direction="vertical" class="line"></el-divider>
             <!--装车净重-->
-            <ws-form-item label="净重(吨)" span="1" prop="loadNetWeight">
+            <ws-form-item label="净重(吨):" span="1" prop="loadNetWeight">
               {{ item.loadNetWeight }}
             </ws-form-item>
+             <el-divider direction="vertical" class="line"></el-divider>
              <!--卸车重-->
-            <ws-form-item label="卸车净重(吨)" span="1" prop="unloadNetWeight">
+            <ws-form-item label="卸车净重(吨):" span="1" prop="unloadNetWeight">
               {{ item.unloadNetWeight }}
             </ws-form-item>
+             <el-divider direction="vertical" class="line"></el-divider>
             <!--磅单-->
-            <ws-form-item label="磅单" span="1" prop="loadPoundImg">
+            <ws-form-item label="磅单:" span="1" prop="loadPoundImg">
               <template slot-scope="scope">
                 <img
                   width="18"
@@ -729,7 +733,8 @@ activated(){
 }
 /deep/.ws-info-table .el-form-item .el-form-item__label {
   background-color: #fff;
-  font-size: 14px;
+  font-size: 13px;
+  font-family: PingFangSC-Regular, PingFang SC;
   font-weight: 400;
   color: #8890b1;
   line-height: 16px;
@@ -746,11 +751,11 @@ activated(){
 }
 //联络员及车次
 /deep/.liaison .ws-info-table .el-form-item {
-  width: 16.6%;
+  width: 15%;
   height: 50px;
 }
 /deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
-  width: 51%;
+  width: 53%;
   background: #F6F7FC;
 }
 /deep/.liaison .flex {
@@ -772,4 +777,9 @@ margin-top: 20px;
 .catNosCor{
   color: #5473E8;
 }
+.line{
+  height: 26px;
+  margin-top: 6px;
+  left: 2px;
+}
 </style>

src/views/tranManagement/tranManagementShipping.vue

@@ -45,7 +45,6 @@
           type="input"
           class="findValue"
         ></ws-input>
-        <!-- v-hasPermission="'procurement.sparepart.directShip'" -->
         <ws-button class="find" type="primary" @click="find()"
           ><img
             width="16"
@@ -144,7 +143,7 @@
             />
           </template>
         </el-table-column>
-        <el-table-column class="table_td" label="接单日期" prop="createDate">
+        <el-table-column class="table_td" label="接单时间" prop="createDate">
         </el-table-column>
         <el-table-column prop="seller" label="操作" width="300">
           <template slot-scope="scope">

src/views/tranManagement/tranManagementShippingArrangemen.vue

@@ -69,7 +69,7 @@
                     filterable
                     :filter-method="dataFilter"
                     @change="selectstaff"
-                    class="ys"
+                     size="small"
                   >
                     <el-option
                       v-for="item in options"
@@ -82,6 +82,7 @@
                 </ws-form-item>
                 <ws-form-item label="电话" span="1" prop="driverPhone" class="biao">
                   <ws-input
+                    
                     :readonly="true"
                     v-model="item.driverPhone"
                     placeholder="请输入电话"
@@ -143,20 +144,20 @@
               </ws-info-table>
             </div>
             <div
-              style="width: 530px"
+              style=" width: 536px;"
               class="xia"
               v-for="(items, index) in freightspace"
               v-show="item.shipType=='散船'"
               :key="index"
             >
               <ws-info-table>
-                <ws-form-item :label="'仓位号-'+ (index +1 )" span="1" prop="impurity" class="bot">
+                <ws-form-item :label="'仓位号-'+ (index +1 )" span="1" prop="impurity"  class="bot" >
                   <el-input v-model="items.impurity"></el-input>
                 </ws-form-item>
-                <ws-form-item label="重量(吨)" span="1" prop="positionWeight" class="bot">
+                 <ws-form-item label="重量(吨)" span="1" prop="positionWeight" class="bot" >
                   <el-input v-model="items.positionWeight"></el-input>
-                </ws-form-item>
-                <span
+                </ws-form-item> 
+                 <span
                   width="22"
                   height="22"
                   class="del"
@@ -289,6 +290,7 @@ export default {
   },
   activated() {
     this.loaddata()
+     this.getList()
     
   },
   computed: {
@@ -347,17 +349,44 @@ export default {
         .toPromise()
         .then(response => {
           this.deptBudgetList = response
-          for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
-            var num = this.deptBudgetList.tranCarInfoList[
-              i
-            ].positionWeight.split(',')
-            for (var j = 0; j < num.length; j++) {
-              var num2 = num[j].split('/')
-              this.freightspace.push({
-                impurity: num2[i],
-                positionWeight: num2[num2.length - 1]
-              })
+          // for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
+          //   var num = this.deptBudgetList.tranCarInfoList[
+          //     i
+          //   ].positionWeight.split(',')
+          //   for (var j = 0; j < num.length; j++) {
+          //     var num2 = num[j].split('/')
+          //     this.freightspace.push({
+          //       impurity: num2[i],
+          //       positionWeight: num2[num2.length - 1]
+          //     })
+          //   }
+          // }
+          if(response.tranCarInfoList.length>0) {
+            if(response.tranCarInfoList[i].positionWeight) {
+              this.list = response.tranCarInfoList[0].positionWeight.splice(',')
+              for(var i = 0;i<this.list.length;i++) {
+                var num = this.list[i]
+                this.freightspace.push({
+                  trandriver:num,
+                })
+              }
             }
+          }else{
+            this.deptBudgetList.tranCarInfoList = [
+              {
+                driver:'',
+                driverPhone:'',
+                sendDateStart:'',
+                receiveDateEnd: '',
+                shipNo:'',
+                shipName:'',
+                shipType:'',
+                boxNumber:'',
+                positionWeight:'',
+
+
+              }
+            ]
           }
         })
     },
@@ -508,7 +537,7 @@ export default {
               dispatchCat(tranCarInfo)
                 .toPromise()
                 .then(response => {
-                  this.$message.success('添加成功')
+                  this.$message.success('提交成功')
                   this.deptBudgetList = {}
                   this.freightspace = {}
                   this.selectedOptions = ''
@@ -582,6 +611,7 @@ export default {
   position: relative;
   padding: 10px;
   font-weight: 600;
+  margin-left: 27px;
 }
 
 .position .zaizhong {
@@ -590,6 +620,7 @@ export default {
 
 .bot {
   width: 30%;
+ 
 }
 //去边框
 /deep/.el-form-item {
@@ -715,6 +746,7 @@ export default {
   margin-top: 10px;
   background: #f6f7fc;
   border-radius: 4px;
+  margin-left: 24px;
 }
 .basicInformation .ws-info-table {
   border: none;
@@ -727,15 +759,20 @@ export default {
     width: 150px;
 }
 .zhong {
-  background: #f6f7fc;
-  border: 1px solid #d8dce6;
+    height: 111px;
+    background: #F6F7FC;
+    border-radius: 4px;
+    border: 1px solid #D8DCE6;
+    width: 99%;
+    margin: 0 2%;
+    // margin-left: -76px;
 }
 .bg-left {
   padding-left: 30px;
 }
 /deep/.el-icon-arrow-up:before {
     margin-left: 171px;
-    display: none;
+    // display: none;
 }
 /deep/.el-input--prefix .el-input__inner {
     padding-left: 30px;
@@ -743,8 +780,9 @@ export default {
 }
 .basicInformation .ws-info-table {
     border: none;
-    width: 140%;
-     margin-left: -16px;
+    width: 141%;
+    margin: 0 auto;
+    // margin-left: -89px;
 }
 .ys{
   // margin-left: 300px;
@@ -810,6 +848,7 @@ export default {
   height: 10px;
   line-height: 0px;
   margin-top: 10px;
+  margin-left: 17px;
 }
 
 .amap-page-container {
@@ -929,6 +968,7 @@ export default {
 .center {
   width: 86%;
   margin: 0 auto;
+  // margin: 0 -29%;
 }
 .el-form-item {
   width: 50%;
@@ -1028,6 +1068,7 @@ export default {
 /deep/.ws-info-table .el-form-item {
   border: none;
   height: 50px;
+  // margin: 0 auto;
 }
 /deep/.ws-info-table .el-form-item .el-form-item__content {
   background: #f5f7fa;
@@ -1056,21 +1097,6 @@ export default {
 /deep/.flex .ws-info-table .el-form-item .el-form-item__content {
   border: 0px;
 }
-
-// /deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
-//   width: 30%;
-//   border: 0px solid #d8dce6;
-//   background: #f5f7fa;
-// }
-// /deep/.liaison {
-//   display: contents;
-//   background: #f5f7fa;
-//   border-radius: 4px;
-//   border: 0px solid #d8dce6;
-// }
-// /deep/.liaison .ws-info-table .el-form-item .el-form-item__content {
-//   border: none;
-// }
 .add {
   width: 100px;
   height: 34px;
@@ -1079,6 +1105,8 @@ export default {
   color: #5473e8;
   font-size: 14px;
   border: none;
+  margin-left: 17px;
+  // margin-left: -79px;
 }
 .add img {
   display: inline-block;
@@ -1123,5 +1151,6 @@ export default {
     font-weight: 400;
     color: #8890B1;
     line-height: 16px;
+    margin-left: 22px;
 }
 </style>

src/views/tranManagement/tranManagementShippingLook.vue

@@ -160,35 +160,9 @@
               </ws-form-item>
                
             </ws-info-table>
+            
           </div>
-          <div class="xia">
-            <div
-              style="width: 100%"
-              class="flex position"
-              v-for="(items, index) in freightspace"
-              :key="index"
-            >
-              <ws-info-table>
-                <ws-form-item
-                  :label="'仓位号-' + (index + 1)"
-                  span="1"
-                  prop="impurity"
-                  class="bot"
-                >
-                  {{ items.impurity }}
-                </ws-form-item>
-                <!-- 重量（吨） -->
-                <ws-form-item
-                  label="重量(吨)"
-                  span="1"
-                  prop="positionWeight"
-                  class="bot"
-                >
-                  {{ items.positionWeight }}
-                </ws-form-item>
-              </ws-info-table>
-            </div>
-          </div>
+          
           <div style="text-align: right; padding: 10px">
             <el-button
               class="bg-bottom-up"
@@ -295,7 +269,7 @@ export default {
     this.deptBudgetList.positionId = this.$route.query.positionId
     this.deptBudgetList.warehouseName = this.$route.query.warehouseName
     this.deptBudgetList.binNumber = this.$route.query.binNumber
-    this.getList()
+    // this.getList()
   },
   activated() {
     this.loaddata()
@@ -319,19 +293,19 @@ export default {
           }
         })
     },
-    getList() {
-      shippingList({
-        compId: sessionStorage.getItem('ws-pf_compId'),
-        currentPage: this.currentPage,
-        pageSize: this.pageSize,
-        contractType: this.contractType,
-        tranTypeKey: this.tranTypeKey,
-      })
-        .toPromise()
-        .then((response) => {
-          this.warehouseList = response
-        })
-    },
+    // getList() {
+    //   shippingList({
+    //     compId: sessionStorage.getItem('ws-pf_compId'),
+    //     currentPage: this.currentPage,
+    //     pageSize: this.pageSize,
+    //     contractType: this.contractType,
+    //     tranTypeKey: this.tranTypeKey,
+    //   })
+    //     .toPromise()
+    //     .then((response) => {
+    //       this.warehouseList = response
+    //     })
+    // },
     //返回按钮
     revert() {
       this.freightspace = []
@@ -380,7 +354,7 @@ export default {
         })
     },
     returnsales() {
-      this.$router.push({ path: 'tranManagementShipping' })
+     this.$router.go(-1)
     },
     handleClose() {
       this.accessoryTFs = false
@@ -388,12 +362,12 @@ export default {
     handleSizeChange(val) {
       console.log(`每页 ${val} 条`)
       this.pageSize = val
-      this.getList()
+      // this.getList()
     },
     handleCurrentChange(val) {
       this.currentPage = val
       console.log(`当前页: ${val}`)
-      this.getList()
+      // this.getList()
     },
     selecttaskType(e) {
       for (var i = 0; i < this.taskTypeList.length; i++) {
@@ -487,6 +461,9 @@ export default {
 .position .siji {
   width: 16%;
 }
+/deep/.position .ws-info-table .el-form-item .el-form-item__label {
+  background-color: #f5f7fa;
+}
 .position .zaizhong {
   width: 16%;
 }
@@ -528,20 +505,11 @@ export default {
   font-family: PingFangSC-Regular, PingFang SC;
   margin-bottom: 5px;
   background-color: #fff;
-  font-size: 14px;
-  font-weight: 400;
-  color: #8890b1;
-  line-height: 16px;
-}
-/deep/.ws-info-table .el-form-item .el-form-item__label {
-  background-color: #fff;
-  font-size: 14px;
-  font-family: PingFangSC-Regular, PingFang SC;
+  font-size: 12px;
   font-weight: 400;
   color: #8890b1;
   line-height: 16px;
 }
-
 /deep/.ws-info-table .el-form-item .el-form-item__content {
   background: #f5f7fa;
   border-radius: 4px;
@@ -584,7 +552,7 @@ export default {
 }
 /deep/.ws-info-table .el-form-item .el-form-item__label {
   // background-color: #f5f7fa;
-  font-size: 14px;
+  font-size: 12px;
   font-family: PingFangSC-Regular, PingFang SC;
   font-weight: 400;
   color: #8890b1;
@@ -601,8 +569,9 @@ export default {
 }
 /deep/.position .ws-info-table .el-form-item .el-form-item__label {
   background-color: #f5f7fa;
-  text-align: right;
-  width: 45%;  
+  // text-align: center;
+  width: 48%;
+  
 }
 .middle {
   background: #f6f7fc;
@@ -614,4 +583,17 @@ export default {
   margin-top: 6px;
   left: 2px;
 }
+/deep/.ws-info-table[data-v-850a44a6] .el-form-item .el-form-item__label {
+    // background-color: #eee;
+    // padding-right: 8px;
+    // padding-left: 8px;
+    // width: 100px;
+    font-size: 12px;
+    font-weight: bold;
+    // color: #333;
+    // overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    // line-height: 40px;
+}
 </style>

src/views/tranManagement/tranManagementTransporFeedback.vue

@@ -141,9 +141,7 @@
                   :value="item.staffName"
                 />
               </el-select>
-              <!-- <span v-show="item.temporaryDriverFlag == 0">{{item.driver}} </span>  -->
             </ws-form-item>
-
             <!--电话-->
             <ws-form-item label="司机电话：" span="1" prop="driverPhone">
               <ws-input
@@ -157,6 +155,7 @@
                 >{{ item.driverPhone }}
               </span>
             </ws-form-item>
+             <el-divider direction="vertical" class="line"></el-divider>
             <!--车牌号-->
             <ws-form-item label="车牌号：" span="1" prop="carNo">
               <ws-input
@@ -170,6 +169,7 @@
                 >{{ item.carNo }}
               </span>
             </ws-form-item>
+             <el-divider direction="vertical" class="line"></el-divider>
             <!--装车净重-->
             <ws-form-item label="装车净重：" span="1" prop="loadNetWeight">
               <ws-input
@@ -179,6 +179,7 @@
                 size="small"
               />
             </ws-form-item>
+             <el-divider direction="vertical" class="line"></el-divider>
             <!--磅单-->
             <ws-form-item label="磅单：" span="1" prop="loadPoundImg">
               <template slot-scope="scope">
@@ -941,7 +942,7 @@ export default {
 }
 /deep/.ws-info-table .el-form-item .el-form-item__label {
   background-color: #fff;
-  font-size: 14px;
+  font-size: 13px;
   font-family: PingFangSC-Regular, PingFang SC;
   font-weight: 400;
   color: #8890b1;
@@ -958,10 +959,10 @@ export default {
 }
 //联络员及车次
 /deep/.liaison .ws-info-table .el-form-item {
-  width: 20%;
+  width: 18%;
 }
 /deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
-  width: 30%;
+  width: 41%;
   background: #f6f7fc;
 }
 /deep/.liaison .flex {
@@ -1012,6 +1013,7 @@ export default {
   color: #ffffff;
   background: #c4cada;
   line-height: 24px;
+  margin-left: 18px;
 }
 .signStatus1 {
   height: 25px;
@@ -1023,4 +1025,9 @@ export default {
   color: #5473E8;
   line-height: 24px;
 }
+.line{
+  height: 26px;
+  margin-top: 6px;
+  left: 2px;
+}
 </style>

src/views/tranManagement/tranManagementTransporFeedbackLook.vue

@@ -102,7 +102,7 @@
             <div class="catNos" v-show="item.temporaryDriverFlag == 0">司机-{{index+1}}</div>
              <div class="catNos catNosCor" v-show="item.temporaryDriverFlag != 0">司机-{{index+1}}(临)</div>
             <!--司机-->
-            <ws-form-item label="姓名" span="1" prop="driver">
+            <ws-form-item label="姓名:" span="1" prop="driver">
               <span>{{ item.driver }} </span>
             </ws-form-item>
 

src/views/tranManagement/tranManagementTransporHairRespond.vue

@@ -161,9 +161,15 @@
                 <div class="record" @click="trainSee(scope.row)">查看</div>
                 <div class="adjustment" @click="feedback(scope.row)">反馈</div>
               </template>
-              <template v-else>
+              <template v-else-if="
+                scope.row.tranType == '汽运' &&
+                scope.row.feedbackStatus == '已完成'
+              ">
                 <div class="record1" @click="trainSee(scope.row)">查看</div>
               </template>
+               <template v-else>
+                <div class="record1">—— ——</div>
+              </template>
           </template>
         </el-table-column>
       </el-table>
@@ -281,12 +287,14 @@ export default {
     },
     //查看火运调度详细
     trainSee(row) {
-      this.$router.push({
-        path: 'tranManagementTransporFeedbackLook',
-        query: {
-          id: row.id,
-        },
-      })
+            if (row.tranType == '汽运') {
+        this.$router.push({
+          path: 'tranManagementTransporFeedbackLook',
+          query: {
+            id: row.id,
+          },
+        })
+      } 
     },
     //反馈
     feedback(row) {

src/views/tranManagement/tranManagementTransporTationFire.vue

@@ -75,7 +75,7 @@
             <span v-else>{{ scope.$index + 1 }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="processNo" label="运输任务编号" width="120">
+        <el-table-column prop="processNo" label="运输任务编号">
         </el-table-column>
         <el-table-column prop="goodsName" label="货名" >
         </el-table-column>

src/views/tranManagement/tranManagementTransporTrainNo.vue

@@ -461,7 +461,7 @@ export default {
               dispatchCat(tranCarInfo)
                 .toPromise()
                 .then((response) => {
-                  this.$message.success('添加成功')
+                  this.$message.success('提交成功')
                   this.deptBudgetList = {}
                   this.freightspace = {}
                   this.selectedOptions = ''

src/views/tranManagement/tranManagementVehicle.vue

@@ -73,7 +73,7 @@
             <span v-else>{{ scope.$index + 1 }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="processNo" label="运输任务编号" width="120">
+        <el-table-column prop="processNo" label="运输任务编号" >
         </el-table-column>
         <el-table-column prop="goodsName" label="货名"> </el-table-column>
         <el-table-column prop="weight" label="重量（吨）"> </el-table-column>

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -422,7 +422,7 @@ export default {
               dispatchCat(tranCarInfo)
                 .toPromise()
                 .then((response) => {
-                  this.$message.success('派车成功')
+                  this.$message.success('提交成功')
                   this.$router.go(-1)
                 })
             } else {