Commit 876dcb48 authored by 黄奎's avatar 黄奎

11

parent 2f4211ed
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
<th>资产编号</th> <th>资产编号</th>
<th>品牌名称</th> <th>品牌名称</th>
<th>操作人/时间</th> <th>操作人/时间</th>
<t>操作</t> <th>操作</th>
</thead> </thead>
<tbody> <tbody>
<template v-for="(item,index1) in tableData"> <template v-for="(item,index1) in tableData">
...@@ -87,7 +87,6 @@ ...@@ -87,7 +87,6 @@
<p>{{item.AuditStatusName}}</p> <p>{{item.AuditStatusName}}</p>
</div> </div>
</div> </div>
</td> </td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.SourceName}}</td> <td :rowspan="item.DetailList.length" v-if="index==0">{{item.SourceName}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0"> <td :rowspan="item.DetailList.length" v-if="index==0">
...@@ -121,7 +120,6 @@ ...@@ -121,7 +120,6 @@
</td> </td>
</tr> </tr>
</template> </template>
<tr v-show="tableData.length==0"> <tr v-show="tableData.length==0">
<td colspan="12" align="center">暂无数据</td> <td colspan="12" align="center">暂无数据</td>
</tr> </tr>
...@@ -131,7 +129,6 @@ ...@@ -131,7 +129,6 @@
:total="total"> :total="total">
</el-pagination> </el-pagination>
</div> </div>
<el-dialog title="转交" :visible.sync="dialogState" width="530px"> <el-dialog title="转交" :visible.sync="dialogState" width="530px">
<el-form class="MyEditForm" :model="addMsg" :rules="rules" ref="addMsg" label-width="0px"> <el-form class="MyEditForm" :model="addMsg" :rules="rules" ref="addMsg" label-width="0px">
<div class="basefix"> <div class="basefix">
...@@ -166,7 +163,7 @@ ...@@ -166,7 +163,7 @@
import Treeselect from "@riophae/vue-treeselect"; import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default { export default {
name: 'SignMan', name: 'Supplierman',
components: { components: {
Treeselect, Treeselect,
CheckDetails CheckDetails
...@@ -233,7 +230,6 @@ ...@@ -233,7 +230,6 @@
}, },
dateList: [], dateList: [],
EmName: '', EmName: '',
} }
}, },
created() { created() {
...@@ -281,7 +277,6 @@ ...@@ -281,7 +277,6 @@
ZhuanJiao(item) { ZhuanJiao(item) {
this.dialogState = true; this.dialogState = true;
this.addMsg.WorkFlowId = item.Id; this.addMsg.WorkFlowId = item.Id;
}, },
See(item, path, backto, type) { See(item, path, backto, type) {
let shenpistr = type; let shenpistr = type;
...@@ -321,7 +316,6 @@ ...@@ -321,7 +316,6 @@
this.EmployeeList1 = res.data.data; this.EmployeeList1 = res.data.data;
} else { } else {
this.EmployeeList2 = res.data.data; this.EmployeeList2 = res.data.data;
} }
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
...@@ -414,10 +408,12 @@ ...@@ -414,10 +408,12 @@
}, },
}, },
} }
</script> </script>
<style scoped> <style scoped>
.spotquery { .spotquery {
box-sizing: border-box; box-sizing: border-box;
} }
</style> </style>
...@@ -7,13 +7,11 @@ ...@@ -7,13 +7,11 @@
<img style="width:16px;height:14px" src="../../assets/img/user.png" alt=""> <img style="width:16px;height:14px" src="../../assets/img/user.png" alt="">
账号</p> 账号</p>
<el-input v-model="userInfo.EmAccount" placeholder="请输入"></el-input> <el-input v-model="userInfo.EmAccount" placeholder="请输入"></el-input>
</div> </div>
<div> <div>
<p> <p>
<img style="width:16px;height:14px;margin-right:4px" src="../../assets/img/passwd.png" alt="">密码</p> <img style="width:16px;height:14px;margin-right:4px" src="../../assets/img/passwd.png" alt="">密码</p>
<el-input type="password" v-model="userInfo.EmPassword" placeholder="请输入内容"></el-input> <el-input type="password" v-model="userInfo.EmPassword" placeholder="请输入内容"></el-input>
</div> </div>
<div class="loginDiv"> <div class="loginDiv">
<span v-loading="btnLoading" @click="Login">登录</span> <span v-loading="btnLoading" @click="Login">登录</span>
...@@ -24,19 +22,19 @@ ...@@ -24,19 +22,19 @@
</template> </template>
<script> <script>
export default { export default {
name: 'login', name: 'login',
data(){ data() {
return{ return {
userInfo:{ userInfo: {
EmAccount:'', EmAccount: '',
EmPassword:'', EmPassword: '',
Domain:'', Domain: '',
}, },
btnLoading:false, btnLoading: false,
} }
}, },
created(){ created() {
// let href = window.location.href; // let href = window.location.href;
// let param = href.split('?')[1].split("&") ; // let param = href.split('?')[1].split("&") ;
// if(param){ // if(param){
...@@ -47,19 +45,21 @@ export default { ...@@ -47,19 +45,21 @@ export default {
// this.getUserInfo(); // this.getUserInfo();
// } // }
}, },
mounted(){ mounted() {
this.initData(); this.initData();
}, },
methods:{ methods: {
getUserInfo(){ getUserInfo() {
this.apiJavaPost("/api/user/GetUserLoginMenu",{}, this.apiJavaPost("/api/user/GetUserLoginMenu", {},
res => { res => {
this.btnLoading=false; this.btnLoading = false;
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
let user=res.data.data; let user = res.data.data;
var userJson = JSON.stringify(user); var userJson = JSON.stringify(user);
localStorage.zcuserInfo = userJson; localStorage.zcuserInfo = userJson;
this.$router.push({path: 'Home'}) this.$router.push({
path: 'Home'
})
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
...@@ -74,9 +74,8 @@ export default { ...@@ -74,9 +74,8 @@ export default {
this.userInfo.EmPassword = "123456"; this.userInfo.EmPassword = "123456";
} }
this.userInfo.Domain = window.location.hostname this.userInfo.Domain = window.location.hostname
// this.userInfo.Domain = "zcyx.oytour.com";
}, },
Login(){ Login() {
if (this.userInfo.EmAccount == "") { if (this.userInfo.EmAccount == "") {
this.nameIsShow = true; this.nameIsShow = true;
this.Error("请输入用户名"); this.Error("请输入用户名");
...@@ -86,16 +85,17 @@ export default { ...@@ -86,16 +85,17 @@ export default {
this.Error("请输入密码"); this.Error("请输入密码");
return; return;
} }
this.btnLoading = true;
this.btnLoading=true; this.apiJavaPost("/api/login/userlogin", this.userInfo,
this.apiJavaPost("/api/login/userlogin",this.userInfo,
res => { res => {
this.btnLoading=false; this.btnLoading = false;
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
let user=res.data.data; let user = res.data.data;
var userJson = JSON.stringify(user); var userJson = JSON.stringify(user);
localStorage.zcuserInfo = userJson; localStorage.zcuserInfo = userJson;
this.$router.push({path: 'Home'}) this.$router.push({
path: 'Home'
})
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
...@@ -104,15 +104,15 @@ export default { ...@@ -104,15 +104,15 @@ export default {
); );
}, },
}, },
}
}
</script> </script>
<style> <style>
.login .el-loading-mask{ .login .el-loading-mask {
border-radius: 24px; border-radius: 24px;
} }
.login{
.login {
position: absolute; position: absolute;
width: 100%; width: 100%;
height: 100%; height: 100%;
...@@ -121,35 +121,42 @@ export default { ...@@ -121,35 +121,42 @@ export default {
background: url('../../assets/img/login.png') no-repeat; background: url('../../assets/img/login.png') no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
font-family: "PingFang"; font-family: "PingFang";
} }
.login .loginContent{
.login .loginContent {
position: absolute; position: absolute;
top: 20%; top: 20%;
left:15%; left: 15%;
width: 400px; width: 400px;
} }
.login .loginContent .el-input__inner{
.login .loginContent .el-input__inner {
border: none; border: none;
border-bottom: 1px solid #CCCCCC; border-bottom: 1px solid #CCCCCC;
border-radius: 0; border-radius: 0;
color:#333333; color: #333333;
padding:0; padding: 0;
} }
.login .loginContent .el-input.is-active .el-input__inner,.login .loginContent .el-input__inner:focus{
border-bottom: 2px solid #089bab!important; .login .loginContent .el-input.is-active .el-input__inner,
} .login .loginContent .el-input__inner:focus {
.loginDiv{ border-bottom: 2px solid #089bab !important;
margin-top:50px; }
}
.loginDiv span{ .loginDiv {
margin-top: 50px;
}
.loginDiv span {
display: inline-block; display: inline-block;
width:180px; width: 180px;
height:48px; height: 48px;
line-height:48px; line-height: 48px;
background:rgba(17,17,17,1); background: rgba(17, 17, 17, 1);
border-radius:24px; border-radius: 24px;
text-align: center; text-align: center;
color:#FFFFFF; color: #FFFFFF;
cursor: pointer; cursor: pointer;
} }
</style> </style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment