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

- 将名称字段改为编号字段，调整字段映射关系 - 更改公司选择下拉框的数据源接口和SQL查询语句 - 移除扣料依据字段，新增批次号字段配置 - 调整表格列配置，将名称列改为编号列并使用自动编码组件 - 更新表单布局，将内部标识字段改为名称字段并设为必填 - 添加备注字段的文本域组件配置 - 修改子表单配置，将工序相关字段改为工艺流程字段 - 移除质检设置和自动扣料相关的表单分组配置 - 更新环境配置文件中的代理设置和接口地址配置

refactor(jcsj): 优化工艺类型组件配置和字段映射
- 将名称字段改为编号字段，调整字段映射关系 - 更改公司选择下拉框的数据源接口和SQL查询语句 - 移除扣料依据字段，新增批次号字段配置 - 调整表格列配置，将名称列改为编号列并使用自动编码组件 - 更新表单布局，将内部标识字段改为名称字段并设为必填 - 添加备注字段的文本域组件配置 - 修改子表单配置，将工序相关字段改为工艺流程字段 - 移除质检设置和自动扣料相关的表单分组配置 - 更新环境配置文件中的代理设置和接口地址配置
eae3c96a · 张恒 · 26c03b64 · eae3c96a · eae3c96a · eae3c96a
Commit eae3c96a authored Dec 31, 2025 by 张恒
8 changed files
--- a/xjrsoft-vue3/.env.development
+++ b/xjrsoft-vue3/.env.development
 # 是否开启mock数据，关闭时需要自行对接后台接口
-VITE_USE_MOCK=false
+VITE_USE_MOCK = false

 # 资源公共路径,需要以 /开头和结尾
-VITE_PUBLIC_PATH=/
+VITE_PUBLIC_PATH = /

-# 本地开发代理（解决跨域）
-# 所有匹配前缀的请求将被代理到目标服务器
-VITE_PROXY=[["/system","http://192.168.8.136:8080"],["/language","http://192.168.8.136:8080"],["/api","http://192.168.8.136:8080"]]
+# 本地开发代理，可以解决跨域及多地址代理
+# 如果接口地址匹配到，则会转发到http://localhost:3000，防止本地出现跨域问题
+# 可以有多个，注意多个不能换行，否则代理将会失效
+# VITE_PROXY = [["/basic-api","http://localhost:3000"],["/upload","http://localhost:3300/upload"]]
+# VITE_PROXY=[["/api","https://vvbin.cn/test"]]

 # 是否删除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地址
