diff --git a/src/views/wms/agvManage/backflushDetailbQad/backflushDetailbQad.data.ts b/src/views/wms/agvManage/backflushDetailbQad/backflushDetailbQad.data.ts index 14b82105e..76bea1dd6 100644 --- a/src/views/wms/agvManage/backflushDetailbQad/backflushDetailbQad.data.ts +++ b/src/views/wms/agvManage/backflushDetailbQad/backflushDetailbQad.data.ts @@ -106,6 +106,13 @@ export const BackflushDetailbQad = useCrudSchemas(reactive([ field: 'qty', sort: 'custom', }, + { + label: '是否委外', + field: 'isWw', + sort: 'custom', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + }, { label: '操作', field: 'action', diff --git a/src/views/wms/inventoryManage/balanceContainer/index.vue b/src/views/wms/inventoryManage/balanceContainer/index.vue index 2d4ee1064..c72deb283 100644 --- a/src/views/wms/inventoryManage/balanceContainer/index.vue +++ b/src/views/wms/inventoryManage/balanceContainer/index.vue @@ -107,7 +107,7 @@ const updataTableColumns = (val) => { } const { tableObject, tableMethods } = useTable({ - getListApi: BalanceApi.getBalanceByQJ // 分页接口 + getListApi: BalanceApi.getBalanceByQJToScrap // 分页接口 }) // 获得表格的各种操作 @@ -150,9 +150,11 @@ const buttonBaseClick = (val, item) => { getList() } } else if (val == 'filtrate') { // 筛选 - } else if (val=='selection_point'){// 批量打印 - handleSelectionPoint() - } else { // 其他按钮 + } + // else if (val=='selection_point'){// 批量打印 + // handleSelectionPoint() + // } + else { // 其他按钮 console.log('其他按钮', item) } } @@ -220,22 +222,22 @@ const handleSelectionPoint = async ()=>{ // window.open(srcPoint.value+'&relateNumber='+rows.join(',')) } // 列表-操作按钮 -const butttondata = [ - { - label: '标签信息', - name: 'bqxx', - hide: false, - type: 'primary', - icon: '', - color: '', - link: true, - float:'right', - hasPermi: '' - }, - defaultButtons.mainListPointBtn(null), // 标签打印 - // defaultButtons.mainListEditBtn({hasPermi:'wms:balance:update'}), // 编辑 - // defaultButtons.mainListDeleteBtn({hasPermi:'wms:balance:delete'}), // 删除 -] +// const butttondata = [ +// { +// label: '标签信息', +// name: 'bqxx', +// hide: false, +// type: 'primary', +// icon: '', +// color: '', +// link: true, +// float:'right', +// hasPermi: '' +// }, +// defaultButtons.mainListPointBtn(null), // 标签打印 +// // defaultButtons.mainListEditBtn({hasPermi:'wms:balance:update'}), // 编辑 +// // defaultButtons.mainListDeleteBtn({hasPermi:'wms:balance:delete'}), // 删除 +// ] // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue index 5096dda96..58f1f53d8 100644 --- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue +++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue @@ -230,6 +230,11 @@ const clearSearchInput = (field)=>{ }) } } +const defaultReasonCodeRequisition = ref(true) +const setDefaultrReasonCodeRequisition = ()=>{ + formRef.value.setDefaultBlurValue('reasonCodeRequisition','SC99') + defaultReasonCodeRequisition.value = false +} // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => { nextTick(async () => { @@ -324,6 +329,11 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => setV[formField] = val[0][searchField] tableData.value = [] // 重置明细数据 formRef.setValues(setV) + if(formField == 'costCenterCode'){ + if(defaultReasonCodeRequisition.value){ + setDefaultrReasonCodeRequisition() + } + } } }) } @@ -641,6 +651,12 @@ const openForm =async (type: string, row?: number) => { }) } formRef.value.open(type, row) + if(type == 'create'){ + nextTick(()=>{ + defaultReasonCodeRequisition.value = true + formRef.value.setDefaultBlurValue('costCenterCode','DEFC') + }) + } } // 批量打印--生产退料 diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts index 959141c48..4fe78c5f4 100644 --- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts +++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts @@ -892,7 +892,7 @@ export const ProductionscrapRequestMain = useCrudSchemas( table: { width: 150 }, - isForm:false, + isForm:true, isTable:false, isTableForm:false, form: { diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue index 16b901b6a..51b472a5c 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue @@ -177,7 +177,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ defaultButtons.defaultExportBtn({hasPermi:'wms:purchasereceipt-job-main:export'}), // 导出 - defaultButtons.defaultUpdateTaskSettingBtn(null), // 更新任务设置 + defaultButtons.defaultUpdateTaskSettingBtn({hide:routeName.value.includes('SCP')}), // 更新任务设置 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 diff --git a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue index e5a762365..4586e8290 100644 --- a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue +++ b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue @@ -248,7 +248,7 @@ const openDetail = async (row: any, titleName: any, titleValue: any) => { const BASE_URL = getJmreportBaseUrl() const src = ref(BASE_URL + '/jmreport/view/973017727126409216?token=' + getAccessToken()) const handlePrint = async (row) => { - window.open(src.value+'&id='+row.id) + window.open(src.value+'&id='+row.id+'&searchTime='+`${tableObject.params.searchTime||''}`) } @@ -370,6 +370,9 @@ const selectChange = (value,field)=>{ } if(dayList.value.length>0){ day.value = dayList.value[0]['value'] + searchRef.value.setFormValues({ + 'day':day.value, + }) } } } @@ -378,6 +381,7 @@ const resetClick = async (data)=>{ year.value = '' month.value = '' day.value = '' + data['searchTime'] = '' searchClick(data) } @@ -392,7 +396,9 @@ const searchClick = async (data)=>{ if((''+data['day']).length==1){ data['day'] = '0' + data['day'] } - data['searchTime'] = `${data['year']}-${data['month']}-${data['day']}` + if(data['year']&&data['month']&&data['day']){ + data['searchTime'] = `${data['year']}-${data['month']}-${data['day']}` + } setSearchParams(data) } /** 初始化 **/ diff --git a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts index cedc89710..858334c5b 100644 --- a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts +++ b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts @@ -19,14 +19,14 @@ export const SupplierApbalanceMain = useCrudSchemas(reactive([ sort: 'custom', isForm: false, }, - { - label: '状态', - field: 'replyStatus', - sort: 'custom', - isSearch: true, - dictType: DICT_TYPE.REPLY_STATUS, - dictClass: 'string', - }, + // { + // label: '状态', + // field: 'replyStatus', + // sort: 'custom', + // isSearch: true, + // dictType: DICT_TYPE.REPLY_STATUS, + // dictClass: 'string', + // }, { label: '公司代码', field: 'ttCompany', @@ -45,6 +45,7 @@ export const SupplierApbalanceMain = useCrudSchemas(reactive([ sort: 'custom', isSearch: true, isTable:false, + isDetail:false, }, { label: '月', @@ -52,7 +53,7 @@ export const SupplierApbalanceMain = useCrudSchemas(reactive([ sort: 'custom', isSearch: true, isTable:false, - + isDetail:false, }, { label: '日', @@ -60,7 +61,7 @@ export const SupplierApbalanceMain = useCrudSchemas(reactive([ sort: 'custom', isSearch: true, isTable:false, - + isDetail:false, }, // { // label: '账户类型',