From 0220ddc8989a15ed5638d1b4bccf4ca119624612 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期二, 12 十二月 2023 10:49:07 +0800
Subject: [PATCH] 	modified:   src/views/common/part.vue 	modified:   src/views/technology/completeproductstructure/index.vue 	modified:   src/views/technology/document/document-form.vue 	modified:   src/views/technology/routing/index.vue 	modified:   src/views/technology/structure/index.vue

---
 src/views/technology/document/document-form.vue         |   13 +++++++++++--
 src/views/technology/routing/index.vue                  |    2 +-
 src/views/technology/structure/index.vue                |    2 +-
 src/views/common/part.vue                               |   36 ++++++++++++++++++------------------
 src/views/technology/completeproductstructure/index.vue |    2 +-
 5 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/src/views/common/part.vue b/src/views/common/part.vue
index 71ec427..9374cce 100644
--- a/src/views/common/part.vue
+++ b/src/views/common/part.vue
@@ -202,24 +202,24 @@
             isSearch: true,
             searchInfoType: 'text'
           },
-          {
-            minWidth: '100',
-            prop: 'drawingNumber',
-            label: '鍥惧彿',
-            sort: true,
-            isTrue: true,
-            isSearch: true,
-            searchInfoType: 'text'
-          },
-          {
-            minWidth: '120',
-            prop: 'ean',
-            label: 'EAN缂栫爜',
-            sort: true,
-            isTrue: true,
-            isSearch: true,
-            searchInfoType: 'text'
-          }
+          // {
+          //   minWidth: '100',
+          //   prop: 'drawingNumber',
+          //   label: '鍥惧彿',
+          //   sort: true,
+          //   isTrue: true,
+          //   isSearch: true,
+          //   searchInfoType: 'text'
+          // },
+          // {
+          //   minWidth: '120',
+          //   prop: 'ean',
+          //   label: 'EAN缂栫爜',
+          //   sort: true,
+          //   isTrue: true,
+          //   isSearch: true,
+          //   searchInfoType: 'text'
+          // }
         ],
         materialTypeList: [],
         materialAttributeList: []
diff --git a/src/views/technology/completeproductstructure/index.vue b/src/views/technology/completeproductstructure/index.vue
index 1be5f56..4fc9997 100644
--- a/src/views/technology/completeproductstructure/index.vue
+++ b/src/views/technology/completeproductstructure/index.vue
@@ -34,7 +34,7 @@
       multipleSelection: [],
       uploadInfo: {
         // 鏄惁灞曠ず涓婁紶EXCEL浠ュ強瀵瑰簲鐨剈rl
-        isShow: true,
+        isShow: false,
         url: 'mes/bom/uploadExcel',
       },
       prelang: 'completeProductStructure',
diff --git a/src/views/technology/document/document-form.vue b/src/views/technology/document/document-form.vue
index 5f9c1a9..19348cf 100644
--- a/src/views/technology/document/document-form.vue
+++ b/src/views/technology/document/document-form.vue
@@ -11,7 +11,7 @@
       </div>
     </div>
     <div class="page-main">
-      <div class="document-basic">
+      <div class="document-basic" style="height: 28%;">
         <el-form
           :model="dataForm"
           :rules="dataRule"
@@ -160,6 +160,15 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+              <el-col :span="6">
+              <el-form-item label="椤圭洰鍙�" prop="projectNo">
+                <el-input
+                  v-model="dataForm.projectNo"
+                  placeholder="椤圭洰鍙�"
+                  style="width:100%"
+                ></el-input>
+              </el-form-item>
+            </el-col> 
               <el-col :span="6">
                 <el-form-item label="澶囨敞" prop="remark">
                   <el-input
@@ -854,7 +863,7 @@
           { required: true, message: '鐗堟湰鍙蜂笉鑳戒负绌�', trigger: 'blur' }
         ],
         projectNo: [
-          { required: true, message: '椤圭洰鍙蜂笉鑳戒负绌�', trigger: 'blur' }
+          // { required: true, message: '椤圭洰鍙蜂笉鑳戒负绌�', trigger: 'blur' }
         ],
         projectType: [
           { required: true, message: '椤圭洰绫诲埆涓嶈兘涓虹┖', trigger: 'change' }
diff --git a/src/views/technology/routing/index.vue b/src/views/technology/routing/index.vue
index e3d7d29..4c685f1 100644
--- a/src/views/technology/routing/index.vue
+++ b/src/views/technology/routing/index.vue
@@ -138,7 +138,7 @@
       customUpload: true,
       uploadInfo: {
         // 鏄惁灞曠ず涓婁紶EXCEL浠ュ強瀵瑰簲鐨剈rl
-        isShow: true,
+        isShow: false,
         url: '/mes/routing/uploadExcel'
       },
       prelang: 'routing',
diff --git a/src/views/technology/structure/index.vue b/src/views/technology/structure/index.vue
index 74037af..8ceba97 100644
--- a/src/views/technology/structure/index.vue
+++ b/src/views/technology/structure/index.vue
@@ -129,7 +129,7 @@
       customUpload: true,
       uploadInfo: {
         // 鏄惁灞曠ず涓婁紶EXCEL浠ュ強瀵瑰簲鐨剈rl
-        isShow: true,
+        isShow: false,
         url: '/mes/structure/uploadExt'
       },
       prelang: 'structure',

--
Gitblit v1.9.3