|
@@ -418,7 +418,8 @@ import {
|
|
getListOrderTrack
|
|
getListOrderTrack
|
|
} from '@/api/supply/pickup'
|
|
} from '@/api/supply/pickup'
|
|
import { getDictList } from '@/api/common'
|
|
import { getDictList } from '@/api/common'
|
|
-
|
|
|
|
|
|
+import { mapGetters } from 'vuex'
|
|
|
|
+
|
|
export default {
|
|
export default {
|
|
name: 'PickupForm',
|
|
name: 'PickupForm',
|
|
componentName: 'PickupForm',
|
|
componentName: 'PickupForm',
|
|
@@ -500,7 +501,8 @@ export default {
|
|
hideSidebar: !this.sidebar.opened,
|
|
hideSidebar: !this.sidebar.opened,
|
|
openSidebar: this.sidebar.opened
|
|
openSidebar: this.sidebar.opened
|
|
}
|
|
}
|
|
- }
|
|
|
|
|
|
+ },
|
|
|
|
+ ...mapGetters(['userInfo'])
|
|
// comDisabled() {
|
|
// comDisabled() {
|
|
// return id => {
|
|
// return id => {
|
|
// if (this.isFront === false && id === '1574563841707114498') {
|
|
// if (this.isFront === false && id === '1574563841707114498') {
|
|
@@ -655,10 +657,9 @@ export default {
|
|
// 获取提货方式列表
|
|
// 获取提货方式列表
|
|
getPickupWayList() {
|
|
getPickupWayList() {
|
|
getDictList({ sysDictEnum: 'PICK' }).then(res => {
|
|
getDictList({ sysDictEnum: 'PICK' }).then(res => {
|
|
- const localData = JSON.parse(localStorage.getItem('supply_user'))
|
|
|
|
- this.frontPickType = localData.frontPickType
|
|
|
|
- this.isFront = localData.isFront
|
|
|
|
- this.isPick = localData.isPick
|
|
|
|
|
|
+ this.frontPickType = this.userInfo.frontPickType
|
|
|
|
+ this.isFront = this.userInfo.isFront
|
|
|
|
+ this.isPick = this.userInfo.isPick
|
|
res.data.forEach(k => {
|
|
res.data.forEach(k => {
|
|
if (this.frontPickType) {
|
|
if (this.frontPickType) {
|
|
if (!this.isFront && k.dictCode == 1) {
|
|
if (!this.isFront && k.dictCode == 1) {
|