diff --git a/src/views/distribution/inventory/distributionStockListDiscuss.vue b/src/views/distribution/inventory/distributionStockListDiscuss.vue
index 66090cd9..099134ce 100644
--- a/src/views/distribution/inventory/distributionStockListDiscuss.vue
+++ b/src/views/distribution/inventory/distributionStockListDiscuss.vue
@@ -245,16 +245,18 @@ export default {
checkarr: [],
fixed: false,
sortable: true,
- },{
- prop: 'mallName',
- label: '商城名称',
- type: 2,
- values: '',
- width: '180',
- checkarr: [],
- fixed: false,
- sortable: true,
- },{
+ },
+ // {
+ // prop: 'mallName',
+ // label: '商城名称',
+ // type: 2,
+ // values: '',
+ // width: '180',
+ // checkarr: [],
+ // fixed: false,
+ // sortable: true,
+ // },
+ {
prop: 'quantityStock',
label: '库存数量',
type: 1,
@@ -466,7 +468,7 @@ export default {
mounted () {
this.init();
this.onLoad(this.page);
- /**
+ /**
* 初始化获取本地缓存的编辑隐藏的列表
* 固定搭配，不能更改
*/
@@ -568,7 +570,7 @@ export default {
this.columnList = newarr;
this.$functions.setStorage(window.location.pathname+'sortlist', headarr);
}
-
+
},
selectionsc(value) {
console.log(value);
@@ -778,6 +780,7 @@ export default {
},
onLoad (page, params = {}) {
this.loading = true;
+ this.query.typeService = '1';
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data;
this.page.total = data.total;
diff --git a/src/views/distribution/inventory/distributionStockListMarket.vue b/src/views/distribution/inventory/distributionStockListMarket.vue
index 66090cd9..e138468f 100644
--- a/src/views/distribution/inventory/distributionStockListMarket.vue
+++ b/src/views/distribution/inventory/distributionStockListMarket.vue
@@ -189,16 +189,16 @@ export default {
fixed: false,
sortable: true,
},
- {
- prop: 'market',
- label: '商场',
- type: 2,
- values: '',
- width: '180',
- checkarr: [],
- fixed: false,
- sortable: true,
- },
+ // {
+ // prop: 'market',
+ // label: '商场',
+ // type: 2,
+ // values: '',
+ // width: '180',
+ // checkarr: [],
+ // fixed: false,
+ // sortable: true,
+ // },
{
prop: 'descriptionGoods',
label: '货物名称',
@@ -227,16 +227,18 @@ export default {
checkarr: [],
fixed: false,
sortable: true,
- },{
- prop: 'shop',
- label: '门店',
- type: 2,
- values: '',
- width: '180',
- checkarr: [],
- fixed: false,
- sortable: true,
- },{
+ },
+ // {
+ // prop: 'shop',
+ // label: '门店',
+ // type: 2,
+ // values: '',
+ // width: '180',
+ // checkarr: [],
+ // fixed: false,
+ // sortable: true,
+ // },
+ {
prop: 'storageLocation',
label: '库位信息',
type: 2,
@@ -245,16 +247,18 @@ export default {
checkarr: [],
fixed: false,
sortable: true,
- },{
- prop: 'mallName',
- label: '商城名称',
- type: 2,
- values: '',
- width: '180',
- checkarr: [],
- fixed: false,
- sortable: true,
- },{
+ },
+ // {
+ // prop: 'mallName',
+ // label: '商城名称',
+ // type: 2,
+ // values: '',
+ // width: '180',
+ // checkarr: [],
+ // fixed: false,
+ // sortable: true,
+ // },
+ {
prop: 'quantityStock',
label: '库存数量',
type: 1,
@@ -385,16 +389,18 @@ export default {
checkarr: [],
fixed: false,
sortable: true,
- },{
- prop: 'shoppingMall',
- label: '所属商场',
- type: 2,
- values: '',
- width: '150',
- checkarr: [],
- fixed: false,
- sortable: true,
- },{
+ },
+ // {
+ // prop: 'shoppingMall',
+ // label: '所属商场',
+ // type: 2,
+ // values: '',
+ // width: '150',
+ // checkarr: [],
+ // fixed: false,
+ // sortable: true,
+ // },
+ {
prop: 'warehouseName',
label: '仓库名称',
type: 2,
@@ -466,7 +472,7 @@ export default {
mounted () {
this.init();
this.onLoad(this.page);
- /**
+ /**
* 初始化获取本地缓存的编辑隐藏的列表
* 固定搭配，不能更改
*/
@@ -568,7 +574,7 @@ export default {
this.columnList = newarr;
this.$functions.setStorage(window.location.pathname+'sortlist', headarr);
}
-
+
},
selectionsc(value) {
console.log(value);
@@ -778,6 +784,7 @@ export default {
},
onLoad (page, params = {}) {
this.loading = true;
+ this.query.typeService = '2';
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data;
this.page.total = data.total;
diff --git a/src/views/distribution/inventory/distributionStockListSelf.vue b/src/views/distribution/inventory/distributionStockListSelf.vue
index 66090cd9..084d1d8e 100644
--- a/src/views/distribution/inventory/distributionStockListSelf.vue
+++ b/src/views/distribution/inventory/distributionStockListSelf.vue
@@ -189,16 +189,16 @@ export default {
fixed: false,
sortable: true,
},
- {
- prop: 'market',
- label: '商场',
- type: 2,
- values: '',
- width: '180',
- checkarr: [],
- fixed: false,
- sortable: true,
- },
+ // {
+ // prop: 'market',
+ // label: '商场',
+ // type: 2,
+ // values: '',
+ // width: '180',
+ // checkarr: [],
+ // fixed: false,
+ // sortable: true,
+ // },
{
prop: 'descriptionGoods',
label: '货物名称',
@@ -227,16 +227,18 @@ export default {
checkarr: [],
fixed: false,
sortable: true,
- },{
- prop: 'shop',
- label: '门店',
- type: 2,
- values: '',
- width: '180',
- checkarr: [],
- fixed: false,
- sortable: true,
- },{
+ },
+ // {
+ // prop: 'shop',
+ // label: '门店',
+ // type: 2,
+ // values: '',
+ // width: '180',
+ // checkarr: [],
+ // fixed: false,
+ // sortable: true,
+ // },
+ {
prop: 'storageLocation',
label: '库位信息',
type: 2,
@@ -245,16 +247,18 @@ export default {
checkarr: [],
fixed: false,
sortable: true,
- },{
- prop: 'mallName',
- label: '商城名称',
- type: 2,
- values: '',
- width: '180',
- checkarr: [],
- fixed: false,
- sortable: true,
- },{
+ },
+ // {
+ // prop: 'mallName',
+ // label: '商城名称',
+ // type: 2,
+ // values: '',
+ // width: '180',
+ // checkarr: [],
+ // fixed: false,
+ // sortable: true,
+ // },
+ {
prop: 'quantityStock',
label: '库存数量',
type: 1,
@@ -385,16 +389,18 @@ export default {
checkarr: [],
fixed: false,
sortable: true,
- },{
- prop: 'shoppingMall',
- label: '所属商场',
- type: 2,
- values: '',
- width: '150',
- checkarr: [],
- fixed: false,
- sortable: true,
- },{
+ },
+ // {
+ // prop: 'shoppingMall',
+ // label: '所属商场',
+ // type: 2,
+ // values: '',
+ // width: '150',
+ // checkarr: [],
+ // fixed: false,
+ // sortable: true,
+ // },
+ {
prop: 'warehouseName',
label: '仓库名称',
type: 2,
@@ -466,7 +472,7 @@ export default {
mounted () {
this.init();
this.onLoad(this.page);
- /**
+ /**
* 初始化获取本地缓存的编辑隐藏的列表
* 固定搭配，不能更改
*/
@@ -568,7 +574,7 @@ export default {
this.columnList = newarr;
this.$functions.setStorage(window.location.pathname+'sortlist', headarr);
}
-
+
},
selectionsc(value) {
console.log(value);
@@ -778,6 +784,7 @@ export default {
},
onLoad (page, params = {}) {
this.loading = true;
+ this.query.typeService = '3';
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data;
this.page.total = data.total;
diff --git a/src/views/distribution/stockup/distributionStockup.vue b/src/views/distribution/stockup/distributionStockup.vue
index 939d5d06..b0c4f2ad 100644
--- a/src/views/distribution/stockup/distributionStockup.vue
+++ b/src/views/distribution/stockup/distributionStockup.vue
@@ -30,8 +30,8 @@
</div>
<!-- 头部右侧按钮模块 -->
<div class="avue-crud__right">
- <!-- <el-button icon="el-icon-search" @click="onLoad" >全部</el-button>
- <el-button icon="el-icon-refresh" @click="getStockUp('2')" >已备货</el-button>
+ <!-- <el-button icon="el-icon-search" @click="onLoad" >全部</el-button>-->
+<!-- <el-button icon="el-icon-refresh" @click="getStockUp('2')" >已备货</el-button>
<el-button icon="el-icon-search" @click="getStockUp('1')" >待备货</el-button>-->
<el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
@@ -95,8 +95,8 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="备货区域" :label-width="formLabelWidth" @change="getForklift($event,'3')">
- <el-select v-model="form.goodsAreaId" clearable placeholder="请选择备货区编号">
+ <el-form-item label="备货区域" :label-width="formLabelWidth" >
+ <el-select v-model="form.goodsAreaId" clearable placeholder="请选择备货区编号" @change="getForklift($event,'3')">
<el-option
v-for="item in goodsAreaIdData"
:key="item.dictKey"
@@ -211,6 +211,7 @@ import option from "@/option/distribution/distributionStockup";
import { mapGetters } from "vuex";
import { getListTeam } from '@/api/basicdata/basicdataTeamGroup';
import dayjs from 'dayjs';
+import { getDictionaryBiz } from '@/api/system/dict';
export default {
data () {
@@ -247,19 +248,36 @@ export default {
sortable: true,
},
{
- prop: 'stockupStatus',
+ prop: 'stockupStatusName',
label: '备货状态',
type: 3,
values: '',
width: '180',
- checkarr: [],
+ checkarr: [
+ {
+ label: '未备货',
+ value: '1',
+ },
+ {
+ label: '待备货',
+ value: '2',
+ },
+ {
+ label: '备货中',
+ value: '3',
+ },
+ {
+ label: '已备货',
+ value: '4',
+ },
+ ],
fixed: false,
sortable: true,
},
{
prop: 'stockupArea',
label: '备货区',
- type: 3,
+ type: 2,
values: '',
width: '180',
checkarr: [],
@@ -267,12 +285,21 @@ export default {
sortable: true,
},
{
- prop: 'assignStatus',
+ prop: 'assignStatusName',
label: '指派状态',
type: 3,
values: '',
width: '150',
- checkarr: [],
+ checkarr: [
+ {
+ label: '未指派',
+ value: '1',
+ },
+ {
+ label: '已指派',
+ value: '2',
+ },
+ ],
fixed: false,
sortable: true,
},
@@ -286,21 +313,31 @@ export default {
fixed: false,
sortable: true,
},
+ // {
+ // prop: 'goodsAreaId',
+ // label: '备货区编号',
+ // type: 2,
+ // values: '',
+ // width: '150',
+ // checkarr: [],
+ // fixed: false,
+ // sortable: true,
+ // head: true,
+ // },
{
- prop: 'goodsAreaId',
- label: '备货区编号',
+ prop: 'forkliftName',
+ label: '叉车司机',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
- head: true,
},
{
- prop: 'forklift',
- label: '叉车司机',
- type: 2,
+ prop: 'typeServiceName',
+ label: '服务类型',
+ type: 3,
values: '',
width: '150',
checkarr: [],
@@ -308,7 +345,7 @@ export default {
sortable: true,
},
{
- prop: 'loader',
+ prop: 'loaderName',
label: '装卸班组',
type: 2,
values: '',
@@ -383,12 +420,12 @@ export default {
forkliftData: [],
loaderData: [],
goodsAreaIdData: [],
+ distributionType: [],
deptId: '',
}
},
mounted () {
this.init();
- this.onLoad(this.page);
/**
* 初始化获取本地缓存的编辑隐藏的列表
* 固定搭配，不能更改
@@ -480,7 +517,16 @@ export default {
},
selectsc(index, row) {
console.log(index, row);
- this.query[row.prop] = index;
+ if(row.prop =='typeServiceName'){
+ this.query['typeService'] = index;
+ }else if(row.prop =='stockupStatusName'){
+ this.query["stockupStatus"] = index;
+ }else if(row.prop =='assignStatusName'){
+ this.query["assignStatus"] = index;
+ }else{
+ this.query[row.prop] = index;
+ }
+ // this.query[row.prop] = index;
this.onLoad(this.page);
},
timesc(index, row) {
@@ -496,7 +542,17 @@ export default {
},
inputsc(index, row) {
console.log(index, row);
- this.query[row.prop] = index;
+/* if(row.prop =='typeServiceName'){
+ this.query['typeService'] = index;
+ }else if(row.prop =='stockupStatusName'){
+ this.query["stockupStatus"] = index;
+ }else if(row.prop =='assignStatusName'){
+ this.query["assignStatus"] = index;
+ }else{
+ this.query[row.prop] = index;
+ }*/
+ this.query[row.prop] = index;
+
this.onLoad(this.page);
},
//查询备货
@@ -611,16 +667,27 @@ export default {
this.$message.warning("请选择至少一条数据");
return;
}
- this.dialogFormCustomer = true;
- this.getFork();
- this.getTeam()
-
+ let a = false ;
+ this.selectionList.some(i =>{
+ if(i.assignStatus == "2"){
+ a = true;
+ return;
+ }
+ })
+ // = this.selectionList.findIndex(i => i.assignStatus == 2);
+ if(!a){
+ this.dialogFormCustomer = true;
+ this.getFork();
+ this.getTeam()
+ }else{
+ this.$message.warning("已指派，请勿重复指派！！！")
+ }
},
//确定指派
callFordelivery(){
this.form.ids = this.ids;
console.log("数据》》》",this.form);
- /* addAssign(this.form).then(res =>{
+ addAssign(this.form).then(res =>{
this.$message({
type: "success",
message: "操作成功！"
@@ -628,10 +695,19 @@ export default {
this.onLoad(this.page);
this.dialogFormCustomer = false;
})
-*/
},
init () {
this.height = this.setPx(document.body.clientHeight - 340);
+ getDictionaryBiz('distribution_type').then(res => {
+ // console.log("8908098080",res.data.data);
+ this.distributionType = res.data.data;
+ this.columnList[8].checkarr =res.data.data.map(item=>{
+ item.value=item.dictKey
+ item.label=item.dictValue
+ return item
+ });
+ });
+ this.onLoad(this.page);
},
searchHide () {
this.search = !this.search;
@@ -756,20 +832,22 @@ export default {
let a = await getUser(i.forkliftId);
i.forkliftId =a.data.data.name;
}*/
-
+ let s =this.distributionType.find(d => d.dictKey == i.typeService);
+ console.log("sssss",s);
+ i.typeServiceName = s.dictValue;
i.loader = i.groupName;
i.stockupArea = i.headline;
if(i.assignStatus == '2'){
- i.assignStatus = '已指派';
+ i.assignStatusName = '已指派';
}else{
- i.assignStatus = '未指派';
+ i.assignStatusName = '未指派';
}
if(i.stockupStatus == '2'){
- i.stockupStatus = '待备货';
+ i.stockupStatusName = '待备货';
}else if(i.stockupStatus == '3'){
- i.stockupStatus = '已备货';
+ i.stockupStatusName = '已备货';
}else{
- i.stockupStatus = '未备货';
+ i.stockupStatusName = '未备货';
}
});
this.selectionClear();
diff --git a/src/views/distribution/stockup/distributionStockupDiscuss.vue b/src/views/distribution/stockup/distributionStockupDiscuss.vue
index 5c260748..319fa96e 100644
--- a/src/views/distribution/stockup/distributionStockupDiscuss.vue
+++ b/src/views/distribution/stockup/distributionStockupDiscuss.vue
@@ -1,8 +1,8 @@
<template>
<basic-container>
<div class="avue-crud">
- <el-row :hidden="!search" style="padding: 6px 18px">
- <!-- 查询模块 -->
+<!-- <el-row :hidden="!search" style="padding: 6px 18px">
+ <!– 查询模块 –>
<el-form :inline="true" :model="query">
<el-form-item label="备货状态:">
<el-input v-model="query.stockupStatus" placeholder="请输入备货状态"></el-input>
@@ -16,13 +16,13 @@
placeholder="请输入指派状态;1-未指派、2-已指派"
></el-input>
</el-form-item>
- <!-- 查询按钮 -->
+ <!– 查询按钮 –>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
<el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
</el-form-item>
</el-form>
- </el-row>
+ </el-row>-->
<el-row>
<div class="avue-crud__header">
<!-- 头部左侧按钮模块 -->
@@ -37,12 +37,13 @@
</div>
<!-- 头部右侧按钮模块 -->
<div class="avue-crud__right">
- <el-button icon="el-icon-search" @click="onLoad">全部</el-button>
- <el-button icon="el-icon-refresh" @click="getStockUp('2')">已备货</el-button>
+<!-- <el-button icon="el-icon-search" @click="onLoad">全部</el-button>-->
+ <!-- <el-button icon="el-icon-refresh" @click="getStockUp('2')">已备货</el-button>
<el-button icon="el-icon-search" @click="getStockUp('1')">待备货</el-button>
-
- <!-- <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>-->
- <!-- <el-button icon="el-icon-search" @click="searchHide" circle></el-button>-->
+-->
+ <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
+ <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
+ <el-button icon="el-icon-search" @click="searchHide" circle></el-button>
</div>
</div>
</el-row>
@@ -438,7 +439,7 @@ export default {
mounted() {
this.init();
this.onLoad(this.page);
- /**
+ /**
* 初始化获取本地缓存的编辑隐藏的列表
* 固定搭配，不能更改
*/
@@ -540,7 +541,7 @@ export default {
this.columnList = newarr;
this.$functions.setStorage(window.location.pathname+'sortlist', headarr);
}
-
+
},
selectionsc(value) {
console.log(value);
@@ -806,11 +807,11 @@ export default {
this.page.total = data.total;
this.data = data.records;
this.data.forEach(async i => {
- if (i.forklift != '-1') {
+ /*if (i.forklift != '-1') {
console.log('i==', i);
let a = await getUser(i.forklift);
i.forklift = a.data.data.name;
- }
+ }*/
i.loader = i.groupName;
i.stockupArea = i.headline;
diff --git a/src/views/distribution/stockup/distributionStockupMarket.vue b/src/views/distribution/stockup/distributionStockupMarket.vue
index c1ddb0bc..3fc7308f 100644
--- a/src/views/distribution/stockup/distributionStockupMarket.vue
+++ b/src/views/distribution/stockup/distributionStockupMarket.vue
@@ -1,8 +1,8 @@
<template>
<basic-container>
<div class="avue-crud">
- <el-row :hidden="!search" style="padding:6px 18px">
- <!-- 查询模块 -->
+ <!--<el-row :hidden="!search" style="padding:6px 18px">
+ <!– 查询模块 –>
<el-form :inline="true" :model="query">
<el-form-item label="备货状态:">
<el-input v-model="query.stockupStatus" placeholder="请输入备货状态"></el-input>
@@ -13,13 +13,13 @@
<el-form-item label="指派状态;1-未指派、2-已指派:">
<el-input v-model="query.assignStatus" placeholder="请输入指派状态;1-未指派、2-已指派"></el-input>
</el-form-item>
- <!-- 查询按钮 -->
+ <!– 查询按钮 –>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
<el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
</el-form-item>
</el-form>
- </el-row>
+ </el-row>-->
<el-row>
<div class="avue-crud__header">
<!-- 头部左侧按钮模块 -->
@@ -30,12 +30,13 @@
</div>
<!-- 头部右侧按钮模块 -->
<div class="avue-crud__right">
- <el-button icon="el-icon-search" @click="onLoad" >全部</el-button>
- <el-button icon="el-icon-refresh" @click="getStockUp('2')" >已备货</el-button>
- <el-button icon="el-icon-search" @click="getStockUp('1')" >待备货</el-button>
+<!-- <el-button icon="el-icon-search" @click="onLoad" >全部</el-button>-->
+<!-- <el-button icon="el-icon-refresh" @click="getStockUp('2')" >已备货</el-button>
+ <el-button icon="el-icon-search" @click="getStockUp('1')" >待备货</el-button>-->
-<!-- <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>-->
-<!-- <el-button icon="el-icon-search" @click="searchHide" circle></el-button>-->
+ <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
+ <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
+ <el-button icon="el-icon-search" @click="searchHide" circle></el-button>
</div>
</div>
</el-row>
@@ -387,7 +388,7 @@ export default {
mounted () {
this.init();
this.onLoad(this.page);
- /**
+ /**
* 初始化获取本地缓存的编辑隐藏的列表
* 固定搭配，不能更改
*/
@@ -419,9 +420,9 @@ export default {
showdrawer(value){
this.drawerShow=value
},
- /**
+ /**
* 弹窗的勾选回调，用于更改头部数组
- * 固定搭配，只需要更换 columnList
+ * 固定搭配，只需要更换 columnList
*/
setnewcolum(newarr, headarr) {
// console.log(newarr,'+++++++++++')
@@ -691,11 +692,11 @@ export default {
this.page.total = data.total;
this.data = data.records;
this.data.forEach(async i =>{
- if(i.forklift != "-1"){
+ /*if(i.forklift != "-1"){
console.log("i==",i);
let a = await getUser(i.forklift);
i.forklift =a.data.data.name;
- }
+ }*/
i.loader = i.groupName;
i.stockupArea = i.headline;
diff --git a/src/views/distribution/stockup/distributionStockupSelf.vue b/src/views/distribution/stockup/distributionStockupSelf.vue
index 3eeea3fd..dbd16e63 100644
--- a/src/views/distribution/stockup/distributionStockupSelf.vue
+++ b/src/views/distribution/stockup/distributionStockupSelf.vue
@@ -1,8 +1,8 @@
<template>
<basic-container>
<div class="avue-crud">
- <el-row :hidden="!search" style="padding:6px 18px">
- <!-- 查询模块 -->
+ <!-- <el-row :hidden="!search" style="padding:6px 18px">
+ <!– 查询模块 –>
<el-form :inline="true" :model="query">
<el-form-item label="备货状态:">
<el-input v-model="query.stockupStatus" placeholder="请输入备货状态"></el-input>
@@ -13,13 +13,13 @@
<el-form-item label="指派状态;1-未指派、2-已指派:">
<el-input v-model="query.assignStatus" placeholder="请输入指派状态;1-未指派、2-已指派"></el-input>
</el-form-item>
- <!-- 查询按钮 -->
+ <!– 查询按钮 –>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
<el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
</el-form-item>
</el-form>
- </el-row>
+ </el-row>-->
<el-row>
<div class="avue-crud__header">
<!-- 头部左侧按钮模块 -->
@@ -30,12 +30,13 @@
</div>
<!-- 头部右侧按钮模块 -->
<div class="avue-crud__right">
- <el-button icon="el-icon-search" @click="onLoad" >全部</el-button>
- <el-button icon="el-icon-refresh" @click="getStockUp('2')" >已备货</el-button>
- <el-button icon="el-icon-search" @click="getStockUp('1')" >待备货</el-button>
+<!-- <el-button icon="el-icon-search" @click="onLoad" >全部</el-button>-->
+ <!-- <el-button icon="el-icon-refresh" @click="getStockUp('2')" >已备货</el-button>
+ <el-button icon="el-icon-search" @click="getStockUp('1')" >待备货</el-button>-->
-<!-- <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>-->
-<!-- <el-button icon="el-icon-search" @click="searchHide" circle></el-button>-->
+ <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
+ <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
+ <el-button icon="el-icon-search" @click="searchHide" circle></el-button>
</div>
</div>
</el-row>
@@ -387,7 +388,7 @@ export default {
mounted () {
this.init();
this.onLoad(this.page);
- /**
+ /**
* 初始化获取本地缓存的编辑隐藏的列表
* 固定搭配，不能更改
*/
@@ -419,9 +420,9 @@ export default {
showdrawer(value){
this.drawerShow=value
},
- /**
+ /**
* 弹窗的勾选回调，用于更改头部数组
- * 固定搭配，只需要更换 columnList
+ * 固定搭配，只需要更换 columnList
*/
setnewcolum(newarr, headarr) {
// console.log(newarr,'+++++++++++')
@@ -691,11 +692,11 @@ export default {
this.page.total = data.total;
this.data = data.records;
this.data.forEach(async i =>{
- if(i.forklift != "-1"){
+ /* if(i.forklift != "-1"){
console.log("i==",i);
let a = await getUser(i.forklift);
i.forklift =a.data.data.name;
- }
+ }*/
i.loader = i.groupName;
i.stockupArea = i.headline;
diff --git a/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue b/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue
index 87c07574..f17c5826 100644
--- a/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue
+++ b/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue
@@ -877,13 +877,13 @@ export default {
async getWareHoust(page, params = {}){
let a = await getListUser();
let b = await getDept(a.data.data.deptId);
- // console.log("aaa",a);
- // console.log("bbb",b.data.data.deptCategory);
+ console.log("aaa",a);
+ console.log("bbb",b);
if(b.data.data.deptCategory == "4"){
//部门
let st= {
- label: b.data.data.id,
- value: b.data.data.deptName
+ label: b.data.data.deptName,
+ value: b.data.data.id
}
this.store.push(st);
this.form.warehouseId = b.data.data.id;