diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 266b38258..909333405 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -840,10 +840,6 @@ const submitForm = async () => {
const data = unref(formRef)?.formModel
if (!wsCache.get('ShowPackingNumber') ) {
data.packingNumber=''
- data.packUnit=''
- data.packQty=''
- data.outPackUnit=''
- data.inPackUnit=''
}
emit('submitForm', formType.value, data)
} finally {
@@ -855,10 +851,6 @@ const submitForm = async () => {
const data = unref(formRef)?.formModel
if (!wsCache.get('ShowPackingNumber') ) {
data.packingNumber=''
- data.packUnit=''
- data.packQty=''
- data.outPackUnit=''
- data.inPackUnit=''
}
console.log(data);
@@ -875,10 +867,6 @@ const submitForm = async () => {
// 清空包装号
if (!wsCache.get('ShowPackingNumber') ) {
data.packingNumber=''
- data.packUnit=''
- data.packQty=''
- data.outPackUnit=''
- data.inPackUnit=''
}
emit('success', formType.value, data)
} finally {
diff --git a/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRecord/index.vue b/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRecord/index.vue
index 6fcd4a008..b3c3c1724 100644
--- a/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRecord/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRecord/index.vue
@@ -28,6 +28,14 @@
v-model:currentPage="tableObject.currentPage"
v-model:sort="tableObject.sort"
>
+
+
+ {{ row.number }}
+
+
+
+
+
@@ -66,6 +74,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
import { formatDate } from '@/utils/formatTime'
import { usePageLoading } from '@/hooks/web/usePageLoading'
+import {CACHE_KEY, useCache} from "@/hooks/web/useCache";
const { loadStart, loadDone } = usePageLoading()
// 采购换货申请
@@ -100,7 +109,9 @@ const HeadButttondata = [
defaultButtons.defaultFilterBtn(null), // 筛选
defaultButtons.defaultSetBtn(null), // 设置
]
+const buttonTableClick = async (val, row) => {
+}
// 头部按钮事件
const buttonBaseClick = (val, item) => {
if (val == 'export') { // 导出
@@ -119,10 +130,23 @@ const buttonBaseClick = (val, item) => {
}
}
+// 列表-操作按钮
+const butttondata = (row,$index) => {
+ const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
+ if(findIndex>-1&&findIndex<$index){
+ return []
+ }
+ return []
+}
const formRef = ref()
const detailRef = ref()
-
+const { wsCache } = useCache()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+ const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+ if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+ detailRef.value.openDetail(row, titleName, titleValue,'recordPurchaseBarter')
+}
/** 导出按钮操作 */
const handleExport = async () => {
diff --git a/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRequest/purchaseBarterRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRequest/purchaseBarterRequestMain.data.ts
index 4ada3c32d..8f3612b02 100644
--- a/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRequest/purchaseBarterRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRequest/purchaseBarterRequestMain.data.ts
@@ -194,6 +194,8 @@ export const PurchaseBarterRequestDetail = useCrudSchemas(reactive
field: 'uom',
sort: 'custom',
isSearch: false,
+ dictType: DICT_TYPE.UOM,
+ dictClass: 'string',
tableForm: {
disabled: true
},