Merge branch 'master' of http://git.zthymaoyi.com/gongdecai/wangluohuoyun-htqd

src/views/cargoOwnerManagement/empowerExamine.vue

@@ -9,7 +9,7 @@
           </el-col>
           <el-col :span="10">
             <div class="screen">
-              <el-input placeholder="可按货主姓名、账号查找" v-model="searchkeyWord" @keyup.enter.native="find" clearable @change="find"></el-input>
+              <el-input class='find' placeholder="可按货主姓名、账号查找" v-model="searchkeyWord" @keyup.enter.native="find" clearable @change="find"></el-input>
               <el-button class="search" @click="find"><img width="16" height="16" style="margin-left: -8px"
                   src="../../../public/img/sousuo.png" /></el-button>
             </div>
@@ -617,7 +617,8 @@
         height: 40px;
         background: #2f53eb;
         border-radius: 0px 2px 2px 0px;
-        border: 1px solid #f0f1f2;
+        border: 1px solid #DCDFE6;
+        margin-left:-1px;
       }
 
       .count_css {
@@ -759,4 +760,7 @@
       margin-bottom: 20px;
     }
   }
+  .find::v-deep input.el-input__inner{
+    border-radius:0;
+  }
 </style>

src/views/cargoOwnerManagement/merchantVerification.vue

@@ -9,7 +9,7 @@
 					</el-col>
 					<el-col :span="10">
 						<div class="screen">
-							<el-input placeholder="可按货主姓名、账号和企业名称查找" @keyup.enter.native="find" v-model="searchkeyWord" clearable @change="find"></el-input>
+							<el-input class='find' placeholder="可按货主姓名、账号和企业名称查找" @keyup.enter.native="find" v-model="searchkeyWord" clearable @change="find"></el-input>
 							<el-button class="search" @click="find"><img width="16" height="16"
 									style="margin-left: -8px" src="../../../public/img/sousuo.png" /></el-button><span
 								class="count_css">共{{ deptBudgetTotal }}条</span>
@@ -64,7 +64,8 @@
 		</el-pagination>
 		<el-dialog :close-on-click-modal='false' title="授权书" :visible.sync="lookInfo" width="500px" center :before-close="lookBookClose">
 			<div class="InfoBook_css">
-					<img :src="bookUrl" class="InfoBook_img">
+
+					<img v-for='item in bookUrlArray' :src="item" class="InfoBook_img">
 
 			</div>
 
@@ -116,7 +117,7 @@
 				lookInfo: false,
 				rejectInfo: false,
 				form: {},
-				bookUrl:""
+				bookUrlArray:[]
 
 			};
 		},
@@ -201,7 +202,14 @@
 			},
 
 			lookBook(row) {
-				this.bookUrl = row.certificateAddressUrl
+				this.bookUrlArray=[]
+				var arr=row.certificateAddressUrl.split(',')
+				for (let i = 0; i < arr.length; i++) {
+					if(arr[i]!=''){
+						this.bookUrlArray.push(arr[i])
+					}
+					
+				}
 				this.lookInfo = true;
 			},
 			lookBookClose() {
@@ -294,7 +302,8 @@
 				height: 40px;
 				background: #2f53eb;
 				border-radius: 0px 2px 2px 0px;
-				border: 1px solid #f0f1f2;
+				border: 1px solid #DCDFE6;
+        		margin-left:-1px;
 			}
 
 			.count_css {
@@ -426,5 +435,7 @@
 			margin-top: 10px;
 		}
 	}
-
+.find::v-deep input.el-input__inner{
+    border-radius:0;
+  }
 </style>

src/views/cargoOwnerManagement/taskAudit.vue

@@ -9,7 +9,7 @@
 					</el-col>
 					<el-col :span="10">
 						<div class="screen">
-							<el-input placeholder="可按货主姓名、账号查找" v-model="searchkeyWord" clearable @change="find"></el-input>
+							<el-input class='find' placeholder="可按货主姓名、账号查找" v-model="searchkeyWord" clearable @change="find"></el-input>
 							<el-button class="search" @click="find"><img width="16" height="16"
 									style="margin-left: -8px" src="../../../public/img/sousuo.png" /></el-button><span
 								class="count_css">共{{ deptBudgetTotal }}条</span>
