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

src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/index.vue

@@ -36,7 +36,7 @@
       </el-table-column>
       <el-table-column align="center" label="操作" fixed="right" width="240">
         <template #default="scope">
-          <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event, scope.row)" />
+          <ButtonBase :Butttondata="butttondata(scope.row)" @button-base-click="buttonTableClick($event, scope.row)" />
         </template>
       </el-table-column>
     </el-table>
@@ -132,11 +132,22 @@ const buttonBaseClick = (val, item) => {
   }
 }
 
+// 根据状态返回该按钮是否显示 
+const isShowMainButton = (row,val) => {
+  if (val == row.name) {
+    return true
+  } else {
+    return false
+  }
+}
+
 // 列表-操作按钮
-const butttondata = [
+const butttondata = (row) => {
-  defaultButtons.mainListEditBtn({ hasPermi: 'wms:itembasic:update' }), // 编辑
+  return [
-  defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:itembasic:delete' }), // 删除
+    defaultButtons.mainListEditBtn({hasPermi: 'wms:itembasic:update' }), // 编辑
-]
+    defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['默认规则']),  hasPermi: 'wms:itembasic:delete' }), // 删除
+  ]
+}
 
 // 列表-操作按钮事件 
 const buttonTableClick = (val, row) => {

src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/index.vue

@@ -36,7 +36,7 @@
       </el-table-column>
       <el-table-column align="center" label="操作" fixed="right" width="240">
         <template #default="scope">
-          <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event, scope.row)" />
+          <ButtonBase :Butttondata="butttondata(scope.row)" @button-base-click="buttonTableClick($event, scope.row)" />
         </template>
       </el-table-column>
     </el-table>
@@ -132,11 +132,22 @@ const buttonBaseClick = (val, item) => {
   }
 }
 
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val == row.name) {
+    return true
+  } else {
+    return false
+  }
+}
+
 // 列表-操作按钮
-const butttondata = [
+const butttondata = (row) => {
-  defaultButtons.mainListEditBtn({ hasPermi: 'wms:itembasic:update' }), // 编辑
+  return [
-  defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:itembasic:delete' }), // 删除
+    defaultButtons.mainListEditBtn({hasPermi: 'wms:itembasic:update' }), // 编辑
-]
+    defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['默认规则']),  hasPermi: 'wms:itembasic:delete' }), // 删除
+  ]
+}
 
 // 列表-操作按钮事件 
 const buttonTableClick = (val, row) => {

src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/index.vue

@@ -36,7 +36,7 @@
       </el-table-column>
       <el-table-column align="center" label="操作" fixed="right" width="240">
         <template #default="scope">
-          <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event, scope.row)" />
+          <ButtonBase :Butttondata="butttondata(scope.row)" @button-base-click="buttonTableClick($event, scope.row)" />
         </template>
       </el-table-column>
     </el-table>
@@ -134,11 +134,22 @@ const buttonBaseClick = (val, item) => {
   }
 }
 
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val == row.name) {
+    return true
+  } else {
+    return false
+  }
+}
+
 // 列表-操作按钮
-const butttondata = [
+const butttondata = (row) => {
-  defaultButtons.mainListEditBtn({ hasPermi: 'wms:itembasic:update' }), // 编辑
+  return [
-  defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:itembasic:delete' }), // 删除
+    defaultButtons.mainListEditBtn({hasPermi: 'wms:itembasic:update' }), // 编辑
-]
+    defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['默认规则']),  hasPermi: 'wms:itembasic:delete' }), // 删除
+  ]
+}
 
 // 列表-操作按钮事件 
 const buttonTableClick = (val, row) => {

src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/index.vue

@@ -36,7 +36,7 @@
       </el-table-column>
       <el-table-column align="center" label="操作" fixed="right" width="240">
         <template #default="scope">
-          <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event, scope.row)" />
+          <ButtonBase :Butttondata="butttondata(scope.row)" @button-base-click="buttonTableClick($event, scope.row)" />
         </template>
       </el-table-column>
     </el-table>
@@ -130,11 +130,22 @@ const buttonBaseClick = (val, item) => {
   }
 }
 
+// 根据状态返回该按钮是否显示 
+const isShowMainButton = (row,val) => {
+  if (val == row.name) {
+    return true
+  } else {
+    return false
+  }
+}
+
 // 列表-操作按钮
