Merge pull request 'lifei' (#15) from lifei into master

Reviewed-on: #15

src/views/login/index.vue

@@ -14,6 +14,8 @@
                         <el-input
                             v-model="loginForm.username"
                             placeholder="请输入用户名"
+                            
+                            oninput="if(value.length>11)value=value.slice(0,11)" type="Number"  onkeyup="this.value = this.value.replace(/[^\d]/g,'');" 
                         >
                             <img
                                 slot="prefix"

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) => {

src/views/site/oilSiteOilsPrice/OilSiteOilsPriceList.vue

@@ -188,11 +188,11 @@
               </div>
               </template>
           </el-table-column>
-          <el-table-column prop="address" label="创建人">
+          <el-table-column prop="address" label="创建人/id">
             <template slot-scope="scope">
               <div>
-                <div>{{ scope.row.createUserName }}</div>
+                <div>创建人: {{ scope.row.createUserName?scope.row.createUserName:'暂无数据' }}</div>
-                <div> {{ scope.row.createUser?'暂无数据':scope.row.createUser}}</div>
+                <div>创建人ID： {{ scope.row.createUser?scope.row.createUser:'暂无数据'}}</div>
               </div>
               </template>
           </el-table-column>
@@ -594,12 +594,16 @@ export default {
               return (
                 <div>
                   <div>
-                    <span>更新人</span>
+                    <span>创建人:</span>
-                    <span>{row.createUserName === undefined ?  ':'+'暂无数据' :row.createUserName}</span>
+                    <span>{row.createUserName === undefined ? '暂无数据' :row.createUserName}</span>
                   </div>
-                  <div>
+                  {/* <div>
                     <span>更新时间</span>
                     <span>{row.updateTime}</span>
+                  </div> */}
+                  <div>
+                    <span>ID：</span>
+                    <span> {row.createUser?row.createUser:'暂无数据'}</span>
                   </div>
                 </div>
               );