@@ -95,7 +95,7 @@
 			<div class="right_css">
 						<div class="right_item">任务编号：{{taskLook.taskNo}}</div>
 						<div class="right_title">公司</div>
-						<div class="right_item">{{taskLook.cargoOwnerName}}</div>
+						<div class="right_item">{{taskLook.cargoOwner}}</div>
 						<div class="right_title">发货地区</div>
 						<div class="right_item">{{taskLook.sendPrivate}}{{taskLook.sendCity}}{{taskLook.sendArea}}</div>
 						<div class="right_title">发货详细地址</div>
@@ -106,6 +106,8 @@
 						<div class="right_item">{{taskLook.unloadDetailedAddress}}</div>
 						<div class="right_title">运输距离</div>
 						<div class="right_item">约{{taskLook.distance ? taskLook.distance : 0}}km</div>
+						<div class="right_title">货物类别</div>
+						<div class="right_item">{{taskLook.goodsType}}</div>
 						<div class="right_title">货名</div>
 						<div class="right_item">{{taskLook.goodsName}}</div>
 						<div class="right_title">重量（吨）</div>
@@ -319,7 +321,8 @@
 				height: 40px;
 				background: #2f53eb;
 				border-radius: 0px 2px 2px 0px;
-				border: 1px solid #f0f1f2;
+				border: 1px solid #DCDFE6;
+        		margin-left:-1px;
 			}
 
 			.count_css {
@@ -429,5 +432,7 @@
 		::v-deep .el-drawer {
 			overflow: auto;
 		}
-	
+	.find::v-deep input.el-input__inner{
+    border-radius:0;
+  }
 </style>

src/views/contractManagement/contractModel.vue

@@ -9,7 +9,7 @@
           </el-col>
           <el-col :span="10">
             <div class="screen">
-              <el-input placeholder="可按司机姓名、账号、身份证号查找" @keyup.enter.native="find" v-model="searchkeyWord" clearable></el-input>
+              <el-input class='find' placeholder="可按司机姓名、账号、身份证号查找" @keyup.enter.native="find" v-model="searchkeyWord" clearable></el-input>
               <el-button class="search" @click="find"><img width="16" height="16" style="margin-left: -8px"
                   src="../../../public/img/sousuo.png" /></el-button><span
                 class="count_css">共{{ deptBudgetTotal }}条</span>
@@ -196,7 +196,8 @@
         height: 40px;
         background: #2f53eb;
         border-radius: 0px 2px 2px 0px;
-        border: 1px solid #f0f1f2;
+        border: 1px solid #DCDFE6;
+        margin-left:-1px;
       }
 
       .count_css {
@@ -283,4 +284,7 @@
       margin-top: 10px;
     }
   }
+  .find::v-deep input.el-input__inner{
+    border-radius:0;
+  }
 </style>

src/views/driverManagement/fleetInfo.vue

@@ -7,7 +7,7 @@
           <el-col :span="14" style="height: 45px"> </el-col>
           <el-col :span="10">
             <div class="screen">
-              <el-input placeholder="可按队长姓名、账号、车队名称查找" @keyup.enter.native="find" v-model="searchkeyWord" clearable @change="find"></el-input>
+              <el-input class='find' placeholder="可按队长姓名、账号、车队名称查找" @keyup.enter.native="find" v-model="searchkeyWord" clearable @change="find"></el-input>
               <el-button class="search" @click="find"><img width="16" height="16" style="margin-left: -8px"
                   src="../../../public/img/sousuo.png" /></el-button><span
                 class="count_css">共{{ deptBudgetTotal }}条</span>
@@ -327,7 +327,8 @@
         height: 40px;
         background: #2f53eb;
         border-radius: 0px 2px 2px 0px;
-        border: 1px solid #f0f1f2;
+        border: 1px solid #DCDFE6;
+        margin-left:-1px;
       }
 
       .count_css {
@@ -386,4 +387,7 @@
     -webkit-box-orient: vertical;
     -webkit-line-clamp: 2; //想显示多少行
   }
+  .find::v-deep input.el-input__inner{
+    border-radius:0;
+  }
 </style>

src/views/driverManagement/identityExamine.vue

