Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo

zs

2025-05-13 0cd95d98fdf7ed22d53398242feb2a3ca185cf09

Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo

 CommonDLL/CmsQueryExtensions.dll

Binary files differ

 CommonDLL/¹«¹²Ç°¶Ë×é¼þ/src/components/BaseQueryDrawer/BaseQueryDrawer.module.scss

 CommonDLL/¹«¹²Ç°¶Ë×é¼þ/src/components/BaseQueryDrawer/BaseQueryDrawer.tsx

 CommonDLL/¹«¹²Ç°¶Ë×é¼þ/src/components/DyFormForHighQuery/DyFormForHighQuery.d.ts

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,39 @@
import { VNode, Component, DefineComponent } from 'vue'

export interface OptionItemType {
  label?: string
  description?: string
  name?: string
  value: string | number
}

export interface FormItemPropType {
  prop?: string | Ref<string>
  highSelectProp?: string | Ref<string>
  label?: String | Ref<string>
  rules?: any[] | Ref<any[]>
  disabled?: boolean | Ref<boolean>
  isDateControl?: boolean | Ref<boolean>
  placeholder?: string | Ref<string>
  type?: string | Ref<string>
  width?: string | Ref<string>
  el?: string | Component | DefineComponent | Ref<string>
  options?: OptionItemType[] | any[] | Ref<any>
  highSelectAttrs?: object | Ref<object>
  isTitle?: boolean
  title?:string | Component
  [key: string]: any | Ref<string>
}

export interface FormPropsType {
  formData: { [key: string]: any }
  formItemProps: FormItemPropType[]
  [key: string]: any
}

export interface PropsType {
  formItemProps: FormItemPropType[]
  formData: { [key: string]: any }
  labelWidth: string
  [key: string]: any
}

 CommonDLL/¹«¹²Ç°¶Ë×é¼þ/src/components/DyFormForHighQuery/DyFormForHighQuery.module.scss

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,41 @@
.formStyle {
  .formItem {
    // ç§»é™¤å›ºå®šå®½åº¦é™åˆ¶
    width: auto !important;
    margin-right: 0 !important;
  }
  
  .formControl {
    flex: 1; // è®©æŽ§ä»¶å æ®å‰©ä½™ç©ºé—´
    min-width: 0; // å…è®¸æŽ§ä»¶æ”¶ç¼©
  }

  .formItemLabel {
    display: inline-flex;
    justify-content: flex-end;
    align-items: center;
    flex: 0 0 auto;
    font-size: var(--cs-form-label-font-size);
    color: var(--cs-text-color-regular);
    height: 32px;
    line-height: 32px;
    padding: 0 12px 0 0;
    box-sizing: border-box;
    > img {
      margin-left: 10px;
    }
  }
  
  :global(.cs-select) {
    width: 100%;
  }
  
  // ç§»é™¤å›ºå®šå®½åº¦è®¾ç½®
  :global(.cs-form--inline .cs-form-item) {
    width: auto !important;
  }
  
  :global(.cs-form--inline .cs-form-item:nth-last-of-type(2n)) {
    margin-right: 0 !important;
  }
}

 CommonDLL/¹«¹²Ç°¶Ë×é¼þ/src/components/DyFormForHighQuery/DyFormForHighQuery.tsx

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,245 @@
// import { ElInput } from "element-plus";
import {
  defineComponent,
  PropType,
  ref,
  Ref,
  SetupContext,
  computed,
  unref,
  markRaw,
  DefineComponent,
} from 'vue'
import styles from './DyFormForHighQuery.module.scss'
import ElInput from 'element-plus/es/components/input/index'
import Option from '@/components/Select/Option'
import Select from '@/components/Select/Select'
import SelectInput from '@/components/SelectInput/SelectInput'
import type { FormInstance } from 'element-plus'
import Icon from '../Icon/Icon'
import {
  FormPropsType,
  FormItemPropType,
  PropsType,
  OptionItemType,
} from './DyFormForHighQuery.d'
import Variable from '../Variable/Variable'
import Title from '../Title/Title'
import TextareaFlow from '../Flow/Flow'
import get from 'lodash/get'
import set from 'lodash/set'

const formItemElementMap = markRaw<Record<string, any>>({
  input: ElInput,
  select: Select,
  selectInput: SelectInput,
  variable: Variable,
  textareaFlow: TextareaFlow,
})

const Type: Record<string, any> = {
  select: 'select',
}
export default defineComponent<FormPropsType>({
  //@ts-ignore
  name: '动态表单',
  props: {
    labelWidth: {
      type: String,
      default: '100px',
    },
    labelPosition: {
      type: String,
      default: 'left',
    },
    formData: {
      type: Object as PropType<{ [key: string]: any }>,
      default: () => ({}),
    },
    formItemProps: {
      type: Array,
      default: () => [],
    },
    inLine: {
      type: Boolean,
      default: false,
    },
  },
  setup(props: PropsType, { attrs, emit, expose }: SetupContext) {
    const formRef = ref<FormInstance>()
    const form: any = computed({
      get() {
        return props.formData
      },
      set(v) {
        emit('update:formData', v)
      },
    })

    const currentWidgetModel = computed(() => {
      return (path: string) => {
        return get(form.value, path)
      }
    })

    const validate = () => {
      if (!formRef.value) return false
      return new Promise((resolve, reject) => {
        formRef.value?.validate((valid: boolean) => {
          if (valid) {
            resolve(true)
          } else {
            reject(false)
          }
        })
      })
    }

    const resetForm = () => {
      if (!formRef.value) return false
      formRef.value.resetFields()
    }

    const formItemProps = computed(() => {
      return props.formItemProps || []
    })

    expose({ validate, resetForm })

    const FormRender: any = ($props: any) => {
      const item: FormItemPropType = $props.item
      const options = $props.item.options || []
      if (item.el && Type[item.el as string]) {
        return options.map((el: OptionItemType) => (
          <Option
            label={el.label || el.description || el.name}
            value={el.value}
          ></Option>
        ))
      }
      return null
    }
    const FormRenderForHighSelectOptions: any = ($props: any) => {
      const item: FormItemPropType = $props.item
      const options = $props.item.highSelectAttrs?.options || []
      if (1===1) {
        return options.map((el: OptionItemType) => (
          <Option
            label={el.label || el.description || el.name}
            value={el.value}
          ></Option>
        ))
      }
      return null
    }

    const onUpdateModelValue = (v: string | number, prop: string) => {
      set(form.value, prop, v)
    }

    return () => {
      return (
        <div class={styles.formStyle}>
          <el-form
            labelPosition={props.labelPosition}
            labelWidth={props.labelWidth}
            model={form.value}
            ref={formRef}
            inline={props.inLine}
          >
            {formItemProps.value.map(
              (item: FormItemPropType, index: number) => {
                if (item.isTitle) {
                  if (typeof item.title === 'string') {
                    return (
                      <Title style="margin-bottom: 10px">{item.title}</Title>
                    )
                  }
                  return item.title
                }

                const itemProps: FormItemPropType = {}
                Object.entries(item).forEach(([key, value]) => {
                  itemProps[key] = unref(value)
                })

                const el =
                  typeof itemProps.el === 'string'
                    ? formItemElementMap[itemProps.el]
                    : itemProps.el || null
                const Component = el
                const el2 =
                   formItemElementMap['select'];
                const ComponentForHighSelect = el2
                return Component && !item.isHide ? (
                
                  <el-form-item
                    label={itemProps.label}
                    prop={itemProps.prop}
                    rules={itemProps.rules}
                    key={itemProps.prop}
                    vSlots={
                      itemProps.labelIcon
                        ? {
                            label: () => (
                              <label class={styles.formitemPropsLabel}>
                                {itemProps.label}
                                <Icon icon={itemProps.labelIcon} />
                              </label>
                            ),
                          }
                        : null
                    }
                  >
                   {/* æ·»åŠ çš„比较操作符选择器 */}
                   {/* ä½¿ç”¨flex布局让三个元素在同一行 */}
                   <div class="flex items-center w-full" style="width:100%">
                  {/* <el-select
                  size="small"
                  style="margin-right: 8px; min-width: 10px;"
                >
                  <el-option label="等于" value="2" />
                  <el-option label="不等于" value="8" />
                </el-select>  */}
                 {/* å½“组件类型不是日期控件时显示ComponentForHighSelect */}
                 {(!itemProps.isDateControl && (
  // ComponentForHighSelect çš„渲染代码
  <ComponentForHighSelect style="width:150px;"
                   {...itemProps.highSelectAttrs}
                     modelValue={currentWidgetModel.value(itemProps.highSelectAttrs?.prop || '')}
                     onUpdate:modelValue={(val: string | number) =>
                        onUpdateModelValue(val, itemProps.highSelectAttrs?.prop || '')
                      }>
                  <FormRenderForHighSelectOptions item={itemProps} />
                </ComponentForHighSelect>
))}
 {/* æ—¥æœŸæŽ§ä»¶æ—¶çš„占位元素 */}
{itemProps.isDateControl && <span style="width:150px;margin-right:8px;"></span>}
                
                      &nbsp; 
                    <Component
                      style={{
                        width: itemProps.width, // é»˜è®¤å æ»¡å‰©ä½™å®½åº¦
                        // width: itemProps.width , // é»˜è®¤å æ»¡å‰©ä½™å®½åº¦
                        height: itemProps.height,
                      }}
                      {...itemProps}
                      // v-model={form.value[itemProps.prop as keyof any]}
                      modelValue={currentWidgetModel.value(itemProps.prop)}
                      onUpdate:modelValue={(val: string | number) =>
                        onUpdateModelValue(val, itemProps.prop)
                      }
                    >
                      <FormRender item={itemProps} />
                    </Component>
                    </div>
                  </el-form-item>
                ) : null
              }
            )}
          </el-form>
        </div>
      )
    }
  },
})

 CommonDLL/¹«¹²Ç°¶Ë×é¼þ/src/components/DyFormForHighQuery/DyFormForHighQueryOptions.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
// å­—符串类查询
export const FILTER_MODE_OPTIONS_STRING = [
    { label: '模糊查询', value: 1 },
    { label: '精准查询', value: 2 },
  ];
  // æ•°å­—类查询
export const FILTER_MODE_OPTIONS_NUM = [
    { label: '精准查询', value: 2 },
    { label: '大于等于', value: 3 },
    { label: '小于等于', value: 4 },
    { label: '大于', value: 5 },
    { label: '小于', value: 6 },
    { label: '不等于', value: 7 },
  ];
    // bool查询
