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

src/views/wms/issueManage/issue/issueRequestMain/index.vue

@@ -195,6 +195,7 @@ const getDefaultPackUnit = async (packUnitList)=>{
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
   nextTick(async() => {
+    debugger
     if (type == 'tableForm') {
       // 明细查询页赋值
       if (formField == 'itemCode') {
@@ -215,6 +216,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
             productionLineCode:formRef.formModel['productionLineCode'],//生产线代码
             workStationCode:formRef.formModel['workStationCode'],//工位代码
           })
+          newRow['itemDesc1'] = item['backNumber']//物料描述1赋值到背番
           tableData.value.push(newRow)
         })
         getDefaultPackUnit(packUnitList)

src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts

@@ -946,6 +946,25 @@ export const IssueRequestDetail = useCrudSchemas(
         }
       }
     },
+    {
+      label: '背番',
+      field: 'itemDesc1',
+      sort: 'custom',
+      isSearch: true,
+  isForm:false,
+  hiddenSearchHigh:true,
+      table: {
+        width: 150
+      },
+  form:{
+        componentProps:{
+          disabled: true,
+        }
+      },
+      tableForm: {
+        disabled: true
+      },
+    },
     {
       label: '包装规格',
       field: 'packUnit',

src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts

@@ -1020,7 +1020,6 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
     table: {
       width: 150
     },
-    isTableForm: false,
     isForm: false,
     // isSearch: true,
     tableForm: {
@@ -1721,6 +1720,15 @@ export const SupplierdeliverRequestPackage = useCrudSchemas(reactive<CrudSchema[
       width: 150,
     },
   },
+  {
+    label: '背番',
+    field: 'itemDesc1',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150,
+    },
+  },
 {
     label: '批次',
     field: 'batch',

src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts

@@ -789,8 +789,9 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '背番',
-    field: 'backNumber',
+    field: 'itemDesc1',
     sort: 'custom',
+    isSearch:true,
     table: {
       width: 150
     },

src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts

@@ -776,8 +776,9 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '背番',
-    field: 'backNumber',
+    field: 'itemDesc1',
     sort: 'custom',
+    isSearch:true,
     table: {
       width: 150
     },

src/views/wms/productionManage/productionplan/qadproductionplan/qadProductionPlanMain.data.ts

@@ -36,6 +36,22 @@ export const QadProductionPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150,
     }
   },
+  {
+    label: '背番',
+    field: 'itemDesc1',
+    sort: 'custom',
+    isSearch: true,
+isForm:false,
+hiddenSearchHigh:true,
+    table: {
+      width: 150
+    },
+form:{
+      componentProps:{
+        disabled: true,
+      }
+    }
+  },
   {
     label: '计划数量',
     field: 'planQty',

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

@@ -855,6 +855,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
+    isSearch:true,
     table: {
       width: 150
     },

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

@@ -514,6 +514,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    isSearch:true,
     isTableForm: false,
     isForm: false,
     tableForm: {

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

@@ -1037,7 +1037,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
-    isTableForm: false,
+    isSearch:true,
     isForm: false,
     sortTableDefault: 1003,
     sortSearchDefault: 5,
@@ -1739,6 +1739,22 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
       }
     }
   },
+  {
+    label: '背番',
+    field: 'backNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
   {
     label: '批次',
     field: 'batch',

src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts

@@ -856,6 +856,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
+    isSearch:true,
     table: {
       width: 150
     },

src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts

@@ -515,6 +515,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
+    isSearch:true,
     table: {
       width: 150
     },

src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts

@@ -1094,7 +1094,6 @@ export const ProductreceiptRequestDetail = useCrudSchemas(
       table: {
         width: 150
       },
-      isTableForm: false,
       isForm: false,
       isSearch: true,
       sortTableDefault: 1003,

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

@@ -2021,6 +2021,14 @@ export const SupplierdeliverRequestPackage2 = useCrudSchemas(reactive<CrudSchema
       disabled: true
     }
   },
+  {
+    label: '背番',
+    field: 'backNumber',
+    sort: 'custom',
+    tableForm: {
+      disabled: true
+    }
+  },
   {
     label: '包装号',
     field: 'number',