@@ -9,7 +9,7 @@
           </el-col>
           <el-col :span="10">
             <div class="screen">
-              <el-input placeholder="可按司机姓名、账号、身份证号查找" @keyup.enter.native="find" v-model="searchkeyWord" clearable @change="find"></el-input>
+              <el-input class='find' placeholder="可按司机姓名、账号、身份证号查找" @keyup.enter.native="find" v-model="searchkeyWord" clearable @change="find"></el-input>
               <el-button class="search" @click="find"><img width="16" height="16" style="margin-left: -8px"
                   src="../../../public/img/sousuo.png" /></el-button><span
                 class="count_css">共{{ deptBudgetTotal }}条</span>
@@ -108,7 +108,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="paymentDate" label="附件">
-          <template slot-scope="scope" style="text-align: center">
+          <template slot-scope="scope" style="text-align: center" v-if="scope.row.backStageStatus !='未认证'">
             <span class="btn_css btn_css1" @click="fujianLook(scope.row)">查看</span>
             <el-tooltip placement="top" v-if="
                 scope.row.overdueFlag == 1 ||
@@ -220,9 +220,9 @@
           <div class="fujian_item" :class="count == 2 ? 'file_btn' : ''" @click="btnChange(2)">
             驾驶证
           </div>
-          <div class="fujian_item" :class="count == 3 ? 'file_btn' : ''" @click="btnChange(3)">
+          <!-- <div class="fujian_item" :class="count == 3 ? 'file_btn' : ''" @click="btnChange(3)">
             行驶证
-          </div>
+          </div> -->
           <div class="fujian_item" :class="count == 4 ? 'file_btn' : ''" @click="btnChange(4)">
             从业资格证
           </div>
@@ -236,6 +236,9 @@
             挂车运营证
           </div> -->
         </div>
+        <div class="file_tips">
+          <span v-if="count == 1">有效期：{{file.cardValidityDate}} </span><span v-if="count == 2"> 准驾车型：{{file.quasiDrivingVehicle}} </span> <span v-if="count == 2"> 发证机关：{{file.lssuingAuthority}} </span> <span v-if="count == 4"> 从业资格证号：{{file.qualificationCertificateNumber}}</span>
+        </div>
         <div class="file_img">
           <img :src="img[index]" class="img_css" @click="enlarge(img[index])"/>
         </div>
@@ -730,7 +733,8 @@
         height: 40px;
         background: #2f53eb;
         border-radius: 0px 2px 2px 0px;
-        border: 1px solid #f0f1f2;
+        border: 1px solid #DCDFE6;
+        margin-left:-1px;
       }
 
       .count_css {
@@ -907,7 +911,7 @@
   //附件
   .file {
     .fujian_css {
-      width: 360px;
+      width: 270px;
       display: flex;
       margin: 0 auto;
       text-align: center;
@@ -928,6 +932,10 @@
         background-color: #cfdbfe;
       }
     }
+    .file_tips{
+        margin: 10px auto;
+       width: 50%;
+    }
 
     .file_img {
       width: 525px;
@@ -961,7 +969,9 @@
   ::v-deep .input_css .el-input__inner {
     height: 30px;
   }
-
+  .find::v-deep input.el-input__inner{
+    border-radius:0;
+  }
   // .tupian{
   //   width: 100%;
   //   height: 100%;

src/views/driverManagement/vehicleExamine.vue

@@ -9,7 +9,7 @@
           </el-col>
           <el-col :span="10">
             <div class="screen">
-              <el-input placeholder="可按司机姓名、账号、车牌号查找" v-model="searchkeyWord" @keyup.enter.native="find" clearable @change="find"></el-input>
+              <el-input class='find' placeholder="可按司机姓名、账号、车牌号查找" v-model="searchkeyWord" @keyup.enter.native="find" clearable @change="find"></el-input>
               <el-button class="search" @click="find"><img width="16" height="16" style="margin-left: -8px"
                   src="../../../public/img/sousuo.png" /></el-button><span
                 class="count_css">共{{ deptBudgetTotal }}条</span>
@@ -142,6 +142,10 @@
             人车合影
           </div>
         </div>
+        <div class="file_tips">
+          <span v-if="count == 3">有效期：{{file.drivingLicenseValidityDate}} </span><span v-if="count == 3"> 注册日期：{{file.drivingLicenseRegistrationDate}} </span> <span v-if="count == 3"> 发证日期：{{file.drivingLicenseIssueDate}} </span> <span v-if="count == 3"> 发证机关：{{file.lssuingAuthority}}</span>
+          <span v-if="count == 5">有效期：{{file.trailerLicenseValidityDate}} </span><span v-if="count == 5"> 注册日期：{{file.trailerLicenseRegistrationDate}} </span> <span v-if="count == 5"> 发证日期：{{file.trailerLicenseIssueDate}} </span> <span v-if="count == 5"> 发证机关：{{file.guaLssuingAuthority}}</span>
+        </div>
         <div class="file_img">
           <img :src="img[index]" class="img_css" @click="enlarge(img[index])" />
         </div>
@@ -452,7 +456,8 @@
         height: 40px;
         background: #2f53eb;
         border-radius: 0px 2px 2px 0px;
-        border: 1px solid #f0f1f2;
+        border: 1px solid #DCDFE6;
+        margin-left:-1px;
       }
 
       .count_css {
@@ -571,8 +576,10 @@
         background-color: #cfdbfe;
       }
     }
