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

src/components/TableForm/src/TableForm.vue

@@ -97,7 +97,7 @@
               :type="headerItem?.tableForm?.inputType"
               :placeholder="
                 t(
-                  `ts.${headerItem?.tableForm?.placeholder || '请输入' + headerItem.label}`
+                  `ts.${headerItem?.tableForm?.isPlaceholder === false ? '' :( headerItem?.tableForm?.placeholder || '请输入' + headerItem.label)}`
                 ).replace('ts.', '')
               "
               :disabled="itemIsDisabled(headerItem, row)"

src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts

@@ -88,6 +88,22 @@ export const Customeritem = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true
   },
+  {
+    label: '背番',
+    field: 'itemDesc1',
+    sort: 'custom',
+    isSearch: true,
+    isForm:false,
+hiddenSearchHigh:true,
+    table: {
+      width: 150
+    },
+form:{
+      componentProps:{
+        disabled: true,
+      }
+    }
+  },
   {
     label: '客户物料代码',
     field: 'customerItemCode',

src/views/wms/basicDataManage/customerManage/saleprice/saleprice.data.ts

@@ -88,6 +88,22 @@ export const Saleprice = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
+  {
+    label: '背番',
+    field: 'itemDesc1',
+    sort: 'custom',
+    isSearch: true,
+    isForm:false,
+hiddenSearchHigh:true,
+    table: {
+      width: 150
+    },
+form:{
+      componentProps:{
+        disabled: true,
+      }
+    }
+  },
   {
     label: '货币',
     field: 'currency',

src/views/wms/basicDataManage/itemManage/bom/bom.data.ts

@@ -43,6 +43,21 @@ export const Bom = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '父背番',
+    field: 'productBackNumber',
+    sort: 'custom',
+    isSearch: true,
+    hiddenSearchHigh:true,
+    table: {
+      width: 150
+    },
+    form:{
+      componentProps:{
+        disabled: true,
+      }
+    }
+  },
   {
     label: '子物料代码',
     field: 'componentItemCode',
@@ -72,6 +87,21 @@ export const Bom = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '子背番',
+    field: 'componentBackNumber',
+    sort: 'custom',
+    isSearch: true,
+    hiddenSearchHigh:true,
+    table: {
+      width: 150
+    },
+    form:{
+      componentProps:{
+        disabled: true,
+      }
+    }
+  },
   {
     label: '子物料计量单位',
     field: 'componentUom',

src/views/wms/basicDataManage/itemManage/itemSyntheticRelation/index.vue

@@ -95,6 +95,7 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
     } else {
       setV[formField] = val[0][searchField]
     }
+    setV['itemDesc1'] = val[0]['backNumber']//物料描述1赋值到背番
     formRef.setValues(setV)
   })
 }

src/views/wms/basicDataManage/itemManage/itemSyntheticRelation/itemSyntheticRelation.data.ts

@@ -77,6 +77,22 @@ export const ItemSyntheticRelation = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: false,
     isForm:false,
   },
+  {
+    label: '背番',
+    field: 'itemDesc1',
+    sort: 'custom',
+    isSearch: false,
+    isForm:false,
+hiddenSearchHigh:true,
+    table: {
+      width: 150
+    },
+form:{
+      componentProps:{
+        disabled: true,
+      }
+    }
+  },
   {
     label: '生效时间',
     field: 'effectiveDate',

src/views/wms/basicDataManage/itemManage/itemarea/index.vue

@@ -178,6 +178,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       }else{
         setV[formField] = setV[0][searchField]
       }
+      setV['itemDesc1'] = val[0]['backNumber']//物料描述1赋值到背番
       formRef.setValues(setV)
     }
   })

src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts

@@ -50,6 +50,21 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '背番',
+    field: 'itemDesc1',
+    sort: 'custom',
+    isSearch: true,
+hiddenSearchHigh:true,
+    table: {
+      width: 150
+    },
+form:{
+      componentProps:{
+        disabled: true,
+      }
+    }
+  },
   {
     label: '区域代码',
     field: 'areaCode',

src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts

@@ -49,7 +49,7 @@ export const Itembasic = useCrudSchemas(reactive<CrudSchema[]>([
     label: '背番',
     field: 'backNumber',
     sort: 'custom',
-    isSearch: false,
+    isSearch: true,
     table: {
       width: 150
     },

src/views/wms/basicDataManage/itemManage/itempackage/index.vue

@@ -359,6 +359,7 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
     if('itemCode'==formField){
       setV['itemName'] = val[0]['name']
       setV['uom'] = val[0]['uom']
+      setV['backNumber'] = val[0]['backNumber']
     }
     if('packUnit'==formField){
       setV['packType'] = val[0]['type']

src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts

@@ -69,10 +69,16 @@ export const Itempackaging = useCrudSchemas(reactive<CrudSchema[]>([
     label: '背番',
     field: 'backNumber',
     sort: 'custom',
+    hiddenSearchHigh:true,
     isSearch: true,
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
   },
   {
     label: '计量单位',

src/views/wms/basicDataManage/itemManage/productionlineitem/index.vue

@@ -257,6 +257,7 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
   nextTick(() => {
     const setV = {}
     setV[formField] = val[0][searchField]
+    setV['itemDesc1'] = val[0]['backNumber']
     formRef.setValues(setV)
   })
 }

src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts

@@ -151,6 +151,21 @@ export const Productionlineitem = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '背番',
+    field: 'itemDesc1',
+    sort: 'custom',
+    isSearch: true,
+    hiddenSearchHigh:true,
+    table: {
+      width: 150
+    },
+    form:{
+      componentProps:{
+        disabled: true,
+      }
+    }
+  },
   {
     label: '是否可用',
     field: 'available',

src/views/wms/basicDataManage/itemManage/stdcostprice/index.vue

@@ -245,6 +245,7 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
   nextTick(() => {
     const setV = {}
     setV[formField] = val[0][searchField]
+    setV['itemDesc1'] = val[0]['backNumber']
     formRef.setValues(setV)
   })
 }

src/views/wms/basicDataManage/itemManage/stdcostprice/stdcostprice.data.ts

@@ -82,6 +82,21 @@ export const Stdcostprice = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '背番',
+    field: 'itemDesc1',
+    sort: 'custom',
+    isSearch: true,
+    hiddenSearchHigh:true,
+    table: {
+      width: 150
+    },
+    form:{
+      componentProps:{
+        disabled: true,
+      }
+    }
+  },
   {
     label: '货币',
     field: 'currency',

src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue

@@ -66,7 +66,7 @@ import * as BarbasicApi from '@/api/wms/barbasic'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as PackageApi from '@/api/wms/package'
 import { formatTime } from '@/utils/index'
-import * as Itempackaging from '@/api/wms/itempackage'
+import * as itembasicApi from '@/api/wms/itembasic'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
 import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
@@ -110,17 +110,21 @@ const searchTableSuccess = (formField, searchField, val, basicFormRef, type, row
         setV['produceDate'] = ''
         setV['expireDate'] = ''
         setV['validityDays'] = val[0]['validityDays']
-        await Itempackaging.getItempackagingPage({
+        await itembasicApi.getItembasicPage({
-          itemCode: val[0]['code']
+          code: val[0]['code']
         }).then(res => {
           if (res) {
             if (res.list.length > 0) {
-              setV['packQty'] = res.list[0].packQty
+              setV['packQty'] = res.list[0].defaultPackQty
-              setV['packUnit'] = res.list[0].packUnit
+              setV['packUnit'] = res.list[0].defaultPackUnit
             }
           }
         })
       }
+      if(formField == 'packUnit') {
+        setV['packUnit'] = val[0].packUnit
+        setV['packQty'] = val[0].packQty
+      }
       basicFormRef.setValues(setV)
   })
 }

src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts

@@ -91,6 +91,7 @@ export const Purchaseprice = useCrudSchemas(reactive<CrudSchema[]>([
     label: '背番',
     field: 'backNumber',
     sort: 'custom',
+    hiddenSearchHigh:true,
     isSearch: true,
     table: {
       width: 150

src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts

@@ -110,6 +110,7 @@ export const Supplieritem = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     isSearch:true,
+    hiddenSearchHigh:true,
     tableForm:{
       disabled:true,
     }

src/views/wms/inventoryManage/balance/balance.data.ts

@@ -7,6 +7,9 @@ import { Supplieritem } from '@/views/wms/basicDataManage/supplierManage/supplie
 import * as ProductionlineitemApi from '@/api/wms/productionlineitem'
 import { Productionlineitem } from '@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data'
 import { validatePositiveNumber } from "@/utils/validator";
+
+import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
+import * as ItemPackageApi from '@/api/wms/itempackage/index'
 /**
  * @returns {Array} 库存余额
  */
@@ -902,22 +905,109 @@ export const BalancePackage = useCrudSchemas(reactive<CrudSchema[]>([
       min: 0
     }
   },
-  {
+  // {
-    label: '包装规格',
+  //   label: '包装规格',
-    field: 'packUnit',
+  //   field: 'packUnit',
-    sort: 'custom',
+  //   sort: 'custom',
-    tableForm: {
+  //   tableForm: {
-      disabled: true
+  //     disabled: true
-    }
+  //   }
-  },
+  // },
-  {
+  // {
-    label: '标包数量',
+  //   label: '标包数量',
-    field: 'packQty',
+  //   field: 'packQty',
-    sort: 'custom',
+  //   sort: 'custom',
-    tableForm: {
+  //   tableForm: {
-      disabled: true
+  //     disabled: true
-    }
+  //   }
-  },
+  // },
+   {
+          label: '包装规格',
+          field: 'packUnit',
+          sort: 'custom',
+          isSearch: false,
+          table: {
+            width: 120
+          },
+          isTable: false,
+          isTableForm: true,
+          isForm: true,
+          tableForm: {
+            enterSearch: true,
+            isInpuFocusShow: true,
+            isSearchList: true, // 开启查询弹窗
+            searchListPlaceholder: '请选择包装规格', // 输入框占位文本
+            searchField: 'packUnit', // 查询弹窗赋值字段
+            searchTitle: '物料包装信息', // 查询弹窗标题
+            searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
+            searchPage: ItemPackageApi.getItempackagingPage, // 查询弹窗所需分页方法
+            searchCondition: [
+              {
+                key: 'available',
+                value: 'TRUE',
+                isMainValue: false
+              },
+              {
+                key: 'itemCode',
+                value: 'itemCode',
+                message: '请先选择物料代码！',
+                isMainValue: true
+              }
+            ],
+            verificationParams: [
+              {
+                key: 'packUnit',
+                action: '==',
+                value: '',
+                isMainValue: false,
+                isSearch: true,
+                isFormModel: true
+              }
+            ] // 失去焦点校验参数
+          },
+          form: {
+            // labelMessage: '信息提示说明！！！',
+            componentProps: {
+              isSearchList: true, // 开启查询弹窗
+              searchListPlaceholder: '请选择包装规格', // 输入框占位文本
+              searchField: 'packUnit', // 查询弹窗赋值字段
+              searchTitle: '物料包装信息', // 查询弹窗标题
+              searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
+              searchPage: ItemPackageApi.getItempackagingPage, // 查询弹窗所需分页方法
+              searchCondition: [
+                {
+                  key: 'available',
+                  value: 'TRUE',
+                  isMainValue: false
+                },
+                {
+                  key: 'itemCode',
+                  value: 'itemCode',
+                  message: '请先选择物料代码！', // 当前置条件为空时 弹出信息提示
+                  isMainValue: true
+                }
+              ],
+              verificationParams: [
+                {
+                  key: 'packUnit',
+                  action: '==',
+                  value: '',
+                  isMainValue: false,
+                  isSearch: true,
+                  isFormModel: true
+                }
+              ] // 失去焦点校验参数
+            }
+          }
+        },
+        {
+          label: '包装数量',
+          field: 'packQty',
+          sort: 'custom',
+          table: {
+            width: 150
+          }
+        },
   {
     label: '计量单位',
     field: 'uom',

src/views/wms/inventoryManage/balance/index.vue

@@ -475,7 +475,11 @@ const getLabelDetailPage = async (row, useToPackingNumber) => {
 const searchTableSuccessLabel = async (formField, searchField, val, formRef, type, row) => {
   console.log('批量打印',val)
   if (type == 'tableForm') {
-    row[formField] = val[0][searchField]
+    // row[formField] = val[0][searchField]
+    if (formField === 'packUnit') {
+        row['packUnit'] = val[0]['packUnit']
+        row['packQty'] = val[0]['packQty']
+      }
   } else {
       const setV = {}
       setV[formField] = val[0][searchField]

src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts

@@ -1706,7 +1706,6 @@ export const UnplannedreceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSc
     table: {
       width: 150,
       componentProps: {
-        disabled: true,
         isSearchList: true,
         searchListPlaceholder: '请选择包装',
         searchField: 'packUnit',
@@ -1731,7 +1730,6 @@ export const UnplannedreceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSc
     },
     tableForm: {
       enterSearch:true,
-      disabled: true,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择包装',
       searchField: 'packUnit',
@@ -1760,14 +1758,6 @@ export const UnplannedreceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSc
     table: {
       width: 150
     },
-    form: {
-      componentProps: {
-        disabled: true,
-      }
-    },
-    tableForm: {
-      disabled: true,
-    }
   },
   {
     label: '标签生产线代码',

src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue

@@ -95,6 +95,7 @@ import * as LocationApi  from '@/api/wms/location'
 import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
 import * as ruleApi  from '@/api/wms/rule/index'
+import { formatTime } from '@/utils/index'
 const { loadStart, loadDone } = usePageLoading()
 // 库存转移申请
 // 只有库存转移申请在使用的
@@ -327,6 +328,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           newRow['uom'] = item['uom']
           newRow['qty'] = item['qty']
           newRow['toInventoryStatus'] = item['inventoryStatus']//库存移动申请
+          newRow['toBatch'] = formatTime(new Date(), 'yyyyMMdd')
           tableData.value.push(newRow)
         })
       }else if (formField == 'toLocationCode') {
@@ -347,7 +349,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         if (toManagementPrecision.value == 'BY_BATCH') {
           if(row['fromBatch']==''){
             row['fromBatchFormItemType'] = 'FormDate'
-            row['disabled_fromBatch'] = false
+            row['disabled_fromBatch'] = true
           }
          
         } else if (toManagementPrecision.value == 'BY_QUANTITY') {
@@ -726,9 +728,9 @@ const submitForm = async (formType, submitData) => {
     return
   }
   let batchList = tableData.value.filter(item=>item.fromBatchFormItemType&&item.fromBatchFormItemType == 'FormDate' && item.toManagementPrecision == 'BY_BATCH')
-  let noBatch = batchList.find(item => !item.fromBatch)
+  let noToBatch = batchList.find(item => !item.toBatch)
-  if(noBatch){
+  if(noToBatch){
-    message.warning(`${noBatch.itemCode}没有填写批次，请填写`)
+    message.warning(`${noToBatch.itemCode}没有填写到批次，请填写`)
     return
   }
   data.subList = tableData.value // 拼接子表数据参数

src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/inventorymoveRequestMain.data.ts

@@ -588,22 +588,27 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       }
     },
   },
-  // {
+  {
-  //   label: '到批次',
+    label: '到批次',
-  //   field: 'toBatch',
+    field: 'toBatch',
-  //   sort: 'custom',
+    sort: 'custom',
-  //   table: {
+    table: {
-  //     width: 150
+      width: 150
-  //   },
+    },
-  //   isTableForm: true,
+    tableForm: {
-  //   isForm: false,
+      disabled: false,
-  //   tableForm: {
+      type:'FormDate',
-  //     disabled: true,
+      placeholder: '请选择到批次',
-  //     placeholder: '请选择从批次',
+      valueFormat: 'YYYYMMDD',
-  //     valueFormat: 'YYYYMMDD',
+      format: 'YYYYMMDD',
-  //     format: 'YYYYMMDD',
+    },
-  //   },
+    form: {
-  // },
+      componentProps: {
+        disabled: false,
+        valueFormat: 'YYYYMMDD',
+      }
+    }
+  },
   {
     label: '从包装号',
     field: 'fromPackingNumber',

src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts

@@ -1790,74 +1790,93 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
       }
     }
   },
-  {
+   {
-    label: '包装规格',
+        label: '包装规格',
-    field: 'packUnit',
+        field: 'packUnit',
-    sort: 'custom',
+        sort: 'custom',
-    table: {
+        isSearch: false,
-      width: 150,
+        table: {
-      componentProps: {
+          width: 120
-        disabled: true,
-        isSearchList: true,
-        searchListPlaceholder: '请选择包装',
-        searchField: 'packUnit',
-        searchTitle: '物品包装信息',
-        searchAllSchemas: Itempackaging.allSchemas,
-        searchPage: ItemPackageApi.getItemPackagingPageByItemCode,
-        searchCondition: [
-          {
-            key: 'itemCode',
-            value: 'itemCode',
-            message: '请选择订单行',
-            isMainValue: true
-          },
-          {
-            key: 'available',
-            value: 'TRUE',
-            isMainValue: false
-          }
-        ]
-
-      }
-    },
-    tableForm: {
-      disabled: true,
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择包装',
-      searchField: 'packUnit',
-      searchTitle: '物品包装信息',
-      searchAllSchemas: Itempackaging.allSchemas,
-      searchPage: ItemPackageApi.getItemPackagingPageByItemCode,
-      searchCondition: [
-        {
-          key: 'itemCode',
-          value: 'itemCode',
-          message: '请选择订单行',
-          isMainValue: true
         },
-        {
+        isTable: false,
-          key: 'available',
+        isTableForm: true,
-          value: 'TRUE',
+        isForm: true,
-          isMainValue: false
+        tableForm: {
-        }]
+          enterSearch: true,
-    },
+          isInpuFocusShow: true,
-  },
+          isSearchList: true, // 开启查询弹窗
-  {
+          searchListPlaceholder: '请选择包装规格', // 输入框占位文本
-    label: '包装数量',
+          searchField: 'packUnit', // 查询弹窗赋值字段
-    field: 'packQty',
+          searchTitle: '物料包装信息', // 查询弹窗标题
-    sort: 'custom',
+          searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
-    table: {
+          searchPage: ItemPackageApi.getItempackagingPage, // 查询弹窗所需分页方法
-      width: 150
+          searchCondition: [
-    },
+            {
-    form: {
+              key: 'available',
-      componentProps: {
+              value: 'TRUE',
-        disabled: true
+              isMainValue: false
-      }
+            },
-    },
+            {
-    tableForm: {
+              key: 'itemCode',
-      disabled: true,
+              value: 'itemCode',
-    }
+              message: '请先选择物料代码！',
-  },
+              isMainValue: true
+            }
+          ],
+          verificationParams: [
+            {
+              key: 'packUnit',
+              action: '==',
+              value: '',
+              isMainValue: false,
+              isSearch: true,
+              isFormModel: true
+            }
+          ] // 失去焦点校验参数
+        },
+        form: {
+          // labelMessage: '信息提示说明！！！',
+          componentProps: {
+            isSearchList: true, // 开启查询弹窗
+            searchListPlaceholder: '请选择包装规格', // 输入框占位文本
+            searchField: 'packUnit', // 查询弹窗赋值字段
+            searchTitle: '物料包装信息', // 查询弹窗标题
+            searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
+            searchPage: ItemPackageApi.getItempackagingPage, // 查询弹窗所需分页方法
+            searchCondition: [
+              {
+                key: 'available',
+                value: 'TRUE',
+                isMainValue: false
+              },
+              {
+                key: 'itemCode',
+                value: 'itemCode',
+                message: '请先选择物料代码！', // 当前置条件为空时 弹出信息提示
+                isMainValue: true
+              }
+            ],
+            verificationParams: [
+              {
+                key: 'packUnit',
+                action: '==',
+                value: '',
+                isMainValue: false,
+                isSearch: true,
+                isFormModel: true
+              }
+            ] // 失去焦点校验参数
+          }
+        }
+      },
+      {
+        label: '包装数量',
+        field: 'packQty',
+        sort: 'custom',
+        table: {
+          width: 150
+        }
+      },
   {
     label: '标签生产线代码',
     field: 'productionLineCodePackage',
@@ -2159,5 +2178,11 @@ export const ProductreceiptRequestLabelRules = reactive({
   batch: [
     { required: true, message: '请选择批次', trigger: ['change','blur'] }
   ],
+  packUnit: [
+    { required: true, message: '请选择包装规格', trigger: ['change','blur'] }
+  ],
+  packQty: [
+    { required: true, message: '请输入包装数量', trigger: ['change','blur'] }
+  ],
 })
 

src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRequest/index.vue

@@ -253,16 +253,16 @@ const butttondata = (row,$index) => {
     return []
   }
     return [
-        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3']),hasPermi:'wms:purchase-barter-request-main:close'}), // 关闭
+        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','8']),hasPermi:'wms:purchase-barter-request-main:close'}), // 关闭
         defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:purchase-barter-request-main:reAdd'}), // 重新添加
         defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchase-barter-request-main:submit'}), // 提交审批
         defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchase-barter-request-main:refused'}), // 驳回
         defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchase-barter-request-main:agree'}), // 审批通过
-        defaultButtons.outBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:purchase-barter-request-main:out'}), // 出库
+        // defaultButtons.outBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:purchase-barter-request-main:out'}), // 出库
-        defaultButtons.inBtn({hide:isShowMainButton(row,['11']),hasPermi:'wms:purchase-barter-request-main:in'}), // 入库
+        // defaultButtons.inBtn({hide:isShowMainButton(row,['11']),hasPermi:'wms:purchase-barter-request-main:in'}), // 入库
-        defaultButtons.mainListSuspend1Btn({hide:isShowMainButton(row,['11']),hasPermi:'wms:purchase-barter-request-main:suspend'}), // 中止
+        // defaultButtons.mainListSuspend1Btn({hide:isShowMainButton(row,['11']),hasPermi:'wms:purchase-barter-request-main:suspend'}), // 中止
         defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchase-barter-request-main:delete'}), // 删除
-        defaultButtons.mainListDocumentPrintBtn({hide:isShowMainButton(row,['1','2','3','4','6','7','8','11'])})
+        defaultButtons.mainListDocumentPrintBtn({hide:isShowMainButton(row,['8'])})
     ]
 }
 

src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts

@@ -219,6 +219,16 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '背番',
+    field: 'backNumber',
+    sort: 'custom',
+    isSearch: true,
+hiddenSearchHigh:true,
+    table: {
+      width: 150
+    },
+  },
   {
     label: '版本号',
     field: 'version',
@@ -556,6 +566,15 @@ export const DemandforecastingMainPlan = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '背番',
+    field: 'backNumber',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 150
+    },
+  },
   {
     label: '计划日期',
     field: 'dueDate',

src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts

@@ -109,6 +109,16 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '背番',
+    field: 'backNumber',
+    sort: 'custom',
+    isSearch: true,
+hiddenSearchHigh:true,
+    table: {
+      width: 150
+    },
+  },
   {
     label: '版本号',
     field: 'version',

src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts

@@ -513,6 +513,7 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     isSearch:true,
+    hiddenSearchHigh:true,
     tableForm:{
       disabled:true,
     }

src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMainWms/purchaseMain.data.ts

@@ -508,7 +508,7 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '背番',
-    field: 'itemDesc1',
+    field: 'backNumber',
     sort: 'custom',
     table: {
       width: 150

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

@@ -232,6 +232,16 @@ const { loadStart, loadDone } = usePageLoading()
         setV['itemCode'] = val[0]['code']
         setV['poNumber'] = val[0]['number']
         setV['poLine'] = val[0]['lineNumber']
+        setV['receivedNumber'] = val[0]['receivedNumber']
+        console.log(PurchasePlanDetail.allSchemas.tableFormColumns);
+        
+        PurchasePlanDetail.allSchemas.tableFormColumns.forEach(item =>{
+        if(item.value == ''){
+          if(item.field == 'receivedNumber'){
+            item.tableForm.placeholder = ''
+          }
+        }
+      })
         
         if(formField == 'supplierCode'){
           setV['supplierCode'] = val[0]['code']

src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts

@@ -653,6 +653,18 @@ export const PurchasePlanDetail = useCrudSchemas(
     //     }
     //   }
     // },
+    {
+      label: '便次',
+      field: 'deliNo',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 3,
+      isTableForm: false,
+      isForm: false,
+      isTable: true,
+      isDetail:false
+    },
     {
       label: '订单行',
       field: 'poLine',
@@ -772,15 +784,21 @@ export const PurchasePlanDetail = useCrudSchemas(
       field: 'backNumber',
       sort: 'custom',
       isSearch: true,
+      hiddenSearchHigh:true,
       table: {
         width: 150
       },
-      sortSearchDefault: 5,
-      sortTableDefault: 18,
-      isTableForm: false,
-      isForm: false,
       isTable: true,
-      isDetail:false
+      sortSearchDefault: 10,
+      sortTableDefault: 19,
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      },
+      tableForm: {
+        disabled: true
+      }
     },
     {
       label: '物料状态',
@@ -843,8 +861,9 @@ export const PurchasePlanDetail = useCrudSchemas(
         }
       },
       tableForm: {
-        type: 'Select',
+        // type: 'Select',
-        disabled: true
+        disabled: true,
+        isPlaceholder:false
       }
     },
     {

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts

@@ -506,6 +506,7 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     field: 'backNumber',
     sort: 'custom',
     isSearch: true,
+    hiddenSearchHigh:true,
     table: {
       width: 150
     },

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

@@ -153,6 +153,7 @@
         </template>
       </el-table-column>
       <el-table-column label="物料代码" width="150" prop="itemCode" align="center" />
+      <el-table-column label="背番" width="150" prop="backNumber" align="center" />
       <el-table-column label="批次" width="150" prop="batch" align="center" />
       <el-table-column label="库存数量" width="150" prop="balanceQty" align="center" />
       <el-table-column label="库存计量单位" width="150" prop="uom" align="center">

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts

@@ -932,9 +932,18 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     field: 'backNumber',
     sort: 'custom',
     isSearch: true,
+    hiddenSearchHigh:true,
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
   },
   {
     label: '物料描述1',
@@ -1645,6 +1654,23 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
       disabled: true
     }
   },
+  {
+    label: '背番',
+    field: 'backNumber',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
   {
     label: '生产日期',
     field: 'produceDate',
@@ -1908,6 +1934,17 @@ export const SupplierdeliverRequestPackage = useCrudSchemas(reactive<CrudSchema[
       disabled: true
     }
   },
+  {
+    label: '背番',
+    field: 'backNumber',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
   {
     label: '包装号',
     field: 'number',

src/views/wms/supplierManage/purchaseClaim/purchaseClaimRecord/PurchaseClaimRecordMain.data.ts

@@ -307,6 +307,16 @@ export const PurchaseClaimRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
       type: 'Select'
     },
   },
+  {
+    label: '背番',
+    field: 'backNumber',
+    sort: 'custom',
+    isSearch: true,
+    hiddenSearchHigh:true,
+    table: {
+      width: 150
+    },
+  },
   {
     label: '计量单位',
     field: 'uom',

src/views/wms/supplierManage/purchaseClaim/purchaseClaimRequest/PurchaseClaimRequestMain.data.ts

@@ -293,6 +293,24 @@ export const PurchaseClaimRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       }
     }
   },
+  {
+    label: '背番',
+    field: 'backNumber',
+    sort: 'custom',
+    hiddenSearchHigh:true,
+    isSearch: true,
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled:true
+    },
+    form: {
+      componentProps: {
+        disabled: true,
+      }
+    }
+  },
   {
     label: '计量单位',
     field: 'uom',

src/views/wms/supplierManage/purchaseClaim/purchaseClaimRequest/index.vue

@@ -176,6 +176,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
           tfk['itemCode'] = item['itemCode']
           tfk['itemName'] = item['itemName']
           tfk['uom'] = item['supplierUom']
+          tfk['backNumber'] = item['backNumber']
           tableData.value.push(tfk)
         })
       }

src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/purchaseDiscreteOrderMain.data.ts

@@ -1532,6 +1532,17 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
   },
+  {
+    label: '背番',
+    field: 'backNumber',
+    sort: 'custom',
+    isSearch: false,
+    hiddenSearchHigh:true,
+    sortTableDefault:3,
+    table: {
+      width: 150
+    },
+  },
   {
     label: '物料描述',
     field: 'itemDesc',

src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts

@@ -1578,6 +1578,20 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
   },
+  {
+    label: '背番',
+    field: 'backNumber',
+    sort: 'custom',
+    isSearch: false,
+    hiddenSearchHigh:true,
+    table: {
+      width: 150
+    },
+    sortTableDefault:4,
+    isTableForm:false,
+    isDetail: false,
+    isTable: true,
+  },
   {
     label: '物料描述',
     field: 'itemDesc',

src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue

@@ -606,6 +606,7 @@ const searchTableSuccess = (formField, searchField, val, searchFormRef, type, ro
           newRow['deliveryDate'] = item['prhRcpDate']
           newRow['arrivalQty'] = item['prhRcvd']
           newRow['id'] = item['id']
+          newRow['backNumber'] = item['backNumber']
           newRow['currency'] = item['currency']
         }
         tableData.value.push(newRow)
@@ -1223,7 +1224,8 @@ const submitPurchasePass = async (id, submitData) => {
 const formFinanceRef = ref()
 const handleFinanceApp = async (row) => {
   row.postingDate = dayjs().valueOf()
-  row.voucherNumberRemark = '收到' + row.supplierName + '发票' + row.goldenTaxInvoiceNumber
+  //描述用供应商简称
+  row.voucherNumberRemark = '收到' + row.supplierShortName + '发票' + row.goldenTaxInvoiceNumber
   formFinanceRef.value.open('update', row, null, '财务通过', '财务通过')
 }
 

src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts

@@ -126,6 +126,10 @@ export const PurchaseReceiptOrReturnRecordDetail = useCrudSchemas(reactive<CrudS
     label: '物料代码',
     field: 'itemCode'
   },
+  {
+    label: '背番',
+    field: 'backNumber'
+  },
   {
     label: '创建时间',
     field: 'createTime',
@@ -1794,6 +1798,24 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       disabled: true
     }
   },
+  {
+    label: '背番',
+    field: 'backNumber',
+    sort: 'custom',
+    isSearch: true,
+    hiddenSearchHigh:true,
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
   {
     label: '物料描述',
     field: 'itemDesc',
@@ -2345,6 +2367,16 @@ export const ClaimDetails = useCrudSchemas(reactive<CrudSchema[]>([
       disabled: true
     }
   },
+  {
+    label: '背番',
+    field: 'backNumber',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
   {
     label: '索赔数量',
     field: 'claimQty',

src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts

@@ -1717,6 +1717,16 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       disabled: true
     }
   },
+  {
+    label: '背番',
+    field: 'backNumber',
+    sort: 'custom',
+    hiddenSearchHigh:true,
+    isSearch: false,
+    table: {
+      width: 150
+    },
+  },
   {
     label: '物料描述',
     field: 'itemDesc',

src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts

@@ -212,6 +212,16 @@ export const SupplierinvoiceInvoiced = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '背番',
+    field: 'backNumber',
+    sort: 'custom',
+    hiddenSearchHigh:true,
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
   // {
   //   label: '计量单位',
   //   field: 'uom',