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. 5
      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',
'menu',
'setting',
'userInfo'
]),
validSidebar() {
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: [],
methods: {
//

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

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

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

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

5
src/page/login/userlogin.vue

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

5
src/store/modules/common.js

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

5
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 { mapGetters } from 'vuex';
import { getDictionaryBiz } from '@/api/system/dict';
export default {
data() {
return {
@ -506,7 +505,7 @@ export default {
this.queryDictionary();
this.init();
this.onLoad(this.page);
/**
* 初始化获取本地缓存的编辑隐藏的列表
* 固定搭配不能更改
@ -527,7 +526,7 @@ export default {
// this.columnListedit=JSON.parse(JSON.stringify(this.columnList))
},
computed: {
...mapGetters(['permission']),
...mapGetters(['permission','setting']),
ids() {
let ids = [];
this.selectionList.forEach(ele => {

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

@ -1,8 +1,8 @@
<template>
<div>
<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: 30%;width: 300px;height: 150px" @click="ddd">外协</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: 100px;height: 40px" @click="ddd">外协</el-button>
</el-row>
</div>
<div style="border: 3px solid pink;margin: 2%" v-if="aaa">

Loading…
Cancel
Save