-
-
+    .file_tips{
+        margin: 10px auto;
+       width: 70%;
+    }
     .file_img {
       width: 525px;
       height: 332px;
@@ -585,7 +592,7 @@
     }
 
     .btn {
-      width: 410px;
+      width: 415px;
       margin: 0 auto;
     }
   }
@@ -594,4 +601,7 @@
     position: absolute;
     margin: 2px 0 0 10px;
   }
+  .find::v-deep input.el-input__inner{
+    border-radius:0;
+  }
 </style>

src/views/enterpriseManagement/enterpriseAudit.vue

@@ -9,7 +9,7 @@
           </el-col>
           <el-col :span="10">
             <div class="screen">
-              <el-input placeholder="可按法人姓名、账号、企业名称查找" @keyup.enter.native="find" v-model="searchkeyWord" clearable @change="find"></el-input>
+              <el-input class='find' placeholder="可按法人姓名、账号、企业名称查找" @keyup.enter.native="find" v-model="searchkeyWord" clearable @change="find"></el-input>
               <el-button class="search" @click="find"><img width="16" height="16" style="margin-left: -8px"
                   src="../../../public/img/sousuo.png" /></el-button><span
                 class="count_css">共{{ deptBudgetTotal }}条</span>
@@ -468,7 +468,9 @@
         height: 40px;
         background: #2f53eb;
         border-radius: 0px 2px 2px 0px;
-        border: 1px solid #f0f1f2;
+        border: 1px solid #DCDFE6;
+        margin-left:-1px;
+        // border-left: 1px solid #2f53eb;
       }
 
       .count_css {
@@ -632,4 +634,14 @@
       }
     }
   }
+  .pay {
+    .pay_css {
+      display: flex;
+      margin-bottom: 20px;
+      justify-content: space-between;
+    }
+  }
+  .find::v-deep input.el-input__inner{
+    border-radius:0;
+  }
 </style>

src/views/feedbackManagement/userFeedback.vue

@@ -9,7 +9,7 @@
           </el-col>
           <el-col :span="10">
             <div class="screen">
-              <el-input placeholder="可按工单编号、姓名、账号和反馈信息查找" @keyup.enter.native="find" v-model="searchkeyWord" clearable @change="find"></el-input>
+              <el-input class='find' placeholder="可按工单编号、姓名、账号和反馈信息查找" @keyup.enter.native="find" v-model="searchkeyWord" clearable @change="find"></el-input>
               <el-button class="search" @click="find"><img width="16" height="16" style="margin-left: -8px"
                   src="../../../public/img/sousuo.png" /></el-button><span
                 class="count_css">共{{ deptBudgetTotal }}条</span>
@@ -299,7 +299,8 @@
         height: 40px;
         background: #2f53eb;
         border-radius: 0px 2px 2px 0px;
-        border: 1px solid #f0f1f2;
+        border: 1px solid #DCDFE6;
+        margin-left:-1px;
       }
 
       .count_css {
@@ -383,4 +384,7 @@
       margin-top: 10px;
     }
   }