export const FILTER_MODE_OPTIONS_BOOL = [
    { label: '精准查询', value: 2 },
    { label: '不等于', value: 7 },
  ];

 CommonDLL/¹«¹²Ç°¶Ë×é¼þ/src/utils/commonOptionConstants.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,11 @@
// æ˜¯ å¦(高级查询用)
  export const BOOLEAN_OPTIONS = [
    { label: '是', value: 'true'},
    { label: '否', value: 'false' },
  ];

  // æ˜¯ å¦(新增、修改界面专用)
  export const BOOLEAN_OPTIONS_AddEdit = [
    { label: '是', value: true},
    { label: '否', value: false },
  ];

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/App.config

@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
  <connectionStrings>
    <add name="Shao_本地WmsMysql" connectionString="Server=localhost;Database=cms.plugin.pipelinelems;Uid=root;Pwd=123abc.com;" />
    
    <add name="本地_MySql_CMS" connectionString="Server=localhost;Database=07a6b2f4bbb04e8bb23a9f17a4a769c2_project;Uid=root;Pwd=123abc.com;" />
      <add name="ZS_本地WmsMysql" connectionString="Server=localhost;Database=cms.plugin.hiawms;Uid=root;Pwd=123abc.com;" />
    <add name="Shao_本地WmsMysql" connectionString="Server=localhost;Database=cms.plugin.pipelinelems;Uid=root;Pwd=123abc.com;" />
   
    <!--  <add name="LA22012_武汉牧野_生产库_伟本环境" connectionString="Data Source=10.10.40.166;Initial Catalog=WHMY_Prod_Test;Persist Security Info=True;User ID=sa;Password=123abc.com" /> 
    <add name="LA22012_武汉牧野_生产库_26测试环境" connectionString="Data Source=172.27.96.26;Initial Catalog=WHMY_Prod_Test;Persist Security Info=True;User ID=sa;Password=MJC!2022@wms" />

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/Generate/VUE/VUE_Generate.cs

@@ -1,58 +1,58 @@


using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
//using System;
//using System.Collections.Generic;
//using System.Linq;
//using System.Text;

namespace GenerateCode_GEBrilliantFactory
{
    /// <summary>
    /// VUE文件
    /// </summary>
    public class VUE_Generate : BaseGenerate
    {
        public static string CreateText(string TableAlias, string modulelogo, string primaryKey,
            List<ColumnModel> columnNameList, string ChinaComment
            , string emport_templeteFileDownName, string emport_excelCategroy)
        {
            var str = TextHelper.ReadText(@"Templete\VUE\VUE文件模板.txt");
//namespace GenerateCode_GEBrilliantFactory
//{
//    /// <summary>
//    /// VUE文件
//    /// </summary>
//    public class VUE_Generate : BaseGenerate
//    {
//        public static string CreateText(string TableAlias, string modulelogo, string primaryKey,
//            List<ColumnModel> columnNameList, string ChinaComment
//            , string emport_templeteFileDownName, string emport_excelCategroy)
//        {
//            var str = TextHelper.ReadText(@"Templete\VUE\VUE文件模板.txt");

            CommonReplace(ref str);
            str = str.Replace("$el-table-column$", StructStrHelper.GetElTableColumnStr(columnNameList));//列表项
//            CommonReplace(ref str);
//            str = str.Replace("$el-table-column$", StructStrHelper.GetElTableColumnStr(columnNameList));//列表项

            //新增/编辑界面
            str = str.Replace("$el-item$", StructStrHelper.GetElFormItemStrForAddEditForm(columnNameList));
//            //新增/编辑界面
//            str = str.Replace("$el-item$", StructStrHelper.GetElFormItemStrForAddEditForm(columnNameList));

            //查看界面
            str = str.Replace("$el-item-view$", StructStrHelper.GetElFormItemStrForViewForm(columnNameList));
//            //查看界面
//            str = str.Replace("$el-item-view$", StructStrHelper.GetElFormItemStrForViewForm(columnNameList));

            str = str.Replace("$el-form-itemForSearch$", StructStrHelper.GetElFormItemForSearchStr(columnNameList));
//            str = str.Replace("$el-form-itemForSearch$", StructStrHelper.GetElFormItemForSearchStr(columnNameList));

            //导出字符串
            str = str.Replace("$VueExportColumnHeaderStr$", StructStrHelper.GetVueExportTHeaderArrayStr(columnNameList));
//            //导出字符串
//            str = str.Replace("$VueExportColumnHeaderStr$", StructStrHelper.GetVueExportTHeaderArrayStr(columnNameList));


            //公共查询的列
            var SearchFormInputPlaceholderNameStr = "";
            str = str.Replace("$SearchFormInputPlaceholderStr$", StructStrHelper.GetVueSearchFormInputPlaceholderStr(columnNameList, ref SearchFormInputPlaceholderNameStr));
            str = str.Replace("$SearchFormInputPlaceholderNameStr$", SearchFormInputPlaceholderNameStr);
//            //公共查询的列
//            var SearchFormInputPlaceholderNameStr = "";
//            str = str.Replace("$SearchFormInputPlaceholderStr$", StructStrHelper.GetVueSearchFormInputPlaceholderStr(columnNameList, ref SearchFormInputPlaceholderNameStr));
//            str = str.Replace("$SearchFormInputPlaceholderNameStr$", SearchFormInputPlaceholderNameStr);

            //高级查询
            str = str.Replace("$FormOptionsStr$", StructStrHelper.GetVueFormOptionsStr(columnNameList));
//            //高级查询
//            str = str.Replace("$FormOptionsStr$", StructStrHelper.GetVueFormOptionsStr(columnNameList));

            str = str.Replace("$ChinaComment$", ChinaComment);//中文注释
//            str = str.Replace("$ChinaComment$", ChinaComment);//中文注释


            str = str.Replace("$Modulelogo$", modulelogo);//表别名(他一定要在最后替换)
            str = str.Replace("$TableAlias$", TableAlias);//表别名(他一定要在最后替换)
            str = str.Replace("$PrimaryKey$", primaryKey);//主键
//            str = str.Replace("$Modulelogo$", modulelogo);//表别名(他一定要在最后替换)
//            str = str.Replace("$TableAlias$", TableAlias);//表别名(他一定要在最后替换)
//            str = str.Replace("$PrimaryKey$", primaryKey);//主键

            //替换导入功能
            str = str.Replace("$emport_templeteFileDownName$", emport_templeteFileDownName);
            str = str.Replace("$emport_excelCategroy$", emport_excelCategroy);
//            //替换导入功能
//            str = str.Replace("$emport_templeteFileDownName$", emport_templeteFileDownName);
//            str = str.Replace("$emport_excelCategroy$", emport_excelCategroy);

            return str;
        }
    }
}
//            return str;
//        }
//    }
//}

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/Generate/Web/Controllers/EntityModeQueryDrawer_Generate.cs

@@ -27,18 +27,21 @@
            str = str.Replace("$PageAddFormAttributes_Query$", attrString);

            attrString = "";
            attrString += StructStrHelper.GetVueFormOptionsStrForSave_PageAddFormAttributes_Query(param.ColumnNameList,param);
            attrString += StructStrHelper.GetVueFormOptionsStrForSave_PageAddFormAttributes_Query(newColumnNameList, param);
            str = str.Replace("$Save_PageAddFormAttributes_Query$", attrString);


            attrString = "";
            attrString += StructStrHelper.GetVueFormOptionsStrForPageAddFormAttributes_Query_Clear(newColumnNameList, param);
            str = str.Replace("$Save_PageAddFormAttributes_Query_Clear$", attrString);

            attrString = "";
            attrString += StructStrHelper.GetVueFormOptionsStrForPageAddFormAttributes_Query_Clear_HighSelect(newColumnNameList, param);
            str = str.Replace("$Save_PageAddFormAttributes_Query_Clear_HighSelect$", attrString);

            attrString = "";
            attrString += StructStrHelper.GetVueFormOptionsStrForCommonQueryEnumForFrom(param.ColumnNameList, param);
            str = str.Replace("$CommonQueryEnumForFrom$", attrString);

            attrString = "";
            attrString += StructStrHelper.GetVueFormOptionsStrForPageAddFormAttributes_Query_Clear(param.ColumnNameList, param);
            str = str.Replace("$Save_PageAddFormAttributes_Query_Clear$", attrString);



            return str;
        }

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/GenerateCode_WeiBen_CMS.csproj

@@ -249,6 +249,7 @@
    <Compile Include="Generate\Web\Views\Pages\EntityNameClass\EntityNameClass_Config_Generate.cs" />
    <Compile Include="Generate\Web\Views\Pages\EntityNameClass\EntityNameClass_Generate.cs" />
    <Compile Include="Generate\Web\Views\Pages\EntityNameClass\EntityNameClass_module_Generate.cs" />
    <Compile Include="Model\Enum\MyDataTypeCategorizeEnum.cs" />
    <Compile Include="Model\GenerateCodeConfigParam.cs" />
    <Compile Include="Model\GenerateCodeParam.cs" />
    <Compile Include="Model\Enum\DataBaseEnum.cs" />

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/Model/Enum/MyDataTypeCategorizeEnum.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;

namespace GenerateCode_GEBrilliantFactory
{
    /// <summary>
    /// æˆ‘的数据类型分类枚举
    /// </summary>
    public enum MyDataTypeCategorizeEnum
    {
        å¸ƒå°”ç±» = 0,
        æ•°å­—ç±» = 1,
        æ—¥æœŸç±» = 2,
        å­—符串类 = 3,
        
    }
}

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/Templete/Web/Controllers/EntityModeDrawerÄ£°å.txt

@@ -14,6 +14,10 @@
import isEqual from 'lodash/isEqual'
import { ConfirmBox } from '@/components/ConfirmBox/ConfirmBox'
import { cloneDeep } from 'lodash'
// å¼•å…¥å…¬å…±é€‰é¡¹é…ç½® 
import {  
  BOOLEAN_OPTIONS_AddEdit 
} from '@/utils/commonOptionConstants'; 

