diff --git a/src/views/dike/safetyManage/floodControlManagement/power.vue b/src/views/dike/safetyManage/floodControlManagement/power.vue index abb7d47..5e73039 100644 --- a/src/views/dike/safetyManage/floodControlManagement/power.vue +++ b/src/views/dike/safetyManage/floodControlManagement/power.vue @@ -16,9 +16,9 @@ v-show="showSearch" label-width="68px" > - + @@ -117,8 +117,8 @@ - - + + @@ -198,7 +198,7 @@ v-for="dict in dikeNameOptions" :key="dict.id" :label="dict.dikeName" - :value="dict.id" + :value="dict.dikeCode" > @@ -306,7 +306,7 @@ export default { pageSize: 10, ids: null, data: { - dikeId: null, + dikeCode: null, powerType: null, powerModel: null, dikeName: null, @@ -327,7 +327,7 @@ export default { form: {}, // 表单校验 rules: { - dikeId: [ + dikeCode: [ { required: true, message: "请选择关联堤防", trigger: "blur" }, ], powerType: [ @@ -364,9 +364,9 @@ export default { this.loading = false; }); }, - wageIdFormat(row) { - const id = row.dikeId; - let data = this.dikeNameOptions.find((res) => res.id == id); + dikeCodeFormat(row) { + const dikeCode = row.dikeCode; + let data = this.dikeNameOptions.find((res) => res.dikeCode == dikeCode); if (data) return data.dikeName; }, // 电源种类字典翻译 @@ -382,7 +382,7 @@ export default { reset() { this.form = { id: null, - dikeId: null, + dikeCode: null, powerType: null, powerModel: null, dikeName: null, @@ -403,7 +403,7 @@ export default { pageSize: 10, data: { id: null, - dikeId: null, + dikeCode: null, powerType: null, powerModel: null, dikeName: null, diff --git a/src/views/dike/safetyManage/floodControlManagement/preplan.vue b/src/views/dike/safetyManage/floodControlManagement/preplan.vue index 095c096..6b7be08 100644 --- a/src/views/dike/safetyManage/floodControlManagement/preplan.vue +++ b/src/views/dike/safetyManage/floodControlManagement/preplan.vue @@ -16,9 +16,9 @@ v-show="showSearch" label-width="68px" > - + + + @@ -357,7 +357,7 @@ export default { pageSize: 10, ids: null, data: { - dikeId: null, + dikeCode: null, dikeCode: null, dikeName: null, dikeType: null, @@ -402,8 +402,8 @@ export default { }); }, methods: { - dikeIdFormat(row) { - const id = row.dikeId; + dikeCodeFormat(row) { + const id = row.dikeCode; let data = this.dikeNameOptions.find((res) => res.id == id); if (data) return data.dikeName; }, @@ -430,7 +430,7 @@ export default { this.fileList = []; this.form = { id: null, - dikeId: null, + dikeCode: null, dikeCode: null, dikeName: null, dikeType: null, @@ -457,7 +457,7 @@ export default { pageSize: 10, data: { id: null, - dikeId: null, + dikeCode: null, dikeCode: null, dikeName: null, dikeType: null, diff --git a/src/views/dike/safetyManage/floodControlManagement/supplies.vue b/src/views/dike/safetyManage/floodControlManagement/supplies.vue index c8f9f4b..727ad73 100644 --- a/src/views/dike/safetyManage/floodControlManagement/supplies.vue +++ b/src/views/dike/safetyManage/floodControlManagement/supplies.vue @@ -16,9 +16,9 @@ v-show="showSearch" label-width="68px" > - - + @@ -154,8 +154,8 @@ - - + + @@ -268,7 +268,7 @@ v-for="dict in dikeNameOptions" :key="dict.id" :label="dict.dikeName" - :value="dict.id" + :value="dict.dikeCode" > @@ -378,7 +378,7 @@ export default { pageSize: 10, ids: null, data: { - dikeId: null, + dikeCode: null, materialName: null, dikeName: null, personName: null, @@ -404,7 +404,7 @@ export default { form: {}, // 表单校验 rules: { - dikeId: [ + dikeCode: [ { required: true, message: "请选择关联堤防", trigger: "blur" }, ], materialName: [ @@ -451,9 +451,9 @@ export default { this.loading = false; }); }, - wageIdFormat(row) { - const id = row.dikeId; - let data = this.dikeNameOptions.find((res) => res.id == id); + dikeCodeFormat(row) { + const dikeCode = row.dikeCode; + let data = this.dikeNameOptions.find((res) => res.dikeCode == dikeCode); if (data) return data.dikeName; }, // 物资种类字典翻译 @@ -469,7 +469,7 @@ export default { reset() { this.form = { id: null, - dikeId: null, + dikeCode: null, materialName: null, dikeName: null, personName: null, @@ -495,7 +495,7 @@ export default { pageSize: 10, data: { id: null, - dikeId: null, + dikeCode: null, materialName: null, dikeName: null, personName: null, diff --git a/src/views/dike/safetyManage/floodControlManagement/tissue.vue b/src/views/dike/safetyManage/floodControlManagement/tissue.vue index 1ce026d..8efaa78 100644 --- a/src/views/dike/safetyManage/floodControlManagement/tissue.vue +++ b/src/views/dike/safetyManage/floodControlManagement/tissue.vue @@ -135,8 +135,8 @@ - + @@ -248,7 +248,7 @@ v-for="dict in dikeNameOptions" :key="dict.id" :label="dict.dikeName" - :value="dict.id" + :value="dict.dikeCode" > @@ -443,7 +443,7 @@ export default { form: {}, // 表单校验 rules: { - dikeId: [ + dikeCode: [ { required: true, message: "请选择堤防名称", trigger: "blur" }, ], organizationName: [ @@ -524,21 +524,21 @@ export default { typeFormat(row, column) { return this.selectDictLabel(this.typeOptions, row.chargePersonType); }, - dikeIdFormat(row) { - const id = row.dikeId; + dikeCodeFormat(row) { + const dikeCode = row.dikeCode; // const name = await new Promise(function (resolve, reject) { // getJbxx(id).then((res) => { // // console.log(111, res); // resolve(res.data.dikeName); // }); // }); - let data = this.dikeNameOptions.find((res) => res.id == id); + let data = this.dikeNameOptions.find((res) => res.dikeCode == dikeCode); if (data) return data.dikeName; }, /** 查询防汛组织列表 */ getList() { this.loading = true; - // this.queryParams.data.dikeId = this.$route.query.baseDataId; + // this.queryParams.data.dikeCode = this.$route.query.baseDataId; listFxzz(this.queryParams).then((response) => { this.fxzzList = response.records; this.total = response.total; @@ -686,7 +686,7 @@ export default { if (this.delIdList.length > 0) delFxzzcy(this.delIdList); } else { this.form.cy = C0; - // this.form.dikeId = this.$route.query.baseDataId; + // this.form.dikeCode = this.$route.query.baseDataId; addFxzz(this.form).then((response) => { if (response.code === 200) { this.msgSuccess("新增成功"); diff --git a/src/views/dike/safetyManage/safeProduction/components/list.vue b/src/views/dike/safetyManage/safeProduction/components/list.vue index f9bc352..d9b2df3 100644 --- a/src/views/dike/safetyManage/safeProduction/components/list.vue +++ b/src/views/dike/safetyManage/safeProduction/components/list.vue @@ -93,8 +93,8 @@ - - + + @@ -379,7 +379,7 @@ export default { pageSize: 10, ids: null, data: { - dikeId: null, + dikeCode: null, proposer: null, head: null, findTime: null, @@ -444,9 +444,9 @@ export default { this.title = "解决堤防隐患信息"; }); }, - dikeIdFormat(row) { - const id = row.dikeId; - let data = this.dikeNameOptions.find((res) => res.id == id); + dikeCodeFormat(row) { + const dikeCode = row.dikeCode; + let data = this.dikeNameOptions.find((res) => res.dikeCode == dikeCode); if (data) return data.dikeName; }, /** 查询堤防隐患信息列表 */ @@ -475,7 +475,7 @@ export default { this.fileList = []; this.form = { id: null, - dikeId: null, + dikeCode: null, proposer: null, head: null, findTime: null, @@ -508,7 +508,7 @@ export default { pageSize: 10, data: { id: null, - dikeId: null, + dikeCode: null, proposer: null, head: null, findTime: null,