diff --git a/src/application/mk/libs/function/funs.js b/src/application/mk/libs/function/funs.js
index e09c0ba..a4656f7 100644
--- a/src/application/mk/libs/function/funs.js
+++ b/src/application/mk/libs/function/funs.js
@@ -96,7 +96,7 @@ export default {
       list.forEach(item => {
         item[fieldName] = dataId;
       })
-    }
+    } 
     if (dataId && type !== 'array') {
 
 
diff --git a/src/pages/Middle/Mold/MoldProductionOrder/Edit.vue b/src/pages/Middle/Mold/MoldProductionOrder/Edit.vue
index 22f5270..2af0b15 100644
--- a/src/pages/Middle/Mold/MoldProductionOrder/Edit.vue
+++ b/src/pages/Middle/Mold/MoldProductionOrder/Edit.vue
@@ -45,7 +45,7 @@
               </div>
             </template>
           </vxe-column>
-          <vxe-column field="mold_component" title="部件" width="160" :params="editor_component" formatter="formatRef"
+          <vxe-column field="component_detail" title="部件" width="160" :params="editor_component" formatter="formatRef"
             :edit-render="{ name: 'MkGridDataSelector' }"></vxe-column>
           <vxe-column field="component_num" title="部件数量" width="160"
             :edit-render="{ name: '$input', props: { type: 'number' } }"></vxe-column>
@@ -53,7 +53,7 @@
             formatter='formatEnum'
             :edit-render="{ name: '$select', props: { options: options_production_type } }"></vxe-column>
 
-          <vxe-column field="process_info" title="加工人员" width="160" :params="editor_staff" formatter="formatRef"
+          <vxe-column field="process_detail" title="加工人员" width="160" :params="editor_d1_process" formatter="formatRef"
             :edit-render="{ name: 'MkGridDataSelector' }"></vxe-column>
 
 
@@ -68,9 +68,9 @@
           <vxe-column field="send_time" title="发料时间" width="160" formatter="formatDate"
             :edit-render="{ name: '$input', props: { type: 'date' } }"></vxe-column>
 
-          <vxe-column field="send_uid" title="发料人员" width="160" :params="editor_staff" formatter="formatRef"
+          <vxe-column field="send_detail" title="发料人员" width="160" :params="editor_d1_send" formatter="formatRef"
             :edit-render="{ name: 'MkGridDataSelector' }"></vxe-column>
-
+ 
 
           <vxe-column field="is_complete" title="是否完成" width="160" :params="{data:options_is_complete}" formatter='formatEnum'
             :edit-render="{ name: '$select', props: { options: options_is_complete } }"></vxe-column>
@@ -111,13 +111,13 @@
               </div>
             </template>
           </vxe-column>
-          <vxe-column field="mold_component" title="部件" width="160" :params="editor_component" formatter="formatRef"
+          <vxe-column field="component_detail" title="部件" width="160" :params="editor_component" formatter="formatRef"
             :edit-render="{ name: 'MkGridDataSelector' }"></vxe-column>
-          <vxe-column field="mes_processes" title="工序" width="160" :params="editor_processes" formatter="formatRef"
+          <vxe-column field="process_detail" title="工序" width="160" :params="editor_processes" formatter="formatRef"
             :edit-render="{ name: 'MkGridDataSelector' }"></vxe-column>
 
 
-          <vxe-column field="process_info" title="加工人员" width="160" :params="editor_staff" formatter="formatRef"
+          <vxe-column field="process_uid_detail" title="加工人员" width="160" :params="editor_process_uid" formatter="formatRef"
             :edit-render="{ name: 'MkGridDataSelector' }"></vxe-column>
 
 
@@ -127,21 +127,21 @@
             :edit-render="{ name: '$input', props: { type: 'date' } }"></vxe-column>
 
 
-          <vxe-column field="is_send" title="是否发料" width="160" :params="options_is_send"
+          <vxe-column field="is_send" title="是否发料" width="160" :params="{data:options_is_send}"
             formatter='formatEnum'></vxe-column>
           <vxe-column field="send_time" title="发料时间" width="160" formatter="formatDate"
             :edit-render="{ name: '$input', props: { type: 'date' } }"></vxe-column>
 
-          <vxe-column field="is_complete" title="是否完成" width="160" :params="options_is_complete"
+          <vxe-column field="is_complete" title="是否完成" width="160" :params="{data:options_is_complete}"
             formatter='formatEnum'></vxe-column>
           <vxe-column field="complete_time" title="实际完成时间" width="160" formatter="formatDate"
             :edit-render="{ name: '$input', props: { type: 'date' } }"></vxe-column>
 
-          <vxe-column field="send_type" title="发料人员类型" width="160" :params="options_user_type"
+          <vxe-column field="send_type" title="发料人员类型" width="160" :params="{data:options_user_type}"
             formatter='formatEnum'></vxe-column>
 
 
-          <vxe-column field="complete_type" title="完工人员类型" width="160" :params="options_user_type"
+          <vxe-column field="complete_type" title="完工人员类型" width="160" :params="{data:options_user_type}"
             formatter='formatEnum'></vxe-column>
           <vxe-column field="remark" title="备注" width="160" :edit-render="{ name: '$input', props: {} }"></vxe-column>
 
@@ -255,7 +255,7 @@ export default {
             }
           },{
             title: '模具', span: 8,
-            field: 'mold_scheme', 
+            field: 'mold_detail', 
             itemRender: {
               name: 'MkFormInputShow', props: {
                 params: {
@@ -323,12 +323,32 @@ export default {
         textField: "name",
         listdataFieldName: 'MesProcesses',
         mapper: [
-          { fromField: "id", field: "mes_processes_id" }
+          { fromField: "id", field: "process_id" }
         ],
         dataUrl: `${BASE_URL.BASE_URL}/MesProcesses/v1/mes/processes/list`
       },
 
-      editor_staff: {
+      editor_d1_process: {
+        dataType: "object",
+        valueField: "id",
+        textField: "name",
+        listdataFieldName: 'MesStaff',
+        mapper: [
+          { fromField: "id", field: "process_uid" }
+        ],
+        dataUrl: `${BASE_URL.BASE_URL}/MesStaff/v1/mes/staff/list`
+      },
+      editor_d1_send: {
+        dataType: "object",
+        valueField: "id",
+        textField: "name",
+        listdataFieldName: 'MesStaff',
+        mapper: [
+          { fromField: "id", field: "send_uid" }
+        ],
+        dataUrl: `${BASE_URL.BASE_URL}/MesStaff/v1/mes/staff/list`
+      },
+      editor_process_uid: {
         dataType: "object",
         valueField: "id",
         textField: "name",
@@ -338,7 +358,6 @@ export default {
         ],
         dataUrl: `${BASE_URL.BASE_URL}/MesStaff/v1/mes/staff/list`
       },
-
 
     };
 
@@ -561,11 +580,11 @@ export default {
             { field: 'component_id', type: 'bigint' },
             { field: 'process_uid', type: 'bigint' },
             { field: 'send_uid', type: 'bigint' },
-            { field: 'send_uid', type: 'bigint' },
+            { field: 'process_id', type: 'bigint' }, 
           ]
         });
         postdata.mold_production_order_component_processes = this.$mk.getPostFieldValue({
-          rowFilter: (row) => { return row.id || (row.component_id && row.mes_processes_id) },
+          rowFilter: (row) => { return row.id || (row.component_id && row.process_id) },
           dataId: this.getDataId_BigInt(),
           list: this.detailsData2,
           deletedList: this.deletedDetailsData2,
@@ -573,9 +592,14 @@ export default {
           dataRule: [
 
             { field: 'id', type: 'bigint' },
+            { field: 'prepare_process_time', type: 'timestamp' },
+            { field: 'plan_complete_time', type: 'timestamp' },
+
+            
             { field: 'update_uid', type: 'bigint' },
             { field: 'create_uid', type: 'bigint' },
             { field: 'component_id', type: 'bigint' },
+            { field: 'process_id', type: 'bigint' },
             { field: 'process_uid', type: 'bigint' },
           ]
         });