export const use$EntityName$Drawer = (props: any, ctx?: any) => {
  const $PageMenuInstanceName$Drawer = injectModel<$EntityName$Drawer>('$PageMenuInstanceName$Drawer')

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/Templete/Web/Controllers/EntityModeQueryDrawerÄ£°å.txt

@@ -14,6 +14,15 @@
import isEqual from 'lodash/isEqual'
import { ConfirmBox } from '@/components/ConfirmBox/ConfirmBox'
import { cloneDeep } from 'lodash'
// å¼•å…¥å…¬å…±é€‰é¡¹é…ç½®
import { 
  FILTER_MODE_OPTIONS_STRING, 
  FILTER_MODE_OPTIONS_NUM,
  FILTER_MODE_OPTIONS_BOOL
} from '@/components/DyFormForHighQuery/DyFormForHighQueryOptions';
import { 
  BOOLEAN_OPTIONS
} from '@/utils/commonOptionConstants';

export const use$EntityName$QueryDrawer = (props: any, ctx?: any) => {
  const $PageMenuInstanceName$Drawer = injectModel<$EntityName$Drawer>('$EntityName$Drawer')
@@ -110,11 +119,18 @@
    const data =commonGetFormData();
    ctx.emit('confirmQuery', data)
  }
  /** 
   * é‡ç½®å…¬å…±select查询 
   */ 
  const onResetForHighSelect = async () => { 
    $Save_PageAddFormAttributes_Query_Clear_HighSelect$
  } 
  /**
   * é‡ç½®æŸ¥è¯¢
   */
  const onReset = async () => {
    formData.value = {}
    onResetForHighSelect();//重置公共select查询 
    $Save_PageAddFormAttributes_Query_Clear$
    //向父组件发送自定义事件
    ctx.emit('restQuery');
@@ -143,6 +159,7 @@
    $CommonQueryEnumForFrom$
  }
  commonQueryEnumForFrom()
  onResetForHighSelect();//重置公共select查询 
  /**
   * å¼¹çª—打开获取详情
   */

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/Templete/Web/Views/Pages/Dialog/EntityNameClassQueryDrawer/EntityNameClassQueryDrawerÄ£°å.txt

@@ -5,7 +5,7 @@
import BaseQueryDrawer from '@/components/BaseQueryDrawer/BaseQueryDrawer'
import styles from './$EntityName$QueryDrawer.module.scss'
import { use$EntityName$QueryDrawer } from '../../../../Controllers/$EntityName$QueryDrawer.tsx'
import DyForm from '@/components/DyForm/DyForm'
import DyFormForHighQuery from '@/components/DyFormForHighQuery/DyFormForHighQuery' 

// @ts-ignore
export default defineComponent<{
@@ -59,12 +59,12 @@
        before-close={onClose}
        onClose={onClose}
      >
        <DyForm
        <DyFormForHighQuery
          ref={formRef}
          formData={formData.value}
          labelWidth="106px"
          formItemProps={formItems}
        ></DyForm>
        ></DyFormForHighQuery>
      </BaseQueryDrawer>
    )
  },

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/Templete/Web/Views/Pages/EntityNameClass/EntityNameClassÄ£°å.txt

@@ -23,6 +23,10 @@
  ElFormItem,
} from 'element-plus'
import { injectModel } from '@/libs/Provider/Provider'
// å¼•å…¥å…¬å…±é€‰é¡¹é…ç½® 
import {  
  FILTER_MODE_OPTIONS_STRING
} from '@/components/DyFormForHighQuery/DyFormForHighQueryOptions'; 

interface RenderTableType {
  url?: string
@@ -68,7 +72,8 @@
    // æ–°å¢žçš„查询条件
    const queryForm = ref({
      searchVal: '',
      str_searchFormInputAttrs:[]
      str_searchFormInputAttrs:[],
      searchVal_FilterMode:''
    })
    //定义整体模糊查询的列数组(注意：必须大小写跟后端的实体类属性名一致，否则会导致匹配不对的问题)
    const _searchFormInputAttrs = ref([
@@ -91,16 +96,20 @@
      }
    }

    // ç»„件挂载时获取枚举数据
    onMounted(() => {
      fetchEnumData()
    })
    // å®šä¹‰å“åº”式查询数据 
    const _curHighQueryData = ref({ searchVal: '',str_searchFormInputAttrs:[],searchVal_FilterMode:'' });  
    // ç»„件挂载时获取枚举数据 
    onMounted(() => { 
      fetchEnumData() 
      queryForm.value.searchVal_FilterMode = FILTER_MODE_OPTIONS_STRING[0]?.value || ''; 
      _curHighQueryData.value.searchVal_FilterMode = queryForm.value.searchVal_FilterMode;  
      _curHighQueryData.value.str_searchFormInputAttrs = _searchFormInputAttrs.value; 
    }) 

    // å®šä¹‰å“åº”式查询数据
    const _curHighQueryData = ref({ searchVal: '',str_searchFormInputAttrs:[] });
    // æ–°ç‰ˆçš„查询方法（主页面中的按钮【查询】）
    const handleQueryForMain = async () => {
      _curHighQueryData.value.searchVal = queryForm.value.searchVal;
      _curHighQueryData.value.searchVal_FilterMode = queryForm.value.searchVal_FilterMode; 
      _curHighQueryData.value.str_searchFormInputAttrs = _searchFormInputAttrs.value;
      tableRef.value.getList(_curHighQueryData.value)
    }
@@ -113,6 +122,7 @@
    // æ–°ç‰ˆçš„查询重置
    const resetQuery = () => {
      queryForm.value.searchVal = ''
      queryForm.value.searchVal_FilterMode = FILTER_MODE_OPTIONS_STRING[0]?.value || '';
      queryForm.value.str_searchFormInputAttrs=_searchFormInputAttrs.value;
    }
     //新版的导出方法
@@ -130,6 +140,7 @@
    const commonSaveCurHighQueryData=(filteredData={})=>{
      _curHighQueryData.value = { ..._curHighQueryData.value, ...filteredData };
      _curHighQueryData.value.searchVal = queryForm.value.searchVal
      _curHighQueryData.value.searchVal_FilterMode = queryForm.value.searchVal_FilterMode 
      _curHighQueryData.value.str_searchFormInputAttrs =_searchFormInputAttrs.value;
    }
     //获取高级查询弹出框的查询值
@@ -143,6 +154,7 @@
      )
      //组合模糊查询
      filteredData.searchVal = queryForm.value.searchVal
      filteredData.searchVal_FilterMode = queryForm.value.searchVal_FilterMode 
      filteredData.str_searchFormInputAttrs =_searchFormInputAttrs.value;
      return filteredData;
    }
@@ -279,6 +291,21 @@
                />
                </el-tooltip>
              </ElFormItem>
              <ElFormItem label="" style="width:100px;"> 
                   <ElSelect
                                v-model={queryForm.value.searchVal_FilterMode}
                                placeholder="请选择"
                                class={styles.formItem}
                              >
                                {FILTER_MODE_OPTIONS_STRING.map((option) => (
                                  <ElOption
                                    key={option.value}
                                    label={option.label}
                                    value={option.value}
                                  />
                                ))}
                              </ElSelect>
              </ElFormItem> 
              <IconButton type="primary" icon="search" onClick={handleQueryForMain}>
                æŸ¥è¯¢
              </IconButton>

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/Utility/CommonHelper.cs

@@ -15,6 +15,32 @@
    /// </summary>
    public class CommonHelper
    {
        /// <summary>
        /// èŽ·å– æˆ‘的数据类型分类枚举
        /// </summary>
        /// <param name="enumDT"></param>
        /// <returns></returns>
        public static MyDataTypeCategorizeEnum GetMyDataTypeCategorizeEnum(DataTypeEnum enumDT)
        {
            //处理高级select查询 
            switch (enumDT)
            {
                case DataTypeEnum.dt_bit:
                case DataTypeEnum.dt_tinyint:
                    return MyDataTypeCategorizeEnum.布尔类;
                case DataTypeEnum.dt_int:
                case DataTypeEnum.dt_bigint:
                case DataTypeEnum.dt_decimal:
                case DataTypeEnum.dt_float:
                    return MyDataTypeCategorizeEnum.数字类;
                case DataTypeEnum.dt_datetime:
                case DataTypeEnum.dt_datetime2:
                case DataTypeEnum.dt_datetimeoffset:
                    return MyDataTypeCategorizeEnum.日期类;
                default://剩余的一律认为是 å­—符串  
                    return MyDataTypeCategorizeEnum.字符串类;
            }
        }

        /// <summary>
        /// æ˜¯å¦å¿½ç•¥è¯¥åˆ—

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/Utility/StructStrHelper.cs

@@ -681,7 +681,7 @@
                    case DataTypeEnum.dt_datetimeoffset:
                        attrStr += "        //表示是 é«˜çº§æŸ¥è¯¢èŒƒå›´æŸ¥è¯¢ç‰¹æ€§\n";
                        attrStr += "        [HighSearchRangeAttribute]\n";
                        attrStr += "        public List<string>" + emptyStr + attr + " { get; set; }\n";
                        attrStr += "        public string" + emptyStr + attr + " { get; set; }\n";
                        attrStr += "\n";//最后是加一个空格
                        break;
                    case DataTypeEnum.dt_bigint:
@@ -1842,7 +1842,8 @@
                    {
                        case DataTypeEnum.dt_bit:
                        case DataTypeEnum.dt_tinyint:
                            sb.Append("                 options: [{label: '是',value: true}, {label: '否',value: false}] \n");
                            //sb.Append("                 options: [{label: '是',value: true}, {label: '否',value: false}] \n");
                            sb.Append("                 options: BOOLEAN_OPTIONS_AddEdit \n");
                            break;
                        default:
                            break;
@@ -1862,7 +1863,7 @@


        /// <summary>
        /// èŽ·å–VUE formOptions字符串(高级查询中的)
        /// èŽ·å–VUE formOptions字符串(添加、修改弹出页面的)
        /// </summary>
        /// <param name="columnModelList"></param>
        /// <returns></returns>
@@ -2009,12 +2010,14 @@
                                }
                                else
                                {
                                    sb.Append("                 options: [{label: '是',value: true}, {label: '否',value: false}] \n");
                                    //sb.Append("                 options: [{label: '是',value: true}, {label: '否',value: false}] \n");
                                    sb.Append("                 options: BOOLEAN_OPTIONS_AddEdit \n");
                                }
                            }
                            else
                            {
                                sb.Append("                 options: [{label: '是',value: true}, {label: '否',value: false}] \n");
                                //sb.Append("                 options: [{label: '是',value: true}, {label: '否',value: false}] \n");
                                sb.Append("                 options: BOOLEAN_OPTIONS_AddEdit \n");
                            }
                            break;
                        default:
@@ -2034,7 +2037,7 @@
        }

        /// <summary>
        /// èŽ·å–VUE formOptions字符串(高级查询中的)
        /// æž„建 é«˜çº§æŸ¥è¯¢ä¸­çš„form字段 
        /// </summary>
        /// <param name="columnModelList"></param>
        /// <returns></returns>
