Browse Source

Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

fix_bug_pro20231227
pref_mail@163.com 2 years ago
parent
commit
d26f11f339
  1. 3
      src/main.js
  2. 218
      src/option/distribution/distrilbutionBillLading.js
  3. 34
      src/utils/util.js
  4. 8
      src/utils/watermark.js
  5. 35
      src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
  6. 946
      src/views/distribution/inventory/distributionStockArticleDetails.vue
  7. 861
      src/views/distribution/inventory/distrilbutionBillLading.vue
  8. 128
      src/views/distribution/inventory/distrilbutionBillLadingList.vue
  9. 34
      src/views/distribution/stockup/distributionStockup.vue
  10. 20
      src/views/distribution/stockup/distributionStockupDiscuss.vue
  11. 20
      src/views/distribution/stockup/distributionStockupMarket.vue
  12. 27
      src/views/distribution/stockup/distributionStockupSelf.vue
  13. 2
      vite.config.js

3
src/main.js

@ -12,7 +12,7 @@ import Avue from '@smallwei/avue';
import '@smallwei/avue/lib/index.css';
import crudCommon from '@/mixins/crud.js';
import globalc from '@/api/basicdata/globalc.js'
import { getScreen } from './utils/util';
import { getScreen,getHtmls } from './utils/util';
import functions from './utils/functions'
import './permission';
import error from './error';
@ -55,6 +55,7 @@ app.provide('functions',functions)
app.config.globalProperties.$globalc = globalc;
app.config.globalProperties.website = website;
app.config.globalProperties.getScreen = getScreen;
app.config.globalProperties.getHtmls = getHtmls;
app.use(error);
app.use(i18n);

218
src/option/distribution/distrilbutionBillLading.js

@ -123,7 +123,6 @@ export default {
label: "总件数",
prop: "quantity",
},
// {
// label: "已提件数",
// prop: "pickUpTime",
@ -1015,4 +1014,221 @@ export default {
search: true,
},
],
columnOrder: [
{
prop: 'serviceNumber',
label: '服务号',
width: '150',
head: false,
},
{
prop: 'waybillNumber ',
label: '运单号',
width: '150',
head: false,
},
{
prop: 'orderCode',
label: '订单自编号',
width: '150',
},
{
prop: 'mallName',
label: '商场名称',
width: '180',
},
{
prop: 'descriptionGoods',
label: '货物名称',
width: '180',
},
{
prop: 'warehouse',
label: '所在仓库',
width: '180',
},
{
prop: 'warehouseEntryTime',
label: '入库时间',
width: '180',
},
{
prop: 'warehouseEntryTimeEnd',
label: '最新入库时间',
width: '180',
},
{
prop: 'storeTime',
label: '在库时间',
width: '180',
},
{
prop: 'totalNumber',
label: '订单总件数',
width: '150',
},
{
prop: 'consigneeUnit',
label: '收货单位',
width: '150',
}, {
prop: 'consigneePerson',
label: '收货人',
width: '150',
}, {
prop: 'handQuantity',
label: '在库件数',
width: '150',
}, {
prop: 'availableQuantity',
label: '可用数量',
width: '150',
},
{
prop: 'notReceived',
label: '未入库数量',
width: '150',
}, {
prop: 'sortingQuantity',
label: '分拣数量',
width: '150',
}, {
prop: 'deliveryQuantity',
label: '配送数量',
width: '150',
}, {
prop: 'transferQuantity',
label: '中转数量',
width: '150',
}, {
prop: 'signinQuantity',
label: '签收数量',
width: '150',
},{
prop: 'groundingStatusName',
label: '上架状态',
width: '150',
},{
prop: 'allocation',
label: '货区-货位-货架',
width: '150',
},{
prop: 'resource',
label: '订单来源',
width: '150',
},
{
prop: 'trays',
label: '所在托盘',
width: '150',
},
{
prop: 'freezeStatusName',
label: '冻结状态',
width: '150',
},
{
prop: 'orderStatusName',
label: '订单状态',
width: '150',
},
{
prop: 'reservationStatusName',
label: '预约状态',
width: '150',
},
{
prop: 'stockupStatusName',
label: '备货状态',
width: '150',
},
{
prop: 'completeSetName',
label: '是否齐套',
width: '150',
},
{
prop: 'notification',
label: '通知状态',
width: '150',
},
{
prop: 'customerName',
label: '顾客名字',
width: '150',
},
{
prop: 'customerTelephone',
label: '顾客电话',
width: '150',
},
{
prop: 'customerAddress',
label: '顾客地址',
width: '150',
},
{
prop: 'fee',
label: '增值服务',
width: '150',
}, {
prop: 'createUserName',
label: '创建人',
width: '150',
}, {
prop: 'createTime',
label: '创建时间',
width: '150',
},
],
}

34
src/utils/util.js

