From a66c5c5dab90b4c6ad5d747e8f30c66c1c2f035e Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Tue, 6 Feb 2024 09:41:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=87=E8=B4=AD=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E8=81=94=E7=B3=BB=E4=BA=BA=E4=B8=8E=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliver/purchaseMain/index.vue | 5 +- .../purchaseMain/purchaseMain.data.ts | 157 ++++++++-------- .../purchasePlanMain/purchasePlanMain.data.ts | 173 ++++++++---------- 3 files changed, 161 insertions(+), 174 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue index ad7639584..dae2ac888 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue @@ -120,7 +120,10 @@ const setV = {} setV[formField] = val[0][searchField] if(formField == 'supplierCode'){ - tableData.value = [] // 清空数据 + tableData.value = [] // 清空子表数据 + setV['contactName']=val[0]['contacts'] + setV['contactPhone']=val[0]['phone'] + setV['contactEmail']=val[0]['email'] } formRef.setValues(setV) } diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts index 8d41d7769..b3385bb85 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts @@ -100,21 +100,6 @@ export const PurchaseMain = useCrudSchemas(reactive([ value: new Date().getTime() }, }, - { - label: '税率', - field: 'taxRate', - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'InputNumber', - componentProps: { - style: {width:'100%'}, - min: 0 - } - } - }, { label: '截止日期', field: 'dueDate', @@ -138,32 +123,23 @@ export const PurchaseMain = useCrudSchemas(reactive([ }, }, { - label: '版本', - field: 'version', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '联系人姓名', - field: 'contactName', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '联系人电话', - field: 'contactPhone', + label: '税率', + field: 'taxRate', sort: 'custom', table: { width: 150 }, + form: { + component: 'InputNumber', + componentProps: { + style: {width:'100%'}, + min: 0 + } + } }, { - label: '联系人电子邮件', - field: 'contactEmail', + label: '版本', + field: 'version', sort: 'custom', table: { width: 150 @@ -186,13 +162,6 @@ export const PurchaseMain = useCrudSchemas(reactive([ isTableForm: false, isForm: false, }, - { - label: '备注', - field: 'remark', - table: { - width: 150 - }, - }, { label: '是否寄存订单', field: 'isConsignment', @@ -212,21 +181,6 @@ export const PurchaseMain = useCrudSchemas(reactive([ } }, }, - { - label: '业务类型', - field: 'businessType', - sort: 'custom', - table: { - width: 150 - }, - isForm: false, - form: { - value: 'PurchaseReceipt', - componentProps: { - disabled: true - } - } - }, { label: '是否可用', field: 'available', @@ -247,6 +201,47 @@ export const PurchaseMain = useCrudSchemas(reactive([ } }, }, + { + label: '联系人姓名', + field: 'contactName', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '联系人电话', + field: 'contactPhone', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '联系人电子邮件', + field: 'contactEmail', + sort: 'custom', + table: { + width: 150 + }, + }, + + { + label: '业务类型', + field: 'businessType', + sort: 'custom', + table: { + width: 150 + }, + isForm: false, + isTable: false, + form: { + value: 'PurchaseReceipt', + componentProps: { + disabled: true + } + } + }, { label: '创建者', field: 'creator', @@ -311,6 +306,13 @@ export const PurchaseMain = useCrudSchemas(reactive([ } }, }, + { + label: '备注', + field: 'remark', + table: { + width: 150 + }, + }, { label: '操作', field: 'action', @@ -366,6 +368,19 @@ export const PurchaseMainRules = reactive({ * @returns {Array} 采购订单子表 */ export const PurchaseDetail = useCrudSchemas(reactive([ + { + label: '单据号', + field: 'number', + isTableForm: false, + table: { + width: 150 + }, + form: { + componentProps: { + disabled: true + } + } + }, { label: '行号', field: 'lineNumber', @@ -422,19 +437,6 @@ export const PurchaseDetail = useCrudSchemas(reactive([ } } }, - { - label: '单据号', - field: 'number', - isTableForm: false, - table: { - width: 150 - }, - form: { - componentProps: { - disabled: true - } - } - }, { label: '计量单位', field: 'uom', @@ -679,14 +681,6 @@ export const PurchaseDetail = useCrudSchemas(reactive([ isTableForm: false, isForm: false }, - - { - label: '备注', - field: 'remark', - table: { - width: 150 - }, - }, { label: '是否可用', field: 'available', @@ -793,6 +787,13 @@ export const PurchaseDetail = useCrudSchemas(reactive([ }, isForm: false, }, + { + label: '备注', + field: 'remark', + table: { + width: 150 + }, + }, { label: '操作', field: 'action', diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts index ce196f2dd..0560578f9 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts @@ -126,15 +126,34 @@ export const PurchasePlanMain = useCrudSchemas(reactive([ }, isForm: false, }, - { - label: '备注', - field: 'remark', + label: '是否可用', + field: 'available', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, - isTable: false, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + }, + isSearch: true, + }, + { + label: '创建者', + field: 'creator', + sort: 'custom', + isForm: false, + table: { + width: 150 + }, }, { label: '创建时间', @@ -160,8 +179,8 @@ export const PurchasePlanMain = useCrudSchemas(reactive([ } }, { - label: '创建者', - field: 'creator', + label: '最后更新者', + field: 'updater', sort: 'custom', isForm: false, table: { @@ -192,33 +211,13 @@ export const PurchasePlanMain = useCrudSchemas(reactive([ } }, { - label: '最后更新者', - field: 'updater', - sort: 'custom', - isForm: false, - table: { - width: 150 - }, - }, - { - label: '是否可用', - field: 'available', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isTable: true, + label: '备注', + field: 'remark', sort: 'custom', table: { width: 150 }, - form: { - component: 'Switch', - value: 'TRUE', - componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' - } - }, - isSearch: true, + isTable: false, }, { label: '操作', @@ -255,12 +254,26 @@ export const PurchasePlanMainRules = reactive({ * @returns {Array} 要货计划子表 */ export const PurchasePlanDetail = useCrudSchemas(reactive([ + { + label: '单据号', + field: 'number', + sort: 'custom', + isTableForm: false, + table: { + width: 150 + }, + form: { + componentProps: { + disabled: true + } + } + }, { label: '订单号', field: 'poNumber', sort: 'custom', table: { - width: 150 + width: 170 }, tableForm: { isInpuFocusShow: true, @@ -358,20 +371,6 @@ export const PurchasePlanDetail = useCrudSchemas(reactive([ }] } }, - { - label: '单据号', - field: 'number', - sort: 'custom', - isTableForm: false, - table: { - width: 150 - }, - form: { - componentProps: { - disabled: true - } - } - }, { label: '物料代码', field: 'itemCode', @@ -406,32 +405,6 @@ export const PurchasePlanDetail = useCrudSchemas(reactive([ } }, - // { - // label: '已计划数量', - // field: 'plannedQty', - // sort: 'custom', - // table: { - // width: 150 - // }, - // form: { - // componentProps: { - // disabled: true - // } - // }, - // tableForm: { - // disabled: true - // } - // }, - { - label: '已发货数量', - field: 'shippedQty', - sort: 'custom', - table: { - width: 150 - }, - isTableForm: false, - isForm: false - }, { label: '计划数量', field: 'planQty', @@ -452,6 +425,16 @@ export const PurchasePlanDetail = useCrudSchemas(reactive([ } } }, + { + label: '已发货数量', + field: 'shippedQty', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false + }, { label: '计量单位', field: 'uom', @@ -467,6 +450,31 @@ export const PurchasePlanDetail = useCrudSchemas(reactive([ type: 'Select' } }, + { + label: '是否可用', + field: 'available', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isSearch: true, + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + type: 'Select', + inactiveValue: 'FALSE', + disabled: true + }, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + } + }, { label: '最后更新者', field: 'updater', @@ -508,31 +516,6 @@ export const PurchasePlanDetail = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '是否可用', - field: 'available', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isSearch: true, - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - tableForm: { - type: 'Select', - inactiveValue: 'FALSE', - disabled: true - }, - form: { - component: 'Switch', - value: 'TRUE', - componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' - } - } - }, { label: '操作', field: 'action',