@@ -2050,6 +2053,12 @@
      el: 'input',
      disabled: disabled,
      placeholder: '请输入物料编码',
                 highSelectAttrs:{
                     prop: 'materialCode_FilterMode',
                     el: 'select', 
                     placeholder: '请选择', 
                     options:FILTER_MODE_OPTIONS_STRING,
                   }
    },
                 */
                //List<ColumnModel> newList = ListHelper.RemoveForPageAddFormAttributes(columnModelList);
@@ -2176,18 +2185,82 @@
                                }
                                else
                                {
                                    sb.Append("                 options: [{label: '是',value: true}, {label: '否',value: false}] \n");
                                    sb.Append("                   clearable:true, \n");
                                    sb.Append("                 options: BOOLEAN_OPTIONS, \n");
                                }
                            }
                            else
                            {
                                sb.Append("                 options: [{label: '是',value: true}, {label: '否',value: false}] \n");
                                sb.Append("                   clearable:true, \n");
                                sb.Append("                 options: BOOLEAN_OPTIONS, \n");
                            }
                            

                            break;
                        default:
                            break;
                    }

                    //处理高级select查询 
                    MyDataTypeCategorizeEnum myDataTypeCategorizeEnum = CommonHelper.GetMyDataTypeCategorizeEnum(enumDT);
                    switch (myDataTypeCategorizeEnum)
                    {
                        case MyDataTypeCategorizeEnum.布尔类:
                            sb.Append("                   highSelectAttrs:{ \n");
                            sb.Append($"                     prop: '{low_prop_ColumnName}_FilterMode', \n");
                            sb.Append("                     el: 'select',  \n");
                            sb.Append("                     placeholder: '请选择',  \n");
                            sb.Append("                     options:FILTER_MODE_OPTIONS_BOOL \n");//bool查询
                            sb.Append("                   } \n");

                            break;
                        case MyDataTypeCategorizeEnum.数字类:
                            if (param.EnumList?.Count > 0)
                            {
                                var findEnumObj = param.EnumList.Where(x => x.EnumAttrName == columnModel.ColumnName).FirstOrDefault();
                                if (findEnumObj != null)
                                {
                                    sb.Append("                   highSelectAttrs:{ \n");
                                    sb.Append($"                     prop: '{low_prop_ColumnName}_FilterMode', \n");
                                    sb.Append("                     el: 'select',  \n");
                                    sb.Append("                     placeholder: '请选择',  \n");
                                    sb.Append("                     options:FILTER_MODE_OPTIONS_BOOL \n");//bool查询
                                    sb.Append("                   } \n");
                                }
                                else
                                {
                                    sb.Append("                   highSelectAttrs:{ \n");
                                    sb.Append($"                     prop: '{low_prop_ColumnName}_FilterMode', \n");
                                    sb.Append("                     el: 'select',  \n");
                                    sb.Append("                     placeholder: '请选择',  \n");
                                    sb.Append("                     options:FILTER_MODE_OPTIONS_NUM \n");//数字类查询
                                    sb.Append("                   } \n");
                                }
                            }
                            else
                            {
                                sb.Append("                   highSelectAttrs:{ \n");
                                sb.Append($"                     prop: '{low_prop_ColumnName}_FilterMode', \n");
                                sb.Append("                     el: 'select',  \n");
                                sb.Append("                     placeholder: '请选择',  \n");
                                sb.Append("                     options:FILTER_MODE_OPTIONS_NUM \n");//数字类查询
                                sb.Append("                   } \n");
                            }

                            break;
                        case MyDataTypeCategorizeEnum.日期类:
                            //日期类 é«˜çº§ select查询没有
                            sb.Append("                   isDateControl: true, // æ˜¾å¼æ ‡è®°ä¸ºæ—¥æœŸæŽ§ä»¶ \n");
                            break;
                        default://剩余的一律认为是 å­—符串  
                            sb.Append("                   highSelectAttrs:{ \n");
                            sb.Append($"                     prop: '{low_prop_ColumnName}_FilterMode', \n");
                            sb.Append("                     el: 'select',  \n");
                            sb.Append("                     placeholder: '请选择',  \n");
                            sb.Append("                     options:FILTER_MODE_OPTIONS_STRING \n");//字符串类查询
                            sb.Append("                   } \n");
                            break;
                    }

                    sb.Append("                }, \n");
                }
                //去掉最后一个,
@@ -2322,15 +2395,27 @@
                /*
                  materialCode: formData.value.materialCode,
                 */
                List<ColumnModel> newList = ListHelper.RemoveForPageTableListQueryAttributes(columnModelList);
                foreach (var columnModel in newList)
                foreach (var columnModel in columnModelList)
                {

                    //首字母小写
                    var low_prop_ColumnName = CommonHelper.FirstLowercase(columnModel.ColumnName);
                    sb.Append($"{low_prop_ColumnName}: formData.value.{low_prop_ColumnName} || '', \n");


                    //添加select高级查询
                    DataTypeEnum enumDT = (DataTypeEnum)Enum.Parse(typeof(DataTypeEnum), "dt_" + columnModel.DataType.ToString());
                    MyDataTypeCategorizeEnum myDataTypeCategorizeEnum = CommonHelper.GetMyDataTypeCategorizeEnum(enumDT);
                    switch (myDataTypeCategorizeEnum)
                    {
                        case MyDataTypeCategorizeEnum.布尔类:
                        case MyDataTypeCategorizeEnum.数字类:
                        default://剩余的一律认为是 å­—符串  
                            sb.Append($"{low_prop_ColumnName}_FilterMode: formData.value.{low_prop_ColumnName}_FilterMode || '', \n");
                            break;
                        case MyDataTypeCategorizeEnum.日期类:
                            //日期类 é«˜çº§ select查询没有
                            break;
                    }
                }
                //去掉最后一个,
                var res = sb.ToString();
@@ -2515,8 +2600,7 @@
                /*
                  materialCode: res.materialCode,
                 */
                List<ColumnModel> newList = ListHelper.RemoveForPageAddFormAttributes(columnModelList);
                foreach (var columnModel in newList)
                foreach (var columnModel in columnModelList)
                {
                    //首字母小写
                    var low_prop_ColumnName = CommonHelper.FirstLowercase(columnModel.ColumnName);
@@ -2533,6 +2617,46 @@
            }
        }

        public static string GetVueFormOptionsStrForPageAddFormAttributes_Query_Clear_HighSelect(List<ColumnModel> columnModelList, GenerateCodeParam param)
        {
            StringBuilder sb = new StringBuilder();
            try
            {
                /*
                  formData.value.materialCode_FilterMode = 1
                 */
                foreach (var columnModel in columnModelList)
                {
                    //首字母小写
                    var low_prop_ColumnName = CommonHelper.FirstLowercase(columnModel.ColumnName);
                    //添加select高级查询
                    DataTypeEnum enumDT = (DataTypeEnum)Enum.Parse(typeof(DataTypeEnum), "dt_" + columnModel.DataType.ToString());
                    MyDataTypeCategorizeEnum myDataTypeCategorizeEnum = CommonHelper.GetMyDataTypeCategorizeEnum(enumDT);
                    switch (myDataTypeCategorizeEnum)
                    {
                        case MyDataTypeCategorizeEnum.布尔类:
                        case MyDataTypeCategorizeEnum.数字类:
                            sb.Append($"formData.value.{low_prop_ColumnName}_FilterMode = 2 \n");//精准查询
                            break;
                        default://剩余的一律认为是 å­—符串  
                            sb.Append($"formData.value.{low_prop_ColumnName}_FilterMode = 1 \n");//模糊查询
                            break;
                        case MyDataTypeCategorizeEnum.日期类:
                            //日期类 é«˜çº§ select查询没有
                            break;
                    }
                }
                //去掉最后一个,
                var res = sb.ToString();
                res = res.Substring(0, res.Length - 1);
                return res;
            }
            catch (Exception ex)
            {
                throw ex;
            }
        }

        public static string GetVueFormOptionsStrForPageAdd_EntityNameClass_enumOptions(List<ColumnModel> columnModelList, GenerateCodeParam param)
        {
            StringBuilder sb = new StringBuilder();

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/GetWmsMaterialInput.cs

@@ -1,3 +1,4 @@
using CMS.Plugin.HIAWms.Domain.Shared.Enums; 
using CmsQueryExtensions.Extension; 
using Volo.Abp.Application.Dtos; 
 
@@ -116,7 +117,7 @@
        /// <summary>
        /// é‡‡è´­ç±»åž‹ï¼ˆæžšä¸¾å€¼ï¼‰
        /// </summary>
        public int?  PurchaseType { get; set; }
        public PurchaseTypeEnum?  PurchaseType { get; set; }

        /// <summary>
        /// é‡‡è´­ç±»åž‹ï¼ˆæžšä¸¾å€¼ï¼‰-查询关系运算符 
@@ -126,7 +127,7 @@
        /// <summary>
        /// ç‰©æ–™ç±»åž‹ï¼ˆæžšä¸¾å€¼ï¼‰
        /// </summary>
        public int?  MaterialType { get; set; }
        public MaterialTypeEnum?  MaterialType { get; set; }

        /// <summary>
        /// ç‰©æ–™ç±»åž‹ï¼ˆæžšä¸¾å€¼ï¼‰-查询关系运算符 
@@ -196,7 +197,7 @@
        /// <summary>
        /// æ˜¯å¦ä¸ºä¸»æ”¯ç®¡
        /// </summary>
        public int?  IsMainBranch { get; set; }
        public YesNoEnum?  IsMainBranch { get; set; }

        /// <summary>
        /// æ˜¯å¦ä¸ºä¸»æ”¯ç®¡-查询关系运算符 
@@ -288,7 +289,7 @@
        /// </summary>
        //表示是 é«˜çº§æŸ¥è¯¢èŒƒå›´æŸ¥è¯¢ç‰¹æ€§
        [HighSearchRangeAttribute]
        public List<string> CreationTime { get; set; }
        public string CreationTime { get; set; }


        /// <summary>
@@ -306,7 +307,7 @@
        /// </summary>
        //表示是 é«˜çº§æŸ¥è¯¢èŒƒå›´æŸ¥è¯¢ç‰¹æ€§
        [HighSearchRangeAttribute]
        public List<string> LastModificationTime { get; set; }
        public string LastModificationTime { get; set; }


        /// <summary>
@@ -344,7 +345,7 @@
        /// </summary>
        //表示是 é«˜çº§æŸ¥è¯¢èŒƒå›´æŸ¥è¯¢ç‰¹æ€§
        [HighSearchRangeAttribute]
        public List<string> DeletionTime { get; set; }
        public string DeletionTime { get; set; }


        /// <summary>

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialExportModel.cs

@@ -137,58 +137,34 @@
        public string RedundantField3 { get; set; }

        /// <summary>
        /// æŽ’序
        /// </summary>
        [ExcelColumn(Name = "排序", Width = 25)]
        public int Sort { get; set; }

        /// <summary>
        /// å¤‡æ³¨
        /// </summary>
        [ExcelColumn(Name = "备注", Width = 25)]
        public string Remark { get; set; }

        /// <summary>
        /// æ˜¯å¦ç¦ç”¨
        /// åˆ›å»ºæ—¶é—´
        /// </summary>
        [ExcelColumn(Name = "是否禁用", Width = 25)]
        public bool? IsDisabled { get; set; }
        [ExcelColumn(Name = "创建时间", Width = 25)]
        public DateTime CreationTime { get; set; }

        /// <summary>
        /// åˆ é™¤æ—¶é—´
        /// ä¿®æ”¹æ—¶é—´
        /// </summary>
        [ExcelColumn(Name = "删除时间", Width = 25)]
        public DateTime DeletionTime { get; set; }
        [ExcelColumn(Name = "修改时间", Width = 25)]
        public DateTime LastModificationTime { get; set; }

        /// <summary>
        /// æ“ä½œå¤‡æ³¨
        /// åˆ›å»ºäºº
        /// </summary>
        [ExcelColumn(Name = "操作备注", Width = 25)]
        public string OperationRemark { get; set; }
        [ExcelColumn(Name = "创建人", Width = 25)]
        public string CreatorName { get; set; }

        /// <summary>
        /// åˆ é™¤å¤‡æ³¨
        /// ä¿®æ”¹äºº
        /// </summary>
        [ExcelColumn(Name = "删除备注", Width = 25)]
        public string DeleteRemark { get; set; }

        /// <summary>
        /// æ‰©å±•å­—段1
        /// </summary>
        [ExcelColumn(Name = "扩展字段1", Width = 25)]
        public string ExtraField1 { get; set; }

        /// <summary>
        /// æ‰©å±•å­—段2
        /// </summary>
        [ExcelColumn(Name = "扩展字段2", Width = 25)]
        public string ExtraField2 { get; set; }

        /// <summary>
        /// æ‰©å±•å­—段3
        /// </summary>
        [ExcelColumn(Name = "扩展字段3", Width = 25)]
        public string ExtraField3 { get; set; }
        [ExcelColumn(Name = "修改人", Width = 25)]
        public string LastModifierName { get; set; }

 
 

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs

@@ -165,7 +165,6 @@
        updateObj.RedundantField2 = input.RedundantField2;
        updateObj.RedundantField3 = input.RedundantField3;
        updateObj.Remark = input.Remark;
        updateObj.IsDisabled = input.IsDisabled;
 
 
        await wmsMaterialRepository.UpdateAsync(updateObj); 
@@ -343,7 +342,6 @@
RedundantField2 = impItem.RedundantField2,
RedundantField3 = impItem.RedundantField3,
Remark = impItem.Remark,
IsDisabled = impItem.IsDisabled,
 
                    }; 
 
