Browse Source

更新方法

dev-warehouse
zhangsiyu 2 years ago
parent
commit
3461834af9
  1. 13
      src/page/index/index.vue
  2. 5
      src/page/index/top/index.vue
  3. 2
      src/page/index/top/top-theme.vue
  4. 5
      src/page/login/userlogin.vue
  5. 5
      src/store/modules/common.js
  6. 3
      src/views/distribution/signfor/distributionSignfor.vue
  7. 4
      src/views/distribution/turndelivery/deliveryInfo.vue

13
src/page/index/index.vue

@ -62,6 +62,7 @@ export default {
'isSearch', 'isSearch',
'menu', 'menu',
'setting', 'setting',
'userInfo'
]), ]),
validSidebar() { validSidebar() {
return !( return !(
@ -69,6 +70,18 @@ export default {
); );
}, },
}, },
mounted() {
if (this.userInfo.tenant_id == '000000') {
let obj = JSON.parse(JSON.stringify(this.setting));
obj.debug = true;
this.$store.commit('SERTING', obj);
} else {
let obj = JSON.parse(JSON.stringify(this.setting));
obj.debug = false;
this.$store.commit('SERTING', obj);
}
// console.log(obj)
},
props: [], props: [],
methods: { methods: {
// //

5
src/page/index/top/index.vue

@ -17,7 +17,7 @@
<div v-if="setting.lock" class="top-bar__item"> <div v-if="setting.lock" class="top-bar__item">
<top-lock></top-lock> <top-lock></top-lock>
</div> </div>
<div v-if="setting.theme" class="top-bar__item"> <div v-if="setting.theme" class="">
<top-theme></top-theme> <top-theme></top-theme>
</div> </div>
<div class="top-bar__item"> <div class="top-bar__item">
@ -82,6 +82,9 @@ export default {
name: 'top', name: 'top',
data() { data() {
return {}; return {};
},
mounted(){
}, },
filters: {}, filters: {},
created() {}, created() {},

2
src/page/index/top/top-theme.vue

@ -11,7 +11,7 @@
</el-dialog> </el-dialog>
<span> <span>
<i class="icon-zhuti" @click="open"></i> <!-- <i class="icon-zhuti" @click="open"></i> -->
</span> </span>
</div> </div>
</template> </template>

5
src/page/login/userlogin.vue

@ -198,7 +198,7 @@ export default {
}, },
}, },
computed: { computed: {
...mapGetters(['tagWel', 'userInfo']), ...mapGetters(['tagWel', 'userInfo','setting']),
}, },
props: [], props: [],
methods: { methods: {
@ -226,6 +226,8 @@ export default {
}, },
handleLogin() { handleLogin() {
this.$refs.loginForm.validate(valid => { this.$refs.loginForm.validate(valid => {
// console.log(valid)
// return
if (valid) { if (valid) {
const loading = this.$loading({ const loading = this.$loading({
lock: true, lock: true,
@ -238,6 +240,7 @@ export default {
if (this.website.switchMode) { if (this.website.switchMode) {
const deptId = this.userInfo.dept_id; const deptId = this.userInfo.dept_id;
const roleId = this.userInfo.role_id; const roleId = this.userInfo.role_id;
if (deptId.includes(',') || roleId.includes(',')) { if (deptId.includes(',') || roleId.includes(',')) {
this.loginForm.deptId = deptId; this.loginForm.deptId = deptId;
this.loginForm.roleId = roleId; this.loginForm.roleId = roleId;

5
src/store/modules/common.js

@ -10,12 +10,15 @@ const common = {
isSearch: false, isSearch: false,
isRefresh: true, isRefresh: true,
isLock: getStore({ name: 'isLock' }), isLock: getStore({ name: 'isLock' }),
themeName: getStore({ name: 'themeName' }) || 'theme-white', themeName: getStore({ name: 'themeName' }) || 'theme-hey',
lockPasswd: getStore({ name: 'lockPasswd' }) || '', lockPasswd: getStore({ name: 'lockPasswd' }) || '',
website: website, website: website,
setting: website.setting, setting: website.setting,
}, },
mutations: { mutations: {
SERTING:(state,newconfig)=>{
state.setting=newconfig
},
SET_LANGUAGE: (state, language) => { SET_LANGUAGE: (state, language) => {
state.language = language; state.language = language;
setStore({ setStore({

3
src/views/distribution/signfor/distributionSignfor.vue

@ -230,7 +230,6 @@ import { getList, getDetail, add, update, remove } from '@/api/distribution/dist
import option from '@/option/distribution/distributionSignfor'; import option from '@/option/distribution/distributionSignfor';
import { mapGetters } from 'vuex'; import { mapGetters } from 'vuex';
import { getDictionaryBiz } from '@/api/system/dict'; import { getDictionaryBiz } from '@/api/system/dict';
export default { export default {
data() { data() {
return { return {
@ -527,7 +526,7 @@ export default {
// this.columnListedit=JSON.parse(JSON.stringify(this.columnList)) // this.columnListedit=JSON.parse(JSON.stringify(this.columnList))
}, },
computed: { computed: {
...mapGetters(['permission']), ...mapGetters(['permission','setting']),
ids() { ids() {
let ids = []; let ids = [];
this.selectionList.forEach(ele => { this.selectionList.forEach(ele => {

4
src/views/distribution/turndelivery/deliveryInfo.vue

@ -1,8 +1,8 @@
<template> <template>
<div> <div>
<el-row> <el-row>
<el-button type="primary" plain style="margin-left: 15%;width: 300px;height: 150px" @click="ccc">自主配送</el-button> <el-button type="primary" plain style="margin-left: 15%;width: 100px;height: 40px" @click="ccc">自主配送</el-button>
<el-button type="primary" plain style="margin-left: 30%;width: 300px;height: 150px" @click="ddd">外协</el-button> <el-button type="primary" plain style="margin-left: 30%;width: 100px;height: 40px" @click="ddd">外协</el-button>
</el-row> </el-row>
</div> </div>
<div style="border: 3px solid pink;margin: 2%" v-if="aaa"> <div style="border: 3px solid pink;margin: 2%" v-if="aaa">

Loading…
Cancel
Save