@ -277,13 +277,13 @@ export const openWindow = (url, title, w, h) => {
const width = window.innerWidth
? window.innerWidth
: document.documentElement.clientWidth
? document.documentElement.clientWidth
: screen.width;
? document.documentElement.clientWidth
: screen.width;
const height = window.innerHeight
? window.innerHeight
: document.documentElement.clientHeight
? document.documentElement.clientHeight
: screen.height;
? document.documentElement.clientHeight
: screen.height;
const left = width / 2 - w / 2 + dualScreenLeft;
const top = height / 2 - h / 2 + dualScreenTop;
@ -291,13 +291,13 @@ export const openWindow = (url, title, w, h) => {
url,
title,
'toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=no, resizable=yes, copyhistory=no, width=' +
w +
', height=' +
h +
', top=' +
top +
', left=' +
left
w +
', height=' +
h +
', top=' +
top +
', left=' +
left
);
// Puts focus on the newWindow
@ -314,6 +314,18 @@ export const getScreen = isCollapse => {
}
};
export const getHtmls = (arrs, htmldemo) => {
let html = ''
arrs.map(item => {
let strhtml = JSON.parse(JSON.stringify(htmldemo));
for (let key in item) {
let str = '${' + key + '}';
strhtml = strhtml.replace(str, item[key]);
}
html += strhtml;
});
return html
}
/**
* 获取顶部地址栏地址
*/

8
src/utils/watermark.js

