mdmweb.git - Gitblit

yangys

2025-08-17 c865d7849368bec0808eb186dfa79948f1c2cf95

修改查询参数

已修改4个文件

	src/views/flowmgr/processQuery.vue	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/flowmgr/processQuery1.vue	32 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/flowmgr/processQuery2.vue	28 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/flowmgr/programexport.vue	19 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 src/views/flowmgr/processQuery.vue

@@ -11,10 +11,10 @@
            type="card"
            class="demo-tabs"
        >
            <el-tab-pane label="待办" name="todo">
            <el-tab-pane label="进行中" name="todo">
                <processQuery1 v-if="activeName==='todo'"></processQuery1>
            </el-tab-pane>
            <el-tab-pane label="已办" name="done">
            <el-tab-pane label="已结束" name="done">
                <processQuery2 v-if="activeName==='done'"> </processQuery2>
            </el-tab-pane>
        </el-tabs>

 src/views/flowmgr/processQuery1.vue

@@ -96,15 +96,15 @@
                dialogClickModal: false,
                column: [
                    {
                        label: '流程类型',
                        prop: 'processDefinitionKey',
                        label: '流程名称',
                        prop: 'myProcessName',
                        search: true,
                        searchType: 'select',
                        hide: true,
                        dicUrl: `/blade-mdm/system/dict/dictionary?code=flow`,
                        dicUrl: `/blade-system/dict-biz/dictionary?code=process_name`,
                        props: {
                            label: 'dictValue',
                            value: 'remark',
                            value: 'dictValue',
                        },
                    },
                    {
@@ -310,12 +310,12 @@
                labelWidth: 100,
                span: 8,
                column: [
                    {
                        label: '流程类型',
                        prop: 'processDefinitionKey',
                     {
                        label: '流程名称',
                        prop: '',
                        render: ({ row }) => {
                            return h('p',{'class': 'margin0'}, row?.processDefinitionKey)
                        },
                            return h('p',{'class': 'margin0'}, row?.variables.myProcessName)
                        }
                    },
                    {
                        label: '创建时间',
@@ -331,13 +331,7 @@
                            return h('p',{'class': 'margin0'}, row?.variables?.title)
                        }
                    },
                    {
                        label: '流程名称',
                        prop: '',
                        render: ({ row }) => {
                            return h('p',{'class': 'margin0'}, row?.variables.myProcessName)
                        }
                    },
                   
                    {
                        label: '工艺版次',
                        prop: 'variables.craftEdition',
@@ -640,7 +634,7 @@
                createTimeBegin: params.createTimeBegin || undefined,
                createTimeEnd: params.createTimeEnd || undefined,
                keyword: params.keyword || undefined,
                processDefinitionKey: params.processDefinitionKey || undefined
                myProcessName: params.myProcessName || undefined
            }
            this.query = data
            this.onLoad(this.page, data);
@@ -654,7 +648,7 @@
                createTimeBegin: params.createTimeBegin,
                createTimeEnd: params.createTimeEnd,
                keyword: params.keyword || '',
                processDefinitionKey: params.processDefinitionKey || ''
                myProcessName: params.myProcessName || ''
            }
            this.onLoad(this.page, data);
            done();
@@ -678,7 +672,7 @@
                createTimeBegin: params.createTimeBegin,
                createTimeEnd: params.createTimeEnd,
                keyword: params.keyword || '',
                processDefinitionKey: params.processDefinitionKey || ''
                myProcessName: params.myProcessName || ''
            };
            this.loading = true;
            getList(page.currentPage, page.pageSize, Object.assign(data, params)).then(res => {

 src/views/flowmgr/processQuery2.vue

@@ -98,12 +98,12 @@
                dialogClickModal: false,
                column: [
                    {
                        label: '流程类型',
                        prop: 'processDefinitionKey',
                        label: '流程名称',
                        prop: 'myProcessName',
                        search: true,
                        searchType: 'select',
                        hide: true,
                        dicUrl: `/blade-mdm/system/dict/dictionary?code=flow`,
                        dicUrl: `/blade-system/dict-biz/dictionary?code=process_name`,
                        props: {
                            label: 'dictValue',
                            value: 'remark',
@@ -313,11 +313,11 @@
                span: 8,
                column: [
                    {
                        label: '流程类型',
                        prop: 'processDefinitionKey',
                        label: '流程名称',
                        prop: '',
                        render: ({ row }) => {
                            return h('p',{'class': 'margin0'}, row?.processDefinitionKey)
                        },
                            return h('p',{'class': 'margin0'}, row?.variables.myProcessName)
                        }
                    },
                    {
                        label: '创建时间',
@@ -333,13 +333,7 @@
                            return h('p',{'class': 'margin0'}, row?.variables?.title)
                        }
                    },
                    {
                        label: '流程名称',
                        prop: '',
                        render: ({ row }) => {
                            return h('p',{'class': 'margin0'}, row?.variables.myProcessName)
                        }
                    },
                    
                    {
                        label: '工艺版次',
                        prop: 'variables.craftEdition',
@@ -642,7 +636,7 @@
                createTimeBegin: params.createTimeBegin || undefined,
                createTimeEnd: params.createTimeEnd || undefined,
                keyword: params.keyword || undefined,
                processDefinitionKey: params.processDefinitionKey || undefined
                myProcessName: params.myProcessName || undefined
            }
            this.query = data
            this.onLoad(this.page, data);
@@ -656,7 +650,7 @@
                createTimeBegin: params.createTimeBegin,
                createTimeEnd: params.createTimeEnd,
                keyword: params.keyword || '',
                processDefinitionKey: params.processDefinitionKey || ''
                myProcessName: params.myProcessName || ''
            }
            this.onLoad(this.page, data);
            done();
@@ -680,7 +674,7 @@
                createTimeBegin: params.createTimeBegin,
                createTimeEnd: params.createTimeEnd,
                keyword: params.keyword || '',
                processDefinitionKey: params.processDefinitionKey || ''
                myProcessName: params.myProcessName || ''
            };
            this.loading = true;
            getList2(page.currentPage, page.pageSize, Object.assign(data, params)).then(res => {

 src/views/flowmgr/programexport.vue

@@ -95,14 +95,20 @@
                        label: '工序号',
                        prop: 'processNo',
                    },
                    
                    {
                        label: '图号版次',
                        prop: 'drawingNoEdition',
                        label: '工序版次',
                        prop: 'processEdition',
                    },
                    {
                        label: '工序名称',
                        prop: 'processName',
                    },
                    {
                        label: '图号版次',
                        prop: 'drawingNoEdition',
                    },
                    
                    {
                        label: '程序名称',
                        prop: 'name',
@@ -158,14 +164,19 @@
                        prop: 'processNo',
                    },
                    {
                        label: '图号版次',
                        prop: 'drawingNoEdition',
                        label: '工序版次',
                        prop: 'processEdition',
                    },
                    {
                        label: '工序名称',
                        prop: 'processName',
                    },
                    {
                        label: '图号版次',
                        prop: 'drawingNoEdition',
                    },
                    
                    {
                        label: '程序名称',
                        prop: 'name',
                        search: true,

			@@ -11,10 +11,10 @@
			type="card"
			class="demo-tabs"
			>
			<el-tab-pane label="待办" name="todo">
			<el-tab-pane label="进行中" name="todo">
			<processQuery1 v-if="activeName==='todo'"></processQuery1>
			</el-tab-pane>
			<el-tab-pane label="已办" name="done">
			<el-tab-pane label="已结束" name="done">
			<processQuery2 v-if="activeName==='done'"> </processQuery2>
			</el-tab-pane>
			</el-tabs>

			@@ -96,15 +96,15 @@
			dialogClickModal: false,
			column: [
			{
			label: '流程类型',
			prop: 'processDefinitionKey',
			label: '流程名称',
			prop: 'myProcessName',
			search: true,
			searchType: 'select',
			hide: true,
			dicUrl: `/blade-mdm/system/dict/dictionary?code=flow`,
			dicUrl: `/blade-system/dict-biz/dictionary?code=process_name`,
			props: {
			label: 'dictValue',
			value: 'remark',
			value: 'dictValue',
			},
			},
			{
			@@ -310,12 +310,12 @@
			labelWidth: 100,
			span: 8,
			column: [
			{
			label: '流程类型',
			prop: 'processDefinitionKey',
			{
			label: '流程名称',
			prop: '',
			render: ({ row }) => {
			return h('p',{'class': 'margin0'}, row?.processDefinitionKey)
			},
			return h('p',{'class': 'margin0'}, row?.variables.myProcessName)
			}
			},
			{
			label: '创建时间',
			@@ -331,13 +331,7 @@
			return h('p',{'class': 'margin0'}, row?.variables?.title)
			}
			},
			{
			label: '流程名称',
			prop: '',
			render: ({ row }) => {
			return h('p',{'class': 'margin0'}, row?.variables.myProcessName)
			}
			},

			{
			label: '工艺版次',
			prop: 'variables.craftEdition',
			@@ -640,7 +634,7 @@
			createTimeBegin: params.createTimeBegin \|\| undefined,
			createTimeEnd: params.createTimeEnd \|\| undefined,
			keyword: params.keyword \|\| undefined,
			processDefinitionKey: params.processDefinitionKey \|\| undefined
			myProcessName: params.myProcessName \|\| undefined
			}
			this.query = data
			this.onLoad(this.page, data);
			@@ -654,7 +648,7 @@
			createTimeBegin: params.createTimeBegin,
			createTimeEnd: params.createTimeEnd,
			keyword: params.keyword \|\| '',
			processDefinitionKey: params.processDefinitionKey \|\| ''
			myProcessName: params.myProcessName \|\| ''
			}
			this.onLoad(this.page, data);
			done();
			@@ -678,7 +672,7 @@
			createTimeBegin: params.createTimeBegin,
			createTimeEnd: params.createTimeEnd,
			keyword: params.keyword \|\| '',
			processDefinitionKey: params.processDefinitionKey \|\| ''
			myProcessName: params.myProcessName \|\| ''
			};
			this.loading = true;
			getList(page.currentPage, page.pageSize, Object.assign(data, params)).then(res => {

			@@ -98,12 +98,12 @@
			dialogClickModal: false,
			column: [
			{
			label: '流程类型',
			prop: 'processDefinitionKey',
			label: '流程名称',
			prop: 'myProcessName',
			search: true,
			searchType: 'select',
			hide: true,
			dicUrl: `/blade-mdm/system/dict/dictionary?code=flow`,
			dicUrl: `/blade-system/dict-biz/dictionary?code=process_name`,
			props: {
			label: 'dictValue',
			value: 'remark',
			@@ -313,11 +313,11 @@
			span: 8,
			column: [
			{
			label: '流程类型',
			prop: 'processDefinitionKey',
			label: '流程名称',
			prop: '',
			render: ({ row }) => {
			return h('p',{'class': 'margin0'}, row?.processDefinitionKey)
			},
			return h('p',{'class': 'margin0'}, row?.variables.myProcessName)
			}
			},
			{
			label: '创建时间',
			@@ -333,13 +333,7 @@
			return h('p',{'class': 'margin0'}, row?.variables?.title)
			}
			},
			{
			label: '流程名称',
			prop: '',
			render: ({ row }) => {
			return h('p',{'class': 'margin0'}, row?.variables.myProcessName)
			}
			},

			{
			label: '工艺版次',
			prop: 'variables.craftEdition',
			@@ -642,7 +636,7 @@
			createTimeBegin: params.createTimeBegin \|\| undefined,
			createTimeEnd: params.createTimeEnd \|\| undefined,
			keyword: params.keyword \|\| undefined,
			processDefinitionKey: params.processDefinitionKey \|\| undefined
			myProcessName: params.myProcessName \|\| undefined
			}
			this.query = data
			this.onLoad(this.page, data);
			@@ -656,7 +650,7 @@
			createTimeBegin: params.createTimeBegin,
			createTimeEnd: params.createTimeEnd,
			keyword: params.keyword \|\| '',
			processDefinitionKey: params.processDefinitionKey \|\| ''
			myProcessName: params.myProcessName \|\| ''
			}
			this.onLoad(this.page, data);
			done();
			@@ -680,7 +674,7 @@
			createTimeBegin: params.createTimeBegin,
			createTimeEnd: params.createTimeEnd,
			keyword: params.keyword \|\| '',
			processDefinitionKey: params.processDefinitionKey \|\| ''
			myProcessName: params.myProcessName \|\| ''
			};
			this.loading = true;
			getList2(page.currentPage, page.pageSize, Object.assign(data, params)).then(res => {

			@@ -95,14 +95,20 @@
			label: '工序号',
			prop: 'processNo',
			},

			{
			label: '图号版次',
			prop: 'drawingNoEdition',
			label: '工序版次',
			prop: 'processEdition',
			},
			{
			label: '工序名称',
			prop: 'processName',
			},
			{
			label: '图号版次',
			prop: 'drawingNoEdition',
			},

			{
			label: '程序名称',
			prop: 'name',
			@@ -158,14 +164,19 @@
			prop: 'processNo',
			},
			{
			label: '图号版次',
			prop: 'drawingNoEdition',
			label: '工序版次',
			prop: 'processEdition',
			},
			{
			label: '工序名称',
			prop: 'processName',
			},
			{
			label: '图号版次',
			prop: 'drawingNoEdition',
			},

			{
			label: '程序名称',
			prop: 'name',
			search: true,