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

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

master
qb 1 year ago
parent
6455e3aed8 cc92b3d92b
commit
9448bf6d76
10 changed files with 2090 additions and 267 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. 27
      src/api/aftersales/aftersalesWorkOrder.js
  2. 8
      src/api/distribution/createTask.js
  3. 1
      src/option/aftersales/aftersalesWorkOrder.js
  4. 385
      src/option/aftersales/vueTvemp.js
  5. 32
      src/utils/util.js
  6. 1702
      src/views/aftersales/VueTemp.vue
  7. 2
      src/views/aftersales/aftersalesWorkOrder.vue
  8. 2
      src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocationDetails.vue
  9. 109
      src/views/distribution/checkInventoryTask/createTask.vue
  10. 89
      src/views/distribution/checkInventoryTask/createTaskt.vue

27
src/api/aftersales/aftersalesWorkOrder.js
Unescape View File

@ -83,4 +83,31 @@ export const $_getList = (params) => {
method: 'get',
params
})
}
// 首页工单新增
export const $_submit = (data) => {
return request({
url: '/api/logpm-aftersales/aftersalesWorkOrder/submit',
method: 'post',
data
})
}
// 首页查看详情
export const $_getDetail = (params) => {
return request({
url: '/api/logpm-aftersales/aftersalesWorkOrder/detail',
method: 'get',
params
})
}
// 首页删除
export const $_remove = (params) => {
return request({
url: '/api/logpm-aftersales/aftersalesWorkOrder/remove',
method: 'post',
params
})
}

8
src/api/distribution/createTask.js
Unescape View File

