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

【NEV-PC】前端缺陷及优化更改

ag_report_nev
安虹睿 1 year ago
parent
dfff19f8b3
commit
f7801c2bb4
8 changed files with 76 additions and 41 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. 3
      fe/PC/src/components/currenDescriptions/index.vue
  2. 4
      fe/PC/src/components/currenTable/index.vue
  3. 3
      fe/PC/src/components/umyTable/index.vue
  4. 74
      fe/PC/src/utils/detailsTableColumns/index.js
  5. 14
      fe/PC/src/utils/tableColumns/index.js
  6. 14
      fe/PC/src/utils/tabsDesTions/index.js
  7. 1
      fe/PC/src/views/basicData/ItemsManage/Kitting.vue
  8. 4
      fe/PC/src/views/basicData/WorkshopManage/ProductionLine.vue

3
fe/PC/src/components/currenDescriptions/index.vue
View File

@ -23,6 +23,9 @@
<span v-else-if="item.type && item.type == 'objectDateTime'">{{
propsData[item.prop]?propsData[item.prop][item.showProp]:"" | formatDate
}}</span>
<span v-if="item.type == 'price'">
{{ (propsData[item.prop]).toFixed(item.pointe || 2) }}
</span>
<span v-else-if="item.type && item.type == 'object'">
{{ propsData[item.prop]?propsData[item.prop][item.showProp]:"" }}
</span>

4
fe/PC/src/components/currenTable/index.vue
View File

@ -272,7 +272,9 @@
@click="buttonClick(scope.row, scope.$index, item.label)"
>{{item.label}}</el-button>
</el-form-item>
<span v-if="item.type == 'price'">
{{ (scope.row[item.prop]).toFixed(item.pointe || 2) }}
</span>
<span v-if="item.type == 'object'">
{{ scope.row[item.prop] ? scope.row[item.prop][item.showProp] : "" }}
</span>

3
fe/PC/src/components/umyTable/index.vue
View File

@ -273,6 +273,9 @@
@click="buttonOperationClick(scope.row, item.buttonName.split('|')[indexButton])"
>{{itemButton}}</el-button>
</div>
<span v-if="item.type == 'price'">
{{ (scope.row[item.prop]).toFixed(item.pointe || 2) }}
</span>
<span v-if="item.type == 'object'">
{{ scope.row[item.prop] ? scope.row[item.prop][item.showProp] : "" }}
</span>

74
fe/PC/src/utils/detailsTableColumns/index.js
View File