+  .find::v-deep input.el-input__inner{
+    border-radius:0;
+  }
 </style>

src/views/officialWebsiteManagement/news.vue

@@ -3,11 +3,11 @@
     <div class="center_css">
       <div class="top_css">
             <el-button type="primary" @click="AddRecord">新增</el-button>
-            <el-date-picker v-model="value1" value-format="yyyy-MM-dd" @change="dateChange" type="daterange"
+            <el-date-picker class='date' v-model="value1" value-format="yyyy-MM-dd" @change="dateChange" type="daterange"
               range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
             </el-date-picker>
             <div class="screen">
-              <el-input v-model="searchkeyWord" @keyup.enter.native="find" placeholder="可按编号和标题内容查找" clearable />
+              <el-input class='find' v-model="searchkeyWord" @keyup.enter.native="find" placeholder="可按编号和标题内容查找" clearable />
               <el-button class="search" @click="find"><img width="16" height="16" style="margin-left: -8px"
                   src="../../../public/img/sousuo.png"></el-button>
             </div>
@@ -200,7 +200,8 @@
         height: 40px;
         background: #2f53eb;
         border-radius: 0px 2px 2px 0px;
-        border: 1px solid #f0f1f2;
+        border: 1px solid #DCDFE6;
+        margin-left:-1px;
       }
 
       .count_css {
@@ -415,4 +416,10 @@
       margin: 0 auto;
     }
   }
+  .date{
+    margin:0 10px;
+  }
+  .find::v-deep input.el-input__inner{
+    border-radius:0;
+  }
 </style>

src/views/officialWebsiteManagement/notice.vue

@@ -3,11 +3,11 @@
     <div class="center_css">
       <div class="top_css">
             <el-button type="primary" @click="AddRecord">新增</el-button>
-            <el-date-picker v-model="value1" value-format="yyyy-MM-dd" @change="dateChange" type="daterange"
+            <el-date-picker class='date' v-model="value1" value-format="yyyy-MM-dd" @change="dateChange" type="daterange"
               range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
             </el-date-picker>
             <div class="screen">
-              <el-input v-model="searchkeyWord" @keyup.enter.native="find" placeholder="可按编号和标题内容查找" clearable />
+              <el-input class='find' v-model="searchkeyWord" @keyup.enter.native="find" placeholder="可按编号和标题内容查找" clearable />
               <el-button class="search" @click="find"><img width="16" height="16" style="margin-left: -8px"
                   src="../../../public/img/sousuo.png"></el-button>
             </div>
@@ -200,7 +200,8 @@
         height: 40px;
         background: #2f53eb;
         border-radius: 0px 2px 2px 0px;
-        border: 1px solid #f0f1f2;
+        border: 1px solid #DCDFE6;
+        margin-left:-1px;
       }
 
       .count_css {
@@ -415,4 +416,10 @@
       margin: 0 auto;
     }
   }
+  .date{
+    margin:0 10px;
+  }
+  .find::v-deep input.el-input__inner{
+    border-radius:0;
+  }
 </style>

src/views/officialWebsiteManagement/publicity.vue

@@ -3,11 +3,11 @@
     <div class="center_css">
       <div class="top_css">
             <el-button type="primary" @click="AddRecord">新增</el-button>
-            <el-date-picker v-model="value1" value-format="yyyy-MM-dd" @change="dateChange" type="daterange"
+            <el-date-picker class='date' v-model="value1" value-format="yyyy-MM-dd" @change="dateChange" type="daterange"
               range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
             </el-date-picker>
             <div class="screen">
-              <el-input v-model="searchkeyWord" @keyup.enter.native="find" placeholder="可按编号和标题内容查找" clearable />
+              <el-input class='find' v-model="searchkeyWord" @keyup.enter.native="find" placeholder="可按编号和标题内容查找" clearable />
               <el-button class="search" @click="find"><img width="16" height="16" style="margin-left: -8px"
                   src="../../../public/img/sousuo.png"></el-button>
             </div>
@@ -200,7 +200,8 @@
         height: 40px;
         background: #2f53eb;
         border-radius: 0px 2px 2px 0px;
