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

README.md

@@ -1,4 +1,4 @@
-## dev发布2024-05-16-001
+## dev发布2024-05-16-002
 **xxxx.data.ts 文件配置说明**
 **form表单查询弹窗配置**
 form: {

src/views/eam/equipmentManufacturer/equipmentManufacturer.data.ts

@@ -96,6 +96,18 @@ export const EquipmentManufacturer = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '是否启用',
+    field: 'available',
+    sort: 'custom',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+      isTable: true,
+      isDetail: false,
+      isSearch: false,
+      isTableForm: false,
+      isForm: false,
+  },
   {
     label: '备注',
     field: 'remark',

src/views/eam/equipmentManufacturer/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -90,6 +90,15 @@ const updataTableColumns = (val) => {
   tableColumns.value = val
 }
 
+
+const judgeStatus = (row) =>{
+ if(row.available === 'TRUE'){
+   return true
+ }else{
+   return false
+ }
+}
+
 const { tableObject, tableMethods } = useTable({
   getListApi: EquipmentManufacturerApi.getEquipmentManufacturerPage // 分页接口
 })
@@ -132,10 +141,13 @@ const buttonBaseClick = (val, item) => {
 }
 
 // 列表-操作按钮
-const butttondata = [
+const butttondata = (row) => {
+  return [
   defaultButtons.mainListEditBtn({hasPermi:'eam:equipment-manufacturer:update'}), // 编辑
+  defaultButtons.mainListEnableBtn({hasPermi:'eam:inspection-item:enable',hide: judgeStatus(row)}), // 启用
+  defaultButtons.mainListDisableBtn({hasPermi:'eam:inspection-item:disable',hide: !judgeStatus(row)}), // 禁用
   // defaultButtons.mainListDeleteBtn({hasPermi:'eam:equipment-manufacturer:delete'}), // 删除
-]
+]}
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
@@ -143,6 +155,10 @@ const buttonTableClick = async (val, row) => {
     openForm('update', row)
   } else if (val == 'delete') { // 删除
     handleDelete(row.id)
+  } else if (val == 'enable') { // 启用
+    handleEnable(row,'TRUE')
+  }else if (val == 'disable') {// 禁用
+    handleEnable(row,'FALSE')
   }
 }
 
@@ -235,6 +251,17 @@ const searchFormClick = (searchData) => {
   getList() // 刷新当前列表
 }
 
+const handleEnable = (row,enable) =>{
+  message.confirm(t('您确定'+(enable=='TRUE'?'启用':'禁用')+'该项吗, 是否继续?')).then(() => {
+    row.available = enable
+    EquipmentManufacturerApi.updateEquipmentManufacturer(row).then(res => {
+      message.success(t('common.updateSuccess'))
+      getList()
+    }) 
+  })  
+  
+}
+
 /** 初始化 **/
 onMounted(async () => {
   getList()

src/views/eam/equipmentSupplier/equipmentSupplier.data.ts

@@ -102,6 +102,18 @@ export const EquipmentSupplier = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '是否启用',
+    field: 'available',
+    sort: 'custom',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+      isTable: true,
+      isDetail: false,
+      isSearch: false,
+      isTableForm: false,
+      isForm: false,
+  },
   {
     label: '备注',
     field: 'remark',

src/views/eam/equipmentSupplier/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -90,6 +90,15 @@ const updataTableColumns = (val) => {
   tableColumns.value = val
 }
 
+
+const judgeStatus = (row) =>{
+ if(row.available === 'TRUE'){
+   return true
+ }else{
+   return false
+ }
+}
+
 const { tableObject, tableMethods } = useTable({
   getListApi: EquipmentSupplierApi.getEquipmentSupplierPage // 分页接口
 })
@@ -132,10 +141,13 @@ const buttonBaseClick = (val, item) => {
 }
 
 // 列表-操作按钮
-const butttondata = [
+const butttondata = (row) => {
+  return [
   defaultButtons.mainListEditBtn({hasPermi:'eam:equipment-supplier:update'}), // 编辑
+  defaultButtons.mainListEnableBtn({hasPermi:'eam:inspection-item:enable',hide: judgeStatus(row)}), // 启用
+  defaultButtons.mainListDisableBtn({hasPermi:'eam:inspection-item:disable',hide: !judgeStatus(row)}), // 禁用
   // defaultButtons.mainListDeleteBtn({hasPermi:'eam:equipment-supplier:delete'}), // 删除
-]
+]}
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
@@ -143,6 +155,10 @@ const buttonTableClick = async (val, row) => {
     openForm('update', row)
   } else if (val == 'delete') { // 删除
     handleDelete(row.id)
+  } else if (val == 'enable') { // 启用
+    handleEnable(row,'TRUE')
+  }else if (val == 'disable') {// 禁用
+    handleEnable(row,'FALSE')
   }
 }
 
@@ -235,6 +251,16 @@ const searchFormClick = (searchData) => {
   getList() // 刷新当前列表
 }
 
+const handleEnable = (row,enable) =>{
+  message.confirm(t('您确定'+(enable=='TRUE'?'启用':'禁用')+'该项吗, 是否继续?')).then(() => {
+    row.available = enable
+    EquipmentSupplierApi.updateEquipmentSupplier(row).then(res => {
+      message.success(t('common.updateSuccess'))
+      getList()
+    }) 
+  })
+}
+
 /** 初始化 **/
 onMounted(async () => {
   getList()

src/views/eam/inspectionItem/index.vue

@@ -253,16 +253,15 @@ const searchFormClick = (searchData) => {
 }
 
 const handleEnable = (row,enable) =>{
-  row.available = enable
+  message.confirm(t('您确定'+(enable=='TRUE'?'启用':'禁用')+'该项吗, 是否继续?')).then(() => {
-  InspectionItemApi.updateInspectionItem(row).then(res => {
+    row.available = enable
-    message.success(t('common.updateSuccess'))
+    InspectionItemApi.updateInspectionItem(row).then(res => {
-    getList()
+      message.success(t('common.updateSuccess'))
-  }) 
+      getList()
+    }) 
+  })
 }
 
-
-
-
 /** 初始化 **/
 onMounted(async () => {
   getList()

src/views/eam/spotCheckItem/index.vue

@@ -252,11 +252,13 @@ const searchFormClick = (searchData) => {
 
 
 const handleEnable = (row,enable) =>{
-  row.available = enable
+  message.confirm(t('您确定'+(enable=='TRUE'?'启用':'禁用')+'该项吗, 是否继续?')).then(() => {
-  SpotCheckItemApi.updateSpotCheckItem(row).then(res => {
+    row.available = enable
-    message.success(t('common.updateSuccess'))
+    SpotCheckItemApi.updateSpotCheckItem(row).then(res => {
-    getList()
+      message.success(t('common.updateSuccess'))
-  }) 
+      getList()
+    }) 
+  })
 }
 
 /** 初始化 **/