From 4df58b38421d18fded9691b78531ffe7550dfe5b Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Wed, 6 Nov 2024 13:12:18 +0800
Subject: [PATCH] 1

---
 .../soIssueNotify/searchIssureNotify.vue      | 17 ++++++++++++++
 .../soIssueNotify/searchIssureNotifyForCK.vue | 23 ++++++++++++++++---
 src/views/modules/sys/user-add-or-update.vue  |  4 ----
 3 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/src/views/modules/orderIssure/soIssueNotify/searchIssureNotify.vue b/src/views/modules/orderIssure/soIssueNotify/searchIssureNotify.vue
index cfe3710..bd0acec 100644
--- a/src/views/modules/orderIssure/soIssueNotify/searchIssureNotify.vue
+++ b/src/views/modules/orderIssure/soIssueNotify/searchIssureNotify.vue
@@ -823,6 +823,23 @@
             status: true,
             fixed: '',
             columnWidth: 80
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table3Remark',
+            tableId: "701002Table3",
+            tableName: "申请单材料明细表",
+            columnProp: "remark",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "备注",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 160
           },{
             userId: this.$store.state.user.name,
             functionId: 701002,
diff --git a/src/views/modules/orderIssure/soIssueNotify/searchIssureNotifyForCK.vue b/src/views/modules/orderIssure/soIssueNotify/searchIssureNotifyForCK.vue
index dbaddd6..f7c029f 100644
--- a/src/views/modules/orderIssure/soIssueNotify/searchIssureNotifyForCK.vue
+++ b/src/views/modules/orderIssure/soIssueNotify/searchIssureNotifyForCK.vue
@@ -300,9 +300,9 @@
             columnWidth: 100
           },{
             userId: this.$store.state.user.name,
-            functionId: 701002,
-            serialNumber: '701002Table1WorkShopName',
-            tableId: "701002Table1",
+            functionId: 701003,
+            serialNumber: '701003Table1WorkShopName',
+            tableId: "701003Table1",
             tableName: "领料申请主表",
             columnProp: "workShopName",
             headerAlign: "center",
@@ -768,6 +768,23 @@
             status: true,
             fixed: '',
             columnWidth: 80
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701003,
+            serialNumber: '701003Table3Remark',
+            tableId: "701003Table3",
+            tableName: "申请单材料明细表",
+            columnProp: "remark",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "备注",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 160
           },{
             userId: this.$store.state.user.name,
             functionId: 701003,
diff --git a/src/views/modules/sys/user-add-or-update.vue b/src/views/modules/sys/user-add-or-update.vue
index fa31f15..86654b6 100644
--- a/src/views/modules/sys/user-add-or-update.vue
+++ b/src/views/modules/sys/user-add-or-update.vue
@@ -213,10 +213,6 @@ export default {
     },
     // 表单提交
     dataFormSubmit() {
-      if(this.dataForm.workShopId == null || this.dataForm.workShopId == ''){
-        this.$message.error("车间不能为空!");
-        return false;
-      }
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
           this.$http({