Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/icore-pass

src/views/RMS/components/addOilPrice.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 添加油价信息 -->
-  <div class="addWagonLoad">
+  <div class="addOilPrice">
     <page-title>返回</page-title>
     <div class="form_you">
       <span class="text">油品名称 </span>
@@ -133,7 +133,7 @@ export default {
 </script>
 <style lang='scss'>
 
-.addWagonLoad{
+.addOilPrice{
   .form_you{
     margin-left: 35%;
     margin-top: 30px;

src/views/inward/components/offsetSteel/saleSteelTruckOrder/platformStockInfo.vue

@@ -285,6 +285,20 @@
           width="150px"
         >
         </el-table-column>
+        <el-table-column
+          prop="isAccept"
+          label="是否验收"
+          align="center"
+          width="150px"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="isAcceptTime"
+          label="验收时间"
+          align="center"
+          width="150px"
+        >
+        </el-table-column>
         <el-table-column label="操作" align="center" width="150px" prop="operation">
           <template slot-scope="scope">
             <el-button type="text" @click="operate(scope.row)">保存</el-button>