Browse Source

安瑞系统中左侧菜单的样式、页面右上角的欢迎语、菜单右击的下拉菜单的整体调整,厂商、车型、员工页面修复测试文档中的问题。

master
Zhao Qiqi 3 years ago
parent
commit
3d502a0713
  1. 14
      anrui-base/anrui-base-ui/src/layout/components/Sidebar/SidebarItem.vue
  2. 2
      anrui-base/anrui-base-ui/src/layout/components/TagsView/index.vue
  3. 1
      anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanli.vue
  4. 10
      anrui-buscenter/anrui-buscenter-ui/src/layout/components/Navbar.vue
  5. 18
      anrui-buscenter/anrui-buscenter-ui/src/layout/components/Sidebar/SidebarItem.vue
  6. 9
      anrui-buscenter/anrui-buscenter-ui/src/layout/components/TagsView/index.vue
  7. 4
      anrui-buscenter/anrui-buscenter-ui/src/main.js
  8. 10
      anrui-buscenter/anrui-finmanage-ui/src/layout/components/Navbar.vue
  9. 18
      anrui-buscenter/anrui-finmanage-ui/src/layout/components/Sidebar/SidebarItem.vue
  10. 8
      anrui-buscenter/anrui-finmanage-ui/src/layout/components/TagsView/index.vue
  11. 4
      anrui-buscenter/anrui-finmanage-ui/src/store/modules/user.js
  12. 1
      anrui-management/anrui-management-ui/src/components/uploadFileimg/upload.vue
  13. 10
      anrui-management/anrui-management-ui/src/layout/components/Navbar.vue
  14. 18
      anrui-management/anrui-management-ui/src/layout/components/Sidebar/SidebarItem.vue
  15. 13
      anrui-management/anrui-management-ui/src/layout/components/TagsView/index.vue
  16. 4
      anrui-management/anrui-management-ui/src/store/modules/user.js
  17. 59
      anrui-management/anrui-management-ui/src/views/sysstaffinfo/yuangongAdd.vue
  18. 2
      anrui-management/anrui-management-ui/src/views/sysstaffinfo/yuangongInfo.vue
  19. 18
      anrui-management/anrui-management-ui/src/views/sysstaffinfo/yuangongguanli.vue
  20. 4
      anrui-scm/anrui-scm-ui/src/api/cheliang/basevehiclemodel.js
  21. 22
      anrui-scm/anrui-scm-ui/src/layout/components/Sidebar/SidebarItem.vue
  22. 9
      anrui-scm/anrui-scm-ui/src/layout/components/TagsView/index.vue
  23. 4
      anrui-scm/anrui-scm-ui/src/main.js
  24. 4
      anrui-scm/anrui-scm-ui/src/styles/index.scss
  25. 16
      anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouse.vue
  26. 5
      anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexing.vue
  27. 8
      anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexinglook.vue
  28. 328
      anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/ohter/changyongpeizhiInfo.vue
  29. 8
      anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/ohter/changyongpeizhiRel.vue
  30. 2
      anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengtaizhang.vue
  31. 4
      anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengtaizhangAdd.vue
  32. 2
      anrui-system-ui/src/api/system/menu/index.js
  33. 5
      anrui-system-ui/src/layout/components/Navbar.vue
  34. 1
      anrui-system-ui/src/layout/components/Sidebar/SidebarItem.vue
  35. 21
      anrui-system-ui/src/layout/components/Sidebar/index.vue
  36. 17
      anrui-system-ui/src/layout/components/TagsView/index.vue
  37. 6
      anrui-system-ui/src/store/modules/user.js
  38. 13
      anrui-system-ui/src/views/Home/Home.vue
  39. 2
      anrui-system-ui/src/views/RoleAdminister/RoleAdminister.vue

14
anrui-base/anrui-base-ui/src/layout/components/Sidebar/SidebarItem.vue

@ -99,17 +99,19 @@ export default {
</script> </script>
<style scoped> <style scoped>
/deep/ .el-submenu__title { /deep/ .el-submenu__title {
height: 36px !important; height: 40px !important;
line-height: 36px !important; line-height: 40px !important;
font-size: 16px!important;
} }
/deep/ .el-submenu .el-menu-item { /deep/ .el-submenu .el-menu-item {
height: 30px !important; height: 40px !important;
line-height: 30px !important; line-height: 40px !important;
} }
/deep/ .el-menu-item { /deep/ .el-menu-item {
height: 30px !important; height: 40px !important;
line-height: 30px !important; line-height: 40px !important;
font-size: 16px!important;
} }
</style> </style>

2
anrui-base/anrui-base-ui/src/layout/components/TagsView/index.vue

@ -192,7 +192,7 @@ export default {
} else { } else {
this.left = left this.left = left
} }
this.top = e.clientY -32 this.top = e.clientY - 32
this.visible = true this.visible = true
this.selectedTag = tag this.selectedTag = tag
}, },

1
anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanli.vue

@ -381,6 +381,7 @@ export default {
handleFilter() { handleFilter() {
this.listQuery.current = 1 this.listQuery.current = 1
this.getList() this.getList()
this.searchData()
}, },
handleReset() { handleReset() {
this.listQuery = { this.listQuery = {

10
anrui-buscenter/anrui-buscenter-ui/src/layout/components/Navbar.vue

@ -3,13 +3,14 @@
<div class="navbar"> <div class="navbar">
<h3 class="breadcrumb-container">安瑞集团信息化平台</h3> <h3 class="breadcrumb-container">安瑞集团信息化平台</h3>
<div class="right-menu"> <div class="right-menu">
<p>{{Orgname}} {{departmentName}} 欢迎, {{name}}</p> <!-- <p>{{Orgname}} {{departmentName}} 欢迎, {{name}}</p>-->
<p>欢迎您{{pNameAndDepartmentNameAndPostName}} {{name}}</p>
<img src="@/assets/images/info.png"> <img src="@/assets/images/info.png">
<!-- <img src="@/assets/images/dy.png" @click="logout"> --> <!-- <img src="@/assets/images/dy.png" @click="logout"> -->
<span class="backToHome" @click="logout"><i class="el-icon-back"></i>返回首页</span> <span class="backToHome" @click="logout"><i class="el-icon-back"></i>返回首页</span>
</div> </div>
</div> </div>
<el-footer class="footer" height="40px">Copyright © 2021 安瑞集团 All Rights Reserved</el-footer> <el-footer class="footer" height="40px">Copyright © {{ year }} 安瑞集团 All Rights Reserved</el-footer>
</div> </div>
</template> </template>
@ -20,12 +21,17 @@ export default {
Orgname: '', Orgname: '',
departmentName: '', departmentName: '',
name: '', name: '',
year:'',
pNameAndDepartmentNameAndPostName:''
} }
}, },
mounted() { mounted() {
this.Orgname = window.sessionStorage.getItem('Orgname') this.Orgname = window.sessionStorage.getItem('Orgname')
this.departmentName = window.sessionStorage.getItem('departmentName') this.departmentName = window.sessionStorage.getItem('departmentName')
this.pNameAndDepartmentNameAndPostName = window.sessionStorage.getItem('pNameAndDepartmentNameAndPostName')
this.name = window.sessionStorage.getItem('name') this.name = window.sessionStorage.getItem('name')
var nowDate = new Date()
this.year = nowDate.getFullYear()
}, },
methods: { methods: {
logout() { logout() {

18
anrui-buscenter/anrui-buscenter-ui/src/layout/components/Sidebar/SidebarItem.vue

@ -97,3 +97,21 @@ export default {
} }
} }
</script> </script>
<style scoped>
/deep/ .el-submenu__title {
height: 40px !important;
line-height: 40px !important;
font-size: 16px!important;
}
/deep/ .el-submenu .el-menu-item {
height: 40px !important;
line-height: 40px !important;
}
/deep/ .el-menu-item {
height: 40px !important;
line-height: 40px !important;
font-size: 16px!important;
}
</style>

9
anrui-buscenter/anrui-buscenter-ui/src/layout/components/TagsView/index.vue

@ -20,13 +20,13 @@
</el-dropdown> </el-dropdown>
</div>--> </div>-->
<!--
<ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu"> <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
<li @click="refreshSelectedTag(selectedTag)">刷新</li> <li @click="refreshSelectedTag(selectedTag)">刷新</li>
<li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)">关闭</li> <li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)">关闭</li>
<li @click="closeOthersTags">关闭其他</li> <li @click="closeOthersTags">关闭其他</li>
<li @click="closeAllTags(selectedTag)">关闭所有</li> <li @click="closeAllTags(selectedTag)">关闭所有</li>
</ul>--> </ul>
</div> </div>
</template> </template>
@ -141,7 +141,8 @@
} = view } = view
this.$nextTick(() => { this.$nextTick(() => {
this.$router.replace({ this.$router.replace({
path: '/redirect' + fullPath // path: '/redirect' + fullPath
path: fullPath
}) })
}) })
}) })
@ -199,7 +200,7 @@
} else { } else {
this.left = left this.left = left
} }
this.top = e.clientY this.top = e.clientY - 32
this.visible = true this.visible = true
this.selectedTag = tag this.selectedTag = tag
}, },

