zhaoxuebing 10 months ago
parent
commit
7a08e5572e
  1. 2
      src/api/wms/customerreturnRequestMain/index.ts
  2. 39
      src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts
  3. 2
      src/views/wms/countManage/count/countPlanMain/index.vue
  4. 2
      src/views/wms/countManage/count/countRequestMain/index.vue
  5. 2
      src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue
  6. 2
      src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
  7. 2
      src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue
  8. 2
      src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
  9. 2
      src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue
  10. 2
      src/views/wms/deliversettlementManage/deliverplan/saleMain/index.vue
  11. 2
      src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue
  12. 2
      src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
  13. 2
      src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue
  14. 2
      src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue
  15. 2
      src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue
  16. 50
      src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
  17. 2
      src/views/wms/issueManage/issue/issueRequestMain/index.vue
  18. 2
      src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/index.vue
  19. 2
      src/views/wms/issueManage/pick/pickRequestMain/index.vue
  20. 15
      src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
  21. 15
      src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
  22. 2
      src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
  23. 2
      src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
  24. 2
      src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/index.vue
  25. 2
      src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue
  26. 6
      src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
  27. 2
      src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
  28. 2
      src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
  29. 2
      src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue
  30. 4
      src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
  31. 2
      src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue
  32. 2
      src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
  33. 2
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
  34. 2
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue

2
src/api/wms/customerreturnRequestMain/index.ts

