From f01d982cc8d201ef391418e19d5d60b165071424 Mon Sep 17 00:00:00 2001
From: zhangdi <1104545947@qq.com>
Date: Mon, 1 Jun 2026 15:54:57 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/authority/role.vue                  | 19 +++++----
 src/views/oem/oemOrder/turnFacInner.vue       | 40 ++++++++++---------
 .../components/outsourceDialog.vue            |  5 +++
 src/views/system/menu.vue                     |  2 +-
 4 files changed, 39 insertions(+), 27 deletions(-)

diff --git a/src/views/authority/role.vue b/src/views/authority/role.vue
index a5c58f3a..ccecbc5c 100644
--- a/src/views/authority/role.vue
+++ b/src/views/authority/role.vue
@@ -1,17 +1,17 @@
 <template>
-  <basic-container>
+  <basic-container >
     <avue-crud :option="option" :table-loading="loading" :data="data" ref="crud" v-model="form"
       :permission="permissionList" :before-open="beforeOpen" @row-del="rowDel" @row-update="rowUpdate"
       @row-save="rowSave" @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
-      @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
+      @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad" >
       <template #menu-left>
-        <el-button type="danger"  v-if="permission.role_delete" plain @click="handleDelete">删 除
+        <el-button type="danger" v-if="permission.role_delete" plain @click="handleDelete">删 除
         </el-button>
-        <el-button  @click="handleRole" v-if="userInfo.authority.includes('admin')" plain>权限设置
+        <el-button @click="handleRole" v-if="userInfo.authority.includes('admin')" plain>权限设置
         </el-button>
       </template>
       <template #menu="{ row }">
-        <el-button type="primary" text  v-if="userInfo.authority.includes('admin')" plain
+        <el-button type="primary" text v-if="userInfo.authority.includes('admin')" plain
           style="border: 0; background-color: transparent !important" @click.stop="handleRowRole(row)">权限设置
         </el-button>
       </template>
@@ -85,7 +85,7 @@ export default {
         total: 0,
       },
       option: {
-        height:'auto',
+        height: window.innerHeight - 250,
         tip: false,
         simplePage: true,
         searchShow: true,
@@ -96,7 +96,7 @@ export default {
         selection: true,
         viewBtn: true,
         labelWidth: 120,
-        searchLabelWidth: 120,
+        searchLabelWidth: 'auto',
         menuWidth: 350,
         dialogWidth: 600,
         dialogClickModal: false,
@@ -111,7 +111,7 @@ export default {
         viewBtnIcon: ' ',
         delBtnIcon: ' ',
         editBtnIcon: ' ',
-        searchShowBtn:false,
+        searchShowBtn: false,
         align: 'center',
         column: [
           {
@@ -121,6 +121,7 @@ export default {
             type: 'tree',
             hide: true,
             span: 24,
+            align: 'left',
             props: {
               label: 'title',
             },
@@ -137,6 +138,7 @@ export default {
             prop: 'roleName',
             search: true,
             span: 24,
+            align: 'left',
             rules: [
               {
                 required: true,
@@ -174,6 +176,7 @@ export default {
             prop: 'roleAlias',
             search: true,
             span: 24,
+            align: 'left',
             rules: [
               {
                 required: true,
diff --git a/src/views/oem/oemOrder/turnFacInner.vue b/src/views/oem/oemOrder/turnFacInner.vue
index fc71e5d7..0fd6bc65 100644
--- a/src/views/oem/oemOrder/turnFacInner.vue
+++ b/src/views/oem/oemOrder/turnFacInner.vue
@@ -15,7 +15,7 @@
     </el-dialog>
 </template>
 <script>
-import {getInProcess,turnIn} from "@/api/outsourcingManagement/oemOrder"
+import { getInProcess, turnIn } from "@/api/outsourcingManagement/oemOrder"
 export default {
     props: {
         turnFacInnerOpen: {
@@ -44,7 +44,7 @@ export default {
                 dialogWidth: '60%',
                 border: true,
                 index: false,
-                selection:true,
+                selection: true,
                 menuWidth: 240,
                 dialogClickModal: false,
                 excelBtn: true,
@@ -101,7 +101,7 @@ export default {
                     {
                         label: '工艺能力',
                         prop: 'processAbilityName',
-                        bind:"processAbility.name",
+                        bind: "processAbility.name",
                         search: false,
                         sortable: true,
                         overHidden: true,
@@ -144,7 +144,7 @@ export default {
 
                 ]
             },
-            selectionList:[]
+            selectionList: []
         };
     },
     mounted() {
@@ -152,15 +152,18 @@ export default {
         this.getData()
     },
     methods: {
-        getData(){
+        getData() {
             getInProcess({
-                woIds:[this.rowItem.woId],
-                runType:2
-            }).then(res =>{
+                woIds: [this.rowItem.woId],
+                runType: 2
+            }).then(res => {
                 this.data = res.data.data
             })
         },
-        selectionChange(list){
+        selectionChange(list) {
+            list.forEach(item => {
+                item.handle = true
+            });
             this.selectionList = list
         },
         takeBack() {
@@ -194,29 +197,30 @@ export default {
             this.$emit('cancel', typeof isRefresh === 'boolean' && isRefresh);
         },
 
-        submit(){
+        submit() {
             if (this.data.length == 0) {
                 this.$message.error('当前数据列表为空');
                 return;
             }
-            this.$refs.form.validate((valid) => { 
-                if (valid) { 
-                    if(this.selectionList.length == 0){
+            this.$refs.form.validate((valid) => {
+                if (valid) {
+                    if (this.selectionList.length == 0) {
                         this.$message.error('请选择要转厂内的工序')
                         return
                     }
 
+
                     let query = {
                         workOrderRuns: [
                             {
-                                runType:2,
-                                woId:this.rowItem.woId
+                                runType: 2,
+                                woId: this.rowItem.woId
                             }
                         ],
                         workPlanRuns: this.selectionList,
                     };
-                    turnIn(query).then(res =>{
-                        if(res.data.code == 200){
+                    turnIn(query).then(res => {
+                        if (res.data.code == 200) {
                             this.$message.success('转厂内成功');
                             this.cancel(true);
                         }
@@ -229,6 +233,6 @@ export default {
 
         }
     },
-    
+
 };
 </script>
diff --git a/src/views/productionManagement/components/outsourceDialog.vue b/src/views/productionManagement/components/outsourceDialog.vue
index da0aaa7e..d4682e55 100644
--- a/src/views/productionManagement/components/outsourceDialog.vue
+++ b/src/views/productionManagement/components/outsourceDialog.vue
@@ -7,6 +7,7 @@
     width="60%"
     @close="closeDialog"
   >
+
     <el-form :model="outsourceForm" :rules="outsourceRules" label-width="70px">
       <el-form-item label="备注：" prop="memo">
         <el-input
@@ -119,6 +120,10 @@ export default {
         this.$message.error('请选择需要转外协的数据');
         return;
       }
+      if(this.outsourceForm.memo==''){
+        this.$message.error('请填写备注！');
+        return;
+      }
       this.loading = true
       let orderData = [];
       this.itemData.forEach(item => {
diff --git a/src/views/system/menu.vue b/src/views/system/menu.vue
index 7c119acf..a6244fe7 100644
--- a/src/views/system/menu.vue
+++ b/src/views/system/menu.vue
@@ -81,7 +81,7 @@ export default {
         searchShow: true,
         searchMenuSpan: 6,
         dialogWidth: '60%',
-        height:'auto',
+        height: window.innerHeight - 250,
         tree: true,
         border: true,
         index: true,