前端 sdy

src/views/tranManagement/tranManagementReceivingFeedback.vue

@@ -517,14 +517,12 @@ export default {
   background: #e9ecf7;
 }
 .el-row{
-    height: 150px;
+    height: 60px;
 }
 .base_header_layout .grid-content{
     margin-top: 80px;
 }
-.but{
-    margin-left: 6px;
-}
+
 .el-input--small .el-input__inner{
     margin-left: 20px;
 }

src/views/tranManagement/tranManagementShipping.vue

@@ -3,9 +3,9 @@
   <div>
     <BaseHeaderLayout :leftSpan="12">
       <template slot="left">
-        <ws-button class="but" @click="statusquery(1)"> 执行中</ws-button>
-        <ws-button class="but" @click="statusquery(2)">已完成</ws-button>
-        <ws-button class="but" @click="statusquery()">全部任务</ws-button>
+        <ws-button class="but" :type="searchType == 1 ?'primary':''"  @click="statusquery(1)"> 执行中</ws-button>
+        <ws-button class="but" :type="searchType == 2 ?'primary':''"  @click="statusquery(2)">已完成</ws-button>
+        <ws-button class="but" :type="searchType == undefined ?'primary':''"  @click="statusquery()">全部任务</ws-button>
       </template>
       <!-- 接单开始 -->
       <template slot="right">
@@ -506,14 +506,12 @@ export default {
   background: #e9ecf7;
 }
 .el-row {
-  height: 150px;
+  height: 60px;
 }
 .base_header_layout .grid-content {
   margin-top: 80px;
 }
-.but {
-  margin-left: 6px;
-}
+
 .el-input--small .el-input__inner {
   margin-left: 20px;
 }

src/views/tranManagement/tranManagementShippingLook.vue

@@ -24,129 +24,56 @@
           <ws-info-table>
             <!-- 任务编号 -->
             <ws-form-item label="任务编号" span="1" prop="processNo">
-              <!-- <ws-input
-              v-model="deptBudgetList.processNo" 
-              placeholder="请输入任务编号"
-              maxlength="20"
-              size="small"
-              />-->
               {{deptBudgetList.processNo}}
             </ws-form-item>
             <!-- 货名 -->
             <ws-form-item label="货名" span="1" prop="goodsName">
-              <!-- <ws-input
-              v-model="deptBudgetList.goodsName"
-              placeholder="请输入货名"
-              maxlength="20"
-              size="small"
-              />-->
               {{deptBudgetList.goodsName}}
             </ws-form-item>
             <!--重量（吨）-->
             <ws-form-item label="重量（吨）" span="1" prop="weight" class="readonly">
-              <!-- <ws-input
-              v-model="deptBudgetList.weight"
-              placeholder="请输入重重"
-              maxlength="100"
-              size="small"
-              />-->
               {{deptBudgetList.weight}}
             </ws-form-item>
 
             <!--发货地址-->
             <ws-form-item label="发货地址" span="1">
-              <!-- <ws-input
-              readonly="readonly"
-              v-model="deptBudgetList.sendDetailedAddress"
-              placeholder=""
-              maxlength="120"
-              size="small"
-              />-->
               {{deptBudgetList.sendPrivate}}{{deptBudgetList.sendCity}}{{deptBudgetList.sendArea}}
             </ws-form-item>
             <!--发货人-->
             <ws-form-item label="发货人" span="1" prop="sender">
-              <!-- <ws-input
-              v-model="deptBudgetList.sender"
-              placeholder="请输入发货人姓名"
-              maxlength="100"
-              size="small"
-              />-->
               {{deptBudgetList.sender}}
             </ws-form-item>
 
             <!--发货人电话-->
             <ws-form-item label="发货人电话" span="1" prop="senderPhone">
-              <!-- <ws-input
-              v-model="deptBudgetList.senderPhone"
-              placeholder="请输入发货人电话"
-              maxlength="100"
-              size="small"
-              />-->
               {{deptBudgetList.senderPhone}}
             </ws-form-item>
             <!--收货地址-->
             <ws-form-item label="收货地址" span="1" prop="receiveDetailedAddress">
-              <!-- <el-cascader
-            v-model="deptBudgetList.receiveDetailedAddress"
-            clearable
-            size="large"
-            placeholder="请选择发货地址"
-            style="width: 200%"
-              />-->
               {{deptBudgetList.receivePrivate}}{{deptBudgetList.receiveCity}}{{deptBudgetList.receiveArea}}
             </ws-form-item>
             <!--收货人-->
             <ws-form-item label="收货人" span="1" prop="receiver">
