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

修改提货编辑

dev-warehouse
caoyizhong 2 years ago
parent
2479873ae4
commit
aaa16be310
10 changed files with 887 additions and 236 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. 556
      src/option/distribution/distrilbutionBillLading.js
  2. 2
      src/router/views/index.js
  3. 1
      src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
  4. 23
      src/views/distribution/inventory/distrilbutionBillLading.vue
  5. 81
      src/views/distribution/stockup/distributionStockup.vue
  6. 151
      src/views/distribution/stockup/distributionStockupDetailsSelf.vue
  7. 82
      src/views/distribution/stockup/distributionStockupDiscuss.vue
  8. 82
      src/views/distribution/stockup/distributionStockupMarket.vue
  9. 137
      src/views/distribution/stockup/distributionStockupSelf.vue
  10. 8
      src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue

556
src/option/distribution/distrilbutionBillLading.js
Unescape View File

@ -460,5 +460,559 @@ export default {
label: "费用合计",
prop: "totalCost",
},
]
],
columnReservation: [ // 备货订单
{
label: "主键",
prop: "id",
display: false,
hide: true,
},
{
label: "租户号",
prop: "tenantId",
display: false,
hide: true,
},
{
label: "创建人",
prop: "createUser",
display: false,
hide: true,
},
{
label: "创建时间",
prop: "createTime",
display: false,
hide: true,
},
{
label: "更新人",
prop: "updateUser",
display: false,
hide: true,
},
{
label: "更新时间",
prop: "updateTime",
display: false,
hide: true,
},
{
label: "状态",
prop: "status",
display: false,
hide: true,
},
{
label: "是否已删除",
prop: "isDeleted",
display: false,
hide: true,
},
{
label: "创建部门",
prop: "createDept",
display: false,
hide: true,
},
// {
// label: "备货时间",
// prop: "stockupDate",
// format: "YYYY-MM-DD hh:mm:ss",
// valueFormat: "YYYY-MM-DD hh:mm:ss",
// },
// {
// label: "配送单号",
// prop: "stockupUser",
// },
{
label: "收货人",
prop: "consignee",
search: true,
},
{
label: "收货电话",
prop: "deliveryPhone",
search: true,
},
{
label: "收货地址",
prop: "deliveryAddress",
search: true,
},
{
label: "收货单位",
prop: "mallName",
},
{
label: "订单自编号",
prop: "stockArticleId",
display: false,
},
// {
// label: "配送单号",
// prop: "reserve2",
// display: false,
// },
{
label: "备货状态",
prop: "stockupStatusName",
display: false,
},
// {
// label: "配送状态",
// prop: "reserve4",
// display: false,
// },
/* {
label: "装车件数",
prop: "reserve5",
display: false,
},
{
label: "签收件数",
prop: "reserve3",
display: false,
},
{
label: "回库件数",
prop: "reserve4",
display: false,
},
{
label: "是否加急",
prop: "reserve5",
display: false,
},
{
label: "状态",
prop: "reserve5",
display: false,
},*/
],
columnStockOrder: [ // 备货订单
{
label: "主键",
prop: "id",
display: false,
hide: true,
},
{
label: "租户号",
prop: "tenantId",
display: false,
hide: true,
},
{
label: "创建人",
prop: "createUser",
display: false,
hide: true,
},
{
label: "创建时间",
prop: "createTime",
display: false,
hide: true,
},
{
label: "更新人",
prop: "updateUser",
display: false,
hide: true,
},
{
label: "更新时间",
prop: "updateTime",
display: false,
hide: true,
},
{
label: "状态",
prop: "status",
display: false,
hide: true,
},
{
label: "是否已删除",
prop: "isDeleted",
display: false,
hide: true,
},
{
label: "创建部门",
prop: "createDept",
display: false,
hide: true,
},
// {
// label: "备货时间",
// prop: "stockupDate",
// format: "YYYY-MM-DD hh:mm:ss",
// valueFormat: "YYYY-MM-DD hh:mm:ss",
// },
{
label: "订单自编号",
prop: "orderSelfNumbering",
},
{
label: "货物名称",
prop: "descriptionGoods",
search: true,
},
/* {
label: "物料名称",
prop: "stockupArea",
search: true,
},*/
{
label: "备货件数",
prop: "totalNumber",
search: true,
},
{
label: "已备数量",
prop: "esau",
},
{
label: "备货状态",
prop: "stockupStatusName",
display: false,
},
// {
// label: "备货时间",
// prop: "stockupDate",
// display: false,
// },
// {
// label: "托盘码",
// prop: "reserve3",
// display: false,
// },
{
label: "库位信息",
prop: "stockipAllocation",
display: false,
},
// {
// label: "备货区",
// prop: "stockupArea",
// display: false,
// },
],
columnStockingBag: [ //备货包件
{
label: "主键",
prop: "id",
display: false,
hide: true,
},
{
label: "租户号",
prop: "tenantId",
display: false,
hide: true,
},
{
label: "创建人",
prop: "createUser",
display: false,
hide: true,
},
{
label: "创建时间",
prop: "createTime",
display: false,
hide: true,
},
{
label: "更新人",
prop: "updateUser",
display: false,
hide: true,
},
{
label: "更新时间",
prop: "updateTime",
display: false,
hide: true,
},
{
label: "状态",
prop: "status",
display: false,
hide: true,
},
{
label: "是否已删除",
prop: "isDeleted",
display: false,
hide: true,
},
{
label: "创建部门",
prop: "createDept",
display: false,
hide: true,
},
{
label: "包条码",
prop: "packetBarCode",
},
{
label: "一级品",
prop: "firsts",
search: true,
},
{
label: "二级品",
prop: "second",
search: true,
},
{
label: "三级品",
prop: "thirdProduct",
search: true,
},
{
label: "物料名称",
prop: "materialName",
},
{
label: "备货状态",
prop: "stockUp",
display: false,
},
// {
// label: "备货时间",
// prop: "stockupDate",
// display: false,
// },
{
label: "托盘码",
prop: "pallet",
display: false,
},
{
label: "库位信息",
prop: "goodsAllocation",
display: false,
},
// {
// label: "备货区",
// prop: "stockupArea",
// display: false,
// },
],
columnInventory: [ //库存品
{
label: "主键",
prop: "id",
display: false,
hide: true,
},
{
label: "租户号",
prop: "tenantId",
display: false,
hide: true,
},
{
label: "创建人",
prop: "createUser",
display: false,
hide: true,
},
{
label: "创建时间",
prop: "createTime",
display: false,
hide: true,
},
{
label: "更新人",
prop: "updateUser",
display: false,
hide: true,
},
{
label: "更新时间",
prop: "updateTime",
display: false,
hide: true,
},
{
label: "状态",
prop: "status",
display: false,
hide: true,
},
{
label: "是否已删除",
prop: "isDeleted",
display: false,
hide: true,
},
{
label: "创建部门",
prop: "createDept",
display: false,
hide: true,
},
{
label: "SKU",
prop: "sku",
},
{
label: "订单编号",
prop: "orderSelfNumbering",
search: true,
},
{
label: "物料名称",
prop: "descriptionGoods",
search: true,
},
{
label: "单位",
prop: "cargoUnit",
search: true,
},
{
label: "备货数",
prop: "quantity",
},
{
label: "已备数量",
prop: "number",
display: false,
},
{
label: "备货状态",
prop: "StockUp",
display: false,
},
// {
// label: "备货时间",
// prop: "stockupDate",
// display: false,
// },
{
label: "托盘码",
prop: "pallet",
display: false,
},
{
label: "库位信息",
prop: "goodsAllocation",
display: false,
},
// {
// label: "备货区",
// prop: "stockupArea",
// },
],
columnBasic: [ //基本信息
{
label: "主键",
prop: "id",
display: false,
hide: true,
},
{
label: "租户号",
prop: "tenantId",
display: false,
hide: true,
},
{
label: "创建人",
prop: "createUser",
display: false,
hide: true,
},
{
label: "创建时间",
prop: "createTime",
display: false,
hide: true,
},
{
label: "更新人",
prop: "updateUser",
display: false,
hide: true,
},
{
label: "更新时间",
prop: "updateTime",
display: false,
hide: true,
},
{
label: "状态",
prop: "status",
display: false,
hide: true,
},
{
label: "是否已删除",
prop: "isDeleted",
display: false,
hide: true,
},
{
label: "创建部门",
prop: "createDept",
display: false,
hide: true,
},
// {
// label: "备货时间",
// prop: "stockupDate",
// format: "YYYY-MM-DD hh:mm:ss",
// valueFormat: "YYYY-MM-DD hh:mm:ss",
// },
{
label: "备货编号",
prop: "stockupCode",
},
// {
// label: "商场名称",
// prop: "stockupStatus",
// search: true,
// },
{
label: "备货时间",
prop: "pickUpTime",
search: true,
},
{
label: "提货人",
prop: "consignee",
search: true,
},
{
label: "提货车牌",
prop: "pickUpPlate",
},
{
label: "提货总费用",
prop: "totalCost",
},
/* {
label: "配送车次",
prop: "condition",
search: true,
},*/
{
label: "备货区",
prop: "stockupArea",
search: true,
},
],
}

