Browse Source

修复bug

master
chenfang 11 months ago
parent
commit
b4320be999
  1. 2
      src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue
  2. 42
      src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
  3. 13
      src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
  4. 8
      src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue

2
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'}), //
]
}

42
src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts

@ -106,6 +106,11 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
},
isSearch: true,
form: {
componentProps: {
disabled: true
}
}
},
{
label: '客户月台代码',
@ -114,22 +119,27 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
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: '承运商',

13
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<CrudSchema[]>([
//表单校验
export const DeliverRequestDetailRules = reactive({
soNumber: [
{ required: true, message: '请选择销售订单号', trigger: 'change' }
],
// soNumber: [
// { required: true, message: '请选择销售订单号', trigger: 'change' }
// ],
// packingNumber: [
// { required: true, message: '请选择包装号', trigger: 'change' }
// ],

8
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)
})
}

Loading…
Cancel
Save