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

- 添加备注字段到表单配置中
- 移除额定工时字段配置
- 修复编码组件占位符文本错误
- 更新多个字段的key值以确保唯一性
- 修正默认选择值和占位符文本
- 调整子表单产品列表的数据映射关系
- 重构数据模型接口定义，更新字段名称和结构
- 移除采集方案相关的监听和处理逻辑
- 更新工作流程权限配置中的字段映射
- 优化产品列表数据加载和处理方式

xjrsoft-vue3/src/api/jcsj/gxgl/model/GxglModel.ts

@@ -11,6 +11,8 @@ export interface RokeProcessPageParams extends BasicPageParams {
   categoryId: string;
 
   collectionSchemeId: string;
+
+  note: string;
 }
 
 /**
@@ -26,8 +28,6 @@ export interface RokeProcessPageModel {
   categoryId: string;
 
   collectionSchemeId: string;
-
-  ratedWorkingHours: string;
 }
 
 /**
@@ -122,7 +122,7 @@ export interface RokeProcessModel {
 
   mesProcessProductList?: MesProcessProductModel;
 
-  mesProcessSchemeList?: MesProcessSchemeModel;
+  mesCollectionItemList?: MesCollectionItemModel;
 }
 
 /**
@@ -152,22 +152,58 @@ export interface MesProcessProductModel {
   isFeeding: string;
 
   number: string;
+
+  name: string;
+
+  code: string;
 }
 
 /**
- * @description: MesProcessScheme表类型
+ * @description: MesCollectionItem表类型
  */
-export interface MesProcessSchemeModel {
+export interface MesCollectionItemModel {
   id: string;
 
-  processId: string;
+  code: string;
 
-  collectionSchemeId: 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;

xjrsoft-vue3/src/views/jcsj/gxgl/components/GxglModal.vue

@@ -148,8 +148,9 @@
   function customClick(item) {
     if (item.key == 'confirm') {
       handleSubmit();
-    } else if (item.key == 'cancel') {
+    } else if (item.key == 'cancel' && props.formType !== 'normal') {
       handleClose();
+      closeModal(); 
     } else if (item.key == 'reset') {
       formRef.value.resetFields();
     } else {
@@ -158,7 +159,6 @@
   }  
   function handleClose() {
     formRef.value.resetFields();
-    closeModal();
   }
   
 </script>

xjrsoft-vue3/src/views/jcsj/gxgl/components/workflowPermission.ts

@@ -77,7 +77,7 @@ export const permissionList = [
     isSubTable: false,
     showChildren: true,
     type: 'number',
-    key: 'ca8257a46070472e9639110b11f7f3bd',
+    key: '4a92294f40b2406a9ce865678f3b74e4',
     children: [],
     options: {},
     defaultValue: 0,
@@ -97,7 +97,6 @@ export const permissionList = [
     key: '6a8f658eb0e046e48c3dac472c0e51ae',
     children: [],
     options: {},
-    defaultValue: '2005534898818441218',
   },
   {
     required: false,
@@ -155,23 +154,8 @@ export const permissionList = [
         isSaveTable: false,
         showChildren: false,
         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: '编号',
-        fieldId: 'bianHao3907',
+        fieldId: 'code',
         type: 'Input',
         key: '00c0e93b675841f48265b896515a5241',
         children: [],
@@ -186,7 +170,7 @@ export const permissionList = [
         showChildren: false,
         tableName: 'mesProcessProductList',
         fieldName: '名称',
-        fieldId: 'mingChen2461',
+        fieldId: 'name',
         type: 'Input',
         key: '91863c5a0ec24d76ade8735cd401059b',
         children: [],
@@ -231,84 +215,9 @@ export const permissionList = [
         showChildren: false,
         tableName: 'mesProcessProductList',
         fieldName: '备注',
-        fieldId: 'beiZhu7713',
-        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',
+        fieldId: 'bz',
         type: 'Input',
-        key: '5d40e3c7f274461aba1f041c5f33c13d',
+        key: '607b81d8885746409998c64f0a55a56e',
         children: [],
       },
       {
@@ -319,11 +228,11 @@ export const permissionList = [
         isSubTable: false,
         isSaveTable: false,
         showChildren: false,
-        tableName: 'mesProcessSchemeList',
-        fieldName: '备注',
-        fieldId: 'beiZhu2454',
+        tableName: 'mesProcessProductList',
+        fieldName: '产品物料id',
+        fieldId: 'productId',
         type: 'Input',
-        key: '7674096c8feb431a8689c584a93c5b8a',
+        key: '6e053d43971d4157b0f9118f9cbbb4bb',
         children: [],
       },
     ],