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

src/views/taskManagement/moveWarehouseTask.vue

@@ -142,9 +142,15 @@
         </el-table-column>
         <el-table-column prop="seller" label="详情" width="200">
           <template slot-scope="scope">
-            <ws-button class="completed" @click="see(scope.row)">
+             <div
+              class="record"
+              @click="see(scope.row)"
+            >
+              查看
+            </div>
+            <!-- <ws-button class="completed" @click="see(scope.row)">
               查看
-            </ws-button>
+            </ws-button> -->
           </template>
         </el-table-column>
       </el-table>
@@ -427,16 +433,6 @@ export default {
   padding: 0 4px !important;
   position: relative;
 }
-.record:after {
-  position: absolute;
-  content: '';
-  display: block;
-  top: 5px;
-  right: -2px;
-  width: 1px;
-  height: 12px;
-  background: #e9ecf7;
-}
 .el-row {
   height: 50px;
 }

src/views/taskManagement/moveWarehouseTaskLook.vue

@@ -34,7 +34,7 @@
         <span style="font-weight: 600">{{ this.moveTaskNo }}</span></span
       >
       <div v-for="(item, index) in moveLookData" :key="index">
-        <ws-info-table class="inout" v-show="item.inOutType == '移库出库'">
+        <ws-info-table class="inout" v-if="item.inOutType == '移库出库'">
           <!--出货库-->
           <div class="library">
             <span style="margin-left: 14px"
@@ -43,7 +43,7 @@
             <span style="margin-left: 10px">{{ item.taskStatus }}</span>
           </div>
           <!--出库经办人-->
-          <ws-form-item label="出库经办人:" span="1" prop="agent">
+          <ws-form-item label="出库经办人：" span="1" prop="agent">
             {{ item.agent }}
           </ws-form-item>
           <el-divider direction="vertical" class="line"></el-divider>
@@ -62,7 +62,7 @@
             {{ item.predictDate }}
           </ws-form-item>
         </ws-info-table>
-        <ws-info-table class="inout" v-show="item.inOutType == '移库入库'">
+        <ws-info-table class="inout" v-if="item.inOutType == '移库入库'">
           <div class="library">
             <span style="margin-left: 14px">
               入货库：{{ item.warehouseName }}</span
@@ -70,7 +70,7 @@
             <span style="margin-left: 10px">{{ item.taskStatus }}</span>
           </div>
           <!--入库经办人-->
-          <ws-form-item label="入库经办人:" span="1" prop="agent">
+          <ws-form-item label="入库经办人：" span="1" prop="agent">
             {{ item.agent }}
           </ws-form-item>
           <el-divider direction="vertical" class="line"></el-divider>
@@ -112,7 +112,7 @@
         <el-input
           placeholder="信息暂无"
           :disabled="true"
-          v-model="this.bulkDensity+'g/L(容)'"
+          v-model="this.bulkDensity + 'g/L(容)'"
         >
         </el-input>
         <el-divider direction="vertical" class="line1"></el-divider>
@@ -152,21 +152,21 @@
       <ws-info-table class="flow">
         <el-table :data="moveLookData" height="90" border style="width: 100%;">
           <el-table-column prop="weightOut" label="累计出库量（吨）">
-            <template>
+            <!-- <template> -->
               <div class="weights">{{ this.weightOut }}</div>
-            </template>
+            <!-- </template> -->
           </el-table-column>
           <el-table-column prop="weightIn" label="累计入库量（吨）">
-            <template>
+            <!-- <template> -->
               <div class="weights">{{ this.weightIn }}</div>
-            </template>
+            <!-- </template> -->
           </el-table-column>
           <el-table-column prop="transportLoss" label="累计运输损耗（吨）">
-            <template>
+            <!-- <template> -->
               <div class="weights">
                 {{ this.transportLoss }}
               </div>
-            </template>
+            <!-- </template> -->
           </el-table-column>
         </el-table>
       </ws-info-table>

src/views/taskManagement/tranManagementTransport.vue

@@ -80,7 +80,7 @@
         class="wenzi"
         :data="gainList.records"
         style="width: 100%; "
-        height="680"
+        height="780"
       >
         <el-table-column type="index" label="序号">
           <template scope="scope">
@@ -489,10 +489,10 @@ export default {
   width: 62px;
   text-align: right;
 }
-.el-button--primary {
-  background-color: #5878e8;
-  border-color: #5878e8;
-}
+// .el-button--primary {
+//   background-color: #5878e8;
+//   border-color: #5878e8;
+// }
 .el-pagination{
   padding-top: 20px;
   text-align: center;
@@ -600,7 +600,6 @@ export default {
 .el-button--primary {
     background-color: #5878e8;
     border-color: #5878e8;
-    margin-left: 6px;
 }
 .el-pagination {
     white-space: nowrap;

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -653,7 +653,6 @@
       >
     </div>
   </div>
-  </div>
 </template>
 <script>
 import {

src/views/tranManagement/tranManagementShipping.vue

@@ -70,7 +70,7 @@
       >
         <el-table-column type="index" label="序号" width="80">
         </el-table-column>
-        <el-table-column class="table_td" prop="processNo" label="运输任务编号" width="120">
+        <el-table-column class="table_td" prop="processNo" label="运输任务编号">
         </el-table-column>
         <el-table-column class="table_td" prop="goodsName" label="货名">
         </el-table-column>
@@ -144,7 +144,7 @@
             />
           </template>
         </el-table-column>
-        <el-table-column class="table_td" label="接单时间" prop="receivingDate">
+        <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/tranManagementTransporHairRespond.vue

@@ -155,7 +155,7 @@
             />
           </template>
         </el-table-column>
-        <el-table-column prop="receivingDate" class="table_td" label="接单时间">
+        <el-table-column prop="createDate" class="table_td" label="接单时间">
         </el-table-column>
         <el-table-column prop="seller" label="操作" width="300">
           <template  slot-scope="scope">

src/views/tranManagement/tranManagementTransporTationFire.vue

@@ -149,7 +149,7 @@
             />
           </template>
         </el-table-column>
-        <el-table-column prop="receivingDate" class="table_td" label="接单时间">
+        <el-table-column prop="createDate" class="table_td" label="接单时间">
         </el-table-column>
         <el-table-column prop="seller" label="操作" width="300">
           <template slot-scope="scope">