4
anrui-buscenter/anrui-buscenter-ui/src/main.js

@ -96,7 +96,8 @@ function getUserInfo() {
userSid: data.sid, userSid: data.sid,
orgSid: data.organizationSid, //单位sid orgSid: data.organizationSid, //单位sid
Orgname: data.organizationName, Orgname: data.organizationName,
dwjb: data.dwjb dwjb: data.dwjb,
pNameAndDepartmentNameAndPostName:data.pNameAndDepartmentNameAndPostName
}; };
//结果存入缓存 //结果存入缓存
window.sessionStorage.setItem('staffSid', user.staffSid); window.sessionStorage.setItem('staffSid', user.staffSid);
@ -108,6 +109,7 @@ function getUserInfo() {
window.sessionStorage.setItem('user', user); window.sessionStorage.setItem('user', user);
window.sessionStorage.setItem('departmentName', user.departmentName); window.sessionStorage.setItem('departmentName', user.departmentName);
window.sessionStorage.setItem('departmentSid', user.departmentSid); window.sessionStorage.setItem('departmentSid', user.departmentSid);
window.sessionStorage.setItem('pNameAndDepartmentNameAndPostName', user.pNameAndDepartmentNameAndPostName)
}) })
} }

10
anrui-buscenter/anrui-finmanage-ui/src/layout/components/Navbar.vue

@ -3,13 +3,14 @@
<div class="navbar"> <div class="navbar">
<h3 class="breadcrumb-container">安瑞集团信息化平台</h3> <h3 class="breadcrumb-container">安瑞集团信息化平台</h3>
<div class="right-menu"> <div class="right-menu">
<p>{{Orgname}} {{departmentName}} 欢迎, {{name}}</p> <!-- <p>{{Orgname}} {{departmentName}} 欢迎, {{name}}</p>-->
<p>欢迎您{{pNameAndDepartmentNameAndPostName}} {{name}}</p>
<img src="@/assets/images/info.png"> <img src="@/assets/images/info.png">
<!-- <img src="@/assets/images/dy.png" @click="logout"> --> <!-- <img src="@/assets/images/dy.png" @click="logout"> -->
<span class="backToHome" @click="logout"><i class="el-icon-back"></i>返回首页</span> <span class="backToHome" @click="logout"><i class="el-icon-back"></i>返回首页</span>
</div> </div>
</div> </div>
<el-footer class="footer" height="40px">Copyright © 2021 安瑞集团 All Rights Reserved</el-footer> <el-footer class="footer" height="40px">Copyright © {{year}} 安瑞集团 All Rights Reserved</el-footer>
</div> </div>
</template> </template>
@ -20,12 +21,17 @@ export default {
Orgname:'', Orgname:'',
departmentName:'', departmentName:'',
name:'', name:'',
year:'',
pNameAndDepartmentNameAndPostName:''
} }
}, },
mounted(){ mounted(){
this.Orgname = window.sessionStorage.getItem('Orgname') this.Orgname = window.sessionStorage.getItem('Orgname')
this.departmentName = window.sessionStorage.getItem('departmentName') this.departmentName = window.sessionStorage.getItem('departmentName')
this.name = window.sessionStorage.getItem('name') this.name = window.sessionStorage.getItem('name')
this.pNameAndDepartmentNameAndPostName = window.sessionStorage.getItem('pNameAndDepartmentNameAndPostName')
var nowDate = new Date()
this.year = nowDate.getFullYear()
}, },
methods: { methods: {
logout() { logout() {

18
anrui-buscenter/anrui-finmanage-ui/src/layout/components/Sidebar/SidebarItem.vue

@ -97,3 +97,21 @@ export default {
} }
} }
</script> </script>
<style scoped>
/deep/ .el-submenu__title {
height: 40px !important;
line-height: 40px !important;
font-size: 16px!important;
}
/deep/ .el-submenu .el-menu-item {
height: 40px !important;
line-height: 40px !important;
}
/deep/ .el-menu-item {
height: 40px !important;
line-height: 40px !important;
font-size: 16px!important;
}
</style>

8
anrui-buscenter/anrui-finmanage-ui/src/layout/components/TagsView/index.vue

@ -26,13 +26,12 @@
</el-dropdown> </el-dropdown>
</div>--> </div>-->
<!--
<ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu"> <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
<li @click="refreshSelectedTag(selectedTag)">刷新</li> <li @click="refreshSelectedTag(selectedTag)">刷新</li>
<li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)">关闭</li> <li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)">关闭</li>
<li @click="closeOthersTags">关闭其他</li> <li @click="closeOthersTags">关闭其他</li>
<li @click="closeAllTags(selectedTag)">关闭所有</li> <li @click="closeAllTags(selectedTag)">关闭所有</li>
</ul>--> </ul>
</div> </div>
</template> </template>
@ -139,7 +138,8 @@ export default {
const { fullPath } = view const { fullPath } = view
this.$nextTick(() => { this.$nextTick(() => {
this.$router.replace({ this.$router.replace({
path: '/redirect' + fullPath path: fullPath
// path: '/redirect' + fullPath
}) })
}) })
}) })
@ -191,7 +191,7 @@ export default {
} else { } else {
this.left = left this.left = left
} }
this.top = e.clientY this.top = e.clientY - 32
this.visible = true this.visible = true
this.selectedTag = tag this.selectedTag = tag
}, },

4
anrui-buscenter/anrui-finmanage-ui/src/store/modules/user.js