-const butttondata = [
+const butttondata = (row) => {
-  defaultButtons.mainListEditBtn({ hasPermi: 'wms:itembasic:update' }), // 编辑
+  return [
-  defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:itembasic:delete' }), // 删除
+    defaultButtons.mainListEditBtn({hasPermi: 'wms:itembasic:update' }), // 编辑
-]
+    defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['默认规则']),  hasPermi: 'wms:itembasic:delete' }), // 删除
+  ]
+}
 
 // 列表-操作按钮事件 
 const buttonTableClick = (val, row) => {

src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/index.vue

@@ -36,7 +36,7 @@
       </el-table-column>
       <el-table-column align="center" label="操作" fixed="right" width="240">
         <template #default="scope">
-          <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event, scope.row)" />
+          <ButtonBase :Butttondata="butttondata(scope.row)" @button-base-click="buttonTableClick($event, scope.row)" />
         </template>
       </el-table-column>
     </el-table>
@@ -132,11 +132,22 @@ const buttonBaseClick = (val, item) => {
   }
 }
 
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val == row.name) {
+    return true
+  } else {
+    return false
+  }
+}
+
 // 列表-操作按钮
-const butttondata = [
+const butttondata = (row) => {
-  defaultButtons.mainListEditBtn({ hasPermi: 'wms:itembasic:update' }), // 编辑
+  return [
-  defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:itembasic:delete' }), // 删除
+    defaultButtons.mainListEditBtn({hasPermi: 'wms:itembasic:update' }), // 编辑
-]
+    defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['默认规则']),  hasPermi: 'wms:itembasic:delete' }), // 删除
+  ]
+}
 
 // 列表-操作按钮事件 
 const buttonTableClick = (val, row) => {

src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/index.vue

@@ -37,7 +37,7 @@
       </el-table-column>
       <el-table-column align="center" label="操作" fixed="right" width="240">
         <template #default="scope">
-          <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event, scope.row)" />
+          <ButtonBase :Butttondata="butttondata(scope.row)" @button-base-click="buttonTableClick($event, scope.row)" />
         </template>
       </el-table-column>
     </el-table>
@@ -133,11 +133,22 @@ const buttonBaseClick = (val, item) => {
   }
 }
 
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val == row.name) {
+    return true
+  } else {
+    return false
+  }
+}
+
 // 列表-操作按钮
-const butttondata = [
+const butttondata = (row) => {
-  defaultButtons.mainListEditBtn({ hasPermi: 'wms:itembasic:update' }), // 编辑
+  return [
-  defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:itembasic:delete' }), // 删除
+    defaultButtons.mainListEditBtn({hasPermi: 'wms:itembasic:update' }), // 编辑
-]
+    defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['默认规则']),  hasPermi: 'wms:itembasic:delete' }), // 删除
+  ]
+}
 
 // 列表-操作按钮事件 
 const buttonTableClick = (val, row) => {

src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/index.vue

@@ -36,7 +36,7 @@
       </el-table-column>
       <el-table-column align="center" label="操作" fixed="right" width="240">
         <template #default="scope">
-          <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event, scope.row)" />
+          <ButtonBase :Butttondata="butttondata(scope.row)" @button-base-click="buttonTableClick($event, scope.row)" />
         </template>
       </el-table-column>
     </el-table>
@@ -132,11 +132,22 @@ const buttonBaseClick = (val, item) => {
   }
 }
 
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val == row.name) {
+    return true
+  } else {
+    return false
+  }
+}
+
 // 列表-操作按钮
-const butttondata = [
+const butttondata = (row) => {
-  defaultButtons.mainListEditBtn({ hasPermi: 'wms:itembasic:update' }), // 编辑
+  return [
-  defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:itembasic:delete' }), // 删除
+    defaultButtons.mainListEditBtn({hasPermi: 'wms:itembasic:update' }), // 编辑
-]
+    defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['默认规则']),  hasPermi: 'wms:itembasic:delete' }), // 删除
+  ]
+}
 
 // 列表-操作按钮事件 
 const buttonTableClick = (val, row) => {

src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/index.vue

@@ -36,7 +36,7 @@
       </el-table-column>
       <el-table-column align="center" label="操作" fixed="right" width="240">
         <template #default="scope">
-          <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event, scope.row)" />
+          <ButtonBase :Butttondata="butttondata(scope.row)" @button-base-click="buttonTableClick($event, scope.row)" />
         </template>
       </el-table-column>
     </el-table>
@@ -132,11 +132,22 @@ const buttonBaseClick = (val, item) => {
   }
 }
 
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val == row.name) {
+    return true
+  } else {
+    return false
+  }
+}
+
 // 列表-操作按钮
-const butttondata = [
+const butttondata = (row) => {
-  defaultButtons.mainListEditBtn({ hasPermi: 'wms:itembasic:update' }), // 编辑
+  return [
-  defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:itembasic:delete' }), // 删除
+    defaultButtons.mainListEditBtn({hasPermi: 'wms:itembasic:update' }), // 编辑
-]
+    defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['默认规则']),  hasPermi: 'wms:itembasic:delete' }), // 删除
+  ]
+}
 
 // 列表-操作按钮事件 
 const buttonTableClick = (val, row) => {

src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue

@@ -37,7 +37,7 @@
       </el-table-column>
       <el-table-column align="center" label="操作" fixed="right" width="240">
         <template #default="scope">
-          <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event, scope.row)" />
+          <ButtonBase :Butttondata="butttondata(scope.row)" @button-base-click="buttonTableClick($event, scope.row)" />
         </template>
       </el-table-column>
     </el-table>
