Browse Source

【nev-平板】业务库移页面开发

ag_report_nev
安虹睿 12 months ago
parent
commit
99583332ca
  1. 17
      fe/PC/src/api/wms-api.js
  2. 9
      fe/PC/src/api/wms-job.js
  3. 2
      fe/PC/src/components/commonTabel-drawer/style/index.scss
  4. 3
      fe/PC/src/components/newAndEdiDialog/index.vue
  5. 10
      fe/PC/src/components/umyTable/index.vue
  6. 22
      fe/PC/src/utils/tableColumns/index.js
  7. 24
      fe/PC/src/utils/tabsDesTions/index.js
  8. 173
      fe/PC/src/views/padManage/padTransferLibJob.vue

17
fe/PC/src/api/wms-api.js

@ -700,6 +700,23 @@ export function getInjectioModelPlanBom(data) {
})
}
// 通过packingCode获取库存余额表
export function getInventoryByPackingCode(packingCode){
return request({
url: baseURL + 'wms/inventory/inventory-balance/by-packing-code/' + packingCode,
method: 'get',
})
}
// 成品发运申请-批量生成发货单
export function deliverRequestHandleList(ids) {
return request({
url: baseURL + 'wms/store/deliver-request/handle-list',
method: 'post',
data:ids
})
}
// 客户退拆任务-完成 todo
// export async function productionRecycleJobComplete(id) {
// return request({

9
fe/PC/src/api/wms-job.js

@ -245,3 +245,12 @@ export function countJobResetByNumber(data) {
data:data
})
}
// 【pad】业务库移-生成库移
export function transferLibJobHandel(id, data) {
return request({
url: baseURL + 'wms/store/transfer-lib-job/handle/' + id,
method: 'post',
data:data
})
}

2
fe/PC/src/components/commonTabel-drawer/style/index.scss

@ -121,5 +121,5 @@
content: unset !important;
}
::v-deep .el-descriptions--medium.is-bordered .el-descriptions-item__cell{
min-width: 200px !important;
min-width: 180px !important;
}

3
fe/PC/src/components/newAndEdiDialog/index.vue

@ -27,6 +27,9 @@
@radioChange="radioChange"
@changeSelect="changeSelect"
>
<template>
<slot></slot>
</template>
<template v-if="showmyTable">
<el-form-item class="formTable-box" prop="details">
<currenTable

10
fe/PC/src/components/umyTable/index.vue

