diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue index e19abf544..c3e5e0037 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue @@ -111,9 +111,9 @@ > diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue index 2dbc5fe0e..8cfbac120 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue @@ -88,9 +88,9 @@ > diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue index 1fc5a4ead..37de27bff 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue @@ -89,9 +89,9 @@ > diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue index 347bbd91b..de41e509a 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue @@ -112,9 +112,9 @@ > diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue index 8734dc6c1..e33f74b7d 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue @@ -88,9 +88,9 @@ > diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue index 6c3baccb2..38ddd263e 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue @@ -112,9 +112,9 @@ > diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue index 8802a7638..67fdf4fd3 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue @@ -112,9 +112,9 @@ > diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue index 0b2cee5d7..cf7f2a5f6 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue @@ -89,9 +89,9 @@ > diff --git a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts index 493fd7d22..3480e04d2 100644 --- a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts +++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts @@ -446,7 +446,7 @@ export const CountadjustRequestDetail = useCrudSchemas(reactive([ }, }, { - label: '数量', + label: '差异数量', field: 'qty', sort: 'custom', table: { diff --git a/src/views/wms/inventoryManage/containerinit/containerBindRecord/containerBindRecordMain.data.ts b/src/views/wms/inventoryManage/containerinit/containerBindRecord/containerBindRecordMain.data.ts index a2ed3a301..6c1a81f56 100644 --- a/src/views/wms/inventoryManage/containerinit/containerBindRecord/containerBindRecordMain.data.ts +++ b/src/views/wms/inventoryManage/containerinit/containerBindRecord/containerBindRecordMain.data.ts @@ -64,6 +64,8 @@ export const ContainerBindRecordDetail = useCrudSchemas(reactive([ { label: '内容物类型', field: 'containerContentType', + dictType: DICT_TYPE.CONTAINER_CONTENT_TYPE, + dictClass: 'string', sort: 'custom', isSearch: true, form: { @@ -103,6 +105,8 @@ export const ContainerBindRecordDetail = useCrudSchemas(reactive([ { label: '库存状态', field: 'inventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', sort: 'custom', form: { component: 'Radio' @@ -114,6 +118,8 @@ export const ContainerBindRecordDetail = useCrudSchemas(reactive([ { label: '计量单位', field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', sort: 'custom', table: { width: 150 diff --git a/src/views/wms/inventoryManage/containerinit/containerRepair/containerRepairRecordMain.data.ts b/src/views/wms/inventoryManage/containerinit/containerRepair/containerRepairRecordMain.data.ts index 9eeddeb76..60e1154c4 100644 --- a/src/views/wms/inventoryManage/containerinit/containerRepair/containerRepairRecordMain.data.ts +++ b/src/views/wms/inventoryManage/containerinit/containerRepair/containerRepairRecordMain.data.ts @@ -80,6 +80,8 @@ export const ContainerRepairRecordDetail = useCrudSchemas(reactive { label: '从状态', field: 'fromContainerStatus', + dictType: DICT_TYPE.CONTAINER_STATUS, + dictClass: 'string', sort: 'custom', isSearch: true, form: { @@ -92,6 +94,8 @@ export const ContainerRepairRecordDetail = useCrudSchemas(reactive { label: '到状态', field: 'toContainerStatus', + dictType: DICT_TYPE.CONTAINER_STATUS, + dictClass: 'string', sort: 'custom', isSearch: true, form: { @@ -115,6 +119,9 @@ export const ContainerRepairRecordDetail = useCrudSchemas(reactive defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } }, + table: { + width: 150 + }, isForm: false, }, { @@ -122,6 +129,9 @@ export const ContainerRepairRecordDetail = useCrudSchemas(reactive field: 'remark', sort: 'custom', isSearch: true, + table: { + width: 150 + }, }, { label: '操作', diff --git a/src/views/wms/inventoryManage/containerinit/containerRepair/index.vue b/src/views/wms/inventoryManage/containerinit/containerRepair/index.vue index e2453b8e8..e397950d3 100644 --- a/src/views/wms/inventoryManage/containerinit/containerRepair/index.vue +++ b/src/views/wms/inventoryManage/containerinit/containerRepair/index.vue @@ -154,8 +154,8 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'wms:container-repair-record-main:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:container-repair-record-main:delete'}), // 删除 + //defaultButtons.mainListEditBtn({hasPermi:'wms:container-repair-record-main:update'}), // 编辑 + //defaultButtons.mainListDeleteBtn({hasPermi:'wms:container-repair-record-main:delete'}), // 删除 ] // 列表-操作按钮事件 diff --git a/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/containerUnbindRecordMain.data.ts b/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/containerUnbindRecordMain.data.ts index 1f06c3998..5fa429d89 100644 --- a/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/containerUnbindRecordMain.data.ts +++ b/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/containerUnbindRecordMain.data.ts @@ -63,6 +63,8 @@ export const ContainerUnbindRecordDetail = useCrudSchemas(reactive { label: '内容物类型', field: 'containerContentType', + dictType: DICT_TYPE.CONTAINER_CONTENT_TYPE, + dictClass: 'string', sort: 'custom', isSearch: true, form: { @@ -102,6 +104,8 @@ export const ContainerUnbindRecordDetail = useCrudSchemas(reactive { label: '库存状态', field: 'inventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', sort: 'custom', form: { component: 'Radio' @@ -113,6 +117,8 @@ export const ContainerUnbindRecordDetail = useCrudSchemas(reactive { label: '计量单位', field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', sort: 'custom', table: { width: 150 diff --git a/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/index.vue b/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/index.vue index bdc81db93..c26c2e311 100644 --- a/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/index.vue +++ b/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/index.vue @@ -120,9 +120,9 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn({hasPermi:'wms:containerUnbindRecordMain:create'}), // 新增 - defaultButtons.defaultImportBtn({hasPermi:'wms:containerUnbindRecordMain:import'}), // 导入 - defaultButtons.defaultExportBtn({hasPermi:'wms:containerUnbindRecordMain:export'}), // 导出 + // defaultButtons.defaultAddBtn({hasPermi:'wms:container-unbind-record-main:create'}), // 新增 + defaultButtons.defaultImportBtn({hasPermi:'wms:container-unbind-record-main:import'}), // 导入 + defaultButtons.defaultExportBtn({hasPermi:'wms:container-unbind-record-main:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -154,8 +154,8 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'wms:containerUnbindRecordMain:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:containerUnbindRecordMain:delete'}), // 删除 + //defaultButtons.mainListEditBtn({hasPermi:'wms:container-unbind-record-main:update'}), // 编辑 + //defaultButtons.mainListDeleteBtn({hasPermi:'wms:container-unbind-record-main:delete'}), // 删除 ] // 列表-操作按钮事件 diff --git a/src/views/wms/inventoryManage/containerinit/containerinitadd/containerMain.data.ts b/src/views/wms/inventoryManage/containerinit/containerinitadd/containerMain.data.ts index 91fbddc1c..3e6de4e36 100644 --- a/src/views/wms/inventoryManage/containerinit/containerinitadd/containerMain.data.ts +++ b/src/views/wms/inventoryManage/containerinit/containerinitadd/containerMain.data.ts @@ -8,26 +8,21 @@ import * as BalanceApi from "@/api/wms/balance"; // 表单校验 export const ContainerMainRules = reactive({ - number: [ - { required: true, message: '请输入号码', trigger: 'blur' } - ], type: [ { required: true, message: '请选择类型', trigger: 'change' } ], status: [ { required: true, message: '请选择状态', trigger: 'change' } - ], - ownerCode: [ - { required: true, message: '请选择货主代码', trigger: 'change' } - ], + ] }) export const ContainerMain = useCrudSchemas(reactive([ { - label: '号码', + label: '单据号', field: 'number', sort: 'custom', isSearch: true, + isForm: false, }, { label: '类型', diff --git a/src/views/wms/inventoryManage/containerinit/containerinitadd/index.vue b/src/views/wms/inventoryManage/containerinit/containerinitadd/index.vue index 956735566..5fefb9a21 100644 --- a/src/views/wms/inventoryManage/containerinit/containerinitadd/index.vue +++ b/src/views/wms/inventoryManage/containerinit/containerinitadd/index.vue @@ -28,7 +28,7 @@ v-model:sort="tableObject.sort" > diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts index 382a6af95..d48a6349e 100644 --- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts +++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts @@ -415,6 +415,12 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive([ //表单校验 export const ProductrepairRequestMainRules = reactive({ + workshopCode: [ + { required: true, message: '请选择车间代码', trigger: 'change' } + ], + dueTime: [ + { required: true, message: '请选择截止时间', trigger: 'change' } + ], fromWarehouseCode: [ { required: true, message: '请选择从仓库代码', trigger: 'change' } ], diff --git a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts index 38bb7a6e9..61a38b90c 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts +++ b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts @@ -688,6 +688,7 @@ export const ProdcutscrapRecordBomDismantle = useCrudSchemas(reactive([ //表单校验 export const ProductscrapRequestMainRules = reactive({ + workshopCode: [ + { required: true, message: '请选择车间代码', trigger: 'change' } + ], + dueTime: [ + { required: true, message: '请选择截止时间', trigger: 'change' } + ], fromWarehouseCode: [ { required: true, message: '请选择从仓库代码', trigger: 'change' } ], diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue index e47062cfe..adda80c48 100644 --- a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue @@ -187,7 +187,7 @@ const butttondata = (row) => { defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-request-main:refused'}), // 驳回 defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-request-main:agree'}), // 审批通过 defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:purchasereceipt-request-main:handle'}), // 处理 - defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-request-main:update'}), // 编辑 + // defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-request-main:update'}), // 编辑 ] } diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue index cd36991e3..b5e00a309 100644 --- a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue @@ -192,7 +192,7 @@ const butttondata = (row) => { defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-request-main:refused'}), // 驳回 defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-request-main:agree'}), // 审批通过 defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:purchasereceipt-request-main:handle'}), // 处理 - defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-request-main:update'}), // 编辑 + // defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-request-main:update'}), // 编辑 ] } diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts index d0079c458..e0092c798 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts @@ -4,6 +4,9 @@ import * as SupplierApi from '@/api/wms/supplier' import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data' import * as SupplieritemApi from '@/api/wms/supplieritem' import { Supplieritem } from '@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data' +import * as PurchaseMainApi from '@/api/wms/purchaseMain' +import * as PurchaseDetailApi from '@/api/wms/purchaseDetail' +import { PurchaseDetail, PurchaseMain } from '../purchaseMain/purchaseMain.data' const { t } = useI18n() // 国际化 /** @@ -57,7 +60,7 @@ export const DemandforecastingMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { - style: {width:'100%'}, + style: { width: '100%' }, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -80,7 +83,7 @@ export const DemandforecastingMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { - style: {width:'100%'}, + style: { width: '100%' }, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -103,7 +106,7 @@ export const DemandforecastingMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { - style: {width:'100%'}, + style: { width: '100%' }, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -132,7 +135,7 @@ export const DemandforecastingMain = useCrudSchemas(reactive([ isForm: false, form: { value: 'PurchasePrediction', - componentProps:{ + componentProps: { disabled: true } } @@ -179,7 +182,7 @@ export const DemandforecastingMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { - style: {width:'100%'}, + style: { width: '100%' }, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -270,7 +273,7 @@ export const DemandforecastingDetail = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { - style: {width:'100%'}, + style: { width: '100%' }, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -283,74 +286,140 @@ export const DemandforecastingDetail = useCrudSchemas(reactive([ } }, { - label: '单据号', - field: 'number', + label: '订单号', + field: 'poNumber', sort: 'custom', table: { width: 150 }, - isTableForm: false, + tableForm: { + isInpuFocusShow: true, + searchListPlaceholder: '请选择订单号', + searchField: 'number', + searchTitle: '采购订单信息', + searchAllSchemas: PurchaseMain.allSchemas, + searchPage: PurchaseMainApi.getPurchaseMainPage, + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }, { + key: 'supplierCode', + value: 'supplierCode', + isMainValue: true + } + , { + key: 'status', + value: 2, + isMainValue: false + } + ] + }, form: { + // labelMessage: '信息提示说明！！！', componentProps: { - disbaled: true + isSearchList: true, + searchListPlaceholder: '请选择订单号', + searchField: 'number', + searchTitle: '采购订单信息', + searchAllSchemas: PurchaseMain.allSchemas, + searchPage: PurchaseMainApi.getPurchaseMainPage, + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }] } } }, { - label: '物品代码', - field: 'itemCode', + label: '订单行', + field: 'poLine', sort: 'custom', table: { width: 150 }, - tableForm:{ - isInpuFocusShow: true, - searchListPlaceholder: '请选择供应商物品', - searchField: 'itemCode', - searchTitle: '供应商物品信息', - searchAllSchemas: Supplieritem.allSchemas, - searchPage: SupplieritemApi.getSupplieritemPage, - searchCondition: [{ - key:'supplierCode', - value:'supplierCode', - isMainValue: true - },{ - key: 'available', - value: 'TRUE', - isMainValue: false - }//, //条件，例：isMainValue: true,表示查询条件是主表的字段的值 itemCode：查询列表中字段 supplierCode：指主表某字段 - // { - // key:'available', - // value:'TRUE', - // isMainValue: false - // } - ] // 条件，例：isMainValue: false,表示查询条件不是主表的字段的值 available：查询列表中字段 TRUE：指查询具体值 - }, form: { // labelMessage: '信息提示说明！！！', componentProps: { isSearchList: true, - searchListPlaceholder: '请选择供应商物品', - searchField: 'itemCode', - searchTitle: '供应商物品信息', - searchAllSchemas: Supplieritem.allSchemas, - searchPage: SupplieritemApi.getSupplieritemPage, + searchListPlaceholder: '请选择订单行', + searchField: 'lineNumber', + searchTitle: '采购订单信息', + searchAllSchemas: PurchaseDetail.allSchemas, + searchPage: PurchaseDetailApi.getPurchaseDetailPage, searchCondition: [{ - key:'supplierCode', - value:'supplierCode', + key: 'number', + value: 'poNumber', isMainValue: true - },{ + }, { key: 'available', value: 'TRUE', isMainValue: false - }//, //条件，例：isMainValue: true,表示查询条件是主表的字段的值 itemCode：查询列表中字段 supplierCode：指主表某字段 - // { - // key:'available', - // value:'TRUE', - // isMainValue: false - // } - ] // 条件，例：isMainValue: false,表示查询条件不是主表的字段的值 available：查询列表中字段 TRUE：指查询具体值 + }] } + }, + tableForm: { + isInpuFocusShow: true, + searchListPlaceholder: '请选择订单行', + searchField: 'lineNumber', + searchTitle: '采购订单信息', + searchAllSchemas: PurchaseDetail.allSchemas, + searchPage: PurchaseDetailApi.getPurchaseDetailPage, + searchCondition: [{ + key: 'number', + value: 'poNumber', + isMainValue: true + }, { + key: 'available', + value: 'TRUE', + isMainValue: false + }] + } + }, + { + label: '单据号', + field: 'number', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + form: { + componentProps: { + disbaled: true + } + } + }, + { + label: '物品代码', + field: 'itemCode', + sort: 'custom', + table: { + width: 150 + }, + form: { + componentProps: { + disabled: true + } + }, + tableForm: { + disabled: true + } + }, + { + label: '计量单位', + field: 'uom', + sort: 'custom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isSearch: true, + isTable: true, + table: { + width: 150 + }, + tableForm: { + type: 'Select' } }, { @@ -375,7 +444,7 @@ export const DemandforecastingDetail = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { - style: {width:'100%'}, + style: { width: '100%' }, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -414,20 +483,7 @@ export const DemandforecastingDetail = useCrudSchemas(reactive([ precision: 6 } }, - { - label: '计量单位', - field: 'uom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - tableForm: { - type: 'Select' - } - }, + { label: '最后更新时间', field: 'updateTime', @@ -442,7 +498,7 @@ export const DemandforecastingDetail = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { - style: {width:'100%'}, + style: { width: '100%' }, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -465,12 +521,12 @@ export const DemandforecastingDetail = useCrudSchemas(reactive([ label: '操作', field: 'action', isDetail: false, - isForm: false , + isForm: false, table: { width: 150, fixed: 'right' }, - isTableForm:false, + isTableForm: false, } ])) @@ -494,4 +550,4 @@ export const DemandforecastingDetailRules = reactive({ itemCode: [ { required: true, message: '请选择物品代码', trigger: 'change' } ], -}) +}) \ No newline at end of file diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue index 1e32e2031..6d27c4545 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue @@ -105,6 +105,11 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => if (type == 'tableForm') { // 明细查询页赋值 row[formField] = val[0][searchField] + if (formField == 'poLine') { + row['itemCode'] = val[0]['itemCode'] + row['uom'] = val[0]['uom'] + row['available'] = val[0]['available'] + } } else { const setV = {} setV[formField] = val[0][searchField] diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue index fe4f9e7da..97f8958a3 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue @@ -88,19 +88,6 @@ row['planQty'] = val[0]['orderQty']-val[0]['plannedQty'] row['available'] = val[0]['available'] } - // await PurchaseDetailApi.getPurchaseDetailPage({ - // number: row['poNumber'], - // available: 'TRUE', - // // poLine: row['lineNumber'], - // }).then(res => { - // if (formField == 'poLine') { - // row['itemCode'] = res.list[0].itemCode - // row['uom'] = res.list[0].uom - // row['orderQty'] = res.list[0].orderQty - // row['planQty'] = res.list[0].orderQty-res.list[0].plannedQty - // row['available'] = res.list[0].available - // } - // }) } else { const setV = {} setV[formField] = val[0][searchField] diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue index a61820b33..a83bec284 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue @@ -185,7 +185,7 @@ defaultButtons.mainListPlanSubBtn({ hide: isShowMainButton(row, ['1']) }), // 提交审批 defaultButtons.mainListPlanAppBtn({ hide: isShowMainButton(row, ['2']) }), // 审批通过 defaultButtons.mainListPlanTurBtn({ hide: isShowMainButton(row, ['2']) }), // 驳回按钮 - defaultButtons.mainListEditBtn({ hasPermi: 'wms:supplierdeliver-request-main:update' }), // 编辑 + defaultButtons.mainListEditBtn({ hide: isShowMainButton(row, ['1']),hasPermi: 'wms:supplierdeliver-request-main:update' }), // 编辑 // defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:supplierdeliver-request-main:delete' }), // 删除 { label: '生成标签',