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

src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue

@@ -372,7 +372,8 @@ const onChange = (field, e)=>{
     } else {
       Area.allSchemas.formSchema.forEach((item) => {
         if (item.field == 'manageMode') {
-          item.componentProps.options = manageModeOptions.value?.filter(item=>item.value!='BY_QUANTITY')
+          item.componentProps.options = manageModeOptions.value
+          // item.componentProps.options = manageModeOptions.value?.filter(item=>item.value!='BY_QUANTITY')
           basicFormRef.value.formRef.formModel.manageMode = item.componentProps.options[0].value
         }
       })

src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts

@@ -938,24 +938,24 @@ export const PurchasePlanDetail = useCrudSchemas(
         }
       }
     },
-    {
-      label: '箱数',
-      field: 'orderQty',
-      sort: 'custom',
-      sortSearchDefault: 8,
-      sortTableDefault:23,
-      table: {
-        width: 150
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      },
-      tableForm: {
-        disabled: true
-      }
-    },
+    // {
+    //   label: '箱数',
+    //   field: 'orderQty',
+    //   sort: 'custom',
+    //   sortSearchDefault: 8,
+    //   sortTableDefault:23,
+    //   table: {
+    //     width: 150
+    //   },
+    //   form: {
+    //     componentProps: {
+    //       disabled: true
+    //     }
+    //   },
+    //   tableForm: {
+    //     disabled: true
+    //   }
+    // },
     {
       label: '采购标包数量',
       field: 'purchaseStdQty',
@@ -1039,7 +1039,6 @@ export const PurchasePlanDetail = useCrudSchemas(
       isTableForm: false,
       isForm: false,
       isTable: true,
-      hiddenInMain: true,
     },
     {
       label: '已收采购数量',

src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue

@@ -116,24 +116,27 @@ const { getList, setSearchParams } = tableMethods
     }
   }
 
-// 列表头部按钮
-const HeadButttondata = [
-  // defaultButtons.defaultAddBtn({hasPermi:'wms:supplierinvoice-invoiced:create'}), // 新增
-  // defaultButtons.defaultImportBtn({hasPermi:'wms:supplierinvoice-invoiced:import'}), // 导入
+const HeadButttondata = ref([])
+if(routeName.value == 'SupplierinvoiceInvoiced'){
+  HeadButttondata.value = [
     defaultButtons.defaultExportBtn(null), // 导出
     defaultButtons.mainListSelectionOrderPassBtn({hasPermi:'wms:supplierinvoice-invoiced:batchPass'}), //批量通过 
     defaultButtons.defaultFreshBtn(null), // 刷新
     defaultButtons.defaultFilterBtn(null), // 筛选
     defaultButtons.defaultSetBtn(null), // 设置
-  // {
-  //   label: '自定义扩展按钮',
-  //   name: 'zdy',
-  //   hide: false,
-  //   type: 'primary',
-  //   icon: 'Select',
-  //   color: ''
-  // },
   ]
+} else {
+  console.log(routeName.value)
+  HeadButttondata.value = [
+    defaultButtons.defaultExportBtn(null), // 导出
+    defaultButtons.mainListSelectionOrderPassBtn({hasPermi:'wms:supplierinvoice-invoiced:batchPassWork'}), //批量通过 
+    defaultButtons.defaultFreshBtn(null), // 刷新
+    defaultButtons.defaultFilterBtn(null), // 筛选
+    defaultButtons.defaultSetBtn(null), // 设置
+  ]
+}
+
+
 
 // 头部按钮事件
 const buttonBaseClick = (val, item) => {