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 {
export interface MesCheliangBgPageModel {
id: string;
gzxm: string;
gzr: string;
gzxm: string;
cphm: string;
cllx: string;
......@@ -46,6 +46,10 @@ export interface MesCheliangBgPageModel {
gzjssj: 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 { ErrorMessageMode } from '/#/axios';
......@@ -7,17 +7,17 @@ enum Api {
Page = '/chaiche/pybg/page',
List = '/chaiche/pybg/list',
Info = '/chaiche/pybg/info',
MesCheliangPybg = '/chaiche/pybg',
MesCheliangBg = '/chaiche/pybg',
}
/**
* @description: 查询MesCheliangPybg分页列表
* @description: 查询MesCheliangBg分页列表
*/
export async function getMesCheliangPybgPage(params: MesCheliangPybgPageParams, mode: ErrorMessageMode = 'modal') {
return defHttp.get<MesCheliangPybgPageResult>(
export async function getMesCheliangBgPage(params: MesCheliangBgPageParams, mode: ErrorMessageMode = 'modal') {
return defHttp.get<MesCheliangBgPageResult>(
{
url: Api.Page,
params,
......@@ -29,10 +29,10 @@ export async function getMesCheliangPybgPage(params: MesCheliangPybgPageParams,
}
/**
* @description: 获取MesCheliangPybg信息
* @description: 获取MesCheliangBg信息
*/
export async function getMesCheliangPybg(id: String, mode: ErrorMessageMode = 'modal') {
return defHttp.get<MesCheliangPybgPageModel>(
export async function getMesCheliangBg(id: String, mode: ErrorMessageMode = 'modal') {
return defHttp.get<MesCheliangBgPageModel>(
{
url: Api.Info,
params: { id },
......@@ -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>(
{
url: Api.MesCheliangPybg,
params: mesCheliangPybg,
url: Api.MesCheliangBg,
params: mesCheliangBg,
},
{
errorMessageMode: mode,
......@@ -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>(
{
url: Api.MesCheliangPybg,
params: mesCheliangPybg,
url: Api.MesCheliangBg,
params: mesCheliangBg,
},
{
errorMessageMode: mode,
......@@ -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>(
{
url: Api.MesCheliangPybg,
url: Api.MesCheliangBg,
data: ids,
},
{
......
xjrsoft-vue3/src/api/chaiche/pybg/model/PybgModel.ts
import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel';
/**
* @description: MesCheliangPybg分页参数 模型
* @description: MesCheliangBg分页参数 模型
*/
export interface MesCheliangPybgPageParams extends BasicPageParams {
export interface MesCheliangBgPageParams extends BasicPageParams {
cphm: string;
cllx: string;
gzr: string;
clzl: string;
gzkssj: string;
pyr: string;
bglx: string;
gzxm: string;
cllx: string;
gzkssj: string;
gzxm: string;
gzjssj: string;
}
/**
* @description: MesCheliangPybg分页返回值模型
* @description: MesCheliangBg分页返回值模型
*/
export interface MesCheliangPybgPageModel {
export interface MesCheliangBgPageModel {
id: string;
cphm: string;
......@@ -31,24 +31,28 @@ export interface MesCheliangPybgPageModel {
clzl: string;
pyr: string;
gzr: string;
gzxm: string;
gzkssj: string;
gzjssj: string;
clls: string;
}
/**
* @description: MesCheliangPybg表类型
* @description: MesCheliangBg表类型
*/
export interface MesCheliangPybgModel {
export interface MesCheliangBgModel {
id: string;
bglx: string;
cheliangId: string;
pyr: string;
gzr: string;
gzxm: string;
......@@ -58,15 +62,57 @@ export interface MesCheliangPybgModel {
clzl: string;
pyyclls: string;
clppxh: string;
clys: string;
clls: string;
gzkssj: 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;
......@@ -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[] = [
{
key: '1',
title: 'Query Params',
tableInfo: [
{
name: 'keyword',
value: null,
description: null,
required: false,
dataType: null,
type: null,
defaultValue: null,
validateType: null,
error: null,
expression: null,
children: null,
bindType: '',
},
],
tableInfo: [{ name: 'keyword', required: false, bindType: '' }],
},
{ key: '2', title: 'Header', tableInfo: [] },
{ key: '3', title: 'Body' },
......@@ -103,9 +88,9 @@ export const searchFormSchema: FormSchema[] = [
componentProps: {
datasourceType: 'api',
apiConfig: {
path: '/cheliang/py-list',
path: '/cheliang/cc-list',
method: 'GET',
apiId: '81d881afe72d4be3a05677caa75e6342',
apiId: '4f46d9d7f8de47c5b744ac88e2ab7eaa',
apiParams: [
{
key: '1',
......@@ -131,13 +116,13 @@ export const searchFormSchema: FormSchema[] = [
{ key: '3', title: 'Body' },
],
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: [
{ name: 'label', tableTitle: '车牌号码', bindField: '', show: true, width: 150 },
{ name: 'cllx_name', tableTitle: '车辆类型', bindField: '', show: true, width: 150 },
{
name: 'gbzl',
tableTitle: '车辆重量',
tableTitle: '车辆重量(kg)',
bindField: 'clzl',
show: true,
width: 150,
......@@ -151,6 +136,14 @@ export const searchFormSchema: FormSchema[] = [
width: 150,
component: 'e17f3687f30f4a2995ea2b07348150b5',
},
{
name: 'id',
tableTitle: '',
bindField: 'cheliang_id',
show: false,
width: 150,
component: 'e1221f5840d7486588dd2c1e086af59d',
},
],
},
labelField: 'label',
......@@ -182,9 +175,9 @@ export const searchFormSchema: FormSchema[] = [
export const columns: BasicColumn[] = [
{
resizable: true,
dataIndex: 'gzxm',
title: '工作项目',
componentType: 'associate-popup',
dataIndex: 'gzr',
title: '工作人',
componentType: 'user',
fixed: false,
sorter: true,
......@@ -195,9 +188,9 @@ export const columns: BasicColumn[] = [
{
resizable: true,
dataIndex: 'gzr',
title: '工作人',
componentType: 'user',
dataIndex: 'gzxm',
title: '工作项目',
componentType: 'associate-popup',
fixed: false,
sorter: true,
......@@ -309,6 +302,32 @@ export const columns: BasicColumn[] = [
styleConfig: 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 = [];
......@@ -405,7 +424,6 @@ export const formProps: FormProps = {
span: 7,
defaultValue: '',
placeholder: '请输入报工类型',
maxlength: null,
prefix: '',
suffix: '',
addonBefore: '',
......@@ -473,7 +491,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: '2017066632836796418' },
labelField: 'name',
......@@ -506,7 +523,6 @@ export const formProps: FormProps = {
span: 7,
defaultValue: '',
placeholder: '请输入车辆颜色',
maxlength: null,
prefix: '',
suffix: '',
addonBefore: '',
......@@ -572,7 +588,6 @@ export const formProps: FormProps = {
span: 7,
defaultValue: '',
placeholder: '请输入车辆id',
maxlength: null,
prefix: '',
suffix: '',
addonBefore: '',
......@@ -620,22 +635,7 @@ export const formProps: FormProps = {
{
key: '1',
title: 'Query Params',
tableInfo: [
{
name: 'keyword',
value: null,
description: null,
required: false,
dataType: null,
type: null,
defaultValue: null,
validateType: null,
error: null,
expression: null,
children: null,
bindType: '',
},
],
tableInfo: [{ name: 'keyword', required: false, bindType: '' }],
},
{ key: '2', title: 'Header', tableInfo: [] },
{ key: '3', title: 'Body' },
......@@ -668,7 +668,6 @@ export const formProps: FormProps = {
min: 0,
max: 100,
step: 1,
maxlength: null,
disabled: false,
showLabel: true,
controls: true,
......@@ -697,7 +696,6 @@ export const formProps: FormProps = {
min: 0,
max: 100,
step: 1,
maxlength: null,
disabled: false,
showLabel: true,
controls: true,
......@@ -726,7 +724,6 @@ export const formProps: FormProps = {
min: 0,
max: 100,
step: 1,
maxlength: null,
disabled: false,
showLabel: true,
controls: true,
......@@ -755,7 +752,6 @@ export const formProps: FormProps = {
min: 0,
max: 100,
step: 1,
maxlength: null,
disabled: false,
showLabel: true,
controls: true,
......@@ -794,9 +790,9 @@ export const formProps: FormProps = {
pageSize: 10,
assoTitle: '车牌号码',
apiConfig: {
path: '/cheliang/py-list',
path: '/cheliang/cc-list',
method: 'GET',
apiId: '81d881afe72d4be3a05677caa75e6342',
apiId: '4f46d9d7f8de47c5b744ac88e2ab7eaa',
apiParams: [
{
key: '1',
......@@ -822,13 +818,13 @@ export const formProps: FormProps = {
{ key: '3', title: 'Body' },
],
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: [
{ name: 'label', tableTitle: '车牌号码', show: true, width: 150 },
{ name: 'cllx_name', tableTitle: '车辆类型', show: true, width: 150 },
{
name: 'gbzl',
tableTitle: '车辆重量',
tableTitle: '车辆重量(kg)',
bindField: 'clzl',
show: true,
width: 150,
......@@ -842,6 +838,14 @@ export const formProps: FormProps = {
width: 150,
component: 'e17f3687f30f4a2995ea2b07348150b5',
},
{
name: 'id',
tableTitle: '',
bindField: 'cheliangId',
show: false,
width: 150,
component: 'e1221f5840d7486588dd2c1e086af59d',
},
],
},
dicOptions: [],
......@@ -866,7 +870,6 @@ export const formProps: FormProps = {
span: 7,
defaultValue: '',
placeholder: '请输入车辆品牌型号',
maxlength: null,
prefix: '',
suffix: '',
addonBefore: '',
......
xjrsoft-vue3/src/views/chaiche/ccbg/index.vue
......@@ -133,7 +133,7 @@
//展示在列表内的按钮
const actionButtons = ref<string[]>(["view","edit","delete"]);
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);
})
......
xjrsoft-vue3/src/views/chaiche/cheliangxx/components/config.ts
......@@ -218,7 +218,7 @@ export const columns: BasicColumn[] = [
{
resizable: true,
dataIndex: 'gbzl',
title: '过磅重量(t)',
title: '过磅重量(kg)',
componentType: 'number',
fixed: false,
......@@ -683,7 +683,7 @@ export const formProps: FormProps = {
{
key: 'ce1146f2655e4478a755f51dd14860ab',
field: 'gbzl',
label: '过磅重量(t)',
label: '过磅重量(kg)',
type: 'number',
component: 'InputNumber',
colProps: { span: 24 },
......@@ -703,7 +703,7 @@ export const formProps: FormProps = {
isShow: true,
rules: [],
events: {},
placeholder: '请输入过磅重量(t)',
placeholder: '请输入过磅重量(kg)',
tooltipConfig: { visible: false, title: '提示文本' },
style: { width: '100%' },
},
......
xjrsoft-vue3/src/views/chaiche/cheliangxx/components/workflowPermission.ts
......@@ -107,7 +107,7 @@ export const permissionList = [
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '过磅重量(t)',
fieldName: '过磅重量(kg)',
fieldId: 'gbzl',
isSubTable: false,
showChildren: true,
......
xjrsoft-vue3/src/views/chaiche/pybg/components/Form.vue
......@@ -15,7 +15,7 @@
import { reactive, ref, onMounted, nextTick, watch } from 'vue';
import { formProps, formEventConfigs } from './config';
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 { FormDataProps } from '/@/components/Designer/src/types';
import { usePermission } from '/@/hooks/web/usePermission';
......@@ -110,7 +110,7 @@
// 根据行唯一ID查询行数据，并设置表单数据 【编辑】
async function setFormDataFromId(rowId) {
try {
const record = await getMesCheliangPybg(rowId);
const record = await getMesCheliangBg(rowId);
setFieldsValue(record);
state.formModel = record;
await getFormDataEvent(formEventConfigs, state.formModel,
......@@ -156,7 +156,7 @@
try {
values[RowKey] = rowId;
state.formModel = values;
let saveVal = await updateMesCheliangPybg(values);
let saveVal = await updateMesCheliangBg(values);
await submitFormEvent(formEventConfigs, state.formModel,
systemFormRef.value,
formProps.schemas, true, state.formInfo.formName,state.formInfo.formId); //表单事件：提交表单
......@@ -167,7 +167,7 @@
async function add(values) {
try {
state.formModel = values;
let saveVal = await addMesCheliangPybg(values);
let saveVal = await addMesCheliangBg(values);
await submitFormEvent(formEventConfigs, state.formModel,
systemFormRef.value,
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';
export const searchFormSchema: FormSchema[] = [
{
field: 'cphm',
label: '车牌号码',
label: '车辆号码',
defaultValue: undefined,
component: 'XjrSelect',
componentProps: {
......@@ -15,30 +15,57 @@ export const searchFormSchema: FormSchema[] = [
method: 'GET',
apiId: '81d881afe72d4be3a05677caa75e6342',
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: '3', title: 'Body' },
],
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: [
{ 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',
tableTitle: '',
bindField: 'cllx',
show: false,
width: 150,
component: '6ef2584234dd425faaaf5c7896181019',
component: 'b376e6f92fc94f75ab508964c7406d8a',
},
{ name: 'cllx_name', tableTitle: '车辆类型', bindField: null, show: true, width: 150 },
{
name: 'gbzl',
tableTitle: '车辆重量(kg)',
bindField: 'clzl',
show: true,
name: 'id',
tableTitle: '',
bindField: 'cheliang_id',
show: false,
width: 150,
component: 'ae99d59a65304fa5a0ea3f4c9a87e524',
component: '6aac9bdc31f74f969e4e94ff13b5a95f',
},
],
},
......@@ -50,40 +77,49 @@ export const searchFormSchema: FormSchema[] = [
},
},
{
field: 'cllx',
label: '车辆类型',
field: 'gzr',
label: '排液人',
defaultValue: undefined,
component: 'XjrSelect',
component: 'User',
componentProps: {
datasourceType: 'dic',
params: { itemId: '2017066632836796418' },
labelField: 'name',
valueField: 'value',
mode: 'multiple',
showSearch: true,
getPopupContainer: () => document.body,
suffix: 'ant-design:setting-outlined',
placeholder: '请选择',
},
},
{
field: 'clzl',
label: '车辆重量',
field: 'gzkssj',
label: '工作开始时间',
defaultValue: undefined,
component: 'InputNumber',
component: 'RangePicker',
componentProps: {
format: 'YYYY-MM-DD HH:mm:ss',
style: { width: '100%' },
getPopupContainer: () => document.body,
},
},
{
field: 'pyr',
label: '排液人',
field: 'bglx',
label: '报工类型',
defaultValue: undefined,
component: 'User',
component: 'Input',
},
{
field: 'cllx',
label: '车辆类型',
defaultValue: undefined,
component: 'XjrSelect',
componentProps: {
suffix: 'ant-design:setting-outlined',
placeholder: '请选择',
datasourceType: 'dic',
params: { itemId: '2017066632836796418' },
labelField: 'name',
valueField: 'value',
mode: 'multiple',
showSearch: true,
getPopupContainer: () => document.body,
},
},
{
field: 'gzxm',
label: '工作项目',
......@@ -96,14 +132,33 @@ export const searchFormSchema: FormSchema[] = [
method: 'GET',
apiId: 'd31f8fea01274bdf9f1f72464daa59e8',
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: '3', title: 'Body' },
],
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: '工作项', bindField: '', show: true, width: 150 },
{ name: 'label', tableTitle: '工作项目', bindField: '', show: true, width: 150 },
],
},
labelField: 'label',
......@@ -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',
label: '工作结束时间',
defaultValue: undefined,
......@@ -142,7 +185,7 @@ export const columns: BasicColumn[] = [
{
resizable: true,
dataIndex: 'cphm',
title: '车牌号码',
title: '车辆号码',
componentType: 'associate-popup',
fixed: false,
......@@ -168,7 +211,7 @@ export const columns: BasicColumn[] = [
{
resizable: true,
dataIndex: 'clzl',
title: '车辆重量',
title: '车辆重量(kg)',
componentType: 'number',
fixed: false,
......@@ -180,7 +223,7 @@ export const columns: BasicColumn[] = [
{
resizable: true,
dataIndex: 'pyr',
dataIndex: 'gzr',
title: '排液人',
componentType: 'user',
......@@ -229,6 +272,19 @@ export const columns: BasicColumn[] = [
styleConfig: undefined,
listStyle: undefined,
},
{
resizable: true,
dataIndex: 'clls',
title: '处理辆数',
componentType: 'number',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: undefined,
},
];
//表头合并配置
export const headerMergingData = [];
......@@ -302,7 +358,7 @@ export const formProps: FormProps = {
size: 'default',
schemas: [
{
key: 'b4c421cbd9e54671b9d17967c987c03d',
key: 'ac7307293cde45ca8f87f91d169ec7ed',
field: '',
label: '',
type: 'grid',
......@@ -313,9 +369,43 @@ export const formProps: FormProps = {
span: 8,
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',
label: '车牌号码',
label: '车辆号码',
type: 'associate-popup',
component: 'MultiplePopup',
colProps: { span: 24 },
......@@ -323,48 +413,75 @@ export const formProps: FormProps = {
popupType: 'associate',
width: '100%',
span: 7,
placeholder: '请选择车牌号码',
placeholder: '请选择车辆号码',
showLabel: true,
disabled: false,
datasourceType: 'api',
labelField: 'label',
valueField: 'value',
pageSize: 10,
assoTitle: '车牌号码',
assoTitle: '车辆号码',
apiConfig: {
path: '/cheliang/py-list',
method: 'GET',
apiId: '81d881afe72d4be3a05677caa75e6342',
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: '3', title: 'Body' },
],
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: [
{ 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',
tableTitle: '',
bindField: 'cllx',
show: false,
width: 150,
component: '6ef2584234dd425faaaf5c7896181019',
component: 'b376e6f92fc94f75ab508964c7406d8a',
},
{ name: 'cllx_name', tableTitle: '车辆类型', show: true, width: 150 },
{
name: 'gbzl',
tableTitle: '车辆重量(kg)',
bindField: 'clzl',
show: true,
name: 'id',
tableTitle: '',
bindField: 'cheliangId',
show: false,
width: 150,
component: 'ae99d59a65304fa5a0ea3f4c9a87e524',
component: '6aac9bdc31f74f969e4e94ff13b5a95f',
},
],
},
dicOptions: [],
required: true,
required: false,
rules: [],
events: {},
isShow: true,
......@@ -372,146 +489,141 @@ export const formProps: FormProps = {
style: { width: '100%' },
},
},
],
},
{
span: 8,
list: [
{
key: '6ef2584234dd425faaaf5c7896181019',
field: 'cllx',
label: '车辆类型',
type: 'select',
component: 'XjrSelect',
key: 'b8e63f39708d46cdb64fd9b5e9079dd4',
field: 'gzr',
label: '排液人',
type: 'user',
component: 'User',
colProps: { span: 24 },
defaultValue: '',
componentProps: {
width: '100%',
span: 7,
placeholder: '请选择下拉选择',
width: '100%',
defaultValue: '',
placeholder: '请选择人员',
userType: 0,
prefix: '',
suffix: 'ant-design:setting-outlined',
showLabel: true,
showSearch: false,
isMultiple: false,
clearable: false,
disabled: false,
staticOptions: [
{ key: 1, label: 'Option 1', value: 'Option 1' },
{ 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: [],
events: {},
required: false,
multiple: true,
isShow: true,
events: {},
tooltipConfig: { visible: false, title: '提示文本' },
itemId: '2017066632836796418',
style: { width: '100%' },
},
},
],
},
{
span: 8,
list: [
{
key: 'ae99d59a65304fa5a0ea3f4c9a87e524',
field: 'clzl',
label: '车辆重量',
type: 'number',
component: 'InputNumber',
key: '3bf66ae914c64049bf385d556ceb2dc9',
field: 'gzkssj',
label: '工作开始时间',
type: 'date',
component: 'DatePicker',
colProps: { span: 24 },
defaultValue: '',
componentProps: {
width: '100%',
span: 7,
defaultValue: '',
min: 0,
max: 100,
step: 1,
maxlength: null,
disabled: false,
width: '100%',
placeholder: '请选择工作开始时间',
format: 'YYYY-MM-DD HH:mm:ss',
showLabel: true,
controls: true,
required: true,
subTotal: false,
allowClear: true,
disabled: false,
required: false,
isShow: true,
rules: [],
events: {},
placeholder: '请输入车辆重量',
isGetCurrent: false,
tooltipConfig: { visible: false, title: '提示文本' },
searchType: 'time',
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',
field: 'pyr',
label: '排液人',
type: 'user',
component: 'User',
key: '0e1477cdb9f2472da86bd385c4c44ea5',
field: 'bglx',
label: '报工类型',
type: 'input',
component: 'Input',
colProps: { span: 24 },
defaultValue: '',
componentProps: {
span: 7,
width: '100%',
span: 7,
defaultValue: '',
placeholder: '请选择人员',
userType: 0,
placeholder: '请输入报工类型',
maxlength: null,
prefix: '',
suffix: 'ant-design:setting-outlined',
showLabel: true,
suffix: '',
addonBefore: '',
addonAfter: '',
disabled: false,
required: true,
multiple: true,
isShow: true,
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: 'b376e6f92fc94f75ab508964c7406d8a',
field: 'cllx',
label: '车辆类型',
type: 'select',
component: 'XjrSelect',
colProps: { span: 24 },
componentProps: {
width: '100%',
span: 7,
placeholder: '请选择下拉选择',
showLabel: true,
showSearch: false,
isMultiple: false,
clearable: false,
disabled: false,
staticOptions: [
{ key: 1, label: 'Option 1', value: 'Option 1' },
{ 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: {},
isShow: true,
tooltipConfig: { visible: false, title: '提示文本' },
itemId: '2017066632836796418',
style: { width: '100%' },
},
},
{
span: 8,
list: [
{
key: '5ab8ad30eda84a05a8ac3393c57a82d2',
key: '16549fa420014b3f871e74e4274df5b3',
field: 'gzxm',
label: '工作项目',
type: 'associate-popup',
......@@ -534,16 +646,35 @@ export const formProps: FormProps = {
method: 'GET',
apiId: 'd31f8fea01274bdf9f1f72464daa59e8',
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: '3', title: 'Body' },
],
script:
"var sql = 'SELECT id AS `value`, gzx AS label FROM mes_base_gongzuoxiang;';\r\nreturn db.select(sql);",
outputParams: [{ name: 'label', tableTitle: '工作项', show: true, width: 150 }],
'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 }],
},
dicOptions: [],
required: true,
required: false,
rules: [],
events: {},
isShow: true,
......@@ -551,38 +682,10 @@ export const formProps: FormProps = {
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',
field: 'gzkssj',
label: '工作开始时间',
key: '809f3945b0e34453a81f40a868675eb7',
field: 'gzjssj',
label: '工作结束时间',
type: 'date',
component: 'DatePicker',
colProps: { span: 24 },
......@@ -591,12 +694,12 @@ export const formProps: FormProps = {
span: 7,
defaultValue: '',
width: '100%',
placeholder: '请选择工作开始时间',
placeholder: '请选择工作结束时间',
format: 'YYYY-MM-DD HH:mm:ss',
showLabel: true,
allowClear: true,
disabled: false,
required: true,
required: false,
isShow: true,
rules: [],
events: {},
......@@ -612,38 +715,68 @@ export const formProps: FormProps = {
span: 8,
list: [
{
key: 'a775006aab184860860da4573b2e185a',
field: 'gzjssj',
label: '工作结束时间',
type: 'date',
component: 'DatePicker',
key: 'ffba6da2c6be427388480ba9dbeda417',
field: 'clzl',
label: '车辆重量(kg)',
type: 'number',
component: 'InputNumber',
colProps: { span: 24 },
defaultValue: '',
componentProps: {
width: '100%',
span: 7,
defaultValue: '',
width: '100%',
placeholder: '请选择工作结束时间',
format: 'YYYY-MM-DD HH:mm:ss',
min: 0,
max: 100,
step: 1,
maxlength: null,
disabled: false,
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,
required: true,
showLabel: true,
controls: true,
required: false,
subTotal: false,
isShow: true,
rules: [],
events: {},
isGetCurrent: false,
placeholder: '请输入处理辆数',
tooltipConfig: { visible: false, title: '提示文本' },
searchType: 'time',
style: { width: '100%' },
},
},
],
},
{ span: 8, list: [] },
],
componentProps: {
gutter: 16,
gutter: 0,
justify: 'start',
align: 'top',
isShow: true,
......@@ -656,7 +789,7 @@ export const formProps: FormProps = {
},
},
{
key: '88c5a499b17d4e5fb4bb67d1b3ae2e8f',
key: '4074ceefdde44a77a11c2bc53cc3cdf3',
field: 'bz',
label: '备注',
type: 'textarea',
......@@ -665,7 +798,7 @@ export const formProps: FormProps = {
defaultValue: '',
componentProps: {
width: '100%',
span: 7,
span: '',
defaultValue: '',
placeholder: '请输入备注',
maxlength: 500,
......@@ -685,30 +818,9 @@ export const formProps: FormProps = {
},
},
{
key: '4f7e001de6dc4c6eaa7c1385ff2d09da',
field: '',
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: '预处理前照片',
key: '0d7ec3c4b4e54dfb9eeca107ec214d04',
field: 'clqzp1',
label: '处理前照片',
type: 'upload',
component: 'Upload',
colProps: { span: 24 },
......@@ -716,11 +828,11 @@ export const formProps: FormProps = {
api: uploadApi,
span: '',
defaultValue: '',
accept: '',
accept: '.jpg,.jpeg,.png,.bmp',
maxNumber: 5,
maxSize: 5,
showLabel: true,
multiple: false,
multiple: true,
disabled: false,
required: false,
isShow: true,
......@@ -731,9 +843,9 @@ export const formProps: FormProps = {
},
},
{
key: '1065c11a72cc4d42983939a2b6a9c2bf',
field: 'yclhzp',
label: '预处理后照片',
key: '42b8984cc17f4cacafa3ae1e885d8260',
field: 'clhzp1',
label: '处理后照片',
type: 'upload',
component: 'Upload',
colProps: { span: 24 },
......@@ -741,11 +853,11 @@ export const formProps: FormProps = {
api: '#{upload}#',
span: '',
defaultValue: '',
accept: '',
accept: '.jpg,.jpeg,.png,.bmp',
maxNumber: 5,
maxSize: 5,
showLabel: true,
multiple: false,
multiple: true,
disabled: false,
required: false,
isShow: true,
......
xjrsoft-vue3/src/views/chaiche/pybg/components/workflowPermission.ts
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,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '车牌号码',
fieldName: '车辆号码',
fieldId: 'cphm',
isSubTable: false,
showChildren: true,
type: 'associate-popup',
key: 'af19c3eb20d945e093176d60b4f5a0d1',
key: '7542feb5b0de459baded633a4cb87763',
children: [],
options: {},
},
{
required: true,
required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '车辆类型',
fieldId: 'cllx',
fieldName: '排液人',
fieldId: 'gzr',
isSubTable: false,
showChildren: true,
type: 'select',
key: '6ef2584234dd425faaaf5c7896181019',
type: 'user',
key: 'b8e63f39708d46cdb64fd9b5e9079dd4',
children: [],
options: {},
defaultValue: '',
},
{
required: true,
required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '车辆重量',
fieldId: 'clzl',
fieldName: '工作开始时间',
fieldId: 'gzkssj',
isSubTable: false,
showChildren: true,
type: 'number',
key: 'ae99d59a65304fa5a0ea3f4c9a87e524',
type: 'date',
key: '3bf66ae914c64049bf385d556ceb2dc9',
children: [],
options: {},
defaultValue: '',
},
{
required: true,
required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '排液人',
fieldId: 'pyr',
fieldName: '报工类型',
fieldId: 'bglx',
isSubTable: false,
showChildren: true,
type: 'user',
key: '115cd0bc43e84138a51cb1e189bfb8e5',
type: 'input',
key: '0e1477cdb9f2472da86bd385c4c44ea5',
children: [],
options: {},
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,
edit: true,
disabled: false,
......@@ -77,40 +111,57 @@ export const permissionList = [
isSubTable: false,
showChildren: true,
type: 'associate-popup',
key: '5ab8ad30eda84a05a8ac3393c57a82d2',
key: '16549fa420014b3f871e74e4274df5b3',
children: [],
options: {},
},
{
required: true,
required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '工作开始时间',
fieldId: 'gzkssj',
fieldName: '工作结束时间',
fieldId: 'gzjssj',
isSubTable: false,
showChildren: true,
type: 'date',
key: '309b6c3f707349a89cd97cf1b00ee0b8',
key: '809f3945b0e34453a81f40a868675eb7',
children: [],
options: {},
defaultValue: '',
},
{
required: true,
required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '工作结束时间',
fieldId: 'gzjssj',
fieldName: '车辆重量(kg)',
fieldId: 'clzl',
isSubTable: false,
showChildren: true,
type: 'date',
key: 'a775006aab184860860da4573b2e185a',
type: 'number',
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: [],
options: {},
defaultValue: '',
......@@ -127,7 +178,7 @@ export const permissionList = [
isSubTable: false,
showChildren: true,
type: 'textarea',
key: '88c5a499b17d4e5fb4bb67d1b3ae2e8f',
key: '4074ceefdde44a77a11c2bc53cc3cdf3',
children: [],
options: {},
defaultValue: '',
......@@ -139,12 +190,12 @@ export const permissionList = [
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '预处理前照片',
fieldId: 'yclqzp',
fieldName: '处理前照片',
fieldId: 'clqzp1',
isSubTable: false,
showChildren: true,
type: 'upload',
key: 'ed064b5f5ca945feb5ef37dbf6f06eec',
key: '0d7ec3c4b4e54dfb9eeca107ec214d04',
children: [],
options: {},
defaultValue: '',
......@@ -156,12 +207,12 @@ export const permissionList = [
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '预处理后照片',
fieldId: 'yclhzp',
fieldName: '处理后照片',
fieldId: 'clhzp1',
isSubTable: false,
showChildren: true,
type: 'upload',
key: '1065c11a72cc4d42983939a2b6a9c2bf',
key: '42b8984cc17f4cacafa3ae1e885d8260',
children: [],
options: {},
defaultValue: '',
......
xjrsoft-vue3/src/views/chaiche/pybg/index.vue
......@@ -66,7 +66,7 @@
import { Modal } from 'ant-design-vue';
import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
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 { useMessage } from '/@/hooks/web/useMessage';
import { useI18n } from '/@/hooks/web/useI18n';
......@@ -167,7 +167,7 @@
const [registerTable, { reload, }] = useTable({
title: 'Pybg列表',
api: getMesCheliangPybgPage,
api: getMesCheliangBgPage,
rowKey: 'id',
columns: filterColumns,
pagination: {
......@@ -270,7 +270,7 @@
okText: '确认',
cancelText: '取消',
onOk() {
deleteMesCheliangPybg(ids).then((_) => {
deleteMesCheliangBg(ids).then((_) => {
handleSuccess();
notification.success({
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