Skip to content

W
weiqiao-vue
Commit eae3c96a by 张恒
Options

refactor(jcsj): 优化工艺类型组件配置和字段映射 

- 将名称字段改为编号字段，调整字段映射关系
- 更改公司选择下拉框的数据源接口和SQL查询语句
- 移除扣料依据字段，新增批次号字段配置
- 调整表格列配置，将名称列改为编号列并使用自动编码组件
- 更新表单布局，将内部标识字段改为名称字段并设为必填
- 添加备注字段的文本域组件配置
- 修改子表单配置，将工序相关字段改为工艺流程字段
- 移除质检设置和自动扣料相关的表单分组配置
- 更新环境配置文件中的代理设置和接口地址配置
parent 26c03b64
Showing with 223 additions and 99 deletions
xjrsoft-vue3/.env.development
# 是否开启mock数据，关闭时需要自行对接后台接口 # 是否开启mock数据，关闭时需要自行对接后台接口
VITE_USE_MOCK=false VITE_USE_MOCK = false
# 资源公共路径,需要以 /开头和结尾 # 资源公共路径,需要以 /开头和结尾
VITE_PUBLIC_PATH=/ VITE_PUBLIC_PATH = /
# 本地开发代理（解决跨域） # 本地开发代理，可以解决跨域及多地址代理
# 所有匹配前缀的请求将被代理到目标服务器 # 如果接口地址匹配到，则会转发到http://localhost:3000，防止本地出现跨域问题
VITE_PROXY=[["/system","http://192.168.8.136:8080"],["/language","http://192.168.8.136:8080"],["/api","http://192.168.8.136:8080"]] # 可以有多个，注意多个不能换行，否则代理将会失效
# VITE_PROXY = [["/basic-api","http://localhost:3000"],["/upload","http://localhost:3300/upload"]]
# VITE_PROXY=[["/api","https://vvbin.cn/test"]]
# 是否删除Console.log # 是否删除Console.log
VITE_DROP_CONSOLE=false VITE_DROP_CONSOLE = false
# 接口地址（用于代码中生成 baseURL） # 接口地址
VITE_GLOB_API_URL=http://192.168.8.136:8080 # 如果没有跨域问题，直接在这里配置即可
# VITE_GLOB_API_URL=http://192.168.8.73:8080
VITE_GLOB_API_URL=http://localhost:8080
# 文件上传接口 # 文件上传接口 可选
VITE_GLOB_UPLOAD_URL=/system/oss/upload VITE_GLOB_UPLOAD_URL = /system/oss/upload
# 文件预览接口 # 文件预览接口 可选
VITE_GLOB_UPLOAD_PREVIEW=http://114.116.210.204:8013/onlinePreview?url= VITE_GLOB_UPLOAD_PREVIEW = http://114.116.210.204:8013/onlinePreview?url=
# 外部url地址 #外部url地址
VITE_GLOB_OUT_LINK_URL=http://localhost:4100 VITE_GLOB_OUT_LINK_URL = http://localhost:4100
# 打印项目地址 #打印项目地址
VITE_GLOB_PRINT_BASE_URL=http://vue.xjrsoft.com:3300 VITE_GLOB_PRINT_BASE_URL = http://vue.xjrsoft.com:3300
# IM URL 地址 #IM URL 地址
VITE_GLOB_IM_LINK_URL=http://localhost:8827 VITE_GLOB_IM_LINK_URL = http://localhost:8827
# 调查问卷地址 #调查问卷地址
VITE_GLOB_QN_LINK_URL=http://localhost:3100 VITE_GLOB_QN_LINK_URL = http://localhost:3100
# 接口地址前缀（如统一加 /prefix） # 接口地址前缀，有些系统所有接口地址都有前缀，可以在这里统一加，方便切换
VITE_GLOB_API_URL_PREFIX= VITE_GLOB_API_URL_PREFIX =
# 是否启用官网代码 # 是否启用官网代码
VITE_GLOB_PRODUCTION=false VITE_GLOB_PRODUCTION = false
xjrsoft-vue3/src/api/jcsj/gylx/model/GylxModel.ts
...@@ -4,33 +4,173 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel'; ...@@ -4,33 +4,173 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel';
* @description: RokeRouting分页参数 模型 * @description: RokeRouting分页参数 模型
*/ */
export interface RokeRoutingPageParams extends BasicPageParams { export interface RokeRoutingPageParams extends BasicPageParams {
code: string;
companyId: string;
name: string; name: string;
lotRuleId: string; lotRuleId: string;
}
internalCode: string; /**
* @description: RokeRouting分页返回值模型
*/
export interface RokeRoutingPageModel {
id: string;
deductionBasis: string; code: string;
note: string; companyId: string;
name: string;
lotRuleId: string;
} }
/** /**
* @description: RokeRouting分页返回值模型 * @description: RokeRouting表类型
*/ */
export interface RokeRoutingPageModel { export interface RokeRoutingModel {
id: string; id: string;
messageMainAttachmentId: string;
name: string; name: string;
code: string;
internalCode: string;
active: string;
note: string;
companyId: string;
lotRuleId: string; lotRuleId: string;
autoDeduction: string;
deductionAutoConfirm: string;
deductionMoment: string;
deductionBasis: string; deductionBasis: string;
note: string; deductionWorkCenter: string;
documentId: string;
productId: string;
routingQualityMode: string;
deleteMark: string;
createDate: string;
createUserId: string;
modifyDate: string;
modifyUserId: string;
rokeRoutingProcessList?: RokeRoutingProcessModel;
} }
0; /**
* @description: RokeRoutingProcess表类型
*/
export interface RokeRoutingProcessModel {
id: string;
deleteMark: string;
name: string;
code: string;
categoryId: string;
processType: string;
internalCode: string;
active: string;
withoutWoProduce: string;
note: string;
ratedWorkingHours: string;
companyId: string;
isPress: string;
prepareWorkHours: string;
collectionSchemeId: string;
qualityMode: string;
qcSchemeId: string;
isQuality: string;
salaryType: string;
baseQty: string;
salaryUnit: string;
salary: string;
salaryCode: string;
qcSalaryBasis: string;
qcSalaryType: string;
qcBaseQty: string;
qcSalaryUnit: string;
qcSalary: string;
qcSalaryCode: string;
defaultReporter: string;
collectionItem: string;
inspectionCollectionItem: string;
inspectionScheme: string;
inspectionDepartment: string;
inspectionStaff: string;
defectProcessing: string;
createDate: string;
createUserId: string;
modifyDate: string;
modifyUserId: string;
zyzdFile: string;
zyzdtpFile: string;
routingId: string;
processId: string;
}
/** /**
* @description: RokeRouting分页返回值结构 * @description: RokeRouting分页返回值结构
......
xjrsoft-vue3/src/api/jcsj/ryxx/model/RyxxModel.ts
...@@ -6,19 +6,25 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel'; ...@@ -6,19 +6,25 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel';
export interface RokeEmployeePageParams extends BasicPageParams { export interface RokeEmployeePageParams extends BasicPageParams {
name: string; name: string;
code: string;
phone: string;
skillLevelId: string;
jobNumber: string; jobNumber: string;
positionId: string; positionId: string;
gender: string;
departmentId: string; departmentId: string;
phone: string; gender: string;
idNumber: string; idNumber: string;
note: string; isOnJob: string;
companyId: string;
} }
/** /**
...@@ -33,15 +39,7 @@ export interface RokeEmployeePageModel { ...@@ -33,15 +39,7 @@ export interface RokeEmployeePageModel {
positionId: string; positionId: string;
gender: string;
departmentId: string; departmentId: string;
phone: string;
age: string;
note: string;
} }
0; 0;
......
xjrsoft-vue3/src/views/jcsj/gylx/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":"2006195708167311360","name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true,"isUse":true},{"buttonId":"2006195708171505664","name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true,"isUse":true},{"buttonId":"2006195708171505665","name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true,"isUse":true,"isEnableLock":true},{"buttonId":"2006195708171505666","name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true,"isUse":true}]
return filterButtonAuth(list); return filterButtonAuth(list);
}) })
...@@ -382,4 +382,4 @@ ...@@ -382,4 +382,4 @@
</style> </style>
\ No newline at end of file
xjrsoft-vue3/src/views/jcsj/ryxx/components/workflowPermission.ts
...@@ -51,21 +51,20 @@ export const permissionList = [ ...@@ -51,21 +51,20 @@ export const permissionList = [
defaultValue: 1, defaultValue: 1,
}, },
{ {
required: true, required: false,
view: true, view: true,
edit: true, edit: false,
disabled: false, disabled: true,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '编号', fieldName: '编号',
fieldId: 'code', fieldId: 'code',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'input', type: 'auto-code',
key: 'bae97ad7fefb4f8aa692e678934e8f97', key: '552fd440728b449eb2e2ed15bf8eb068',
children: [], children: [],
options: {}, options: {},
defaultValue: '',
}, },
{ {
required: false, required: false,
...@@ -74,14 +73,15 @@ export const permissionList = [ ...@@ -74,14 +73,15 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '班组', fieldName: '电话',
fieldId: 'teamId', fieldId: 'phone',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'select', type: 'input',
key: 'b8f4cac721c84e4e8202cc66b54a6795', key: '488d22332deb4f2abf4a9423122d98f7',
children: [], children: [],
options: {}, options: {},
defaultValue: '',
}, },
{ {
required: false, required: false,
...@@ -107,15 +107,14 @@ export const permissionList = [ ...@@ -107,15 +107,14 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '工号', fieldName: '技能等级',
fieldId: 'jobNumber', fieldId: 'skillLevelId',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'input', type: 'select',
key: '1ef1b726c6f34f4fa0d704afac0aac7a', key: '7126b5787dc647bda9c3b05d626a2cf2',
children: [], children: [],
options: {}, options: {},
defaultValue: '',
}, },
{ {
required: false, required: false,
...@@ -124,14 +123,15 @@ export const permissionList = [ ...@@ -124,14 +123,15 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '职位', fieldName: '工号',
fieldId: 'positionId', fieldId: 'jobNumber',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'select', type: 'input',
key: 'ea8630c3055b4a28a85ef1fbefadfc75', key: '1ef1b726c6f34f4fa0d704afac0aac7a',
children: [], children: [],
options: {}, options: {},
defaultValue: '',
}, },
{ {
required: false, required: false,
...@@ -140,12 +140,12 @@ export const permissionList = [ ...@@ -140,12 +140,12 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '性别', fieldName: '职位',
fieldId: 'gender', fieldId: 'positionId',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'select', type: 'select',
key: 'b5eb1855dc6d409280dbb7c4a333ae07', key: 'ea8630c3055b4a28a85ef1fbefadfc75',
children: [], children: [],
options: {}, options: {},
}, },
...@@ -172,31 +172,14 @@ export const permissionList = [ ...@@ -172,31 +172,14 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '技能等级', fieldName: '性别',
fieldId: 'skillLevelId', fieldId: 'gender',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'select', type: 'select',
key: '7126b5787dc647bda9c3b05d626a2cf2', key: 'b5eb1855dc6d409280dbb7c4a333ae07',
children: [],
options: {},
},
{
required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '电话',
fieldId: 'phone',
isSubTable: false,
showChildren: true,
type: 'input',
key: '488d22332deb4f2abf4a9423122d98f7',
children: [], children: [],
options: {}, options: {},
defaultValue: '',
}, },
{ {
required: false, required: false,
...@@ -239,14 +222,15 @@ export const permissionList = [ ...@@ -239,14 +222,15 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '公司', fieldName: '年龄',
fieldId: 'companyId', fieldId: 'age',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'select', type: 'input',
key: 'dfb0639d444c4449b11f26cf210feac5', key: '8c0ea91bdee24d40aa94110ab9f19eae',
children: [], children: [],
options: {}, options: {},
defaultValue: '',
}, },
{ {
required: false, required: false,
...@@ -255,15 +239,14 @@ export const permissionList = [ ...@@ -255,15 +239,14 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '年龄', fieldName: '在职情况',
fieldId: 'age', fieldId: 'isOnJob',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'input', type: 'select',
key: '8c0ea91bdee24d40aa94110ab9f19eae', key: 'a1494eb3af92444bb256d4781a46a52c',
children: [], children: [],
options: {}, options: {},
defaultValue: '',
}, },
{ {
required: false, required: false,
...@@ -272,12 +255,12 @@ export const permissionList = [ ...@@ -272,12 +255,12 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '在职情况', fieldName: '公司',
fieldId: 'isOnJob', fieldId: 'companyId',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'select', type: 'select',
key: 'a1494eb3af92444bb256d4781a46a52c', key: 'dfb0639d444c4449b11f26cf210feac5',
children: [], children: [],
options: {}, options: {},
}, },
......
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