Skip to content

W
weiqiao-vue
Commit cd5542b0 by 张恒
Options

Merge remote-tracking branch 'origin/hongshun' into hongshun

parents 471b8012 a29ed07f
Showing with 42 additions and 13 deletions
xjrsoft-vue3/src/api/ckgl/cgrk/model/CgrkModel.ts
...@@ -6,6 +6,10 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel'; ...@@ -6,6 +6,10 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel';
export interface MesWarehouseInPageParams extends BasicPageParams { export interface MesWarehouseInPageParams extends BasicPageParams {
djh: string; djh: string;
djrq: string;
crklx: string;
ck: string; ck: string;
gys: string; gys: string;
...@@ -17,6 +21,8 @@ export interface MesWarehouseInPageParams extends BasicPageParams { ...@@ -17,6 +21,8 @@ export interface MesWarehouseInPageParams extends BasicPageParams {
ywzz: string; ywzz: string;
cspc: string; cspc: string;
bz: string;
} }
/** /**
......
xjrsoft-vue3/src/views/ckgl/cgrk/components/config.ts
...@@ -10,6 +10,33 @@ export const searchFormSchema: FormSchema[] = [ ...@@ -10,6 +10,33 @@ export const searchFormSchema: FormSchema[] = [
component: 'Input', component: 'Input',
}, },
{ {
field: 'djrq',
label: '单据日期',
defaultValue: undefined,
component: 'RangePicker',
componentProps: {
format: 'YYYY-MM-DD HH:mm:ss',
style: { width: '100%' },
getPopupContainer: () => document.body,
},
},
{
field: 'crklx',
label: '出入库类型',
defaultValue: undefined,
component: 'XjrSelect',
componentProps: {
datasourceType: 'dic',
params: { itemId: '2010533622867509249' },
labelField: 'name',
valueField: 'value',
mode: 'multiple',
showSearch: true,
getPopupContainer: () => document.body,
},
},
{
field: 'ck', field: 'ck',
label: '仓库', label: '仓库',
defaultValue: undefined, defaultValue: undefined,
...@@ -68,6 +95,12 @@ export const searchFormSchema: FormSchema[] = [ ...@@ -68,6 +95,12 @@ export const searchFormSchema: FormSchema[] = [
defaultValue: undefined, defaultValue: undefined,
component: 'Input', component: 'Input',
}, },
{
field: 'bz',
label: '备注',
defaultValue: undefined,
component: 'Input',
},
]; ];
export const columns: BasicColumn[] = [ export const columns: BasicColumn[] = [
...@@ -619,7 +652,6 @@ export const formProps: FormProps = { ...@@ -619,7 +652,6 @@ export const formProps: FormProps = {
span: 7, span: 7,
defaultValue: '', defaultValue: '',
placeholder: '请输入厂商批次', placeholder: '请输入厂商批次',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
...@@ -853,7 +885,6 @@ export const formProps: FormProps = { ...@@ -853,7 +885,6 @@ export const formProps: FormProps = {
span: '', span: '',
defaultValue: '', defaultValue: '',
placeholder: '请输入型号', placeholder: '请输入型号',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
...@@ -914,7 +945,6 @@ export const formProps: FormProps = { ...@@ -914,7 +945,6 @@ export const formProps: FormProps = {
span: '', span: '',
defaultValue: '', defaultValue: '',
placeholder: '请输入厂商批次', placeholder: '请输入厂商批次',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
......
xjrsoft-vue3/src/views/ckgl/cgrk/index.vue
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
//展示在列表内的按钮 //展示在列表内的按钮
const actionButtons = ref<string[]>(["view","edit","delete"]); const actionButtons = ref<string[]>(["view","edit","delete"]);
const buttonConfigs = computed(()=>{ const buttonConfigs = computed(()=>{
const list = [{"buttonId":"2011687510413426688","name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true,"isUse":true},{"buttonId":"2011687510413426689","name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true,"isUse":true},{"buttonId":"2011687510413426690","name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true,"isUse":true,"isEnableLock":true},{"buttonId":"2011729952881885184","name":"打印","code":"print","icon":"ant-design:printer-outlined","isDefault":true,"isUse":true},{"buttonId":"2011691871017484288","name":"快速导出","code":"export","icon":"ant-design:export-outlined","isDefault":true,"isUse":true},{"buttonId":"2011691871017484289","name":"提交","code":"commit","icon":"ant-design:arrow-up-outlined","isDefault":false,"isUse":true,"setting":[],"showType":"top","buttonType":"primary"},{"buttonId":"2011687510413426691","name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true,"isUse":true}] const list = [{"buttonId":"2011687510413426688","name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true,"isUse":true},{"buttonId":"2011687510413426690","name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true,"isUse":true,"isEnableLock":true},{"buttonId":"2011729952881885184","name":"打印","code":"print","icon":"ant-design:printer-outlined","isDefault":true,"isUse":true},{"buttonId":"2011691871017484288","name":"快速导出","code":"export","icon":"ant-design:export-outlined","isDefault":true,"isUse":true},{"buttonId":"2011691871017484289","name":"提交","code":"commit","icon":"ant-design:arrow-up-outlined","isDefault":false,"isUse":true,"setting":[],"showType":"top","buttonType":"primary"},{"buttonId":"2011687510413426691","name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true,"isUse":true}]
return filterButtonAuth(list); return filterButtonAuth(list);
}) })
...@@ -154,7 +154,7 @@ ...@@ -154,7 +154,7 @@
return buttonConfigs.value?.filter((x) => actionButtons.value.includes(x.code)); return buttonConfigs.value?.filter((x) => actionButtons.value.includes(x.code));
}); });
const btnEvent = {view : handleView,add : handleAdd,edit : handleEdit,print : handlePrint,export : handleExport,delete : handleDelete,} const btnEvent = {view : handleView,edit : handleEdit,print : handlePrint,export : handleExport,delete : handleDelete,}
const { currentRoute } = useRouter(); const { currentRoute } = useRouter();
...@@ -187,7 +187,7 @@ ...@@ -187,7 +187,7 @@
formConfig: { formConfig: {
labelWidth: 100, labelWidth: 100,
schemas: searchFormSchema, schemas: searchFormSchema,
fieldMapToTime: [], fieldMapToTime: [['djrq', ['djrqStart', 'djrqEnd'], 'YYYY-MM-DD HH:mm:ss ', true],],
showResetButton: false, showResetButton: false,
}, },
bordered:false, bordered:false,
...@@ -234,13 +234,6 @@ ...@@ -234,13 +234,6 @@
} }
function handleAdd() {
openModal(true, { isUpdate: false, });
}
async function handleEdit(record: Recordable) { async function handleEdit(record: Recordable) {
let field = 'id'; let field = 'id';
......
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