-              <!-- <ws-input
-              v-model="deptBudgetList.receiver"
-              placeholder="请输入发货人"
-              maxlength="100"
-              size="small"
-              />-->
               {{deptBudgetList.receiver}}
             </ws-form-item>
 
             <!--收货人电话-->
             <ws-form-item label="收货人电话" span="1" prop="receiverPhone">
-              <!-- <ws-input
-              v-model="deptBudgetList.receiverPhone"
-              placeholder="请输入收货人电话"
-              maxlength="100"
-              size="small"
-              />-->
               {{deptBudgetList.receiverPhone}}
             </ws-form-item>
 
             <!--发船日期-->
             <ws-form-item label="发船日期" span="1" prop="deliveryDateStart">
-              <!-- <ws-input
-            v-model="deptBudgetList.deliveryDateStart"
-            placeholder=""
-            maxlength="20"
-            size="small"
-              />-->
               {{deptBudgetList.deliveryDateStart}}
             </ws-form-item>
 
             <!--最晚发货日期-->
             <ws-form-item label="最晚到货日期" span="1" prop="deliveryDateEnd">
-              <!-- <ws-input
-            v-model="deptBudgetList.deliveryDateEnd"
-            placeholder=""
-            maxlength="20"
-            size="small"
-              />-->
               {{deptBudgetList.deliveryDateEnd}}
             </ws-form-item>
             <!--合同编号-->
             <ws-form-item label="合同编号" span="1" prop="contractNo">
-              <!-- <ws-input
-            v-model="deptBudgetList.contractNo"
-            placeholder="请输入合同编号"
-            maxlength="20"
-            size="small"
-              />-->
+
               {{deptBudgetList.contractNo}}
             </ws-form-item>
           </ws-info-table>
@@ -161,66 +88,29 @@
               <ws-info-table>
                 <!-- 姓名 -->
                 <ws-form-item label="姓名" span="1" prop="driver" class="siji">
-                  <!-- <ws-input
-                  v-model="item.driver"
-                  placeholder="请选择联络员"
-                  size="small"
-                  ></ws-input>-->
                   {{item.driver}}
                 </ws-form-item>
                 <!-- 电话 -->
                 <ws-form-item label="电话" span="1" prop="driverPhone" class="siji">
-                  <!-- <ws-input
-                  v-model="item.driverPhone"
-                  placeholder="联络员电话"
-                  size="small"
-                  ></ws-input>-->
                   {{item.driverPhone}}
                 </ws-form-item>
                 <!--发船日期-->
                 <ws-form-item label="发船日期" span="1" prop="sendDateStart" class="siji">
-                  <!-- <ws-input
-                  v-model="item.sendDateStart"
-                  placeholder="请选择日期"
-                  ></ws-input>-->
                   {{item.sendDateStart}}
                 </ws-form-item>
                 <ws-form-item label="预计到港日期" span="1" prop="receiveDateEnd" class="siji">
-                  <!-- <ws-input
-                  v-model="item.receiveDateEnd"
-                  placeholder="请选择日期"
-                  value-format="yyyy-MM-dd"
-                  size="small"
-                  />-->
                   {{item.receiveDateEnd}}
                 </ws-form-item>
                 <!-- 船名 -->
                 <ws-form-item label="船名" span="1" prop="shipName" class="siji">
-                  <!-- <ws-input 
-                  v-model="item.shipName"
-                  placeholder="请输入船名"
-                  maxlength="100"
-                  size="small"
-                  ></ws-input>-->
                   {{item.shipName}}
                 </ws-form-item>
                 <!-- 航次 -->
                 <ws-form-item label="航次" span="1" prop="shipNo" class="siji">
-                  <!-- <ws-input 
-                  v-model="item.shipNo"
-                  placeholder="请选择航次"
-                  maxlength="100"
-                  size="small"
-                  ></ws-input>-->
                   {{item.shipNo}}
                 </ws-form-item>
                 <!-- 类型 -->
                 <ws-form-item label="类型" span="1" prop="shipType" class="siji">
-                  <!-- <ws-input
-                  v-model="item.shipType"
-                  placeholder=""
-                  size="small"
-                  ></ws-input>-->
                   {{item.shipType}}
                 </ws-form-item>
                 <ws-form-item
@@ -230,11 +120,6 @@
                   class="siji"
                   v-show="item.shipType=='集装箱'"
                 >
-                  <!-- <ws-input
-          v-model="item.boxNumber"
-          placeholder="请输入数量"
-          size="small"
-                  ></ws-input>-->
                   {{item.boxNumber}}
                 </ws-form-item>
               </ws-info-table>
