diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue index b1d95d61b..cfe6b33fd 100644 --- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue @@ -189,7 +189,7 @@ const butttondata = (row) => { defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:customerreceipt-request-main:refused'}), // 驳回 defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:customerreceipt-request-main:agree'}), // 审批通过 defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:customerreceipt-request-main:handle'}), // 处理 - defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:customerreceipt-request-main:update'}), // 编辑 + // defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:customerreceipt-request-main:update'}), // 编辑 ] } diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts index f2bff7b1d..cad67a28e 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts @@ -106,6 +106,11 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ width: 150 }, isSearch: true, + form: { + componentProps: { + disabled: true + } + } }, { label: '客户月台代码', @@ -114,22 +119,27 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, - // form: { - // // labelMessage: '信息提示说明!!!', - // componentProps: { - // isSearchList: true, // 开启查询弹窗 - // searchListPlaceholder: '请选择客户月台代码', // 输入框占位文本 - // searchField: 'customerDockCode', // 查询弹窗赋值字段 - // searchTitle: '发货记录信息', // 查询弹窗标题 - // searchAllSchemas: Customerdock.allSchemas, // 查询弹窗所需类 - // searchPage: CustomerdockApi.getCustomerdockPage, // 查询弹窗所需分页方法 - // searchCondition: [{ - // key: 'available', - // value: 'TRUE', - // isMainValue: false - // }] - // } - // } + form: { + // labelMessage: '信息提示说明!!!', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择客户月台代码', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '客户月台信息', // 查询弹窗标题 + searchAllSchemas: Customerdock.allSchemas, // 查询弹窗所需类 + searchPage: CustomerdockApi.getCustomerdockPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }, + { + key: 'customerCode', + value: 'customerCode', + isMainValue: true + }] + } + } }, { label: '承运商', diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts index 0d9896a2e..76d951cb1 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts @@ -2,13 +2,6 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter } from '@/utils/formatTime' import * as getRequestsettingApi from '@/api/wms/requestsetting/index' -import * as CustomerApi from '@/api/wms/customer' -import { Customer } from '@/views/wms/basicDataManage/customerManage/customer/customer.data' - -import * as SaleMainApi from '@/api/wms/saleMain' -import * as SaleDetailApi from '@/api/wms/saleDetail' -import { SaleDetail, SaleMain } from '../../deliverplan/saleMain/saleMain.data' - import * as DeliverPlanMainApi from '@/api/wms/deliverPlanMain' import { DeliverPlanMain } from '../../deliverplan/deliverPlanMain/deliverPlanMain.data' @@ -915,9 +908,9 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ //表单校验 export const DeliverRequestDetailRules = reactive({ - soNumber: [ - { required: true, message: '请选择销售订单号', trigger: 'change' } - ], + // soNumber: [ + // { required: true, message: '请选择销售订单号', trigger: 'change' } + // ], // packingNumber: [ // { required: true, message: '请选择包装号', trigger: 'change' } // ], diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue index 577452352..5abf55937 100644 --- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue @@ -164,11 +164,17 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { nextTick(() => { const setV = {} - setV[formField] = val[0][searchField] + if(formField == 'fromPackingNumber') { setV['fromPackingNumber'] = val[0]['packingNumber'] setV['itemCode'] = val[0]['itemCode'] setV['fromBatch'] = val[0]['batch'] setV['locationCode'] = val[0]['locationCode'] + setV['fromQty'] = val[0]['qty'] + setV['fromInventoryStatus'] = val[0]['inventoryStatus'] + setV['uom'] = val[0]['uom'] + } else { + setV[formField] = val[0][searchField] + } formRef.setValues(setV) }) }