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

src/views/wms/inventoryManage/containerinit/containerBindRecord/containerBindRecordMain.data.ts

@@ -64,6 +64,8 @@ export const ContainerBindRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '内容物类型',
     field: 'containerContentType',
+    dictType: DICT_TYPE.CONTAINER_CONTENT_TYPE,
+    dictClass: 'string',
     sort: 'custom',
     isSearch: true,
     form: {
@@ -103,6 +105,8 @@ export const ContainerBindRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '库存状态',
     field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
     sort: 'custom',
     form: {
       component: 'Radio'
@@ -114,6 +118,8 @@ export const ContainerBindRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '计量单位',
     field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
     sort: 'custom',
     table: {
       width: 150

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

@@ -80,6 +80,8 @@ export const ContainerRepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '从状态',
     field: 'fromContainerStatus',
+    dictType: DICT_TYPE.CONTAINER_STATUS,
+    dictClass: 'string',
     sort: 'custom',
     isSearch: true,
     form: {
@@ -92,6 +94,8 @@ export const ContainerRepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '到状态',
     field: 'toContainerStatus',
+    dictType: DICT_TYPE.CONTAINER_STATUS,
+    dictClass: 'string',
     sort: 'custom',
     isSearch: true,
     form: {
@@ -115,6 +119,9 @@ export const ContainerRepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
+    table: {
+      width: 150
+    },
     isForm: false,
   },
   {
@@ -122,6 +129,9 @@ export const ContainerRepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     field: 'remark',
     sort: 'custom',
     isSearch: true,
+    table: {
+      width: 150
+    },
   },
   {
     label: '操作',

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

@@ -154,8 +154,8 @@ const buttonBaseClick = (val, item) => {
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'wms:container-repair-record-main:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'wms:container-repair-record-main:delete'}), // 删除
+  //defaultButtons.mainListEditBtn({hasPermi:'wms:container-repair-record-main:update'}), // 编辑
+  //defaultButtons.mainListDeleteBtn({hasPermi:'wms:container-repair-record-main:delete'}), // 删除
 ]
 
 // 列表-操作按钮事件

src/views/wms/inventoryManage/containerinit/containerUnbindRecord/containerUnbindRecordMain.data.ts

@@ -63,6 +63,8 @@ export const ContainerUnbindRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '内容物类型',
     field: 'containerContentType',
+    dictType: DICT_TYPE.CONTAINER_CONTENT_TYPE,
+    dictClass: 'string',
     sort: 'custom',
     isSearch: true,
     form: {
@@ -102,6 +104,8 @@ export const ContainerUnbindRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '库存状态',
     field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
     sort: 'custom',
     form: {
       component: 'Radio'
@@ -113,6 +117,8 @@ export const ContainerUnbindRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '计量单位',
     field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
     sort: 'custom',
     table: {
       width: 150

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

@@ -120,9 +120,9 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:containerUnbindRecordMain:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'wms:containerUnbindRecordMain:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'wms:containerUnbindRecordMain:export'}), // 导出
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:container-unbind-record-main:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:container-unbind-record-main:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:container-unbind-record-main:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -154,8 +154,8 @@ const buttonBaseClick = (val, item) => {
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'wms:containerUnbindRecordMain:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'wms:containerUnbindRecordMain:delete'}), // 删除
+  //defaultButtons.mainListEditBtn({hasPermi:'wms:container-unbind-record-main:update'}), // 编辑
+  //defaultButtons.mainListDeleteBtn({hasPermi:'wms:container-unbind-record-main:delete'}), // 删除
 ]
 
 // 列表-操作按钮事件

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue

@@ -185,7 +185,7 @@
       defaultButtons.mainListPlanSubBtn({ hide: isShowMainButton(row, ['1']) }), // 提交审批
       defaultButtons.mainListPlanAppBtn({ hide: isShowMainButton(row, ['2']) }), // 审批通过
       defaultButtons.mainListPlanTurBtn({ hide: isShowMainButton(row, ['2']) }), // 驳回按钮
-      defaultButtons.mainListEditBtn({ hasPermi: 'wms:supplierdeliver-request-main:update' }), // 编辑
+      defaultButtons.mainListEditBtn({ hide: isShowMainButton(row, ['1']),hasPermi: 'wms:supplierdeliver-request-main:update' }), // 编辑
       // defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:supplierdeliver-request-main:delete' }), // 删除
       {
         label: '生成标签',