@@ -249,40 +134,16 @@
             >
               <ws-info-table>
                 <ws-form-item :label="'仓位号-'+ (index + 1 )" span="1" prop="impurity" class="bot">
-                  <!-- <ws-input
-          v-model="item.impurity"
-          placeholder="请输入仓位号"
-          size="small"
-                  ></ws-input>-->
                   {{items.impurity}}
                 </ws-form-item>
                 <!-- 重量（吨） -->
                 <ws-form-item label="重量(吨)" span="1" prop="positionWeight" class="bot">
-                  <!-- <ws-input
-          v-model="item.positionWeight"
-          placeholder="请输入装仓重量"
-          size="small"
-                  ></ws-input>-->
                   {{items.positionWeight}}
                 </ws-form-item>
               </ws-info-table>
-              <!-- <img
-            width="22"
-            height="22"
-            class="del"
-            @click="del(index)"
-            src="../../../public/img/del.png"
-            alt=""
-              />-->
+
             </div>
           </div>
-          <!-- <el-button
-          class="add"
-          type="primary"
-          size="small"
-          @click="add()"
-          >添加仓位</el-button
-          >-->
           <div style="text-align: right; padding: 10px">
             <el-button class="bg-bottom-up" type="primary" size="small" @click="returnsales()">关闭</el-button>
           </div>
