Merge pull request '修复调度 调价任务列表 个人价被覆盖情况' (#14) from lifei into master

Reviewed-on: #14

src/views/site/oilCompanySiteDiaodu/oilCompanySiteList.vue

@@ -433,7 +433,7 @@ export default {
       tableColumns: [
         {
           prop: "taskName",
-          width: 180,
+          width: 160,
           label: "任务名称",
           show: true,
           render: (row, column, cell) => {
@@ -445,7 +445,7 @@ export default {
         },
         {
           prop: "siteName",
-          width: 220,
+          width: 230,
           label: "油站名称",
           show: true,
           render: (row, column, cell) => {
@@ -457,13 +457,13 @@ export default {
         },
         {
           prop: "oilProductCode",
-          width: 150,
+          width: 230,
           label: "基础个人价",
           show: true,
           render: (row, column, cell) => {
             return <div>
               <span class="colorhui">油品：</span><span>{cell}</span><br/>
-              <span class="colorhui">当前基础个人价：</span><span>{row.currentFloorPrice}</span><i v-show={row.floorPriceIgnore==1} class="el-icon-s-check"></i>
+              <span class="colorhui">当前基础个人价：</span><span>{row.floorPriceIgnore}</span><i v-show={row.floorPriceIgnore==1} class="el-icon-s-check"></i>
                   </div>
           },
         },
@@ -517,7 +517,7 @@ export default {
         },
         {
           prop: "preExecuteTime",
-          minWidth: 220,
+          minWidth: 200,
           label: "预约时间/执行时间",
           show: true,
           render: (row, column, cell) => {
@@ -529,7 +529,7 @@ export default {
         },
         {
           prop: "createUserName",
-          minWidth: 220,
+          minWidth: 210,
           label: "创建人/创建时间",
           show: true,
           render: (row, column, cell) => {