@ -907,6 +907,44 @@ export const PurchaseReturnRequest = [
// { label: "ID", prop: 'id' },
// ************** 确定隐藏 ************************
]
// 上架后退货审批
export const PurchaseReturnApprove = [
{ label: "物品代码", prop: "itemCode", fixed: "left" },
{ label: "物品名称", prop: "itemName" },
{ label: "物品描述1", prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" },
{ label: "配置", prop: "item_configurationFromFE" },
{ label: "数量", prop: "qty" },
{ label: "单位", prop: "uom" },
{ label: "批次", prop: 'lot' },
{ label: "箱码", prop: "packingCode" },
{ label: "退货库位", prop: "locationCode" },
{ label: "ERP储位", prop: "locationErpCode" },
{ label: "订单号", prop: 'poNumber', width:orderWidth },
// -----------------------------------------------------------------------
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: 'lastModifierId' },
{ label: "单据号", prop: 'number' },
{ label: "备注", prop: 'remark' },
{ label: "供应商批次", prop: 'supplierBatch' },
{ label: "到货时间", prop: 'arriveDate' },
{ label: "生产时间", prop: 'produceDate' },
{ label: "过期时间", prop: 'expireDate' },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "库位组", prop: 'locationGroup' },
{ label: "仓库代码", prop: 'warehouseCode' },
{ label: "库区", prop: 'locationArea' },
{ label: "订单行", prop: 'poLine' },
{ label: "事务ID", prop: "tenantId" },
// ************** 确定隐藏 ************************
// { label: "status", prop: 'status' },
// { label: "主表ID", prop: "masterID" },
// { label: "ID", prop: 'id' },
// ************** 确定隐藏 ************************
]
// 上架后退货任务 20230412
export const PurchaseReturnJob = [
{ label: "物品代码", prop: "itemCode", fixed: "left" },
@ -3539,11 +3577,11 @@ export const completDumpNoteZS = [
{ label: "单位", prop: "uom" },
{ label: "数量", prop: "qty" },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "来源箱码", prop: 'fromPackingCode' },
{ label: "目标箱码", prop: 'toPackingCode' },
{ label: "来源批次", prop: 'fromLot' },
{ label: "目标批次", prop: 'toLot' },
{ label: "供应商批次", prop: 'supplierBatch' },
// { label: "来源箱码", prop: 'fromPackingCode' },
// { label: "目标箱码", prop: 'toPackingCode' },
// { label: "来源批次", prop: 'fromLot' },
// { label: "目标批次", prop: 'toLot' },
// { label: "供应商批次", prop: 'supplierBatch' },
{ label: "到货时间", prop: "arriveDate", type: "dateTime" },
{ label: "生产时间", prop: "produceDate", type: "dateTime" },
{ label: "过期时间", prop: "expireDate", type: "dateTime" },
@ -3557,7 +3595,7 @@ export const completDumpNoteZS = [
{ label: "目标ERP库位", prop: "toLocationErpCode" },
{ label: "来源仓库", prop: 'fromWarehouseCode' },
{ label: "目标仓库", prop: 'toWarehouseCode' },
{ label: "在途库位", prop: "onTheWayLocationCode" },
// { label: "在途库位", prop: "onTheWayLocationCode" },
{ label: "原因", prop: 'reason' },
{ label: "备注", prop: 'remark' },
{ label: "创建时间", prop: "creationTime",type:"dateTime" },
@ -3578,11 +3616,11 @@ export const completDumpNotePT = [
{ label: "单位", prop: "uom" },
{ label: "数量", prop: "qty" },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "来源箱码", prop: 'fromPackingCode' },
{ label: "目标箱码", prop: 'toPackingCode' },
{ label: "来源批次", prop: 'fromLot' },
{ label: "目标批次", prop: 'toLot' },
{ label: "供应商批次", prop: 'supplierBatch' },
// { label: "来源箱码", prop: 'fromPackingCode' },
// { label: "目标箱码", prop: 'toPackingCode' },
// { label: "来源批次", prop: 'fromLot' },
// { label: "目标批次", prop: 'toLot' },
// { label: "供应商批次", prop: 'supplierBatch' },
{ label: "到货时间", prop: "arriveDate", type: "dateTime" },
{ label: "生产时间", prop: "produceDate", type: "dateTime" },
{ label: "过期时间", prop: "expireDate", type: "dateTime" },
@ -3596,7 +3634,7 @@ export const completDumpNotePT = [
{ label: "目标ERP库位", prop: "toLocationErpCode" },
{ label: "来源仓库", prop: 'fromWarehouseCode' },
{ label: "目标仓库", prop: 'toWarehouseCode' },
{ label: "在途库位", prop: "onTheWayLocationCode" },
// { label: "在途库位", prop: "onTheWayLocationCode" },
{ label: "原因", prop: 'reason' },
{ label: "备注", prop: 'remark' },
{ label: "创建时间", prop: "creationTime",type:"dateTime" },
@ -3617,11 +3655,11 @@ export const completDumpNoteZP = [
{ label: "单位", prop: "uom" },
{ label: "数量", prop: "qty" },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "来源箱码", prop: 'fromPackingCode' },
{ label: "目标箱码", prop: 'toPackingCode' },
{ label: "来源批次", prop: 'fromLot' },
{ label: "目标批次", prop: 'toLot' },
{ label: "供应商批次", prop: 'supplierBatch' },
// { label: "来源箱码", prop: 'fromPackingCode' },
// { label: "目标箱码", prop: 'toPackingCode' },
// { label: "来源批次", prop: 'fromLot' },
// { label: "目标批次", prop: 'toLot' },
// { label: "供应商批次", prop: 'supplierBatch' },
{ label: "到货时间", prop: "arriveDate", type: "dateTime" },
{ label: "生产时间", prop: "produceDate", type: "dateTime" },
{ label: "过期时间", prop: "expireDate", type: "dateTime" },
@ -3635,7 +3673,7 @@ export const completDumpNoteZP = [
{ label: "目标ERP库位", prop: "toLocationErpCode" },
{ label: "来源仓库", prop: 'fromWarehouseCode' },
{ label: "目标仓库", prop: 'toWarehouseCode' },
{ label: "在途库位", prop: "onTheWayLocationCode" },
// { label: "在途库位", prop: "onTheWayLocationCode" },
{ label: "原因", prop: 'reason' },
{ label: "备注", prop: 'remark' },
{ label: "创建时间", prop: "creationTime",type:"dateTime" },

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

@ -1014,7 +1014,7 @@ export const StdCostPriceSheet = [
prop: "itemCode",
width:"200px"
},
{ label: "标准成本价格", prop: "stdCostPrice" },
{ label: "标准成本价格", prop: "stdCostPrice",type:"price" },
{ label: "创建时间", prop: "creationTime", type:'dateTime' },
{ label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
{ label: "备注", prop: "remark" },
@ -1029,7 +1029,7 @@ export const PurchasePriceSheet = [
width:"200px"
},
{ label: "供应商编号", prop: "supplierCode" },
{ label: "采购价格", prop: "purchasePrice" },
{ label: "采购价格", prop: "purchasePrice",type:"price" },
{ label: "价格单描述", prop: "description" },
{ label: "创建时间", prop: "creationTime", type:'dateTime' },
{ label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
@ -1045,7 +1045,7 @@ export const SalePriceSheet = [
width:"200px"
},
{ label: "客户代码", prop: "customerCode" },
{ label: "销售价格", prop: "salePrice" },
{ label: "销售价格", prop: "salePrice",type:"price" },
{ label: "价格单描述", prop: "description" },
{ label: "创建时间", prop: "creationTime", type:'dateTime' },
{ label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
@ -4116,7 +4116,7 @@ export const PositionCode = [
// { label: _Names.itemDesc2, prop: "desc2" },
{ label: _Names.basicUom, prop: "basicUom" },
{ label: _Names.stdPackQty, prop: "stdPackQty",isNumber:true },
{ label: _Names.locationCode, prop: "locationCode" },
{ label: "叫料库位代码", prop: "locationCode" },
{ label: _Names.locationName, prop: "locationName" },
{ label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
{ label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
@ -4193,8 +4193,6 @@ export const completDumpNoteZS = [
},
{ label: "申请单号", prop: "requestNumber",width: orderWidth },
{ label: "任务单号", prop: 'jobNumber',width: orderWidth },
{ label: "使用中间库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
{ label: "是否确认", prop: "confirmed", type: "tagFilter", filters: "whetherOrNot" },
{ label: "操作员", prop: "worker" },
{ label: "备注", prop: 'remark' },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
@ -4213,8 +4211,6 @@ export const completDumpNotePT = [
},
{ label: "申请单号", prop: "requestNumber",width: orderWidth },
{ label: "任务单号", prop: 'jobNumber',width: orderWidth },
{ label: "使用中间库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
{ label: "是否确认", prop: "confirmed", type: "tagFilter", filters: "whetherOrNot" },
{ label: "操作员", prop: "worker" },
{ label: "备注", prop: 'remark' },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
@ -4233,8 +4229,6 @@ export const completDumpNoteZP = [
},
{ label: "申请单号", prop: "requestNumber",width: orderWidth },
{ label: "任务单号", prop: 'jobNumber',width: orderWidth },
{ label: "使用中间库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
{ label: "是否确认", prop: "confirmed", type: "tagFilter", filters: "whetherOrNot" },
{ label: "操作员", prop: "worker" },
{ label: "备注", prop: 'remark' },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },

14
fe/PC/src/utils/tabsDesTions/index.js
View File

@ -763,7 +763,7 @@ export const StdCostPriceSheet = [
prop: "itemCode",
width:"200px"
},
{ label: "标准成本价格", prop: "stdCostPrice" },
{ label: "标准成本价格", prop: "stdCostPrice",type:"price" },
{ label: "创建时间", prop: "creationTime", type:'dateTime' },
{ label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
{ label: "备注", prop: "remark" },
@ -778,7 +778,7 @@ export const PurchasePriceSheet = [
width:"200px"
},
{ label: "供应商编号", prop: "supplierCode" },
{ label: "采购价格", prop: "purchasePrice" },
{ label: "采购价格", prop: "purchasePrice",type:"price" },
{ label: "价格单描述", prop: "description" },
{ label: "创建时间", prop: "creationTime", type:'dateTime' },
{ label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
@ -794,7 +794,7 @@ export const SalePriceSheet = [
width:"200px"
},
{ label: "客户代码", prop: "customerCode" },
{ label: "销售价格", prop: "salePrice" },
{ label: "销售价格", prop: "salePrice",type:"price" },
{ label: "价格单描述", prop: "description" },
{ label: "创建时间", prop: "creationTime", type:'dateTime' },
{ label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
@ -2991,7 +2991,7 @@ export const PositionCode = [
// { label: _Names.itemDesc2, prop: "desc2" },
{ label: _Names.basicUom, prop: "basicUom" },
{ label: _Names.stdPackQty, prop: "stdPackQty" },
{ label: _Names.locationCode, prop: "locationCode" },
{ label: "叫料库位代码", prop: "locationCode" },
{ label: _Names.locationName, prop: "locationName" },
{ label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
{ label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
@ -3051,8 +3051,6 @@ export const completDumpNoteZS = [
},
{ label: "申请单号", prop: "requestNumber" },
{ label: "任务单号", prop: 'jobNumber' },
{ label: "使用中间库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
{ label: "是否确认", prop: "confirmed", type: "filter", filters: "whetherOrNot" },
{ label: "操作员", prop: "worker" },
{ label: "备注", prop: 'remark' },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
@ -3070,8 +3068,6 @@ export const completDumpNotePT = [
},
{ label: "申请单号", prop: "requestNumber" },
{ label: "任务单号", prop: 'jobNumber' },
{ label: "使用中间库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
{ label: "是否确认", prop: "confirmed", type: "filter", filters: "whetherOrNot" },
{ label: "操作员", prop: "worker" },
{ label: "备注", prop: 'remark' },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
@ -3089,8 +3085,6 @@ export const completDumpNoteZP = [
},
{ label: "申请单号", prop: "requestNumber" },
{ label: "任务单号", prop: 'jobNumber' },
{ label: "使用中间库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
{ label: "是否确认", prop: "confirmed", type: "filter", filters: "whetherOrNot" },
{ label: "操作员", prop: "worker" },
{ label: "备注", prop: 'remark' },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },

1
fe/PC/src/views/basicData/ItemsManage/Kitting.vue
View File

@ -75,6 +75,7 @@
<!--抽屉-->
<curren-Drawer
:title="tableColumns"
firstTabs="mx"
:DrawerLoading="Loading.DrawerLoading"
:drawer="displayDialog.detailsDialog"
:dropdownData="dropdownData"

4
fe/PC/src/views/basicData/WorkshopManage/ProductionLine.vue
View File

@ -130,14 +130,14 @@ export default {
code: null,
name: null,
description: null,
locationCode: [],
locationCode: null,
},
//编辑
editFormData: {
code: null,
name: null,
description: null,
locationCode: [],
locationCode: null,
concurrencyStamp: null,
},
editOptions: {

Write Preview
Loading…
Cancel
Save