geg-gas/geg-gas-web
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

查询条件添加

Browse Source
This commit is contained in:
‘huanghaiixia’
2026-02-02 10:43:46 +08:00
parent 16a8e11308
commit 3ce161bcbe
26 changed files with 282 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/views/dayPlan/Demand/components/config.ts
View File

@ -6,6 +6,16 @@ export const formConfig = {
};
export const searchFormSchema: FormSchema[] = [
{
field: 'datePlan',
label: '计划日期',
component: 'RangePicker',
componentProps: {
format: 'YYYY-MM-DD',
style: { width: '100%' },
getPopupContainer: () => document.body,
},
},
{
field: 'pointDelyName',
@ -118,15 +128,6 @@ export const columns: BasicColumn[] = [
sorter: true,
},
{
dataIndex: 'note',
title: '备注',
componentType: 'input',
align: 'left',
sorter: true,
},
{
dataIndex: 'reply',
title: '批复意见',

83
src/views/dayPlan/Demand/index.vue
View File

@ -68,7 +68,8 @@
import useEventBus from '/@/hooks/event/useEventBus';
import { cloneDeep } from 'lodash-es';
import NP from 'number-precision';
import dayjs from 'dayjs';
const defaultDate = ref([dayjs().format('YYYY-MM-DD'),dayjs().add(1, 'day').format('YYYY-MM-DD')]);
const { bus, CREATE_FLOW, FLOW_PROCESSED, FORM_LIST_MODIFIED } = useEventBus();
const { notification } = useMessage();
@ -124,7 +125,8 @@
const [registerModal, { openModal }] = useModal();
const [registerImportModal, { openModal: openImportModal }] = useModal();
const formName='日计划-客户需求';
// const formName='管道气日计划';
const formName=currentRoute.value.meta?.title;
const [registerTable, { reload, clearSelectedRowKeys }] = useTable({
title: '' || (formName + '列表'),
api: getLngPngDemandPage,
@ -134,8 +136,44 @@
rowProps: {
gutter: 16,
},
schemas: customSearchFormSchema,
fieldMapToTime: [],
schemas: [
{
field: 'datePlan',
label: '计划日期',
component: 'RangePicker',
defaultValue: defaultDate.value,
componentProps: {
format: 'YYYY-MM-DD',
style: { width: '100%' },
getPopupContainer: () => document.body,
},
},
{
field: 'pointDelyName',
label: '下载点',
component: 'Input',
},
{
field: 'kName',
label: '销售合同名称/编码',
component: 'Input',
},
{
field: 'approCode',
label: '审批状态',
component: 'XjrSelect',
componentProps: {
datasourceType: 'dic',
params: { itemId: '1990669393069129729' },
labelField: 'name',
valueField: 'value',
getPopupContainer: () => document.body,
},
},
],
fieldMapToTime: [['datePlan', ['startDate', 'endDate'], 'YYYY-MM-DD']],
showResetButton: true,
submitButtonOptions: {
text: '搜索',
@ -150,6 +188,7 @@
},
},
},
immediate: false,
beforeFetch: (params) => {
return { ...params, FormId: formIdComputedRef.value, PK: 'id',page:params.limit };
},
@ -209,7 +248,7 @@
path: '/dayPlan/Demand/createForm',
query: {
formPath: 'dayPlan/Demand',
formName: formName,
formName: "查看"+formName,
formId:currentRoute.value.meta.formId,
id: record.id,
type:'view'
@ -237,7 +276,7 @@
path: '/dayPlan/Demand/createForm',
query: {
formPath: 'dayPlan/Demand',
formName: formName,
formName: "新建"+formName,
formId:currentRoute.value.meta.formId
}
});
@ -249,7 +288,7 @@
path: '/dayPlan/Demand/createForm',
query: {
formPath: 'dayPlan/Demand',
formName: formName,
formName: "编辑"+formName,
formId:currentRoute.value.meta.formId,
id: record.id,
type: 'edit'
@ -262,7 +301,7 @@
path: '/dayPlan/Demand/createForm',
query: {
formPath: 'dayPlan/Demand',
formName: formName,
formName: "对比"+formName,
formId:currentRoute.value.meta.formId,
id: record.id,
type: 'compare'
@ -394,6 +433,7 @@
reload()
}
onMounted(() => {
reload({ searchInfo: { startDate: defaultDate.value[0], endDate: defaultDate.value[1] }});
if (schemaIdComputedRef.value) {
bus.on(FLOW_PROCESSED, handleRefresh);
@ -557,7 +597,10 @@
};
</script>
<style lang="less">
.Demandtyle .advanceRow> div:nth-of-type(3){
.Demandtyle .cusSearchForm .advanceRow> div:nth-of-type(3){
display: none;
}
.Demandtyle .advanceRow> div:nth-of-type(2){
display: none;
}
// .Demandtyle .cusSearchForm .advanceRow> div:nth-of-type(2){
@ -574,22 +617,32 @@
.hide{
display: none !important;
}
:deep( .ant-col-8:nth-child(2)) {
:deep( .ant-col-8:nth-child(3)) {
width: 320px !important;
max-width: 320px !important;;
}
:deep(.ant-col-8:nth-child(2) .ant-form-item-label) {
:deep(.ant-col-8:nth-child(3) .ant-form-item-label) {
width: 160px !important;
}
:deep(.ant-col-8:nth-child(2) .ant-form-item-label .ant-form-item-no-colon) {
:deep(.ant-col-8:nth-child(3) .ant-form-item-label .ant-form-item-no-colon) {
width: 160px !important;
max-width: 160px !important;
}
:deep( .ant-col-8:nth-child(1)) {
width: 220px !important;
max-width: 220px !important;;
width: 320px !important;
max-width: 320px !important;;
}
:deep(.ant-col-8:nth-child(1) .ant-form-item-label) {
width: 70px !important;
width: 80px !important;
}
// :deep( .ant-col-8:nth-child(4)) {
// width: 320px !important;
// max-width: 320px !important;;
// }
// :deep(.ant-col-8:nth-child(4) .ant-form-item-label) {
// width: 80px !important;
// }
</style>

22
src/views/dayPlan/PngAppro/components/config.ts
View File

@ -6,7 +6,21 @@ export const formConfig = {
};
export const searchFormSchema: FormSchema[] = [
{
field: 'cuCode',
label: '客户名称',
component: 'Input',
},
{
field: 'kName',
label: '合同名称',
component: 'Input',
},
{
field: 'pointDelyName',
label: '下载点',
component: 'Input',
},
{
field: 'datePlan',
label: '计划日期',
@ -17,12 +31,8 @@ export const searchFormSchema: FormSchema[] = [
getPopupContainer: () => document.body,
},
},
{
field: 'cuCode',
label: '客户名称/简称/编码',
component: 'Input',
},
{
field: 'approCode',
label: '审批状态',
component: 'XjrSelect',

36
src/views/dayPlan/PngAppro/index.vue
View File

@ -115,7 +115,8 @@
const [registerModal, { openModal}] = useModal();
const [registerApproStatus, { openModal: openModalApproStatus}] = useModal();
let formName='管道气销售审批';
// let formName='管道气销售审批';
const formName=currentRoute.value.meta?.title;
let curPath = 'dayPlan/PngAppro/index'
const [registerTable, { reload, clearSelectedRowKeys, setTableData }] = useTable({
title: '' || (formName + '列表'),
@ -204,7 +205,7 @@
path: '/dayPlan/PngAppro/createForm',
query: {
formPath: curPath,
formName: formName,
formName: "查看"+formName,
formId:currentRoute.value.meta.formId,
id: record.id,
type: 'view'
@ -247,7 +248,7 @@
path: '/dayPlan/PngAppro/createForm',
query: {
formPath: curPath,
formName: formName,
formName: "审批"+formName,
formId:currentRoute.value.meta.formId,
id: record.id
}
@ -258,7 +259,7 @@
path: '/dayPlan/PngAppro/createForm',
query: {
formPath: curPath,
formName: formName+'对比',
formName: '对比'+formName,
formId:currentRoute.value.meta.formId,
id: record.demandOrgId,
type: 'compare'
@ -444,24 +445,31 @@
:deep(.ant-table-selection-col) {
width: 50px;
}
:deep( .ant-col-8:nth-child(1)) {
:deep( .ant-col-8:nth-child(4)) {
width: 320px !important;
max-width: 320px !important;;
}
:deep(.ant-col-8:nth-child(1) .ant-form-item-label) {
:deep(.ant-col-8:nth-child(4) .ant-form-item-label) {
width: 80px !important;
}
:deep( .ant-col-8:nth-child(2)) {
width: 360px !important;
:deep( .w-full .ant-col-8:nth-child(1)) {
width: 320px !important;
max-width: 320px !important;;
}
:deep(.ant-col-8:nth-child(2) .ant-form-item-label) {
width: 160px !important;
}
:deep(.ant-col-8:nth-child(2) .ant-form-item-label .ant-form-item-no-colon) {
width: 160px !important;
max-width: 160px !important;
:deep(.w-full .ant-col-8:nth-child(1) .ant-form-item-label) {
width: 80px !important;
}
// :deep( .ant-col-8:nth-child(2)) {
// width: 360px !important;
// max-width: 320px !important;;
// }
// :deep(.ant-col-8:nth-child(2) .ant-form-item-label) {
// width: 160px !important;
// }
// :deep(.ant-col-8:nth-child(2) .ant-form-item-label .ant-form-item-no-colon) {
// width: 160px !important;
// max-width: 160px !important;
// }
.show{
display: flex;
}

3
src/views/dayPlan/PngApproGd/index.vue
View File

@ -95,7 +95,8 @@
const schemaIdComputedRef = ref();
schemaIdComputedRef.value = currentRoute.value.meta.schemaId
const [registerModal, { openModal }] = useModal();
const formName='管道气管道审批';
// const formName='管道气管道审批';
const formName=currentRoute.value.meta?.title;
const [registerTable, { reload, clearSelectedRowKeys }] = useTable({
title: '' || (formName + '列表'),
api: getLngPngApproPage,

33
src/views/dayPlan/PngApproJsz/index.vue
View File

@ -51,9 +51,9 @@
import useEventBus from '/@/hooks/event/useEventBus';
import { cloneDeep } from 'lodash-es';
import rejectReplyModal from '/@/components/common/rejectReplyModal.vue';
import dayjs from 'dayjs';
const { bus, CREATE_FLOW, FLOW_PROCESSED, FORM_LIST_MODIFIED } = useEventBus();
const defaultDate = ref([dayjs().format('YYYY-MM-DD'),dayjs().add(1, 'day').format('YYYY-MM-DD')]);
const { notification } = useMessage();
const { t } = useI18n();
defineEmits(['register']);
@ -96,7 +96,8 @@
const schemaIdComputedRef = ref();
schemaIdComputedRef.value = currentRoute.value.meta.schemaId
const [registerModal, { openModal }] = useModal();
const formName='管道气接收站审批';
// const formName='管道气接收站审批';
const formName=currentRoute.value.meta?.title;
const [registerTable, { reload, clearSelectedRowKeys }] = useTable({
title: '' || (formName + '列表'),
api: getLngPngApproPage,
@ -106,10 +107,23 @@
rowProps: {
gutter: 16,
},
schemas: customSearchFormSchema,
fieldMapToTime: [['datePlan', ['startDate', 'endDate'], 'YYYY-MM-DD HH:mm:ss ', true],],
schemas: [
{
field: 'datePlan',
label: '计划日期',
component: 'RangePicker',
defaultValue: defaultDate.value,
componentProps: {
format: 'YYYY-MM-DD',
style: { width: '100%' },
getPopupContainer: () => document.body,
},
},
],
fieldMapToTime: [['datePlan', ['startDate', 'endDate'], 'YYYY-MM-DD'],],
showResetButton: true,
},
immediate: false,
beforeFetch: (params) => {
return { ...params, FormId: formIdComputedRef.value, PK: 'id',page: params.limit };
},
@ -308,7 +322,7 @@
}
onMounted(() => {
reload({ searchInfo: { startDate: defaultDate.value[0], endDate: defaultDate.value[1] }});
if (schemaIdComputedRef.value) {
bus.on(FLOW_PROCESSED, handleRefresh);
bus.on(CREATE_FLOW, handleRefresh);
@ -390,4 +404,11 @@
.hide{
display: none !important;
}
:deep( .ant-col-8:nth-child(1)) {
width: 320px !important;
max-width: 320px !important;;
}
:deep(.ant-col-8:nth-child(1) .ant-form-item-label) {
width: 80px !important;
}
</style>

36
src/views/dayPlan/PngMeasureSalesPur/components/searchForm.vue
View File

@ -26,19 +26,31 @@
</AButton>
</div>
</a-col>
<a-col :span="6" v-if="isAdvanced">
<!-- <a-col :span="6" v-if="isAdvanced">
<a-form-item label="计划日期" name="reply" >
<a-range-picker v-model:value="formState.datePlan" />
</a-form-item>
</a-col>
<a-col :span="7" v-if="isAdvanced">
</a-col> -->
<a-col :span="6" v-if="isAdvanced">
<a-form-item label="上载点" name="pointUpName">
<a-input-search v-model:value="formState.pointUpName" readonly placeholder="请选择上载点" @search="onSearchDownLoad('up')" />
<a-input v-model:value="formState.pointUpName" placeholder="请输入" />
<!-- <a-input-search v-model:value="formState.pointUpName" readonly placeholder="请选择上载点" @search="onSearchDownLoad('up')" /> -->
</a-form-item>
</a-col>
<a-col :span="7" v-if="isAdvanced">
<a-form-item label="下载点" name="pointDelyName">
<a-input-search v-model:value="formState.pointDelyName" readonly placeholder="请选择下载点" @search="onSearchDownLoad('dely')"/>
<a-input v-model:value="formState.pointDelyName" placeholder="请输入" />
<!-- <a-input-search v-model:value="formState.pointDelyName" readonly placeholder="请选择下载点" @search="onSearchDownLoad('dely')"/> -->
</a-form-item>
</a-col>
<a-col :span="7" v-if="isAdvanced">
<a-form-item label="状态" name="statusCode">
<a-select v-model:value="formState.statusCode" :disabled="isDisable" placeholder="请选择" style="width: 100%" allow-clear >
<a-select-option v-for="item in statusList" :key="item.value" :value="item.value">
{{ item.label }}
</a-select-option>
</a-select>
<!-- <a-input-search v-model:value="formState.pointDelyName" readonly placeholder="请选择下载点" @search="onSearchDownLoad('dely')"/> -->
</a-form-item>
</a-col>
</a-row>
@ -80,6 +92,12 @@
wrapperCol: { span: 15 },
}
const isAdvanced = ref(false)
const statusList = [
{label: '计量中', value: 'JLZ'},
{label: '结算中', value: 'JSZ'},
{label: '已结算', value: 'YJS'},
{label: '计量完成', value: 'JLWC'},
]
onMounted(() => {
@ -105,15 +123,13 @@
const onSearch = () => {
let obj = {
...formState.value,
startDate: formState.value.datePlan ? dayjs(formState.value.datePlan[0]).format('YYYY-MM-DD') : '',
endDate: formState.value.datePlan ? dayjs(formState.value.datePlan[1]).format('YYYY-MM-DD') : '',
// startDate: formState.value.datePlan ? dayjs(formState.value.datePlan[0]).format('YYYY-MM-DD') : '',
// endDate: formState.value.datePlan ? dayjs(formState.value.datePlan[1]).format('YYYY-MM-DD') : '',
dateMeaStart: formState.value.dateMea ? dayjs(formState.value.dateMea[0]).format('YYYY-MM-DD') : '',
dateMeaEnd: formState.value.dateMea ? dayjs(formState.value.dateMea[1]).format('YYYY-MM-DD') : '',
}
delete obj.datePlan
// delete obj.datePlan
delete obj.dateMea
delete obj.pointUpName
delete obj.pointDelyName
emit('search', obj)
}
const onReset = () => {

5
src/views/dayPlan/PngMeasureSalesPur/index.vue
View File

@ -156,7 +156,8 @@
const tableName = 'PngMeasureSalesPur';
const columnName = 'PngMeasureSalesPur';
const formName='管道气采购计量';
// const formName='管道气采购计量';
const formName=currentRoute.value.meta?.title;
const loadData = async () => {
loading.value = true;
@ -218,7 +219,7 @@
path: '/dayPlan/PngMeasureSalesPur/createForm',
query: {
formPath: 'dayPlan/PngMeasureSalesPur',
formName: formName,
formName: "新建"+formName,
formId:currentRoute.value.meta.formId,
type:'add'
}