java_project
/
logpm_page
4
1
Fork 0
Code Issues Pull Requests Activity
Browse Source

修改回显

dev-warehouse
caoyizhong 2 years ago
parent
e118cc65a6
commit
3bf2547043
8 changed files with 535 additions and 341 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      src/option/distribution/distributionStockArticle.js
  2. 106
      src/views/distribution/inventory/delivery/distributionStockArticle.vue
  3. 238
      src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
  4. 352
      src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
  5. 130
      src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
  6. 24
      src/views/distribution/inventory/distributionStockList.vue
  7. 4
      src/views/distribution/inventory/distributionStockListDetails.vue
  8. 14
      src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue

8
src/option/distribution/distributionStockArticle.js
Unescape View File

@ -91,7 +91,7 @@ export default {
search: true
},
{
label: '仓库',
label: '所在仓库',
prop: 'warehouse',
search: true
},
@ -102,7 +102,7 @@ export default {
},
{
label: '服务类型',
prop: 'typeService',
prop: 'typeServerName',
search: true
}
@ -294,7 +294,7 @@ export default {
prop: 'thirdProduct'
},
{
label: '物料',
label: '物料名称',
prop: 'material'
},
{
@ -302,7 +302,7 @@ export default {
prop: 'quantity'
},
{
label: '车次号',
label: '客户车次号',
prop: 'trainNumber'
}
],

106
src/views/distribution/inventory/delivery/distributionStockArticle.vue
Unescape View File

