diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 94444b9f5..a2a896063 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -265,6 +265,6 @@ export enum DICT_TYPE { STRATEGY_PARAM_OPEARTOR = 'strategy_param_opeartor', // 策略参数操作符 DATA_TYPE = 'data_type', // 数据类型 PACK_UNIT = 'pack_unit', // 包装单位 - DETAIL_STATUS = 'detail_status' // 明细状态 - + DETAIL_STATUS = 'detail_status', // 明细状态 + TRANSFER_MODE = 'transfer_mode' // 运输方式 } diff --git a/src/views/wms/basicDataManage/documentSetting/documentsetting/documentsetting.data.ts b/src/views/wms/basicDataManage/documentSetting/documentsetting/documentsetting.data.ts index fbe8db260..ff8f871f3 100644 --- a/src/views/wms/basicDataManage/documentSetting/documentsetting/documentsetting.data.ts +++ b/src/views/wms/basicDataManage/documentSetting/documentsetting/documentsetting.data.ts @@ -15,6 +15,11 @@ export const Documentsetting = useCrudSchemas(reactive([ fixed: 'left' }, isSearch: true, + form: { + componentProps: { + disabled: true + } + } }, { label: '名称', @@ -24,6 +29,11 @@ export const Documentsetting = useCrudSchemas(reactive([ width: 150 }, isSearch: true, + form: { + componentProps: { + disabled: true + } + } }, { label: '描述', @@ -142,7 +152,7 @@ export const Documentsetting = useCrudSchemas(reactive([ { label: '创建时间', field: 'createTime', - isTable: true, + isTable: false, formatter: dateFormatter, isForm: false, detail: { @@ -185,8 +195,6 @@ export const Documentsetting = useCrudSchemas(reactive([ field: 'available', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, - isSearch: true, sort: 'custom', table: { width: 150 @@ -199,6 +207,8 @@ export const Documentsetting = useCrudSchemas(reactive([ activeValue: 'TRUE' } }, + isTable: false, + isForm: false }, { label: '操作', diff --git a/src/views/wms/basicDataManage/documentSetting/documentsetting/index.vue b/src/views/wms/basicDataManage/documentSetting/documentsetting/index.vue index de8e1276a..032138bb7 100644 --- a/src/views/wms/basicDataManage/documentSetting/documentsetting/index.vue +++ b/src/views/wms/basicDataManage/documentSetting/documentsetting/index.vue @@ -90,7 +90,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn({hasPermi:'wms:documentsetting:create'}), // 新增 + // defaultButtons.defaultAddBtn({hasPermi:'wms:documentsetting:create'}), // 新增 // defaultButtons.defaultImportBtn({hasPermi:'wms:documentsetting:import'}), // 导入 // defaultButtons.defaultExportBtn({hasPermi:'wms:documentsetting:export'}), // 导出 defaultButtons.defaultFreshBtn(null),//刷新 @@ -125,7 +125,7 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = [ defaultButtons.mainListEditBtn({hasPermi:'wms:documentsetting:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:documentsetting:delete'}), // 删除 + // defaultButtons.mainListDeleteBtn({hasPermi:'wms:documentsetting:delete'}), // 删除 ] // 列表-操作按钮事件 diff --git a/src/views/wms/basicDataManage/documentSetting/jobsetting/index.vue b/src/views/wms/basicDataManage/documentSetting/jobsetting/index.vue index e0ae87843..73f9c5e9b 100644 --- a/src/views/wms/basicDataManage/documentSetting/jobsetting/index.vue +++ b/src/views/wms/basicDataManage/documentSetting/jobsetting/index.vue @@ -90,7 +90,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn({hasPermi:'wms:jobsetting:create'}), // 新增 + // defaultButtons.defaultAddBtn({hasPermi:'wms:jobsetting:create'}), // 新增 // defaultButtons.defaultImportBtn({hasPermi:'wms:jobsetting:import'}), // 导入 // defaultButtons.defaultExportBtn({hasPermi:'wms:jobsetting:export'}), // 导出 defaultButtons.defaultFreshBtn(null),//刷新 @@ -125,7 +125,7 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = [ defaultButtons.mainListEditBtn({hasPermi:'wms:jobsetting:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:jobsetting:delete'}), // 删除 + // defaultButtons.mainListDeleteBtn({hasPermi:'wms:jobsetting:delete'}), // 删除 ] // 列表-操作按钮事件 diff --git a/src/views/wms/basicDataManage/documentSetting/jobsetting/jobsetting.data.ts b/src/views/wms/basicDataManage/documentSetting/jobsetting/jobsetting.data.ts index 0429f197c..30c306b58 100644 --- a/src/views/wms/basicDataManage/documentSetting/jobsetting/jobsetting.data.ts +++ b/src/views/wms/basicDataManage/documentSetting/jobsetting/jobsetting.data.ts @@ -15,6 +15,11 @@ export const Jobsetting = useCrudSchemas(reactive([ fixed: 'left' }, isSearch: true, + form: { + componentProps: { + disabled: true + } + } }, { label: '有效分钟', @@ -225,8 +230,6 @@ export const Jobsetting = useCrudSchemas(reactive([ field: 'available', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isSearch: true, - isTable: true, sort: 'custom', table: { width: 150 @@ -239,6 +242,8 @@ export const Jobsetting = useCrudSchemas(reactive([ activeValue: 'TRUE' } }, + isTable: false, + isForm: false, }, { label: '生效时间', @@ -267,7 +272,6 @@ export const Jobsetting = useCrudSchemas(reactive([ field: 'isSoftDeleted', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, sort: 'custom', table: { width: 150 @@ -280,6 +284,8 @@ export const Jobsetting = useCrudSchemas(reactive([ activeValue: 'TRUE' } }, + isTable: false, + isForm: false, }, { label: '失效时间', diff --git a/src/views/wms/basicDataManage/documentSetting/recordsetting/index.vue b/src/views/wms/basicDataManage/documentSetting/recordsetting/index.vue index b27655030..df1b6a53d 100644 --- a/src/views/wms/basicDataManage/documentSetting/recordsetting/index.vue +++ b/src/views/wms/basicDataManage/documentSetting/recordsetting/index.vue @@ -90,7 +90,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn({hasPermi:'wms:recordsetting:create'}), // 新增 + // defaultButtons.defaultAddBtn({hasPermi:'wms:recordsetting:create'}), // 新增 // defaultButtons.defaultImportBtn({hasPermi:'wms:recordsetting:import'}), // 导入 // defaultButtons.defaultExportBtn({hasPermi:'wms:recordsetting:export'}), // 导出 defaultButtons.defaultFreshBtn(null),//刷新 @@ -125,7 +125,7 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = [ defaultButtons.mainListEditBtn({hasPermi:'wms:recordsetting:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:recordsetting:delete'}), // 删除 + // defaultButtons.mainListDeleteBtn({hasPermi:'wms:recordsetting:delete'}), // 删除 ] // 列表-操作按钮事件 diff --git a/src/views/wms/basicDataManage/documentSetting/recordsetting/recordsetting.data.ts b/src/views/wms/basicDataManage/documentSetting/recordsetting/recordsetting.data.ts index e84e79833..83f73a421 100644 --- a/src/views/wms/basicDataManage/documentSetting/recordsetting/recordsetting.data.ts +++ b/src/views/wms/basicDataManage/documentSetting/recordsetting/recordsetting.data.ts @@ -15,6 +15,11 @@ export const Recordsetting = useCrudSchemas(reactive([ fixed: 'left' }, isSearch: true, + form: { + componentProps: { + disabled: true + } + } }, { label: '接口类型', @@ -24,9 +29,6 @@ export const Recordsetting = useCrudSchemas(reactive([ isSearch: true, isTable: true, sort: 'custom', - table: { - width: 150 - }, }, { label: '生效时间', @@ -37,9 +39,6 @@ export const Recordsetting = useCrudSchemas(reactive([ dateFormat: 'YYYY-MM-DD HH:mm:ss' }, sort: 'custom', - table: { - width: 180 - }, form: { component: 'DatePicker', componentProps: { @@ -59,9 +58,6 @@ export const Recordsetting = useCrudSchemas(reactive([ dateFormat: 'YYYY-MM-DD HH:mm:ss' }, sort: 'custom', - table: { - width: 180 - }, form: { component: 'DatePicker', componentProps: { @@ -82,9 +78,6 @@ export const Recordsetting = useCrudSchemas(reactive([ dateFormat: 'YYYY-MM-DD HH:mm:ss' }, sort: 'custom', - table: { - width: 180 - }, form: { component: 'DatePicker', componentProps: { @@ -99,9 +92,6 @@ export const Recordsetting = useCrudSchemas(reactive([ label: '备注', field: 'remark', sort: 'custom', - table: { - width: 150 - }, }, { label: '创建者', @@ -109,21 +99,13 @@ export const Recordsetting = useCrudSchemas(reactive([ isTable: false, isForm: false, sort: 'custom', - table: { - width: 150 - }, }, { label: '是否可用', field: 'available', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, - isSearch: true, sort: 'custom', - table: { - width: 150 - }, form: { component: 'Switch', value: 'TRUE', @@ -132,6 +114,8 @@ export const Recordsetting = useCrudSchemas(reactive([ activeValue: 'TRUE' } }, + isTable: false, + isForm: false, }, { label: '操作', @@ -139,7 +123,6 @@ export const Recordsetting = useCrudSchemas(reactive([ isDetail: false, isForm: false , table: { - width: 150, fixed: 'right' } } diff --git a/src/views/wms/basicDataManage/documentSetting/requestsetting/index.vue b/src/views/wms/basicDataManage/documentSetting/requestsetting/index.vue index 73da59e61..0177d62f3 100644 --- a/src/views/wms/basicDataManage/documentSetting/requestsetting/index.vue +++ b/src/views/wms/basicDataManage/documentSetting/requestsetting/index.vue @@ -90,7 +90,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn({hasPermi:'wms:requestsetting:create'}), // 新增 + // defaultButtons.defaultAddBtn({hasPermi:'wms:requestsetting:create'}), // 新增 // defaultButtons.defaultImportBtn({hasPermi:'wms:requestsetting:import'}), // 导入 // defaultButtons.defaultExportBtn({hasPermi:'wms:requestsetting:export'}), // 导出 defaultButtons.defaultFreshBtn(null),//刷新 @@ -125,7 +125,7 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = [ defaultButtons.mainListEditBtn({hasPermi:'wms:requestsetting:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:requestsetting:delete'}), // 删除 + // defaultButtons.mainListDeleteBtn({hasPermi:'wms:requestsetting:delete'}), // 删除 ] // 列表-操作按钮事件 diff --git a/src/views/wms/basicDataManage/documentSetting/requestsetting/requestsetting.data.ts b/src/views/wms/basicDataManage/documentSetting/requestsetting/requestsetting.data.ts index 3661babae..3c3468fa9 100644 --- a/src/views/wms/basicDataManage/documentSetting/requestsetting/requestsetting.data.ts +++ b/src/views/wms/basicDataManage/documentSetting/requestsetting/requestsetting.data.ts @@ -15,6 +15,11 @@ export const Requestsetting = useCrudSchemas(reactive([ fixed: 'left' }, isSearch: true, + form: { + componentProps: { + disabled: true + } + } }, { label: '申请模式', @@ -26,6 +31,11 @@ export const Requestsetting = useCrudSchemas(reactive([ table: { width: 150 }, + form: { + componentProps: { + disabled: true + } + } }, { label: '自动提交', @@ -108,8 +118,6 @@ export const Requestsetting = useCrudSchemas(reactive([ field: 'available', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isSearch: true, - isTable: true, sort: 'custom', table: { width: 150 @@ -122,6 +130,8 @@ export const Requestsetting = useCrudSchemas(reactive([ activeValue: 'TRUE' } }, + isTable: false, + isForm: false }, { label: '生效时间', diff --git a/src/views/wms/basicDataManage/documentSetting/switch/index.vue b/src/views/wms/basicDataManage/documentSetting/switch/index.vue index d7e56f5dc..a6c36e2b3 100644 --- a/src/views/wms/basicDataManage/documentSetting/switch/index.vue +++ b/src/views/wms/basicDataManage/documentSetting/switch/index.vue @@ -124,7 +124,7 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'wms:switch:update'}), // 编辑 + defaultButtons.mainListEditBtn(null), // 编辑 // defaultButtons.mainListDeleteBtn({hasPermi:'wms:switch:delete'}), // 删除 ] diff --git a/src/views/wms/basicDataManage/documentSetting/switch/switch.data.ts b/src/views/wms/basicDataManage/documentSetting/switch/switch.data.ts index 016035092..b93d2d423 100644 --- a/src/views/wms/basicDataManage/documentSetting/switch/switch.data.ts +++ b/src/views/wms/basicDataManage/documentSetting/switch/switch.data.ts @@ -10,7 +10,6 @@ export const Switch = useCrudSchemas(reactive([ sort: 'custom', isSearch: true, table: { - width: 150, fixed: 'left' }, form: { @@ -24,9 +23,6 @@ export const Switch = useCrudSchemas(reactive([ field: 'description', sort: 'custom', isSearch: true, - table: { - width: 150 - }, form: { componentProps: { disabled: true @@ -41,9 +37,6 @@ export const Switch = useCrudSchemas(reactive([ dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', isTable: true, - table: { - width: 150 - }, form: { component: 'Switch', value: 'TRUE', @@ -60,10 +53,8 @@ export const Switch = useCrudSchemas(reactive([ isSearch: true, dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, - table: { - width: 150 - }, + isTable: false, + isForm: false, form: { component: 'Switch', value: 'TRUE', diff --git a/src/views/wms/basicDataManage/documentSetting/transactiontype/index.vue b/src/views/wms/basicDataManage/documentSetting/transactiontype/index.vue index 7aa6b6fd0..c01f72adc 100644 --- a/src/views/wms/basicDataManage/documentSetting/transactiontype/index.vue +++ b/src/views/wms/basicDataManage/documentSetting/transactiontype/index.vue @@ -90,7 +90,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn({hasPermi:'wms:transactiontype:create'}), // 新增 + // defaultButtons.defaultAddBtn({hasPermi:'wms:transactiontype:create'}), // 新增 // defaultButtons.defaultImportBtn({hasPermi:'wms:transactiontype:import'}), // 导入 // defaultButtons.defaultExportBtn({hasPermi:'wms:transactiontype:export'}), // 导出 defaultButtons.defaultFreshBtn(null),//刷新 @@ -125,7 +125,7 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = [ defaultButtons.mainListEditBtn({hasPermi:'wms:transactiontype:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:transactiontype:delete'}), // 删除 + // defaultButtons.mainListDeleteBtn({hasPermi:'wms:transactiontype:delete'}), // 删除 ] // 列表-操作按钮事件 diff --git a/src/views/wms/basicDataManage/documentSetting/transactiontype/transactiontype.data.ts b/src/views/wms/basicDataManage/documentSetting/transactiontype/transactiontype.data.ts index 89c6c0bc3..1bec72c46 100644 --- a/src/views/wms/basicDataManage/documentSetting/transactiontype/transactiontype.data.ts +++ b/src/views/wms/basicDataManage/documentSetting/transactiontype/transactiontype.data.ts @@ -11,26 +11,29 @@ export const Transactiontype = useCrudSchemas(reactive([ field: 'code', sort: 'custom', table: { - width: 150, fixed: 'left' }, isSearch: true, + form: { + componentProps: { + disabled: true + } + } }, { label: '名称', field: 'name', sort: 'custom', - table: { - width: 150 - }, + form: { + componentProps: { + disabled: true + } + } }, { label: '描述', field: 'description', sort: 'custom', - table: { - width: 150 - }, }, { label: '库存动作', @@ -40,9 +43,6 @@ export const Transactiontype = useCrudSchemas(reactive([ isSearch: true, isTable: true, sort: 'custom', - table: { - width: 150 - }, }, { label: '允许负数', @@ -52,9 +52,6 @@ export const Transactiontype = useCrudSchemas(reactive([ isSearch: true, isTable: true, sort: 'custom', - table: { - width: 150 - }, form: { component: 'Switch', value: 'TRUE', @@ -70,11 +67,8 @@ export const Transactiontype = useCrudSchemas(reactive([ dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', isSearch: true, - isTable: true, + isTable: false, sort: 'custom', - table: { - width: 150 - }, form: { component: 'Switch', value: 'TRUE', @@ -83,17 +77,15 @@ export const Transactiontype = useCrudSchemas(reactive([ activeValue: 'TRUE' } }, + isForm: false, }, { label: '是否软删除', field: 'isSoftDeleted', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', - table: { - width: 150 - }, form: { component: 'Switch', value: 'TRUE', @@ -102,6 +94,7 @@ export const Transactiontype = useCrudSchemas(reactive([ activeValue: 'TRUE' } }, + isForm: false, }, { label: '生效时间', @@ -112,9 +105,6 @@ export const Transactiontype = useCrudSchemas(reactive([ dateFormat: 'YYYY-MM-DD HH:mm:ss' }, sort: 'custom', - table: { - width: 150 - }, form: { component: 'DatePicker', componentProps: { @@ -134,9 +124,6 @@ export const Transactiontype = useCrudSchemas(reactive([ dateFormat: 'YYYY-MM-DD HH:mm:ss' }, sort: 'custom', - table: { - width: 150 - }, form: { component: 'DatePicker', componentProps: { @@ -155,9 +142,6 @@ export const Transactiontype = useCrudSchemas(reactive([ dateFormat: 'YYYY-MM-DD HH:mm:ss' }, sort: 'custom', - table: { - width: 150 - }, isTable: false, isForm: false, form: { @@ -174,9 +158,6 @@ export const Transactiontype = useCrudSchemas(reactive([ label: '备注', field: 'remark', sort: 'custom', - table: { - width: 150 - }, }, { label: '创建者', @@ -184,9 +165,6 @@ export const Transactiontype = useCrudSchemas(reactive([ isTable: false, isForm: false, sort: 'custom', - table: { - width: 150 - }, }, { label: '操作', diff --git a/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts b/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts index f96a4ea33..d5edf8b7a 100644 --- a/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts +++ b/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts @@ -95,7 +95,18 @@ export const Productionlineitem = useCrudSchemas(reactive([ searchField: 'code', searchTitle: '物品信息', searchAllSchemas: Itembasic.allSchemas, - searchPage: ItembasicApi.getItembasicPage + searchPage: ItembasicApi.getItembasicPage, + searchCondition: [{ + key:'enableMake', + value:'TRUE', + isMainValue: false + }, + { + key:'type', + value:'FG,SEMI', + isMainValue: false + }, + ] } } }, diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts index a2aa452e3..401256863 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts @@ -18,6 +18,9 @@ import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/item import * as CustomerdockApi from '@/api/wms/customerdock' import { Customerdock } from '@/views/wms/basicDataManage/customerManage/customerdock/customerdock.data' +import * as CarrierApi from '@/api/wms/carrier' +import { Carrier } from '@/views/wms/basicDataManage/orderManage/carrier/carrier.data' + const { t } = useI18n() // 国际化 // 获取自动提交自动通过自动执行,跳过任务直接删生成记录的默认值 @@ -113,11 +116,24 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + form: { + // labelMessage: '信息提示说明!!!', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择承运商', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '承运商信息', // 查询弹窗标题 + searchAllSchemas: Carrier.allSchemas, // 查询弹窗所需类 + searchPage: CarrierApi.getCarrierPage // 查询弹窗所需分页方法 + } + } }, { label: '运输方式', field: 'transferMode', sort: 'custom', + dictType: DICT_TYPE.TRANSFER_MODE, + dictClass: 'string', table: { width: 150 }, diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts index d16d61ae9..5e3b5fb2a 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts @@ -615,7 +615,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive