zhibinlv
/
WZC2
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

【nev-pad】需求更改+pad调整

ag_report_nev
安虹睿 10 months ago
parent
ba97c6ce65
commit
4e5996f1e8
3 changed files with 40 additions and 34 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. 1
      fe/PC/src/components/currenForm/index.vue
  2. 16
      fe/PC/src/utils/tableColumns/index.js
  3. 57
      fe/PC/src/views/padManage/isPadForTransferLibJob.vue

1
fe/PC/src/components/currenForm/index.vue
View File

@ -49,6 +49,7 @@
<!-- 输入框 onkeyup: 正则表达式，用于前端输入校验工作-->
<!-- :onkeyup="item.onkeyup" -->
<el-input
:id="item.id"
v-if="item.type === 'input'"
v-model="searchData[item.prop]"
:maxlength="item.maxlength"

16
fe/PC/src/utils/tableColumns/index.js
View File

@ -3380,7 +3380,7 @@ export const completDumpNoteZP = [
// 注塑申请
export const IssueRequestZS = [
{ label: "请求单号", prop: "number", fixed: "left", type: "name" },
{ label: "状态", prop: "requestStatus", type: "filter", filters: "requestStatus" },
{ 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" },
@ -3395,7 +3395,7 @@ export const IssueRequestZS = [
export const IssueJobZS = [
{ label: "任务单号", prop: "number", fixed: "left", type: "name" },
{ label: "申请单号", prop: "injectionRequestNumber" },
{ label: "状态", prop: "jobStatus",type: "filter", filters: "jobStatus" },
{ label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" },
{ label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
{ label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
{ label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" },
@ -3428,7 +3428,7 @@ export const IssueNoteZS = [
// 喷涂申请
export const IssueRequestPT = [
{ label: "请求单号", prop: "number", fixed: "left", type: "name" },
{ label: "状态", prop: "requestStatus", type: "filter", filters: "requestStatus" },
{ label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" },
{ label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
{ label: "备注", prop: "remark" },
{ label: "操作员", prop: "worker" },
@ -3440,7 +3440,7 @@ export const IssueRequestPT = [
export const IssueJobPT = [
{ label: "任务单号", prop: "number", fixed: "left", type: "name" },
{ label: "申请单号", prop: "coatingRequestNumber" },
{ label: "状态", prop: "jobStatus",type: "filter", filters: "jobStatus" },
{ label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" },
{ label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
{ label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
{ label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" },
@ -3470,7 +3470,7 @@ export const IssueNotePT = [
// 装配申请
export const IssueRequestZP = [
{ label: "请求单号", prop: "number", fixed: "left", type: "name" },
{ label: "状态", prop: "requestStatus", type: "filter", filters: "requestStatus" },
{ label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" },
{ label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
{ label: "备注", prop: "remark" },
{ label: "操作员", prop: "worker" },
@ -3482,7 +3482,7 @@ export const IssueRequestZP = [
export const IssueJobZP = [
{ label: "任务单号", prop: "number", fixed: "left", type: "name" },
{ label: "申请单号", prop: "assembleRequestNumber" },
{ label: "状态", prop: "jobStatus",type: "filter", filters: "jobStatus" },
{ label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" },
{ label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
{ label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
{ label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" },
@ -3512,7 +3512,7 @@ export const IssueNoteZP = [
// 备品申请
export const IssueRequestBP = [
{ label: "请求单号", prop: "number", fixed: "left", type: "name" },
{ label: "状态", prop: "requestStatus", type: "filter", filters: "requestStatus" },
{ label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" },
{ label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
{ label: "备注", prop: "remark" },
{ label: "操作员", prop: "worker" },
@ -3524,7 +3524,7 @@ export const IssueRequestBP = [
export const IssueJobBP = [
{ label: "任务单号", prop: "number", fixed: "left", type: "name" },
{ label: "申请单号", prop: "sparePartRequestNumber" },
{ label: "状态", prop: "jobStatus",type: "filter", filters: "jobStatus" },
{ label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" },
{ label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
{ label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
{ label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" },

57
fe/PC/src/views/padManage/isPadForTransferLibJob.vue
View File

@ -56,7 +56,7 @@
:colon="false"
:tabsDesTions="padDeatilColumn"
:propsData="currentRowData.details[0]"
style="width:100%;padding-top:20px"
style="width:100%"
></curren-descriptions>
</div>
<span slot="footer" class="dialog-footer">
@ -67,7 +67,7 @@
<!-- 查看库存余额 -->
<el-dialog
class="showInventoryPop"
title="查看库存余额"
:title="inventoryTableData && inventoryTableData.length > 0 ? '查看库存余额（'+ inventoryTableData.length +'条）' : '查看库存余额'"
:visible="showInventoryVisible"
top="5vh"
width="90%">
@ -81,14 +81,13 @@
<div>{{item[inventoryColumn[6].prop]}}</div>
</div>
<curren-descriptions
:column="2"
:column="3"
size="mini"
:border="true"
:direction="'horizontal'"
:tabsDesTions="inventoryColumn"
:propsData="item"
style="width:100%;padding-top:20px"
:labelStyle="{'width':'200px'}"
></curren-descriptions>
</div>
<el-empty v-if="(!inventoryTableData || inventoryTableData.length <= 0) && !showInventoryLoading" description="暂无数据"></el-empty>
@ -200,9 +199,9 @@ export default {
{ label: _Names.itemCode, prop: "itemCode"},
{ label: _Names.itemName, prop: "itemName" },
{ label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "请求数量", prop: 'requestQty' },
{ label: _Names.requestLocationErpCode, prop: 'requestLocationErpCode' },
// { label: _Names.itemDesc2, prop: "itemDesc2" },
// { label: "请求数量", prop: 'requestQty' },
// { label: _Names.requestLocationErpCode, prop: 'requestLocationErpCode' },
{ label: "推荐来源数量", prop: 'recommendFromQty' },
{ label: "推荐目标数量", prop: 'recommendToQty' },
{ label: "推荐来源箱标签", prop: 'recommendFromPackingCode' },
@ -215,22 +214,22 @@ export default {
{ label: "推荐目标批次", prop: 'recommendToLot' },
{ label: "推荐来源过期时间", prop: 'recommendFromExpireDate', type: "dateTime" },
{ label: "推荐目标过期时间", prop: 'recommendToExpireDate', type: "dateTime" },
{ label: "实际来源数量", prop: 'handledFromQty' },
{ label: "实际目标数量", prop: 'handledToQty' },
{ label: "实际来源箱标签", prop: 'handledFromPackingCode' },
{ label: "实际目标箱标签", prop: 'handledToPackingCode' },
{ label: "实际来源库位", prop: 'handledFromLocationCode' },
{ label: "实际目标库位", prop: 'handledToLocationCode' },
{ label: _Names.handledFromErpCode, prop: 'handledFromLocationErpCode' },
{ label: _Names.handledToErpCode, prop: 'handledToLocationErpCode' },
{ label: "实际来源批次", prop: 'handledFromLot' },
{ label: "实际目标批次", prop: 'handledToLot' },
{ label: "实际来源过期时间", prop: 'handledFromExpireDate', type: "dateTime" },
{ label: "实际目标过期时间", prop: 'handledToExpireDate', type: "dateTime" },
// { label: "实际来源数量", prop: 'handledFromQty' },
// { label: "实际目标数量", prop: 'handledToQty' },
// { label: "实际来源箱标签", prop: 'handledFromPackingCode' },
// { label: "实际目标箱标签", prop: 'handledToPackingCode' },
// { label: "实际来源库位", prop: 'handledFromLocationCode' },
// { label: "实际目标库位", prop: 'handledToLocationCode' },
// { label: _Names.handledFromErpCode, prop: 'handledFromLocationErpCode' },
// { label: _Names.handledToErpCode, prop: 'handledToLocationErpCode' },
// { label: "实际来源批次", prop: 'handledFromLot' },
// { label: "实际目标批次", prop: 'handledToLot' },
// { label: "实际来源过期时间", prop: 'handledFromExpireDate', type: "dateTime" },
// { label: "实际目标过期时间", prop: 'handledToExpireDate', type: "dateTime" },
{ label: "位置码", prop: 'positionCode' },
{ label: "生产线", prop: 'prodLine' },
{ label: "任务状态", prop: "jobStatus",type: "filter", filters: "jobStatus" },
{ label: "推荐类型", prop: 'recommendType' },
// { label: "推荐类型", prop: 'recommendType' },
],
listRowButton:[
{
@ -256,7 +255,7 @@ export default {
toLocationCode:"",
},
compeletForm: [
{ type: "input", label: "箱码", prop: 'packingCode', colSpan: 12, },
{ type: "input", id:'compeletFormPackingCode', label: "箱码", prop: 'packingCode', colSpan: 12, },
{ type: "input", disabled:true, label: "来源库位", prop: 'fromLocationCode', colSpan: 12, },
{ type: "input", disabled:true, label: "目标库位", prop: 'toLocationCode', colSpan: 12, },
// filterSelect示例：
@ -265,7 +264,7 @@ export default {
// },
],
compeletRule: {
packingCode: [{ required: true, trigger: "blur", message: "不可为空" }],
packingCode: [{ required: true, trigger: ["blur","change"], message: "不可为空" }],
fromLocationCode: [{ required: true, trigger: "blur", message: "不可为空" }],
toLocationCode: [{ required: true, trigger: "blur", message: "不可为空" }],
},
@ -284,7 +283,7 @@ export default {
{ label: '数量', prop: "qty" },
{ label: "箱码", prop: 'packingCode' },
{ label: "批次", prop: 'lot' },
{ label: "供应商批次", prop: "supplierBatch" },
// { label: "供应商批次", prop: "supplierBatch" },
{ label: "标包数量", prop: "stdPackQty" },
{ label: "库位", prop: 'locationCode' },
{ label: _Names.locationErpCode, prop: "locationErpCode" },
@ -292,10 +291,10 @@ export default {
{ label: "标准成本单价", prop: "stdCostPrice" },
{ label: "标准成本金额", prop: "stdCost" },
{ label: "备注", prop: 'remark' },
{ label: "序号", prop: 'serialNumber' },
{ label: "状态", prop: "status", type: "filter", filters: "openToClose" },
// { label: "序号", prop: 'serialNumber' },
// { label: "状态", prop: "status", type: "filter", filters: "openToClose" },
{ label: "库区", prop: 'locationArea' },
{ label: "管理类型", prop: "manageType", type: "filter", filters: "manageType" },
// { label: "管理类型", prop: "manageType", type: "filter", filters: "manageType" },
{ label: "入库时间", prop: 'putInTime', type:"dateTime" },
{ label: "生产时间", prop: "produceDate", type: "dateTime" },
{ label: "到货时间", prop: "arriveDate", type: "dateTime" },
@ -401,6 +400,9 @@ export default {
if(item.name == "compelet"){
this.currentRowData = row
this.compeletHandleVisible = true
this.$nextTick(()=>{
document.getElementById("compeletFormPackingCode").focus()
})
}
},
headerSearchHandle(){
@ -479,6 +481,9 @@ export default {
::v-deep .el-dialog{
margin-bottom:0 !important
}
::v-deep .el-empty__image{
width:100px !important
}
::v-deep .el-dialog__body{
padding:0 15px !important;
}

Write Preview
Loading…
Cancel
Save