@ -21,7 +21,7 @@
:cell-class-name="cellClassName"
>
<!-- :tree-props="treeProps" height 不能共存 此组件暂不支持tree的格式-->
<u-table-column v-if="selectionTable" fixed="left" type="selection" :reserve-selection="true" />
<u-table-column v-if="selectionTable" fixed="left" type="selection" :reserve-selection="true" :selectable='selectEnable'/>
<u-table-column v-if="isShowIndex" type="index" fixed="left" label="序号" width="50" />
<template v-for="(item, index) in TableSize">
<u-table-column
@ -584,6 +584,14 @@ export default {
this.setTableHeightHandle()
},
methods: {
//
selectEnable(row, rowIndex) {
if (!row.tableSelectEnable) {
return true
} else {
return false
}
},
//
clearSelection(){
this.$refs.multipleTable.clearSelection();

22
fe/PC/src/utils/tableColumns/index.js

@ -4978,14 +4978,24 @@ export const KittingIssueNote = [
// 【pad】业务库移
export const padTransferLibJob = [
{ label: "请求单号", prop: "number", fixed: "left", type: "name" },
{ label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" },
{ label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
{ label: "来源库位列表", prop: 'fromLocationCodeJsonList',type:"showDetail",isJson:true,showProp:true },
{ label: "目标库位代码", prop: "toLocationCode" },
{ label: "目标ERP库位", prop: "toLocationErpCode" },
{ label: "任务单号", prop: "number", fixed: "left", type: "name" },
{ label: "申请单号", prop: 'requestNumber',width: orderWidth },
{ label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" },
{ label: "回调服务名称", prop: "callServerName" },
{ label: "回调业务类型", prop: "callBusinessType" },
{ label: "传入申请单号", prop: "callRequestNumber" },
{ label: "传入任务单号", prop: "callJobNumber" },
// { label: "任务类型", prop: 'jobType' },
{ label: "任务描述", prop: 'jobDescription' },
{ label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
{ label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" },
{ label: "确认时间", prop: 'confirmTime' },
{ label: "备注", prop: "remark" },
{ label: "操作员", prop: "worker" },
{ label: "承接用户", prop: "acceptUserName" },
{ label: "承接时间", prop: 'acceptTime', type: "dateTime" },
{ label: "完成者用户名", prop: 'completeUserName' },
{ label: "完成时间", prop: "completeTime", type: "dateTime" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]

24
fe/PC/src/utils/tabsDesTions/index.js

@ -3744,3 +3744,27 @@ export const KittingIssueNote = [
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
// 【pad】业务库移
export const padTransferLibJob = [
{ label: "任务单号", prop: "number", fixed: "left", type: "name" },
{ label: "申请单号", prop: 'requestNumber' },
{ label: "状态", prop: "jobStatus",type: "filter", filters: "jobStatus" },
{ label: "回调服务名称", prop: "callServerName" },
{ label: "回调业务类型", prop: "callBusinessType" },
{ label: "传入申请单号", prop: "callRequestNumber" },
{ label: "传入任务单号", prop: "callJobNumber" },
// { label: "任务类型", prop: 'jobType' },
{ label: "任务描述", prop: 'jobDescription' },
{ label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
{ label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" },
{ label: "确认时间", prop: 'confirmTime' },
{ label: "备注", prop: "remark" },
{ label: "操作员", prop: "worker" },
{ label: "承接用户", prop: "acceptUserName" },
{ label: "承接时间", prop: 'acceptTime', type: "dateTime" },
{ label: "完成者用户名", prop: 'completeUserName' },
{ label: "完成时间", prop: "completeTime", type: "dateTime" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]

173
fe/PC/src/views/padManage/padTransferLibJob.vue

@ -44,7 +44,8 @@
:drawer="displayDialog.detailsDialog"
:propsData="propsData"
:tabsDesTions="tabsDesTions"
:Butttondata="[]"
:Butttondata="DrawerButtonData"
@drawerbutton="drawerbutton"
@drawerShut="(val) => (displayDialog.detailsDialog = val)"
@handleCommand="drawerHandle"
@close-value="closeValue"
@ -54,26 +55,104 @@
@alterResultCountDetails="alterResultCountDetails"
@alertoldSkipCountDetails="alertoldSkipCountDetails"
></curren-Drawer>
</div>
<!-- 新增与编辑 -->
<newAndEdiDialog
:loading="Loading.newAndEdiLoading"
:active="active"
:pageStatus="pageStatus"
:formReveal="formReveal"
:formTitle="formTitle"
:displayDialog="editDialog"
:FormData="formReveal ? CreateFormData : editFormData"
:Form="formReveal ? CreateForm : editForm"
:Options="editOptions"
:Handle="editHandle"
:Rules="formReveal ? editRules.cerateRule : editRules.editRule"
@FormSubmit="FormSubmitHandle"
@close="FormClose"
@goBack="goBack"
>
<template>
<curren-descriptions
v-if="this.displayDialog.newDialog"
:border="true"
:column="3"
:direction="'horizontal'"
:colon="false"
:tabsDesTions="detailsTableColumns"
:propsData="propsData.details[0]"
class="drawerDescriptionsFirst"
style="width:100%;padding-top:20px"
>
</curren-descriptions>
</template>
<script>
import { tableMixins } from "@/mixins/TableMixins";
import { LoadingMixins } from "@/mixins/LoadingMixins";
import { drawerMixins } from "@/mixins/drawerMixins";
import { TableHeaderMixins } from "@/mixins/TableHeaderMixins";
import { mixins } from "@/mixins/mixins";
export default {
</newAndEdiDialog>
<!-- 搜索按钮窗体组件 -->
<searchPage
ref="searchTable"
:tableLoading="Loading.autoTableLoading"
:advancedFilter="advancedFilter()"
:filterPageListParams="filterPageListParams"
:formTitle="searchTitle"
:displayDialog="displayDialog.AddNewDialog"
:searchTableData="searchData"
:searchTableColumns="searchColumns"
:searchTotalCount="searchTotalCount"
:supplierItemPage="searchPageListParams"
@handleSelectionChange="prepareFormData"
@SizeChange="searchAlterResultCount($event, searchPageListParams)"
@CurrentChange="searchAlertoldSkipCount($event, searchPageListParams)"
@tableButtonClick="searchSubmit(arguments)"
></searchPage>
</div>
</template>
<script>
import { tableMixins } from "@/mixins/TableMixins";
import { LoadingMixins } from "@/mixins/LoadingMixins";
import { drawerMixins } from "@/mixins/drawerMixins";
import { TableHeaderMixins } from "@/mixins/TableHeaderMixins";
import { mixins } from "@/mixins/mixins";
import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
import { filterSelectMixins } from '@/mixins/filter-Select'
import { transferLibJobHandel } from '@/api/wms-job'
import { getInventoryByPackingCode } from '@/api/wms-api'
import currenDescriptions from "@/components/currenDescriptions"
export default {
name: "padTransferLibJob",
components: {
currenDescriptions,
},
mixins: [
tableMixins,
LoadingMixins,
drawerMixins,
TableHeaderMixins,
mixins,
filterSelectMixins,
newAndEdiDialogMixins
],
computed: {
editDialog: {
get: function () {
return this.displayDialog.newDialog || this.displayDialog.editDialog;
},
},
//
hideButton: function () {
return function (val) {
let data = true
val.forEach(key => {
if (this.propsData.jobStatus == key) {
data = false
}
})
return data
}
}
},
data() {
return {
URL: "wms/store/kitting-issue-request",
URL: "wms/store/transfer-lib-job",
//
currenButtonData: [
// this.defaultImportBtn(),//
@ -81,13 +160,77 @@
this.defaultFreshBtn(),//
this.defaultFilterBtn(),//
],
DrawerButtonData:[
{
type:'success',
label: '完成库移',
name: "handle",
hide: () => { return this.hideButton([1,2,4]) },
size:"mini"
},
],
CreateFormData: {
packingCode:"",
fromLocationCode:"",
toLocationCode:"",
},
CreateForm: [
{ type: "input", label: "箱码", prop: 'packingCode', colSpan: 12, },
{ type: "input", label: "来源库位", prop: 'fromLocationCode', colSpan: 12, },
{ type: "input", label: "目标库位", prop: 'toLocationCode', colSpan: 12, },
],
editRules: {
cerateRule: {
packingCode: [{ required: true, trigger: "blur", message: "不可为空" }],
fromLocationCode: [{ required: true, trigger: "blur", message: "不可为空" }],
toLocationCode: [{ required: true, trigger: "blur", message: "不可为空" }],
},
},
};
},
mounted() {
this.paging();
},
};
</script>
<style lang="scss" scoped>
@import "@/styles/mainbasicData.scss";
</style>
methods:{
drawerbutton(val){
//
if(val == "handle"){
this.formTitle = "完成库移";
this.formReveal = true
this.theEvent = "newly"
this.displayDialog.newDialog = true;
}
},
FormSubmitHandle(val){
this.Loading.newAndEdiLoading = true
//
getInventoryByPackingCode(this.CreateFormData.packingCode).then(inventory => {
// details
let _data = this.propsData
_data.details[0].handledFromPackingCode = this.CreateFormData.packingCode
_data.details[0].handledToPackingCode = this.CreateFormData.packingCode
_data.details[0].handledFromLocationCode = this.CreateFormData.fromLocationCode
_data.details[0].handledToLocationCode = this.CreateFormData.toLocationCode
_data.details[0].handledToLot = inventory.lot
_data.details[0].handledFromLot = inventory.lot
_data.details[0].handledFromSupplierBatch = inventory.supplierBatch
_data.details[0].handledToSupplierBatch = inventory.supplierBatch
_data.details[0].handledFromQty = inventory.qty
_data.details[0].handledToQty = inventory.qty
transferLibJobHandel(this.propsData.id, _data).then(res => {
this.Loading.newAndEdiLoading = false
this.FormResult("success")
}).catch(err => {
this.Loading.newAndEdiLoading = false
this.FormResult("error")
})
}).catch(err => {
this.Loading.newAndEdiLoading = false
})
}
}
};
</script>
<style lang="scss" scoped>
@import "@/styles/mainbasicData.scss";
</style>
Loading…
Cancel
Save