@ -400,7 +400,7 @@ export default {
},
{
prop: 'warehouse',
label: '仓库',
label: '所在仓库',
type: 2,
values: '',
width: '180',
@ -476,7 +476,7 @@ export default {
sortable: true,
},
{
prop: 'handQuantity',
prop: 'notReceived',
label: '未入库数量',
type: 1,
values: '',
@ -521,12 +521,28 @@ export default {
fixed: false,
sortable: true,
},{
prop: 'handQuantity',
prop: 'groundingStatusName',
label: '上架状态',
type: 1,
type: 3,
values: '',
width: '150',
checkarr: [],
checkarr: [
{
value: '0',
label: '未上架',
},
{
value: '1',
label: '部分上架',
}, {
value: '2',
label: '已上架',
},
{
value: '3',
label: '已下架',
},
],
fixed: false,
sortable: true,
},{
@ -559,17 +575,26 @@ export default {
sortable: true,
},
{
prop: 'freeze_status',
prop: 'freezeStatusName',
label: '冻结状态',
type: 1,
type: 3,
values: '',
width: '150',
checkarr: [],
checkarr: [
{
value: '1',
label: '已冻结',
},
{
value: '0',
label: '未冻结',
},
],
fixed: false,
sortable: true,
},
{
prop: 'state',
prop: 'orderStateName',
label: '状态',
type: 2,
values: '',
@ -608,7 +633,7 @@ export default {
// sortable: true,
// },
{
prop: 'typeName',
prop: 'typeServerName',
label: '服务类型',
type: 3,
values: '',
@ -656,16 +681,18 @@ export default {
checkarr: [],
fixed: false,
sortable: true,
}, {
prop: 'createUser',
label: '创建人',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
}, {
},
// {
// prop: 'createUser',
// label: '创建人',
// type: 1,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
{
prop: 'createTime',
label: '创建时间',
type: 1,
@ -885,7 +912,9 @@ export default {
},
selectsc(index, row) {
console.log(index, row);
if(row.prop ==='completeSetName'){
if(row.prop ==='freezeStatusName'){
this.query['freezeStatus'] = index;
}else if(row.prop ==='completeSetName'){
this.query['completeSet'] = index;
}else if(row.prop ==='typeName'){
this.query['typeService'] = index;
@ -1102,7 +1131,7 @@ export default {
this.height = this.setPx(document.body.clientHeight - 340);
getDictionaryBiz('distribution_type').then(res => {
this.distributionType = res.data.data;
this.columnList[13].checkarr =res.data.data.map(item=>{
this.columnList[26].checkarr =res.data.data.map(item=>{
item.value=item.dictKey
item.label=item.dictValue
return item
@ -1296,13 +1325,42 @@ export default {
this.query.genre = 1;
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data;
console.log(">>>>>>>",data.records);
this.page.total = data.total;
this.data = data.records;
this.data = this.data.map(i => {
const freezeStatusMap = {
0: "未冻结",
1: "已冻结",
default: "无"
};
const nuMap = {
'-1': "0"
};
const groundingStatusMap = {
0: "未上架",
1: "部分上架",
2: "已上架",
3: "已下架",
default: "无"
};
i.freezeStatusName = freezeStatusMap[i.freezeStatus] || freezeStatusMap.default;
i.groundingStatusName = groundingStatusMap[i.groundingStatus] || groundingStatusMap.default;
i.handQuantity = nuMap[i.handQuantity] || i.handQuantity;
i.sortingQuantity = nuMap[i.sortingQuantity] || i.sortingQuantity;
i.deliveryQuantity = nuMap[i.deliveryQuantity] || i.deliveryQuantity;
i.signinQuantity = nuMap[i.signinQuantity] || i.signinQuantity;
i.transferQuantity = nuMap[i.transferQuantity] || i.transferQuantity;
i.availableQuantity = nuMap[i.availableQuantity] || i.availableQuantity;
console.log("i.totalNumber",i.totalNumber,"i.handQuantitys",i.handQuantity);
i.notReceived = parseInt( i.totalNumber) - parseInt(i.handQuantity);
return i;
});
this.loading = false;
this.selectionClear();
});
}
},
}
};
</script>

238
src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
Unescape View File

@ -401,7 +401,7 @@ export default {
},
{
prop: 'warehouse',
label: '仓库',
label: '所在仓库',
type: 2,
values: '',
width: '180',
@ -439,49 +439,6 @@ export default {
fixed: false,
sortable: true,
},
{
prop: 'dealerName',
label: '经销商名称',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'dealerCode',
label: '经销商编码',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'storeName',
label: '门店编码',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'storeCode',
label: '门店名称',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'consigneeUnit',
label: '收货单位',
@ -500,16 +457,6 @@ export default {
checkarr: [],
fixed: false,
sortable: true,
}
, {
prop: 'consigneeAddress',
label: '收货地址',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
}, {
prop: 'handQuantity',
label: '在库件数',
@ -530,7 +477,7 @@ export default {
sortable: true,
},
{
prop: 'handQuantity',
prop: 'notReceived',
label: '未入库数量',
type: 1,
values: '',
@ -575,12 +522,28 @@ export default {
fixed: false,
sortable: true,
},{
prop: 'handQuantity',
prop: 'groundingStatusName',
label: '上架状态',
type: 1,
type: 3,
values: '',
width: '150',
checkarr: [],
checkarr: [
{
value: '0',
label: '未上架',
},
{
value: '1',
label: '部分上架',
}, {
value: '2',
label: '已上架',
},
{
value: '3',
label: '已下架',
},
],
fixed: false,
sortable: true,
},{
@ -613,17 +576,26 @@ export default {
sortable: true,
},
{
prop: 'freeze_status',
prop: 'freezeStatusName',
label: '冻结状态',
type: 1,
type: 3,
values: '',
width: '150',
checkarr: [],
checkarr: [
{
value: '1',
label: '已冻结',
},
{
value: '0',
label: '未冻结',
},
],
fixed: false,
sortable: true,
},
{
prop: 'state',
prop: 'orderStateName',
label: '状态',
type: 2,
values: '',
@ -662,9 +634,9 @@ export default {
// sortable: true,
// },
{
prop: 'typeName',
prop: 'typeServerName',
label: '服务类型',
type: 3,
type: 1,
values: '',
width: '150',
checkarr: [],
@ -807,10 +779,6 @@ export default {
mounted () {
this.init();
this.onLoad(this.page);
/**
* 初始化获取本地缓存的编辑隐藏的列表
* 固定搭配，不能更改
*/
/**
* 初始化获取本地缓存的编辑隐藏的列表
* 固定搭配，不能更改
@ -906,16 +874,6 @@ export default {
}
},
methods: {
//通知提货
handleCallDeliveryOwn(row){
console.log("row",row);
this.formCustomer.name = row.row.customerName;
this.formCustomer.phone = row.row.customerTelephone;
this.formCustomer.address = row.row.customerAddress;
this.formCustomer.stockArticleId = row.row.id;
this.dialogFormCustomer = true;
this.dialogFormCustomerOwn = true;
},
showdrawer(value){
this.drawerShow=value
},
@ -953,8 +911,12 @@ export default {
},
selectsc(index, row) {
console.log(index, row);
if(row.prop ==='completeSetName'){
if(row.prop ==='freezeStatusName'){
this.query['freezeStatus'] = index;
}else if(row.prop ==='completeSetName'){
this.query['completeSet'] = index;
}else if(row.prop ==='typeName'){
this.query['typeService'] = index;
}else{
this.query[row.prop] = index;
}
@ -973,6 +935,7 @@ export default {
},
inputsc(index, row) {
console.log(index, row);
// console.log(index, row.prop);
this.query[row.prop] = index;
this.onLoad(this.page);
},
@ -985,13 +948,16 @@ export default {
this.selectionList.some( i =>{
if(i.stateName === "已预约"){
st = true;
this.$message.warning(i.orderSelfNumbering+"已预约，请勿重复预约！！！");
this.$message.warning(i.orderSelfNumbering+" - 已预约，请勿重复预约！！！");
}
if(i.typeService === 3){
st = true;
this.$message.warning(i.orderSelfNumbering+" - 为自提单，无法预约！！！");
}
})
if(st){
return
}
// 判断orderId是否全都相等
const notEqualFlag = this.selectionList.some(
(item) =>
@ -1000,29 +966,29 @@ export default {
&& ele.customerTelephone !== item.customerTelephone
&& ele.customerAddress !== item.customerAddress ).length >= 1
);
console.log("notEqualFlag=====",notEqualFlag);
// 返回true,说明有不同
// 返回false,说明全都相等
if(!notEqualFlag){
this.$router.push({
path: '/distribution/reservation/reservationFrom',
query:{
id: this.ids,
name: '添加预约单'
}
});
}else{
this.$message.warning("请选择相同收货信息的订单！！！")
}
if(!notEqualFlag){
this.$router.push({
path: '/distribution/reservation/reservationFrom',
query:{
id: this.ids,
}
});
}else{
this.$message.warning("请选择相同收货信息的订单！！！")
}
},
async handleStockList(){
if (this.selectionList.length === 0) {
this.$message.warning("请选择至少一条数据");
return;
}else if (this.selectionList.length > 1){
}
this.getSock();
/*else if (this.selectionList.length > 1){
this.getSock();
}else if (this.selectionList.length < 2){
//判断有没有包件
@ -1031,7 +997,7 @@ export default {
}
let a = await getListOwn(this.page.currentPage,this.page.pageSize,params);
console.log("aaaaaaa===",a.data.data);
// console.log("aaaaaaa===",a.data.data);
if(a.data.data.records.length > 0){
this.$router.push({
path: '/distribution/inventory/distributionStockArticleFrom',
@ -1043,7 +1009,7 @@ export default {
}else{
this.getSock();
}
}
}*/
},
getSock(){
this.$confirm("确定将选择的订单转为库存品吗？", {
@ -1125,6 +1091,16 @@ export default {
}
});
},
//修改客户信息
handleCallDeliveryOwn(row){
console.log("row",row);
this.formCustomer.name = row.row.customerName;
this.formCustomer.phone = row.row.customerTelephone;
this.formCustomer.address = row.row.customerAddress;
this.formCustomer.stockArticleId = row.row.id;
this.dialogFormCustomer = true;
this.dialogFormCustomerOwn = true;
},
//通知提货
handleCallDelivery(ind){
if (this.selectionList.length === 0) {
@ -1132,22 +1108,20 @@ export default {
return;
}
switch (ind) {
case '1':
let ids = [];
this.selectionList.forEach(ele => {
ids.push(ele.orderSelfNumbering);
});
this.formCall.waybill = ids;
this.dialogFormVisible = true;
break;
case '2':
this.dialogFormService = true;
break;
case '3':
this.dialogFormCustomer = true;
break;
case '1':
let ids = [];
this.selectionList.forEach(ele => {
ids.push(ele.orderSelfNumbering);
});
this.formCall.waybill = ids;
this.dialogFormVisible = true;
break;
case '2':
this.dialogFormService = true;
break;
case '3':
this.dialogFormCustomer = true;
break;
}
},
@ -1262,7 +1236,7 @@ export default {
handleEdit (row) {
this.title = '编辑'
this.box = true
getDetail(row.id).then(res => {
getDetail(row.row.id).then(res => {
this.form = res.data.data;
});
},
@ -1273,11 +1247,12 @@ export default {
// getDetail(row.id).then(res => {
// this.form = res.data.data;
// });
// console.log("查看===",row.row);
this.$router.push({
path: '/distribution/inventory/distributionStockArticleDetails',
query: {
id : row.row.id,
name: "详情"+row.row.orderSelfNumbering
name: "详情 - "+row.row.orderSelfNumbering
},
})
@ -1349,12 +1324,41 @@ export default {
this.query.typeService = 1;
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data;
console.log(">>>>>>>",data.records);
this.page.total = data.total;
this.data = data.records;
this.data = this.data.map(i => {
const freezeStatusMap = {
0: "未冻结",
1: "已冻结",
default: "无"
};
const nuMap = {
'-1': "0"
};
const groundingStatusMap = {
0: "未上架",
1: "部分上架",
2: "已上架",
3: "已下架",
default: "无"
};
i.freezeStatusName = freezeStatusMap[i.freezeStatus] || freezeStatusMap.default;
i.groundingStatusName = groundingStatusMap[i.groundingStatus] || groundingStatusMap.default;
i.handQuantity = nuMap[i.handQuantity] || i.handQuantity;
i.sortingQuantity = nuMap[i.sortingQuantity] || i.sortingQuantity;
i.deliveryQuantity = nuMap[i.deliveryQuantity] || i.deliveryQuantity;
i.signinQuantity = nuMap[i.signinQuantity] || i.signinQuantity;
i.transferQuantity = nuMap[i.transferQuantity] || i.transferQuantity;
i.availableQuantity = nuMap[i.availableQuantity] || i.availableQuantity;
i.notReceived = parseInt( i.totalNumber ) - parseInt( i.handQuantity);
return i;
});
this.loading = false;
this.selectionClear();
});
}
},
}
};
</script>

352
src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
Unescape View File

@ -8,27 +8,27 @@
<el-form-item label="订单自编号:">
<el-input v-model="query.orderSelfNumbering" placeholder="请输入订单自编号" ></el-input>
</el-form-item>
<!-- <el-form-item label="货物名称:">
<el-input v-model="query.descriptionGoods" placeholder="请输入货物名称"></el-input>
</el-form-item>
<el-form-item label="仓库:">
<el-input v-model="query.warehouse" placeholder="请输入仓库"></el-input>
</el-form-item>
<el-form-item label="是否齐套:">
<el-input v-model="query.completeSet" placeholder="请输入是否齐套"></el-input>
</el-form-item>
<el-form-item label="品牌:">
<el-input v-model="query.brand" placeholder="请输入品牌"></el-input>
</el-form-item>
<el-form-item label="服务类型:">
<el-input v-model="query.typeService" placeholder="请输入服务类型"></el-input>
</el-form-item>
<el-form-item label="类型;1 预约单 2库存单:">
<el-input v-model="query.genre" placeholder="请输入类型;1 预约单 2库存单"></el-input>
</el-form-item>
<el-form-item label="状态;1 配送 2 待配送:">
<el-input v-model="query.state" placeholder="请输入状态;1 配送 2 待配送"></el-input>
</el-form-item>-->
<!-- <el-form-item label="货物名称:">
<el-input v-model="query.descriptionGoods" placeholder="请输入货物名称"></el-input>
</el-form-item>
<el-form-item label="仓库:">
<el-input v-model="query.warehouse" placeholder="请输入仓库"></el-input>
</el-form-item>
<el-form-item label="是否齐套:">
<el-input v-model="query.completeSet" placeholder="请输入是否齐套"></el-input>
</el-form-item>
<el-form-item label="品牌:">
<el-input v-model="query.brand" placeholder="请输入品牌"></el-input>
</el-form-item>
<el-form-item label="服务类型:">
<el-input v-model="query.typeService" placeholder="请输入服务类型"></el-input>
</el-form-item>-->
<!-- <el-form-item label="类型;1 预约单 2库存单:">-->
<!-- <el-input v-model="query.genre" placeholder="请输入类型;1 预约单 2库存单"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="状态;1 配送 2 待配送:">-->
<!-- <el-input v-model="query.state" placeholder="请输入状态;1 配送 2 待配送"></el-input>-->
<!-- </el-form-item>-->
<!-- 查询按钮 -->
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
@ -37,37 +37,38 @@
</el-form>
</el-row>
<el-row>
<!-- <div class="avue-crud__header">
&lt;!&ndash; 头部左侧按钮模块 &ndash;&gt;
<div class="avue-crud__left">
<el-button type="primary" icon="el-icon-plus" @click="handleTrade" v-if="handler && taker || handler && trade"> 商配</el-button>
<el-button type="danger" icon="el-icon-delete" @click="handleMunicipal" v-if="handler && taker || handler && trade">市配</el-button>
<el-button type="primary" icon="el-icon-plus" @click="handlePickUpStore" v-if="permission.stockArticle_add && handler && !trade || permission.stockArticle_add && !taker" >自提</el-button>
<el-button type="danger" icon="el-icon-delete" @click="handleEntire" >全部</el-button>
<el-button type="primary" icon="el-icon-plus" @click="handleInform('2')" v-if = "!handler && !taker">未通知</el-button>
<el-button type="danger" icon="el-icon-delete" @click="handleInform('1')" v-if = "!handler && !taker">已通知</el-button>
</div>
&lt;!&ndash; 头部右侧按钮模块 &ndash;&gt;
&lt;!&ndash; <div class="avue-crud__right">&ndash;&gt;
&lt;!&ndash; <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>&ndash;&gt;
&lt;!&ndash; <el-button icon="el-icon-search" @click="searchHide" circle></el-button>&ndash;&gt;
&lt;!&ndash; </div>&ndash;&gt;
</div>-->
<!-- <div class="avue-crud__header">
&lt;!&ndash; 头部左侧按钮模块 &ndash;&gt;
<div class="avue-crud__left">
<el-button type="primary" icon="el-icon-plus" @click="handleTrade" v-if="handler && taker || handler && trade"> 商配</el-button>
<el-button type="danger" icon="el-icon-delete" @click="handleMunicipal" v-if="handler && taker || handler && trade">市配</el-button>
<el-button type="primary" icon="el-icon-plus" @click="handlePickUpStore" v-if="permission.stockArticle_add && handler && !trade || permission.stockArticle_add && !taker" >自提</el-button>
<el-button type="danger" icon="el-icon-delete" @click="handleEntire" >全部</el-button>
<el-button type="primary" icon="el-icon-plus" @click="handleInform('2')" v-if = "!handler && !taker">未通知</el-button>
<el-button type="danger" icon="el-icon-delete" @click="handleInform('1')" v-if = "!handler && !taker">已通知</el-button>
</div>
&lt;!&ndash; 头部右侧按钮模块 &ndash;&gt;
&lt;!&ndash; <div class="avue-crud__right">&ndash;&gt;
&lt;!&ndash; <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>&ndash;&gt;
&lt;!&ndash; <el-button icon="el-icon-search" @click="searchHide" circle></el-button>&ndash;&gt;
&lt;!&ndash; </div>&ndash;&gt;
</div>-->
<div class="avue-crud__header">
<!-- 头部左侧按钮模块 -->
<div class="avue-crud__left">
<el-button type="primary" icon="el-icon-plus" @click="handleAdd" v-if = "handler">创建异常</el-button>
<el-button type="danger" icon="el-icon-delete" @click="handleMoke" v-if = "handler">转预约单</el-button>
<el-button type="primary" icon="el-icon-plus" @click="handleStockList" v-if = "handler">批量加配转库存品</el-button>
<el-button type="danger" icon="el-icon-delete" @click="handleCallDelivery('3')" v-if = "handler">修改客户信息</el-button>
<el-button type="danger" icon="el-icon-delete" @click="handleCallDelivery('2')" v-if = "handler">修改服务类型</el-button>
<el-button type="danger" icon="el-icon-edit" @click="handleMoke" v-if = "handler">转预约单</el-button>
<el-button type="primary" icon="el-icon-edit" @click="handleStockList" v-if = "handler">批量加配转库存品</el-button>
<el-button type="danger" icon="el-icon-edit" @click="handleCallDelivery('3')" v-if = "handler">修改客户信息</el-button>
<el-button type="danger" icon="el-icon-edit" @click="handleCallDelivery('2')" v-if = "handler">修改服务类型</el-button>
<!-- <el-button type="danger" icon="el-icon-plus" v-if = "handler">转配送</el-button>-->
</div>
<!-- <div class="avue-crud__left">
<div class="avue-crud__left">
<el-button type="primary" icon="el-icon-plus" @click="handlebill" v-if = "!handler">创建提货单</el-button>
<el-button type="danger" icon="el-icon-delete" @click="handleCallDelivery('1')" v-if = "!handler">再次通知</el-button>
<el-button type="primary" icon="el-icon-plus" @click="handleCallDelivery('1')" v-if = "!handler">通知提货</el-button>
</div>-->
</div>
<!-- 头部右侧按钮模块 -->
<div class="avue-crud__right">
<el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
@ -75,8 +76,6 @@
<el-button icon="el-icon-search" @click="searchHide" circle></el-button>
</div>
</div>
</el-row>
<el-row>
<!-- 列表模块 -->
@ -138,7 +137,7 @@
<template #footer>
<span class="dialog-footer">
<el-button @click="dialogFormVisible = false">取消</el-button>
<!-- <el-button type="primary" @click="dialogFormVisible = false"> 确定 </el-button>-->
<!-- <el-button type="primary" @click="dialogFormVisible = false"> 确定 </el-button>-->
<el-button type="primary" @click="callFordelivery('1')"> 确定 </el-button>
</span>
</template>
@ -146,13 +145,13 @@
<el-dialog v-model="dialogFormService" title="修改服务类型">
<el-form :model="formService">
<el-form-item label="服务类型" :label-width="formLabelWidth">
<!-- <el-input v-model="formService.typeService" autocomplete="off" />-->
<!-- <el-input v-model="formService.typeService" autocomplete="off" />-->
<el-select v-model="formService.typeService" clearable placeholder="请选择服务类型">
<el-option
v-for="item in distributionType"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictKey">
v-for="item in distributionType"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictKey">
</el-option>
</el-select>
</el-form-item>
@ -171,7 +170,7 @@
<template #footer>
<span class="dialog-footer">
<el-button @click="dialogFormService = false">取消</el-button>
<!-- <el-button type="primary" @click="dialogFormVisible = false"> 确定 </el-button>-->
<!-- <el-button type="primary" @click="dialogFormVisible = false"> 确定 </el-button>-->
<el-button type="primary" @click="callFordelivery('2')"> 确定 </el-button>
</span>
</template>
@ -196,7 +195,7 @@
<template #footer>
<span class="dialog-footer">
<el-button @click="dialogFormCustomer = false">取消</el-button>
<!-- <el-button type="primary" @click="dialogFormVisible = false"> 确定 </el-button>-->
<!-- <el-button type="primary" @click="dialogFormVisible = false"> 确定 </el-button>-->
<el-button type="primary" @click="callFordelivery('3')"> 确定 </el-button>
</span>
</template>
@ -225,7 +224,7 @@
<el-input v-model="form.warehouse" placeholder="请输入仓库"/>
</el-form-item>
<el-form-item label="入库时间" prop="warehouseEntryTime">
<!-- <el-input v-model="form.warehouseEntryTime" placeholder="请输入入库时间"/>-->
<!-- <el-input v-model="form.warehouseEntryTime" placeholder="请输入入库时间"/>-->
<el-date-picker
v-model="form.warehouseEntryTime"
type="datetime"
@ -245,12 +244,12 @@
</el-form-item>
<el-form-item label="是否齐套" prop="completeSet">
<el-select v-model="form.completeSet" clearable placeholder="请选择是否齐套">
<!-- <el-option-->
<!-- v-for="item in completeSetData"-->
<!-- :key="item.dictKey"-->
<!-- :label="item.dictValue"-->
<!-- :value="item.dictKey">-->
<!-- </el-option>-->
<!-- <el-option-->
<!-- v-for="item in completeSetData"-->
<!-- :key="item.dictKey"-->
<!-- :label="item.dictValue"-->
<!-- :value="item.dictKey">-->
<!-- </el-option>-->
<el-option label="是" value="2">是</el-option>
<el-option label="否" value="1">否</el-option>
</el-select>
@ -260,12 +259,12 @@
</el-form-item>
<el-form-item label="服务类型" prop="typeService">
<el-select v-model="form.typeService" clearable placeholder="请选择服务类型">
<!-- <el-option-->
<!-- v-for="item in typeServiceData"-->
<!-- :key="item.dictKey"-->
<!-- :label="item.dictValue"-->
<!-- :value="item.dictKey">-->
<!-- </el-option>-->
<!-- <el-option-->
<!-- v-for="item in typeServiceData"-->
<!-- :key="item.dictKey"-->
<!-- :label="item.dictValue"-->
<!-- :value="item.dictKey">-->
<!-- </el-option>-->
<el-option label="干" value="1">干</el-option>
<el-option label="仓" value="2">仓</el-option>
<el-option label="配" value="3">配</el-option>
@ -282,24 +281,24 @@
</el-form-item>
<el-form-item label="类型;1 预约单 2库存单" prop="genre">
<el-select v-model="form.genre" clearable placeholder="请选择类型;1 预约单 2库存单">
<!-- <el-option-->
<!-- v-for="item in genreData"-->
<!-- :key="item.dictKey"-->
<!-- :label="item.dictValue"-->
<!-- :value="item.dictKey">-->
<!-- </el-option>-->
<!-- <el-option-->
<!-- v-for="item in genreData"-->
<!-- :key="item.dictKey"-->
<!-- :label="item.dictValue"-->
<!-- :value="item.dictKey">-->
<!-- </el-option>-->
<el-option label="库存单" value="2">库存单</el-option>
<el-option label="预约单" value="1">预约单</el-option>
</el-select>
</el-form-item>
<el-form-item label="状态;1 配送 2 待配送" prop="state">
<el-select v-model="form.state" clearable placeholder="请选择状态;1 配送 2 待配送">
<!-- <el-option-->
<!-- v-for="item in stateData"-->
<!-- :key="item.dictKey"-->
<!-- :label="item.dictValue"-->
<!-- :value="item.dictKey">-->
<!-- </el-option>-->
<!-- <el-option-->
<!-- v-for="item in stateData"-->
<!-- :key="item.dictKey"-->
<!-- :label="item.dictValue"-->
<!-- :value="item.dictKey">-->
<!-- </el-option>-->
<el-option label="待配送" value="2">待配送</el-option>
<el-option label="配送" value="1">配送</el-option>
</el-select>
@ -401,7 +400,7 @@ export default {
},
{
prop: 'warehouse',
label: '仓库',
label: '所在仓库',
type: 2,
values: '',
width: '180',
@ -477,7 +476,7 @@ export default {
sortable: true,
},
{
prop: 'handQuantity',
prop: 'notReceived',
label: '未入库数量',
type: 1,
values: '',
@ -522,12 +521,28 @@ export default {
fixed: false,
sortable: true,
},{
prop: 'handQuantity',
prop: 'groundingStatusName',
label: '上架状态',
type: 1,
type: 3,
values: '',
width: '150',
checkarr: [],
checkarr: [
{
value: '0',
label: '未上架',
},
{
value: '1',
label: '部分上架',
}, {
value: '2',
label: '已上架',
},
{
value: '3',
label: '已下架',
},
],
fixed: false,
sortable: true,
},{
@ -560,17 +575,26 @@ export default {
sortable: true,
},
{
prop: 'freeze_status',
prop: 'freezeStatusName',
label: '冻结状态',
type: 1,
type: 3,
values: '',
width: '150',
checkarr: [],
checkarr: [
{
value: '1',
label: '已冻结',
},
{
value: '0',
label: '未冻结',
},
],
fixed: false,
sortable: true,
},
{
prop: 'state',
prop: 'orderStateName',
label: '状态',
type: 2,
values: '',
@ -609,9 +633,9 @@ export default {
// sortable: true,
// },
{
prop: 'typeName',
prop: 'typeServerName',
label: '服务类型',
type: 3,
type: 1,
values: '',
width: '150',
checkarr: [],
@ -849,16 +873,6 @@ export default {
}
},
methods: {
//通知提货
handleCallDeliveryOwn(row){
console.log("row",row);
this.formCustomer.name = row.row.customerName;
this.formCustomer.phone = row.row.customerTelephone;
this.formCustomer.address = row.row.customerAddress;
this.formCustomer.stockArticleId = row.row.id;
this.dialogFormCustomer = true;
this.dialogFormCustomerOwn = true;
},
showdrawer(value){
this.drawerShow=value
},
@ -896,8 +910,12 @@ export default {
},
selectsc(index, row) {
console.log(index, row);
if(row.prop ==='completeSetName'){
if(row.prop ==='freezeStatusName'){
this.query['freezeStatus'] = index;
}else if(row.prop ==='completeSetName'){
this.query['completeSet'] = index;
}else if(row.prop ==='typeName'){
this.query['typeService'] = index;
}else{
this.query[row.prop] = index;
}
@ -916,6 +934,7 @@ export default {
},
inputsc(index, row) {
console.log(index, row);
// console.log(index, row.prop);
this.query[row.prop] = index;
this.onLoad(this.page);
},
@ -928,7 +947,11 @@ export default {
this.selectionList.some( i =>{
if(i.stateName === "已预约"){
st = true;
this.$message.warning(i.orderSelfNumbering+"已预约，请勿重复预约！！！");
this.$message.warning(i.orderSelfNumbering+" - 已预约，请勿重复预约！！！");
}
if(i.typeService === 3){
st = true;
this.$message.warning(i.orderSelfNumbering+" - 为自提单，无法预约！！！");
}
})
if(st){
@ -945,27 +968,26 @@ export default {
console.log("notEqualFlag=====",notEqualFlag);
// 返回true,说明有不同
// 返回false,说明全都相等
if(!notEqualFlag){
this.$router.push({
path: '/distribution/reservation/reservationFrom',
query:{
id: this.ids,
name: '添加预约单'
}
});
}else{
this.$message.warning("请选择相同收货信息的订单！！！")
}
if(!notEqualFlag){
this.$router.push({
path: '/distribution/reservation/reservationFrom',
query:{
id: this.ids,
}
});
}else{
this.$message.warning("请选择相同收货信息的订单！！！")
}
},
async handleStockList(){
if (this.selectionList.length === 0) {
this.$message.warning("请选择至少一条数据");
return;
}else if (this.selectionList.length > 1){
}
this.getSock();
/*else if (this.selectionList.length > 1){
this.getSock();
}else if (this.selectionList.length < 2){
//判断有没有包件
@ -974,7 +996,7 @@ export default {
}
let a = await getListOwn(this.page.currentPage,this.page.pageSize,params);
console.log("aaaaaaa===",a.data.data);
// console.log("aaaaaaa===",a.data.data);
if(a.data.data.records.length > 0){
this.$router.push({
path: '/distribution/inventory/distributionStockArticleFrom',
@ -986,7 +1008,7 @@ export default {
}else{
this.getSock();
}
}
}*/
},
getSock(){
this.$confirm("确定将选择的订单转为库存品吗？", {
@ -1025,6 +1047,7 @@ export default {
case '2':
this.formService.stockArticleId = this.ids;
// console.log("服务类型",this.formService);
addService(this.formService).then(() =>{
this.$message({
type: "success",
@ -1069,28 +1092,36 @@ export default {
});
},
//通知提货
handleCallDeliveryOwn(row){
console.log("row",row);
this.formCustomer.name = row.row.customerName;
this.formCustomer.phone = row.row.customerTelephone;
this.formCustomer.address = row.row.customerAddress;
this.formCustomer.stockArticleId = row.row.id;
this.dialogFormCustomer = true;
this.dialogFormCustomerOwn = true;
},
//通知提货
handleCallDelivery(ind){
if (this.selectionList.length === 0) {
this.$message.warning("请选择至少一条数据");
return;
}
switch (ind) {
case '1':
let ids = [];
this.selectionList.forEach(ele => {
ids.push(ele.orderSelfNumbering);
});
this.formCall.waybill = ids;
this.dialogFormVisible = true;
break;
case '2':
this.dialogFormService = true;
break;
case '3':
this.dialogFormCustomer = true;
break;
case '1':
let ids = [];
this.selectionList.forEach(ele => {
ids.push(ele.orderSelfNumbering);
});
this.formCall.waybill = ids;
this.dialogFormVisible = true;
break;
case '2':
this.dialogFormService = true;
break;
case '3':
this.dialogFormCustomer = true;
break;
}
},
@ -1098,11 +1129,11 @@ export default {
this.height = this.setPx(document.body.clientHeight - 340);
getDictionaryBiz('distribution_type').then(res => {
this.distributionType = res.data.data;
/* this.columnList[12].checkarr =res.data.data.map(item=>{
this.columnList[26].checkarr =res.data.data.map(item=>{
item.value=item.dictKey
item.label=item.dictValue
return item
});*/
});
});
},
@ -1179,12 +1210,12 @@ export default {
let params = {};
this.query.typeService = '1';
switch (index) {
case '1':
this.query.notification = index;
break;
case '2':
this.query.notification = index;
break;
case '1':
this.query.notification = index;
break;
case '2':
this.query.notification = index;
break;
}
this.query.typeService = '1';
getList(this.page.currentPage, this.page.pageSize, Object.assign(params, this.query)).then(res => {
@ -1205,7 +1236,7 @@ export default {
handleEdit (row) {
this.title = '编辑'
this.box = true
getDetail(row.id).then(res => {
getDetail(row.row.id).then(res => {
this.form = res.data.data;
});
},
@ -1216,11 +1247,12 @@ export default {
// getDetail(row.id).then(res => {
// this.form = res.data.data;
// });
// console.log("查看===",row.row);
this.$router.push({
path: '/distribution/inventory/distributionStockArticleDetails',
query: {
id : row.row.id,
name: "详情"+row.row.orderSelfNumbering
name: "详情 - "+row.row.orderSelfNumbering
},
})
@ -1289,15 +1321,43 @@ export default {
onLoad (page, params = {}) {
this.loading = true;
this.query.genre = 1;
this.query.typeService = 2;
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data;
console.log(">>>>>>>",data.records);
this.page.total = data.total;
this.data = data.records;
this.data = this.data.map(i => {
const freezeStatusMap = {
0: "未冻结",
1: "已冻结",
default: "无"
};
const nuMap = {
'-1': "0"
};
const groundingStatusMap = {
0: "未上架",
1: "部分上架",
2: "已上架",
3: "已下架",
default: "无"
};
i.freezeStatusName = freezeStatusMap[i.freezeStatus] || freezeStatusMap.default;
i.groundingStatusName = groundingStatusMap[i.groundingStatus] || groundingStatusMap.default;
i.handQuantity = nuMap[i.handQuantity] || i.handQuantity;
i.sortingQuantity = nuMap[i.sortingQuantity] || i.sortingQuantity;
i.deliveryQuantity = nuMap[i.deliveryQuantity] || i.deliveryQuantity;
i.signinQuantity = nuMap[i.signinQuantity] || i.signinQuantity;
i.transferQuantity = nuMap[i.transferQuantity] || i.transferQuantity;
i.availableQuantity = nuMap[i.availableQuantity] || i.availableQuantity;
i.notReceived = parseInt( i.totalNumber) - parseInt( i.handQuantity);
return i;
});
this.loading = false;
this.selectionClear();
});
}
},
}
};
</script>

130
src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
Unescape View File

@ -97,7 +97,7 @@
</template>
</tablecmt>
</el-row>
<el-row>
<el-row >
<div class="avue-crud__pagination" style="width:100%">
<!-- 分页模块 -->
<el-pagination align="right"
@ -165,7 +165,7 @@
</el-form-item>
</el-form>
<div class="avue-crud__pagination" style="width:100%">
<div class="avue-crud__pagination" style="width:100%" v-if="lishi">
<!-- 分页模块 -->
<el-pagination align="right"
background
@ -445,7 +445,7 @@ export default {
},
{
prop: 'warehouse',
label: '仓库',
label: '所在仓库',
type: 2,
values: '',
width: '180',
@ -521,7 +521,7 @@ export default {
sortable: true,
},
{
prop: 'handQuantity',
prop: 'notReceived',
label: '未入库数量',
type: 1,
values: '',
@ -566,12 +566,28 @@ export default {
fixed: false,
sortable: true,
},{
prop: 'handQuantity',
prop: 'groundingStatusName',
label: '上架状态',
type: 1,
type: 3,
values: '',
width: '150',
checkarr: [],
checkarr: [
{
value: '0',
label: '未上架',
},
{
value: '1',
label: '部分上架',
}, {
value: '2',
label: '已上架',
},
{
value: '3',
label: '已下架',
},
],
fixed: false,
sortable: true,
},{
@ -604,12 +620,21 @@ export default {
sortable: true,
},
{
prop: 'freeze_status',
prop: 'freezeStatusName',
label: '冻结状态',
type: 1,
type: 3,
values: '',
width: '150',
checkarr: [],
checkarr: [
{
value: '1',
label: '已冻结',
},
{
value: '0',
label: '未冻结',
},
],
fixed: false,
sortable: true,
},
@ -666,9 +691,9 @@ export default {
// sortable: true,
// },
{
prop: 'typeName',
prop: 'typeServerName',
label: '服务类型',
type: 3,
type: 1,
values: '',
width: '150',
checkarr: [],
@ -980,8 +1005,12 @@ export default {
},
selectsc(index, row) {
console.log(index, row);
if(row.prop ==='completeSetName'){
if(row.prop ==='freezeStatusName'){
this.query['freezeStatus'] = index;
}else if(row.prop ==='completeSetName'){
this.query['completeSet'] = index;
}else if(row.prop ==='typeName'){
this.query['typeService'] = index;
}else{
this.query[row.prop] = index;
}
@ -1344,11 +1373,12 @@ export default {
// getDetail(row.id).then(res => {
// this.form = res.data.data;
// });
// console.log("查看===",row.row);
this.$router.push({
path: '/distribution/inventory/distributionStockArticleDetails',
query: {
id : row.row.id,
name: "详情"+row.row.orderSelfNumbering
name: "详情 - "+row.row.orderSelfNumbering
},
})
@ -1428,26 +1458,68 @@ export default {
this.query.typeService = 3;
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data;
console.log(">>>>>>>",data.records);
this.page.total = data.total;
data.records.some(i =>{
if(i.notification == '1'){
i.notification = '未通知'
}else{
i.notification = '已通知'
}
if(i.state == '1'){
i.stateName = '待预约'
}else if(i.state == '2'){
i.stateName = '已预约'
}else if(i.state == '7'){
i.stateName = '已完成'
}
});
// data.records.some(i =>{
// if(i.notification == '1'){
// i.notification = '未通知'
// }else{
// i.notification = '已通知'
// }
// if(i.state == '1'){
// i.stateName = '待预约'
// }else if(i.state == '2'){
// i.stateName = '已预约'
// }else if(i.state == '7'){
// i.stateName = '已完成'
// }
// });
this.data = data.records;
this.data = this.data.map(i => {
const notificationMap = {
'1': "已通知",
'2': "未通知",
default: "无"
};
const stateMap = {
'1': "待预约",
'2': "已预约",
'7': " 已完成",
default: "无"
};
const freezeStatusMap = {
0: "未冻结",
1: "已冻结",
default: "无"
};
const nuMap = {
'-1': "0"
};
const groundingStatusMap = {
0: "未上架",
1: "部分上架",
2: "已上架",
3: "已下架",
default: "无"
};
i.stateName = stateMap[i.state] || stateMap.default;
i.notification = notificationMap[i.notification] || notificationMap.default;
i.freezeStatusName = freezeStatusMap[i.freezeStatus] || freezeStatusMap.default;
i.groundingStatusName = groundingStatusMap[i.groundingStatus] || groundingStatusMap.default;
i.handQuantity = nuMap[i.handQuantity] || i.handQuantity;
i.sortingQuantity = nuMap[i.sortingQuantity] || i.sortingQuantity;
i.deliveryQuantity = nuMap[i.deliveryQuantity] || i.deliveryQuantity;
i.signinQuantity = nuMap[i.signinQuantity] || i.signinQuantity;
i.transferQuantity = nuMap[i.transferQuantity] || i.transferQuantity;
i.availableQuantity = nuMap[i.availableQuantity] || i.availableQuantity;
i.notReceived = parseInt( i.totalNumber) - parseInt( i.handQuantity );
return i;
});
this.loading = false;
this.selectionClear();
});
}
},
}
};
</script>

24
src/views/distribution/inventory/distributionStockList.vue
Unescape View File

@ -124,7 +124,7 @@
v-for="item in distributionUnit"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictKey"
:value="item.dictValue"
/>
</el-select>
</el-form-item>
@ -279,6 +279,16 @@ export default {
// fixed: false,
// sortable: true,
// },
{
prop: 'marketName',
label: '商场/客户',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'descriptionGoods',
label: '货物名称',
@ -398,16 +408,6 @@ export default {
fixed: false,
sortable: true,
},
{
prop: 'marketName',
label: '商场/客户',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'storeName',
label: '门店名称',
@ -867,7 +867,7 @@ export default {
this.formInline.id =this.stockList.id;
this.formInline.materialId =this.stockList.materialId;
this.formInline.marketId =this.stockList.marketId;
this.formInline.storeId =this.stockList.storeId;
this.formInline.storeId =!!this.stockList.storeId && this.stockList.storeId != '-1' ? this.stockList.storeId : null ;
console.log("提交的值",this.formInline);

4
src/views/distribution/inventory/distributionStockListDetails.vue
Unescape View File

@ -33,13 +33,13 @@
<el-row>
<el-col :span="10">
<el-form-item label="货物单位:">
<span>{{queryOwn.unit}}</span>
<span>{{queryOwn.cargoUnit}}</span>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="门店:">
<span>{{queryOwn.storeName}}</span>
<span>{{!!queryOwn.storeName ? queryOwn.storeName : '无' }}</span>
</el-form-item>
</el-col>
</el-row>

14
src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue
Unescape View File

@ -385,7 +385,7 @@ export default {
tip: '请上传 .xls,.xlsx 标准格式文件',
action: '/api/logpm-warehouse/warehouseWarehousingEntry/import-WarehousingEntry',
},
{
/*{
label: '数据覆盖',
prop: 'isCovered',
type: 'switch',
@ -410,7 +410,7 @@ export default {
trigger: 'blur',
},
],
},
},*/
{
label: '模板下载',
prop: 'excelTemplate',
@ -612,11 +612,11 @@ export default {
//下载模板
handleTemplate() {
console.log("下载模板！！！");
// exportBlob(
// `/blade-system/user/export-template?${this.website.tokenHeader}=${getToken()}`
// ).then(res => {
// downloadXls(res.data, '入库物品数据模板.xlsx');
// });
exportBlob(
`/api/logpm-warehouse/warehouseWarehousingEntry/export-warehouseWarehousingEntry?${this.website.tokenHeader}=${getToken()}`
).then(res => {
downloadXls(res.data, '入库物品数据模板.xlsx');
});
},
handleImport(){
this.excelBox = true;

Write Preview
Loading…
Cancel
Save