huojin
/
Cpte-Vue3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

main
HUOJIN\92525 2026-01-15 18:00:38 +08:00
parent 285fa0b444
commit a4eb09b017
4 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/base/area/AreaList.vue
View File

@ -139,6 +139,10 @@
width: 120,
fixed: 'right',
},
defSort: {
column: 'createTime',
order: 'asc',
},
beforeFetch: async (params) => {
// 创建新的查询参数对象，避免修改原始对象
const newQueryParam = { ...queryParam };

14
src/views/base/area/components/AreaSelect.vue
View File

@ -272,9 +272,17 @@ export default defineComponent({
*/
const handleSearch = debounce(function (value: string) {
searchKeyword.value = value;
pageNo.value = 1;
isHasData.value = true;
if (!value) {
// 搜索值为空时，重新加载全部数据
pageNo.value = 1;
isHasData.value = true;
queryData(1, '', false);
} else {
// 有搜索值时，执行搜索
pageNo.value = 1;
isHasData.value = true;
queryData(1, value, true);
}
// 直接调用API进行搜索
queryData(1, value, true);
}, 300);

8
src/views/base/point/PointList.vue
View File

@ -7,12 +7,7 @@
<a-col :lg="6">
<a-form-item name="areaId">
<template #label><span title="库区">库区</span></template>
<JSearchSelect
v-model:value="queryParam.areaId"
placeholder="请选择库区"
dict="base_area where iz_active=1 and del_flag=0 ,area_name,id"
allowClear
/>
<AreaSelect v-model:value="queryParam.areaId" />
</a-form-item>
</a-col>
<a-col :lg="6">
@ -108,6 +103,7 @@
import JInput from '../../../components/Form/src/jeecg/components/JInput.vue';
import SwitchStatus from '/@/views/base/SwitchStatus.vue';
import { JDictSelectTag, JSearchSelect } from '@/components/Form';
import AreaSelect from '@/views/base/area/components/AreaSelect.vue';
const fieldPickers = reactive({});

15
src/views/base/point/components/PointForm.vue
View File

@ -6,13 +6,7 @@
<a-row>
<a-col :span="12">
<a-form-item label="库区" v-bind="validateInfos.areaId" id="PointForm-areaId" name="areaId">
<JSearchSelect
v-model:value="formData.areaId"
placeholder="请选择库区"
dict="base_area where iz_active=1 and del_flag=0,area_name,id"
allowClear
@change="onAreaChange"
/>
<AreaSelect v-model:value="formData.areaId" @change="onAreaChange" />
</a-form-item>
</a-col>
<a-col :span="12">
@ -21,7 +15,7 @@
</a-form-item>
</a-col>
<a-col :span="12" v-if="formData.areaId!='1986328561044119554' && formData.areaId!='1986337742572707841'">
<a-col :span="12" v-if="formData.areaId!='1986328561044119554' && formData.areaId!='1986337742572707841' && formData.areaId!='2011686820969934849' && formData.areaId!='2011686935004672001' ">
<a-form-item label="状态" v-bind="validateInfos.status" id="PointForm-status" name="status">
<JDictSelectTag
v-model:value="formData.status"
@ -146,6 +140,7 @@
import { JDictSelectTag, JSearchSelect } from '@/components/Form';
import JSwitch from '@/components/Form/src/jeecg/components/JSwitch.vue';
import { getTenantId } from '@/utils/auth';
import AreaSelect from '@/views/base/area/components/AreaSelect.vue';
const props = defineProps({
formDisabled: { type: Boolean, default: false },
@ -212,8 +207,8 @@
// 定义库区ID常量，提高可读性和可维护性
const CP_MJ_AREA_IDS = new Set(['1988794761598668802', '1988795017837088770']);
//成品存储区、模具存储区、入库工作站、出库工作站
const CP_MJ_RK_CK_AREA_IDS = new Set(['1988794761598668802', '1988795017837088770', '1986328561044119554', '1986337742572707841']);
//成品存储区、模具存储区、入库工作站、出库工作站、模具入库工作站、模具出库工作站
const CP_MJ_RK_CK_AREA_IDS = new Set(['1988794761598668802', '1988795017837088770', '1986328561044119554', '1986337742572707841','2011686820969934849','2011686935004672001']);
/**
* 库区选择变化事件