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

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

@@ -174,6 +174,10 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
+        }, {
+          key: 'type',
+          value: 'predict',//补给品类型
+          isMainValue: false
         }, {
           key: 'workshopCode',
           value: 'workshopCode',

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

@@ -182,6 +182,10 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
+        },{
+          key: 'type',
+          value: 'assemble',//号口品类型
+          isMainValue: false
         },{
           key: 'workshopCode',
           value: 'workshopCode',
@@ -1701,56 +1705,36 @@ export const BackflushDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
 
 
 /**
- * @returns {Array} 制品收货申请创建标签
+ * @returns {Array} 号口品收货申请创建标签
  */
 export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '生产线代码',
-    field: 'productionLineCodePackage',
+    label: '物料代码',
+    field: 'itemCode',
     sort: 'custom',
     table: {
       width: 150
     },
-    tableForm:{
+    tableForm: {
       disabled: true
-      // isInpuFocusShow: true,
-      // searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
-      // searchField: 'productionLineCode', // 查询弹窗赋值字段
-      // searchTitle: '生产线物料关系信息', // 查询弹窗标题
-      // searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
-      // searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
-      // searchCondition:[{
-      //   key: 'itemCode',
-      //   value: 'itemCode',
-      //   isMainValue: true
-      // }]
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
     }
   },
   {
-    label: '供应商代码',
-    field: 'supplierItemCode',
+    label: '批次',
+    field: 'batch',
     sort: 'custom',
     table: {
       width: 150
     },
-    tableForm:{
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
-      searchField: 'supplierCode', // 查询弹窗赋值字段
-      searchTitle: '供应商信息', // 查询弹窗标题
-      searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类
-      searchPage: SupplieritemApi.getSupplieritemPage, // 查询弹窗所需分页方法
-      searchCondition:[{
-        key: 'itemCode',
-        value: 'itemCode',
-        message: '请填写物料代码！',
-        isMainValue: true
-      }]
-    }
   },
   {
-    label: '物料代码',
-    field: 'itemCode',
+    label: '数量',
+    field: 'qty',
     sort: 'custom',
     table: {
       width: 150
@@ -1765,38 +1749,132 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
     }
   },
   {
-    label: '物料名称',
-    field: 'itemName',
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
-    isTableForm: false,
-    isForm: false,
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
   },
   {
-    label: '物料描述1',
-    field: 'itemDesc1',
+    label: '包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+    table: {
+      width: 150,
+      componentProps: {
+        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
+        },
+        {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+    },
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
     sort: 'custom',
     table: {
       width: 150
     },
-    isTableForm: false,
-    isForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
-    label: '物料描述2',
-    field: 'itemDesc2',
+    label: '标签生产线代码',
+    field: 'productionLineCodePackage',
     sort: 'custom',
     table: {
       width: 150
     },
+    isTable: false,
+    tableForm: {
+      disabled: true,
+    },
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierItemCode',
+    sort: 'custom',
     isTableForm: false,
     isForm: false,
+    table: {
+      width: 150
+    },
+    tableForm: {
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+      searchField: 'supplierCode', // 查询弹窗赋值字段
+      searchTitle: '供应商信息', // 查询弹窗标题
+      searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类
+      searchPage: SupplieritemApi.getSupplieritemPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key: 'itemCode',
+        value: 'itemCode',
+        message: '请填写物料代码！',
+        isMainValue: true
+      }]
+    }
   },
+
   {
-    label: '项目代码',
-    field: 'projectCode',
+    label: '物料名称',
+    field: 'itemName',
     sort: 'custom',
     table: {
       width: 150
@@ -1805,56 +1883,36 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
     isForm: false,
   },
   {
-    label: '批次',
-    field: 'batch',
+    label: '物料描述1',
+    field: 'itemDesc1',
     sort: 'custom',
     table: {
       width: 150
     },
-    tableForm: {
-      disabled: true,
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
+    isTableForm: false,
+    isForm: false,
   },
   {
-    label: '数量',
-    field: 'qty',
+    label: '物料描述2',
+    field: 'itemDesc2',
     sort: 'custom',
     table: {
       width: 150
     },
-    tableForm: {
-      disabled: true
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
+    isTableForm: false,
+    isForm: false,
   },
   {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
+    label: '项目代码',
+    field: 'projectCode',
     sort: 'custom',
     table: {
       width: 150
     },
-    tableForm: {
-      disabled: true
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
+    isTableForm: false,
+    isForm: false,
   },
+
   {
     label: '库存状态',
     field: 'inventoryStatus',
@@ -1862,6 +1920,8 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
+    isTableForm: false,
+    isForm: false,
     table: {
       width: 150
     },
@@ -1879,22 +1939,8 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
     label: '来源生产线代码',
     field: 'productionLineCode',
     sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      disabled: true
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
-  {
-    label: '来源生产线代码',
-    field: 'productionLineCode',
-    sort: 'custom',
+    isTableForm: false,
+    isForm: false,
     table: {
       width: 150
     },
@@ -1911,6 +1957,8 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
     label: '来源工位代码',
     field: 'workStationCode',
     sort: 'custom',
+    isTableForm: false,
+    isForm: false,
     table: {
       width: 150
     },
@@ -1927,6 +1975,8 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
     label: '来源库位代码',
     field: 'fromLocationCode',
     sort: 'custom',
+    isTableForm: false,
+    isForm: false,
     table: {
       width: 150
     },
@@ -1953,78 +2003,13 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
       }
     }
   },
-  {
-    label: '包装规格1',
-    field: 'packUnit',
-    sort: 'custom',
-    table: {
-      width: 150,
-      componentProps: {
-        disabled: true,
-        isSearchList: true,
-        searchListPlaceholder: '请选择包装',
-        searchField: 'packUnit',
-        searchTitle: '物品包装信息',
-        searchAllSchemas: Itempackaging.allSchemas,
-        searchPage: ItemPackageApi.getItempackagingPageByProductreceipt,
-        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.getItempackagingPageByProductreceipt,
-      searchCondition: [
-        {
-          key: 'itemCode',
-          value: 'itemCode',
-          message: '请选择订单行',
-          isMainValue: true
-        },
-        {
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
-    }
-  },
-  {
-    label: '包装数量1',
-    field: 'packQty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    },
-    tableForm: {
-      disabled: true,
-    }
-  },
   {
     label: '包装规格2',
     field: 'secondPackUnit',
     sort: 'custom',
+    isTableForm: false,
+    isForm: false,
     table: {
       width: 150,
       componentProps: {
@@ -2052,6 +2037,7 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
       }
     },
     tableForm: {
+      enterSearch: true,
       disabled: true,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择包装',
@@ -2077,12 +2063,14 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
     label: '包装数量2',
     field: 'secondPackQty',
     sort: 'custom',
+    isTableForm: false,
+    isForm: false,
     table: {
       width: 150
     },
     form: {
       componentProps: {
-        disabled:true
+        disabled: true
       }
     },
     tableForm: {