@@ -375,7 +373,6 @@
RedundantField2 = impItem.RedundantField2,
RedundantField3 = impItem.RedundantField3,
Remark = impItem.Remark,
IsDisabled = impItem.IsDisabled,
 
                    }; 
 

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms/Resources/Templates/WmsMaterialµ¼³öÄ£°å.xlsx

Binary files differ

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/templatedemo_web/src/utils/commonOptionConstants.js

@@ -1,5 +1,11 @@
// æ˜¯ å¦
// æ˜¯ å¦(高级查询用)
  export const BOOLEAN_OPTIONS = [
    { label: '是', value: true },
    { label: '否', value: false },
    { label: '是', value: 'true'},
    { label: '否', value: 'false' },
  ];

  // æ˜¯ å¦(新增、修改界面专用)
  export const BOOLEAN_OPTIONS_AddEdit = [
    { label: '是', value: true},
    { label: '否', value: false },
  ];

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialDrawer.tsx

@@ -14,6 +14,10 @@
import isEqual from 'lodash/isEqual' 
import { ConfirmBox } from '@/components/ConfirmBox/ConfirmBox' 
import { cloneDeep } from 'lodash' 
// å¼•å…¥å…¬å…±é€‰é¡¹é…ç½®  
import {   
  BOOLEAN_OPTIONS_AddEdit  
} from '@/utils/commonOptionConstants';  
 
