Skip to content

W
weiqiao-vue
Commit 9765a358 by sunguoxiang
Options

Merge branch 'hongshun' into hongshun-sun

parents 6e3fa42c a3067df6
Showing with 397 additions and 183 deletions
xjrsoft-vue3/src/api/chaiche/ccbg/model/CcbgModel.ts
...@@ -4,25 +4,25 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel'; ...@@ -4,25 +4,25 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel';
* @description: MesCheliangBg分页参数 模型 * @description: MesCheliangBg分页参数 模型
*/ */
export interface MesCheliangBgPageParams extends BasicPageParams { export interface MesCheliangBgPageParams extends BasicPageParams {
banzu: string;
cphm: string; cphm: string;
clys: string; clys: string;
gzjssj: string;
gzr: string; gzr: string;
gzkssj: string;
cllx: string; cllx: string;
wlzt: string; clls: string;
gzxm: string; gzxm: string;
clppxh: string; gzjssj: string;
gzkssj: string; wlzt: string;
clppxh: string;
} }
/** /**
...@@ -56,8 +56,6 @@ export interface MesCheliangBgPageModel { ...@@ -56,8 +56,6 @@ export interface MesCheliangBgPageModel {
gzsc: string; gzsc: string;
wlzt: string; wlzt: string;
banzu: string;
} }
/** /**
......
xjrsoft-vue3/src/api/ckgl/xsck/model/XsckModel.ts
...@@ -6,11 +6,33 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel'; ...@@ -6,11 +6,33 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel';
export interface MesWarehouseSaleoutPageParams extends BasicPageParams { export interface MesWarehouseSaleoutPageParams extends BasicPageParams {
djbh: string; djbh: string;
djrq: string;
ck: string; ck: string;
crklx: string;
jbr: string;
bm: string;
ddkh: string;
djzt: string;
ywzz: string; ywzz: string;
cydw: string;
shrq: string;
shdz: string;
shrxm: string;
pch: string; pch: string;
bz: string;
} }
/** /**
...@@ -41,13 +63,13 @@ export interface MesWarehouseSaleoutPageModel { ...@@ -41,13 +63,13 @@ export interface MesWarehouseSaleoutPageModel {
shdz: string; shdz: string;
shr: string;
ywzz: string; ywzz: string;
djzt: string; djzt: string;
bz: string; bz: string;
shrxm: string;
} }
/** /**
...@@ -84,7 +106,7 @@ export interface MesWarehouseSaleoutModel { ...@@ -84,7 +106,7 @@ export interface MesWarehouseSaleoutModel {
shdz: string; shdz: string;
shr: string; shrxm: string;
bz: string; bz: string;
......
xjrsoft-vue3/src/api/jcsj/wlqd/model/WlqdModel.ts
...@@ -7,8 +7,6 @@ export interface MesBaseBomPageParams extends BasicPageParams { ...@@ -7,8 +7,6 @@ export interface MesBaseBomPageParams extends BasicPageParams {
bommc: string; bommc: string;
cpid: string; cpid: string;
sfyy: string;
} }
/** /**
...@@ -19,15 +17,17 @@ export interface MesBaseBomPageModel { ...@@ -19,15 +17,17 @@ export interface MesBaseBomPageModel {
bommc: string; bommc: string;
bomsl: string;
bombb: string;
cpmc: string; cpmc: string;
cpbh: string;
cpgg: string; cpgg: string;
cpxh: string; cpxh: string;
bomsl: string;
bombb: string;
} }
/** /**
...@@ -86,6 +86,8 @@ export interface MesBaseBomModel { ...@@ -86,6 +86,8 @@ export interface MesBaseBomModel {
modifyUserId: string; modifyUserId: string;
sjbom: string;
mesBaseBomItemList?: MesBaseBomItemModel; mesBaseBomItemList?: MesBaseBomItemModel;
} }
...@@ -99,6 +101,8 @@ export interface MesBaseBomItemModel { ...@@ -99,6 +101,8 @@ export interface MesBaseBomItemModel {
bomid: string; bomid: string;
wlid: string;
wlbh: string; wlbh: string;
wlmc: string; wlmc: string;
......
xjrsoft-vue3/src/api/scgl/scjh/model/ScjhModel.ts
...@@ -6,9 +6,9 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel'; ...@@ -6,9 +6,9 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel';
export interface MesProductionPlanPageParams extends BasicPageParams { export interface MesProductionPlanPageParams extends BasicPageParams {
jhbh: string; jhbh: string;
ddbh: string; kh: string;
ssgs: string; ywzz: string;
zt: string; zt: string;
} }
...@@ -19,13 +19,15 @@ export interface MesProductionPlanPageParams extends BasicPageParams { ...@@ -19,13 +19,15 @@ export interface MesProductionPlanPageParams extends BasicPageParams {
export interface MesProductionPlanPageModel { export interface MesProductionPlanPageModel {
id: string; id: string;
ddbh: string;
jhbh: string; jhbh: string;
ddbh: string;
kh: string; kh: string;
ssgs: string; jhjhrq: string;
ywzz: string;
zt: string; zt: string;
} }
...@@ -107,6 +109,8 @@ export interface MesProductionPlanProductModel { ...@@ -107,6 +109,8 @@ export interface MesProductionPlanProductModel {
cpbh: string; cpbh: string;
cpmc: string;
nbdm: string; nbdm: string;
hjzt: string; hjzt: string;
......
xjrsoft-vue3/src/views/chaiche/ccbg/components/CcbgModal.vue
...@@ -135,3 +135,4 @@ ...@@ -135,3 +135,4 @@
</script> </script>
\ No newline at end of file
xjrsoft-vue3/src/views/chaiche/ccbg/components/workflowPermission.ts
...@@ -23,22 +23,6 @@ export const permissionList = [ ...@@ -23,22 +23,6 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '班组',
fieldId: 'banzu',
isSubTable: false,
showChildren: true,
type: 'radio',
key: 'fdb254d1c2dc4370a1905ffd85148370',
children: [],
options: {},
},
{
required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '车牌号码', fieldName: '车牌号码',
fieldId: 'cphm', fieldId: 'cphm',
isSubTable: false, isSubTable: false,
...@@ -72,12 +56,12 @@ export const permissionList = [ ...@@ -72,12 +56,12 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '工作结束时间', fieldName: '工作人',
fieldId: 'gzjssj', fieldId: 'gzr',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'date', type: 'user',
key: 'a349e957579e47cb90727cdfa8c9d21f', key: '21906e99fb08459ea4318c04707797ca',
children: [], children: [],
options: {}, options: {},
defaultValue: '', defaultValue: '',
...@@ -89,12 +73,12 @@ export const permissionList = [ ...@@ -89,12 +73,12 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '车辆id', fieldName: '工作开始时间',
fieldId: 'cheliangId', fieldId: 'gzkssj',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'input', type: 'date',
key: 'e1221f5840d7486588dd2c1e086af59d', key: '4da55e5ac2c04a2dacd2cd58470b6820',
children: [], children: [],
options: {}, options: {},
defaultValue: '', defaultValue: '',
...@@ -106,12 +90,12 @@ export const permissionList = [ ...@@ -106,12 +90,12 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '工作人', fieldName: '车辆id',
fieldId: 'gzr', fieldId: 'cheliangId',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'user', type: 'input',
key: '21906e99fb08459ea4318c04707797ca', key: 'e1221f5840d7486588dd2c1e086af59d',
children: [], children: [],
options: {}, options: {},
defaultValue: '', defaultValue: '',
...@@ -156,15 +140,14 @@ export const permissionList = [ ...@@ -156,15 +140,14 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '磅单数量', fieldName: '工作项目',
fieldId: 'bdsl', fieldId: 'gzxm',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'number', type: 'associate-popup',
key: '5bd116e5f35344cb8780f747370cee8d', key: '0d265387754f487886c4b77058fd49a0',
children: [], children: [],
options: {}, options: {},
defaultValue: '',
}, },
{ {
required: false, required: false,
...@@ -173,12 +156,12 @@ export const permissionList = [ ...@@ -173,12 +156,12 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '工作时长(h)', fieldName: '工作结束时间',
fieldId: 'gzsc', fieldId: 'gzjssj',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'number', type: 'date',
key: 'ae4a15e58ffe4710b337560f7d3b0703', key: 'a349e957579e47cb90727cdfa8c9d21f',
children: [], children: [],
options: {}, options: {},
defaultValue: '', defaultValue: '',
...@@ -206,14 +189,15 @@ export const permissionList = [ ...@@ -206,14 +189,15 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '工作项目', fieldName: '车辆重量(kg)',
fieldId: 'gzxm', fieldId: 'clzl',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'associate-popup', type: 'number',
key: '0d265387754f487886c4b77058fd49a0', key: '059de967d74b44bba170351aff279c63',
children: [], children: [],
options: {}, options: {},
defaultValue: '',
}, },
{ {
required: false, required: false,
...@@ -222,12 +206,12 @@ export const permissionList = [ ...@@ -222,12 +206,12 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '车辆重量(kg)', fieldName: '车辆品牌型号',
fieldId: 'clzl', fieldId: 'clppxh',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'number', type: 'input',
key: '059de967d74b44bba170351aff279c63', key: '45b440505abc47e2a61e9a0a459c67b2',
children: [], children: [],
options: {}, options: {},
defaultValue: '', defaultValue: '',
...@@ -239,12 +223,12 @@ export const permissionList = [ ...@@ -239,12 +223,12 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '车辆品牌型号', fieldName: '磅单数量',
fieldId: 'clppxh', fieldId: 'bdsl',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'input', type: 'number',
key: '45b440505abc47e2a61e9a0a459c67b2', key: '5bd116e5f35344cb8780f747370cee8d',
children: [], children: [],
options: {}, options: {},
defaultValue: '', defaultValue: '',
...@@ -256,12 +240,12 @@ export const permissionList = [ ...@@ -256,12 +240,12 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '工作开始时间', fieldName: '工作时长(h)',
fieldId: 'gzkssj', fieldId: 'gzsc',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'date', type: 'number',
key: '4da55e5ac2c04a2dacd2cd58470b6820', key: 'ae4a15e58ffe4710b337560f7d3b0703',
children: [], children: [],
options: {}, options: {},
defaultValue: '', defaultValue: '',
......
xjrsoft-vue3/src/views/chaiche/ccbg/index.vue
...@@ -82,9 +82,9 @@ ...@@ -82,9 +82,9 @@
import { useModal } from '/@/components/Modal'; import { useModal } from '/@/components/Modal';
import CcbgModal from './components/CcbgModal.vue'; import CcbgModal from './components/CcbgModal.vue';
import InWarehouse from './components/InWarehouse.vue'; import InWarehouse from './components/InWarehouse.vue';
...@@ -163,11 +163,11 @@ ...@@ -163,11 +163,11 @@
const selectedKeys = ref<string[]>([]); const selectedKeys = ref<string[]>([]);
const selectedRowsData = ref<any[]>([]); const selectedRowsData = ref<any[]>([]);
const [registerModal, { openModal }] = useModal(); const [registerModal, { openModal }] = useModal();
...@@ -182,8 +182,8 @@ ...@@ -182,8 +182,8 @@
formConfig: { formConfig: {
labelWidth: 100, labelWidth: 100,
schemas: searchFormSchema, schemas: searchFormSchema,
fieldMapToTime: [['gzjssj', ['gzjssjStart', 'gzjssjEnd'], 'YYYY-MM-DD HH:mm:ss ', true], fieldMapToTime: [['gzkssj', ['gzkssjStart', 'gzkssjEnd'], 'YYYY-MM-DD HH:mm:ss ', true],
['gzkssj', ['gzkssjStart', 'gzkssjEnd'], 'YYYY-MM-DD HH:mm:ss ', true],], ['gzjssj', ['gzjssjStart', 'gzjssjEnd'], 'YYYY-MM-DD HH:mm:ss ', true],],
showResetButton: false, showResetButton: false,
}, },
bordered:false, bordered:false,
...@@ -324,7 +324,7 @@ ...@@ -324,7 +324,7 @@
function handleInWarehouseCancel() { function handleInWarehouseCancel() {
showInWarehouse.value = false; showInWarehouse.value = false;
} }
function handleView(record: Recordable) { function handleView(record: Recordable) {
let info={ let info={
isView: true, isView: true,
......
xjrsoft-vue3/src/views/ckgl/xsck/components/config.ts
...@@ -10,12 +10,72 @@ export const searchFormSchema: FormSchema[] = [ ...@@ -10,12 +10,72 @@ 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: 'ck', field: 'ck',
label: '仓库', label: '仓库',
defaultValue: undefined, defaultValue: undefined,
component: 'Input', component: 'Input',
}, },
{ {
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: 'jbr',
label: '经办人',
defaultValue: undefined,
component: 'Input',
},
{
field: 'bm',
label: '部门',
defaultValue: undefined,
component: 'Input',
},
{
field: 'ddkh',
label: '订单客户',
defaultValue: undefined,
component: 'Input',
},
{
field: 'djzt',
label: '单据状态',
defaultValue: undefined,
component: 'XjrSelect',
componentProps: {
datasourceType: 'dic',
params: { itemId: '2010588655764074497' },
labelField: 'name',
valueField: 'value',
mode: 'multiple',
showSearch: true,
getPopupContainer: () => document.body,
},
},
{
field: 'ywzz', field: 'ywzz',
label: '业务组织', label: '业务组织',
defaultValue: undefined, defaultValue: undefined,
...@@ -31,11 +91,47 @@ export const searchFormSchema: FormSchema[] = [ ...@@ -31,11 +91,47 @@ export const searchFormSchema: FormSchema[] = [
}, },
}, },
{ {
field: 'cydw',
label: '承运单位',
defaultValue: undefined,
component: 'Input',
},
{
field: 'shrq',
label: '收货日期',
defaultValue: undefined,
component: 'RangePicker',
componentProps: {
format: 'YYYY-MM-DD HH:mm:ss',
style: { width: '100%' },
getPopupContainer: () => document.body,
},
},
{
field: 'shdz',
label: '收货地址',
defaultValue: undefined,
component: 'Input',
},
{
field: 'shrxm',
label: '收货人',
defaultValue: undefined,
component: 'Input',
},
{
field: 'pch', field: 'pch',
label: '批次号', label: '批次号',
defaultValue: undefined, defaultValue: undefined,
component: 'Input', component: 'Input',
}, },
{
field: 'bz',
label: '备注',
defaultValue: undefined,
component: 'Input',
},
]; ];
export const columns: BasicColumn[] = [ export const columns: BasicColumn[] = [
...@@ -184,19 +280,6 @@ export const columns: BasicColumn[] = [ ...@@ -184,19 +280,6 @@ export const columns: BasicColumn[] = [
{ {
resizable: true, resizable: true,
dataIndex: 'shr',
title: '收货人',
componentType: 'input',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: '',
},
{
resizable: true,
dataIndex: 'ywzz', dataIndex: 'ywzz',
title: '业务组织', title: '业务组织',
componentType: 'select', componentType: 'select',
...@@ -233,6 +316,19 @@ export const columns: BasicColumn[] = [ ...@@ -233,6 +316,19 @@ export const columns: BasicColumn[] = [
styleConfig: undefined, styleConfig: undefined,
listStyle: undefined, listStyle: undefined,
}, },
{
resizable: true,
dataIndex: 'shrxm',
title: '收货人',
componentType: 'input',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: '',
},
]; ];
//表头合并配置 //表头合并配置
export const headerMergingData = []; export const headerMergingData = [];
...@@ -639,7 +735,6 @@ export const formProps: FormProps = { ...@@ -639,7 +735,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: '2015724355955159041' }, params: { itemId: '2015724355955159041' },
labelField: 'name', labelField: 'name',
...@@ -774,7 +869,7 @@ export const formProps: FormProps = { ...@@ -774,7 +869,7 @@ export const formProps: FormProps = {
list: [ list: [
{ {
key: '4fb2b6b7dd9341d1b5dcf0968266269b', key: '4fb2b6b7dd9341d1b5dcf0968266269b',
field: 'shr', field: 'shrxm',
label: '收货人', label: '收货人',
type: 'input', type: 'input',
component: 'Input', component: 'Input',
...@@ -823,7 +918,6 @@ export const formProps: FormProps = { ...@@ -823,7 +918,6 @@ export const formProps: FormProps = {
span: 8, span: 8,
defaultValue: '', defaultValue: '',
placeholder: '请输入批次号', placeholder: '请输入批次号',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
......
xjrsoft-vue3/src/views/ckgl/xsck/components/workflowPermission.ts
...@@ -207,7 +207,7 @@ export const permissionList = [ ...@@ -207,7 +207,7 @@ export const permissionList = [
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '收货人', fieldName: '收货人',
fieldId: 'shr', fieldId: 'shrxm',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'input', type: 'input',
......
xjrsoft-vue3/src/views/ckgl/xsck/index.vue
...@@ -184,7 +184,8 @@ ...@@ -184,7 +184,8 @@
formConfig: { formConfig: {
labelWidth: 100, labelWidth: 100,
schemas: searchFormSchema, schemas: searchFormSchema,
fieldMapToTime: [], fieldMapToTime: [['djrq', ['djrqStart', 'djrqEnd'], 'YYYY-MM-DD HH:mm:ss ', true],
['shrq', ['shrqStart', 'shrqEnd'], 'YYYY-MM-DD HH:mm:ss ', true],],
showResetButton: false, showResetButton: false,
}, },
bordered:false, bordered:false,
......
xjrsoft-vue3/src/views/jcsj/gylx/components/config.ts
...@@ -595,7 +595,7 @@ export const formProps: FormProps = { ...@@ -595,7 +595,7 @@ export const formProps: FormProps = {
{ name: 'category_id', tableTitle: '工序类别' }, { name: 'category_id', tableTitle: '工序类别' },
{ name: 'id', tableTitle: 'ID' }, { name: 'id', tableTitle: 'ID' },
{ tableTitle: '采集方案ID', name: 'collection_scheme_id' }, { tableTitle: '采集方案ID', name: 'collection_scheme_id' },
{ name: 'rated_working_hours', tableTitle: '额工时定' }, { name: 'rated_working_hours', tableTitle: '额定工时' },
], ],
}, },
itemId: '', itemId: '',
......
xjrsoft-vue3/src/views/jcsj/wlqd/components/workflowPermission.ts
...@@ -57,7 +57,7 @@ export const permissionList = [ ...@@ -57,7 +57,7 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '选择产品', fieldName: '产品',
fieldId: 'cpid', fieldId: 'cpid',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
...@@ -176,7 +176,7 @@ export const permissionList = [ ...@@ -176,7 +176,7 @@ export const permissionList = [
isSubTable: true, isSubTable: true,
showChildren: false, showChildren: false,
tableName: 'mesBaseBomItemList', tableName: 'mesBaseBomItemList',
fieldName: '物料项', fieldName: '',
fieldId: 'mesBaseBomItemList', fieldId: 'mesBaseBomItemList',
type: 'form', type: 'form',
key: 'c87fc2d18e24429a819521f35f19137b', key: 'c87fc2d18e24429a819521f35f19137b',
...@@ -190,21 +190,6 @@ export const permissionList = [ ...@@ -190,21 +190,6 @@ export const permissionList = [
isSaveTable: false, isSaveTable: false,
showChildren: false, showChildren: false,
tableName: 'mesBaseBomItemList', tableName: 'mesBaseBomItemList',
fieldName: '选择物料',
fieldId: 'wlmc',
type: 'MultiplePopup',
key: '709b38c05d11468db0db4e6e9168e4f9',
children: [],
},
{
required: true,
view: true,
edit: true,
disabled: false,
isSubTable: false,
isSaveTable: false,
showChildren: false,
tableName: 'mesBaseBomItemList',
fieldName: '物料编号', fieldName: '物料编号',
fieldId: 'wlbh', fieldId: 'wlbh',
type: 'Input', type: 'Input',
...@@ -221,7 +206,7 @@ export const permissionList = [ ...@@ -221,7 +206,7 @@ export const permissionList = [
showChildren: false, showChildren: false,
tableName: 'mesBaseBomItemList', tableName: 'mesBaseBomItemList',
fieldName: '物料名称', fieldName: '物料名称',
fieldId: 'wuLiaoMingChen9398', fieldId: 'wlmc',
type: 'Input', type: 'Input',
key: '112f6292bd884006ad872f06aeef4e6f', key: '112f6292bd884006ad872f06aeef4e6f',
children: [], children: [],
...@@ -316,6 +301,21 @@ export const permissionList = [ ...@@ -316,6 +301,21 @@ export const permissionList = [
key: '9230b500d1024028af68ed4ac49bdbd3', key: '9230b500d1024028af68ed4ac49bdbd3',
children: [], children: [],
}, },
{
required: true,
view: true,
edit: true,
disabled: false,
isSubTable: false,
isSaveTable: false,
showChildren: false,
tableName: 'mesBaseBomItemList',
fieldName: '物料ID',
fieldId: 'wlid',
type: 'Input',
key: '998cedda278d4544ab851536bae4aacc',
children: [],
},
], ],
}, },
]; ];
xjrsoft-vue3/src/views/scgl/scjh/components/Form.vue
...@@ -222,3 +222,4 @@ ...@@ -222,3 +222,4 @@
}); });
</script> </script>
\ No newline at end of file
xjrsoft-vue3/src/views/scgl/scjh/components/workflowPermission.ts
...@@ -33,7 +33,7 @@ export const permissionList = [ ...@@ -33,7 +33,7 @@ export const permissionList = [
defaultValue: '', defaultValue: '',
}, },
{ {
required: true, required: false,
view: true, view: true,
edit: true, edit: true,
disabled: false, disabled: false,
...@@ -169,7 +169,7 @@ export const permissionList = [ ...@@ -169,7 +169,7 @@ export const permissionList = [
isSaveTable: false, isSaveTable: false,
showChildren: false, showChildren: false,
tableName: 'mesProductionPlanProductList', tableName: 'mesProductionPlanProductList',
fieldName: '物料编号', fieldName: '编号',
fieldId: 'cpbh', fieldId: 'cpbh',
type: 'Input', type: 'Input',
key: 'cd0038f42bc64c189b3821f0e2061321', key: 'cd0038f42bc64c189b3821f0e2061321',
...@@ -184,6 +184,21 @@ export const permissionList = [ ...@@ -184,6 +184,21 @@ export const permissionList = [
isSaveTable: false, isSaveTable: false,
showChildren: false, showChildren: false,
tableName: 'mesProductionPlanProductList', tableName: 'mesProductionPlanProductList',
fieldName: '名称',
fieldId: 'cpmc',
type: 'Input',
key: 'c8f88cafd17f4655bfbe4643ffe58c9c',
children: [],
},
{
required: true,
view: true,
edit: true,
disabled: false,
isSubTable: false,
isSaveTable: false,
showChildren: false,
tableName: 'mesProductionPlanProductList',
fieldName: '内部代码', fieldName: '内部代码',
fieldId: 'nbdm', fieldId: 'nbdm',
type: 'Input', type: 'Input',
......
xjrsoft-vue3/src/views/scgl/scjh/index.vue
<template> <template>
<ResizePageWrapper :hasLeft="false"> <ResizePageWrapper :hasLeft="false">
<template #resizeRight> <template #resizeRight>
...@@ -26,28 +27,45 @@ ...@@ -26,28 +27,45 @@
</template> </template>
</template> </template>
<template #bodyCell="{ column, record }"> <template #bodyCell="{ column, record }">
<template v-if="column.dataIndex === 'action'"> <template v-if="column.dataIndex === 'action'">
<TableAction
<TableAction
:actions="getLessActions(record)" :actions="getLessActions(record)"
:dropDownActions="getMoreActions(record)" :dropDownActions="getMoreActions(record)"
/> />
</template> </template>
<template v-else-if="column.dataIndex && column?.listStyle"> <template v-else-if="column.dataIndex && column?.listStyle">
<span :style="executeListStyle(getValue(record, column, 'style'), column?.listStyle)">{{ <span :style="executeListStyle(getValue(record, column, 'style'), column?.listStyle)">{{
getValue(record, column, 'value') getValue(record, column, 'value')
}}</span> }}</span>
</template> </template>
</template> </template>
</BasicTable> </BasicTable>
</template> </template>
<ScjhModal @register="registerModal" @success="handleFormSuccess" @cancel="handleFormCancel"/>
</ResizePageWrapper>
<ScjhModal @register="registerModal" @success="handleFormSuccess" @cancel="handleFormCancel" />
</ResizePageWrapper>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { ref, computed, provide, Ref, createVNode } from 'vue'; import { ref, computed,provide,Ref, createVNode,
} from 'vue';
import { Modal } from 'ant-design-vue'; import { Modal } from 'ant-design-vue';
import { ExclamationCircleOutlined } from '@ant-design/icons-vue'; import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
import { BasicTable, useTable, TableAction, ActionItem } from '/@/components/Table'; import { BasicTable, useTable, TableAction, ActionItem } from '/@/components/Table';
...@@ -60,20 +78,46 @@ ...@@ -60,20 +78,46 @@
import { useMessage } from '/@/hooks/web/useMessage'; import { useMessage } from '/@/hooks/web/useMessage';
import { useI18n } from '/@/hooks/web/useI18n'; import { useI18n } from '/@/hooks/web/useI18n';
import { usePermission } from '/@/hooks/web/usePermission'; import { usePermission } from '/@/hooks/web/usePermission';
import CustomButtonModal from '/@/components/Form/src/components/CustomButtonModal.vue'; import CustomButtonModal from '/@/components/Form/src/components/CustomButtonModal.vue';
import { executeListStyle, getValue } from '/@/hooks/web/useListStyle'; //列表样式配置 import { executeListStyle, getValue } from '/@/hooks/web/useListStyle';//列表样式配置
import { useRouter } from 'vue-router'; import { useRouter } from 'vue-router';
import { useModal } from '/@/components/Modal'; import { useModal } from '/@/components/Modal';
import ScjhModal from './components/ScjhModal.vue'; import ScjhModal from './components/ScjhModal.vue';
import { searchFormSchema, columns } from './components/config';
import { searchFormSchema, columns } from './components/config';
import Icon from '/@/components/Icon/index'; import Icon from '/@/components/Icon/index';
const listSpliceNum = ref(3); //操作列最先展示几个
const listSpliceNum = ref(3); //操作列最先展示几个
import { useConcurrentLock } from '/@/hooks/web/useConcurrentLock'; import { useConcurrentLock } from '/@/hooks/web/useConcurrentLock';
const pageParamsInfo = ref<any>({}); const pageParamsInfo = ref<any>({});
...@@ -91,7 +135,12 @@ ...@@ -91,7 +135,12 @@
const filterColumns = filterColumnAuth(columns); const filterColumns = filterColumnAuth(columns);
const tableRef = ref(); const tableRef = ref();
//展示在列表内的按钮 //展示在列表内的按钮
const actionButtons = ref<string[]>(['view', 'edit', 'delete']); const actionButtons = ref<string[]>(['view', 'edit', 'delete']);
const buttonConfigs = computed(() => { const buttonConfigs = computed(() => {
...@@ -161,13 +210,19 @@ ...@@ -161,13 +210,19 @@
}; };
const { currentRoute } = useRouter(); const { currentRoute } = useRouter();
const formIdComputedRef = computed(() => currentRoute.value.meta.formId as string); const formIdComputedRef = computed(() => currentRoute.value.meta.formId as string);
provide<Ref<string>>('currentFormId', formIdComputedRef); provide<Ref<string>>('currentFormId', formIdComputedRef);
const selectedKeys = ref<string[]>([]); const selectedKeys = ref<string[]>([]);
const selectedRowsData = ref<any[]>([]); const selectedRowsData = ref<any[]>([]);
const [registerModal, { openModal }] = useModal(); const [registerModal, { openModal }] = useModal();
const [registerTable, { reload }] = useTable({ const [registerTable, { reload }] = useTable({
...@@ -184,18 +239,25 @@ ...@@ -184,18 +239,25 @@
fieldMapToTime: [], fieldMapToTime: [],
showResetButton: false, showResetButton: false,
}, },
bordered: false, bordered:false,
beforeFetch: (params) => { beforeFetch: (params) => {
pageParamsInfo.value = { ...params, FormId: formIdComputedRef.value, PK: 'id' }; pageParamsInfo.value = {...params, FormId: formIdComputedRef.value,PK: 'id' }
return pageParamsInfo.value; return pageParamsInfo.value;
}, },
afterFetch: (res) => { afterFetch: (res) => {
selectedKeys.value = []; selectedKeys.value = [];
selectedRowsData.value = []; selectedRowsData.value = [];
}, },
useSearchForm: true, useSearchForm: true,
showTableSetting: true, showTableSetting: true,
striped: false, striped: false,
actionColumn: { actionColumn: {
width: 195, width: 195,
...@@ -207,44 +269,53 @@ ...@@ -207,44 +269,53 @@
size: false, size: false,
}, },
customRow, customRow,
isAdvancedQuery: false, isAdvancedQuery: false,
querySelectOption: JSON.stringify(searchFormSchema), querySelectOption: JSON.stringify(searchFormSchema),
objectId: formIdComputedRef.value, ////系统表单formId,自定义表单releaseId的id值 objectId: formIdComputedRef.value, ////系统表单formId,自定义表单releaseId的id值
}); });
function buttonClick(code) { function buttonClick(code) {
btnEvent[code](); btnEvent[code]();
} }
function handleAdd() { function handleAdd() {
openModal(true, { isUpdate: false }); openModal(true, { isUpdate: false });
} }
async function handleEdit(record: Recordable) { async function handleEdit(record: Recordable) {
let field = 'id'; let field = 'id';
try { try {
let hasIn = handleHasEnableLocke(buttonConfigs.value, 'edit'); let hasIn = handleHasEnableLocke(buttonConfigs.value, 'edit');
if (hasIn) { if (hasIn) {
let res = await handleOpenFormEnableLockeData(record[field], formIdComputedRef.value); let res = await handleOpenFormEnableLockeData(record[field], formIdComputedRef.value);
if (res !== null) { if (res !== null) {
return; return;
} }
} }
let info = { let info = {
id: record[field], id: record[field],
isUpdate: true, isUpdate: true,
};
};
openModal(true, info);
} catch (error) {} openModal(true, info);
} catch (error) {}
} }
function handleDelete(record: Recordable) { function handleDelete(record: Recordable) {
deleteList([record.id]); deleteList([record.id]);
} }
function deleteList(ids) { function deleteList(ids) {
Modal.confirm({ Modal.confirm({
title: '提示信息', title: '提示信息',
...@@ -264,14 +335,19 @@ ...@@ -264,14 +335,19 @@
onCancel() {}, onCancel() {},
}); });
} }
function onSelectChange(selectedRowKeys: [], selectedRows) { function onSelectChange(selectedRowKeys: [], selectedRows) {
selectedKeys.value = selectedRowKeys; selectedKeys.value = selectedRowKeys;
selectedRowsData.value = selectedRows; selectedRowsData.value = selectedRows;
} }
function customRow(record: Recordable) { function customRow(record: Recordable) {
return { return {
onClick: () => { onClick: () => {
let selectedRowKeys = [...selectedKeys.value]; let selectedRowKeys = [...selectedKeys.value];
if (selectedRowKeys.indexOf(record.id) >= 0) { if (selectedRowKeys.indexOf(record.id) >= 0) {
...@@ -289,14 +365,18 @@ ...@@ -289,14 +365,18 @@
}, },
}; };
} }
function handleSuccess() { function handleSuccess() {
selectedKeys.value = [];
selectedRowsData.value = [];
selectedKeys.value = [];
selectedRowsData.value = [];
reload(); reload();
} }
function handleFormSuccess() {
function handleFormSuccess() {
handleSuccess(); handleSuccess();
handleCloseFormEnableLocke(buttonConfigs.value, 'edit'); handleCloseFormEnableLocke(buttonConfigs.value, 'edit');
} }
...@@ -304,13 +384,14 @@ ...@@ -304,13 +384,14 @@
handleCloseFormEnableLocke(buttonConfigs.value, 'edit'); handleCloseFormEnableLocke(buttonConfigs.value, 'edit');
} }
function handleView(record: Recordable) { function handleView(record: Recordable) {
let info = { let info={
isView: true, isView: true,
id: record.id, id: record.id,
}; };
openModal(true, info); openModal(true, info);
} }
function handleXiafa(record: Recordable) { function handleXiafa(record: Recordable) {
...@@ -348,16 +429,16 @@ ...@@ -348,16 +429,16 @@
let list = getActions(record); let list = getActions(record);
return list.slice(listSpliceNum.value); return list.slice(listSpliceNum.value);
} }
function getActions(record: Recordable): ActionItem[] { function getActions(record: Recordable):ActionItem[] {
record.isCanEdit = false; record.isCanEdit = false;
let actionsList: ActionItem[] = []; let actionsList: ActionItem[] = [];
actionButtonConfig.value?.map((button) => { actionButtonConfig.value?.map((button) => {
if (!record?.workflowData?.processId) { if (!record?.workflowData?.processId) {
record.isCanEdit = true; record.isCanEdit = true;
actionsList.push({ actionsList.push({
...button, ...button,
auth: `scjh:${button.code}`, auth: `scjh:${button.code}`,
label: button?.name, label: button?.name,
color: button.code === 'delete' ? 'error' : undefined, color: button.code === 'delete' ? 'error' : undefined,
...@@ -370,22 +451,29 @@ ...@@ -370,22 +451,29 @@
label: button?.name, label: button?.name,
onClick: btnEvent[button.code]?.bind(null, record), onClick: btnEvent[button.code]?.bind(null, record),
}); });
} }
} }
}); });
return actionsList; return actionsList;
} }
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
:deep(.ant-table-selection-col) { :deep(.ant-table-selection-col) {
width: 50px; width: 50px;
} }
.show { .show{
display: flex; display: flex;
} }
.hide { .hide{
display: none !important; display: none !important;
} }
</style> </style>
xjrsoft-vue3/src/views/scgl/scrw/components/config.ts
...@@ -854,7 +854,7 @@ export const formProps: FormProps = { ...@@ -854,7 +854,7 @@ export const formProps: FormProps = {
disabled: false, disabled: false,
showLabel: true, showLabel: true,
controls: true, controls: true,
required: false, required: true,
subTotal: false, subTotal: false,
isShow: true, isShow: true,
rules: [], rules: [],
......
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