caoliancun/dispacth_zhongpin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Reviewed-on: #15
This commit was merged in pull request #15.
This commit is contained in:
曹连存
2023-05-16 00:46:47 +00:00
parent bcdbc13b24 ac7df467f4
commit bb65bd1e39
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/login/index.vue
View File

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

16
src/views/site/oilSiteOilsPrice/OilSiteOilsPriceList.vue
View File

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