Skip to content

W
weiqiao-vue
Commit 9765a358 by sunguoxiang
Options

Merge branch 'hongshun' into hongshun-sun

parents 6e3fa42c a3067df6
Showing with 519 additions and 153 deletions
xjrsoft-vue3/src/api/chaiche/ccbg/model/CcbgModel.ts
......@@ -4,25 +4,25 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel';
* @description: MesCheliangBg分页参数 模型
*/
export interface MesCheliangBgPageParams extends BasicPageParams {
banzu: string;
cphm: string;
clys: string;
gzjssj: string;
gzr: string;
gzkssj: string;
cllx: string;
wlzt: string;
clls: string;
gzxm: string;
clppxh: string;
gzjssj: string;
gzkssj: string;
wlzt: string;
clppxh: string;
}
/**
......@@ -56,8 +56,6 @@ export interface MesCheliangBgPageModel {
gzsc: 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';
export interface MesWarehouseSaleoutPageParams extends BasicPageParams {
djbh: string;
djrq: string;
ck: string;
crklx: string;
jbr: string;
bm: string;
ddkh: string;
djzt: string;
ywzz: string;
cydw: string;
shrq: string;
shdz: string;
shrxm: string;
pch: string;
bz: string;
}
/**
......@@ -41,13 +63,13 @@ export interface MesWarehouseSaleoutPageModel {
shdz: string;
shr: string;
ywzz: string;
djzt: string;
bz: string;
shrxm: string;
}
/**
......@@ -84,7 +106,7 @@ export interface MesWarehouseSaleoutModel {
shdz: string;
shr: string;
shrxm: string;
bz: string;
......
xjrsoft-vue3/src/api/jcsj/wlqd/model/WlqdModel.ts
......@@ -7,8 +7,6 @@ export interface MesBaseBomPageParams extends BasicPageParams {
bommc: string;
cpid: string;
sfyy: string;
}
/**
......@@ -19,15 +17,17 @@ export interface MesBaseBomPageModel {
bommc: string;
bomsl: string;
bombb: string;
cpmc: string;
cpbh: string;
cpgg: string;
cpxh: string;
bomsl: string;
bombb: string;
}
/**
......@@ -86,6 +86,8 @@ export interface MesBaseBomModel {
modifyUserId: string;
sjbom: string;
mesBaseBomItemList?: MesBaseBomItemModel;
}
......@@ -99,6 +101,8 @@ export interface MesBaseBomItemModel {
bomid: string;
wlid: string;
wlbh: string;
wlmc: string;
......
xjrsoft-vue3/src/api/scgl/scjh/model/ScjhModel.ts
......@@ -6,9 +6,9 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel';
export interface MesProductionPlanPageParams extends BasicPageParams {
jhbh: string;
ddbh: string;
kh: string;
ssgs: string;
ywzz: string;
zt: string;
}
......@@ -19,13 +19,15 @@ export interface MesProductionPlanPageParams extends BasicPageParams {
export interface MesProductionPlanPageModel {
id: string;
ddbh: string;
jhbh: string;
ddbh: string;
kh: string;
ssgs: string;
jhjhrq: string;
ywzz: string;
zt: string;
}
......@@ -107,6 +109,8 @@ export interface MesProductionPlanProductModel {
cpbh: string;
cpmc: string;
nbdm: string;
hjzt: string;
......
xjrsoft-vue3/src/views/chaiche/ccbg/components/CcbgModal.vue
......@@ -135,3 +135,4 @@
</script>
\ No newline at end of file
xjrsoft-vue3/src/views/chaiche/ccbg/components/workflowPermission.ts
......@@ -23,22 +23,6 @@ export const permissionList = [
disabled: false,
isSaveTable: false,
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: '车牌号码',
fieldId: 'cphm',
isSubTable: false,
......@@ -72,12 +56,12 @@ export const permissionList = [
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '工作结束时间',
fieldId: 'gzjssj',
fieldName: '工作人',
fieldId: 'gzr',
isSubTable: false,
showChildren: true,
type: 'date',
key: 'a349e957579e47cb90727cdfa8c9d21f',
type: 'user',
key: '21906e99fb08459ea4318c04707797ca',
children: [],
options: {},
defaultValue: '',
......@@ -89,12 +73,12 @@ export const permissionList = [
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '车辆id',
fieldId: 'cheliangId',
fieldName: '工作开始时间',
fieldId: 'gzkssj',
isSubTable: false,
showChildren: true,
type: 'input',
key: 'e1221f5840d7486588dd2c1e086af59d',
type: 'date',
key: '4da55e5ac2c04a2dacd2cd58470b6820',
children: [],
options: {},
defaultValue: '',
......@@ -106,12 +90,12 @@ export const permissionList = [
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '工作人',
fieldId: 'gzr',
fieldName: '车辆id',
fieldId: 'cheliangId',
isSubTable: false,
showChildren: true,
type: 'user',
key: '21906e99fb08459ea4318c04707797ca',
type: 'input',
key: 'e1221f5840d7486588dd2c1e086af59d',
children: [],
options: {},
defaultValue: '',
......@@ -156,15 +140,14 @@ export const permissionList = [
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '磅单数量',
fieldId: 'bdsl',
fieldName: '工作项目',
fieldId: 'gzxm',
isSubTable: false,
showChildren: true,
type: 'number',
key: '5bd116e5f35344cb8780f747370cee8d',
type: 'associate-popup',
key: '0d265387754f487886c4b77058fd49a0',
children: [],
options: {},
defaultValue: '',
},
{
required: false,
......@@ -173,12 +156,12 @@ export const permissionList = [
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '工作时长(h)',
fieldId: 'gzsc',
fieldName: '工作结束时间',
fieldId: 'gzjssj',
isSubTable: false,
showChildren: true,
type: 'number',
key: 'ae4a15e58ffe4710b337560f7d3b0703',
type: 'date',
key: 'a349e957579e47cb90727cdfa8c9d21f',
children: [],
options: {},
defaultValue: '',
......@@ -206,14 +189,15 @@ export const permissionList = [
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '工作项目',
fieldId: 'gzxm',
fieldName: '车辆重量(kg)',
fieldId: 'clzl',
isSubTable: false,
showChildren: true,
type: 'associate-popup',
key: '0d265387754f487886c4b77058fd49a0',
type: 'number',
key: '059de967d74b44bba170351aff279c63',
children: [],
options: {},
defaultValue: '',
},
{
required: false,
......@@ -222,12 +206,12 @@ export const permissionList = [
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '车辆重量(kg)',
fieldId: 'clzl',
fieldName: '车辆品牌型号',
fieldId: 'clppxh',
isSubTable: false,
showChildren: true,
type: 'number',
key: '059de967d74b44bba170351aff279c63',
type: 'input',
key: '45b440505abc47e2a61e9a0a459c67b2',
children: [],
options: {},
defaultValue: '',
......@@ -239,12 +223,12 @@ export const permissionList = [
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '车辆品牌型号',
fieldId: 'clppxh',
fieldName: '磅单数量',
fieldId: 'bdsl',
isSubTable: false,
showChildren: true,
type: 'input',
key: '45b440505abc47e2a61e9a0a459c67b2',
type: 'number',
key: '5bd116e5f35344cb8780f747370cee8d',
children: [],
options: {},
defaultValue: '',
......@@ -256,12 +240,12 @@ export const permissionList = [
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '工作开始时间',
fieldId: 'gzkssj',
fieldName: '工作时长(h)',
fieldId: 'gzsc',
isSubTable: false,
showChildren: true,
type: 'date',
key: '4da55e5ac2c04a2dacd2cd58470b6820',
type: 'number',
key: 'ae4a15e58ffe4710b337560f7d3b0703',
children: [],
options: {},
defaultValue: '',
......
xjrsoft-vue3/src/views/chaiche/ccbg/index.vue
......@@ -182,8 +182,8 @@
formConfig: {
labelWidth: 100,
schemas: searchFormSchema,
fieldMapToTime: [['gzjssj', ['gzjssjStart', 'gzjssjEnd'], 'YYYY-MM-DD HH:mm:ss ', true],
['gzkssj', ['gzkssjStart', 'gzkssjEnd'], 'YYYY-MM-DD HH:mm:ss ', true],],
fieldMapToTime: [['gzkssj', ['gzkssjStart', 'gzkssjEnd'], 'YYYY-MM-DD HH:mm:ss ', true],
['gzjssj', ['gzjssjStart', 'gzjssjEnd'], 'YYYY-MM-DD HH:mm:ss ', true],],
showResetButton: false,
},
bordered:false,
......
xjrsoft-vue3/src/views/ckgl/xsck/components/config.ts
......@@ -10,12 +10,72 @@ export const searchFormSchema: FormSchema[] = [
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',
label: '仓库',
defaultValue: undefined,
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',
label: '业务组织',
defaultValue: undefined,
......@@ -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',
label: '批次号',
defaultValue: undefined,
component: 'Input',
},
{
field: 'bz',
label: '备注',
defaultValue: undefined,
component: 'Input',
},
];
export const columns: BasicColumn[] = [
......@@ -184,19 +280,6 @@ export const columns: BasicColumn[] = [
{
resizable: true,
dataIndex: 'shr',
title: '收货人',
componentType: 'input',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: '',
},
{
resizable: true,
dataIndex: 'ywzz',
title: '业务组织',
componentType: 'select',
......@@ -233,6 +316,19 @@ export const columns: BasicColumn[] = [
styleConfig: undefined,
listStyle: undefined,
},
{
resizable: true,
dataIndex: 'shrxm',
title: '收货人',
componentType: 'input',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: '',
},
];
//表头合并配置
export const headerMergingData = [];
......@@ -639,7 +735,6 @@ export const formProps: FormProps = {
{ key: 2, label: 'Option 2', value: 'Option 2' },
{ key: 3, label: 'Option 3', value: 'Option 3' },
],
defaultSelect: null,
datasourceType: 'dic',
params: { itemId: '2015724355955159041' },
labelField: 'name',
......@@ -774,7 +869,7 @@ export const formProps: FormProps = {
list: [
{
key: '4fb2b6b7dd9341d1b5dcf0968266269b',
field: 'shr',
field: 'shrxm',
label: '收货人',
type: 'input',
component: 'Input',
......@@ -823,7 +918,6 @@ export const formProps: FormProps = {
span: 8,
defaultValue: '',
placeholder: '请输入批次号',
maxlength: null,
prefix: '',
suffix: '',
addonBefore: '',
......
xjrsoft-vue3/src/views/ckgl/xsck/components/workflowPermission.ts
......@@ -207,7 +207,7 @@ export const permissionList = [
isSaveTable: false,
tableName: '',
fieldName: '收货人',
fieldId: 'shr',
fieldId: 'shrxm',
isSubTable: false,
showChildren: true,
type: 'input',
......
xjrsoft-vue3/src/views/ckgl/xsck/index.vue
......@@ -184,7 +184,8 @@
formConfig: {
labelWidth: 100,
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,
},
bordered:false,
......
xjrsoft-vue3/src/views/jcsj/gylx/components/config.ts
......@@ -595,7 +595,7 @@ export const formProps: FormProps = {
{ name: 'category_id', tableTitle: '工序类别' },
{ name: 'id', tableTitle: 'ID' },
{ tableTitle: '采集方案ID', name: 'collection_scheme_id' },
{ name: 'rated_working_hours', tableTitle: '额工时定' },
{ name: 'rated_working_hours', tableTitle: '额定工时' },
],
},
itemId: '',
......
xjrsoft-vue3/src/views/jcsj/wlqd/components/workflowPermission.ts
......@@ -57,7 +57,7 @@ export const permissionList = [
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '选择产品',
fieldName: '产品',
fieldId: 'cpid',
isSubTable: false,
showChildren: true,
......@@ -176,7 +176,7 @@ export const permissionList = [
isSubTable: true,
showChildren: false,
tableName: 'mesBaseBomItemList',
fieldName: '物料项',
fieldName: '',
fieldId: 'mesBaseBomItemList',
type: 'form',
key: 'c87fc2d18e24429a819521f35f19137b',
......@@ -190,21 +190,6 @@ export const permissionList = [
isSaveTable: false,
showChildren: false,
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: '物料编号',
fieldId: 'wlbh',
type: 'Input',
......@@ -221,7 +206,7 @@ export const permissionList = [
showChildren: false,
tableName: 'mesBaseBomItemList',
fieldName: '物料名称',
fieldId: 'wuLiaoMingChen9398',
fieldId: 'wlmc',
type: 'Input',
key: '112f6292bd884006ad872f06aeef4e6f',
children: [],
......@@ -316,6 +301,21 @@ export const permissionList = [
key: '9230b500d1024028af68ed4ac49bdbd3',
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 @@
});
</script>
\ No newline at end of file
xjrsoft-vue3/src/views/scgl/scjh/components/workflowPermission.ts
......@@ -33,7 +33,7 @@ export const permissionList = [
defaultValue: '',
},
{
required: true,
required: false,
view: true,
edit: true,
disabled: false,
......@@ -169,7 +169,7 @@ export const permissionList = [
isSaveTable: false,
showChildren: false,
tableName: 'mesProductionPlanProductList',
fieldName: '物料编号',
fieldName: '编号',
fieldId: 'cpbh',
type: 'Input',
key: 'cd0038f42bc64c189b3821f0e2061321',
......@@ -184,6 +184,21 @@ export const permissionList = [
isSaveTable: false,
showChildren: false,
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: '内部代码',
fieldId: 'nbdm',
type: 'Input',
......
xjrsoft-vue3/src/views/scgl/scjh/index.vue
<template>
<ResizePageWrapper :hasLeft="false">
<template #resizeRight>
......@@ -26,7 +27,11 @@
</template>
</template>
<template #bodyCell="{ column, record }">
<template v-if="column.dataIndex === 'action'">
<TableAction
:actions="getLessActions(record)"
:dropDownActions="getMoreActions(record)"
......@@ -39,14 +44,27 @@
}}</span>
</template>
</template>
</BasicTable>
</template>
<ScjhModal @register="registerModal" @success="handleFormSuccess" @cancel="handleFormCancel" />
</ResizePageWrapper>
<ScjhModal @register="registerModal" @success="handleFormSuccess" @cancel="handleFormCancel"/>
</ResizePageWrapper>
</template>
<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 { ExclamationCircleOutlined } from '@ant-design/icons-vue';
......@@ -61,19 +79,45 @@
import { useI18n } from '/@/hooks/web/useI18n';
import { usePermission } from '/@/hooks/web/usePermission';
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 { useModal } from '/@/components/Modal';
import ScjhModal from './components/ScjhModal.vue';
import { searchFormSchema, columns } from './components/config';
import Icon from '/@/components/Icon/index';
const listSpliceNum = ref(3); //操作列最先展示几个
import { useConcurrentLock } from '/@/hooks/web/useConcurrentLock';
const pageParamsInfo = ref<any>({});
......@@ -92,6 +136,11 @@
const filterColumns = filterColumnAuth(columns);
const tableRef = ref();
//展示在列表内的按钮
const actionButtons = ref<string[]>(['view', 'edit', 'delete']);
const buttonConfigs = computed(() => {
......@@ -162,12 +211,18 @@
const { currentRoute } = useRouter();
const formIdComputedRef = computed(() => currentRoute.value.meta.formId as string);
provide<Ref<string>>('currentFormId', formIdComputedRef);
const selectedKeys = ref<string[]>([]);
const selectedRowsData = ref<any[]>([]);
const [registerModal, { openModal }] = useModal();
const [registerTable, { reload }] = useTable({
......@@ -184,18 +239,25 @@
fieldMapToTime: [],
showResetButton: false,
},
bordered: false,
bordered:false,
beforeFetch: (params) => {
pageParamsInfo.value = { ...params, FormId: formIdComputedRef.value, PK: 'id' };
pageParamsInfo.value = {...params, FormId: formIdComputedRef.value,PK: 'id' }
return pageParamsInfo.value;
},
afterFetch: (res) => {
selectedKeys.value = [];
selectedRowsData.value = [];
},
useSearchForm: true,
showTableSetting: true,
striped: false,
actionColumn: {
width: 195,
......@@ -212,10 +274,15 @@
objectId: formIdComputedRef.value, ////系统表单formId,自定义表单releaseId的id值
});
function buttonClick(code) {
btnEvent[code]();
}
function handleAdd() {
openModal(true, { isUpdate: false });
}
......@@ -235,12 +302,16 @@
id: record[field],
isUpdate: true,
};
openModal(true, info);
} catch (error) {}
}
function handleDelete(record: Recordable) {
deleteList([record.id]);
}
......@@ -265,6 +336,10 @@
});
}
function onSelectChange(selectedRowKeys: [], selectedRows) {
selectedKeys.value = selectedRowKeys;
selectedRowsData.value = selectedRows;
......@@ -272,6 +347,7 @@
function customRow(record: Recordable) {
return {
onClick: () => {
let selectedRowKeys = [...selectedKeys.value];
if (selectedRowKeys.indexOf(record.id) >= 0) {
......@@ -291,11 +367,15 @@
}
function handleSuccess() {
selectedKeys.value = [];
selectedRowsData.value = [];
reload();
}
function handleFormSuccess() {
handleSuccess();
handleCloseFormEnableLocke(buttonConfigs.value, 'edit');
......@@ -304,8 +384,9 @@
handleCloseFormEnableLocke(buttonConfigs.value, 'edit');
}
function handleView(record: Recordable) {
let info = {
let info={
isView: true,
id: record.id,
};
......@@ -348,7 +429,7 @@
let list = getActions(record);
return list.slice(listSpliceNum.value);
}
function getActions(record: Recordable): ActionItem[] {
function getActions(record: Recordable):ActionItem[] {
record.isCanEdit = false;
let actionsList: ActionItem[] = [];
......@@ -375,17 +456,24 @@
});
return actionsList;
}
</script>
<style lang="less" scoped>
:deep(.ant-table-selection-col) {
width: 50px;
}
.show {
.show{
display: flex;
}
.hide {
.hide{
display: none !important;
}
</style>
xjrsoft-vue3/src/views/scgl/scrw/components/config.ts
......@@ -854,7 +854,7 @@ export const formProps: FormProps = {
disabled: false,
showLabel: true,
controls: true,
required: false,
required: true,
subTotal: false,
isShow: true,
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