From d252bdded90da937e52dff0ea216e60b36bc51be Mon Sep 17 00:00:00 2001
From: xielue <gd_star@163.com>
Date: Fri, 8 Sep 2023 23:09:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=85=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Mes/MesProcesses/MesProcesses/Edit.vue    | 25 +++++++++++++++++++
 .../Middle/Mold/MoldProductionOrder/Edit.vue  | 16 +++++++-----
 2 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/src/pages/Middle/Mes/MesProcesses/MesProcesses/Edit.vue b/src/pages/Middle/Mes/MesProcesses/MesProcesses/Edit.vue
index b45438c..5e33afa 100644
--- a/src/pages/Middle/Mes/MesProcesses/MesProcesses/Edit.vue
+++ b/src/pages/Middle/Mes/MesProcesses/MesProcesses/Edit.vue
@@ -176,6 +176,27 @@ export default {
                 }
               }
             },
+
+            {
+              title: '部门', span: 12,
+              field: 'department_detail',
+              dataRule: {
+                fromField: "id",
+                saveField: "department_id" // 如果表单项存储的是对象，将从fromField中取得值保存到saveField
+              },
+              itemRender: {
+                name: 'MkFormDataSelector', props: {
+                  params: {
+                    dataType: "object",
+                    valueField: "id",
+                    textField: "name",
+                    listdataFieldName: 'BaseDepartment',
+                    dataUrl: `${BASE_URL.BASE_URL}/BaseDepartment/v1/base/department/list`
+                  }
+                }
+              }
+            },
+
             { field: 'code', title: '工序编码', span: 12, itemRender: { name: '$input' } },
             { field: 'desc', title: '工序描述', span: 12, itemRender: { name: '$input' } },
             { field: 'remark', title: '工序备注', span: 12, itemRender: { name: '$input' } },
@@ -228,6 +249,10 @@ export default {
           }
 
           this.pageOptions.formOptions.data = a.data[detailDataFieldName];
+
+
+          
+
           this.lastFormDataJson = JSON.stringify(this.pageOptions.formOptions.data);
           this.$forceUpdate()
         }).catch((a) => {
diff --git a/src/pages/Middle/Mold/MoldProductionOrder/Edit.vue b/src/pages/Middle/Mold/MoldProductionOrder/Edit.vue
index d8fd55b..bcb467a 100644
--- a/src/pages/Middle/Mold/MoldProductionOrder/Edit.vue
+++ b/src/pages/Middle/Mold/MoldProductionOrder/Edit.vue
@@ -42,12 +42,12 @@
               </div>
             </template>
           </vxe-column>
-          <vxe-column field="department_detail" title="部门" width="160" :params="editor_department" formatter="formatRef"
-            :edit-render="{ name: 'MkGridDataSelector' }"></vxe-column>
           <vxe-column field="component_detail" title="部件" width="160" :params="editor_component" formatter="formatRef"
             :edit-render="{ name: 'MkGridDataSelector' }"></vxe-column>
           <vxe-column field="process_detail" title="工序" width="160" :params="editor_processes" formatter="formatRef"
             :edit-render="{ name: 'MkGridDataSelector' }"></vxe-column>
+          <vxe-column field="department_detail" title="部门" width="160" :params="editor_department" formatter="formatRef"
+            :edit-render="{ name: 'MkGridDataSelector' }"></vxe-column>
 
 
           <vxe-column field="process_uid_detail" title="加工人员" width="160" :params="editor_process_uid"
@@ -744,8 +744,7 @@ export default {
       this.detailsData2.splice($table.getRowSeq(row) - 1, 1);
     },
 
-
-
+ 
     beforeEditMethod({ column, row }) {
       if (this.pageStatus == "approved") {
         return false;
@@ -759,9 +758,14 @@ export default {
     beforeEditEvent({ column, row }) {
       console.log(column, row);
     },
-    onPulldownSelected({ row, name, params }) {
-      console.log(row, name, params);
+    onPulldownSelected({ row,selectedData,column  }) {
+      console.log(selectedData);
 
+
+      if(column.field=='process_detail' && column.title == '工序'){
+        row.department_detail = selectedData.department_detail || {};
+        row.department_id = selectedData.department_id;
+      }
     },
     onPopupSelected({ rows, name, params }) {
       console.log(rows, name, params);