Merge branch 'weiqiao-vue3' of https://git.rokedata.com/jinmin/weiqiao-vue into weiqiao-vue3

ac30f4d4 · 史雅文 · e2cc78b7 · 34aacec5 · ac30f4d4 · ac30f4d4
Commit ac30f4d4 authored Dec 30, 2025 by 史雅文
5 changed files
--- a/xjrsoft-vue3/src/api/jcsj/gxgl/model/GxglModel.ts
+++ b/xjrsoft-vue3/src/api/jcsj/gxgl/model/GxglModel.ts
@@ -6,8 +6,6 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel';
 export interface RokeProcessPageParams extends BasicPageParams {
  name: string;

-  defaultReporter: string;
-
  categoryId: string;

  collectionSchemeId: string;
@@ -27,12 +25,239 @@ export interface RokeProcessPageModel {

  collectionSchemeId: string;

+  note: string;
+
  ratedWorkingHours: string;
+}
+
+/**
+ * @description: RokeProcess表类型
+ */
+export interface RokeProcessModel {
+  id: string;
+
+  deleteMark: string;
+
+  messageMainAttachmentId: 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;
+
+  mesProcessItemList?: MesProcessItemModel;
+
+  mesProcessProductList?: MesProcessProductModel;
 }

-0;
+/**
+ * @description: MesProcessItem表类型
+ */
+export interface MesProcessItemModel {
+  id: string;
+
+  processId: string;
+
+  code: string;
+
+  name: 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;
+
+  companyId: string;
+
+  qualityCategoryId: string;
+
+  analysisMethod: string;
+
+  qualityMethodId: string;
+
+  destructive: string;
+
+  keyItem: string;
+
+  deleteMark: string;
+
+  createDate: string;
+
+  createUserId: string;
+
+  modifyDate: string;
+
+  modifyUserId: string;
+}
+
+/**
+ * @description: MesProcessProduct表类型
+ */
+export interface MesProcessProductModel {
+  id: string;
+
+  deleteMark: string;
+
+  cpbh: string;
+
+  cpmc: string;
+
+  nbdm: string;
+
+  hjzt: string;
+
+  cptp: string;
+
+  kxs: string;
+
+  kcg: string;
+
+  wllx: string;
+
+  cplx: string;
+
+  gg: string;
+
+  xh: string;
+
+  fpl: string;
+
+  bzzl: string;
+
+  erpid: string;
+
+  zygf: string;
+
+  bz: string;
+
+  p1: string;
+
+  p2: string;
+
+  p3: string;
+
+  p4: string;
+
+  p5: string;
+
+  p6: string;
+
+  p7: string;
+
+  p8: string;
+
+  p9: string;
+
+  p10: string;
+
+  createDate: string;
+
+  createUserId: string;
+
+  modifyDate: string;
+
+  modifyUserId: string;
+
+  processId: string;
+
+  isFeeding: string;
+
+  number: string;
+}

 /**
 * @description: RokeProcess分页返回值结构

--- a/xjrsoft-vue3/src/views/jcsj/cjfa/components/workflowPermission.ts
+++ b/xjrsoft-vue3/src/views/jcsj/cjfa/components/workflowPermission.ts
@@ -17,7 +17,7 @@ export const permissionList = [
    defaultValue: '',
  },
  {
-    required: true,
+    required: false,
    view: true,
    edit: true,
    disabled: false,
@@ -34,7 +34,7 @@ export const permissionList = [
    defaultValue: '',
  },
  {
-    required: true,
+    required: false,
    view: true,
    edit: true,
    disabled: false,

--- a/xjrsoft-vue3/src/views/jcsj/gxgl/components/config.ts
+++ b/xjrsoft-vue3/src/views/jcsj/gxgl/components/config.ts
--- a/xjrsoft-vue3/src/views/jcsj/gxgl/components/workflowPermission.ts
+++ b/xjrsoft-vue3/src/views/jcsj/gxgl/components/workflowPermission.ts
@@ -23,17 +23,18 @@ export const permissionList = [
    disabled: false,
    isSaveTable: false,
    tableName: '',
-    fieldName: '默认报工人员',
-    fieldId: 'defaultReporter',
+    fieldName: '作业指导',
+    fieldId: 'zyzdFile',
    isSubTable: false,
    showChildren: true,
-    type: 'select',
-    key: 'aa72d19636d540078e40a0dae8b90e3c',
+    type: 'upload',
+    key: 'f7c26bba94034dcdbc816e49607d64e9',
    children: [],
    options: {},
+    defaultValue: '',
  },
  {
-    required: false,
+    required: true,
    view: true,
    edit: true,
    disabled: false,
@@ -55,12 +56,12 @@ export const permissionList = [
    disabled: false,
    isSaveTable: false,
    tableName: '',
-    fieldName: '是否委外',
-    fieldId: 'prepareWorkHours',
+    fieldName: '额定工时',
+    fieldId: 'ratedWorkingHours',
    isSubTable: false,
    showChildren: true,
-    type: 'switch',
-    key: 'aabb539eede446daa35c754416cc50ae',
+    type: 'number',
+    key: 'ca8257a46070472e9639110b11f7f3bd',
    children: [],
    options: {},
    defaultValue: 0,
@@ -76,28 +77,11 @@ export const permissionList = [
    fieldId: 'collectionSchemeId',
    isSubTable: false,
    showChildren: true,
-    type: 'select',
-    key: '55d03e0607bc4ea281a248fdcfc571bb',
+    type: 'associate-select',
+    key: '6a8f658eb0e046e48c3dac472c0e51ae',
    children: [],
    options: {},
-    defaultValue: '无',
-  },
-  {
-    required: false,
-    view: true,
-    edit: true,
-    disabled: false,
-    isSaveTable: false,
-    tableName: '',
-    fieldName: '额定工时',
-    fieldId: 'ratedWorkingHours',
-    isSubTable: false,
-    showChildren: true,
-    type: 'number',
-    key: 'ca8257a46070472e9639110b11f7f3bd',
-    children: [],
-    options: {},
-    defaultValue: 0,
+    defaultValue: '2005534898818441218',
  },
  {
    required: false,
@@ -106,12 +90,12 @@ export const permissionList = [
    disabled: false,
    isSaveTable: false,
    tableName: '',
-    fieldName: '有效的',
+    fieldName: '有效',
    fieldId: 'active',
    isSubTable: false,
    showChildren: true,
    type: 'switch',
-    key: 'e2c431530e954e53852f9a6026987e0d',
+    key: 'c0730ef93c40445195dac1ed93677144',
    children: [],
    options: {},
    defaultValue: 1,
@@ -123,48 +107,194 @@ export const permissionList = [
    disabled: false,
    isSaveTable: false,
    tableName: '',
-    fieldName: '作业指导',
-    fieldId: 'zyzdFile',
+    fieldName: '备注',
+    fieldId: 'note',
    isSubTable: false,
    showChildren: true,
-    type: 'upload',
-    key: 'f7c26bba94034dcdbc816e49607d64e9',
+    type: 'textarea',
+    key: '037bf18717bf496f8a1fc0e8605a8a7d',
    children: [],
    options: {},
    defaultValue: '',
  },
  {
-    required: false,
+    required: true,
    view: true,
    edit: true,
    disabled: false,
-    isSaveTable: false,
-    tableName: '',
-    fieldName: '作业指导',
-    fieldId: 'zyzdtpFile',
-    isSubTable: false,
-    showChildren: true,
-    type: 'upload',
-    key: 'f40c42bc3b174f7589179a6b8976eb65',
-    children: [],
-    options: {},
-    defaultValue: '',
+    isSubTable: true,
+    showChildren: false,
+    tableName: 'mesProcessProductList',
+    fieldName: '',
+    fieldId: 'mesProcessProductList',
+    type: 'form',
+    key: '7cb7c6cdf3ec417280dc49e19dd39ffa',
+    children: [
+      {
+        required: true,
+        view: true,
+        edit: true,
+        disabled: false,
+        isSubTable: false,
+        isSaveTable: false,
+        showChildren: false,
+        tableName: 'mesProcessProductList',
+        fieldName: '编号',
+        fieldId: 'cpbh',
+        type: 'Input',
+        key: '00c0e93b675841f48265b896515a5241',
+        children: [],
+      },
+      {
+        required: true,
+        view: true,
+        edit: true,
+        disabled: false,
+        isSubTable: false,
+        isSaveTable: false,
+        showChildren: false,
+        tableName: 'mesProcessProductList',
+        fieldName: '名称',
+        fieldId: 'cpmc',
+        type: 'Input',
+        key: '91863c5a0ec24d76ade8735cd401059b',
+        children: [],
+      },
+      {
+        required: true,
+        view: true,
+        edit: true,
+        disabled: false,
+        isSubTable: false,
+        isSaveTable: false,
+        showChildren: false,
+        tableName: 'mesProcessProductList',
+        fieldName: '数量',
+        fieldId: 'number',
+        type: 'InputNumber',
+        key: '6c749d8f7bde474da082c659146f473c',
+        children: [],
+      },
+      {
+        required: true,
+        view: true,
+        edit: true,
+        disabled: false,
+        isSubTable: false,
+        isSaveTable: false,
+        showChildren: false,
+        tableName: 'mesProcessProductList',
+        fieldName: '是否投料',
+        fieldId: 'isFeeding',
+        type: 'Switch',
+        key: 'cb38672445b24eedb2b10addf520de2e',
+        children: [],
+      },
+      {
+        required: true,
+        view: true,
+        edit: true,
+        disabled: false,
+        isSubTable: false,
+        isSaveTable: false,
+        showChildren: false,
+        tableName: 'mesProcessProductList',
+        fieldName: '备注',
+        fieldId: 'bz',
+        type: 'InputTextArea',
+        key: '1084a7c39baf47ba9a0251cb4e2f8c14',
+        children: [],
+      },
+    ],
  },
  {
-    required: false,
+    required: true,
    view: true,
    edit: true,
    disabled: false,
-    isSaveTable: false,
-    tableName: '',
-    fieldName: '备注',
-    fieldId: 'note',
-    isSubTable: false,
-    showChildren: true,
-    type: 'textarea',
-    key: '04ae7a540acd4c46949c6fd53e652a45',
-    children: [],
-    options: {},
-    defaultValue: '',
+    isSubTable: true,
+    showChildren: false,
+    tableName: 'mesProcessItemList',
+    fieldName: '',
+    fieldId: 'mesProcessItemList',
+    type: 'form',
+    key: '3fd474ce5f8c4bf78bd86dc701cbdc4f',
+    children: [
+      {
+        required: true,
+        view: true,
+        edit: true,
+        disabled: false,
+        isSubTable: false,
+        isSaveTable: false,
+        showChildren: false,
+        tableName: 'mesProcessItemList',
+        fieldName: '编码',
+        fieldId: 'code',
+        type: 'Input',
+        key: '3999831fde0a4e879f64f33eb2a1edd1',
+        children: [],
+      },
+      {
+        required: true,
+        view: true,
+        edit: true,
+        disabled: false,
+        isSubTable: false,
+        isSaveTable: false,
+        showChildren: false,
+        tableName: 'mesProcessItemList',
+        fieldName: '名称',
+        fieldId: 'name',
+        type: 'Input',
+        key: 'ab6576e960ee44b4af09975e64088f05',
+        children: [],
+      },
+      {
+        required: true,
+        view: true,
+        edit: true,
+        disabled: false,
+        isSubTable: false,
+        isSaveTable: false,
+        showChildren: false,
+        tableName: 'mesProcessItemList',
+        fieldName: '数据类型',
+        fieldId: 'dataType',
+        type: 'XjrSelect',
+        key: '745cb3bb014d4dd9ba38139d17b2f305',
+        children: [],
+      },
+      {
+        required: true,
+        view: true,
+        edit: true,
+        disabled: false,
+        isSubTable: false,
+        isSaveTable: false,
+        showChildren: false,
+        tableName: 'mesProcessItemList',
+        fieldName: '是否必填',
+        fieldId: 'required',
+        type: 'Switch',
+        key: '36a40652260d491e8a088ff843aab982',
+        children: [],
+      },
+      {
+        required: true,
+        view: true,
+        edit: true,
+        disabled: false,
+        isSubTable: false,
+        isSaveTable: false,
+        showChildren: false,
+        tableName: 'mesProcessItemList',
+        fieldName: '备注',
+        fieldId: 'note',
+        type: 'InputTextArea',
+        key: 'f3ba1f809888475d925665668e2a1851',
+        children: [],
+      },
+    ],
  },
 ];
--- a/xjrsoft-vue3/src/views/jcsj/gxgl/index.vue
+++ b/xjrsoft-vue3/src/views/jcsj/gxgl/index.vue
@@ -154,7 +154,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":"2005548723533832192","name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true,"isUse":true},{"buttonId":"2005548723533832193","name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true,"isUse":true},{"buttonId":"2005548723533832194","name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true,"isUse":true,"isEnableLock":true},{"buttonId":"2005548723533832195","name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true,"isUse":true}]
    return filterButtonAuth(list);
  })