Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

src/views/mes/item/index.vue

@@ -152,7 +152,7 @@ const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
   if(type == "update"){
     Item.allSchemas.formSchema.forEach((item) => {
-      
+
       if (item.field == 'itemCode') {
               item.componentProps.disabled = true
         }
@@ -168,7 +168,7 @@ const openForm = (type: string, row?: any) => {
                 item.componentProps.disabled = false
           }
 
-      }  
+      }
       if(row.dataType == 'SWITCH'){
         if (item.field == 'dataVerify') {
                 item.componentProps.disabled = true
@@ -177,7 +177,7 @@ const openForm = (type: string, row?: any) => {
                 item.componentProps.disabled = true
           }
 
-      }     
+      }
       if(row.dataType == 'TEXT'){
         if (item.field == 'dataVerify') {
               item.componentProps.disabled = true
@@ -186,8 +186,8 @@ const openForm = (type: string, row?: any) => {
               item.componentProps.disabled = true
         }
 
-      }       
-    })       
+      }
+    })
   }else{
     Item.allSchemas.formSchema.forEach((item) => {
       if (item.field == 'itemCode') {
@@ -202,9 +202,12 @@ const openForm = (type: string, row?: any) => {
       if (item.field == 'dataStandvalue') {
             item.componentProps.disabled = false
       }
+      if (item.field == 'status') {
+        item.componentProps.disabled = true
+      }
 
     })
-  }  
+  }
   basicFormRef.value.open(type, row)
 }
 
@@ -293,9 +296,9 @@ const searchFormClick = (searchData) => {
 
 //数据类型切换
 const onChangeQG = (field, cur, item) => {
- 
+
   console.log('cur'+cur)
-  
+
     Item.allSchemas.formSchema.forEach((item) => {
       if(cur == 'SWITCH'){
         if (item.field == 'dataVerify') {
@@ -306,8 +309,8 @@ const onChangeQG = (field, cur, item) => {
           }
         if (item.field == 'status') {
                 item.componentProps.disabled = false
-        } 
-      }     
+        }
+      }
       if(cur == 'TEXT'){
         if (item.field == 'dataVerify') {
               item.componentProps.disabled = true
@@ -317,7 +320,7 @@ const onChangeQG = (field, cur, item) => {
         }
         if (item.field == 'status') {
               item.componentProps.disabled = true
-        } 
+        }
       }
       if(cur == 'NUMBER'){
         if (item.field == 'dataVerify') {
@@ -328,13 +331,13 @@ const onChangeQG = (field, cur, item) => {
           }
         if (item.field == 'status') {
                 item.componentProps.disabled = true
-          } 
+          }
       }
-    })       
- 
-    
+    })
+
+
   }
-  
+
 
 /** 初始化 **/
 onMounted(async () => {

src/views/wms/inventoryManage/balance/index.vue

@@ -133,17 +133,17 @@ const buttonBaseClick = (val, item) => {
 
 // 列表-操作按钮
 const butttondata = [
-  {
-    label: '标签信息',
-    name: 'bqxx',
-    hide: false,
-    type: 'primary',
-    icon: '',
-    color: '',
-    link: true,
-    float:'right',
-    hasPermi: ''
-  },
+  // {
+  //   label: '标签信息',
+  //   name: 'bqxx',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: '',
+  //   color: '',
+  //   link: true,
+  //   float:'right',
+  //   hasPermi: ''
+  // },
   defaultButtons.mainListPointBtn(null), // 标签打印
   // defaultButtons.mainListEditBtn({hasPermi:'wms:balance:update'}), // 编辑
   // defaultButtons.mainListDeleteBtn({hasPermi:'wms:balance:delete'}), // 删除