Skip to content

W
weiqiao-vue
Commit 2f1cc80f by 王宝涛
Options

feat(ccbg): 更新车辆报工功能的数据模型和界面配置 

- 调整MesCheliangBgPageModel接口字段顺序，添加bdsl和gzsc字段
- 修改查询参数配置，简化tableInfo结构
- 更新API路径从/cheliang/py-list到/cheliang/cc-list，调整API ID
- 优化SQL查询语句，添加车辆状态过滤条件
- 调整车牌号码显示标题为车辆重量(kg)
- 添加隐藏ID字段映射
- 交换工作人和工作项目的dataIndex和标题配置
- 新增磅单数量和工作时长列
- 移除多余的最大长度限制配置
- 统一车辆重量单位显示为(kg)
- 调整表单字段名称和组件配置
- 更新搜索表单中的关联弹窗配置
- 重新组织表单布局和组件属性配置
- 更新上传组件的文件类型和多选设置
parent 0f3a09a5
Showing with 599 additions and 383 deletions
xjrsoft-vue3/src/api/chaiche/ccbg/model/CcbgModel.ts
...@@ -27,10 +27,10 @@ export interface MesCheliangBgPageParams extends BasicPageParams { ...@@ -27,10 +27,10 @@ export interface MesCheliangBgPageParams extends BasicPageParams {
export interface MesCheliangBgPageModel { export interface MesCheliangBgPageModel {
id: string; id: string;
gzxm: string;
gzr: string; gzr: string;
gzxm: string;
cphm: string; cphm: string;
cllx: string; cllx: string;
...@@ -46,6 +46,10 @@ export interface MesCheliangBgPageModel { ...@@ -46,6 +46,10 @@ export interface MesCheliangBgPageModel {
gzjssj: string; gzjssj: string;
clls: string; clls: string;
bdsl: string;
gzsc: string;
} }
/** /**
......
xjrsoft-vue3/src/api/chaiche/pybg/index.ts
import { MesCheliangPybgPageModel, MesCheliangPybgPageParams, MesCheliangPybgPageResult } from './model/PybgModel'; import { MesCheliangBgPageModel, MesCheliangBgPageParams, MesCheliangBgPageResult } from './model/PybgModel';
import { defHttp } from '/@/utils/http/axios'; import { defHttp } from '/@/utils/http/axios';
import { ErrorMessageMode } from '/#/axios'; import { ErrorMessageMode } from '/#/axios';
...@@ -7,17 +7,17 @@ enum Api { ...@@ -7,17 +7,17 @@ enum Api {
Page = '/chaiche/pybg/page', Page = '/chaiche/pybg/page',
List = '/chaiche/pybg/list', List = '/chaiche/pybg/list',
Info = '/chaiche/pybg/info', Info = '/chaiche/pybg/info',
MesCheliangPybg = '/chaiche/pybg', MesCheliangBg = '/chaiche/pybg',
} }
/** /**
* @description: 查询MesCheliangPybg分页列表 * @description: 查询MesCheliangBg分页列表
*/ */
export async function getMesCheliangPybgPage(params: MesCheliangPybgPageParams, mode: ErrorMessageMode = 'modal') { export async function getMesCheliangBgPage(params: MesCheliangBgPageParams, mode: ErrorMessageMode = 'modal') {
return defHttp.get<MesCheliangPybgPageResult>( return defHttp.get<MesCheliangBgPageResult>(
{ {
url: Api.Page, url: Api.Page,
params, params,
...@@ -29,10 +29,10 @@ export async function getMesCheliangPybgPage(params: MesCheliangPybgPageParams, ...@@ -29,10 +29,10 @@ export async function getMesCheliangPybgPage(params: MesCheliangPybgPageParams,
} }
/** /**
* @description: 获取MesCheliangPybg信息 * @description: 获取MesCheliangBg信息
*/ */
export async function getMesCheliangPybg(id: String, mode: ErrorMessageMode = 'modal') { export async function getMesCheliangBg(id: String, mode: ErrorMessageMode = 'modal') {
return defHttp.get<MesCheliangPybgPageModel>( return defHttp.get<MesCheliangBgPageModel>(
{ {
url: Api.Info, url: Api.Info,
params: { id }, params: { id },
...@@ -44,13 +44,13 @@ export async function getMesCheliangPybg(id: String, mode: ErrorMessageMode = 'm ...@@ -44,13 +44,13 @@ export async function getMesCheliangPybg(id: String, mode: ErrorMessageMode = 'm
} }
/** /**
* @description: 新增MesCheliangPybg * @description: 新增MesCheliangBg
*/ */
export async function addMesCheliangPybg(mesCheliangPybg: Recordable, mode: ErrorMessageMode = 'modal') { export async function addMesCheliangBg(mesCheliangBg: Recordable, mode: ErrorMessageMode = 'modal') {
return defHttp.post<boolean>( return defHttp.post<boolean>(
{ {
url: Api.MesCheliangPybg, url: Api.MesCheliangBg,
params: mesCheliangPybg, params: mesCheliangBg,
}, },
{ {
errorMessageMode: mode, errorMessageMode: mode,
...@@ -59,13 +59,13 @@ export async function addMesCheliangPybg(mesCheliangPybg: Recordable, mode: Erro ...@@ -59,13 +59,13 @@ export async function addMesCheliangPybg(mesCheliangPybg: Recordable, mode: Erro
} }
/** /**
* @description: 更新MesCheliangPybg * @description: 更新MesCheliangBg
*/ */
export async function updateMesCheliangPybg(mesCheliangPybg: Recordable, mode: ErrorMessageMode = 'modal') { export async function updateMesCheliangBg(mesCheliangBg: Recordable, mode: ErrorMessageMode = 'modal') {
return defHttp.put<boolean>( return defHttp.put<boolean>(
{ {
url: Api.MesCheliangPybg, url: Api.MesCheliangBg,
params: mesCheliangPybg, params: mesCheliangBg,
}, },
{ {
errorMessageMode: mode, errorMessageMode: mode,
...@@ -74,12 +74,12 @@ export async function updateMesCheliangPybg(mesCheliangPybg: Recordable, mode: E ...@@ -74,12 +74,12 @@ export async function updateMesCheliangPybg(mesCheliangPybg: Recordable, mode: E
} }
/** /**
* @description: 删除MesCheliangPybg（批量删除） * @description: 删除MesCheliangBg（批量删除）
*/ */
export async function deleteMesCheliangPybg(ids: string[], mode: ErrorMessageMode = 'modal') { export async function deleteMesCheliangBg(ids: string[], mode: ErrorMessageMode = 'modal') {
return defHttp.delete<boolean>( return defHttp.delete<boolean>(
{ {
url: Api.MesCheliangPybg, url: Api.MesCheliangBg,
data: ids, data: ids,
}, },
{ {
......
xjrsoft-vue3/src/api/chaiche/pybg/model/PybgModel.ts
import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel'; import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel';
/** /**
* @description: MesCheliangPybg分页参数 模型 * @description: MesCheliangBg分页参数 模型
*/ */
export interface MesCheliangPybgPageParams extends BasicPageParams { export interface MesCheliangBgPageParams extends BasicPageParams {
cphm: string; cphm: string;
cllx: string; gzr: string;
clzl: string; gzkssj: string;
pyr: string; bglx: string;
gzxm: string; cllx: string;
gzkssj: string; gzxm: string;
gzjssj: string; gzjssj: string;
} }
/** /**
* @description: MesCheliangPybg分页返回值模型 * @description: MesCheliangBg分页返回值模型
*/ */
export interface MesCheliangPybgPageModel { export interface MesCheliangBgPageModel {
id: string; id: string;
cphm: string; cphm: string;
...@@ -31,24 +31,28 @@ export interface MesCheliangPybgPageModel { ...@@ -31,24 +31,28 @@ export interface MesCheliangPybgPageModel {
clzl: string; clzl: string;
pyr: string; gzr: string;
gzxm: string; gzxm: string;
gzkssj: string; gzkssj: string;
gzjssj: string; gzjssj: string;
clls: string;
} }
/** /**
* @description: MesCheliangPybg表类型 * @description: MesCheliangBg表类型
*/ */
export interface MesCheliangPybgModel { export interface MesCheliangBgModel {
id: string; id: string;
bglx: string;
cheliangId: string; cheliangId: string;
pyr: string; gzr: string;
gzxm: string; gzxm: string;
...@@ -58,15 +62,57 @@ export interface MesCheliangPybgModel { ...@@ -58,15 +62,57 @@ export interface MesCheliangPybgModel {
clzl: string; clzl: string;
pyyclls: string; clppxh: string;
clys: string;
clls: string;
gzkssj: string; gzkssj: string;
gzjssj: string; gzjssj: string;
yclqzp: string; clqzp1: string;
clqzp2: string;
clhzp1: string;
clhzp2: string;
bdsl: string;
bdzp: string;
gbswzp: string;
gznr: string;
gzsc: string;
sfwgcj: string;
drzcl: string;
kjsj: string;
tjsj: string;
kjsc: string;
kjhdl: string;
yxhm: string;
pslb: string;
ghcj: string;
dhch: string;
dhpsxx: string;
yclhzp: string; dhxx: string;
bz: string; bz: string;
...@@ -80,6 +126,6 @@ export interface MesCheliangPybgModel { ...@@ -80,6 +126,6 @@ export interface MesCheliangPybgModel {
} }
/** /**
* @description: MesCheliangPybg分页返回值结构 * @description: MesCheliangBg分页返回值结构
*/ */
export type MesCheliangPybgPageResult = BasicFetchResult<MesCheliangPybgPageModel>; export type MesCheliangBgPageResult = BasicFetchResult<MesCheliangBgPageModel>;
xjrsoft-vue3/src/views/chaiche/ccbg/components/config.ts
...@@ -62,22 +62,7 @@ export const searchFormSchema: FormSchema[] = [ ...@@ -62,22 +62,7 @@ export const searchFormSchema: FormSchema[] = [
{ {
key: '1', key: '1',
title: 'Query Params', title: 'Query Params',
tableInfo: [ tableInfo: [{ name: 'keyword', required: false, bindType: '' }],
{
name: 'keyword',
value: null,
description: null,
required: false,
dataType: null,
type: null,
defaultValue: null,
validateType: null,
error: null,
expression: null,
children: null,
bindType: '',
},
],
}, },
{ key: '2', title: 'Header', tableInfo: [] }, { key: '2', title: 'Header', tableInfo: [] },
{ key: '3', title: 'Body' }, { key: '3', title: 'Body' },
...@@ -103,9 +88,9 @@ export const searchFormSchema: FormSchema[] = [ ...@@ -103,9 +88,9 @@ export const searchFormSchema: FormSchema[] = [
componentProps: { componentProps: {
datasourceType: 'api', datasourceType: 'api',
apiConfig: { apiConfig: {
path: '/cheliang/py-list', path: '/cheliang/cc-list',
method: 'GET', method: 'GET',
apiId: '81d881afe72d4be3a05677caa75e6342', apiId: '4f46d9d7f8de47c5b744ac88e2ab7eaa',
apiParams: [ apiParams: [
{ {
key: '1', key: '1',
...@@ -131,13 +116,13 @@ export const searchFormSchema: FormSchema[] = [ ...@@ -131,13 +116,13 @@ export const searchFormSchema: FormSchema[] = [
{ key: '3', title: 'Body' }, { key: '3', title: 'Body' },
], ],
script: script:
"\r\nvar sql = 'SELECT cl.id, cl.cllx, dic.`name` AS cllx_name, cl.gbzl, cl.cphm AS `value`, cl.cphm AS label ' +\r\n'FROM mes_base_cheliang cl ' +\r\n'LEFT JOIN ' +\r\n'(SELECT detail.`value`, detail.`name` ' +\r\n'FROM xjr_dictionary_item item ' +\r\n'LEFT JOIN xjr_dictionary_detail detail ON detail.item_id = item.id ' +\r\n'WHERE item.`code` = \"cllx\") dic ON cl.cllx = dic.`value` COLLATE utf8mb4_0900_ai_ci ' +\r\n'WHERE cl.sfcj = \"0\" ' +\r\n'?{keyword, AND cl.cphm LIKE CONCAT(\"%\", #{keyword}, \"%\")}'\r\nreturn db.select(sql);", "var sql = 'SELECT cl.id, cl.cllx, dic.`name` AS cllx_name, cl.gbzl, cl.cphm AS `value`, cl.cphm AS label ' +\r\n'FROM mes_base_cheliang cl ' +\r\n'LEFT JOIN ' +\r\n'(SELECT detail.`value`, detail.`name` ' +\r\n'FROM xjr_dictionary_item item ' +\r\n'LEFT JOIN xjr_dictionary_detail detail ON detail.item_id = item.id ' +\r\n'WHERE item.`code` = \"cllx\") dic ON cl.cllx = dic.`value` COLLATE utf8mb4_0900_ai_ci ' +\r\n'WHERE cl.ypy = \"1\" AND cl.sfcj = \"0\" AND cl.jcdj = \"2\" ' +\r\n'?{keyword, AND cl.cphm LIKE CONCAT(\"%\", #{keyword}, \"%\")}'\r\nreturn db.select(sql);",
outputParams: [ outputParams: [
{ name: 'label', tableTitle: '车牌号码', bindField: '', show: true, width: 150 }, { name: 'label', tableTitle: '车牌号码', bindField: '', show: true, width: 150 },
{ name: 'cllx_name', tableTitle: '车辆类型', bindField: '', show: true, width: 150 }, { name: 'cllx_name', tableTitle: '车辆类型', bindField: '', show: true, width: 150 },
{ {
name: 'gbzl', name: 'gbzl',
tableTitle: '车辆重量', tableTitle: '车辆重量(kg)',
bindField: 'clzl', bindField: 'clzl',
show: true, show: true,
width: 150, width: 150,
...@@ -151,6 +136,14 @@ export const searchFormSchema: FormSchema[] = [ ...@@ -151,6 +136,14 @@ export const searchFormSchema: FormSchema[] = [
width: 150, width: 150,
component: 'e17f3687f30f4a2995ea2b07348150b5', component: 'e17f3687f30f4a2995ea2b07348150b5',
}, },
{
name: 'id',
tableTitle: '',
bindField: 'cheliang_id',
show: false,
width: 150,
component: 'e1221f5840d7486588dd2c1e086af59d',
},
], ],
}, },
labelField: 'label', labelField: 'label',
...@@ -182,9 +175,9 @@ export const searchFormSchema: FormSchema[] = [ ...@@ -182,9 +175,9 @@ export const searchFormSchema: FormSchema[] = [
export const columns: BasicColumn[] = [ export const columns: BasicColumn[] = [
{ {
resizable: true, resizable: true,
dataIndex: 'gzxm', dataIndex: 'gzr',
title: '工作项目', title: '工作人',
componentType: 'associate-popup', componentType: 'user',
fixed: false, fixed: false,
sorter: true, sorter: true,
...@@ -195,9 +188,9 @@ export const columns: BasicColumn[] = [ ...@@ -195,9 +188,9 @@ export const columns: BasicColumn[] = [
{ {
resizable: true, resizable: true,
dataIndex: 'gzr', dataIndex: 'gzxm',
title: '工作人', title: '工作项目',
componentType: 'user', componentType: 'associate-popup',
fixed: false, fixed: false,
sorter: true, sorter: true,
...@@ -309,6 +302,32 @@ export const columns: BasicColumn[] = [ ...@@ -309,6 +302,32 @@ export const columns: BasicColumn[] = [
styleConfig: undefined, styleConfig: undefined,
listStyle: undefined, listStyle: undefined,
}, },
{
resizable: true,
dataIndex: 'bdsl',
title: '磅单数量',
componentType: 'number',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: undefined,
},
{
resizable: true,
dataIndex: 'gzsc',
title: '工作时长',
componentType: 'number',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: undefined,
},
]; ];
//表头合并配置 //表头合并配置
export const headerMergingData = []; export const headerMergingData = [];
...@@ -405,7 +424,6 @@ export const formProps: FormProps = { ...@@ -405,7 +424,6 @@ export const formProps: FormProps = {
span: 7, span: 7,
defaultValue: '', defaultValue: '',
placeholder: '请输入报工类型', placeholder: '请输入报工类型',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
...@@ -473,7 +491,6 @@ export const formProps: FormProps = { ...@@ -473,7 +491,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: '2017066632836796418' }, params: { itemId: '2017066632836796418' },
labelField: 'name', labelField: 'name',
...@@ -506,7 +523,6 @@ export const formProps: FormProps = { ...@@ -506,7 +523,6 @@ export const formProps: FormProps = {
span: 7, span: 7,
defaultValue: '', defaultValue: '',
placeholder: '请输入车辆颜色', placeholder: '请输入车辆颜色',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
...@@ -572,7 +588,6 @@ export const formProps: FormProps = { ...@@ -572,7 +588,6 @@ export const formProps: FormProps = {
span: 7, span: 7,
defaultValue: '', defaultValue: '',
placeholder: '请输入车辆id', placeholder: '请输入车辆id',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
...@@ -620,22 +635,7 @@ export const formProps: FormProps = { ...@@ -620,22 +635,7 @@ export const formProps: FormProps = {
{ {
key: '1', key: '1',
title: 'Query Params', title: 'Query Params',
tableInfo: [ tableInfo: [{ name: 'keyword', required: false, bindType: '' }],
{
name: 'keyword',
value: null,
description: null,
required: false,
dataType: null,
type: null,
defaultValue: null,
validateType: null,
error: null,
expression: null,
children: null,
bindType: '',
},
],
}, },
{ key: '2', title: 'Header', tableInfo: [] }, { key: '2', title: 'Header', tableInfo: [] },
{ key: '3', title: 'Body' }, { key: '3', title: 'Body' },
...@@ -668,7 +668,6 @@ export const formProps: FormProps = { ...@@ -668,7 +668,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,
...@@ -697,7 +696,6 @@ export const formProps: FormProps = { ...@@ -697,7 +696,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,
...@@ -726,7 +724,6 @@ export const formProps: FormProps = { ...@@ -726,7 +724,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,
...@@ -755,7 +752,6 @@ export const formProps: FormProps = { ...@@ -755,7 +752,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,
...@@ -794,9 +790,9 @@ export const formProps: FormProps = { ...@@ -794,9 +790,9 @@ export const formProps: FormProps = {
pageSize: 10, pageSize: 10,
assoTitle: '车牌号码', assoTitle: '车牌号码',
apiConfig: { apiConfig: {
path: '/cheliang/py-list', path: '/cheliang/cc-list',
method: 'GET', method: 'GET',
apiId: '81d881afe72d4be3a05677caa75e6342', apiId: '4f46d9d7f8de47c5b744ac88e2ab7eaa',
apiParams: [ apiParams: [
{ {
key: '1', key: '1',
...@@ -822,13 +818,13 @@ export const formProps: FormProps = { ...@@ -822,13 +818,13 @@ export const formProps: FormProps = {
{ key: '3', title: 'Body' }, { key: '3', title: 'Body' },
], ],
script: script:
"\r\nvar sql = 'SELECT cl.id, cl.cllx, dic.`name` AS cllx_name, cl.gbzl, cl.cphm AS `value`, cl.cphm AS label ' +\r\n'FROM mes_base_cheliang cl ' +\r\n'LEFT JOIN ' +\r\n'(SELECT detail.`value`, detail.`name` ' +\r\n'FROM xjr_dictionary_item item ' +\r\n'LEFT JOIN xjr_dictionary_detail detail ON detail.item_id = item.id ' +\r\n'WHERE item.`code` = \"cllx\") dic ON cl.cllx = dic.`value` COLLATE utf8mb4_0900_ai_ci ' +\r\n'WHERE cl.sfcj = \"0\" ' +\r\n'?{keyword, AND cl.cphm LIKE CONCAT(\"%\", #{keyword}, \"%\")}'\r\nreturn db.select(sql);", "var sql = 'SELECT cl.id, cl.cllx, dic.`name` AS cllx_name, cl.gbzl, cl.cphm AS `value`, cl.cphm AS label ' +\r\n'FROM mes_base_cheliang cl ' +\r\n'LEFT JOIN ' +\r\n'(SELECT detail.`value`, detail.`name` ' +\r\n'FROM xjr_dictionary_item item ' +\r\n'LEFT JOIN xjr_dictionary_detail detail ON detail.item_id = item.id ' +\r\n'WHERE item.`code` = \"cllx\") dic ON cl.cllx = dic.`value` COLLATE utf8mb4_0900_ai_ci ' +\r\n'WHERE cl.ypy = \"1\" AND cl.sfcj = \"0\" AND cl.jcdj = \"2\" ' +\r\n'?{keyword, AND cl.cphm LIKE CONCAT(\"%\", #{keyword}, \"%\")}'\r\nreturn db.select(sql);",
outputParams: [ outputParams: [
{ name: 'label', tableTitle: '车牌号码', show: true, width: 150 }, { name: 'label', tableTitle: '车牌号码', show: true, width: 150 },
{ name: 'cllx_name', tableTitle: '车辆类型', show: true, width: 150 }, { name: 'cllx_name', tableTitle: '车辆类型', show: true, width: 150 },
{ {
name: 'gbzl', name: 'gbzl',
tableTitle: '车辆重量', tableTitle: '车辆重量(kg)',
bindField: 'clzl', bindField: 'clzl',
show: true, show: true,
width: 150, width: 150,
...@@ -842,6 +838,14 @@ export const formProps: FormProps = { ...@@ -842,6 +838,14 @@ export const formProps: FormProps = {
width: 150, width: 150,
component: 'e17f3687f30f4a2995ea2b07348150b5', component: 'e17f3687f30f4a2995ea2b07348150b5',
}, },
{
name: 'id',
tableTitle: '',
bindField: 'cheliangId',
show: false,
width: 150,
component: 'e1221f5840d7486588dd2c1e086af59d',
},
], ],
}, },
dicOptions: [], dicOptions: [],
...@@ -866,7 +870,6 @@ export const formProps: FormProps = { ...@@ -866,7 +870,6 @@ export const formProps: FormProps = {
span: 7, span: 7,
defaultValue: '', defaultValue: '',
placeholder: '请输入车辆品牌型号', placeholder: '请输入车辆品牌型号',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
......
xjrsoft-vue3/src/views/chaiche/ccbg/index.vue
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,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":"delete","icon":"ant-design:delete-outlined","isDefault":true}] const list = [{"buttonId":"2018972431831822336","name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true,"isUse":true},{"buttonId":"2018972431831822337","name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true,"isUse":true},{"buttonId":"2018972431831822338","name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true,"isUse":true,"isEnableLock":true},{"buttonId":"2018972431831822339","name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true,"isUse":true}]
return filterButtonAuth(list); return filterButtonAuth(list);
}) })
......
xjrsoft-vue3/src/views/chaiche/cheliangxx/components/config.ts
...@@ -218,7 +218,7 @@ export const columns: BasicColumn[] = [ ...@@ -218,7 +218,7 @@ export const columns: BasicColumn[] = [
{ {
resizable: true, resizable: true,
dataIndex: 'gbzl', dataIndex: 'gbzl',
title: '过磅重量(t)', title: '过磅重量(kg)',
componentType: 'number', componentType: 'number',
fixed: false, fixed: false,
...@@ -683,7 +683,7 @@ export const formProps: FormProps = { ...@@ -683,7 +683,7 @@ export const formProps: FormProps = {
{ {
key: 'ce1146f2655e4478a755f51dd14860ab', key: 'ce1146f2655e4478a755f51dd14860ab',
field: 'gbzl', field: 'gbzl',
label: '过磅重量(t)', label: '过磅重量(kg)',
type: 'number', type: 'number',
component: 'InputNumber', component: 'InputNumber',
colProps: { span: 24 }, colProps: { span: 24 },
...@@ -703,7 +703,7 @@ export const formProps: FormProps = { ...@@ -703,7 +703,7 @@ export const formProps: FormProps = {
isShow: true, isShow: true,
rules: [], rules: [],
events: {}, events: {},
placeholder: '请输入过磅重量(t)', placeholder: '请输入过磅重量(kg)',
tooltipConfig: { visible: false, title: '提示文本' }, tooltipConfig: { visible: false, title: '提示文本' },
style: { width: '100%' }, style: { width: '100%' },
}, },
......
xjrsoft-vue3/src/views/chaiche/cheliangxx/components/workflowPermission.ts
...@@ -107,7 +107,7 @@ export const permissionList = [ ...@@ -107,7 +107,7 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '过磅重量(t)', fieldName: '过磅重量(kg)',
fieldId: 'gbzl', fieldId: 'gbzl',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
......
xjrsoft-vue3/src/views/chaiche/pybg/components/Form.vue
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
import { reactive, ref, onMounted, nextTick, watch } from 'vue'; import { reactive, ref, onMounted, nextTick, watch } from 'vue';
import { formProps, formEventConfigs } from './config'; import { formProps, formEventConfigs } from './config';
import SimpleForm from '/@/components/SimpleForm/src/SimpleForm.vue'; import SimpleForm from '/@/components/SimpleForm/src/SimpleForm.vue';
import { addMesCheliangPybg, getMesCheliangPybg, updateMesCheliangPybg } from '/@/api/chaiche/pybg'; import { addMesCheliangBg, getMesCheliangBg, updateMesCheliangBg } from '/@/api/chaiche/pybg';
import { cloneDeep, isString } from 'lodash-es'; import { cloneDeep, isString } from 'lodash-es';
import { FormDataProps } from '/@/components/Designer/src/types'; import { FormDataProps } from '/@/components/Designer/src/types';
import { usePermission } from '/@/hooks/web/usePermission'; import { usePermission } from '/@/hooks/web/usePermission';
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
// 根据行唯一ID查询行数据，并设置表单数据 【编辑】 // 根据行唯一ID查询行数据，并设置表单数据 【编辑】
async function setFormDataFromId(rowId) { async function setFormDataFromId(rowId) {
try { try {
const record = await getMesCheliangPybg(rowId); const record = await getMesCheliangBg(rowId);
setFieldsValue(record); setFieldsValue(record);
state.formModel = record; state.formModel = record;
await getFormDataEvent(formEventConfigs, state.formModel, await getFormDataEvent(formEventConfigs, state.formModel,
...@@ -156,7 +156,7 @@ ...@@ -156,7 +156,7 @@
try { try {
values[RowKey] = rowId; values[RowKey] = rowId;
state.formModel = values; state.formModel = values;
let saveVal = await updateMesCheliangPybg(values); let saveVal = await updateMesCheliangBg(values);
await submitFormEvent(formEventConfigs, state.formModel, await submitFormEvent(formEventConfigs, state.formModel,
systemFormRef.value, systemFormRef.value,
formProps.schemas, true, state.formInfo.formName,state.formInfo.formId); //表单事件：提交表单 formProps.schemas, true, state.formInfo.formName,state.formInfo.formId); //表单事件：提交表单
...@@ -167,7 +167,7 @@ ...@@ -167,7 +167,7 @@
async function add(values) { async function add(values) {
try { try {
state.formModel = values; state.formModel = values;
let saveVal = await addMesCheliangPybg(values); let saveVal = await addMesCheliangBg(values);
await submitFormEvent(formEventConfigs, state.formModel, await submitFormEvent(formEventConfigs, state.formModel,
systemFormRef.value, systemFormRef.value,
formProps.schemas, true, state.formInfo.formName,state.formInfo.formId); //表单事件：提交表单 formProps.schemas, true, state.formInfo.formName,state.formInfo.formId); //表单事件：提交表单
......
xjrsoft-vue3/src/views/chaiche/pybg/components/config.ts
...@@ -5,7 +5,7 @@ import { uploadApi } from '/@/api/sys/upload'; ...@@ -5,7 +5,7 @@ import { uploadApi } from '/@/api/sys/upload';
export const searchFormSchema: FormSchema[] = [ export const searchFormSchema: FormSchema[] = [
{ {
field: 'cphm', field: 'cphm',
label: '车牌号码', label: '车辆号码',
defaultValue: undefined, defaultValue: undefined,
component: 'XjrSelect', component: 'XjrSelect',
componentProps: { componentProps: {
...@@ -15,30 +15,57 @@ export const searchFormSchema: FormSchema[] = [ ...@@ -15,30 +15,57 @@ export const searchFormSchema: FormSchema[] = [
method: 'GET', method: 'GET',
apiId: '81d881afe72d4be3a05677caa75e6342', apiId: '81d881afe72d4be3a05677caa75e6342',
apiParams: [ apiParams: [
{ key: '1', title: 'Query Params', tableInfo: [] }, {
key: '1',
title: 'Query Params',
tableInfo: [
{
name: 'keyword',
value: '',
description: null,
required: false,
dataType: 'String',
type: null,
defaultValue: null,
validateType: null,
error: null,
expression: null,
children: null,
bindType: 'value',
},
],
},
{ key: '2', title: 'Header', tableInfo: [] }, { key: '2', title: 'Header', tableInfo: [] },
{ key: '3', title: 'Body' }, { key: '3', title: 'Body' },
], ],
script: script:
"return db.select('SELECT id, cllx, gbzl, cphm AS `value`, cphm AS label FROM mes_base_cheliang WHERE sfcj = \\'0\\';');", "\r\nvar sql = 'SELECT cl.id, cl.cllx, dic.`name` AS cllx_name, cl.gbzl, cl.cphm AS `value`, cl.cphm AS label ' +\r\n'FROM mes_base_cheliang cl ' +\r\n'LEFT JOIN ' +\r\n'(SELECT detail.`value`, detail.`name` ' +\r\n'FROM xjr_dictionary_item item ' +\r\n'LEFT JOIN xjr_dictionary_detail detail ON detail.item_id = item.id ' +\r\n'WHERE item.`code` = \"cllx\") dic ON cl.cllx = dic.`value` COLLATE utf8mb4_0900_ai_ci ' +\r\n'WHERE cl.sfcj = \"0\" ' +\r\n'?{keyword, AND cl.cphm LIKE CONCAT(\"%\", #{keyword}, \"%\")}'\r\nreturn db.select(sql);",
outputParams: [ outputParams: [
{ name: 'label', tableTitle: '车牌号码', bindField: null, show: true, width: 150 }, { name: 'label', tableTitle: '车牌号码', bindField: '', show: true, width: 150 },
{ name: 'cllx_name', tableTitle: '车辆类型', bindField: '', show: true, width: 150 },
{
name: 'gbzl',
tableTitle: '车辆重量(kg)',
bindField: 'clzl',
show: true,
width: 150,
component: 'ffba6da2c6be427388480ba9dbeda417',
},
{ {
name: 'cllx', name: 'cllx',
tableTitle: '', tableTitle: '',
bindField: 'cllx', bindField: 'cllx',
show: false, show: false,
width: 150, width: 150,
component: '6ef2584234dd425faaaf5c7896181019', component: 'b376e6f92fc94f75ab508964c7406d8a',
}, },
{ name: 'cllx_name', tableTitle: '车辆类型', bindField: null, show: true, width: 150 },
{ {
name: 'gbzl', name: 'id',
tableTitle: '车辆重量(kg)', tableTitle: '',
bindField: 'clzl', bindField: 'cheliang_id',
show: true, show: false,
width: 150, width: 150,
component: 'ae99d59a65304fa5a0ea3f4c9a87e524', component: '6aac9bdc31f74f969e4e94ff13b5a95f',
}, },
], ],
}, },
...@@ -50,40 +77,49 @@ export const searchFormSchema: FormSchema[] = [ ...@@ -50,40 +77,49 @@ export const searchFormSchema: FormSchema[] = [
}, },
}, },
{ {
field: 'cllx', field: 'gzr',
label: '车辆类型', label: '排液人',
defaultValue: undefined, defaultValue: undefined,
component: 'XjrSelect', component: 'User',
componentProps: { componentProps: {
datasourceType: 'dic', suffix: 'ant-design:setting-outlined',
params: { itemId: '2017066632836796418' }, placeholder: '请选择',
labelField: 'name',
valueField: 'value',
mode: 'multiple',
showSearch: true,
getPopupContainer: () => document.body,
}, },
}, },
{ {
field: 'clzl', field: 'gzkssj',
label: '车辆重量', label: '工作开始时间',
defaultValue: undefined, defaultValue: undefined,
component: 'InputNumber', component: 'RangePicker',
componentProps: { componentProps: {
format: 'YYYY-MM-DD HH:mm:ss',
style: { width: '100%' }, style: { width: '100%' },
getPopupContainer: () => document.body,
}, },
}, },
{ {
field: 'pyr', field: 'bglx',
label: '排液人', label: '报工类型',
defaultValue: undefined, defaultValue: undefined,
component: 'User', component: 'Input',
},
{
field: 'cllx',
label: '车辆类型',
defaultValue: undefined,
component: 'XjrSelect',
componentProps: { componentProps: {
suffix: 'ant-design:setting-outlined', datasourceType: 'dic',
placeholder: '请选择', params: { itemId: '2017066632836796418' },
labelField: 'name',
valueField: 'value',
mode: 'multiple',
showSearch: true,
getPopupContainer: () => document.body,
}, },
}, },
{ {
field: 'gzxm', field: 'gzxm',
label: '工作项目', label: '工作项目',
...@@ -96,14 +132,33 @@ export const searchFormSchema: FormSchema[] = [ ...@@ -96,14 +132,33 @@ export const searchFormSchema: FormSchema[] = [
method: 'GET', method: 'GET',
apiId: 'd31f8fea01274bdf9f1f72464daa59e8', apiId: 'd31f8fea01274bdf9f1f72464daa59e8',
apiParams: [ apiParams: [
{ key: '1', title: 'Query Params', tableInfo: [] }, {
key: '1',
title: 'Query Params',
tableInfo: [
{
name: 'keyword',
value: null,
description: null,
required: false,
dataType: 'String',
type: null,
defaultValue: null,
validateType: null,
error: null,
expression: null,
children: null,
bindType: '',
},
],
},
{ key: '2', title: 'Header', tableInfo: [] }, { key: '2', title: 'Header', tableInfo: [] },
{ key: '3', title: 'Body' }, { key: '3', title: 'Body' },
], ],
script: script:
"var sql = 'SELECT id AS `value`, gzx AS label FROM mes_base_gongzuoxiang;';\r\nreturn db.select(sql);", 'var sql = \'SELECT id AS `value`, gzx AS label FROM mes_base_gongzuoxiang ?{keyword, WHERE gzx LIKE CONCAT("%", #{keyword}, "%")};\';\r\nreturn db.select(sql);',
outputParams: [ outputParams: [
{ name: 'label', tableTitle: '工作项', bindField: '', show: true, width: 150 }, { name: 'label', tableTitle: '工作项目', bindField: '', show: true, width: 150 },
], ],
}, },
labelField: 'label', labelField: 'label',
...@@ -114,18 +169,6 @@ export const searchFormSchema: FormSchema[] = [ ...@@ -114,18 +169,6 @@ export const searchFormSchema: FormSchema[] = [
}, },
}, },
{ {
field: 'gzkssj',
label: '工作开始时间',
defaultValue: undefined,
component: 'RangePicker',
componentProps: {
format: 'YYYY-MM-DD HH:mm:ss',
style: { width: '100%' },
getPopupContainer: () => document.body,
},
},
{
field: 'gzjssj', field: 'gzjssj',
label: '工作结束时间', label: '工作结束时间',
defaultValue: undefined, defaultValue: undefined,
...@@ -142,7 +185,7 @@ export const columns: BasicColumn[] = [ ...@@ -142,7 +185,7 @@ export const columns: BasicColumn[] = [
{ {
resizable: true, resizable: true,
dataIndex: 'cphm', dataIndex: 'cphm',
title: '车牌号码', title: '车辆号码',
componentType: 'associate-popup', componentType: 'associate-popup',
fixed: false, fixed: false,
...@@ -168,7 +211,7 @@ export const columns: BasicColumn[] = [ ...@@ -168,7 +211,7 @@ export const columns: BasicColumn[] = [
{ {
resizable: true, resizable: true,
dataIndex: 'clzl', dataIndex: 'clzl',
title: '车辆重量', title: '车辆重量(kg)',
componentType: 'number', componentType: 'number',
fixed: false, fixed: false,
...@@ -180,7 +223,7 @@ export const columns: BasicColumn[] = [ ...@@ -180,7 +223,7 @@ export const columns: BasicColumn[] = [
{ {
resizable: true, resizable: true,
dataIndex: 'pyr', dataIndex: 'gzr',
title: '排液人', title: '排液人',
componentType: 'user', componentType: 'user',
...@@ -229,6 +272,19 @@ export const columns: BasicColumn[] = [ ...@@ -229,6 +272,19 @@ export const columns: BasicColumn[] = [
styleConfig: undefined, styleConfig: undefined,
listStyle: undefined, listStyle: undefined,
}, },
{
resizable: true,
dataIndex: 'clls',
title: '处理辆数',
componentType: 'number',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: undefined,
},
]; ];
//表头合并配置 //表头合并配置
export const headerMergingData = []; export const headerMergingData = [];
...@@ -302,7 +358,7 @@ export const formProps: FormProps = { ...@@ -302,7 +358,7 @@ export const formProps: FormProps = {
size: 'default', size: 'default',
schemas: [ schemas: [
{ {
key: 'b4c421cbd9e54671b9d17967c987c03d', key: 'ac7307293cde45ca8f87f91d169ec7ed',
field: '', field: '',
label: '', label: '',
type: 'grid', type: 'grid',
...@@ -313,9 +369,43 @@ export const formProps: FormProps = { ...@@ -313,9 +369,43 @@ export const formProps: FormProps = {
span: 8, span: 8,
list: [ list: [
{ {
key: 'af19c3eb20d945e093176d60b4f5a0d1', key: '6aac9bdc31f74f969e4e94ff13b5a95f',
field: 'cheliangId',
label: '车辆id',
type: 'input',
component: 'Input',
colProps: { span: 24 },
defaultValue: '',
componentProps: {
width: '100%',
span: 7,
defaultValue: '',
placeholder: '请输入车辆id',
maxlength: null,
prefix: '',
suffix: '',
addonBefore: '',
addonAfter: '',
disabled: false,
allowClear: false,
showLabel: true,
required: false,
rules: [],
events: {},
listStyle: '',
isSave: false,
isShow: false,
scan: false,
bordered: true,
isShowAi: false,
tooltipConfig: { visible: false, title: '提示文本' },
style: { width: '100%' },
},
},
{
key: '7542feb5b0de459baded633a4cb87763',
field: 'cphm', field: 'cphm',
label: '车牌号码', label: '车辆号码',
type: 'associate-popup', type: 'associate-popup',
component: 'MultiplePopup', component: 'MultiplePopup',
colProps: { span: 24 }, colProps: { span: 24 },
...@@ -323,48 +413,75 @@ export const formProps: FormProps = { ...@@ -323,48 +413,75 @@ export const formProps: FormProps = {
popupType: 'associate', popupType: 'associate',
width: '100%', width: '100%',
span: 7, span: 7,
placeholder: '请选择车牌号码', placeholder: '请选择车辆号码',
showLabel: true, showLabel: true,
disabled: false, disabled: false,
datasourceType: 'api', datasourceType: 'api',
labelField: 'label', labelField: 'label',
valueField: 'value', valueField: 'value',
pageSize: 10, pageSize: 10,
assoTitle: '车牌号码', assoTitle: '车辆号码',
apiConfig: { apiConfig: {
path: '/cheliang/py-list', path: '/cheliang/py-list',
method: 'GET', method: 'GET',
apiId: '81d881afe72d4be3a05677caa75e6342', apiId: '81d881afe72d4be3a05677caa75e6342',
apiParams: [ apiParams: [
{ key: '1', title: 'Query Params', tableInfo: [] }, {
key: '1',
title: 'Query Params',
tableInfo: [
{
name: 'keyword',
value: '',
description: null,
required: false,
dataType: 'String',
type: null,
defaultValue: null,
validateType: null,
error: null,
expression: null,
children: null,
bindType: 'value',
},
],
},
{ key: '2', title: 'Header', tableInfo: [] }, { key: '2', title: 'Header', tableInfo: [] },
{ key: '3', title: 'Body' }, { key: '3', title: 'Body' },
], ],
script: script:
"return db.select('SELECT id, cllx, gbzl, cphm AS `value`, cphm AS label FROM mes_base_cheliang WHERE sfcj = \\'0\\';');", "\r\nvar sql = 'SELECT cl.id, cl.cllx, dic.`name` AS cllx_name, cl.gbzl, cl.cphm AS `value`, cl.cphm AS label ' +\r\n'FROM mes_base_cheliang cl ' +\r\n'LEFT JOIN ' +\r\n'(SELECT detail.`value`, detail.`name` ' +\r\n'FROM xjr_dictionary_item item ' +\r\n'LEFT JOIN xjr_dictionary_detail detail ON detail.item_id = item.id ' +\r\n'WHERE item.`code` = \"cllx\") dic ON cl.cllx = dic.`value` COLLATE utf8mb4_0900_ai_ci ' +\r\n'WHERE cl.sfcj = \"0\" ' +\r\n'?{keyword, AND cl.cphm LIKE CONCAT(\"%\", #{keyword}, \"%\")}'\r\nreturn db.select(sql);",
outputParams: [ outputParams: [
{ name: 'label', tableTitle: '车牌号码', show: true, width: 150 }, { name: 'label', tableTitle: '车牌号码', show: true, width: 150 },
{ name: 'cllx_name', tableTitle: '车辆类型', show: true, width: 150 },
{
name: 'gbzl',
tableTitle: '车辆重量(kg)',
bindField: 'clzl',
show: true,
width: 150,
component: 'ffba6da2c6be427388480ba9dbeda417',
},
{ {
name: 'cllx', name: 'cllx',
tableTitle: '', tableTitle: '',
bindField: 'cllx', bindField: 'cllx',
show: false, show: false,
width: 150, width: 150,
component: '6ef2584234dd425faaaf5c7896181019', component: 'b376e6f92fc94f75ab508964c7406d8a',
}, },
{ name: 'cllx_name', tableTitle: '车辆类型', show: true, width: 150 },
{ {
name: 'gbzl', name: 'id',
tableTitle: '车辆重量(kg)', tableTitle: '',
bindField: 'clzl', bindField: 'cheliangId',
show: true, show: false,
width: 150, width: 150,
component: 'ae99d59a65304fa5a0ea3f4c9a87e524', component: '6aac9bdc31f74f969e4e94ff13b5a95f',
}, },
], ],
}, },
dicOptions: [], dicOptions: [],
required: true, required: false,
rules: [], rules: [],
events: {}, events: {},
isShow: true, isShow: true,
...@@ -372,49 +489,56 @@ export const formProps: FormProps = { ...@@ -372,49 +489,56 @@ export const formProps: FormProps = {
style: { width: '100%' }, style: { width: '100%' },
}, },
}, },
],
},
{
span: 8,
list: [
{ {
key: '6ef2584234dd425faaaf5c7896181019', key: 'b8e63f39708d46cdb64fd9b5e9079dd4',
field: 'cllx', field: 'gzr',
label: '车辆类型', label: '排液人',
type: 'select', type: 'user',
component: 'XjrSelect', component: 'User',
colProps: { span: 24 }, colProps: { span: 24 },
defaultValue: '',
componentProps: { componentProps: {
span: 7,
width: '100%', width: '100%',
defaultValue: '',
placeholder: '请选择人员',
userType: 0,
prefix: '',
suffix: 'ant-design:setting-outlined',
showLabel: true,
disabled: false,
required: false,
multiple: true,
isShow: true,
events: {},
tooltipConfig: { visible: false, title: '提示文本' },
style: { width: '100%' },
},
},
{
key: '3bf66ae914c64049bf385d556ceb2dc9',
field: 'gzkssj',
label: '工作开始时间',
type: 'date',
component: 'DatePicker',
colProps: { span: 24 },
defaultValue: '',
componentProps: {
span: 7, span: 7,
placeholder: '请选择下拉选择', defaultValue: '',
width: '100%',
placeholder: '请选择工作开始时间',
format: 'YYYY-MM-DD HH:mm:ss',
showLabel: true, showLabel: true,
showSearch: false, allowClear: true,
isMultiple: false,
clearable: false,
disabled: false, disabled: false,
staticOptions: [ required: false,
{ key: 1, label: 'Option 1', value: 'Option 1' }, isShow: true,
{ key: 2, label: 'Option 2', value: 'Option 2' },
{ key: 3, label: 'Option 3', value: 'Option 3' },
],
defaultSelect: null,
datasourceType: 'dic',
params: { itemId: '2017066632836796418' },
labelField: 'name',
valueField: 'value',
apiConfig: {
path: 'CodeGeneration/selection',
method: 'GET',
apiId: '93d735dcb7364a0f8102188ec4d77ac7',
},
dicOptions: [],
required: true,
rules: [], rules: [],
events: {}, events: {},
isShow: true, isGetCurrent: false,
tooltipConfig: { visible: false, title: '提示文本' }, tooltipConfig: { visible: false, title: '提示文本' },
itemId: '2017066632836796418', searchType: 'time',
style: { width: '100%' }, style: { width: '100%' },
}, },
}, },
...@@ -424,94 +548,82 @@ export const formProps: FormProps = { ...@@ -424,94 +548,82 @@ export const formProps: FormProps = {
span: 8, span: 8,
list: [ list: [
{ {
key: 'ae99d59a65304fa5a0ea3f4c9a87e524', key: '0e1477cdb9f2472da86bd385c4c44ea5',
field: 'clzl', field: 'bglx',
label: '车辆重量', label: '报工类型',
type: 'number', type: 'input',
component: 'InputNumber', component: 'Input',
colProps: { span: 24 }, colProps: { span: 24 },
defaultValue: '', defaultValue: '',
componentProps: { componentProps: {
width: '100%', width: '100%',
span: 7, span: 7,
defaultValue: '', defaultValue: '',
min: 0, placeholder: '请输入报工类型',
max: 100,
step: 1,
maxlength: null, maxlength: null,
prefix: '',
suffix: '',
addonBefore: '',
addonAfter: '',
disabled: false, disabled: false,
allowClear: false,
showLabel: true, showLabel: true,
controls: true, required: false,
required: true,
subTotal: false,
isShow: true,
rules: [], rules: [],
events: {}, events: {},
placeholder: '请输入车辆重量', listStyle: '',
isSave: false,
isShow: false,
scan: false,
bordered: true,
isShowAi: false,
tooltipConfig: { visible: false, title: '提示文本' }, tooltipConfig: { visible: false, title: '提示文本' },
style: { width: '100%' }, style: { width: '100%' },
}, },
}, },
],
},
],
componentProps: {
gutter: 16,
justify: 'start',
align: 'top',
isShow: true,
showBorder: false,
bordercolor: '#d9d9d9',
bordershowtype: [true, true, true, true],
borderwidth: 1,
padding: '10px',
margin: '10px',
},
},
{
key: '9043491de4e342b881f8012ffa4155ce',
field: '',
label: '',
type: 'grid',
colProps: { span: 24 },
component: 'Grid',
children: [
{
span: 8,
list: [
{ {
key: '115cd0bc43e84138a51cb1e189bfb8e5', key: 'b376e6f92fc94f75ab508964c7406d8a',
field: 'pyr', field: 'cllx',
label: '排液人', label: '车辆类型',
type: 'user', type: 'select',
component: 'User', component: 'XjrSelect',
colProps: { span: 24 }, colProps: { span: 24 },
defaultValue: '',
componentProps: { componentProps: {
span: 7,
width: '100%', width: '100%',
defaultValue: '', span: 7,
placeholder: '请选择人员', placeholder: '请选择下拉选择',
userType: 0,
prefix: '',
suffix: 'ant-design:setting-outlined',
showLabel: true, showLabel: true,
showSearch: false,
isMultiple: false,
clearable: false,
disabled: false, disabled: false,
required: true, staticOptions: [
multiple: true, { key: 1, label: 'Option 1', value: 'Option 1' },
isShow: true, { key: 2, label: 'Option 2', value: 'Option 2' },
{ key: 3, label: 'Option 3', value: 'Option 3' },
],
defaultSelect: null,
datasourceType: 'dic',
params: { itemId: '2017066632836796418' },
labelField: 'name',
valueField: 'value',
apiConfig: {
path: 'CodeGeneration/selection',
method: 'GET',
apiId: '93d735dcb7364a0f8102188ec4d77ac7',
},
dicOptions: [],
required: false,
rules: [],
events: {}, events: {},
isShow: true,
tooltipConfig: { visible: false, title: '提示文本' }, tooltipConfig: { visible: false, title: '提示文本' },
itemId: '2017066632836796418',
style: { width: '100%' }, style: { width: '100%' },
}, },
}, },
],
},
{
span: 8,
list: [
{ {
key: '5ab8ad30eda84a05a8ac3393c57a82d2', key: '16549fa420014b3f871e74e4274df5b3',
field: 'gzxm', field: 'gzxm',
label: '工作项目', label: '工作项目',
type: 'associate-popup', type: 'associate-popup',
...@@ -534,16 +646,35 @@ export const formProps: FormProps = { ...@@ -534,16 +646,35 @@ export const formProps: FormProps = {
method: 'GET', method: 'GET',
apiId: 'd31f8fea01274bdf9f1f72464daa59e8', apiId: 'd31f8fea01274bdf9f1f72464daa59e8',
apiParams: [ apiParams: [
{ key: '1', title: 'Query Params', tableInfo: [] }, {
key: '1',
title: 'Query Params',
tableInfo: [
{
name: 'keyword',
value: null,
description: null,
required: false,
dataType: 'String',
type: null,
defaultValue: null,
validateType: null,
error: null,
expression: null,
children: null,
bindType: '',
},
],
},
{ key: '2', title: 'Header', tableInfo: [] }, { key: '2', title: 'Header', tableInfo: [] },
{ key: '3', title: 'Body' }, { key: '3', title: 'Body' },
], ],
script: script:
"var sql = 'SELECT id AS `value`, gzx AS label FROM mes_base_gongzuoxiang;';\r\nreturn db.select(sql);", 'var sql = \'SELECT id AS `value`, gzx AS label FROM mes_base_gongzuoxiang ?{keyword, WHERE gzx LIKE CONCAT("%", #{keyword}, "%")};\';\r\nreturn db.select(sql);',
outputParams: [{ name: 'label', tableTitle: '工作项', show: true, width: 150 }], outputParams: [{ name: 'label', tableTitle: '工作项目', show: true, width: 150 }],
}, },
dicOptions: [], dicOptions: [],
required: true, required: false,
rules: [], rules: [],
events: {}, events: {},
isShow: true, isShow: true,
...@@ -551,38 +682,10 @@ export const formProps: FormProps = { ...@@ -551,38 +682,10 @@ export const formProps: FormProps = {
style: { width: '100%' }, style: { width: '100%' },
}, },
}, },
],
},
{ span: 8, list: [] },
],
componentProps: {
gutter: 16,
justify: 'start',
align: 'top',
isShow: true,
showBorder: false,
bordercolor: '#d9d9d9',
bordershowtype: [true, true, true, true],
borderwidth: 1,
padding: '10px',
margin: '10px',
},
},
{
key: 'aed0b91d0fa14b6fb7318d3a71de47a7',
field: '',
label: '',
type: 'grid',
colProps: { span: 24 },
component: 'Grid',
children: [
{
span: 8,
list: [
{ {
key: '309b6c3f707349a89cd97cf1b00ee0b8', key: '809f3945b0e34453a81f40a868675eb7',
field: 'gzkssj', field: 'gzjssj',
label: '工作开始时间', label: '工作结束时间',
type: 'date', type: 'date',
component: 'DatePicker', component: 'DatePicker',
colProps: { span: 24 }, colProps: { span: 24 },
...@@ -591,12 +694,12 @@ export const formProps: FormProps = { ...@@ -591,12 +694,12 @@ export const formProps: FormProps = {
span: 7, span: 7,
defaultValue: '', defaultValue: '',
width: '100%', width: '100%',
placeholder: '请选择工作开始时间', placeholder: '请选择工作结束时间',
format: 'YYYY-MM-DD HH:mm:ss', format: 'YYYY-MM-DD HH:mm:ss',
showLabel: true, showLabel: true,
allowClear: true, allowClear: true,
disabled: false, disabled: false,
required: true, required: false,
isShow: true, isShow: true,
rules: [], rules: [],
events: {}, events: {},
...@@ -612,38 +715,68 @@ export const formProps: FormProps = { ...@@ -612,38 +715,68 @@ export const formProps: FormProps = {
span: 8, span: 8,
list: [ list: [
{ {
key: 'a775006aab184860860da4573b2e185a', key: 'ffba6da2c6be427388480ba9dbeda417',
field: 'gzjssj', field: 'clzl',
label: '工作结束时间', label: '车辆重量(kg)',
type: 'date', type: 'number',
component: 'DatePicker', component: 'InputNumber',
colProps: { span: 24 }, colProps: { span: 24 },
defaultValue: '', defaultValue: '',
componentProps: { componentProps: {
width: '100%',
span: 7, span: 7,
defaultValue: '', defaultValue: '',
width: '100%', min: 0,
placeholder: '请选择工作结束时间', max: 100,
format: 'YYYY-MM-DD HH:mm:ss', step: 1,
maxlength: null,
disabled: false,
showLabel: true, showLabel: true,
allowClear: true, controls: true,
required: false,
subTotal: false,
isShow: true,
rules: [],
events: {},
placeholder: '请输入车辆重量(kg)',
tooltipConfig: { visible: false, title: '提示文本' },
style: { width: '100%' },
},
},
{
key: '234d3626d0fb4a41a10bf2f562eabce3',
field: 'clls',
label: '处理辆数',
type: 'number',
component: 'InputNumber',
colProps: { span: 24 },
defaultValue: '',
componentProps: {
width: '100%',
span: 7,
defaultValue: '',
min: 0,
max: 100,
step: 1,
maxlength: null,
disabled: false, disabled: false,
required: true, showLabel: true,
controls: true,
required: false,
subTotal: false,
isShow: true, isShow: true,
rules: [], rules: [],
events: {}, events: {},
isGetCurrent: false, placeholder: '请输入处理辆数',
tooltipConfig: { visible: false, title: '提示文本' }, tooltipConfig: { visible: false, title: '提示文本' },
searchType: 'time',
style: { width: '100%' }, style: { width: '100%' },
}, },
}, },
], ],
}, },
{ span: 8, list: [] },
], ],
componentProps: { componentProps: {
gutter: 16, gutter: 0,
justify: 'start', justify: 'start',
align: 'top', align: 'top',
isShow: true, isShow: true,
...@@ -656,7 +789,7 @@ export const formProps: FormProps = { ...@@ -656,7 +789,7 @@ export const formProps: FormProps = {
}, },
}, },
{ {
key: '88c5a499b17d4e5fb4bb67d1b3ae2e8f', key: '4074ceefdde44a77a11c2bc53cc3cdf3',
field: 'bz', field: 'bz',
label: '备注', label: '备注',
type: 'textarea', type: 'textarea',
...@@ -665,7 +798,7 @@ export const formProps: FormProps = { ...@@ -665,7 +798,7 @@ export const formProps: FormProps = {
defaultValue: '', defaultValue: '',
componentProps: { componentProps: {
width: '100%', width: '100%',
span: 7, span: '',
defaultValue: '', defaultValue: '',
placeholder: '请输入备注', placeholder: '请输入备注',
maxlength: 500, maxlength: 500,
...@@ -685,30 +818,9 @@ export const formProps: FormProps = { ...@@ -685,30 +818,9 @@ export const formProps: FormProps = {
}, },
}, },
{ {
key: '4f7e001de6dc4c6eaa7c1385ff2d09da', key: '0d7ec3c4b4e54dfb9eeca107ec214d04',
field: '', field: 'clqzp1',
label: '', label: '处理前照片',
type: 'grid',
colProps: { span: 24 },
component: 'Grid',
children: [{ span: 24, list: [] }],
componentProps: {
gutter: 16,
justify: 'start',
align: 'top',
isShow: true,
showBorder: false,
bordercolor: '#d9d9d9',
bordershowtype: [true, true, true, true],
borderwidth: 1,
padding: '10px',
margin: '10px',
},
},
{
key: 'ed064b5f5ca945feb5ef37dbf6f06eec',
field: 'yclqzp',
label: '预处理前照片',
type: 'upload', type: 'upload',
component: 'Upload', component: 'Upload',
colProps: { span: 24 }, colProps: { span: 24 },
...@@ -716,11 +828,11 @@ export const formProps: FormProps = { ...@@ -716,11 +828,11 @@ export const formProps: FormProps = {
api: uploadApi, api: uploadApi,
span: '', span: '',
defaultValue: '', defaultValue: '',
accept: '', accept: '.jpg,.jpeg,.png,.bmp',
maxNumber: 5, maxNumber: 5,
maxSize: 5, maxSize: 5,
showLabel: true, showLabel: true,
multiple: false, multiple: true,
disabled: false, disabled: false,
required: false, required: false,
isShow: true, isShow: true,
...@@ -731,9 +843,9 @@ export const formProps: FormProps = { ...@@ -731,9 +843,9 @@ export const formProps: FormProps = {
}, },
}, },
{ {
key: '1065c11a72cc4d42983939a2b6a9c2bf', key: '42b8984cc17f4cacafa3ae1e885d8260',
field: 'yclhzp', field: 'clhzp1',
label: '预处理后照片', label: '处理后照片',
type: 'upload', type: 'upload',
component: 'Upload', component: 'Upload',
colProps: { span: 24 }, colProps: { span: 24 },
...@@ -741,11 +853,11 @@ export const formProps: FormProps = { ...@@ -741,11 +853,11 @@ export const formProps: FormProps = {
api: '#{upload}#', api: '#{upload}#',
span: '', span: '',
defaultValue: '', defaultValue: '',
accept: '', accept: '.jpg,.jpeg,.png,.bmp',
maxNumber: 5, maxNumber: 5,
maxSize: 5, maxSize: 5,
showLabel: true, showLabel: true,
multiple: false, multiple: true,
disabled: false, disabled: false,
required: false, required: false,
isShow: true, isShow: true,
......
xjrsoft-vue3/src/views/chaiche/pybg/components/workflowPermission.ts
export const permissionList = [ export const permissionList = [
{ {
required: true, required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '车辆id',
fieldId: 'cheliangId',
isSubTable: false,
showChildren: true,
type: 'input',
key: '6aac9bdc31f74f969e4e94ff13b5a95f',
children: [],
options: {},
defaultValue: '',
},
{
required: false,
view: true, view: true,
edit: true, edit: true,
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '车牌号码', fieldName: '车辆号码',
fieldId: 'cphm', fieldId: 'cphm',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'associate-popup', type: 'associate-popup',
key: 'af19c3eb20d945e093176d60b4f5a0d1', key: '7542feb5b0de459baded633a4cb87763',
children: [], children: [],
options: {}, options: {},
}, },
{ {
required: true, required: false,
view: true, view: true,
edit: true, edit: true,
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '车辆类型', fieldName: '排液人',
fieldId: 'cllx', fieldId: 'gzr',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'select', type: 'user',
key: '6ef2584234dd425faaaf5c7896181019', key: 'b8e63f39708d46cdb64fd9b5e9079dd4',
children: [], children: [],
options: {}, options: {},
defaultValue: '',
}, },
{ {
required: true, required: false,
view: true, view: true,
edit: true, edit: true,
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '车辆重量', fieldName: '工作开始时间',
fieldId: 'clzl', fieldId: 'gzkssj',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'number', type: 'date',
key: 'ae99d59a65304fa5a0ea3f4c9a87e524', key: '3bf66ae914c64049bf385d556ceb2dc9',
children: [], children: [],
options: {}, options: {},
defaultValue: '', defaultValue: '',
}, },
{ {
required: true, required: false,
view: true, view: true,
edit: true, edit: true,
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '排液人', fieldName: '报工类型',
fieldId: 'pyr', fieldId: 'bglx',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'user', type: 'input',
key: '115cd0bc43e84138a51cb1e189bfb8e5', key: '0e1477cdb9f2472da86bd385c4c44ea5',
children: [], children: [],
options: {}, options: {},
defaultValue: '', defaultValue: '',
}, },
{ {
required: true, required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '车辆类型',
fieldId: 'cllx',
isSubTable: false,
showChildren: true,
type: 'select',
key: 'b376e6f92fc94f75ab508964c7406d8a',
children: [],
options: {},
},
{
required: false,
view: true, view: true,
edit: true, edit: true,
disabled: false, disabled: false,
...@@ -77,40 +111,57 @@ export const permissionList = [ ...@@ -77,40 +111,57 @@ export const permissionList = [
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'associate-popup', type: 'associate-popup',
key: '5ab8ad30eda84a05a8ac3393c57a82d2', key: '16549fa420014b3f871e74e4274df5b3',
children: [], children: [],
options: {}, options: {},
}, },
{ {
required: true, required: false,
view: true, view: true,
edit: true, edit: true,
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '工作开始时间', fieldName: '工作结束时间',
fieldId: 'gzkssj', fieldId: 'gzjssj',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'date', type: 'date',
key: '309b6c3f707349a89cd97cf1b00ee0b8', key: '809f3945b0e34453a81f40a868675eb7',
children: [], children: [],
options: {}, options: {},
defaultValue: '', defaultValue: '',
}, },
{ {
required: true, required: false,
view: true, view: true,
edit: true, edit: true,
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '工作结束时间', fieldName: '车辆重量(kg)',
fieldId: 'gzjssj', fieldId: 'clzl',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'date', type: 'number',
key: 'a775006aab184860860da4573b2e185a', key: 'ffba6da2c6be427388480ba9dbeda417',
children: [],
options: {},
defaultValue: '',
},
{
required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '处理辆数',
fieldId: 'clls',
isSubTable: false,
showChildren: true,
type: 'number',
key: '234d3626d0fb4a41a10bf2f562eabce3',
children: [], children: [],
options: {}, options: {},
defaultValue: '', defaultValue: '',
...@@ -127,7 +178,7 @@ export const permissionList = [ ...@@ -127,7 +178,7 @@ export const permissionList = [
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'textarea', type: 'textarea',
key: '88c5a499b17d4e5fb4bb67d1b3ae2e8f', key: '4074ceefdde44a77a11c2bc53cc3cdf3',
children: [], children: [],
options: {}, options: {},
defaultValue: '', defaultValue: '',
...@@ -139,12 +190,12 @@ export const permissionList = [ ...@@ -139,12 +190,12 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '预处理前照片', fieldName: '处理前照片',
fieldId: 'yclqzp', fieldId: 'clqzp1',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'upload', type: 'upload',
key: 'ed064b5f5ca945feb5ef37dbf6f06eec', key: '0d7ec3c4b4e54dfb9eeca107ec214d04',
children: [], children: [],
options: {}, options: {},
defaultValue: '', defaultValue: '',
...@@ -156,12 +207,12 @@ export const permissionList = [ ...@@ -156,12 +207,12 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '预处理后照片', fieldName: '处理后照片',
fieldId: 'yclhzp', fieldId: 'clhzp1',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'upload', type: 'upload',
key: '1065c11a72cc4d42983939a2b6a9c2bf', key: '42b8984cc17f4cacafa3ae1e885d8260',
children: [], children: [],
options: {}, options: {},
defaultValue: '', defaultValue: '',
......
xjrsoft-vue3/src/views/chaiche/pybg/index.vue
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
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';
import { getMesCheliangPybgPage, deleteMesCheliangPybg} from '/@/api/chaiche/pybg'; import { getMesCheliangBgPage, deleteMesCheliangBg} from '/@/api/chaiche/pybg';
import { ResizePageWrapper } from '/@/components/Page'; import { ResizePageWrapper } from '/@/components/Page';
import { useMessage } from '/@/hooks/web/useMessage'; import { useMessage } from '/@/hooks/web/useMessage';
import { useI18n } from '/@/hooks/web/useI18n'; import { useI18n } from '/@/hooks/web/useI18n';
...@@ -167,7 +167,7 @@ ...@@ -167,7 +167,7 @@
const [registerTable, { reload, }] = useTable({ const [registerTable, { reload, }] = useTable({
title: 'Pybg列表', title: 'Pybg列表',
api: getMesCheliangPybgPage, api: getMesCheliangBgPage,
rowKey: 'id', rowKey: 'id',
columns: filterColumns, columns: filterColumns,
pagination: { pagination: {
...@@ -270,7 +270,7 @@ ...@@ -270,7 +270,7 @@
okText: '确认', okText: '确认',
cancelText: '取消', cancelText: '取消',
onOk() { onOk() {
deleteMesCheliangPybg(ids).then((_) => { deleteMesCheliangBg(ids).then((_) => {
handleSuccess(); handleSuccess();
notification.success({ notification.success({
message: 'Tip', message: 'Tip',
......
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