22

schangxiang@126.com

2025-05-03 5334be033295f330b25dd4d77a39a1dbd82cf79c

22

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/web/src/components/BaseQueryDrawer/BaseQueryDrawer.tsx

@@ -26,7 +26,7 @@
    //   default: false,
    // },
  },
  emits: ['close', 'confirmQuery', 'update:modelValue', 'open', 'beforeClose'],
  emits: ['close', 'confirmQueryForBase', 'update:modelValue', 'open', 'beforeClose'],
  setup(props: any, { emit, slots, attrs }: any) {
    // const size = computed(() => {
    //   if (attrs.size.includes('px')) {
@@ -71,7 +71,7 @@
                      å…³é—­
                    </el-button>
                    <el-button
                      onClick={() => emit('confirmQuery')}
                      onClick={() => emit('confirmQueryForBase')}
                      type="primary"
                      class={{
                        [styles.csBaseBtn]: true,

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/web/src/widgets/HIAWms/Controllers/WmsMaterialQueryDrawer.tsx

@@ -205,8 +205,9 @@
   * ç¡®è®¤æŸ¥è¯¢
   */
  const onConfirmQuery = async () => {
    ElMessage.success('点击了查询按钮')
    await formRef.value?.validate()
    alert('你来吊我内部方法了啊');
   
    //await formRef.value?.validate()
    const data = {
      materialCode: formData.value.materialCode,
      materialName: formData.value.materialName,
@@ -232,6 +233,9 @@
    ElMessage.success('保存成功')
    //ctx.emit('confirmQuery')
    //增加传递参数 ã€Editby shaocx,2025-05-03】
    debugger
    console.log("新传递参数是:"+data);
    alert("新传递参数是:"+data);
    ctx.emit('confirmQuery',data)
  }


 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/web/src/widgets/HIAWms/Views/Pages/Dialog/WmsMaterialQueryDrawer/WmsMaterialQueryDrawer.tsx

@@ -29,7 +29,7 @@
      default: 0,
    },
  },
  emits: ['update:modelValue', 'close', 'submit', 'confirmquery'],
  emits: ['update:modelValue', 'close', 'submit', 'confirmquery1'],
  setup(props: Record<string, any>, ctx: SetupContext) {
    const {
      onClose,
@@ -47,7 +47,7 @@
        title={props.title || '高级查询'}
        v-model={visible.value}
        close-on-click-modal={true}
        confirmQuery={onConfirmQuery}
        onConfirmQueryForBase={onConfirmQuery}
        onOpen={onOpen}
        before-close={onClose}
        onClose={onClose}

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/web/src/widgets/HIAWms/Views/Pages/WmsMaterial/WmsMaterial.tsx

@@ -116,10 +116,24 @@
    })

    // æ–°å¢žçš„查询方法
    const handleQuery = async () => {
      console.log('查询条件:', queryParams.value)
      // tableRef.value.getTableList()
      tableRef.value.getList(queryParams.value)
    const handleQuery = async (extraParams = {}) => {
      //console.log('新的查询条件:', extraParams)
      //debugger
      alert('调用handleQuery方法');
      console.log('新的查询条件:', extraParams)
      // è¿‡æ»¤æŽ‰ undefined çš„值
const filteredData = Object.assign(
  {},
  ...Object.entries(extraParams).map(([key, value]) => (value !== undefined ? { [key]: value } : {}))
);

      tableRef.value.getList(filteredData)
      // debugger
      // console.log('新的查询条件:', extraParams)
      // tableRef.value.getList(extraParams)
      // console.log('查询条件:', queryParams.value)
      // // tableRef.value.getTableList()
      // tableRef.value.getList(queryParams.value)
    }

    // é‡ç½®æŸ¥è¯¢æ¡ä»¶
@@ -207,7 +221,7 @@
            title={dialogConfigForQuery.title}
            row={current.value}
            sort={sort.value}
            onConfirmQuery={onConfirmWmsMaterial}
            onConfirmQuery={handleQuery}
          />

          {/* æ–°å¢žçš„查询表单 */}
@@ -347,6 +361,9 @@
              onConfirm={onSearch}
              style={{ marginTop: '-1px' }}
            />
             <IconButton type="primary" icon="search" onClick={handleQuery}>
                æŸ¥è¯¢
              </IconButton>
              <IconButton
                style=""
                icon="refresh"