@ -11,8 +11,8 @@ let setWatermark = (str) => {
}
let can = document.createElement('canvas')
can.width = 600
can.height = 600
can.width = 700
can.height = 650
let cans = can.getContext('2d')
cans.rotate(-15 * Math.PI / 150)
@ -25,8 +25,8 @@ let setWatermark = (str) => {
let div = document.createElement('div')
div.id = id
div.style.pointerEvents = 'none'
div.style.top = '10px'
div.style.left = '10px'
div.style.top = '50px'
div.style.left = '60px'
div.style.position = 'fixed'
div.style.zIndex = '1000000'
div.style.width = document.documentElement.clientWidth + 'px'

35
src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue

@ -1774,20 +1774,6 @@ export default {
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 = ''
// }
// });
this.data = data.records;
this.data = this.data.map(i => {
const notificationMap = {
@ -1795,31 +1781,10 @@ export default {
'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;

946
src/views/distribution/inventory/distributionStockArticleDetails.vue

File diff suppressed because it is too large Load Diff

861
src/views/distribution/inventory/distrilbutionBillLading.vue

File diff suppressed because it is too large Load Diff

128
src/views/distribution/inventory/distrilbutionBillLadingList.vue

@ -3,12 +3,57 @@
<div class="avue-crud" >
<el-row>
<el-col :span="5">
<span style="margin-bottom: 2%;font-size: 20px"> 已通知500/1000 </span>
<span style="margin-bottom: 2%;font-size: 20px"> 待提货{{page.total}}/{{page.total}} </span>
</el-col>
<el-col :span="10">
<span style="margin-bottom: 2%;font-size: 20px"> 未通知500/1000</span>
<span style="margin-bottom: 2%;font-size: 20px"> 已提货{{page.total}}/{{page.total}}</span>
</el-col>
</el-row>
<el-row :hidden="!search" style="padding:6px 18px">
<!-- 查询模块 -->
<el-form :inline="true" :model="query">
<el-form-item label="订单自编号:">
<el-input v-model="query.orderCode" placeholder="请输入订单自编号" ></el-input>
</el-form-item>
<el-form-item label="入库时间:">
<!-- <el-input v-model="query.stockupArea" placeholder="请输入备货区"></el-input>-->
<el-date-picker
v-model="stockupDate"
type="datetimerange"
unlink-panels
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
:shortcuts="shortcuts"
/>
</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>
<el-button icon="el-icon-delete" @click="searchReset()"> </el-button>
</el-form-item>
</el-form>
</el-row>
<!--<el-row :hidden="!search" style="padding:6px 18px">
@ -33,6 +78,7 @@
<div class="avue-crud__left">
<!-- <el-button type="primary" icon="el-icon-plus" @click="handleAdd"> </el-button>
<el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain> </el-button>-->
<el-button type="primary" icon="el-icon-plus" @click="handleBillAdd">创建自提</el-button>
<el-button type="primary" icon="el-icon-plus" @click="handleAdd">自提签收</el-button>
</div>
@ -57,10 +103,11 @@
@selection="selectionChange"
>
<template #default="slotProps">
<el-button size="small" @click="editsolt(slotProps.scope)">修改</el-button>
<el-button size="small" type="danger" @click="delectsolt(slotProps.scope)"
>删除</el-button
>
<!-- <el-button size="small" @click="editsolt(slotProps.scope)">修改</el-button>-->
<el-button size="small" @click="handleLike(slotProps.scope)">查看</el-button>
<el-button type="primary" text icon="el-icon-edit" @click="handleEdits(slotProps.scope)">编辑提货信息</el-button>
<el-button size="small" type="danger" icon="el-icon-edit" text @click="delectsolt(slotProps.scope)">删除</el-button>
<el-button size="small" type="danger" icon="el-icon-edit" text @click="delectsolt(slotProps.scope)">签收</el-button>
</template>
</tablecmt>
</el-row>
@ -584,6 +631,7 @@ export default {
view: false,
//
query: {},
stockupDate:[],
//
page: {
currentPage: 1,
@ -603,6 +651,35 @@ export default {
distributionType: [],
costListName: [],
certificateType: [],
shortcuts :[
{
text: '最近一周',
value: () => {
const end = new Date()
const start = new Date()
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
return [start, end]
},
},
{
text: '最近一个月',
value: () => {
const end = new Date()
const start = new Date()
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
return [start, end]
},
},
{
text: '最近三个月',
value: () => {
const end = new Date()
const start = new Date()
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
return [start, end]
},
},
]
}
},
@ -666,7 +743,7 @@ export default {
this.columnList = newarr;
this.$functions.setStorage(window.location.pathname+'sortlist', headarr);
}
},
selectionsc(value) {
console.log(value);
@ -761,6 +838,7 @@ export default {
},
searchReset () {
this.query = {};
this.stockupDate = [];
this.page.currentPage = 1;
this.onLoad(this.page);
},
@ -784,7 +862,6 @@ export default {
}
}
}
},
async handleSubmit () {
@ -821,6 +898,33 @@ export default {
this.form = {}
this.box = true
},
handleBillAdd () {
this.$router.push({
path: '/distribution/inventory/distrilbutionBillLading',
query:{
type: '1'
}
});
},
//
handleLike(){
this.$message.warning("!!!");
},
handleEdits (row) {
// this.title = ''
// this.box = true
// getDetail(row.id).then(res => {
// this.form = res.data.data;
// });
this.$router.push({
path: '/distribution/inventory/distrilbutionBillLading',
query:{
id: row.row.id,
name: '编辑提货单',
type: '2'
}
});
},
handleEdit (row) {
this.title = '编辑'
this.box = true
@ -897,6 +1001,12 @@ export default {
},
onLoad (page, params = {}) {
this.loading = true;
if(this.stockupDate.length > 0){
let startDate = this.stockupDate[0];
let entDate = this.stockupDate[1];
params.startDate = this.getTime(startDate.toString());
params.entDate = this.getTime(entDate.toString());
}
getListOwn(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data;
console.log("???????",data);

34
src/views/distribution/stockup/distributionStockup.vue

@ -264,7 +264,7 @@ export default {
},
{
prop: 'stockupUser',
label: '备货人',
label: '操作人',
type: 2,
values: '',
width: '150',
@ -279,22 +279,22 @@ export default {
values: '',
width: '180',
checkarr: [
{
label: '未备货',
value: '1',
},
{
label: '待备货',
value: '2',
},
{
label: '备货中',
value: '3',
},
{
label: '已备货',
value: '4',
},
// {
// label: '',
// value: '1',
// },
// {
// label: '',
// value: '2',
// },
// {
// label: '',
// value: '3',
// },
// {
// label: '',
// value: '4',
// },
],
fixed: false,
sortable: true,

20
src/views/distribution/stockup/distributionStockupDiscuss.vue

@ -291,16 +291,16 @@ export default {
sortable: true,
head: false,
},
{
prop: 'stockupUser',
label: '备货人',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
// {
// prop: 'stockupUser',
// label: '',
// type: 2,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
{
prop: 'stockupStatusName',
label: '备货状态',

20
src/views/distribution/stockup/distributionStockupMarket.vue

@ -273,16 +273,16 @@ export default {
sortable: true,
head: false,
},
{
prop: 'stockupUser',
label: '备货人',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
// {
// prop: 'stockupUser',
// label: '',
// type: 2,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
{
prop: 'stockupStatusName',
label: '备货状态',

27
src/views/distribution/stockup/distributionStockupSelf.vue

@ -72,11 +72,11 @@
<!-- </el-icon>-->
<!-- </el-button>-->
<!-- <div v-if="bianjiKz" class="bianji">-->
<el-button type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope)">编辑提货信息</el-button>
<!-- <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope)">编辑提货信息</el-button>-->
<el-button type="primary" text icon="el-icon-edit" @click="handleBeiHuo(slotProps.scope)">编辑备货信息</el-button>
<!-- </div>-->
<!-- <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope)">取消</el-button>-->
<el-button type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope)">打印</el-button>
<el-button type="primary" text icon="el-icon-edit" @click="handlePrint(slotProps.scope)">打印</el-button>
</template>
</tablecmt>
</el-row>
@ -263,16 +263,16 @@ export default {
sortable: true,
head: false,
},
{
prop: 'stockupUser',
label: '备货人',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
// {
// prop: 'stockupUser',
// label: '',
// type: 2,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
{
prop: 'pickUpTime',
label: '备货时间',
@ -882,6 +882,9 @@ export default {
})
}
},
handlePrint(row){
this.$message.warning("!!!");
},
handleAdd () {
this.title = '新增'
this.form = {}

2
vite.config.js

@ -12,7 +12,7 @@ export default ({ mode, command }) => {
port: 2888,
proxy: {
'/api': {
target: 'http://192.168.10.200:8888',
target: 'http://192.168.10.75:8777',
//target: 'http://test3.javablade.com',
changeOrigin: true,
rewrite: path => path.replace(/^\/api/, ''),

Loading…
Cancel
Save