-        border: 1px solid #f0f1f2;
+        border: 1px solid #DCDFE6;
+        margin-left:-1px;
       }
 
       .count_css {
@@ -415,4 +416,10 @@
       margin: 0 auto;
     }
   }
+  .date{
+    margin:0 10px;
+  }
+  .find::v-deep input.el-input__inner{
+    border-radius:0;
+  }
 </style>

src/views/orderManagement/orderAudit.vue

@@ -12,7 +12,7 @@
           </el-col>
           <el-col :span="10">
             <div class="screen">
-              <el-input placeholder="可按订单编号、姓名、账号查找" @keyup.enter.native="find" v-model="searchkeyWord" clearable @change="find"></el-input>
+              <el-input class='find' placeholder="可按订单编号、姓名、账号查找" @keyup.enter.native="find" v-model="searchkeyWord" clearable @change="find"></el-input>
               <el-button class="search" @click="find"><img width="16" height="16" style="margin-left: -8px"
                   src="../../../public/img/sousuo.png" /></el-button><span
                 class="count_css">共{{ deptBudgetTotal }}条</span>
@@ -95,7 +95,26 @@
          </template>
         </el-table-column>
         <el-table-column prop="updateDate" label="更新时间" min-width="160"></el-table-column>
-        <el-table-column prop="cargoOwnerStatus" label="状态" min-width="92"></el-table-column>
+        <!-- <el-table-column prop="cargoOwnerStatus" label="状态" min-width="92">
+          <template scope="scope">
+            <span>{{scope.row.cargoOwnerStatus}}</span>
+            <i v-if='scope.row.cargoOwnerStatus=="已"' class="el-icon-question"></i>
+          </template>
+        </el-table-column> -->
+        <el-table-column prop="cargoOwnerStatus" label="状态" min-width="92">
+          <template slot-scope="scope">
+            <span>{{scope.row.cargoOwnerStatus}}</span>
+            <el-popover
+              v-if='scope.row.terminator==1||scope.row.terminator==2'
+              placement="top-start"
+              :title="scope.row.terminator==1?'司机终止订单':'货主终止订单'"
+              width="200"
+              trigger="hover">
+              <div v-html='scope.row.content'></div>
+              <i v-if='scope.row.cargoOwnerStatus=="已终止"' slot="reference" class="el-icon-question"></i>
+            </el-popover>
+          </template>
+        </el-table-column>
         <el-table-column label="操作" min-width="350">
           <template slot-scope="scope">
             <el-link target="_blank" @click="see(scope.row)" type="primary" :underline="false"
@@ -191,7 +210,7 @@
       </div>
     </el-dialog>
 
-    <el-drawer title="任务详情" :visible.sync="rightSee" style="overflow-y: auto !important">
+    <el-drawer title="订单详情" :visible.sync="rightSee" style="overflow-y: auto !important">
       <div class="right_css">
         <div class="title_name">基本信息</div>
         <div class="right_item">订单编号：{{costData.orderNo}}</div>
@@ -209,6 +228,8 @@
         <div class="right_item">
           {{costData.unloadPrivate}}{{costData.unloadCity}}{{costData.unloadArea}}{{costData.unloadDetailedAddress}}
         </div>
+         <div class="right_title">货物类别</div>
+        <div class="right_item">{{costData.goodsType}}</div>
         <div class="right_title">货名</div>
         <div class="right_item">{{costData.goodsName}}</div>
         <div class="right_title">发货联系人</div>
@@ -234,15 +255,17 @@
         <div v-if="costData.hyCarrierInfo">
           <div class="title_name">承运信息</div>
           <div class="right_title">承运合同编号</div>
-          <div class="right_item">{{costData.hyCarrierInfo.orderNo}}</div>
+          <div class="right_item">{{costData.contractNo}}</div>
           <div class="right_title">委托合同编号</div>
-          <div class="right_item">{{costData.hyCarrierInfo.orderNo}}</div>
+          <div class="right_item">{{costData.wtContractNo}}</div>
           <div class="right_title">车牌号</div>
           <div class="right_item">{{costData.hyCarrierInfo.carNo}}</div>
           <div class="right_title">预计运费</div>
           <div class="right_item">{{costData.hyCarrierInfo.estimatedFreight}}</div>
           <div class="right_title">装车时间</div>
           <div class="right_item">{{costData.hyCarrierInfo.loadingDate}}</div>