@@ -133,11 +133,22 @@ const buttonBaseClick = (val, item) => {
   }
 }
 
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val == row.name) {
+    return true
+  } else {
+    return false
+  }
+}
+
 // 列表-操作按钮
-const butttondata = [
+const butttondata = (row) => {
-  defaultButtons.mainListEditBtn({ hasPermi: 'wms:itembasic:update' }), // 编辑
+  return [
-  defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:itembasic:delete' }), // 删除
+    defaultButtons.mainListEditBtn({hasPermi: 'wms:itembasic:update' }), // 编辑
-]
+    defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['默认规则']),  hasPermi: 'wms:itembasic:delete' }), // 删除
+  ]
+}
 
 // 列表-操作按钮事件 
 const buttonTableClick = (val, row) => {

src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/index.vue

@@ -37,7 +37,7 @@
       </el-table-column>
       <el-table-column align="center" label="操作" fixed="right" width="240">
         <template #default="scope">
-          <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event, scope.row)" />
+          <ButtonBase :Butttondata="butttondata(scope.row)" @button-base-click="buttonTableClick($event, scope.row)" />
         </template>
       </el-table-column>
     </el-table>
@@ -134,11 +134,22 @@ const buttonBaseClick = (val, item) => {
   }
 }
 
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val == row.name) {
+    return true
+  } else {
+    return false
+  }
+}
+
 // 列表-操作按钮
-const butttondata = [
+const butttondata = (row) => {
-  defaultButtons.mainListEditBtn({ hasPermi: 'wms:itembasic:update' }), // 编辑
+  return [
-  defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:itembasic:delete' }), // 删除
+    defaultButtons.mainListEditBtn({hasPermi: 'wms:itembasic:update' }), // 编辑
-]
+    defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['默认规则']),  hasPermi: 'wms:itembasic:delete' }), // 删除
+  ]
+}
 
 // 列表-操作按钮事件 
 const buttonTableClick = (val, row) => {

src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/index.vue

@@ -36,7 +36,7 @@
       </el-table-column>
       <el-table-column align="center" label="操作" fixed="right" width="240">
         <template #default="scope">
-          <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event, scope.row)" />
+          <ButtonBase :Butttondata="butttondata(scope.row)" @button-base-click="buttonTableClick($event, scope.row)" />
         </template>
       </el-table-column>
     </el-table>
@@ -132,11 +132,22 @@ const buttonBaseClick = (val, item) => {
   }
 }
 
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val == row.name) {
+    return true
+  } else {
+    return false
+  }
+}
+
 // 列表-操作按钮
-const butttondata = [
+const butttondata = (row) => {
-  defaultButtons.mainListEditBtn({ hasPermi: 'wms:itembasic:update' }), // 编辑
+  return [
-  defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:itembasic:delete' }), // 删除
+    defaultButtons.mainListEditBtn({hasPermi: 'wms:itembasic:update' }), // 编辑
-]
+    defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['默认规则']),  hasPermi: 'wms:itembasic:delete' }), // 删除
+  ]
+}
 
 // 列表-操作按钮事件 
 const buttonTableClick = (val, row) => {

src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/index.vue

@@ -37,7 +37,7 @@
       </el-table-column>
       <el-table-column align="center" label="操作" fixed="right" width="240">
         <template #default="scope">
-          <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event, scope.row)" />
+          <ButtonBase :Butttondata="butttondata(scope.row)" @button-base-click="buttonTableClick($event, scope.row)" />
         </template>
       </el-table-column>
     </el-table>
@@ -133,11 +133,22 @@ const buttonBaseClick = (val, item) => {
   }
 }
 
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val == row.name) {
+    return true
+  } else {
+    return false
+  }
+}
+
 // 列表-操作按钮
-const butttondata = [
+const butttondata = (row) => {
-  defaultButtons.mainListEditBtn({ hasPermi: 'wms:itembasic:update' }), // 编辑
+  return [
-  defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:itembasic:delete' }), // 删除
+    defaultButtons.mainListEditBtn({hasPermi: 'wms:itembasic:update' }), // 编辑
-]
+    defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['默认规则']),  hasPermi: 'wms:itembasic:delete' }), // 删除
+  ]
+}
 
 // 列表-操作按钮事件 
 const buttonTableClick = (val, row) => {