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

src/components/Form/src/Form.vue

@@ -55,7 +55,7 @@ export default defineComponent({
     vLoading: propTypes.bool.def(false),
     labelPosition: propTypes.string.def('left'),
   },
-  emits: ['register','opensearchTable','clearSearchInput', 'onChange', 'onBlur','onEnter','hiddenFilterButton','changeDialogWidth'],
+  emits: ['register','opensearchTable','clearSearchInput', 'onChange', 'onBlur','onEnter','hiddenFilterButton','changeDialogWidth','onInput'],
   setup(props, { slots, expose, emit }) {
     // element form 实例
     const elFormRef = ref<ComponentRef<typeof ElForm>>()
@@ -204,6 +204,9 @@ export default defineComponent({
     const onBlur = (field, e) => {
       emit('onBlur', field, e)
     }
+    const onInput = (field,value) => {
+      emit('onInput', field,value)
+    }
     // 渲染formItem
     const renderFormItem = (item: FormSchema) => {
       // 单独给只有options属性的组件做判断
@@ -382,6 +385,7 @@ export default defineComponent({
                       style={item.componentProps?.style}
                       onChange={(e)=>{onChange(item.field, e)}}
                       onBlur={(e)=>{onBlur(item.field, e)}}
+                      onInput={(value)=>{onInput(item.field,value)}}
                       {...(notRenderOptions.includes(item?.component as string) &&
                       item?.componentProps?.options
                         ? { options: item?.componentProps?.options || [] }

src/components/Search/src/Search.vue

@@ -43,7 +43,7 @@ const props = defineProps({
   }
 })
 
-const emit = defineEmits(['search', 'reset'])
+const emit = defineEmits(['search', 'reset','onInput'])
 
 const visible = ref(true)
 
@@ -88,6 +88,14 @@ const { register, elFormRef, methods } = useForm({
   model: props.model || {}
 })
 
+const onInput = (field,value) => {
+  emit('onInput', field,value)
+} 
+
+const formRef = ref()
+const setFormValues = (formData)=>{
+  formRef.value.setValues(formData)
+}
 const search = async () => {
   await unref(elFormRef)?.validate(async (isValid) => {
     if (isValid) {
@@ -118,12 +126,14 @@ const setVisible = () => {
 }
 const Search = ref()
 onMounted(() => {})
+defineExpose({setFormValues}) // 提供 open 方法，用于打开弹窗
+
 </script>
 
 <template>
   <!-- update by 芋艿：class="-mb-15px" 用于降低和 ContentWrap 组件的底部距离，避免空隙过大 -->
   <div ref="Search">
-    <Form
+    <Form ref="formRef"
       :inline="inline"
       :is-col="isCol"
       :is-custom="false"
@@ -132,6 +142,7 @@ onMounted(() => {})
       class="-mb-15px search"
       hide-required-asterisk
       @register="register"
+      @onInput="onInput"
     >
       <template #action>
         <div v-if="layout === 'inline'">

src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="SupplierUser.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search ref="seachRef" :schema="SupplierUser.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" @onInput="onInput"/>
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -89,6 +89,17 @@ const tableColumns = ref(SupplierUser.allSchemas.tableColumns)
 const updataTableColumns = (val) => {
   tableColumns.value = val
 }
+const seachRef = ref()
+const onInput = (field,value) => {
+  if('userId'==field){
+    value =  value.replace(/[^\d]/g,'')
+    seachRef.value.setFormValues({
+      userId:value
+    })
+  }
+
+}
+    
 
 // 查询列表页面参数设置
 const searchTableParams = ref([

src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts

@@ -489,7 +489,8 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     },
     tableForm: {
       type: 'InputNumber',
-      min: 1,
+      min: 0.000001,
+      default:1,
       precision: 6
     }
   },

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

@@ -731,6 +731,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     tableForm:{
+      disabled:true,
       type: 'Select'
     }
   },

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

@@ -732,6 +732,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     tableForm:{
+      disabled:true,
       type: 'Select'
     }
   },

src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts

@@ -2282,7 +2282,8 @@ export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSch
             key: 'itemCode',
             value: 'itemCode',
             message: '请选择订单行',
-            isMainValue: true
+            isTableRowValue: true, //查询当前searchTable表中行数据的值
+            isMainValue: false
           },
           {
             key: 'available',
@@ -2306,7 +2307,8 @@ export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSch
           key: 'itemCode',
           value: 'itemCode',
           message: '请选择订单行',
-          isMainValue: true
+          isTableRowValue: true, //查询当前searchTable表中行数据的值
+          isMainValue: false
         },
         {
           key: 'available',