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

src/components/Form/src/Form.vue

@@ -276,6 +276,7 @@ export default defineComponent({
                   if(event.keyCode === 13){
                     //回车
                     emit('onEnter',item.field,formModel.value[item.field],event)
+                    event.target.blur();//回车之后自动失去焦点
                   }
               }} 
               onBlur={(e) => { onBlur(item.field,formModel.value[item.field]) }}
@@ -409,6 +410,7 @@ export default defineComponent({
                           if(event.keyCode === 13){
                             //回车
                             emit('onEnter',item.field,formModel.value[item.field],event)
+                            event.target.blur();//回车之后自动失去焦点
                           }
                       }} 
                       {...(notRenderOptions.includes(item?.component as string) &&

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

@@ -220,6 +220,7 @@ const openForm = (type: string, row?: any) => {
 
 // form表单提交
 const formsSuccess = async (formType,data) => {
+  try{
       var isHave =Productionlineitem.allSchemas.formSchema.some(function (item) {
       return item.field === 'activeTime' || item.field === 'expireTime';
     });
@@ -246,6 +247,9 @@ const formsSuccess = async (formType,data) => {
     }else{
       buttonBaseClick('refresh',null)
     }
+  } catch {
+    basicFormRef.value.formLoading = false
+  }
 }
 
 // 查询页面返回

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

@@ -206,7 +206,8 @@ const openForm = (type: string, row?: any) => {
 }
 
 // form表单提交
-const formsSuccess = async (formType,data) => {
+const formsSuccess = async (formType, data) => {
+  try{
     var isHave =Stdcostprice.allSchemas.formSchema.some(function (item) {
       return item.field === 'activeTime' || item.field === 'expireTime';
     });
@@ -233,6 +234,10 @@ const formsSuccess = async (formType,data) => {
     }else{
       buttonBaseClick('refresh',null)
     }
+  } catch {
+    basicFormRef.value.formLoading = false
+    
+  }
 }
 
 // 查询页面返回

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

@@ -378,7 +378,8 @@ const searchFormClick = (searchData) => {
 /** 初始化 **/
 onMounted(async () => {
   tableObject.params = {
-    available: true
+    available: true,
+    type: 'MakeLabel'
   }
   getList()
 })

src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts

@@ -31,7 +31,7 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     label: '标签类型',
     field: 'type',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
     dictType: DICT_TYPE.LABEL_TYPE,
     dictClass: 'string'
   },
@@ -52,6 +52,7 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     label: '关联号',
     field: 'relateNumber',
     sort: 'custom',
+    isSearch:true
   },
   {
     label: '标签条码字符串',

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

@@ -401,7 +401,8 @@ const searchFormClick = (searchData) => {
 /** 初始化 **/
 onMounted(async () => {
   tableObject.params = {
-    available: true
+    available: true,
+    type: 'PurchaseLabel'
   }
   getList()
 })

src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts

@@ -43,7 +43,7 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     label: '标签类型',
     field: 'type',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
     dictType: DICT_TYPE.LABEL_TYPE,
     dictClass: 'string'
   },

src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/deliverRecordMain.data.ts

@@ -330,6 +330,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     hiddenInMain: true,
   },
   {
@@ -397,6 +398,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     hiddenInMain: true,
   },
   {

src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts

@@ -376,6 +376,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     hiddenInMain: true,
   },
   {

src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts

@@ -25,6 +25,7 @@ export const DeliverRecordMain = useCrudSchemas(
       table: {
         width: 180
       },
+      isTable: false,
       isSearch: false
     },
     {
@@ -33,7 +34,8 @@ export const DeliverRecordMain = useCrudSchemas(
       sort: 'custom',
       table: {
         width: 180
-      }
+      },
+      isTable: false,
     },
     {
       label: '发货记录单号',
@@ -54,7 +56,7 @@ export const DeliverRecordMain = useCrudSchemas(
       table: {
         width: 180
       },
-      isTable: true,
+      isTable: false,
       isDetail: true
     },
     {
@@ -332,7 +334,7 @@ export const DeliverRecordMain = useCrudSchemas(
       isTable: false
     },
     {
-      label: '业务类型',
+      label: '发货类型',
       field: 'businessType',
       sort: 'custom',
       table: {
@@ -590,6 +592,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '包装规格',
@@ -656,6 +659,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '从库位',
@@ -937,7 +941,7 @@ export const DeliverRecordImport = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '物料类型',
+    label: '类型',
     field: 'type',
     sort: 'custom',
     dictType: DICT_TYPE.LEADERSHIP_MATERIAL_TYPE,

src/views/wms/deliversettlementManage/ssSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts

@@ -352,6 +352,8 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
+    hiddenInMain: true,
   },
   {
     label: '包装规格',
@@ -418,6 +420,8 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
+    hiddenInMain: true,
   },
   {
     label: '从库位',

src/views/wms/deliversettlementManage/tjdtSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts

@@ -298,6 +298,8 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
+    hiddenInMain: true,
   },
   {
     label: '包装规格',
@@ -364,6 +366,8 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
+    hiddenInMain: true,
   },
   {
     label: '从库位',

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

@@ -1378,9 +1378,9 @@ export const ProductionreturnRequestDetailRules = reactive({
   qty:[
     { validator:validateQty, message: '数量必须大于0', trigger: 'change'}
   ],
-  // batch: [
+  batch: [
-  //   { required: true, message: '请输入批次', trigger: 'blur' }
+    { required: true, message: '请输入批次', trigger: 'blur' }
-  // ],
+  ],
   inventoryStatus: [
     { required: true, message: '请选择库存状态', trigger: 'change' }
   ],

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

@@ -1705,56 +1705,36 @@ export const BackflushDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
 
 
 /**
- * @returns {Array} 制品收货申请创建标签
+ * @returns {Array} 号口品收货申请创建标签
  */
 export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '生产线代码',
+    label: '物料代码',
-    field: 'productionLineCodePackage',
+    field: 'itemCode',
     sort: 'custom',
     table: {
       width: 150
     },
-    tableForm:{
+    tableForm: {
       disabled: true
-      // isInpuFocusShow: true,
+    },
-      // searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
+    form: {
-      // searchField: 'productionLineCode', // 查询弹窗赋值字段
+      componentProps: {
-      // searchTitle: '生产线物料关系信息', // 查询弹窗标题
+        disabled: true
-      // searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
+      }
-      // searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
-      // searchCondition:[{
-      //   key: 'itemCode',
-      //   value: 'itemCode',
-      //   isMainValue: true
-      // }]
     }
   },
   {
-    label: '供应商代码',
+    label: '批次',
-    field: 'supplierItemCode',
+    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: '物料代码',
+    label: '数量',
-    field: 'itemCode',
+    field: 'qty',
     sort: 'custom',
     table: {
       width: 150
@@ -1769,38 +1749,132 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
     }
   },
   {
-    label: '物料名称',
+    label: '计量单位',
-    field: 'itemName',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
-    isTableForm: false,
+    tableForm: {
-    isForm: false,
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
   },
   {
-    label: '物料描述1',
+    label: '包装规格',
-    field: 'itemDesc1',
+    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,
+    form: {
-    isForm: false,
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
-    label: '物料描述2',
+    label: '标签生产线代码',
-    field: 'itemDesc2',
+    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: '项目代码',
+    label: '物料名称',
-    field: 'projectCode',
+    field: 'itemName',
     sort: 'custom',
     table: {
       width: 150
@@ -1809,56 +1883,36 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
     isForm: false,
   },
   {
-    label: '批次',
+    label: '物料描述1',
-    field: 'batch',
+    field: 'itemDesc1',
     sort: 'custom',
     table: {
       width: 150
     },
-    tableForm: {
+    isTableForm: false,
-      disabled: true,
+    isForm: false,
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
   },
   {
-    label: '数量',
+    label: '物料描述2',
-    field: 'qty',
+    field: 'itemDesc2',
     sort: 'custom',
     table: {
       width: 150
     },
-    tableForm: {
+    isTableForm: false,
-      disabled: true
+    isForm: false,
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
   },
   {
-    label: '计量单位',
+    label: '项目代码',
-    field: 'uom',
+    field: 'projectCode',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
-    tableForm: {
+    isTableForm: false,
-      disabled: true
+    isForm: false,
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
   },
+
   {
     label: '库存状态',
     field: 'inventoryStatus',
@@ -1866,6 +1920,8 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
+    isTableForm: false,
+    isForm: false,
     table: {
       width: 150
     },
@@ -1883,22 +1939,8 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
     label: '来源生产线代码',
     field: 'productionLineCode',
     sort: 'custom',
-    table: {
+    isTableForm: false,
-      width: 150
+    isForm: false,
-    },
-    tableForm: {
-      disabled: true
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
-  {
-    label: '来源生产线代码',
-    field: 'productionLineCode',
-    sort: 'custom',
     table: {
       width: 150
     },
@@ -1915,6 +1957,8 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
     label: '来源工位代码',
     field: 'workStationCode',
     sort: 'custom',
+    isTableForm: false,
+    isForm: false,
     table: {
       width: 150
     },
@@ -1931,6 +1975,8 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
     label: '来源库位代码',
     field: 'fromLocationCode',
     sort: 'custom',
+    isTableForm: false,
+    isForm: false,
     table: {
       width: 150
     },
@@ -1957,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: {
@@ -2056,6 +2037,7 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
       }
     },
     tableForm: {
+      enterSearch: true,
       disabled: true,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择包装',
@@ -2081,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: {

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

@@ -108,9 +108,7 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '计划员',
     field: 'planerId',
     sort: 'custom',
-    table: {
+ 
-      width: 150
-    },
     isTable:false,
     isForm: false,
     isSearch:true,
@@ -182,9 +180,7 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '物料代码',
     field: 'itemCode',
     sort: 'custom',
-    table: {
+    
-      width: 150
-    },
     isSearch:true,
     isTable:true,
     isForm: false,
@@ -217,9 +213,7 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '版本号',
     field: 'version',
     sort: 'custom',
-    table: {
+   
-      width: 150
-    },
     isSearch:true,
     search: {
       // labelMessage: '信息提示说明！！！',

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

@@ -550,6 +550,21 @@ export const PurchasePlanMainRules = reactive({
  */
 export const PurchasePlanDetail = useCrudSchemas(
   reactive<CrudSchema[]>([
+    {
+      label: '要货计划单号',
+      field: 'number',
+      sort: 'custom',
+      isTableForm: false,
+      hiddenInMain: true,
+      table: {
+        width: 180
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      }
+    },
     {
       label: '采购订单号',
       field: 'poNumber',
@@ -861,21 +876,7 @@ export const PurchasePlanDetail = useCrudSchemas(
       }
     },
 
-    {
+    
-      label: '要货计划单号',
-      field: 'number',
-      sort: 'custom',
-      isTableForm: false,
-      hiddenInMain: true,
-      table: {
-        width: 180
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      }
-    },
     {
       label: '已收货数量',
       field: 'receivedQty',

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

@@ -88,6 +88,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       // labelMessage: '信息提示说明！！！',
       componentProps: {
         enterSearch: true,
+        isEnter:true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段