diff --git a/src/api/wms/mesRawMaterialConsumptionInfo/index.ts b/src/api/wms/mesRawMaterialConsumptionInfo/index.ts
new file mode 100644
index 000000000..fbfaf7290
--- /dev/null
+++ b/src/api/wms/mesRawMaterialConsumptionInfo/index.ts
@@ -0,0 +1,46 @@
+import request from '@/config/axios'
+
+
+export const AssemblyFinishedMaterialConsumptionMesRespVO = {
+ finishPackingNumber: '',
+ finishBatch: '',
+ finishItemCode: '',
+ finishCreateTime: new Date(),
+ id: 0,
+ processCode: '',
+ bomVersion: '',
+ packingNumber: '',
+ batch: '',
+ inventoryStatus: '',
+ fromLocationCode: '',
+ fromLocationGroupCode: '',
+ fromAreaCode: '',
+ itemName: '',
+ itemDesc1: '',
+ itemDesc2: '',
+ projectCode: '',
+ qty: '',
+ uom: '',
+ number: '',
+ itemCode: '',
+ remark: '',
+ createTime: new Date(),
+ creator: '',
+ code: '',
+ interfaceType: '',
+ jobDetailId: ''
+};
+
+
+// 查询QAD项目信息列表
+export const getMesRawMaterialConsumptionInfoPage = async (params) => {
+ if (params.isSearch) {
+ delete params.isSearch
+ const data = {...params}
+ return await request.post({ url: '/wms/productreceipt-detailb/getAssemblyMaterialUsageMesSenior', data })
+ } else {
+ return await request.get({ url: `/wms/productreceipt-detailb/getAssemblyMaterialUsageMes`, params })
+ }
+}
+
+
diff --git a/src/api/wms/purchasereturnRequestDetail/index.ts b/src/api/wms/purchasereturnRequestDetail/index.ts
index 921b1036f..6634cddde 100644
--- a/src/api/wms/purchasereturnRequestDetail/index.ts
+++ b/src/api/wms/purchasereturnRequestDetail/index.ts
@@ -45,6 +45,10 @@ export const getPurchasereturnSupplierByCode = async (params) => {
export const getPurchasereturnPurchasereceiptRecordByItemCode = async (params) => {
return await request.get({ url: `/wms/purchasereceipt-record-detail/queryPurchasereceiptRecordByItemCode`, params })
}
+// 选完退货库位 渲染子列表数据
+export const getBalancePurchaseReceiptReturn = async (params) => {
+ return await request.get({ url: `/wms/balance/queryBalancePurchaseReceiptReturn`, params })
+}
// 查询采购退货申请子列表
export const getPurchasereturnRequestDetailPageSpare = async (params) => {
diff --git a/src/api/wms/rawMaterialConsumptionInfo/index.ts b/src/api/wms/rawMaterialConsumptionInfo/index.ts
new file mode 100644
index 000000000..38b62d2a9
--- /dev/null
+++ b/src/api/wms/rawMaterialConsumptionInfo/index.ts
@@ -0,0 +1,46 @@
+import request from '@/config/axios'
+
+
+export const AssemblyFinishedMaterialConsumptionRespVO = {
+ finishPackingNumber: '',
+ finishBatch: '',
+ finishItemCode: '',
+ finishCreateTime: new Date(),
+ id: 0,
+ processCode: '',
+ bomVersion: '',
+ packingNumber: '',
+ batch: '',
+ inventoryStatus: '',
+ fromLocationCode: '',
+ fromLocationGroupCode: '',
+ fromAreaCode: '',
+ itemName: '',
+ itemDesc1: '',
+ itemDesc2: '',
+ projectCode: '',
+ qty: '',
+ uom: '',
+ number: '',
+ itemCode: '',
+ remark: '',
+ createTime: new Date(),
+ creator: '',
+ code: '',
+ interfaceType: '',
+ jobDetailId: ''
+};
+
+
+// 查询QAD项目信息列表
+export const getRawMaterialConsumptionInfoPage = async (params) => {
+ if (params.isSearch) {
+ delete params.isSearch
+ const data = {...params}
+ return await request.post({ url: '/wms/backflush-record-detailb/getAssemblyMaterialUsageSenior', data })
+ } else {
+ return await request.get({ url: `/wms/backflush-record-detailb/getAssemblyMaterialUsage`, params })
+ }
+}
+
+
diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index bd0156d2e..431b470fd 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -78,7 +78,7 @@
-
+
-
+
-
-
+
+
-
-
+
{{ row.number }}
-
-
+
+
@@ -58,7 +66,7 @@
ref="detailRef"
:isBasic="false"
:allSchemas="CountJobMain.allSchemas"
- :detailAllSchemas="CountJobDetail.allSchemas"
+ :detailAllSchemas="countJobDetailTableColumns"
:detailAllSchemasRules="CountJobDetailRules"
:searchTableParams="searchTableParams"
:apiPage="CountJobDetailApi.getCountJobDetailPage"
@@ -76,17 +84,21 @@
:extend="rowMasterIdRef"
:isShowDownloadBtn="true"
/>
-
diff --git a/src/views/wms/productionManage/productreceiptAssemble/mesRawMaterialConsumptionInfo/mesRawMaterialConsumptionInfo.data.ts b/src/views/wms/productionManage/productreceiptAssemble/mesRawMaterialConsumptionInfo/mesRawMaterialConsumptionInfo.data.ts
new file mode 100644
index 000000000..527092ab8
--- /dev/null
+++ b/src/views/wms/productionManage/productreceiptAssemble/mesRawMaterialConsumptionInfo/mesRawMaterialConsumptionInfo.data.ts
@@ -0,0 +1,190 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+
+
+export const MesRawMaterialConsumptionInfo = useCrudSchemas(reactive([
+ {
+ label: '成品包装号',
+ field: 'finishedPackingNumber',
+ sort: 'custom',
+ isSearch: true,
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '成品批次',
+ field: 'finishedBatch',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isSearch: true,
+ },
+ {
+ label: '成品物料代码',
+ field: 'finishedItemCode',
+ sort: 'custom',
+ isSearch: true,
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '成品创建时间',
+ field: 'finishedCreateTime',
+ formatter: dateFormatter,
+ isSearch: true,
+ search: {
+ component: 'DatePicker',
+ componentProps: {
+ valueFormat: 'YYYY-MM-DD HH:mm:ss',
+ type: 'daterange',
+ defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+ }
+ },
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x',
+ }
+ },
+ },
+ {
+ label: '成品创建人',
+ field: 'finishedCreator',
+ sort: 'custom',
+ isTable: true,
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '唯一码',
+ field: 'remark',
+ sort: 'custom',
+ isSearch: true,
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '客户物料号',
+ field: 'customerItemCode',
+ sort: 'custom',
+ isSearch: true,
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '原料包装号',
+ field: 'packingNumber',
+ sort: 'custom',
+ isSearch: true,
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '原料旧包装号',
+ field: 'oldPackingNumber',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isSearch: true,
+ },
+ {
+ label: '原料批次',
+ field: 'batch',
+ sort: 'custom',
+ isSearch: true,
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '原料主表ID',
+ field: 'masterId',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '原料单据号',
+ field: 'number',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '原料物品代码',
+ field: 'itemCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '原料物品名称',
+ field: 'itemName',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '原料外部零件号',
+ field: 'outsideItemCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '原料外部生产日期',
+ field: 'outsideProduceDate',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '原料外部流水号',
+ field: 'outsideSerialNumber',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '创建人',
+ field: 'creator',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '创建时间',
+ field: 'createTime',
+ formatter: dateFormatter,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ },
+]))
\ No newline at end of file
diff --git a/src/views/wms/productionManage/productreceiptAssemble/rawMaterialConsumptionInfo/index.vue b/src/views/wms/productionManage/productreceiptAssemble/rawMaterialConsumptionInfo/index.vue
new file mode 100644
index 000000000..ede928449
--- /dev/null
+++ b/src/views/wms/productionManage/productreceiptAssemble/rawMaterialConsumptionInfo/index.vue
@@ -0,0 +1,111 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/wms/productionManage/productreceiptAssemble/rawMaterialConsumptionInfo/rawMaterialConsumptionInfo.data.ts b/src/views/wms/productionManage/productreceiptAssemble/rawMaterialConsumptionInfo/rawMaterialConsumptionInfo.data.ts
new file mode 100644
index 000000000..c4d9e18d3
--- /dev/null
+++ b/src/views/wms/productionManage/productreceiptAssemble/rawMaterialConsumptionInfo/rawMaterialConsumptionInfo.data.ts
@@ -0,0 +1,260 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 制品收货记录子表
+ */
+export const RawMaterialConsumptionInfo = useCrudSchemas(reactive([
+
+ {
+ label: '成品包装号',
+ field: 'finishedPackingNumber',
+ sort: 'custom',
+ isSearch: true,
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '成品批次',
+ field: 'finishedBatch',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isSearch: true,
+ },
+ {
+ label: '成品物料代码',
+ field: 'finishedItemCode',
+ sort: 'custom',
+ isSearch: true,
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '成品创建时间',
+ field: 'finishedCreateTime',
+ formatter: dateFormatter,
+ isSearch: true,
+ search: {
+ component: 'DatePicker',
+ componentProps: {
+ valueFormat: 'YYYY-MM-DD HH:mm:ss',
+ type: 'daterange',
+ defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+ }
+ },
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x',
+ }
+ },
+ },
+ {
+ label: '成品创建人',
+ field: 'finishedCreator',
+ sort: 'custom',
+ isTable: true,
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '原料工序代码',
+ field: 'processCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '原料BOM版本',
+ field: 'bomVersion',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '原料包装号',
+ field: 'packingNumber',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '原料批次',
+ field: 'batch',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isSearch: true,
+ },
+ {
+ label: '原料库存状态',
+ field: 'inventoryStatus',
+ dictType: DICT_TYPE.INVENTORY_STATUS,
+ dictClass: 'string',
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '原料从库位代码',
+ field: 'fromLocationCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '原料从库位组代码',
+ field: 'fromLocationGroupCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '原料从库区代码',
+ field: 'fromAreaCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '原料单据号',
+ field: 'number',
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ },
+ {
+ label: '原料物料代码',
+ field: 'itemCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isSearch: true,
+ },
+ {
+ label: '原料备注',
+ field: 'remark',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '原料物料名称',
+ field: 'itemName',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '原料物料描述1',
+ field: 'itemDesc1',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '原料物料描述2',
+ field: 'itemDesc2',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '原料项目代码',
+ field: 'projectCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '原料数量',
+ field: 'qty',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'InputNumber',
+ }
+ },
+ {
+ label: '原料计量单位',
+ field: 'uom',
+ dictType: DICT_TYPE.UOM,
+ dictClass: 'string',
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '原料接口类型',
+ field: 'interfaceType',
+ dictType: DICT_TYPE.INTERFACE_TYPE,
+ dictClass: 'string',
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '原料创建者',
+ field: 'creator',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '原料创建时间',
+ field: 'createTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x',
+ }
+ },
+ },
+]))
\ No newline at end of file
diff --git a/src/views/wms/productionManage/productscrap/productscrapJobMain/productscrapJobMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapJobMain/productscrapJobMain.data.ts
index a6f17e110..5b93fbace 100644
--- a/src/views/wms/productionManage/productscrap/productscrapJobMain/productscrapJobMain.data.ts
+++ b/src/views/wms/productionManage/productscrap/productscrapJobMain/productscrapJobMain.data.ts
@@ -1,8 +1,8 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter } from '@/utils/formatTime'
-// import * as InspectionQ3Api from '@/api/qms/inspectionQ3/inspectionQ3Main'
-// import { InspectionQ3Main } from '@/views/qms/inspectionQ3/inspectionQ3.data'
+import * as InspectionQ3Api from '@/api/qms/inspectionQ3/inspectionQ3Main'
+import { InspectionQ3Main } from '@/views/qms/inspectionQ3/inspectionQ3.data'
/**
* @returns {Array} 制品报废任务主表
@@ -28,50 +28,50 @@ export const ProductscrapJobMain = useCrudSchemas(
},
isSearch: true
},
- // {
- // label: 'Q3通知单号',
- // field: 'q3Number',
- // sort: 'custom',
- // isSearch: false,
- // isDetail: true,
- // table: {
- // width: 150
- // },
- // form: {
- // // labelMessage: '信息提示说明！！！',
- // componentProps: {
- // enterSearch: true, // multiple: true,
- // isSearchList: true, // 开启查询弹窗
- // searchListPlaceholder: '请选择Q3通知单号', // 输入框占位文本
- // searchField: 'number', // 查询弹窗赋值字段
- // searchTitle: 'Q3通知单号', // 查询弹窗标题
- // searchAllSchemas: InspectionQ3Main.allSchemas, // 查询弹窗所需类
- // searchPage: InspectionQ3Api.getInspectionQ3MainPage, // 查询弹窗所需分页方法
- // searchCondition: [
- // {
- // key: 'available',
- // value: 'TRUE',
- // isMainValue: false
- // },
- // {
- // key: 'status',
- // value: '0',
- // isMainValue: false
- // }
- // ],
- // verificationParams: [
- // {
- // key: 'number',
- // action: '==',
- // value: '',
- // isMainValue: false,
- // isSearch: true,
- // isFormModel: true
- // }
- // ] // 失去焦点校验参数
- // }
- // }
- // },
+ {
+ label: 'Q3通知单号',
+ field: 'q3Number',
+ sort: 'custom',
+ isSearch: false,
+ isDetail: true,
+ table: {
+ width: 150
+ },
+ form: {
+ // labelMessage: '信息提示说明！！！',
+ componentProps: {
+ enterSearch: true, // multiple: true,
+ isSearchList: true, // 开启查询弹窗
+ searchListPlaceholder: '请选择Q3通知单号', // 输入框占位文本
+ searchField: 'number', // 查询弹窗赋值字段
+ searchTitle: 'Q3通知单号', // 查询弹窗标题
+ searchAllSchemas: InspectionQ3Main.allSchemas, // 查询弹窗所需类
+ searchPage: InspectionQ3Api.getInspectionQ3MainPage, // 查询弹窗所需分页方法
+ searchCondition: [
+ {
+ key: 'available',
+ value: 'TRUE',
+ isMainValue: false
+ },
+ {
+ key: 'status',
+ value: '0',
+ isMainValue: false
+ }
+ ],
+ verificationParams: [
+ {
+ key: 'number',
+ action: '==',
+ value: '',
+ isMainValue: false,
+ isSearch: true,
+ isFormModel: true
+ }
+ ] // 失去焦点校验参数
+ }
+ }
+ },
{
label: '从仓库代码',
field: 'fromWarehouseCode',
diff --git a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
index 9ecc7ab9c..16a0a352d 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
+++ b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
@@ -1,8 +1,8 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
-// import * as InspectionQ3Api from '@/api/qms/inspectionQ3/inspectionQ3Main'
-// import { InspectionQ3Main } from '@/views/qms/inspectionQ3/inspectionQ3.data'
+import * as InspectionQ3Api from '@/api/qms/inspectionQ3/inspectionQ3Main'
+import { InspectionQ3Main } from '@/views/qms/inspectionQ3/inspectionQ3.data'
/**
* @returns {Array} 制品报废记录主表
@@ -28,50 +28,50 @@ export const ProductscrapRecordMain = useCrudSchemas(
},
isSearch: true
},
- // {
- // label: 'Q3通知单号',
- // field: 'q3Number',
- // sort: 'custom',
- // isSearch: false,
- // isDetail: true,
- // table: {
- // width: 150
- // },
- // form: {
- // // labelMessage: '信息提示说明！！！',
- // componentProps: {
- // enterSearch: true, // multiple: true,
- // isSearchList: true, // 开启查询弹窗
- // searchListPlaceholder: '请选择Q3通知单号', // 输入框占位文本
- // searchField: 'number', // 查询弹窗赋值字段
- // searchTitle: 'Q3通知单号', // 查询弹窗标题
- // searchAllSchemas: InspectionQ3Main.allSchemas, // 查询弹窗所需类
- // searchPage: InspectionQ3Api.getInspectionQ3MainPage, // 查询弹窗所需分页方法
- // searchCondition: [
- // {
- // key: 'available',
- // value: 'TRUE',
- // isMainValue: false
- // },
- // {
- // key: 'status',
- // value: '0',
- // isMainValue: false
- // }
- // ],
- // verificationParams: [
- // {
- // key: 'number',
- // action: '==',
- // value: '',
- // isMainValue: false,
- // isSearch: true,
- // isFormModel: true
- // }
- // ] // 失去焦点校验参数
- // }
- // }
- // },
+ {
+ label: 'Q3通知单号',
+ field: 'q3Number',
+ sort: 'custom',
+ isSearch: false,
+ isDetail: true,
+ table: {
+ width: 150
+ },
+ form: {
+ // labelMessage: '信息提示说明！！！',
+ componentProps: {
+ enterSearch: true, // multiple: true,
+ isSearchList: true, // 开启查询弹窗
+ searchListPlaceholder: '请选择Q3通知单号', // 输入框占位文本
+ searchField: 'number', // 查询弹窗赋值字段
+ searchTitle: 'Q3通知单号', // 查询弹窗标题
+ searchAllSchemas: InspectionQ3Main.allSchemas, // 查询弹窗所需类
+ searchPage: InspectionQ3Api.getInspectionQ3MainPage, // 查询弹窗所需分页方法
+ searchCondition: [
+ {
+ key: 'available',
+ value: 'TRUE',
+ isMainValue: false
+ },
+ {
+ key: 'status',
+ value: '0',
+ isMainValue: false
+ }
+ ],
+ verificationParams: [
+ {
+ key: 'number',
+ action: '==',
+ value: '',
+ isMainValue: false,
+ isSearch: true,
+ isFormModel: true
+ }
+ ] // 失去焦点校验参数
+ }
+ }
+ },
{
label: '状态',
field: 'status',
diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
index e2c4e0af3..881153b74 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
@@ -21,8 +21,8 @@ import { Productionlineitem } from '@/views/wms/basicDataManage/itemManage/produ
import { Bom } from '@/views/wms/basicDataManage/itemManage/bom/bom.data'
import * as BomApi from '@/api/wms/bom'
-// import * as InspectionQ3Api from '@/api/qms/inspectionQ3/inspectionQ3Main'
-// import { InspectionQ3Main } from '@/views/qms/inspectionQ3/inspectionQ3.data'
+import * as InspectionQ3Api from '@/api/qms/inspectionQ3/inspectionQ3Main'
+import { InspectionQ3Main } from '@/views/qms/inspectionQ3/inspectionQ3.data'
const { t } = useI18n() // 国际化
@@ -60,50 +60,50 @@ export const ProductscrapRequestMain = useCrudSchemas(
isForm: false,
isSearch: true
},
- // {
- // label: 'Q3通知单号',
- // field: 'q3Number',
- // sort: 'custom',
- // isSearch: false,
- // isDetail: true,
- // table: {
- // width: 150
- // },
- // form: {
- // // labelMessage: '信息提示说明！！！',
- // componentProps: {
- // enterSearch: true, // multiple: true,
- // isSearchList: true, // 开启查询弹窗
- // searchListPlaceholder: '请选择Q3通知单号', // 输入框占位文本
- // searchField: 'number', // 查询弹窗赋值字段
- // searchTitle: 'Q3通知单号', // 查询弹窗标题
- // searchAllSchemas: InspectionQ3Main.allSchemas, // 查询弹窗所需类
- // searchPage: InspectionQ3Api.getInspectionQ3MainPage, // 查询弹窗所需分页方法
- // searchCondition: [
- // {
- // key: 'available',
- // value: 'TRUE',
- // isMainValue: false
- // },
- // {
- // key: 'status',
- // value: '0',
- // isMainValue: false
- // }
- // ],
- // verificationParams: [
- // {
- // key: 'number',
- // action: '==',
- // value: '',
- // isMainValue: false,
- // isSearch: true,
- // isFormModel: true
- // }
- // ] // 失去焦点校验参数
- // }
- // }
- // },
+ {
+ label: 'Q3通知单号',
+ field: 'q3Number',
+ sort: 'custom',
+ isSearch: false,
+ isDetail: true,
+ table: {
+ width: 150
+ },
+ form: {
+ // labelMessage: '信息提示说明！！！',
+ componentProps: {
+ enterSearch: true, // multiple: true,
+ isSearchList: true, // 开启查询弹窗
+ searchListPlaceholder: '请选择Q3通知单号', // 输入框占位文本
+ searchField: 'number', // 查询弹窗赋值字段
+ searchTitle: 'Q3通知单号', // 查询弹窗标题
+ searchAllSchemas: InspectionQ3Main.allSchemas, // 查询弹窗所需类
+ searchPage: InspectionQ3Api.getInspectionQ3MainPage, // 查询弹窗所需分页方法
+ searchCondition: [
+ {
+ key: 'available',
+ value: 'TRUE',
+ isMainValue: false
+ },
+ {
+ key: 'status',
+ value: '0',
+ isMainValue: false
+ }
+ ],
+ verificationParams: [
+ {
+ key: 'number',
+ action: '==',
+ value: '',
+ isMainValue: false,
+ isSearch: true,
+ isFormModel: true
+ }
+ ] // 失去焦点校验参数
+ }
+ }
+ },
{
label: '状态',
field: 'status',
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
index ab994d604..da33ae7d3 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
@@ -54,18 +54,20 @@
- 选择收货单明细
+ 选择收货单明细
@@ -124,7 +126,7 @@
@searchTableSuccess="searchTableSuccessLabel"
/>
-
+
import download from '@/utils/download'
import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import {
+ PurchasereturnRequestMainNew,
+ PurchasereturnRequestMainRulesNew,
+ PurchasereturnRequestDetailNew,
+ PurchasereturnRequestDetailRulesNew,
+ PurchasereturnPurchasereceiptRecordNew
+} from './purchasereturnRequestMainNew.data'
import {
PurchasereturnRequestMain,
- PurchasereturnRequestMainRules,
PurchasereturnRequestDetail,
PurchasereturnRequestDetailRules,
- PurchasereReturnRequestDetailLabel,
- PurchasereceiptRecordMain1,
- PurchasereturnPurchasereceiptRecord
-} from './purchasereturnRequestMain.data'
+ PurchasereReturnRequestDetailLabel
+} from '../purchasereturnRequestMain/purchasereturnRequestMain.data'
import * as PurchasereturnRequestMainApi from '@/api/wms/purchasereturnRequestMain'
import * as PurchasereturnRequestDetailApi from '@/api/wms/purchasereturnRequestDetail'
import * as PurchasereceiptRecordDetailApi from '@/api/wms/purchasereceiptRecordDetail'
@@ -160,8 +166,6 @@ import * as BalanceApi from '@/api/wms/balance'
import { async } from '@antv/x6/lib/registry/marker/async'
import { getJmreportBaseUrl } from '@/utils/systemParam'
import { formatDate } from '@/utils/formatTime'
-import * as ItembasicApi from '@/api/wms/itembasic'
-import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
// 采购退货申请
defineOptions({ name: 'PurchasereturnRequestMainNew' })
@@ -182,36 +186,27 @@ const isShowButton = ref(true)
const updataTableColumns = (val) => {
tableColumns.value = val
}
-
-
-const onChangeForm = (field, cur, formRef)=>{
- console.log('onChangeForm',field, cur, formRef)
- if(field=='supplierCode'){
- //供应商
- PurchasereturnRequestMain.allSchemas.formSchema.forEach(item=>{
- // 物料名称赋值
- if(item.field=='supplierCode'){
- let setV = {}
- setV['supplierName'] = item.componentProps.options?.find(el=>el.supplierCode==cur+'')['supplierName']
- formRef.value.setValues(setV)
- }
- })
- }else if(field == 'locationCode'){
- // 退货库位 获取明细列表
- tableData.value = [{
- 'batch':'20240908',
- 'status':'合格',
- 'inventoryBalance':300,
- 'qty':1,
- 'reason':'200',
- 'remark':'',
- }]
-
- }
-}
const onEnter = async (field, value) => {
console.log(field, value)
-
+ if ('supplierCode' == field) {
+ //供应商代码
+ formRef.value.opensearchTable(
+ 'purchaseReceiptRecordNumber',
+ 'number',
+ '采购收货记录',
+ PurchasereceiptRecordMain1.allSchemas,
+ PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPageReturn,
+ [
+ {
+ key: 'supplierCode',
+ value: 'supplierCode',
+ isMainValue: true
+ }
+ ]
+ )
+ } else if ('purchaseReceiptRecordNumber' == field) {
+ //采购收货记录
+ }
}
// 生成标签
@@ -256,7 +251,6 @@ const searchTableSuccessLabel = (formField, searchField, val, formRef, type, row
}
})
}
-
// 查询页面返回
const searchTableSuccess = async (formField, searchField, val, formRef, type, row) => {
console.log('searchTableSuccess', formField, searchField, val, formRef, type, row)
@@ -275,8 +269,17 @@ const searchTableSuccess = async (formField, searchField, val, formRef, type, ro
})
console.log('物料供应商',res)
if(res&&res.length>0){
- PurchasereturnRequestMain.allSchemas.formSchema.forEach(item=>{
+ PurchasereturnRequestMainNew.allSchemas.formSchema.forEach(item=>{
if(item.field == 'supplierCode'){
+ //重置
+ setV['supplierCode'] = ''
+ setV['supplierName'] = ''
+ setV['hahaha'] = ''
+ setV['poNumber'] = ''
+ setV['poLine'] = ''
+ setV['receiptNumber'] = ''
+ setV['asnNumber'] = ''
+ tableData.value = []
item.componentProps.options = res
}
})
@@ -291,8 +294,63 @@ const searchTableSuccess = async (formField, searchField, val, formRef, type, ro
const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
nextTick(() => {
const setV = {}
- setV[formField] = val[0][searchField]
+ if (formField == 'poLine' || formField == 'itemCode') {
+ console.log(val)
+ setV['poLine'] = val[0]['poLine']
+ setV['poNumber'] = val[0]['poNumber']
+ setV['itemCode'] = val[0]['itemCode']
+ setV['itemName'] = val[0]['itemName']
+ setV['itemDesc1'] = val[0]['itemDesc1']
+ setV['itemDesc2'] = val[0]['itemDesc2']
+ setV['batch'] = val[0]['toBatch']
+ setV['altBatch'] = val[0]['altBatch']
+ setV['containerNumber'] = val[0]['toContainerNumber']
+ setV['receiptQty'] = val[0]['qty']
+ setV['qty'] = val[0]['qty']
+ setV['uom'] = val[0]['uom']
+ setV['supplierQty'] = val[0]['supplierQty']
+ setV['supplierUom'] = val[0]['supplierUom']
+ setV['inventoryStatus'] = val[0]['inventoryStatus']
+ // setV['fromLocationCode'] = val[0]['toLocationCode']
+ // setV['toLocationCode'] = val[0]['toLocationCode']
+ setV['fromLocationGroupCode'] = val[0]['locationGroupCode']
+ setV['toLocationGroupCode'] = null
+ setV['toWarehouseCode'] = null
+ setV['toAreaTypes'] = null
+ setV['fromAreaCode'] = val[0]['areaCode']
+ setV['toAreaCode'] = val[0]['toAreaCode']
+ setV['fromQwnerCode'] = val[0]['fromQwnerCode']
+ setV['toOwnerCode'] = val[0]['toOwnerCode']
+ setV['arriveDate'] = val[0]['arriveDate']
+ setV['produceDate'] = val[0]['produceDate']
+ setV['expireDate'] = val[0]['expireDate']
+ setV['convertRate'] = val[0]['convertRate']
+ setV['visualInspectResult'] = val[0]['visualInspectResult']
+ setV['visualInspectPhotos'] = val[0]['visualInspectPhotos']
+ setV['failedReason'] = val[0]['failedReason']
+ setV['singlePrice'] = val[0]['singlePrice']
+ setV['amount'] = val[0]['amount']
+ setV['projectCode'] = val[0]['projectCode']
+ // setV['packingNumber'] = val[0]['packingNumber']
+ // setV['inventoryBalance'] = val[0]['qty']
+ if (formField == 'itemCode') {
+ setV['batch'] = val[0]['toBatch']
+ setV['containerNumber'] = val[0]['toContainerNumber']
+ setV['containerNumber'] = val[0]['containerNumber']
+ setV['containerNumber'] = val[0]['containerNumber']
+ // setV['fromLocationCode'] = val[0]['fromLocationCode']
+ // setV['toLocationCode'] = val[0]['toLocationCode']
+ }
+ } else if (formField == 'packingNumber'){
+ setV[formField] = val[0][searchField]
+ setV['inventoryBalance'] = val[0]['qty']
+ setV['batch'] = val[0]['batch']
+ setV['fromLocationCode'] = val[0]['locationCode']
+ }
+ else {
+ setV[formField] = val[0][searchField]
+ }
formRef.setValues(setV)
})
}
@@ -449,10 +507,37 @@ const buttonTableClick = async (val, row) => {
/** 添加/修改操作 */
const formRef = ref()
const openForm = async (type: string, row?: number) => {
- originTableData.value = [] // 重置明细数据
- tableData.value = [] // 重置明细数据
- isShowButton.value = true
+ isShowButton.value = true
+ if (type == 'create') {
+ originTableData.value = [] // 重置明细数据
+ tableData.value = [] // 重置明细数据
+ PurchasereturnRequestMain.allSchemas.formSchema.forEach((item) => {
+ if (item.field == 'supplierCode') {
+ item.componentProps.disabled = true
+ item.componentProps.isSearchList = true
+ }
+ if (item.field == 'asnNumber') {
+ item.componentProps.disabled = true
+ item.componentProps.isSearchList = true
+ }
+ })
+ }
+ if (type == 'update') {
+ PurchasereturnRequestMain.allSchemas.formSchema.forEach((item) => {
+ if (item.field == 'supplierCode') {
+ item.componentProps.disabled = true
+ item.componentProps.isSearchList = false
+ }
+ if (item.field == 'asnNumber') {
+ item.componentProps.disabled = true
+ item.componentProps.isSearchList = false
+ }
+ })
+ tableData.value = [{
+
+ }]
+ }
formRef.value.open(type, row)
}
@@ -590,7 +675,132 @@ const originTableData = ref([])
const searchTableRef = ref()
// 添加明细
const handleAddTable = () => {
-
+ const subTableDFata = originTableData.value.filter(
+ (item) => !tableData.value.find((item1) => item1.id == item.id)
+ )
+ if (subTableDFata.length == 0) {
+ message.warning('暂无可选择数据!')
+ return
+ }
+
+ const tableObject = {
+ // 当前页
+ currentPage: 1,
+ // 导出加载中
+ exportLoading: false,
+ // 加载中
+ loading: false,
+ // 页数
+ pageSize: subTableDFata.length,
+ params: null,
+ // 排序
+ sort: {
+ order: '', // 排序规则
+ prop: '' // 排序字段
+ },
+ // 总条数
+ total: subTableDFata.length,
+ // 表格数据
+ tableList: subTableDFata,
+ currentRow: null
+ }
+
+ const tableColumns = PurchasereturnRequestDetail.allSchemas.tableFormColumns
+ tableColumns.forEach((item) => {
+ item.width = item.table?.width || 150
+ })
+
+ searchTableRef.value.openData('采购收货记录单号', tableObject, { tableColumns }, true)
+ // searchTableRef.value.open(
+ // ('供应商信息',
+ // // _searchTableAllSchemas,
+ // // _searchTablePage, // 接口
+ // // formField,
+ // // searchField,
+ // true,//是否多选
+ // // type,
+ // // row,
+ // _searchCondition
+ // )
+ // )
+
+ // console.log(subTableDFata)
+ // const {tableObject, tableMethods } = useTable({
+ // getListApi: getPage.value // 分页接口
+ // })
+ // searchTableRef.value.open(
+ // ('供应商信息',
+ // // _searchTableAllSchemas,
+ // // _searchTablePage, // 接口
+ // // formField,
+ // // searchField,
+ // true,//是否多选
+ // // type,
+ // // row,
+ // _searchCondition
+ // )
+ // )
+ // tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+ // let purchaseReceiptRecordNumber = formRef.value.formRef.formModel.purchaseReceiptRecordNumber
+ // PurchasereturnRequestDetail.allSchemas.tableFormColumns.map((item) => {
+ // item.tableForm.disabled = true
+ // if (item.field == 'remark') {
+ // item.tableForm.disabled = false
+ // }
+ // if (item.field == 'reason') {
+ // item.tableForm.disabled = false
+ // }
+ // if (item.field == 'qty') {
+ // item.tableForm.disabled = false
+ // }
+ // if(purchaseReceiptRecordNumber == ''){
+ // if (item.field == 'itemCode') {
+ // item.tableForm.isInpuFocusShow = true
+ // }
+ // if(item.field == 'poLine'){
+ // item.tableForm.isInpuFocusShow = false
+ // }
+ // }else{
+ // if (item.field == 'itemCode') {
+ // item.tableForm.isInpuFocusShow = false
+ // }
+ // if(item.field == 'poLine'){
+ // item.tableForm.isInpuFocusShow = true
+ // }
+ // }
+ // })
+}
+const onChangeForm = async (field, cur, formRef)=>{
+ console.log('onChangeForm',field, cur, formRef)
+ if(field=='supplierCode'){
+ //供应商
+ PurchasereturnRequestMainNew.allSchemas.formSchema.forEach(item=>{
+ // 物料名称赋值
+ if(item.field=='supplierCode'){
+ let setV = {}
+ setV['supplierName'] = item.componentProps.options?.find(el=>el.supplierCode==cur+'')['supplierName']
+ formRef.value.setValues(setV)
+ }
+ })
+ }else if(field == 'locationCode'){
+ // 退货库位 获取明细列表
+ let subList = await PurchasereturnRequestDetailApi.getBalancePurchaseReceiptReturn({
+ itemCode:formRef.value.formModel.itemCode,
+ fromLocationCode:formRef.value.formModel.locationCode
+ })
+
+ console.log('subList',subList)
+ if(subList&&subList.length>0){
+ tableData.value = subList.map(item=>({
+ 'batch':item['batch'],
+ 'status':item['inventoryStatus'],
+ 'inventoryBalance':item['qty'],
+ 'qty':1,
+ 'reason_type':'',
+ 'reason':''
+ }))
+ }
+ }
}
// 选择收货单明细
const chooseReceiptList = ()=>{
@@ -604,7 +814,7 @@ const chooseReceiptList = ()=>{
}
searchTableRef.value.open(
"收货单明细",
- PurchasereturnPurchasereceiptRecord.allSchemas,
+ PurchasereturnPurchasereceiptRecordNew.allSchemas,
PurchasereturnRequestDetailApi.getPurchasereturnPurchasereceiptRecordByItemCode,
"hahaha",
"hahaha",
@@ -628,6 +838,7 @@ const searchTableSuccess1 = (formField, searchField, val, type, row) => {
if(formField=='hahaha'){
// 选择收货单明细
const setV = {}
+ setV['hahaha'] = val[0]['asnNumber']
setV['poNumber'] = val[0]['poNumber']
setV['poLine'] = val[0]['poLine']
setV['receiptNumber'] = val[0]['receiptNumber']
@@ -679,26 +890,14 @@ const submitForm = async (formType, submitData) => {
// message.warning("退货数量不能大于收获数量")
// return;
// }
- if (tableData.value.find((item) => Number(item.qty) > Number(item.inventoryBalance))) {
+ if (tableData.value.find((item) => item['qty']> item['inventoryBalance'])) {
message.warning('退货数量不能大于库存余额')
return
}
- data.subList = tableData.value // 拼接子表数据参数
+ data.subList = tableData.value.filter(item=>item['qty']>0) // 拼接子表数据参数
formRef.value.formLoading = true
try {
if (formType === 'create') {
- let flag = false
- data.subList.forEach((item) => {
- if (item.qty == 0) {
- message.warning('数量不能为0')
- flag = true
- return
- }
- })
- if (flag) {
- formRef.value.formLoading = false
- return
- }
data.returnSourceType='1'
await PurchasereturnRequestMainApi.createPurchasereturnRequestMain(data)
message.success(t('common.createSuccess'))
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMainNew.data.ts
similarity index 57%
rename from src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMain.data.ts
rename to src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMainNew.data.ts
index 444b562c1..3f0f6fda6 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/purchasereturnRequestMainNew.data.ts
@@ -43,120 +43,10 @@ const userDept = userStore.userSelfInfo.dept
userDept.id = userDept.id.toString()
const userDeptArray: any = [userDept]
-// 采购收货记录展示列
-export const PurchasereceiptRecordMain1 = useCrudSchemas(
- reactive([
- {
- label: '物料代码',
- field: 'itemCode',
- fixed: 'left',
- sort: 'custom',
- table: {
- width: 150
- },
- isSearch: true
- },
- {
- label: '采购收货记录单号',
- field: 'number',
- fixed: 'left',
- sort: 'custom',
- table: {
- width: 200
- },
- isSearch: true
- },
- {
- label: '发货单号',
- field: 'asnNumber',
- sort: 'custom',
- table: {
- width: 180
- },
- sortTableDefault: 2,
- isSearch: true
- },
- {
- label: '采购订单号',
- field: 'poNumber',
- sort: 'custom',
- table: {
- width: 150
- },
- isSearch: true
- },
- {
- label: '订单行',
- field: 'poLine',
- sort: 'custom',
- table: {
- width: 150
- }
- },
-
- {
- label: '物料名称',
- field: 'itemName',
- sort: 'custom',
- table: {
- width: 150
- }
- },
- {
- label: '批次', // 实际是子表的从批次，为了不影响页面，单独放上面
- field: 'fromBatch',
- sort: 'custom',
- isForm: false,
- isTableForm: false,
- table: {
- width: 150
- }
- },
- {
- label: '计量单位',
- field: 'uom',
- dictType: DICT_TYPE.UOM,
- dictClass: 'string',
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
- }
- },
- // {
- // label: '包装规格',
- // field: 'packUnit',
- // dictClass: 'string',
- // isTable: true,
- // sort: 'custom',
- // table: {
- // width: 150
- // },
- // },
- // {
- // label: '从库位代码',
- // field: 'fromLocationCode',
- // sort: 'custom',
- // table: {
- // width: 150
- // },
- //
- // },
- {
- label: '到库位代码',
- field: 'toLocationCode',
- sort: 'custom',
- table: {
- width: 150
- }
- }
- ])
-)
-
/**
* @returns {Array} 采购退货申请主表
*/
-export const PurchasereturnRequestMain = useCrudSchemas(
+export const PurchasereturnRequestMainNew = useCrudSchemas(
reactive([
{
label: '物料代码',
@@ -244,7 +134,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(
}
},
{
- label: '',
+ label: ' ',
field: 'hahaha',
table: {
width: 180
@@ -338,7 +228,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(
{
label: '状态',
field: 'status',
- dictType: DICT_TYPE.REQUEST_STATUS,
+ dictType: DICT_TYPE.INVENTORY_STATUS,
dictClass: 'string',
isSearch: true,
isTable: true,
@@ -431,9 +321,23 @@ export const PurchasereturnRequestMain = useCrudSchemas(
}
])
)
+//表单校验
+export const PurchasereturnRequestMainRulesNew = reactive({
+ itemCode: [
+ { required: true, message: '请输入供应商代码', trigger: 'blur' }
+ ],
+ supplierCode: [
+ { required: true, message: '请输入供应商代码', trigger: 'blur' }
+ ],
+ hahaha: [
+ required
+ ],
+ locationCode: [
+ { required: true, message: '请选择收货单明细', trigger: 'blur' }
+ ]
+})
-
-export const PurchasereturnPurchasereceiptRecord = useCrudSchemas(
+export const PurchasereturnPurchasereceiptRecordNew = useCrudSchemas(
reactive([
{
label: '收货日期',
@@ -461,9 +365,6 @@ export const PurchasereturnPurchasereceiptRecord = useCrudSchemas(
label: '收货单号',
field: 'receiptNumber',
sort: 'custom',
- table: {
- width: 150
- },
tableForm:{
disabled:true
},
@@ -477,9 +378,6 @@ export const PurchasereturnPurchasereceiptRecord = useCrudSchemas(
label: '发货单号',
field: 'asnNumber',
sort: 'custom',
- table: {
- width: 150
- },
tableForm:{
disabled:true
},
@@ -556,56 +454,12 @@ export const PurchasereturnPurchasereceiptRecord = useCrudSchemas(
])
)
-//表单校验
-export const PurchasereturnRequestMainRules = reactive({
- supplierCode: [
- { required: true, message: '请输入供应商代码', trigger: 'blur' }
- ],
- dueTime: [
- { required: true, message: '请选择截止时间', trigger: 'blur' }
- ],
- // purchaseReceiptRecordNumber: [
- // { required: true, message: '请输入采购收货记录单号', trigger: 'blur' }
- // ],
- carrierCode: [
- { max: 50, message: '不得超过50个字符', trigger: 'blur' },
- ],
- vehiclePlateNumber: [
- { max: 50, message: '不得超过50个字符', trigger: 'blur' },
- ],
- remark: [
- { max: 50, message: '不得超过50个字符', trigger: 'blur' }
- ],
- fromWarehouseCode: [
- { required: true, message: '请输入从仓库代码', trigger: 'blur' }
- ],
- fromAreaTypes: [
- { required: true, message: '请选择从库区类型范围', trigger: 'change' }
- ],
- departmentCode: [
- { required: true, message: '请输入部门', trigger: 'blur' }
- ],
- autoCommit: [
- { required: true, message: '请选择是否自动提交', trigger: 'change' }
- ],
- autoAgree: [
- { required: true, message: '请选择是否自动通过', trigger: 'change' }
- ],
- autoExecute: [
- { required: true, message: '请选择是否自动执行', trigger: 'change' }
- ],
- directCreateRecord: [
- { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
- ],
- businessType: [
- { required: true, message: '请输入业务类型', trigger: 'blur' }
- ],
-})
+
/**
* @returns {Array} 采购退货申请子表
*/
-export const PurchasereturnRequestDetail = useCrudSchemas(reactive([
+export const PurchasereturnRequestDetailNew = useCrudSchemas(reactive([
{
label: '批次',
field: 'batch',
@@ -689,7 +543,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive
},
{
label: '退货原因',
- field: 'reason',
+ field: 'reason_type',
dictType: DICT_TYPE.UOM,
dictClass: 'string',
// isSearch: true,
@@ -709,7 +563,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive
},
{
label: '退货原因描述',
- field: 'remark',
+ field: 'reason',
sort: 'custom',
table: {
width: 150
@@ -731,264 +585,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive
]))
//表单校验
-export const PurchasereturnRequestDetailRules = reactive({
+export const PurchasereturnRequestDetailRulesNew = reactive({
})
-export const PurchasereReturnRequestDetailLabel = useCrudSchemas(reactive([
- {
- label: '物料代码',
- field: 'itemCode',
- sort: 'custom',
- table: {
- width: 150
- },
- tableForm:{
- disabled: true
- },
- form: {
- componentProps: {
- disabled: true
- }
- }
- },
- {
- label: '物料名称',
- field: 'itemName',
- sort: 'custom',
- table: {
- width: 150
- },
- tableForm:{
- disabled:true
- },
- isTableForm: true,
- },
- {
- label: '物料描述1',
- field: 'itemDesc1',
- sort: 'custom',
- table: {
- width: 150
- },
- tableForm:{
- disabled:true
- },
- isTableForm: true,
- },
- {
- label: '物料描述2',
- field: 'itemDesc2',
- sort: 'custom',
- table: {
- width: 150
- },
- isTableForm: false,
- isForm: false
- },
- {
- label: '包装号',
- field: 'packingNumber',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable:false,
- isTableForm: false,
- isForm: false
- },
- // {
- // label: '器具号',
- // field: 'containerNumber',
- // sort: 'custom',
- // table: {
- // width: 150
- // },
- // isTableForm: false,
- // isForm: false
- // },
- {
- label: '数量',
- field: 'qty',
- sort: 'custom',
- table: {
- width: 150
- },
- form: {
- component: 'InputNumber',
- componentProps: {
- disabled:true,
- min: 1,
- precision: 6
- },
- },
- tableForm: {
- disabled:true,
- type: 'InputNumber',
- min: 1,
- precision: 6
- }
- },
- {
- label: '计量单位',
- field: 'uom',
- dictType: DICT_TYPE.UOM,
- dictClass: 'string',
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
- },
- tableForm: {
- type: 'Select',
- disabled: true
- }
- },
- {
- label: '从库位代码1',
- field: 'fromLocationCode',
- sort: 'custom',
- table: {
- width: 150
- },
- isTableForm: false,
- isForm: false
- },
- {
- label: '生产日期',
- field: 'produceDate',
- formatter: dateFormatter2,
- detail: {
- dateFormat: 'YYYY-MM-DD'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- form: {
- component: 'DatePicker',
- componentProps: {
- disabled:true,
- style: {width: '100%'},
- type: 'date',
- dateFormat: 'YYYY-MM-DD',
- valueFormat: 'x',
- }
- },
- tableForm:{
- disabled:true,
- type:'FormDate',
- placeholder: '请选择生产日期',
- valueFormat: 'x',
- },
- },
-
- // {
- // label: '替代批次',
- // field: 'altBatch',
- // sort: 'custom',
- // table: {
- // width: 150
- // },
- // isTableForm: false,
- // isForm: false
- // },
- {
- label: '库存状态',
- field: 'inventoryStatus',
- dictType: DICT_TYPE.INVENTORY_STATUS,
- dictClass: 'string',
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
- },
- isTableForm: false,
- isForm: false,
- tableForm: {
- type: 'Select'
- }
- },
- {
- label: '批次',
- field: 'batch',
- sort: 'custom',
- table: {
- width: 150
- },
- },
- {
- label: '包装数量',
- field: 'packQty',
- sort: 'custom',
- table: {
- width: 150
- },
- form: {
- componentProps: {
- disabled: true,
- isSearchList: true,
- searchListPlaceholder: '请选择包装',
- searchField: 'packQty',
- searchTitle: '物品包装信息',
- searchAllSchemas: Itempackaging.allSchemas,
- searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
- searchCondition: [
- {
- key: 'itemCode',
- value: 'itemCode',
- message: '请选择订单行',
- isMainValue: true
- },
- {
- key: 'available',
- value: 'TRUE',
- isMainValue: false
- }
-
- ]
- }
- },
- tableForm: {
- disabled: true,
- isInpuFocusShow: true,
- searchListPlaceholder: '请选择包装',
- searchField: 'packQty',
- searchTitle: '物品包装信息',
- searchAllSchemas: Itempackaging.allSchemas,
- searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
- searchCondition: [
- {
- key: 'itemCode',
- value: 'itemCode',
- message: '请选择订单行',
- isMainValue: true
- },
- {
- key: 'available',
- value: 'TRUE',
- isMainValue: false
- }]
- },
- isTableForm: true,
- isForm: true
- },
- {
- label: '包装规格',
- field: 'packUnit',
- dictClass: 'string',
- isTable: true,
- sort: 'custom',
- table: {
- width: 150,
- componentProps: {
- disabled: true
- }
- },
- tableForm:{
- disabled:true
- },
- isTableForm: true,
- isForm: true
- },
-]))