@ -39,13 +39,15 @@ const actions = {
userSid: data.sid, userSid: data.sid,
orgSid: data.organizationSid, orgSid: data.organizationSid,
Orgname: data.organizationName, Orgname: data.organizationName,
dwjb: data.dwjb dwjb: data.dwjb,
pNameAndDepartmentNameAndPostName:data.pNameAndDepartmentNameAndPostName
} }
commit('SET_UESRINFO', user) commit('SET_UESRINFO', user)
window.sessionStorage.setItem('userSid', user.userSid); window.sessionStorage.setItem('userSid', user.userSid);
window.sessionStorage.setItem('Orgname', user.Orgname); window.sessionStorage.setItem('Orgname', user.Orgname);
window.sessionStorage.setItem('departmentName', user.departmentName); window.sessionStorage.setItem('departmentName', user.departmentName);
window.sessionStorage.setItem('name', user.name); window.sessionStorage.setItem('name', user.name);
window.sessionStorage.setItem('pNameAndDepartmentNameAndPostName', user.pNameAndDepartmentNameAndPostName)
resolve(data) resolve(data)
}).catch(error => { }).catch(error => {
reject(error) reject(error)

1
anrui-management/anrui-management-ui/src/components/uploadFileimg/upload.vue

@ -138,7 +138,6 @@ export default {
removeImage(file, ImageFileList) { removeImage(file, ImageFileList) {
this.files.splice(this.files.indexOf(file), 1) this.files.splice(this.files.indexOf(file), 1)
const imgFiles = [] const imgFiles = []
this.files.forEach((o) => { this.files.forEach((o) => {
imgFiles.push(o.url) imgFiles.push(o.url)
}) })

10
anrui-management/anrui-management-ui/src/layout/components/Navbar.vue

@ -3,13 +3,14 @@
<div class="navbar"> <div class="navbar">
<h3 class="breadcrumb-container">安瑞集团信息化平台</h3> <h3 class="breadcrumb-container">安瑞集团信息化平台</h3>
<div class="right-menu"> <div class="right-menu">
<p>{{Orgname}} {{departmentName}} 欢迎, {{name}}</p> <!-- <p>{{Orgname}} {{departmentName}} 欢迎, {{name}}</p>-->
<p>欢迎您{{pNameAndDepartmentNameAndPostName}} {{name}}</p>
<img src="@/assets/images/info.png"> <img src="@/assets/images/info.png">
<!-- <img src="@/assets/images/dy.png" @click="logout"> --> <!-- <img src="@/assets/images/dy.png" @click="logout"> -->
<span class="backToHome" @click="logout"><i class="el-icon-back"></i>返回首页</span> <span class="backToHome" @click="logout"><i class="el-icon-back"></i>返回首页</span>
</div> </div>
</div> </div>
<el-footer class="footer" height="40px">Copyright © 2021 安瑞集团 All Rights Reserved</el-footer> <el-footer class="footer" height="40px">Copyright © {{ year }} 安瑞集团 All Rights Reserved</el-footer>
</div> </div>
</template> </template>
@ -20,12 +21,17 @@ export default {
Orgname: '', Orgname: '',
departmentName: '', departmentName: '',
name: '', name: '',
year:'',
pNameAndDepartmentNameAndPostName:''
} }
}, },
mounted() { mounted() {
this.Orgname = window.sessionStorage.getItem('Orgname') this.Orgname = window.sessionStorage.getItem('Orgname')
this.departmentName = window.sessionStorage.getItem('departmentName') this.departmentName = window.sessionStorage.getItem('departmentName')
this.name = window.sessionStorage.getItem('name') this.name = window.sessionStorage.getItem('name')
this.pNameAndDepartmentNameAndPostName = window.sessionStorage.getItem('pNameAndDepartmentNameAndPostName')
var nowDate = new Date()
this.year = nowDate.getFullYear()
}, },
methods: { methods: {
logout() { logout() {

18
anrui-management/anrui-management-ui/src/layout/components/Sidebar/SidebarItem.vue

@ -97,3 +97,21 @@ export default {
} }
} }
</script> </script>
<style scoped>
/deep/ .el-submenu__title {
height: 40px !important;
line-height: 40px !important;
font-size: 16px!important;
}
/deep/ .el-submenu .el-menu-item {
height: 40px !important;
line-height: 40px !important;
}
/deep/ .el-menu-item {
height: 40px !important;
line-height: 40px !important;
font-size: 16px!important;
}
</style>

13
anrui-management/anrui-management-ui/src/layout/components/TagsView/index.vue

@ -16,6 +16,14 @@
<span v-if="!isAffix(tag)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" /> <span v-if="!isAffix(tag)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
</router-link> </router-link>
</scroll-pane> </scroll-pane>
<ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
<li @click="refreshSelectedTag(selectedTag)">刷新</li>
<li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)">关闭</li>
<li @click="closeOthersTags">关闭其他</li>
<li @click="closeAllTags(selectedTag)">关闭所有</li>
</ul>
</div> </div>
</template> </template>
@ -122,7 +130,8 @@ export default {
const { fullPath } = view const { fullPath } = view
this.$nextTick(() => { this.$nextTick(() => {
this.$router.replace({ this.$router.replace({
path: '/redirect' + fullPath path: fullPath
// path: '/redirect' + fullPath
}) })
}) })
}) })
@ -174,7 +183,7 @@ export default {
} else { } else {
this.left = left this.left = left
} }
this.top = e.clientY this.top = e.clientY - 32
this.visible = true this.visible = true
this.selectedTag = tag this.selectedTag = tag
}, },

4
anrui-management/anrui-management-ui/src/store/modules/user.js

