Skip to content

W
weiqiao-vue
Commit 37fc60f3 by 宋春膨
Options

feat(ckgl/qtrk): 添加业务伙伴业务类型调拨日期来源单据查询字段 

- 在 QtrkModel.ts 中新增 ywhb、ywlx、dbrq、lydj 四个查询参数字段
- 在 searchFormSchema 配置中添加业务伙伴、业务类型、调拨日期、来源单据四个搜索表单项
- 调拨日期字段使用 RangePicker 组件并配置时间格式
- 移除多个字段的 maxlength 和 defaultSelect 等无效配置属性
- 更新 index.vue 中按钮配置结构，添加 buttonId 属性
- 配置调拨日期字段的时间范围映射关系
- 修改开发环境和生产环境的 API 基础 URL 端口配置
- 在系统表单组件中注册新的库存管理批次管理和生产计划组件
parent 60b5551a
Showing with 49 additions and 19 deletions
xjrsoft-uni/common/config/index.js
...@@ -8,8 +8,8 @@ const config = { ...@@ -8,8 +8,8 @@ const config = {
IM_WS_URL:"ws://192.168.0.162:8878/im",// IM socket 地址 IM_WS_URL:"ws://192.168.0.162:8878/im",// IM socket 地址
} }
if (process.env.NODE_ENV === 'development') { if (process.env.NODE_ENV === 'development') {
config.baseUrl = 'http://localhost:8080'; config.baseUrl = 'http://localhost:8053';
} else { } else {
config.baseUrl = 'http://192.168.0.72:8080'; config.baseUrl = 'http://192.168.0.72:8053';
} }
export default config; export default config;
\ No newline at end of file
xjrsoft-uni/components/system-form/Index.vue
<template> <template>
<view> <view>
<SystemDemo ref="systemRef" v-if="componentName=='sys-system-demo'" :disabled="props.disabled" :isWorkFlow="true" :workFlowParams="formConfig.workFlowParams" :formModel="props.formModel"></SystemDemo> <SystemDemo ref="systemRef" v-if="componentName=='sys-system-demo'" :disabled="props.disabled" :isWorkFlow="true" :workFlowParams="formConfig.workFlowParams" :formModel="props.formModel"></SystemDemo>
<sys-ckgl-pcgl ref="systemRef" v-else-if="componentName=='sys-ckgl-pcgl'" :disabled="props.disabled" :isWorkFlow="true" :workFlowParams="formConfig.workFlowParams" :formModel="props.formModel"></sys-ckgl-pcgl>
<sys-scgl-scjh ref="systemRef" v-else-if="componentName=='sys-scgl-scjh'" :disabled="props.disabled" :isWorkFlow="true" :workFlowParams="formConfig.workFlowParams" :formModel="props.formModel"></sys-scgl-scjh>
<!--html--> <!--html-->
<view v-else >请检查表单文件是否存在</view> <view v-else >请检查表单文件是否存在</view>
</view> </view>
......
xjrsoft-vue3/src/api/ckgl/qtrk/model/QtrkModel.ts
...@@ -4,6 +4,14 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel'; ...@@ -4,6 +4,14 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel';
* @description: MesWarehouseOther分页参数 模型 * @description: MesWarehouseOther分页参数 模型
*/ */
export interface MesWarehouseOtherPageParams extends BasicPageParams { export interface MesWarehouseOtherPageParams extends BasicPageParams {
ywhb: string;
ywlx: string;
dbrq: string;
lydj: string;
ck: string; ck: string;
cgy: string; cgy: string;
......
xjrsoft-vue3/src/views/ckgl/qtrk/components/config.ts
...@@ -3,6 +3,36 @@ import { BasicColumn } from '/@/components/Table'; ...@@ -3,6 +3,36 @@ import { BasicColumn } from '/@/components/Table';
export const searchFormSchema: FormSchema[] = [ export const searchFormSchema: FormSchema[] = [
{ {
field: 'ywhb',
label: '业务伙伴',
defaultValue: undefined,
component: 'Input',
},
{
field: 'ywlx',
label: '业务类型',
defaultValue: undefined,
component: 'Input',
},
{
field: 'dbrq',
label: '调拨日期',
defaultValue: undefined,
component: 'RangePicker',
componentProps: {
format: 'YYYY-MM-DD HH:mm:ss',
style: { width: '100%' },
getPopupContainer: () => document.body,
},
},
{
field: 'lydj',
label: '来源单据',
defaultValue: undefined,
component: 'Input',
},
{
field: 'ck', field: 'ck',
label: '仓库', label: '仓库',
defaultValue: undefined, defaultValue: undefined,
...@@ -199,7 +229,6 @@ export const formProps: FormProps = { ...@@ -199,7 +229,6 @@ export const formProps: FormProps = {
span: 7, span: 7,
defaultValue: '', defaultValue: '',
placeholder: '请输入业务伙伴', placeholder: '请输入业务伙伴',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
...@@ -238,7 +267,6 @@ export const formProps: FormProps = { ...@@ -238,7 +267,6 @@ export const formProps: FormProps = {
span: 7, span: 7,
defaultValue: '', defaultValue: '',
placeholder: '请输入业务类型', placeholder: '请输入业务类型',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
...@@ -309,7 +337,6 @@ export const formProps: FormProps = { ...@@ -309,7 +337,6 @@ export const formProps: FormProps = {
span: 7, span: 7,
defaultValue: '', defaultValue: '',
placeholder: '请输入来源单据', placeholder: '请输入来源单据',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
...@@ -356,7 +383,6 @@ export const formProps: FormProps = { ...@@ -356,7 +383,6 @@ export const formProps: FormProps = {
{ key: 2, label: 'Option 2', value: 'Option 2' }, { key: 2, label: 'Option 2', value: 'Option 2' },
{ key: 3, label: 'Option 3', value: 'Option 3' }, { key: 3, label: 'Option 3', value: 'Option 3' },
], ],
defaultSelect: null,
datasourceType: 'dic', datasourceType: 'dic',
params: { itemId: '2010539474382962690' }, params: { itemId: '2010539474382962690' },
labelField: 'name', labelField: 'name',
...@@ -394,7 +420,6 @@ export const formProps: FormProps = { ...@@ -394,7 +420,6 @@ export const formProps: FormProps = {
span: 7, span: 7,
defaultValue: '', defaultValue: '',
placeholder: '请输入仓管员', placeholder: '请输入仓管员',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
...@@ -453,7 +478,6 @@ export const formProps: FormProps = { ...@@ -453,7 +478,6 @@ export const formProps: FormProps = {
span: '', span: '',
defaultValue: '', defaultValue: '',
placeholder: '请输入产品', placeholder: '请输入产品',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
...@@ -484,7 +508,6 @@ export const formProps: FormProps = { ...@@ -484,7 +508,6 @@ export const formProps: FormProps = {
span: '', span: '',
defaultValue: '', defaultValue: '',
placeholder: '请输入规格', placeholder: '请输入规格',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
...@@ -515,9 +538,7 @@ export const formProps: FormProps = { ...@@ -515,9 +538,7 @@ export const formProps: FormProps = {
span: '', span: '',
defaultValue: 0, defaultValue: 0,
min: 0, min: 0,
max: null,
step: 1, step: 1,
maxlength: null,
disabled: false, disabled: false,
showLabel: true, showLabel: true,
controls: true, controls: true,
...@@ -541,9 +562,7 @@ export const formProps: FormProps = { ...@@ -541,9 +562,7 @@ export const formProps: FormProps = {
span: '', span: '',
defaultValue: 0, defaultValue: 0,
min: 0, min: 0,
max: null,
step: 1, step: 1,
maxlength: null,
disabled: false, disabled: false,
showLabel: true, showLabel: true,
controls: true, controls: true,
...@@ -569,7 +588,6 @@ export const formProps: FormProps = { ...@@ -569,7 +588,6 @@ export const formProps: FormProps = {
min: 0, min: 0,
max: 100, max: 100,
step: 1, step: 1,
maxlength: null,
disabled: false, disabled: false,
showLabel: true, showLabel: true,
controls: true, controls: true,
...@@ -601,7 +619,6 @@ export const formProps: FormProps = { ...@@ -601,7 +619,6 @@ export const formProps: FormProps = {
{ key: 2, label: 'Option 2', value: 'Option 2' }, { key: 2, label: 'Option 2', value: 'Option 2' },
{ key: 3, label: 'Option 3', value: 'Option 3' }, { key: 3, label: 'Option 3', value: 'Option 3' },
], ],
defaultSelect: null,
datasourceType: 'dic', datasourceType: 'dic',
params: { itemId: '2003765781699985410' }, params: { itemId: '2003765781699985410' },
labelField: 'name', labelField: 'name',
...@@ -640,7 +657,6 @@ export const formProps: FormProps = { ...@@ -640,7 +657,6 @@ export const formProps: FormProps = {
{ key: 2, label: 'Option 2', value: 'Option 2' }, { key: 2, label: 'Option 2', value: 'Option 2' },
{ key: 3, label: 'Option 3', value: 'Option 3' }, { key: 3, label: 'Option 3', value: 'Option 3' },
], ],
defaultSelect: null,
datasourceType: 'dic', datasourceType: 'dic',
params: { itemId: '2010541442849521665' }, params: { itemId: '2010541442849521665' },
labelField: 'name', labelField: 'name',
...@@ -671,7 +687,6 @@ export const formProps: FormProps = { ...@@ -671,7 +687,6 @@ export const formProps: FormProps = {
span: '', span: '',
defaultValue: '', defaultValue: '',
placeholder: '请输入备注', placeholder: '请输入备注',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
......
xjrsoft-vue3/src/views/ckgl/qtrk/index.vue
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
//展示在列表内的按钮 //展示在列表内的按钮
const actionButtons = ref<string[]>(["view","edit","delete"]); const actionButtons = ref<string[]>(["view","edit","delete"]);
const buttonConfigs = computed(()=>{ const buttonConfigs = computed(()=>{
const list = [{"isUse":true,"name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true},{"isUse":true,"name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true},{"isUse":true,"name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true,"isEnableLock":true},{"isUse":true,"name":"快速导出","code":"export","icon":"ant-design:export-outlined","isDefault":true},{"isUse":true,"name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true}] const list = [{"buttonId":"2010545435055874048","name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true,"isUse":true},{"buttonId":"2010545435055874049","name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true,"isUse":true},{"buttonId":"2010545435055874050","name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true,"isUse":true,"isEnableLock":true},{"buttonId":"2010545435055874051","name":"快速导出","code":"export","icon":"ant-design:export-outlined","isDefault":true,"isUse":true},{"buttonId":"2010545435055874052","name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true,"isUse":true}]
return filterButtonAuth(list); return filterButtonAuth(list);
}) })
...@@ -184,7 +184,7 @@ ...@@ -184,7 +184,7 @@
formConfig: { formConfig: {
labelWidth: 100, labelWidth: 100,
schemas: searchFormSchema, schemas: searchFormSchema,
fieldMapToTime: [], fieldMapToTime: [['dbrq', ['dbrqStart', 'dbrqEnd'], 'YYYY-MM-DD HH:mm:ss ', true],],
showResetButton: false, showResetButton: false,
}, },
bordered:false, bordered:false,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment