前端代码合并提交

src/views/platform/waybill/history.vue

@@ -71,6 +71,16 @@
               <span>{{scope.row.createTime | fmtDate}}</span>
             </template>
           </el-table-column>
+           <el-table-column
+            label="状态"
+            show-overflow-tooltip>
+            <template slot-scope="scope">
+
+               <span v-if="scope.row.batchStatus == 1" style="color: red">上传中</span>
+                <span v-else-if="scope.row.batchStatus == 0" style="color: green">上传成功</span>
+
+              </template>
+          </el-table-column>
           <el-table-column
             label="操作"
             width="80">

src/views/platform/waybill/over.vue

@@ -74,6 +74,16 @@
               <span>{{scope.row.createTime | fmtDate}}</span>
             </template>
           </el-table-column>
+           <el-table-column
+            label="状态"
+            show-overflow-tooltip>
+            <template slot-scope="scope">
+
+               <span v-if="scope.row.batchStatus == 1" style="color: red">上传中</span>
+                <span v-else-if="scope.row.batchStatus == 0" style="color: green">上传成功</span>
+
+              </template>
+          </el-table-column>
           <el-table-column
             label="操作"
             width="80">

src/views/platform/waybill/waybill.vue

@@ -75,6 +75,16 @@
             </template>
           </el-table-column>
           <el-table-column
+            label="状态"
+            show-overflow-tooltip>
+            <template slot-scope="scope">
+
+               <span v-if="scope.row.batchStatus == 1" style="color: red">上传中</span>
+                <span v-else-if="scope.row.batchStatus == 0" style="color: green">上传成功</span>
+
+              </template>
+          </el-table-column>
+          <el-table-column
             label="操作"
             width="80">
             <template slot-scope="scope" show-overflow-tooltip>