@ -113,7 +113,7 @@ export const pageItemCodeToBalance = async (params) => {
if (params.isSearch) { if (params.isSearch) {
delete params.isSearch delete params.isSearch
const data = {...params} const data = {...params}
return await request.post({ url: '/wms/customerreturn-request-main/pageItemCodeToBalance', data }) return await request.post({ url: '/wms/customerreturn-request-main/pageItemCodeToBalanceSenior', data })
} else { } else {
return request.get({ url: `/wms/customerreturn-request-main/pageItemCodeToBalance`, params }) return request.get({ url: `/wms/customerreturn-request-main/pageItemCodeToBalance`, params })
} }

39
src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts

@ -110,24 +110,6 @@ export const Customerdock = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '仓库基础信息', // 查询弹窗标题
searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
searchCondition: [{
key: 'available',
value: 'TRUE',
action: '==',
isSearch: true,
isMainValue: false
}]
}
}
}, },
{ {
label: '默认库位', label: '默认库位',
@ -136,24 +118,6 @@ export const Customerdock = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择库位代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '库位基础信息', // 查询弹窗标题
searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
searchCondition: [{
key: 'available',
value: 'TRUE',
action: '==',
isSearch: true,
isMainValue: false
}]
}
}
}, },
{ {
label: '是否可用', label: '是否可用',
@ -170,7 +134,8 @@ export const Customerdock = useCrudSchemas(reactive<CrudSchema[]>([
value: 'TRUE', value: 'TRUE',
componentProps: { componentProps: {
inactiveValue: 'FALSE', inactiveValue: 'FALSE',
activeValue: 'TRUE' activeValue: 'TRUE',
disabled: true
} }
}, },
}, },

2
src/views/wms/countManage/count/countPlanMain/index.vue

@ -186,7 +186,7 @@ const { getList, setSearchParams } = tableMethods
// //
const HeadButttondata = [ const HeadButttondata = [
defaultButtons.defaultAddBtn({ hasPermi: 'wms:count-plan-main:create' }), // defaultButtons.defaultAddBtn({ hasPermi: 'wms:count-plan-main:create' }), //
// defaultButtons.defaultImportBtn({hasPermi:'wms:count-plan-main:import'}), // // defaultButtons.defaultImportBtn({hasPermi:'wms:count-plan-main:import'}), //
defaultButtons.defaultExportBtn({ hasPermi: 'wms:count-plan-main:export' }), // defaultButtons.defaultExportBtn({ hasPermi: 'wms:count-plan-main:export' }), //
defaultButtons.defaultFreshBtn(null), // defaultButtons.defaultFreshBtn(null), //

2
src/views/wms/countManage/count/countRequestMain/index.vue

@ -201,7 +201,7 @@ const { getList, setSearchParams } = tableMethods
// //
const HeadButttondata = [ const HeadButttondata = [
// defaultButtons.defaultAddBtn({hasPermi:'wms:count-request-main:create'}), // // defaultButtons.defaultAddBtn({hasPermi:'wms:count-request-main:create'}), //
// defaultButtons.defaultImportBtn({hasPermi:'wms:count-request-main:import'}), // // defaultButtons.defaultImportBtn({hasPermi:'wms:count-request-main:import'}), //
defaultButtons.defaultExportBtn({ hasPermi: 'wms:count-request-main:export' }), // defaultButtons.defaultExportBtn({ hasPermi: 'wms:count-request-main:export' }), //
defaultButtons.defaultFreshBtn(null), // defaultButtons.defaultFreshBtn(null), //

2
src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue

@ -135,7 +135,7 @@ const { getList, setSearchParams } = tableMethods
// //
const HeadButttondata = [ const HeadButttondata = [
// defaultButtons.defaultAddBtn({hasPermi:'wms:countadjust-request-main:create'}), // // defaultButtons.defaultAddBtn({hasPermi:'wms:countadjust-request-main:create'}), //
// defaultButtons.defaultImportBtn({hasPermi:'wms:countadjust-request-main:import'}), // // defaultButtons.defaultImportBtn({hasPermi:'wms:countadjust-request-main:import'}), //
defaultButtons.defaultExportBtn({hasPermi:'wms:countadjust-request-main:export'}), // defaultButtons.defaultExportBtn({hasPermi:'wms:countadjust-request-main:export'}), //
defaultButtons.defaultFreshBtn(null), // defaultButtons.defaultFreshBtn(null), //

2
src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue

@ -198,7 +198,7 @@ const { getList, setSearchParams } = tableMethods
const trueFalse = ref(true) const trueFalse = ref(true)
// //
const HeadButttondata = [ const HeadButttondata = [
defaultButtons.defaultAddBtn({hasPermi:'wms:customerreturn-request-main:create'}), // defaultButtons.defaultAddBtn({hasPermi:'wms:customerreturn-request-main:create'}), //
defaultButtons.defaultImportBtn({hasPermi:'wms:customerreturn-request-main:import'}), // defaultButtons.defaultImportBtn({hasPermi:'wms:customerreturn-request-main:import'}), //
defaultButtons.defaultExportBtn({hasPermi:'wms:customerreturn-request-main:export'}), // defaultButtons.defaultExportBtn({hasPermi:'wms:customerreturn-request-main:export'}), //
defaultButtons.defaultFreshBtn(null), // defaultButtons.defaultFreshBtn(null), //

2
src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue

@ -155,7 +155,7 @@ const { getList, setSearchParams } = tableMethods
// //
const HeadButttondata = [ const HeadButttondata = [
// defaultButtons.defaultAddBtn({hasPermi:'wms:customersettle-request-main:create'}), // // defaultButtons.defaultAddBtn({hasPermi:'wms:customersettle-request-main:create'}), //
// defaultButtons.defaultImportBtn({hasPermi:'wms:customersettle-request-main:import'}), // // defaultButtons.defaultImportBtn({hasPermi:'wms:customersettle-request-main:import'}), //
defaultButtons.defaultExportBtn({hasPermi:'wms:customersettle-request-main:export'}), // defaultButtons.defaultExportBtn({hasPermi:'wms:customersettle-request-main:export'}), //
defaultButtons.defaultFreshBtn(null), // defaultButtons.defaultFreshBtn(null), //

2
src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue

@ -182,7 +182,7 @@ const { getList, setSearchParams } = tableMethods
// //
const HeadButttondata = [ const HeadButttondata = [
defaultButtons.defaultAddBtn({hasPermi:'wms:deliver-request-main:create'}), // defaultButtons.defaultAddBtn({hasPermi:'wms:deliver-request-main:create'}), //
defaultButtons.defaultImportBtn({hasPermi:'wms:deliver-request-main:import'}), // defaultButtons.defaultImportBtn({hasPermi:'wms:deliver-request-main:import'}), //
defaultButtons.defaultExportBtn({hasPermi:'wms:deliver-request-main:export'}), // defaultButtons.defaultExportBtn({hasPermi:'wms:deliver-request-main:export'}), //
defaultButtons.defaultFreshBtn(null), // defaultButtons.defaultFreshBtn(null), //

2
src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue

@ -144,7 +144,7 @@ const { getList, setSearchParams } = tableMethods
// //
const HeadButttondata = [ const HeadButttondata = [
defaultButtons.defaultAddBtn({hasPermi:'wms:deliver-plan-main:create'}), // defaultButtons.defaultAddBtn({hasPermi:'wms:deliver-plan-main:create'}), //
defaultButtons.defaultImportBtn({hasPermi:'wms:deliver-plan-main:import'}), // defaultButtons.defaultImportBtn({hasPermi:'wms:deliver-plan-main:import'}), //
defaultButtons.defaultExportBtn({hasPermi:'wms:deliver-plan-main:export'}), // defaultButtons.defaultExportBtn({hasPermi:'wms:deliver-plan-main:export'}), //
defaultButtons.defaultFreshBtn(null), // defaultButtons.defaultFreshBtn(null), //

2
src/views/wms/deliversettlementManage/deliverplan/saleMain/index.vue

@ -134,7 +134,7 @@ const { getList, setSearchParams } = tableMethods
// //
const HeadButttondata = [ const HeadButttondata = [
defaultButtons.defaultAddBtn({hasPermi:'wms:sale-main:create'}), // defaultButtons.defaultAddBtn({hasPermi:'wms:sale-main:create'}), //
defaultButtons.defaultImportBtn({hasPermi:'wms:sale-main:import'}), // defaultButtons.defaultImportBtn({hasPermi:'wms:sale-main:import'}), //
defaultButtons.defaultExportBtn({hasPermi:'wms:sale-main:export'}), // defaultButtons.defaultExportBtn({hasPermi:'wms:sale-main:export'}), //
defaultButtons.defaultFreshBtn(null), // defaultButtons.defaultFreshBtn(null), //

2
src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue

@ -136,7 +136,7 @@ const { getList, setSearchParams } = tableMethods
// //
const HeadButttondata = [ const HeadButttondata = [
defaultButtons.defaultAddBtn({hasPermi:'wms:inventoryinit-request-main:create'}), // defaultButtons.defaultAddBtn({hasPermi:'wms:inventoryinit-request-main:create'}), //
defaultButtons.defaultImportBtn({hasPermi:'wms:inventoryinit-request-main:import'}), // defaultButtons.defaultImportBtn({hasPermi:'wms:inventoryinit-request-main:import'}), //
defaultButtons.defaultExportBtn({hasPermi:'wms:inventoryinit-request-main:export'}), // defaultButtons.defaultExportBtn({hasPermi:'wms:inventoryinit-request-main:export'}), //
defaultButtons.defaultFreshBtn(null), // defaultButtons.defaultFreshBtn(null), //

2
src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue

@ -143,7 +143,7 @@ const { getList, setSearchParams } = tableMethods
// //
const HeadButttondata = [ const HeadButttondata = [
defaultButtons.defaultAddBtn({hasPermi:'wms:scrap-request-main:create'}), // defaultButtons.defaultAddBtn({hasPermi:'wms:scrap-request-main:create'}), //
defaultButtons.defaultImportBtn({hasPermi:'wms:scrap-request-main:import'}), // defaultButtons.defaultImportBtn({hasPermi:'wms:scrap-request-main:import'}), //
defaultButtons.defaultExportBtn({hasPermi:'wms:scrap-request-main:export'}), // defaultButtons.defaultExportBtn({hasPermi:'wms:scrap-request-main:export'}), //
defaultButtons.defaultFreshBtn(null), // defaultButtons.defaultFreshBtn(null), //

2
src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue

@ -156,7 +156,7 @@ const { getList, setSearchParams } = tableMethods
// //
const HeadButttondata = [ const HeadButttondata = [
defaultButtons.defaultAddBtn({hasPermi:'wms:transferissue-request-main:create'}), // defaultButtons.defaultAddBtn({hasPermi:'wms:transferissue-request-main:create'}), //
defaultButtons.defaultImportBtn({hasPermi:'wms:transferissue-request-main:import'}), // defaultButtons.defaultImportBtn({hasPermi:'wms:transferissue-request-main:import'}), //
defaultButtons.defaultExportBtn({hasPermi:'wms:transferissue-request-main:export'}), // defaultButtons.defaultExportBtn({hasPermi:'wms:transferissue-request-main:export'}), //
defaultButtons.defaultFreshBtn(null), // defaultButtons.defaultFreshBtn(null), //

2
src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue

@ -148,7 +148,7 @@ const { getList, setSearchParams } = tableMethods
// //
const HeadButttondata = [ const HeadButttondata = [
// defaultButtons.defaultAddBtn({hasPermi:'wms:transferreceipt-request-main:create'}), // // defaultButtons.defaultAddBtn({hasPermi:'wms:transferreceipt-request-main:create'}), //
// defaultButtons.defaultImportBtn({hasPermi:'wms:transferreceipt-request-main:import'}), // // defaultButtons.defaultImportBtn({hasPermi:'wms:transferreceipt-request-main:import'}), //
defaultButtons.defaultExportBtn({hasPermi:'wms:transferreceipt-request-main:export'}), // defaultButtons.defaultExportBtn({hasPermi:'wms:transferreceipt-request-main:export'}), //
defaultButtons.defaultFreshBtn(null), // defaultButtons.defaultFreshBtn(null), //

2
src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue

@ -148,7 +148,7 @@ const { getList, setSearchParams } = tableMethods
// //
const HeadButttondata = [ const HeadButttondata = [
defaultButtons.defaultAddBtn({hasPermi:'wms:unplannedissue-request-main:create'}), // defaultButtons.defaultAddBtn({hasPermi:'wms:unplannedissue-request-main:create'}), //
defaultButtons.defaultImportBtn({hasPermi:'wms:unplannedissue-request-main:import'}), // defaultButtons.defaultImportBtn({hasPermi:'wms:unplannedissue-request-main:import'}), //
defaultButtons.defaultExportBtn({hasPermi:'wms:unplannedissue-request-main:export'}), // defaultButtons.defaultExportBtn({hasPermi:'wms:unplannedissue-request-main:export'}), //
defaultButtons.defaultFreshBtn(null), // defaultButtons.defaultFreshBtn(null), //

50
src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue

@ -131,6 +131,7 @@ const tableColumns = ref(UnplannedreceiptRequestMain.allSchemas.tableColumns)
const detailListTableColumns = UnplannedreceiptRequestDetailLabel.allSchemas const detailListTableColumns = UnplannedreceiptRequestDetailLabel.allSchemas
const isCreateLabel = ref(false) const isCreateLabel = ref(false)
const formLabelRef = ref() const formLabelRef = ref()
const labelType = ref('') //
const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({ const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({
getListApi: UnplannedreceiptRequestDetailApi.getUnplannedreceiptRequestDetailPage getListApi: UnplannedreceiptRequestDetailApi.getUnplannedreceiptRequestDetailPage
}) })
@ -141,19 +142,56 @@ const updataTableColumns = (val) => {
tableColumns.value = val tableColumns.value = val
} }
//
const isItemType = async (itemCode, labelTypeParams) => {
let isType = false
const labelTypeOld = JSON.parse(JSON.stringify(labelType.value))
await ItembasicApi.getItembasicPage({
pageSize: 10,
pageNo: 1,
code: itemCode,
sort: '',
by: 'ASC',
}).then(res => {
if (res.list.length > 0) {
//
if (res.list[0].enableMake == "FALSE") {
labelType.value = 'cg'
if (labelTypeParams == 'cg') {
isType = true
}
} else {
labelType.value = 'zz'
if (labelTypeParams == 'zz') {
isType = true
}
}
if(labelTypeParams == '') isType = true
}
})
//
if (!isType) labelType.value = labelTypeOld
return isType
}
// //
const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => { const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
nextTick(() => { nextTick(async () => {
if (type == 'tableForm') { if (type == 'tableForm') {
// //
if(formField == 'toLocationCode'){ if(formField == 'toLocationCode'){
row['toLocationCode'] = val[0]['code'] row['toLocationCode'] = val[0]['code']
} } else if(formField == 'itemCode'){
if(formField == 'itemCode'){ const isType = await isItemType(val[0]['code'], labelType.value)
if(!isType){
message.warning('当前物料可制造与其他数据不一致,请重新选择!')
} else {
row['itemCode'] = val[0]['code'] row['itemCode'] = val[0]['code']
row['uom'] = val[0]['uom'] row['uom'] = val[0]['uom']
} }
} else {
row[formField] = val[0][searchField] row[formField] = val[0][searchField]
}
} else { } else {
const setV = {} const setV = {}
setV[formField] = val[0][searchField] setV[formField] = val[0][searchField]
@ -190,7 +228,7 @@ const { getList, setSearchParams } = tableMethods
// //
const HeadButttondata = [ const HeadButttondata = [
defaultButtons.defaultAddBtn({hasPermi:'wms:unplannedreceipt-request-main:create'}), // defaultButtons.defaultAddBtn({hasPermi:'wms:unplannedreceipt-request-main:create'}), //
defaultButtons.defaultImportBtn({hasPermi:'wms:unplannedreceipt-request-main:import'}), // defaultButtons.defaultImportBtn({hasPermi:'wms:unplannedreceipt-request-main:import'}), //
defaultButtons.defaultExportBtn({hasPermi:'wms:unplannedreceipt-request-main:export'}), // defaultButtons.defaultExportBtn({hasPermi:'wms:unplannedreceipt-request-main:export'}), //
defaultButtons.defaultFreshBtn(null), // defaultButtons.defaultFreshBtn(null), //
@ -323,8 +361,8 @@ const buttonTableClick = async (val, row) => {
by: 'ASC', by: 'ASC',
}).then(res => { }).then(res => {
if (res.list.length > 0) { if (res.list.length > 0) {
// //
if (res.list[0].type == "RAW") { if (res.list[0].enableMake == "FALSE") {
// tableform // tableform
detailListTableColumns.tableFormColumns.map(item => { detailListTableColumns.tableFormColumns.map(item => {
if(item.field == 'productionLineCodePackage') { if(item.field == 'productionLineCodePackage') {

2
src/views/wms/issueManage/issue/issueRequestMain/index.vue

@ -144,7 +144,7 @@ const { getList, setSearchParams } = tableMethods
// //
const HeadButttondata = [ const HeadButttondata = [
defaultButtons.defaultAddBtn({hasPermi:'wms:issue-request-main:create'}), // defaultButtons.defaultAddBtn({hasPermi:'wms:issue-request-main:create'}), //
defaultButtons.defaultImportBtn({hasPermi:'wms:issue-request-main:import'}), // defaultButtons.defaultImportBtn({hasPermi:'wms:issue-request-main:import'}), //
defaultButtons.defaultExportBtn({hasPermi:'wms:issue-request-main:export'}), // defaultButtons.defaultExportBtn({hasPermi:'wms:issue-request-main:export'}), //
defaultButtons.defaultFreshBtn(null), // defaultButtons.defaultFreshBtn(null), //

2
src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/index.vue

@ -157,7 +157,7 @@ const { getList, setSearchParams } = tableMethods
// //
const HeadButttondata = [ const HeadButttondata = [
defaultButtons.defaultAddBtn({hasPermi:'wms:onlinesettlement-request-main:create'}), // defaultButtons.defaultAddBtn({hasPermi:'wms:onlinesettlement-request-main:create'}), //
defaultButtons.defaultImportBtn({hasPermi:'wms:onlinesettlement-request-main:import'}), // defaultButtons.defaultImportBtn({hasPermi:'wms:onlinesettlement-request-main:import'}), //
defaultButtons.defaultExportBtn({hasPermi:'wms:onlinesettlement-request-main:export'}), // defaultButtons.defaultExportBtn({hasPermi:'wms:onlinesettlement-request-main:export'}), //
defaultButtons.defaultFreshBtn(null), // defaultButtons.defaultFreshBtn(null), //

2
src/views/wms/issueManage/pick/pickRequestMain/index.vue

@ -147,7 +147,7 @@ const { getList, setSearchParams } = tableMethods
// //
const HeadButttondata = [ const HeadButttondata = [
defaultButtons.defaultAddBtn({hasPermi:'wms:pick-request-main:create'}), // defaultButtons.defaultAddBtn({hasPermi:'wms:pick-request-main:create'}), //
defaultButtons.defaultImportBtn({hasPermi:'wms:pick-request-main:import'}), // defaultButtons.defaultImportBtn({hasPermi:'wms:pick-request-main:import'}), //
defaultButtons.defaultExportBtn({hasPermi:'wms:pick-request-main:export'}), // defaultButtons.defaultExportBtn({hasPermi:'wms:pick-request-main:export'}), //
defaultButtons.defaultFreshBtn(null), // defaultButtons.defaultFreshBtn(null), //

15
src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue

@ -125,6 +125,7 @@ const updataTableColumns = (val) => {
// //
const isItemType = async (itemCode, labelTypeParams) => { const isItemType = async (itemCode, labelTypeParams) => {
let isType = false let isType = false
const labelTypeOld = JSON.parse(JSON.stringify(labelType.value))
await ItembasicApi.getItembasicPage({ await ItembasicApi.getItembasicPage({
pageSize: 10, pageSize: 10,
pageNo: 1, pageNo: 1,
@ -133,8 +134,8 @@ const isItemType = async (itemCode, labelTypeParams) => {
by: 'ASC', by: 'ASC',
}).then(res => { }).then(res => {
if (res.list.length > 0) { if (res.list.length > 0) {
// //
if (res.list[0].type == "RAW") { if (res.list[0].enableMake == "FALSE") {
labelType.value = 'cg' labelType.value = 'cg'
if (labelTypeParams == 'cg') { if (labelTypeParams == 'cg') {
isType = true isType = true
@ -148,6 +149,8 @@ const isItemType = async (itemCode, labelTypeParams) => {
if(labelTypeParams == '') isType = true if(labelTypeParams == '') isType = true
} }
}) })
//
if (!isType) labelType.value = labelTypeOld
return isType return isType
} }
@ -159,7 +162,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
if(formField == 'itemCode') { if(formField == 'itemCode') {
const isType = await isItemType(val[0]['itemCode'], labelType.value) const isType = await isItemType(val[0]['itemCode'], labelType.value)
if(!isType){ if(!isType){
message.warning('当前物料类型与其他数据不一致,请重新选择!') message.warning('当前物料可制造与其他数据不一致,请重新选择!')
} else { } else {
row['itemCode'] = val[0]['itemCode'] row['itemCode'] = val[0]['itemCode']
row['uom'] = val[0]['uom'] row['uom'] = val[0]['uom']
@ -194,7 +197,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
if(formField == 'itemCode') { if(formField == 'itemCode') {
const isType = await isItemType(val[0]['itemCode'], labelType.value) const isType = await isItemType(val[0]['itemCode'], labelType.value)
if(!isType){ if(!isType){
message.warning('当前物料类型与其他数据不一致,请重新选择!') message.warning('当前物料可制造与其他数据不一致,请重新选择!')
} else { } else {
setV['itemCode'] = val[0]['itemCode'] setV['itemCode'] = val[0]['itemCode']
setV['uom'] = val[0]['uom'] setV['uom'] = val[0]['uom']
@ -363,8 +366,8 @@ const buttonTableClick = async (val, row) => {
by: 'ASC', by: 'ASC',
}).then(res => { }).then(res => {
if (res.list.length > 0) { if (res.list.length > 0) {
// //
if (res.list[0].type == "RAW") { if (res.list[0].enableMake == "FALSE") {
// tableform // tableform
detailListTableColumns.tableFormColumns.map(itemColumns => { detailListTableColumns.tableFormColumns.map(itemColumns => {
if(itemColumns.field == 'productionLineCodePackage') { if(itemColumns.field == 'productionLineCodePackage') {

15
src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue

@ -128,6 +128,7 @@ const updataTableColumns = (val) => {
// //
const isItemType = async (itemCode, labelTypeParams) => { const isItemType = async (itemCode, labelTypeParams) => {
let isType = false let isType = false
const labelTypeOld = JSON.parse(JSON.stringify(labelType.value))
await ItembasicApi.getItembasicPage({ await ItembasicApi.getItembasicPage({
pageSize: 10, pageSize: 10,
pageNo: 1, pageNo: 1,
@ -136,8 +137,8 @@ const isItemType = async (itemCode, labelTypeParams) => {
by: 'ASC', by: 'ASC',
}).then(res => { }).then(res => {
if (res.list.length > 0) { if (res.list.length > 0) {
// //
if (res.list[0].type == "RAW") { if (res.list[0].enableMake == "FALSE") {
labelType.value = 'cg' labelType.value = 'cg'
if (labelTypeParams == 'cg') { if (labelTypeParams == 'cg') {
isType = true isType = true
@ -151,6 +152,8 @@ const isItemType = async (itemCode, labelTypeParams) => {
if(labelTypeParams == '') isType = true if(labelTypeParams == '') isType = true
} }
}) })
//
if (!isType) labelType.value = labelTypeOld
return isType return isType
} }
@ -162,7 +165,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
if(formField == 'itemCode') { if(formField == 'itemCode') {
const isType = await isItemType(val[0]['itemCode'], labelType.value) const isType = await isItemType(val[0]['itemCode'], labelType.value)
if(!isType){ if(!isType){
message.warning('当前物料类型与其他数据不一致,请重新选择!') message.warning('当前物料可制造与其他数据不一致,请重新选择!')
} else { } else {
row['batch'] = val[0]['batch']==''?formatTime(new Date(), 'yyyyMMdd'):val[0]['batch'] row['batch'] = val[0]['batch']==''?formatTime(new Date(), 'yyyyMMdd'):val[0]['batch']
row['itemCode'] = val[0]['itemCode'] row['itemCode'] = val[0]['itemCode']
@ -200,7 +203,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
if(formField == 'itemCode') { if(formField == 'itemCode') {
const isType = await isItemType(val[0]['itemCode'], labelType.value) const isType = await isItemType(val[0]['itemCode'], labelType.value)
if(!isType){ if(!isType){
message.warning('当前物料类型与其他数据不一致,请重新选择!') message.warning('当前物料可制造与其他数据不一致,请重新选择!')
} else { } else {
setV['batch'] = val[0]['batch'] setV['batch'] = val[0]['batch']
setV['itemCode'] = val[0]['itemCode'] setV['itemCode'] = val[0]['itemCode']
@ -370,8 +373,8 @@ const buttonTableClick = async (val, row) => {
by: 'ASC', by: 'ASC',
}).then(res => { }).then(res => {
if (res.list.length > 0) { if (res.list.length > 0) {
// //
if (res.list[0].type == "RAW") { if (res.list[0].enableMake == "FALSE") {
// tableform // tableform
detailListTableColumns.tableFormColumns.map(itemColumns => { detailListTableColumns.tableFormColumns.map(itemColumns => {
if(itemColumns.field == 'productionLineCodePackage') { if(itemColumns.field == 'productionLineCodePackage') {

2
src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue

@ -186,7 +186,7 @@ const { getList, setSearchParams } = tableMethods
// //
const HeadButttondata = [ const HeadButttondata = [
defaultButtons.defaultAddBtn({hasPermi:'wms:inventorychange-request-main:create'}), // defaultButtons.defaultAddBtn({hasPermi:'wms:inventorychange-request-main:create'}), //
defaultButtons.defaultImportBtn({hasPermi:'wms:inventorychange-request-main:import'}), // defaultButtons.defaultImportBtn({hasPermi:'wms:inventorychange-request-main:import'}), //
defaultButtons.defaultExportBtn({hasPermi:'wms:inventorychange-request-main:export'}), // defaultButtons.defaultExportBtn({hasPermi:'wms:inventorychange-request-main:export'}), //
defaultButtons.defaultFreshBtn(null), // defaultButtons.defaultFreshBtn(null), //

2
src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue

@ -320,7 +320,7 @@ const { getList, setSearchParams } = tableMethods
// //
const HeadButttondata = [ const HeadButttondata = [
defaultButtons.defaultAddBtn({hasPermi:'wms:inventorymove-request-main:create'}), // defaultButtons.defaultAddBtn({hasPermi:'wms:inventorymove-request-main:create'}), //
defaultButtons.defaultImportBtn({hasPermi:'wms:inventorymove-request-main:import'}), // defaultButtons.defaultImportBtn({hasPermi:'wms:inventorymove-request-main:import'}), //
defaultButtons.defaultExportBtn({hasPermi:'wms:inventorymove-request-main:export'}), // defaultButtons.defaultExportBtn({hasPermi:'wms:inventorymove-request-main:export'}), //
defaultButtons.defaultFreshBtn(null), // defaultButtons.defaultFreshBtn(null), //

2
src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/index.vue

@ -148,7 +148,7 @@ const { getList, setSearchParams } = tableMethods
// //
const HeadButttondata = [ const HeadButttondata = [
defaultButtons.defaultAddBtn({hasPermi:'wms:offlinesettlement-request-main:create'}), // defaultButtons.defaultAddBtn({hasPermi:'wms:offlinesettlement-request-main:create'}), //
defaultButtons.defaultImportBtn({hasPermi:'wms:offlinesettlement-request-main:import'}), // defaultButtons.defaultImportBtn({hasPermi:'wms:offlinesettlement-request-main:import'}), //
defaultButtons.defaultExportBtn({hasPermi:'wms:offlinesettlement-request-main:export'}), // defaultButtons.defaultExportBtn({hasPermi:'wms:offlinesettlement-request-main:export'}), //
defaultButtons.defaultFreshBtn(null), // defaultButtons.defaultFreshBtn(null), //

2
src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue

@ -147,7 +147,7 @@ const { getList, setSearchParams } = tableMethods
// //
const HeadButttondata = [ const HeadButttondata = [
defaultButtons.defaultAddBtn({hasPermi:'wms:productputaway-request-main:create'}), // defaultButtons.defaultAddBtn({hasPermi:'wms:productputaway-request-main:create'}), //
defaultButtons.defaultImportBtn({hasPermi:'wms:productputaway-request-main:import'}), // defaultButtons.defaultImportBtn({hasPermi:'wms:productputaway-request-main:import'}), //
defaultButtons.defaultExportBtn({hasPermi:'wms:productputaway-request-main:export'}), // defaultButtons.defaultExportBtn({hasPermi:'wms:productputaway-request-main:export'}), //
defaultButtons.defaultFreshBtn(null), // defaultButtons.defaultFreshBtn(null), //

6
src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue

@ -204,7 +204,7 @@ const { getList, setSearchParams } = tableMethods
// //
const HeadButttondata = [ const HeadButttondata = [
defaultButtons.defaultAddBtn({hasPermi:'wms:productreceipt-request-main:create'}), // defaultButtons.defaultAddBtn({hasPermi:'wms:productreceipt-request-main:create'}), //
defaultButtons.defaultImportBtn({hasPermi:'wms:productreceipt-request-main:import'}), // defaultButtons.defaultImportBtn({hasPermi:'wms:productreceipt-request-main:import'}), //
defaultButtons.defaultExportBtn({hasPermi:'wms:productreceipt-request-main:export'}), // defaultButtons.defaultExportBtn({hasPermi:'wms:productreceipt-request-main:export'}), //
defaultButtons.defaultFreshBtn(null), // defaultButtons.defaultFreshBtn(null), //
@ -352,8 +352,8 @@ const buttonTableClick = async (val, row) => {
by: 'ASC', by: 'ASC',
}).then(res => { }).then(res => {
if (res.list.length > 0) { if (res.list.length > 0) {
// //
if (res.list[0].type == "RAW") { if (res.list[0].enableMake == "FALSE") {
// tableform // tableform
detailListTableColumns.tableFormColumns.map(itemColumns => { detailListTableColumns.tableFormColumns.map(itemColumns => {
if(itemColumns.field == 'productionLineCodePackage') { if(itemColumns.field == 'productionLineCodePackage') {

2
src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue

@ -291,7 +291,7 @@ const { getList, setSearchParams } = tableMethods
// //
const HeadButttondata = [ const HeadButttondata = [
defaultButtons.defaultAddBtn({hasPermi:'wms:productrepair-request-main:create'}), // defaultButtons.defaultAddBtn({hasPermi:'wms:productrepair-request-main:create'}), //
// defaultButtons.defaultImportBtn({hasPermi:'wms:productrepair-request-main:import'}), // // defaultButtons.defaultImportBtn({hasPermi:'wms:productrepair-request-main:import'}), //
defaultButtons.defaultExportBtn({hasPermi:'wms:productrepair-request-main:export'}), // defaultButtons.defaultExportBtn({hasPermi:'wms:productrepair-request-main:export'}), //
defaultButtons.defaultFreshBtn(null), // defaultButtons.defaultFreshBtn(null), //

2
src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue

@ -298,7 +298,7 @@ const { getList, setSearchParams } = tableMethods
// //
const HeadButttondata = [ const HeadButttondata = [
defaultButtons.defaultAddBtn({hasPermi:'wms:productscrap-request-main:create'}), // defaultButtons.defaultAddBtn({hasPermi:'wms:productscrap-request-main:create'}), //
// defaultButtons.defaultImportBtn({hasPermi:'wms:productscrap-request-main:import'}), // // defaultButtons.defaultImportBtn({hasPermi:'wms:productscrap-request-main:import'}), //
defaultButtons.defaultExportBtn({hasPermi:'wms:productscrap-request-main:export'}), // defaultButtons.defaultExportBtn({hasPermi:'wms:productscrap-request-main:export'}), //
defaultButtons.defaultFreshBtn(null), // defaultButtons.defaultFreshBtn(null), //

2
src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue

@ -115,7 +115,7 @@
// //
const HeadButttondata = [ const HeadButttondata = [
// defaultButtons.defaultAddBtn({ hasPermi: 'wms:inspect-request-main:create' }), // // defaultButtons.defaultAddBtn({ hasPermi: 'wms:inspect-request-main:create' }), //
// defaultButtons.defaultImportBtn({hasPermi:'wms:inspect-request-main:import'}), // // defaultButtons.defaultImportBtn({hasPermi:'wms:inspect-request-main:import'}), //
defaultButtons.defaultExportBtn({ hasPermi: 'wms:inspect-request-main:export' }), // defaultButtons.defaultExportBtn({ hasPermi: 'wms:inspect-request-main:export' }), //
defaultButtons.defaultFreshBtn(null), // defaultButtons.defaultFreshBtn(null), //

4
src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue

@ -288,10 +288,10 @@ const { getList, setSearchParams } = tableMethods
// //
const HeadButttondata = [ const HeadButttondata = [
// defaultButtons.defaultAddBtn({hasPermi:'wms:purchasereturn-request-main:create'}), // // defaultButtons.defaultAddBtn({hasPermi:'wms:purchasereturn-request-main:create'}), //
// defaultButtons.defaultImportBtn({hasPermi:'wms:purchasereturn-request-main:import'}), // // defaultButtons.defaultImportBtn({hasPermi:'wms:purchasereturn-request-main:import'}), //
// defaultButtons.defaultExportBtn({hasPermi:'wms:purchasereturn-request-main:export'}), // // defaultButtons.defaultExportBtn({hasPermi:'wms:purchasereturn-request-main:export'}), //
defaultButtons.defaultAddBtn(null), // defaultButtons.defaultAddBtn(null), //
defaultButtons.defaultImportBtn(null), // defaultButtons.defaultImportBtn(null), //
defaultButtons.defaultExportBtn(null), // defaultButtons.defaultExportBtn(null), //
defaultButtons.defaultFreshBtn(null), // defaultButtons.defaultFreshBtn(null), //

2
src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue

@ -141,7 +141,7 @@ const { getList, setSearchParams } = tableMethods
// //
const HeadButttondata = [ const HeadButttondata = [
// defaultButtons.defaultAddBtn({hasPermi:'wms:putaway-request-main:create'}), // // defaultButtons.defaultAddBtn({hasPermi:'wms:putaway-request-main:create'}), //
// defaultButtons.defaultImportBtn({hasPermi:'wms:putaway-request-main:import'}), // // defaultButtons.defaultImportBtn({hasPermi:'wms:putaway-request-main:import'}), //
defaultButtons.defaultExportBtn({hasPermi:'wms:putaway-request-main:export'}), // defaultButtons.defaultExportBtn({hasPermi:'wms:putaway-request-main:export'}), //
defaultButtons.defaultFreshBtn(null), // defaultButtons.defaultFreshBtn(null), //

2
src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue

@ -147,7 +147,7 @@
// //
const HeadButttondata = [ const HeadButttondata = [
defaultButtons.defaultAddBtn({ hasPermi: 'wms:purchase-plan-main:create' }), // defaultButtons.defaultAddBtn({ hasPermi: 'wms:purchase-plan-main:create' }), //
defaultButtons.defaultImportBtn({ hasPermi: 'wms:purchase-plan-main:import' }), // defaultButtons.defaultImportBtn({ hasPermi: 'wms:purchase-plan-main:import' }), //
defaultButtons.defaultExportBtn({ hasPermi: 'wms:purchase-plan-main:export' }), // defaultButtons.defaultExportBtn({ hasPermi: 'wms:purchase-plan-main:export' }), //
defaultButtons.defaultFreshBtn(null), // defaultButtons.defaultFreshBtn(null), //

2
src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue

@ -187,7 +187,7 @@ const { getList, setSearchParams } = tableMethods
// //
const HeadButttondata = [ const HeadButttondata = [
defaultButtons.defaultAddBtn({ hasPermi: 'wms:supplierdeliver-request-main:create' }), // defaultButtons.defaultAddBtn({ hasPermi: 'wms:supplierdeliver-request-main:create' }), //
defaultButtons.defaultImportBtn({ hasPermi: 'wms:supplierdeliver-request-main:import' }), // defaultButtons.defaultImportBtn({ hasPermi: 'wms:supplierdeliver-request-main:import' }), //
defaultButtons.defaultExportBtn({ hasPermi: 'wms:supplierdeliver-request-main:export' }), // defaultButtons.defaultExportBtn({ hasPermi: 'wms:supplierdeliver-request-main:export' }), //
defaultButtons.defaultFreshBtn(null), // defaultButtons.defaultFreshBtn(null), //

2
src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue

@ -115,7 +115,7 @@
// //
const HeadButttondata = [ const HeadButttondata = [
defaultButtons.defaultAddBtn({ hasPermi: 'wms:supplierinvoice-request-main:create' }), // defaultButtons.defaultAddBtn({ hasPermi: 'wms:supplierinvoice-request-main:create' }), //
defaultButtons.defaultExportBtn({ hasPermi: 'wms:supplierinvoice-request-main:export' }), // defaultButtons.defaultExportBtn({ hasPermi: 'wms:supplierinvoice-request-main:export' }), //
defaultButtons.defaultFreshBtn(null), // defaultButtons.defaultFreshBtn(null), //
defaultButtons.defaultFilterBtn(null), // defaultButtons.defaultFilterBtn(null), //

Loading…
Cancel
Save