Merge branch 'intex' into intex_online_yejiaxing

1 week ago · 799182c27f
7 changed files with 205 additions and 28 deletions
--- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
@ -839,7 +839,29 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
  //     }
  //   }
  // },
-
+{
+      label: '客户订单号',
+      field: 'customerOrderNumber',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isSearch: false,
+      search: {
+        component: 'Input',
+      },
+      isTable: true,
+      isTableForm:false,
+      hiddenInMain:true,
+      isForm: false,
+      isDetail:false,
+      form: {
+        component: 'Input',
+        componentProps: {
+          
+        }
+      }
+    },
  {
    label: '品番',
    field: 'itemCode',
--- a/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/unfinishedShipmentMain.data.ts
+++ b/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/unfinishedShipmentMain.data.ts
@ -233,19 +233,19 @@ export const UnfinishedShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
      value: 0
    }
  },
-  // {
-  //   label: '已结数量',
-  //   field: 'finishdQuantity',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150,
-  //   },
-  //   isTableForm:false,
-  //   form: {
-  //     component: 'InputNumber',
-  //     value: 0
-  //   }
-  // },
+  {
+    label: '已结数量',
+    field: 'finishdQuantity',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+    isTableForm:false,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    }
+  },
  {
    label: '销售单价',
    field: 'unitPrice',
--- a/src/views/wms/inventoryManage/balance/balance.data.ts
+++ b/src/views/wms/inventoryManage/balance/balance.data.ts
@ -669,6 +669,141 @@ export const BalancePopWindow = useCrudSchemas(
  ])
 )

+/**
+ * @returns {Array} 库存余额弹窗(翻包申请用)
+ */
+export const BalancePopWindowPackageOver = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '品番',
+      field: 'itemCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isSearch: true
+    },
+    {
+      label: '品名',
+      field: 'itemName',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isSearch: true
+    },
+    {
+      label: '背番',
+      field: 'backNumber',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      //hiddenSearchHigh: true,// 高级筛选中隐藏
+      isSearch: true
+    },
+    {
+      label: '描述',
+      field: 'itemDesc2',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenSearchHigh: true,// 高级筛选中隐藏
+      isSearch: true
+    },
+    {
+      label: '品番类型',
+      field: 'itemType',
+      sort: 'custom',
+      dictType: DICT_TYPE.ITEM_TYPE,
+      dictClass: 'string',
+      isSearch: true,
+      table: {
+        width: 100
+      }
+    },
+    {
+      label: '库存数量',
+      field: 'qty',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'InputNumber'
+      }
+    },
+    {
+      label: '计量单位',
+      field: 'uom',
+      dictType: DICT_TYPE.UOM,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      }
+    },
+    {
+      label: '批次',
+      field: 'batch',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isSearch: true
+    },
+    {
+      label: '库存状态',
+      field: 'inventoryStatus',
+      dictType: DICT_TYPE.INVENTORY_STATUS,
+      dictClass: 'string',
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      }
+    },
+    {
+      label: '库位代码',
+      field: 'locationCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isSearch: true
+    },
+    {
+      label: '包装规格',
+      field: 'packUnit',
+      sort: 'custom',
+      table: {
+        width: 150
+      }
+    },
+    {
+      label: '包装数量',
+      field: 'packQty',
+      sort: 'custom',
+      table: {
+        width: 150
+      }
+    },
+    // TODO: 临时添加 方便操作
+    // {
+    //   label: '操作',
+    //   field: 'action',
+    //   isDetail: false,
+    //   isForm: false,
+    //   table: {
+    //     width: 200,
+    //     fixed: 'right'
+    //   }
+    // }
+  ])
+)
+

 export const TransactionTab = useCrudSchemas(reactive<CrudSchema[]>([
  {
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue
@ -130,12 +130,21 @@ const butttondata = (row,$index) => {
  if(findIndex>-1&&findIndex<$index){
    return []
  }
-  return [defaultButtons.mainListPointBtn(null)] // 标签打印
+  return [defaultButtons.mainListPointBtn({
+    label: t(`ts.打印标签`).replace('ts.', ''),
+    name: 'point',
+    hide: false,
+    type: row.isClick?'warning':'primary',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })] // 标签打印
 }

 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
  if (val == 'point') { // 标签打印
+    row.isClick = true
    handlePoint(row)
  }
 }
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts
@ -9,7 +9,7 @@ import * as ItempackagingApi from '@/api/wms/itempackage'
 import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'

 import * as BalanceApi from '@/api/wms/balance'
-import { BalancePopWindow } from '@/views/wms/inventoryManage/balance/balance.data'
+import { BalancePopWindow,BalancePopWindowPackageOver } from '@/views/wms/inventoryManage/balance/balance.data'

 // 获取自动提交自动通过自动执行，跳过任务直接生成记录的默认值
 const queryParams = {
@ -536,7 +536,7 @@ export const PackageoverRequestDetail = useCrudSchemas(
          searchListPlaceholder: '请选择品番', // 输入框占位文本
          searchField: 'itemCode', // 查询弹窗赋值字段
          searchTitle: '库存余额信息', // 查询弹窗标题
-          searchAllSchemas: BalancePopWindow.allSchemas, // 查询弹窗所需类
+          searchAllSchemas: BalancePopWindowPackageOver.allSchemas, // 查询弹窗所需类
          searchPage: BalanceApi.getBalancePage, // 查询弹窗所需分页方法
          searchCondition: [
            {
@ -559,7 +559,7 @@ export const PackageoverRequestDetail = useCrudSchemas(
        searchListPlaceholder: '请选择品番', // 输入框占位文本
        searchField: 'itemCode', // 查询弹窗赋值字段
        searchTitle: '库存余额信息', // 查询弹窗标题
-        searchAllSchemas: BalancePopWindow.allSchemas, // 查询弹窗所需类
+        searchAllSchemas: BalancePopWindowPackageOver.allSchemas, // 查询弹窗所需类
        searchPage: BalanceApi.getBalancePage, // 查询弹窗所需分页方法
        searchCondition: [
          {
@ -594,7 +594,15 @@ export const PackageoverRequestDetail = useCrudSchemas(
      table: {
        width: 150
      },
-      isTableForm: false,
+        tableForm: {
+        disabled: true
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      },
+      isTableForm: true,
      isSearch: true,
      isForm: false
    },
--- a/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts
+++ b/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts
@ -23,6 +23,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 180
    },
+    isSearch:true,
    sortTableDefault: 1,
  },
  // {
--- a/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts
+++ b/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts
@ -32,20 +32,22 @@ export const RepleinshRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
    label: '申请单号',
    field: 'requestNumber',
    sort: 'custom',
+    isSearch:true,
    table: {
      width: 180
    },
    sortTableDefault:1,
  },
-  // {
-  //   label: '任务单号',
-  //   field: 'jobNumber',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 180
-  //   },
-  //   sortTableDefault: 2,
-  // },
+  {
+    label: '任务单号',
+    field: 'jobNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch:true,
+    sortTableDefault: 2,
+  },
  // {
  //   label: '供应商代码',
  //   field: 'supplierCode',