@ -39,13 +39,15 @@ const actions = {
userSid: data.sid, userSid: data.sid,
orgSid: data.organizationSid, orgSid: data.organizationSid,
Orgname: data.organizationName, Orgname: data.organizationName,
dwjb: data.dwjb dwjb: data.dwjb,
pNameAndDepartmentNameAndPostName:data.pNameAndDepartmentNameAndPostName
} }
commit('SET_UESRINFO', user) commit('SET_UESRINFO', user)
window.sessionStorage.setItem('userSid', user.userSid); window.sessionStorage.setItem('userSid', user.userSid);
window.sessionStorage.setItem('Orgname', user.Orgname); window.sessionStorage.setItem('Orgname', user.Orgname);
window.sessionStorage.setItem('departmentName', user.departmentName); window.sessionStorage.setItem('departmentName', user.departmentName);
window.sessionStorage.setItem('name', user.name); window.sessionStorage.setItem('name', user.name);
window.sessionStorage.setItem('pNameAndDepartmentNameAndPostName', user.pNameAndDepartmentNameAndPostName)
resolve(data) resolve(data)
}).catch(error => { }).catch(error => {
reject(error) reject(error)

59
anrui-management/anrui-management-ui/src/views/sysstaffinfo/yuangongAdd.vue

@ -121,7 +121,7 @@
</el-main> </el-main>
<el-aside style="text-align: center;width: 25%;border-right: 1px solid #e0e3eb"> <el-aside style="text-align: center;width: 25%;border-right: 1px solid #e0e3eb">
<!--头像上传 :limit="1" bucket="map" :upload-data="{ type: '0001' }"--> <!--头像上传 :limit="1" bucket="map" :upload-data="{ type: '0001' }"-->
<upload-head ref="uploadImg" :front-photo="temp.photo" @photoAdd="photoPath"/> <upload-head ref="uploadHead" :front-photo="temp.photo" @photoAdd="photoPath"/>
</el-aside> </el-aside>
</el-container> </el-container>
<el-row> <el-row>
@ -221,7 +221,7 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="3"> <el-col :span="3">
<span><span class="icon">*</span>入职时间</span> <span><span class="icon">*</span>入职日期</span>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item prop="joinCompnyDate"> <el-form-item prop="joinCompnyDate">
@ -598,7 +598,8 @@ export default {
idTerm: [{required: true, message: '证件有效期不能为空', trigger: 'change'}], idTerm: [{required: true, message: '证件有效期不能为空', trigger: 'change'}],
national: [{required: true, message: '民族不能为空', trigger: 'change'}], national: [{required: true, message: '民族不能为空', trigger: 'change'}],
mobile: [{required: true, message: '手机号不能为空', validator: checkSubmit, trigger: 'change'}], mobile: [{required: true, message: '手机号不能为空', validator: checkSubmit, trigger: 'change'}],
personType: [{required: true, message: '员工类型不能为空', trigger: 'change'}] personType: [{required: true, message: '员工类型不能为空', trigger: 'change'}],
joinCompnyDate: [{required: true, message: '入职日期不能为空', trigger: 'blur'}]
}, },
submitdisabled: false submitdisabled: false
} }
@ -611,6 +612,13 @@ export default {
this.huoquSheng() this.huoquSheng()
}, },
methods: { methods: {
//
// email_blur(){
// var verify =/^\w[-\w.+]*@([A-Za-z0-9][-A-Za-z0-9]+\.)+[A-Za-z]{2,14}/;
// if(!verify.test(this.temp.email)){
// this.message =', '
// }
// },
// -------------------------------------------------- // --------------------------------------------------
huoquSheng() { huoquSheng() {
getProvince().then((res) => { getProvince().then((res) => {
@ -1012,61 +1020,45 @@ export default {
}, },
// //
getUrl() { getUrl() {
// console.log('身份证人面像',this.idCardA_list)
// if (this.photo_list.length > 0) {
// this.temp.photo = this.photo_list[this.photo_list.length - 1].url
// }
// for (var i = 0; i < this.photo_list.length; i++) {
// this.temp.photo = this.photo_list[i].url;
// console.log("", this.temp.photo);
// }
// () // ()
if (this.idCardA_list.length > 0) { if (this.idCardA_list.length > 0) {
this.temp.idCardA = this.idCardA_list[this.idCardA_list.length - 1].url this.temp.idCardA = this.idCardA_list[this.idCardA_list.length - 1].url
}else {
this.temp.idCardA = ''
} }
// for (var i = 0; i < this.idCardA_list.length; i++) {
// this.temp.idCardA = this.idCardA_list[i].url;
// console.log("", this.temp.idCardA);
// }
// () // ()
if (this.idCardB_list.length > 0) { if (this.idCardB_list.length > 0) {
this.temp.idCardB = this.idCardB_list[this.idCardB_list.length - 1].url this.temp.idCardB = this.idCardB_list[this.idCardB_list.length - 1].url
}else {
this.temp.idCardB = ''
} }
// for (var i = 0; i < this.idCardB_list.length; i++) {
// this.temp.idCardB = this.idCardB_list[i].url;
// console.log("", this.temp.idCardB);
// }
// //
if (this.diploma_list.length > 0) { if (this.diploma_list.length > 0) {
this.temp.diploma = this.diploma_list[this.diploma_list.length - 1].url this.temp.diploma = this.diploma_list[this.diploma_list.length - 1].url
}else {
this.temp.diploma = ''
} }
// for (var i = 0; i < this.diploma_list.length; i++) {
// this.temp.diploma = this.diploma_list[i].url;
// console.log("", this.temp.diploma);
// }
// //
if (this.degree_list.length > 0) { if (this.degree_list.length > 0) {
this.temp.degreeCertificate = this.degree_list[this.degree_list.length - 1].url this.temp.degreeCertificate = this.degree_list[this.degree_list.length - 1].url
}else {
this.temp.degreeCertificate = ''
} }
// for (var i = 0; i < this.degree_list.length; i++) {
// this.temp.degreeCertificate = this.degree_list[i].url;
// console.log("", this.temp.degreeCertificate);
// }
// leaveCertificate // leaveCertificate
if (this.leave_list.length > 0) { if (this.leave_list.length > 0) {
this.temp.leaveCertificate = this.leave_list[this.leave_list.length - 1].url this.temp.leaveCertificate = this.leave_list[this.leave_list.length - 1].url
}else {
this.temp.leaveCertificate = ''
} }
// for (var i = 0; i < this.leave_list.length; i++) {
// this.temp.leaveCertificate = this.leave_list[i].url;
// console.log("", this.temp.leaveCertificate);
// }
// console.log("");
}, },
// === // ===
handleReturn(isreload) { handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist') if (isreload === 'true') this.$emit('reloadlist')
// this.photo_list = [] // this.photo_list = []
this.$refs['uploadHead'].files = []
this.$refs['uploadHead'].Photo = ''
this.idCardA_list = [] this.idCardA_list = []
this.idCardB_list = [] this.idCardB_list = []
this.diploma_list = [] this.diploma_list = []
@ -1132,6 +1124,7 @@ export default {
url: this.temp.idCardA url: this.temp.idCardA
}) })
} }
console.log('身份证人面像',this.idCardA_list)
if (this.temp.idCardB !== '') { if (this.temp.idCardB !== '') {
const imgName = this.temp.idCardB.split('/') const imgName = this.temp.idCardB.split('/')
this.idCardB_list.push({ this.idCardB_list.push({
@ -1167,7 +1160,6 @@ export default {
saveAdd() { saveAdd() {
const _this = this const _this = this
this.getUrl()
this.$refs['dataForm'].validate((valid) => { this.$refs['dataForm'].validate((valid) => {
this.getGenderKey() this.getGenderKey()
this.getUrl() this.getUrl()
@ -1203,6 +1195,7 @@ export default {
saveEdit() { saveEdit() {
const _this = this const _this = this
this.$refs['dataForm'].validate((valid) => { this.$refs['dataForm'].validate((valid) => {
this.getUrl()
if (valid) { if (valid) {
this.submitdisabled = true this.submitdisabled = true
req.saveEdit(this.temp, this.sid).then((resp) => { req.saveEdit(this.temp, this.sid).then((resp) => {

2
anrui-management/anrui-management-ui/src/views/sysstaffinfo/yuangongInfo.vue

@ -216,7 +216,7 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="3"> <el-col :span="3">
<span><span class="icon">*</span>入职时间</span> <span><span class="icon">*</span>入职日期</span>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item> <el-form-item>

18
anrui-management/anrui-management-ui/src/views/sysstaffinfo/yuangongguanli.vue

@ -57,17 +57,17 @@
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" @selection-change="handleSelectionChange"> <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column width="50px" type="selection" align="center"/> <el-table-column width="50px" type="selection" align="center"/>
<el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/> <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column prop="jobNumber" label="员工编号" align="center"> <el-table-column width="110px" prop="jobNumber" label="员工编号" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="tablerow-click" @click="toInfo(scope.row)">{{ scope.row.jobNumber }}</span> <span class="tablerow-click" @click="toInfo(scope.row)">{{ scope.row.jobNumber }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="name" label="员工姓名" align="center"/> <el-table-column width="130px" prop="name" label="员工姓名" align="center"/>
<el-table-column prop="personType" label="员工姓名" align="center"/> <el-table-column width="85px" prop="personType" label="员工类型" align="center"/>
<el-table-column prop="mobile" label="手机号" align="center"/> <el-table-column width="140px" prop="mobile" label="手机号" align="center"/>
<el-table-column prop="orgName" label="所在部门" align="center"/> <el-table-column prop="orgName" label="所在部门" align="left"/>
<el-table-column prop="postName" label="岗位" align="center"/> <el-table-column width="180px" prop="postName" label="岗位" align="center"/>
<el-table-column prop="joinCompnyDate" label="入职日期" align="center"/> <el-table-column width="140px" prop="joinCompnyDate" label="入职日期" align="center"/>
</el-table> </el-table>
</div> </div>
<div class="pages"> <div class="pages">
@ -503,11 +503,11 @@ export default {
} }
/deep/ .el-collapse-item__wrap { /deep/ .el-collapse-item__wrap {
border-bottom: 0px solid #ebeef5; border-bottom: 0 solid #ebeef5;
} }
/deep/ .el-collapse-item__header { /deep/ .el-collapse-item__header {
border-bottom: 0px solid #e6ebf5; border-bottom: 0 solid #e6ebf5;
} }
.searchbtn { .searchbtn {

4
anrui-scm/anrui-scm-ui/src/api/cheliang/basevehiclemodel.js

@ -33,9 +33,9 @@ export function deleteBySids(params) {
// 详情回显 已改 // 详情回显 已改
export function details(data) { export function details(data) {
return request({ return request({
url: '/base/v1/basevehiclemodel/details/' + data, url: '/base/v1/basevehiclemodel/details/' + data.sid + '/' + data.useOrgSid,
method: 'get', method: 'get',
params: data // params: data
}) })
} }

22
anrui-scm/anrui-scm-ui/src/layout/components/Sidebar/SidebarItem.vue

@ -71,7 +71,7 @@ export default {
} }
}) })
// When there is only one child // When there is only one child
// if (showingChildren.length === 1) { // if (showingChildren.length === 1) {
// this.onlyOneChild=item() // this.onlyOneChild=item()
// return true // return true
@ -96,4 +96,22 @@ export default {
} }
} }
} }
</script> </script>
<style scoped>
/deep/ .el-submenu__title {
height: 40px !important;
line-height: 40px !important;
font-size: 16px!important;
}
/deep/ .el-submenu .el-menu-item {
height: 40px !important;
line-height: 40px !important;
}
/deep/ .el-menu-item {
height: 40px !important;
line-height: 40px !important;
font-size: 16px!important;
}
</style>

9
anrui-scm/anrui-scm-ui/src/layout/components/TagsView/index.vue

@ -26,13 +26,13 @@
</el-dropdown> </el-dropdown>
</div>--> </div>-->
<!--
<ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu"> <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
<li @click="refreshSelectedTag(selectedTag)">刷新</li> <li @click="refreshSelectedTag(selectedTag)">刷新</li>
<li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)">关闭</li> <li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)">关闭</li>
<li @click="closeOthersTags">关闭其他</li> <li @click="closeOthersTags">关闭其他</li>
<li @click="closeAllTags(selectedTag)">关闭所有</li> <li @click="closeAllTags(selectedTag)">关闭所有</li>
</ul>--> </ul>
</div> </div>
</template> </template>
@ -139,7 +139,8 @@ export default {
const { fullPath } = view const { fullPath } = view
this.$nextTick(() => { this.$nextTick(() => {
this.$router.replace({ this.$router.replace({
path: '/redirect' + fullPath path: fullPath
// path: '/redirect' + fullPath
}) })
}) })
}) })
@ -191,7 +192,7 @@ export default {
} else { } else {
this.left = left this.left = left
} }
this.top = e.clientY this.top = e.clientY - 32
this.visible = true this.visible = true
this.selectedTag = tag this.selectedTag = tag
}, },

4
anrui-scm/anrui-scm-ui/src/main.js

@ -65,7 +65,8 @@ function getUserInfo() {
Orgname: data.organizationName, Orgname: data.organizationName,
dwjb: data.dwjb, dwjb: data.dwjb,
orgNamePath: data.orgNamePath, // 使用组织全路径名称 orgNamePath: data.orgNamePath, // 使用组织全路径名称
orgSidPath: data.orgSidPath // 使用组织全路径Sid orgSidPath: data.orgSidPath, // 使用组织全路径Sid
pNameAndDepartmentNameAndPostName:data.pNameAndDepartmentNameAndPostName
} }
// 结果存入缓存 // 结果存入缓存
window.sessionStorage.setItem('staffSid', user.staffSid) window.sessionStorage.setItem('staffSid', user.staffSid)
@ -79,6 +80,7 @@ function getUserInfo() {
window.sessionStorage.setItem('departmentSid', user.departmentSid) window.sessionStorage.setItem('departmentSid', user.departmentSid)
window.sessionStorage.setItem('orgNamePath', user.orgNamePath) window.sessionStorage.setItem('orgNamePath', user.orgNamePath)
window.sessionStorage.setItem('orgSidPath', user.orgSidPath) window.sessionStorage.setItem('orgSidPath', user.orgSidPath)
window.sessionStorage.setItem('pNameAndDepartmentNameAndPostName', user.pNameAndDepartmentNameAndPostName)
}) })
} }

4
anrui-scm/anrui-scm-ui/src/styles/index.scss

@ -214,11 +214,11 @@ div:focus {
color: #606266; color: #606266;
font-weight: 600; font-weight: 600;
border-right: 1px solid $table-border-color; border-right: 1px solid $table-border-color;
padding: 0px 15px !important; padding: 0 10px !important;
line-height: 48px; line-height: 48px;
} }
.el-form-item{ .el-form-item{
padding: 0px 15px !important; padding: 0 10px !important;
margin-bottom: 0; margin-bottom: 0;
.addinputw { width: 80%; } .addinputw { width: 80%; }
} }

16
anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouse.vue

@ -17,9 +17,9 @@
<el-option v-for="item in useOrg_list" :key="item.sid" :label="item.name" :value="item.sid"/> <el-option v-for="item in useOrg_list" :key="item.sid" :label="item.name" :value="item.sid"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="编码"> <!-- <el-form-item label="编码">-->
<el-input v-model="queryParams.params.warehouseCode" placeholder="请输入编码" clearable/> <!-- <el-input v-model="queryParams.params.warehouseCode" placeholder="请输入编码" clearable/>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="名称"> <el-form-item label="名称">
<el-input v-model="queryParams.params.warehouseName" placeholder="请输入名称" clearable/> <el-input v-model="queryParams.params.warehouseName" placeholder="请输入名称" clearable/>
</el-form-item> </el-form-item>
@ -52,13 +52,17 @@
@selection-change="handleSelectionChange"> @selection-change="handleSelectionChange">
<el-table-column width="50px" type="selection" align="center"/> <el-table-column width="50px" type="selection" align="center"/>
<el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/> <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column width="160px" label="编码" align="center"> <!-- <el-table-column width="160px" label="编码" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <span class="bluezi" @click="toInfo(scope.row)">{{ scope.row.warehouseCode }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column width="200px" prop="warehouseName" label="名称" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="bluezi" @click="toInfo(scope.row)">{{ scope.row.warehouseCode }}</span> <span class="bluezi" @click="toInfo(scope.row)">{{ scope.row.warehouseName }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="240px" prop="useOrg" label="使用组织" align="center"/> <el-table-column width="240px" prop="useOrg" label="使用组织" align="center"/>
<el-table-column width="200px" prop="warehouseName" label="名称" align="center"/>
<el-table-column prop="warehouseAttribute" label="详细地址" align="center"/> <el-table-column prop="warehouseAttribute" label="详细地址" align="center"/>
<el-table-column width="200px" prop="warehouseContract" label="负责人及电话" align="center"/> <el-table-column width="200px" prop="warehouseContract" label="负责人及电话" align="center"/>
<el-table-column width="140px" prop="warehouseGroup" label="分组" align="center"/> <el-table-column width="140px" prop="warehouseGroup" label="分组" align="center"/>

5
anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexing.vue

@ -348,6 +348,7 @@ export default {
break break
} }
}, },
//
getPathSid() { getPathSid() {
const userSid = window.sessionStorage.getItem('userSid') const userSid = window.sessionStorage.getItem('userSid')
getPathSidByUserSid({userSid:userSid}).then((res) => { getPathSidByUserSid({userSid:userSid}).then((res) => {
@ -587,8 +588,8 @@ export default {
handleCheck(row) { handleCheck(row) {
this.viewState = 4 this.viewState = 4
const sid = row.sid const sid = row.sid
console.log('详情sid', sid) console.log('详情sid', sid,'useOrg:',this.useOrg)
this.$refs['divinfo'].showInfo(sid, row) this.$refs['divinfo'].showInfo(sid, row, this.useOrg)
}, },
// ID // ID
doDel() { doDel() {

8
anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexinglook.vue

@ -270,8 +270,12 @@ export default {
this.$emit('doback') this.$emit('doback')
}, },
// //
showInfo(sid, row) { showInfo(sid, row, useOrgSid) {
details(sid).then((response) => { const data = {
sid:sid,
useOrgSid:useOrgSid
}
details(data).then((response) => {
this.FormLoading = false this.FormLoading = false
if (response.success) { if (response.success) {
this.temp = response.data this.temp = response.data

328
anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/ohter/changyongpeizhiInfo.vue

@ -1,328 +0,0 @@
<template>
<div class="app-container">
<div class="tab-header webtop">
<div>车型详情</div>
<div>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
<div class="listadd">
<el-form ref="dataForm" :model="temp" label-position="right" class="formadd">
<div class="title">车型详情</div>
<el-row>
<el-col :span="4">
<span>品牌</span>
</el-col>
<el-col :span="20">
<el-form-item>
<span>{{ temp.brandName }}</span>
</el-form-item>
</el-col>
<!-- <el-col :span="4">-->
<!-- <span>车型编码</span>-->
<!-- </el-col>-->
<!-- <el-col :span="8">-->
<!-- <el-form-item>-->
<!-- <span>{{ temp.vehicleTypeCode }}</span>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
</el-row>
<el-row>
<el-col :span="4">
<span>功能</span>
</el-col>
<el-col :span="8">
<el-form-item>
<span>{{ temp.vehicleTypeValue }}</span>
</el-form-item>
</el-col>
<el-col :span="4">
<span>系列</span>
</el-col>
<el-col :span="8">
<el-form-item>
<span>{{ temp.productLineValue }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4">
<span>驱动</span>
</el-col>
<el-col :span="8">
<el-form-item>
<span>{{ temp.driveFormValue }}</span>
</el-form-item>
</el-col>
<el-col :span="4">
<span>马力</span>
</el-col>
<el-col :span="8">
<el-form-item>
<span>{{ temp.powerValue }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4">
<span>版本</span>
</el-col>
<el-col :span="8">
<el-form-item>
<span>{{ temp.vehicleVersionValue }}</span>
</el-form-item>
</el-col>
<el-col :span="4">
<span>燃料</span>
</el-col>
<el-col :span="8">
<el-form-item>
<span>{{ temp.fuelTypeValue }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4">
<span>变速箱</span>
</el-col>
<el-col :span="8">
<el-form-item>
<span>{{ temp.gearboxTypeValue }}</span>
</el-form-item>
</el-col>
<el-col :span="4">
<span>排放标准</span>
</el-col>
<el-col :span="8">
<el-form-item>
<span>{{ temp.emissionStandardValue }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4">
<span>发动机型号</span>
</el-col>
<el-col :span="8">
<el-form-item>
<span>{{ temp.engineTypeValue }}</span>
</el-form-item>
</el-col>
<el-col :span="4">
<span>细分市场</span>
</el-col>
<el-col :span="8">
<el-form-item>
<span>{{ temp.marketSegments }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4">
<span>规格型号</span>
</el-col>
<el-col :span="8">
<el-form-item>
<span>{{ temp.specifications }}</span>
</el-form-item>
</el-col>
<el-col :span="4">
<span>系别</span>
</el-col>
<el-col :span="8">
<el-form-item>
<span>{{ temp.departmentValue }}</span>
</el-form-item>
</el-col>
</el-row>
<!-- <el-row>-->
<!-- <el-col :span="4">-->
<!-- <span>内部编码</span>-->
<!-- </el-col>-->
<!-- <el-col :span="8">-->
<!-- <el-form-item >-->
<!-- <span>{{ temp.insideCode }}</span>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="4">-->
<!-- </el-col>-->
<!-- <el-col :span="8">-->
<!-- </el-col>-->
<!-- </el-row>-->
<div class="addtable">
<div class="tabletitle">
<div class="titlename">
常用配置列表
</div>
</div>
<template class="tablelist">
<el-table :data="temp.baseModelConfigVo" :index="index" border style="width: 100%">
<el-table-column align="center" label="序号" type="index" width="50"/>
<el-table-column prop="mNum" width="150" label="指导价(万元)" align="center">
<template slot-scope="props">
<span>{{ props.row.guidedPrice }}</span>
</template>
</el-table-column>
<el-table-column prop="mName" width="150" label="颜色" align="center">
<template slot-scope="props">
<span>{{ props.row.carColor }}</span>
</template>
</el-table-column>
<el-table-column prop="model" width="150" label="缓速器" align="center">
<template slot-scope="props">
<span>{{ props.row.slowMachine }}</span>
</template>
</el-table-column>
<el-table-column prop="year" width="95" label="后视镜" align="center">
<template slot-scope="props">
<span>{{ props.row.rearViewMirror }}</span>
</template>
</el-table-column>
<el-table-column prop="logisticsCustomer" width="95" label="轮胎" align="center">
<template slot-scope="props">
<span>{{ props.row.tireSize }}</span>
</template>
</el-table-column>
<el-table-column prop="company" width="150" label="驾驶室" align="center">
<template slot-scope="props">
<span>{{ props.row.specification }}</span>
</template>
</el-table-column>
<el-table-column prop="netReceiptsNum" width="150" label="后桥速比" align="center">
<template slot-scope="props">
<span>{{ props.row.rearAxleRatio }}</span>
</template>
</el-table-column>
<el-table-column prop="receivingWarehouse" width="150" label="空调" align="center">
<template slot-scope="props">
<span>{{ props.row.airConditioner }}</span>
</template>
</el-table-column>
<el-table-column prop="position" width="150" label="轮毂材质" align="center">
<template slot-scope="props">
<span>{{ props.row.hubMaterial }}</span>
</template>
</el-table-column>
<el-table-column prop="batchNum" width="150" label="导流罩" align="center">
<template slot-scope="props">
<span>{{ props.row.baffleModel }}</span>
</template>
</el-table-column>
<el-table-column prop="cargoOwner" width="120" label="悬架" align="center">
<template slot-scope="props">
<span>{{ props.row.suspension }}</span>
</template>
</el-table-column>
<el-table-column prop="remarks" width="150" label="座椅" align="center">
<template slot-scope="props">
<span>{{ props.row.seat }}</span>
</template>
</el-table-column>
<el-table-column prop="remarks" width="150" label="护轮罩" align="center">
<template slot-scope="props">
<span>{{ props.row.tireCover }}</span>
</template>
</el-table-column>
<el-table-column prop="remarks" width="150" label="鞍座" align="center">
<template slot-scope="props">
<span>{{ props.row.saddle }}</span>
</template>
</el-table-column>
<el-table-column prop="remarks" width="150" label="轴距" align="center">
<template slot-scope="props">
<span>{{ props.row.wheelbase }}</span>
</template>
</el-table-column>
<el-table-column prop="remarks" width="150" label="保险杠" align="center">
<template slot-scope="props">
<span>{{ props.row.bumper }}</span>
</template>
</el-table-column>
<el-table-column prop="remarks" width="150" label="配置包" align="center">
<template slot-scope="props">
<span>{{ props.row.configuringBao }}</span>
</template>
</el-table-column>
<el-table-column prop="remarks" width="150" label="独立热源" align="center">
<template slot-scope="props">
<span>{{ props.row.independentSources }}</span>
</template>
</el-table-column>
<el-table-column prop="remarks" width="150" label="燃料箱" align="center">
<template slot-scope="props">
<span>{{ props.row.fuelTank }}</span>
</template>
</el-table-column>
<el-table-column prop="remarks" width="150" label="多媒体" align="center">
<template slot-scope="props">
<span>{{ props.row.multimedia }}</span>
</template>
</el-table-column>
<el-table-column prop="remarks" width="150" label="货箱" align="center">
<template slot-scope="props">
<span>{{ props.row.packingCase }}</span>
</template>
</el-table-column>
</el-table>
</template>
</div>
</el-form>
</div>
</div>
</template>
<script>
import { details } from '@/api/cheliang/basevehiclemodel'
export default {
name: 'changyongpeizhiInfo',
data() {
return {
// ---------
index: 0,
FormLoading: false,
listLoading: false,
temp: {} //
}
},
methods: {
// ------------------------------------------------------
//
handleReturn() {
this.temp = {}
this.$emit('doback')
},
//
showInfo(sid, row) {
this.FormLoading = true
details(sid).then((response) => {
this.FormLoading = false
if (response.code === '200') {
this.temp = response.data
} else {
this.$notify({
title: '失败',
message: '查询失败',
type: 'error'
})
}
})
}
}
}
</script>
<style scoped>
/deep/ .el-col-4 {
text-align: right;
float: left;
font-size: 14px;
color: #606266;
line-height: 40px !important;
font-weight: 600;
}
.addinputw {
width: 100% !important;
}
</style>

8
anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/ohter/changyongpeizhiRel.vue

@ -128,21 +128,21 @@
</div> </div>
</div> </div>
<!--End 列表页面--> <!--End 列表页面-->
<changyongpeizhiInfo v-show="viewState == 6" ref="divinfo" @doback="resetState"></changyongpeizhiInfo> <chexinglook v-show="viewState == 6" ref="divinfo" @doback="resetState"></chexinglook>
</div> </div>
</template> </template>
<script> <script>
import { brandDown, getPathSidByUserSid, pullDown, selectVehModelByConfigSid } from '@/api/cheliang/basevehiclemodel' import { brandDown, getPathSidByUserSid, pullDown, selectVehModelByConfigSid } from '@/api/cheliang/basevehiclemodel'
import { deleteRel } from '@/api/cheliang/basemodelconfig' import { deleteRel } from '@/api/cheliang/basemodelconfig'
import changyongpeizhiInfo from './changyongpeizhiInfo'
import Pagination from '@/components/pagination' import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye' import pageye from '@/components/pagination/pageye'
import Chexinglook from '@/views/cheliang/chexing/chexinglook'
export default { export default {
name: 'changyongpeizhiRel', name: 'changyongpeizhiRel',
components: { components: {
changyongpeizhiInfo, Chexinglook,
Pagination, Pagination,
pageye pageye
}, },
@ -415,7 +415,7 @@ export default {
console.log('111', row) console.log('111', row)
this.viewState = 6 this.viewState = 6
const sid = row.sid const sid = row.sid
this.$refs['divinfo'].showInfo(sid, row) this.$refs['divinfo'].showInfo(sid, row, this.useOrg)
}, },
// //
handleOpen() { handleOpen() {

2
anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengtaizhang.vue

@ -85,7 +85,7 @@
<span>{{ scope.row.receiver }}</span> <span>{{ scope.row.receiver }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注" width="370px" align="center"> <el-table-column label="备注" width="370px" align="left">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.remarks }}</span> <span>{{ scope.row.remarks }}</span>
</template> </template>

4
anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengtaizhangAdd.vue

@ -349,7 +349,7 @@ export default {
certificateSituation: '', certificateSituation: '',
certificateSituationValue: '', certificateSituationValue: '',
certificatePhoto: [], certificatePhoto: [],
// certificateState: '', // key certificateState: '0002', // key
certificateStateValue: '正式', // value certificateStateValue: '正式', // value
noticeModel:'' // noticeModel:'' //
}, // }, //
@ -640,7 +640,7 @@ export default {
certificateSituation: '', certificateSituation: '',
certificateSituationValue: '', certificateSituationValue: '',
certificatePhoto: [], certificatePhoto: [],
// certificateState: '', // key certificateState: '0002', // key
certificateStateValue: '正式' // value certificateStateValue: '正式' // value
}, // }, //
this.$emit('doback') this.$emit('doback')

2
anrui-system-ui/src/api/system/menu/index.js

@ -50,7 +50,7 @@ export function IsEnable(data) {
url: '/portal/v1/sysmenu/updateIsEnable/' + data.sid+'/'+data.isEnable, url: '/portal/v1/sysmenu/updateIsEnable/' + data.sid+'/'+data.isEnable,
method: 'POST', method: 'POST',
/* data: qs.stringify(data),*/ /* data: qs.stringify(data),*/
headers: {'Content-Type': 'application/json', headers:{'Content-Type':'application/json',
'token':tokens 'token':tokens
} }
}) })

5
anrui-system-ui/src/layout/components/Navbar.vue

@ -9,7 +9,7 @@
<span class="backToHome" @click="logout"><i class="el-icon-back"></i>返回首页</span> <span class="backToHome" @click="logout"><i class="el-icon-back"></i>返回首页</span>
</div> </div>
</div> </div>
<el-footer class="footer" height="40px">Copyright © 2021 安瑞集团 All Rights Reserved</el-footer> <el-footer class="footer" height="40px">Copyright © {{ year }} 安瑞集团 All Rights Reserved</el-footer>
</div> </div>
</template> </template>
@ -20,12 +20,15 @@ export default {
Orgname:'', Orgname:'',
departmentName:'', departmentName:'',
name:'', name:'',
year:''
} }
}, },
mounted(){ mounted(){
this.Orgname = window.sessionStorage.getItem('Orgname') this.Orgname = window.sessionStorage.getItem('Orgname')
this.departmentName = window.sessionStorage.getItem('departmentName') this.departmentName = window.sessionStorage.getItem('departmentName')
this.name = window.sessionStorage.getItem('name') this.name = window.sessionStorage.getItem('name')
var nowDate = new Date()
this.year = nowDate.getFullYear()
}, },
methods: { methods: {
logout() { logout() {

1
anrui-system-ui/src/layout/components/Sidebar/SidebarItem.vue

@ -94,3 +94,4 @@ export default {
} }
} }
</script> </script>

21
anrui-system-ui/src/layout/components/Sidebar/index.vue

@ -138,8 +138,21 @@
} }
} }
</script> </script>
<style scoped="scoped"> <style scoped>
/deep/ .scrollbar-wrapper { /deep/ .el-submenu__title {
padding-bottom: 40px; height: 40px !important;
} line-height: 40px !important;
font-size: 16px!important;
}
/deep/ .el-submenu .el-menu-item {
height: 40px !important;
line-height: 40px !important;
}
/deep/ .el-menu-item {
height: 40px !important;
line-height: 40px !important;
font-size: 16px!important;
}
</style> </style>

17
anrui-system-ui/src/layout/components/TagsView/index.vue

@ -25,15 +25,15 @@
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
</div>--> </div>-->
<!--
<ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu"> <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
<li @click="refreshSelectedTag(selectedTag)">刷新</li> <li @click="refreshSelectedTag(selectedTag)">刷新</li>
<li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)">关闭</li> <li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)">关闭</li>
<li @click="closeOthersTags">关闭其他</li> <li @click="closeOthersTags">关闭其他</li>
<li @click="closeAllTags(selectedTag)">关闭所有</li> <li @click="closeAllTags(selectedTag)">关闭所有</li>
</ul>--> </ul>
</div> </div>
</template> </template>
@ -140,7 +140,8 @@ export default {
const { fullPath } = view const { fullPath } = view
this.$nextTick(() => { this.$nextTick(() => {
this.$router.replace({ this.$router.replace({
path: '/redirect' + fullPath path: fullPath
// path: '/redirect' + fullPath
}) })
}) })
}) })
@ -153,8 +154,8 @@ export default {
} else { } else {
this.$router.push('/index'); this.$router.push('/index');
} }
// this.$store.dispatch('tagsView/delView', view).then(({ visitedViews }) => { // this.$store.dispatch('tagsView/delView', view).then(({ visitedViews }) => {
// if (this.isActive(view)) { // if (this.isActive(view)) {
// this.toLastView(visitedViews, view) // this.toLastView(visitedViews, view)
@ -201,7 +202,7 @@ export default {
} else { } else {
this.left = left this.left = left
} }
this.top = e.clientY this.top = e.clientY - 32
this.visible = true this.visible = true
this.selectedTag = tag this.selectedTag = tag
}, },

6
anrui-system-ui/src/store/modules/user.js

@ -28,7 +28,7 @@ const actions = {
login(userInfo).then(response => { login(userInfo).then(response => {
const { data } = response const { data } = response
commit('SET_TOKEN', data.token) commit('SET_TOKEN', data.token)
setStorage(data.token) setStorage(data.token)
let user = { let user = {
roleSid: data.roleSid, roleSid: data.roleSid,
name: data.name, name: data.name,
@ -39,13 +39,15 @@ const actions = {
userSid: data.sid, userSid: data.sid,
orgSid: data.organizationSid, orgSid: data.organizationSid,
Orgname: data.organizationName, Orgname: data.organizationName,
dwjb: data.dwjb dwjb: data.dwjb,
pNameAndDepartmentNameAndPostName:data.pNameAndDepartmentNameAndPostName
} }
commit('SET_UESRINFO', user) commit('SET_UESRINFO', user)
window.sessionStorage.setItem('userSid', user.userSid); window.sessionStorage.setItem('userSid', user.userSid);
window.sessionStorage.setItem('Orgname', user.Orgname); window.sessionStorage.setItem('Orgname', user.Orgname);
window.sessionStorage.setItem('departmentName', user.departmentName); window.sessionStorage.setItem('departmentName', user.departmentName);
window.sessionStorage.setItem('name', user.name); window.sessionStorage.setItem('name', user.name);
window.sessionStorage.setItem('pNameAndDepartmentNameAndPostName', user.pNameAndDepartmentNameAndPostName);
resolve(data) resolve(data)
}).catch(error => { }).catch(error => {
reject(error) reject(error)

13
anrui-system-ui/src/views/Home/Home.vue

@ -3,9 +3,9 @@
<div class="header"> <div class="header">
<p class="title"><img src="../../assets/loginImg/logo.png"/>安瑞集团信息化平台</p> <p class="title"><img src="../../assets/loginImg/logo.png"/>安瑞集团信息化平台</p>
<div class="head_info"> <div class="head_info">
<p>{{Orgname}},</p> <!-- <p>{{Orgname}},</p>-->
<!--<p>{{$store.getters.userInfo.Orgname}}</p>--> <!--<p>{{$store.getters.userInfo.Orgname}}</p>-->
<p>欢迎{{name}}</p> <p>欢迎{{pNameAndDepartmentNameAndPostName}} {{name}}</p>
<!--<img src="@/assets/images/info.png" />--> <!--<img src="@/assets/images/info.png" />-->
<p @click="logout()" class="dy"><img src="@/assets/images/dy.png"/></p> <p @click="logout()" class="dy"><img src="@/assets/images/dy.png"/></p>
</div> </div>
@ -72,7 +72,7 @@
<p>{{item.title}}</p> <p>{{item.title}}</p>
</li> </li>
</ul> </ul>
<p class="copy">Copyright © 2021 安瑞集团 All Rights Reserved</p> <p class="copy">Copyright © {{ year }} 安瑞集团 All Rights Reserved</p>
</div> </div>
<!--<ul class="nav-box">--> <!--<ul class="nav-box">-->
<!--<li style="background-color: #e87861;" @click="toNavbar('http://39.104.100.138:8081/')"> <!--<li style="background-color: #e87861;" @click="toNavbar('http://39.104.100.138:8081/')">
@ -204,7 +204,9 @@
userInfo: {}, userInfo: {},
Orgname: '', Orgname: '',
departmentName: '', departmentName: '',
name: '' name: '',
pNameAndDepartmentNameAndPostName:'',
year:''
} }
}, },
beforeCreate() { beforeCreate() {
@ -213,7 +215,10 @@
mounted() { mounted() {
this.Orgname = window.sessionStorage.getItem('Orgname') this.Orgname = window.sessionStorage.getItem('Orgname')
this.departmentName = window.sessionStorage.getItem('departmentName') this.departmentName = window.sessionStorage.getItem('departmentName')
this.pNameAndDepartmentNameAndPostName = window.sessionStorage.getItem('pNameAndDepartmentNameAndPostName')
this.name = window.sessionStorage.getItem('name') this.name = window.sessionStorage.getItem('name')
var nowDate = new Date()
this.year = nowDate.getFullYear()
// sourcesofrole({ psid: '0', roleSid: this.$store.getters.userInfo.roleSid }).then(res => { // sourcesofrole({ psid: '0', roleSid: this.$store.getters.userInfo.roleSid }).then(res => {
// this.menus = res.data // this.menus = res.data
// }) // })

2
anrui-system-ui/src/views/RoleAdminister/RoleAdminister.vue

@ -158,7 +158,7 @@
<td> <td>
<div style="height:230px;line-height:120px;overflow:auto;overflow-x:hidden;"> <div style="height:230px;line-height:120px;overflow:auto;overflow-x:hidden;">
<el-tree v-loading="loading" :data="treedata" ref="Tree" show-checkbox accordion node-key="sid" <el-tree v-loading="loading" :data="treedata" ref="Tree" show-checkbox accordion node-key="sid"
:default-expand-all='true' :check-strictly="true" :default-expand-all='true'
:default-checked-keys="checkedId" :default-checked-keys="checkedId"
:props="defaultProps" :props="defaultProps"
@check-change="checkchange"> @check-change="checkchange">

Loading…
Cancel
Save