Skip to content

W
weiqiao-vue
Commit 0a7be219 by 张恒
Options

refactor(gxgl): 重构工艺管理组件配置和数据模型 

- 添加备注字段到表单配置中
- 移除额定工时字段配置
- 修复编码组件占位符文本错误
- 更新多个字段的key值以确保唯一性
- 修正默认选择值和占位符文本
- 调整子表单产品列表的数据映射关系
- 重构数据模型接口定义，更新字段名称和结构
- 移除采集方案相关的监听和处理逻辑
- 更新工作流程权限配置中的字段映射
- 优化产品列表数据加载和处理方式
parent 216523fe
Showing with 189 additions and 647 deletions
xjrsoft-vue3/src/api/jcsj/gxgl/model/GxglModel.ts
...@@ -11,6 +11,8 @@ export interface RokeProcessPageParams extends BasicPageParams { ...@@ -11,6 +11,8 @@ export interface RokeProcessPageParams extends BasicPageParams {
categoryId: string; categoryId: string;
collectionSchemeId: string; collectionSchemeId: string;
note: string;
} }
/** /**
...@@ -26,8 +28,6 @@ export interface RokeProcessPageModel { ...@@ -26,8 +28,6 @@ export interface RokeProcessPageModel {
categoryId: string; categoryId: string;
collectionSchemeId: string; collectionSchemeId: string;
ratedWorkingHours: string;
} }
/** /**
...@@ -122,7 +122,7 @@ export interface RokeProcessModel { ...@@ -122,7 +122,7 @@ export interface RokeProcessModel {
mesProcessProductList?: MesProcessProductModel; mesProcessProductList?: MesProcessProductModel;
mesProcessSchemeList?: MesProcessSchemeModel; mesCollectionItemList?: MesCollectionItemModel;
} }
/** /**
...@@ -152,22 +152,58 @@ export interface MesProcessProductModel { ...@@ -152,22 +152,58 @@ export interface MesProcessProductModel {
isFeeding: string; isFeeding: string;
number: string; number: string;
name: string;
code: string;
} }
/** /**
* @description: MesProcessScheme表类型 * @description: MesCollectionItem表类型
*/ */
export interface MesProcessSchemeModel { export interface MesCollectionItemModel {
id: string; id: string;
processId: string; code: string;
collectionSchemeId: string; name: string;
required: string; required: string;
categoryId: string;
contentType: string;
dataType: string;
dictId: string;
relatedModelId: string;
relatedModelName: string;
relatedModelDomain: string;
standardValue: string;
upperValue: string;
lowerValue: string;
note: string; note: string;
companyId: string;
qualityCategoryId: string;
analysisMethod: string;
qualityMethodId: string;
destructive: string;
keyItem: string;
deleteMark: string; deleteMark: string;
createDate: string; createDate: string;
......
xjrsoft-vue3/src/views/jcsj/gxgl/components/Form.vue
...@@ -16,19 +16,17 @@ ...@@ -16,19 +16,17 @@
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 { addRokeProcess, getRokeProcess, updateRokeProcess } from '/@/api/jcsj/gxgl'; import { addRokeProcess, getRokeProcess, updateRokeProcess } from '/@/api/jcsj/gxgl';
import { getMesCollectionScheme } from '/@/api/jcsj/cjfa';
import { getMesBaseProductInfo } from '/@/api/jcsj/cpxx';
import { cloneDeep, isString } from 'lodash-es'; import { cloneDeep, isString } from 'lodash-es';
import { FormDataProps } from '/@/components/Designer/src/types';
import { usePermission } from '/@/hooks/web/usePermission'; import { usePermission } from '/@/hooks/web/usePermission';
import CustomButtonModal from '/@/components/Form/src/components/CustomButtonModal.vue';
import { FromPageType } from '/@/enums/workflowEnum'; import { FromPageType } from '/@/enums/workflowEnum';
import { createFormEvent, getFormDataEvent, loadFormEvent, submitFormEvent,} from '/@/hooks/web/useFormEvent'; import { createFormEvent, getFormDataEvent, loadFormEvent, submitFormEvent,} from '/@/hooks/web/useFormEvent';
import { changeWorkFlowForm, changeSchemaDisabled } from '/@/hooks/web/useWorkFlowForm'; import { changeWorkFlowForm, changeSchemaDisabled } from '/@/hooks/web/useWorkFlowForm';
import { WorkFlowFormParams } from '/@/model/workflow/bpmnConfig'; import { WorkFlowFormParams } from '/@/model/workflow/bpmnConfig';
import { useRouter } from 'vue-router'; import { useRouter } from 'vue-router';
import { useMessage } from '/@/hooks/web/useMessage';
const { filterFormSchemaAuth } = usePermission(); const { filterFormSchemaAuth } = usePermission();
const { notification } = useMessage();
const RowKey = 'id'; const RowKey = 'id';
const emits = defineEmits(['changeUploadComponentIds','loadingCompleted', 'update:value']); const emits = defineEmits(['changeUploadComponentIds','loadingCompleted', 'update:value']);
...@@ -39,14 +37,12 @@ ...@@ -39,14 +37,12 @@
}, },
}); });
const systemFormRef = ref(); const systemFormRef = ref();
const data = reactive({ const data: { formDataProps: FormDataProps } = reactive({
formDataProps: cloneDeep(formProps) as any, formDataProps: cloneDeep(formProps),
}); });
const state = reactive({ const state = reactive({
formModel: {} as any, formModel: {},
formInfo:{formId:'',formName:''}, formInfo:{formId:'',formName:''}
isUpdatingCollectionItems: false, // 防止编辑时触发更新
isProcessingProductList: false, // 防止产品列表去重时触发循环更新
}); });
const { currentRoute } = useRouter(); const { currentRoute } = useRouter();
watch( watch(
...@@ -59,135 +55,6 @@ ...@@ -59,135 +55,6 @@
}, },
); );
// 处理产品列表去重
function deduplicateProductList(productList: any[]): { uniqueList: any[]; duplicateProducts: string[] } {
if (!productList || !Array.isArray(productList) || productList.length === 0) {
return { uniqueList: productList || [], duplicateProducts: [] };
}
const productIdMap = new Map();
const duplicateProducts: string[] = [];
const uniqueList: any[] = [];
productList.forEach((product: any) => {
const productId = product.productId;
if (!productId) {
// 如果没有productId，直接添加（可能是新增的空行）
uniqueList.push(product);
return;
}
if (productIdMap.has(productId)) {
// 发现重复产品
const productName = product.mingChen2461 || product.bianHao3907 || `产品ID: ${productId}`;
duplicateProducts.push(productName);
} else {
// 首次出现，添加到唯一列表
productIdMap.set(productId, product);
uniqueList.push(product);
}
});
return { uniqueList, duplicateProducts };
}
// 监听采集方案变化，实时更新采集项列表
watch(
() => state.formModel.collectionSchemeId,
async (newVal, oldVal) => {
// 如果正在更新采集项列表，则不处理（防止编辑时加载数据触发）
if (state.isUpdatingCollectionItems) {
return;
}
// 如果值没有变化，则不处理
if (newVal === oldVal) {
return;
}
// 如果采集方案为空，清空采集项列表
if (!newVal) {
state.formModel.mesProcessSchemeList = [];
await nextTick();
setFieldsValue({ mesProcessSchemeList: [] });
return;
}
// 获取采集方案下的采集项列表
await loadCollectionItemsByScheme(newVal);
},
{
immediate: false,
deep: false, // 不需要深度监听，只监听值的变化
},
);
// 根据采集方案ID加载采集项列表
async function loadCollectionItemsByScheme(schemeId: string | string[]) {
// 处理采集方案可能是数组的情况（多选），取第一个
const actualSchemeId = Array.isArray(schemeId) ? (schemeId.length > 0 ? schemeId[0] : '') : schemeId;
if (!actualSchemeId) {
state.formModel.mesProcessSchemeList = [];
await nextTick();
setFieldsValue({ mesProcessSchemeList: [] });
return;
}
try {
state.isUpdatingCollectionItems = true;
// 先尝试通过采集方案详情获取采集项列表
try {
const schemeInfo: any = await getMesCollectionScheme(actualSchemeId);
// 如果采集方案详情中包含采集项列表
if (schemeInfo && schemeInfo.mesCollectionSchemeItemList && Array.isArray(schemeInfo.mesCollectionSchemeItemList)) {
const collectionItems = schemeInfo.mesCollectionSchemeItemList;
// 转换为 mesProcessSchemeList 格式
const processSchemeList = collectionItems.map((item: any) => ({
id: item.id || '',
collectionSchemeId: actualSchemeId,
bianMa8881: item.code || '', // 编码
mingChen4867: item.name || '', // 名称
mingChen3506: item.dataType || item.contentType || '', // 数据类型
mingChen6235: item.required || '0', // 是否必填
beiZhu2454: item.note || '', // 备注
required: item.required || '0',
note: item.note || '',
}));
// 更新表单数据
state.formModel.mesProcessSchemeList = processSchemeList;
// 使用 nextTick 确保数据更新后再设置到表单
await nextTick();
setFieldsValue({ mesProcessSchemeList: processSchemeList });
return;
}
} catch (error) {
console.warn('通过采集方案详情获取采集项列表失败，尝试其他方式', error);
}
// 如果采集方案详情中没有采集项列表，尝试通过采集项API获取
// 注意：这里需要根据实际的API接口调整，可能需要通过其他方式获取
// 暂时先尝试通过采集方案的详情接口，如果失败则清空列表
state.formModel.mesProcessSchemeList = [];
await nextTick();
setFieldsValue({ mesProcessSchemeList: [] });
} catch (error) {
console.error('获取采集项列表失败', error);
// 如果获取失败，清空列表
state.formModel.mesProcessSchemeList = [];
await nextTick();
setFieldsValue({ mesProcessSchemeList: [] });
} finally {
// 确保在数据更新完成后再重置标志
await nextTick();
state.isUpdatingCollectionItems = false;
}
}
onMounted(async () => { onMounted(async () => {
try { try {
if (props.fromPage == FromPageType.MENU) { if (props.fromPage == FromPageType.MENU) {
...@@ -227,12 +94,12 @@ ...@@ -227,12 +94,12 @@
// 校验form 通过返回表单数据 // 校验form 通过返回表单数据
async function validate() { async function validate() {
let values: any = {}; let values = [];
try { try {
values = await systemFormRef.value?.validate() || {}; values = await systemFormRef.value?.validate();
//添加隐藏组件 //添加隐藏组件
if (data.formDataProps.hiddenComponent?.length) { if (data.formDataProps.hiddenComponent?.length) {
data.formDataProps.hiddenComponent.forEach((component: any) => { data.formDataProps.hiddenComponent.forEach((component) => {
values[component.bindField] = component.value; values[component.bindField] = component.value;
}); });
} }
...@@ -243,78 +110,24 @@ ...@@ -243,78 +110,24 @@
// 根据行唯一ID查询行数据，并设置表单数据 【编辑】 // 根据行唯一ID查询行数据，并设置表单数据 【编辑】
async function setFormDataFromId(rowId) { async function setFormDataFromId(rowId) {
try { try {
// 编辑时设置标志，防止加载数据时触发采集方案变化监听和产品去重 const record = await getRokeProcess(rowId);
state.isUpdatingCollectionItems = true;
state.isProcessingProductList = true;
const record: any = await getRokeProcess(rowId);
// 处理产品列表数据，根据productId查询产品信息并填充编号、名称、备注
if (record.mesProcessProductList && Array.isArray(record.mesProcessProductList)) {
const productList = record.mesProcessProductList;
const processedProductList = await Promise.all(
productList.map(async (product: any) => {
if (product.productId) {
try {
const productInfo: any = await getMesBaseProductInfo(product.productId);
// 填充产品信息到表格字段
return {
...product,
bianHao3907: productInfo?.cpbh || '', // 产品编号
mingChen2461: productInfo?.cpmc || '', // 产品名称
beiZhu7713: productInfo?.bz || product.bz || '', // 备注（优先使用产品备注，如果没有则使用原有备注）
};
} catch (error) {
console.warn(`获取产品信息失败，productId: ${product.productId}`, error);
// 如果查询失败，返回原数据
return {
...product,
bianHao3907: product.bianHao3907 || '',
mingChen2461: product.mingChen2461 || '',
beiZhu7713: product.beiZhu7713 || product.bz || '',
};
}
}
return product;
})
);
record.mesProcessProductList = processedProductList;
}
// 先设置表单数据
setFieldsValue(record); setFieldsValue(record);
// 再更新 formModel，这样 watch 不会在数据加载时触发
state.formModel = record; state.formModel = record;
// 等待数据设置完成
await nextTick();
// 如果编辑时没有采集项列表，但采集方案存在，则加载采集项列表
if (record.collectionSchemeId && (!record.mesProcessSchemeList || record.mesProcessSchemeList.length === 0)) {
// 加载采集项列表时，isUpdatingCollectionItems 已经在 loadCollectionItemsByScheme 中管理
await loadCollectionItemsByScheme(record.collectionSchemeId);
}
await getFormDataEvent(formEventConfigs, state.formModel, await getFormDataEvent(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); //表单事件：获取表单数据
} catch (error) { } catch (error) {
console.error('加载表单数据失败', error);
} finally {
// 确保在数据加载完成后重置标志，允许后续的采集方案切换触发更新
await nextTick();
state.isUpdatingCollectionItems = false;
state.isProcessingProductList = false;
} }
} }
// 辅助返回表单数据 // 辅助返回表单数据
async function getFieldsValue() { async function getFieldsValue() {
let values: any = {}; let values = [];
try { try {
values = await systemFormRef.value?.getFieldsValue() || {}; values = await systemFormRef.value?.getFieldsValue();
//添加隐藏组件 //添加隐藏组件
if (data.formDataProps.hiddenComponent?.length) { if (data.formDataProps.hiddenComponent?.length) {
data.formDataProps.hiddenComponent.forEach((component: any) => { data.formDataProps.hiddenComponent.forEach((component) => {
values[component.bindField] = component.value; values[component.bindField] = component.value;
}); });
} }
...@@ -384,57 +197,7 @@ ...@@ -384,57 +197,7 @@
formProps.schemas, true, state.formInfo.formName,state.formInfo.formId); //表单事件：加载表单 formProps.schemas, true, state.formInfo.formName,state.formInfo.formId); //表单事件：加载表单
} }
function handleChange(val) { function handleChange(val) {
// 保存旧的采集方案ID，用于判断是否发生变化
const oldCollectionSchemeId = state.formModel.collectionSchemeId;
// 处理产品列表去重（在更新formModel之前）
if (val.mesProcessProductList && Array.isArray(val.mesProcessProductList) && !state.isProcessingProductList) {
const { uniqueList, duplicateProducts } = deduplicateProductList(val.mesProcessProductList);
// 如果有重复产品，进行去重并提示
if (duplicateProducts.length > 0) {
state.isProcessingProductList = true;
val.mesProcessProductList = uniqueList;
// 立即更新表单数据，确保去重后的数据反映到表单中
nextTick(() => {
setFieldsValue({ mesProcessProductList: uniqueList });
state.isProcessingProductList = false;
});
notification.warning({
message: '提示',
description: `以下产品已存在，已自动去除重复项：${duplicateProducts.join('、')}`,
duration: 3,
});
}
}
// 同步更新 state.formModel，确保 watch 能监听到变化
// 使用响应式的方式更新，确保能触发 watch
if (val.collectionSchemeId !== undefined) {
state.formModel.collectionSchemeId = val.collectionSchemeId;
}
// 更新其他字段
Object.keys(val).forEach(key => {
if (key !== 'collectionSchemeId') {
state.formModel[key] = val[key];
}
});
emits('update:value', val); emits('update:value', val);
// 如果采集方案发生变化，且不在更新状态，立即触发更新
// 这样可以确保即使 watch 没有触发，也能更新采集项列表
if (val.collectionSchemeId !== undefined &&
val.collectionSchemeId !== oldCollectionSchemeId &&
!state.isUpdatingCollectionItems) {
nextTick(() => {
if (!state.isUpdatingCollectionItems) {
loadCollectionItemsByScheme(val.collectionSchemeId);
}
});
}
} }
async function sendMessageForAllIframe() { async function sendMessageForAllIframe() {
try { try {
...@@ -459,3 +222,4 @@ ...@@ -459,3 +222,4 @@
}); });
</script> </script>
\ No newline at end of file
xjrsoft-vue3/src/views/jcsj/gxgl/components/GxglModal.vue
...@@ -148,8 +148,9 @@ ...@@ -148,8 +148,9 @@
function customClick(item) { function customClick(item) {
if (item.key == 'confirm') { if (item.key == 'confirm') {
handleSubmit(); handleSubmit();
} else if (item.key == 'cancel') { } else if (item.key == 'cancel' && props.formType !== 'normal') {
handleClose(); handleClose();
closeModal();
} else if (item.key == 'reset') { } else if (item.key == 'reset') {
formRef.value.resetFields(); formRef.value.resetFields();
} else { } else {
...@@ -158,7 +159,6 @@ ...@@ -158,7 +159,6 @@
} }
function handleClose() { function handleClose() {
formRef.value.resetFields(); formRef.value.resetFields();
closeModal();
} }
</script> </script>
......
xjrsoft-vue3/src/views/jcsj/gxgl/components/config.ts
...@@ -56,6 +56,12 @@ export const searchFormSchema: FormSchema[] = [ ...@@ -56,6 +56,12 @@ export const searchFormSchema: FormSchema[] = [
getPopupContainer: () => document.body, getPopupContainer: () => document.body,
}, },
}, },
{
field: 'note',
label: '备注',
defaultValue: undefined,
component: 'Input',
},
]; ];
export const columns: BasicColumn[] = [ export const columns: BasicColumn[] = [
...@@ -110,19 +116,6 @@ export const columns: BasicColumn[] = [ ...@@ -110,19 +116,6 @@ export const columns: BasicColumn[] = [
styleConfig: undefined, styleConfig: undefined,
listStyle: undefined, listStyle: undefined,
}, },
{
resizable: true,
dataIndex: 'ratedWorkingHours',
title: '额定工时',
componentType: 'number',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: undefined,
},
]; ];
//表头合并配置 //表头合并配置
export const headerMergingData = []; export const headerMergingData = [];
...@@ -216,7 +209,7 @@ export const formProps: FormProps = { ...@@ -216,7 +209,7 @@ export const formProps: FormProps = {
componentProps: { componentProps: {
width: '100%', width: '100%',
span: 7, span: 7,
placeholder: '请输入编码组件组件', placeholder: '请输入编码组件组件编码',
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
...@@ -340,7 +333,7 @@ export const formProps: FormProps = { ...@@ -340,7 +333,7 @@ export const formProps: FormProps = {
}, },
}, },
{ {
key: 'ca8257a46070472e9639110b11f7f3bd', key: '4a92294f40b2406a9ce865678f3b74e4',
field: 'ratedWorkingHours', field: 'ratedWorkingHours',
label: '额定工时', label: '额定工时',
type: 'number', type: 'number',
...@@ -405,7 +398,7 @@ export const formProps: FormProps = { ...@@ -405,7 +398,7 @@ export const formProps: FormProps = {
events: {}, events: {},
isShow: true, isShow: true,
tooltipConfig: { visible: false, title: '提示文本' }, tooltipConfig: { visible: false, title: '提示文本' },
defaultSelect: '2005534898818441218', defaultSelect: '',
style: { width: '100%' }, style: { width: '100%' },
}, },
}, },
...@@ -471,7 +464,7 @@ export const formProps: FormProps = { ...@@ -471,7 +464,7 @@ export const formProps: FormProps = {
width: '100%', width: '100%',
span: 1, span: 1,
defaultValue: '', defaultValue: '',
placeholder: '请输入备注', placeholder: '请输入备注备注',
rows: 4, rows: 4,
autoSize: false, autoSize: false,
showCount: false, showCount: false,
...@@ -545,41 +538,9 @@ export const formProps: FormProps = { ...@@ -545,41 +538,9 @@ export const formProps: FormProps = {
mainKey: 'mesProcessProductList', mainKey: 'mesProcessProductList',
columns: [ columns: [
{ {
key: '6e053d43971d4157b0f9118f9cbbb4bb',
title: '产品物料id',
dataIndex: 'productId',
componentType: 'Input',
defaultValue: '',
componentProps: {
width: '100%',
span: '',
defaultValue: '',
placeholder: '',
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: '提示文本' },
prestrainField: 'id',
},
},
{
key: '00c0e93b675841f48265b896515a5241', key: '00c0e93b675841f48265b896515a5241',
title: '编号', title: '编号',
dataIndex: 'bianHao3907', dataIndex: 'code',
componentType: 'Input', componentType: 'Input',
defaultValue: '', defaultValue: '',
componentProps: { componentProps: {
...@@ -591,14 +552,14 @@ export const formProps: FormProps = { ...@@ -591,14 +552,14 @@ export const formProps: FormProps = {
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
addonAfter: '', addonAfter: '',
disabled: true, disabled: false,
allowClear: false, allowClear: false,
showLabel: true, showLabel: true,
required: false, required: false,
rules: [], rules: [],
events: {}, events: {},
listStyle: '', listStyle: '',
isSave: true, isSave: false,
isShow: true, isShow: true,
scan: false, scan: false,
bordered: true, bordered: true,
...@@ -610,7 +571,7 @@ export const formProps: FormProps = { ...@@ -610,7 +571,7 @@ export const formProps: FormProps = {
{ {
key: '91863c5a0ec24d76ade8735cd401059b', key: '91863c5a0ec24d76ade8735cd401059b',
title: '名称', title: '名称',
dataIndex: 'mingChen2461', dataIndex: 'name',
componentType: 'Input', componentType: 'Input',
defaultValue: '', defaultValue: '',
componentProps: { componentProps: {
...@@ -622,14 +583,14 @@ export const formProps: FormProps = { ...@@ -622,14 +583,14 @@ export const formProps: FormProps = {
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
addonAfter: '', addonAfter: '',
disabled: true, disabled: false,
allowClear: false, allowClear: false,
showLabel: true, showLabel: true,
required: false, required: false,
rules: [], rules: [],
events: {}, events: {},
listStyle: '', listStyle: '',
isSave: true, isSave: false,
isShow: true, isShow: true,
scan: false, scan: false,
bordered: true, bordered: true,
...@@ -683,9 +644,9 @@ export const formProps: FormProps = { ...@@ -683,9 +644,9 @@ export const formProps: FormProps = {
}, },
}, },
{ {
key: '86ad9fb6998c4d0ea8e11ed0ef6585cb', key: '607b81d8885746409998c64f0a55a56e',
title: '备注', title: '备注',
dataIndex: 'beiZhu7713', dataIndex: 'bz',
componentType: 'Input', componentType: 'Input',
defaultValue: '', defaultValue: '',
componentProps: { componentProps: {
...@@ -693,23 +654,56 @@ export const formProps: FormProps = { ...@@ -693,23 +654,56 @@ export const formProps: FormProps = {
span: '', span: '',
defaultValue: '', defaultValue: '',
placeholder: '', placeholder: '',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
addonAfter: '', addonAfter: '',
disabled: true, disabled: false,
allowClear: false, allowClear: false,
showLabel: true, showLabel: true,
required: false, required: false,
rules: [], rules: [],
events: {}, events: {},
listStyle: '', listStyle: '',
isSave: true, isSave: false,
isShow: true, isShow: true,
scan: false, scan: false,
bordered: true, bordered: true,
isShowAi: false, isShowAi: false,
tooltipConfig: { visible: false, title: '提示文本' }, tooltipConfig: { visible: false, title: '提示文本' },
prestrainField: 'bz',
},
},
{
key: '6e053d43971d4157b0f9118f9cbbb4bb',
title: '产品物料id',
dataIndex: 'productId',
componentType: 'Input',
defaultValue: '',
componentProps: {
width: '100%',
span: '',
defaultValue: '',
placeholder: '',
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: '提示文本' },
prestrainField: 'id',
}, },
}, },
{ title: '操作', key: 'action', fixed: 'right', width: '50px' }, { title: '操作', key: 'action', fixed: 'right', width: '50px' },
...@@ -717,65 +711,34 @@ export const formProps: FormProps = { ...@@ -717,65 +711,34 @@ export const formProps: FormProps = {
span: '24', span: '24',
preloadType: 'api', preloadType: 'api',
apiConfig: { apiConfig: {
path: '/scgl/scjh/getAllProduct', path: '/jcxx/getProduct',
method: 'GET', method: 'GET',
apiId: 'f4fbb57f2f18425e97918a031c8aa7d8', apiId: 'copy1767517099244d66500',
apiParams: [ apiParams: [
{ key: '1', title: 'Query Params', tableInfo: [] }, { key: '1', title: 'Query Params', tableInfo: [] },
{ 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,cpmc as label from mes_base_product_info where delete_mark=0';\r\nreturn db.select(sql)", 'var sql="select *,id as value,name as label from roke_product where delete_mark = 0";\r\nreturn db.select(sql);',
outputParams: [ outputParams: [
{ { name: 'cpbh', tableTitle: '编号' },
name: 'id', { name: 'cpmc', tableTitle: '名称' },
tableTitle: '产品ID', { name: 'bz', tableTitle: '备注' },
bindField: 'productId', { name: 'id', tableTitle: 'ID' },
show: false,
width: 150,
},
{
name: 'cpbh',
tableTitle: '产品编号',
bindField: 'bianHao3907',
show: true,
width: 150,
},
{
name: 'cpmc',
tableTitle: '产品名称',
bindField: 'mingChen2461',
show: true,
width: 150,
},
{
name: 'gg',
tableTitle: '产品规格',
bindField: 'cpgg',
show: true,
width: 150,
},
{
name: 'xh',
tableTitle: '产品型号',
bindField: 'cpxh',
show: true,
width: 150,
},
], ],
}, },
itemId: '', itemId: '',
dicOptions: [], dicOptions: [],
useSelectButton: true, useSelectButton: true,
buttonName: '+ 新增', buttonName: '新增',
showLabel: true, showLabel: true,
showComponentBorder: true, showComponentBorder: true,
showBorder: false, showBorder: false,
bordercolor: '#f0f0f0', bordercolor: '#f0f0f0',
bordershowtype: [true, true, true, true], bordershowtype: [true, true, true, true],
borderwidth: 1, borderwidth: 1,
showIndex: false, showIndex: true,
isShow: true, isShow: true,
multipleHeads: [], multipleHeads: [],
buttonList: [], buttonList: [],
...@@ -790,205 +753,74 @@ export const formProps: FormProps = { ...@@ -790,205 +753,74 @@ export const formProps: FormProps = {
hasCheckedCol: true, hasCheckedCol: true,
events: {}, events: {},
showPagenation: true, showPagenation: true,
}, widths: [
},
],
},
{
span: 0,
name: '采集项',
list: [
{
key: '3fd474ce5f8c4bf78bd86dc701cbdc4f',
label: '',
field: 'mesProcessSchemeList',
type: 'form',
component: 'SubForm',
required: true,
colProps: { span: 24 },
componentProps: {
mainKey: 'mesProcessSchemeList',
columns: [
{ {
key: '3999831fde0a4e879f64f33eb2a1edd1', key: '00c0e93b675841f48265b896515a5241',
title: '编码', name: '编号',
dataIndex: 'bianMa8881', bindField: 'code',
componentType: 'Input', width: null,
defaultValue: '', minWidth: null,
componentProps: { maxWidth: null,
width: '100%', resizable: false,
span: '', unit: null,
defaultValue: '', isEdit: true,
placeholder: '',
prefix: '',
suffix: '',
addonBefore: '',
addonAfter: '',
disabled: true,
allowClear: false,
showLabel: true,
required: false,
rules: [],
events: {},
listStyle: '',
isSave: true,
isShow: true,
scan: false,
bordered: true,
isShowAi: false,
tooltipConfig: { visible: false, title: '提示文本' },
},
}, },
{ {
key: 'ab6576e960ee44b4af09975e64088f05', key: '91863c5a0ec24d76ade8735cd401059b',
title: '名称', name: '名称',
dataIndex: 'mingChen4867', bindField: 'name',
componentType: 'Input', width: null,
defaultValue: '', minWidth: null,
componentProps: { maxWidth: null,
width: '100%', resizable: false,
span: '', unit: null,
defaultValue: '', isEdit: true,
placeholder: '',
prefix: '',
suffix: '',
addonBefore: '',
addonAfter: '',
disabled: true,
allowClear: false,
showLabel: true,
required: false,
rules: [],
events: {},
listStyle: '',
isSave: true,
isShow: true,
scan: false,
bordered: true,
isShowAi: false,
tooltipConfig: { visible: false, title: '提示文本' },
},
}, },
{ {
key: 'f086101bc78b4471b3cb95b3970c368e', key: '6c749d8f7bde474da082c659146f473c',
title: '数据类型', name: '数量',
dataIndex: 'mingChen3506', bindField: 'number',
componentType: 'Input', width: null,
defaultValue: '', minWidth: null,
componentProps: { maxWidth: null,
width: '100%', resizable: false,
span: '', unit: null,
defaultValue: '', isEdit: false,
placeholder: '',
prefix: '',
suffix: '',
addonBefore: '',
addonAfter: '',
disabled: true,
allowClear: false,
showLabel: true,
required: false,
rules: [],
events: {},
listStyle: '',
isSave: true,
isShow: true,
scan: false,
bordered: true,
isShowAi: false,
tooltipConfig: { visible: false, title: '提示文本' },
},
}, },
{ {
key: '5d40e3c7f274461aba1f041c5f33c13d', key: 'cb38672445b24eedb2b10addf520de2e',
title: '是否必填', name: '是否投料',
dataIndex: 'mingChen6235', bindField: 'is_feeding',
componentType: 'Input', width: null,
defaultValue: '', minWidth: null,
componentProps: { maxWidth: null,
width: '100%', resizable: false,
span: '', unit: null,
defaultValue: '', isEdit: false,
placeholder: '', },
prefix: '', {
suffix: '', key: '607b81d8885746409998c64f0a55a56e',
addonBefore: '', name: '备注',
addonAfter: '', bindField: 'bz',
disabled: true, width: null,
allowClear: false, minWidth: null,
showLabel: true, maxWidth: null,
required: false, resizable: false,
rules: [], unit: null,
events: {}, isEdit: false,
listStyle: '',
isSave: true,
isShow: true,
scan: false,
bordered: true,
isShowAi: false,
tooltipConfig: { visible: false, title: '提示文本' },
},
}, },
{ {
key: '7674096c8feb431a8689c584a93c5b8a', key: '6e053d43971d4157b0f9118f9cbbb4bb',
title: '备注', name: '产品物料id',
dataIndex: 'beiZhu2454', bindField: 'product_id',
componentType: 'Input', width: null,
defaultValue: '', minWidth: null,
componentProps: { maxWidth: null,
width: '100%', resizable: false,
span: '', unit: null,
defaultValue: '', isEdit: false,
placeholder: '',
prefix: '',
suffix: '',
addonBefore: '',
addonAfter: '',
disabled: true,
allowClear: false,
showLabel: true,
required: false,
rules: [],
events: {},
listStyle: '',
isSave: true,
isShow: true,
scan: false,
bordered: true,
isShowAi: false,
tooltipConfig: { visible: false, title: '提示文本' },
},
}, },
{ title: '操作', key: 'action', fixed: 'right', width: '50px' },
], ],
span: '24',
preloadType: 'api',
apiConfig: {},
itemId: '',
dicOptions: [],
useSelectButton: false,
buttonName: '选择数据',
showLabel: true,
showComponentBorder: true,
showBorder: false,
bordercolor: '#f0f0f0',
bordershowtype: [true, true, true, true],
borderwidth: 1,
showIndex: false,
isShow: true,
multipleHeads: [],
buttonList: [],
topButtonList: [],
isExport: false,
isImport: false,
isDeleteSelected: false,
isListView: false,
viewList: [],
isShowAdd: false,
isShowDelete: true,
hasCheckedCol: false,
events: {},
showPagenation: true,
}, },
}, },
], ],
......
xjrsoft-vue3/src/views/jcsj/gxgl/components/workflowPermission.ts
...@@ -77,7 +77,7 @@ export const permissionList = [ ...@@ -77,7 +77,7 @@ export const permissionList = [
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'number', type: 'number',
key: 'ca8257a46070472e9639110b11f7f3bd', key: '4a92294f40b2406a9ce865678f3b74e4',
children: [], children: [],
options: {}, options: {},
defaultValue: 0, defaultValue: 0,
...@@ -97,7 +97,6 @@ export const permissionList = [ ...@@ -97,7 +97,6 @@ export const permissionList = [
key: '6a8f658eb0e046e48c3dac472c0e51ae', key: '6a8f658eb0e046e48c3dac472c0e51ae',
children: [], children: [],
options: {}, options: {},
defaultValue: '2005534898818441218',
}, },
{ {
required: false, required: false,
...@@ -155,23 +154,8 @@ export const permissionList = [ ...@@ -155,23 +154,8 @@ export const permissionList = [
isSaveTable: false, isSaveTable: false,
showChildren: false, showChildren: false,
tableName: 'mesProcessProductList', tableName: 'mesProcessProductList',
fieldName: '产品物料id',
fieldId: 'productId',
type: 'Input',
key: '6e053d43971d4157b0f9118f9cbbb4bb',
children: [],
},
{
required: true,
view: true,
edit: true,
disabled: false,
isSubTable: false,
isSaveTable: false,
showChildren: false,
tableName: 'mesProcessProductList',
fieldName: '编号', fieldName: '编号',
fieldId: 'bianHao3907', fieldId: 'code',
type: 'Input', type: 'Input',
key: '00c0e93b675841f48265b896515a5241', key: '00c0e93b675841f48265b896515a5241',
children: [], children: [],
...@@ -186,7 +170,7 @@ export const permissionList = [ ...@@ -186,7 +170,7 @@ export const permissionList = [
showChildren: false, showChildren: false,
tableName: 'mesProcessProductList', tableName: 'mesProcessProductList',
fieldName: '名称', fieldName: '名称',
fieldId: 'mingChen2461', fieldId: 'name',
type: 'Input', type: 'Input',
key: '91863c5a0ec24d76ade8735cd401059b', key: '91863c5a0ec24d76ade8735cd401059b',
children: [], children: [],
...@@ -231,84 +215,9 @@ export const permissionList = [ ...@@ -231,84 +215,9 @@ export const permissionList = [
showChildren: false, showChildren: false,
tableName: 'mesProcessProductList', tableName: 'mesProcessProductList',
fieldName: '备注', fieldName: '备注',
fieldId: 'beiZhu7713', fieldId: 'bz',
type: 'Input',
key: '86ad9fb6998c4d0ea8e11ed0ef6585cb',
children: [],
},
],
},
{
required: true,
view: true,
edit: true,
disabled: false,
isSubTable: true,
showChildren: false,
tableName: 'mesProcessSchemeList',
fieldName: '',
fieldId: 'mesProcessSchemeList',
type: 'form',
key: '3fd474ce5f8c4bf78bd86dc701cbdc4f',
children: [
{
required: true,
view: true,
edit: true,
disabled: false,
isSubTable: false,
isSaveTable: false,
showChildren: false,
tableName: 'mesProcessSchemeList',
fieldName: '编码',
fieldId: 'bianMa8881',
type: 'Input',
key: '3999831fde0a4e879f64f33eb2a1edd1',
children: [],
},
{
required: true,
view: true,
edit: true,
disabled: false,
isSubTable: false,
isSaveTable: false,
showChildren: false,
tableName: 'mesProcessSchemeList',
fieldName: '名称',
fieldId: 'mingChen4867',
type: 'Input',
key: 'ab6576e960ee44b4af09975e64088f05',
children: [],
},
{
required: true,
view: true,
edit: true,
disabled: false,
isSubTable: false,
isSaveTable: false,
showChildren: false,
tableName: 'mesProcessSchemeList',
fieldName: '数据类型',
fieldId: 'mingChen3506',
type: 'Input',
key: 'f086101bc78b4471b3cb95b3970c368e',
children: [],
},
{
required: true,
view: true,
edit: true,
disabled: false,
isSubTable: false,
isSaveTable: false,
showChildren: false,
tableName: 'mesProcessSchemeList',
fieldName: '是否必填',
fieldId: 'mingChen6235',
type: 'Input', type: 'Input',
key: '5d40e3c7f274461aba1f041c5f33c13d', key: '607b81d8885746409998c64f0a55a56e',
children: [], children: [],
}, },
{ {
...@@ -319,11 +228,11 @@ export const permissionList = [ ...@@ -319,11 +228,11 @@ export const permissionList = [
isSubTable: false, isSubTable: false,
isSaveTable: false, isSaveTable: false,
showChildren: false, showChildren: false,
tableName: 'mesProcessSchemeList', tableName: 'mesProcessProductList',
fieldName: '备注', fieldName: '产品物料id',
fieldId: 'beiZhu2454', fieldId: 'productId',
type: 'Input', type: 'Input',
key: '7674096c8feb431a8689c584a93c5b8a', key: '6e053d43971d4157b0f9118f9cbbb4bb',
children: [], children: [],
}, },
], ],
......
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