Browse Source

fix: projectCode改dikeCode

sy-water-data-board-ui
hxh 1 month ago
parent
commit
74992a165d
  1. 4
      src/views/dike/runManage/pestAnimalControl2/InspectionRecords/index.vue
  2. 4
      src/views/dike/runManage/pestAnimalControl2/acceptanceRecords/index.vue
  3. 12
      src/views/dike/runManage/pestAnimalControl2/componentsDetails/acceptanceDetails.vue
  4. 18
      src/views/dike/runManage/pestAnimalControl2/componentsDetails/inspectionRecordDetails.vue
  5. 16
      src/views/dike/runManage/pestAnimalControl2/componentsDetails/maintenanceDetails.vue
  6. 4
      src/views/dike/runManage/pestAnimalControl2/defectList/index.vue
  7. 4
      src/views/dike/runManage/pestAnimalControl2/maintenanceRecords/index.vue
  8. 26
      src/views/dike/runManage/pestAnimalControl2/patrolItemsManage/details.vue
  9. 4
      src/views/dike/runManage/pestAnimalControl2/patrolItemsManage/index.vue

4
src/views/dike/runManage/pestAnimalControl2/InspectionRecords/index.vue

@ -136,8 +136,8 @@
> >
<el-table-column prop="id" align="center" label="单号"/> <el-table-column prop="id" align="center" label="单号"/>
<el-table-column prop="checkingName" align="center" label="防治项目名称"/> <el-table-column prop="checkingName" align="center" label="防治项目名称"/>
<el-table-column prop="projectName" align="center" label="工程名称"/> <el-table-column prop="dikeName" align="center" label="工程名称"/>
<el-table-column prop="projectCode" align="center" label="工程代码"/> <el-table-column prop="dikeCode" align="center" label="工程代码"/>
<el-table-column prop="type" align="center" label="检查类型"> <el-table-column prop="type" align="center" label="检查类型">
<template slot-scope="scope"> <template slot-scope="scope">

4
src/views/dike/runManage/pestAnimalControl2/acceptanceRecords/index.vue

