前端sdy

src/views/taskManagement/tranManagementLook.vue

@@ -28,8 +28,8 @@
           <ws-form-item label="任务编号" span="1" prop="taskNo">
             {{ deptBudgetList.taskNo }}
           </ws-form-item>
-          <!--合同编号（选填）-->
-          <ws-form-item label="合同编号（选填）" span="1" prop="contractNo">
+          <!--合同编号-->
+          <ws-form-item label="合同编号" span="1" prop="contractNo">
             {{ deptBudgetList.contractNo }}
           </ws-form-item>
           <!--货名-->
@@ -89,9 +89,9 @@
         </ws-info-table>
         <!-- </div>-->
         <ws-info-table>
-          <!--发货日期-->
+          <!--发货地区-->
           <ws-form-item label="发货地区" span="1" prop="waterContent">
-            {{ item.sendPrivate }}/{{ item.sendCity }}{{ item.sendArea }}
+            {{ item.sendPrivate }}/{{ item.sendCity }}/{{ item.sendArea }}
           </ws-form-item>
           <!--发货地详细地址-->
           <ws-form-item
@@ -113,12 +113,12 @@
 
         <!-- <div class="nei"> -->
         <ws-info-table>
-          <!--发货日期-->
+          <!--收货地区-->
           <ws-form-item label="收货地区" span="1" prop="waterContent">
             {{ item.receivePrivate }}/{{ item.receiveCity
-            }}{{ item.receiveArea }}
+            }}/{{ item.receiveArea }}
           </ws-form-item>
-          <!--发货地详细地址-->
+          <!--收货地详细地址-->
           <ws-form-item
             label="收货地详细地址"
             span="1"

src/views/taskManagement/tranManagementTransport.vue

@@ -3,8 +3,7 @@
   <div>
     <BaseHeaderLayout :leftSpan="15">
       <template slot="left">
-        <span style='width: 134px;
-    display: inline-block;'>起点：</span>
+        <span style="width: 134px; display: inline-block">起点：</span>
         <el-input
           label="起点"
           placeholder="请输入起点"
@@ -12,8 +11,7 @@
           maxlength="200"
           type="input"
         ></el-input>
-        <span style='width: 134px;
-    display: inline-block;'>终点：</span>
+        <span style="width: 134px; display: inline-block">终点：</span>
         <el-input
           label="终点"
           placeholder="请输入终点"
@@ -53,18 +51,32 @@
       </template>
     </BaseHeaderLayout>
     <div>
-        <ws-button class="but" :type="primary==1?'primary':''" @click="handlestatus(1)">
-          执行中</ws-button
-        >
-        <ws-button class="but" :type="primary==2?'primary':''" @click="handlestatus(2)">已完成</ws-button>
-        <ws-button class="but" :type="primary==3?'primary':''" @click="handlestatus('')">全部任务</ws-button>
+      <ws-button
+        class="but"
+        :type="primary == 1 ? 'primary' : ''"
+        @click="handlestatus(1)"
+      >
+        执行中</ws-button
+      >
+      <ws-button
+        class="but"
+        :type="primary == 2 ? 'primary' : ''"
+        @click="handlestatus(2)"
+        >已完成</ws-button
+      >
+      <ws-button
+        class="but"
+        :type="primary == 3 ? 'primary' : ''"
+        @click="handlestatus('')"
+        >全部任务</ws-button
+      >
       <el-table
         class="wenzi"
         :data="gainList.records"
         style="width: 100%; margin-top: 20px"
         height="780"
       >
-        <el-table-column type="index">
+        <el-table-column type="index" label="序号">
           <template scope="scope">
             <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
             <span v-else>{{ scope.$index + 1 }}</span>
@@ -73,13 +85,18 @@
         <el-table-column prop="taskNo" label="运输任务编号" width="160">
         </el-table-column>
         <el-table-column prop="contractNo" label="合同编号" width="160">
-           </el-table-column>
+        </el-table-column>
         <el-table-column prop=" weight" class="table_td" label="货物（吨数）">
           <template slot-scope="scope">
             {{ scope.row.goodsName }}({{ scope.row.weight }})
           </template>
         </el-table-column>
-        <el-table-column prop="tranType" class="table_td" label="运输方式">
+        <el-table-column
+          prop="tranType"
+          class="table_td"
+          label="运输方式"
+          width="120"
+        >
         </el-table-column>
         <el-table-column prop="" class="table_td" label="起点">
           <template slot-scope="scope">
