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

src/api/wms/containerMain/index.ts

@@ -49,3 +49,13 @@ export const exportContainerMain = async (params) => {
 export const importTemplate = () => {
   return request.download({ url: '/wms/container-main/get-import-template' })
 }
+
+// 器具维修
+export const repairSubmitContainerRequestMain = async (id) => {
+  return await request.put({ url: `/wms/container-main/repair?id=` + id })
+}
+
+// 器具报废
+export const scrapSubmitContainerRequestMain = async (id) => {
+  return await request.put({ url: `/wms/container-main/scrap?id=` + id })
+}

src/views/wms/inventoryManage/container/containerMain.data.ts

@@ -30,8 +30,12 @@ export const ContainerMain = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
   },
   {
-    label: '状态',
-    field: 'status',
+    label: '器具状态',
+    field: 'containerStatus',
+    dictType: DICT_TYPE.CONTAINER_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    isForm: true,
     sort: 'custom',
     isSearch: true,
   },

src/views/wms/inventoryManage/containerinit/containerRepair/containerRepairRecordMain.data.ts

@@ -65,7 +65,9 @@ export const ContainerRepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     label: '单据号',
     field: 'number',
     sort: 'custom',
-    isSearch: true,
+    table: {
+      width: 150
+    }
   },
   {
     label: '器具号',

src/views/wms/inventoryManage/containerinit/containerinitadd/containerMain.data.ts

@@ -133,6 +133,16 @@ export const ContainerMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 300,
+      fixed: 'right'
+    },
+  }
 ]))
 
 

src/views/wms/inventoryManage/containerinit/containerinitadd/index.vue

@@ -144,8 +144,26 @@ const buttonBaseClick = (val, item) => {
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'wms:containerMain:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'wms:containerMain:delete'}), // 删除
+  defaultButtons.mainListEditBtn({hasPermi:'wms:container-main:update'}), // 编辑
+  // defaultButtons.mainListDeleteBtn({hasPermi:'wms:container-main:delete'}), // 删除
+  {
+    label: '维修',
+    name: 'repair',
+    hide: false,
+    type: 'primary',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  },
+  {
+    label: '报废',
+    name: 'scrap',
+    hide: false,
+    type: 'danger',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  }
 ]
 
 // 列表-操作按钮事件
@@ -154,7 +172,31 @@ const buttonTableClick = async (val, row) => {
     openForm('update', row)
   } else if (val == 'delete') { // 删除
     handleDelete(row.id)
+  } else if(val == 'repair'){ // 维修
+    repairSubmit(row.id)
+  } else if(val == 'scrap'){ // 报废
+    scrapSubmit(row.id)
+  }
 }
+
+/** 维修按钮操作 */
+const repairSubmit = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmSubmit'))
+    await ContainerMainApi.repairSubmitContainerRequestMain(id)
+    message.success(t('common.submitSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 报废按钮操作 */
+const scrapSubmit = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmSubmit'))
+    await ContainerMainApi.scrapSubmitContainerRequestMain(id)
+    message.success(t('common.submitSuccess'))
+    await getList()
+  } catch {}
 }
 
 /** 添加/修改操作 */

src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts

@@ -735,8 +735,8 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
   {
     label: '库存状态',
     field: 'inventoryStatus',
-    dictType: DICT_TYPE.INVENTORY_STATUS,
-    dictClass: 'string',
+    // dictType: DICT_TYPE.INVENTORY_STATUS,
+    // dictClass: 'string',
     isTable: true,
     sort: 'custom',
     table: {
@@ -749,7 +749,7 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
     },
     tableForm: {
       disabled: true,
-      type: 'Select'
+      // type: 'Select'
     }
   },
   {
@@ -1229,8 +1229,8 @@ export const BomDismantle = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '库存状态',
     field: 'inventoryStatus',
-    dictType: DICT_TYPE.INVENTORY_STATUS,
-    dictClass: 'string',
+    // dictType: DICT_TYPE.INVENTORY_STATUS,
+    // dictClass: 'string',
     isTable: true,
     sort: 'custom',
     table: {