diff --git a/src/api/wms/location/index.ts b/src/api/wms/location/index.ts index 36cf3f575..bce556d5c 100644 --- a/src/api/wms/location/index.ts +++ b/src/api/wms/location/index.ts @@ -34,6 +34,17 @@ export const getLocationPage = async (params) => { return await request.get({ url: `/wms/location/page`, params }) } } + +export const getLocationMPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return request.post({ url: '/wms/location/Msenior', data }) + } else { + return await request.get({ url: `/wms/location/Mpage`, params }) + } +} + export const getLocationPageRepleinsh = async (params) => { if (params.isSearch) { delete params.isSearch @@ -139,4 +150,4 @@ export const selectConfigToLocation = async (params) => { // 根据code获取数据列表 export const getLocationByCodes = async (params) => { return await request.get({ url: `/wms/location/listByCodes`, params }) -} \ No newline at end of file +} diff --git a/src/api/wms/productreceiptRecordMain/index.ts b/src/api/wms/productreceiptRecordMain/index.ts index 074f47423..e3dd420d9 100644 --- a/src/api/wms/productreceiptRecordMain/index.ts +++ b/src/api/wms/productreceiptRecordMain/index.ts @@ -95,7 +95,7 @@ export const exportProductreceiptRecordMain = async (params) => { params.filters.push(cmd) delete params.isSearch const data = {...params} - return await request.post({ url: '/wms/productreceipt-record-main/export-excel-senior', data }) + return await request.downloadPost({ url: '/wms/productreceipt-record-main/export-excel-senior', data }) } else { return await request.download({ url: `/wms/productreceipt-record-main/export-excel`, params }) } diff --git a/src/utils/auth.ts b/src/utils/auth.ts index 7da49b08b..53cdbd581 100644 --- a/src/utils/auth.ts +++ b/src/utils/auth.ts @@ -10,24 +10,32 @@ const RefreshTokenKey = 'REFRESH_TOKEN' // 获取token export const getAccessToken = () => { // 此处与TokenKey相同，此写法解决初始化时Cookies中不存在TokenKey报错 - return wsCache.get(AccessTokenKey) ? wsCache.get(AccessTokenKey) : wsCache.get('ACCESS_TOKEN') + // return wsCache.get(AccessTokenKey) ? wsCache.get(AccessTokenKey) : wsCache.get('ACCESS_TOKEN') + return sessionStorage.getItem(AccessTokenKey) ? sessionStorage.getItem(AccessTokenKey) : sessionStorage.getItem('ACCESS_TOKEN') + } // 刷新token export const getRefreshToken = () => { - return wsCache.get(RefreshTokenKey) + // return wsCache.get(RefreshTokenKey) + return sessionStorage.getItem(RefreshTokenKey) + } // 设置token export const setToken = (token: TokenType) => { - wsCache.set(RefreshTokenKey, token.refreshToken) - wsCache.set(AccessTokenKey, token.accessToken) + // wsCache.set(RefreshTokenKey, token.refreshToken) + // wsCache.set(AccessTokenKey, token.accessToken) + sessionStorage.setItem(RefreshTokenKey,token.refreshToken) + sessionStorage.setItem(AccessTokenKey,token.accessToken) } // 删除token export const removeToken = () => { - wsCache.delete(AccessTokenKey) - wsCache.delete(RefreshTokenKey) + // wsCache.delete(AccessTokenKey) + // wsCache.delete(RefreshTokenKey) + sessionStorage.removeItem(AccessTokenKey) + sessionStorage.removeItem(RefreshTokenKey) } /** 格式化token（jwt格式） */ diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 22c46d617..5c75f708f 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -323,6 +323,9 @@ export enum DICT_TYPE { QUALITY_NOTIFICATION_PRIORITY = 'quality_notification_priority', // 质量通知优先级 CLAIM_REASON = 'claim_Reason', // 质量通知索赔原因 QMS_CODE = 'qms_code', // 质量通知代码 + QMS_Q1_CODE = 'qms_Q1_code', + QMS_Q2_CODE = 'qms_Q2_code', + QMS_Q3_CODE = 'qms_Q3_code', DEFECT_LOCATION = 'defect_location', // 质量通知缺陷位置 DEFECT_TYPE = 'defect_type', // 质量通知缺陷类型 PROBLEM_REASON = 'problem_reason', // 质量通知问题原因 diff --git a/src/views/qms/inspectionJob/addForm.vue b/src/views/qms/inspectionJob/addForm.vue index 93b717cd3..5627ed1a2 100644 --- a/src/views/qms/inspectionJob/addForm.vue +++ b/src/views/qms/inspectionJob/addForm.vue @@ -414,6 +414,16 @@ + + + + + @@ -502,16 +512,6 @@ - - - - - @@ -77,6 +78,8 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' +import * as ProductionlineitemApi from '@/api/wms/productionlineitem' +import * as StdcostpriceApi from '@/api/wms/stdcostprice' import { useUserStore } from '@/store/modules/user' const userStore = useUserStore() @@ -92,12 +95,43 @@ routeName.value = route.name const tableColumns = ref(Q3.allSchemas.tableColumns) // 查询页面返回 +const priceObj = ref() const searchTableSuccess = (formField, searchField, val, formRef) => { - nextTick(() => { + nextTick(async () => { const setV = {} if (formField == 'itemCode') { console.log(val) setV['uom'] = val[0]['uom'] + console.log(formRef.formModel.qty) + // let res = await ProductionlineitemApi.selectItemCodeToProductionLineCode(val[0].code) + ProductionlineitemApi.selectItemCodeToProductionLineCode(val[0].code).then((res) => { + console.log(res) + if (res?.length > 0) { + formRef.formModel.defectLocation = res[0].productionLineCode + Q3.allSchemas.formSchema.forEach(item=>{ + if (item.field == 'defectLocation') { + item.componentProps.options = res + } + }) + } + }) + const params = { + by: "ASC", + filters: [{column: "itemCode", action: "==", value: val[0].code}], + pageNo: 1, + pageSize: 500, + sort: "" + } + params.isSearch = true + StdcostpriceApi.getStdcostpricePage(params).then((res) => { + if (res.list?.length > 0) { + priceObj.value = res.list[0] + formRef.setValues({ + amount: (parseFloat(formRef.formModel.qty) * parseFloat(priceObj.value.price)).toFixed(6) + }) + } + + }) } if (formField == 'q1Number') { //Q1通知单号 @@ -113,6 +147,11 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { } }) } +const onChange =(field,e)=>{ + if (field == 'qty') { + basicFormRef.value.formRef.formModel.amount = (parseFloat( basicFormRef.value.formRef.formModel.qty) * parseFloat( priceObj.value.price)).toFixed(6) +} +} // 字段设置 更新主列表字段 const updataTableColumns = (val) => { diff --git a/src/views/qms/inspectionQ3/inspectionQ3.data.ts b/src/views/qms/inspectionQ3/inspectionQ3.data.ts index 21c16e7e9..142deb01f 100644 --- a/src/views/qms/inspectionQ3/inspectionQ3.data.ts +++ b/src/views/qms/inspectionQ3/inspectionQ3.data.ts @@ -22,11 +22,11 @@ export const Q3Rules = reactive({ defectLocation: [required], defectType: [ { required: true, message: '缺陷类型不能为空', trigger: 'blur' }, - { max: 64, message: '不得超过64个字符', trigger: 'blur' } + { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], problemReason: [ { required: true, message: '问题原因不能为空', trigger: 'blur' }, - { max: 64, message: '不得超过64个字符', trigger: 'blur' } + { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], priority: [required], amount: [required], @@ -214,7 +214,7 @@ export const Q3 = useCrudSchemas( label: '编码', field: 'code', sort: 'custom', - dictType: DICT_TYPE.QMS_CODE, + dictType: DICT_TYPE.QMS_Q3_CODE, dictClass: 'string', isSearch: true, isTable: true, @@ -226,12 +226,19 @@ export const Q3 = useCrudSchemas( label: '缺陷位置', field: 'defectLocation', sort: 'custom', - dictType: DICT_TYPE.DEFECT_LOCATION, dictClass: 'string', isSearch: false, isTable: false, - tableForm: { - type: 'Select' + form: { + component: 'Select', + componentProps: { + options: [], + optionsAlias: { + labelField: 'productionLineName', + valueField: 'productionLineCode' + }, + filterable: true, + } } }, { diff --git a/src/views/qms/inspectionRecord/index.vue b/src/views/qms/inspectionRecord/index.vue index ba8757931..533b848f3 100644 --- a/src/views/qms/inspectionRecord/index.vue +++ b/src/views/qms/inspectionRecord/index.vue @@ -163,7 +163,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 let HeadButttondata = [ - // defaultButtons.defaultExportBtn(null), // 导出 + defaultButtons.defaultExportBtn({ hasPermi: 'qms:inspection-recode-main:export' }), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null) // 设置 @@ -342,7 +342,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await InspectionRecordMainApi.exportInspectionRecordMain(tableObject.params) - download.excel(data, '备件申领记录主.xlsx') + download.excel(data, '检验记录.xlsx') } catch { } finally { exportLoading.value = false diff --git a/src/views/qms/inspectionRequest/inspectionRequestMain.data.ts b/src/views/qms/inspectionRequest/inspectionRequestMain.data.ts index a0e01d22a..89c4b6f7b 100644 --- a/src/views/qms/inspectionRequest/inspectionRequestMain.data.ts +++ b/src/views/qms/inspectionRequest/inspectionRequestMain.data.ts @@ -440,8 +440,8 @@ export const InspectionMain = useCrudSchemas( isSearch: true }, { - label: 'aql', - field: 'aql', + label: 'AQL值', + field: 'aqlValue', sort: 'custom', dictType: DICT_TYPE.BASIC_AQL, dictClass: 'string', diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue index eb9f347ae..ce408d873 100644 --- a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue +++ b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue @@ -52,7 +52,7 @@ :tableData="tableData" :apiUpdate="ItemareaApi.updateItemarea" :apiCreate="ItemareaApi.createItemarea" - :isBusiness="true" + :isBusiness="false" @handleAddTable="handleAddTable" @handleDeleteTable="handleDeleteTable" :isShowReduceButtonSelection="true" @@ -68,7 +68,7 @@ ([ }, isSearch: true }, + { + label: '申请单号', + field: 'requestNumber', + sort: 'custom', + table: { + width: 180 + }, + isSearch: true + }, { label: '状态', field: 'status', @@ -62,15 +71,7 @@ export const CountJobMain = useCrudSchemas(reactive([ width: 180 }, }, - { - label: '申请单号', - field: 'requestNumber', - sort: 'custom', - table: { - width: 180 - }, - isSearch: true - }, + { label: '阶段', field: 'stage', diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts index d1f008727..53ff33579 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts @@ -19,6 +19,16 @@ export const CustomerreturnJobMain = useCrudSchemas( }, isSearch: true }, + { + label: '申请单号', + field: 'requestNumber', + sort: 'custom', + table: { + width: 180 + }, + isTable: true, + isSearch: true + }, { label: '状态', field: 'status', @@ -31,16 +41,6 @@ export const CustomerreturnJobMain = useCrudSchemas( width: 150 } }, - { - label: '申请单号', - field: 'requestNumber', - sort: 'custom', - table: { - width: 180 - }, - isTable: true, - isSearch: true - }, { label: '发货记录单号', field: 'deliverRecordNumber', diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts index 470142e42..72c5ffb1a 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts @@ -19,20 +19,6 @@ export const CustomerreturnRecordMain = useCrudSchemas( }, isSearch: true }, - { - label: '状态', - field: 'status', - dictType: DICT_TYPE.REQUEST_STATUS, - dictClass: 'string', - isSearch: false, - isTable: false, - isDetail: false, - isForm: false, - sort: 'custom', - table: { - width: 150 - } - }, { label: '申请单号', field: 'requestNumber', @@ -50,8 +36,22 @@ export const CustomerreturnRecordMain = useCrudSchemas( table: { width: 180 }, - isTable: false }, + { + label: '状态', + field: 'status', + dictType: DICT_TYPE.REQUEST_STATUS, + dictClass: 'string', + isSearch: false, + isTable: false, + isDetail: false, + isForm: false, + sort: 'custom', + table: { + width: 150 + } + }, + { label: '发货记录单号', field: 'deliverRecordNumber', diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts index 43d4f5bbe..359674d44 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts @@ -17,8 +17,8 @@ export const StockupMainJob = useCrudSchemas(reactive([ }, }, { - label: '发货计划单号', - field: 'deliverPlanNumber', + label: '申请单号', + field: 'requestNumber', sort: 'custom', isForm: false, table: { @@ -26,14 +26,13 @@ export const StockupMainJob = useCrudSchemas(reactive([ }, }, { - label: '申请单号', - field: 'requestNumber', + label: '发货计划单号', + field: 'deliverPlanNumber', sort: 'custom', isForm: false, table: { width: 180 }, - isTable: false }, { label: '从仓库', diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts index 64cb61179..4e5ad182a 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts @@ -17,34 +17,33 @@ export const StockupMainRecord = useCrudSchemas(reactive([ }, }, { - label: '发货计划单号', - field: 'deliverPlanNumber', + label: '申请单号', + field: 'requestNumber', sort: 'custom', - isForm: false, + // isSearch: true, table: { width: 180 }, }, { - label: '申请单号', - field: 'requestNumber', + label: '任务单号', + field: 'jobNumber', sort: 'custom', // isSearch: true, table: { width: 180 }, - isTable: false, }, { - label: '任务单号', - field: 'jobNumber', + label: '发货计划单号', + field: 'deliverPlanNumber', sort: 'custom', - // isSearch: true, + isForm: false, table: { width: 180 }, - isTable: false, }, + { label: '从仓库', field: 'fromWarehouseCode', diff --git a/src/views/wms/inventoryManage/package/index.vue b/src/views/wms/inventoryManage/package/index.vue index ecdd102b5..3fcce7858 100644 --- a/src/views/wms/inventoryManage/package/index.vue +++ b/src/views/wms/inventoryManage/package/index.vue @@ -65,6 +65,7 @@ import { Package,PackageRules } from './package.data' import * as PackageApi from '@/api/wms/package' import * as defaultButtons from '@/utils/disposition/defaultButtons' import { getJmreportBaseUrl } from '@/utils/systemParam' +import * as EquipmentInspectionRecordMainApi from "@/api/eam/equipmentInspectionRecordMain"; defineOptions({ name: 'package' }) @@ -85,15 +86,28 @@ const updataTableColumns = (val) => { // 查询列表页面参数设置 const searchTableParams = ref([ ]) - // 查询页面返回 -const searchTableSuccess = (formField, searchField, val, basicFormRef, type, row ) => { +const searchTableSuccess = (formField, searchField, val, formRef, type, row) => { nextTick(() => { const setV = {} setV[formField] = val[0][searchField] - setV['itemName'] = val[0]['name'] - basicFormRef.setValues(setV) - basicFormRef.setValues(setV) + if (formField == 'itemCode'){ + setV['itemName'] = val[0]['name'] + setV['itemDesc1'] = val[0]['desc1'] + setV['itemDesc2'] = val[0]['desc2'] + setV['uom'] = val[0]['uom'] + setV['altUom'] = val[0]['altUom'] + } + else if (formField == 'packUnit'){ + setV['packQty'] = val[0]['packQty'] + } + else if(formField == 'toWarehouseCode'){ + setV['toLocationCode'] = null + } + else if(formField == 'supplierCode'){ + setV['supplierItemCode'] = val[0]['supplierItemCode'] + } + formRef.setValues(setV) }) } @@ -106,7 +120,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ defaultButtons.defaultAddBtn({hasPermi:'wms:package:create'}), // 新增 - // defaultButtons.defaultImportBtn({hasPermi:'wms:package:import'}), // 导入 + defaultButtons.defaultImportBtn({hasPermi:'wms:package:import'}), // 导入 defaultButtons.defaultExportBtn({hasPermi:'wms:package:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 @@ -315,7 +329,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '包装导入模版.xlsx' + templateTitle: '包装信息导入模板.xlsx' }) // 导入成功之后 @@ -335,5 +349,6 @@ const searchFormClick = (searchData) => { /** 初始化 **/ onMounted(async () => { getList() + importTemplateData.templateUrl = await PackageApi.importTemplate() }) diff --git a/src/views/wms/inventoryManage/package/package.data.ts b/src/views/wms/inventoryManage/package/package.data.ts index 71ab5a09b..890e785b1 100644 --- a/src/views/wms/inventoryManage/package/package.data.ts +++ b/src/views/wms/inventoryManage/package/package.data.ts @@ -2,12 +2,32 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' import {Itembasic} from "@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data"; import * as ItembasicApi from "@/api/wms/itembasic"; +import {Warehouse} from "@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data"; +import * as WarehouseApi from "@/api/wms/warehouse"; +import {Dock} from "@/views/wms/basicDataManage/factoryModeling/dock/dock.data"; +import * as DockApi from "@/api/wms/dock"; +import {Packageunit} from "@/views/wms/basicDataManage/itemManage/packageunit/packageunit.data"; +import * as PackageunitApi from "@/api/wms/packageunit"; +import {Location} from "@/views/wms/basicDataManage/factoryModeling/location/location.data"; +import * as LocationApi from "@/api/wms/location"; +import {Supplier} from "@/views/wms/basicDataManage/supplierManage/supplier/supplier.data"; +import * as SupplierApi from "@/api/wms/supplier"; +import {Itempackaging} from "@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data"; +import * as ItempackagingApi from "@/api/wms/itempackage"; +import * as SupplieritemApi from "@/api/wms/supplieritem"; +import { formatTime } from '@/utils/index' + +import { + Supplieritem +} from "@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data"; // 表单校验 export const PackageRules = reactive({ - number: [required], + // number: [required], itemCode: [required], itemName: [required], + packUnit: [required], + packQty: [required], }) export const Package = useCrudSchemas(reactive([ { @@ -19,16 +39,17 @@ export const Package = useCrudSchemas(reactive([ width: 180, fixed: 'left' }, + isForm:false }, - { - label: '父包装号', - field: 'parentNumber', - sort: 'custom', - isSearch: true, - table: { - width: 180, - }, - }, + // { + // label: '父包装号', + // field: 'parentNumber', + // sort: 'custom', + // isSearch: true, + // table: { + // width: 180, + // }, + // }, { label: '物料代码', field: 'itemCode', @@ -50,7 +71,15 @@ export const Package = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } }, isSearch: true @@ -70,6 +99,11 @@ export const Package = useCrudSchemas(reactive([ table: { width: 150, }, + form: { + componentProps: { + disabled: true + } + }, }, { label: '物料描述2', @@ -78,12 +112,20 @@ export const Package = useCrudSchemas(reactive([ table: { width: 150, }, + form: { + componentProps: { + disabled: true + } + }, }, { label: '批次', field: 'batch', sort: 'custom', isSearch: true, + form:{ + value: formatTime(new Date(), 'yyyyMMdd') + }, table: { width: 150, }, @@ -123,6 +165,7 @@ export const Package = useCrudSchemas(reactive([ }, form: { component: 'DatePicker', + value: formatTime(new Date(), 'yyyy-MM-dd'), componentProps: { style: {width: '100%'}, type: 'date', @@ -186,7 +229,10 @@ export const Package = useCrudSchemas(reactive([ dictType: DICT_TYPE.UOM, dictClass: 'string', // 默认都是字符串类型其他暂不考虑 form: { - component: 'SelectV2' + component: 'SelectV2', + componentProps: { + disabled: true + } }, table: { width: 150, @@ -207,7 +253,10 @@ export const Package = useCrudSchemas(reactive([ dictType: DICT_TYPE.UOM, dictClass: 'string', // 默认都是字符串类型其他暂不考虑 form: { - component: 'SelectV2' + component: 'SelectV2', + componentProps: { + disabled: true + } }, table: { width: 150, @@ -229,14 +278,6 @@ export const Package = useCrudSchemas(reactive([ width: 150, }, }, - { - label: '包装数量', - field: 'packQty', - sort: 'custom', - table: { - width: 150, - }, - }, { label: '包装规格', field: 'packUnit', @@ -249,31 +290,134 @@ export const Package = useCrudSchemas(reactive([ table: { width: 150, }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + enterSearch:true, + isSearch:true, + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择物料代码', + searchField: 'packUnit', + searchTitle: '物料包装信息', + searchAllSchemas: Itempackaging.allSchemas, + searchPage: ItempackagingApi.getItempackagingPageTree, + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + },{ + key:'itemCode', // 查询列表中字段 + value:'itemCode', // 指主表某字段 + message: '请选择物料代码！', // 当前置条件为空时 弹出信息提示 + isMainValue: true, // 表示查询条件是主表的字段的值 + action: '==', // 查询拼接条件 + }], + verificationParams: [{ + key: 'packUnit', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 + + } + } }, { - label: '仓库代码', - field: 'toWarehouseCode', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '月台代码', - field: 'toDockCode', + label: '包装数量', + field: 'packQty', sort: 'custom', table: { width: 150, }, - }, - { - label: '库位代码', - field: 'toLocationCode', - sort: 'custom', - table: { - width: 150, + form: { + componentProps: { + disabled: true + } }, }, + // { + // label: '仓库代码', + // field: 'toWarehouseCode', + // sort: 'custom', + // table: { + // width: 150, + // }, + // form: { + // // labelMessage: '信息提示说明！！！', + // componentProps: { + // enterSearch:true, + // isSearch:true, + // isSearchList: true, // 开启查询弹窗 + // searchListPlaceholder: '请选择仓库代码', // 输入框占位文本 + // searchField: 'code', // 查询弹窗赋值字段 + // searchTitle: '仓库信息', // 查询弹窗标题 + // searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类 + // searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法 + // searchCondition: [{ + // key: 'available', + // value: 'TRUE', + // isMainValue: false + // }] + // } + // } + // }, + // { + // label: '月台代码', + // field: 'toDockCode', + // sort: 'custom', + // table: { + // width: 150, + // }, + // form: { + // // labelMessage: '信息提示说明！！！', + // componentProps: { + // enterSearch: true, + // isSearchList: true, + // searchListPlaceholder: '请选择月台代码', + // searchField: 'code', + // searchTitle: '客户月台', + // searchAllSchemas: Dock.allSchemas, + // searchPage: DockApi.getDockPage, + // searchCondition: [{ + // key: 'available', + // value: 'TRUE', + // isMainValue: false + // }], + // } + // } + // }, + // { + // label: '库位代码', + // field: 'toLocationCode', + // sort: 'custom', + // table: { + // width: 150, + // }, + // form: { + // // labelMessage: '信息提示说明！！！', + // componentProps: { + // enterSearch: true, + // isSearchList: true, + // searchListPlaceholder: '请选择库位代码', + // searchField: 'code', + // searchTitle: '库位信息', + // searchAllSchemas: Location.allSchemas, + // searchPage: LocationApi.getLocationPage, + // searchCondition: [{ + // key: 'available', + // value: 'TRUE', + // isMainValue: false + // },{ + // key: 'warehouseCode', + // value: 'toWarehouseCode', + // message: '请填写仓库代码！', + // isMainValue: true + // }], + // } + // } + // }, { label: '供应商代码', field: 'supplierCode', @@ -281,6 +425,36 @@ export const Package = useCrudSchemas(reactive([ table: { width: 150, }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + enterSearch:true, + isInpuFocusShow: true, + searchListPlaceholder: '请选择物料代码', // 输入框占位文本 + searchField: 'supplierCode', // 查询弹窗赋值字段 + searchTitle: '供应商物料信息', + isSearchList: true, // 开启查询弹窗 + searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类 + searchPage: SupplieritemApi.getSupplieritemPage, // 查询弹窗所需分页方法 + searchCondition:[{ + key: 'itemCode', + value: 'itemCode', + message: '请填写物料代码！', + isMainValue: true + }], + verificationParams: [ + { + key: 'supplierCode', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true + } + ] // 失去焦点校验参数 + + } + } }, { label: '供应商物料代码', @@ -289,159 +463,193 @@ export const Package = useCrudSchemas(reactive([ table: { width: 150, }, + form: { + componentProps: { + disabled: true + // enterSearch: true, + // isSearchList: true, // 开启查询弹窗 + // searchListPlaceholder: '请选择供应商物料', // 输入框占位文本 + // searchField: 'supplierItemCode', // 查询弹窗赋值字段 + // searchTitle: '供应商信息', // 查询弹窗标题 + // searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类 + // searchPage: SupplieritemApi.getSupplieritemPage, // 查询弹窗所需分页方法 + // searchCondition: [ + // { + // key: 'available', + // value: 'TRUE', + // isMainValue: false + // },{ + // key: 'supplierCode', + // value: 'supplierCode', + // message: '请填写物料代码！', + // isMainValue: true + // } + // ], + // verificationParams: [ + // { + // key: 'code', + // action: '==', + // value: '', + // isMainValue: false, + // isSearch: true, + // isFormModel: true + // } + // ] // 失去焦点校验参数 + } + } }, - { - label: '采购订单号', - field: 'poNumber', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '采购订单行', - field: 'poLine', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '采购计划单号', - field: 'rpNumber', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '发货单号', - field: 'asnNumber', - sort: 'custom', - table: { - width: 182, - }, - }, - { - label: '生产订单号', - field: 'woNumber', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '生产订单行', - field: 'woLine', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '生产线代码', - field: 'productionLineCode', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '班组代码', - field: 'teamCode', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '班次代码', - field: 'shiftCode', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '客户代码', - field: 'customerCode', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '客户月台代码', - field: 'customerDockCode', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '客户物料代码', - field: 'customerItemCode', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '销售订单号', - field: 'soNumber', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '销售订单行', - field: 'soLine', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '质量等级', - field: 'eqLevel', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '货主代码', - field: 'ownerCode', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '重量', - field: 'weight', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '面积', - field: 'area', - sort: 'custom', - table: { - width: 150, - }, - }, - { - label: '体积', - field: 'volume', - sort: 'custom', - table: { - width: 150, - }, - }, + // { + // label: '采购订单号', + // field: 'poNumber', + // sort: 'custom', + // table: { + // width: 150, + // }, + // }, + // { + // label: '采购订单行', + // field: 'poLine', + // sort: 'custom', + // table: { + // width: 150, + // }, + // }, + // { + // label: '采购计划单号', + // field: 'rpNumber', + // sort: 'custom', + // table: { + // width: 150, + // }, + // }, + // { + // label: '发货单号', + // field: 'asnNumber', + // sort: 'custom', + // table: { + // width: 182, + // }, + // }, + // { + // label: '生产订单号', + // field: 'woNumber', + // sort: 'custom', + // table: { + // width: 150, + // }, + // }, + // { + // label: '生产订单行', + // field: 'woLine', + // sort: 'custom', + // table: { + // width: 150, + // }, + // }, + // { + // label: '生产线代码', + // field: 'productionLineCode', + // sort: 'custom', + // table: { + // width: 150, + // }, + // }, + // { + // label: '班组代码', + // field: 'teamCode', + // sort: 'custom', + // table: { + // width: 150, + // }, + // }, + // { + // label: '班次代码', + // field: 'shiftCode', + // sort: 'custom', + // table: { + // width: 150, + // }, + // }, + // { + // label: '客户代码', + // field: 'customerCode', + // sort: 'custom', + // table: { + // width: 150, + // }, + // }, + // { + // label: '客户月台代码', + // field: 'customerDockCode', + // sort: 'custom', + // table: { + // width: 150, + // }, + // }, + // { + // label: '客户物料代码', + // field: 'customerItemCode', + // sort: 'custom', + // table: { + // width: 150, + // }, + // }, + // { + // label: '销售订单号', + // field: 'soNumber', + // sort: 'custom', + // table: { + // width: 150, + // }, + // }, + // { + // label: '销售订单行', + // field: 'soLine', + // sort: 'custom', + // table: { + // width: 150, + // }, + // }, + // { + // label: '质量等级', + // field: 'eqLevel', + // sort: 'custom', + // table: { + // width: 150, + // }, + // }, + // { + // label: '货主代码', + // field: 'ownerCode', + // sort: 'custom', + // table: { + // width: 150, + // }, + // }, + // { + // label: '重量', + // field: 'weight', + // sort: 'custom', + // table: { + // width: 150, + // }, + // }, + // { + // label: '面积', + // field: 'area', + // sort: 'custom', + // table: { + // width: 150, + // }, + // }, + // { + // label: '体积', + // field: 'volume', + // sort: 'custom', + // table: { + // width: 150, + // }, + // }, { label: '创建时间', field: 'createTime', diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts index 006654a97..b4da910ea 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts @@ -11,11 +11,18 @@ export const PackageoverMain = useCrudSchemas(reactive([ width: 180 }, }, + { + label: '申请单号', + field: 'requestNumber', + sort: 'custom', + table: { + width: 180 + }, + }, { label: '任务单据号', field: 'jobNumber', sort: 'custom', - isTable: false, isSearch: true, table: { width: 180 diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/packageoverRetrospect.data.ts b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/packageoverRetrospect.data.ts index 98cbe9164..3e04602b2 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/packageoverRetrospect.data.ts +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/packageoverRetrospect.data.ts @@ -15,6 +15,14 @@ export const PackageoverRetrospect = useCrudSchemas(reactive([ width: 180 }, }, + { + label: '申请单号', + field: 'requestNumber', + sort: 'custom', + table: { + width: 180 + }, + }, { label: '任务单据号', field: 'jobNumber', diff --git a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts index 79b861dac..8f3ef3edd 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts @@ -20,6 +20,15 @@ export const ScrapJobMain = useCrudSchemas( }, isSearch: true }, + { + label: '申请单号', + field: 'requestNumber', + sort: 'custom', + table: { + width: 180 + }, + isSearch: true + }, { label: '状态', field: 'status', @@ -32,15 +41,6 @@ export const ScrapJobMain = useCrudSchemas( width: 150 } }, - { - label: '申请单号', - field: 'requestNumber', - sort: 'custom', - table: { - width: 180 - }, - isSearch: true - }, { label: 'Q3通知单号', field: 'q3Number', diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts index 6deb6668c..5482ed0b7 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts @@ -25,6 +25,15 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive([ }, isSearch: true, }, + { + label: '申请单号', + field: 'requestNumber', + sort: 'custom', + table: { + width: 150 + }, + isSearch: true, + }, { label: '状态', field: 'status', @@ -55,15 +64,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '申请单号', - field: 'requestNumber', - sort: 'custom', - table: { - width: 150 - }, - isSearch: true, - }, + { label: '申请时间', field: 'requestTime', @@ -368,12 +369,12 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive([ }, { label: '备注', - field: 'remark', + field: 'remarkMain', sort: 'custom', isTable:false, table: { width: 150 - }, + } }, { label: '自动完成', diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts index ab46f3b90..52f8636d2 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts @@ -375,11 +375,12 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive([ }, { label: '备注', - field: 'remark', + field: 'remarkMain', sort: 'custom', table: { width: 150 }, + isTable: false, }, { label: '创建时间', @@ -746,7 +747,6 @@ export const UnplannedissueRecordDetail = useCrudSchemas(reactive( width: 150 }, isTable: true, - hiddenInMain:true, }, // { // label: '任务明细ID', diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts index 18c27439b..225dec49e 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts @@ -497,13 +497,13 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive([ }, { label: '备注', - field: 'remark', + field: 'remarkMain', sort: 'custom', table: { width: 150 }, + isTable: false, sortTableDefault: 1000, - isTable: true, }, { label: '直接生成记录', diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts index 5fdee9aee..d6f590e93 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts @@ -27,6 +27,15 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive([ }, isSearch: true, }, + { + label: '申请单号', + field: 'requestNumber', + sort: 'custom', + table: { + width: 180 + }, + isSearch: true, + }, { label: '状态', field: 'status', @@ -39,15 +48,6 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '申请单号', - field: 'requestNumber', - sort: 'custom', - table: { - width: 180 - }, - isSearch: true, - }, { label: '申请时间', field: 'requestTime', @@ -350,14 +350,15 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive([ // width: 150 // }, // }, - // { - // label: '备注', - // field: 'remark', - // sort: 'custom', - // table: { - // width: 150 - // }, - // }, + { + label: '备注', + field: 'remarkMain', + sort: 'custom', + table: { + width: 150 + }, + isTable: false, + }, { label: '自动完成', field: 'autoComplete', diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts index 0c4460a21..32c7b00bf 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts @@ -350,12 +350,12 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive( }, { label: '备注', - field: 'remark', + field: 'remarkMain', isTable:false, sort: 'custom', table: { width: 150 - }, + } }, { label: '创建时间', diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts index 0c3c267f5..cd7947c15 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts @@ -539,11 +539,12 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive }, { label: '备注', - field: 'remark', + field: 'remarkMain', sort: 'custom', table: { width: 150 }, + isTable:false, sortTableDefault: 1000, }, { diff --git a/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts b/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts index 0f51bb88f..339f2d484 100644 --- a/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts +++ b/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts @@ -24,7 +24,7 @@ export const IssueJobMain = useCrudSchemas( table: { width: 180 }, - isTable: false + sortTableDefault: 1 }, { label: '供应商代码', diff --git a/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts b/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts index 45bdb85b7..718af8ea1 100644 --- a/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts +++ b/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts @@ -18,34 +18,34 @@ export const IssueRecordMain = useCrudSchemas( isSearch: true }, { - label: '状态', - field: 'status', - dictType: DICT_TYPE.JOB_STATUS, - dictClass: 'string', - isTable: false, + label: '申请单号', + field: 'requestNumber', sort: 'custom', table: { - width: 150 + width: 180 }, sortTableDefault: 1 }, { - label: '申请单号', - field: 'requestNumber', + label: '任务单号', + field: 'jobNumber', sort: 'custom', table: { width: 180 }, - isTable: false + sortTableDefault: 1 }, { - label: '任务单号', - field: 'jobNumber', + label: '状态', + field: 'status', + dictType: DICT_TYPE.JOB_STATUS, + dictClass: 'string', + isTable: false, sort: 'custom', table: { - width: 180 + width: 150 }, - isTable: false + sortTableDefault: 1 }, { label: '供应商代码', diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts index e076ee449..4eaf12322 100644 --- a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts +++ b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts @@ -23,7 +23,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive([ table: { width: 180 }, - isTable: false, + sortTableDefault: 2, }, { label: '车间代码', diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts index 71588ccb4..1401944b8 100644 --- a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts +++ b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts @@ -17,16 +17,13 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive isSearch: true }, { - label: '状态', - field: 'status', - dictType: DICT_TYPE.JOB_STATUS, - dictClass: 'string', - isTable: false, + label: '申请单号', + field: 'jobNumber', sort: 'custom', table: { - width: 150 + width: 180 }, - sortTableDefault:1, + sortTableDefault: 1, }, { label: '发料记录单号', @@ -35,7 +32,19 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive table: { width: 180 }, + sortTableDefault: 1 + }, + { + label: '状态', + field: 'status', + dictType: DICT_TYPE.JOB_STATUS, + dictClass: 'string', isTable: false, + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:1, }, { label: '任务单号', diff --git a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/productionreturnJobMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/productionreturnJobMain.data.ts index 56378194f..3cc29ed56 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/productionreturnJobMain.data.ts +++ b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/productionreturnJobMain.data.ts @@ -15,6 +15,15 @@ export const ProductionreturnJobMain = useCrudSchemas(reactive([ }, isSearch: true, }, + { + label: '申请单号', + field: 'requestNumber', + sort: 'custom', + table: { + width: 180 + }, + isSearch: true, + }, { label: '状态', field: 'status', @@ -35,16 +44,6 @@ export const ProductionreturnJobMain = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '申请单号', - field: 'requestNumber', - sort: 'custom', - table: { - width: 180 - }, - isSearch: true, - isTable: false, - }, { label: '从仓库代码', field: 'fromWarehouseCode', diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts index 6b8a77b0a..9ccd2f3ac 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts +++ b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts @@ -15,26 +15,6 @@ export const ProductionreturnRecordMain = useCrudSchemas(reactive( }, isSearch: true }, - // { - // label: '状态', - // field: 'status', - // dictType: DICT_TYPE.REQUEST_STATUS, - // dictClass: 'string', - // isForm: false, - // isTable: true, - // sort: 'custom', - // table: { - // width: 150 - // }, - // }, - { - label: '车间代码', - field: 'workshopCode', - sort: 'custom', - table: { - width: 150 - }, - }, { label: '申请单号', field: 'requestNumber', @@ -42,7 +22,6 @@ export const ProductionreturnRecordMain = useCrudSchemas(reactive( table: { width: 180 }, - isTable: false, isSearch: true }, @@ -53,10 +32,30 @@ export const ProductionreturnRecordMain = useCrudSchemas(reactive( table: { width: 180 }, - isTable: false, isSearch: true }, + // { + // label: '状态', + // field: 'status', + // dictType: DICT_TYPE.REQUEST_STATUS, + // dictClass: 'string', + // isForm: false, + // isTable: true, + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + { + label: '车间代码', + field: 'workshopCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { label: '出库事务类型', field: 'outTransactionType', diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue index e7c223aea..d8c3b0c40 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue @@ -322,17 +322,17 @@ const butttondata = (row,$index) => { defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productionreturn-request-main:update'}), // 编辑 // defaultButtons.mainListDeleteBtn({hasPermi:'wms:productionreturn-request-main:delete'}), // 删除 // 创建标签 - { - label: '创建标签', - name: 'cjbq', - hide: isShowMainButton(row,['3']), - type: 'primary', - icon: '', - color: '', - hasPermi: '', - link: true, // 文本展现按钮 - }, - defaultButtons.mainListPointBtn({hide:isShowMainButton(row,['3','6','8'])}), // 标签打印 + // { + // label: '创建标签', + // name: 'cjbq', + // hide: isShowMainButton(row,['3']), + // type: 'primary', + // icon: '', + // color: '', + // hasPermi: '', + // link: true, // 文本展现按钮 + // }, + // defaultButtons.mainListPointBtn({hide:isShowMainButton(row,['3','6','8'])}), // 标签打印 ] } @@ -465,18 +465,18 @@ const buttonTableClick = async (val, row) => { } else if (val == 'mainHandle') { // 处理 // 判断 是否已创建标签 - let isCreateLabel = false - await PackageApi.getPackagePage({ - requestNumber: row.number - }).then(res => { - if (res) { - if (res.list.length > 0) isCreateLabel = true - } - }) - if (!isCreateLabel) { - message.warning('请先创建标签') - return - } + // let isCreateLabel = false + // await PackageApi.getPackagePage({ + // requestNumber: row.number + // }).then(res => { + // if (res) { + // if (res.list.length > 0) isCreateLabel = true + // } + // }) + // if (!isCreateLabel) { + // message.warning('请先创建标签') + // return + // } tableObject.loading = true ProductionreturnRequestMainNoApi.handle(row.masterId).then(() => { message.success(t('common.updateSuccess')) diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts index a9d8a0807..985f70f3c 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts @@ -533,7 +533,8 @@ export const ProductionreturnRequestDetail = useCrudSchemas( table: { width: 120 }, - isTable: false, + isTable:false, + isTableForm:false, tableForm: { isInpuFocusShow: true, isSearchList: true, // 开启查询弹窗 @@ -589,6 +590,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas( width: 120 }, isTable: false, + isTableForm: false, tableForm: { disabled: true }, diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/index.vue b/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/index.vue index 36ff783ea..7f402440b 100644 --- a/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/index.vue +++ b/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/index.vue @@ -156,7 +156,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await ProductionscrapRecordMainApi.exportProductionscrapRecordMain(tableObject.params) - download.excel(data, '线标报废记录主.xlsx') + download.excel(data, '线标报废记录.xlsx') } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts index 379fd98d5..6051b154e 100644 --- a/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts +++ b/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts @@ -23,7 +23,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive([ table: { width: 180 }, - isTable: false, + sortTableDefault: 1, }, { label: '供应商代码', diff --git a/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts index f48218a06..250073f0d 100644 --- a/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts +++ b/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts @@ -35,7 +35,7 @@ export const RepleinshRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, - isTable: false, + sortTableDefault:1, }, { label: '任务单号', @@ -44,7 +44,7 @@ export const RepleinshRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, - isTable: false, + sortTableDefault: 2, }, // { // label: '供应商代码', diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts index 9cab1b5ec..6f0905ed8 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts @@ -16,20 +16,20 @@ export const InventorymoveJobMain = useCrudSchemas(reactive([ isSearch: true, }, { - label: '状态', - field: 'status', - dictType: DICT_TYPE.JOB_STATUS, - dictClass: 'string', - isSearch: true, - isTable: true, + label: '申请单号', + field: 'requestNumber', sort: 'custom', table: { width: 150 }, }, { - label: '申请单号', - field: 'requestNumber', + label: '状态', + field: 'status', + dictType: DICT_TYPE.JOB_STATUS, + dictClass: 'string', + isSearch: true, + isTable: true, sort: 'custom', table: { width: 150 diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue index 33d2cfee8..0cd2020f7 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue @@ -1,7 +1,7 @@