@@ -154,13 +171,22 @@
         </el-table-column>
         <el-table-column prop="seller" label="操作" width="300">
           <template slot-scope="scope">
-            <ws-button class="completed" @click="nocomplete(scope.row)">
+            <!-- <ws-button class="completed" @click="nocomplete(scope.row)">
               查看
             </ws-button>
             <ws-button class="putstorage" @click="delivery(scope.row)">
               编辑
             </ws-button>
-            <ws-button @click="deleteclick(scope.row)"> 删除 </ws-button>
+            <ws-button @click="deleteclick(scope.row)"> 删除 </ws-button> -->
+            <div class="record" @click="nocomplete(scope.row)">
+              查看
+            </div>
+            <div class="record" @click="delivery(scope.row)">
+              编辑
+            </div>
+            <div class="record" @click="deleteclick(scope.row)">
+              删除
+            </div>
           </template>
         </el-table-column>
       </el-table>
@@ -203,7 +229,7 @@ export default {
       year: '',
       gainList: [],
       currentPage: 1,
-      primary:1,
+      primary: 1,
       pageSize: 10,
       searchType: 1,
       searchTypeText: '未完成',
@@ -275,14 +301,14 @@ export default {
     },
     handlestatus(status) {
       this.searchType = status
-      if(status==1){
-        this.primary=1
-      }else if(status==2){
-        this.primary=2
-      }else{
-        this.primary=3
+      if (status == 1) {
+        this.primary = 1
+      } else if (status == 2) {
+        this.primary = 2
+      } else {
+        this.primary = 3
       }
-      
+
       this.getList()
     },
     //编辑
@@ -510,17 +536,17 @@ export default {
   border-top-right-radius: 0px;
   border-bottom-right-radius: 0px;
 }
-.completed.el-button--default {
-  border-color: #5878e8;
-  background-color: #f6f7fc;
-  color: #5878e8;
-}
-.putstorage.el-button--default,
-.deliverystorage.el-button--default {
-  border-color: #8890b1;
-  background-color: #fff;
-  color: #8890b1;
-}
+// .completed.el-button--default {
+//   border-color: #5878e8;
+//   background-color: #f6f7fc;
+//   color: #5878e8;
+// }
+// .putstorage.el-button--default,
+// .deliverystorage.el-button--default {
+//   border-color: #8890b1;
+//   background-color: #fff;
+//   color: #8890b1;
+// }
 /deep/.el-table tr td:first-child,
 /deep/.el-table tr th.is-leaf:first-child {
   border-left: 1px solid #e9ecf7;
@@ -542,20 +568,62 @@ export default {
   height: 12px;
   background: #e9ecf7;
 }
- /deep/.base_header_layout .grid-content {
- margin-bottom: 60px;
+/deep/.base_header_layout .grid-content {
+  margin-bottom: 60px;
 }
-/deep/.el-table td, /deep/.el-table th.is-leaf {
-    border-right: 1px solid transparent; 
+/deep/.el-table td,
+/deep/.el-table th.is-leaf {
+  border-right: 1px solid transparent;
+  text-align: center;
 }
 .findValue.el-input {
   width: 50%;
-  margin:0;
+  margin: 0;
+}
+.el-input {
+  margin: 0 10px;
+}
+/deep/.search .el-button--small {
+  padding: 0;
+}
+//操作按钮
+.record,
+.adjustment {
+  display: inline-block;
+  color: #5878e8;
+  padding: 0 4px !important;
+  position: relative;
+  font-size: 14px;
+}
+.record:after {
+  position: absolute;
+  content: '';
+  display: block;
+  top: 5px;
+  right: -2px;
+  width: 1px;
+  height: 12px;
+  background: #e9ecf7;
+}
+//状态样式
+.executory,
+.inExecution,
+.done {
+  width: 6px;
+  height: 6px;
+  display: inline-block;
+  border-radius: 50%;
+  position: relative;
+  top: -1px;
+  font-size: 14px;
+}
+.executory {
+  background: #ff9f24;
 }
-.el-input{
-  margin:0 10px;
+.inExecution {
+  background: #5878e8;
 }
-/deep/.search .el-button--small{
-  padding:0;
+.done {
+  background: #50cad4;
 }
 </style>

src/views/taskManagement/tranManagementTransportAdd.vue

@@ -857,4 +857,5 @@ export default {
 .el-cascader {
   width: 100%;
 }
+
 </style>

src/views/tranManagement/tranManagementTransporTationFire.vue

@@ -150,7 +150,6 @@
              <div
               class="record"
               @click="trainSee(scope.row)"
-              
             >
               查看
             </div>