@ -54,6 +54,14 @@ export const postBatchDelete = params => {
params,
});
};
export const $_postBatchDelete = params => {
return request({
url: '/api/logpm-warehouse/blade-taskQuest/taskQuest/remove',
method: 'post',
params,
});
};
// 新增盘点任务
export const $_submit = (data) => {
return request({

1
src/option/aftersales/aftersalesWorkOrder.js
Unescape View File

@ -194,3 +194,4 @@ export default {
}
]
}

385
src/option/aftersales/vueTvemp.js
Unescape View File

@ -0,0 +1,385 @@
export const columnList = [
{
prop: '',
label: '复选框',
type: 0,
width: 55,
fixed: true,
},
{
prop: '',
label: '序号',
type: 12,
values: '',
width: 55,
fixed: true,
},
{
prop: 'workOrderTypeName',//workOrderType
label: '异常类型',
type: 3,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'discoveryNodeName',//discoveryNode
label: '发现节点',
type: 3,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'workOrderNumber',
label: '异常工单号',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'waybillNumber',
label: '运单号',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'orderCode',
label: '订单自编号',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'trainNumber',
label: '车次号',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'first',
label: '一级品',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'secondary',
label: '二级品',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'vehicleRoute',
label: '车辆线路',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'deliverGoodsTime',
label: '送货时间',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'discoveryTime',
label: '发现时间',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'warehousingTime',
label: '入库时间',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'waybillMall',
label: '运单商场',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'deliveryTime',
label: '配送时间',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'deliveryDriver',
label: '配送司机',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'workOrderStatus',
label: '工单状态',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'customerServiceName',
label: '归属客服名称',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'overTime',
label: '完结时间',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'problemDescription',
label: '异常问题描述',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'personResponsible',
label: '责任人(库内作业环节)',
type: 2,
values: '',
width: '170',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'processNumber',
label: '钉钉流程号',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'reviewedBy',
label: '审核人',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'auditTime',
label: '审核时间',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'entryTime',
label: '财务入账时间',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'remarks',
label: '备注',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'createUserName',
label: '操作',
type: 6,
values: '',
width: '200',
checkarr: [],
fixed: 'right',
sortable: false,
},
]
export const recordList = [
{
prop: 'entryTime',
label: '跟进时间',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'entryTime',
label: '跟进仓库',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'entryTime',
label: '跟进人',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'entryTime',
label: '处理结果',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'entryTime',
label: '备注',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'entryTime',
label: '图片',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'entryTime',
label: '更新日志',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
]

32
src/utils/util.js
Unescape View File

@ -487,3 +487,35 @@ export const setNodeHeight = (_node, _height = '') => {
console.log('_node :>> ', _defaultHeight - _node.getBoundingClientRect().top - 65 + 'px');
}
};
/**
* 下拉框搜索公共函数processRowProperty(index, row, details);
* @param {string} index index参数
* @param {object} row row (表头参数)
* @param {object} details details (搜索参数)
*/
//
const updateDetailQuery = (index, propName, obj) => {
// 更新或删除查询参数
if (index) {
obj[propName] = index;
} else {
delete obj[propName];
}
};
export const processRowProperty = (index, row, details) => {
const nameRegex = /(\w+)Name$/; // 捕获以'Name'结尾的属性名
const match = row.prop.match(nameRegex);
// 如果属性以'Name'结尾，则更新相应的查询参数
if (match) {
const basePropName = match[1]; // 获取不包含'Name'的属性名
updateDetailQuery(index, basePropName, details.query);
} else {
updateDetailQuery(index, row.prop, details.query);
}
// 如果提供的index为假值，从query中删除原始属性
if (!index) {
delete details.query[row.prop];
}
};

1702
src/views/aftersales/VueTemp.vue
View File

File diff suppressed because it is too large Load Diff

2
src/views/aftersales/aftersalesWorkOrder.vue
Unescape View File

@ -479,7 +479,7 @@ export default {
add(this.form).then(() => {
this.box = false;
// this.box = false;
this.onLoad(this.page);
this.$message({
type: "success",

2
src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocationDetails.vue
Unescape View File

@ -215,7 +215,7 @@ const details = reactive({
},
{
prop: 'orderCode',
label: '订单码',
label: '订单自编号',
type: 2,
values: '',
width: '130',

109
src/views/distribution/checkInventoryTask/createTask.vue
Unescape View File

@ -92,47 +92,28 @@
<div :class="ElBtnClass" v-if="item.type == 3">
<el-button
:link="ElButtonS[0].link"
:class="ElButtonS[0].class"
:auto-insert-space="ElButtonS[0].space"
:size="ElButtonS[0].size"
:icon="ElButtonS[0].icon"
@click="ViewEvent(props.row)"
>明细</el-button
>已盘点明细</el-button
>
<el-button
:link="ElButtonS[0].link"
:class="ElButtonS[0].class"
:auto-insert-space="ElButtonS[0].space"
:size="ElButtonS[0].size"
:icon="ElButtonS[0].icon"
@click="DetailsNotCounted(props.row)"
>未盘点明细</el-button
>
<el-button
:link="ElButtonS[0].link"
:class="ElButtonS[0].class"
:auto-insert-space="ElButtonS[0].space"
:size="ElButtonS[0].size"
:icon="ElButtonS[0].icon"
@click="Discard(props.row)"
>废弃</el-button
>
<el-button
:link="ElButtonS[1].link"
:class="ElButtonS[1].class"
:auto-insert-space="ElButtonS[1].space"
:size="ElButtonS[1].size"
:icon="ElButtonS[1].icon"
@click="extension(props.row)"
>延期</el-button
>
<el-button
:link="ElButtonS[3].link"
:class="ElButtonS[3].class"
:auto-insert-space="ElButtonS[3].space"
:size="ElButtonS[3].size"
:icon="ElButtonS[3].icon"
@click="comparativeData(props.row)"
>对比数据</el-button
>
@ -182,7 +163,7 @@
</div>
<!-- 弹窗详情 -->
<el-dialog v-model="PopupDetails" :title="!InventoryState?'盘点数据':'未盘点数据'" width="80%" :before-close="handleClose" :fullscreen="fullScreen">
<el-dialog v-model="PopupDetails" :title="!InventoryState?'盘点数据':'未盘点数据'" width="80%" :before-close="handleClose" :fullscreen="fullScreen">
<div style="margin-bottom: 10px">
<div style="display: flex">
<!-- v-if="TcMInventoryStatus" -->
@ -211,7 +192,7 @@
:data="TcPD"
row-key="name"
border
height="600"
:height="eightyPercentHeight + 'px'"
style="width: 100%"
@select-all="TcselectAll"
@select="TcselectChange"
@ -691,7 +672,7 @@ import {
$_questDetailIds,
$_exportGetContrastInfo,
$_getList,
postBatchDelete,
$_postBatchDelete,
} from '@/api/distribution/createTask';
import { ElMessageBox } from 'element-plus'
import { ElMessage } from 'element-plus';
@ -727,6 +708,7 @@ const Tcrow = ref(); //弹窗当前行
const WrapBarEditing = ref({}); //弹窗数据编辑
const PopupEditing = ref(false); //弹窗编辑
const ElBtnClass = ref(null);
const UncountedDetails=ref();//未盘点明细盘点必须参数
const contrastData = ref([]); //对比数据表格
const dialogcontrast = ref(false); //对比数据弹窗
const contrastloading = ref(false); //对比数据表格加载
@ -744,6 +726,8 @@ const readList = ref([]); //多选框
const TcReaJoin = ref([]); //零担库存品状态10，20，30...
const TcDataaddition = ref(false); //数据新增弹唱
const Fromnewlyadded = ref({}); //数据新增
const screenHeight = ref(0); // 屏幕高度
const eightyPercentHeight = ref(0); // 80% 高度
const Statusjudgment = ref(false); //新增按钮
const DbEx=ref(null);//对比明细导出
const fullScreen=ref(false);//是否全屏
@ -779,7 +763,7 @@ const menuData = ref([
label: '盘点任务编号',
type: 5,
values: '',
width: '260',
width: '200',
checkarr: [],
fixed: false,
search: true,
@ -790,7 +774,7 @@ const menuData = ref([
label: '仓库名称',
type: 4,
values: '',
width: '250',
width: '100',
checkarr: [],
fixed: false,
search: true,
@ -801,7 +785,7 @@ const menuData = ref([
label: '商城名称',
type: 4,
values: '',
width: '250',
width: '150',
checkarr: [],
fixed: false,
search: true,
@ -812,7 +796,7 @@ const menuData = ref([
label: '收货单位',
type: 4,
values: '',
width: '250',
width: '200',
checkarr: [],
fixed: false,
search: true,
@ -823,7 +807,7 @@ const menuData = ref([
label: '品牌名称',
type: 4,
values: '',
width: '250',
width: '200',
checkarr: [],
fixed: false,
search: false,
@ -893,7 +877,7 @@ const InventoryDetails = ref([
label: '订单自编号',
type: 5,
values: '',
width: '260',
width: '230',
checkarr: [],
fixed: true,
search: true,
@ -904,7 +888,7 @@ const InventoryDetails = ref([
label: '包条',
type: 5,
values: '',
width: '260',
width: '200',
checkarr: [],
fixed: true,
search: true,
@ -916,7 +900,7 @@ const InventoryDetails = ref([
label: '品类',
type: 6,
values: '',
width: '260',
width: '100',
checkarr: [
{
value: 1,
@ -940,7 +924,7 @@ const InventoryDetails = ref([
label: '盘点状态',
type: 6,
values: '',
width: '260',
width: '100',
checkarr: [
{
value: 0,
@ -968,7 +952,7 @@ const InventoryDetails = ref([
label: '货位',
type: 5,
values: '',
width: '260',
width: '150',
checkarr: [],
fixed: false,
search: true,
@ -977,7 +961,7 @@ const InventoryDetails = ref([
{
prop: 'materialName',
label: '物料名称',
type: 4,
type: 5,
values: '',
width: '260',
checkarr: [],
@ -988,7 +972,7 @@ const InventoryDetails = ref([
{
prop: 'trayCode',
label: '托盘码',
type: 4,
type: 5,
values: '',
width: '260',
checkarr: [],
@ -999,7 +983,7 @@ const InventoryDetails = ref([
{
prop: 'trayName',
label: '托盘名称',
type: 4,
type: 5,
values: '',
width: '150',
checkarr: [],
@ -1010,7 +994,7 @@ const InventoryDetails = ref([
{
prop: 'inventoryPerson',
label: '盘点人',
type: 4,
type: 5,
values: '',
width: '150',
checkarr: [],
@ -1021,7 +1005,7 @@ const InventoryDetails = ref([
{
prop: 'inventoryDate',
label: '盘点时间',
type: 4,
type: 5,
values: '',
width: '150',
checkarr: [],
@ -1088,7 +1072,7 @@ const InventoryDetails = ref([
{
prop: 'brandName',
label: '品牌',
type: 4,
type: 5,
values: '',
width: '250',
checkarr: [],
@ -1382,6 +1366,10 @@ const BtnfullScreen=()=>{
}
function onLoad() {
// 在组件挂载后获取屏幕高度
screenHeight.value = window.innerHeight;
// 计算80%的高度
eightyPercentHeight.value = screenHeight.value * 0.8;
getDictionaryBiz('logpm_unit').then(res => {
//异常类型
console.log(res, '字典返回值');
@ -1437,8 +1425,10 @@ const InInputSo=(values,val)=>{
// 搜索框
const InputSo = val => {
TcPdloading.value=true
console.log(val, '搜索框接收的值');
let data = {};
console.log(row.value,'row.value');
data.current = TccurrentPage.value;
data.size = TcpageSize.value;
// if (val.prop == 'categoryName') {
@ -1493,8 +1483,8 @@ const InputSo = val => {
// if (val.prop != 'categoryName' || val.prop != 'materialCode') {
let dataS = {
questNum: row.value.questNum,
questId: row.value.id,
questNum: UncountedDetails.value.questNum,
questId: UncountedDetails.value.id,
current: TccurrentPage.value, //页码
size: TcpageSize.value, //条数
[val.prop]: val.values,
@ -1660,7 +1650,8 @@ const InventoryModification = () => {
categoryName: item.categoryName,
questId: item.questId,
questNum: row.value.questNum,
name:item.Input
name:item.Input,
questStatus: 1
});
});
console.log(data, '要提交的数据');
@ -1705,6 +1696,7 @@ const TcViewEvent = (val,Inso) => {
questId: val.id,
current: TccurrentPage.value, //页码
size: TcpageSize.value, //条数
questStatus: 1,
...Inso
};
console.log(data, '要提交的数据');
@ -1747,10 +1739,9 @@ const Discard=(val)=>{
data.push(val.id)
let ids = data.join(',')
console.log(data);
ElMessageBox.confirm('是否废弃该盘点任务?')
ElMessageBox.confirm('是否废弃该盘点任务?')
.then(() => {
postBatchDelete({ids}).then(res=>{
$_postBatchDelete({ids}).then(res=>{
console.log(res,'删除成功');
if(res.data.code==200){
ElMessage({
@ -1769,10 +1760,10 @@ const Discard=(val)=>{
}
// 未盘点数据请求
const NotCountedFn = (row,Inso) => {
const NotCountedFn = (row,Inso,type=0) => {
TcPdloading.value = true;
$_getDetailInfo({
questStatus: 0,
questStatus: type,
questNum: row.questNum,
questId: row.id,
current: TccurrentPage.value, //页码
@ -1796,7 +1787,7 @@ const DetailsNotCounted = row => {
InventoryDetails.value.forEach(item=>{
item.values=null
})
UncountedDetails.value=row;
InventoryState.value=true;//修改弹窗标题（未盘点数据），
TcFrom.value={};//重置搜索
TccurrentPage.value = 1; //重置页码
@ -1807,7 +1798,17 @@ const DetailsNotCounted = row => {
PopupDetails.value = true;
NotCountedFn(row);
row.value = row;
console.log(row.value,'未盘点明细存储值');
};
// 未盘点转已盘点按钮
const NotInventoried = val => {
if (!Tcrow.value) {

89
src/views/distribution/checkInventoryTask/createTaskt.vue
Unescape View File

@ -168,7 +168,6 @@ import {
postAddtaskQuest,
getTaskQuestPage,
postEditTaskQuestUpdate,
postBatchDelete,
} from '@/api/distribution/createTask';
import { mapGetters } from 'vuex';
import dayjs from 'dayjs';
@ -491,33 +490,33 @@ export default {
/**
* 批量删除
*/
handleBatchDelete() {
if (this.selectionList.length === 0)
return this.$message({
type: 'error',
message: '最少选择一条数据',
});
const ids = this.selectionList.map(item => item.id).join(',');
this.$confirm('确定将选择数据删除?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
})
.then(async () => {
return postBatchDelete({ ids });
})
.then(res => {
this.onLoad(this.page);
const { code, msg } = res.data;
if (code === 200) {
return this.$message({
type: 'success',
message: msg,
});
}
});
},
// handleBatchDelete() {
// if (this.selectionList.length === 0)
// return this.$message({
// type: 'error',
// message: '最少选择一条数据',
// });
// const ids = this.selectionList.map(item => item.id).join(',');
// this.$confirm('确定将选择数据删除?', {
// confirmButtonText: '确定',
// cancelButtonText: '取消',
// type: 'warning',
// })
// .then(async () => {
// return postBatchDelete({ ids });
// })
// .then(res => {
// this.onLoad(this.page);
// const { code, msg } = res.data;
// if (code === 200) {
// return this.$message({
// type: 'success',
// message: msg,
// });
// }
// });
// },
btnsc(index, row) {
console.log(index, row);
@ -683,23 +682,23 @@ export default {
/**
* 删除单个任务
*/
handleDeleteCheck(row) {
this.$confirm('确定将选择数据删除?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
})
.then(() => {
return postBatchDelete({ ids: row.id });
})
.then(() => {
this.onLoad(this.page);
this.$message({
type: 'success',
message: '操作成功!',
});
});
},
// handleDeleteCheck(row) {
// this.$confirm('确定将选择数据删除?', {
// confirmButtonText: '确定',
// cancelButtonText: '取消',
// type: 'warning',
// })
// .then(() => {
// return postBatchDelete({ ids: row.id });
// })
// .then(() => {
// this.onLoad(this.page);
// this.$message({
// type: 'success',
// message: '操作成功!',
// });
// });
// },
/**
* 查看单个任务

Write Preview
Loading…
Cancel
Save