export const useWmsMaterialDrawer = (props: any, ctx?: any) => { 
  const wmsMaterialDrawer = injectModel<WmsMaterialDrawer>('wmsMaterialDrawer') 
@@ -91,7 +95,7 @@
                   //disabled: disabled, 
                   placeholder: '请输入是否有效物料', 
              rules: [{required: true, message: '是否有效物料不能为空', trigger: 'blur' }], 
                 options: [{label: '是',value: true}, {label: '否',value: false}] 
                 options: BOOLEAN_OPTIONS_AddEdit 
                }, 
                { 
                   label: '是否自产', 
@@ -99,7 +103,7 @@
                   el: 'select', 
                   //disabled: disabled, 
                   placeholder: '请输入是否自产', 
                 options: [{label: '是',value: true}, {label: '否',value: false}] 
                 options: BOOLEAN_OPTIONS_AddEdit 
                }, 
                { 
                   label: '数量', 
@@ -162,6 +166,7 @@
                   label: '采购类型（枚举值）', 
                   prop: 'purchaseType', 
                   el: 'select', 
                   clearable:true, 
                   options: [], 
                   //disabled: disabled, 
                   placeholder: '请输入采购类型（枚举值）', 
@@ -171,6 +176,7 @@
                   label: '物料类型（枚举值）', 
                   prop: 'materialType', 
                   el: 'select', 
                   clearable:true, 
                   options: [], 
                   //disabled: disabled, 
                   placeholder: '请输入物料类型（枚举值）', 
@@ -252,6 +258,7 @@
                   label: '是否为主支管', 
                   prop: 'isMainBranch', 
                   el: 'select', 
                   clearable:true, 
                   options: [], 
                   //disabled: disabled, 
                   placeholder: '请输入是否为主支管', 
@@ -298,55 +305,6 @@
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入备注', 
                }, 
                { 
                   label: '删除时间', 
                   prop: 'deletionTime', 
                   el: (props: any, { attrs }: SetupContext) => { 
                     return h(datePicker, {  
                       ...props,  
                       clearable: true,  
                       ...attrs,  
                     })  
                   },
                   width: '100%',
                   //disabled: disabled, 
                   placeholder: '请输入删除时间', 
                }, 
                { 
                   label: '操作备注', 
                   prop: 'operationRemark', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入操作备注', 
                }, 
                { 
                   label: '删除备注', 
                   prop: 'deleteRemark', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入删除备注', 
                }, 
                { 
                   label: '扩展字段1', 
                   prop: 'extraField1', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入扩展字段1', 
                }, 
                { 
                   label: '扩展字段2', 
                   prop: 'extraField2', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入扩展字段2', 
                }, 
                { 
                   label: '扩展字段3', 
                   prop: 'extraField3', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入扩展字段3', 
                },  
  ]) 
  /** 
@@ -404,13 +362,7 @@
redundantField1: formData.value.redundantField1, 
redundantField2: formData.value.redundantField2, 
redundantField3: formData.value.redundantField3, 
remark: formData.value.remark, 
deletionTime: formData.value.deletionTime, 
operationRemark: formData.value.operationRemark, 
deleteRemark: formData.value.deleteRemark, 
extraField1: formData.value.extraField1, 
extraField2: formData.value.extraField2, 
extraField3: formData.value.extraField3,  
remark: formData.value.remark,  
    } 
    if (!current.value) { 
      await wmsMaterialDrawer.addWmsMaterial(data) 
@@ -486,13 +438,7 @@
redundantField1: res.redundantField1, 
redundantField2: res.redundantField2, 
redundantField3: res.redundantField3, 
remark: res.remark, 
deletionTime: res.deletionTime, 
operationRemark: res.operationRemark, 
deleteRemark: res.deleteRemark, 
extraField1: res.extraField1, 
extraField2: res.extraField2, 
extraField3: res.extraField3,  
remark: res.remark,  
        id: res.id, 
      } 
      disabled.value = true 

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

@@ -14,15 +14,15 @@
import isEqual from 'lodash/isEqual' 
import { ConfirmBox } from '@/components/ConfirmBox/ConfirmBox' 
import { cloneDeep } from 'lodash' 
// å¼•å…¥å…¬å…±é€‰é¡¹é…ç½®
import { 
  FILTER_MODE_OPTIONS_STRING, 
  FILTER_MODE_OPTIONS_NUM,
  FILTER_MODE_OPTIONS_BOOL
} from '@/components/DyFormForHighQuery/DyFormForHighQueryOptions';
import { 
  BOOLEAN_OPTIONS
} from '@/utils/commonOptionConstants';
// å¼•å…¥å…¬å…±é€‰é¡¹é…ç½® 
import {  
  FILTER_MODE_OPTIONS_STRING,  
  FILTER_MODE_OPTIONS_NUM, 
  FILTER_MODE_OPTIONS_BOOL 
} from '@/components/DyFormForHighQuery/DyFormForHighQueryOptions'; 
import {  
  BOOLEAN_OPTIONS 
} from '@/utils/commonOptionConstants'; 
 
export const useWmsMaterialQueryDrawer = (props: any, ctx?: any) => { 
  const wmsMaterialDrawer = injectModel<WmsMaterialDrawer>('WmsMaterialDrawer') 
@@ -84,7 +84,7 @@
    }, 
  }) 
  /** 
   * æ·»åŠ çš„form字段 
   * é«˜çº§æŸ¥è¯¢çš„form字段 
   */ 
  const formItems = reactive([ 
                    { 
@@ -93,12 +93,12 @@
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入物料编码（唯一标识）', 
                   highSelectAttrs:{
                     prop: 'materialCode_FilterMode',
                     el: 'select', 
                     placeholder: '请选择', 
                     options:FILTER_MODE_OPTIONS_STRING,
                   }
                   highSelectAttrs:{ 
                     prop: 'materialCode_FilterMode', 
                     el: 'select',  
                     placeholder: '请选择',  
                     options:FILTER_MODE_OPTIONS_STRING 
                   } 
                }, 
                { 
                   label: '是否有效物料', 
@@ -106,8 +106,14 @@
                   el: 'select', 
                   //disabled: disabled, 
                   placeholder: '请输入是否有效物料', 
                 options: [{label: '是',value: true}, {label: '否',value: false}],
                 selectOptions: [{label: '真',value: true}, {label: '假啊',value: false}] 
                   clearable:true, 
                 options: BOOLEAN_OPTIONS, 
                   highSelectAttrs:{ 
                     prop: 'isValid_FilterMode', 
                     el: 'select',  
                     placeholder: '请选择',  
                     options:FILTER_MODE_OPTIONS_BOOL 
                   } 
                }, 
                { 
                   label: '是否自产', 
@@ -115,18 +121,18 @@
                   el: 'select', 
                   //disabled: disabled, 
                   placeholder: '请输入是否自产', 
                 options: [{label: '是',value: true}, {label: '否',value: false}] ,
                 selectOptions: [{label: '真',value: true}, {label: '假啊',value: false}] 
                   clearable:true, 
                 options: BOOLEAN_OPTIONS, 
                   highSelectAttrs:{ 
                     prop: 'isSelfMade_FilterMode', 
                     el: 'select',  
                     placeholder: '请选择',  
                     options:FILTER_MODE_OPTIONS_BOOL 
                   } 
                }, 
                { 
                   label: '数量', 
                   prop: 'num', 
                   highSelectAttrs:{
                    prop: 'num_FilterMode',
                    el: 'select', 
                    placeholder: '请选择', 
                    options:FILTER_MODE_OPTIONS_NUM,
                  },
                   el: (props: any, { attrs }: SetupContext) => { 
                     return h(inputNumber, {  
                       ...props,  
@@ -139,6 +145,12 @@
                   precision: 0, 
                   //disabled: disabled, 
                   placeholder: '请输入数量', 
                   highSelectAttrs:{ 
                     prop: 'num_FilterMode', 
                     el: 'select',  
                     placeholder: '请选择',  
                     options:FILTER_MODE_OPTIONS_NUM 
                   } 
                }, 
                { 
                   label: '自有数量', 
@@ -155,6 +167,12 @@
                   precision: 0, 
                   //disabled: disabled, 
                   placeholder: '请输入自有数量', 
                   highSelectAttrs:{ 
                     prop: 'selfNum_FilterMode', 
                     el: 'select',  
                     placeholder: '请选择',  
                     options:FILTER_MODE_OPTIONS_NUM 
                   } 
                }, 
                { 
                   label: '物料名称', 
@@ -162,6 +180,12 @@
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入物料名称', 
                   highSelectAttrs:{ 
                     prop: 'materialName_FilterMode', 
                     el: 'select',  
                     placeholder: '请选择',  
                     options:FILTER_MODE_OPTIONS_STRING 
                   } 
                }, 
                { 
                   label: '可空长度', 
@@ -178,22 +202,42 @@
                   precision: 2, 
                   //disabled: disabled, 
                   placeholder: '请输入可空长度', 
                   highSelectAttrs:{ 
                     prop: 'nullLength_FilterMode', 
                     el: 'select',  
                     placeholder: '请选择',  
                     options:FILTER_MODE_OPTIONS_NUM 
                   } 
                }, 
                { 
                   label: '采购类型（枚举值）', 
                   prop: 'purchaseType', 
                   el: 'select', 
                   clearable:true, 
                   option: [], 
                   //disabled: disabled, 
                   placeholder: '请输入采购类型（枚举值）', 
                   highSelectAttrs:{ 
                     prop: 'purchaseType_FilterMode', 
                     el: 'select',  
                     placeholder: '请选择',  
                     options:FILTER_MODE_OPTIONS_BOOL 
                   } 
                }, 
                { 
                   label: '物料类型（枚举值）', 
                   prop: 'materialType', 
                   el: 'select', 
                   clearable:true, 
                   option: [], 
                   //disabled: disabled, 
                   placeholder: '请输入物料类型（枚举值）', 
                   highSelectAttrs:{ 
                     prop: 'materialType_FilterMode', 
                     el: 'select',  
                     placeholder: '请选择',  
                     options:FILTER_MODE_OPTIONS_BOOL 
                   } 
                }, 
                { 
                   label: '主单位（如：kg、m、个）', 
@@ -201,6 +245,12 @@
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入主单位（如：kg、m、个）', 
                   highSelectAttrs:{ 
                     prop: 'primaryUnit_FilterMode', 
                     el: 'select',  
                     placeholder: '请选择',  
                     options:FILTER_MODE_OPTIONS_STRING 
                   } 
                }, 
                { 
                   label: '规格/标准（如：GB/T 8163-2018）', 
@@ -208,6 +258,12 @@
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入规格/标准（如：GB/T 8163-2018）', 
                   highSelectAttrs:{ 
                     prop: 'standard_FilterMode', 
                     el: 'select',  
                     placeholder: '请选择',  
                     options:FILTER_MODE_OPTIONS_STRING 
                   } 
                }, 
                { 
                   label: '外径（单位：mm）', 
@@ -224,6 +280,12 @@
                   precision: 2, 
                   //disabled: disabled, 
                   placeholder: '请输入外径（单位：mm）', 
                   highSelectAttrs:{ 
                     prop: 'outerDiameter_FilterMode', 
                     el: 'select',  
                     placeholder: '请选择',  
                     options:FILTER_MODE_OPTIONS_NUM 
                   } 
                }, 
                { 
                   label: '壁厚（单位：mm）', 
@@ -240,6 +302,12 @@
                   precision: 2, 
                   //disabled: disabled, 
                   placeholder: '请输入壁厚（单位：mm）', 
                   highSelectAttrs:{ 
                     prop: 'wallThickness_FilterMode', 
                     el: 'select',  
                     placeholder: '请选择',  
                     options:FILTER_MODE_OPTIONS_NUM 
                   } 
                }, 
                { 
                   label: '材质（如：304不锈钢）', 
@@ -247,6 +315,12 @@
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入材质（如：304不锈钢）', 
                   highSelectAttrs:{ 
                     prop: 'materialQuality_FilterMode', 
                     el: 'select',  
                     placeholder: '请选择',  
                     options:FILTER_MODE_OPTIONS_STRING 
                   } 
                }, 
                { 
                   label: '长度（单位：m）', 
@@ -263,14 +337,27 @@
                   precision: 2, 
                   //disabled: disabled, 
                   placeholder: '请输入长度（单位：m）', 
                   highSelectAttrs:{ 
                     prop: 'length_FilterMode', 
                     el: 'select',  
                     placeholder: '请选择',  
                     options:FILTER_MODE_OPTIONS_NUM 
                   } 
                }, 
                { 
                   label: '是否为主支管', 
                   prop: 'isMainBranch', 
                   el: 'select', 
                   clearable:true, 
                   option: [], 
                   //disabled: disabled, 
                   placeholder: '请输入是否为主支管', 
                   highSelectAttrs:{ 
                     prop: 'isMainBranch_FilterMode', 
                     el: 'select',  
                     placeholder: '请选择',  
                     options:FILTER_MODE_OPTIONS_BOOL 
                   } 
                }, 
                { 
                   label: '生产工厂', 
@@ -278,6 +365,12 @@
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入生产工厂', 
                   highSelectAttrs:{ 
                     prop: 'factory_FilterMode', 
                     el: 'select',  
                     placeholder: '请选择',  
                     options:FILTER_MODE_OPTIONS_STRING 
                   } 
                }, 
                { 
                   label: '证书编号', 
@@ -285,6 +378,12 @@
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入证书编号', 
                   highSelectAttrs:{ 
                     prop: 'certification_FilterMode', 
                     el: 'select',  
                     placeholder: '请选择',  
                     options:FILTER_MODE_OPTIONS_STRING 
                   } 
                }, 
                { 
                   label: '冗余字段1 - é¢„留扩展用途', 
@@ -292,6 +391,12 @@
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入冗余字段1 - é¢„留扩展用途', 
                   highSelectAttrs:{ 
                     prop: 'redundantField1_FilterMode', 
                     el: 'select',  
                     placeholder: '请选择',  
                     options:FILTER_MODE_OPTIONS_STRING 
                   } 
                }, 
                { 
                   label: '冗余字段2 - é¢„留扩展用途', 
@@ -299,6 +404,12 @@
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入冗余字段2 - é¢„留扩展用途', 
                   highSelectAttrs:{ 
                     prop: 'redundantField2_FilterMode', 
                     el: 'select',  
                     placeholder: '请选择',  
                     options:FILTER_MODE_OPTIONS_STRING 
                   } 
                }, 
                { 
                   label: '冗余字段3 - é¢„留扩展用途', 
@@ -306,6 +417,12 @@
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入冗余字段3 - é¢„留扩展用途', 
                   highSelectAttrs:{ 
                     prop: 'redundantField3_FilterMode', 
                     el: 'select',  
                     placeholder: '请选择',  
                     options:FILTER_MODE_OPTIONS_STRING 
                   } 
                }, 
                { 
                   label: '备注', 
@@ -313,26 +430,16 @@
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入备注', 
                }, 
                { 
                   label: '是否禁用', 
                   prop: 'isDisabled', 
                   el: 'select', 
                   //disabled: disabled, 
                   placeholder: '请输入是否禁用', 
                 options:BOOLEAN_OPTIONS
                }, 
                { 
                   label: '扩展属性', 
                   prop: 'extraProperties', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入扩展属性', 
                   highSelectAttrs:{ 
                     prop: 'remark_FilterMode', 
                     el: 'select',  
                     placeholder: '请选择',  
                     options:FILTER_MODE_OPTIONS_STRING 
                   } 
                }, 
                { 
                   label: '创建时间', 
                   prop: 'creationTime', 
                   isDateControl: true, // æ˜¾å¼æ ‡è®°ä¸ºæ—¥æœŸæŽ§ä»¶
                   el: (props: any, { attrs }: SetupContext) => { 
                     return h(dateTimePickerRange, {  
                       ...props,
@@ -343,11 +450,11 @@
                   width: '100%',
                   //disabled: disabled, 
                   placeholder: '请输入创建时间', 
                   isDateControl: true, // æ˜¾å¼æ ‡è®°ä¸ºæ—¥æœŸæŽ§ä»¶ 
                }, 
                { 
                   label: '修改时间', 
                   prop: 'lastModificationTime', 
                   isDateControl: true, // æ˜¾å¼æ ‡è®°ä¸ºæ—¥æœŸæŽ§ä»¶
                   el: (props: any, { attrs }: SetupContext) => { 
                     return h(dateTimePickerRange, {  
                       ...props,
@@ -358,6 +465,7 @@
                   width: '100%',
                   //disabled: disabled, 
                   placeholder: '请输入修改时间', 
                   isDateControl: true, // æ˜¾å¼æ ‡è®°ä¸ºæ—¥æœŸæŽ§ä»¶ 
                }, 
                { 
                   label: '创建人', 
@@ -365,6 +473,12 @@
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入创建人', 
                   highSelectAttrs:{ 
                     prop: 'creatorName_FilterMode', 
                     el: 'select',  
                     placeholder: '请选择',  
                     options:FILTER_MODE_OPTIONS_STRING 
                   } 
                }, 
                { 
                   label: '修改人', 
@@ -372,6 +486,12 @@
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入修改人', 
                   highSelectAttrs:{ 
                     prop: 'lastModifierName_FilterMode', 
                     el: 'select',  
                     placeholder: '请选择',  
                     options:FILTER_MODE_OPTIONS_STRING 
                   } 
                },  
  ]) 
  /** 
@@ -385,37 +505,57 @@
    return check 
  } 
  const commonGetFormData=()=>{ 
  //alert(formData.value.materialCode_FilterMode)
    const data = { 
      materialCode: formData.value.materialCode || '', 
      materialCode_FilterMode: formData.value.materialCode_FilterMode || '', 
materialCode_FilterMode: formData.value.materialCode_FilterMode || '', 
isValid: formData.value.isValid || '', 
isValid_FilterMode: formData.value.isValid_FilterMode || '', 
isSelfMade: formData.value.isSelfMade || '', 
isSelfMade_FilterMode: formData.value.isSelfMade_FilterMode || '', 
num: formData.value.num || '', 
num_FilterMode: formData.value.num_FilterMode || '', 
selfNum: formData.value.selfNum || '', 
selfNum_FilterMode: formData.value.selfNum_FilterMode || '', 
materialName: formData.value.materialName || '', 
materialName_FilterMode: formData.value.materialName_FilterMode || '', 
nullLength: formData.value.nullLength || '', 
nullLength_FilterMode: formData.value.nullLength_FilterMode || '', 
purchaseType: formData.value.purchaseType || '', 
purchaseType_FilterMode: formData.value.purchaseType_FilterMode || '', 
materialType: formData.value.materialType || '', 
materialType_FilterMode: formData.value.materialType_FilterMode || '', 
primaryUnit: formData.value.primaryUnit || '', 
primaryUnit_FilterMode: formData.value.primaryUnit_FilterMode || '', 
standard: formData.value.standard || '', 
standard_FilterMode: formData.value.standard_FilterMode || '', 
outerDiameter: formData.value.outerDiameter || '', 
outerDiameter_FilterMode: formData.value.outerDiameter_FilterMode || '', 
wallThickness: formData.value.wallThickness || '', 
wallThickness_FilterMode: formData.value.wallThickness_FilterMode || '', 
materialQuality: formData.value.materialQuality || '', 
materialQuality_FilterMode: formData.value.materialQuality_FilterMode || '', 
length: formData.value.length || '', 
length_FilterMode: formData.value.length_FilterMode || '', 
isMainBranch: formData.value.isMainBranch || '', 
isMainBranch_FilterMode: formData.value.isMainBranch_FilterMode || '', 
factory: formData.value.factory || '', 
factory_FilterMode: formData.value.factory_FilterMode || '', 
certification: formData.value.certification || '', 
certification_FilterMode: formData.value.certification_FilterMode || '', 
redundantField1: formData.value.redundantField1 || '', 
redundantField1_FilterMode: formData.value.redundantField1_FilterMode || '', 
redundantField2: formData.value.redundantField2 || '', 
redundantField2_FilterMode: formData.value.redundantField2_FilterMode || '', 
redundantField3: formData.value.redundantField3 || '', 
redundantField3_FilterMode: formData.value.redundantField3_FilterMode || '', 
remark: formData.value.remark || '', 
isDisabled: formData.value.isDisabled || '', 
extraProperties: formData.value.extraProperties || '', 
remark_FilterMode: formData.value.remark_FilterMode || '', 
creationTime: formData.value.creationTime || '', 
lastModificationTime: formData.value.lastModificationTime || '', 
creatorName: formData.value.creatorName || '', 
lastModifierName: formData.value.lastModifierName || '',  
creatorName_FilterMode: formData.value.creatorName_FilterMode || '', 
lastModifierName: formData.value.lastModifierName || '', 
lastModifierName_FilterMode: formData.value.lastModifierName_FilterMode || '',  
    } 
    return data; 
  } 
@@ -433,46 +573,67 @@
    const data =commonGetFormData(); 
    ctx.emit('confirmQuery', data) 
  } 
  /** 
   * é‡ç½®å…¬å…±select查询 
   */ 
  const onResetForHighSelect = async () => { 
    formData.value.materialCode_FilterMode = 1
  } 
  /**  
   * é‡ç½®å…¬å…±select查询  
   */  
  const onResetForHighSelect = async () => {  
    formData.value.materialCode_FilterMode = 1 
formData.value.isValid_FilterMode = 2 
formData.value.isSelfMade_FilterMode = 2 
formData.value.num_FilterMode = 2 
formData.value.selfNum_FilterMode = 2 
formData.value.materialName_FilterMode = 1 
formData.value.nullLength_FilterMode = 2 
formData.value.purchaseType_FilterMode = 2 
formData.value.materialType_FilterMode = 2 
formData.value.primaryUnit_FilterMode = 1 
formData.value.standard_FilterMode = 1 
formData.value.outerDiameter_FilterMode = 2 
formData.value.wallThickness_FilterMode = 2 
formData.value.materialQuality_FilterMode = 1 
formData.value.length_FilterMode = 2 
formData.value.isMainBranch_FilterMode = 2 
formData.value.factory_FilterMode = 1 
formData.value.certification_FilterMode = 1 
formData.value.redundantField1_FilterMode = 1 
formData.value.redundantField2_FilterMode = 1 
formData.value.redundantField3_FilterMode = 1 
formData.value.remark_FilterMode = 1 
formData.value.creatorName_FilterMode = 1 
formData.value.lastModifierName_FilterMode = 1  
  }  
  /** 
   * é‡ç½®æŸ¥è¯¢ 
   */ 
  const onReset = async () => { 
    formData.value = {} 
    onResetForHighSelect();//重置公共select查询 
    formData.value.MaterialCode = '' 
formData.value.IsValid = '' 
formData.value.IsSelfMade = '' 
formData.value.Num = '' 
formData.value.SelfNum = '' 
formData.value.MaterialName = '' 
formData.value.NullLength = '' 
formData.value.PurchaseType = '' 
formData.value.MaterialType = '' 
formData.value.PrimaryUnit = '' 
formData.value.Standard = '' 
formData.value.OuterDiameter = '' 
formData.value.WallThickness = '' 
formData.value.MaterialQuality = '' 
formData.value.Length = '' 
formData.value.IsMainBranch = '' 
formData.value.Factory = '' 
formData.value.Certification = '' 
formData.value.RedundantField1 = '' 
formData.value.RedundantField2 = '' 
formData.value.RedundantField3 = '' 
formData.value.Remark = '' 
formData.value.DeletionTime = '' 
formData.value.OperationRemark = '' 
formData.value.DeleteRemark = '' 
formData.value.ExtraField1 = '' 
formData.value.ExtraField2 = '' 
formData.value.ExtraField3 = ''  
    onResetForHighSelect();//重置公共select查询  
    formData.value.materialCode = '' 
formData.value.isValid = '' 
formData.value.isSelfMade = '' 
formData.value.num = '' 
formData.value.selfNum = '' 
formData.value.materialName = '' 
formData.value.nullLength = '' 
formData.value.purchaseType = '' 
formData.value.materialType = '' 
formData.value.primaryUnit = '' 
formData.value.standard = '' 
formData.value.outerDiameter = '' 
formData.value.wallThickness = '' 
formData.value.materialQuality = '' 
formData.value.length = '' 
formData.value.isMainBranch = '' 
formData.value.factory = '' 
formData.value.certification = '' 
formData.value.redundantField1 = '' 
formData.value.redundantField2 = '' 
formData.value.redundantField3 = '' 
formData.value.remark = '' 
formData.value.creationTime = '' 
formData.value.lastModificationTime = '' 
formData.value.creatorName = '' 
formData.value.lastModifierName = ''  
    //向父组件发送自定义事件 
    ctx.emit('restQuery'); 
  } 
@@ -512,7 +673,7 @@
 
  } 
  commonQueryEnumForFrom() 
  onResetForHighSelect();//重置公共select查询 
  onResetForHighSelect();//重置公共select查询  
  /** 
   * å¼¹çª—打开获取详情 
   */ 

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

@@ -5,7 +5,7 @@
import BaseQueryDrawer from '@/components/BaseQueryDrawer/BaseQueryDrawer' 
import styles from './WmsMaterialQueryDrawer.module.scss' 
import { useWmsMaterialQueryDrawer } from '../../../../Controllers/WmsMaterialQueryDrawer.tsx' 
import DyFormForHighQuery from '@/components/DyFormForHighQuery/DyFormForHighQuery' 
import DyFormForHighQuery from '@/components/DyFormForHighQuery/DyFormForHighQuery'  
 
// @ts-ignore 
export default defineComponent<{ 

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Views/Pages/WmsMaterial/Config.ts

@@ -115,16 +115,6 @@
  width:160, 
}, 
{ 
  field: 'isDisabled', 
  title: '是否禁用', 
  width:80, 
}, 
{ 
  field: 'extraProperties', 
  title: '扩展属性', 
  width:160, 
}, 
{ 
  field: 'creationTime', 
  title: '创建时间', 
  width:180, 

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

@@ -23,6 +23,10 @@
  ElFormItem, 
} from 'element-plus' 
import { injectModel } from '@/libs/Provider/Provider' 
// å¼•å…¥å…¬å…±é€‰é¡¹é…ç½®  
import {   
  FILTER_MODE_OPTIONS_STRING 
} from '@/components/DyFormForHighQuery/DyFormForHighQueryOptions';  
 
interface RenderTableType { 
  url?: string 
@@ -68,7 +72,8 @@
    // æ–°å¢žçš„查询条件 
    const queryForm = ref({ 
      searchVal: '', 
      str_searchFormInputAttrs:[] 
      str_searchFormInputAttrs:[], 
      searchVal_FilterMode:'' 
    }) 
    //定义整体模糊查询的列数组(注意：必须大小写跟后端的实体类属性名一致，否则会导致匹配不对的问题) 
    const _searchFormInputAttrs = ref([ 
@@ -114,16 +119,20 @@
      } 
    } 
 
    // ç»„件挂载时获取枚举数据 
    onMounted(() => { 
      fetchEnumData() 
    }) 
    // å®šä¹‰å“åº”式查询数据  
    const _curHighQueryData = ref({ searchVal: '',str_searchFormInputAttrs:[],searchVal_FilterMode:'' });   
    // ç»„件挂载时获取枚举数据  
    onMounted(() => {  
      fetchEnumData()  
      queryForm.value.searchVal_FilterMode = FILTER_MODE_OPTIONS_STRING[0]?.value || '';  
      _curHighQueryData.value.searchVal_FilterMode = queryForm.value.searchVal_FilterMode;   
      _curHighQueryData.value.str_searchFormInputAttrs = _searchFormInputAttrs.value;  
    })  
 
    // å®šä¹‰å“åº”式查询数据 
    const _curHighQueryData = ref({ searchVal: '',str_searchFormInputAttrs:[] }); 
    // æ–°ç‰ˆçš„查询方法（主页面中的按钮【查询】） 
    const handleQueryForMain = async () => { 
      _curHighQueryData.value.searchVal = queryForm.value.searchVal; 
      _curHighQueryData.value.searchVal_FilterMode = queryForm.value.searchVal_FilterMode;  
      _curHighQueryData.value.str_searchFormInputAttrs = _searchFormInputAttrs.value; 
      tableRef.value.getList(_curHighQueryData.value) 
    } 
@@ -136,6 +145,7 @@
    // æ–°ç‰ˆçš„查询重置 
    const resetQuery = () => { 
      queryForm.value.searchVal = '' 
      queryForm.value.searchVal_FilterMode = FILTER_MODE_OPTIONS_STRING[0]?.value || ''; 
      queryForm.value.str_searchFormInputAttrs=_searchFormInputAttrs.value; 
    } 
     //新版的导出方法 
@@ -153,6 +163,7 @@
    const commonSaveCurHighQueryData=(filteredData={})=>{ 
      _curHighQueryData.value = { ..._curHighQueryData.value, ...filteredData }; 
      _curHighQueryData.value.searchVal = queryForm.value.searchVal 
      _curHighQueryData.value.searchVal_FilterMode = queryForm.value.searchVal_FilterMode  
      _curHighQueryData.value.str_searchFormInputAttrs =_searchFormInputAttrs.value; 
    } 
     //获取高级查询弹出框的查询值 
@@ -166,6 +177,7 @@
      ) 
      //组合模糊查询 
      filteredData.searchVal = queryForm.value.searchVal 
      filteredData.searchVal_FilterMode = queryForm.value.searchVal_FilterMode  
      filteredData.str_searchFormInputAttrs =_searchFormInputAttrs.value; 
      return filteredData; 
    } 
@@ -318,7 +330,6 @@
              </IconButton> 
              <el-divider direction="vertical" /> 
 
              <el-divider direction="vertical" /> 
              <el-upload 
                v-permission="wmsMaterial-import" 
                name="file" 
@@ -357,6 +368,21 @@
                /> 
                </el-tooltip> 
              </ElFormItem> 
              <ElFormItem label="" style="width:100px;">  
                   <ElSelect 
                                v-model={queryForm.value.searchVal_FilterMode} 
                                placeholder="请选择" 
                                class={styles.formItem} 
                              > 
                                {FILTER_MODE_OPTIONS_STRING.map((option) => ( 
                                  <ElOption 
                                    key={option.value} 
                                    label={option.label} 
                                    value={option.value} 
                                  /> 
                                ))} 
                              </ElSelect> 
              </ElFormItem>  
              <IconButton type="primary" icon="search" onClick={handleQueryForMain}> 
                æŸ¥è¯¢ 
              </IconButton> 

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/queryExtensions/CmsQueryExtensions/Extension/DynamicSearchParameters/PredicateExtensions/PredicateExtensions.cs

@@ -40,9 +40,13 @@
            return Expression.Lambda<T>(merge(first.Body, secondBody), first.Parameters);
        }

        public static Expression<Func<T, bool>> And<T>(this Expression<Func<T, bool>> first, Expression<Func<T, bool>> second)
        //public static Expression<Func<T, bool>> And<T>(this Expression<Func<T, bool>> first, Expression<Func<T, bool>> second)
        //{
        //    return first.Compose(second, Expression.And);
        //}
        public static Expression<Func<T, bool>> AndAlso<T>(this Expression<Func<T, bool>> first, Expression<Func<T, bool>> second)
        {
            return first.Compose(second, Expression.And);
            return first.Compose(second, Expression.AndAlso);
        }

        public static Expression<Func<T, bool>> Or<T>(this Expression<Func<T, bool>> first, Expression<Func<T, bool>> second)

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/queryExtensions/CmsQueryExtensions/Extension/DynamicSearchParameters/PredicateExtensions/WhereHelper.cs

@@ -17,7 +17,8 @@

        private MemberExpression common_left;

        private UnaryExpression common_right;
        //private UnaryExpression common_right;
        private ConstantExpression common_right;

        public WhereHelper()

@@ -53,7 +54,7 @@

            var propertyValue = converter.ConvertFromInvariantString(value.ToString()); // 3
            var constant = Expression.Constant(propertyValue);
            common_right = Expression.Convert(constant, propertyType); // 4
            common_right = constant; // 4

            // common_right = Expression.Constant(value, value.GetType());//构建一个常量,值是  value
        }
@@ -69,7 +70,7 @@

            Expression result = Expression.Equal(common_left, common_right);

            filter = Expression.And(filter, result);
            filter = Expression.AndAlso(filter, result);
        }

        /// <summary>
@@ -84,7 +85,7 @@

            Expression result = Expression.NotEqual(common_left, common_right);

            filter = Expression.And(filter, result);
            filter = Expression.AndAlso(filter, result);

        }

@@ -100,7 +101,7 @@

            Expression result = Expression.GreaterThan(common_left, common_right);

            filter = Expression.And(filter, result);
            filter = Expression.AndAlso(filter, result);

        }

@@ -116,7 +117,7 @@

            Expression result = Expression.GreaterThanOrEqual(common_left, common_right);

            filter = Expression.And(filter, result);
            filter = Expression.AndAlso(filter, result);

        }

@@ -132,7 +133,7 @@

            Expression result = Expression.LessThan(common_left, common_right);

            filter = Expression.And(filter, result);
            filter = Expression.AndAlso(filter, result);

        }