-VITE_GLOB_OUT_LINK_URL=http://localhost:4100
+#外部url地址
+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 地址
-VITE_GLOB_IM_LINK_URL=http://localhost:8827
+#IM URL 地址
+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
--- a/xjrsoft-vue3/src/api/jcsj/gylx/model/GylxModel.ts
+++ b/xjrsoft-vue3/src/api/jcsj/gylx/model/GylxModel.ts
@@ -4,33 +4,173 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel';
 * @description: RokeRouting分页参数 模型
 */
 export interface RokeRoutingPageParams extends BasicPageParams {
+  code: string;
+
+  companyId: string;
+
  name: 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;

+  messageMainAttachmentId: string;
+
  name: string;

+  code: string;
+
+  internalCode: string;
+
+  active: string;
+
+  note: string;
+
+  companyId: string;
+
  lotRuleId: string;

+  autoDeduction: string;
+
+  deductionAutoConfirm: string;
+
+  deductionMoment: 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分页返回值结构

--- a/xjrsoft-vue3/src/api/jcsj/ryxx/model/RyxxModel.ts
+++ b/xjrsoft-vue3/src/api/jcsj/ryxx/model/RyxxModel.ts
@@ -6,19 +6,25 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel';
 export interface RokeEmployeePageParams extends BasicPageParams {
  name: string;

+  code: string;
+
+  phone: string;
+
+  skillLevelId: string;
+
  jobNumber: string;

  positionId: string;

-  gender: string;
-
  departmentId: string;

-  phone: string;
+  gender: string;

  idNumber: string;

-  note: string;
+  isOnJob: string;
+
+  companyId: string;
 }

 /**
@@ -33,15 +39,7 @@ export interface RokeEmployeePageModel {

  positionId: string;

-  gender: string;
-
  departmentId: string;
-
-  phone: string;
-
-  age: string;
-
-  note: string;
 }

 0;

--- a/xjrsoft-vue3/src/views/jcsj/gylx/components/config.ts
+++ b/xjrsoft-vue3/src/views/jcsj/gylx/components/config.ts
--- a/xjrsoft-vue3/src/views/jcsj/gylx/components/workflowPermission.ts
+++ b/xjrsoft-vue3/src/views/jcsj/gylx/components/workflowPermission.ts
--- a/xjrsoft-vue3/src/views/jcsj/gylx/index.vue
+++ b/xjrsoft-vue3/src/views/jcsj/gylx/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":"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);
  })


--- a/xjrsoft-vue3/src/views/jcsj/ryxx/components/config.ts
+++ b/xjrsoft-vue3/src/views/jcsj/ryxx/components/config.ts
--- a/xjrsoft-vue3/src/views/jcsj/ryxx/components/workflowPermission.ts
+++ b/xjrsoft-vue3/src/views/jcsj/ryxx/components/workflowPermission.ts
@@ -51,21 +51,20 @@ export const permissionList = [
    defaultValue: 1,
  },
  {
-    required: true,
+    required: false,
    view: true,
-    edit: true,
-    disabled: false,
+    edit: false,
+    disabled: true,
    isSaveTable: false,
    tableName: '',
    fieldName: '编号',
    fieldId: 'code',
    isSubTable: false,
    showChildren: true,
-    type: 'input',
-    key: 'bae97ad7fefb4f8aa692e678934e8f97',
+    type: 'auto-code',
+    key: '552fd440728b449eb2e2ed15bf8eb068',
    children: [],
    options: {},
-    defaultValue: '',
  },
  {
    required: false,
@@ -74,14 +73,15 @@ export const permissionList = [
    disabled: false,
    isSaveTable: false,
    tableName: '',
-    fieldName: '班组',
-    fieldId: 'teamId',
+    fieldName: '电话',
+    fieldId: 'phone',
    isSubTable: false,
    showChildren: true,
-    type: 'select',
-    key: 'b8f4cac721c84e4e8202cc66b54a6795',
+    type: 'input',
+    key: '488d22332deb4f2abf4a9423122d98f7',
    children: [],
    options: {},
+    defaultValue: '',
  },
  {
    required: false,
@@ -107,15 +107,14 @@ export const permissionList = [
    disabled: false,
    isSaveTable: false,
    tableName: '',
-    fieldName: '工号',
-    fieldId: 'jobNumber',
+    fieldName: '技能等级',
+    fieldId: 'skillLevelId',
    isSubTable: false,
    showChildren: true,
-    type: 'input',
-    key: '1ef1b726c6f34f4fa0d704afac0aac7a',
+    type: 'select',
+    key: '7126b5787dc647bda9c3b05d626a2cf2',
    children: [],
    options: {},
-    defaultValue: '',
  },
  {
    required: false,
@@ -124,14 +123,15 @@ export const permissionList = [
    disabled: false,
    isSaveTable: false,
    tableName: '',
-    fieldName: '职位',
-    fieldId: 'positionId',
+    fieldName: '工号',
+    fieldId: 'jobNumber',
    isSubTable: false,
    showChildren: true,
-    type: 'select',
-    key: 'ea8630c3055b4a28a85ef1fbefadfc75',
+    type: 'input',
+    key: '1ef1b726c6f34f4fa0d704afac0aac7a',
    children: [],
    options: {},
+    defaultValue: '',
  },
  {
    required: false,
@@ -140,12 +140,12 @@ export const permissionList = [
    disabled: false,
    isSaveTable: false,
    tableName: '',
-    fieldName: '性别',
-    fieldId: 'gender',
+    fieldName: '职位',
+    fieldId: 'positionId',
    isSubTable: false,
    showChildren: true,
    type: 'select',
-    key: 'b5eb1855dc6d409280dbb7c4a333ae07',
+    key: 'ea8630c3055b4a28a85ef1fbefadfc75',
    children: [],
    options: {},
  },
@@ -172,31 +172,14 @@ export const permissionList = [
    disabled: false,
    isSaveTable: false,
    tableName: '',
-    fieldName: '技能等级',
-    fieldId: 'skillLevelId',
+    fieldName: '性别',
+    fieldId: 'gender',
    isSubTable: false,
    showChildren: true,
    type: 'select',
-    key: '7126b5787dc647bda9c3b05d626a2cf2',
-    children: [],
-    options: {},
-  },
-  {
-    required: false,
-    view: true,
-    edit: true,
-    disabled: false,
-    isSaveTable: false,
-    tableName: '',
-    fieldName: '电话',
-    fieldId: 'phone',
-    isSubTable: false,
-    showChildren: true,
-    type: 'input',
-    key: '488d22332deb4f2abf4a9423122d98f7',
+    key: 'b5eb1855dc6d409280dbb7c4a333ae07',
    children: [],
    options: {},
-    defaultValue: '',
  },
  {
    required: false,
@@ -239,14 +222,15 @@ export const permissionList = [
    disabled: false,
    isSaveTable: false,
    tableName: '',
-    fieldName: '公司',
-    fieldId: 'companyId',
+    fieldName: '年龄',
+    fieldId: 'age',
    isSubTable: false,
    showChildren: true,
-    type: 'select',
-    key: 'dfb0639d444c4449b11f26cf210feac5',
+    type: 'input',
+    key: '8c0ea91bdee24d40aa94110ab9f19eae',
    children: [],
    options: {},
+    defaultValue: '',
  },
  {
    required: false,
@@ -255,15 +239,14 @@ export const permissionList = [
    disabled: false,
    isSaveTable: false,
    tableName: '',
-    fieldName: '年龄',
-    fieldId: 'age',
+    fieldName: '在职情况',
+    fieldId: 'isOnJob',
    isSubTable: false,
    showChildren: true,
-    type: 'input',
-    key: '8c0ea91bdee24d40aa94110ab9f19eae',
+    type: 'select',
+    key: 'a1494eb3af92444bb256d4781a46a52c',
    children: [],
    options: {},
-    defaultValue: '',
  },
  {
    required: false,
@@ -272,12 +255,12 @@ export const permissionList = [
    disabled: false,
    isSaveTable: false,
    tableName: '',
-    fieldName: '在职情况',
-    fieldId: 'isOnJob',
+    fieldName: '公司',
+    fieldId: 'companyId',
    isSubTable: false,
    showChildren: true,
    type: 'select',
-    key: 'a1494eb3af92444bb256d4781a46a52c',
+    key: 'dfb0639d444c4449b11f26cf210feac5',
    children: [],
    options: {},
  },