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

修复已知bug

dev-xx
马远东 11 months ago
parent
b80d335af4
commit
ca9be539f0
3 changed files with 385 additions and 93 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. 357
      src/views/aftersales/aftersalesWorkOrderAddTemp.vue
  2. 1
      src/views/distribution/deliverylist/distributionDeliveryListedt.vue
  3. 120
      src/views/distribution/inventory/distrilbutionBillLadingView.vue

357
src/views/aftersales/aftersalesWorkOrderAddTemp.vue
Unescape View File

@ -14,15 +14,23 @@
</div>
<!-- 主体内容 -->
<div class="content">
<el-form :model="form" label-width="30%" style="width: 100%" label-position="top">
<el-form
ref="ruleFormRef"
:rules="ruleForm"
:model="form"
label-width="30%"
style="width: 100%"
label-position="top"
>
<!-- 头部类型选择 -->
<div class="tablemunTop">
<!-- 异常类型 -->
<el-form-item label="异常类型">
<el-form-item label="异常类型" prop="workOrderType">
<el-select
v-model="form.workOrderType"
placeholder="请选择异常类型"
style="width: 100%"
clearable
>
<el-option
v-for="item in Exceptionoptions"
@ -33,7 +41,7 @@
</el-select>
</el-form-item>
<!-- 发现节点 -->
<el-form-item label="发现节点">
<el-form-item label="发现节点" prop="discoveryNode">
<el-select
v-model="form.discoveryNode"
placeholder="请选择发现节点"
@ -44,6 +52,7 @@
:key="item.value"
:label="item.label"
:value="item.value"
clearable
/>
</el-select>
</el-form-item>
@ -54,53 +63,219 @@
</div>
<!-- 包件信息 -->
<el-tabs v-model="form.activPackage" class="demo-tabs Packagebox" @tab-click="handleClick">
<el-tabs
v-model="form.activPackage"
class="demo-tabs Packagebox"
@tab-click="handleClick"
v-loading="form.Packageloading"
>
<el-tab-pane label="包件信息" name="0">
<el-button type="primary" class="el_addPackage" @click="Addpackages">
<el-icon><Plus /></el-icon>新增包件</el-button
>
<div class="el_top">
<el-button type="primary" class="el_addPackage" @click="Addpackages">
<el-icon><Plus /></el-icon>新增包件</el-button
>
<div class="el_Package_num">
<span>共计包件:{{ form.PackageList.length }}</span>
</div>
</div>
<template v-for="(item, index) in form.PackageList" :key="index + item.packageCode">
<div class="el_Package">
<div class="Package">
<el-form-item label="包条码">
<el-input v-model="item.packageCode" placeholder="请输入包条码" />
<el-form-item
:prop="`PackageList[${index}.packageCode]`"
:rules="ruleForm.packageCode"
label="包条码"
>
<el-input v-model="item.packageCode" placeholder="请输入包条码" clearable />
</el-form-item>
<el-form-item label="运单号">
<el-input v-model="item.waybillNumber" placeholder="请输入运单号" />
<el-form-item
label="运单号"
:prop="`PackageList[${index}.waybillNumber]`"
:rules="ruleForm.waybillNumber"
>
<el-input v-model="item.waybillNumber" placeholder="请输入运单号" clearable />
</el-form-item>
<el-form-item label="订单自编号">
<el-input v-model="item.orderCode" placeholder="请输入订单自编号" />
<el-form-item
label="订单自编号"
:prop="`PackageList[${index}.orderCode]`"
:rules="ruleForm.orderCode"
>
<el-input v-model="item.orderCode" placeholder="请输入订单自编号" clearable />
</el-form-item>
<el-form-item label="一级品">
<el-input v-model="item.first" placeholder="请输入一级品" />
<el-form-item
label="一级品"
:prop="`PackageList[${index}.first]`"
:rules="ruleForm.first"
>
<el-input v-model="item.first" placeholder="请输入一级品" clearable />
</el-form-item>
<el-form-item label="二级品">
<el-input v-model="item.secondary" placeholder="请输入二级品" />
<el-form-item
label="二级品"
:prop="`PackageList[${index}.secondary]`"
:rules="ruleForm.secondary"
>
<el-input v-model="item.secondary" placeholder="请输入二级品" clearable />
</el-form-item>
<el-form-item label="品牌">
<el-input v-model="item.brandName" placeholder="请输入品牌" />
<el-form-item
label="品牌"
:prop="`PackageList[${index}.brandName]`"
:rules="ruleForm.brandName"
>
<el-input v-model="item.brandName" placeholder="请输入品牌" clearable />
</el-form-item>
</div>
<!-- 按钮 -->
<div class="el_activPackage_btton">
<el-button type="primary">查看历史包件</el-button>
<el-button type="primary" @click="Removepackage(index)">移除</el-button>
<el-button @click="ViewhistoricalPackages">查看历史包件</el-button>
<el-button v-if="index" type="primary" @click="Removepackage(index)"
>移除</el-button
>
</div>
</div>
</template>
</el-tab-pane>
</el-tabs>
<!-- 基础信息 -->
<el-tabs
v-model="form.activPackage"
class="demo-tabs Packagebox"
@tab-click="handleClick"
v-loading="form.Packageloading"
>
<el-tab-pane label="基础信息" name="0">
<div class="Basicinformation">
<el-form-item label="车次号" prop="trainNumber">
<el-select
v-model="form.trainNumber"
placeholder="请选择车次号"
style="width: 100%"
>
<el-option
v-for="item in Discoveringoptions"
:key="item.value"
:label="item.label"
:value="item.value"
clearable
/>
</el-select>
</el-form-item>
<el-form-item label="配送时间" prop="deliveryTime">
<el-date-picker
v-model="form.deliveryTime"
style="width: 100%"
type="datetime"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
placeholder="请选择配送时间"
/>
</el-form-item>
<el-form-item label="配送司机" prop="deliveryDriver">
<el-input v-model="form.deliveryDriver" placeholder="请输配送司机" clearable />
</el-form-item>
<el-form-item label="车辆线路" prop="vehicleRoute">
<el-input v-model="form.vehicleRoute" placeholder="请输入车辆线路" clearable />
</el-form-item>
<el-form-item label="发货时间" prop="deliverGoodsTime">
<el-date-picker
v-model="form.deliverGoodsTime"
style="width: 100%"
type="datetime"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
placeholder="请选择发货时间"
/>
</el-form-item>
<el-form-item label="入库时间" prop="warehousingTime">
<el-date-picker
v-model="form.warehousingTime"
style="width: 100%"
type="datetime"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
placeholder="请选择入库时间"
/>
</el-form-item>
<el-form-item label="发现时间" prop="discoveryTime">
<el-date-picker
v-model="form.discoveryTime"
style="width: 100%"
type="datetime"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
placeholder="请选择发现时间"
/>
</el-form-item>
<el-form-item label="运单商场" prop="waybillMall">
<el-input v-model="form.waybillMall" placeholder="请输入运单商场" clearable />
</el-form-item>
<el-form-item label="合作模式" prop="typeServiceName">
<el-input v-model="form.typeServiceName" placeholder="合作模式(自动带出)" clearable />
</el-form-item>
<div class="el_Basic">
<el-form-item label="处理方" prop="processor" class="el_Processing">
<el-select
v-model="form.processor"
placeholder="请选择处理方"
style="width: 100%"
>
<el-option
v-for="item in Discoveringoptions"
:key="item.value"
:label="item.label"
:value="item.value"
clearable
/>
</el-select>
</el-form-item>
<el-form-item label="调查经过" prop="deliveryTime" class="el_Investigation">
<el-input v-model="form.investigationPocess" placeholder="请输调查经过" clearable />
</el-form-item>
</div>
</div>
</el-tab-pane>
</el-tabs>
</el-form>
</div>
<el-button type="primary" @click="onSubmit">提交</el-button>
</div>
<!-- 历史包件弹窗 -->
<el-dialog v-model="form.historydialog" title="查看历史包件" width="500">
<div class="el_details">
<el-form-item label="历史包件">
<el-select v-model="form.discoveryNode" placeholder="历史包件选择" style="width: 100%">
<el-option
v-for="item in form.Historicalpackage"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-button>查看详情</el-button>
</div>
<template #footer>
<div class="dialog-footer">
<el-button @click="form.historydialog = false"> 取消</el-button>
<el-button type="primary" @click="historyPush">查看</el-button>
</div>
</template>
</el-dialog>
</template>
<script setup>
import { ref } from 'vue';
import { ref, reactive } from 'vue';
import { ElMessage, ElMessageBox } from 'element-plus';
import { getDictionaryBiz } from '@/api/system/dict'; //字典
import {
$_getList,
@ -115,6 +290,9 @@ const form = ref({
TabactiveName: '0', //工单类型菜单
activPackage: '0', //包件信息菜单
Pageloading: false, //页面加载
Packageloading: false, //包件加载
historydialog: false, //历史包件弹窗
// 包件列表
PackageList: [
{
sequence: 1, //序号
@ -126,8 +304,20 @@ const form = ref({
brandName: '', //品牌
history: true, //是否有历史包间
},
], //包件列表
], //历史包件列表
Historicalpackage: [],
});
const ruleForm = reactive({
workOrderType: [{ required: true, message: '请选择异常类型', trigger: 'change' }],
discoveryNode: [{ required: true, message: '请选择发现节点', trigger: 'change' }],
packageCode: [{ required: true, message: '请输入包条码', trigger: 'change' }],
waybillNumber: [{ required: true, message: '请输入运单号', trigger: 'change' }],
orderCode: [{ required: true, message: '请输入订单自编号', trigger: 'change' }],
first: [{ required: true, message: '请输入一级品', trigger: 'change' }],
secondary: [{ required: true, message: '请输入二级品', trigger: 'change' }],
brandName: [{ required: true, message: '请输入品牌', trigger: 'change' }],
});
const ruleFormRef = ref(); //表单示例
// 异常类型
const Exceptionoptions = ref([]);
// 发现节点
@ -151,8 +341,17 @@ const onLoad = async () => {
form.value.Pageloading = false; //关闭页面加载
};
onLoad();
// 菜单切换
const handleClick = (tab, event) => {
console.log(tab, event);
};
// 新增包件
const Addpackages = () => {
form.value.Packageloading = true;
let time = setTimeout(() => {
form.value.Packageloading = false;
clearTimeout(time);
}, 300);
let data = {
packageCode: '', //包条码
waybillNumber: '', //运单号
@ -164,21 +363,40 @@ const Addpackages = () => {
form.value.PackageList.push(data);
};
// 移除包件
const Removepackage = async index => {
const Removepackage = index => {
console.log(index, 'index');
await form.value.PackageList.splice(index, 1); //移除当前点击的按钮
ElMessage({
message: '移除成功.',
type: 'success',
plain: true,
});
ElMessageBox.confirm('是否移除当前包件信息?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
})
.then(async () => {
await form.value.PackageList.splice(index, 1); //移除当前点击的按钮
ElMessage({
message: '移除成功.',
type: 'success',
plain: true,
});
})
.catch(() => {
ElMessage({
type: 'info',
message: 'Delete canceled',
});
});
};
// 菜单切换
const handleClick = (tab, event) => {
console.log(tab, event);
// 历史包件查看
const ViewhistoricalPackages = () => {
form.value.historydialog = true; //打开弹窗
};
const historyPush = () => {};
// 提交
const onSubmit = async () => {};
const onSubmit = () => {
ruleFormRef.value.validate(valid => {
console.log(valid, '123123');
});
};
const TabactiveClick = (a, b) => {
console.log(a, b);
};
@ -233,14 +451,22 @@ const TabactiveClick = (a, b) => {
.el_Package {
display: flex;
align-items: center;
.el_activPackage_btton {
flex: 1;
display: flex;
justify-content: space-between;
margin: 0px 3%;
}
}
:deep(.is-active) {
font-weight: bold;
}
:deep(.Package) {
width: 80%;
display: flex;
justify-content: flex-start;
justify-content: space-between;
.el-form-item {
width: 16%;
.el-form-item__label {
margin-bottom: 0;
}
@ -250,7 +476,66 @@ const TabactiveClick = (a, b) => {
background-color: #409eff;
border: none;
color: #ffffff;
margin-bottom: 11px;
}
.el_top {
display: flex;
align-items: center;
margin-bottom: 10px;
height: 40px;
.el_Package_num {
margin-left: 120px;
font-size: 14px;
height: 80%;
border-bottom: 1px solid #409eff;
display: flex;
align-items: center;
justify-content: center;
padding: 12px;
box-sizing: border-box;
span {
color: #666;
font-weight: 500;
}
}
}
}
.el_details {
display: flex;
align-items: flex-start;
justify-content: space-between;
.el-form-item {
width: 78%;
}
}
.Basicinformation {
width: 100%;
display: flex;
flex-wrap: wrap;
:deep(.el-form-item) {
width: 12.8%;
margin-right: 10px;
.el-form-item__content {
height: 29px;
.el-input {
height: 100% !important;
.el-input__wrapper {
height: 100%;
}
}
}
.el-form-item__label {
margin-bottom: 0;
}
}
.el_Basic{
flex: 1;
display: flex;
.el_Processing{
width: 54%;
}
.el_Investigation{
flex: 1;
}
}
}
</style>

1
src/views/distribution/deliverylist/distributionDeliveryListedt.vue
Unescape View File

@ -5146,6 +5146,7 @@ export default {
this.view = true;
this.box = true;
this.wid = row.id;
this.reservationActiveName ='reservationPackage'
this.getWrapdetails(this.wpage);
await this.$nextTick();

120
src/views/distribution/inventory/distrilbutionBillLadingView.vue
Unescape View File

@ -240,28 +240,8 @@ export default {
head: false,
},
{
prop: 'scanUser',
label: '签收人',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'signingTime',
label: '签收时间',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
// {
// prop: 'trainNumber',
// label: '客户车次号',
@ -295,8 +275,8 @@ export default {
head: false,
},
{
prop: 'totalNumber', //需要新增字段
label: '订单总数',
prop: 'descriptionGoods',
label: '货物名称',
type: 2,
values: '',
width: '150',
@ -305,10 +285,9 @@ export default {
sortable: true,
head: false,
},
{
prop: 'handQuantity', //需要新增字段
label: '应提货件数',
prop: 'materialName',
label: '物料名称',
type: 2,
values: '',
width: '150',
@ -318,9 +297,9 @@ export default {
head: false,
},
{
prop: 'pickUpQuantity', //需要新增字段
label: '提货件数',
type: 2,
prop: 'totalNumber', //需要新增字段
label: '订单总数',
type: 1,
values: '',
width: '150',
checkarr: [],
@ -330,9 +309,9 @@ export default {
},
{
prop: 'conditionsName', //需要新增字段
label: '提货状态',
type: 2,
prop: 'handQuantity', //需要新增字段
label: '计划件数',
type: 1,
values: '',
width: '150',
checkarr: [],
@ -341,9 +320,9 @@ export default {
head: false,
},
{
prop: 'descriptionGoods',
label: '货物名称',
type: 2,
prop: 'handQuantity',
label: '备货件数',
type: 1,
values: '',
width: '150',
checkarr: [],
@ -352,9 +331,9 @@ export default {
head: false,
},
{
prop: 'materialName',
label: '物料名称',
type: 2,
prop: 'pickUpQuantity', //需要新增字段
label: '实提件数',
type: 1,
values: '',
width: '150',
checkarr: [],
@ -363,8 +342,8 @@ export default {
head: false,
},
{
prop: 'handQuantity',
label: '备货件数',
prop: 'stockupStatusName',
label: '备货状态',
type: 2,
values: '',
width: '150',
@ -374,8 +353,8 @@ export default {
head: false,
},
{
prop: 'preparedQuantity',
label: '已备数量',
prop: 'conditionsName', //需要新增字段
label: '提货状态',
type: 2,
values: '',
width: '150',
@ -384,10 +363,35 @@ export default {
sortable: true,
head: false,
},
// {
// prop: 'preparedQuantity',
// label: '已备数量',
// type: 2,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
{
prop: 'stockupStatusName',
label: '备货状态',
type: 2,
prop: 'signingTime',
label: '签收时间',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'scanUser',
label: '签收人',
type: 1,
values: '',
width: '150',
checkarr: [],
@ -406,6 +410,7 @@ export default {
sortable: true,
head: false,
},
{
prop: 'goodsAllocation',
label: '货位信息',
@ -417,6 +422,7 @@ export default {
sortable: true,
head: false,
},
],
//库存品
inventoryoption: [
@ -617,17 +623,17 @@ export default {
sortable: true,
head: false,
},
{
prop: 'orderPackageStatusName',
label: '包件状态',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
// {
// prop: 'orderPackageStatusName',
// label: '包件状态',
// type: 2,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
// {
// prop: 'orderPackageCode',//需要新增字段
// label: '备货状态',

Write Preview
Loading…
Cancel
Save