2
src/router/views/index.js
Unescape View File

@ -707,7 +707,7 @@ export default [
children: [
{
path: '/distribution/stockup/distributionStockupDetailsSelf',
name: '备货明细',
name: '自提明细',
meta: {
i18n: 'dict',
},

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

@ -1153,6 +1153,7 @@ export default {
path: '/distribution/inventory/distrilbutionBillLading',
query:{
id: this.ids,
type: '1'
}
});
},

23
src/views/distribution/inventory/distrilbutionBillLading.vue
Unescape View File

@ -491,14 +491,25 @@ export default {
},
mounted () {
this.init();
this.onLoad(this.page);
if(this.$route.query.type == '2'){
//查询提货编辑数据
this.getDetailOen();
}else{
this.onLoad(this.page);
}
},
watch:{
'$route.query.id':{
handler(newVal, oldVal) {
// console.log(newVal, oldVal);
this.onLoad(this.page);
this.onLoadOwn(this.page);
if(this.$route.query.type == '2'){
//查询提货编辑数据
this.getDetailOen();
}else{
this.onLoad(this.page);
this.onLoadOwn(this.page);
}
},
deep: true,
immediate: true
@ -531,6 +542,12 @@ export default {
}
},
methods: {
//查询提货详情信息
getDetailOen(){
getDetail(this.$route.query.id).then(res =>{
console.log("详情信息》》》》",res.data.data);
})
},
//移除数据
rowStock (row) {
console.log(">>?>?><?",row);

81
src/views/distribution/stockup/distributionStockup.vue
Unescape View File

@ -26,7 +26,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" text icon="el-icon-edit" @click="handleForklift" >指派叉车司机</el-button>
<el-button type="primary" text icon="el-icon-edit" @click="handleForklift" >指派配货信息</el-button>
</div>
<!-- 头部右侧按钮模块 -->
<div class="avue-crud__right">
@ -55,7 +55,7 @@
<template #default="slotProps">
<el-button type="primary" text icon="el-icon-view" @click="handleView(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="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="handleEdit(slotProps.scope)">打印</el-button>
</template>
</tablecmt>
@ -77,6 +77,15 @@
</el-row>
<el-dialog v-model="dialogFormCustomer" title="指派叉车">
<el-form :model="form">
<el-form-item label="备货时间" :label-width="formLabelWidth" v-if="this.num=='2'">
<el-date-picker style="width: 25%;"
v-model="form.stockupDate"
type="datetime"
format="YYYY-MM-DD HH:mm:ss"
value-format="YYYY-MM-DD HH:mm:ss"
placeholder="时间"
/>
</el-form-item>
<el-form-item label="叉车司机" :label-width="formLabelWidth">
<el-select v-model="form.forkliftId" clearable placeholder="请选择叉车司机" @change="getForklift($event,'1')">
<el-option
@ -112,7 +121,7 @@
<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="callFordelivery('3')"> 确定 </el-button>
<el-button type="primary" @click="callFordelivery()"> 确定 </el-button>
</span>
</template>
</el-dialog>
@ -381,7 +390,7 @@ export default {
label: '操作',
type: 6,
values: '',
width: '280',
width: '230',
checkarr: [],
fixed: 'right',
hide: true,
@ -413,6 +422,7 @@ export default {
},
// 表单数据
form: {},
formOne: {},
// 选择行
selectionList: [],
// 表单配置
@ -424,6 +434,7 @@ export default {
goodsAreaIdData: [],
distributionType: [],
deptId: '',
num: '',
}
},
mounted () {
@ -665,6 +676,7 @@ export default {
* 指派叉车查询的司机
*/
handleForklift(){
if (this.selectionList.length === 0) {
this.$message.warning("请选择至少一条数据");
return;
@ -678,25 +690,42 @@ export default {
})
// = this.selectionList.findIndex(i => i.assignStatus == 2);
if(!a){
this.num = '3';
this.dialogFormCustomer = true;
this.getFork();
this.getTeam()
this.getTeam();
}else{
this.$message.warning("已指派，请勿重复指派！！！")
}
},
//确定指派
callFordelivery(){
this.form.ids = this.ids;
console.log("数据》》》",this.form);
addAssign(this.form).then(res =>{
this.$message({
type: "success",
message: "操作成功！"
});
this.onLoad(this.page);
this.dialogFormCustomer = false;
})
if(this.num =='3'){
this.form.ids = this.ids;
console.log("数据》》》",this.form);
addAssign(this.form).then(res =>{
this.$message({
type: "success",
message: "操作成功！"
});
this.onLoad(this.page);
this.dialogFormCustomer = false;
})
}else if(this.num == '2'){
console.log(">>>>>>>",this.formOne);
update(Object.assign(this.formOne,this.form)).then(res =>{
console.log(">>>>>>>",this.formOne);
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
this.dialogFormCustomer = false;
})
}
},
init () {
this.height = this.setPx(document.body.clientHeight - 340);
@ -749,11 +778,23 @@ export default {
this.box = true
},
handleEdit (row) {
this.title = '编辑'
this.box = true
getDetail(row.id).then(res => {
this.form = res.data.data;
});
// this.title = '编辑'
// this.box = true
// getDetail(row.id).then(res => {
// this.form = res.data.data;
// });
console.log("row<<<<<",row);
this.form.forkliftId = row.row.forkliftId;
this.form.loaderId = row.row.loaderId;
this.form.goodsAreaId = row.row.goodsAreaId;
this.form.stockupDate = row.row.stockupDate;
this.dialogFormCustomer = true;
this.num = '2';
this.formOne = row.row;
this.getFork();
this.getTeam();
},
handleView (row) {
// this.title = '查看'

151
src/views/distribution/stockup/distributionStockupDetailsSelf.vue
Unescape View File

@ -19,46 +19,6 @@
</template>
</el-table>
</el-row>
<!-- <el-row style="margin-bottom: 5%">
&lt;!&ndash; 列表模块 &ndash;&gt;
<el-table ref="table" v-loading="loading"
@selection-change="selectionChange"
:data="data"
height="20%"
style="width: 100%"
:border="option.border">
<template v-for="(item,index) in option.columnTakeOver">
&lt;!&ndash; table字段 &ndash;&gt;
<el-table-column v-if="item.hide!==true"
:prop="item.prop"
:label="item.label"
:width="item.width"
:key="index">
</el-table-column>
</template>
</el-table>
</el-row>
<el-row style="margin-bottom: 5%">
&lt;!&ndash; 列表模块 &ndash;&gt;
<el-table ref="table" v-loading="loading"
@selection-change="selectionChange"
:data="data"
style="width: 100%"
:border="option.border">
<template v-for="(item,index) in option.columnStockUp">
&lt;!&ndash; table字段 &ndash;&gt;
<el-table-column v-if="item.hide!==true"
:prop="item.prop"
:label="item.label"
:width="item.width"
:key="index">
</el-table-column>
</template>
</el-table>
</el-row>-->
<el-row>
<el-tabs
type="card"
@ -67,50 +27,6 @@
v-model="activeName"
@tab-click="handleClick"
>
<el-tab-pane label="预约列表" name="reservation">
<el-table ref="table" v-loading="loading"
@selection-change="selectionChange"
:data="data3"
:height="height"
style="width: 100%"
:border="option.border">
<!-- <el-table-column type="selection" v-if="option.selection" width="55" align="center"></el-table-column>-->
<el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>
<el-table-column v-if="option.index" label="序号" type="index" width="60" align="center">
</el-table-column>
<template v-for="(item,index) in option.columnReservation">
<!-- table字段 -->
<el-table-column v-if="item.hide!==true"
:prop="item.prop"
:label="item.label"
:width="item.width"
:key="index">
</el-table-column>
</template>
<!-- 操作栏模块 -->
<!-- <el-table-column prop="menu" label="操作" :width="220" align="center">-->
<!-- <template #="{row}">-->
<!-- &lt;!&ndash; <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>&ndash;&gt;-->
<!-- &lt;!&ndash; <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>&ndash;&gt;-->
<!-- &lt;!&ndash; <el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>&ndash;&gt;-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
<div class="avue-crud__pagination" style="width:100%">
<!-- 分页模块 -->
<el-pagination align="right"
background
@size-change="sizeChange"
@current-change="currentChange"
:current-page="page3.currentPage"
:page-sizes="[10, 20, 30, 40, 50, 100]"
:page-size="page3.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="page3.total">
</el-pagination>
</div>
</el-tab-pane>
<el-tab-pane label="订单列表" name="library">
<el-table ref="table" v-loading="loading"
@selection-change="selectionChange"
@ -131,14 +47,6 @@
:key="index">
</el-table-column>
</template>
<!-- 操作栏模块 -->
<!-- <el-table-column prop="menu" label="操作" :width="220" align="center">-->
<!-- <template #="{row}">-->
<!-- &lt;!&ndash; <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>&ndash;&gt;-->
<!-- &lt;!&ndash; <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>&ndash;&gt;-->
<!-- &lt;!&ndash; <el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>&ndash;&gt;-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
<div class="avue-crud__pagination" style="width:100%">
<!-- 分页模块 -->
@ -162,7 +70,7 @@
:height="height"
style="width: 100%"
:border="option.border">
<el-table-column type="selection" v-if="option.selection" width="55" align="center"></el-table-column>
<!-- <el-table-column type="selection" v-if="option.selection" width="55" align="center"></el-table-column>-->
<el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>
<el-table-column v-if="option.index" label="序号" type="index" width="60" align="center">
</el-table-column>
@ -175,14 +83,14 @@
:key="index">
</el-table-column>
</template>
<!-- 操作栏模块 -->
<!-- 操作栏模块
<el-table-column prop="menu" label="操作" :width="220" align="center">
<template #="{row}">
<!-- <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>-->
<!-- <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>-->
<!-- <el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>-->
&lt;!&ndash; <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>&ndash;&gt;
&lt;!&ndash; <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>&ndash;&gt;
&lt;!&ndash; <el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>&ndash;&gt;
</template>
</el-table-column>
</el-table-column>-->
</el-table>
<div class="avue-crud__pagination" style="width:100%">
<!-- 分页模块 -->
@ -251,7 +159,7 @@
</el-pagination>
</div>
</el-row>-->
<el-dialog v-model="dialogFormCustomer" title="修改客户信息">
<!-- <el-dialog v-model="dialogFormCustomer" title="修改客户信息">
<el-form :model="formCustomer">
<el-form-item label="姓名" :label-width="formLabelWidth">
<el-input v-model="formCustomer.name" autocomplete="off" />
@ -271,11 +179,11 @@
<template #footer>
<span class="dialog-footer">
<el-button @click="dialogFormCustomer = false">取消</el-button>
<!-- <el-button type="primary" @click="dialogFormVisible = false"> 确定 </el-button>-->
&lt;!&ndash; <el-button type="primary" @click="dialogFormVisible = false"> 确定 </el-button>&ndash;&gt;
<el-button type="primary" @click="callFordelivery('3')"> 确定 </el-button>
</span>
</template>
</el-dialog>
</el-dialog>-->
</div>
</basic-container>
</template>
@ -290,7 +198,7 @@ import {
getDetailStockupOwn,
getDetailReservationOwn, getDetailOrderOwn, getDetailInventoryOwn
} from '@/api/distribution/distrilbutionBillLading';
import option from "@/option/distribution/distributionStockup";
import option from "@/option/distribution/distrilbutionBillLading";
import { mapGetters } from "vuex";
import { getDictionaryBiz } from '@/api/system/dict';
import { getParcelListOwn } from '@/api/distribution/distributionParcelList';
@ -299,7 +207,7 @@ export default {
data () {
return {
height: 0,
activeName: 'reservation',
activeName: 'library',
// 弹框标题
title: '',
// 是否展示弹框
@ -307,7 +215,7 @@ export default {
// 是否显示查询
search: true,
// 加载中
loading: true,
loading: false,
// 是否为查看模式
view: false,
// 查询信息
@ -413,6 +321,7 @@ export default {
//库存品
this.getInventoryList(this.page2);
}
},
init () {
this.height = this.setPx(document.body.clientHeight - 570);
@ -635,46 +544,18 @@ export default {
// this.loading = true;
this.query.id = this.$route.query.id;
getDetailStockupOwn(this.$route.query.id).then(res => {
// console.log("返回的值",res.data.data);
console.log("返回的值",res.data.data);
const data = res.data.data;
this.data[0] = data;
const { serveType, deliveryWay, deliveryType } = this.data[0];
const serveTypes = serveType.split(',');
const deliveryWays = deliveryWay.split(',');
const deliveryTypes = deliveryType.split(',');
const serveTypeName = this.getOwnServer(serveTypes, '', this.serveTypeList) || null;
const deliveryWayName = this.getOwnServer(deliveryWays, '', this.deliveryWayList) || null;
const deliveryTypeName = this.getOwnServer(deliveryTypes, '', this.distributionType) || null;
Object.assign(this.data[0], {
serveTypeName,
deliveryWayName,
deliveryTypeName
});
this.loading = false;
this.getReservationList(page);
this.getOrderList(page);
// console.log(">>>>>",this.data[0],deliveryTypeName,deliveryWayName,serveTypeName);
this.selectionClear();
});
} ,
//查询预约列表
async getReservationList(page){
let a =await getDetailReservationOwn(page.currentPage,page.pageSize,{id :this.$route.query.id});
// console.log("......",a.data);
const data = a.data.data;
this.data3 = data.records;
this.data3.forEach(i =>{
let b = this.stockupStatusList.find( a => a.dictKey == i.stockupStatus);
if(!!b){
i.stockupStatusName = b.dictValue;
}
})
this.page3.total = a.data.data.total;
this.loading = false;
this.selectionClear();
},
//查询包件列表
async getStockUpParcelsList(page){
let a = await getParcelListOwn(page.currentPage,page.pageSize,{id :this.$route.query.id});
let a = await getDetailReservationOwn(page.currentPage,page.pageSize,{id :this.$route.query.id});
console.log("包件...",a.data);
const data = a.data.data;
this.data1 = data.records;

82
src/views/distribution/stockup/distributionStockupDiscuss.vue
Unescape View File

@ -26,7 +26,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" text icon="el-icon-edit" @click="handleForklift" >指派叉车司机</el-button>
<el-button type="primary" text icon="el-icon-edit" @click="handleForklift" >指派配货信息</el-button>
</div>
<!-- 头部右侧按钮模块 -->
<div class="avue-crud__right">
@ -55,7 +55,7 @@
<template #default="slotProps">
<el-button type="primary" text icon="el-icon-view" @click="handleView(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="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="handleEdit(slotProps.scope)">打印</el-button>
</template>
</tablecmt>
@ -77,6 +77,15 @@
</el-row>
<el-dialog v-model="dialogFormCustomer" title="指派叉车">
<el-form :model="form">
<el-form-item label="备货时间" :label-width="formLabelWidth" v-if="this.num=='2'">
<el-date-picker style="width: 25%;"
v-model="form.stockupDate"
type="datetime"
format="YYYY-MM-DD HH:mm:ss"
value-format="YYYY-MM-DD HH:mm:ss"
placeholder="时间"
/>
</el-form-item>
<el-form-item label="叉车司机" :label-width="formLabelWidth">
<el-select v-model="form.forkliftId" clearable placeholder="请选择叉车司机" @change="getForklift($event,'1')">
<el-option
@ -112,7 +121,7 @@
<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="callFordelivery('3')"> 确定 </el-button>
<el-button type="primary" @click="callFordelivery()"> 确定 </el-button>
</span>
</template>
</el-dialog>
@ -381,7 +390,7 @@ export default {
label: '操作',
type: 6,
values: '',
width: '280',
width: '230',
checkarr: [],
fixed: 'right',
hide: true,
@ -413,6 +422,7 @@ export default {
},
// 表单数据
form: {},
formOne: {},
// 选择行
selectionList: [],
// 表单配置
@ -424,6 +434,7 @@ export default {
goodsAreaIdData: [],
distributionType: [],
deptId: '',
num: '',
}
},
mounted () {
@ -665,6 +676,7 @@ export default {
* 指派叉车查询的司机
*/
handleForklift(){
if (this.selectionList.length === 0) {
this.$message.warning("请选择至少一条数据");
return;
@ -678,25 +690,42 @@ export default {
})
// = this.selectionList.findIndex(i => i.assignStatus == 2);
if(!a){
this.num = '3';
this.dialogFormCustomer = true;
this.getFork();
this.getTeam()
this.getTeam();
}else{
this.$message.warning("已指派，请勿重复指派！！！")
}
},
//确定指派
callFordelivery(){
this.form.ids = this.ids;
console.log("数据》》》",this.form);
addAssign(this.form).then(res =>{
this.$message({
type: "success",
message: "操作成功！"
});
this.onLoad(this.page);
this.dialogFormCustomer = false;
})
if(this.num =='3'){
this.form.ids = this.ids;
console.log("数据》》》",this.form);
addAssign(this.form).then(res =>{
this.$message({
type: "success",
message: "操作成功！"
});
this.onLoad(this.page);
this.dialogFormCustomer = false;
})
}else if(this.num == '2'){
console.log(">>>>>>>",this.formOne);
update(Object.assign(this.formOne,this.form)).then(res =>{
console.log(">>>>>>>",this.formOne);
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
this.dialogFormCustomer = false;
})
}
},
init () {
this.height = this.setPx(document.body.clientHeight - 340);
@ -749,11 +778,23 @@ export default {
this.box = true
},
handleEdit (row) {
this.title = '编辑'
this.box = true
getDetail(row.id).then(res => {
this.form = res.data.data;
});
// this.title = '编辑'
// this.box = true
// getDetail(row.id).then(res => {
// this.form = res.data.data;
// });
console.log("row<<<<<",row);
this.form.forkliftId = row.row.forkliftId;
this.form.loaderId = row.row.loaderId;
this.form.goodsAreaId = row.row.goodsAreaId;
this.form.stockupDate = row.row.stockupDate;
this.dialogFormCustomer = true;
this.num = '2';
this.formOne = row.row;
this.getFork();
this.getTeam();
},
handleView (row) {
// this.title = '查看'
@ -833,7 +874,6 @@ 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;

82
src/views/distribution/stockup/distributionStockupMarket.vue
Unescape View File

@ -26,7 +26,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" text icon="el-icon-edit" @click="handleForklift" >指派叉车司机</el-button>
<el-button type="primary" text icon="el-icon-edit" @click="handleForklift" >指派配货信息</el-button>
</div>
<!-- 头部右侧按钮模块 -->
<div class="avue-crud__right">
@ -55,7 +55,7 @@
<template #default="slotProps">
<el-button type="primary" text icon="el-icon-view" @click="handleView(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="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="handleEdit(slotProps.scope)">打印</el-button>
</template>
</tablecmt>
@ -77,6 +77,15 @@
</el-row>
<el-dialog v-model="dialogFormCustomer" title="指派叉车">
<el-form :model="form">
<el-form-item label="备货时间" :label-width="formLabelWidth" v-if="this.num=='2'">
<el-date-picker style="width: 25%;"
v-model="form.stockupDate"
type="datetime"
format="YYYY-MM-DD HH:mm:ss"
value-format="YYYY-MM-DD HH:mm:ss"
placeholder="时间"
/>
</el-form-item>
<el-form-item label="叉车司机" :label-width="formLabelWidth">
<el-select v-model="form.forkliftId" clearable placeholder="请选择叉车司机" @change="getForklift($event,'1')">
<el-option
@ -112,7 +121,7 @@
<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="callFordelivery('3')"> 确定 </el-button>
<el-button type="primary" @click="callFordelivery()"> 确定 </el-button>
</span>
</template>
</el-dialog>
@ -381,7 +390,7 @@ export default {
label: '操作',
type: 6,
values: '',
width: '280',
width: '230',
checkarr: [],
fixed: 'right',
hide: true,
@ -413,6 +422,7 @@ export default {
},
// 表单数据
form: {},
formOne: {},
// 选择行
selectionList: [],
// 表单配置
@ -424,6 +434,7 @@ export default {
goodsAreaIdData: [],
distributionType: [],
deptId: '',
num: '',
}
},
mounted () {
@ -665,6 +676,7 @@ export default {
* 指派叉车查询的司机
*/
handleForklift(){
if (this.selectionList.length === 0) {
this.$message.warning("请选择至少一条数据");
return;
@ -678,25 +690,42 @@ export default {
})
// = this.selectionList.findIndex(i => i.assignStatus == 2);
if(!a){
this.num = '3';
this.dialogFormCustomer = true;
this.getFork();
this.getTeam()
this.getTeam();
}else{
this.$message.warning("已指派，请勿重复指派！！！")
}
},
//确定指派
callFordelivery(){
this.form.ids = this.ids;
console.log("数据》》》",this.form);
addAssign(this.form).then(res =>{
this.$message({
type: "success",
message: "操作成功！"
});
this.onLoad(this.page);
this.dialogFormCustomer = false;
})
if(this.num =='3'){
this.form.ids = this.ids;
console.log("数据》》》",this.form);
addAssign(this.form).then(res =>{
this.$message({
type: "success",
message: "操作成功！"
});
this.onLoad(this.page);
this.dialogFormCustomer = false;
})
}else if(this.num == '2'){
console.log(">>>>>>>",this.formOne);
update(Object.assign(this.formOne,this.form)).then(res =>{
console.log(">>>>>>>",this.formOne);
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
this.dialogFormCustomer = false;
})
}
},
init () {
this.height = this.setPx(document.body.clientHeight - 340);
@ -749,11 +778,23 @@ export default {
this.box = true
},
handleEdit (row) {
this.title = '编辑'
this.box = true
getDetail(row.id).then(res => {
this.form = res.data.data;
});
// this.title = '编辑'
// this.box = true
// getDetail(row.id).then(res => {
// this.form = res.data.data;
// });
console.log("row<<<<<",row);
this.form.forkliftId = row.row.forkliftId;
this.form.loaderId = row.row.loaderId;
this.form.goodsAreaId = row.row.goodsAreaId;
this.form.stockupDate = row.row.stockupDate;
this.dialogFormCustomer = true;
this.num = '2';
this.formOne = row.row;
this.getFork();
this.getTeam();
},
handleView (row) {
// this.title = '查看'
@ -833,7 +874,6 @@ 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;

137
src/views/distribution/stockup/distributionStockupSelf.vue
Unescape View File

@ -26,7 +26,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" text icon="el-icon-edit" @click="handleForklift" >指派叉车司机</el-button>
<el-button type="primary" text icon="el-icon-edit" @click="handleForklift" >指派配货信息</el-button>
</div>
<!-- 头部右侧按钮模块 -->
<div class="avue-crud__right">
@ -54,8 +54,17 @@
>
<template #default="slotProps">
<el-button type="primary" text icon="el-icon-view" @click="handleView(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="handleEdit(slotProps.scope)">取消</el-button>
<!-- <el-button type="primary" text v-on:mouseover="handleMouseEnter" v-on:mouseout="handleMouseLeave">-->
<!-- 编辑-->
<!-- <el-icon class="el-icon&#45;&#45;right">-->
<!-- <arrow-down />-->
<!-- </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="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>
</template>
</tablecmt>
@ -232,7 +241,7 @@ export default {
{
prop: 'stockupCode',
label: '备货编码',
type: 4,
type: 2,
values: '',
width: '150',
checkarr: [],
@ -316,17 +325,28 @@ export default {
fixed: false,
sortable: true,
},
// {
// prop: 'goodsAreaId',
// label: '备货区编号',
// type: 2,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: true,
// },
{
prop: '配送车次',
label: '备货区编号',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: true,
},
{
prop: '配送司机',
label: '备货区编号',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: true,
},
{
prop: 'forkliftName',
label: '叉车司机',
@ -382,7 +402,7 @@ export default {
label: '操作',
type: 6,
values: '',
width: '280',
width: '230',
checkarr: [],
fixed: 'right',
hide: true,
@ -391,6 +411,7 @@ export default {
],
columnListedit: [],
drawerShow: false,
bianjiKz: false,
height: 0,
// 弹框标题
title: '',
@ -425,6 +446,7 @@ export default {
goodsAreaIdData: [],
distributionType: [],
deptId: '',
num: '',
}
},
mounted () {
@ -458,6 +480,14 @@ export default {
}
},
methods: {
//移出
handleMouseLeave(){
this.bianjiKz = false;
},
//移入
handleMouseEnter(){
this.bianjiKz = true;
},
//选择
getForklift(row,ty){
console.log("执行了了了了",row);
@ -679,6 +709,7 @@ export default {
})
// = this.selectionList.findIndex(i => i.assignStatus == 2);
if(!a){
this.num = '3'
this.dialogFormCustomer = true;
this.getFork();
this.getTeam()
@ -688,16 +719,32 @@ export default {
},
//确定指派
callFordelivery(){
this.form.ids = this.ids;
console.log("数据》》》",this.form);
addAssign(this.form).then(res =>{
this.$message({
type: "success",
message: "操作成功！"
});
this.onLoad(this.page);
this.dialogFormCustomer = false;
})
if(this.num =='3'){
this.form.ids = this.ids;
console.log("数据》》》",this.form);
addAssign(this.form).then(res =>{
this.$message({
type: "success",
message: "操作成功！"
});
this.onLoad(this.page);
this.dialogFormCustomer = false;
})
}else if(this.num == '2'){
console.log(">>>>>>>",this.formOne);
update(Object.assign(this.formOne,this.form)).then(res =>{
console.log(">>>>>>>",this.formOne);
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
this.dialogFormCustomer = false;
})
}
},
init () {
this.height = this.setPx(document.body.clientHeight - 340);
@ -750,12 +797,37 @@ export default {
this.box = true
},
handleEdit (row) {
this.title = '编辑'
this.box = true
getDetail(row.id).then(res => {
this.form = res.data.data;
// 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'
}
});
},
//备货编辑
handleBeiHuo (row) {
// if(row.row.assignStatus == '1'){
// this.$message.warning("")
// }else{
console.log("",row.row);
this.form.forkliftId = !!row.row.forkliftId && row.row.forkliftId != -1 ? row.row.forkliftId : null;
this.form.loaderId = !!row.row.loaderId && row.row.loaderId != -1 ? row.row.loaderId : null;
this.form.goodsAreaId = !!row.row.goodsAreaId && row.row.goodsAreaId != -1 ? row.row.goodsAreaId : null;
this.dialogFormCustomer = true;
this.num = '2';
this.formOne = row.row;
this.getFork();
this.getTeam();
// }
},
handleView (row) {
// this.title = '查看'
// this.view = true;
@ -869,3 +941,8 @@ export default {
}
};
</script>
<style >
.bianji{
}
</style>

8
src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue
Unescape View File

@ -796,10 +796,10 @@ export default {
} else {
// console.log("修改！！！");
if(!this.form.orderNumber){
this.$message.warning("请完善订单自编号！！");
return ;
}
// if(!this.form.orderNumber){
// this.$message.warning("请完善订单自编号！！");
// return ;
// }
console.log("this.form",this.form);
this.form.list = this.data;
update(this.form).then(() => {

Write Preview
Loading…
Cancel
Save