Merge branch 'hella_online_20241212_pandian' into hella_online_20241219

src/views/wms/countManage/count/countJobMain/index.vue

@@ -239,15 +239,15 @@ const butttondata = (row, $index) => {
       link: true, //文本展现按钮
       hasPermi: '' // wms:count-job-main:importCountJob
     },
-    // {
-    //   label: '线边盘点',
-    //   name: 'lineTypeImport',
-    //   hide: !(row.status==2&&row.lineType==true),
-    //   type: 'success',
-    //   color: '',
-    //   link: true, //文本展现按钮
-    //   hasPermi: '' // wms:count-job-main:lineTypeImport
-    // },
+    {
+      label: '线边盘点',
+      name: 'lineTypeImport',
+      hide: !(row.status==2&&row.lineType==true),
+      type: 'success',
+      color: '',
+      link: true, //文本展现按钮
+      hasPermi: '' // wms:count-job-main:lineTypeImport
+    },
     defaultButtons.mainListJobAbaBtn({ hide: isShowMainButton(row, ['2']) }), // 放弃
     {
       label: '完成',

src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue

@@ -196,11 +196,11 @@ const butttondata = (row,$index) => {
 
     return [
     defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:countadjust-request-main:close'}), // 关闭
-        defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:countadjust-request-main:reAdd'}), //重新添加
-        defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:countadjust-request-main:submit'}), // 提交审批
-        defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:countadjust-request-main:refused'}), // 驳回
-        defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:countadjust-request-main:agree'}), // 审批通过
-        defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:countadjust-request-main:handle'}), // 处理
+    // defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:countadjust-request-main:reAdd'}), //重新添加
+    defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:countadjust-request-main:submit'}), // 提交审批
+    defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:countadjust-request-main:refused'}), // 驳回
+    defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:countadjust-request-main:agree'}), // 审批通过
+    defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:countadjust-request-main:handle'}), // 处理
     ]
 }
 // 列表-操作按钮事件