Browse Source

结局冲突

master_hella_20240701
ljlong_2630 6 months ago
parent
commit
13041e32af
  1. 2
      README.md
  2. 2
      src/components/Table/src/Table.vue
  3. 3
      src/locales/en-US.ts
  4. 3
      src/locales/zh-CN.ts
  5. 3
      src/views/eam/maintenance/index.vue
  6. 2
      src/views/mes/orderDay/components/schedule.vue
  7. 12
      src/views/qms/inspectionMethod/index.vue
  8. 2
      src/views/qms/inspectionRecord/detail.vue
  9. 12
      src/views/qms/sampleCode/index.vue
  10. 2
      src/views/qms/sampleCode/sampleCode.data.ts
  11. 12
      src/views/qms/samplingProcess/index.vue
  12. 12
      src/views/qms/samplingScheme/index.vue
  13. 2
      src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts
  14. 2
      src/views/wms/basicDataManage/factoryModeling/productionline/productionline.data.ts
  15. 1
      src/views/wms/basicDataManage/factoryModeling/workshop/workshop.data.ts
  16. 1
      src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts
  17. 8
      src/views/wms/basicDataManage/itemManage/relegate/relegateRecord/relegateRecordMain.data.ts
  18. 24
      src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
  19. 48
      src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
  20. 2
      src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts
  21. 7
      src/views/wms/basicDataManage/labelManage/callmaterials/index.vue
  22. 7
      src/views/wms/basicDataManage/labelManage/locationLabel/index.vue
  23. 4
      src/views/wms/basicDataManage/subject/subjectAccount/index.vue
  24. 6
      src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts
  25. 15
      src/views/wms/buttMesManage/mesBarCode/mesBarCode.data.ts
  26. 28
      src/views/wms/inventoryManage/balance/index.vue
  27. 3
      src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
  28. 70
      src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts
  29. 34
      src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts
  30. 52
      src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue
  31. 101
      src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
  32. 35
      src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts
  33. 36
      src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
  34. 37
      src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
  35. 365
      src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
  36. 32
      src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts
  37. 38
      src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts
  38. 42
      src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts
  39. 2
      src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/productputawayAssembleJobMain.data.ts
  40. 2
      src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/productputawayAssembleRecordMain.data.ts
  41. 2
      src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts
  42. 26
      src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts
  43. 28
      src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts
  44. 60
      src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
  45. 2
      src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts
  46. 1
      src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
  47. 4
      src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue
  48. 3
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
  49. 13
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
  50. 5
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts

2
README.md

@ -1,4 +1,4 @@
## dev发布2024-05-23-001 ## dev发布2024-05-23-002
**xxxx.data.ts 文件配置说明** **xxxx.data.ts 文件配置说明**
**form表单查询弹窗配置** **form表单查询弹窗配置**
form: { form: {

2
src/components/Table/src/Table.vue

@ -200,7 +200,7 @@ export default defineComponent({
const { selection, reserveSelection, align, headerAlign,border } = unref(getProps) const { selection, reserveSelection, align, headerAlign,border } = unref(getProps)
// //
return selection ? ( return selection ? (
<ElTableColumn <ElTableColumn fixed="left"
type="selection" type="selection"
reserveSelection={reserveSelection} reserveSelection={reserveSelection}
align={align} align={align}

3
src/locales/en-US.ts

@ -1009,7 +1009,8 @@ export default {
:'Please first select the data you want to print', :'Please first select the data you want to print',
:'Failed to create label', :'Failed to create label',
:'The production date cannot be longer than the expiration date', :'The production date cannot be longer than the expiration date',
'计划到货时间大于要货计划送达日期是否继续?':'The planned arrival time is greater than the planned delivery date. Do you want to continue?', '计划到货时间大于':'The planned arrival time is greater than ',
'是否继续?':'. Do you want to continue?',
'子表明细不能为空!':'Subindicates that the detail cannot be empty!', '子表明细不能为空!':'Subindicates that the detail cannot be empty!',
:'The purchase request was successfully generated', :'The purchase request was successfully generated',
'确认生成采购申请吗?':'Confirm to generate purchase application?', '确认生成采购申请吗?':'Confirm to generate purchase application?',

3
src/locales/zh-CN.ts

@ -1009,7 +1009,8 @@ export default {
:'请先选择要打印的数据', :'请先选择要打印的数据',
:'创建标签失败', :'创建标签失败',
:'生产日期不可以大于过期日期', :'生产日期不可以大于过期日期',
'计划到货时间大于要货计划送达日期是否继续?':'计划到货时间大于要货计划送达日期是否继续?', '计划到货时间大于':'计划到货时间大于',
'是否继续?':'是否继续?',
'子表明细不能为空!':'子表明细不能为空!', '子表明细不能为空!':'子表明细不能为空!',
:'采购申请生成成功', :'采购申请生成成功',
'确认生成采购申请吗?':'确认生成采购申请吗?', '确认生成采购申请吗?':'确认生成采购申请吗?',

3
src/views/eam/maintenance/index.vue

@ -66,10 +66,9 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
import TableHead from '@/components/TableHead/src/TableHead.vue' import TableHead from '@/components/TableHead/src/TableHead.vue'
import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
import Detail from '@/components/Detail/src/Detail.vue' import Detail from '@/components/Detail/src/Detail.vue'
import * as BasicInspectionOptionApi from "@/api/eam/basicInspectionOption";
import {EquipmentAccounts} from "@/views/eam/equipmentAccounts/equipmentAccounts.data"; import {EquipmentAccounts} from "@/views/eam/equipmentAccounts/equipmentAccounts.data";
import * as EquipmentItemApi from "@/api/eam/equipmentAccounts"; import * as EquipmentItemApi from "@/api/eam/equipmentAccounts";
import { ToolAccounts } from "@/views/eam/toolAccounts/ToolAccounts.data"; import { ToolAccounts } from "@/views/eam/toolAccounts/toolAccounts.data";
import * as ToolItemApi from "@/api/eam/toolAccounts"; import * as ToolItemApi from "@/api/eam/toolAccounts";
defineOptions({ name: 'Maintenance' }) defineOptions({ name: 'Maintenance' })

2
src/views/mes/orderDay/components/schedule.vue

@ -515,7 +515,7 @@ const doPublishPlan= ()=>{
tempBom: detailData.value.tempBom, tempBom: detailData.value.tempBom,
workMode: detailData.value.workMode, workMode: detailData.value.workMode,
planDate: detailData.value.planDate, planDate: detailData.value.planDate,
startTime: detailData.value.planDate, startTime: detailData.value.startTime,
endTime: detailData.value.endTime, endTime: detailData.value.endTime,
taskMode: detailData.value.taskMode, taskMode: detailData.value.taskMode,
batchCode:detailData.value.batchCode, batchCode:detailData.value.batchCode,

12
src/views/qms/inspectionMethod/index.vue

@ -105,9 +105,9 @@ const { getList, setSearchParams } = tableMethods
// //
const HeadButttondata = [ const HeadButttondata = [
defaultButtons.defaultAddBtn({hasPermi:'qms:inspectionMethod:create'}), // defaultButtons.defaultAddBtn({hasPermi:'qms:inspection-method:create'}), //
defaultButtons.defaultImportBtn({hasPermi:'qms:inspectionMethod:import'}), // defaultButtons.defaultImportBtn({hasPermi:'qms:inspection-method:import'}), //
defaultButtons.defaultExportBtn({hasPermi:'qms:inspectionMethod:export'}), // defaultButtons.defaultExportBtn({hasPermi:'qms:inspection-method:export'}), //
defaultButtons.defaultFreshBtn(null), // defaultButtons.defaultFreshBtn(null), //
defaultButtons.defaultFilterBtn(null), // defaultButtons.defaultFilterBtn(null), //
defaultButtons.defaultSetBtn(null), // defaultButtons.defaultSetBtn(null), //
@ -147,9 +147,9 @@ const isShowMainButton = (row,val) => {
const butttondata = (row) => { const butttondata = (row) => {
return [ return [
defaultButtons.mainListEditBtn({hasPermi: 'qms:inspectionMethod:update'}), defaultButtons.mainListEditBtn({hasPermi: 'qms:inspection-method:update'}),
defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'qms:inspectionMethod:enable'}), defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'qms:inspection-method:enable'}),
defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'qms:inspectionMethod:disable'}), defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'qms:inspection-method:disable'}),
] ]
} }

2
src/views/qms/inspectionRecord/detail.vue

@ -35,7 +35,7 @@
<el-tab-pane <el-tab-pane
v-for="item in data.subList" v-for="item in data.subList"
:key="item.name" :key="item.name"
:label="item.processCode" :label="item.processDescribe"
:name="item.name" :name="item.name"
> >
<div class="small-title">检验工序</div> <div class="small-title">检验工序</div>

12
src/views/qms/sampleCode/index.vue

@ -100,9 +100,9 @@ const { getList, setSearchParams } = tableMethods
// //
const HeadButttondata = [ const HeadButttondata = [
defaultButtons.defaultAddBtn({hasPermi:'qms:sampleCode:create'}), // defaultButtons.defaultAddBtn({hasPermi:'qms:sample-code:create'}), //
defaultButtons.defaultImportBtn({hasPermi:'qms:sampleCode:import'}), // defaultButtons.defaultImportBtn({hasPermi:'qms:sample-code:import'}), //
defaultButtons.defaultExportBtn({hasPermi:'qms:sampleCode:export'}), // defaultButtons.defaultExportBtn({hasPermi:'qms:sample-code:export'}), //
defaultButtons.defaultFreshBtn(null), // defaultButtons.defaultFreshBtn(null), //
defaultButtons.defaultFilterBtn(null), // defaultButtons.defaultFilterBtn(null), //
defaultButtons.defaultSetBtn(null), // defaultButtons.defaultSetBtn(null), //
@ -148,9 +148,9 @@ const isShowMainButton = (row,val) => {
const butttondata = (row) => { const butttondata = (row) => {
return [ return [
defaultButtons.mainListEditBtn({hasPermi: 'qms:sampleCode:update'}), defaultButtons.mainListEditBtn({hasPermi: 'qms:sample-code:update'}),
defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'qms:sampleCode:enable'}), defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'qms:sample-code:enable'}),
defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'qms:sampleCode:disable'}), defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'qms:sample-code:disable'}),
] ]
} }

