From 0cd95d98fdf7ed22d53398242feb2a3ca185cf09 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周二, 13 5月 2025 15:38:35 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
Weben_CMS专用代码生成器/queryExtensions/CmsQueryExtensions/Extension/DynamicSearchParameters/PredicateExtensions/WhereHelper.cs | 19
CommonDLL/公共前端组件/src/components/DyFormForHighQuery/DyFormForHighQueryOptions.js | 19
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/templatedemo_web/src/utils/commonOptionConstants.js | 12
Weben_CMS专用代码生成器/Code/App.config | 3
Weben_CMS专用代码生成器/Code/Generate/VUE/VUE_Generate.cs | 84 +-
Weben_CMS专用代码生成器/Code/GenerateCode_WeiBen_CMS.csproj | 1
CommonDLL/公共前端组件/src/utils/commonOptionConstants.js | 11
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Views/Pages/Dialog/WmsMaterialQueryDrawer/WmsMaterialQueryDrawer.tsx | 2
CommonDLL/公共前端组件/src/components/DyFormForHighQuery/DyFormForHighQuery.tsx | 245 +++++++++++
CommonDLL/公共前端组件/src/components/BaseQueryDrawer/BaseQueryDrawer.module.scss | 0
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs | 3
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms/Resources/Templates/WmsMaterial导出模板.xlsx | 0
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/GetWmsMaterialInput.cs | 13
Weben_CMS专用代码生成器/Code/Utility/StructStrHelper.cs | 152 ++++++
CommonDLL/公共前端组件/src/components/DyFormForHighQuery/DyFormForHighQuery.module.scss | 41 +
Weben_CMS专用代码生成器/queryExtensions/CmsQueryExtensions/Extension/DynamicSearchParameters/WhereConditionsExtensions.cs | 16
Weben_CMS专用代码生成器/Code/Model/Enum/MyDataTypeCategorizeEnum.cs | 19
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Views/Pages/WmsMaterial/WmsMaterial.tsx | 42 +
CommonDLL/公共前端组件/src/components/DyFormForHighQuery/DyFormForHighQuery.d.ts | 39 +
CommonDLL/CmsQueryExtensions.dll | 0
Weben_CMS专用代码生成器/Code/Templete/Web/Controllers/EntityModeQueryDrawer模板.txt | 17
Weben_CMS专用代码生成器/Code/Utility/CommonHelper.cs | 26 +
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialExportModel.cs | 48 -
Weben_CMS专用代码生成器/Code/Templete/Web/Views/Pages/EntityNameClass/EntityNameClass模板.txt | 41 +
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialDrawer.tsx | 76 --
Weben_CMS专用代码生成器/queryExtensions/CmsQueryExtensions/Extension/DynamicSearchParameters/PredicateExtensions/PredicateExtensions.cs | 8
Weben_CMS专用代码生成器/Code/Templete/Web/Views/Pages/Dialog/EntityNameClassQueryDrawer/EntityNameClassQueryDrawer模板.txt | 6
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Views/Pages/WmsMaterial/Config.ts | 10
CommonDLL/公共前端组件/src/components/BaseQueryDrawer/BaseQueryDrawer.tsx | 0
Weben_CMS专用代码生成器/Code/Generate/Web/Controllers/EntityModeQueryDrawer_Generate.cs | 17
Weben_CMS专用代码生成器/Code/Templete/Web/Controllers/EntityModeDrawer模板.txt | 4
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialQueryDrawer.tsx | 329 +++++++++++---
32 files changed, 997 insertions(+), 306 deletions(-)
diff --git a/CommonDLL/CmsQueryExtensions.dll b/CommonDLL/CmsQueryExtensions.dll
index f4b2558..fb7ab04 100644
--- a/CommonDLL/CmsQueryExtensions.dll
+++ b/CommonDLL/CmsQueryExtensions.dll
Binary files differ
diff --git "a/CommonDLL/\345\205\254\345\205\261\345\211\215\347\253\257\347\273\204\344\273\266/BaseQueryDrawer/BaseQueryDrawer.module.scss" "b/CommonDLL/\345\205\254\345\205\261\345\211\215\347\253\257\347\273\204\344\273\266/src/components/BaseQueryDrawer/BaseQueryDrawer.module.scss"
similarity index 100%
rename from "CommonDLL/\345\205\254\345\205\261\345\211\215\347\253\257\347\273\204\344\273\266/BaseQueryDrawer/BaseQueryDrawer.module.scss"
rename to "CommonDLL/\345\205\254\345\205\261\345\211\215\347\253\257\347\273\204\344\273\266/src/components/BaseQueryDrawer/BaseQueryDrawer.module.scss"
diff --git "a/CommonDLL/\345\205\254\345\205\261\345\211\215\347\253\257\347\273\204\344\273\266/BaseQueryDrawer/BaseQueryDrawer.tsx" "b/CommonDLL/\345\205\254\345\205\261\345\211\215\347\253\257\347\273\204\344\273\266/src/components/BaseQueryDrawer/BaseQueryDrawer.tsx"
similarity index 100%
rename from "CommonDLL/\345\205\254\345\205\261\345\211\215\347\253\257\347\273\204\344\273\266/BaseQueryDrawer/BaseQueryDrawer.tsx"
rename to "CommonDLL/\345\205\254\345\205\261\345\211\215\347\253\257\347\273\204\344\273\266/src/components/BaseQueryDrawer/BaseQueryDrawer.tsx"
diff --git "a/CommonDLL/\345\205\254\345\205\261\345\211\215\347\253\257\347\273\204\344\273\266/src/components/DyFormForHighQuery/DyFormForHighQuery.d.ts" "b/CommonDLL/\345\205\254\345\205\261\345\211\215\347\253\257\347\273\204\344\273\266/src/components/DyFormForHighQuery/DyFormForHighQuery.d.ts"
new file mode 100644
index 0000000..aea115f
--- /dev/null
+++ "b/CommonDLL/\345\205\254\345\205\261\345\211\215\347\253\257\347\273\204\344\273\266/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
+}
diff --git "a/CommonDLL/\345\205\254\345\205\261\345\211\215\347\253\257\347\273\204\344\273\266/src/components/DyFormForHighQuery/DyFormForHighQuery.module.scss" "b/CommonDLL/\345\205\254\345\205\261\345\211\215\347\253\257\347\273\204\344\273\266/src/components/DyFormForHighQuery/DyFormForHighQuery.module.scss"
new file mode 100644
index 0000000..0fff059
--- /dev/null
+++ "b/CommonDLL/\345\205\254\345\205\261\345\211\215\347\253\257\347\273\204\344\273\266/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;
+ }
+}
\ No newline at end of file
diff --git "a/CommonDLL/\345\205\254\345\205\261\345\211\215\347\253\257\347\273\204\344\273\266/src/components/DyFormForHighQuery/DyFormForHighQuery.tsx" "b/CommonDLL/\345\205\254\345\205\261\345\211\215\347\253\257\347\273\204\344\273\266/src/components/DyFormForHighQuery/DyFormForHighQuery.tsx"
new file mode 100644
index 0000000..1d2d888
--- /dev/null
+++ "b/CommonDLL/\345\205\254\345\205\261\345\211\215\347\253\257\347\273\204\344\273\266/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>}
+
+
+ <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>
+ )
+ }
+ },
+})
diff --git "a/CommonDLL/\345\205\254\345\205\261\345\211\215\347\253\257\347\273\204\344\273\266/src/components/DyFormForHighQuery/DyFormForHighQueryOptions.js" "b/CommonDLL/\345\205\254\345\205\261\345\211\215\347\253\257\347\273\204\344\273\266/src/components/DyFormForHighQuery/DyFormForHighQueryOptions.js"
new file mode 100644
index 0000000..e70f08b
--- /dev/null
+++ "b/CommonDLL/\345\205\254\345\205\261\345\211\215\347\253\257\347\273\204\344\273\266/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 },
+ ];
diff --git "a/CommonDLL/\345\205\254\345\205\261\345\211\215\347\253\257\347\273\204\344\273\266/src/utils/commonOptionConstants.js" "b/CommonDLL/\345\205\254\345\205\261\345\211\215\347\253\257\347\273\204\344\273\266/src/utils/commonOptionConstants.js"
new file mode 100644
index 0000000..d09c6d6
--- /dev/null
+++ "b/CommonDLL/\345\205\254\345\205\261\345\211\215\347\253\257\347\273\204\344\273\266/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 },
+ ];
\ No newline at end of file
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/App.config" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/App.config"
index 389ad5f..8bc4975 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/App.config"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/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" />
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Generate/VUE/VUE_Generate.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Generate/VUE/VUE_Generate.cs"
index 48b0dd8..0b01ad9 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Generate/VUE/VUE_Generate.cs"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/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;
+// }
+// }
+//}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Generate/Web/Controllers/EntityModeQueryDrawer_Generate.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Generate/Web/Controllers/EntityModeQueryDrawer_Generate.cs"
index 88017bf..a408304 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Generate/Web/Controllers/EntityModeQueryDrawer_Generate.cs"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/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;
}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/GenerateCode_WeiBen_CMS.csproj" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/GenerateCode_WeiBen_CMS.csproj"
index 4af2c50..f57c03d 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/GenerateCode_WeiBen_CMS.csproj"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/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" />
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Model/Enum/MyDataTypeCategorizeEnum.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Model/Enum/MyDataTypeCategorizeEnum.cs"
new file mode 100644
index 0000000..f32e9a9
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Model/Enum/MyDataTypeCategorizeEnum.cs"
@@ -0,0 +1,19 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace GenerateCode_GEBrilliantFactory
+{
+ /// <summary>
+ /// 鎴戠殑鏁版嵁绫诲瀷鍒嗙被鏋氫妇
+ /// </summary>
+ public enum MyDataTypeCategorizeEnum
+ {
+ 甯冨皵绫� = 0,
+ 鏁板瓧绫� = 1,
+ 鏃ユ湡绫� = 2,
+ 瀛楃涓茬被 = 3,
+
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Web/Controllers/EntityModeDrawer\346\250\241\346\235\277.txt" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Web/Controllers/EntityModeDrawer\346\250\241\346\235\277.txt"
index cbcf880..bc66791 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Web/Controllers/EntityModeDrawer\346\250\241\346\235\277.txt"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Web/Controllers/EntityModeDrawer\346\250\241\346\235\277.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')
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Web/Controllers/EntityModeQueryDrawer\346\250\241\346\235\277.txt" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Web/Controllers/EntityModeQueryDrawer\346\250\241\346\235\277.txt"
index 54c1878..942ba5f 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Web/Controllers/EntityModeQueryDrawer\346\250\241\346\235\277.txt"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Web/Controllers/EntityModeQueryDrawer\346\250\241\346\235\277.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查询
/**
* 弹窗打开获取详情
*/
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Web/Views/Pages/Dialog/EntityNameClassQueryDrawer/EntityNameClassQueryDrawer\346\250\241\346\235\277.txt" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Web/Views/Pages/Dialog/EntityNameClassQueryDrawer/EntityNameClassQueryDrawer\346\250\241\346\235\277.txt"
index 4c46461..43feee1 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Web/Views/Pages/Dialog/EntityNameClassQueryDrawer/EntityNameClassQueryDrawer\346\250\241\346\235\277.txt"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Web/Views/Pages/Dialog/EntityNameClassQueryDrawer/EntityNameClassQueryDrawer\346\250\241\346\235\277.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>
)
},
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Web/Views/Pages/EntityNameClass/EntityNameClass\346\250\241\346\235\277.txt" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Web/Views/Pages/EntityNameClass/EntityNameClass\346\250\241\346\235\277.txt"
index 6bb0efc..4e53d26 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Web/Views/Pages/EntityNameClass/EntityNameClass\346\250\241\346\235\277.txt"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Web/Views/Pages/EntityNameClass/EntityNameClass\346\250\241\346\235\277.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>
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Utility/CommonHelper.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Utility/CommonHelper.cs"
index 8fd1da2..d845681 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Utility/CommonHelper.cs"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/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>
/// 鏄惁蹇界暐璇ュ垪
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Utility/StructStrHelper.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Utility/StructStrHelper.cs"
index ca814b3..bf9af82 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Utility/StructStrHelper.cs"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/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();
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/GetWmsMaterialInput.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/GetWmsMaterialInput.cs"
index bc0347b..150f658 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/GetWmsMaterialInput.cs"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/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>
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialExportModel.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialExportModel.cs"
index 92b76ef..77583d2 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialExportModel.cs"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/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; }
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs"
index 74a0476..90560f4 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/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,
};
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms/Resources/Templates/WmsMaterial\345\257\274\345\207\272\346\250\241\346\235\277.xlsx" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms/Resources/Templates/WmsMaterial\345\257\274\345\207\272\346\250\241\346\235\277.xlsx"
index 01bff94..2cc7419 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms/Resources/Templates/WmsMaterial\345\257\274\345\207\272\346\250\241\346\235\277.xlsx"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms/Resources/Templates/WmsMaterial\345\257\274\345\207\272\346\250\241\346\235\277.xlsx"
Binary files differ
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/templatedemo_web/src/utils/commonOptionConstants.js" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/templatedemo_web/src/utils/commonOptionConstants.js"
index 5bb488c..d09c6d6 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/templatedemo_web/src/utils/commonOptionConstants.js"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/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 },
+ ];
\ No newline at end of file
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialDrawer.tsx" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialDrawer.tsx"
index a777cf9..5b14d1f 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialDrawer.tsx"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/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
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialQueryDrawer.tsx" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialQueryDrawer.tsx"
index 7244d18..74147d8 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialQueryDrawer.tsx"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/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 @@
},
})
/**
- * 娣诲姞鐨刦orm瀛楁
+ * 楂樼骇鏌ヨ鐨刦orm瀛楁
*/
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銆乵銆佷釜锛�',
@@ -201,6 +245,12 @@
el: 'input',
//disabled: disabled,
placeholder: '璇疯緭鍏ヤ富鍗曚綅锛堝锛歬g銆乵銆佷釜锛�',
+ highSelectAttrs:{
+ prop: 'primaryUnit_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options:FILTER_MODE_OPTIONS_STRING
+ }
},
{
label: '瑙勬牸/鏍囧噯锛堝锛欸B/T 8163-2018锛�',
@@ -208,6 +258,12 @@
el: 'input',
//disabled: disabled,
placeholder: '璇疯緭鍏ヨ鏍�/鏍囧噯锛堝锛欸B/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: '璇疯緭鍏ュ寰勶紙鍗曚綅锛歮m锛�',
+ highSelectAttrs:{
+ prop: 'outerDiameter_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options:FILTER_MODE_OPTIONS_NUM
+ }
},
{
label: '澹佸帤锛堝崟浣嶏細mm锛�',
@@ -240,6 +302,12 @@
precision: 2,
//disabled: disabled,
placeholder: '璇疯緭鍏ュ鍘氾紙鍗曚綅锛歮m锛�',
+ 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: '璇疯緭鍏ラ暱搴︼紙鍗曚綅锛歮锛�',
+ 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鏌ヨ
/**
* 寮圭獥鎵撳紑鑾峰彇璇︽儏
*/
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Views/Pages/Dialog/WmsMaterialQueryDrawer/WmsMaterialQueryDrawer.tsx" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Views/Pages/Dialog/WmsMaterialQueryDrawer/WmsMaterialQueryDrawer.tsx"
index bf58443..f461ffc 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Views/Pages/Dialog/WmsMaterialQueryDrawer/WmsMaterialQueryDrawer.tsx"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/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<{
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Views/Pages/WmsMaterial/Config.ts" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Views/Pages/WmsMaterial/Config.ts"
index c2b4865..7d72d81 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Views/Pages/WmsMaterial/Config.ts"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/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,
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Views/Pages/WmsMaterial/WmsMaterial.tsx" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Views/Pages/WmsMaterial/WmsMaterial.tsx"
index 6fa6a4a..c03f2aa 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Views/Pages/WmsMaterial/WmsMaterial.tsx"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/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>
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/queryExtensions/CmsQueryExtensions/Extension/DynamicSearchParameters/PredicateExtensions/PredicateExtensions.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/queryExtensions/CmsQueryExtensions/Extension/DynamicSearchParameters/PredicateExtensions/PredicateExtensions.cs"
index d8796d5..1dd935a 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/queryExtensions/CmsQueryExtensions/Extension/DynamicSearchParameters/PredicateExtensions/PredicateExtensions.cs"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/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)
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/queryExtensions/CmsQueryExtensions/Extension/DynamicSearchParameters/PredicateExtensions/WhereHelper.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/queryExtensions/CmsQueryExtensions/Extension/DynamicSearchParameters/PredicateExtensions/WhereHelper.cs"
index eee8805..6fbd65f 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/queryExtensions/CmsQueryExtensions/Extension/DynamicSearchParameters/PredicateExtensions/WhereHelper.cs"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/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);
}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/queryExtensions/CmsQueryExtensions/Extension/DynamicSearchParameters/WhereConditionsExtensions.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/queryExtensions/CmsQueryExtensions/Extension/DynamicSearchParameters/WhereConditionsExtensions.cs"
index 56c4e99..a3698e0 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/queryExtensions/CmsQueryExtensions/Extension/DynamicSearchParameters/WhereConditionsExtensions.cs"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/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锛岃В鍐砿ysql 澶勭悊And浼氬嚭閿欑殑闂(??And?? 閫氬父瀵瑰簲 ??鎸変綅涓� (&)??锛屼笉浼氱煭璺眰鍊硷紝鍙兘瀵艰嚧 SQL 鐢熸垚 NOT (NOT (...)) 杩欐牱鐨勫啑浣欓�昏緫,??AndAlso?? 瀵瑰簲 ??閫昏緫涓� (&&)??锛屼細鐭矾姹傚�硷紝鐢熸垚鐨� SQL 鏇寸畝娲侀珮鏁堛��) 銆怑ditby 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锛岃В鍐砿ysql 澶勭悊And浼氬嚭閿欑殑闂(??And?? 閫氬父瀵瑰簲 ??鎸変綅涓� (&)??锛屼笉浼氱煭璺眰鍊硷紝鍙兘瀵艰嚧 SQL 鐢熸垚 NOT (NOT (...)) 杩欐牱鐨勫啑浣欓�昏緫,??AndAlso?? 瀵瑰簲 ??閫昏緫涓� (&&)??锛屼細鐭矾姹傚�硷紝鐢熸垚鐨� SQL 鏇寸畝娲侀珮鏁堛��) 銆怑ditby 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锛岃В鍐砿ysql 澶勭悊And浼氬嚭閿欑殑闂(鈥嬧�婣nd鈥嬧�� 閫氬父瀵瑰簲 鈥嬧�嬫寜浣嶄笌 (&)鈥嬧�嬶紝涓嶄細鐭矾姹傚�硷紝鍙兘瀵艰嚧 SQL 鐢熸垚 NOT (NOT (...)) 杩欐牱鐨勫啑浣欓�昏緫,鈥嬧�婣ndAlso鈥嬧�� 瀵瑰簲 鈥嬧�嬮�昏緫涓� (&&)鈥嬧�嬶紝浼氱煭璺眰鍊硷紝鐢熸垚鐨� SQL 鏇寸畝娲侀珮鏁堛��) 銆怑ditby 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
--
Gitblit v1.9.3