+          <div class="right_title">装车定位</div>
+          <div class="right_item">{{costData.hyCarrierInfo.loadingCity}}{{costData.hyCarrierInfo.loadingArea}}</div>
           <div class="right_title">装车照片</div>
           <div style="display: flex;" v-if="costData.hyCarrierInfo.loadingImg">
             <div v-for="(item,index) in costData.hyCarrierInfo.loadingImg.split(',')" :key="index">
@@ -253,6 +276,8 @@
           <div class="right_item">{{costData.hyCarrierInfo.totalFreight}}</div>
           <div class="right_title" v-if="costData.hyCarrierInfo.unloadingDate">卸车时间</div>
           <div class="right_item">{{costData.hyCarrierInfo.unloadingDate}}</div>
+          <div class="right_title">卸车定位</div>
+          <div class="right_item">{{costData.hyCarrierInfo.unloadingCity}}{{costData.hyCarrierInfo.unloadingArea}}</div>
           <div class="right_title" v-if="costData.hyCarrierInfo.unloadingImg">卸车照片</div>
           <div style="display: flex;" v-if="costData.hyCarrierInfo.unloadingImg">
             <div v-for="(item,index) in costData.hyCarrierInfo.unloadingImg.split(',')" :key="index">
@@ -441,6 +466,24 @@
         _obj.startDate = this.startDate
         _obj.endDate = this.endDate
         getListData(_obj).then(response => {
+          if(response.data.records){
+            for (let i = 0; i < response.data.records.length; i++) {
+              if(response.data.records[i].cargoOwnerStatus=='已终止'){
+                if(response.data.records[i].terminationReason==1){
+                  response.data.records[i].content='原因：已与货主协商<br/>描述：'+response.data.records[i].terminationReasonDescription
+                }else if(response.data.records[i].terminationReason==2){
+                  response.data.records[i].content='原因：货主原因终止<br/>描述：'+response.data.records[i].terminationReasonDescription
+                }else if(response.data.records[i].terminationReason==3){
+                  response.data.records[i].content='原因：司机个人原因终止<br/>描述：'+response.data.records[i].terminationReasonDescription
+                }else if(response.data.records[i].terminationReason==4){
+                  response.data.records[i].content='原因：其他<br/>描述：'+response.data.records[i].terminationReasonDescription
+                }
+                
+              }else{
+                response.data.records[i].content=''
+              }
+            }
+          }
             this.tableData = response.data.records
             this.deptBudgetTotal = response.data.total
             this.listLoading = false
@@ -676,7 +719,8 @@
         height: 40px;
         background: #2f53eb;
         border-radius: 0px 2px 2px 0px;
-        border: 1px solid #f0f1f2;
+        border: 1px solid #DCDFE6;
+        margin-left:-1px;
       }
 
       .count_css {
@@ -852,4 +896,7 @@
   ::v-deep .el-drawer {
     overflow: auto;
   }
+  .find::v-deep input.el-input__inner{
+    border-radius:0;
+  }
 </style>

src/views/platformManagement/specifiedRecords.vue

@@ -9,7 +9,7 @@
           </el-col>
           <el-col :span="10">
             <div class="screen">
-              <el-input v-model="searchkeyWord" placeholder="可按版本号、编写单位、编撰人员查找" @keyup.enter.native="find" clearable @change="find" />
+              <el-input class='find' v-model="searchkeyWord" placeholder="可按版本号、编写单位、编撰人员查找" @keyup.enter.native="find" clearable @change="find" />
               <el-button class="search" @click="find"><img
                 width="16"
                 height="16"
@@ -351,7 +351,8 @@ export default {
 				height: 40px;
 				background: #2f53eb;
 				border-radius: 0px 2px 2px 0px;
-				border: 1px solid #f0f1f2;
+				border: 1px solid #DCDFE6;
+        margin-left:-1px;
 			}
 
 			.count_css {
@@ -570,4 +571,7 @@ export default {
 			margin: 0 auto;
 		}
 	}
+  .find::v-deep input.el-input__inner{
+    border-radius:0;
+  }
 </style>