From b741fcf51103593a08e00fe35a8ac9eab4d44323 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Fri, 7 Apr 2023 09:04:03 +0800 Subject: [PATCH 001/105] =?UTF-8?q?=E5=9C=B0=E5=9D=80=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PC/public/config.js | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/fe/PC/public/config.js b/fe/PC/public/config.js index 839266d33..aa046d202 100644 --- a/fe/PC/public/config.js +++ b/fe/PC/public/config.js @@ -1,22 +1,22 @@ // dev +// window.SITE_CONFIG['base'] = 'http://dev.ccwin-in.com:60099' +// window.SITE_CONFIG['user'] = 'http://dev.ccwin-in.com:60083/api' +// window.SITE_CONFIG['print'] = 'print' +// window.SITE_CONFIG['largeScreen'] = 'http://dev.ccwin-in.com:59082' +// window.SITE_CONFIG['warehouseCode'] = 'T8' +// window.SITE_CONFIG['company'] = 'DongYang' +// window.SITE_CONFIG['client_secret'] = '1q2w3E*' +// window.SITE_CONFIG['reportsUrl'] = 'http://10.164.0.227:59091/#/reports/' + +// dev-new window.SITE_CONFIG['base'] = 'http://dev.ccwin-in.com:21093' window.SITE_CONFIG['user'] = 'http://dev.ccwin-in.com:21093/api/auth' window.SITE_CONFIG['print'] = 'print' -window.SITE_CONFIG['largeScreen'] = 'http://dev.ccwin-in.com:59082' +window.SITE_CONFIG['largeScreen'] = 'http://dev.ccwin-in.com:21093' window.SITE_CONFIG['warehouseCode'] = 'T8' window.SITE_CONFIG['company'] = 'DongYang' -window.SITE_CONFIG['client_secret'] = '1q2w3e*' -window.SITE_CONFIG['reportsUrl'] = 'http://10.164.0.227:59091/#/reports/' - -// dev-new -// window.SITE_CONFIG['base'] = 'http://dev.ccwin-in.com:21093' -// window.SITE_CONFIG['user'] = 'http://dev.ccwin-in.com:21293' -// window.SITE_CONFIG['print'] = 'print' -// window.SITE_CONFIG['largeScreen'] = 'http://dev.ccwin-in.com:21093' -// window.SITE_CONFIG['warehouseCode'] = 'T8' -// window.SITE_CONFIG['company'] = 'DongYang' -// window.SITE_CONFIG['client_secret'] = '1q2w3e*' -// window.SITE_CONFIG['reportsUrl'] = 'http://10.164.0.227:21093/#/reports/' +window.SITE_CONFIG['client_secret'] = '1q2w3E*' +window.SITE_CONFIG['reportsUrl'] = 'http://10.164.0.227:21093/#/reports/' // localhost // window.SITE_CONFIG['base'] = 'http://dev.ccwin-in.com:59099' @@ -25,7 +25,7 @@ window.SITE_CONFIG['reportsUrl'] = 'http://10.164.0.227:59091/#/reports/' // window.SITE_CONFIG['largeScreen'] = 'http://dev.ccwin-in.com:59082' // window.SITE_CONFIG['warehouseCode'] = 'T8' // window.SITE_CONFIG['company'] = 'DongYang' -// window.SITE_CONFIG['client_secret'] = '1q2w3e*' +// window.SITE_CONFIG['client_secret'] = '1q2w3E*' // window.SITE_CONFIG['reportsUrl'] = 'http://10.164.0.227:59091/#/reports/' // mock @@ -36,5 +36,5 @@ window.SITE_CONFIG['reportsUrl'] = 'http://10.164.0.227:59091/#/reports/' // window.SITE_CONFIG['largeScreen'] = 'http://dev.ccwin-in.com:59092' // window.SITE_CONFIG['warehouseCode'] = 'T8' // window.SITE_CONFIG['company'] = 'DongYang' -// window.SITE_CONFIG['client_secret'] = '1q2w3e*' +// window.SITE_CONFIG['client_secret'] = '1q2w3E*' // window.SITE_CONFIG['reportsUrl'] = 'http://10.164.0.227:59091/#/reports/' \ No newline at end of file From e0c27fc79415457d6d7531a0ae567fc6031aa144 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Fri, 7 Apr 2023 09:12:23 +0800 Subject: [PATCH 002/105] =?UTF-8?q?=E8=B4=A8=E6=A3=80=E5=8D=95=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=9C=B0=E5=9D=80=E4=BF=AE=E6=94=B9=E5=8F=8A=E8=B7=AF?= =?UTF-8?q?=E7=94=B1=E5=9C=B0=E5=9D=80=E6=96=87=E4=BB=B6=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PC/src/filters/options.js | 2 +- fe/PC/src/utils/detailsTableColumns/index.js | 2 +- fe/PC/src/utils/quicklySearchOption/index.js | 2 +- fe/PC/src/utils/summaryTableColumns/index.js | 2 +- fe/PC/src/utils/tableColumns/index.js | 2 +- fe/PC/src/utils/tabsDesTions/index.js | 2 +- fe/PC/src/views/rawMaterialManage/quality/InspectNotice.vue | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/fe/PC/src/filters/options.js b/fe/PC/src/filters/options.js index 9fee56b6f..2c2756605 100644 --- a/fe/PC/src/filters/options.js +++ b/fe/PC/src/filters/options.js @@ -196,7 +196,7 @@ export function Roles(val){ // "CountPlan": "盘点计划", // "CountNote": "盘点记录", // "CountAdjustNote": "盘点差异调整记录", - // "InspectNotice": "报检单", + // "InspectRequest": "报检单", // "InspectNote": "检验记录", // "InspectAbnormalNote": "质量异常记录", // "ProductRecycleNote": "成品回收记录", diff --git a/fe/PC/src/utils/detailsTableColumns/index.js b/fe/PC/src/utils/detailsTableColumns/index.js index 413866740..9e5febcb2 100644 --- a/fe/PC/src/utils/detailsTableColumns/index.js +++ b/fe/PC/src/utils/detailsTableColumns/index.js @@ -210,7 +210,7 @@ export const PurchaseReceiptJob = [ // ----------------------------------------------------------------------- ] // 报检单 已调整 -export const InspectNotice = [ +export const InspectRequest = [ { label: "物品代码", prop: "itemCode", fixed: "left" }, { label: "物品名称", prop: "itemName", width: orderWidth }, { label: "物品描述", prop: "itemDesc1" }, diff --git a/fe/PC/src/utils/quicklySearchOption/index.js b/fe/PC/src/utils/quicklySearchOption/index.js index d3d992209..cfe0bc246 100644 --- a/fe/PC/src/utils/quicklySearchOption/index.js +++ b/fe/PC/src/utils/quicklySearchOption/index.js @@ -9,7 +9,7 @@ // 原料管理 /**/ // 报检单 -export const InspectNotice = { +export const InspectRequest = { // action:"==",//默认等于 prop:'asnNumber', placeholder:'请输入发货单号', diff --git a/fe/PC/src/utils/summaryTableColumns/index.js b/fe/PC/src/utils/summaryTableColumns/index.js index f25e56551..a8ec664fd 100644 --- a/fe/PC/src/utils/summaryTableColumns/index.js +++ b/fe/PC/src/utils/summaryTableColumns/index.js @@ -4,7 +4,7 @@ const orderWidth = 180 // 原料管理 /**/ // 报检单 已调整 -export const InspectNotice = [ +export const InspectRequest = [ // { label: "检验详情", fixed: "left", type: "button" }, { label: "物品代码", prop: "itemCode" }, { label: "物品名称", prop: "itemName" }, diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js index cea25d174..4ebcb686d 100644 --- a/fe/PC/src/utils/tableColumns/index.js +++ b/fe/PC/src/utils/tableColumns/index.js @@ -1438,7 +1438,7 @@ export const lackMaterialsInfo = [ { label: "status", prop: 'status' }, ] // 报检单 已调整 -export const InspectNotice = [ +export const InspectRequest = [ { label: "检验单号", prop: "number", diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js index a758aa2c8..c27a72543 100644 --- a/fe/PC/src/utils/tabsDesTions/index.js +++ b/fe/PC/src/utils/tabsDesTions/index.js @@ -984,7 +984,7 @@ export const PurchaseReceiptNote = [ // ----------------------------------------------------------------------- ] // 报检单 已调整 20221220 -export const InspectNotice = [ +export const InspectRequest = [ { label: "检验单号", prop: "number" }, { label: "状态", prop: "jobStatus", type: "filter", filters: "jobStatus" }, { label: "创建时间", prop: "creationTime",type: "dateTime" }, diff --git a/fe/PC/src/views/rawMaterialManage/quality/InspectNotice.vue b/fe/PC/src/views/rawMaterialManage/quality/InspectNotice.vue index b62848a04..d1ca73a77 100644 --- a/fe/PC/src/views/rawMaterialManage/quality/InspectNotice.vue +++ b/fe/PC/src/views/rawMaterialManage/quality/InspectNotice.vue @@ -232,7 +232,7 @@ import { mixins } from "@/mixins/mixins" import currenDescriptions from "@/components/currenDescriptions" import pdf from "@/components/pdf" export default { - name: "InspectNotice", + name: "InspectRequest", mixins: [ tableMixins, LoadingMixins, @@ -246,7 +246,7 @@ export default { }, data () { return { - URL: 'wms/job/inspect-job', + URL: 'wms/store/inspect-request', // tab标签值 currentTagName:'hz', uploadShow: false, From 92e59025a7b76a3d7cd79d956b5b7d2d01315acf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Fri, 7 Apr 2023 10:22:51 +0800 Subject: [PATCH 003/105] =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E6=B2=A1=E6=9C=89=E6=9E=9A=E4=B8=BE=E5=80=BC?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PC/src/components/umyTable/index.vue | 6 +++--- fe/PC/src/filters/index.js | 6 ++++++ fe/PC/src/utils/index.js | 4 +++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/fe/PC/src/components/umyTable/index.vue b/fe/PC/src/components/umyTable/index.vue index a946c772a..5f427db67 100644 --- a/fe/PC/src/components/umyTable/index.vue +++ b/fe/PC/src/components/umyTable/index.vue @@ -702,9 +702,9 @@ export default { background: #f6f7fb !important; border: none !important; - &:last-child{ - background: unset !important; - } + // &:last-child{ + // background: unset !important; + // } } ::v-deep .el-form-item__error{ position: relative; diff --git a/fe/PC/src/filters/index.js b/fe/PC/src/filters/index.js index 92cd33a7e..350d335ff 100644 --- a/fe/PC/src/filters/index.js +++ b/fe/PC/src/filters/index.js @@ -114,6 +114,12 @@ export function isTableColumns(data) { return isData } +/** + * @param {*} index 枚举值 + * @param {*} text 枚举函数名称 + * @param {*} prop 返回字段 + * @param {*} type dictType + */ export function trigger(index, text, prop, type) { let Function = statusType.default[text] return Function(index, prop, type) diff --git a/fe/PC/src/utils/index.js b/fe/PC/src/utils/index.js index 09d37fcee..6cc3b36bc 100644 --- a/fe/PC/src/utils/index.js +++ b/fe/PC/src/utils/index.js @@ -386,12 +386,14 @@ export function removeClass(ele, cls) { //返回 export function Enum(status, index, prop) { + let _no_text = '无' + if(!status)return _no_text if (index != undefined) { //如果传入的是index if (prop === 'color') { const domColor = status[index] ? status[index][prop] : "" return 'color:' + domColor } else { - const dom = status[index] ? status[index][prop] : "无" + const dom = status[index] ? status[index][prop] : _no_text return dom } } else { From d0640b8f6fdbb2aefe6c3e74fef3679aa0a89a88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Fri, 7 Apr 2023 10:25:28 +0800 Subject: [PATCH 004/105] =?UTF-8?q?dictFormatData=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PC/src/utils/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fe/PC/src/utils/index.js b/fe/PC/src/utils/index.js index 6cc3b36bc..aec7bb21e 100644 --- a/fe/PC/src/utils/index.js +++ b/fe/PC/src/utils/index.js @@ -494,7 +494,7 @@ export function getMatchRegConformValue(type,defaultValue,fixedNum){ // 字典格式化数据结构 export function dictFormatData() { - return new Promise(resolve => { + return new Promise((resolve,reject) => { let rs = [] let childRs = {} let param = { From 6b9fe61eb30c2c7dcf935766c38bf0502483a6d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Fri, 7 Apr 2023 10:29:25 +0800 Subject: [PATCH 005/105] =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PC/src/filters/index.js | 1 + fe/PC/src/utils/request.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/fe/PC/src/filters/index.js b/fe/PC/src/filters/index.js index 350d335ff..a674ed054 100644 --- a/fe/PC/src/filters/index.js +++ b/fe/PC/src/filters/index.js @@ -122,6 +122,7 @@ export function isTableColumns(data) { */ export function trigger(index, text, prop, type) { let Function = statusType.default[text] + if(!Function)return '无' return Function(index, prop, type) } // 多数据源，集合 diff --git a/fe/PC/src/utils/request.js b/fe/PC/src/utils/request.js index 58180b04e..1c1750bf9 100644 --- a/fe/PC/src/utils/request.js +++ b/fe/PC/src/utils/request.js @@ -91,7 +91,7 @@ service.interceptors.response.use( }, error => { let err = error.response.data.error // for debug - if (err.validationErrors) { + if (err && err.validationErrors) { for (let item in err.validationErrors) { Message({ message: err.validationErrors[item].message, From bb9b7d35e0fb7d2b9e13b5af3f57aec5ec2bbd90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Fri, 7 Apr 2023 10:44:19 +0800 Subject: [PATCH 006/105] =?UTF-8?q?=E8=B4=A8=E6=A3=80=E5=8D=95=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E8=B0=83=E6=95=B4=E5=8F=8A=E6=8E=A5=E5=8F=A3=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PC/src/api/wms-job.js | 2 +- fe/PC/src/utils/detailsTableColumns/index.js | 55 +++++++++++-------- fe/PC/src/utils/summaryTableColumns/index.js | 39 ++++++++----- fe/PC/src/utils/tableColumns/index.js | 54 ++++++++++-------- fe/PC/src/utils/tabsDesTions/index.js | 52 +++++++++++------- .../{InspectNotice.vue => InspectRequest.vue} | 44 ++++++++------- 6 files changed, 145 insertions(+), 101 deletions(-) rename fe/PC/src/views/rawMaterialManage/quality/{InspectNotice.vue => InspectRequest.vue} (98%) diff --git a/fe/PC/src/api/wms-job.js b/fe/PC/src/api/wms-job.js index 6afac7482..335995cd7 100644 --- a/fe/PC/src/api/wms-job.js +++ b/fe/PC/src/api/wms-job.js @@ -198,7 +198,7 @@ export function preparationPlanByNumber(params) { //质检——完成质检 export function completeSummaryDetailStatus(params, data) { return request({ - url: baseURL + 'wms/job/inspect-job/complete-summary-detail-status/' + params.id, + url: baseURL + 'wms/store/inspect-job/complete-summary-detail-status/' + params.id, method: 'post', params: params, data diff --git a/fe/PC/src/utils/detailsTableColumns/index.js b/fe/PC/src/utils/detailsTableColumns/index.js index 9e5febcb2..622367a93 100644 --- a/fe/PC/src/utils/detailsTableColumns/index.js +++ b/fe/PC/src/utils/detailsTableColumns/index.js @@ -209,29 +209,27 @@ export const PurchaseReceiptJob = [ // { label: "ERP库位", prop: "recommendErpCode" }, // ----------------------------------------------------------------------- ] -// 报检单 已调整 +// 报检单 20230407 export const InspectRequest = [ { label: "物品代码", prop: "itemCode", fixed: "left" }, { label: "物品名称", prop: "itemName", width: orderWidth }, - { label: "物品描述", prop: "itemDesc1" }, + { label: "物品描述1", prop: "itemDesc1" }, + { label: "物品描述2", prop: "itemDesc2" }, { label: "收货数量", prop: "receiveQty" }, - { label: "物品单位", prop: "receiveUom" }, { label: "生产批次", prop: "lot" }, { label: "箱码", prop: "packingCode" }, + { label: "状态", prop: "status", type: "tagFilter", filters: "requestStatus" }, { label: "状态", prop: "detailInspectStatus", type: "filter", filters: "detailInspectStatus" }, { label: "库位", prop: 'locationCode' }, { label: "ERP库位", prop: 'locationErpCode' }, - { label: "合格数量", prop: 'goodQty' }, - { label: "不合格数量", prop: 'failedQty' }, - { label: "外观", prop: 'appearance' }, - { label: "尺寸", prop: 'volume' }, - { label: "重量", prop: 'weight' }, - { label: "其他属性", prop: 'otherPropertyJson' }, + { label: "检验单号", prop: "number" }, // ----------------------------------------------------------------------- + { label: "计量单位", prop: 'uom' }, + { label: "创建时间", prop: "creationTime", type: "dateTime" }, + { label: "创建者Id", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "完成时间", prop: "completeTime",type: "dateTime" }, + { label: "上次修改者Id", prop: 'lastModifierId' }, { label: "备注", prop: 'remark' }, - { label: "标包计量单位", prop: 'stdPackUom' }, { label: "标包数量", prop: 'stdPackQty' }, { label: "供应商批次", prop: 'supplierBatch' }, { label: "到货时间", prop: 'arriveDate', type: "dateTime" }, @@ -244,17 +242,30 @@ export const InspectRequest = [ { label: "订单行", prop: 'poLine' }, { label: "样品率", prop: 'samplePercent' }, { label: "检验数量", prop: 'inspectQty' }, - { label: "不合格原因代码", prop: 'failedReason' }, - { label: "不合格原因说明", prop: 'failedReason', type: "filter", filters: "getDict" , dictType:"UnqualifiedReason" }, - { label: "破坏数量", prop: 'crackQty' }, - { label: "检验人姓名", prop: 'inspectUserName' }, - { label: "检验人电话", prop: 'inspectUserPhone' }, - { label: "检验人邮件", prop: 'inspectUserEmail' }, - { label: "最终不合格数量", prop: 'notPassedQty' }, { label: "AbcClass类别", prop: 'abcClass' }, - { label: "供应商包装计量单位", prop: 'supplierPackUom' }, - { label: "供应商包装数量", prop: 'supplierPackQty' }, - { label: "inspectType", prop: 'inspectType' }, + { label: "事务ID", prop: "tenantId" }, + { label: "主表ID", prop: "masterID" }, + { label: "附加属性", prop: "attributes" }, + { label: "检验类型", prop: "inspectType", type: "filter", filters: "inspectType" }, + { label: "ID", prop: "id" }, + // { label: "完成时间", prop: "completeTime",type: "dateTime" }, + // { label: "标包计量单位", prop: 'stdPackUom' }, + // { label: "不合格原因代码", prop: 'failedReason' }, + // { label: "不合格原因说明", prop: 'failedReason', type: "filter", filters: "getDict" , dictType:"UnqualifiedReason" }, + // { label: "破坏数量", prop: 'crackQty' }, + // { label: "检验人姓名", prop: 'inspectUserName' }, + // { label: "检验人电话", prop: 'inspectUserPhone' }, + // { label: "检验人邮件", prop: 'inspectUserEmail' }, + // { label: "最终不合格数量", prop: 'notPassedQty' }, + // { label: "供应商包装计量单位", prop: 'supplierPackUom' }, + // { label: "供应商包装数量", prop: 'supplierPackQty' }, + // { label: "物品单位", prop: "receiveUom" }, + // { label: "合格数量", prop: 'goodQty' }, + // { label: "不合格数量", prop: 'failedQty' }, + // { label: "外观", prop: 'appearance' }, + // { label: "尺寸", prop: 'volume' }, + // { label: "重量", prop: 'weight' }, + // { label: "其他属性", prop: 'otherPropertyJson' }, // ----------------------------------------------------------------------- ] // 检验记录 字段需要确定 @@ -308,7 +319,7 @@ export const InspectNote = [ { label: "检验人电话", prop: 'inspectUserPhone' }, { label: "status", prop: 'status' }, { label: "masterID", prop: "masterID" }, - { label: "inspectType", prop: 'inspectType' }, + { label: "检验类型", prop: "inspectType", type: "filter", filters: "inspectType" }, { label: "ID", prop: "id" }, // { label: "其他属性", prop: 'otherPropertyJson' }, // ----------------------------------------------------------------------- diff --git a/fe/PC/src/utils/summaryTableColumns/index.js b/fe/PC/src/utils/summaryTableColumns/index.js index a8ec664fd..800782da3 100644 --- a/fe/PC/src/utils/summaryTableColumns/index.js +++ b/fe/PC/src/utils/summaryTableColumns/index.js @@ -3,25 +3,28 @@ const orderWidth = 180 // 原料管理 /**/ -// 报检单 已调整 +// 报检单 20230407 export const InspectRequest = [ - // { label: "检验详情", fixed: "left", type: "button" }, { label: "物品代码", prop: "itemCode" }, { label: "物品名称", prop: "itemName" }, - { label: "物品描述", prop: "itemDesc1" }, - { label: "物品单位", prop: "receiveUom" }, + { label: "物品描述1", prop: "itemDesc1" }, + { label: "物品描述2", prop: "itemDesc2" }, { label: "生产批次", prop: "lot" }, { label: "收货数量", prop: 'receiveQty' }, { label: "检验数量", prop: 'inspectQty' }, { label: "合格数量", prop: 'goodQty' }, { label: "不合格数量", prop: 'failedQty' }, // ----------------------------------------------------------------------- + { 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: "completeTime",type: "dateTime" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, + { label: "上次修改者ID", prop: "lastModifierId" }, + { label: "主表ID", prop: "masterID" }, { label: "备注", prop: 'remark' }, - { label: "标包计量单位", prop: 'stdPackUom' }, + { label: "计量单位", prop: 'uom' }, { label: "标包数量", prop: 'stdPackQty' }, { label: "供应商批次", prop: 'supplierBatch' }, { label: "到货时间", prop: 'arriveDate', type: "dateTime" }, @@ -30,17 +33,23 @@ export const InspectRequest = [ { label: "订单号", prop: 'poNumber',width: orderWidth }, { label: "订单行", prop: 'poLine' }, { label: "样品率", prop: 'samplePercent' }, - { label: "不合格原因代码", prop: 'failedReason' }, - { label: "不合格原因", prop: 'failedReason', type: "filter", filters: "getDict" , dictType:"UnqualifiedReason" }, { label: "破坏数量", prop: 'crackQty' }, - { label: "检验人姓名", prop: 'inspectUserName' }, - { label: "检验人电话", prop: 'inspectUserPhone' }, - { label: "检验人邮件", prop: 'inspectUserEmail' }, { label: "最终不合格数量", prop: 'notPassedQty' }, - { label: "供应商包装计量单位", prop: 'supplierPackUom' }, - { label: "供应商包装数量", prop: 'supplierPackQty' }, { label: "检验报告", prop: 'inspectReport' }, - { label: "inspectType", prop: 'inspectType' }, + { label: "事务ID", prop: "tenantId" }, + { label: "检验类型", prop: "inspectType", type: "filter", filters: "inspectType" }, + { label: "ID", prop: 'id' }, + // { label: "检验详情", fixed: "left", type: "button" }, + // { label: "检验人姓名", prop: 'inspectUserName' }, + // { label: "检验人电话", prop: 'inspectUserPhone' }, + // { label: "检验人邮件", prop: 'inspectUserEmail' }, + // { label: "不合格原因代码", prop: 'failedReason' }, + // { label: "不合格原因", prop: 'failedReason', type: "filter", filters: "getDict" , dictType:"UnqualifiedReason" }, + // { label: "供应商包装计量单位", prop: 'supplierPackUom' }, + // { label: "供应商包装数量", prop: 'supplierPackQty' }, + // { label: "物品单位", prop: "receiveUom" }, + // { label: "完成时间", prop: "completeTime",type: "dateTime" }, + // { label: "标包计量单位", prop: 'stdPackUom' }, // ----------------------------------------------------------------------- ] // 检验记录 字段需要确定 @@ -83,7 +92,7 @@ export const InspectNote = [ { label: "检验人邮件", prop: 'inspectUserEmail' }, { label: "检验人姓名", prop: 'inspectUserName' }, { label: "检验人电话", prop: 'inspectUserPhone' }, - { label: "inspectType", prop: 'inspectType' }, + { label: "检验类型", prop: "inspectType", type: "filter", filters: "inspectType" }, { label: "masterID", prop: "masterID" }, // ----------------------------------------------------------------------- ] \ No newline at end of file diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js index 4ebcb686d..3ea36add2 100644 --- a/fe/PC/src/utils/tableColumns/index.js +++ b/fe/PC/src/utils/tableColumns/index.js @@ -1437,7 +1437,7 @@ export const lackMaterialsInfo = [ { label: "供应商包装数量", prop: "supplierPackQty" }, { label: "status", prop: 'status' }, ] -// 报检单 已调整 +// 报检单 20230407 export const InspectRequest = [ { label: "检验单号", @@ -1446,37 +1446,47 @@ export const InspectRequest = [ type: "name", width: orderWidth }, - { label: "状态", prop: "jobStatus", type: "tagFilter", filters: "jobStatus" }, + { label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" }, { label: "创建时间", prop: "creationTime",type: "dateTime" }, - { label: "筹措员代码", prop: "worker" }, + { label: "操作员", prop: "worker" }, { label: "采购订单号", prop: "poNumber",width: orderWidth }, { label: "发货单号", prop: "asnNumber",width: orderWidth }, - { label: "到货单号", prop: "arriveNoticeNumber",width: orderWidth }, { label: "收货单号", prop: "receiptNumber",width: orderWidth }, { label: "供应商代码", prop: "supplierCode" }, { label: "备注", prop: 'remark' }, // ----------------------------------------------------------------------- - { label: "要求到货日期", prop: "planArriveDate",type: "dateTime" }, - { label: "发货日期", prop: "shipDate",type: "dateTime" }, + { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "公司", prop: 'company' }, + { label: "上次修改者ID", prop: "lastModifierId" }, + { label: "生效日期", prop: "activeDate",type: "dateTime" }, + { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" }, + { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" }, + { label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" }, + { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" }, + { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" }, + { label: "到货单号", prop: 'purchaseReceiptRequestNumber' }, { label: "仓库", prop: 'warehouseCode' }, - { label: "上游任务编号", prop: 'upStreamJobNumber' }, - { label: "任务类型", prop: 'jobType' }, - { label: "优先级", prop: 'priority' }, - { label: "优先级增量", prop: 'priorityIncrement' }, - { label: "工作组", prop: 'workGroupCode' }, - { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" }, - { label: "承接者ID", prop: 'acceptUserId' }, - { label: "承接者用户名", prop: 'acceptUserName' }, - { label: "承接时间", prop: 'acceptTime', type: "dateTime" }, - { label: "完成者", prop: 'completeUserId' }, - { label: "完成者用户名", prop: 'completeUserName' }, - { label: "完成时间", prop: 'completeTime', type: "dateTime" }, - { label: "任务描述", prop: 'jobDescription' }, - { label: "检验单号", prop: 'inspectNumber' }, { label: "要货计划单号", prop: 'rpNumber' }, - { label: "nextAction", prop: 'nextAction' }, + { label: "事务ID", prop: "tenantId" }, + // { label: "状态", prop: "jobStatus", type: "tagFilter", filters: "jobStatus" }, + // { label: "到货单号", prop: "arriveNoticeNumber",width: orderWidth }, + // { label: "要求到货日期", prop: "planArriveDate",type: "dateTime" }, + // { label: "发货日期", prop: "shipDate",type: "dateTime" }, + // { label: "上游任务编号", prop: 'upStreamJobNumber' }, + // { label: "任务类型", prop: 'jobType' }, + // { label: "优先级", prop: 'priority' }, + // { label: "优先级增量", prop: 'priorityIncrement' }, + // { label: "工作组", prop: 'workGroupCode' }, + // { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" }, + // { label: "承接者ID", prop: 'acceptUserId' }, + // { label: "承接者用户名", prop: 'acceptUserName' }, + // { label: "承接时间", prop: 'acceptTime', type: "dateTime" }, + // { label: "完成者", prop: 'completeUserId' }, + // { label: "完成者用户名", prop: 'completeUserName' }, + // { label: "完成时间", prop: 'completeTime', type: "dateTime" }, + // { label: "任务描述", prop: 'jobDescription' }, + // { label: "检验单号", prop: 'inspectNumber' }, + // { label: "nextAction", prop: 'nextAction' }, // ----------------------------------------------------------------------- ] // 检验记录 字段需要确定 diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js index c27a72543..3f37d6e7c 100644 --- a/fe/PC/src/utils/tabsDesTions/index.js +++ b/fe/PC/src/utils/tabsDesTions/index.js @@ -983,42 +983,52 @@ export const PurchaseReceiptNote = [ // { label: "公司", prop: 'company' }, // ----------------------------------------------------------------------- ] -// 报检单 已调整 20221220 +// 报检单 20230407 export const InspectRequest = [ { label: "检验单号", prop: "number" }, - { label: "状态", prop: "jobStatus", type: "filter", filters: "jobStatus" }, + { label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" }, { label: "创建时间", prop: "creationTime",type: "dateTime" }, { label: "采购订单号", prop: "poNumber" }, { label: "发货单号", prop: "asnNumber" }, - { label: "到货单号", prop: "arriveNoticeNumber" }, { label: "收货单号", prop: "receiptNumber" }, { label: "供应商代码", prop: "supplierCode" }, { label: "操作员", prop: 'worker' }, { label: "备注", prop: 'remark' }, - { label: "承接用户", prop: 'acceptUserName' }, - { label: "承接时间", prop: 'acceptTime', type: "dateTime" }, - { label: "完成用户", prop: 'completeUserName' }, - { label: "完成时间", prop: 'completeTime', type: "dateTime" }, + { label: "生效日期", prop: "activeDate",type: "dateTime" }, // ----------------------------------------------------------------------- + { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" }, + { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" }, + { label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" }, + { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" }, + { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" }, + { label: "到货单号", prop: 'purchaseReceiptRequestNumber' }, + { label: "仓库", prop: 'warehouseCode' }, + { label: "要货计划单号", prop: 'rpNumber' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "上次修改者ID", prop: "lastModifierId" }, { label: "事务ID", prop: "tenantId" }, - { label: "上游任务编号", prop: 'upStreamJobNumber' }, - { label: "任务类型", prop: 'jobType', type: "filter", filters: "taskType" }, - { label: "优先级", prop: 'priority' }, - { label: "优先级增量", prop: 'priorityIncrement' }, - { label: "工作组", prop: 'workGroupCode' }, - { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" }, { label: "创建者ID", prop: "creatorId" }, - { label: "承接者ID", prop: 'acceptUserId' }, - { label: "完成者ID", prop: 'completeUserId' }, - { label: "任务描述", prop: 'jobDescription' }, - { label: "检验单号", prop: 'inspectNumber' }, - { label: "要货计划单号", prop: 'rpNumber' }, - { label: "nextAction", prop: 'nextAction' }, - { label: "仓库", prop: 'warehouseCode' }, { label: "ID", prop: 'id' }, - { label: "公司", prop: 'company' }, + // { label: "到货单号", prop: "arriveNoticeNumber" }, + // { label: "承接用户", prop: 'acceptUserName' }, + // { label: "承接时间", prop: 'acceptTime', type: "dateTime" }, + // { label: "完成用户", prop: 'completeUserName' }, + // { label: "完成时间", prop: 'completeTime', type: "dateTime" }, + // { label: "上游任务编号", prop: 'upStreamJobNumber' }, + // { label: "任务类型", prop: 'jobType', type: "filter", filters: "taskType" }, + // { label: "优先级", prop: 'priority' }, + // { label: "优先级增量", prop: 'priorityIncrement' }, + // { label: "工作组", prop: 'workGroupCode' }, + // { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" }, + // { label: "承接者ID", prop: 'acceptUserId' }, + // { label: "完成者ID", prop: 'completeUserId' }, + // { label: "任务描述", prop: 'jobDescription' }, + // { label: "检验单号", prop: 'inspectNumber' }, + // { label: "要货计划单号", prop: 'rpNumber' }, + // { label: "nextAction", prop: 'nextAction' }, + // { label: "仓库", prop: 'warehouseCode' }, + // { label: "公司", prop: 'company' }, + // { label: "状态", prop: "jobStatus", type: "filter", filters: "jobStatus" }, // ----------------------------------------------------------------------- ] // 检验记录 字段需要确定 diff --git a/fe/PC/src/views/rawMaterialManage/quality/InspectNotice.vue b/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue similarity index 98% rename from fe/PC/src/views/rawMaterialManage/quality/InspectNotice.vue rename to fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue index d1ca73a77..50b56311e 100644 --- a/fe/PC/src/views/rawMaterialManage/quality/InspectNotice.vue +++ b/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue @@ -403,27 +403,23 @@ export default { // 质检详情页面-form数据 inspectNoticeDetailsFormData: { supplierBatch: null, - inspectUserPhone: null, creationTime: null, summaryInspectStatus: 0, - supplierPackUom: null, + inspectUser: null, + uom: null, receiveQty: 0, lot: null, notPassedQty: 0, remark: null, itemDesc1: null, - stdPackUom: null, itemDesc2: null, - receiveUom: null, poLine: null, stdPackQty: 0, arriveDate: null, goodQty: 0, - inspectUserName: null, itemCode: null, samplePercent: 0, masterID: null, - tenantId: null, crackQty: 0, inspectType: 0, lastModifierId: null, @@ -431,8 +427,6 @@ export default { expireDate: null, number: null, itemName: null, - inspectUserEmail: null, - supplierPackQty: 0, abcClass: null, failedReason: null, failedQty: 0, @@ -443,10 +437,18 @@ export default { inspectReport: null, lastModificationTime: null, filesList:[], - sampleQty: 0, // 要求检验数量 - goodQty: 0, formFile: [], details: [] + // inspectUserEmail: null, + // supplierPackQty: 0, + // tenantId: null, + // inspectUserName: null, + // receiveUom: null, + // sampleQty: 0, // 要求检验数量 + // goodQty: 0, + // supplierPackUom: null, + // inspectUserPhone: null, + // stdPackUom: null, }, // 质检详情页面-form字段 inspectNoticeDetailsForm: [ @@ -581,27 +583,23 @@ export default { this.inspectNoticeDetailsFormData.formFile = [] this.inspectNoticeDetailsFormData = { supplierBatch: null, - inspectUserPhone: null, creationTime: null, summaryInspectStatus: 0, - supplierPackUom: null, + inspectUser: null, + uom: null, receiveQty: 0, lot: null, notPassedQty: 0, remark: null, itemDesc1: null, - stdPackUom: null, itemDesc2: null, - receiveUom: null, poLine: null, stdPackQty: 0, arriveDate: null, goodQty: 0, - inspectUserName: null, itemCode: null, samplePercent: 0, masterID: null, - tenantId: null, crackQty: 0, inspectType: 0, lastModifierId: null, @@ -609,8 +607,6 @@ export default { expireDate: null, number: null, itemName: null, - inspectUserEmail: null, - supplierPackQty: 0, abcClass: null, failedReason: null, failedQty: 0, @@ -621,10 +617,18 @@ export default { inspectReport: null, lastModificationTime: null, filesList:[], - sampleQty: 0, // 要求检验数量 - goodQty: 0, formFile: [], details: [] + // inspectUserEmail: null, + // supplierPackQty: 0, + // tenantId: null, + // inspectUserName: null, + // receiveUom: null, + // sampleQty: 0, // 要求检验数量 + // goodQty: 0, + // supplierPackUom: null, + // inspectUserPhone: null, + // stdPackUom: null, } this.$listAssign(this.inspectNoticeDetailsFormData, row) let findRs = this.tableDataDetails.details.filter(item => ( From 1ba7e36f25479289afe51edab2fad68dc0119f0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Fri, 7 Apr 2023 11:20:01 +0800 Subject: [PATCH 007/105] =?UTF-8?q?=E6=8A=A5=E6=A3=80=E5=8D=95=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PC/src/api/wms-job.js | 6 ++--- .../quality/InspectRequest.vue | 23 +++++++++++-------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/fe/PC/src/api/wms-job.js b/fe/PC/src/api/wms-job.js index 335995cd7..8e7ba9fdf 100644 --- a/fe/PC/src/api/wms-job.js +++ b/fe/PC/src/api/wms-job.js @@ -208,7 +208,7 @@ export function completeSummaryDetailStatus(params, data) { //质检——设置默认状态（清除质检） export function setDetailDefaultOkStatus(params, id, data) { return request({ - url: baseURL + 'wms/job/inspect-job/set-detail-default-ok-status/' + id, + url: baseURL + 'wms/store/inspect-job/set-detail-default-ok-status/' + id, method: 'post', params: params, data @@ -218,7 +218,7 @@ export function setDetailDefaultOkStatus(params, id, data) { //质检——设置详情为合格 export function setDetailOkStatus(params, id, data) { return request({ - url: baseURL + 'wms/job/inspect-job/set-detail-ok-status/' + id, + url: baseURL + 'wms/store/inspect-job/set-detail-ok-status/' + id, method: 'post', params: params, data @@ -228,7 +228,7 @@ export function setDetailOkStatus(params, id, data) { //质检——设置详情为不合格 export function setDetailNookStatus(params, id, data) { return request({ - url: baseURL + 'wms/job/inspect-job/set-detail-nook-status/' + id, + url: baseURL + 'wms/store/inspect-job/set-detail-nook-status/' + id, method: 'post', params: params, data diff --git a/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue b/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue index 50b56311e..f00763b56 100644 --- a/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue +++ b/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue @@ -277,6 +277,8 @@ export default { inspectNoticeDetailsTableLoading: false, // 检验 inspectFormData: { + inspectUser: null, + uom: null, samplePercent: 0, number: null, otherPropertyJson: null, @@ -286,55 +288,54 @@ export default { lot: null, locationErpCode: null, failedQty: 0, - inspectUserEmail: null, supplierBatch: null, produceDate: null, lastModificationTime: null, creationTime: null, lastModifierId: null, - tenantId: null, - supplierPackUom: null, receiveQty: 0, remark: null, expireDate: null, poNumber: null, inspectType: 0, notPassedQty: 0, - inspectUserName: null, - receiveUom: null, locationCode: null, abcClass: null, locationGroup: null, containerCode: null, id: null, - supplierPackQty: 0, warehouseCode: null, creatorId: null, poLine: null, masterID: null, - inspectUserPhone: "18182874811", status: 0, goodQty: 0, locationArea: null, failedReason: null, - itemCode: null, itemName: null, itemDesc1: null, itemDesc2: null, stdPackQty: 0, - stdPackUom: null, packingCode:null, inspectQty: 0, appearance: null, volume: null, weight: null, - // otherPropertyJson 其他属性json, otherPropertyJson: null, details: [{ name: '', value: '' }], + // supplierPackQty: 0, + // inspectUserPhone: "18182874811", + // stdPackUom: null, + // otherPropertyJson 其他属性json, + // inspectUserEmail: null, + // tenantId: null, + // supplierPackUom: null, + // inspectUserName: null, + // receiveUom: null, }, inspectForm: [ { type: "input", label: "物品代码", prop: "itemCode", disabled: true, colSpan: 12 }, @@ -402,6 +403,7 @@ export default { ], // 质检详情页面-form数据 inspectNoticeDetailsFormData: { + warehouseCode: localStorage.getItem('warehouseCode'), supplierBatch: null, creationTime: null, summaryInspectStatus: 0, @@ -582,6 +584,7 @@ export default { } this.inspectNoticeDetailsFormData.formFile = [] this.inspectNoticeDetailsFormData = { + warehouseCode: localStorage.getItem('warehouseCode'), supplierBatch: null, creationTime: null, summaryInspectStatus: 0, From fcb1f822b0df73656f12b3a4f4a7ae058425156c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Fri, 7 Apr 2023 12:01:07 +0800 Subject: [PATCH 008/105] =?UTF-8?q?=E4=B8=8D=E5=90=88=E6=A0=BC=E8=BD=AC?= =?UTF-8?q?=E5=90=88=E6=A0=BC=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/commonTabel-drawer/index.vue | 2 +- fe/PC/src/utils/detailsTableColumns/index.js | 49 +++++++++++-------- fe/PC/src/utils/tableColumns/index.js | 6 +-- fe/PC/src/utils/tabsDesTions/index.js | 6 +-- 4 files changed, 36 insertions(+), 27 deletions(-) diff --git a/fe/PC/src/components/commonTabel-drawer/index.vue b/fe/PC/src/components/commonTabel-drawer/index.vue index c45b70de8..c1029a1cd 100644 --- a/fe/PC/src/components/commonTabel-drawer/index.vue +++ b/fe/PC/src/components/commonTabel-drawer/index.vue @@ -97,7 +97,7 @@ Date: Fri, 7 Apr 2023 13:46:12 +0800 Subject: [PATCH 009/105] =?UTF-8?q?=E6=8A=BD=E5=B1=89=E7=AA=9C=E7=9A=84?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PC/src/components/commonTabel-drawer/index.vue | 1 - fe/PC/src/components/commonTabel-drawer/style/index.scss | 5 ++++- fe/PC/src/styles/basicData.scss | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/fe/PC/src/components/commonTabel-drawer/index.vue b/fe/PC/src/components/commonTabel-drawer/index.vue index c1029a1cd..b06b0e292 100644 --- a/fe/PC/src/components/commonTabel-drawer/index.vue +++ b/fe/PC/src/components/commonTabel-drawer/index.vue @@ -8,7 +8,6 @@ :with-header="false" :modal="false" size="100%" - style="height:calc(100% - 28px);top: 14px;right:14px" >
diff --git a/fe/PC/src/components/commonTabel-drawer/style/index.scss b/fe/PC/src/components/commonTabel-drawer/style/index.scss index bdd3e882e..877fd49f9 100644 --- a/fe/PC/src/components/commonTabel-drawer/style/index.scss +++ b/fe/PC/src/components/commonTabel-drawer/style/index.scss @@ -3,6 +3,9 @@ position: absolute; left: 32%; overflow: visible; + // height:calc(100% - 28px); + // top: 14px; + // right:14px ::v-deep .el-drawer { height: 100%; @@ -67,7 +70,7 @@ display: flex; flex-direction: column; .el-tabs__header{ - padding-bottom: 5px ; + // padding-bottom: 5px ; .el-tabs__nav{ z-index: auto !important; } diff --git a/fe/PC/src/styles/basicData.scss b/fe/PC/src/styles/basicData.scss index 1dc5e3451..231d5cd5d 100644 --- a/fe/PC/src/styles/basicData.scss +++ b/fe/PC/src/styles/basicData.scss @@ -2,6 +2,7 @@ .page-box { @include appMainPage; padding-top:20px; + position: relative; ::v-deep .v-modal { z-index: 20 !important; From d4df40c106a6ad8f94730b9d2f64f1dc6bd07913 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Fri, 7 Apr 2023 14:11:27 +0800 Subject: [PATCH 010/105] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=95=B4=E4=BD=93=E5=8F=8A=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PC/src/utils/detailsTableColumns/index.js | 31 +++++++++++--------- fe/PC/src/utils/summaryTableColumns/index.js | 30 +++++++++++-------- fe/PC/src/utils/tableColumns/index.js | 13 +++++--- fe/PC/src/utils/tabsDesTions/index.js | 9 +++--- 4 files changed, 48 insertions(+), 35 deletions(-) diff --git a/fe/PC/src/utils/detailsTableColumns/index.js b/fe/PC/src/utils/detailsTableColumns/index.js index 622367a93..03102e4c8 100644 --- a/fe/PC/src/utils/detailsTableColumns/index.js +++ b/fe/PC/src/utils/detailsTableColumns/index.js @@ -268,30 +268,24 @@ export const InspectRequest = [ // { label: "其他属性", prop: 'otherPropertyJson' }, // ----------------------------------------------------------------------- ] -// 检验记录 字段需要确定 +// 检验记录 20230407 export const InspectNote = [ - // { label: "其他详情", fixed: "left", type: "button" }, { label: "物品代码", prop: "itemCode", fixed: "left" }, { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, { label: "收货数量", prop: "receiveQty" }, - { label: "物品单位", prop: "receiveUom" }, { label: "生产批次", prop: "lot" }, { label: "箱码", prop: "packingCode" }, { label: "库位", prop: 'locationCode' }, { label: "ERP库位", prop: 'locationErpCode' }, { label: "合格数量", prop: 'goodQty' }, { label: "不合格数量", prop: 'failedQty' }, - { label: "外观", prop: 'appearance' }, - { label: "尺寸", prop: 'volume' }, - { label: "重量", prop: 'weight' }, - { label: "状态", prop: "detailInspectStatus", type: "filter", filters: "detailInspectStatus" }, - // { label: "不合格原因代码", prop: 'failedReason' }, - // { label: "不合格原因说明", prop: 'failedReason', type: "filter", filters: "getDict", dictType: "UnqualifiedReason" }, + { label: "检验人", prop: 'inspectUser' }, // ----------------------------------------------------------------------- { label: "盘点标签", prop: "containerCode" }, { label: "破坏数量", prop: 'crackQty' }, + { label: "异常照片", prop: 'photos' }, { label: "最终不合格数量", prop: 'notPassedQty' }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, { label: "创建者Id", prop: 'creatorId' }, @@ -308,20 +302,29 @@ export const InspectNote = [ { label: "库区", prop: 'locationArea' }, { label: "订单号", prop: 'poNumber' }, { label: "订单行", prop: 'poLine' }, - { label: "标包计量单位", prop: 'stdPackUom' }, + { label: "计量单位", prop: 'uom' }, { label: "标包数量", prop: 'stdPackQty' }, { label: "样品率", prop: 'samplePercent' }, { label: "检验数量", prop: 'inspectQty' }, { label: "AbcClass类别", prop: 'abcClass' }, { label: "事务ID", prop: "tenantId" }, - { label: "检验人邮件", prop: 'inspectUserEmail' }, - { label: "检验人姓名", prop: 'inspectUserName' }, - { label: "检验人电话", prop: 'inspectUserPhone' }, { label: "status", prop: 'status' }, { label: "masterID", prop: "masterID" }, { label: "检验类型", prop: "inspectType", type: "filter", filters: "inspectType" }, { label: "ID", prop: "id" }, - // { label: "其他属性", prop: 'otherPropertyJson' }, + { label: "其他属性", prop: 'otherPropertyJson' }, + // { label: "标包计量单位", prop: 'stdPackUom' }, + // { label: "检验人邮件", prop: 'inspectUserEmail' }, + // { label: "检验人姓名", prop: 'inspectUserName' }, + // { label: "检验人电话", prop: 'inspectUserPhone' }, + // { label: "其他详情", fixed: "left", type: "button" }, + // { label: "物品单位", prop: "receiveUom" }, + // { label: "外观", prop: 'appearance' }, + // { label: "尺寸", prop: 'volume' }, + // { label: "重量", prop: 'weight' }, + // { label: "状态", prop: "detailInspectStatus", type: "filter", filters: "detailInspectStatus" }, + // { label: "不合格原因代码", prop: 'failedReason' }, + // { label: "不合格原因说明", prop: 'failedReason', type: "filter", filters: "getDict", dictType: "UnqualifiedReason" }, // ----------------------------------------------------------------------- ] diff --git a/fe/PC/src/utils/summaryTableColumns/index.js b/fe/PC/src/utils/summaryTableColumns/index.js index 800782da3..c898e4a55 100644 --- a/fe/PC/src/utils/summaryTableColumns/index.js +++ b/fe/PC/src/utils/summaryTableColumns/index.js @@ -56,22 +56,19 @@ export const InspectRequest = [ export const InspectNote = [ { label: "物品代码", prop: "itemCode", fixed: "left" }, { label: "物品名称", prop: "itemName" }, - { label: "物品描述", prop: "itemDesc1" }, - { label: "物品单位", prop: 'receiveUom' }, + { label: "物品描述1", prop: "itemDesc1" }, + { label: "物品描述2", prop: "itemDesc2" }, { label: "生产批次", prop: "lot" }, + { label: "计量单位", prop: 'uom' }, { label: "收货数量", prop: 'receiveQty' }, { label: "检验数量", prop: 'inspectQty' }, { label: "合格数量", prop: 'goodQty' }, { label: "不合格数量", prop: 'failedQty' }, - { label: "外观", prop: 'appearance' }, - { label: "尺寸", prop: 'volume' }, - { label: "重量", prop: 'weight' }, - // { label: "不合格原因代码", prop: 'failedReason' }, - // { label: "不合格原因", prop: 'failedReason', type: "filter", filters: "getDict", dictType: "UnqualifiedReason" }, + { label: "检验人", prop: 'inspectUser' }, + { label: "不合格原因代码", prop: 'failedReason' }, + { label: "不合格原因", prop: 'failedReason', type: "filter", filters: "getDict", dictType: "UnqualifiedReason" }, // ----------------------------------------------------------------------- { label: "单据号", prop: "number" }, - { label: "物品描述2", prop: "itemDesc2" }, - { label: "创建时间", prop: "completeTime",type: "dateTime" }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, @@ -83,16 +80,23 @@ export const InspectNote = [ { label: "过期时间", prop: 'expireDate', type: "dateTime" }, { label: "订单号", prop: 'poNumber' }, { label: "订单行", prop: 'poLine' }, - { label: "标包计量单位", prop: 'stdPackUom' }, { label: "标包数量", prop: 'stdPackQty' }, { label: "样品率", prop: 'samplePercent' }, { label: "破坏数量", prop: 'crackQty' }, { label: "最终不合格数量", prop: 'notPassedQty' }, { label: "事务ID", prop: "tenantId" }, - { label: "检验人邮件", prop: 'inspectUserEmail' }, - { label: "检验人姓名", prop: 'inspectUserName' }, - { label: "检验人电话", prop: 'inspectUserPhone' }, { label: "检验类型", prop: "inspectType", type: "filter", filters: "inspectType" }, { label: "masterID", prop: "masterID" }, + { label: "ID", prop: "id" }, + // { label: "物品描述2", prop: "itemDesc2" }, + // { label: "创建时间", prop: "completeTime",type: "dateTime" }, + // { label: "标包计量单位", prop: 'stdPackUom' }, + // { label: "检验人邮件", prop: 'inspectUserEmail' }, + // { label: "检验人姓名", prop: 'inspectUserName' }, + // { label: "检验人电话", prop: 'inspectUserPhone' }, + // { label: "物品单位", prop: 'receiveUom' }, + // { label: "外观", prop: 'appearance' }, + // { label: "尺寸", prop: 'volume' }, + // { label: "重量", prop: 'weight' }, // ----------------------------------------------------------------------- ] \ No newline at end of file diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js index 3ea36add2..12e4e7762 100644 --- a/fe/PC/src/utils/tableColumns/index.js +++ b/fe/PC/src/utils/tableColumns/index.js @@ -1489,7 +1489,7 @@ export const InspectRequest = [ // { label: "nextAction", prop: 'nextAction' }, // ----------------------------------------------------------------------- ] -// 检验记录 字段需要确定 +// 检验记录 20230407 export const InspectNote = [ { label: "检验单号", @@ -1499,10 +1499,11 @@ export const InspectNote = [ width: orderWidth }, { label: "创建时间", prop: "creationTime",type: "dateTime" }, + { label: "创建者ID", prop: 'creatorId' }, { label: "筹措员代码", prop: "worker" }, + { label: "到货单号", prop: 'purchaseReceiptRequestNumber' }, { label: "采购订单号", prop: "poNumber" ,width: orderWidth }, { label: "发货单号", prop: "asnNumber",width: orderWidth }, - { label: "到货单号", prop: "arriveNoticeNumber",width: orderWidth }, { label: "收货单号", prop: "receiptNumber",width: orderWidth }, { label: "供应商代码", prop: "supplierCode" }, { label: "备注", prop: 'remark' }, @@ -1510,10 +1511,14 @@ export const InspectNote = [ { label: "检验单号", prop: 'inspectNumber',width: orderWidth }, { label: "要货计划单号", prop: 'rpNumber',width: orderWidth }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "公司", prop: 'company' }, + { label: "上次修改者ID", prop: "lastModifierId" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { label: "仓库", prop: 'warehouseCode' }, { label: "检验规则", prop: 'nextAction',type: "filter", filters: "nextAction" }, + { label: "ID", prop: 'id' }, + { label: "事务ID", prop: "tenantId" }, + // { label: "到货单号", prop: "arriveNoticeNumber",width: orderWidth }, + // { label: "公司", prop: 'company' }, + // { label: "仓库", prop: 'warehouseCode' }, // ----------------------------------------------------------------------- ] // 不合格库存（不合格转合格） 已调整 diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js index 3f37d6e7c..49c87ca4f 100644 --- a/fe/PC/src/utils/tabsDesTions/index.js +++ b/fe/PC/src/utils/tabsDesTions/index.js @@ -1031,14 +1031,14 @@ export const InspectRequest = [ // { label: "状态", prop: "jobStatus", type: "filter", filters: "jobStatus" }, // ----------------------------------------------------------------------- ] -// 检验记录 字段需要确定 +// 检验记录 20230407 export const InspectNote = [ { label: "检验单号", prop: "number" }, { label: "创建时间", prop: "creationTime",type: "dateTime" }, { label: "筹措员代码", prop: "worker" }, { label: "采购订单号", prop: "poNumber" }, { label: "发货单号", prop: "asnNumber" }, - { label: "到货单号", prop: "arriveNoticeNumber" }, + { label: "到货单号", prop: 'purchaseReceiptRequestNumber' }, { label: "收货单号", prop: "receiptNumber" }, { label: "供应商代码", prop: "supplierCode" }, { label: "备注", prop: 'remark' }, @@ -1051,9 +1051,10 @@ export const InspectNote = [ { label: "生效日期", prop: 'activeDate', type: "dateTime" }, { label: "事务ID", prop: "tenantId" }, { label: "检验规则", prop: 'nextAction',type: "filter", filters: "nextAction" }, - { label: "仓库", prop: 'warehouseCode' }, { label: "ID", prop: 'id' }, - { label: "公司", prop: 'company' }, + // { label: "仓库", prop: 'warehouseCode' }, + // { label: "到货单号", prop: "arriveNoticeNumber" }, + // { label: "公司", prop: 'company' }, // ----------------------------------------------------------------------- ] // 不合格转合格记录 已调整 20221220 From b8ffb8335fbe7300eb035c77add6635a02730735 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Fri, 7 Apr 2023 15:55:30 +0800 Subject: [PATCH 011/105] =?UTF-8?q?=E4=B8=8D=E5=90=88=E6=A0=BC=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4=E5=8F=8A=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PC/src/utils/tableColumns/index.js | 15 +++++++++++---- .../quality/unqualifiedToQualified.vue | 14 ++++++++------ 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js index f41081862..7016f8764 100644 --- a/fe/PC/src/utils/tableColumns/index.js +++ b/fe/PC/src/utils/tableColumns/index.js @@ -1524,20 +1524,23 @@ export const InspectNote = [ // 不合格库存（不合格转合格） 已调整 export const unqualifiedToQualified = [ { label: "创建时间", prop: "creationTime", type: "dateTime" }, - // { label: "发货单号", prop: "asnNumber", width: orderWidth }, + { label: "创建者ID", prop: 'creatorId' }, { label: "物品代码", prop: "itemCode" }, { label: "物品名称", prop: "itemName" }, - { label: "物品描述", prop: "itemDesc1" }, + { label: "物品描述1", prop: "itemDesc1" }, + { label: "物品描述2", prop: "itemDesc2" }, { label: "数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "批次", prop: "lot" }, { label: "箱码", prop: "packingCode" }, { label: "库位", prop: 'locationCode' }, { label: "入库时间", prop: 'putInTime',type: "dateTime" }, + { label: "备注", prop: 'remark' }, // ----------------------------------------------------------------------- { label: "ERP库位", prop: "locationErpCode" }, + { label: "标包数量", prop: "stdPackQty" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "公司", prop: 'company' }, + { label: "上次修改者ID", prop: "lastModifierId" }, { label: "供应商批次", prop: 'supplierBatch' }, { label: "到货时间", prop: 'arriveDate', type: "dateTime" }, { label: "生产时间", prop: 'produceDate', type: "dateTime" }, @@ -1551,9 +1554,13 @@ export const unqualifiedToQualified = [ { label: "最后盘点标签", prop: 'lastCountLabel' }, { label: "是否可用", prop: 'isActive' }, { label: "最后事务号", prop: 'lastTransNumber' }, - { label: "lastTransType", prop: 'lastTransType' }, + { label: "最后事务类型", prop: "lastTransType", type: "filter", filters: "TransTypeBase" }, { label: "manageType", prop: 'manageType' }, { label: "status", prop: 'status' }, + { label: "ID", prop: 'id' }, + { label: "事务ID", prop: "tenantId" }, + // { label: "发货单号", prop: "asnNumber", width: orderWidth }, + // { label: "公司", prop: 'company' }, // ----------------------------------------------------------------------- ] // 不合格转合格记录 已调整 20230407 diff --git a/fe/PC/src/views/rawMaterialManage/quality/unqualifiedToQualified.vue b/fe/PC/src/views/rawMaterialManage/quality/unqualifiedToQualified.vue index 1b80d4e6b..b151c1c44 100644 --- a/fe/PC/src/views/rawMaterialManage/quality/unqualifiedToQualified.vue +++ b/fe/PC/src/views/rawMaterialManage/quality/unqualifiedToQualified.vue @@ -110,22 +110,23 @@ export default { if (this.selectionData != undefined ) { if (this.selectionData.length > 0) { this.Loading.appMainLoading = true + // 20230407 let params = { tenantId: null, remark: null, extraProperties: null, worker: store.getters.name.userName, - warehouseCode: null, activeDate: new Date(), autoSubmit: false, autoAgree: false, autoHandle: false, autoCompleteJob: false, directCreateNote: false, - requestStatus: 0, - company: localStorage.getItem('company'), number: null, details: [] + // warehouseCode: null, + // requestStatus: 0, + // company: localStorage.getItem('company'), } // company "DongYang" // concurrencyStamp "187ecf6d642e48f68a86f05ceddcbaea" @@ -147,12 +148,10 @@ export default { // status 3 // tenantId null this.selectionData.forEach(item => { - item.stdPackUom = null + // 20230407 item.stdPackQty = 0 item.fromPackingCode = item.packingCode item.toPackingCode = item.packingCode - item.fromContainerCode = item.containerCode - item.toContainerCode = item.containerCode item.fromLot = item.lot item.toLot = item.lot item.fromLocationCode = item.locationCode @@ -173,6 +172,9 @@ export default { item.poNumber = null item.supplierCode = null params.details.push(item) + // item.fromContainerCode = item.containerCode + // item.toContainerCode = item.containerCode + // item.stdPackUom = null }) convertOk(params).then(res => { this.$message.success('已成功转为合格') From ff2e664dd55e078d200873223f524fa1dd37c56b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Fri, 7 Apr 2023 16:03:12 +0800 Subject: [PATCH 012/105] =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BD=99=E9=A2=9D?= =?UTF-8?q?=E5=AD=97=E6=AE=B5+=E4=B8=9A=E5=8A=A1=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PC/src/utils/tableColumns/index.js | 20 +- fe/PC/src/utils/tabsDesTions/index.js | 18 +- .../InventoryQuery/InventoryBalance.vue | 254 +++++++++--------- 3 files changed, 152 insertions(+), 140 deletions(-) diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js index f41081862..02f78b00c 100644 --- a/fe/PC/src/utils/tableColumns/index.js +++ b/fe/PC/src/utils/tableColumns/index.js @@ -2569,7 +2569,7 @@ export const InventoryInitialNote = [ { label: "生效日期", prop: "activeDate" }, { label: "库存初始化请求单号", prop: "requestNumber" }, ] -// 库存余额 +// 库存余额 20230407 export const InventoryBalance = [ { label: "物品代码", @@ -2594,9 +2594,21 @@ export const InventoryBalance = [ { label: "入库时间", prop: "putInTime", type: "dateTime" }, { label: "过期日期", prop: "expireDate" ,type: "dateTime" }, { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" }, - { label: "上次盘点时间", prop: "lastCountTime",type: "dateTime" }, - { label: "上次盘点单号", prop: "lastCountPlanNumber",width: orderWidth }, - { label: "上次盘点标签号", prop: "lastCountLabel" }, + { label: "最后盘点时间", prop: "lastCountTime",type: "dateTime" }, + { label: "最后盘点计划单号", prop: "lastCountPlanNumber",width: orderWidth }, + { label: "最后盘点标签", prop: "lastCountLabel" }, + // ----------------------------------------------------------------------- + { label: "标包数量", prop: "stdPackQty" }, + { label: "库位组", prop: "locationGroup" }, + { label: "库区", prop: "locationArea" }, + { label: "管理类型", prop: "manageType", type: "filter", filters: "manageType" }, + { label: "序号", prop: "serialNumber" }, + { label: "备注", prop: "remark" }, + { label: "到货日期", prop: "arriveDate",type: "dateTime" }, + { label: "供应商批次", prop: "supplierBatch" }, + { label: "仓库", prop: 'warehouseCode' }, + { label: "最后事务类型", prop: "lastTransType", type: "filter", filters: "TransTypeBase" }, + { label: "最后事务编号", prop: 'lastTransNumber' }, ] // 库存事务 export const InventoryTransaction = [ diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js index dd8f8590c..7006a7904 100644 --- a/fe/PC/src/utils/tabsDesTions/index.js +++ b/fe/PC/src/utils/tabsDesTions/index.js @@ -1933,7 +1933,7 @@ export const InventoryInitialNote = [ { label: "ID", prop: 'id' }, // ----------------------------------------------------------------------- ] -// 库存余额 1 +// 库存余额 20230407 export const InventoryBalance = [ { label: "物品代码", prop: 'itemCode' }, { label: "物品名称", prop: "itemName" }, @@ -1950,27 +1950,27 @@ export const InventoryInitialNote = [ { label: "入库时间", prop: "putInTime", type: "dateTime" }, { label: "过期日期", prop: "expireDate" ,type: "dateTime" }, { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" }, - { label: "上次盘点时间", prop: "lastCountTime", type: "dateTime" }, - { label: "上次盘点单号", prop: "lastCountPlanNumber" }, - { label: "上次盘点标签号", prop: "lastCountLabel" }, + { label: "最后盘点时间", prop: "lastCountTime", type: "dateTime" }, + { label: "最后盘点计划单号", prop: "lastCountPlanNumber" }, + { label: "最后盘点标签号", prop: "lastCountLabel" }, // ----------------------------------------------------------------------- { label: "物品描述", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, { label: "标包数量", prop: 'stdPackQty' }, - { label: "标包计量单位", prop: 'stdPackUom' }, + // { label: "标包计量单位", prop: 'stdPackUom' }, { label: "供应商批次", prop: 'supplierBatch' }, { label: "事务ID", prop: "tenantId" }, { label: "序号", prop: "serialNumber" }, { label: "备注", prop: 'remark' }, { label: "创建者ID", prop: "creatorId" }, { label: "上次修改者ID", prop: "lastModifierId" }, - { label: "上次事务编号", prop: "lastTransNumber" }, - { label: "上次事务类型", prop: "transType", type: "filter", filters: "TransTypeBase" }, + { label: "最后事务编号", prop: "lastTransNumber" }, + { label: "最后事务类型", prop: "lastTransType", type: "filter", filters: "TransTypeBase" }, { label: "库区", prop: "locationArea" }, { label: "库位组", prop: "locationGroup" }, { label: "管理类型", prop: "manageType", type: "filter", filters: "manageType" }, - { label: "到达时间", prop: "arriveDate",type:"dateTime" }, - { label: "公司", prop: "company" }, + { label: "到货时间", prop: "arriveDate",type:"dateTime" }, + // { label: "公司", prop: "company" }, { label: "仓库", prop: "warehouseCode" }, { label: "ID", prop: "id" }, // ----------------------------------------------------------------------- diff --git a/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryBalance.vue b/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryBalance.vue index d33e8be87..ff0461cf3 100644 --- a/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryBalance.vue +++ b/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryBalance.vue @@ -25,7 +25,7 @@ > - + > --> { return this.hideButton() }, - name: "active", - size: 'mini' - }, + // { + // type: 'success', + // icon: 'el-icon-check', + // label: '启用', + // hide: () => { return this.hideButton() }, + // name: "active", + // size: 'mini' + // }, ], //编辑 - editFormData: { - id: null, - itemCode: null, - itemName: null, - itemDesc1: null, - itemDesc2: null, - produceDate: null, - expireDate: null, - locationCode: null, - status: 1, - lot: true, - packingCode: true, - containerCode: null, - qty: null, - locationArea: null, - locationGroup: null, - locationErpCode: null, - putInTime: null, - }, - editOptions: {}, - CreateForm: [ - { type: "input", label: "箱标签", prop: 'packingCode', colSpan: 12 }, - { type: "input", label: "排序依次", prop: 'sortingBase', colSpan: 12 }, - { type: "input", label: "序号", prop: 'serialNumber', colSpan: 12 }, - { type: "input", label: "最后盘点计划", prop: 'lastCountPlanNumber', colSpan: 12 }, - { type: "input", label: "最后盘点标签", prop: 'lastCountLabel', colSpan: 12 }, - { type: "input", label: "物品代码", prop: 'itemCode', colSpan: 12 }, - { type: "input", label: "批次编号", prop: 'batchCode', colSpan: 12 }, - { type: "input", label: "备注", prop: 'remark', colSpan: 12 }, - ], - editForm: [ - { type: "input", label: "物品代码", prop: "itemCode", disabled:true, colSpan: 12 }, - { type: "input", label: "物品名称", prop: "itemName", disabled:true, colSpan: 12 }, - { type: "input", label: "库位代码", prop: "locationCode", disabled:true, colSpan: 12 }, - { type: "input", label: "批次", prop: "lot", disabled:true, colSpan: 12 }, - { type: "input", label: "箱标签", prop: "packingCode", disabled:true, colSpan: 12 }, - { type: "input", label: "库区", prop: "locationArea", disabled:true, colSpan: 12 }, - { type: "input", label: "库位组", prop: "locationGroup", disabled:true, colSpan: 12 }, - { type: "dateTime", label: "入库时间", prop: "putInTime", disabled:true, colSpan: 12 }, - { type: "dateTime", label: "生产日期", prop: "produceDate", disabled:true, colSpan: 12 }, - { type: "dateTime", label: "过期日期", prop: "expireDate", colSpan: 12 }, - ], - editRules: { - expireDate: [{ required: true, trigger: "blur", message: "不可为空" }], - }, + // editFormData: { + // id: null, + // itemCode: null, + // itemName: null, + // itemDesc1: null, + // itemDesc2: null, + // produceDate: null, + // expireDate: null, + // locationCode: null, + // status: 1, + // lot: true, + // packingCode: true, + // containerCode: null, + // qty: null, + // locationArea: null, + // locationGroup: null, + // locationErpCode: null, + // putInTime: null, + // }, + // editOptions: {}, + // CreateForm: [ + // { type: "input", label: "箱标签", prop: 'packingCode', colSpan: 12 }, + // { type: "input", label: "排序依次", prop: 'sortingBase', colSpan: 12 }, + // { type: "input", label: "序号", prop: 'serialNumber', colSpan: 12 }, + // { type: "input", label: "最后盘点计划", prop: 'lastCountPlanNumber', colSpan: 12 }, + // { type: "input", label: "最后盘点标签", prop: 'lastCountLabel', colSpan: 12 }, + // { type: "input", label: "物品代码", prop: 'itemCode', colSpan: 12 }, + // { type: "input", label: "批次编号", prop: 'batchCode', colSpan: 12 }, + // { type: "input", label: "备注", prop: 'remark', colSpan: 12 }, + // ], + // editForm: [ + // { type: "input", label: "物品代码", prop: "itemCode", disabled:true, colSpan: 12 }, + // { type: "input", label: "物品名称", prop: "itemName", disabled:true, colSpan: 12 }, + // { type: "input", label: "库位代码", prop: "locationCode", disabled:true, colSpan: 12 }, + // { type: "input", label: "批次", prop: "lot", disabled:true, colSpan: 12 }, + // { type: "input", label: "箱标签", prop: "packingCode", disabled:true, colSpan: 12 }, + // { type: "input", label: "库区", prop: "locationArea", disabled:true, colSpan: 12 }, + // { type: "input", label: "库位组", prop: "locationGroup", disabled:true, colSpan: 12 }, + // { type: "dateTime", label: "入库时间", prop: "putInTime", disabled:true, colSpan: 12 }, + // { type: "dateTime", label: "生产日期", prop: "produceDate", disabled:true, colSpan: 12 }, + // { type: "dateTime", label: "过期日期", prop: "expireDate", colSpan: 12 }, + // ], + // editRules: { + // expireDate: [{ required: true, trigger: "blur", message: "不可为空" }], + // }, }; }, mounted () { this.paging(); }, methods: { - drawerbutton(val){ - // 启用 - if(val == "active"){ - this.$confirm('此操作将启用该数据, 是否继续?', '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning' - }).then(() => { - this.Loading.appMainLoading = true - inventoryBalanceActive(this.propsData.id).then(res => { - this.$successMsg('启用成功!') - this.Loading.appMainLoading = false - this.displayDialog.detailsDialog = false - this.paging() - // getDetailed(this.propsData.id, this.URL).then(res => { - // this.propsData = res - // this.Loading.DrawerLoading = false - // }) - }).catch(err => { - this.Loading.appMainLoading = false - }) - }).catch((err) => { - console.log(err) - }); - } - }, + // drawerbutton(val){ + // // 启用 + // if(val == "active"){ + // this.$confirm('此操作将启用该数据, 是否继续?', '提示', { + // confirmButtonText: '确定', + // cancelButtonText: '取消', + // type: 'warning' + // }).then(() => { + // this.Loading.appMainLoading = true + // inventoryBalanceActive(this.propsData.id).then(res => { + // this.$successMsg('启用成功!') + // this.Loading.appMainLoading = false + // this.displayDialog.detailsDialog = false + // this.paging() + // // getDetailed(this.propsData.id, this.URL).then(res => { + // // this.propsData = res + // // this.Loading.DrawerLoading = false + // // }) + // }).catch(err => { + // this.Loading.appMainLoading = false + // }) + // }).catch((err) => { + // console.log(err) + // }); + // } + // }, //抽屉下拉按钮操作 库存余额删除 只能删除库存数量为0的记录 - drawerHandle(val) { - if (val == 'delete') { - if (this.propsData.qty == '0') { - this.$confirm('此操作将永久删除该消息, 是否继续?', '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning' - }).then(() => { - this.Loading.appMainLoading = true - this.displayDialog.detailsDialog = false - postDelete(this.propsData.id, this.URL).then(res => { - this.$successMsg('删除成功!') - this.Loading.appMainLoading = false - this.paging() - }).catch(err => { - this.Loading.appMainLoading = false - }) - }).catch(() => { - }); - } else { - this.$message({ - message: "只能删除库存数量为 0 的记录！！", - type: "warning", - }); - } - } - }, + // drawerHandle(val) { + // if (val == 'delete') { + // if (this.propsData.qty == '0') { + // this.$confirm('此操作将永久删除该消息, 是否继续?', '提示', { + // confirmButtonText: '确定', + // cancelButtonText: '取消', + // type: 'warning' + // }).then(() => { + // this.Loading.appMainLoading = true + // this.displayDialog.detailsDialog = false + // postDelete(this.propsData.id, this.URL).then(res => { + // this.$successMsg('删除成功!') + // this.Loading.appMainLoading = false + // this.paging() + // }).catch(err => { + // this.Loading.appMainLoading = false + // }) + // }).catch(() => { + // }); + // } else { + // this.$message({ + // message: "只能删除库存数量为 0 的记录！！", + // type: "warning", + // }); + // } + // } + // }, //点击表单提交(新增或编辑) - FormClick (val) { - let params = { - id: this.editFormData.id, - expireDate: this.editFormData.expireDate - } - updateExpireDate(params, this.URL).then( res => { - this.displayDialog.editDialog = false - this.$message.success("修改成功！"); - this.paging(); - }).catch( err => { - this.$message.success("修改失败！"); - console.log(err) - }) - } + // FormClick (val) { + // let params = { + // id: this.editFormData.id, + // expireDate: this.editFormData.expireDate + // } + // updateExpireDate(params, this.URL).then( res => { + // this.displayDialog.editDialog = false + // this.$message.success("修改成功！"); + // this.paging(); + // }).catch( err => { + // this.$message.success("修改失败！"); + // console.log(err) + // }) + // } }, }; From 2f5ddcb55278224fcc355727ce1a0fe0dc6d0db1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Fri, 7 Apr 2023 16:16:56 +0800 Subject: [PATCH 013/105] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=BB=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E3=80=81=E8=AF=A6=E6=83=85=E6=B8=B2=E6=9F=93=E5=90=8E?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=96=B9=E6=B3=95=E5=B0=81=E8=A3=85=EF=BC=8C?= =?UTF-8?q?=E6=89=80=E6=9C=89=E4=B8=9A=E5=8A=A1=E7=BA=BF=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=8F=8A=E8=AF=A6=E6=83=85=E6=9C=89=E9=87=8D=E6=9E=84=E7=9A=84?= =?UTF-8?q?=E5=87=BD=E6=95=B0=E6=9B=B4=E6=94=B9=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PC/src/mixins/TableHeaderMixins.js | 6 ++---- fe/PC/src/mixins/TableMixins.js | 18 ++++++++++++------ .../deliver/DeliverNote-Query.vue | 2 +- .../deliver/FISDeliverNote-Query.vue | 2 +- .../dismantle/customerDismantleNote.vue | 4 ++-- .../dismantle/customerDismantleRequest.vue | 4 ++-- .../partiallyPreparedProductsNote.vue | 2 +- .../productReceipt/ProductReceiptRequest.vue | 2 +- .../customerStorageAllocationConfirm.vue | 2 +- .../customerStorageAllocationNote.vue | 2 +- .../customerStorageAllocationRequest.vue | 2 +- .../interStorageAllocationNote.vue | 2 +- .../intraStorageTransferNote.vue | 2 +- .../lineSideWarehouseAllocationConfirm.vue | 2 +- .../lineSideWarehouseAllocationNote.vue | 2 +- .../lineSideWarehouseAllocationRequest.vue | 2 +- .../lineSideWarehousePaymentNote.vue | 2 +- .../lineSideWarehousePaymentRequest.vue | 2 +- .../lineSideWarehouseScrappingNote.vue | 2 +- .../lineSideWarehouseScrappingRequest.vue | 2 +- .../automaticCallApply.vue | 2 +- .../automaticCallJob-msQuery.vue | 2 +- .../automaticCallNote.vue | 2 +- .../beforeGroundingReturnNote.vue | 2 +- .../directIssue/directIssueNote.vue | 2 +- .../manualMaterialRequest/IssueJob.vue | 2 +- .../manualMaterialRequest/IssueNote.vue | 2 +- .../manualMaterialRequest/IssueRequest.vue | 2 +- .../materialDirectSendNote.vue | 2 +- .../purchaseOnShelves/PutawayNote.vue | 2 +- .../PurchaseReceiptNote-msQuery.vue | 2 +- .../purchaseReturn/returnNote.vue | 2 +- .../quality/unqualifiedToQualified.vue | 2 +- .../rawMaterialManage/scrap/ScrapNote.vue | 2 +- fe/PC/src/views/systemManage/Department.vue | 4 ++-- 35 files changed, 50 insertions(+), 46 deletions(-) diff --git a/fe/PC/src/mixins/TableHeaderMixins.js b/fe/PC/src/mixins/TableHeaderMixins.js index f7089270c..d5c6ef682 100644 --- a/fe/PC/src/mixins/TableHeaderMixins.js +++ b/fe/PC/src/mixins/TableHeaderMixins.js @@ -151,8 +151,7 @@ export const TableHeaderMixins = { this.totalCount = res.totalCount this.httpOverallSearchData = null //清空全面筛选的回显数据 if(searchOverallRef)searchOverallRef.changeMoreListShow(false)//关闭高级筛选 - // todo:getSupplierByCodes - this.getSupplierByCodesHandle_table() + this.pagingCallback() }).catch(err => { this.Loading.tableLoading = false }) @@ -212,8 +211,7 @@ export const TableHeaderMixins = { this.httpOverallSearchData = {} this.httpOverallSearchData.params = JSON.parse(JSON.stringify(_data_primary)) this.httpOverallSearchData.moreList = JSON.parse(JSON.stringify(_data_moreList)) - console.log(this.httpOverallSearchData) - this.getSupplierByCodesHandle_table() + this.pagingCallback() }).catch(err => { this.Loading.tableLoading = false }) diff --git a/fe/PC/src/mixins/TableMixins.js b/fe/PC/src/mixins/TableMixins.js index 3a00b2674..95fa446be 100644 --- a/fe/PC/src/mixins/TableMixins.js +++ b/fe/PC/src/mixins/TableMixins.js @@ -47,7 +47,7 @@ export const tableMixins = { getPageList(this.PageListParams, this.URL).then(res => { this.tableData = res.items this.totalCount = res.totalCount - this.getSupplierByCodesHandle_table() + this.pagingCallback() }).catch(err => { this.Loading.tableLoading = false }) @@ -101,7 +101,7 @@ export const tableMixins = { } else { this.propsData = res } - this.getSupplierByCodesHandle_props() + this.inlineDialogCallback() }).catch(err => { this.Loading.DrawerLoading = false }) @@ -136,8 +136,6 @@ export const tableMixins = { }, // 获取供应商信息过滤tableData getSupplierByCodesHandle_table() { - this.Loading.tableLoading = false - return for(let i=0;i { this.tableData = res.items this.totalCount = res.totalCount - this.getSupplierByCodesHandle_table() + this.pagingCallback() }) .catch(err => { this.Loading.tableLoading = false diff --git a/fe/PC/src/views/finishedProductManage/deliver/FISDeliverNote-Query.vue b/fe/PC/src/views/finishedProductManage/deliver/FISDeliverNote-Query.vue index 2f9ddccc5..405dd67e3 100644 --- a/fe/PC/src/views/finishedProductManage/deliver/FISDeliverNote-Query.vue +++ b/fe/PC/src/views/finishedProductManage/deliver/FISDeliverNote-Query.vue @@ -86,7 +86,7 @@ export default { .then(res => { this.tableData = res.items this.totalCount = res.totalCount - this.getSupplierByCodesHandle_table() + this.pagingCallback() }) .catch(err => { this.Loading.tableLoading = false diff --git a/fe/PC/src/views/finishedProductManage/dismantle/customerDismantleNote.vue b/fe/PC/src/views/finishedProductManage/dismantle/customerDismantleNote.vue index 5a87f9b57..6ac8dfd42 100644 --- a/fe/PC/src/views/finishedProductManage/dismantle/customerDismantleNote.vue +++ b/fe/PC/src/views/finishedProductManage/dismantle/customerDismantleNote.vue @@ -109,7 +109,7 @@ export default { item.preStartTime = item.noteAndBackFlushDetails[0].preStartTime item.workHour = item.noteAndBackFlushDetails[0].workHour }) - this.getSupplierByCodesHandle_table() + this.pagingCallback() }) .catch(err => { this.Loading.tableLoading = false @@ -139,7 +139,7 @@ export default { this.propsData.rawLocationCode = this.propsData.noteAndBackFlushDetails[0].rawLocationCode this.propsData.preStartTime = this.propsData.noteAndBackFlushDetails[0].preStartTime this.propsData.workHour = this.propsData.noteAndBackFlushDetails[0].workHour - this.getSupplierByCodesHandle_props() + this.inlineDialogCallback() }) .catch(err => { this.Loading.DrawerLoading = false diff --git a/fe/PC/src/views/finishedProductManage/dismantle/customerDismantleRequest.vue b/fe/PC/src/views/finishedProductManage/dismantle/customerDismantleRequest.vue index 887825518..53642f87e 100644 --- a/fe/PC/src/views/finishedProductManage/dismantle/customerDismantleRequest.vue +++ b/fe/PC/src/views/finishedProductManage/dismantle/customerDismantleRequest.vue @@ -123,7 +123,7 @@ export default { item.preStartTime = item.details[0].preStartTime item.workHour = item.details[0].workHour }) - this.getSupplierByCodesHandle_table() + this.pagingCallback() }) .catch(err => { this.Loading.tableLoading = false @@ -151,7 +151,7 @@ export default { this.propsData.rawLocationCode = this.propsData.details[0].rawLocationCode this.propsData.preStartTime = this.propsData.details[0].preStartTime this.propsData.workHour = this.propsData.details[0].workHour - this.getSupplierByCodesHandle_props() + this.inlineDialogCallback() }).catch(err => { this.Loading.DrawerLoading = false }) diff --git a/fe/PC/src/views/finishedProductManage/partiallyPreparedProducts/partiallyPreparedProductsNote.vue b/fe/PC/src/views/finishedProductManage/partiallyPreparedProducts/partiallyPreparedProductsNote.vue index 545ca85b6..c7aca84e9 100644 --- a/fe/PC/src/views/finishedProductManage/partiallyPreparedProducts/partiallyPreparedProductsNote.vue +++ b/fe/PC/src/views/finishedProductManage/partiallyPreparedProducts/partiallyPreparedProductsNote.vue @@ -90,7 +90,7 @@ export default { .then(res => { this.tableData = res.items this.totalCount = res.totalCount - this.getSupplierByCodesHandle_table() + this.pagingCallback() }).catch(err => { this.Loading.tableLoading = false }) diff --git a/fe/PC/src/views/finishedProductManage/productReceipt/ProductReceiptRequest.vue b/fe/PC/src/views/finishedProductManage/productReceipt/ProductReceiptRequest.vue index 8bc279f05..b3aeefee9 100644 --- a/fe/PC/src/views/finishedProductManage/productReceipt/ProductReceiptRequest.vue +++ b/fe/PC/src/views/finishedProductManage/productReceipt/ProductReceiptRequest.vue @@ -124,7 +124,7 @@ export default { materialRequestByType(this.PageListParams, this.URL + '/by-type', params).then(res => { this.tableData = res.items this.totalCount = res.totalCount - this.getSupplierByCodesHandle_table() + this.pagingCallback() }).catch(err => { this.Loading.tableLoading = false }) diff --git a/fe/PC/src/views/inventoryManage/customerStorageAllocation/customerStorageAllocationConfirm.vue b/fe/PC/src/views/inventoryManage/customerStorageAllocation/customerStorageAllocationConfirm.vue index f831aa0f9..8edb33e2a 100644 --- a/fe/PC/src/views/inventoryManage/customerStorageAllocation/customerStorageAllocationConfirm.vue +++ b/fe/PC/src/views/inventoryManage/customerStorageAllocation/customerStorageAllocationConfirm.vue @@ -150,7 +150,7 @@ export default { getPageListWip(this.PageListParams, 'wms/store/transfer-note/get-custom-loc-list').then(res => { this.tableData = res.items this.totalCount = res.totalCount - this.getSupplierByCodesHandle_table() + this.pagingCallback() }).catch(err => { this.Loading.tableLoading = false }) diff --git a/fe/PC/src/views/inventoryManage/customerStorageAllocation/customerStorageAllocationNote.vue b/fe/PC/src/views/inventoryManage/customerStorageAllocation/customerStorageAllocationNote.vue index f29b176d7..b3a05ca58 100644 --- a/fe/PC/src/views/inventoryManage/customerStorageAllocation/customerStorageAllocationNote.vue +++ b/fe/PC/src/views/inventoryManage/customerStorageAllocation/customerStorageAllocationNote.vue @@ -113,7 +113,7 @@ export default { getPageListWip(this.PageListParams, 'wms/store/transfer-note/get-custom-loc-list').then(res => { this.tableData = res.items this.totalCount = res.totalCount - this.getSupplierByCodesHandle_table() + this.pagingCallback() }).catch(err => { this.Loading.tableLoading = false }) diff --git a/fe/PC/src/views/inventoryManage/customerStorageAllocation/customerStorageAllocationRequest.vue b/fe/PC/src/views/inventoryManage/customerStorageAllocation/customerStorageAllocationRequest.vue index 3effcf654..90aa25ef3 100644 --- a/fe/PC/src/views/inventoryManage/customerStorageAllocation/customerStorageAllocationRequest.vue +++ b/fe/PC/src/views/inventoryManage/customerStorageAllocation/customerStorageAllocationRequest.vue @@ -115,7 +115,7 @@ export default { getPageListWip(this.PageListParams, 'wms/store/transfer-request/get-custom-loc-list').then(res => { this.tableData = res.items this.totalCount = res.totalCount - this.getSupplierByCodesHandle_table() + this.pagingCallback() }).catch(err => { this.Loading.tableLoading = false }) diff --git a/fe/PC/src/views/inventoryManage/interStorageAllocation/interStorageAllocationNote.vue b/fe/PC/src/views/inventoryManage/interStorageAllocation/interStorageAllocationNote.vue index 60267f713..a0f4418c0 100644 --- a/fe/PC/src/views/inventoryManage/interStorageAllocation/interStorageAllocationNote.vue +++ b/fe/PC/src/views/inventoryManage/interStorageAllocation/interStorageAllocationNote.vue @@ -113,7 +113,7 @@ export default { getPageListWip(this.PageListParams, 'wms/store/transfer-note/get-erp-loc-list').then(res => { this.tableData = res.items this.totalCount = res.totalCount - this.getSupplierByCodesHandle_table() + this.pagingCallback() }).catch(err => { this.Loading.tableLoading = false }) diff --git a/fe/PC/src/views/inventoryManage/intraStorageTransfer/intraStorageTransferNote.vue b/fe/PC/src/views/inventoryManage/intraStorageTransfer/intraStorageTransferNote.vue index 4019532b4..39073daad 100644 --- a/fe/PC/src/views/inventoryManage/intraStorageTransfer/intraStorageTransferNote.vue +++ b/fe/PC/src/views/inventoryManage/intraStorageTransfer/intraStorageTransferNote.vue @@ -109,7 +109,7 @@ export default { getPageListWip(this.PageListParams, 'wms/store/transfer-note/get-inside-list').then(res => { this.tableData = res.items this.totalCount = res.totalCount - this.getSupplierByCodesHandle_table() + this.pagingCallback() }).catch(err => { this.Loading.tableLoading = false }) diff --git a/fe/PC/src/views/inventoryManage/lineSideWarehouseAllocation/lineSideWarehouseAllocationConfirm.vue b/fe/PC/src/views/inventoryManage/lineSideWarehouseAllocation/lineSideWarehouseAllocationConfirm.vue index 4c5040478..b9c0617f7 100644 --- a/fe/PC/src/views/inventoryManage/lineSideWarehouseAllocation/lineSideWarehouseAllocationConfirm.vue +++ b/fe/PC/src/views/inventoryManage/lineSideWarehouseAllocation/lineSideWarehouseAllocationConfirm.vue @@ -150,7 +150,7 @@ export default { getPageListWip(this.PageListParams, 'wms/store/transfer-note/get-wip-list').then(res => { this.tableData = res.items this.totalCount = res.totalCount - this.getSupplierByCodesHandle_table() + this.pagingCallback() }).catch(err => { this.Loading.tableLoading = false }) diff --git a/fe/PC/src/views/inventoryManage/lineSideWarehouseAllocation/lineSideWarehouseAllocationNote.vue b/fe/PC/src/views/inventoryManage/lineSideWarehouseAllocation/lineSideWarehouseAllocationNote.vue index 6d77dc128..b42a42100 100644 --- a/fe/PC/src/views/inventoryManage/lineSideWarehouseAllocation/lineSideWarehouseAllocationNote.vue +++ b/fe/PC/src/views/inventoryManage/lineSideWarehouseAllocation/lineSideWarehouseAllocationNote.vue @@ -113,7 +113,7 @@ export default { getPageListWip(this.PageListParams, 'wms/store/transfer-note/get-wip-list').then(res => { this.tableData = res.items this.totalCount = res.totalCount - this.getSupplierByCodesHandle_table() + this.pagingCallback() }).catch(err => { this.Loading.tableLoading = false }) diff --git a/fe/PC/src/views/inventoryManage/lineSideWarehouseAllocation/lineSideWarehouseAllocationRequest.vue b/fe/PC/src/views/inventoryManage/lineSideWarehouseAllocation/lineSideWarehouseAllocationRequest.vue index 12f1f3826..9ce112cbe 100644 --- a/fe/PC/src/views/inventoryManage/lineSideWarehouseAllocation/lineSideWarehouseAllocationRequest.vue +++ b/fe/PC/src/views/inventoryManage/lineSideWarehouseAllocation/lineSideWarehouseAllocationRequest.vue @@ -112,7 +112,7 @@ export default { getPageListWip(this.PageListParams, 'wms/store/transfer-request/get-wip-list').then(res => { this.tableData = res.items this.totalCount = res.totalCount - this.getSupplierByCodesHandle_table() + this.pagingCallback() }).catch(err => { this.Loading.tableLoading = false }) diff --git a/fe/PC/src/views/inventoryManage/lineSideWarehousePayment/lineSideWarehousePaymentNote.vue b/fe/PC/src/views/inventoryManage/lineSideWarehousePayment/lineSideWarehousePaymentNote.vue index 22491f2f9..0d3677813 100644 --- a/fe/PC/src/views/inventoryManage/lineSideWarehousePayment/lineSideWarehousePaymentNote.vue +++ b/fe/PC/src/views/inventoryManage/lineSideWarehousePayment/lineSideWarehousePaymentNote.vue @@ -86,7 +86,7 @@ export default { materialRequestByType(this.PageListParams, this.URL + '/by-type', params).then(res => { this.tableData = res.items this.totalCount = res.totalCount - this.getSupplierByCodesHandle_table() + this.pagingCallback() }).catch(err => { this.Loading.tableLoading = false }) diff --git a/fe/PC/src/views/inventoryManage/lineSideWarehousePayment/lineSideWarehousePaymentRequest.vue b/fe/PC/src/views/inventoryManage/lineSideWarehousePayment/lineSideWarehousePaymentRequest.vue index 49c7b9173..a153e3e9e 100644 --- a/fe/PC/src/views/inventoryManage/lineSideWarehousePayment/lineSideWarehousePaymentRequest.vue +++ b/fe/PC/src/views/inventoryManage/lineSideWarehousePayment/lineSideWarehousePaymentRequest.vue @@ -103,7 +103,7 @@ export default { materialRequestByType(this.PageListParams, this.URL + '/by-type', params).then(res => { this.tableData = res.items this.totalCount = res.totalCount - this.getSupplierByCodesHandle_table() + this.pagingCallback() }).catch(err => { this.Loading.tableLoading = false }) diff --git a/fe/PC/src/views/inventoryManage/lineSideWarehouseScrapping/lineSideWarehouseScrappingNote.vue b/fe/PC/src/views/inventoryManage/lineSideWarehouseScrapping/lineSideWarehouseScrappingNote.vue index 693ab7e10..8451155de 100644 --- a/fe/PC/src/views/inventoryManage/lineSideWarehouseScrapping/lineSideWarehouseScrappingNote.vue +++ b/fe/PC/src/views/inventoryManage/lineSideWarehouseScrapping/lineSideWarehouseScrappingNote.vue @@ -105,7 +105,7 @@ export default { materialRequestByType(this.PageListParams, this.URL + '/by-type', params).then(res => { this.tableData = res.items this.totalCount = res.totalCount - this.getSupplierByCodesHandle_table() + this.pagingCallback() }).catch(err => { this.Loading.tableLoading = false }) diff --git a/fe/PC/src/views/inventoryManage/lineSideWarehouseScrapping/lineSideWarehouseScrappingRequest.vue b/fe/PC/src/views/inventoryManage/lineSideWarehouseScrapping/lineSideWarehouseScrappingRequest.vue index 44b29bb0f..8856fc6ea 100644 --- a/fe/PC/src/views/inventoryManage/lineSideWarehouseScrapping/lineSideWarehouseScrappingRequest.vue +++ b/fe/PC/src/views/inventoryManage/lineSideWarehouseScrapping/lineSideWarehouseScrappingRequest.vue @@ -104,7 +104,7 @@ export default { materialRequestByType(this.PageListParams, this.URL + '/by-type', params).then(res => { this.tableData = res.items this.totalCount = res.totalCount - this.getSupplierByCodesHandle_table() + this.pagingCallback() }).catch(err => { this.Loading.tableLoading = false }) diff --git a/fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallApply.vue b/fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallApply.vue index d22510b27..3a296b007 100644 --- a/fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallApply.vue +++ b/fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallApply.vue @@ -137,7 +137,7 @@ export default { .then(res => { this.tableData = res.items this.totalCount = res.totalCount - this.getSupplierByCodesHandle_table() + this.pagingCallback() }).catch(err => { this.Loading.tableLoading = false }) diff --git a/fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallJob-msQuery.vue b/fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallJob-msQuery.vue index 9476d8d50..e17cd584e 100644 --- a/fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallJob-msQuery.vue +++ b/fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallJob-msQuery.vue @@ -252,7 +252,7 @@ export default { .then(res => { this.tableData = res.items this.totalCount = res.totalCount - this.getSupplierByCodesHandle_table() + this.pagingCallback() }) .catch(err => { this.Loading.tableLoading = false diff --git a/fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallNote.vue b/fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallNote.vue index dc3b335c3..d7fa0848d 100644 --- a/fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallNote.vue +++ b/fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallNote.vue @@ -99,7 +99,7 @@ export default { .then(res => { this.tableData = res.items this.totalCount = res.totalCount - this.getSupplierByCodesHandle_table() + this.pagingCallback() }) .catch(err => { this.Loading.tableLoading = false diff --git a/fe/PC/src/views/rawMaterialManage/beforeGroundingReturn/beforeGroundingReturnNote.vue b/fe/PC/src/views/rawMaterialManage/beforeGroundingReturn/beforeGroundingReturnNote.vue index e78b263b3..c19eba560 100644 --- a/fe/PC/src/views/rawMaterialManage/beforeGroundingReturn/beforeGroundingReturnNote.vue +++ b/fe/PC/src/views/rawMaterialManage/beforeGroundingReturn/beforeGroundingReturnNote.vue @@ -97,7 +97,7 @@ export default { .then(res => { this.tableData = res.items this.totalCount = res.totalCount - this.getSupplierByCodesHandle_table() + this.pagingCallback() }) .catch(err => { this.Loading.tableLoading = false diff --git a/fe/PC/src/views/rawMaterialManage/directIssue/directIssueNote.vue b/fe/PC/src/views/rawMaterialManage/directIssue/directIssueNote.vue index df60d8e18..47c45591c 100644 --- a/fe/PC/src/views/rawMaterialManage/directIssue/directIssueNote.vue +++ b/fe/PC/src/views/rawMaterialManage/directIssue/directIssueNote.vue @@ -97,7 +97,7 @@ export default { materialRequestByType(this.PageListParams, this.URL + '/by-type', params).then(res => { this.tableData = res.items this.totalCount = res.totalCount - this.getSupplierByCodesHandle_table() + this.pagingCallback() }).catch(err => { this.Loading.tableLoading = false }) diff --git a/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueJob.vue b/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueJob.vue index e2b13c917..4bafabaad 100644 --- a/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueJob.vue +++ b/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueJob.vue @@ -254,7 +254,7 @@ export default { .then(res => { this.tableData = res.items this.totalCount = res.totalCount - this.getSupplierByCodesHandle_table() + this.pagingCallback() }).catch(err => { this.Loading.tableLoading = false }) diff --git a/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueNote.vue b/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueNote.vue index 146f8b970..4f86dc879 100644 --- a/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueNote.vue +++ b/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueNote.vue @@ -98,7 +98,7 @@ export default { materialRequestByType(this.PageListParams, this.URL + '/by-type', params).then(res => { this.tableData = res.items this.totalCount = res.totalCount - this.getSupplierByCodesHandle_table() + this.pagingCallback() }).catch(err => { this.Loading.tableLoading = false }) diff --git a/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueRequest.vue b/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueRequest.vue index cfdb8059a..4710a1752 100644 --- a/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueRequest.vue +++ b/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueRequest.vue @@ -113,7 +113,7 @@ export default { materialRequestByType(this.PageListParams, this.URL + '/by-type', params).then(res => { this.tableData = res.items this.totalCount = res.totalCount - this.getSupplierByCodesHandle_table() + this.pagingCallback() }).catch(err => { this.Loading.tableLoading = false }) diff --git a/fe/PC/src/views/rawMaterialManage/materialDirectSend/materialDirectSendNote.vue b/fe/PC/src/views/rawMaterialManage/materialDirectSend/materialDirectSendNote.vue index 48f5409aa..783d88bfd 100644 --- a/fe/PC/src/views/rawMaterialManage/materialDirectSend/materialDirectSendNote.vue +++ b/fe/PC/src/views/rawMaterialManage/materialDirectSend/materialDirectSendNote.vue @@ -96,7 +96,7 @@ getPageListWip(this.PageListParams, 'wms/store/deliver-note/list-for-raw').then(res => { this.tableData = res.items this.totalCount = res.totalCount - this.getSupplierByCodesHandle_table() + this.pagingCallback() }).catch(err => { this.Loading.tableLoading = false }) diff --git a/fe/PC/src/views/rawMaterialManage/purchaseOnShelves/PutawayNote.vue b/fe/PC/src/views/rawMaterialManage/purchaseOnShelves/PutawayNote.vue index 35b5e5c17..c3cabd706 100644 --- a/fe/PC/src/views/rawMaterialManage/purchaseOnShelves/PutawayNote.vue +++ b/fe/PC/src/views/rawMaterialManage/purchaseOnShelves/PutawayNote.vue @@ -94,7 +94,7 @@ export default { getPageListWip(this.PageListParams, 'wms/store/putaway-note/get-list-by-purchase').then(res => { this.tableData = res.items this.totalCount = res.totalCount - this.getSupplierByCodesHandle_table() + this.pagingCallback() }).catch(err => { this.Loading.tableLoading = false }) diff --git a/fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseReceiptNote-msQuery.vue b/fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseReceiptNote-msQuery.vue index 8cc24e748..55a915ebd 100644 --- a/fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseReceiptNote-msQuery.vue +++ b/fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseReceiptNote-msQuery.vue @@ -169,7 +169,7 @@ export default { } else { this.propsData = res } - this.getSupplierByCodesHandle_props() + this.inlineDialogCallback() }).catch(err => { this.Loading.DrawerLoading = false }) diff --git a/fe/PC/src/views/rawMaterialManage/purchaseReturn/returnNote.vue b/fe/PC/src/views/rawMaterialManage/purchaseReturn/returnNote.vue index 6d732dc7b..9a9d81d20 100644 --- a/fe/PC/src/views/rawMaterialManage/purchaseReturn/returnNote.vue +++ b/fe/PC/src/views/rawMaterialManage/purchaseReturn/returnNote.vue @@ -97,7 +97,7 @@ export default { .then(res => { this.tableData = res.items this.totalCount = res.totalCount - this.getSupplierByCodesHandle_table() + this.pagingCallback() }) .catch(err => { this.Loading.tableLoading = false diff --git a/fe/PC/src/views/rawMaterialManage/quality/unqualifiedToQualified.vue b/fe/PC/src/views/rawMaterialManage/quality/unqualifiedToQualified.vue index b151c1c44..cf3e3dbe3 100644 --- a/fe/PC/src/views/rawMaterialManage/quality/unqualifiedToQualified.vue +++ b/fe/PC/src/views/rawMaterialManage/quality/unqualifiedToQualified.vue @@ -97,7 +97,7 @@ export default { .then(res => { this.tableData = res.items this.totalCount = res.totalCount - this.getSupplierByCodesHandle_table() + this.pagingCallback() }).catch(err => { this.Loading.tableLoading = false }) diff --git a/fe/PC/src/views/rawMaterialManage/scrap/ScrapNote.vue b/fe/PC/src/views/rawMaterialManage/scrap/ScrapNote.vue index 2d127819c..633338421 100644 --- a/fe/PC/src/views/rawMaterialManage/scrap/ScrapNote.vue +++ b/fe/PC/src/views/rawMaterialManage/scrap/ScrapNote.vue @@ -89,7 +89,7 @@ export default { materialRequestByType(this.PageListParams, this.URL + '/by-type', params).then(res => { this.tableData = res.items this.totalCount = res.totalCount - this.getSupplierByCodesHandle_table() + this.pagingCallback() }).catch(err => { this.Loading.tableLoading = false }) diff --git a/fe/PC/src/views/systemManage/Department.vue b/fe/PC/src/views/systemManage/Department.vue index 4a04a78d1..dee867ab6 100644 --- a/fe/PC/src/views/systemManage/Department.vue +++ b/fe/PC/src/views/systemManage/Department.vue @@ -140,7 +140,7 @@ export default { departmentList(this.PageListParams, this.URL).then(res => { this.tableData = res.items this.totalCount = res.totalCount - this.getSupplierByCodesHandle_table() + this.pagingCallback() }).catch(err => { this.Loading.tableLoading = false }) @@ -163,7 +163,7 @@ export default { } else { this.propsData = res } - this.getSupplierByCodesHandle_props() + this.inlineDialogCallback() }) .catch(err => { this.Loading.DrawerLoading = false From 2b5a9f3f34d7668f882112021bb5f6c723d5a1b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Fri, 7 Apr 2023 16:51:39 +0800 Subject: [PATCH 014/105] =?UTF-8?q?=E6=8A=A5=E6=A3=80=E5=8D=95=E6=A3=80?= =?UTF-8?q?=E9=AA=8C=E8=AF=A6=E6=83=85=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= =?UTF-8?q?+=E6=8A=BD=E5=B1=89=E6=B1=87=E6=80=BB=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=E9=AB=98=E5=BA=A6=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PC/src/components/commonTabel-drawer/index.vue | 2 +- fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/fe/PC/src/components/commonTabel-drawer/index.vue b/fe/PC/src/components/commonTabel-drawer/index.vue index b06b0e292..a0428a474 100644 --- a/fe/PC/src/components/commonTabel-drawer/index.vue +++ b/fe/PC/src/components/commonTabel-drawer/index.vue @@ -103,7 +103,7 @@ @handleSelectionChange="handleSelectionChange" @inlineDialog="inlineDialog" @buttonClick="buttonClick" - :setUTableHeight="200" + :setUTableHeight="210" >