@@ -148,7 +149,7 @@

            Expression result = Expression.LessThanOrEqual(common_left, common_right);

            filter = Expression.And(filter, result);
            filter = Expression.AndAlso(filter, result);

        }

@@ -167,7 +168,7 @@

            Expression result = Expression.Call(left, typeof(string).GetMethod("Contains", new Type[] { typeof(string) }), right);

            filter = Expression.And(filter, result);
            filter = Expression.AndAlso(filter, result);

        }


 Weben_CMSרÓôúÂëÉú³ÉÆ÷/queryExtensions/CmsQueryExtensions/Extension/DynamicSearchParameters/WhereConditionsExtensions.cs

@@ -52,7 +52,9 @@
                            try
                            {
                                var new_conditions = PredicateExtensions.GetConditionExpressionForFuzzyQuery<T>(pro_value_searchFormInputAttrs.ToArray(), pro_value_searchVal);
                                conditions = conditions.And(new_conditions);
                                //And改为AndAlso，解决mysql å¤„理And会出错的问题(??And?? é€šå¸¸å¯¹åº” ??按位与 (&)??，不会短路求值，可能导致 SQL ç”Ÿæˆ NOT (NOT (...)) è¿™æ ·çš„冗余逻辑,??AndAlso?? å¯¹åº” ??逻辑与 (&&)??，会短路求值，生成的 SQL æ›´ç®€æ´é«˜æ•ˆã€‚) ã€Editby shaocx,2025-05-13】
                                //conditions = conditions.And(new_conditions);
                                conditions = conditions.Compose(new_conditions, Expression.AndAlso);
                            }
                            catch (Exception ex)
                            {
@@ -65,7 +67,9 @@
                        else if (i_pro_value_searchValMode == Convert.ToInt32(SearchFilterModeEnum.精准查询))
                        {//精准查询
                            var new_conditions = PredicateExtensions.GetConditionExpressionForPreciseQuery<T>(pro_value_searchFormInputAttrs.ToArray(), pro_value_searchVal);
                            conditions = conditions.And(new_conditions);
                            //And改为AndAlso，解决mysql å¤„理And会出错的问题(??And?? é€šå¸¸å¯¹åº” ??按位与 (&)??，不会短路求值，可能导致 SQL ç”Ÿæˆ NOT (NOT (...)) è¿™æ ·çš„冗余逻辑,??AndAlso?? å¯¹åº” ??逻辑与 (&&)??，会短路求值，生成的 SQL æ›´ç®€æ´é«˜æ•ˆã€‚) ã€Editby shaocx,2025-05-13】
                            //conditions = conditions.And(new_conditions);
                            conditions = conditions.Compose(new_conditions, Expression.AndAlso);
                            /*
                          pro_value_searchFormInputAttrs.ForEach(x =>
                          {
@@ -107,12 +111,14 @@
                if (hsmList.Count > 0)
                {
                    var high_conditions = PredicateExtensions.GetConditionExpressionForHighFieldByAnd<T>(hsmList);
                    conditions = conditions.And(high_conditions);
                    //And改为AndAlso，解决mysql å¤„理And会出错的问题(​​And​​ é€šå¸¸å¯¹åº” â€‹â€‹æŒ‰ä½ä¸Ž (&)​​，不会短路求值，可能导致 SQL ç”Ÿæˆ NOT (NOT (...)) è¿™æ ·çš„冗余逻辑,​​AndAlso​​ å¯¹åº” â€‹â€‹é€»è¾‘与 (&&)​​，会短路求值，生成的 SQL æ›´ç®€æ´é«˜æ•ˆã€‚) ã€Editby shaocx,2025-05-13】
                    conditions = conditions.Compose(high_conditions, Expression.AndAlso);
                }
                if (hsmForDatetimeList.Count > 0)
                {
                    var high_conditions = PredicateExtensions.GetConditionExpressionForHighFieldByAnd<T>(hsmForDatetimeList);
                    conditions = conditions.And(high_conditions);
                    var high_conditions_dt = PredicateExtensions.GetConditionExpressionForHighFieldByAnd<T>(hsmForDatetimeList);
                    //conditions = conditions.And(high_conditions_dt);
                    conditions = conditions.Compose(high_conditions_dt, Expression.AndAlso);
                }
                #endregion