2
src/views/qms/sampleCode/sampleCode.data.ts

@ -19,7 +19,7 @@ export const SampleCodeRules = reactive({
const samplingSchemeList = await getSamplingScheme() const samplingSchemeList = await getSamplingScheme()
export const SampleCode = useCrudSchemas(reactive<CrudSchema[]>([ export const SampleCode = useCrudSchemas(reactive<CrudSchema[]>([
{ {
label: '采样方案编码', label: '采样方案',
field: 'code', field: 'code',
sort: 'custom', sort: 'custom',
isSearch: true, isSearch: true,

12
src/views/qms/samplingProcess/index.vue

@ -101,9 +101,9 @@ const { getList, setSearchParams } = tableMethods
// //
const HeadButttondata = [ const HeadButttondata = [
defaultButtons.defaultAddBtn({hasPermi:'qms:samplingProcess:create'}), // defaultButtons.defaultAddBtn({hasPermi:'qms:sampling-process:create'}), //
defaultButtons.defaultImportBtn({hasPermi:'qms:samplingProcess:import'}), // defaultButtons.defaultImportBtn({hasPermi:'qms:sampling-process:import'}), //
defaultButtons.defaultExportBtn({hasPermi:'qms:samplingProcess:export'}), // defaultButtons.defaultExportBtn({hasPermi:'qms:sampling-process:export'}), //
defaultButtons.defaultFreshBtn(null), // defaultButtons.defaultFreshBtn(null), //
defaultButtons.defaultFilterBtn(null), // defaultButtons.defaultFilterBtn(null), //
defaultButtons.defaultSetBtn(null), // defaultButtons.defaultSetBtn(null), //
@ -143,9 +143,9 @@ const isShowMainButton = (row,val) => {
const butttondata = (row) => { const butttondata = (row) => {
return [ return [
defaultButtons.mainListEditBtn({hasPermi: 'qms:samplingProcess:update'}), defaultButtons.mainListEditBtn({hasPermi: 'qms:sampling-process:update'}),
defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'qms:samplingProcess:enable'}), defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'qms:sampling-process:enable'}),
defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'qms:samplingProcess:disable'}), defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'qms:sampling-process:disable'}),
] ]
} }

12
src/views/qms/samplingScheme/index.vue

@ -99,9 +99,9 @@ const { getList, setSearchParams } = tableMethods
// //
const HeadButttondata = [ const HeadButttondata = [
defaultButtons.defaultAddBtn({hasPermi:'qms:samplingScheme:create'}), // defaultButtons.defaultAddBtn({hasPermi:'qms:sampling-scheme:create'}), //
defaultButtons.defaultImportBtn({hasPermi:'qms:samplingScheme:import'}), // defaultButtons.defaultImportBtn({hasPermi:'qms:sampling-scheme:import'}), //
defaultButtons.defaultExportBtn({hasPermi:'qms:samplingScheme:export'}), // defaultButtons.defaultExportBtn({hasPermi:'qms:sampling-scheme:export'}), //
defaultButtons.defaultFreshBtn(null), // defaultButtons.defaultFreshBtn(null), //
defaultButtons.defaultFilterBtn(null), // defaultButtons.defaultFilterBtn(null), //
defaultButtons.defaultSetBtn(null), // defaultButtons.defaultSetBtn(null), //
@ -141,9 +141,9 @@ const isShowMainButton = (row,val) => {
const butttondata = (row) => { const butttondata = (row) => {
return [ return [
defaultButtons.mainListEditBtn({hasPermi: 'qms:samplingScheme:update'}), defaultButtons.mainListEditBtn({hasPermi: 'qms:sampling-scheme:update'}),
defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'qms:samplingScheme:enable'}), defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'qms:sampling-scheme:enable'}),
defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'qms:samplingScheme:disable'}), defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'qms:sampling-scheme:disable'}),
] ]
} }

2
src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts

@ -251,7 +251,7 @@ export const DockRules = reactive({
{ validator:validateYS, message: '请输入正确的代码', trigger: 'blur'} { validator:validateYS, message: '请输入正确的代码', trigger: 'blur'}
], ],
name: [ name: [
{ max: 50, message: '不得超过50个字符', trigger: 'blur' } { required: true,max: 50, message: '不得超过50个字符', trigger: 'blur' }
], ],
city: [ city: [
{ max: 50, message: '不得超过50个字符', trigger: 'blur' } { max: 50, message: '不得超过50个字符', trigger: 'blur' }

2
src/views/wms/basicDataManage/factoryModeling/productionline/productionline.data.ts

@ -243,7 +243,7 @@ export const ProductionlineRules = reactive({
{ validator:validateYS, message: '请输入正确的代码', trigger: 'blur'} { validator:validateYS, message: '请输入正确的代码', trigger: 'blur'}
], ],
name: [ name: [
{ max: 50, message: '不得超过50个字符', trigger: 'blur' } { required: true,max: 50, message: '不得超过50个字符', trigger: 'blur' }
], ],
workshopCode: [ workshopCode: [
{ required: true, message: '请输入车间代码', trigger: 'change' } { required: true, message: '请输入车间代码', trigger: 'change' }

1
src/views/wms/basicDataManage/factoryModeling/workshop/workshop.data.ts

@ -139,6 +139,7 @@ export const WorkshopRules = reactive({
{ validator:validateYS, message: '请输入正确的代码', trigger: 'blur'} { validator:validateYS, message: '请输入正确的代码', trigger: 'blur'}
], ],
name: [ name: [
{ required: true, message: '请输入代码', trigger: 'blur' },
{ max: 50, message: '不得超过50个字符', trigger: 'blur' } { max: 50, message: '不得超过50个字符', trigger: 'blur' }
], ],
remark: [ remark: [

1
src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts

@ -291,6 +291,7 @@ export const WorkstationRules = reactive({
{ validator:validateYS, message: '请输入正确的代码', trigger: 'blur'} { validator:validateYS, message: '请输入正确的代码', trigger: 'blur'}
], ],
name: [ name: [
{ required: true, message: '请输入名称', trigger: 'change' },
{ max: 50, message: '不得超过50个字符', trigger: 'blur' } { max: 50, message: '不得超过50个字符', trigger: 'blur' }
], ],
remark: [ remark: [

8
src/views/wms/basicDataManage/itemManage/relegate/relegateRecord/relegateRecordMain.data.ts

@ -257,6 +257,14 @@ export const RelegateRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
width: 150 width: 150
}, },
}, },
{
label: '包装规格',
field: 'packUnit',
sort: 'custom',
table: {
width: 150
},
},
{ {
label: '到包装号', label: '到包装号',
field: 'toPackingNumber', field: 'toPackingNumber',

24
src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue

@ -141,12 +141,12 @@ RelegateRequestDetail.allSchemas.tableFormColumns.map(item => {
key: 'available', key: 'available',
value: 'TRUE', value: 'TRUE',
isMainValue: false isMainValue: false
},{ },{
message: '请选择从仓库代码!', message: '请选择从仓库代码!',
key: 'warehouseCode', key: 'warehouseCode',
value: 'fromWarehouseCode', value: 'fromWarehouseCode',
isMainValue: true isMainValue: true
} }
] ]
item.form.componentProps.searchCondition = [ item.form.componentProps.searchCondition = [
{ {
@ -255,12 +255,12 @@ const butttondata = (row, $index) => {
return [] return []
} }
return [ return [
defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['2','3','4']),hasPermi:'wms:relegate-request-main:close'}), // defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['2','3','4']),hasPermi:'wms:relegate-request-main:close'}), //
defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:relegate-request-main:reAdd'}), // defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:relegate-request-main:reAdd'}), //
defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:relegate-request-main:submit'}), // defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:relegate-request-main:submit'}), //
defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:relegate-request-main:refused'}), // defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:relegate-request-main:refused'}), //
defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:relegate-request-main:agree'}), // defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:relegate-request-main:agree'}), //
defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:relegate-request-main:handle'}), // defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:relegate-request-main:handle'}), //
defaultButtons.mainListEditBtn({ hide: isShowMainButton(row, ['1']), hasPermi: 'wms:relegate-request-main:update' }), // defaultButtons.mainListEditBtn({ hide: isShowMainButton(row, ['1']), hasPermi: 'wms:relegate-request-main:update' }), //
// defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:relegate-request-main:delete' }), // // defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:relegate-request-main:delete' }), //
] ]