@ -151,8 +151,8 @@
<el-table :height="tableHeight" :data="tableData" border> <el-table :height="tableHeight" :data="tableData" border>
<el-table-column prop="id" align="center" label="单号" /> <el-table-column prop="id" align="center" label="单号" />
<el-table-column prop="detail.name" align="center" label="防治项目名称" /> <el-table-column prop="detail.name" align="center" label="防治项目名称" />
<el-table-column prop="projectName" align="center" label="工程名称"/> <el-table-column prop="dikeName" align="center" label="工程名称"/>
<el-table-column prop="projectCode" align="center" label="工程代码"/> <el-table-column prop="dikeCode" align="center" label="工程代码"/>
<el-table-column align="center" label="检查类型"> <el-table-column align="center" label="检查类型">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ <span>{{

12
src/views/dike/runManage/pestAnimalControl2/componentsDetails/acceptanceDetails.vue

@ -8,7 +8,7 @@
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<div class="tc-text2">堤防名称</div> <div class="tc-text2">堤防名称</div>
<div class="tc-text1">{{ form.projectName }}</div> <div class="tc-text1">{{ form.dikeName }}</div>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="tc-text2">堤防巡查责任人</div> <div class="tc-text2">堤防巡查责任人</div>
@ -200,7 +200,7 @@ export default {
images: '', images: '',
createName: '', createName: '',
userName: '', userName: '',
projectName: '', dikeName: '',
category: '', category: '',
parts: '', parts: '',
partsName: '', partsName: '',
@ -210,7 +210,7 @@ export default {
problemImages: '', problemImages: '',
problemLevel: '', problemLevel: '',
createUid: '', createUid: '',
projectCode: '', dikeCode: '',
projectType: '', projectType: '',
type: '', type: '',
time: [], time: [],
@ -218,7 +218,7 @@ export default {
}, },
rules: { rules: {
userName: [{required: true}], userName: [{required: true}],
projectName: [{required: true}], dikeName: [{required: true}],
inspectionCategory: [{required: true}], inspectionCategory: [{required: true}],
time: [{required: true}], time: [{required: true}],
describe: [{required: true}], describe: [{required: true}],
@ -250,14 +250,14 @@ export default {
const checking = await gettV2Record(this.$route.query.recordId) const checking = await gettV2Record(this.$route.query.recordId)
this.form.createName = checking.data.createName this.form.createName = checking.data.createName
this.form.operator = this.userName this.form.operator = this.userName
this.form.projectName = checking.data.projectName this.form.dikeName = checking.data.dikeName
this.form.checkingId = checking.data.checkingId this.form.checkingId = checking.data.checkingId
this.form.checkingName = checking.data.checkingName this.form.checkingName = checking.data.checkingName
this.form.status = checking.data.status this.form.status = checking.data.status
this.form.problems = checking.data.problems this.form.problems = checking.data.problems
this.form.category = checking.data.category this.form.category = checking.data.category
this.form.createUid = checking.data.createUid this.form.createUid = checking.data.createUid
this.form.projectCode = checking.data.projectCode this.form.dikeCode = checking.data.dikeCode
this.form.projectType = checking.data.projectType this.form.projectType = checking.data.projectType
this.form.type = checking.data.type this.form.type = checking.data.type
this.form.startDate = checking.data.startDate this.form.startDate = checking.data.startDate

18
src/views/dike/runManage/pestAnimalControl2/componentsDetails/inspectionRecordDetails.vue

@ -17,8 +17,8 @@
<el-form-item label="防治项目名称:" prop="name"> <el-form-item label="防治项目名称:" prop="name">
{{ form.name }} {{ form.name }}
</el-form-item> </el-form-item>
<el-form-item label="巡查堤防名称:" prop="projectName"> <el-form-item label="巡查堤防名称:" prop="dikeName">
{{ form.projectName }} {{ form.dikeName }}
</el-form-item> </el-form-item>
<el-form-item label="防治类别:" prop="category"> <el-form-item label="防治类别:" prop="category">
{{ getDictLabelName(form.category, "maintenanceCategory") }} {{ getDictLabelName(form.category, "maintenanceCategory") }}
@ -314,10 +314,10 @@ export default {
form: { form: {
createName: "", createName: "",
name: "", name: "",
projectName: "", dikeName: "",
category: "", category: "",
createUid: "", createUid: "",
projectCode: "", dikeCode: "",
projectType: "", projectType: "",
type: "", type: "",
time: [], time: [],
@ -326,7 +326,7 @@ export default {
rules: { rules: {
createName: [{ required: true }], createName: [{ required: true }],
name: [{ required: true }], name: [{ required: true }],
projectName: [{ required: true }], dikeName: [{ required: true }],
category: [{ required: true }], category: [{ required: true }],
time: [{ required: true, message: "请选择巡查时间", trigger: "change"}], time: [{ required: true, message: "请选择巡查时间", trigger: "change"}],
scope: [{ required: true, message: "请输入巡查方位", trigger: "change" }], scope: [{ required: true, message: "请输入巡查方位", trigger: "change" }],
@ -364,10 +364,10 @@ export default {
const checking = await getV2PatrolChecking(this.$route.query.checkingId); const checking = await getV2PatrolChecking(this.$route.query.checkingId);
this.form.createName = checking.data.createName; this.form.createName = checking.data.createName;
this.form.name = checking.data.name; this.form.name = checking.data.name;
this.form.projectName = checking.data.projectName; this.form.dikeName = checking.data.dikeName;
this.form.category = checking.data.category; this.form.category = checking.data.category;
this.form.createUid = checking.data.createUid; this.form.createUid = checking.data.createUid;
this.form.projectCode = checking.data.projectCode; this.form.dikeCode = checking.data.dikeCode;
this.form.projectType = checking.data.projectType; this.form.projectType = checking.data.projectType;
this.form.type = checking.data.type; this.form.type = checking.data.type;
const items = checking.data.items; const items = checking.data.items;
@ -495,8 +495,8 @@ export default {
checkingName: this.form.name, checkingName: this.form.name,
createName: this.form.createName, createName: this.form.createName,
createUid: this.form.createUid, createUid: this.form.createUid,
projectName: this.form.projectName, dikeName: this.form.dikeName,
projectCode: this.form.projectCode, dikeCode: this.form.dikeCode,
projectType: this.form.projectType, projectType: this.form.projectType,
scope: this.form.scope, scope: this.form.scope,
problems: this.problemsData, problems: this.problemsData,

16
src/views/dike/runManage/pestAnimalControl2/componentsDetails/maintenanceDetails.vue

@ -8,7 +8,7 @@
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<div class="tc-text2">堤防名称</div> <div class="tc-text2">堤防名称</div>
<div class="tc-text1">{{ form.projectName }}</div> <div class="tc-text1">{{ form.dikeName }}</div>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="tc-text2">堤防巡查责任人</div> <div class="tc-text2">堤防巡查责任人</div>
@ -176,7 +176,7 @@ export default {
images: [], images: [],
createName: '', createName: '',
userName: '', userName: '',
projectName: '', dikeName: '',
category: '', category: '',
parts: '', parts: '',
partsName: '', partsName: '',
@ -186,7 +186,7 @@ export default {
problemImages: '', problemImages: '',
problemLevel: '', problemLevel: '',
createUid: '', createUid: '',
projectCode: '', dikeCode: '',
projectType: '', projectType: '',
type: '', type: '',
time: [], time: [],
@ -194,7 +194,7 @@ export default {
}, },
rules: { rules: {
userName: [{required: true}], userName: [{required: true}],
projectName: [{required: true}], dikeName: [{required: true}],
inspectionCategory: [{required: true}], inspectionCategory: [{required: true}],
time: [{required: true, message: "请选择巡查时间", trigger: "change"}], time: [{required: true, message: "请选择巡查时间", trigger: "change"}],
describe: [{required: true, message: "输入巡查详情", trigger: "change"}], describe: [{required: true, message: "输入巡查详情", trigger: "change"}],
@ -224,14 +224,14 @@ export default {
this.form.createName = checking.data.createName this.form.createName = checking.data.createName
this.form.userName = this.userName this.form.userName = this.userName
this.form.userId = this.userId this.form.userId = this.userId
this.form.projectName = checking.data.projectName this.form.dikeName = checking.data.dikeName
this.form.checkingId = checking.data.checkingId this.form.checkingId = checking.data.checkingId
this.form.checkingName = checking.data.checkingName this.form.checkingName = checking.data.checkingName
this.form.status = checking.data.status this.form.status = checking.data.status
this.form.problems = checking.data.problems this.form.problems = checking.data.problems
this.form.category = checking.data.category this.form.category = checking.data.category
this.form.createUid = checking.data.createUid this.form.createUid = checking.data.createUid
this.form.projectCode = checking.data.projectCode this.form.dikeCode = checking.data.dikeCode
this.form.projectType = checking.data.projectType this.form.projectType = checking.data.projectType
this.form.type = checking.data.type this.form.type = checking.data.type
this.form.startDate = checking.data.startDate this.form.startDate = checking.data.startDate
@ -341,9 +341,9 @@ export default {
if (valid) { if (valid) {
const data = { const data = {
name: this.form.checkingName, name: this.form.checkingName,
projectCode: this.form.projectCode, dikeCode: this.form.dikeCode,
projectType: this.form.projectType, projectType: this.form.projectType,
projectName: this.form.projectName, dikeName: this.form.dikeName,
status: this.form.status, status: this.form.status,
type: this.form.type, type: this.form.type,
category: this.form.category, category: this.form.category,

4
src/views/dike/runManage/pestAnimalControl2/defectList/index.vue

@ -155,8 +155,8 @@
> >
<el-table-column prop="id" align="center" label="单号" /> <el-table-column prop="id" align="center" label="单号" />
<el-table-column prop="checkingName" align="center" label="防治项目名称" /> <el-table-column prop="checkingName" align="center" label="防治项目名称" />
<el-table-column prop="projectName" align="center" label="工程名称"/> <el-table-column prop="dikeName" align="center" label="工程名称"/>
<el-table-column prop="projectCode" align="center" label="工程代码"/> <el-table-column prop="dikeCode" align="center" label="工程代码"/>
<el-table-column prop="type" align="center" label="检查类型"> <el-table-column prop="type" align="center" label="检查类型">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ <span>{{

4
src/views/dike/runManage/pestAnimalControl2/maintenanceRecords/index.vue

@ -155,8 +155,8 @@
> >
<el-table-column prop="id" align="center" label="单号" /> <el-table-column prop="id" align="center" label="单号" />
<el-table-column prop="name" align="center" label="防治项目名称" /> <el-table-column prop="name" align="center" label="防治项目名称" />
<el-table-column prop="projectName" align="center" label="工程名称"/> <el-table-column prop="dikeName" align="center" label="工程名称"/>
<el-table-column prop="projectCode" align="center" label="工程代码"/> <el-table-column prop="dikeCode" align="center" label="工程代码"/>
<el-table-column prop="type" align="center" label="检查类型"> <el-table-column prop="type" align="center" label="检查类型">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ <span>{{

26
src/views/dike/runManage/pestAnimalControl2/patrolItemsManage/details.vue

@ -12,7 +12,7 @@
ref="ruleForm" ref="ruleForm"
label-width="120px" label-width="120px"
> >
<el-form-item label="堤防名称" prop="projectName"> <el-form-item label="堤防名称" prop="dikeName">
<el-select <el-select
:disabled="!canEdit" :disabled="!canEdit"
class="w-240" class="w-240"
@ -24,7 +24,7 @@
:remote-method="handleGetRemoteDikeMethod" :remote-method="handleGetRemoteDikeMethod"
@focus="handleGetRemoteDikeMethod('')" @focus="handleGetRemoteDikeMethod('')"
@change="handleChangeDike" @change="handleChangeDike"
v-model="formData.projectName" v-model="formData.dikeName"
placeholder="请选择堤防" placeholder="请选择堤防"
> >
<el-option <el-option
@ -35,10 +35,10 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="堤防编码" prop="projectCode"> <el-form-item label="堤防编码" prop="dikeCode">
<el-input <el-input
class="w-240" class="w-240"
v-model="formData.projectCode" v-model="formData.dikeCode"
:disabled="true" :disabled="true"
placeholder="请选择堤防" placeholder="请选择堤防"
></el-input> ></el-input>
@ -191,8 +191,8 @@ export default {
dikeList: [], dikeList: [],
formData: { formData: {
id: null, id: null,
projectCode: "", dikeCode: "",
projectName: "", dikeName: "",
name: "", name: "",
type: "", type: "",
category: "", category: "",
@ -201,8 +201,8 @@ export default {
items: [], items: [],
}, },
rules: { rules: {
projectCode: [{ required: true, message: "请选择", trigger: "change" }], dikeCode: [{ required: true, message: "请选择", trigger: "change" }],
projectName: [{ required: true, message: "请选择", trigger: "change" }], dikeName: [{ required: true, message: "请选择", trigger: "change" }],
name: [{ required: true, message: "请输入", trigger: "blur" }], name: [{ required: true, message: "请输入", trigger: "blur" }],
category: [{ required: true, message: "请选择", trigger: "change" }], category: [{ required: true, message: "请选择", trigger: "change" }],
type: [{ required: true, message: "请选择", trigger: "change" }], type: [{ required: true, message: "请选择", trigger: "change" }],
@ -249,7 +249,7 @@ export default {
pageSize: 10, pageSize: 10,
pageNum: 1, pageNum: 1,
data: { data: {
projectName: query, dikeName: query,
}, },
}).then((res) => { }).then((res) => {
if (res) { if (res) {
@ -260,12 +260,12 @@ export default {
handleChangeDike() { handleChangeDike() {
console.log("this.dikeList >>>>> ", this.dikeList, this.formData); console.log("this.dikeList >>>>> ", this.dikeList, this.formData);
let data = this.dikeList.find( let data = this.dikeList.find(
(v) => v.dikeName === this.formData.projectName (v) => v.dikeName === this.formData.dikeName
); );
console.log("data >>>>> ", data); console.log("data >>>>> ", data);
if (data) { if (data) {
this.formData.dikeType = data.dikeType; this.formData.dikeType = data.dikeType;
this.formData.projectCode = data.dikeCode; this.formData.dikeCode = data.dikeCode;
} }
}, },
// //
@ -280,8 +280,8 @@ export default {
this.formData.name = data.name; this.formData.name = data.name;
this.formData.type = data.type; this.formData.type = data.type;
this.formData.category = data.category; this.formData.category = data.category;
this.formData.projectCode = data.projectCode; this.formData.dikeCode = data.dikeCode;
this.formData.projectName = data.projectName; this.formData.dikeName = data.dikeName;
this.formData.createUid = data.createUid; this.formData.createUid = data.createUid;
this.formData.createName = data.createName; this.formData.createName = data.createName;
// xcTreeData // xcTreeData

4
src/views/dike/runManage/pestAnimalControl2/patrolItemsManage/index.vue

@ -192,9 +192,9 @@ export default {
label="有害动物防治项目名称" label="有害动物防治项目名称"
> >
</el-table-column> </el-table-column>
<el-table-column prop="projectName" align="center" label="工程名称"> <el-table-column prop="dikeName" align="center" label="工程名称">
</el-table-column> </el-table-column>
<el-table-column prop="projectCode" align="center" label="工程代码"> <el-table-column prop="dikeCode" align="center" label="工程代码">
</el-table-column> </el-table-column>
<el-table-column align="center" label="检查类型"> <el-table-column align="center" label="检查类型">
<template slot-scope="scope"> <template slot-scope="scope">

Loading…
Cancel
Save