From f00bb5f4a4916b4e5c5a7fb61a141380c2c2bcb7 Mon Sep 17 00:00:00 2001
From: zxx <47968546@163.com>
Date: Fri, 3 Nov 2023 14:47:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Middle/Base/BaseAdmin/BaseAdmin/edit.vue  | 13 ++++++-------
 .../Mold/MoldProductionOrder/ProcessesList.vue      |  8 +++-----
 src/pages/Middle/Mold/Touch/Reporting.vue           |  1 -
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/pages/Middle/Base/BaseAdmin/BaseAdmin/edit.vue b/src/pages/Middle/Base/BaseAdmin/BaseAdmin/edit.vue
index f6d8638..cf9587a 100644
--- a/src/pages/Middle/Base/BaseAdmin/BaseAdmin/edit.vue
+++ b/src/pages/Middle/Base/BaseAdmin/BaseAdmin/edit.vue
@@ -3,7 +3,7 @@
 
     <vxe-form :data="formOptions.data" ref="xForm" :title-width="formOptions.titleWidth"
       :title-align="formOptions.titleAlign" :rules="formOptions.rules" :items="formOptions.items" titleColon>
-      <template #myregion="{}">
+      <template #myregion="{ }">
         <a-input-search placeholder="input search text" enter-button />
       </template>
     </vxe-form>
@@ -96,7 +96,7 @@ export default {
           { field: 'realname', title: '姓名', span: 24, itemRender: { name: '$input', props: { placeholder: '请输入名称' } } },
           { field: 'nickname', title: '昵称', span: 24, itemRender: { name: '$input', props: { placeholder: '请输入昵称' } } },
           { field: 'englishname', title: '英文名', span: 24, itemRender: { name: '$input', props: { placeholder: '请输入英文名' } } },
- 
+
           { field: 'email', title: 'email', span: 24, itemRender: { name: '$input', props: { placeholder: '请输入email' } } }
 
         ]
@@ -123,7 +123,8 @@ export default {
         url: this.actions.get,
         loading: "加载中...",
         data: {
-          id: this.dataId
+          id: this.dataId,
+          target_uid: this.dataId
         }
       }).then(a => {
         this.formOptions.data = a.data.BaseAdmin;
@@ -144,7 +145,7 @@ export default {
 
       let save = () => {
         let action = this.pageMode == "add" ? this.actions.create : this.actions.update;
-        let postdata =  JSON.parse(JSON.stringify(this.formOptions.data))
+        let postdata = JSON.parse(JSON.stringify(this.formOptions.data))
 
         this.$mk.formatFormData({ data: postdata, rules: this.formOptions.items });
         this.$mk.post({
@@ -179,6 +180,4 @@ export default {
 };
 
 </script>
-<style>
-
-</style>
+<style></style>
diff --git a/src/pages/Middle/Mold/MoldProductionOrder/ProcessesList.vue b/src/pages/Middle/Mold/MoldProductionOrder/ProcessesList.vue
index ab2e1f5..5e07068 100644
--- a/src/pages/Middle/Mold/MoldProductionOrder/ProcessesList.vue
+++ b/src/pages/Middle/Mold/MoldProductionOrder/ProcessesList.vue
@@ -1,7 +1,7 @@
 <template>
   <basic-page-list ref="listPage" :desc="desc" :options="pageOptions" @loadData="loadData">
     <template v-slot:column1="{ row }">
-      <a-button @click.stop="pageDetail(row)">查看详情</a-button>
+      <a-button @click.stop="pageDetail(row)">布产单详情</a-button>
     </template>
 
     <template v-slot:column2="{ row }">
@@ -135,8 +135,6 @@ export default {
         //搜索区
         searchFormItems: [ // 子项
 
-
-
           {
             title: '部门', span: 5,
             field: 'department_id',
@@ -201,7 +199,7 @@ export default {
           sortConfig: {
             defaultSort: {
               field: 'complete_time',
-              order: 'asc'
+              order: 'desc'
             },
             trigger: 'cell', // 触发排序的方式
             remote: true // 是否远程排序
@@ -216,7 +214,7 @@ export default {
 
 
             { slots: { default: 'column1' }, title: '查看详情', width: 120 },
-            { field: 'department_name', title: '部门', sortable: true, width: 100 },
+            { field: 'department_name', title: '部门', sortable: true, width: 140 },
             { field: 'process_name', title: '工序名称', sortable: true, width: 100 },
             { title: '模具图片', slots: { default: 'column4' }, width: 90 },
             { field: 'production_code', title: '布产单号', sortable: true, width: 100 },
diff --git a/src/pages/Middle/Mold/Touch/Reporting.vue b/src/pages/Middle/Mold/Touch/Reporting.vue
index 85d7e04..912e76e 100644
--- a/src/pages/Middle/Mold/Touch/Reporting.vue
+++ b/src/pages/Middle/Mold/Touch/Reporting.vue
@@ -224,7 +224,6 @@
                   </template>
                 </vxe-column>
 
-                <vxe-column field="department_name" title="部门" align="center" width="150"></vxe-column>
                 <vxe-column field="process_name" title="工序名称" align="center" width="110"></vxe-column>
                 <vxe-column title="图片" width="75">
                   <template #default="{ row }">