前端孟祥旭

src/views/tranManagement/tranManagementReceivingFeedback.vue

@@ -233,6 +233,8 @@ export default {
       warehouseList: [],
       deptBudgetList: {},
       historyList: [],
+      value2:'',
+      pickerOptions:[],
       pickerBeginDateBefore: {
         disabledDate: (time) => {
           return time.getTime() > Date.now()
@@ -544,4 +546,10 @@ export default {
     height: 32px;
     margin-left: -20%;
 }
+.completed, .putstorage {
+    display: inline-block;
+    color: #5878e8;
+    padding: 0 4px !important;
+    position: relative;
+}
 </style>

src/views/tranManagement/tranManagementReceivingloading.vue

@@ -24,7 +24,7 @@
     <div class="center">
     <ws-form ref="deptBudgetList" :model="deptBudgetList" :rules="rules">
       <div class="basicInformation">
-        <h2> 任务编号 </h2>
+         <div class="small-title">任务详情</div>
         <ws-info-table>
           <!-- 任务编号 -->
           <ws-form-item label="任务编号" span="1" prop="processNo">
@@ -90,7 +90,7 @@
           </ws-form-item>
         </ws-info-table>
       
-        <div class="small-title"><h2>卸车详情</h2></div>
+        <div class="small-title">卸车详情</div>
         <div class="liaison">
         <div
           style="width: 100%"
@@ -99,12 +99,14 @@
           :key="index"
         >
           <ws-info-table>
-            <!--司机-->
-            <ws-form-item :label="'司机' + (index + 1)" span="1" prop="driver">
-               <el-input
+            <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="'姓名' + (index + 1)" span="1" prop="driver">
+               <!-- <el-input
                 v-show="item.temporaryDriverFlag != 0"
                 v-model="item.driver"
-                placeholder="请选择司机"
+                placeholder="请选择姓名"
                 filterable
                 :filter-method="dataFilter"
                 @change="selectstaff"
@@ -115,40 +117,44 @@
                   :label="item.staffName"
                   :value="item.staffName"
                 />
-               </el-input> 
+               </el-input>  -->
+               {{item.driver}}
                <span v-show="item.temporaryDriverFlag == 0">{{item.driver}} </span> 
                    
             </ws-form-item>
             <!--电话-->
             <ws-form-item label="司机电话" span="1" prop="driverPhone">
-               <ws-input
+               <!-- <ws-input
                v-show="item.temporaryDriverFlag != 0"
                 v-model="item.driverPhone"
                 placeholder="请输入司机电话"
                 maxlength="20"
                 size="small"
-              /> 
+              />  -->
+              {{item.driverPhone}}
              <span v-show="item.temporaryDriverFlag == 0">{{item.driverPhone}} </span> 
             </ws-form-item>
             <!--车牌号-->
             <ws-form-item label="车牌号" span="1" prop="carNo">
-               <ws-input
+               <!-- <ws-input
                v-show="item.temporaryDriverFlag != 0"
                 v-model="item.carNo"
                 placeholder="请输入车牌号"
                 maxlength="20"
                 size="small"
-              /> 
+              />  -->
+              {{item.carNo}}
              <span v-show="item.temporaryDriverFlag == 0">{{item.carNo}} </span> 
             </ws-form-item>
             <!--装车净重-->
             <ws-form-item label="装车(吨)" span="1" prop="loadNetWeight">
-              <ws-input
+              <!-- <ws-input
                 v-model="item.loadNetWeight"
                 placeholder="请输入装车净重"
                 maxlength="20"
                 size="small"
-              />
+              /> -->
+              {{item.lo}}
             </ws-form-item>
             <!--卸车净重(吨)-->
             <ws-form-item label="卸车净重(吨)" span="1" prop="unloadNetWeight">
@@ -660,4 +666,21 @@ export default {
 .position .siji{
   width: 20.6%;
 }
+//下表格式
+/deep/.liaison .ws-info-table .el-form-item {
+  width: 15%;
+  height: 50px;
+}
+/deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
+  width: 30%;
+  background: #F6F7FC;
+}
+/deep/.liaison .flex {
+  display: contents;
+}
+/deep/.liaison .ws-info-table{
+  background: #F6F7FC;
+border-radius: 4px;
+border: 1px solid #D8DCE6;
+}
 </style>

src/views/tranManagement/tranManagementShippingArrangemen.vue

@@ -22,7 +22,7 @@
       </el-col>
     </el-row>
     <div class="center">
-    <ws-form ref="deptBudgetList" :model="deptBudgetList" :rules="rules">
+    <ws-form ref="deptBudgetList" :model="deptBudgetList" :rules="rules" class="position">
       <div class="basicInformation">
          <div class="small-title">任务详情</div>
         <ws-info-table>
@@ -540,7 +540,7 @@ export default {
 }
 .title {
   position: relative;
-  padding-left: 10px;
+  // padding-left: 10px;
 }
 .title::before {
   content: '';

src/views/tranManagement/tranManagementShippingLook.vue

@@ -162,14 +162,13 @@
         </ws-info-table>
        <div class="small-title">联络员及航次</div>
        <div class="aa">
-       <div  class="small-title">航次信息</div>
+       <div class="small-title">航次信息</div>
       <div
           style="width: 100%"
           class="flex position"
            v-for="(item, index) in deptBudgetList.tranCarInfoList"
            :key="index.id"
         >
-        
         <ws-info-table>
           <!-- 姓名 -->
           <ws-form-item label="姓名" span="1" prop="driver" class="siji">
@@ -249,7 +248,7 @@
         <div class="xia">
       <div
           style="width: 100%"
-          class=""
+          class="flex position"
          v-for="(item, index) in freightspace"
          :key="index"
         >
@@ -633,10 +632,10 @@ export default {
 .del {
   right: -70px;
 }
-.bot{
-  width: 30%;
-  border: none;
-}
+// .bot{
+//   width: 30%;
+//   border: none;
+// }
 .siji{
   width: 300px;
 }
@@ -748,4 +747,7 @@ export default {
 .position .siji {
     width: 14.2%;
 }
+.el-form {
+    height: 1000px;
+}
 </style>

src/views/tranManagement/tranManagementTransporFeedbackLook.vue

@@ -105,10 +105,7 @@
             <ws-form-item label="姓名:" span="1" prop="driver" v-show="freightspace[index].temporaryDriverFlag == 0">
               <span>{{ item.driver }} </span>
             </ws-form-item>
-            <!--司机-->
-            <ws-form-item label="姓名:" span="1" prop="driver" v-show="freightspace[index].temporaryDriverFlag == 1">
-              <span>{{ item.driver }} </span>
-            </ws-form-item>
+
             <!--电话-->
             <ws-form-item label="司机电话" span="1" prop="driverPhone">
               <span>{{ item.driverPhone }} </span>
@@ -117,10 +114,14 @@
             <ws-form-item label="车牌号" span="1" prop="carNo">
               <span>{{ item.carNo }} </span>
             </ws-form-item>
-            <!--装车净重-->
-            <ws-form-item label="装车净重" span="1" prop="loadNetWeight">
+            <!--装车(吨)-->
+            <ws-form-item label="装车(吨)" span="1" prop="loadNetWeight">
               {{ item.loadNetWeight }}
             </ws-form-item>
+            <!-- 卸车 -->
+            <ws-form-item label="卸车(吨)" span="1" prop="unloadNetWeight">
+              {{item.unloadNetWeight}}
+            </ws-form-item>
             <!--磅单-->
             <ws-form-item label="磅单" span="1" prop="loadPoundImg">
               <template slot-scope="scope">
@@ -773,4 +774,21 @@ border: 1px solid #D8DCE6;
 .catNosCor{
   color: #5473E8;
 }
+// .ws-info-table .el-form-item .el-form-item__label {
+//   font-size: 14px;
+//   font-family: PingFangSC-Regular, PingFang SC;
+//   font-weight: 400;
+//   color: #8890B1;
+//   line-height: 16px;
+//   background: white;
+// }
+// .ws-info-table {
+//     border-left: 0px;
+//     border-top: 0px;
+//     font-size: 14px;
+//     font-family: PingFangSC-Regular, PingFang SC;
+//     font-weight: 400;
+//     color: #8890B1;
+//     line-height: 16px;
+// }
 </style>