Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/WZC2

fe/PC/src/components/currenForm/index.vue

@@ -591,8 +591,16 @@ export default {
     // 数字类型input框onkeyup最大最小值处理
     typeNumberOnkeyup(item,value){
       if(value){
-        let _match = String(value).match(/\d+/)//正整数
-        this.searchData[item.prop] = _match?_match[0]:_match
+        // 添加pointNumberFixed 可以输入小数
+        if (item.pointNumberFixed) {
+          let _fixed = item.pointNumberFixed ? Number(item.pointNumberFixed) : 100
+          let reg = new RegExp(`\\d+\\.?\\d{0,${_fixed}}`);
+          let _match = String(value).match(reg)
+          this.searchData[item.prop] = _match ? _match[0] : _match
+        } else {
+          let _match = String(value).match(/\d+/)//正整数
+          this.searchData[item.prop] = _match?_match[0]:_match
+        }
       }
       if(this.searchData[item.prop] > item.max){
         this.searchData[item.prop] = item.max

fe/PC/src/views/basicData/BomManage/Bom.vue

@@ -115,7 +115,7 @@ export default {
       //新增
       CreateFormData: {
         remark: null,
-        componentQty: 0,
+        componentQty: 1,
         componentUom: null,
         beginTime: null,
         endTime: null,
@@ -134,7 +134,7 @@ export default {
       editFormData: {
         product:null,
         remark: null,
-        componentQty: 0,
+        componentQty: 1,
         componentUom: null,
         beginTime: null,
         endTime: null,
@@ -155,7 +155,7 @@ export default {
         { type: "filterSelect", label: "子物料号", prop: "component", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物料选择', this.CreateFormData) }, colSpan: 12 },
-        { type: "input", label: "子物料用量", prop: 'componentQty', colSpan: 12, validType:'pointNumber' },
+        { type: "inputNumber", label: "子物料用量", prop: 'componentQty', colSpan: 12, min:1, pointNumberFixed: 2  },
         { type: "input", label: "子物料用量单位", prop: 'componentUom', disabled:"true", colSpan: 12 },
         { type: "dateTime", label: "开始时间", prop: "beginTime", colSpan: 12 },
         { type: "dateTime", label: "结束时间", prop: "endTime", colSpan: 12 },
@@ -170,7 +170,7 @@ export default {
       editForm: [
         { type: "input", label: "父物料号", prop: "product",disabled:"true",  colSpan: 12 },
         { type: "input", label: "子物料号", prop: 'component', disabled:"true", colSpan: 12 },
-        { type: "input", label: "子物料用量", prop: 'componentQty', colSpan: 12, validType:'pointNumber' },
+        { type: "inputNumber", label: "子物料用量", prop: 'componentQty', colSpan: 12, min:1, pointNumberFixed: 2  },
         { type: "input", label: "子物料用量单位", prop: 'componentUom', colSpan: 12 },
         { type: "dateTime", label: "开始时间", prop: "beginTime", colSpan: 12 },
         { type: "dateTime", label: "结束时间", prop: "endTime", colSpan: 12 },

fe/PC/src/views/basicData/SupplierManage/SupplierItem.vue

@@ -161,7 +161,7 @@ export default {
         { type: "filterSelect", label: "物料代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) }, colSpan: 12 },
-        { type: "input", label: "供应商物料代码", prop: "supplierItemCode", colSpan: 12 },
+        { type: "input", label: "供应商物料代码", prop: "supplierItemCode", validType:'numberLetter', colSpan: 12 },
         { type: "input", label: "供应商物料名称", prop: "itemName", colSpan: 12 },
         { type: "input", label: "供应商简称", prop: "supplierSimpleName", colSpan: 12 },
         { type: "input", label: "版本", prop: "version", colSpan: 12 },
@@ -170,7 +170,7 @@ export default {
       editForm: [
         { type: "input", label: "供应商代码", prop: "supplierCode", disabled:"true", colSpan: 12 },
         { type: "input", label: "物料代码", prop: "itemCode", disabled:"true", colSpan: 12 },
-        { type: "input", label: "供应商物料代码", prop: "supplierItemCode", colSpan: 12 },
+        { type: "input", label: "供应商物料代码", prop: "supplierItemCode", validType:'numberLetter', colSpan: 12 },
         { type: "input", label: "供应商物料名称", prop: "itemName", colSpan: 12 },
         { type: "input", label: "供应商简称", prop: "supplierSimpleName", colSpan: 12 },
         { type: "input", label: "包装单位", prop: "supplierPackUom", colSpan: 12 },

fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseOrder-ms.vue

@@ -79,6 +79,7 @@ export default {
       URL: 'wms/store/purchase-order',
       //常用按钮数据
       currenButtonData: [
+        this.defaultImportBtn(),//导入
         this.defaultExportBtn(),//导出
         this.defaultFieldSettingBtn(),//字段设置
         this.defaultFreshBtn(),//刷新

fe/PC/src/views/rawMaterialManage/purchaseReceipt/SupplierAsn-msQuery.vue

@@ -25,6 +25,19 @@
       :httpOverallSearchData="httpOverallSearchData"
     >
     </tablePagination>
+    <!-- 新导入 disabledMethod 导入方式禁用 disabledIsAllowPartImport 是否局部导入禁用-->
+    <!-- methodValue 导入方式默认选项  是否局部导入 默认选项  -->
+    <!-- <importFile
+      :loading="Loading.importLoading"
+      :show="displayDialog.importDialog"
+      :URL="URL"
+      :disabledMethod = {method1:false,method2:false,method3:false}
+      :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false}
+      methodValue="0"
+      isAllowPartImportValue="1"
+      @importClick="postImportMergeClick(arguments)"
+      @postImportDown="importDown"
+    ></importFile> -->
     <!-- 表格导入 -->
     <upload-excel-component 
       :DrawerLoading="Loading.DrawerLoading"
@@ -87,6 +100,7 @@ export default {
   data () {
     return {
       URL: 'wms/store/supplier-asn',
+      // importUploadURL:"wms/store/supplier-asn/newImport",
       //常用按钮数据
       currenButtonData: [
         this.defaultImportBtn(),//导入