48
src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts

@ -13,6 +13,10 @@ import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
import * as LocationApi from '@/api/wms/location' import * as LocationApi from '@/api/wms/location'
import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data' import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
import * as ItempackageApi from '@/api/wms/itempackage'
import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
import * as confgiApi from '@/api/infra/config' import * as confgiApi from '@/api/infra/config'
// 获取自动提交自动通过自动执行,跳过任务直接删生成记录的默认值 // 获取自动提交自动通过自动执行,跳过任务直接删生成记录的默认值
const queryParams = { const queryParams = {
@ -293,6 +297,7 @@ export const RelegateRequestDetailRules = reactive({
available: [required], available: [required],
departmentCode: [required], departmentCode: [required],
concurrencyStamp: [required], concurrencyStamp: [required],
packUnit: [required],
}) })
export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
@ -531,6 +536,49 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
width: 120 width: 120
}, },
}, },
{
label: '包装规格',
field: 'packUnit',
sort: 'custom',
tableForm:{
isInpuFocusShow: true, // 开启查询弹窗
searchListPlaceholder: '请选择包装规格',
searchField: 'packUnit',
searchTitle: '包装规格',
searchAllSchemas: Itempackaging.allSchemas,
searchPage: ItempackageApi.getItempackagingPage,
searchCondition:[
{
key: 'itemCode',
value: 'downItemCode',
message: "请选择降级物料代码",
isMainValue: true
}
]
},
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择包装规格',
searchField: 'packUnit',
searchTitle: '包装规格',
searchAllSchemas: Itempackaging.allSchemas,
searchPage: ItempackageApi.getItempackagingPage,
searchCondition:[
{
key: 'itemCode',
value: 'downItemCode',
message: "请选择降级物料代码",
isMainValue: true
}
]
}
},
table: {
width: 120
},
},
{ {
label: '到库区类型', label: '到库区类型',
field: 'toAreaTypes', field: 'toAreaTypes',

2
src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts

@ -36,6 +36,8 @@ export const CallmaterialsRules = reactive({
warehouseCode: [required], warehouseCode: [required],
workshopCode: [required], workshopCode: [required],
workStationCode: [required], workStationCode: [required],
uom: [required],
callmaterialQty: [required]
}) })
export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([ export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([

7
src/views/wms/basicDataManage/labelManage/callmaterials/index.vue

@ -1,7 +1,7 @@
<template> <template>
<ContentWrap> <ContentWrap>
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<Search :schema="Callmaterials.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" /> <Search :schema="Callmaterials.allSchemas.searchSchema" @search="searchList" @reset="searchList" />
</ContentWrap> </ContentWrap>
<!-- 列表头部 --> <!-- 列表头部 -->
@ -291,7 +291,10 @@ const searchFormClick = (searchData) => {
} }
getList() // getList() //
} }
const searchList = (model)=>{
selectionRows.value = []
setSearchParams(model)
}
watch( watch(
() => tableObject.tableList, () => tableObject.tableList,
() => { () => {

7
src/views/wms/basicDataManage/labelManage/locationLabel/index.vue

@ -1,7 +1,7 @@
<template> <template>
<ContentWrap> <ContentWrap>
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<Search :schema="Package.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" /> <Search :schema="Package.allSchemas.searchSchema" @search="searchList" @reset="searchList" />
</ContentWrap> </ContentWrap>
<!-- 列表头部 --> <!-- 列表头部 -->
@ -209,7 +209,10 @@ const searchFormClick = (searchData) => {
} }
getList() // getList() //
} }
const searchList = (model)=>{
selectionRows.value = []
setSearchParams(model)
}
watch( watch(
() => tableObject.tableList, () => tableObject.tableList,
() => { () => {

4
src/views/wms/basicDataManage/subject/subjectAccount/index.vue

@ -81,9 +81,9 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
nextTick(() => { nextTick(() => {
const setV = {} const setV = {}
if (formField === 'costecentreCode') { if (formField === 'costecentreCode') {
setV['costecentreId'] = val[0]['costcentreId'] setV['costcentreId'] = val[0]['costcentreId']
setV['costcentreCode'] = val[0]['costcentreCode'] setV['costcentreCode'] = val[0]['costcentreCode']
setV['costecentreType'] = val[0]['costcentreType'] setV['costcentreType'] = val[0]['costcentreType']
} }
if( formField === 'projectCode'){ if( formField === 'projectCode'){
setV['projectId'] = val[0]['projectId'] setV['projectId'] = val[0]['projectId']

6
src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts

@ -37,7 +37,7 @@ export const SubjectAccount = useCrudSchemas(reactive<CrudSchema[]>([
}, },
{ {
label: '成本中心ID', label: '成本中心ID',
field: 'costecentreId', field: 'costcentreId',
sort: 'custom', sort: 'custom',
isSearch: false, isSearch: false,
isTable:false, isTable:false,
@ -49,7 +49,7 @@ export const SubjectAccount = useCrudSchemas(reactive<CrudSchema[]>([
}, },
{ {
label: '成本中心代码', label: '成本中心代码',
field: 'costecentreCode', field: 'costcentreCode',
sort: 'custom', sort: 'custom',
isSearch: false, isSearch: false,
form: { form: {
@ -71,7 +71,7 @@ export const SubjectAccount = useCrudSchemas(reactive<CrudSchema[]>([
}, },
{ {
label: '成本中心类型', label: '成本中心类型',
field: 'costecentreType', field: 'costcentreType',
sort: 'custom', sort: 'custom',
isSearch: false, isSearch: false,
form:{ form:{

15
src/views/wms/buttMesManage/mesBarCode/mesBarCode.data.ts

@ -4,6 +4,9 @@ import { dateFormatter } from '@/utils/formatTime'
// 表单校验 // 表单校验
export const MesBarCodeRules = reactive({ export const MesBarCodeRules = reactive({
available: [required], available: [required],
lowerLim: [required],
partNumber: [required],
available: [{ required: true, message: '是否可用不能为空', trigger: 'change' }]
}) })
export const MesBarCode = useCrudSchemas(reactive<CrudSchema[]>([ export const MesBarCode = useCrudSchemas(reactive<CrudSchema[]>([
@ -164,9 +167,19 @@ export const MesBarCode = useCrudSchemas(reactive<CrudSchema[]>([
label: '是否可用', label: '是否可用',
field: 'available', field: 'available',
sort: 'custom', sort: 'custom',
table: { dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string',
table: {
width: 120 width: 120
}, },
form: {
component: 'Switch',
value: 'TRUE',
componentProps: {
inactiveValue: 'FALSE',
activeValue: 'TRUE'
}
}
}, },
{ {
label: '创建时间', label: '创建时间',

28
src/views/wms/inventoryManage/balance/index.vue

@ -1,7 +1,7 @@
<template> <template>
<ContentWrap> <ContentWrap>
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<Search :schema="Balance.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" /> <Search :schema="Balance.allSchemas.searchSchema" @search="searchList" @reset="searchList" />
</ContentWrap> </ContentWrap>
<!-- 列表头部 --> <!-- 列表头部 -->
@ -135,6 +135,10 @@ const buttonBaseClick = (val, item) => {
console.log('其他按钮', item) console.log('其他按钮', item)
} }
} }
const searchList = (model)=>{
selectionRows.value = []
setSearchParams(model)
}
watch( watch(
() => tableObject.tableList, () => tableObject.tableList,
() => { () => {
@ -189,17 +193,17 @@ const handleSelectionPoint = async ()=>{
} }
// - // -
const butttondata = [ const butttondata = [
// { {
// label: '', label: '标签信息',
// name: 'bqxx', name: 'bqxx',
// hide: false, hide: false,
// type: 'primary', type: 'primary',
// icon: '', icon: '',
// color: '', color: '',
// link: true, link: true,
// float:'right', float:'right',
// hasPermi: '' hasPermi: ''
// }, },
defaultButtons.mainListPointBtn(null), // defaultButtons.mainListPointBtn(null), //
// defaultButtons.mainListEditBtn({hasPermi:'wms:balance:update'}), // // defaultButtons.mainListEditBtn({hasPermi:'wms:balance:update'}), //
// defaultButtons.mainListDeleteBtn({hasPermi:'wms:balance:delete'}), // // defaultButtons.mainListDeleteBtn({hasPermi:'wms:balance:delete'}), //

3
src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts

@ -534,6 +534,9 @@ export const TransferissueRequestMainRules = reactive({
remark: [ remark: [
{ max: 50, message: '不得超过50个字符', trigger: 'blur' } { max: 50, message: '不得超过50个字符', trigger: 'blur' }
], ],
dueTime: [
{ required: true, message: '请选择截止时间', trigger: 'change' }
],
}) })
/** /**

70
src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts

@ -28,6 +28,24 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 150 width: 150
}, },
}, },
{
label: '领用代码',
field: 'usageCode',
sort: 'custom',
table: {
width: 150
},
isForm: false,
isTable:false,
},
{
label: '领用描述',
field: 'usageDescription',
sort: 'custom',
table: {
width: 150
},
},
{ {
label: '申请单号', label: '申请单号',
field: 'requestNumber', field: 'requestNumber',
@ -172,6 +190,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable:false,
form: { form: {
component: 'InputNumber', component: 'InputNumber',
} }
@ -183,6 +202,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable:false,
form: { form: {
component: 'InputNumber', component: 'InputNumber',
} }
@ -194,6 +214,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable:false,
}, },
{ {
label: '部门', label: '部门',
@ -202,11 +223,13 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable:false,
}, },
{ {
label: '备注', label: '备注',
field: 'remark', field: 'remark',
sort: 'custom', sort: 'custom',
isTable:false,
table: { table: {
width: 150 width: 150
}, },
@ -216,7 +239,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'autoComplete', field: 'autoComplete',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -235,7 +258,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'allowModifyLocation', field: 'allowModifyLocation',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -254,7 +277,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'allowModifyQty', field: 'allowModifyQty',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -273,7 +296,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'allowBiggerQty', field: 'allowBiggerQty',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -292,7 +315,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'allowSmallerQty', field: 'allowSmallerQty',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -311,7 +334,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'allowModifyInventoryStatus', field: 'allowModifyInventoryStatus',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -330,7 +353,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'allowContinuousScanning', field: 'allowContinuousScanning',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -349,7 +372,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'allowPartialComplete', field: 'allowPartialComplete',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -368,7 +391,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'allowModifyBatch', field: 'allowModifyBatch',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -387,7 +410,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'allowModifyPackingNumber', field: 'allowModifyPackingNumber',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -404,6 +427,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
{ {
label: '承接时间', label: '承接时间',
field: 'acceptTime', field: 'acceptTime',
isTable:false,
formatter: dateFormatter, formatter: dateFormatter,
detail: { detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss' dateFormat: 'YYYY-MM-DD HH:mm:ss'
@ -425,6 +449,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
label: '承接人', label: '承接人',
field: 'acceptUserId', field: 'acceptUserId',
sort: 'custom', sort: 'custom',
isTable:false,
table: { table: {
width: 150 width: 150
}, },
@ -437,6 +462,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
dateFormat: 'YYYY-MM-DD HH:mm:ss' dateFormat: 'YYYY-MM-DD HH:mm:ss'
}, },
sort: 'custom', sort: 'custom',
isTable:false,
table: { table: {
width: 180 width: 180
}, },
@ -453,6 +479,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
label: '完成人', label: '完成人',
field: 'completeUserId', field: 'completeUserId',
sort: 'custom', sort: 'custom',
isTable:false,
table: { table: {
width: 150 width: 150
}, },
@ -468,6 +495,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable:false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -481,6 +509,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
label: '创建者', label: '创建者',
field: 'creator', field: 'creator',
sort: 'custom', sort: 'custom',
isTable:false,
table: { table: {
width: 150 width: 150
}, },
@ -493,6 +522,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
dateFormat: 'YYYY-MM-DD HH:mm:ss' dateFormat: 'YYYY-MM-DD HH:mm:ss'
}, },
sort: 'custom', sort: 'custom',
isTable:false,
table: { table: {
width: 180 width: 180
}, },
@ -509,6 +539,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
label: '最后更新者', label: '最后更新者',
field: 'updater', field: 'updater',
sort: 'custom', sort: 'custom',
isTable:false,
table: { table: {
width: 150 width: 150
}, },
@ -585,6 +616,7 @@ export const UnplannedissueJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
label: '单据号', label: '单据号',
field: 'number', field: 'number',
sort: 'custom', sort: 'custom',
hiddenInMain:true,
table: { table: {
width: 180 width: 180
}, },
@ -686,10 +718,27 @@ export const UnplannedissueJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
width: 150 width: 150
}, },
}, },
{
label: '成本中心代码',
field: 'costcentreCode',
sort: 'custom',
table: {
width: 150
},
},
{
label: '科目代码',
field: 'qadProjectCode',
sort: 'custom',
table: {
width: 150
},
},
{ {
label: '货主代码', label: '货主代码',
field: 'ownerCode', field: 'ownerCode',
sort: 'custom', sort: 'custom',
isTable:false,
table: { table: {
width: 150 width: 150
}, },
@ -698,6 +747,7 @@ export const UnplannedissueJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
label: '项目代码', label: '项目代码',
field: 'projectCode', field: 'projectCode',
sort: 'custom', sort: 'custom',
isTable:false,
table: { table: {
width: 150 width: 150
}, },

34
src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts

@ -171,6 +171,24 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 150 width: 150
}, },
}, },
{
label: '领用代码',
field: 'usageCode',
sort: 'custom',
table: {
width: 150
},
isForm: false,
isTable:false,
},
{
label: '领用描述',
field: 'usageDescription',
sort: 'custom',
table: {
width: 150
},
},
{ {
label: '出库事务类型', label: '出库事务类型',
field: 'outTransactionType', field: 'outTransactionType',
@ -460,6 +478,22 @@ export const UnplannedissueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
width: 150 width: 150
}, },
}, },
{
label: '成本中心代码',
field: 'costcentreCode',
sort: 'custom',
table: {
width: 150
},
},
{
label: '科目代码',
field: 'qadProjectCode',
sort: 'custom',
table: {
width: 150
},
},
{ {
label: '货主代码', label: '货主代码',
field: 'ownerCode', field: 'ownerCode',

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

@ -111,16 +111,28 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
nextTick(() => { nextTick(() => {
if (type == 'tableForm') { if (type == 'tableForm') {
// //
row[formField] = val[0][searchField] if(formField === 'itemCode'){
row['packingNumber'] = val[0]['packingNumber'] row[formField] = val[0][searchField]
row['containerNumber'] = val[0]['containerNumber'] row['packingNumber'] = val[0]['packingNumber']
row['batch'] = val[0]['batch'] row['containerNumber'] = val[0]['containerNumber']
row['inventoryStatus'] = val[0]['inventoryStatus'] row['batch'] = val[0]['batch']
row['fromLocationCode'] = val[0]['locationCode'] row['inventoryStatus'] = val[0]['inventoryStatus']
row['itemCode'] = val[0]['itemCode'] row['fromLocationCode'] = val[0]['locationCode']
row['uom'] = val[0]['uom'] row['itemCode'] = val[0]['itemCode']
row['uom'] = val[0]['uom']
}
if(formField === 'costcentreCode'){
row['costcentreCode'] = val[0]['costcentreCode']
}
if(formField === 'qadProjectCode'){
row['qadProjectCode'] = val[0]['projectCode']
}
} else { } else {
const setV = {} const setV = {}
if(formField === 'usageDescription'){
setV['usageDescription'] = val[0]['usageDescription']
setV['usageCode'] = val[0]['code']
}
setV[formField] = val[0][searchField] setV[formField] = val[0][searchField]
formRef.setValues(setV) formRef.setValues(setV)
} }
@ -130,14 +142,22 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
nextTick(() => { nextTick(() => {
const setV = {} const setV = {}
setV[formField] = val[0][searchField] if(formField === 'itemCode'){
setV['packingNumber'] = val[0]['packingNumber'] setV[formField] = val[0][searchField]
setV['containerNumber'] = val[0]['containerNumber'] setV['packingNumber'] = val[0]['packingNumber']
setV['batch'] = val[0]['batch'] setV['containerNumber'] = val[0]['containerNumber']
setV['inventoryStatus'] = val[0]['inventoryStatus'] setV['batch'] = val[0]['batch']
setV['fromLocationCode'] = val[0]['locationCode'] setV['inventoryStatus'] = val[0]['inventoryStatus']
setV['itemCode'] = val[0]['itemCode'] setV['fromLocationCode'] = val[0]['locationCode']
row['uom'] = val[0]['uom'] setV['itemCode'] = val[0]['itemCode']
setV['uom'] = val[0]['uom']
}
if(formField === 'costcentreCode'){
setV['costcentreCode'] = val[0]['costcentreCode']
}
if(formField === 'qadProjectCode'){
setV['qadProjectCode'] = val[0]['projectCode']
}
formRef.setValues(setV) formRef.setValues(setV)
}) })
} }

101
src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts

@ -424,6 +424,9 @@ export const UnplannedissueRequestMainRules = reactive({
remark: [ remark: [
{ max: 50, message: '不得超过50个字符', trigger: 'blur' } { max: 50, message: '不得超过50个字符', trigger: 'blur' }
], ],
usageDescription:[
{ required: true, message: '请选择领用描述', trigger: 'blur' }
],
}) })
/** /**
@ -585,6 +588,94 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
width: 150 width: 150
}, },
}, },
{
label: '成本中心代码',
field: 'costcentreCode',
sort: 'custom',
table: {
width: 150
},
tableForm:{
isInpuFocusShow: true, // 开启查询弹窗
searchListPlaceholder: '选择成本中心',
searchField: 'costcentreCode',
searchTitle: '成本中心信息',
searchAllSchemas: SubjectAccount.allSchemas,
searchPage: SubjectAccountApi.getSubjectAccountPage,
searchCondition: [{
key: 'code', // 查询列表中字段
value: 'usageCode', // 指查询具体值
message: '请选择领用描述!', // 当前置条件为空时 弹出信息提示
isMainValue: true // 表示查询条件不是主表的字段的值
}]
},
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '选择成本中心',
searchField: 'costcentreCode',
searchTitle: '成本中心信息',
searchAllSchemas: SubjectAccount.allSchemas,
searchPage: SubjectAccountApi.getSubjectAccountPage,
searchCondition: [{
key: 'code', // 查询列表中字段
value: 'usageCode', // 指查询具体值
message: '请选择领用描述!', // 当前置条件为空时 弹出信息提示
isMainValue: true // 表示查询条件不是主表的字段的值
}]
}
}
},
{
label: '科目代码',
field: 'qadProjectCode',
sort: 'custom',
table: {
width: 150
},
tableForm:{
isInpuFocusShow: true, // 开启查询弹窗
searchListPlaceholder: '选择科目代码',
searchField: 'projectCode',
searchTitle: '科目代码信息',
searchAllSchemas: SubjectAccount.allSchemas,
searchPage: SubjectAccountApi.getSubjectAccountPage,
searchCondition: [{
key: 'code', // 查询列表中字段
value: 'usageCode', // 指查询具体值
message: '请选择领用描述!', // 当前置条件为空时 弹出信息提示
isMainValue: true // 表示查询条件不是主表的字段的值
},{
key: 'costcentreCode', // 查询列表中字段
value: 'costcentreCode', // 指查询具体值
message: '请成本中心代码!', // 当前置条件为空时 弹出信息提示
isMainValue: true // 表示查询条件不是主表的字段的值
}]
},
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '选择成本中心',
searchField: 'projectCode',
searchTitle: '成本中心信息',
searchAllSchemas: SubjectAccount.allSchemas,
searchPage: SubjectAccountApi.getSubjectAccountPage,
searchCondition: [{
key: 'code', // 查询列表中字段
value: 'usageCode', // 指查询具体值
message: '请选择领用描述!', // 当前置条件为空时 弹出信息提示
isMainValue: true // 表示查询条件不是主表的字段的值
},{
key: 'costcentreCode', // 查询列表中字段
value: 'costecentreCode', // 指查询具体值
message: '请成本中心代码!', // 当前置条件为空时 弹出信息提示
isMainValue: false // 表示查询条件不是主表的字段的值
}]
}
}
},
{ {
label: '项目代码', label: '项目代码',
field: 'projectCode', field: 'projectCode',
@ -594,6 +685,7 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
}, },
isTableForm: false, isTableForm: false,
isForm: false, isForm: false,
isTable:false,
}, },
{ {
label: '从货主代码', label: '从货主代码',
@ -603,7 +695,8 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
width: 150 width: 150
}, },
isForm: false, isForm: false,
isTableForm: false isTableForm: false,
isTable:false,
}, },
{ {
label: '备注', label: '备注',
@ -724,4 +817,10 @@ export const UnplannedissueRequestDetailRules = reactive({
remark: [ remark: [
{ max: 50, message: '不得超过50个字符', trigger: 'blur' } { max: 50, message: '不得超过50个字符', trigger: 'blur' }
], ],
costcentreCode:[
{ required: true, message: '请选择成本中心代码', trigger: 'change' }
],
qadProjectCode:[
{ required: true, message: '请选择科目代码', trigger: 'change' }
]
}) })

35
src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts

@ -121,6 +121,7 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
// width: 150 // width: 150
// }, // },
// }, // },
{ {
label: '从库区类型范围', label: '从库区类型范围',
field: 'fromAreaTypes', field: 'fromAreaTypes',
@ -144,6 +145,24 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 150 width: 150
}, },
}, },
{
label: '领用代码',
field: 'usageCode',
sort: 'custom',
table: {
width: 150
},
isForm: false,
isTable:false,
},
{
label: '领用描述',
field: 'usageDescription',
sort: 'custom',
table: {
width: 150
},
},
{ {
label: '优先级', label: '优先级',
field: 'priority', field: 'priority',
@ -695,6 +714,22 @@ export const UnplannedreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
width: 150 width: 150
}, },
}, },
{
label: '成本中心代码',
field: 'costcentreCode',
sort: 'custom',
table: {
width: 150
},
},
{
label: '科目代码',
field: 'qadProjectCode',
sort: 'custom',
table: {
width: 150
},
},
{ {
label: '原因', label: '原因',
field: 'reason', field: 'reason',

36
src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts

@ -142,6 +142,24 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
width: 150 width: 150
}, },
}, },
{
label: '领用代码',
field: 'usageCode',
sort: 'custom',
table: {
width: 150
},
isForm: false,
isTable:false,
},
{
label: '领用描述',
field: 'usageDescription',
sort: 'custom',
table: {
width: 150
},
},
{ {
label: '出库事务类型', label: '出库事务类型',
field: 'outTransactionType', field: 'outTransactionType',
@ -510,6 +528,22 @@ export const UnplannedreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]
width: 150 width: 150
}, },
}, },
{
label: '成本中心代码',
field: 'costcentreCode',
sort: 'custom',
table: {
width: 150
},
},
{
label: '科目代码',
field: 'qadProjectCode',
sort: 'custom',
table: {
width: 150
},
},
{ {
label: '原因', label: '原因',
field: 'reason', field: 'reason',
@ -535,6 +569,7 @@ export const UnplannedreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]
label: '货主代码', label: '货主代码',
field: 'ownerCode', field: 'ownerCode',
sort: 'custom', sort: 'custom',
isTable:false,
table: { table: {
width: 150 width: 150
}, },
@ -543,6 +578,7 @@ export const UnplannedreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]
label: '项目代码', label: '项目代码',
field: 'projectCode', field: 'projectCode',
sort: 'custom', sort: 'custom',
isTable:false,
table: { table: {
width: 150 width: 150
}, },

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

@ -90,9 +90,9 @@
:isShowButton="false" :isShowButton="false"
@handleAddTable="handleAddTable" @handleAddTable="handleAddTable"
@handleDeleteTable="handleDeleteTable" @handleDeleteTable="handleDeleteTable"
@searchTableSuccess="searchTableSuccess" @searchTableSuccess="searchTableLabelSuccess"
:isShowReduceButton="false"
@submitForm="submitFormLabel" @submitForm="submitFormLabel"
/> />
<!-- 导入 --> <!-- 导入 -->
@ -191,11 +191,19 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
row['itemCode'] = val[0]['code'] row['itemCode'] = val[0]['code']
row['uom'] = val[0]['uom'] row['uom'] = val[0]['uom']
} }
} else { } else if(formField === 'costcentreCode'){
row['costcentreCode'] = val[0]['costcentreCode']
} else if(formField === 'qadProjectCode'){
row['qadProjectCode'] = val[0]['projectCode']
}else {
row[formField] = val[0][searchField] row[formField] = val[0][searchField]
} }
} else { } else {
const setV = {} const setV = {}
if(formField === 'usageDescription'){
setV['usageDescription'] = val[0]['usageDescription']
setV['usageCode'] = val[0]['code']
}
setV[formField] = val[0][searchField] setV[formField] = val[0][searchField]
formRef.setValues(setV) formRef.setValues(setV)
} }
@ -213,10 +221,33 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
setV['itemCode'] = val[0]['code'] setV['itemCode'] = val[0]['code']
setV['uom'] = val[0]['uom'] setV['uom'] = val[0]['uom']
} }
if(formField === 'costcentreCode'){
setV['costcentreCode'] = val[0]['costcentreCode']
}
if(formField === 'qadProjectCode'){
setV['qadProjectCode'] = val[0]['projectCode']
}
formRef.setValues(setV) formRef.setValues(setV)
}) })
} }
//
const searchTableLabelSuccess = (formField, searchField, val, formRef, type, row ) => {
nextTick(async () => {
if (type == 'tableForm') {
if(formField === 'packUnit'){
row['packUnit'] = val[0]['packUnit']
row['packQty'] = val[0]['packQty']
}
} else {
const setV = {}
setV[formField] = val[0][searchField]
formRef.setValues(setV)
}
})
}
// //
// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom'] // const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
const Echo = [] const Echo = []

365
src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts

@ -2,8 +2,8 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
import * as getRequestsettingApi from '@/api/wms/requestsetting/index' import * as getRequestsettingApi from '@/api/wms/requestsetting/index'
import * as BalanceApi from '@/api/wms/balance' import * as SubjectAccountApi from '@/api/wms/subjectAccount'
import { Balance } from '@/views/wms/inventoryManage/balance/balance.data' import { SubjectAccount } from '@/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data'
import * as ItembasicApi from '@/api/wms/itembasic' import * as ItembasicApi from '@/api/wms/itembasic'
import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data' import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
@ -12,14 +12,8 @@ import {Warehouse} from "@/views/wms/basicDataManage/factoryModeling/warehouse/w
import * as WarehouseApi from "@/api/wms/warehouse"; import * as WarehouseApi from "@/api/wms/warehouse";
import {Location} from "@/views/wms/basicDataManage/factoryModeling/location/location.data"; import {Location} from "@/views/wms/basicDataManage/factoryModeling/location/location.data";
import * as LocationApi from "@/api/wms/location"; import * as LocationApi from "@/api/wms/location";
import { import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
Productionlineitem import * as ItemPackageApi from '@/api/wms/itempackage/index'
} from "@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data";
import * as ProductionlineitemApi from "@/api/wms/productionlineitem";
import {
Supplieritem
} from "@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data";
import * as SupplieritemApi from "@/api/wms/supplieritem";
const { t } = useI18n() // 国际化 const { t } = useI18n() // 国际化
@ -150,6 +144,35 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>
} }
} }
}, },
{
label: '领用代码',
field: 'usageCode',
sort: 'custom',
table: {
width: 150
},
isForm: false,
isTable:false,
},
{
label: '领用描述',
field: 'usageDescription',
sort: 'custom',
table: {
width: 150
},
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请科目账户信息',
searchField: 'usageDescription',
searchTitle: '科目账户信息',
searchAllSchemas: SubjectAccount.allSchemas,
searchPage: SubjectAccountApi.getSubjectAccountPage
}
}
},
{ {
label: '到库区类型范围', label: '到库区类型范围',
field: 'toAreaTypes', field: 'toAreaTypes',
@ -401,6 +424,9 @@ export const UnplannedreceiptRequestMainRules = reactive({
remark: [ remark: [
{ max: 50, message: '不得超过50个字符', trigger: 'blur' } { max: 50, message: '不得超过50个字符', trigger: 'blur' }
], ],
usageDescription:[
{ required: true, message: '请选择领用描述', trigger: 'blur' }
],
}) })
/** /**
@ -749,6 +775,94 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
isTableForm: false, isTableForm: false,
isForm: false, isForm: false,
}, },
{
label: '成本中心代码',
field: 'costcentreCode',
sort: 'custom',
table: {
width: 150
},
tableForm:{
isInpuFocusShow: true, // 开启查询弹窗
searchListPlaceholder: '选择成本中心',
searchField: 'costcentreCode',
searchTitle: '成本中心信息',
searchAllSchemas: SubjectAccount.allSchemas,
searchPage: SubjectAccountApi.getSubjectAccountPage,
searchCondition: [{
key: 'code', // 查询列表中字段
value: 'usageCode', // 指查询具体值
message: '请选择领用描述!', // 当前置条件为空时 弹出信息提示
isMainValue: true // 表示查询条件不是主表的字段的值
}]
},
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '选择成本中心',
searchField: 'costcentreCode',
searchTitle: '成本中心信息',
searchAllSchemas: SubjectAccount.allSchemas,
searchPage: SubjectAccountApi.getSubjectAccountPage,
searchCondition: [{
key: 'code', // 查询列表中字段
value: 'usageCode', // 指查询具体值
message: '请选择领用描述!', // 当前置条件为空时 弹出信息提示
isMainValue: true // 表示查询条件不是主表的字段的值
}]
}
}
},
{
label: '科目代码',
field: 'qadProjectCode',
sort: 'custom',
table: {
width: 150
},
tableForm:{
isInpuFocusShow: true, // 开启查询弹窗
searchListPlaceholder: '选择科目代码',
searchField: 'projectCode',
searchTitle: '科目代码信息',
searchAllSchemas: SubjectAccount.allSchemas,
searchPage: SubjectAccountApi.getSubjectAccountPage,
searchCondition: [{
key: 'code', // 查询列表中字段
value: 'usageCode', // 指查询具体值
message: '请选择领用描述!', // 当前置条件为空时 弹出信息提示
isMainValue: true // 表示查询条件不是主表的字段的值
},{
key: 'costcentreCode', // 查询列表中字段
value: 'costcentreCode', // 指查询具体值
message: '请成本中心代码!', // 当前置条件为空时 弹出信息提示
isMainValue: true // 表示查询条件不是主表的字段的值
}]
},
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '选择成本中心',
searchField: 'projectCode',
searchTitle: '成本中心信息',
searchAllSchemas: SubjectAccount.allSchemas,
searchPage: SubjectAccountApi.getSubjectAccountPage,
searchCondition: [{
key: 'code', // 查询列表中字段
value: 'usageCode', // 指查询具体值
message: '请选择领用描述!', // 当前置条件为空时 弹出信息提示
isMainValue: true // 表示查询条件不是主表的字段的值
},{
key: 'costcentreCode', // 查询列表中字段
value: 'costecentreCode', // 指查询具体值
message: '请成本中心代码!', // 当前置条件为空时 弹出信息提示
isMainValue: false // 表示查询条件不是主表的字段的值
}]
}
}
},
{ {
label: '原因', label: '原因',
field: 'reason', field: 'reason',
@ -890,6 +1004,12 @@ export const UnplannedreceiptRequestDetailRules = reactive({
remark: [ remark: [
{ max: 50, message: '不得超过50个字符', trigger: 'blur' } { max: 50, message: '不得超过50个字符', trigger: 'blur' }
], ],
costcentreCode:[
{ required: true, message: '请选择成本中心代码', trigger: 'change' }
],
qadProjectCode:[
{ required: true, message: '请选择科目代码', trigger: 'change' }
]
}) })
@ -898,64 +1018,50 @@ export const UnplannedreceiptRequestDetailRules = reactive({
*/ */
export const UnplannedreceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSchema[]>([ export const UnplannedreceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSchema[]>([
{ {
label: '生产线代码', label: '物料代码',
field: 'productionLineCodePackage', field: 'itemCode',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
tableForm:{ tableForm: {
isInpuFocusShow: true, disabled: true
searchListPlaceholder: '请选择生产线代码', // 输入框占位文本 },
searchField: 'productionLineCode', // 查询弹窗赋值字段 form: {
searchTitle: '生产线物料关系信息', // 查询弹窗标题 componentProps: {
searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类 disabled: true
searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法 }
searchCondition:[{
key: 'itemCode',
value: 'itemCode',
message: '请填写物料代码!',
isMainValue: true
}]
} }
}, },
{ {
label: '供应商代码', label: '物料名称',
field: 'supplierItemCode', field: 'itemName',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
tableForm:{ isTableForm: false,
isInpuFocusShow: true, isForm: false,
searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
searchField: 'supplierCode', // 查询弹窗赋值字段
searchTitle: '供应商信息', // 查询弹窗标题
searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类
searchPage: SupplieritemApi.getSupplieritemPage, // 查询弹窗所需分页方法
searchCondition:[{
key: 'itemCode',
value: 'itemCode',
message: '请填写物料代码!',
isMainValue: true
}]
}
}, },
{ {
label: '物料代码', label: '物料描述1',
field: 'itemCode', field: 'itemDesc1',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
tableForm: { isTableForm: false,
disabled: true isForm: false,
},
{
label: '物料描述2',
field: 'itemDesc2',
sort: 'custom',
table: {
width: 150
}, },
form: { isTableForm: false,
componentProps: { isForm: false,
disabled: true
}
}
}, },
{ {
label: '批次', label: '批次',
@ -1113,24 +1219,8 @@ export const UnplannedreceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSc
} }
}, },
{ {
label: '来源生产线代码', label: '到库位代码',
field: 'productionLineCode', field: 'toLocationCode',
sort: 'custom',
table: {
width: 150
},
tableForm: {
disabled: true
},
form: {
componentProps: {
disabled: true
}
}
},
{
label: '来源生产线代码',
field: 'productionLineCode',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -1145,115 +1235,80 @@ export const UnplannedreceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSc
} }
}, },
{ {
label: '来源工位代码', label: '包装规格',
field: 'workStationCode', field: 'packUnit',
isTable: true,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150,
},
tableForm: {
disabled: true
},
form: {
componentProps: { componentProps: {
disabled: true disabled: true,
isSearchList: true,
searchListPlaceholder: '请选择包装',
searchField: 'packUnit',
searchTitle: '物品包装信息',
searchAllSchemas: Itempackaging.allSchemas,
searchPage: ItemPackageApi.getItempackagingPage,
searchCondition: [
{
key: 'itemCode',
value: 'itemCode',
message: '请选择物料代码',
isMainValue: true
},
{
key: 'available',
value: 'TRUE',
isMainValue: false
}
]
} }
}
},
{
label: '来源库位代码',
field: 'fromLocationCode',
sort: 'custom',
table: {
width: 150
}, },
tableForm: { tableForm: {
disabled: true disabled: true,
}, isInpuFocusShow: true,
form: { searchListPlaceholder: '请选择包装',
componentProps: { searchField: 'packUnit',
disabled: true searchTitle: '物品包装信息',
} searchAllSchemas: Itempackaging.allSchemas,
searchPage: ItemPackageApi.getItempackagingPage,
searchCondition: [
{
key: 'itemCode',
value: 'itemCode',
message: '请选择物料代码',
isTableRowValue: true,
isMainValue:false
},
{
key: 'available',
value: 'TRUE',
isMainValue: false
}]
} }
}, },
{ {
label: '物料名称', label: '包装数量',
field: 'itemName', field: 'packQty',
sort: 'custom',
table: {
width: 150
},
isTableForm: false,
isForm: false,
},
{
label: '物料描述1',
field: 'itemDesc1',
sort: 'custom',
table: {
width: 150
},
isTableForm: false,
isForm: false,
},
{
label: '物料描述2',
field: 'itemDesc2',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
isTableForm: false,
isForm: false,
},
{
label: '项目代码',
field: 'projectCode',
sort: 'custom',
table: {
width: 150
},
isTableForm: false,
isForm: false,
},
{
label: '单据号',
field: 'number',
sort: 'custom',
table: {
width: 180
},
isTableForm: false,
form: { form: {
componentProps: { componentProps: {
disabled: true disabled: true,
} }
}
},
{
label: '到库位代码',
field: 'toLocationCode',
sort: 'custom',
table: {
width: 150
}, },
tableForm: { tableForm: {
disabled: true disabled: true,
},
form: {
componentProps: {
disabled: true
}
} }
} },
])) ]))
//表单校验 //表单校验
export const UnplannedreceiptRequestDetailLabelRules = reactive({ export const UnplannedreceiptRequestDetailLabelRules = reactive({
supplierItemCode: [ packUnit: [
{ required: true, message: '请选择供应商', trigger: 'change' } { required: true, message: '请选择包装规格', trigger: 'change' }
], ],
productionLineCodePackage: [
{ required: true, message: '请选择生产线', trigger: 'change' }
]
}) })

32
src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts

@ -608,22 +608,22 @@ export const ProductputawayJobMainRules = reactive({
* @returns {Array} * @returns {Array}
*/ */
export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
{ // {
label: '采购订单号', // label: '采购订单号',
field: 'poNumber', // field: 'poNumber',
sort: 'custom', // sort: 'custom',
table: { // table: {
width: 150 // width: 150
}, // },
}, // },
{ // {
label: '订单行', // label: '订单行',
field: 'poLine', // field: 'poLine',
sort: 'custom', // sort: 'custom',
table: { // table: {
width: 150 // width: 150
}, // },
}, // },
{ {
label: '物料代码', label: '物料代码',
field: 'itemCode', field: 'itemCode',

38
src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts

@ -389,24 +389,24 @@ export const ProductputawayRecordMainRules = reactive({
* @returns {Array} * @returns {Array}
*/ */
export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
{ // {
label: '采购订单号', // label: '采购订单号',
field: 'poNumber', // field: 'poNumber',
sort: 'custom', // sort: 'custom',
table: { // table: {
width: 150 // width: 150
}, // },
sortTableDefault:2, // sortTableDefault:2,
}, // },
{ // {
label: '订单行', // label: '订单行',
field: 'poLine', // field: 'poLine',
sort: 'custom', // sort: 'custom',
table: { // table: {
width: 150 // width: 150
}, // },
sortTableDefault:2, // sortTableDefault:2,
}, // },
{ {
label: '物料代码', label: '物料代码',
field: 'itemCode', field: 'itemCode',
@ -753,4 +753,4 @@ export const ProductputawayRecordDetailRules = reactive({
creator: [ creator: [
{ required: true, message: '请输入创建者', trigger: 'blur' } { required: true, message: '请输入创建者', trigger: 'blur' }
], ],
}) })

42
src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts

@ -427,26 +427,26 @@ export const ProductputawayRequestMainRules = reactive({
* @returns {Array} * @returns {Array}
*/ */
export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
{ // {
label: '采购订单号', // label: '采购订单号',
field: 'poNumber', // field: 'poNumber',
sort: 'custom', // sort: 'custom',
table: { // table: {
width: 150 // width: 150
}, // },
isForm: false, // isForm: false,
isTableForm: false, // isTableForm: false,
}, // },
{ // {
label: '订单行', // label: '订单行',
field: 'poLine', // field: 'poLine',
sort: 'custom', // sort: 'custom',
table: { // table: {
width: 150 // width: 150
}, // },
isForm: false, // isForm: false,
isTableForm: false, // isTableForm: false,
}, // },
{ {
label: '物料代码', label: '物料代码',
field: 'itemCode', field: 'itemCode',
@ -824,4 +824,4 @@ export const ProductputawayRequestDetailRules = reactive({
itemCode: [ itemCode: [
{ required: true, message: '请选择物料代码', trigger: 'change' } { required: true, message: '请选择物料代码', trigger: 'change' }
], ],
}) })

2
src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/productputawayAssembleJobMain.data.ts

@ -611,7 +611,7 @@ export const ProductputawayJobMainRules = reactive({
*/ */
export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
{ {
label: '采购订单号', label: '订单号',
field: 'poNumber', field: 'poNumber',
sort: 'custom', sort: 'custom',
table: { table: {

2
src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/productputawayAssembleRecordMain.data.ts

@ -390,7 +390,7 @@ export const ProductputawayRecordMainRules = reactive({
*/ */
export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
{ {
label: '采购订单号', label: '订单号',
field: 'poNumber', field: 'poNumber',
sort: 'custom', sort: 'custom',
table: { table: {

2
src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts

@ -420,7 +420,7 @@ export const ProductputawayRequestMainRules = reactive({
*/ */
export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
{ {
label: '采购订单号', label: '订单号',
field: 'poNumber', field: 'poNumber',
sort: 'custom', sort: 'custom',
table: { table: {

26
src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts

@ -837,21 +837,21 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
sortTableDefault: 18, sortTableDefault: 18,
hiddenInMain:true, hiddenInMain:true,
}, },
{ // {
label: '数量', // label: '数量',
field: 'qty', // field: 'qty',
sort: 'custom', // sort: 'custom',
table: { // table: {
width: 150 // width: 150
}, // },
form: { // form: {
component: 'InputNumber', // component: 'InputNumber',
}, // },
sortTableDefault: 12, // sortTableDefault: 12,
}, // },
{ {
label: '退货数量', label: '退货数量',
field: 'returnedQty', field: 'qty',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150

28
src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts

@ -484,7 +484,7 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
}, },
{ {
label: '退货数量', label: '退货数量',
field: 'returnedQty', field: 'qty',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -733,19 +733,19 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
sortSearchDefault: 7, sortSearchDefault: 7,
hiddenInMain: true hiddenInMain: true
}, },
{ // {
label: '数量', // label: '数量',
field: 'qty', // field: 'qty',
sort: 'custom', // sort: 'custom',
table: { // table: {
width: 150 // width: 150
}, // },
isTable:true, // isTable:true,
sortTableDefault: 1005, // sortTableDefault: 1005,
form: { // form: {
component: 'InputNumber', // component: 'InputNumber',
} // }
}, // },
{ {
label: '计量单位', label: '计量单位',
field: 'uom', field: 'uom',

60
src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue

@ -1,7 +1,7 @@
<template> <template>
<ContentWrap> <ContentWrap>
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<Search :schema="[...PutawayJobMain.allSchemas.searchSchema,...PutawayJobDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" /> <Search :schema="[...PutawayJobMain.allSchemas.searchSchema,...PutawayJobDetail.allSchemas.searchSchema]" @search="searchList" @reset="searchList" />
</ContentWrap> </ContentWrap>
<!-- 列表头部 --> <!-- 列表头部 -->
@ -17,7 +17,8 @@
<!-- 列表 --> <!-- 列表 -->
<ContentWrap> <ContentWrap>
<Table v-clientTable <Table ref="tableRef" v-clientTable
:selection="true"
:columns="tableColumns" :columns="tableColumns"
:data="tableObject.tableList" :data="tableObject.tableList"
:loading="tableObject.loading" :loading="tableObject.loading"
@ -27,6 +28,7 @@
v-model:pageSize="tableObject.pageSize" v-model:pageSize="tableObject.pageSize"
v-model:currentPage="tableObject.currentPage" v-model:currentPage="tableObject.currentPage"
v-model:sort="tableObject.sort" v-model:sort="tableObject.sort"
@getSelectionRows="getSelectionRows"
> >
<template #number="{row}"> <template #number="{row}">
<el-button type="primary" link @click="openDetail(row, '单据号', row.number)"> <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
@ -54,6 +56,7 @@
@searchTableSuccess="searchTableSuccess" @searchTableSuccess="searchTableSuccess"
/> />
<!-- 详情 --> <!-- 详情 -->
<Detail <Detail
ref="detailRef" ref="detailRef"
@ -96,6 +99,7 @@ import * as PutawayJobMainApi from '@/api/wms/putawayJobMain'
import * as PutawayJobDetailApi from '@/api/wms/putawayJobDetail' import * as PutawayJobDetailApi from '@/api/wms/putawayJobDetail'
import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as defaultButtons from '@/utils/disposition/defaultButtons'
import { CACHE_KEY, useCache } from '@/hooks/web/useCache' import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
import {getAccessToken} from "@/utils/auth";
// //
defineOptions({ name: 'PutawayJobMain' }) defineOptions({ name: 'PutawayJobMain' })
@ -161,6 +165,7 @@ const { getList, setSearchParams } = tableMethods
// //
const HeadButttondata = [ const HeadButttondata = [
defaultButtons.defaultExportBtn({hasPermi:'wms:putaway-job-main:export'}), // defaultButtons.defaultExportBtn({hasPermi:'wms:putaway-job-main:export'}), //
defaultButtons.mainLisSelectiontPointBtn(null), //
defaultButtons.defaultFreshBtn(null), // defaultButtons.defaultFreshBtn(null), //
defaultButtons.defaultFilterBtn(null), // defaultButtons.defaultFilterBtn(null), //
defaultButtons.defaultSetBtn(null), // defaultButtons.defaultSetBtn(null), //
@ -186,12 +191,54 @@ const buttonBaseClick = (val, item) => {
} else { } else {
getList() getList()
} }
} else if (val=='selection_point'){//
handleSelectionPoint()
} else if (val == 'filtrate') { // } else if (val == 'filtrate') { //
} else { // } else { //
console.log('其他按钮', item) console.log('其他按钮', item)
} }
} }
const searchList = (model)=>{
selectionRows.value = []
setSearchParams(model)
}
watch(
() => tableObject.tableList,
() => {
const currentRows = selectionRows.value.find(item=>item.currentPage==tableObject.currentPage)
if(currentRows){
nextTick(() => {
currentRows.selectionRows.forEach(item=>{
tableRef.value.toggleRowSelection(item,true)
})
})
}
}
)
const selectionRows = ref<any>([])
const tableRef = ref()
const getSelectionRows = (currentPage,currentPageSelectionRows) => {
console.log("getSelectionRows",currentPage,currentPageSelectionRows)
const currentRows = selectionRows.value.find(item=>item.currentPage==currentPage)
if(currentRows){
currentRows.selectionRows = currentPageSelectionRows
}else{
selectionRows.value.push({
currentPage,
selectionRows:currentPageSelectionRows
})
}
}
const handleSelectionPoint = async ()=>{
let rows:any = []
selectionRows.value.forEach(item=>{
rows = [...rows,...item.selectionRows.map(item1=>item1.masterId)]
})
console.log('批量打印',rows.join(','))
window.open(src.value+'&id='+rows.join(','))
// window.open(srcPoint.value+'&relateNumber='+rows.join(','))
}
// //
const isShowMainButton = (row,val) => { const isShowMainButton = (row,val) => {
if (val.indexOf(row.status) > -1) { if (val.indexOf(row.status) > -1) {
@ -208,6 +255,7 @@ const butttondata = (row,$index) => {
return [] return []
} }
return [ return [
defaultButtons.mainListDocumentPrintBtn(null), //
// defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), //
defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-job-main:close'}), // defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-job-main:close'}), //
// defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), //
@ -225,9 +273,17 @@ const buttonTableClick = async (val, row) => {
handleClose(row.masterId) handleClose(row.masterId)
} else if (val == 'mainJobAcc') { // } else if (val == 'mainJobAcc') { //
console.log('列表-操作按钮事件-承接') console.log('列表-操作按钮事件-承接')
} else if (val == 'documentPrint') {
//
handleDocumentPrint(row)
} }
} }
const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
const src = ref(BASE_URL + '/jmreport/view/954878108028801024?token=' + getAccessToken())
const handleDocumentPrint = async (row) => {
window.open(src.value+'&id='+row.masterId)
}
// //
const detailParenPackingRef = ref() const detailParenPackingRef = ref()
const { tableObject: packingDetatableData, tableMethods: packDetatableMethods } = useTable({ const { tableObject: packingDetatableData, tableMethods: packDetatableMethods } = useTable({

2
src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts

@ -560,7 +560,7 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
isDetail: false, isDetail: false,
isForm: false, isForm: false,
table: { table: {
width: 120, width: 180,
fixed: 'right' fixed: 'right'
}, },
} }

1
src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts

@ -564,4 +564,5 @@ export const DemandforecastingDetailRules = reactive({
remark: [ remark: [
{ max: 50, message: '不得超过50个字符', trigger: 'blur' } { max: 50, message: '不得超过50个字符', trigger: 'blur' }
], ],
poLine: [{required:true, message: '请选择订单行', trigger: 'blur'}]
}) })

4
src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue

@ -155,7 +155,9 @@ console.log('PurchaseMain.allSchemas.searchSchema',PurchaseMain.allSchemas.searc
setV['contactName']=val[0]['contacts'] setV['contactName']=val[0]['contacts']
setV['contactPhone']=val[0]['phone'] setV['contactPhone']=val[0]['phone']
setV['contactEmail']=val[0]['email'] setV['contactEmail']=val[0]['email']
setV['taxRate']=val[0]['taxRate'] if(formRef.formModel.taxRate==0){
setV['taxRate']=val[0]['taxRate']
}
formRef.setValues(setV) formRef.setValues(setV)
// //
val.forEach(item=>{ val.forEach(item=>{

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

@ -408,7 +408,6 @@ const isShowMainButton = (row, val) => {
} }
} }
// //
const isShowMainButtonLabel = (row, val) => { const isShowMainButtonLabel = (row, val) => {
if (val.indexOf(row.status) > -1) { if (val.indexOf(row.status) > -1) {
@ -900,7 +899,7 @@ const submitForm = async (formType, data) => {
let planArriveStr = formatDate(data.planArriveTime); let planArriveStr = formatDate(data.planArriveTime);
if(planArriveStr > planArriveTimeStr.value){ if(planArriveStr > planArriveTimeStr.value){
let confirmFlag = false; let confirmFlag = false;
await message.confirm(t('ts.计划到货时间大于要货计划送达日期是否继续?')).then(() => { await message.confirm(`${t('ts.计划到货时间大于')}${planArriveTimeStr.value}${t('ts.是否继续?')}`).then(() => {
console.log("选择了OK") console.log("选择了OK")
//OK //OK
}).catch(() => { }).catch(() => {

13
src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue

@ -205,10 +205,13 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
getSearchTableData(val[0]['number'],formField,searchField) getSearchTableData(val[0]['number'],formField,searchField)
// //
let beginTime = val[0]['endTime']
let deliveryDate = formatDate(val[0]['deliveryDate'],'YYYY-MM-DD') if(val[0]['deliveryDate']){
planArriveTimeStr.value = deliveryDate + ' '+ beginTime+":00" let beginTime = val[0]['endTime'] || '00:00'
setV['planArriveTime']= new Date(planArriveTimeStr.value).valueOf(); let deliveryDate = formatDate(val[0]['deliveryDate'],'YYYY-MM-DD')
planArriveTimeStr.value = deliveryDate + ' '+ beginTime+":00"
setV['planArriveTime']= new Date(planArriveTimeStr.value).valueOf();
}
// //
tableData.value = [] tableData.value = []
} }
@ -280,7 +283,7 @@ const submitForm = async (formType, data) => {
let planArriveStr = formatDate(data.planArriveTime); let planArriveStr = formatDate(data.planArriveTime);
if(planArriveStr > planArriveTimeStr.value){ if(planArriveStr > planArriveTimeStr.value){
let confirmFlag = false; let confirmFlag = false;
await message.confirm(t('ts.计划到货时间大于要货计划送达日期是否继续?')).then(() => { await message.confirm(`${t('ts.计划到货时间大于')}${planArriveTimeStr.value}${t('ts.是否继续?')}`).then(() => {
console.log("选择了OK") console.log("选择了OK")
//OK //OK
}).catch(() => { }).catch(() => {

5
src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts

@ -505,7 +505,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
isDetail: false, isDetail: false,
isForm: false, isForm: false,
table: { table: {
width: 330, width: 350,
fixed: 'right' fixed: 'right'
}, },
} }
@ -1123,8 +1123,7 @@ export const SupplierdeliverRequestDetailRules = reactive({
remark: [ remark: [
{ max: 50, message: '不得超过50个字符', trigger: 'blur' } { max: 50, message: '不得超过50个字符', trigger: 'blur' }
], ],
secondPackQty:[{ validator:validateInteger, message: '请输入正确的整数', trigger: 'blur'}]
secondPackQty:[required,{ validator:validateInteger, message: '请输入正确的整数', trigger: 'blur'}]
}) })
export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSchema[]>([ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSchema[]>([

Loading…
Cancel
Save