diff --git a/src/views/contract/bidCost/index.vue b/src/views/contract/bidCost/index.vue
index 9ef0c55..2ab34c4 100644
--- a/src/views/contract/bidCost/index.vue
+++ b/src/views/contract/bidCost/index.vue
@@ -5,7 +5,7 @@
-
+
diff --git a/src/views/contract/division/index.vue b/src/views/contract/division/index.vue
index 0c7675d..10e84ff 100644
--- a/src/views/contract/division/index.vue
+++ b/src/views/contract/division/index.vue
@@ -138,9 +138,14 @@
{{
- (scope.row.quantity ? Number(scope.row.quantity) : 0) - (scope.row.useQuantity ? Number(scope.row.useQuantity) : 0) == 0
+ (scope.row.quantity ? Number(scope.row.quantity) : 0) -
+ (scope.row.useQuantity ? Number(scope.row.useQuantity) : 0) -
+ (scope.row.selectNum ? Number(scope.row.selectNum) : 0) ==
+ 0
? ''
- : (scope.row.quantity ? Number(scope.row.quantity) : 0) - (scope.row.useQuantity ? Number(scope.row.useQuantity) : 0)
+ : (scope.row.quantity ? Number(scope.row.quantity) : 0) -
+ (scope.row.selectNum ? Number(scope.row.selectNum) : 0) -
+ (scope.row.useQuantity ? Number(scope.row.useQuantity) : 0)
}}
@@ -149,12 +154,16 @@
{{
- ((scope.row.quantity ? Number(scope.row.quantity) : 0) - (scope.row.useQuantity ? Number(scope.row.useQuantity) : 0)) *
+ ((scope.row.quantity ? Number(scope.row.quantity) : 0) -
+ (scope.row.useQuantity ? Number(scope.row.useQuantity) : 0) -
+ (scope.row.selectNum ? Number(scope.row.selectNum) : 0)) *
Number(scope.row.unitPrice) ==
0
? ''
: (
- ((scope.row.quantity ? Number(scope.row.quantity) : 0) - (scope.row.useQuantity ? Number(scope.row.useQuantity) : 0)) *
+ ((scope.row.quantity ? Number(scope.row.quantity) : 0) -
+ (scope.row.useQuantity ? Number(scope.row.useQuantity) : 0) -
+ (scope.row.selectNum ? Number(scope.row.selectNum) : 0)) *
Number(scope.row.unitPrice)
).toFixed(2)
}}
diff --git a/src/views/contract/limitPrice/index.vue b/src/views/contract/limitPrice/index.vue
index 69d7e05..557eb60 100644
--- a/src/views/contract/limitPrice/index.vue
+++ b/src/views/contract/limitPrice/index.vue
@@ -124,7 +124,7 @@ const loading = ref(false);
const options = ref([]);
const sheets = ref([]);
const tableData = ref([]);
-const isExpandAll = ref(false);
+const isExpandAll = ref(true);
const reviewStatus = ref('');
const versionObj: any = ref({});
const versionMap = new Map();
diff --git a/src/views/design/appointment/index.vue b/src/views/design/appointment/index.vue
index 19bc328..6adfa28 100644
--- a/src/views/design/appointment/index.vue
+++ b/src/views/design/appointment/index.vue
@@ -65,7 +65,7 @@
>
-
+
-
-
-
-
-
-
+
-
+
{{ parseTime(scope.row.planTheStartTime, '{y}-{m}-{d}') }}
diff --git a/src/views/materials/materials/index.vue b/src/views/materials/materials/index.vue
index 91385e7..c0ab274 100644
--- a/src/views/materials/materials/index.vue
+++ b/src/views/materials/materials/index.vue
@@ -1,13 +1,11 @@
-
+
-
+
@@ -27,22 +25,20 @@
- 新增
+ 新增
+
+
+ 修改
- 修改
+ 删除
- 删除
-
-
-
- 导出
+ 导出
@@ -72,25 +68,28 @@
-
+
详情
- 修改
-
+ 修改
+
删除
- 出入库
+
+ 出入库
+
-
+
@@ -121,12 +120,17 @@
{{ item.label }}
-
+ "
+ />
@@ -137,8 +141,7 @@
-
+
diff --git a/src/views/materials/materialsEquipment/materialIssue/index.vue b/src/views/materials/materialsEquipment/materialIssue/index.vue
index 8d4cdff..cad64f8 100644
--- a/src/views/materials/materialsEquipment/materialIssue/index.vue
+++ b/src/views/materials/materialsEquipment/materialIssue/index.vue
@@ -73,7 +73,10 @@
-
+
+
+
+
@@ -247,7 +250,8 @@ import {
addMaterialIssue,
updateMaterialIssue,
inventoryList,
- getMaterialName
+ getMaterialName,
+ getMaterialInfo
} from '@/api/materials/materialIssue';
import { MaterialIssueVO, MaterialIssueQuery, MaterialIssueForm } from '@/api/materials/materialIssue/types';
@@ -529,8 +533,27 @@ const handleAdd = () => {
dialog.title = '添加物料领料单';
// 新增时初始计算材料名称
computeMaterialName();
+ getFormData();
};
+const options = ref([]);
+//新增获取表单数据
+const getFormData = async () => {
+ const res = await getMaterialInfo(currentProject.value.id);
+ if (res.code == 200) {
+ options.value = res.data;
+ }
+};
+const formCodeChange = (value) => {
+ console.log(value);
+ const selected = options.value.find((opt) => opt.formCode === value);
+ if (selected) {
+ form.value.materialName = selected.materialName;
+ form.value.orderingUnit = selected.orderingUnit;
+ form.value.supplierUnit = selected.supplierUnit;
+ optionsName.value = selected.materials;
+ }
+};
/** 修改按钮操作 */
const handleUpdate = async (row?: MaterialIssueVO) => {
reset();
@@ -682,7 +705,7 @@ watch(
onMounted(() => {
getList();
- getName();
+ // getName();
});
// 监听项目id刷新数据
@@ -692,7 +715,7 @@ const listeningProject = watch(
queryParams.value.projectId = nid;
form.value.projectId = nid;
getList();
- getName();
+ // getName();
}
);
diff --git a/src/views/materials/overallPlanMaterialSupply/index.vue b/src/views/materials/overallPlanMaterialSupply/index.vue
index 4106dc8..52b060a 100644
--- a/src/views/materials/overallPlanMaterialSupply/index.vue
+++ b/src/views/materials/overallPlanMaterialSupply/index.vue
@@ -30,6 +30,9 @@
>一键全部保存
+
+ {{ isExpandAll ? '一键收起' : '一键展开' }}
+
@@ -38,6 +41,7 @@
{
+ isExpandAll.value = !isExpandAll.value;
+ console.log(isExpandAll.value);
+ state.tableData.forEach((row) => {
+ tableRef.value.toggleRowExpansion(row, isExpandAll.value);
+ });
+};
// 获取主表数据
async function getMasterDataList() {
try {
diff --git a/src/views/out/monthPlan/index.vue b/src/views/out/monthPlan/index.vue
index c426eca..b243f1f 100644
--- a/src/views/out/monthPlan/index.vue
+++ b/src/views/out/monthPlan/index.vue
@@ -82,7 +82,7 @@
-
+
diff --git a/src/views/project/landTransfer/BasicData/landBlock/index.vue b/src/views/project/landTransfer/BasicData/landBlock/index.vue
index 8c215a0..3fcccd5 100644
--- a/src/views/project/landTransfer/BasicData/landBlock/index.vue
+++ b/src/views/project/landTransfer/BasicData/landBlock/index.vue
@@ -112,7 +112,7 @@
添加
-
+
{
@@ -400,17 +399,20 @@ const handleView = async (row: LandBlockVO) => {
if (!row?.id) return proxy?.$modal.msgWarning('请选择有效的地块');
// 1. 重置方阵表单（清空历史数据）
- resetMatrix();
+
// 2. 绑定当前地块ID
formM.value.landId = row.id;
// 3. 打开弹窗
dialogMatrix.visible = true;
+ nextTick(() => {
+ resetMatrix();
+ });
dialogMatrix.title = `关联方阵（地块：${row.landName || row.landCode}）`;
};
/** 新增方阵表单项 */
const addUnitBoItem = () => {
- unitBoList.value.push({
+ formM.value.unitBoList.push({
unitProjectArea: '',
unitProjectStatus: '',
unitProjectId: [] // 级联选择初始为空数组
@@ -419,10 +421,10 @@ const addUnitBoItem = () => {
/** 删除方阵表单项 */
const removeUnitBoItem = (index: number) => {
- if (unitBoList.value.length <= 1) {
+ if (formM.value.unitBoList.length <= 1) {
return proxy?.$modal.msgWarning('至少保留一项方阵配置');
}
- unitBoList.value.splice(index, 1);
+ formM.value.unitBoList.splice(index, 1);
// 重置表单校验状态（避免删除后残留校验提示）
landBlockFormMatrixRef.value?.clearValidate();
};
@@ -435,7 +437,7 @@ const submitFormMatrix = () => {
try {
// 处理方阵数据（拆分名称+ID）
- const unitBoListParams = unitBoList.value.map((item) => {
+ const unitBoListParams = formM.value.unitBoList.map((item) => {
const [unitProjectName, unitProjectId] = item.unitProjectId[1]?.split('_') || [];
if (!unitProjectId) throw new Error('方阵ID解析失败，请重新选择方阵');
@@ -455,7 +457,7 @@ const submitFormMatrix = () => {
if (res.code === 200) {
proxy?.$modal.msgSuccess('关联方阵成功');
- dialogMatrix.visible = false;
+ cancelMatrix(); // 关闭弹窗并重置表单
await getList(); // 刷新地块列表
} else {
proxy?.$modal.msgError(res.msg || '关联失败');
@@ -477,7 +479,10 @@ const resetMatrix = () => {
// 1. 清空地块ID
formM.value.landId = undefined;
// 2. 重置方阵列表（仅保留一个空项）
- unitBoList.value = [{ unitProjectArea: '', unitProjectStatus: '', unitProjectId: [] }];
+ // 使用splice方法修改数组
+ formM.value.unitBoList = [{ unitProjectArea: '', unitProjectStatus: '', unitProjectId: [] }];
+ console.log(formM.value.unitBoList, 'unitBoList');
+
// 3. 重置表单校验状态
if (landBlockFormMatrixRef.value) {
landBlockFormMatrixRef.value.resetFields();
diff --git a/src/views/tender/bidd/index.vue b/src/views/tender/bidd/index.vue
index 3c3972b..f2644c8 100644
--- a/src/views/tender/bidd/index.vue
+++ b/src/views/tender/bidd/index.vue
@@ -10,7 +10,7 @@
-
+
diff --git a/src/views/tender/plan/index.vue b/src/views/tender/plan/index.vue
index 7c69723..52e7588 100644
--- a/src/views/tender/plan/index.vue
+++ b/src/views/tender/plan/index.vue
@@ -191,9 +191,14 @@
{{
- (scope.row.quantity ? Number(scope.row.quantity) : 0) - (scope.row.useQuantity ? Number(scope.row.useQuantity) : 0) == 0
+ (scope.row.quantity ? Number(scope.row.quantity) : 0) -
+ (scope.row.useQuantity ? Number(scope.row.useQuantity) : 0) -
+ (scope.row.selectNum ? Number(scope.row.selectNum) : 0) ==
+ 0
? ''
- : (scope.row.quantity ? Number(scope.row.quantity) : 0) - (scope.row.useQuantity ? Number(scope.row.useQuantity) : 0)
+ : (scope.row.quantity ? Number(scope.row.quantity) : 0) -
+ (scope.row.selectNum ? Number(scope.row.selectNum) : 0) -
+ (scope.row.useQuantity ? Number(scope.row.useQuantity) : 0)
}}
@@ -219,12 +224,16 @@
{{
- ((scope.row.quantity ? Number(scope.row.quantity) : 0) - (scope.row.useQuantity ? Number(scope.row.useQuantity) : 0)) *
+ ((scope.row.quantity ? Number(scope.row.quantity) : 0) -
+ (scope.row.useQuantity ? Number(scope.row.useQuantity) : 0) -
+ (scope.row.selectNum ? Number(scope.row.selectNum) : 0)) *
Number(scope.row.unitPrice) ==
0
? ''
: (
- ((scope.row.quantity ? Number(scope.row.quantity) : 0) - (scope.row.useQuantity ? Number(scope.row.useQuantity) : 0)) *
+ ((scope.row.quantity ? Number(scope.row.quantity) : 0) -
+ (scope.row.useQuantity ? Number(scope.row.useQuantity) : 0) -
+ (scope.row.selectNum ? Number(scope.row.selectNum) : 0)) *
Number(scope.row.unitPrice)
).toFixed(2)
}}
diff --git a/src/views/tender/supplierInput/index.vue b/src/views/tender/supplierInput/index.vue
index cea16ef..ac76d0e 100644
--- a/src/views/tender/supplierInput/index.vue
+++ b/src/views/tender/supplierInput/index.vue
@@ -234,17 +234,17 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
@@ -254,17 +254,17 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
@@ -369,14 +369,14 @@ const initFormData: any = {
inputFile: undefined,
// state: '0', // 新增默认待审核
// 新增：用于表单输入的单独字段
- build1: undefined, // 一建建造师
- build2: undefined, // 二建建造师
- build3: undefined, // 注册造价工程师
- build4: undefined, // 其他注册人员
- personnelNumber1: undefined, // 高级工程师
- personnelNumber2: undefined, // 工程师
- personnelNumber3: undefined, // 助理工程师
- personnelNumber4: undefined // 其他职称人员
+ firstBuildingNumber: undefined, // 一建建造师
+ secondBuildingNumber: undefined, // 二建建造师
+ registeredEngineerNumber: undefined, // 注册造价工程师
+ otherBuildingNumber: undefined, // 其他注册人员
+ seniorEngineerNumber: undefined, // 高级工程师
+ engineerNumber: undefined, // 工程师
+ assistantEngineerNumber: undefined, // 助理工程师
+ otherPersonnelNumber: undefined // 其他职称人员
};
// 核心数据（表单+查询参数）
const data = reactive>({
@@ -411,14 +411,14 @@ const rules = computed(() => {
{ pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号格式', trigger: 'blur' }
],
id: [{ required: true, message: 'ID不能为空', trigger: 'blur' }],
- build1: [{ required: true, message: '请输入一建建造师数量', trigger: 'change' }],
- build2: [{ required: true, message: '请输入二建建造师数量', trigger: 'change' }],
- build3: [{ required: true, message: '请输入注册造价工程师数量', trigger: 'change' }],
- build4: [{ required: true, message: '请输入其他数量', trigger: 'change' }],
- personnelNumber1: [{ required: true, message: '请输入高级工程师数量', trigger: 'change' }],
- personnelNumber2: [{ required: true, message: '请输入工程师数量', trigger: 'change' }],
- personnelNumber3: [{ required: true, message: '请输入助理工程师数量', trigger: 'change' }],
- personnelNumber4: [{ required: true, message: '请输入其他数量', trigger: 'change' }]
+ firstBuildingNumber: [{ required: true, message: '请输入一建建造师数量', trigger: 'change' }],
+ secondBuildingNumber: [{ required: true, message: '请输入二建建造师数量', trigger: 'change' }],
+ registeredEngineerNumber: [{ required: true, message: '请输入注册造价工程师数量', trigger: 'change' }],
+ otherBuildingNumber: [{ required: true, message: '请输入其他数量', trigger: 'change' }],
+ seniorEngineerNumber: [{ required: true, message: '请输入高级工程师数量', trigger: 'change' }],
+ engineerNumber: [{ required: true, message: '请输入工程师数量', trigger: 'change' }],
+ assistantEngineerNumber: [{ required: true, message: '请输入助理工程师数量', trigger: 'change' }],
+ otherPersonnelNumber: [{ required: true, message: '请输入其他数量', trigger: 'change' }]
};
// 仅当类型为"劳务"时，添加安全生产许可证+人员数量校验
@@ -430,15 +430,15 @@ const rules = computed(() => {
safeCodeData: [{ required: true, message: '请选择安全生产许可证发证日期', trigger: 'change' }],
safeCertificateValidity: [{ required: true, message: '请选择安全生产许可证有效期', trigger: 'change' }],
// 注册人员数量校验
- build1: [{ required: true, message: '请输入一建建造师数量', trigger: 'blur' }],
- build2: [{ required: true, message: '请输入二建建造师数量', trigger: 'blur' }],
- build3: [{ required: true, message: '请输入注册造价工程师数量', trigger: 'blur' }],
- build4: [{ required: true, message: '请输入其他注册人员数量', trigger: 'blur' }],
+ firstBuildingNumber: [{ required: true, message: '请输入一建建造师数量', trigger: 'blur' }],
+ secondBuildingNumber: [{ required: true, message: '请输入二建建造师数量', trigger: 'blur' }],
+ registeredEngineerNumber: [{ required: true, message: '请输入注册造价工程师数量', trigger: 'blur' }],
+ otherBuildingNumber: [{ required: true, message: '请输入其他注册人员数量', trigger: 'blur' }],
// 职称人员数量校验
- personnelNumber1: [{ required: true, message: '请输入高级工程师数量', trigger: 'blur' }],
- personnelNumber2: [{ required: true, message: '请输入工程师数量', trigger: 'blur' }],
- personnelNumber3: [{ required: true, message: '请输入助理工程师数量', trigger: 'blur' }],
- personnelNumber4: [{ required: true, message: '请输入其他职称人员数量', trigger: 'blur' }]
+ seniorEngineerNumber: [{ required: true, message: '请输入高级工程师数量', trigger: 'blur' }],
+ engineerNumber: [{ required: true, message: '请输入工程师数量', trigger: 'blur' }],
+ assistantEngineerNumber: [{ required: true, message: '请输入助理工程师数量', trigger: 'blur' }],
+ otherPersonnelNumber: [{ required: true, message: '请输入其他职称人员数量', trigger: 'blur' }]
};
}
@@ -455,22 +455,26 @@ const handleTypeChange = () => {
form.value.registeredNumber = undefined;
form.value.personnelNumber = undefined;
// 清空表单单独字段
- form.value.build1 = form.value.build2 = form.value.build3 = form.value.build4 = undefined;
- form.value.personnelNumber1 = form.value.personnelNumber2 = form.value.personnelNumber3 = form.value.personnelNumber4 = undefined;
+ form.value.firstBuildingNumber =
+ form.value.secondBuildingNumber =
+ form.value.registeredEngineerNumber =
+ form.value.otherBuildingNumber =
+ undefined;
+ form.value.seniorEngineerNumber = form.value.engineerNumber = form.value.assistantEngineerNumber = form.value.otherPersonnelNumber = undefined;
}
// 重置隐藏字段的校验状态，避免错误提示残留
supplierInputFormRef.value?.clearValidate([
'safeCode',
'safeCodeData',
'safeCertificateValidity',
- 'build1',
- 'build2',
- 'build3',
- 'build4',
- 'personnelNumber1',
- 'personnelNumber2',
- 'personnelNumber3',
- 'personnelNumber4'
+ 'firstBuildingNumber',
+ 'secondBuildingNumber',
+ 'registeredEngineerNumber',
+ 'otherBuildingNumber',
+ 'seniorEngineerNumber',
+ 'engineerNumber',
+ 'assistantEngineerNumber',
+ 'otherPersonnelNumber'
]);
};
@@ -517,18 +521,18 @@ const resetQuery = () => {
const splitBackEndStrToForm = (resData: any) => {
if (resData.registeredNumber) {
const registeredArr = resData.registeredNumber.split(',');
- form.value.build1 = registeredArr[0] || undefined; // 一建建造师
- form.value.build2 = registeredArr[1] || undefined; // 二建建造师
- form.value.build3 = registeredArr[2] || undefined; // 注册造价工程师
- form.value.build4 = registeredArr[3] || undefined; // 其他注册人员
+ form.value.firstBuildingNumber = registeredArr[0] || undefined; // 一建建造师
+ form.value.secondBuildingNumber = registeredArr[1] || undefined; // 二建建造师
+ form.value.registeredEngineerNumber = registeredArr[2] || undefined; // 注册造价工程师
+ form.value.otherBuildingNumber = registeredArr[3] || undefined; // 其他注册人员
}
if (resData.personnelNumber) {
const personnelArr = resData.personnelNumber.split(',');
- form.value.personnelNumber1 = personnelArr[0] || undefined; // 高级工程师
- form.value.personnelNumber2 = personnelArr[1] || undefined; // 工程师
- form.value.personnelNumber3 = personnelArr[2] || undefined; // 助理工程师
- form.value.personnelNumber4 = personnelArr[3] || undefined; // 其他职称人员
+ form.value.seniorEngineerNumber = personnelArr[0] || undefined; // 高级工程师
+ form.value.engineerNumber = personnelArr[1] || undefined; // 工程师
+ form.value.assistantEngineerNumber = personnelArr[2] || undefined; // 助理工程师
+ form.value.otherPersonnelNumber = personnelArr[3] || undefined; // 其他职称人员
}
};
/** 审核过程按钮操作 */
@@ -599,19 +603,23 @@ const submitForm = () => {
supplierInputFormRef.value?.validate(async (valid: boolean) => {
if (!valid) return;
if (form.value.supplierType === '劳务') {
- form.value.registeredNumber = [form.value.build1, form.value.build2, form.value.build3, form.value.build4].join(',');
+ form.value.registeredNumber = [
+ form.value.firstBuildingNumber,
+ form.value.secondBuildingNumber,
+ form.value.registeredEngineerNumber,
+ form.value.otherBuildingNumber
+ ].join(',');
form.value.personnelNumber = [
- form.value.personnelNumber1,
- form.value.personnelNumber2,
- form.value.personnelNumber3,
- form.value.personnelNumber4
+ form.value.seniorEngineerNumber,
+ form.value.engineerNumber,
+ form.value.assistantEngineerNumber,
+ form.value.otherPersonnelNumber
].join(',');
}
buttonLoading.value = true;
try {
if (fileUploadRef.value) {
await fileUploadRef.value.submitUpload().then((res) => {
- console.log(res);
if (res == 'noFile') {
proxy?.$modal.msgError('请上传文件');
return;
diff --git a/src/views/tender/supplierInput/indexEdit.vue b/src/views/tender/supplierInput/indexEdit.vue
index b6f6677..ac24516 100644
--- a/src/views/tender/supplierInput/indexEdit.vue
+++ b/src/views/tender/supplierInput/indexEdit.vue
@@ -122,41 +122,41 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
@@ -270,14 +270,14 @@ const initFormData = {
inputFile: undefined,
state: '0', // 新增默认待审核
// 新增：用于表单输入的单独字段
- build1: undefined, // 一建建造师
- build2: undefined, // 二建建造师
- build3: undefined, // 注册造价工程师
- build4: undefined, // 其他注册人员
- personnelNumber1: undefined, // 高级工程师
- personnelNumber2: undefined, // 工程师
- personnelNumber3: undefined, // 助理工程师
- personnelNumber4: undefined // 其他职称人员
+ firstBuildingNumber: undefined, // 一建建造师
+ secondBuildingNumber: undefined, // 二建建造师
+ registeredEngineerNumber: undefined, // 注册造价工程师
+ otherBuildingNumber: undefined, // 其他注册人员
+ seniorEngineerNumber: undefined, // 高级工程师
+ engineerNumber: undefined, // 工程师
+ assistantEngineerNumber: undefined, // 助理工程师
+ otherPersonnelNumber: undefined
};
const data = reactive>({
form: { ...initFormData },
@@ -332,17 +332,27 @@ const getInfo = () => {
buttonLoading.value = false;
nextTick(async () => {
const res = await getSupplierInput(routeParams.value.id);
+ console.log(res, '------------------res');
+
Object.assign(form.value, res.data);
- form.value.registeredNumber = form.value.registeredNumber?.split(',');
- form.value.build1 = form.value.registeredNumber[0] || '';
- form.value.build2 = form.value.registeredNumber[1] || '';
- form.value.build3 = form.value.registeredNumber[2] || '';
- form.value.build4 = form.value.registeredNumber[3] || '';
- form.value.personnelNumber = form.value.personnelNumber?.split(',');
- form.value.personnelNumber1 = form.value.personnelNumber[0] || '';
- form.value.personnelNumber2 = form.value.personnelNumber[1] || '';
- form.value.personnelNumber3 = form.value.personnelNumber[2] || '';
- form.value.personnelNumber4 = form.value.personnelNumber[3] || '';
+ // form.value.firstBuildingNumber=res.data.firstBuildingNumber, // 一建建造师
+ // secondBuildingNumber: undefined, // 二建建造师
+ // registeredEngineerNumber: undefined, // 注册造价工程师
+ // otherBuildingNumber: undefined, // 其他注册人员
+ // seniorEngineerNumber: undefined, // 高级工程师
+ // engineerNumber: undefined, // 工程师
+ // assistantEngineerNumber: undefined, // 助理工程师
+ // otherPersonnelNumber: undefined
+ // form.value.registeredNumber = form.value.registeredNumber?.split(',');
+ // form.value.build1 = form.value.registeredNumber[0] || '';
+ // form.value.build2 = form.value.registeredNumber[1] || '';
+ // form.value.build3 = form.value.registeredNumber[2] || '';
+ // form.value.build4 = form.value.registeredNumber[3] || '';
+ // form.value.personnelNumber = form.value.personnelNumber?.split(',');
+ // form.value.personnelNumber1 = form.value.personnelNumber[0] || '';
+ // form.value.personnelNumber2 = form.value.personnelNumber[1] || '';
+ // form.value.personnelNumber3 = form.value.personnelNumber[2] || '';
+ // form.value.personnelNumber4 = form.value.personnelNumber[3] || '';
loading.value = false;
buttonLoading.value = false;
From d06d6a95043fa71d0725a126d15efe0a7e7d89c0 Mon Sep 17 00:00:00 2001
From: ljx <15723110242@139.com>
Date: Tue, 2 Sep 2025 19:09:43 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/project/landTransfer/BasicData/landBlock/index.vue | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/views/project/landTransfer/BasicData/landBlock/index.vue b/src/views/project/landTransfer/BasicData/landBlock/index.vue
index c9ebabe..3c45c71 100644
--- a/src/views/project/landTransfer/BasicData/landBlock/index.vue
+++ b/src/views/project/landTransfer/BasicData/landBlock/index.vue
@@ -431,9 +431,7 @@ const handleView = async (row: LandBlockVO) => {
formM.landId = row.id;
// 打开弹窗
dialogMatrix.visible = true;
- nextTick(() => {
- resetMatrix();
- });
+
dialogMatrix.title = `关联方阵（地块：${row.landName || row.landCode}）`;
};