diff --git a/fe/PC/src/api/wms-job.js b/fe/PC/src/api/wms-job.js index 4859de241..037b3676a 100644 --- a/fe/PC/src/api/wms-job.js +++ b/fe/PC/src/api/wms-job.js @@ -272,3 +272,13 @@ export function transferLibJobHandel(id, data) { data:data }) } + +// 质检-编辑 +export function inspectJobChangeImg(params, data) { + return request({ + url: baseURL + 'wms/store/inspect-job/change-image', + method: 'post', + data:data, + params:params + }) +} \ No newline at end of file diff --git a/fe/PC/src/router/index.js b/fe/PC/src/router/index.js index f8dd19a3d..b305d4b70 100644 --- a/fe/PC/src/router/index.js +++ b/fe/PC/src/router/index.js @@ -257,6 +257,23 @@ export const constantRoutes = [ } }] }, + // 质检-编辑 + { + path: '/', + component: Layout, + redirect: '/InspectRequest_editor', + hidden: true, + children: [{ + path: 'InspectRequest_editor', + component: () => import('@/views/rawMaterialManage/quality/InspectRequest_editor'), + name: 'InspectRequest_editor', + meta: { + keepAlive : true, + title: '报检单-编辑', + icon: '系统首页', + } + }] + }, // { // path: '/', // component: Layout, diff --git a/fe/PC/src/utils/detailsTableColumns/index.js b/fe/PC/src/utils/detailsTableColumns/index.js index a17252f41..2700ae3bb 100644 --- a/fe/PC/src/utils/detailsTableColumns/index.js +++ b/fe/PC/src/utils/detailsTableColumns/index.js @@ -219,6 +219,48 @@ export const InspectRequest = [ { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] +export const InspectRequest_editor = [ + { label: _Names.itemCode, prop: "itemCode", fixed: "left" }, + { label: _Names.itemName, prop: "itemName", width: orderWidth }, + { label: _Names.itemDesc1, prop: "itemDesc1" }, + { label: _Names.itemDesc2, prop: "itemDesc2" }, + { label: _Names.configuration, prop: "item_configurationFromFE" }, + { label: "收货数量", prop: "receiveQty" }, + { label: "生产批次", prop: "lot" }, + { label: "箱码", prop: "packingCode" }, + { label: "检验状态", prop: "detailInspectStatus", type: "filter", filters: "detailInspectStatus" }, + { label: "库位", prop: 'locationCode' }, + // { label: _Names.locationErpCode, prop: 'locationErpCode' }, + { label: "任务单号", prop: "number" }, + { label: "计量单位", prop: 'uom' }, + { label: "备注", prop: 'remark' }, + // { label: "标包数量", prop: 'stdPackQty' },//后期打开 + // { label: "供应商批次", prop: 'supplierBatch' }, + { label: "到货时间", prop: 'arriveDate', type: "dateTime" }, + // { label: "生产时间", prop: 'produceDate', type: "dateTime" }, + { label: "过期时间", prop: 'expireDate', type: "dateTime" }, + // { label: "库位组", prop: 'locationGroup' }, + // { label: "库区", prop: 'locationArea' }, + { label: "订单号", prop: 'poNumber', width: orderWidth }, + { label: "订单行", prop: 'poLine' }, + // { label: "样品率", prop: 'samplePercent' }, + { label: "检验数量", prop: 'inspectQty' }, + // { label: "AbcClass类别", prop: 'abcClass' }, + { label: "检验类型", prop: "inspectType", type: "filter", filters: "inspectType" }, + // { label: "不合格原因代码", prop: 'failedReason' }, + // { label: "不合格原因说明", prop: 'failedReason', type: "filter", filters: "getDict" , dictType:"UnqualifiedReason" }, + // { label: "破坏数量", prop: 'crackQty' }, + // { label: "最终不合格数量", prop: 'notPassedQty' }, + // { label: "检验人", prop: 'inspectUser' }, + { label: "合格数量", prop: 'goodQty' }, + { label: "不合格数量", prop: 'failedQty' }, + { label: "外观", prop: 'appearance' }, + { label: "其他属性", prop: 'otherPropertyJson', width:300}, + { label: "尺寸", prop: 'volume' }, + { label: "重量", prop: 'weight' }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, +] // 检验记录 export const InspectNote = [ diff --git a/fe/PC/src/utils/summaryTableColumns/index.js b/fe/PC/src/utils/summaryTableColumns/index.js index 6cba8f0dd..6f191a5b7 100644 --- a/fe/PC/src/utils/summaryTableColumns/index.js +++ b/fe/PC/src/utils/summaryTableColumns/index.js @@ -43,6 +43,42 @@ export const InspectRequest = [ // { label: "不合格原因代码", prop: 'failedReason' }, // { label: "不合格原因", prop: 'failedReason', type: "filter", filters: "getDict" , dictType:"UnqualifiedReason" }, ] +export const InspectRequest_editor = [ + { label: _Names.itemCode, prop: "itemCode" }, + { label: _Names.itemName, prop: "itemName" }, + { label: _Names.itemDesc1, prop: "itemDesc1" }, + { label: _Names.itemDesc2, prop: "itemDesc2" }, + { label: "生产批次", prop: "lot" }, + { label: "收货数量", prop: 'receiveQty' }, + { label: "检验数量", prop: 'inspectQty' }, + { label: "合格数量", prop: 'goodQty' }, + { label: "不合格数量", prop: 'failedQty' }, + { label: "检验人", prop: 'inspectUser' }, + { label: "任务单号", prop: "number" }, + { label: "创建时间", prop: "creationTime",type: "dateTime" }, + { label: "创建者ID", prop: "creatorId" }, + { label: "状态", prop: "summaryInspectStatus", type: "filter", filters: "summaryInspectStatus" }, + { label: "ABC类", prop: 'abcClass', type: "filter", filters: "abcClass" }, + { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, + { label: "上次修改者ID", prop: "lastModifierId" }, + { label: "备注", prop: 'remark' }, + { label: "计量单位", prop: 'uom' }, + // { label: "标包数量", prop: 'stdPackQty' },//后期打开 + // { label: "供应商批次", prop: 'supplierBatch' }, + { label: "到货时间", prop: 'arriveDate', type: "dateTime" }, + { label: "生产时间", prop: 'produceDate', type: "dateTime" }, + { label: "过期时间", prop: 'expireDate', type: "dateTime" }, + { label: "订单号", prop: 'poNumber',width: orderWidth }, + { label: "订单行", prop: 'poLine' }, + { label: "样品率", prop: 'samplePercent' }, + { label: "破坏数量", prop: 'crackQty' }, + { label: "最终不合格数量", prop: 'notPassedQty' }, + { label: "检验报告", fixed: "right",prop: 'inspectReport',type:'button',buttonName:'查看报告' }, + { label: "事务ID", prop: "tenantId" }, + { label: "检验类型", prop: "inspectType", type: "filter", filters: "inspectType" }, + // { label: "不合格原因代码", prop: 'failedReason' }, + // { label: "不合格原因", prop: 'failedReason', type: "filter", filters: "getDict" , dictType:"UnqualifiedReason" }, +] // 检验记录 export const InspectNote = [ diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js index 06c195323..af01a92e6 100644 --- a/fe/PC/src/utils/tableColumns/index.js +++ b/fe/PC/src/utils/tableColumns/index.js @@ -1263,6 +1263,29 @@ export const InspectRequest = [ { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] +export const InspectRequest_editor = [ + { + label: "检验单号", + prop: "inspectNumber", + fixed: "left", + type: "name", + }, + { label: _Public.status, prop: "jobStatus", type: "tagFilter", filters: "jobStatus" }, + { label: "单据号", prop: 'number', width: orderWidth }, + { label: _Public.worker, prop: 'worker' }, + { label: "采购订单号", prop: "poNumber",width: orderWidth }, + { label: "发货单号", prop: "asnNumber",width: orderWidth }, + { label: "收货单号", prop: "receiptNumber",width: orderWidth }, + { label: "到货单号", prop: 'purchaseReceiptRequestNumber' }, + { label: "供应商代码", prop: "supplierCode" }, + { label: "完成者用户名", prop: 'completeUserName' }, + { label: "完成时间", prop: 'completeTime', type: "dateTime" }, + { label: _Public.remark, prop: 'remark' }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, +] + + // 检验记录 export const InspectNote = [ { diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js index 988985158..8d119b8ca 100644 --- a/fe/PC/src/utils/tabsDesTions/index.js +++ b/fe/PC/src/utils/tabsDesTions/index.js @@ -788,6 +788,22 @@ export const InspectRequest = [ { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] +export const InspectRequest_editor = [ + { label: "检验单号", prop: "number" }, + { label: _Public.status, prop: "jobStatus", type: "filter", filters: "jobStatus" }, + { label: "单据号", prop: 'number' }, + { label: _Public.worker, prop: 'worker' }, + { label: "采购订单号", prop: "poNumber" }, + { label: "发货单号", prop: "asnNumber" }, + { label: "收货单号", prop: "receiptNumber" }, + { label: "到货单号", prop: 'purchaseReceiptRequestNumber' }, + { label: "供应商代码", prop: "supplierCode" }, + { label: "完成者用户名", prop: 'completeUserName' }, + { label: "完成时间", prop: 'completeTime', type: "dateTime" }, + { label: _Public.remark, prop: 'remark' }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, +] // 检验记录 export const InspectNote = [ diff --git a/fe/PC/src/views/rawMaterialManage/quality/InspectRequest_editor.vue b/fe/PC/src/views/rawMaterialManage/quality/InspectRequest_editor.vue new file mode 100644 index 000000000..1080b4d82 --- /dev/null +++ b/fe/PC/src/views/rawMaterialManage/quality/InspectRequest_editor.vue @@ -0,0 +1,1904 @@ + + + + \ No newline at end of file