修复bug

6 months ago · 897fa24658
6 changed files with 54 additions and 51 deletions
--- a/src/api/wms/balance/index.ts
+++ b/src/api/wms/balance/index.ts
@ -161,3 +161,15 @@ export const selectConfigToBalance = async (params) => {
    return request.get({ url: '/wms/balance/pageConfigToBalance', params})
  }
 }
+
+
+// 查询库存余额列表根据业务类型  根据库存状态及库区类型筛选
+export const getBalanceByBusinessTypeByItemType = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/balance/pageBusinessTypeToBalanceSenior', data })
+  } else {
+    return await request.get({ url: `/wms/balance/pageBusinessTypeToBalance`, params })
+  }
+}
--- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRecord/relegateRecordMain.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRecord/relegateRecordMain.data.ts
@ -46,6 +46,9 @@ export const RelegateRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
        valueFormat: 'x'
      }
    },
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
    table: {
      width: 200
    },
@ -84,6 +87,9 @@ export const RelegateRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 200
    },
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
  },
  {
    label: '部门',
--- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
@ -351,15 +351,6 @@ const flag = ref(false)
 // form表单提交
 const submitForm = async (formType, data) => {
  data.subList = tableData.value // 拼接子表数据参数
-  let isExist = false
-  tableData.value.forEach(item => {
-    let rs = tableData.value.filter(filterItem => (filterItem.itemCode == item.itemCode))
-    if (rs.length > 1) isExist = true
-  })
-  if (isExist) {
-    basicFormRef.value.formLoading = false
-    return message.warning('物料代码重复')
-  }
  data.subList.forEach(obj => {
    if (obj.qty == 0) {
      message.warning(`数量不能为0!`)
--- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
@ -100,6 +100,9 @@ export const RelegateRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
      }
    },
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
    isForm: false,
    isTable: false
  },
@ -130,21 +133,8 @@ export const RelegateRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
      }
    },
-    isForm: false,
-    isTable: false
-  },
-  {
-    label: '截止时间',
-    field: 'dueTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
    },
    isForm: false,
    isTable: false
@ -153,7 +143,9 @@ export const RelegateRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
    label: '部门',
    field: 'departmentCode',
    sort: 'custom',
-    isForm: false,
+    isForm:false,
+    isTableForm: false,
+    isTable:false,
  },
  {
    label: '状态',
@ -257,21 +249,24 @@ export const RelegateRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
    field: 'concurrencyStamp',
    sort: 'custom',
    isForm: false,
-    isTable: false
+    isTable: false,
+    isDetail:false
  },
  {
    label: '权限所属人员id',
    field: 'ruleUserId',
    sort: 'custom',
    isForm: false,
-    isTable: false
+    isTable: false,
+    isDetail:false
  },
  {
    label: '工作流流水号',
    field: 'serialNumber',
    sort: 'custom',
    isForm: false,
-    isTable: false
+    isTable: false,
+    isDetail:false
  },
  {
    label: '原因',
@ -285,7 +280,8 @@ export const RelegateRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 200,
      fixed: 'right'
-    }
+    },
+    isDetail:false
  }
 ]))

@ -311,7 +307,7 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
        searchField: 'itemCode',
        searchTitle: '库存余额信息',
        searchAllSchemas: Balance.allSchemas,
-        searchPage: BalanceApi.getBalancePageByBusinessTypeByItemType,
+        searchPage: BalanceApi.getBalanceByBusinessTypeByItemType,
        searchCondition: []
      }
    },
@ -321,7 +317,7 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
      searchField: 'itemCode', // 查询弹窗赋值字段
      searchTitle: '库存余额信息', // 查询弹窗标题
      searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类
-      searchPage: BalanceApi.getBalancePageByBusinessTypeByItemType, // 查询弹窗所需分页方法
+      searchPage: BalanceApi.getBalanceByBusinessTypeByItemType, // 查询弹窗所需分页方法
      searchCondition:[
        {
          key: 'available',
@ -596,14 +592,6 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
    isTableForm: false,
    isTable:false,
  },
-  {
-    label: '扩展属性',
-    field: 'extraProperties',
-    sort: 'custom',
-    isForm:false,
-    isTableForm: false,
-    isTable:false,
-  },
  {
    label: '创建时间',
    field: 'createTime',
@ -617,6 +605,9 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
      }
    },
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
    isForm:false,
    isTableForm: false,
    isTable:false,
--- a/src/views/wms/inventoryManage/balance/index.vue
+++ b/src/views/wms/inventoryManage/balance/index.vue
@ -133,17 +133,17 @@ const buttonBaseClick = (val, item) => {

 // 列表-操作按钮
 const butttondata = [
-  // {
-  //   label: '标签信息',
-  //   name: 'bqxx',
-  //   hide: false,
-  //   type: 'primary',
-  //   icon: '',
-  //   color: '',
-  //   link: true,
-  //   float:'right',
-  //   hasPermi: ''
-  // },
+  {
+    label: '标签信息',
+    name: 'bqxx',
+    hide: false,
+    type: 'primary',
+    icon: '',
+    color: '',
+    link: true,
+    float:'right',
+    hasPermi: ''
+  },
  defaultButtons.mainListPointBtn(null), // 标签打印
  // defaultButtons.mainListEditBtn({hasPermi:'wms:balance:update'}), // 编辑
  // defaultButtons.mainListDeleteBtn({hasPermi:'wms:balance:delete'}), // 删除
--- a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue
@ -58,6 +58,9 @@
    :detailAllSchemas="ContainerRecordDetail.allSchemas"
    :detailAllSchemasRules="ContainerRecordDetailRules"
    :apiPage="ContainerRecordDetailApi.getContainerRecordDetailPage"
+    :detailButtonIsShowAdd="false"
+    :detailButtonIsShowDelete="false"
+    :detailButtonIsShowUpdate="false"
  />

  </template>
@ -137,7 +140,7 @@ const { getList, setSearchParams } = tableMethods

 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:container-record-detail:create'}), // 新增
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:container-record-detail:create'}), // 新增
  defaultButtons.defaultExportBtn({hasPermi:'wms:container-record-detail:export'}), // 导出
  defaultButtons.defaultFreshBtn(null), // 刷新
  defaultButtons.defaultFilterBtn(null), // 筛选