Merge remote-tracking branch 'origin/master'

src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts

@@ -446,7 +446,7 @@ export const CountadjustRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '数量',
+    label: '差异数量',
     field: 'qty',
     sort: 'custom',
     table: {

src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue

@@ -187,7 +187,7 @@ const butttondata = (row) => {
         defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-request-main:refused'}), // 驳回
         defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-request-main:agree'}), // 审批通过
         defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:purchasereceipt-request-main:handle'}), // 处理
-        defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-request-main:update'}), // 编辑
+        // defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-request-main:update'}), // 编辑
     ]
 }
 

src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue

@@ -192,7 +192,7 @@ const butttondata = (row) => {
       defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-request-main:refused'}), // 驳回
       defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-request-main:agree'}), // 审批通过
       defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:purchasereceipt-request-main:handle'}), // 处理
-      defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-request-main:update'}), // 编辑
+      // defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-request-main:update'}), // 编辑
     ]
 }