@@ -433,7 +294,7 @@ export default {
     //返回按钮
     revert() {
       this.freightspace = []
-      this.$router.push({ path: 'tranManagementShipping' })
+      this.$router.go(-1)
     },
     del(index) {
       if (this.freightspace.length > 1) {

src/views/tranManagement/tranManagementTransporHairRespond.vue

@@ -3,6 +3,11 @@
   <div>
     <BaseHeaderLayout :leftSpan="12">
       <template slot="left">
+         <ws-button class="but"  :type="primary == 1 ? 'primary' : ''" @click="statusquery(1)">
+          执行中</ws-button
+        >
+        <ws-button class="but"  :type="primary == 2 ? 'primary' : ''" @click="statusquery(2)">已完成</ws-button>
+        <ws-button class="but"  :type="primary == 3 ? 'primary' : ''" @click="statusquery()">全部任务</ws-button>
       </template>
       <!-- 接单开始 -->
       <template slot="right">
@@ -45,11 +50,7 @@
       </template>
     </BaseHeaderLayout>
     <div class="container">
-       <ws-button class="but"  :type="primary == 1 ? 'primary' : ''" @click="statusquery(1)">
-          执行中</ws-button
-        >
-        <ws-button class="but"  :type="primary == 2 ? 'primary' : ''" @click="statusquery(2)">已完成</ws-button>
-        <ws-button class="but"  :type="primary == 3 ? 'primary' : ''" @click="statusquery()">全部任务</ws-button>
+      
       <el-table
         class="wenzi"
         :data="tranManagementList.records"
@@ -486,11 +487,6 @@ export default {
 .base_header_layout .grid-content {
   margin-top: 80px;
 }
-//待完成三按钮
-.but {
-  margin-top: 10px;
-  margin-left: 110px;
-}
 .el-input--small .el-input__inner {
   margin-left: 20px;
 }

src/views/tranManagement/tranManagementTransporTationFire.vue

@@ -531,9 +531,7 @@ export default {
 .base_header_layout .grid-content {
   margin-top: 80px;
 }
-.but {
-  margin-left: 6px;
-}
+
 .el-input--small .el-input__inner {
   margin-left: 20px;
 }

src/views/tranManagement/tranManagementTransporTrainDetails.vue

@@ -99,18 +99,22 @@
           <ws-form-item label="姓名：" span="1" prop="driver">
             {{ item.driver }}
           </ws-form-item>
+          <el-divider direction="vertical" class="line"></el-divider>
           <!--电话-->
           <ws-form-item label="电话：" span="1" prop="driverPhone">
             {{ item.driverPhone }}
           </ws-form-item>
+          <el-divider direction="vertical" class="line"></el-divider>
           <!--发车日期-->
           <ws-form-item label="发车日期：" span="1" prop="sendDateStart">
             {{ item.sendDateStart }}
           </ws-form-item>
+          <el-divider direction="vertical" class="line"></el-divider>
           <!--到站日期-->
           <ws-form-item label="到站日期：" span="1" prop="receiveDateEnd">
             {{ item.receiveDateEnd }}
           </ws-form-item>
+          <el-divider direction="vertical" class="line"></el-divider>
           <!--车型-->
           <ws-form-item label="车型：" span="1" prop="carModel">
             {{ item.carModel }}
@@ -131,6 +135,7 @@
             >
               {{ items.trainNo }}
             </ws-form-item>
+               <el-divider direction="vertical" class="line" v-if="(index+1) % 5 != 0"></el-divider>
           </div>
         </ws-info-table>
       </div>
@@ -442,11 +447,7 @@ export default {
 .el-col {
   background: #f6f7fc;
 }
-/deep/.ws-info-table .el-form-item .el-form-item__content {
-  padding: 0 25px;
-  border-left: 1px solid transparent;
-  background: #fff;
-}
+
 /deep/.ws-info-table .el-form-item .el-form-item__label {
   width: 100px;
   text-align: center;
@@ -640,18 +641,6 @@ export default {
   border: none;
   height: 50px;
 }
-/deep/.ws-info-table .el-form-item .el-form-item__content {
-  background: #f5f7fa;
-  border-radius: 4px;
-  border: 1px solid #d8dce6;
-  font-family: PingFangSC-Regular, PingFang SC;
-  margin-bottom: 5px;
-  background-color: #fff;
-  font-size: 14px;
-  font-weight: 400;
-  color: #8890b1;
-  line-height: 16px;
-}
 /deep/.ws-info-table .el-form-item .el-form-item__label {
   background-color: #fff;
   font-size: 14px;
@@ -662,16 +651,21 @@ export default {
 }
 
 /deep/.ws-info-table .el-form-item .el-form-item__content {
-  background: #f5f7fa;
   border-radius: 4px;
-  border: 1px solid #d8dce6;
+  margin-bottom: 5px;
+  background-color: #fff;
+  font-size: 14px;
+  color: #8890b1;
+  padding: 0 25px;
+  border-left: 1px solid transparent;
+  background: #F5F7FA;
 }
 /deep/.flex .ws-info-table .el-form-item .el-form-item__content {
   border: 0px;
 }
 //联络员及车次
 /deep/.liaison .ws-info-table .el-form-item {
-  width: 20%;
+  width: 18.7%;
 }
 /deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
   width: 30%;
@@ -689,8 +683,11 @@ export default {
 /deep/.liaison .ws-info-table .el-form-item .el-form-item__content {
   // border: 0px solid #d8dce6;
   border-radius: 0px;
-  border-left: none;
-  border-bottom: none;
-  border-top: none;
+border: none;
+}
+.line{
+  height: 26px;
+  margin-top: 14px;
+  left: -34px;
 }
 </style>

src/views/tranManagement/tranManagementVehicle.vue

@@ -530,9 +530,6 @@ export default {
 .base_header_layout .grid-content {
   margin-top: 80px;
 }
-.but {
-  margin-left: 6px;
-}
 .el-input--small .el-input__inner {
   margin-left: 20px;
 }

src/views/tranManagement/tranManagementVehicleLook.vue

@@ -105,21 +105,27 @@
           <ws-form-item label="姓名" span="1" prop="driver">
             {{ item.driver }}
           </ws-form-item>
+           <el-divider direction="vertical" class="line"></el-divider>
           <ws-form-item class="phone" label="电话" span="1" prop="driverPhone">
             {{ item.driverPhone }}
           </ws-form-item>
+           <el-divider direction="vertical" class="line"></el-divider>
           <ws-form-item label="车牌号" span="1" prop="carNo">
             {{ item.carNo }}
           </ws-form-item>
+            <el-divider direction="vertical" class="line"></el-divider>
           <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">
             {{ item.unloadNetWeight }}
           </ws-form-item>
+            <el-divider direction="vertical" class="line"></el-divider>
           <ws-form-item label="损耗（吨）" span="1" prop="loss">
             {{ item.loss }}
           </ws-form-item>
+            <el-divider direction="vertical" class="line"></el-divider>
           <ws-form-item label="合同" span="1" prop="unloadNetWeight" class="hetong">
           </ws-form-item>
         </ws-info-table>
@@ -425,7 +431,7 @@ export default {
   font-size: 14px;
 }
 /deep/.driver .ws-info-table .el-form-item {
-  width: 14.28%;
+  width: 13.1%;
 }
 /deep/.driver .ws-info-table .el-form-item .el-form-item__label {
   width: 86px;
@@ -444,7 +450,7 @@ export default {
   margin-left: 15px;
 }
 /deep/.driver .ws-info-table .el-form-item .el-form-item__content {
-  border-right: 1px solid #8890b1;
+  // border-right: 1px solid #8890b1;
   background: #f6f7fb;
   font-size: 14px;
   color: #8890b1;
@@ -472,4 +478,9 @@ export default {
 /deep/.driver.ws-info-table .el-form-item .el-form-item__content{
   border:none
 }
+.line{
+ height: 26px;
+ margin-top: 6px;
+left: -36px;
+}
 </style>